From 1c4c48f91aba02b4ec689a90aeb8da7149de8eb1 Mon Sep 17 00:00:00 2001 From: Alexander Leidinger Date: Mon, 14 Nov 2005 20:49:54 +0000 Subject: [PATCH] - fix the package (tried to use a nonexistent plist) [1] - use MASTER_SITE_FEDORA (pet portlint a little bit) - while I'm here: SHA256 (no MD5 change, Kris: no need to check :) ) This should also fix the package build of the linux XFree86 bits. Pointyhat to: netchild [1] --- x11-fonts/linux-f10-fontconfig/Makefile | 8 +++++--- x11-fonts/linux-f10-fontconfig/distinfo.i386 | 1 + x11-fonts/linux-f8-fontconfig/Makefile | 8 +++++--- x11-fonts/linux-f8-fontconfig/distinfo.i386 | 1 + x11-fonts/linux-fontconfig/Makefile | 8 +++++--- x11-fonts/linux-fontconfig/distinfo.i386 | 1 + 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile index 34827e019c38..b08e06f177c2 100644 --- a/x11-fonts/linux-f10-fontconfig/Makefile +++ b/x11-fonts/linux-f10-fontconfig/Makefile @@ -7,9 +7,10 @@ PORTNAME= fontconfig PORTVERSION= 2.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts linux -MASTER_SITES= ftp://rpmfind.net/linux/fedora/core/3/x86_64/os/Fedora/RPMS/ +MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} +MASTER_SITE_SUBDIR=3/x86_64/os/Fedora/RPMS MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Linux/i386 binary of Fontconfig @@ -21,6 +22,7 @@ USE_REINPLACE= yes BASEVERSION= 9 ONLY_FOR_ARCHS= i386 amd64 RPM_SET= fontconfig-2.2.3-5.i386.rpm +PLIST= ${PKGDIR}/pkg-plist #PKGINSTALL= ${WRKDIR}/pkg-install @@ -28,7 +30,7 @@ do-extract: @${RM} -rf ${WRKSRC}/tmp @${MKDIR} ${WRKSRC}/tmp @cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; + rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; post-patch: @${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \ diff --git a/x11-fonts/linux-f10-fontconfig/distinfo.i386 b/x11-fonts/linux-f10-fontconfig/distinfo.i386 index 63adac849bd2..a4a930434541 100644 --- a/x11-fonts/linux-f10-fontconfig/distinfo.i386 +++ b/x11-fonts/linux-f10-fontconfig/distinfo.i386 @@ -1,2 +1,3 @@ MD5 (rpm/fontconfig-2.2.3-5.i386.rpm) = eb0363e0c829ce9d13ba4e0c68ea8458 +SHA256 (rpm/fontconfig-2.2.3-5.i386.rpm) = 78ba916a75999b008744669e8637ba5a0ca2062340e02b878338d684442149d0 SIZE (rpm/fontconfig-2.2.3-5.i386.rpm) = 118946 diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile index 34827e019c38..b08e06f177c2 100644 --- a/x11-fonts/linux-f8-fontconfig/Makefile +++ b/x11-fonts/linux-f8-fontconfig/Makefile @@ -7,9 +7,10 @@ PORTNAME= fontconfig PORTVERSION= 2.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts linux -MASTER_SITES= ftp://rpmfind.net/linux/fedora/core/3/x86_64/os/Fedora/RPMS/ +MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} +MASTER_SITE_SUBDIR=3/x86_64/os/Fedora/RPMS MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Linux/i386 binary of Fontconfig @@ -21,6 +22,7 @@ USE_REINPLACE= yes BASEVERSION= 9 ONLY_FOR_ARCHS= i386 amd64 RPM_SET= fontconfig-2.2.3-5.i386.rpm +PLIST= ${PKGDIR}/pkg-plist #PKGINSTALL= ${WRKDIR}/pkg-install @@ -28,7 +30,7 @@ do-extract: @${RM} -rf ${WRKSRC}/tmp @${MKDIR} ${WRKSRC}/tmp @cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; + rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; post-patch: @${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \ diff --git a/x11-fonts/linux-f8-fontconfig/distinfo.i386 b/x11-fonts/linux-f8-fontconfig/distinfo.i386 index 63adac849bd2..a4a930434541 100644 --- a/x11-fonts/linux-f8-fontconfig/distinfo.i386 +++ b/x11-fonts/linux-f8-fontconfig/distinfo.i386 @@ -1,2 +1,3 @@ MD5 (rpm/fontconfig-2.2.3-5.i386.rpm) = eb0363e0c829ce9d13ba4e0c68ea8458 +SHA256 (rpm/fontconfig-2.2.3-5.i386.rpm) = 78ba916a75999b008744669e8637ba5a0ca2062340e02b878338d684442149d0 SIZE (rpm/fontconfig-2.2.3-5.i386.rpm) = 118946 diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile index 34827e019c38..b08e06f177c2 100644 --- a/x11-fonts/linux-fontconfig/Makefile +++ b/x11-fonts/linux-fontconfig/Makefile @@ -7,9 +7,10 @@ PORTNAME= fontconfig PORTVERSION= 2.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts linux -MASTER_SITES= ftp://rpmfind.net/linux/fedora/core/3/x86_64/os/Fedora/RPMS/ +MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} +MASTER_SITE_SUBDIR=3/x86_64/os/Fedora/RPMS MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Linux/i386 binary of Fontconfig @@ -21,6 +22,7 @@ USE_REINPLACE= yes BASEVERSION= 9 ONLY_FOR_ARCHS= i386 amd64 RPM_SET= fontconfig-2.2.3-5.i386.rpm +PLIST= ${PKGDIR}/pkg-plist #PKGINSTALL= ${WRKDIR}/pkg-install @@ -28,7 +30,7 @@ do-extract: @${RM} -rf ${WRKSRC}/tmp @${MKDIR} ${WRKSRC}/tmp @cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; + rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; post-patch: @${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \ diff --git a/x11-fonts/linux-fontconfig/distinfo.i386 b/x11-fonts/linux-fontconfig/distinfo.i386 index 63adac849bd2..a4a930434541 100644 --- a/x11-fonts/linux-fontconfig/distinfo.i386 +++ b/x11-fonts/linux-fontconfig/distinfo.i386 @@ -1,2 +1,3 @@ MD5 (rpm/fontconfig-2.2.3-5.i386.rpm) = eb0363e0c829ce9d13ba4e0c68ea8458 +SHA256 (rpm/fontconfig-2.2.3-5.i386.rpm) = 78ba916a75999b008744669e8637ba5a0ca2062340e02b878338d684442149d0 SIZE (rpm/fontconfig-2.2.3-5.i386.rpm) = 118946