39 files changed, 78 insertions, 78 deletions

diff --git a/accessibility/linux-atk/Makefile b/accessibility/linux-atk/Makefile
index 3246e733cb09..8a3790774b9b 100644
--- a/accessibility/linux-atk/Makefile
+++ b/accessibility/linux-atk/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	devel accessibility
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
@@ -25,7 +25,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}
 	${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 3246e733cb09..8a3790774b9b 100644
--- a/accessibility/linux-f10-atk/Makefile
+++ b/accessibility/linux-f10-atk/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	devel accessibility
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
@@ -25,7 +25,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}
 	${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 3246e733cb09..8a3790774b9b 100644
--- a/accessibility/linux-f8-atk/Makefile
+++ b/accessibility/linux-f8-atk/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	devel accessibility
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
@@ -25,7 +25,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}
 	${ECHO_CMD} @dirrm usr/share/doc/atk-1.2.0 >> ${PLIST}
 
diff --git a/devel/linux-atk/Makefile b/devel/linux-atk/Makefile
index 3246e733cb09..8a3790774b9b 100644
--- a/devel/linux-atk/Makefile
+++ b/devel/linux-atk/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	devel accessibility
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
@@ -25,7 +25,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}
 	${ECHO_CMD} @dirrm usr/share/doc/atk-1.2.0 >> ${PLIST}
 
diff --git a/devel/linux-glib2/Makefile b/devel/linux-glib2/Makefile
index b746a08cb67c..f41fa5b6a1cc 100644
--- a/devel/linux-glib2/Makefile
+++ b/devel/linux-glib2/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	devel linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Version 2.X Linux/i386 binary port of GLib
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
@@ -25,7 +25,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} glib | ${SED} -e 's:^:@dirrm :' \
 		>> ${PLIST}
diff --git a/emulators/osf1_base/Makefile b/emulators/osf1_base/Makefile
index e07fa7f43137..a4dc4df9976e 100644
--- a/emulators/osf1_base/Makefile
+++ b/emulators/osf1_base/Makefile
@@ -16,12 +16,12 @@ EXTRACT_SUFX=	.rpm
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	The base set of libraries needed in OSF/1 (Tru64) mode
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 ONLY_FOR_ARCHS=	alpha
 
 PREFIX=			/compat/osf1
-EXTRACT_CMD=		rpm2cpio
+EXTRACT_CMD=		rpm2cpio.pl
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|cpio -idum
 NO_WRKSUBDIR=		yes
diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
index abfa41386c11..4c2ceb6ee800 100644
--- a/emulators/ski/Makefile
+++ b/emulators/ski/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.rpm
 MAINTAINER=	freebsd-ia64@FreeBSD.org
 COMMENT=	HP's Ski IA-64 simulator
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 ONLY_FOR_ARCHS=	i386
 
@@ -24,7 +24,7 @@ NOTICE=		 -- please manually download ${DISTNAME}${EXTRACT_SUFX} from the HP sit
 NO_PACKAGE=	${NOTICE}
 NO_CDROM=	${NOTICE}
 
-EXTRACT_CMD=		rpm2cpio
+EXTRACT_CMD=		rpm2cpio.pl
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|cpio -idum
 NO_WRKSUBDIR=		yes
diff --git a/games/xgammon/Makefile b/games/xgammon/Makefile
index cac3543876d6..4021d4d2e142 100644
--- a/games/xgammon/Makefile
+++ b/games/xgammon/Makefile
@@ -17,7 +17,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	tg@FreeBSD.org
 COMMENT=	A backgammon program for X11
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
@@ -28,7 +28,7 @@ PATCH_FILES=	${PORTNAME}-${PORTVERSION}-dirent.patch
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@rpm2cpio ${_DISTDIR}${DISTFILES} | (cd ${WRKDIR}; cpio -i)
+	@rpm2cpio.pl ${_DISTDIR}${DISTFILES} | (cd ${WRKDIR}; cpio -i)
 	@tar -xzf ${WRKDIR}/${DISTNAME}.tar.gz -C ${WRKDIR}
 
 pre-patch:
