diff options
author | Trevor Johnson <trevor@FreeBSD.org> | 2004-01-31 16:57:18 +0000 |
---|---|---|
committer | Trevor Johnson <trevor@FreeBSD.org> | 2004-01-31 16:57:18 +0000 |
commit | 2a9911b9a642146579976a622bfaa1ae603f4abd (patch) | |
tree | ed85e618ac9b054acedf2bbbdbd03e249be3d460 /x11-fonts | |
parent | - Update to 3.6.b (diff) |
patch from
<URL:http://people.freebsd.org/~trevor/ports/freeze-5.2/linux-misc-depends.diff>
to fix dependencies: these ports need ports/archivers/rpm for their
do-install, so they can can use the rpm2cpio that accompanies it
Reviewed by: silence (two months) from portmgr and freebsd-ports-bugs
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 |
4 files changed, 4 insertions, 12 deletions
diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile index eb247d7f9d70..5fa3225ac9e8 100644 --- a/x11-fonts/linux-f10-fontconfig/Makefile +++ b/x11-fonts/linux-f10-fontconfig/Makefile @@ -13,8 +13,6 @@ CATEGORIES= x11-fonts linux MAINTAINER= trevor@FreeBSD.org COMMENT= Linux/i386 binary of Fontconfig -BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio - BASEVERSION= 9 ONLY_FOR_ARCHS= i386 PLIST= ${WRKDIR}/plist @@ -24,7 +22,7 @@ pre-install: ${RM} -rf ${WRKSRC}/tmp ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio < ${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 eb247d7f9d70..5fa3225ac9e8 100644 --- a/x11-fonts/linux-f8-fontconfig/Makefile +++ b/x11-fonts/linux-f8-fontconfig/Makefile @@ -13,8 +13,6 @@ CATEGORIES= x11-fonts linux MAINTAINER= trevor@FreeBSD.org COMMENT= Linux/i386 binary of Fontconfig -BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio - BASEVERSION= 9 ONLY_FOR_ARCHS= i386 PLIST= ${WRKDIR}/plist @@ -24,7 +22,7 @@ pre-install: ${RM} -rf ${WRKSRC}/tmp ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio < ${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 eb247d7f9d70..5fa3225ac9e8 100644 --- a/x11-fonts/linux-fontconfig/Makefile +++ b/x11-fonts/linux-fontconfig/Makefile @@ -13,8 +13,6 @@ CATEGORIES= x11-fonts linux MAINTAINER= trevor@FreeBSD.org COMMENT= Linux/i386 binary of Fontconfig -BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio - BASEVERSION= 9 ONLY_FOR_ARCHS= i386 PLIST= ${WRKDIR}/plist @@ -24,7 +22,7 @@ pre-install: ${RM} -rf ${WRKSRC}/tmp ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio < ${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 b08298f44ff1..3e5a6f84d949 100644 --- a/x11-fonts/linux-urw-fonts/Makefile +++ b/x11-fonts/linux-urw-fonts/Makefile @@ -13,8 +13,6 @@ CATEGORIES= x11-fonts linux MAINTAINER= trevor@FreeBSD.org COMMENT= Truetype fonts for use with Linux programs -BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio - BASEVERSION= 9 MD5_FILE= ${MASTERDIR}/distinfo PLIST= ${WRKDIR}/plist @@ -24,7 +22,7 @@ pre-install: ${RM} -rf ${WRKSRC}/tmp ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio < ${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} |