12 files changed, 15 insertions, 33 deletions

diff --git a/accessibility/linux-atk/Makefile b/accessibility/linux-atk/Makefile
index 0a984c9793b0..c20db579cd86 100644
--- a/accessibility/linux-atk/Makefile
+++ b/accessibility/linux-atk/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	accessibility
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
@@ -25,7 +25,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}
 	${ECHO_CMD} @dirrm usr/share/doc/atk-1.2.0 >> ${PLIST}
 
diff --git a/accessibility/linux-f10-atk/Makefile b/accessibility/linux-f10-atk/Makefile
index 0a984c9793b0..c20db579cd86 100644
--- a/accessibility/linux-f10-atk/Makefile
+++ b/accessibility/linux-f10-atk/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	accessibility
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
@@ -25,7 +25,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}
 	${ECHO_CMD} @dirrm usr/share/doc/atk-1.2.0 >> ${PLIST}
 
diff --git a/accessibility/linux-f8-atk/Makefile b/accessibility/linux-f8-atk/Makefile
index 0a984c9793b0..c20db579cd86 100644
--- a/accessibility/linux-f8-atk/Makefile
+++ b/accessibility/linux-f8-atk/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	accessibility
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
@@ -25,7 +25,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}
 	${ECHO_CMD} @dirrm usr/share/doc/atk-1.2.0 >> ${PLIST}
 
diff --git a/devel/linux-glib2/Makefile b/devel/linux-glib2/Makefile
index 9d49e28c4f46..acde76e543f6 100644
--- a/devel/linux-glib2/Makefile
+++ b/devel/linux-glib2/Makefile
@@ -13,8 +13,6 @@ CATEGORIES=	devel linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Version 2.X Linux/i386 binary port of GLib
 
-BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
 PLIST=		${WRKDIR}/plist
@@ -25,7 +23,7 @@ pre-install:
 	${RM} -rf ${WRKSRC}/tmp
 	${MKDIR} ${WRKSRC}/tmp
 	cd ${WRKSRC}/tmp; \
-		rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | \
+		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | \
 		${CPIO} -id; ${FIND} * -type f -o -type l > ${PLIST}; \
 		${FIND} -d * -type d | ${GREP} glib | ${SED} -e 's:^:@dirrm :' \
 		>> ${PLIST}
diff --git a/japanese/linux-ttfonts/Makefile b/japanese/linux-ttfonts/Makefile
index c26b5db80367..55342a7d3ac5 100644
--- a/japanese/linux-ttfonts/Makefile
+++ b/japanese/linux-ttfonts/Makefile
@@ -12,8 +12,6 @@ CATEGORIES=		japanese x11-fonts linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Japanese Truetype fonts for use with Linux emulation
 
-BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-
 BASEVERSION=	9
 MD5_FILE=	${MASTERDIR}/distinfo
 PLIST=		${WRKDIR}/plist
@@ -23,7 +21,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} ja | ${SED} -e 's:^:@dirrm :' \
 		>> ${PLIST}
diff --git a/textproc/linux-expat/Makefile b/textproc/linux-expat/Makefile
index 5839590defbf..ddbe15639413 100644
--- a/textproc/linux-expat/Makefile
+++ b/textproc/linux-expat/Makefile
@@ -13,8 +13,6 @@ CATEGORIES=	textproc linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 
-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 -div; \
+		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -div; \
 		${FIND} * -type f -o -type l > ${PLIST}
 	${ECHO_CMD} @dirrm usr/share/doc/expat-1.95.5 >> ${PLIST}
 
diff --git a/textproc/linux-f10-expat/Makefile b/textproc/linux-f10-expat/Makefile
index 5839590defbf..ddbe15639413 100644
--- a/textproc/linux-f10-expat/Makefile
+++ b/textproc/linux-f10-expat/Makefile
@@ -13,8 +13,6 @@ CATEGORIES=	textproc linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 
-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 -div; \
+		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -div; \
 		${FIND} * -type f -o -type l > ${PLIST}
 	${ECHO_CMD} @dirrm usr/share/doc/expat-1.95.5 >> ${PLIST}
 
diff --git a/textproc/linux-f8-expat/Makefile b/textproc/linux-f8-expat/Makefile
index 5839590defbf..ddbe15639413 100644
--- a/textproc/linux-f8-expat/Makefile
+++ b/textproc/linux-f8-expat/Makefile
@@ -13,8 +13,6 @@ CATEGORIES=	textproc linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 
-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 -div; \
+		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -div; \
 		${FIND} * -type f -o -type l > ${PLIST}
 	${ECHO_CMD} @dirrm usr/share/doc/expat-1.95.5 >> ${PLIST}
 
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}