diff --git a/japanese/linux-ttfonts/Makefile b/japanese/linux-ttfonts/Makefile
index 1938163fec42..c26b5db80367 100644
--- a/japanese/linux-ttfonts/Makefile
+++ b/japanese/linux-ttfonts/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=		japanese x11-fonts linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Japanese Truetype fonts for use with Linux emulation
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 BASEVERSION=	9
 MD5_FILE=	${MASTERDIR}/distinfo
@@ -23,7 +23,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} ja | ${SED} -e 's:^:@dirrm :' \
 		>> ${PLIST}
diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index a275dbb0c827..89eead493e54 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Intels C/C++ compiler, set up to produce native FreeBSD binaries
 
-EXTRACT_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 RESTRICTED=	Intel forbids any redistribution
 NO_PACKAGE=	${RESTRICTED}
@@ -75,7 +75,7 @@ post-extract:
 #	intel-ecc7-7.1-35.ia64.rpm \
 #	intel-eidb7-7.2.2-72.ia64.rpm \
 #	intel-esubh7-7.1-35.ia64.rpm
-	@cd ${WRKSRC} && rpm2cpio 2>/dev/null ${i} | \
+	@cd ${WRKSRC} && rpm2cpio.pl 2>/dev/null ${i} | \
 		${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet
 .endfor
 
diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile
index a275dbb0c827..89eead493e54 100644
--- a/lang/icc7/Makefile
+++ b/lang/icc7/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Intels C/C++ compiler, set up to produce native FreeBSD binaries
 
-EXTRACT_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 RESTRICTED=	Intel forbids any redistribution
 NO_PACKAGE=	${RESTRICTED}
@@ -75,7 +75,7 @@ post-extract:
 #	intel-ecc7-7.1-35.ia64.rpm \
 #	intel-eidb7-7.2.2-72.ia64.rpm \
 #	intel-esubh7-7.1-35.ia64.rpm
-	@cd ${WRKSRC} && rpm2cpio 2>/dev/null ${i} | \
+	@cd ${WRKSRC} && rpm2cpio.pl 2>/dev/null ${i} | \
 		${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet
 .endfor
 
diff --git a/lang/ifc/Makefile b/lang/ifc/Makefile
index 22ac742f92ea..fe5fb1b265ba 100644
--- a/lang/ifc/Makefile
+++ b/lang/ifc/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Intel's Fortran compiler, set up to produce native FreeBSD objects
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 RESTRICTED=	Intel forbids any redistribution
 NO_PACKAGE=	${RESTRICTED}
@@ -67,7 +67,7 @@ post-extract:
 #	intel-iidb7-7.2.2-64.i386.rpm \
 #	intel-efc7-7.1-34.ia64.rpm \
 #	intel-eidb7-7.2.2-64.ia64.rpm
-	@cd ${WRKSRC} ; rpm2cpio 2>/dev/null ${i} | \
+	@cd ${WRKSRC} ; rpm2cpio.pl 2>/dev/null ${i} | \
 		${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet
 .endfor
 
diff --git a/lang/ifc7/Makefile b/lang/ifc7/Makefile
index 22ac742f92ea..fe5fb1b265ba 100644
--- a/lang/ifc7/Makefile
+++ b/lang/ifc7/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Intel's Fortran compiler, set up to produce native FreeBSD objects
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 RESTRICTED=	Intel forbids any redistribution
 NO_PACKAGE=	${RESTRICTED}
@@ -67,7 +67,7 @@ post-extract:
 #	intel-iidb7-7.2.2-64.i386.rpm \
 #	intel-efc7-7.1-34.ia64.rpm \
 #	intel-eidb7-7.2.2-64.ia64.rpm
-	@cd ${WRKSRC} ; rpm2cpio 2>/dev/null ${i} | \
+	@cd ${WRKSRC} ; rpm2cpio.pl 2>/dev/null ${i} | \
 		${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet
 .endfor
 
diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index bca90913c39f..6b784b7d83af 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	${UPDATEDIST}
 MAINTAINER=	vns@delta.odessa.ua
 COMMENT=	Linux RealPlayer 8.0 from RealNetworks
 
-EXTRACT_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
 		${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound
 
@@ -49,7 +49,7 @@ NO_CDROM=	"Redistribution not allowed"
 NO_BUILD=	yes
 
 post-extract:
-	cd ${WRKDIR}; rpm2cpio ${DISTDIR}/${MAINDIST} | cpio -id --quiet
+	cd ${WRKDIR}; rpm2cpio.pl ${DISTDIR}/${MAINDIST} | cpio -id --quiet
 
 post-patch:
 	${REINPLACE_CMD} -e \
diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile
index 2145712618a7..96ef27f07b04 100644
--- a/print/bjfiltercom/Makefile
+++ b/print/bjfiltercom/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY=	${RPMFILE}
 MAINTAINER=	taoka@FreeBSD.org
 COMMENT?=	Canon Bubble Jet Print Filter for Linux -- Common files
 
-BUILD_DEPENDS=  rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=  rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 .if defined(SLAVE_PORT)
 RUN_DEPENDS=	stsmon:${PORTSDIR}/print/bjfiltercom \
 		pstops:${PORTSDIR}/print/psutils-${PAPERSIZE}
@@ -34,7 +34,7 @@ RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
 BIN_FILES=	bjcmd  bjfilter  bjprn  lgmon  printui  stsmon
 .endif
 
-EXTRACT_CMD=	rpm2cpio
+EXTRACT_CMD=	rpm2cpio.pl
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	| cpio -id --quiet
 
diff --git a/sysutils/tmpwatch/Makefile b/sysutils/tmpwatch/Makefile
index 9a19f8b08b78..78ab572fb0dd 100644
--- a/sysutils/tmpwatch/Makefile
+++ b/sysutils/tmpwatch/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	-2.src.rpm
 MAINTAINER=	markp@FreeBSD.org
 COMMENT=	A utility for removing files based on when they were last accessed
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
@@ -27,7 +27,7 @@ MAN8=		tmpwatch.8
 do-extract:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
-		${LOCALBASE}/bin/rpm2cpio ${DISTDIR}/${DISTFILES} | \
+		${LOCALBASE}/bin/rpm2cpio.pl ${DISTDIR}/${DISTFILES} | \
 		${CPIO} -iud
 	cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${WRKDIR}/${DISTNAME}.tar.gz ${EXTRACT_AFTER_ARGS}
diff --git a/textproc/linux-expat/Makefile b/textproc/linux-expat/Makefile
index e382fccedddd..5839590defbf 100644
--- a/textproc/linux-expat/Makefile
+++ b/textproc/linux-expat/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	textproc linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 
-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 -div; \
+		rpm2cpio.pl < ${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 e382fccedddd..5839590defbf 100644
--- a/textproc/linux-f10-expat/Makefile
+++ b/textproc/linux-f10-expat/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	textproc linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 
-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 -div; \
+		rpm2cpio.pl < ${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 e382fccedddd..5839590defbf 100644
--- a/textproc/linux-f8-expat/Makefile
+++ b/textproc/linux-f8-expat/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	textproc linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 
-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 -div; \
+		rpm2cpio.pl < ${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/vietnamese/vi2vn/Makefile b/vietnamese/vi2vn/Makefile
index 0a9e0b910562..31367a414466 100644
--- a/vietnamese/vi2vn/Makefile
+++ b/vietnamese/vi2vn/Makefile
@@ -18,9 +18,9 @@ COMMENT=	Perl script to convert VIQR encoding to other Vietnamese encodings.
 
 PORTCOMMENT=	Converts Vietnamese VIQR text into troff format
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
-EXTRACT_CMD=		rpm2cpio
+EXTRACT_CMD=		rpm2cpio.pl
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|cpio -idum
 WRKSRC=		${WRKDIR}/${PORTNAME}
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
diff --git a/x11-themes/gnome-industrial-theme/Makefile b/x11-themes/gnome-industrial-theme/Makefile
index 592b079a155c..240a49ad7696 100644
--- a/x11-themes/gnome-industrial-theme/Makefile
+++ b/x11-themes/gnome-industrial-theme/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=   .rpm
 MAINTAINER=	stoerte@dreamwarrior.net
 COMMENT=	Slick GNOME2 theme from Ximian
 
-EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 BUILD_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras
 RUN_DEPENDS=    ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras
 
@@ -68,7 +68,7 @@ pre-everything::
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\
+	@if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\
 		| cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null \
 		&& ${GZIP_CMD} -dc ximian-artwork-${PORTVERSION}.tar.gz \
 		| ${TAR} -xf - && ${RM} ximian-artwork-${PORTVERSION}.tar.gz);\
diff --git a/x11-themes/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile
index 0b58b28473f8..59df0fde7a2a 100644
--- a/x11-themes/gtk-bluecurve-theme/Makefile
+++ b/x11-themes/gtk-bluecurve-theme/Makefile
@@ -15,7 +15,7 @@ DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 MAINTAINER=	rzheka@users.sourceforge.net
 COMMENT=	Bluecurve unified-look theme for GTK1 and GTK2 from RedHat 8.0
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 WRKSRC= 	${WRKDIR}/redhat-artwork-${PORTVERSION}
 USE_GMAKE=	yes
@@ -46,7 +46,7 @@ pre-everything::
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\
+	@if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\
 		then \
 			exit 1; \
 		fi
diff --git a/x11-themes/gtk-industrial-theme/Makefile b/x11-themes/gtk-industrial-theme/Makefile
index 6209105c7a65..f072957f555e 100644
--- a/x11-themes/gtk-industrial-theme/Makefile
+++ b/x11-themes/gtk-industrial-theme/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=   .rpm
 MAINTAINER=	stoerte@dreamwarrior.net
 COMMENT=	Slick theme for GTK1 from Ximian
 
-EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 WRKSRC=		${WRKDIR}/ximian-artwork-${PORTVERSION}
 USE_GMAKE=	yes
@@ -31,7 +31,7 @@ XIMIAN_DISTVERSION=	6.2
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\
+	@if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\
 		| cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null \
 		&& ${GZIP_CMD} -dc ximian-artwork-${PORTVERSION}.tar.gz \
 		| tar -xf - && ${RM} ximian-artwork-${PORTVERSION}.tar.gz);\
diff --git a/x11-themes/qt-bluecurve-theme/Makefile b/x11-themes/qt-bluecurve-theme/Makefile
index a94dcd776712..bfcb54a025f2 100644
--- a/x11-themes/qt-bluecurve-theme/Makefile
+++ b/x11-themes/qt-bluecurve-theme/Makefile
@@ -15,7 +15,7 @@ DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 MAINTAINER=	rzheka@users.sourceforge.net
 COMMENT=	Bluecurve unified-look theme for QT3 from RedHat 8.0
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 WRKSRC= 	${WRKDIR}/redhat-artwork-${PORTVERSION}
 USE_LIBTOOL=	yes
@@ -32,7 +32,7 @@ THEMES_SUBDIRS =	${WRKSRC}/art/qt/Bluecurve
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\
+	@if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\
 		then \
 			exit 1; \
 		fi
diff --git a/x11-toolkits/gnome-industrial-theme/Makefile b/x11-toolkits/gnome-industrial-theme/Makefile
index 592b079a155c..240a49ad7696 100644
--- a/x11-toolkits/gnome-industrial-theme/Makefile
+++ b/x11-toolkits/gnome-industrial-theme/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=   .rpm
 MAINTAINER=	stoerte@dreamwarrior.net
 COMMENT=	Slick GNOME2 theme from Ximian
 
-EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 BUILD_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras
 RUN_DEPENDS=    ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras
 
@@ -68,7 +68,7 @@ pre-everything::
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\
+	@if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\
 		| cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null \
 		&& ${GZIP_CMD} -dc ximian-artwork-${PORTVERSION}.tar.gz \
 		| ${TAR} -xf - && ${RM} ximian-artwork-${PORTVERSION}.tar.gz);\
diff --git a/x11-toolkits/gtk-bluecurve-theme/Makefile b/x11-toolkits/gtk-bluecurve-theme/Makefile
index 0b58b28473f8..59df0fde7a2a 100644
--- a/x11-toolkits/gtk-bluecurve-theme/Makefile
+++ b/x11-toolkits/gtk-bluecurve-theme/Makefile
@@ -15,7 +15,7 @@ DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 MAINTAINER=	rzheka@users.sourceforge.net
 COMMENT=	Bluecurve unified-look theme for GTK1 and GTK2 from RedHat 8.0
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 WRKSRC= 	${WRKDIR}/redhat-artwork-${PORTVERSION}
 USE_GMAKE=	yes
@@ -46,7 +46,7 @@ pre-everything::
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\
+	@if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\
 		then \
 			exit 1; \
 		fi
diff --git a/x11-toolkits/gtk-industrial-theme/Makefile b/x11-toolkits/gtk-industrial-theme/Makefile
index 6209105c7a65..f072957f555e 100644
--- a/x11-toolkits/gtk-industrial-theme/Makefile
+++ b/x11-toolkits/gtk-industrial-theme/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=   .rpm
 MAINTAINER=	stoerte@dreamwarrior.net
 COMMENT=	Slick theme for GTK1 from Ximian
 
-EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 WRKSRC=		${WRKDIR}/ximian-artwork-${PORTVERSION}
 USE_GMAKE=	yes
@@ -31,7 +31,7 @@ XIMIAN_DISTVERSION=	6.2
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\
+	@if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\
 		| cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null \
 		&& ${GZIP_CMD} -dc ximian-artwork-${PORTVERSION}.tar.gz \
 		| tar -xf - && ${RM} ximian-artwork-${PORTVERSION}.tar.gz);\
diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index f615ee4fc2d3..76a1d9355224 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X, i386 Linux binary
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
@@ -29,7 +29,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 'locale|gtk|themes' | \
 		${SED} -e 's:^:@dirrm :' >> ${PLIST}
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index d1573514ca31..80f22ee2efc5 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Linux/i386 pango binary
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio \
 	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 
 BASEVERSION=	9
@@ -27,7 +27,7 @@ pre-install:
 	${ECHO_CMD} etc/pango/pango.modules > ${PLIST}
 	${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} pango | \
 		${SED} -e 's:^:@dirrm :' >> ${PLIST}
diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile
index f615ee4fc2d3..76a1d9355224 100644
--- a/x11-toolkits/linux-f8-gtk2/Makefile
+++ b/x11-toolkits/linux-f8-gtk2/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X, i386 Linux binary
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
@@ -29,7 +29,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 'locale|gtk|themes' | \
 		${SED} -e 's:^:@dirrm :' >> ${PLIST}
diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile
index d1573514ca31..80f22ee2efc5 100644
--- a/x11-toolkits/linux-f8-pango/Makefile
+++ b/x11-toolkits/linux-f8-pango/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Linux/i386 pango binary
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio \
 	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 
 BASEVERSION=	9
@@ -27,7 +27,7 @@ pre-install:
 	${ECHO_CMD} etc/pango/pango.modules > ${PLIST}
 	${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} pango | \
 		${SED} -e 's:^:@dirrm :' >> ${PLIST}
diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile
index f615ee4fc2d3..76a1d9355224 100644
--- a/x11-toolkits/linux-gtk2/Makefile
+++ b/x11-toolkits/linux-gtk2/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X, i386 Linux binary
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
@@ -29,7 +29,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 'locale|gtk|themes' | \
 		${SED} -e 's:^:@dirrm :' >> ${PLIST}
diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile
index d1573514ca31..80f22ee2efc5 100644
--- a/x11-toolkits/linux-pango/Makefile
+++ b/x11-toolkits/linux-pango/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Linux/i386 pango binary
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio \
 	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 
 BASEVERSION=	9
@@ -27,7 +27,7 @@ pre-install:
 	${ECHO_CMD} etc/pango/pango.modules > ${PLIST}
 	${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} pango | \
 		${SED} -e 's:^:@dirrm :' >> ${PLIST}
diff --git a/x11-toolkits/qt-bluecurve-theme/Makefile b/x11-toolkits/qt-bluecurve-theme/Makefile
index a94dcd776712..bfcb54a025f2 100644
--- a/x11-toolkits/qt-bluecurve-theme/Makefile
+++ b/x11-toolkits/qt-bluecurve-theme/Makefile
@@ -15,7 +15,7 @@ DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 MAINTAINER=	rzheka@users.sourceforge.net
 COMMENT=	Bluecurve unified-look theme for QT3 from RedHat 8.0
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 WRKSRC= 	${WRKDIR}/redhat-artwork-${PORTVERSION}
 USE_LIBTOOL=	yes
@@ -32,7 +32,7 @@ THEMES_SUBDIRS =	${WRKSRC}/art/qt/Bluecurve
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\
+	@if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\
 		then \
 			exit 1; \
 		fi