12 files changed, 14 insertions, 18 deletions

diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index d9a09a590c5f..5e638969fe00 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -44,8 +44,6 @@ INSTALLS_SHLIB=	yes
 
 .include "${.CURDIR}/maninfo.mk"
 
-CPIO?=	/usr/bin/cpio
-
 post-configure:
 	${REINPLACE_CMD} -e 's|^DOCUMENT_DIR.*$$|DOCUMENT_DIR=${DOCSDIR}|' \
 		-e 's|^CDKSHLIB.*$$|CDKSHLIB=$$(SONAME)|' \
diff --git a/devel/cil/Makefile b/devel/cil/Makefile
index 9ca90a6afdbe..69a161f866c1 100644
--- a/devel/cil/Makefile
+++ b/devel/cil/Makefile
@@ -25,8 +25,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
-CPIO?=		/usr/bin/cpio
-
 BINFILES=	cilly patcher teetwo
 LIBFILES=	Cilly.pm KeptFile.pm OutputFile.pm TempFile.pm
 EXECFILES=	cilly.byte.exe machdep.exe
diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile
index 3048ddcc1b42..f1142d5b2a77 100644
--- a/devel/cscout/Makefile
+++ b/devel/cscout/Makefile
@@ -22,8 +22,6 @@ USE_REINPLACE=	yes
 
 MAN1=	cscout.1 cswc.1
 
-CPIO=		/usr/bin/cpio
-
 post-patch:
 .if exists(/usr/include/g++/)
 	${REINPLACE_CMD} -i "" -e 's:g++-3:g++:g' \
diff --git a/devel/hs-uni/Makefile b/devel/hs-uni/Makefile
index b9b397d3454c..110b0306a9dd 100644
--- a/devel/hs-uni/Makefile
+++ b/devel/hs-uni/Makefile
@@ -61,7 +61,7 @@ do-install:
 		@cd ${WRKSRC} && ${GMAKE} prepareexports
 		@cd ${WRKSRC} && ${GMAKE} -s --no-print-directory exportnames | \
 		   ${SED} 'y/ /\n/; /^$$/d ; s+${PORTNAME}/++g' | \
-		   cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/uni
+		   ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/uni
 
 		@cd ${PREFIX}/lib/uni && ${FIND} . -type d -print0 | \
 			${XARGS} -0 ${CHMOD} 755 # ugly, but necessary
diff --git a/devel/invitation_to_ruby/Makefile b/devel/invitation_to_ruby/Makefile
index 0864e20ed515..d52c90535811 100644
--- a/devel/invitation_to_ruby/Makefile
+++ b/devel/invitation_to_ruby/Makefile
@@ -28,8 +28,6 @@ NO_BUILD=	yes
 
 PLIST=		${WRKDIR}/plist
 
-CPIO?=		/usr/bin/cpio
-
 .include <bsd.port.pre.mk>
 
 pre-install:
diff --git a/devel/linux-glib2/Makefile b/devel/linux-glib2/Makefile
index f41fa5b6a1cc..9d49e28c4f46 100644
--- a/devel/linux-glib2/Makefile
+++ b/devel/linux-glib2/Makefile
@@ -25,8 +25,8 @@ pre-install:
 	${RM} -rf ${WRKSRC}/tmp
 	${MKDIR} ${WRKSRC}/tmp
 	cd ${WRKSRC}/tmp; \
-		rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \
-		${FIND} * -type f -o -type l > ${PLIST}; \
+		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/devel/linux_devtools/Makefile b/devel/linux_devtools/Makefile
index 09d2d459c2b2..6ce706f156d0 100644
--- a/devel/linux_devtools/Makefile
+++ b/devel/linux_devtools/Makefile
@@ -68,7 +68,8 @@ pre-install:
 	${RM} -rf ${WRKSRC}/tmp
 	${MKDIR} ${WRKSRC}/tmp
 .for ii in ${DISTFILES} ${PATCHFILES}
