diff options
| author | netchild <netchild@FreeBSD.org> | 2003-12-12 21:43:05 +0800 |
|---|---|---|
| committer | netchild <netchild@FreeBSD.org> | 2003-12-12 21:43:05 +0800 |
| commit | 7e4108d2e8dcc99218792ea72bc5f3686d7b79d1 (patch) | |
| tree | 93fb7fd37e3d0028f80a950ce0dc03af626eacf4 /x11-fonts | |
| parent | 0f604e9895401d15bc27421aa834b564241d2025 (diff) | |
| download | freebsd-ports-gnome-7e4108d2e8dcc99218792ea72bc5f3686d7b79d1.tar.gz freebsd-ports-gnome-7e4108d2e8dcc99218792ea72bc5f3686d7b79d1.tar.zst freebsd-ports-gnome-7e4108d2e8dcc99218792ea72bc5f3686d7b79d1.zip | |
s/rpm2cpio/rpm2cpio.pl/ after the recent update of archivers/rpm2cpio (the
script was renamed to solve a conflict with archivers/rpm) to fix possible
build problems.
I've tested this with lang/icc. Any new errors because of this commit in
one of the modified ports may be because the ports previously may have used
rpm2cpio from archivers/rpm instead of the used {EXTRACT,BUILD}_DEPENDS
archivers/rpm2cpio.
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/linux-f10-fontconfig/Makefile | 4 | ||||
| -rw-r--r-- | x11-fonts/linux-f8-fontconfig/Makefile | 4 | ||||
| -rw-r--r-- | x11-fonts/linux-fontconfig/Makefile | 4 | ||||
| -rw-r--r-- | x11-fonts/linux-urw-fonts/Makefile | 4 | ||||
| -rw-r--r-- | x11-fonts/sgifonts/Makefile | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile index 66a10fd364a5..eb247d7f9d70 100644 --- a/x11-fonts/linux-f10-fontconfig/Makefile +++ b/x11-fonts/linux-f10-fontconfig/Makefile @@ -13,7 +13,7 @@ CATEGORIES= x11-fonts linux MAINTAINER= trevor@FreeBSD.org COMMENT= Linux/i386 binary of Fontconfig -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio BASEVERSION= 9 ONLY_FOR_ARCHS= i386 @@ -24,7 +24,7 @@ pre-install: ${RM} -rf ${WRKSRC}/tmp ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l > ${PLIST}; \ ${FIND} -d * -type d | ${GREP} font | \ ${SED} -e 's:^:@dirrm :' >> ${PLIST} diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile index 66a10fd364a5..eb247d7f9d70 100644 --- a/x11-fonts/linux-f8-fontconfig/Makefile +++ b/x11-fonts/linux-f8-fontconfig/Makefile @@ -13,7 +13,7 @@ CATEGORIES= x11-fonts linux MAINTAINER= trevor@FreeBSD.org COMMENT= Linux/i386 binary of Fontconfig -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio BASEVERSION= 9 ONLY_FOR_ARCHS= i386 @@ -24,7 +24,7 @@ pre-install: ${RM} -rf ${WRKSRC}/tmp ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l > ${PLIST}; \ ${FIND} -d * -type d | ${GREP} font | \ ${SED} -e 's:^:@dirrm :' >> ${PLIST} diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile index 66a10fd364a5..eb247d7f9d70 100644 --- a/x11-fonts/linux-fontconfig/Makefile +++ b/x11-fonts/linux-fontconfig/Makefile @@ -13,7 +13,7 @@ CATEGORIES= x11-fonts linux MAINTAINER= trevor@FreeBSD.org COMMENT= Linux/i386 binary of Fontconfig -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio BASEVERSION= 9 ONLY_FOR_ARCHS= i386 @@ -24,7 +24,7 @@ pre-install: ${RM} -rf ${WRKSRC}/tmp ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l > ${PLIST}; \ ${FIND} -d * -type d | ${GREP} font | \ ${SED} -e 's:^:@dirrm :' >> ${PLIST} diff --git a/x11-fonts/linux-urw-fonts/Makefile b/x11-fonts/linux-urw-fonts/Makefile index 9154381d356d..b08298f44ff1 100644 --- a/x11-fonts/linux-urw-fonts/Makefile +++ b/x11-fonts/linux-urw-fonts/Makefile @@ -13,7 +13,7 @@ CATEGORIES= x11-fonts linux MAINTAINER= trevor@FreeBSD.org COMMENT= Truetype fonts for use with Linux programs -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio BASEVERSION= 9 MD5_FILE= ${MASTERDIR}/distinfo @@ -24,7 +24,7 @@ pre-install: ${RM} -rf ${WRKSRC}/tmp ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l > ${PLIST}; \ ${FIND} -d * -type d | ${GREP} -E 'urw|default' | \ ${SED} -e 's:^:@dirrm :' >> ${PLIST} diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile index b75d50ba66a2..71e2f63379d3 100644 --- a/x11-fonts/sgifonts/Makefile +++ b/x11-fonts/sgifonts/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .rpm MAINTAINER= trevor@FreeBSD.org COMMENT= Fonts from the SGI ProPack 1.4 for Linux -EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients PLIST= ${WRKDIR}/pkg-plist @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/sgi-fonts do-extract: @${MKDIR} ${WRKDIR} - @cd ${WRKDIR}; rpm2cpio ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} \ + @cd ${WRKDIR}; rpm2cpio.pl ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} \ | cpio --extract --no-preserve-owner \ --preserve-modification-time --unconditional --quiet @${TAR} -C ${WRKDIR} -xf ${WRKDIR}/sgi-fonts.tar.gz |