diff options
112 files changed, 89 insertions, 159 deletions
diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile index fcdd724b5597..c17739a5a7e5 100644 --- a/audio/gnump3d/Makefile +++ b/audio/gnump3d/Makefile @@ -52,10 +52,10 @@ do-install: .endfor ${MKDIR} ${PERL_SITELIBDIR} cd ${WRKSRC}/lib && ${FIND} . | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PERL_SITELIBDIR} + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PERL_SITELIBDIR} ${MKDIR} ${DATADIR} cd ${WRKSRC}/templates && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} ${MKDIR} ${CONFDIR} ${INSTALL_DATA} ${WRKSRC}/etc/mime.types ${CONFDIR} ${INSTALL_DATA} ${WRKSRC}/etc/gnump3d.conf \ diff --git a/audio/mbrolavox/Makefile b/audio/mbrolavox/Makefile index 6b5d531a3fe0..c6602e0ba380 100644 --- a/audio/mbrolavox/Makefile +++ b/audio/mbrolavox/Makefile @@ -67,7 +67,7 @@ pre-install: do-install: @${MKDIR} ${DATADIR} - @cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${DATADIR} + @cd ${WRKSRC} && ${FIND} * | ${CPIO} -dlmp ${DATADIR} @${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 .include <bsd.port.post.mk> diff --git a/biology/t_coffee/Makefile b/biology/t_coffee/Makefile index 3dc443618b77..d7ab609160bf 100644 --- a/biology/t_coffee/Makefile +++ b/biology/t_coffee/Makefile @@ -47,7 +47,7 @@ post-install: @ ${MKDIR} ${EXAMPLESDIR} @ ${RMDIR} ${WRKSRC}/example/aln 2>/dev/null || ${TRUE} @ cd ${WRKSRC}/example && ${FIND} * \ - | cpio --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} + | ${CPIO} --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} @ ${SED} -e 's#%%DATADIR%%#${DATADIR}#' ${.CURDIR}/pkg-message \ > ${PKGMESSAGE} .if !defined(BATCH) diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile index 29cba1ef2d57..3c65668d1e15 100644 --- a/cad/gerbv/Makefile +++ b/cad/gerbv/Makefile @@ -34,10 +34,10 @@ post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC}/doc && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC}/example && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} .endif .include <bsd.port.mk> diff --git a/databases/pydbdesigner/Makefile b/databases/pydbdesigner/Makefile index 97e147965f9a..5a4ba45e8e05 100644 --- a/databases/pydbdesigner/Makefile +++ b/databases/pydbdesigner/Makefile @@ -31,8 +31,6 @@ MY_SITELIBSUBDIR= ${PYTHON_SITELIBSUBDIR}/${PORTNAME} .include <bsd.port.pre.mk> -CPIO?= /usr/bin/cpio - PYVERSION= ${PYTHON_VERSION:S/^python//} .if defined(PYTHON_VERSION) && ${PYVERSION:S/.//} < 22 .undef NO_IGNORE diff --git a/deskutils/gdeskcal-skins/Makefile b/deskutils/gdeskcal-skins/Makefile index 368ecd45affb..89c882e8fd61 100644 --- a/deskutils/gdeskcal-skins/Makefile +++ b/deskutils/gdeskcal-skins/Makefile @@ -38,7 +38,7 @@ do-install: .for d in ${DATA_DIRS} @${MKDIR} ${PREFIX}/share/gnome/gdeskcal/skins/${d} @cd ${WRKSRC}/${d} && ${FIND} . | \ - cpio --quiet -pdm -L -R ${LIBOWN}:${LIBGRP} \ + ${CPIO} --quiet -pdm -L -R ${LIBOWN}:${LIBGRP} \ ${PREFIX}/share/gnome/gdeskcal/skins/${d} .endfor diff --git a/deskutils/gdeskcal/Makefile b/deskutils/gdeskcal/Makefile index 1e7a36652861..5575573b859f 100644 --- a/deskutils/gdeskcal/Makefile +++ b/deskutils/gdeskcal/Makefile @@ -35,7 +35,7 @@ do-install: for d in ${DATA_DIRS}; do \ ${MKDIR} ${PREFIX}/share/gnome/gdeskcal/$$d ; \ cd ${WRKSRC}/$$d && ${FIND} . | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} \ + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} \ ${PREFIX}/share/gnome/gdeskcal/$$d ; \ done ${INSTALL_SCRIPT} ${WRKSRC}/gdeskcal \ 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 diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile index 07ca4be5c713..1969a7238a09 100644 --- a/emulators/linux_base-8/Makefile +++ b/emulators/linux_base-8/Makefile @@ -157,7 +157,7 @@ pre-install: && ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST} do-install: - cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${PREFIX} + cd ${WRKSRC} && ${FIND} * | ${CPIO} -dlmp ${PREFIX} ${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \; post-install: diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile index 07ca4be5c713..1969a7238a09 100644 --- a/emulators/linux_base-rh-9/Makefile +++ b/emulators/linux_base-rh-9/Makefile @@ -157,7 +157,7 @@ pre-install: && ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST} do-install: - cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${PREFIX} + cd ${WRKSRC} && ${FIND} * | ${CPIO} -dlmp ${PREFIX} ${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \; post-install: diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile index 07ca4be5c713..1969a7238a09 100644 --- a/emulators/linux_base-suse-9.1/Makefile +++ b/emulators/linux_base-suse-9.1/Makefile @@ -157,7 +157,7 @@ pre-install: && ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST} do-install: - cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${PREFIX} + cd ${WRKSRC} && ${FIND} * | ${CPIO} -dlmp ${PREFIX} ${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \; post-install: diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile index 07ca4be5c713..1969a7238a09 100644 --- a/emulators/linux_base-suse-9.2/Makefile +++ b/emulators/linux_base-suse-9.2/Makefile @@ -157,7 +157,7 @@ pre-install: && ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST} do-install: - cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${PREFIX} + cd ${WRKSRC} && ${FIND} * | ${CPIO} -dlmp ${PREFIX} ${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \; post-install: diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile index 07ca4be5c713..1969a7238a09 100644 --- a/emulators/linux_base-suse-9.3/Makefile +++ b/emulators/linux_base-suse-9.3/Makefile @@ -157,7 +157,7 @@ pre-install: && ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST} do-install: - cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${PREFIX} + cd ${WRKSRC} && ${FIND} * | ${CPIO} -dlmp ${PREFIX} ${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \; post-install: diff --git a/emulators/osf1_base/Makefile b/emulators/osf1_base/Makefile index a4dc4df9976e..5f30cc57b686 100644 --- a/emulators/osf1_base/Makefile +++ b/emulators/osf1_base/Makefile @@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= alpha PREFIX= /compat/osf1 EXTRACT_CMD= rpm2cpio.pl EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= |cpio -idum +EXTRACT_AFTER_ARGS= |${CPIO} -idum NO_WRKSUBDIR= yes NO_BUILD= yes NO_FILTER_SHLIBS= yes diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile index 17063c720554..750d3b6e0a0d 100644 --- a/emulators/ski/Makefile +++ b/emulators/ski/Makefile @@ -26,7 +26,7 @@ NO_CDROM= ${NOTICE} EXTRACT_CMD= rpm2cpio.pl EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= |cpio -idum +EXTRACT_AFTER_ARGS= |${CPIO} -idum NO_WRKSUBDIR= yes NO_BUILD= yes NO_FILTER_SHLIBS= yes diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile index a26d8c5f4684..030de2a9f374 100644 --- a/emulators/stella/Makefile +++ b/emulators/stella/Makefile @@ -41,7 +41,7 @@ do-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC}/docs && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/finance/myphpmoney/Makefile b/finance/myphpmoney/Makefile index caf6d46208bb..d51e09f314fc 100644 --- a/finance/myphpmoney/Makefile +++ b/finance/myphpmoney/Makefile @@ -38,7 +38,7 @@ post-patch: do-install: ${MKDIR} ${INSTALLDIR} cd ${WRKSRC}; ${FIND} . \ - | cpio -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} + | ${CPIO} -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} ${CHMOD} -R ${BINMODE} ${INSTALLDIR} ${CHMOD} 777 ${INSTALLDIR}/public_html/dump ${FIND} ${INSTALLDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE} diff --git a/games/adgali/Makefile b/games/adgali/Makefile index bd54cf50a7a5..59801b0e12ae 100644 --- a/games/adgali/Makefile +++ b/games/adgali/Makefile @@ -37,7 +37,7 @@ post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC}/doc/html && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/games/amphetamine/Makefile b/games/amphetamine/Makefile index 59304835a03a..bc3a9f6aa3d6 100644 --- a/games/amphetamine/Makefile +++ b/games/amphetamine/Makefile @@ -26,6 +26,6 @@ DATAVERSION= 0.8.6 post-install: @cd ${WRKDIR}/amph && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/amph + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/amph .include <bsd.port.mk> diff --git a/games/fgfs-base/Makefile b/games/fgfs-base/Makefile index b347a128f49d..b9ba6145c3e3 100644 --- a/games/fgfs-base/Makefile +++ b/games/fgfs-base/Makefile @@ -37,8 +37,6 @@ CONFIGURE_ARGS= --with-threads MAN1= est-epsilon.1 fgfs.1 fgjs.1 gl-info.1 js_demo.1 pstest.1 -CPIO?= /usr/bin/cpio - post-extract: @${FIND} ${WRKSRC} \( -name '.#*' -or -name '*~' \) -print -delete diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile index b347a128f49d..b9ba6145c3e3 100644 --- a/games/flightgear-data/Makefile +++ b/games/flightgear-data/Makefile @@ -37,8 +37,6 @@ CONFIGURE_ARGS= --with-threads MAN1= est-epsilon.1 fgfs.1 fgjs.1 gl-info.1 js_demo.1 pstest.1 -CPIO?= /usr/bin/cpio - post-extract: @${FIND} ${WRKSRC} \( -name '.#*' -or -name '*~' \) -print -delete diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index b347a128f49d..b9ba6145c3e3 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -37,8 +37,6 @@ CONFIGURE_ARGS= --with-threads MAN1= est-epsilon.1 fgfs.1 fgjs.1 gl-info.1 js_demo.1 pstest.1 -CPIO?= /usr/bin/cpio - post-extract: @${FIND} ${WRKSRC} \( -name '.#*' -or -name '*~' \) -print -delete diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile index 86f9299f293b..14da3554059a 100644 --- a/games/ldmud/Makefile +++ b/games/ldmud/Makefile @@ -20,7 +20,6 @@ CONFIGURE_ARGS+=--libdir=${DATADIR} --bindir=${PREFIX}/sbin WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src ALL_TARGET= ldmud -CPIO?= /usr/bin/cpio LOGDIR= ${DATADIR} .if defined(MUDLIB) && ${MUDLIB} == lpmud PLIST_SUB+= LPMUD="" MUDLIB="@comment " diff --git a/graphics/fractorama/Makefile b/graphics/fractorama/Makefile index 6de5a0c077af..f347e8120b22 100644 --- a/graphics/fractorama/Makefile +++ b/graphics/fractorama/Makefile @@ -39,10 +39,10 @@ do-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/../doc && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} ${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC}/../examples && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} .endif .include <bsd.port.mk> diff --git a/graphics/ray++/Makefile b/graphics/ray++/Makefile index 6177cfa008c8..9d490569ec87 100644 --- a/graphics/ray++/Makefile +++ b/graphics/ray++/Makefile @@ -28,7 +28,7 @@ post-patch: do-install: @(cd ${WRKSRC} ; \ ${INSTALL_DATA} ray++.so ${PREFIX}/lib ; \ - ${FIND} * -name "*.h" | cpio -pdum ${PREFIX}/include/${PORTNAME} ; \ + ${FIND} * -name "*.h" | ${CPIO} -pdum ${PREFIX}/include/${PORTNAME}; \ ${CHMOD} -R 755 ${PREFIX}/include/${PORTNAME} ) .include <bsd.port.post.mk> diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile index 00347e08d3f3..c81b71c9c90b 100644 --- a/graphics/urt/Makefile +++ b/graphics/urt/Makefile @@ -63,10 +63,10 @@ post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKDIR}/doc && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} @${MKDIR} ${EXAMPLESDIR} cd ${WRKDIR} && ${FIND} img | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} .endif .include <bsd.port.mk> diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile index a02b17656239..ae943d2b86b7 100644 --- a/graphics/vertex/Makefile +++ b/graphics/vertex/Makefile @@ -53,7 +53,7 @@ do-install: @${MKDIR} ${DATADIR}/icons ${INSTALL_DATA} ${WRKSRC}/vertex/vertex.xpm ${DATADIR}/icons cd ${WRKSRC}/vertex/data && ${FIND} . -type f | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} @${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} a+x .include <bsd.port.mk> diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile index 4bc140be79cb..5b52df177947 100644 --- a/graphics/white_dune/Makefile +++ b/graphics/white_dune/Makefile @@ -58,7 +58,7 @@ do-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC}/docs && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} .endif .include <bsd.port.post.mk> diff --git a/java/diablo-jdk13/Makefile b/java/diablo-jdk13/Makefile index 658a0fd79474..014f3a62298d 100644 --- a/java/diablo-jdk13/Makefile +++ b/java/diablo-jdk13/Makefile @@ -46,7 +46,6 @@ DOWNLOAD_URL= http://www.FreeBSDFoundation.org/cgi-bin/download.cgi?package=${DI WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}jdk${JDK_VERSION} NO_BUILD= yes -CPIO?= /usr/bin/cpio INSTALL_DIR= ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} .if defined(WITHOUT_PLUGIN) diff --git a/java/diablo-jre13/Makefile b/java/diablo-jre13/Makefile index ed075b994fe7..30686171a9a6 100644 --- a/java/diablo-jre13/Makefile +++ b/java/diablo-jre13/Makefile @@ -46,7 +46,6 @@ DOWNLOAD_URL= http://www.FreeBSDFoundation.org/cgi-bin/download.cgi?package=${DI WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}jre${JRE_VERSION} NO_BUILD= yes -CPIO?= /usr/bin/cpio INSTALL_DIR= ${PREFIX}/${PKGNAMEPREFIX}jre${JRE_VERSION} .if defined(WITHOUT_PLUGIN) diff --git a/java/gnu-regexp/Makefile b/java/gnu-regexp/Makefile index 1e0373c96586..25bc346cf836 100644 --- a/java/gnu-regexp/Makefile +++ b/java/gnu-regexp/Makefile @@ -20,8 +20,6 @@ NO_BUILD= yes DOCDIR= ${PREFIX}/share/doc/${PORTNAME} -CPIO?= /usr/bin/cpio - do-install: ${MKDIR} ${DOCDIR} cd ${WRKSRC}/docs && ${FIND} . \ diff --git a/java/jboss3/Makefile b/java/jboss3/Makefile index ffa2afb70f23..b52a5c78317e 100644 --- a/java/jboss3/Makefile +++ b/java/jboss3/Makefile @@ -50,8 +50,6 @@ MAN1= ${CONTROL_SCRIPT_NAME}.1 JBOSSOUTPUT= ${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION} -CPIO?= /usr/bin/cpio - .include <bsd.port.pre.mk> do-configure: diff --git a/java/jboss4/Makefile b/java/jboss4/Makefile index ffa2afb70f23..b52a5c78317e 100644 --- a/java/jboss4/Makefile +++ b/java/jboss4/Makefile @@ -50,8 +50,6 @@ MAN1= ${CONTROL_SCRIPT_NAME}.1 JBOSSOUTPUT= ${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION} -CPIO?= /usr/bin/cpio - .include <bsd.port.pre.mk> do-configure: diff --git a/java/jboss5/Makefile b/java/jboss5/Makefile index ffa2afb70f23..b52a5c78317e 100644 --- a/java/jboss5/Makefile +++ b/java/jboss5/Makefile @@ -50,8 +50,6 @@ MAN1= ${CONTROL_SCRIPT_NAME}.1 JBOSSOUTPUT= ${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION} -CPIO?= /usr/bin/cpio - .include <bsd.port.pre.mk> do-configure: diff --git a/java/jce-aba/Makefile b/java/jce-aba/Makefile index 1ef7f325c8f2..5141f056a973 100644 --- a/java/jce-aba/Makefile +++ b/java/jce-aba/Makefile @@ -20,8 +20,6 @@ USE_JAVA= 1.1+ NO_BUILD= yes JDKVERSION= 1.1 -CPIO?= /usr/bin/cpio - do-install: ${INSTALL_DATA} ${WRKSRC}/lib-${JDKVERSION}/jce.zip ${PREFIX}/share/java/classes/ ${MKDIR} ${PREFIX}/share/java/jce-aba diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile index 921da64d3f20..d562910cb995 100644 --- a/java/jdk11/Makefile +++ b/java/jdk11/Makefile @@ -25,8 +25,6 @@ PLIST_SUB+= JDK_VERSION=${JDK_VERSION} WRKSRC= ${WRKDIR}/jdk${JDK_VERSION} NO_BUILD= yes -CPIO?= /usr/bin/cpio - .include <bsd.port.pre.mk> .if ${PORTOBJFORMAT} == "aout" diff --git a/java/jdk12/Makefile b/java/jdk12/Makefile index 64b828da2b28..bce099b277a0 100644 --- a/java/jdk12/Makefile +++ b/java/jdk12/Makefile @@ -59,8 +59,6 @@ JDKIMAGEDIR= ${WRKSRC}/jdk-image-i386 JDKIMAGEDIR_G= ${WRKSRC}/jdk-debug-image-i386 JREIMAGEDIR= ${WRKSRC}/jre-image-i386 -CPIO?= /usr/bin/cpio - .if defined(NODEBUG) PLIST_SUB+= DEBUG:="@comment " PKGNAMESUFFIX= -nodebug diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index 765afd235595..0be8c63be83c 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -74,8 +74,6 @@ PLIST_SUB+= JDK_VERSION=${JDK_VERSION} JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i386/jdk-image-i386 JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i386/jdk-debug-image-i386 -CPIO?= /usr/bin/cpio - .if defined(NODEBUG) PLIST_SUB+= DEBUG:="@comment " PKGNAMESUFFIX= -nodebug diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index 4ac3e9d011a7..db9ea2c94b5b 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -100,8 +100,6 @@ PKGINSTALL= ${WRKDIR}/pkg-install JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i586/j2sdk-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image -CPIO?= /usr/bin/cpio - .if defined(WITH_DEBUG) PLIST_SUB+= DEBUG:="" PKGNAMESUFFIX= -debug diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 4ac3e9d011a7..db9ea2c94b5b 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -100,8 +100,6 @@ PKGINSTALL= ${WRKDIR}/pkg-install JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i586/j2sdk-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image -CPIO?= /usr/bin/cpio - .if defined(WITH_DEBUG) PLIST_SUB+= DEBUG:="" PKGNAMESUFFIX= -debug diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 4ac3e9d011a7..db9ea2c94b5b 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -100,8 +100,6 @@ PKGINSTALL= ${WRKDIR}/pkg-install JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i586/j2sdk-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image -CPIO?= /usr/bin/cpio - .if defined(WITH_DEBUG) PLIST_SUB+= DEBUG:="" PKGNAMESUFFIX= -debug diff --git a/java/jre/Makefile b/java/jre/Makefile index af005dcea26c..b1f8db0e93b5 100644 --- a/java/jre/Makefile +++ b/java/jre/Makefile @@ -38,8 +38,6 @@ STRIPFILES= bin/i386/green_threads/jre \ lib/i386/green_threads/libsysresource.so \ lib/i386/green_threads/libzip.so -CPIO?= /usr/bin/cpio - .include <bsd.port.pre.mk> .if ${PORTOBJFORMAT} == "aout" diff --git a/java/linux-blackdown-jdk12/Makefile b/java/linux-blackdown-jdk12/Makefile index fa1a11419954..a40827eb8565 100644 --- a/java/linux-blackdown-jdk12/Makefile +++ b/java/linux-blackdown-jdk12/Makefile @@ -33,8 +33,6 @@ NO_BUILD= YES APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} -CPIO?= /usr/bin/cpio - post-patch: ${FIND} ${WRKSRC} \( -name '*.orig' -o -name '.*.orig' \) -print \ | ${XARGS} ${RM} -f diff --git a/java/linux-blackdown-jre11/Makefile b/java/linux-blackdown-jre11/Makefile index 8d452cd140be..36e447c38080 100644 --- a/java/linux-blackdown-jre11/Makefile +++ b/java/linux-blackdown-jre11/Makefile @@ -35,8 +35,6 @@ NO_BUILD= YES APP_HOME?= ${PREFIX}/linux-blackdown-jre${PORTVERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} -CPIO?= /usr/bin/cpio - post-patch: ${FIND} ${WRKSRC} \( -name '*.orig' -o -name '.*.orig' \) -delete ${CP} ${FILESDIR}/arch ${WRKSRC}/bin/ diff --git a/java/linux-ibm-jdk13/Makefile b/java/linux-ibm-jdk13/Makefile index 74fe3d55ca5e..0228bcbb444e 100644 --- a/java/linux-ibm-jdk13/Makefile +++ b/java/linux-ibm-jdk13/Makefile @@ -43,8 +43,6 @@ RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/wadalab-gothic.ttf:${PORTSDIR}/j PLIST_SUB+= JAPANESE="@comment " .endif -CPIO?= /usr/bin/cpio - .include <bsd.port.pre.mk> .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) diff --git a/java/linux-ibm-jdk14/Makefile b/java/linux-ibm-jdk14/Makefile index 708dab64d57e..8c380224361f 100644 --- a/java/linux-ibm-jdk14/Makefile +++ b/java/linux-ibm-jdk14/Makefile @@ -36,8 +36,6 @@ RESTRICTED= "Redistribution of repackaged binaries not permitted" DOWNLOAD_URL= https://www6.software.ibm.com/dl/lxdk/lxdk-p/ -CPIO?= /usr/bin/cpio - .include <bsd.port.pre.mk> .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) diff --git a/java/linux-sun-jdk13/Makefile b/java/linux-sun-jdk13/Makefile index e5f669ff8f5e..bcb23c69e6f8 100644 --- a/java/linux-sun-jdk13/Makefile +++ b/java/linux-sun-jdk13/Makefile @@ -35,8 +35,6 @@ ONLY_FOR_ARCHS= i386 TARGET_DIR?= ${PREFIX}/${PKGBASE}${JDK_VERSION} DOWNLOAD_URL?= http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${JDK_VERSION}_${JDK_REVISION}-oth-JPR&SiteId=JSC&TransactionId=noreg -CPIO?= /usr/bin/cpio - .include <bsd.port.pre.mk> .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile index 417b36b05652..2eab9e9da77c 100644 --- a/java/linux-sun-jdk14/Makefile +++ b/java/linux-sun-jdk14/Makefile @@ -37,7 +37,6 @@ ONLY_FOR_ARCHS= i386 DOWNLOAD_URL?= http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${JDK_VERSION}_${JDK_REVISION}-oth-JPR&SiteId=JSC&TransactionId=noreg PORTTITLE= Java 2 Development Kit ${DL_JDK_VERSION} for Linux APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_VERSION} -CPIO?= /usr/bin/cpio PACKED_JARS= lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar UNPACK_CMD= ${APP_HOME}/lib/unpack diff --git a/java/linux-sun-jdk15/Makefile b/java/linux-sun-jdk15/Makefile index 65d9d9136b64..b9730de4f6b2 100644 --- a/java/linux-sun-jdk15/Makefile +++ b/java/linux-sun-jdk15/Makefile @@ -36,7 +36,6 @@ ONLY_FOR_ARCHS= i386 DOWNLOAD_URL?= http://jsecom16.sun.com/ECom/EComActionServlet?StoreId=22&PartDetailId=j2sdk-1.5.0-beta-b31-oth-JPR PORTTITLE= Java 2 Development Kit ${DL_JDK_VERSION} for Linux APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_VERSION} -CPIO?= /usr/bin/cpio PACKED_JARS= lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar UNPACK_CMD= ${APP_HOME}/lib/unpack diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile index 65d9d9136b64..b9730de4f6b2 100644 --- a/java/linux-sun-jdk16/Makefile +++ b/java/linux-sun-jdk16/Makefile @@ -36,7 +36,6 @@ ONLY_FOR_ARCHS= i386 DOWNLOAD_URL?= http://jsecom16.sun.com/ECom/EComActionServlet?StoreId=22&PartDetailId=j2sdk-1.5.0-beta-b31-oth-JPR PORTTITLE= Java 2 Development Kit ${DL_JDK_VERSION} for Linux APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_VERSION} -CPIO?= /usr/bin/cpio PACKED_JARS= lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar UNPACK_CMD= ${APP_HOME}/lib/unpack diff --git a/java/openjit/Makefile b/java/openjit/Makefile index 4d69ba1ad422..07674b857938 100644 --- a/java/openjit/Makefile +++ b/java/openjit/Makefile @@ -36,8 +36,6 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-jdk=${JAVA_HOME} -CPIO?= /usr/bin/cpio - PLIST_SUB+= JAVADIR=${JAVA_HOME:S,${PREFIX}/,,} .if defined(WITH_JDK11) JAVALIBDIR= ${PREFIX}/lib/OpenJIT diff --git a/korean/mizifont/Makefile b/korean/mizifont/Makefile index db7b33a60deb..3f3e16deaae0 100644 --- a/korean/mizifont/Makefile +++ b/korean/mizifont/Makefile @@ -28,7 +28,6 @@ RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients NO_WRKSUBDIR= yes RPM2CPIO= rpm2cpio -CPIO= /usr/bin/cpio CPIO_OPT= -i --make-directories UNCOMPRESS= /usr/bin/uncompress FONTS= mzgt16e.pcf mzgt16h.pcf mzgt16h1.pcf mzmj16e.pcf mzmj16h.pcf \ diff --git a/lang/cli/Makefile b/lang/cli/Makefile index 8769d9278c0c..4a342fea3461 100644 --- a/lang/cli/Makefile +++ b/lang/cli/Makefile @@ -71,6 +71,7 @@ do-install: @${MKDIR} ${PREFIX}/cli-${PORTVERSION} @${INSTALL_DATA} ${WRKSRC}/license.txt ${PREFIX}/cli-${PORTVERSION} @cd ${WRKSRC}/build/v1.x86fre.rotor && ${FIND} . | \ - /usr/bin/cpio -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/cli-${PORTVERSION} + ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} \ + ${PREFIX}/cli-${PORTVERSION} .include <bsd.port.post.mk> diff --git a/lang/compaq-cc/Makefile b/lang/compaq-cc/Makefile index 78844466b89b..bee68aa505f9 100644 --- a/lang/compaq-cc/Makefile +++ b/lang/compaq-cc/Makefile @@ -36,7 +36,7 @@ CCC_ROOT= ${PREFIX}/${CCC_DIR} PLIST_SUB= CCC_REV=${CCC_REV} CPML_REV=${CPML_REV} LIBOTS_REV=${LIBOTS_REV} EXTRACT_CMD= rpm2cpio EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= |cpio -idum +EXTRACT_AFTER_ARGS= |${CPIO} -idum EXTRACT_ONLY= NO_WRKSUBDIR= yes NO_BUILD= yes @@ -56,7 +56,7 @@ do-install: };\ fi .for F in ${DISTFILES} - cd ${PREFIX} ; rpm2cpio ${DISTDIR}/$F |cpio -idum -R root:wheel + cd ${PREFIX} ; rpm2cpio ${DISTDIR}/$F |${CPIO} -idum -R root:wheel .endfor .for F in ${CCC_ROOT}/alpha-linux/bin/lnxcc \ ${CCC_ROOT}/alpha-linux/bin/lnxcc_driver @@ -101,7 +101,7 @@ do-install: ${MKDIR} ${CCC_ROOT}/alpha-freebsd/lib cd ${FILESDIR}/include ; \ ${FIND} . -print0 \ - | cpio -dump0 -R root:wheel ${CCC_ROOT}/alpha-freebsd/include + | ${CPIO} -dump0 -R root:wheel ${CCC_ROOT}/alpha-freebsd/include cd ${CCC_ROOT}/alpha-freebsd/include ; ${LN} -sf machine/stdarg.h . post-install: diff --git a/lang/icc/Makefile b/lang/icc/Makefile index 4d8dd8d9b311..4f896b146b2e 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -54,7 +54,6 @@ EXTRACT_AFTER_ARGS= | tar -xf - \ ICCCFGVAL!= ${UNAME} -r | ${SED} -e 's/\..*//' BRANDELF?= /usr/bin/brandelf -CPIO?= /usr/bin/cpio OBJCOPY?= /usr/bin/objcopy .for file in ${DISTFILES} diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile index e8c4cdeef7a4..cde294a44590 100644 --- a/lang/icc7/Makefile +++ b/lang/icc7/Makefile @@ -48,7 +48,6 @@ EXTRACT_AFTER_ARGS= | tar -xf - \ ICCCFGVAL!= ${UNAME} -r | ${SED} -e 's/\..*//' -CPIO?= /usr/bin/cpio OBJCOPY?= /usr/bin/objcopy .for file in ${DISTNAME} diff --git a/lang/ifc/Makefile b/lang/ifc/Makefile index 38000221be3a..a041c1c3a76d 100644 --- a/lang/ifc/Makefile +++ b/lang/ifc/Makefile @@ -45,7 +45,6 @@ EXTRACT_AFTER_ARGS= | tar -xf - \ IFCCFGVAL!= ${UNAME} -r | ${SED} -e 's/\..*//' -CPIO?= /usr/bin/cpio OBJCOPY?= /usr/bin/objcopy .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}) diff --git a/lang/ifc7/Makefile b/lang/ifc7/Makefile index 38000221be3a..a041c1c3a76d 100644 --- a/lang/ifc7/Makefile +++ b/lang/ifc7/Makefile @@ -45,7 +45,6 @@ EXTRACT_AFTER_ARGS= | tar -xf - \ IFCCFGVAL!= ${UNAME} -r | ${SED} -e 's/\..*//' -CPIO?= /usr/bin/cpio OBJCOPY?= /usr/bin/objcopy .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}) diff --git a/lang/ifc8/Makefile b/lang/ifc8/Makefile index 7090768920c9..e8ae4b442640 100644 --- a/lang/ifc8/Makefile +++ b/lang/ifc8/Makefile @@ -53,7 +53,6 @@ EXTRACT_AFTER_ARGS= | tar -xf - \ IFCCFGVAL!= ${UNAME} -r | ${SED} -e 's/\..*//' BRANDELF?= /usr/bin/brandelf -CPIO?= /usr/bin/cpio OBJCOPY?= /usr/bin/objcopy .for file in ${DISTFILES} diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index cfc3f93e8622..857319c7feb0 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -39,8 +39,6 @@ CONFIGURE_ARGS= --enable-openssl --with-openssl-includes=${OPENSSLINC} \ --with-openssl-libs=${OPENSSLLIB} .endif -CPIO?= /usr/bin/cpio - .include <bsd.port.pre.mk> CONFIGURE_ARGS+= --program-suffix="-claws" --enable-ipv6 diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile index 8f5e6ae6a665..a91b825d8086 100644 --- a/mail/openwebmail/Makefile +++ b/mail/openwebmail/Makefile @@ -143,8 +143,10 @@ pre-install: do-install: @${MKDIR} ${OWCGIDIR} ${OWDATADIR} - @cd ${WRKSRC}/cgi-bin/openwebmail && ${FIND} . | cpio -dpum -R ${BINOWN}:mail ${OWCGIDIR} - @cd ${WRKSRC}/data/openwebmail && ${FIND} . | cpio -dpum -R ${SHAREOWN}:${SHAREGRP} ${OWDATADIR} + @cd ${WRKSRC}/cgi-bin/openwebmail && ${FIND} . \ + | ${CPIO} -dpum -R ${BINOWN}:mail ${OWCGIDIR} + @cd ${WRKSRC}/data/openwebmail && ${FIND} . \ + | ${CPIO} -dpum -R ${SHAREOWN}:${SHAREGRP} ${OWDATADIR} .if !exists(${OWCGIDIR}/etc/openwebmail.conf) @${CP} ${OWCGIDIR}/etc/openwebmail.conf-dist ${OWCGIDIR}/etc/openwebmail.conf .endif diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile index cfc3f93e8622..857319c7feb0 100644 --- a/mail/sylpheed-claws/Makefile +++ b/mail/sylpheed-claws/Makefile @@ -39,8 +39,6 @@ CONFIGURE_ARGS= --enable-openssl --with-openssl-includes=${OPENSSLINC} \ --with-openssl-libs=${OPENSSLLIB} .endif -CPIO?= /usr/bin/cpio - .include <bsd.port.pre.mk> CONFIGURE_ARGS+= --program-suffix="-claws" --enable-ipv6 diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile index 9f5ea6c234ae..3e4c89cd8910 100644 --- a/math/ploticus/Makefile +++ b/math/ploticus/Makefile @@ -48,11 +48,11 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pl ${PREFIX}/bin @${MKDIR} ${DATADIR} cd ${WRKSRC}/../prefabs && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} .if !defined(NOPORTDOCS) @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC}/../pltestsuite && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} .endif .include <bsd.port.mk> diff --git a/misc/linux-opengroupware/Makefile b/misc/linux-opengroupware/Makefile index 1d8a38c2b029..6416c0259afd 100644 --- a/misc/linux-opengroupware/Makefile +++ b/misc/linux-opengroupware/Makefile @@ -116,7 +116,6 @@ PREFIX= ${LINUXBASE} .include <bsd.port.pre.mk> RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio -CPIO?= /usr/bin/cpio CPIOFLAGS= --extract --make-directories --no-absolute-filenames \ --preserve-modification-time --quiet RPMDIR= ${DISTDIR}/${DIST_SUBDIR} @@ -183,7 +182,7 @@ pre-install: && ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST} do-install: - cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${PREFIX} + cd ${WRKSRC} && ${FIND} * | ${CPIO} -dlmp ${PREFIX} ${FIND} ${PREFIX} -type d \! -ipath '${LINUXBASE}/proc*' -exec ${CHMOD} 755 \{\} \; post-install: diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile index d7edfc91e54f..de0414efe597 100644 --- a/multimedia/linux-xmovie/Makefile +++ b/multimedia/linux-xmovie/Makefile @@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= i386 USE_LINUX= yes EXTRACT_CMD= rpm2cpio EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= | cpio -id --quiet +EXTRACT_AFTER_ARGS= | ${CPIO} -id --quiet NO_BUILD= yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/usr/bin diff --git a/net-im/linux-ymessenger/Makefile b/net-im/linux-ymessenger/Makefile index 2a429e8bde70..d02bee64bd5f 100644 --- a/net-im/linux-ymessenger/Makefile +++ b/net-im/linux-ymessenger/Makefile @@ -39,7 +39,7 @@ do-extract: @for rpm in ${EXTRACT_ONLY}; do\ (cd ${WRKDIR} &&\ rpm2cpio ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE}/$$rpm |\ - cpio --quiet -id);\ + ${CPIO} --quiet -id);\ done post-patch: diff --git a/net-mgmt/flow-extract/Makefile b/net-mgmt/flow-extract/Makefile index 54d47a64e65e..da49b0af28d4 100644 --- a/net-mgmt/flow-extract/Makefile +++ b/net-mgmt/flow-extract/Makefile @@ -18,7 +18,7 @@ COMMENT= Cisco NetFlow awk-like extracting tool BUILD_DEPENDS= flow-cat:${PORTSDIR}/net/flow-tools USE_REINPLACE= yes -EXTRACT_AFTER_ARGS= | cpio -idmu +EXTRACT_AFTER_ARGS= | ${CPIO} -idmu post-patch: patch-makefile diff --git a/net/dgd-lpmud/Makefile b/net/dgd-lpmud/Makefile index 359d1429dbc5..5e3848b45a5c 100644 --- a/net/dgd-lpmud/Makefile +++ b/net/dgd-lpmud/Makefile @@ -26,8 +26,6 @@ DIST_SUBDIR= dgd WRKSRC= ${WRKDIR}/mud USE_REINPLACE= yes -CPIO?= /usr/bin/cpio - post-extract: @${CP} ${FILESDIR}/oconv.c ${WRKSRC}/ @${CP} ${FILESDIR}/Makefile.bin ${WRKSRC}/Makefile diff --git a/net/dgd/Makefile b/net/dgd/Makefile index caa9fb1df4e3..2f7eefcbf61d 100644 --- a/net/dgd/Makefile +++ b/net/dgd/Makefile @@ -31,7 +31,6 @@ PATCH_WRKSRC= ${WRKDIR}/dgd ALL_TARGET= install USE_REINPLACE= yes -CPIO?= /usr/bin/cpio .ifdef (WITH_NETWORKING) PLIST_SUB+= NETWORKING="" .else diff --git a/net/flow-extract/Makefile b/net/flow-extract/Makefile index 54d47a64e65e..da49b0af28d4 100644 --- a/net/flow-extract/Makefile +++ b/net/flow-extract/Makefile @@ -18,7 +18,7 @@ COMMENT= Cisco NetFlow awk-like extracting tool BUILD_DEPENDS= flow-cat:${PORTSDIR}/net/flow-tools USE_REINPLACE= yes -EXTRACT_AFTER_ARGS= | cpio -idmu +EXTRACT_AFTER_ARGS= | ${CPIO} -idmu post-patch: patch-makefile diff --git a/net/linux-ymessenger/Makefile b/net/linux-ymessenger/Makefile index 2a429e8bde70..d02bee64bd5f 100644 --- a/net/linux-ymessenger/Makefile +++ b/net/linux-ymessenger/Makefile @@ -39,7 +39,7 @@ do-extract: @for rpm in ${EXTRACT_ONLY}; do\ (cd ${WRKDIR} &&\ rpm2cpio ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE}/$$rpm |\ - cpio --quiet -id);\ + ${CPIO} --quiet -id);\ done post-patch: diff --git a/print/adobe-cmaps/Makefile b/print/adobe-cmaps/Makefile index 14e08fb0406a..2de5bd1df60f 100644 --- a/print/adobe-cmaps/Makefile +++ b/print/adobe-cmaps/Makefile @@ -23,6 +23,6 @@ do-install: @${MKDIR} ${RESOURCE}/CIDFont @${MKDIR} ${RESOURCE}/Font @cd ${WRKSRC} && ${FIND} . \! -name '.*' \ - | cpio --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${RESOURCE} + | ${CPIO} --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${RESOURCE} .include <bsd.port.mk> diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile index 96ef27f07b04..6759188f7b21 100644 --- a/print/bjfiltercom/Makefile +++ b/print/bjfiltercom/Makefile @@ -36,7 +36,7 @@ BIN_FILES= bjcmd bjfilter bjprn lgmon printui stsmon EXTRACT_CMD= rpm2cpio.pl EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= | cpio -id --quiet +EXTRACT_AFTER_ARGS= | ${CPIO} -id --quiet PLIST_SUB+= PORTVERSION=${PORTVERSION}${_SUF1}${_SUF2} DIST_SUBDIR= bjfilter diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile index d13b8af23066..c6c0a506da06 100644 --- a/science/chemtool/Makefile +++ b/science/chemtool/Makefile @@ -39,7 +39,7 @@ do-install: .if !defined(NOPORTDOCS) @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC}/examples && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} .endif .include <bsd.port.mk> diff --git a/security/srp/Makefile b/security/srp/Makefile index ddd56b9b5e91..b37531b47a6d 100644 --- a/security/srp/Makefile +++ b/security/srp/Makefile @@ -28,7 +28,7 @@ post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC}/docs && ${FIND} . | \ - cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index f7ebd5b58bcb..e0be0697d23e 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -123,7 +123,7 @@ post-install: ${MKDIR} ${DOCSDIR}/html-manual ${INSTALL_DATA} ${WRKSRC}/doc/bacula.pdf ${DOCSDIR} cd ${WRKSRC}/doc && ${FIND} html-manual | \ - cpio -pdm -L -R root:wheel ${DOCSDIR} + ${CPIO} -pdm -L -R root:wheel ${DOCSDIR} .endif # Inform user after install about important things .... diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index f7ebd5b58bcb..e0be0697d23e 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -123,7 +123,7 @@ post-install: ${MKDIR} ${DOCSDIR}/html-manual ${INSTALL_DATA} ${WRKSRC}/doc/bacula.pdf ${DOCSDIR} cd ${WRKSRC}/doc && ${FIND} html-manual | \ - cpio -pdm -L -R root:wheel ${DOCSDIR} + ${CPIO} -pdm -L -R root:wheel ${DOCSDIR} .endif # Inform user after install about important things .... diff --git a/sysutils/tmpwatch/Makefile b/sysutils/tmpwatch/Makefile index 78ab572fb0dd..13c656e31afc 100644 --- a/sysutils/tmpwatch/Makefile +++ b/sysutils/tmpwatch/Makefile @@ -20,7 +20,6 @@ BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio USE_GETOPT_LONG=yes USE_REINPLACE= yes -CPIO?= /usr/bin/cpio CFLAGS+= ${CPPFLAGS} -DVERSION=\"${PORTVERSION}\" MAN8= tmpwatch.8 diff --git a/textproc/javacc/Makefile b/textproc/javacc/Makefile index f73176cc7f7f..906627e3b14a 100644 --- a/textproc/javacc/Makefile +++ b/textproc/javacc/Makefile @@ -22,8 +22,6 @@ NO_BUILD= yes #NO_WRKSUBDIR= yes #DOWNLOAD_URL?= https://javacc.dev.java.net/servlets/ProjectDocumentList?folderID=212 -CPIO?= /usr/bin/cpio - do-configure: for f in "${WRKSRC}/bin/j*"; do \ ${REINPLACE_CMD} -e 's:`dirname \$$0`/lib:${JAVAJARDIR}:' $$f; \ diff --git a/vietnamese/vi2vn/Makefile b/vietnamese/vi2vn/Makefile index fbc6a995fbba..0a7b0f31cca1 100644 --- a/vietnamese/vi2vn/Makefile +++ b/vietnamese/vi2vn/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio EXTRACT_CMD= rpm2cpio.pl EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= |cpio -idum +EXTRACT_AFTER_ARGS= |${CPIO} -idum WRKSRC= ${WRKDIR}/${PORTNAME} USE_REINPLACE= yes NO_BUILD= yes diff --git a/www/linux-beonex/Makefile b/www/linux-beonex/Makefile index 3811d0acc1e6..0d3ae0d41541 100644 --- a/www/linux-beonex/Makefile +++ b/www/linux-beonex/Makefile @@ -72,8 +72,8 @@ pre-install: do-install: ${MKDIR} ${PREFIX}/lib/linux-beonex ${CHMOD} 755 ${PREFIX}/lib/linux-beonex - cd ${WRKSRC} && ${FIND} * | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/linux-beonex + cd ${WRKSRC} && ${FIND} * | ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} \ + ${PREFIX}/lib/linux-beonex ${LN} -s ${PREFIX}/lib/linux-beonex/beonex-comm \ ${PREFIX}/bin/linux-beonex ${INSTALL_SCRIPT} ${WRKDIR}/linkfarm ${PREFIX}/lib/linux-beonex diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile index 8947b1a1544e..ddab4797c089 100644 --- a/www/linux-firefox/Makefile +++ b/www/linux-firefox/Makefile @@ -66,7 +66,7 @@ do-install: ${MKDIR} ${PREFIX}/lib/${FIREBIRD_NAME} ${CHMOD} 755 ${PREFIX}/lib/${FIREBIRD_NAME} cd ${WRKSRC} && ${FIND} * | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} \ + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} \ ${PREFIX}/lib/${FIREBIRD_NAME} ${LN} -sf ${PREFIX}/lib/${FIREBIRD_NAME}/MozillaFirebird \ ${PREFIX}/bin/${FIREBIRD_NAME} diff --git a/www/linux-mozillafirebird/Makefile b/www/linux-mozillafirebird/Makefile index 8947b1a1544e..ddab4797c089 100644 --- a/www/linux-mozillafirebird/Makefile +++ b/www/linux-mozillafirebird/Makefile @@ -66,7 +66,7 @@ do-install: ${MKDIR} ${PREFIX}/lib/${FIREBIRD_NAME} ${CHMOD} 755 ${PREFIX}/lib/${FIREBIRD_NAME} cd ${WRKSRC} && ${FIND} * | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} \ + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} \ ${PREFIX}/lib/${FIREBIRD_NAME} ${LN} -sf ${PREFIX}/lib/${FIREBIRD_NAME}/MozillaFirebird \ ${PREFIX}/bin/${FIREBIRD_NAME} diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile index 6051de3230f6..16cbea5349ac 100644 --- a/www/mozilla-devel/Makefile +++ b/www/mozilla-devel/Makefile @@ -270,7 +270,7 @@ do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} cd ${WRKSRC}/dist/bin && ${FIND} . | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} ${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ @@ -295,7 +295,7 @@ do-install: ${MKDIR} ${PREFIX}/include/mozilla ${CHMOD} 755 ${PREFIX}/include/mozilla cd ${WRKSRC}/dist/include && ${FIND} . | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 255b8a97546b..277c41878eb1 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -268,7 +268,7 @@ do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} cd ${WRKSRC}/dist/bin && ${FIND} . | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} ${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ @@ -293,7 +293,7 @@ do-install: ${MKDIR} ${PREFIX}/include/mozilla ${CHMOD} 755 ${PREFIX}/include/mozilla cd ${WRKSRC}/dist/include && ${FIND} . | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components diff --git a/www/notftp/Makefile b/www/notftp/Makefile index ebd9aac62430..1187cfd1edd4 100644 --- a/www/notftp/Makefile +++ b/www/notftp/Makefile @@ -35,7 +35,7 @@ PLIST_SUB+= INSTALLDIR=${INSTALLDIR:S,^${PREFIX}/,,} do-install: ${MKDIR} ${INSTALLDIR} cd ${WRKSRC}; ${FIND} . \ - | cpio -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} + | ${CPIO} -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} ${FIND} ${INSTALLDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE} .include <bsd.port.mk> diff --git a/www/photo_gallery/Makefile b/www/photo_gallery/Makefile index 100885de5ae6..fe9dabd66d07 100644 --- a/www/photo_gallery/Makefile +++ b/www/photo_gallery/Makefile @@ -31,5 +31,5 @@ USE_GZIP= no do-install: ${MKDIR} ${INSTALLDIR} cd ${WRKSRC}; ${FIND} . \ - | cpio -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} + | ${CPIO} -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} .include <bsd.port.mk> diff --git a/www/phpSysInfo/Makefile b/www/phpSysInfo/Makefile index c7056550765d..e22eae36609c 100644 --- a/www/phpSysInfo/Makefile +++ b/www/phpSysInfo/Makefile @@ -39,7 +39,7 @@ post-patch: do-install: ${MKDIR} ${INSTALLDIR} cd ${WRKSRC}; ${FIND} . \ - | cpio -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} + | ${CPIO} -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} ${CHMOD} -R ${BINMODE} ${INSTALLDIR} ${FIND} ${INSTALLDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE} diff --git a/www/phpsysinfo-dev/Makefile b/www/phpsysinfo-dev/Makefile index c7056550765d..e22eae36609c 100644 --- a/www/phpsysinfo-dev/Makefile +++ b/www/phpsysinfo-dev/Makefile @@ -39,7 +39,7 @@ post-patch: do-install: ${MKDIR} ${INSTALLDIR} cd ${WRKSRC}; ${FIND} . \ - | cpio -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} + | ${CPIO} -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} ${CHMOD} -R ${BINMODE} ${INSTALLDIR} ${FIND} ${INSTALLDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE} diff --git a/www/phpsysinfo/Makefile b/www/phpsysinfo/Makefile index c7056550765d..e22eae36609c 100644 --- a/www/phpsysinfo/Makefile +++ b/www/phpsysinfo/Makefile @@ -39,7 +39,7 @@ post-patch: do-install: ${MKDIR} ${INSTALLDIR} cd ${WRKSRC}; ${FIND} . \ - | cpio -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} + | ${CPIO} -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR} ${CHMOD} -R ${BINMODE} ${INSTALLDIR} ${FIND} ${INSTALLDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE} diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 6051de3230f6..16cbea5349ac 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -270,7 +270,7 @@ do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} cd ${WRKSRC}/dist/bin && ${FIND} . | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} ${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ @@ -295,7 +295,7 @@ do-install: ${MKDIR} ${PREFIX}/include/mozilla ${CHMOD} 755 ${PREFIX}/include/mozilla cd ${WRKSRC}/dist/include && ${FIND} . | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index 6051de3230f6..16cbea5349ac 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -270,7 +270,7 @@ do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} cd ${WRKSRC}/dist/bin && ${FIND} . | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} ${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ @@ -295,7 +295,7 @@ do-install: ${MKDIR} ${PREFIX}/include/mozilla ${CHMOD} 755 ${PREFIX}/include/mozilla cd ${WRKSRC}/dist/include && ${FIND} . | \ - cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components diff --git a/www/smarty/Makefile b/www/smarty/Makefile index 6bc79eb75f2b..8e3db6e56c98 100644 --- a/www/smarty/Makefile +++ b/www/smarty/Makefile @@ -29,8 +29,6 @@ MSG_SRC=${FILESDIR}/pkg-message MSG_SUB= DATADIR=${DATADIR} LOCALBASE=${LOCALBASE} -CPIO?= /usr/bin/cpio - do-install: @${MKDIR} ${DATADIR} .for f in Config_File.class.php Smarty.class.php Smarty_Compiler.class.php debug.tpl diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile index 71e2f63379d3..5a9c72b6737a 100644 --- a/x11-fonts/sgifonts/Makefile +++ b/x11-fonts/sgifonts/Makefile @@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/sgi-fonts do-extract: @${MKDIR} ${WRKDIR} @cd ${WRKDIR}; rpm2cpio.pl ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} \ - | cpio --extract --no-preserve-owner \ + | ${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 240a49ad7696..a7a2aa1cce67 100644 --- a/x11-themes/gnome-industrial-theme/Makefile +++ b/x11-themes/gnome-industrial-theme/Makefile @@ -69,7 +69,7 @@ do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} @if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\ - | cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null \ + | ${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);\ then \ diff --git a/x11-themes/gtk-industrial-theme/Makefile b/x11-themes/gtk-industrial-theme/Makefile index f072957f555e..1673a632d00e 100644 --- a/x11-themes/gtk-industrial-theme/Makefile +++ b/x11-themes/gtk-industrial-theme/Makefile @@ -32,7 +32,7 @@ do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} @if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\ - | cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null \ + | ${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);\ then \ diff --git a/x11-toolkits/gnome-industrial-theme/Makefile b/x11-toolkits/gnome-industrial-theme/Makefile index 240a49ad7696..a7a2aa1cce67 100644 --- a/x11-toolkits/gnome-industrial-theme/Makefile +++ b/x11-toolkits/gnome-industrial-theme/Makefile @@ -69,7 +69,7 @@ do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} @if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\ - | cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null \ + | ${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);\ then \ diff --git a/x11-toolkits/gtk-industrial-theme/Makefile b/x11-toolkits/gtk-industrial-theme/Makefile index f072957f555e..1673a632d00e 100644 --- a/x11-toolkits/gtk-industrial-theme/Makefile +++ b/x11-toolkits/gtk-industrial-theme/Makefile @@ -32,7 +32,7 @@ do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} @if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\ - | cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null \ + | ${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);\ then \ diff --git a/x11-toolkits/linux-f10-openmotif/Makefile b/x11-toolkits/linux-f10-openmotif/Makefile index 4ef154ad6828..e7fd932f2c46 100644 --- a/x11-toolkits/linux-f10-openmotif/Makefile +++ b/x11-toolkits/linux-f10-openmotif/Makefile @@ -35,7 +35,7 @@ EXTRACT_FILES= usr/X11R6/lib/libMrm.so.2.1 \ do-install: cd ${PREFIX}; \ rpm2cpio ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | \ - cpio -idum -R ${LIBOWN}:${LIBGRP} ${EXTRACT_FILES} + ${CPIO} -idum -R ${LIBOWN}:${LIBGRP} ${EXTRACT_FILES} chroot ${PREFIX} /sbin/ldconfig .include <bsd.port.mk> diff --git a/x11-toolkits/linux-f8-openmotif/Makefile b/x11-toolkits/linux-f8-openmotif/Makefile index 4ef154ad6828..e7fd932f2c46 100644 --- a/x11-toolkits/linux-f8-openmotif/Makefile +++ b/x11-toolkits/linux-f8-openmotif/Makefile @@ -35,7 +35,7 @@ EXTRACT_FILES= usr/X11R6/lib/libMrm.so.2.1 \ do-install: cd ${PREFIX}; \ rpm2cpio ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | \ - cpio -idum -R ${LIBOWN}:${LIBGRP} ${EXTRACT_FILES} + ${CPIO} -idum -R ${LIBOWN}:${LIBGRP} ${EXTRACT_FILES} chroot ${PREFIX} /sbin/ldconfig .include <bsd.port.mk> diff --git a/x11-toolkits/linux-openmotif/Makefile b/x11-toolkits/linux-openmotif/Makefile index 4ef154ad6828..e7fd932f2c46 100644 --- a/x11-toolkits/linux-openmotif/Makefile +++ b/x11-toolkits/linux-openmotif/Makefile @@ -35,7 +35,7 @@ EXTRACT_FILES= usr/X11R6/lib/libMrm.so.2.1 \ do-install: cd ${PREFIX}; \ rpm2cpio ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | \ - cpio -idum -R ${LIBOWN}:${LIBGRP} ${EXTRACT_FILES} + ${CPIO} -idum -R ${LIBOWN}:${LIBGRP} ${EXTRACT_FILES} chroot ${PREFIX} /sbin/ldconfig .include <bsd.port.mk> |