-	cd ${WRKSRC}/tmp; rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${ii} | cpio -id
+	cd ${WRKSRC}/tmp; rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${ii} | \
+		${CPIO} -id
 .endfor
 	cd ${WRKSRC}/tmp; ${FIND} * -type f -o -type l > ${PLIST}; \
 		${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :'>> ${PLIST}
diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index 868fd8950ed0..a023a5982c8f 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -22,7 +22,7 @@ PLIST_SUB=	DIR=${DIR}
 
 do-install:
 	@cd ${WRKSRC} && ${FIND} . \! -name '*.bat' \! -name repository \
-		| cpio -pduv -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${DIR}
+		| ${CPIO} -pduv -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${DIR}
 	${CHMOD} -R ${LIBMODE} ${PREFIX}/${DIR}
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/${DIR}/bin
 	${CHMOD} -R ${BINMODE} ${PREFIX}/${DIR}/bin
diff --git a/devel/ruby-jttui/Makefile b/devel/ruby-jttui/Makefile
index 02610cd24047..51137f14404d 100644
--- a/devel/ruby-jttui/Makefile
+++ b/devel/ruby-jttui/Makefile
@@ -28,7 +28,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DESTDIR}${RUBY_MODDOCDIR}
 	cd ${WRKSRC}/doc; \
-	${FIND} . | cpio -pdmv ${DESTDIR}${RUBY_MODDOCDIR}
+	${FIND} . | ${CPIO} -pdmv ${DESTDIR}${RUBY_MODDOCDIR}
 	${CHMOD} -R ugo+rX,ugo-w ${DESTDIR}${RUBY_MODDOCDIR}
 	${MKDIR} ${DESTDIR}${RUBY_MODEXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${DESTDIR}${RUBY_MODEXAMPLESDIR}
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 3d920e92dfe6..d1d7aa689862 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.src.unix.cpio
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	The Safe/Fast I/O Library
 
-EXTRACT_CMD=	cpio
+EXTRACT_CMD=	${CPIO}
 EXTRACT_BEFORE_ARGS=	-idF
 EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
diff --git a/devel/trio/Makefile b/devel/trio/Makefile
index 2215f9724825..dc3bf037ac04 100644
--- a/devel/trio/Makefile
+++ b/devel/trio/Makefile
@@ -25,7 +25,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${FIND} doc html | \
-		cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/wxGlade/Makefile b/devel/wxGlade/Makefile
index 7c4e83d90a49..87d2337f8bec 100644
--- a/devel/wxGlade/Makefile
+++ b/devel/wxGlade/Makefile
@@ -21,14 +21,17 @@ NO_BUILD=	yes
 
 do-install:
 	@${MKDIR} ${PYTHON_SITELIBDIR}/${PORTNAME}
-	(cd ${WRKSRC} && ${FIND} [^d]* \! -name ".cvsignore" -type f | cpio -R ${SHAREOWN}:${SHAREGRP} -pdum ${PYTHON_SITELIBDIR}/${PORTNAME})
+	(cd ${WRKSRC} && ${FIND} [^d]* \! -name ".cvsignore" -type f | \
+		${CPIO} -R ${SHAREOWN}:${SHAREGRP} -pdum \
+		${PYTHON_SITELIBDIR}/${PORTNAME})
 	${CHMOD} -R 644 ${PYTHON_SITELIBDIR}/${PORTNAME}
 	${FIND} ${PYTHON_SITELIBDIR}/${PORTNAME} -type d | ${XARGS} ${CHMOD} 755
 	${CHMOD} 755 ${PYTHON_SITELIBDIR}/${PORTNAME}/wxglade.py \
 		${PYTHON_SITELIBDIR}/${PORTNAME}/xrc2wxg.py
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${FIND} . -type f | cpio -R ${SHAREOWN}:${SHAREGRP} -pdum ${DOCSDIR})
+	(cd ${WRKSRC}/docs && ${FIND} . -type f | \
+		${CPIO} -R ${SHAREOWN}:${SHAREGRP} -pdum ${DOCSDIR})
 	${CHMOD} -R 644 ${DOCSDIR}
 	${FIND} ${DOCSDIR} -type d | ${XARGS} ${CHMOD} 755
 .endif