Make use of "find -exec {} +" (which is POSIX) and "find -delete"
(which is not) throughout the ports Makefiles.
Specifically:
* Replace find|xargs with find -exec {} +
find|xargs is an outdated construct. The -exec {} + invocation
automatically avoids a number of corner cases (see xargs -0, -r).
Also, since the exit status of the left-hand side of a pipe is
ignored, find|xargs hides some problem.
* Replace -exec {} \; with -exec {} + if applicable.
Calling a command a few times with many arguments is simply more
efficient than calling it many times with a single argument.
* Use the -delete operator to remove files and empty directories.
I'm ambivalent about this since it isn't POSIX, but people seem
to like it.
I also combined and tweaked some find(1) invocations while there.
The patch touches 136 files, so it's possible a mistake has slipped
in, but it successfully passed an amd64 bulk build.
x11/qt5/Makefile.inc runs find(1) on directories that don't exist
in all qt5/* ports. Previously the find|xargs construct accidentally
hid the find errors. I went with -find here, i.e., use make's "-"
to ignore any non-zero exit status.
OK?
Index: audio/exaile/Makefile
===================================================================
RCS file: /cvs/ports/audio/exaile/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- audio/exaile/Makefile 19 Nov 2019 21:21:10 -0000 1.39
+++ audio/exaile/Makefile 19 Mar 2020 20:26:04 -0000
@@ -50,6 +50,6 @@ SUBST_VARS += MODPY_SITEPKG
post-configure:
${SUBST_CMD} ${WRKSRC}/Makefile ${WRKSRC}/data/exaile.desktop \
${WRKSRC}/plugins/Makefile ${WRKSRC}/tools/generate-launcher
- @find ${WRKSRC} -name "*.orig" -exec rm -f {} \;
+ @find ${WRKSRC} -name "*.orig" -delete
.include <bsd.port.mk>
Index: audio/libgpod/Makefile
===================================================================
RCS file: /cvs/ports/audio/libgpod/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- audio/libgpod/Makefile 19 Nov 2019 21:21:10 -0000 1.51
+++ audio/libgpod/Makefile 19 Mar 2020 20:26:05 -0000
@@ -54,8 +54,8 @@ CONFIGURE_ARGS+=--enable-gdk-pixbuf \
--localedir=${TRUEPREFIX}/share/locale
pre-configure:
- @find ${WRKDIST} -name \*.py | \
- xargs sed -i 's,/usr/bin/python,${MODPY_BIN},g'
+ @find ${WRKDIST} -name \*.py \
+ -exec sed -i 's,/usr/bin/python,${MODPY_BIN},g' {} +
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-gpod
Index: audio/squeezecenter/Makefile
===================================================================
RCS file: /cvs/ports/audio/squeezecenter/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- audio/squeezecenter/Makefile 14 Jul 2019 02:16:51 -0000 1.21
+++ audio/squeezecenter/Makefile 19 Mar 2020 20:26:05 -0000
@@ -114,6 +114,6 @@ do-install:
cd ${WRKSRC}/; tar cf - Firmware Graphics HTML IR MySQL Plugins \
SQL strings.txt | tar xf - -C ${PREFIX}/${SSSHAREDIR}/
touch ${PREFIX}/share/examples/squeezecenter/empty
- find ${PREFIX} -name '*.orig' -print0 | xargs -0 rm
+ find ${PREFIX} -name '*.orig' -delete
.include <bsd.port.mk>
Index: books/JVMS/Makefile
===================================================================
RCS file: /cvs/ports/books/JVMS/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- books/JVMS/Makefile 14 Jul 2019 02:16:51 -0000 1.5
+++ books/JVMS/Makefile 19 Mar 2020 20:26:06 -0000
@@ -26,6 +26,6 @@ do-install:
${INSTALL_DATA_DIR} ${INSTALL_LOC}
cp -R ${WRKDIST}/* ${INSTALL_LOC}
chown -R ${DOCOWN}:${DOCGRP} ${INSTALL_LOC}
- find ${INSTALL_LOC} -type f|xargs chmod ${DOCMODE}
+ find ${INSTALL_LOC} -type f -exec chmod ${DOCMODE} {} +
.include <bsd.port.mk>
Index: comms/minicom/Makefile
===================================================================
RCS file: /cvs/ports/comms/minicom/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- comms/minicom/Makefile 12 Jul 2019 20:43:47 -0000 1.66
+++ comms/minicom/Makefile 19 Mar 2020 20:26:06 -0000
@@ -35,7 +35,6 @@ post-install:
${INSTALL_DATA} ${WRKDIST}/COPYING ${PREFIX}/share/doc/minicom
${INSTALL_DATA} ${WRKDIST}/ChangeLog ${PREFIX}/share/doc/minicom
@(umask 022; cp -RP ${WRKDIST}/extras ${PREFIX}/share/examples/minicom)
- @find ${PREFIX}/share/examples/minicom -name Makefile\* \
- -exec rm -f {} \;
+ @find ${PREFIX}/share/examples/minicom -name Makefile\* -delete
.include <bsd.port.mk>
Index: converters/lastools/Makefile
===================================================================
RCS file: /cvs/ports/converters/lastools/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- converters/lastools/Makefile 14 Feb 2020 10:40:04 -0000 1.11
+++ converters/lastools/Makefile 19 Mar 2020 20:26:06 -0000
@@ -24,7 +24,7 @@ MAKE_FLAGS = COMPILER="${CXX}" \
CXXFLAGS += -std=c++11
post-patch:
- find ${WRKSRC} -name Makefile | xargs sed -i 's/-O3/${CXXFLAGS}/'
+ find ${WRKSRC} -name Makefile -exec sed -i 's/-O3/${CXXFLAGS}/' {} +
PROGS = laszip lasinfo lasprecision las2txt txt2las las2las lasdiff
lasmerge lasindex
Index: databases/influxdb/Makefile
===================================================================
RCS file: /cvs/ports/databases/influxdb/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- databases/influxdb/Makefile 12 Nov 2019 22:05:27 -0000 1.11
+++ databases/influxdb/Makefile 19 Mar 2020 20:26:07 -0000
@@ -57,7 +57,7 @@ tarball: clean distclean
ftp -o ${WRKDIR}/${DISTFILES}
https://github.com/influxdata/influxdb/archive/v${V}/${DISTFILES}
tar -s /influxdb-${V}/influxdb/ -C
${WRKDIR}/go/src/github.com/influxdata/ -xzf ${WRKDIR}/${DISTFILES}
${SETENV} ${MAKE_ENV} bash ${WRKDIR}/gpm get ${WRKSRC}/Godeps
- find ${WRKDIR}/go -name .git -type d | xargs rm -Rf
+ find ${WRKDIR}/go -name .git -type d -prune -exec rm -Rf {} +
cd ${WRKDIR} && tar -czf /usr/ports/distfiles/${DISTFILES} go
.include <bsd.port.mk>
Index: databases/mysql-zrm/Makefile
===================================================================
RCS file: /cvs/ports/databases/mysql-zrm/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- databases/mysql-zrm/Makefile 12 Jul 2019 20:43:54 -0000 1.24
+++ databases/mysql-zrm/Makefile 19 Mar 2020 20:26:07 -0000
@@ -41,7 +41,7 @@ pre-configure:
${WRKSRC}/usr/bin/*zrm*
do-install:
- @find ${WRKSRC} \( -name "*.bak" -o -name "*.orig" -o -name
"*.beforesubst" \) -exec rm {} \;
+ @find ${WRKSRC} \( -name "*.bak" -o -name "*.orig" -o -name
"*.beforesubst" \) -delete
${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/* ${PREFIX}/bin/
cd ${WRKSRC}/usr/lib; \
tar cf - mysql-zrm | tar xf - -C ${PREFIX}/lib/
Index: databases/openldap23/Makefile
===================================================================
RCS file: /cvs/ports/databases/openldap23/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- databases/openldap23/Makefile 12 Jul 2019 20:43:54 -0000 1.27
+++ databases/openldap23/Makefile 19 Mar 2020 20:26:07 -0000
@@ -84,10 +84,9 @@ post-install:
cd ${PREFIX} && rm -fR bin include lib man/man5/ldap.conf.5 \
man/man5/ldif.5 share/examples/openldap/ldap.conf \
man/man3/ld_errno.3
- find ${PREFIX}/man/man1 -name 'ldap*' -exec rm -f {} \;
- find ${PREFIX}/man/man3 -name 'ber_*' -exec rm -f {} \;
- find ${PREFIX}/man/man3 -name 'lber*' -exec rm -f {} \;
- find ${PREFIX}/man/man3 -name 'ldap*' -exec rm -f {} \;
- find ${PREFIX}/man/man5 -name 'slapo*' -exec rm -f {} \;
+ find ${PREFIX}/man/man1 -name 'ldap*' -delete
+ find ${PREFIX}/man/man3 \
+ \( -name 'ber_*' -o -name 'lber*' -o -name 'ldap*' \) -delete
+ find ${PREFIX}/man/man5 -name 'slapo*' -delete
.include <bsd.port.mk>
Index: databases/p5-Rose-DB/Makefile
===================================================================
RCS file: /cvs/ports/databases/p5-Rose-DB/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- databases/p5-Rose-DB/Makefile 12 Jul 2019 20:43:57 -0000 1.16
+++ databases/p5-Rose-DB/Makefile 19 Mar 2020 20:26:07 -0000
@@ -26,6 +26,6 @@ RUN_DEPENDS= math/p5-Bit-Vector \
TEST_FLAGS += AUTOMATED_TESTING=1
pre-configure:
- find ${WRKSRC} -type f -name \*.orig -exec rm {} \;
+ find ${WRKSRC} -type f -name \*.orig -delete
.include <bsd.port.mk>
Index: databases/percona-toolkit/Makefile
===================================================================
RCS file: /cvs/ports/databases/percona-toolkit/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- databases/percona-toolkit/Makefile 12 Jul 2019 20:43:58 -0000 1.17
+++ databases/percona-toolkit/Makefile 19 Mar 2020 20:26:07 -0000
@@ -24,7 +24,6 @@ CONFIGURE_STYLE = perl
TEST_TARGET = test
pre-configure:
- @find ${WRKSRC} \( -name "*.orig" \) \
- -exec rm -f {} \;
+ @find ${WRKSRC} -name "*.orig" -delete
.include <bsd.port.mk>
Index: databases/pgfouine/Makefile
===================================================================
RCS file: /cvs/ports/databases/pgfouine/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- databases/pgfouine/Makefile 26 Sep 2019 21:59:30 -0000 1.18
+++ databases/pgfouine/Makefile 19 Mar 2020 20:26:07 -0000
@@ -28,7 +28,7 @@ pre-configure:
@sed -i -e 's,/usr/bin/php,${MODPHP_BIN},g;' \
-e 's,!!PREFIX!!,${PREFIX},g' \
${WRKSRC}/pgfouine.php ${WRKSRC}/pgfouine_vacuum.php
- @find ${WRKSRC} -type d -name CVS | xargs rm -fr
+ @find ${WRKSRC} -type d -name CVS -prune -exec rm -fr {} +
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/pgfouine.php ${PREFIX}/bin/pgfouine
Index: databases/ruby-redis/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-redis/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- databases/ruby-redis/Makefile 12 Jul 2019 20:44:01 -0000 1.29
+++ databases/ruby-redis/Makefile 19 Mar 2020 20:26:07 -0000
@@ -30,7 +30,7 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/test/publish_subscribe_test.rb
post-install:
- @find ${PREFIX}/${GEM_LIB}/ -name '.git*' -print0 | xargs -r0 rm
+ @find ${PREFIX}/${GEM_LIB}/ -name '.git*' -delete
@rm ${PREFIX}/${GEM_LIB}/gems/${DISTNAME}/test/*.beforesubst
.include <bsd.port.mk>
Index: databases/skytools/Makefile
===================================================================
RCS file: /cvs/ports/databases/skytools/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- databases/skytools/Makefile 6 Feb 2020 00:40:06 -0000 1.31
+++ databases/skytools/Makefile 19 Mar 2020 20:26:07 -0000
@@ -41,6 +41,6 @@ BINFILES= bulk_loader.py cube_dispatcher
pre-configure:
${SUBST_CMD} ${WRKSRC}/doc/Makefile
find ${WRKSRC} -name '*.py' \
- -exec sed -i 's,/usr/bin/env python,${MODPY_BIN},' {} \;
+ -exec sed -i 's,/usr/bin/env python,${MODPY_BIN},' {} +
.include <bsd.port.mk>
Index: devel/arduino/Makefile
===================================================================
RCS file: /cvs/ports/devel/arduino/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- devel/arduino/Makefile 17 Dec 2019 02:21:53 -0000 1.21
+++ devel/arduino/Makefile 19 Mar 2020 20:26:08 -0000
@@ -46,6 +46,6 @@ do-install:
cp -r ${WRKSRC}/{license.txt,README.md} ${PREFIX}/share/doc/arduino
cp -r ${AVR_WRKDIST}/* ${PREFIX}/share/arduino
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share
- find ${PREFIX} -type f -name \*.orig -exec rm '{}' \;
+ find ${PREFIX} -type f -name \*.orig -delete
.include <bsd.port.mk>
Index: devel/arduino-makefile/Makefile
===================================================================
RCS file: /cvs/ports/devel/arduino-makefile/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/arduino-makefile/Makefile 12 Jul 2019 21:02:13 -0000 1.2
+++ devel/arduino-makefile/Makefile 19 Mar 2020 20:26:08 -0000
@@ -37,6 +37,6 @@ do-install:
${INSTALL_MAN} ${WRKDIST}/robotis-loader.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/arduino-makefile
cp -r ${WRKDIST}/examples/* ${PREFIX}/share/examples/arduino-makefile/
- find ${PREFIX} -type f -name \*.orig -exec rm '{}' \;
+ find ${PREFIX} -type f -name \*.orig -delete
.include <bsd.port.mk>
Index: devel/avr/gcc/Makefile
===================================================================
RCS file: /cvs/ports/devel/avr/gcc/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- devel/avr/gcc/Makefile 12 Jul 2019 20:44:04 -0000 1.34
+++ devel/avr/gcc/Makefile 19 Mar 2020 20:26:08 -0000
@@ -52,8 +52,8 @@ SUBST_VARS= V
# Fix build with clang in c++11 mode
post-patch:
- find ${WRKSRC} -type f \( -name '*.[ch]' -o -name '*.cc' \) | \
- xargs egrep -l '"(HOST_WIDE|PLUGIN_COND|PRId64)' | \
+ find ${WRKSRC} -type f \( -name '*.[ch]' -o -name '*.cc' \) \
+ -exec egrep -l '"(HOST_WIDE|PLUGIN_COND|PRId64)' {} + | \
xargs sed -i -E -e 's/"(HOST_WIDE|PLUGIN_COND|PRId64)/" \1/g'
# XXX
Index: devel/cmake/Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.179
diff -u -p -r1.179 Makefile
--- devel/cmake/Makefile 11 Jan 2020 08:01:09 -0000 1.179
+++ devel/cmake/Makefile 19 Mar 2020 20:26:08 -0000
@@ -60,10 +60,10 @@ SUBST_FILES = ${WRKSRC}/Source/cmLocalGe
${WRKSRC}/bootstrap
post-patch:
- (find ${WRKSRC}/Modules -name "*.cmake" -print0; \
- find ${WRKSRC}/Tests -name "CMakeLists.txt" -print0) | \
- xargs -0 perl -e 's,/usr/local,${LOCALBASE},g; \
- s,/usr/X11R6,${LOCALBASE},g'
+ find ${WRKSRC}/Modules -name "*.cmake" \
+ -exec perl -e 's,/usr/(local|X11R6),${LOCALBASE},g' {} +
+ find ${WRKSRC}/Tests -name "CMakeLists.txt" \
+ -exec perl -e 's,/usr/(local|X11R6),${LOCALBASE},g' {} +
perl -e 's,/usr/local,${LOCALBASE},g' \
${SUBST_FILES}
perl -e 's,/usr/include,${LOCALBASE}/include,' \
@@ -71,12 +71,12 @@ post-patch:
pre-configure:
cp ${FILESDIR}/*.cmake ${WRKSRC}/Modules/
- (find ${WRKSRC}/Modules -name "*.cmake" -print0; \
- find ${WRKSRC}/Tests -name "CMakeLists.txt" -print0) | \
- xargs -0 ${SUBST_CMD}
+ find ${WRKSRC}/Modules -name "*.cmake" -exec ${SUBST_CMD} {} +
+ find ${WRKSRC}/Tests -name "CMakeLists.txt" -exec ${SUBST_CMD} {} +
${SUBST_CMD} ${SUBST_FILES}
post-install:
- @find ${WRKINST}${LOCALBASE} \( -name "*.bak" -o -name "*.orig" -o
-name "*.beforesubst" \) -exec rm {} \;
+ @find ${WRKINST}${LOCALBASE} \( -name "*.bak" -o -name "*.orig" -o \
+ -name "*.beforesubst" \) -delete
.include <bsd.port.mk>
Index: devel/jdk/1.8/Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/1.8/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- devel/jdk/1.8/Makefile 18 Jan 2020 17:42:58 -0000 1.50
+++ devel/jdk/1.8/Makefile 19 Mar 2020 20:26:09 -0000
@@ -146,7 +146,7 @@ build-bootjdk: build
@cd ${WRKTMP}/bootjdk && rm bin/appletviewer bin/policytool
jre/bin/policytool
@cd ${WRKTMP}/bootjdk/jre/lib/${ARCH} && rm libnpt.so libinstrument.so
libsplashscreen.so libjsound.so libawt_xawt.so
@LD_LIBRARY_PATH="${WRKTMP}/bootjdk/jre/lib/${ARCH}:${WRKTMP}/bootjdk/jre/lib/${ARCH}/server"
\
- find ${WRKTMP}/bootjdk -type f -perm -500 -exec ldd {} \;
2>/dev/null | \
+ find ${WRKTMP}/bootjdk -type f -perm -500 -exec ldd {} +
2>/dev/null | \
grep rlib | cut -d"/" -f 2-20 | sort -u | grep -v "\.so$$" | \
xargs -I % cp /% ${WRKTMP}/bootjdk-libs
@cd ${WRKTMP} && tar czf openjdk8-bootjdk-${ARCH}-$$(date
+%Y%m%d).tar.gz bootjdk*
Index: devel/jdk/11/Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/11/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- devel/jdk/11/Makefile 26 Feb 2020 02:17:12 -0000 1.15
+++ devel/jdk/11/Makefile 19 Mar 2020 20:26:09 -0000
@@ -187,7 +187,7 @@ build-bootjdk: build
@find ${WRKTMP}/bootjdk/lib ${WRKTMP}/bootjdk/bin -exec \
sh -c 'file {} | grep -q ELF && strip -S {}' \;
@LD_LIBRARY_PATH="${WRKTMP}/bootjdk/lib" \
- find ${WRKTMP}/bootjdk -type f -perm -500 -exec ldd {} \;
2>/dev/null | \
+ find ${WRKTMP}/bootjdk -type f -perm -500 -exec ldd {} +
2>/dev/null | \
grep rlib | cut -d"/" -f 2-20 | sort -u | grep -v "\.so$$" | \
xargs -I % cp /% ${WRKTMP}/bootjdk-libs
@cd ${WRKTMP} && tar czf openjdk-jdk11u-bootjdk-${MACHINE_ARCH}-$$(date
+%Y%m%d).tar.gz bootjdk*
Index: devel/maven/Makefile
===================================================================
RCS file: /cvs/ports/devel/maven/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- devel/maven/Makefile 12 Jul 2019 20:44:42 -0000 1.33
+++ devel/maven/Makefile 19 Mar 2020 20:26:10 -0000
@@ -36,9 +36,9 @@ do-install:
cd ${WRKDIST} && \
tar -cf - bin boot lib `find * -prune -type f` | \
tar -C ${PREFIX}/maven -xf -
- find ${WRKINST} \
- -name \*.orig -o -name \*.bat -o -name \*.cmd -o -name \*.exe |
\
- xargs rm
+ find ${WRKINST} \( \
+ -name \*.orig -o -name \*.bat -o -name \*.cmd -o -name \*.exe \
+ \) -delete
${INSTALL_DATA_DIR} ${SAMPLEDIR}/logging/
${INSTALL_DATA} ${WRKSRC}/conf/logging/* ${SAMPLEDIR}/logging/
${INSTALL_DATA} ${WRKSRC}/conf/settings.xml ${SAMPLEDIR}/
Index: devel/mingw/Makefile
===================================================================
RCS file: /cvs/ports/devel/mingw/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- devel/mingw/Makefile 12 Jul 2019 20:44:42 -0000 1.18
+++ devel/mingw/Makefile 19 Mar 2020 20:26:10 -0000
@@ -114,13 +114,13 @@ do-install:
cp -r ${MINGW32_OUT}/lib/* ${MINGW32_DIR}/lib && \
chown -R ${SHAREOWN}:${SHAREGRP} ${MINGW32_DIR}/lib && \
chmod -R 644 ${MINGW32_DIR}/lib/* && \
- find ${MINGW32_DIR}/lib -type d -exec chmod a+x {} \;
+ find ${MINGW32_DIR}/lib -type d -exec chmod a+x {} +
# Includes
cp -r ${MINGW32_OUT}/include/* ${MINGW32_DIR}/include && \
chown -R ${SHAREOWN}:${SHAREGRP} ${MINGW32_DIR}/include && \
chmod -R 644 ${MINGW32_DIR}/include/* && \
- find ${MINGW32_DIR}/include -type d -exec chmod a+x {} \;
+ find ${MINGW32_DIR}/include -type d -exec chmod a+x {} +
# Documentation
${INSTALL_MAN} ${MINGW32_OUT}/share/man/man1/* \
Index: devel/ois/Makefile
===================================================================
RCS file: /cvs/ports/devel/ois/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- devel/ois/Makefile 12 Jul 2019 20:44:43 -0000 1.14
+++ devel/ois/Makefile 19 Mar 2020 20:26:10 -0000
@@ -39,7 +39,7 @@ AUTOMAKE_VERSION = 1.10
NO_TEST = Yes
post-extract:
- find ${WRKSRC} -type f | xargs perl -pi -e 's/\015//g'
+ find ${WRKSRC} -type f -exec perl -pi -e 's/\015//g' {} +
post-patch:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
Index: devel/p5-OLE-Storage_Lite/Makefile
===================================================================
RCS file: /cvs/ports/devel/p5-OLE-Storage_Lite/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- devel/p5-OLE-Storage_Lite/Makefile 12 Jul 2019 20:45:02 -0000 1.12
+++ devel/p5-OLE-Storage_Lite/Makefile 19 Mar 2020 20:26:12 -0000
@@ -15,6 +15,6 @@ MODCPAN_EXAMPLES= Yes
MODCPAN_EXAMPLES_DIST= sample
post-extract:
- @find ${WRKDIST} -type f -exec perl -pi -e 's/\r$$//' {} \;
+ @find ${WRKDIST} -type f -exec perl -pi -e 's/\r$$//' {} +
.include <bsd.port.mk>
Index: devel/py-bytecodeassembler/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-bytecodeassembler/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- devel/py-bytecodeassembler/Makefile 12 Jul 2019 20:45:46 -0000 1.12
+++ devel/py-bytecodeassembler/Makefile 19 Mar 2020 20:26:13 -0000
@@ -25,7 +25,7 @@ BUILD_DEPENDS = ${RUN_DEPENDS}
MODPY_SETUPTOOLS = Yes
post-extract:
- @find ${WRKSRC} -type f -exec chmod 644 {} \;
+ @find ${WRKSRC} -type f -exec chmod 644 {} +
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-bytecodeassembler
Index: devel/py-decoratortools/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-decoratortools/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- devel/py-decoratortools/Makefile 12 Jul 2019 20:45:47 -0000 1.16
+++ devel/py-decoratortools/Makefile 19 Mar 2020 20:26:14 -0000
@@ -22,7 +22,7 @@ MODULES= lang/python
MODPY_SETUPTOOLS= Yes
post-install:
- find ${WRKINST}${MODPY_SITEPKG} -type f -exec chmod 444 {} \;
+ find ${WRKINST}${MODPY_SITEPKG} -type f -exec chmod 444 {} +
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-decoratortools
${INSTALL_DATA} ${WRKSRC}/README.txt
${PREFIX}/share/doc/py-decoratortools/
Index: devel/py-symboltype/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-symboltype/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- devel/py-symboltype/Makefile 12 Jul 2019 20:45:54 -0000 1.10
+++ devel/py-symboltype/Makefile 19 Mar 2020 20:26:14 -0000
@@ -23,7 +23,7 @@ MODULES = lang/python
MODPY_SETUPTOOLS = Yes
post-extract:
- @find ${WRKSRC} -type f -exec chmod 644 {} \;
+ @find ${WRKSRC} -type f -exec chmod 644 {} +
post-install:
rm ${WRKSRC}/SymbolType.egg-info/dependency_links.txt
Index: devel/ruby-highline/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-highline/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- devel/ruby-highline/Makefile 12 Jul 2019 21:02:18 -0000 1.20
+++ devel/ruby-highline/Makefile 19 Mar 2020 20:26:15 -0000
@@ -19,9 +19,9 @@ MODRUBY_TEST= testrb
MODRUBY_TEST_TARGET = -I lib test/*.rb
post-install:
- @find ${PREFIX}/${GEM_LIB}/ -type f -name \*.gitignore \
- -or -name \*.cvsignore -or -name Rakefile \
- -or -name setup.rb | xargs rm
+ @find ${PREFIX}/${GEM_LIB}/ -type f \( -name \*.gitignore \
+ -o -name \*.cvsignore -o -name Rakefile \
+ -o -name setup.rb \) -delete
@rmdir ${PREFIX}/${GEM_LIB}/gems/${DISTNAME}/doc
.include <bsd.port.mk>
Index: devel/subversion/Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.177
diff -u -p -r1.177 Makefile
--- devel/subversion/Makefile 19 Dec 2019 19:43:14 -0000 1.177
+++ devel/subversion/Makefile 19 Mar 2020 20:26:15 -0000
@@ -316,7 +316,6 @@ post-install:
-e "s,.*/usr/bin/python.*,#!${MODPY_BIN}," \
-e "s,.*env python.*,#!${MODPY_BIN}," \
{} +
- find ${PREFIX}/share/examples/subversion -type f -name '*\.orig' \
- -exec rm -f {} \;
+ find ${PREFIX}/share/examples/subversion -type f -name '*.orig' -delete
.include <bsd.port.mk>
Index: editors/TeXmacs/Makefile
===================================================================
RCS file: /cvs/ports/editors/TeXmacs/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- editors/TeXmacs/Makefile 27 Feb 2020 14:29:46 -0000 1.15
+++ editors/TeXmacs/Makefile 19 Mar 2020 20:26:15 -0000
@@ -51,7 +51,7 @@ post-extract:
${WRKSRC}/plugins/python/progs/init-python.scm
.for l in asymptote dratex gnuplot graph graphviz sympy xypic
find ${WRKSRC}/plugins/$l -name '*.scm' \
- -exec sed -i 's,python,python${MODPY_VERSION},' {} \;
+ -exec sed -i 's,python,python${MODPY_VERSION},' {} +
.endfor
.include <bsd.port.mk>
Index: emulators/dynagen/Makefile
===================================================================
RCS file: /cvs/ports/emulators/dynagen/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- emulators/dynagen/Makefile 12 Jul 2019 20:46:08 -0000 1.11
+++ emulators/dynagen/Makefile 19 Mar 2020 20:26:16 -0000
@@ -21,7 +21,7 @@ NO_TEST= Yes
PKG_ARCH= *
post-extract:
- @find ${WRKSRC} -type f -exec perl -pi -e 's:\x0d::' {} \;
+ @find ${WRKSRC} -type f -exec perl -pi -e 's:\x0d::' {} +
pre-configure:
@${SUBST_CMD} ${WRKSRC}/dynagen
Index: emulators/pcsxr/Makefile
===================================================================
RCS file: /cvs/ports/emulators/pcsxr/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- emulators/pcsxr/Makefile 12 Jul 2019 20:46:09 -0000 1.24
+++ emulators/pcsxr/Makefile 19 Mar 2020 20:26:16 -0000
@@ -44,6 +44,6 @@ RUN_DEPENDS = devel/desktop-file-utils
NO_TEST = Yes
post-install:
- find ${WRKINST} -name '*.la' -print0 | xargs -0 rm
+ find ${WRKINST} -name '*.la' -delete
.include <bsd.port.mk>
Index: games/bzflag/Makefile
===================================================================
RCS file: /cvs/ports/games/bzflag/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- games/bzflag/Makefile 12 Jul 2019 21:02:20 -0000 1.48
+++ games/bzflag/Makefile 19 Mar 2020 20:26:17 -0000
@@ -47,6 +47,6 @@ post-install:
perl -pi -e "s,^Exec=.*,Exec=bzflag,g;" \
-e
"s,^Icon=.*,Icon=${TRUEPREFIX}/share/bzflag/bzflag-48x48.png,g" \
${PREFIX}/share/applications/bzflag.desktop
- @find ${PREFIX}/lib/bzflag -name '*.la' -print | xargs rm
+ @find ${PREFIX}/lib/bzflag -name '*.la' -delete
.include <bsd.port.mk>
Index: games/dungeon/Makefile
===================================================================
RCS file: /cvs/ports/games/dungeon/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- games/dungeon/Makefile 14 Jul 2019 00:39:36 -0000 1.6
+++ games/dungeon/Makefile 19 Mar 2020 20:26:17 -0000
@@ -28,7 +28,7 @@ ALL_TARGET = dungeon
WRKDIST = ${WRKDIR}
post-extract:
- find ${WRKSRC} -type f | xargs perl -pi -e 's/\015//g; s/\032//g'
+ find ${WRKSRC} -type f -exec perl -pi -e 's/\015//g; s/\032//g' {} +
(cd ${WRKSRC}; for f in `awk '{ print $$1 }' MANIFEST | tail +3`; do \
mv `echo $$f | tr a-z A-Z` $$f; done)
Index: games/gcompris/Makefile
===================================================================
RCS file: /cvs/ports/games/gcompris/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- games/gcompris/Makefile 18 Nov 2019 19:57:44 -0000 1.71
+++ games/gcompris/Makefile 19 Mar 2020 20:26:17 -0000
@@ -66,7 +66,7 @@ pre-configure:
post-install:
rm ${PREFIX}/lib/gcompris/*.{a,la}
- find ${PREFIX}/share/gcompris -type f -perm 755 -exec chmod 644 {} \;
+ find ${PREFIX}/share/gcompris -type f -perm 755 -exec chmod 644 {} +
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/gcompris
.include <bsd.port.mk>
Index: games/jag/Makefile
===================================================================
RCS file: /cvs/ports/games/jag/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- games/jag/Makefile 12 Jul 2019 20:46:20 -0000 1.10
+++ games/jag/Makefile 19 Mar 2020 20:26:18 -0000
@@ -31,7 +31,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/jag
cd ${WRKDIR}/jag-${V}-data/data && pax -rw . ${PREFIX}/share/jag
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/
- find ${PREFIX}/share -type d -exec chmod ${DIRMODE} {} \;
- find ${PREFIX}/share -type f -exec chmod ${SHAREMODE} {} \;
+ find ${PREFIX}/share -type d -exec chmod ${DIRMODE} {} + -o \
+ -type f -exec chmod ${SHAREMODE} {} +
.include <bsd.port.mk>
Index: games/moonlander/Makefile
===================================================================
RCS file: /cvs/ports/games/moonlander/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- games/moonlander/Makefile 12 Jul 2019 20:46:21 -0000 1.13
+++ games/moonlander/Makefile 19 Mar 2020 20:26:18 -0000
@@ -38,6 +38,6 @@ do-install:
@cp -R ${WRKSRC}/{fonts,images,sounds} ${PREFIX}/share/moonlander
post-install:
- @find ${PREFIX}/share/moonlander -type f -print0 |xargs -0 chmod 444
+ @find ${PREFIX}/share/moonlander -type f -exec chmod 444 {} +
.include <bsd.port.mk>
Index: games/neverball/Makefile
===================================================================
RCS file: /cvs/ports/games/neverball/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- games/neverball/Makefile 12 Jul 2019 20:46:21 -0000 1.21
+++ games/neverball/Makefile 19 Mar 2020 20:26:18 -0000
@@ -59,7 +59,7 @@ do-install:
cd ${WRKSRC} && ${INSTALL_PROGRAM} neverball neverputt ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/neverball \
${PREFIX}/share/doc/neverball
- cd ${WRKSRC}/data && find . -type f ! -perm 644 -exec chmod 644 {} \;
+ cd ${WRKSRC}/data && find . -type f ! -perm 644 -exec chmod 644 {} +
cd ${WRKSRC} && find data -type f | pax -rw ${PREFIX}/share/neverball
cd ${WRKSRC} && find locale -type f | pax -rw ${PREFIX}/share
cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.md README.md doc/authors.txt \
Index: games/openarena/Makefile
===================================================================
RCS file: /cvs/ports/games/openarena/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- games/openarena/Makefile 12 Jul 2019 20:46:21 -0000 1.22
+++ games/openarena/Makefile 19 Mar 2020 20:26:18 -0000
@@ -69,7 +69,7 @@ WRKDIST = ${WRKDIR}/openarena-engine-so
ALL_TARGET = release
post-extract:
- find ${WRKDIR} -name '*.orig' -print0 | xargs -0r rm -f
+ find ${WRKDIR} -name '*.orig' -delete
mkdir ${WRKSRC}/code/sndio
cp ${FILESDIR}/snd_sndio.c ${WRKSRC}/code/sndio
Index: games/pokerth/Makefile
===================================================================
RCS file: /cvs/ports/games/pokerth/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- games/pokerth/Makefile 21 Feb 2020 16:07:06 -0000 1.46
+++ games/pokerth/Makefile 19 Mar 2020 20:26:18 -0000
@@ -55,8 +55,7 @@ pre-configure:
cd ${WRKSRC} && \
protoc --cpp_out=src/third_party/protobuf chatcleaner.proto && \
protoc --cpp_out=src/third_party/protobuf pokerth.proto && \
- find . -name "*.pro" -print0 | xargs -0r perl -pi \
- -e 's,qmake,${MODQT5_QMAKE},g;'
+ find . -name "*.pro" -exec perl -pi -e 's,qmake,${MODQT5_QMAKE},g;' {} +
post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/pokerth ${PREFIX}/bin
Index: games/rocksndiamonds/Makefile
===================================================================
RCS file: /cvs/ports/games/rocksndiamonds/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- games/rocksndiamonds/Makefile 17 Jan 2020 07:44:21 -0000 1.41
+++ games/rocksndiamonds/Makefile 19 Mar 2020 20:26:18 -0000
@@ -35,7 +35,7 @@ NO_TEST = Yes
N = rocksndiamonds
post-extract:
- @find ${WRKSRC} -name \*.orig -exec rm {} \;
+ @find ${WRKSRC} -name \*.orig -delete
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/bin
Index: games/vegastrike/data/Makefile
===================================================================
RCS file: /cvs/ports/games/vegastrike/data/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- games/vegastrike/data/Makefile 27 Apr 2019 23:55:04 -0000 1.5
+++ games/vegastrike/data/Makefile 19 Mar 2020 20:26:19 -0000
@@ -29,7 +29,7 @@ do-install:
post-install:
find ${PREFIX}/share/vegastrike/modules/builtin/ \
- -name *.py | xargs ${MODPY_BIN_ADJ}
+ -name *.py -exec ${MODPY_BIN_ADJ} {} +
${MODPY_BIN_ADJ} \
${PREFIX}/share/vegastrike/cgi-accountserver/accountserver.py
Index: games/zangband/Makefile
===================================================================
RCS file: /cvs/ports/games/zangband/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- games/zangband/Makefile 14 Jul 2019 00:39:37 -0000 1.28
+++ games/zangband/Makefile 19 Mar 2020 20:26:19 -0000
@@ -40,8 +40,7 @@ do-install:
(cd ${WRKDIST}/lib && tar -cf - * ) | \
(cd ${PREFIX}/share/zangband && tar -xf - )
@chown -R ${SHAREOWN}:games ${PREFIX}/share/zangband
- @find ${PREFIX} \( -name Makefile\* -o -name delete.me \) \
- -exec rm "{}" \;
+ @find ${PREFIX} \( -name Makefile\* -o -name delete.me \) -delete
${INSTALL} -s -o ${BINOWN} -g games -m 2555 ${WRKSRC}/src/zangband \
${PREFIX}/bin
Index: geo/qlandkartegt/Makefile
===================================================================
RCS file: /cvs/ports/geo/qlandkartegt/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- geo/qlandkartegt/Makefile 5 Oct 2019 22:29:30 -0000 1.33
+++ geo/qlandkartegt/Makefile 19 Mar 2020 20:26:19 -0000
@@ -35,7 +35,7 @@ CONFIGURE_ARGS = -DQK_QT5_PORT=No \
-DCMAKE_CXX_FLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
post-extract:
- @find ${WRKDIST} -name *.orig -exec rm {} \;
+ @find ${WRKDIST} -name *.orig -delete
@rm ${WRKSRC}/cmake/Modules/FindGDAL.cmake
@rm ${WRKSRC}/cmake/Modules/FindJPEG.cmake
Index: graphics/GraphicsMagick/Makefile
===================================================================
RCS file: /cvs/ports/graphics/GraphicsMagick/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- graphics/GraphicsMagick/Makefile 1 Mar 2020 10:04:24 -0000 1.63
+++ graphics/GraphicsMagick/Makefile 19 Mar 2020 20:26:19 -0000
@@ -69,6 +69,6 @@ post-install:
@perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
${PREFIX}/bin/GraphicsMagick++-config \
${PREFIX}/bin/GraphicsMagick-config
- @find ${PREFIX}/lib/GraphicsMagick/modules-Q16 -name '*.a' -print |
xargs rm
+ @find ${PREFIX}/lib/GraphicsMagick/modules-Q16 -name '*.a' -delete
.include <bsd.port.mk>
Index: graphics/openimageio/Makefile
===================================================================
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- graphics/openimageio/Makefile 21 Nov 2019 17:49:57 -0000 1.38
+++ graphics/openimageio/Makefile 19 Mar 2020 20:26:20 -0000
@@ -67,6 +67,6 @@ WANTLIB += atomic
.endif
post-install:
- find ${PREFIX} -name '*.orig' -exec rm -f {} \;
+ find ${PREFIX} -name '*.orig' -delete
.include <bsd.port.mk>
Index: graphics/p5-Image-MetaData-JPEG/Makefile
===================================================================
RCS file: /cvs/ports/graphics/p5-Image-MetaData-JPEG/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- graphics/p5-Image-MetaData-JPEG/Makefile 12 Jul 2019 20:47:07 -0000
1.13
+++ graphics/p5-Image-MetaData-JPEG/Makefile 19 Mar 2020 20:26:20 -0000
@@ -12,6 +12,6 @@ CATEGORIES= graphics
PERMIT_PACKAGE= Yes
pre-configure:
- @find ${WRKSRC} -name '*.orig' -print0 | xargs -0 rm
+ @find ${WRKSRC} -name '*.orig' -delete
.include <bsd.port.mk>
Index: graphics/povray/Makefile
===================================================================
RCS file: /cvs/ports/graphics/povray/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- graphics/povray/Makefile 14 Jul 2019 00:39:37 -0000 1.38
+++ graphics/povray/Makefile 19 Mar 2020 20:26:20 -0000
@@ -58,7 +58,7 @@ post-extract:
-s ',^libpng-${PNG_V},png,' 'libpng-${PNG_V}/png*.[ch]'
pre-patch:
- cd ${WRKSRC} && find . -type f -name \*.orig | xargs rm
+ cd ${WRKSRC} && find . -type f -name \*.orig -delete
post-configure:
sed -i 's,%INSTALLDIR%,${PREFIX}/share/povray/,g' \
Index: graphics/py-matplotlib/Makefile
===================================================================
RCS file: /cvs/ports/graphics/py-matplotlib/Makefile,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile
--- graphics/py-matplotlib/Makefile 10 Mar 2020 03:31:45 -0000 1.80
+++ graphics/py-matplotlib/Makefile 19 Mar 2020 20:26:20 -0000
@@ -72,7 +72,7 @@ post-patch:
cp ${WRKSRC}/setup.cfg{.template,}
pre-configure:
- @find ${WRKSRC}/examples -name \*.py | xargs ${MODPY_BIN_ADJ}
+ @find ${WRKSRC}/examples -name \*.py -exec ${MODPY_BIN_ADJ} {} +
${SUBST_CMD} ${WRKSRC}/setupext.py
post-install:
Index: graphics/sane-backends/Makefile
===================================================================
RCS file: /cvs/ports/graphics/sane-backends/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- graphics/sane-backends/Makefile 9 Feb 2020 20:33:40 -0000 1.89
+++ graphics/sane-backends/Makefile 19 Mar 2020 20:26:21 -0000
@@ -74,7 +74,7 @@ FAKE_FLAGS= configdir=${PREFIX}/share/e
post-install:
# removing the microtek2 backend which needs a Linux kernel module
- find ${PREFIX} -name \*microtek2\* | xargs rm
+ find ${PREFIX} -name \*microtek2\* -delete
cp -R ${WRKSRC}/tools/openbsd/ \
${PREFIX}/share/examples/sane-backends/hotplug
rm ${PREFIX}/share/doc/sane-backends/README*
Index: graphics/scratch/Makefile
===================================================================
RCS file: /cvs/ports/graphics/scratch/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- graphics/scratch/Makefile 12 Jul 2019 20:47:10 -0000 1.19
+++ graphics/scratch/Makefile 19 Mar 2020 20:26:21 -0000
@@ -59,8 +59,8 @@ do-install:
cp -r ${WRKSRC}/$f ${SC_DIR}/$f
.endfor
chown -R ${SHAREOWN}:${SHAREGRP} ${SC_DIR}
- find ${SC_DIR} -type d -exec chmod 755 {} ';'
- find ${SC_DIR} -type f -exec chmod 444 {} ';'
+ find ${SC_DIR} -type d -exec chmod 755 {} + -o \
+ -type f -exec chmod 444 {} +
${INSTALL_SCRIPT} ${WRKBUILD}/scratch ${PREFIX}/bin/scratch
${INSTALL_MAN_DIR} ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKBUILD}/scratch.1 ${PREFIX}/man/man1/scratch.1
Index: japanese/Wnn/Makefile
===================================================================
RCS file: /cvs/ports/japanese/Wnn/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- japanese/Wnn/Makefile 12 Jul 2019 20:47:14 -0000 1.82
+++ japanese/Wnn/Makefile 19 Mar 2020 20:26:21 -0000
@@ -91,12 +91,11 @@ post-patch:
for file in Wnn/jd/jserverrc cWnn/cd/cserverrc kWnn/kd/kserverrc; do\
perl -pi.bak -e 's,\@LIBDIR/\@LANG/dic,${WNNDICDIR}/\@LANG,;' $$file;
done
# Commands are installed directly under /usr/local/bin and dictionaries in
/var/dict
- @{ for dir in ${SRCDOCDIRS}; do \
- find ${WRKSRC}/$$dir -type f; done; } \
- | xargs perl -pi.bok -e \
- 's,/usr/local/bin/Wnn4/,${PREFIX}/bin/,g;
s,/usr/local/lib/wnn/dic,${WNNDICDIR},g;'
- @{ for dir in ${SRCDOCDIRS}; do \
- find ${WRKSRC}/$$dir -type f -name \*.bok; done; } | xargs rm
+ @for dir in ${SRCDOCDIRS}; do \
+ find ${WRKSRC}/$$dir -type f -exec perl -pi.bok -e \
+ 's,/usr/local/bin/Wnn4/,${PREFIX}/bin/,g;
s,/usr/local/lib/wnn/dic,${WNNDICDIR},g;' {} + ; done
+ @for dir in ${SRCDOCDIRS}; do \
+ find ${WRKSRC}/$$dir -type f -name \*.bok -delete ; done
do-configure:
@echo " WNNDICDIR = ${WNNDICDIR}" >${CONFIG_FILE}
Index: lang/fpc/Makefile
===================================================================
RCS file: /cvs/ports/lang/fpc/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- lang/fpc/Makefile 28 Jan 2020 20:32:50 -0000 1.19
+++ lang/fpc/Makefile 19 Mar 2020 20:26:21 -0000
@@ -79,7 +79,7 @@ post-install:
-o ${PREFIX}/share/examples/fpc-$V/fpc.cfg.sample
do-test:
- find ${WRKSRC} -name Package.fpc | xargs rm -f
+ find ${WRKSRC} -name Package.fpc -delete
cd ${WRKSRC}/fpcsrc/tests && \
env -i ${ALL_TEST_ENV} ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} full
Index: lang/jruby/Makefile
===================================================================
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- lang/jruby/Makefile 5 Mar 2020 15:29:13 -0000 1.84
+++ lang/jruby/Makefile 19 Mar 2020 20:26:21 -0000
@@ -85,8 +85,8 @@ do-install:
cd ${WRKBUILD}/lib && tar -cf - * | \
tar -C ${JRUBY_HOME}/lib -xf -
mkdir -p ${JRUBY_HOME}/lib/ruby/{1.8,1.9,2.0}/site_ruby
- find ${JRUBY_HOME}/lib -name '*.orig' -print0 | xargs -0r rm
- find ${JRUBY_HOME}/lib -name '*.beforesubst' -print0 | xargs -0r rm
+ find ${JRUBY_HOME}/lib \( -name '*.orig' -o -name '*.beforesubst' \) \
+ -delete
mv ${JRUBY_HOME}/lib/ruby/gems/{shared,1.8}
ln -s 1.8 ${JRUBY_HOME}/lib/ruby/gems/shared
chown -R ${SHAREOWN}:${SHAREGRP} ${JRUBY_HOME}/lib
Index: lang/kawa/Makefile
===================================================================
RCS file: /cvs/ports/lang/kawa/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- lang/kawa/Makefile 30 Jan 2020 07:52:29 -0000 1.20
+++ lang/kawa/Makefile 19 Mar 2020 20:26:21 -0000
@@ -50,8 +50,7 @@ TEST_FLAGS = DIFF=diff \
# Use a bit complex xargs avoid unneeded modifications to files
# causing build issues on i386.
pre-patch:
- find ${WRKSRC} -type f | \
- xargs fgrep -l "JAR =" | \
+ find ${WRKSRC} -type f -exec fgrep -l "JAR =" {} + | \
xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'; \
touch ${WRKSRC}/configure.ac
sed -i 's,/usr/bin,${LOCALBASE}/bin,g' ${WRKDIST}/doc/*.man
Index: lang/racket-minimal/Makefile
===================================================================
RCS file: /cvs/ports/lang/racket-minimal/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- lang/racket-minimal/Makefile 19 Feb 2020 20:39:56 -0000 1.61
+++ lang/racket-minimal/Makefile 19 Mar 2020 20:26:22 -0000
@@ -116,7 +116,7 @@ CONFIGURE_ARGS += --disable-jit \
.endif
post-install:
- @find ${PREFIX} -type f -name '*.orig' -exec rm -f {} \;
+ @find ${PREFIX} -type f -name '*.orig' -delete
@perl -i -pe 's/installation-name . "snapshot"/installation-name .
"$V"/g' ${WRKINST}/etc/racket/config.rktd
@mv ${WRKINST}/etc/racket ${PREFIX}/share/examples
@cp ${WRKDIR}/racket-openbsd/racket-user-bin-paths ${PREFIX}/bin
Index: lang/ruby/Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/ruby/Makefile.inc,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile.inc
--- lang/ruby/Makefile.inc 19 Nov 2019 17:20:12 -0000 1.23
+++ lang/ruby/Makefile.inc 19 Mar 2020 20:26:22 -0000
@@ -79,7 +79,7 @@ CFLAGS_OVERRIDE = -O1
FIX_RIPPER ?= sed -i 's/%%CFLAGS_OVERRIDE%%/${CFLAGS_OVERRIDE}/g' \
${WRKSRC}/ext/ripper/depend;
-PRE_INSTALL ?= find ${WRKSRC} -name '*.orig' -print0 | xargs -0r rm; \
+PRE_INSTALL ?= find ${WRKSRC} -name '*.orig' -delete; \
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ruby \
${PREFIX}/lib/ruby/gems/${REV}/extensions/${SUB} \
${PREFIX}/lib/ruby/gems/${REV}/extensions/${SUB}/${REV};
Index: lang/ruby/ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.99
diff -u -p -r1.99 ruby.port.mk
--- lang/ruby/ruby.port.mk 2 Jan 2020 21:21:56 -0000 1.99
+++ lang/ruby/ruby.port.mk 19 Mar 2020 20:26:22 -0000
@@ -175,8 +175,8 @@ MODRUBY_RUBY_ADJ = perl -pi \
MODRUBY_ADJ_FILES?=
.if !empty(MODRUBY_ADJ_FILES)
MODRUBY_ADJ_REPLACE= for pat in ${MODRUBY_ADJ_FILES:QL}; do \
- find ${WRKSRC} -type f -name "$$pat" -print0 | \
- xargs -0r ${MODRUBY_RUBY_ADJ} ; \
+ find ${WRKSRC} -type f -name "$$pat" \
+ -exec ${MODRUBY_RUBY_ADJ} {} + ; \
done
MODRUBY_pre-configure += ${MODRUBY_ADJ_REPLACE}
.endif
Index: mail/alpine/Makefile
===================================================================
RCS file: /cvs/ports/mail/alpine/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- mail/alpine/Makefile 12 Jul 2019 20:47:24 -0000 1.45
+++ mail/alpine/Makefile 19 Mar 2020 20:26:22 -0000
@@ -130,7 +130,7 @@ post-install:
${PREFIX}/share/examples/imap-uw
tar -C ${WRKSRC}/imap/docs -cf - . | \
tar -C ${PREFIX}/share/doc/imap-uw -xf -
- find ${PREFIX}/share/doc/imap-uw -type f -exec chmod 0644 {} \;
+ find ${PREFIX}/share/doc/imap-uw -type f -exec chmod 0644 {} +
# mailutil
${INSTALL_PROGRAM} ${WRKBUILD}/imap/mailutil/mailutil ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/imap/src/mailutil/mailutil.1 ${PREFIX}/man/man1
Index: mail/dovecot/Makefile
===================================================================
RCS file: /cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.287
diff -u -p -r1.287 Makefile
--- mail/dovecot/Makefile 7 Mar 2020 11:36:52 -0000 1.287
+++ mail/dovecot/Makefile 19 Mar 2020 20:26:22 -0000
@@ -103,7 +103,6 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh \
${PREFIX}/sbin/dovecot-mkcert.sh
@rm ${PREFIX}/share/doc/dovecot/{dovecot-openssl.cnf,mkcert.sh}
- @find ${PREFIX}/lib/dovecot -name '*.a' -print | xargs rm
- @find ${PREFIX}/lib/dovecot -name '*.la' -print | xargs rm
+ @find ${PREFIX}/lib/dovecot \( -name '*.a' -o -name '*.la' \) -delete
.include <bsd.port.mk>
Index: mail/dovecot-pigeonhole/Makefile
===================================================================
RCS file: /cvs/ports/mail/dovecot-pigeonhole/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- mail/dovecot-pigeonhole/Makefile 7 Mar 2020 09:53:47 -0000 1.71
+++ mail/dovecot-pigeonhole/Makefile 19 Mar 2020 20:26:22 -0000
@@ -33,8 +33,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/
LDFLAGS="-L${LOCALBASE}/lib"
post-install:
- @find ${PREFIX}/lib/dovecot -name '*.a' -print | xargs rm
- @find ${PREFIX}/lib/dovecot -name '*.la' -print | xargs rm
+ @find ${PREFIX}/lib/dovecot \( -name '*.a' -o -name '*.la' \) -delete
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dovecot/
@mv ${PREFIX}/share/doc/dovecot/example-config/ \
${PREFIX}/share/examples/dovecot/
Index: mail/exmh2/Makefile
===================================================================
RCS file: /cvs/ports/mail/exmh2/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- mail/exmh2/Makefile 17 Jul 2019 14:46:33 -0000 1.36
+++ mail/exmh2/Makefile 19 Mar 2020 20:26:22 -0000
@@ -43,7 +43,7 @@ do-install:
cd ${PREFIX}/share && echo 'auto_mkindex exmh'\
| ${MODTCL_BIN}
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/exmh
- find ${PREFIX}/share/exmh -type d -print0 | xargs -0 chmod ${DIRMODE}
- find ${PREFIX}/share/exmh -type f -print0 | xargs -0 chmod ${SHAREMODE}
+ find ${PREFIX}/share/exmh -type d -exec chmod ${DIRMODE} {} + \
+ -o -type f -exec chmod ${SHAREMODE} {} +
.include <bsd.port.mk>
Index: mail/kopano/core/Makefile
===================================================================
RCS file: /cvs/ports/mail/kopano/core/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- mail/kopano/core/Makefile 8 Mar 2020 09:22:39 -0000 1.51
+++ mail/kopano/core/Makefile 19 Mar 2020 20:26:22 -0000
@@ -162,7 +162,8 @@ pre-configure:
${WRKSRC}/tools/python-scripts/kopano-cachestat
perl -pi -e 's,/bin/bash,/bin/sh,g' \
${WRKSRC}/installer/searchscripts/{attachments_parser,zmktemp}
- find ${WRKSRC} -type f | xargs perl -pi -e
's,/usr/bin/python3,${MODPY_BIN},g'
+ find ${WRKSRC} -type f -exec \
+ perl -pi -e 's,/usr/bin/python3,${MODPY_BIN},g' {} +
post-install:
${INSTALL_DATA_DIR} ${WRKINST}${INSTDIR}
@@ -185,7 +186,7 @@ post-install:
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/kopano_search/plaintext.py \
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/kopano/daemon/version/version_info.py
- find ${PREFIX} -name "*.la" -exec rm {} \;
+ find ${PREFIX} -name "*.la" -delete
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
${PREFIX}/share/kopano-dagent/python \
Index: mail/mailscanner/Makefile
===================================================================
RCS file: /cvs/ports/mail/mailscanner/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- mail/mailscanner/Makefile 12 Jul 2019 20:47:29 -0000 1.60
+++ mail/mailscanner/Makefile 19 Mar 2020 20:26:22 -0000
@@ -47,7 +47,7 @@ NO_TEST= Yes
post-extract:
@cd ${WRKDIR} && ${TAR} xzf
MailScanner-install-${V}.${Vs}/perl-tar/MailScanner-${V}.${Vss}${EXTRACT_SUFX}
&& \
- find ${WRKDIST} -type d | xargs chmod 755
+ find ${WRKDIST} -type d -exec chmod 755 {} +
do-install: install_libexec install_etc install_share install_lib
install_bin
@@ -105,7 +105,7 @@ install_share:
@${INST_DATA} ${WRKDIR}/MailScanner-install-${V}.${Vs}/README
${PREFIX}/share/doc/MailScanner/README
@cd ${WRKSRC}/etc ; find reports -type d -exec ${INSTALL_DATA_DIR}
${PREFIX}'/share/examples/MailScanner/{}' \;
@cd ${WRKSRC}/etc ; find reports -type f ! -name "*.orig" | while read
f; do ${INST_DATA} $$f ${PREFIX}/share/examples/MailScanner/$$f; done
- @cd ${PREFIX}/share/examples/MailScanner/reports ; find . -name "*.bak"
-print0 | xargs -0 rm -f
+ @find ${PREFIX}/share/examples/MailScanner/reports -name "*.bak" -delete
install_lib:
${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/MailScanner
Index: mail/sendmail/Makefile
===================================================================
RCS file: /cvs/ports/mail/sendmail/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- mail/sendmail/Makefile 12 Jul 2019 20:47:38 -0000 1.27
+++ mail/sendmail/Makefile 19 Mar 2020 20:26:23 -0000
@@ -91,8 +91,7 @@ post-install:
mv ${PREFIX}/man/man${section}/${manpage}.${section} \
${PREFIX}/man/man${section}/sendmail-${manpage}.${section}
.endfor
- find ${PREFIX}/bin/ -type l -print -execdir rm -f {} ';' | \
- sed 's/^/rm -f /'
+ find ${PREFIX}/bin/ -type l -print -delete | sed 's/^/rm -f /'
mv ${PREFIX}/sbin/makemap ${PREFIX}/libexec/sendmail
.for file in sendmail-enable sendmail-disable
@echo "Installing ${PREFIX}/sbin/${file}"
Index: mail/z-push/Makefile
===================================================================
RCS file: /cvs/ports/mail/z-push/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- mail/z-push/Makefile 26 Sep 2019 21:59:30 -0000 1.58
+++ mail/z-push/Makefile 19 Mar 2020 20:26:23 -0000
@@ -33,7 +33,7 @@ RUN_DEPENDS= mail/kopano/core,-mapi \
do-install:
${INSTALL_DATA_DIR} ${INSTDIR}
cp -Rp ${WRKSRC}/src/* ${INSTDIR}
- find ${INSTDIR} -type f -name \*.orig -exec rm -f {} \;
+ find ${INSTDIR} -type f -name \*.orig -delete
find ${INSTDIR} -name config.php -exec mv {} {}.dist \;
${SUBST_CMD} -m 0644 -c ${FILESDIR}/z-push.conf \
${INSTDIR}/z-push.conf.dist
Index: math/freemat/Makefile
===================================================================
RCS file: /cvs/ports/math/freemat/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- math/freemat/Makefile 12 Jul 2019 20:47:40 -0000 1.37
+++ math/freemat/Makefile 19 Mar 2020 20:26:23 -0000
@@ -40,7 +40,7 @@ CONFIGURE_ARGS= -DUSE_LLVM:BOOL=FALSE
WRKDIST= ${WRKDIR}/FreeMat-${V}.1-Source
post-extract:
- @cd ${WRKSRC} && find . -name \*.moc.cpp | xargs rm
+ @cd ${WRKSRC} && find . -name \*.moc.cpp -delete
pre-configure:
@rm ${WRKSRC}/CMakeCache.txt
Index: math/prover9/p9m4/Makefile
===================================================================
RCS file: /cvs/ports/math/prover9/p9m4/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- math/prover9/p9m4/Makefile 2 Nov 2015 11:56:55 -0000 1.8
+++ math/prover9/p9m4/Makefile 19 Mar 2020 20:26:24 -0000
@@ -29,7 +29,7 @@ SAMPLES_DIR= ${PREFIX}/share/p9m4/Sampl
# The tarball is a mess and not really designed for installation.
post-extract:
rm -r ${WRKSRC}/Samples/Kauer.in\~
- find ${WRKSRC} -type f -name \*~ -exec rm -f {} \;
+ find ${WRKSRC} -type f -name \*~ -delete
pre-configure:
${SUBST_CMD} ${WRKSRC}/files.py
Index: misc/mc/Makefile
===================================================================
RCS file: /cvs/ports/misc/mc/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- misc/mc/Makefile 10 Feb 2020 19:34:33 -0000 1.70
+++ misc/mc/Makefile 19 Mar 2020 20:26:24 -0000
@@ -42,9 +42,8 @@ DEBUG_PACKAGES= ${BUILD_PACKAGES}
post-install:
@mv ${WRKINST}${SYSCONFDIR}/mc ${PREFIX}/share/examples
@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/mc
- @find ${PREFIX}/share/examples/mc -type f | \
- xargs chmod ${SHAREMODE}
- @find ${PREFIX}/share/examples/mc -type d | \
- xargs chmod ${DIRMODE}
+ @find ${PREFIX}/share/examples/mc \
+ -type f -exec chmod ${SHAREMODE} {} + -o \
+ -type d -exec chmod ${DIRMODE} {} +
.include <bsd.port.mk>
Index: multimedia/libquicktime/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- multimedia/libquicktime/Makefile 12 Jul 2019 20:47:56 -0000 1.62
+++ multimedia/libquicktime/Makefile 19 Mar 2020 20:26:25 -0000
@@ -52,7 +52,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/
ac_cv_header_soundcard_h=no
post-install:
- @find ${PREFIX}/lib/libquicktime -name '*.a' -print | xargs rm
- @find ${PREFIX}/lib -name '*.la' -print | xargs rm
+ @find ${PREFIX}/lib/libquicktime -name '*.a' -delete
+ @find ${PREFIX}/lib -name '*.la' -delete
.include <bsd.port.mk>
Index: multimedia/lives/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/lives/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- multimedia/lives/Makefile 12 Jul 2019 20:47:56 -0000 1.22
+++ multimedia/lives/Makefile 19 Mar 2020 20:26:25 -0000
@@ -52,8 +52,8 @@ CONFIGURE_ARGS += --disable-jack \
WRKDIST = ${WRKDIR}/${DISTNAME:L}
pre-configure:
- find ${WRKSRC} -name Makefile.in -print0 | \
- xargs -0r perl -pi -e 's/ -O3/ ${CFLAGS} -std=gnu89/g'
+ find ${WRKSRC} -name Makefile.in -exec \
+ perl -pi -e 's/ -O3/ ${CFLAGS} -std=gnu89/g' {} +
pre-install:
@cd ${WRKDIST}/po && ${MAKE_PROGRAM} update-po
@@ -61,6 +61,6 @@ pre-install:
post-install:
mv ${WRKINST}/${TRUEPREFIX}/share/doc/lives-${V} \
${WRKINST}/${TRUEPREFIX}/share/doc/lives/
- find ${WRKINST}/${TRUEPREFIX}/lib/lives/plugins -name '*.la' | xargs rm
+ find ${WRKINST}/${TRUEPREFIX}/lib/lives/plugins -name '*.la' -delete
.include <bsd.port.mk>
Index: multimedia/sfml/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/sfml/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- multimedia/sfml/Makefile 18 Mar 2020 18:53:45 -0000 1.11
+++ multimedia/sfml/Makefile 19 Mar 2020 20:26:25 -0000
@@ -50,7 +50,7 @@ NO_TEST = Yes
WRKDIST = ${WRKDIR}/SFML-${V}
post-extract:
- find ${WRKSRC} -type f -exec perl -pi -e 's/\015//g' {} \;
+ find ${WRKSRC} -type f -exec perl -pi -e 's/\015//g' {} +
mkdir ${WRKSRC}/src/SFML/Window/OpenBSD
cp ${FILESDIR}/JoystickImpl.* ${WRKSRC}/src/SFML/Window/OpenBSD
Index: multimedia/xine-lib/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.144
diff -u -p -r1.144 Makefile
--- multimedia/xine-lib/Makefile 25 Dec 2019 15:50:45 -0000 1.144
+++ multimedia/xine-lib/Makefile 19 Mar 2020 20:26:25 -0000
@@ -98,6 +98,6 @@ pre-configure:
sed -i 's/__u32/u_int32_t/' ${WRKSRC}/src/input/input_pvr.c
post-install:
- @find ${PREFIX}/lib/xine/plugins -name '*.a' -print | xargs rm
+ @find ${PREFIX}/lib/xine/plugins -name '*.a' -delete
.include <bsd.port.mk>
Index: net/apache-activemq/Makefile
===================================================================
RCS file: /cvs/ports/net/apache-activemq/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- net/apache-activemq/Makefile 12 Jul 2019 20:47:59 -0000 1.34
+++ net/apache-activemq/Makefile 19 Mar 2020 20:26:25 -0000
@@ -45,8 +45,9 @@ do-install:
${INSTALL_DATA} ${FILESDIR}/activemq.conf
${PREFIX}/share/examples/activemq/
mv ${PREFIX}/activemq/conf ${PREFIX}/share/examples/activemq/
# Lots of weird modes to fixup, use a sledgehammer
- find ${INSTALL_DIRS} -type f -print0 | xargs -0 chmod ${SHAREMODE}
- find ${PREFIX}/activemq/bin/ -type f -name \*.jar -print0 | xargs -0
chmod ${BINMODE}
+ find ${INSTALL_DIRS} -type f -exec chmod ${SHAREMODE} {} +
+ find ${PREFIX}/activemq/bin/ -type f -name \*.jar \
+ -exec chmod ${BINMODE} {} +
cd ${PREFIX}/activemq && ln -sf /var/db/activemq/data data
cd ${PREFIX}/activemq && ln -sf /var/db/activemq/tmp tmp
cd ${PREFIX}/activemq && ln -sf ${SYSCONFDIR}/activemq conf
Index: net/argus/Makefile
===================================================================
RCS file: /cvs/ports/net/argus/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- net/argus/Makefile 12 Jul 2019 20:47:59 -0000 1.24
+++ net/argus/Makefile 19 Mar 2020 20:26:25 -0000
@@ -29,7 +29,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/argus/
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/argus/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/argus/events
- find ${WRKSRC}/support -type f -name '*.orig' -exec rm -f {} \;
+ find ${WRKSRC}/support -type f -name '*.orig' -delete
cd ${WRKSRC}/support && tar cf - . | \
tar -C ${PREFIX}/share/examples/argus/ -xf -
cd ${PREFIX}/bin && mv argus-snmp argus-lsof argus-vmstat \
Index: net/argus-clients/Makefile
===================================================================
RCS file: /cvs/ports/net/argus-clients/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- net/argus-clients/Makefile 12 Jul 2019 20:47:59 -0000 1.17
+++ net/argus-clients/Makefile 19 Mar 2020 20:26:25 -0000
@@ -33,7 +33,7 @@ MAKE_FLAGS = CCOPT="${CFLAGS}" COMPATLIB
FAKE_FLAGS = docdir=${PREFIX}/share/doc/argus-clients/
post-extract:
- @find ${WRKSRC} -name '.gdb_history' -exec rm -f {} \;
+ @find ${WRKSRC} -name '.gdb_history' -delete
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/argus/
Index: net/bitlbee/Makefile
===================================================================
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- net/bitlbee/Makefile 12 Jul 2019 20:48:23 -0000 1.72
+++ net/bitlbee/Makefile 19 Mar 2020 20:26:25 -0000
@@ -65,8 +65,8 @@ NO_TEST= Yes
# don't hide compile command lines
pre-configure:
- find ${WRKSRC} -name Makefile | \
- xargs perl -pi -e 's,@\$$\(CC\),\$$(CC),g'
+ find ${WRKSRC} -name Makefile -exec \
+ perl -pi -e 's,@\$$\(CC\),\$$(CC),g' {} +
post-build:
${MAKE_PROGRAM} -C ${WRKSRC}/doc/user-guide user-guide.html
Index: net/epic4/Makefile
===================================================================
RCS file: /cvs/ports/net/epic4/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- net/epic4/Makefile 12 Jul 2019 20:48:26 -0000 1.76
+++ net/epic4/Makefile 19 Mar 2020 20:26:25 -0000
@@ -37,6 +37,6 @@ SUBST_VARS= VERSION
post-extract:
@mv -f ${WRKDIR}/help ${WRKSRC}
- @find ${WRKSRC}/help -name CVS | xargs rm -rf
+ @find ${WRKSRC}/help -name CVS -prune -exec rm -rf {} +
.include <bsd.port.mk>
Index: net/icinga/web/Makefile
===================================================================
RCS file: /cvs/ports/net/icinga/web/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- net/icinga/web/Makefile 10 Mar 2020 21:23:06 -0000 1.43
+++ net/icinga/web/Makefile 19 Mar 2020 20:26:26 -0000
@@ -58,15 +58,15 @@ pre-configure:
ln -s ${MODPHP_BIN} ${WRKDIR}/bin/php
post-configure:
- find ${WRKSRC}/bin -name '*.sh' -print0 | xargs -0r \
- perl -pi -e 's,^#!/bin/bash,#!${LOCALBASE}/bin/bash,g'
+ find ${WRKSRC}/bin -name '*.sh' -exec \
+ perl -pi -e 's,^#!/bin/bash,#!${LOCALBASE}/bin/bash,g' {} +
${SUBST_CMD} ${WRKSRC}/etc/apache2/icinga-web.conf
pre-install:
${INSTALL_DATA_DIR} ${WRKINST}${VARBASE}/www/conf/modules.sample
post-install:
- find ${WRKINST} -name '*.orig' -print0 | xargs -0r rm
+ find ${WRKINST} -name '*.orig' -delete
cd ${WRKSRC}/etc/schema; pax -rw ./ ${PREFIX}/etc/schema/
for i in ${PREFIX}/etc/conf.d/*xml; do mv $$i $$i.dist; done
for i in pnp-host-extension.xml pnp-service-extension.xml; do \
Index: net/icinga/web2/Makefile
===================================================================
RCS file: /cvs/ports/net/icinga/web2/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- net/icinga/web2/Makefile 12 Mar 2020 09:39:09 -0000 1.39
+++ net/icinga/web2/Makefile 19 Mar 2020 20:26:26 -0000
@@ -30,7 +30,7 @@ do-configure:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/icinga-web2
cd ${WRKSRC}; pax -rw ./ ${PREFIX}/icinga-web2/
- find ${PREFIX}/icinga-web2 -name '*.orig' | xargs rm
+ find ${PREFIX}/icinga-web2 -name '*.orig' -delete
ln -s ${TRUEPREFIX}/icinga-web2/bin/icingacli \
${WRKINST}/usr/local/bin/
Index: net/ircd-ratbox/Makefile
===================================================================
RCS file: /cvs/ports/net/ircd-ratbox/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- net/ircd-ratbox/Makefile 12 Jul 2019 20:48:29 -0000 1.30
+++ net/ircd-ratbox/Makefile 19 Mar 2020 20:26:26 -0000
@@ -61,6 +61,6 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ircd-ratbox
cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} \
${PREFIX}/share/doc/ircd-ratbox
- @find ${PREFIX}/lib -name '*.la' -print | xargs rm
+ @find ${PREFIX}/lib -name '*.la' -delete
.include <bsd.port.mk>
Index: net/librenms/Makefile
===================================================================
RCS file: /cvs/ports/net/librenms/Makefile,v
retrieving revision 1.99
diff -u -p -r1.99 Makefile
--- net/librenms/Makefile 7 Mar 2020 14:16:24 -0000 1.99
+++ net/librenms/Makefile 19 Mar 2020 20:26:26 -0000
@@ -65,7 +65,7 @@ post-extract:
-e
's,"/usr/bin/(mtr|nmap|nfdump|ipmitool|virsh|dot|sfdp),"/usr/local/bin/\1,;' \
-e
's,"/usr/lib/nagios/plugins,"/usr/local/libexec/nagios/plugins,;' \
${WRKSRC}/misc/config_definitions.json
- find ${WRKSRC} -type f -print0 | xargs -r0 perl -pi -e '$R'
+ find ${WRKSRC} -type f -exec perl -pi -e '$R' {} +
sed -i \
-e 's, librenms *, _librenms ,' \
-e 's,/var/www/librenms/cronic,-n,' \
Index: net/libtorrent/Makefile
===================================================================
RCS file: /cvs/ports/net/libtorrent/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- net/libtorrent/Makefile 25 Feb 2020 07:02:08 -0000 1.61
+++ net/libtorrent/Makefile 19 Mar 2020 20:26:26 -0000
@@ -43,5 +43,6 @@ CXXFLAGS += -std=c++11
# this patches *only* files containing tr1 to no longer refer to tr1
# we do it pre-patch, because autoconf passes right after us
pre-patch:
- find ${WRKDIST} -type f|xargs fgrep -lw tr1|xargs sed -i.bak -e
's,<tr1/,<,' -e 's/std::tr1/std/g'
+ find ${WRKDIST} -type f -exec fgrep -lw tr1 {} + | \
+ xargs sed -i.bak -e 's,<tr1/,<,' -e 's/std::tr1/std/g'
.include <bsd.port.mk>
Index: net/maradns/Makefile
===================================================================
RCS file: /cvs/ports/net/maradns/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- net/maradns/Makefile 12 Jul 2019 20:48:31 -0000 1.23
+++ net/maradns/Makefile 19 Mar 2020 20:26:26 -0000
@@ -21,7 +21,7 @@ MAKE_FLAGS= CC="${CC}" FLAGS="${CFLAGS}
NO_TEST= Yes
post-configure:
- @find ${WRKSRC} -type f | xargs perl -pi -e "s,/etc,${SYSCONFDIR},g"
+ @find ${WRKSRC} -type f -exec perl -pi -e "s,/etc,${SYSCONFDIR},g" {} +
@perl -pi -e "s, = 99, = 537," ${WRKSRC}/doc/en/examples/ex*
post-install:
Index: net/mfi/Makefile
===================================================================
RCS file: /cvs/ports/net/mfi/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- net/mfi/Makefile 14 Jul 2019 02:16:52 -0000 1.15
+++ net/mfi/Makefile 19 Mar 2020 20:26:26 -0000
@@ -37,8 +37,8 @@ do-install:
ln -fs ${LOCALBASE}/bin/mongod ${INSTDIR}/bin/mongod
ln -s /var/log/mfi ${INSTDIR}/logs
chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
- find ${INSTDIR} -type f|xargs chmod ${SHAREMODE}
- find ${INSTDIR} -type d|xargs chmod ${DIRMODE}
+ find ${INSTDIR} -type f -exec chmod ${SHAREMODE} {} + -o \
+ -type d -exec chmod ${DIRMODE} {} +
${SUBST_CMD} -c -m 555 -o ${BINOWN} -g ${BINGRP} \
${FILESDIR}/mfi.sh ${PREFIX}/bin/mfi
Index: net/netatalk/Makefile
===================================================================
RCS file: /cvs/ports/net/netatalk/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- net/netatalk/Makefile 12 Jul 2019 20:48:33 -0000 1.67
+++ net/netatalk/Makefile 19 Mar 2020 20:26:26 -0000
@@ -50,7 +50,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/README.AppleTalk \
${PREFIX}/share/doc/netatalk
mv ${WRKINST}/etc/netatalk ${PREFIX}/share/examples/
- @find ${PREFIX}/lib/netatalk/uams -name '*.a' -print | xargs rm
- @find ${PREFIX}/lib/netatalk/uams -name '*.la' -print | xargs rm
+ @find ${PREFIX}/lib/netatalk/uams \( -name '*.a' -o -name '*.la' \) \
+ -delete
.include <bsd.port.mk>
Index: net/nfsen/Makefile
===================================================================
RCS file: /cvs/ports/net/nfsen/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- net/nfsen/Makefile 3 Feb 2020 20:40:39 -0000 1.45
+++ net/nfsen/Makefile 19 Mar 2020 20:26:26 -0000
@@ -49,7 +49,7 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/contrib/PortTracker/PortTracker.pm
${PREFIX}/lib/nfsen/plugins/
${INSTALL_SCRIPT} ${WRKSRC}/contrib/PortTracker/PortTracker.php
${WWWDIR}/nfsen/plugins/
-mv ${WWWDIR}/nfsen/conf.php ${WWWDIR}/nfsen/conf.php.dist
- find ${WRKINST} -name '*.orig' -or -name '._*' -print0 | xargs -0r rm
+ find ${WRKINST} \( -name '*.orig' -o -name '._*' \) -delete
chown -R ${SHAREOWN}:${SHAREGRP} ${WRKINST}/var/www/htdocs/nfsen
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/bin ${PREFIX}/lib
${PREFIX}/libdata
Index: net/ntp/Makefile
===================================================================
RCS file: /cvs/ports/net/ntp/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- net/ntp/Makefile 12 Jul 2019 20:48:34 -0000 1.79
+++ net/ntp/Makefile 19 Mar 2020 20:26:27 -0000
@@ -42,7 +42,7 @@ LIB_DEPENDS= devel/libevent2
# the distribution tarball was updated incompletely
post-extract:
@touch ${WRKDIR}/timestamp
- @find ${WRKSRC} -type f -print0 | xargs -0 touch -r ${WRKDIR}/timestamp
+ @find ${WRKSRC} -type f -exec touch -r ${WRKDIR}/timestamp {} +
# patch-sntp_tests_packetProcessing_c triggers a ruby script to regenerate
# run-packetProcessing.c. Avoid ruby, run file does not change anyway.
Index: net/p5-NetPacket/Makefile
===================================================================
RCS file: /cvs/ports/net/p5-NetPacket/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- net/p5-NetPacket/Makefile 12 Jul 2019 20:48:41 -0000 1.13
+++ net/p5-NetPacket/Makefile 19 Mar 2020 20:26:27 -0000
@@ -16,6 +16,6 @@ BUILD_DEPENDS= net/p5-Net-Pcap
NO_TEST= Yes
post-install:
- @find ${WRKINST} -name '*.orig' | xargs rm
+ @find ${WRKINST} -name '*.orig' -delete
.include <bsd.port.mk>
Index: net/php-weathermap/Makefile
===================================================================
RCS file: /cvs/ports/net/php-weathermap/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- net/php-weathermap/Makefile 3 Feb 2020 20:40:40 -0000 1.22
+++ net/php-weathermap/Makefile 19 Mar 2020 20:26:27 -0000
@@ -45,6 +45,6 @@ do-install:
${INSTALL_DATA} ${FILESDIR}/editor-config.php-dist ${INSTDIR}
chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
chmod -R u=rwX,og=rX ${INSTDIR}
- find ${INSTDIR} -name '*.orig' -print0 | xargs -0r rm
+ find ${INSTDIR} -name '*.orig' -delete
.include <bsd.port.mk>
Index: net/pidgin/Makefile
===================================================================
RCS file: /cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.145
diff -u -p -r1.145 Makefile
--- net/pidgin/Makefile 12 Jul 2019 20:48:43 -0000 1.145
+++ net/pidgin/Makefile 19 Mar 2020 20:26:27 -0000
@@ -143,8 +143,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/purple.service \
${PREFIX}/share/dbus-1/services
.for dir in ${ARCHIVE_DIR_LIST}
- @find ${PREFIX}/lib/${dir} -name '*.a' -print | xargs rm
- @find ${PREFIX}/lib/${dir} -name '*.la' -print | xargs rm
+ @find ${PREFIX}/lib/${dir} \( -name '*.a' -o -name '*.la' \) -delete
.endfor
.include <bsd.port.mk>
Index: net/py-zsi/Makefile
===================================================================
RCS file: /cvs/ports/net/py-zsi/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- net/py-zsi/Makefile 12 Jul 2019 20:48:47 -0000 1.10
+++ net/py-zsi/Makefile 19 Mar 2020 20:26:28 -0000
@@ -28,6 +28,6 @@ TEST_IS_INTERACTIVE=Yes
TEST_DEPENDS=${BUILD_PKGPATH}
do-test:
- find ${WRKSRC}/test -name \*.py -exec ${MODPY_BIN} {} \;
+ find ${WRKSRC}/test -name \*.py -exec ${MODPY_BIN} {} +
.include <bsd.port.mk>
Index: net/rtorrent/Makefile
===================================================================
RCS file: /cvs/ports/net/rtorrent/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- net/rtorrent/Makefile 25 Feb 2020 07:02:21 -0000 1.68
+++ net/rtorrent/Makefile 19 Mar 2020 20:26:28 -0000
@@ -41,6 +41,7 @@ post-install:
# this patches *only* files containing tr1 to no longer refer to tr1
# we do it pre-patch, because autoconf passes right after us
pre-patch:
- find ${WRKDIST} -type f|xargs fgrep -lw tr1|xargs sed -i.bak -e
's,<tr1/,<,' -e 's/std::tr1/std/g' -e
's/tr1::placeholders::/std::placeholders::/g' -e 's/tr1::bind/std::bind/g'
+ find ${WRKDIST} -type f -exec fgrep -lw tr1 {} + | \
+ xargs sed -i.bak -e 's,<tr1/,<,' -e 's/std::tr1/std/g' -e
's/tr1::placeholders::/std::placeholders::/g' -e 's/tr1::bind/std::bind/g'
.include <bsd.port.mk>
Index: net/samba/Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.286
diff -u -p -r1.286 Makefile
--- net/samba/Makefile 24 Jan 2020 13:29:42 -0000 1.286
+++ net/samba/Makefile 19 Mar 2020 20:26:28 -0000
@@ -198,22 +198,22 @@ SAMBA_LOGDIR = ${VARBASE}/log/samba
SUBST_VARS = SAMBA_LOGDIR
post-patch:
- find ${WRKSRC} -type f | xargs ${MODPY_BIN_ADJ}
+ find ${WRKSRC} -type f -exec ${MODPY_BIN_ADJ} {} +
post-install:
# removing extra files
- find ${PREFIX} \
- -name '*${PATCHORIG}' -or \
- -name '*.beforesubst' -or \
- -name '*.deconforig' | \
- xargs -rt rm --
+ find ${PREFIX} \( \
+ -name '*${PATCHORIG}' -o \
+ -name '*.beforesubst' -o \
+ -name '*.deconforig' \) \
+ -delete
# fix path to perl modules
mv ${PREFIX}/share/perl5/* ${PREFIX}/${P5SITE}
# precompiling Python modules
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${WRKINST}${MODPY_SITEPKG}
${MODPY_BIN} -O ${MODPY_LIBDIR}/compileall.py ${WRKINST}${MODPY_SITEPKG}
# removing extra symlinks
- find ${PREFIX}/lib -type l -name '*.so' -exec rm {} ';'
+ find ${PREFIX}/lib -type l -name '*.so' -delete
# creating library symlinks
.for _l in ${UTIL_LIBS}
cd ${PREFIX}/lib && ln -fs samba/lib${_l}.so.${LIB${_l}_VERSION}
@@ -222,8 +222,9 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/samba
cp -R ${WRKDIST}/examples/* ${PREFIX}/share/examples/samba
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/samba
- find ${PREFIX}/share/examples/samba -type f | xargs chmod ${SHAREMODE}
- find ${PREFIX}/share/examples/samba -type d | xargs chmod ${DIRMODE}
+ find ${PREFIX}/share/examples/samba \
+ -type f -exec chmod ${SHAREMODE} {} + -o \
+ -type d -exec chmod ${DIRMODE} {} +
sed -e 's:/usr/spool/samba:/var/spool/samba:g' \
-e 's:/usr/local/samba/var/log:${SAMBA_LOGDIR}/smbd:g' \
-e 's:MYGROUP:WORKGROUP:' \
Index: news/trn/Makefile
===================================================================
RCS file: /cvs/ports/news/trn/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- news/trn/Makefile 14 Jul 2019 00:39:38 -0000 1.24
+++ news/trn/Makefile 19 Mar 2020 20:26:28 -0000
@@ -35,7 +35,8 @@ FAKE_FLAGS= \
installfilexp=${WRKINST}${PREFIX}/lib/trn/filexp
post-install:
- find ${PREFIX}/lib/trn/HelpFiles | xargs chown ${SHAREOWN}:${SHAREGRP}
+ find ${PREFIX}/lib/trn/HelpFiles \
+ -exec chown ${SHAREOWN}:${SHAREGRP} {} +
NO_TEST= Yes
Index: plan9/plan9port/Makefile
===================================================================
RCS file: /cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- plan9/plan9port/Makefile 11 Sep 2019 13:42:35 -0000 1.31
+++ plan9/plan9port/Makefile 19 Mar 2020 20:26:28 -0000
@@ -62,7 +62,7 @@ do-build:
do-install:
.for l in .cvsignore .hg .hgignore .hgtags .gitignore .gitkeep *.orig
*.beforesubst .travis.yml
- find ${WRKSRC} -name "$l" -exec rm -f {} \;
+ find ${WRKSRC} -name "$l" -delete
.endfor
cd ${WRKSRC} && sed -i 's#/usr/local#${TRUEPREFIX}#' \
`cat lib/moveplan9.files`
Index: print/foomatic-db/Makefile
===================================================================
RCS file: /cvs/ports/print/foomatic-db/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- print/foomatic-db/Makefile 12 Jul 2019 20:48:54 -0000 1.49
+++ print/foomatic-db/Makefile 19 Mar 2020 20:26:29 -0000
@@ -35,13 +35,13 @@ pre-configure:
### Fedora
# splix
- find ${WRKSRC}/db/source/printer -name '*.xml' | \
- xargs grep -l "<driver>splix"|xargs -r rm
+ find ${WRKSRC}/db/source/printer -name '*.xml' \
+ -exec grep -l "<driver>splix" {} + | xargs -r rm
rm ${WRKSRC}/db/source/driver/splix.xml
# foo2zjs
.for x in zjs zjs-z1 zjs-z2 zjs-z3 oak oak-z1 hp qpdl lava kyo xqx slx hiperc
hiperc-z1 hbpl2
- find ${WRKSRC}/db/source/printer -name '*.xml' | \
- xargs grep -l "<driver>foo2${x}" | xargs -r rm
+ find ${WRKSRC}/db/source/printer -name '*.xml' \
+ -exec grep -l "<driver>foo2${x}" {} + | xargs -r rm
find ${WRKSRC}/db/source/printer -name '*.xml' | \
grep -E 'Samsung-CLP-610|Samsung-CLP-620' | xargs -r rm
find ${WRKSRC}/db/source/printer -name '*.xml' | \
@@ -51,14 +51,14 @@ pre-configure:
.endfor
# these use binaries that are not provided anymore
.for x in lm1100 pentaxpj pbm2l2030 pbm2l7k lex5700 lex7000 c2050 c2070 cjet
- find ${WRKSRC}/db/source/printer -name '*.xml' | \
- xargs grep -l "<driver>${x}</driver>"| xargs -r rm
+ find ${WRKSRC}/db/source/printer -name '*.xml' \
+ -exec grep -l "<driver>${x}</driver>" {} + | xargs -r rm
rm -f ${WRKSRC}/db/source/driver/${x}.xml \
${WRKSRC}/db/source/opt/${x}-*
.endfor
.for x in drv_x125 ml85p pbm2lwxl pbmtozjs bjc800j m2300w m2400w
- find ${WRKSRC}/db/source/printer -name '*.xml' | \
- xargs grep -l "<driver>${x}</driver>"| xargs -r rm
+ find ${WRKSRC}/db/source/printer -name '*.xml' \
+ -exec grep -l "<driver>${x}</driver>" {} + | xargs -r rm
rm -f ${WRKSRC}/db/source/driver/${x}.xml \
${WRKSRC}/db/source/opt/${x}-*
.endfor
Index: print/ghostscript/gnu/Makefile
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v
retrieving revision 1.114
diff -u -p -r1.114 Makefile
--- print/ghostscript/gnu/Makefile 12 Jul 2019 20:48:55 -0000 1.114
+++ print/ghostscript/gnu/Makefile 19 Mar 2020 20:26:29 -0000
@@ -139,7 +139,7 @@ NO_TEST= Yes
# Avoid surprises in update-patches.
# Use the old-style (non-autoconf) build.
post-extract:
- find ${WRKDIST} -name '*.orig' -type f | xargs -r rm
+ find ${WRKDIST} -name '*.orig' -type f -delete
ln -s base/unix-gcc.mak ${WRKDIST}/Makefile
cd ${WRKSRC} && mkdir junk && \
mv expat freetype ijs jpeg lcms lcms2 libpng jbig2dec \
Index: print/hplip/Makefile
===================================================================
RCS file: /cvs/ports/print/hplip/Makefile,v
retrieving revision 1.175
diff -u -p -r1.175 Makefile
--- print/hplip/Makefile 14 Mar 2020 14:12:13 -0000 1.175
+++ print/hplip/Makefile 19 Mar 2020 20:26:29 -0000
@@ -167,8 +167,8 @@ CFLAGS += -Wno-return-type
DEBUG_PACKAGES= -main -common -hpaio -hpcups -hpijs
pre-configure:
- find ${WRKSRC} -name \*.py | \
- xargs perl -pi -e 's,(/usr/bin/python|/usr/bin/env
python),${MODPY_BIN},g'
+ find ${WRKSRC} -name \*.py -exec \
+ perl -pi -e 's,(/usr/bin/python|/usr/bin/env
python),${MODPY_BIN},g' {} +
sed -i 's,/usr/bin/python,${MODPY_BIN},g' \
${WRKSRC}/fax/filters/pstotiff
${SUBST_CMD} \
Index: print/lyx/Makefile
===================================================================
RCS file: /cvs/ports/print/lyx/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- print/lyx/Makefile 16 Mar 2020 02:40:45 -0000 1.90
+++ print/lyx/Makefile 19 Mar 2020 20:26:29 -0000
@@ -67,8 +67,8 @@ pre-configure:
${WRKSRC}/lib/lyx2lyx/lyx2lyx \
${WRKSRC}/lib/scripts/listerrors \
${WRKSRC}/src/graphics/GraphicsConverter.cpp
- find ${WRKSRC} -name "*.py" -print0 | xargs -0 \
- perl -pi -e "s,#! ?/usr/bin/(env )?python,#!${MODPY_BIN},"
+ find ${WRKSRC} -name "*.py" -exec \
+ perl -pi -e "s,#! ?/usr/bin/(env )?python,#!${MODPY_BIN}," {} +
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
Index: print/openclipart/Makefile
===================================================================
RCS file: /cvs/ports/print/openclipart/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- print/openclipart/Makefile 12 Jul 2019 20:48:56 -0000 1.13
+++ print/openclipart/Makefile 19 Mar 2020 20:26:29 -0000
@@ -27,7 +27,6 @@ do-install:
tar -xjf ${FULLDISTDIR}/${DISTFILES} \
-C ${PREFIX}/share -s ',^openclipart-$V-full,openclipart,'
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/openclipart/
- find ${PREFIX}/share/openclipart -type f -print0 | \
- xargs -0 chmod a-x
+ find ${PREFIX}/share/openclipart -type f -exec chmod a-x {} +
.include <bsd.port.mk>
Index: print/scribus/Makefile
===================================================================
RCS file: /cvs/ports/print/scribus/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- print/scribus/Makefile 27 Feb 2020 14:06:13 -0000 1.69
+++ print/scribus/Makefile 19 Mar 2020 20:26:29 -0000
@@ -49,8 +49,8 @@ CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=
# delete DOS line endings
post-extract:
- @find ${WRKSRC} -type f -name "*.cpp" | xargs perl -i -pe 's/\r$$//'
- @find ${WRKSRC} -type f -name "*.h" | xargs perl -i -pe 's/\r$$//'
+ @find ${WRKSRC} -type f \( -name "*.cpp" -o -name "*.h" \) -exec \
+ perl -i -pe 's/\r$$//' {} +
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/applications
Index: productivity/gbirthday/Makefile
===================================================================
RCS file: /cvs/ports/productivity/gbirthday/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- productivity/gbirthday/Makefile 12 Jul 2019 20:48:58 -0000 1.11
+++ productivity/gbirthday/Makefile 19 Mar 2020 20:26:29 -0000
@@ -33,7 +33,7 @@ post-patch:
sed -i 's,@VER@,${GH_TAGNAME:S/v//},g'
${WRKSRC}/src/gbirthday/__init__.py
pre-install:
- find ${WRKSRC} -name \*.orig -exec rm {} \;
+ find ${WRKSRC} -name \*.orig -delete
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/src/gb ${PREFIX}/bin/gbirthday
Index: security/hatchet/Makefile
===================================================================
RCS file: /cvs/ports/security/hatchet/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- security/hatchet/Makefile 12 Jul 2019 20:49:02 -0000 1.10
+++ security/hatchet/Makefile 19 Mar 2020 20:26:30 -0000
@@ -37,7 +37,7 @@ do-configure:
${WRKDIST}/sbin/hatchet_mkdb
do-install:
- @find ${WRKDIST} -name \*.bak -or -name \*.orig | xargs rm
+ @find ${WRKDIST} \( -name \*.bak -o -name \*.orig \) -delete
@cp -pR ${WRKDIST} ${INSTDIR}
.include <bsd.port.mk>
Index: sysutils/logstash/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/logstash/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- sysutils/logstash/Makefile 13 Mar 2020 21:05:04 -0000 1.32
+++ sysutils/logstash/Makefile 19 Mar 2020 20:26:33 -0000
@@ -55,7 +55,7 @@ do-build:
cd ${WRKSRC}/vendor/jruby/lib/ruby/stdlib/ffi/platform/ && \
rm -r
*-{aix,cygwin,darwin,freebsd,gnu,linux,netbsd,solaris,windows}*
@# apply hammer to fixup weird modes
- find ${WRKSRC}/vendor/ -type f -exec chmod 0644 {} \;
+ find ${WRKSRC}/vendor/ -type f -exec chmod 0644 {} +
chmod 755 ${WRKSRC}/vendor/jruby/bin/*
do-install:
Index: sysutils/resmon/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/resmon/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- sysutils/resmon/Makefile 12 Jul 2019 20:49:50 -0000 1.7
+++ sysutils/resmon/Makefile 19 Mar 2020 20:26:33 -0000
@@ -37,7 +37,7 @@ pre-configure:
${SUBST_CMD} ${WRKDIST}/resmon ${WRKDIST}/resmon.conf.sample
do-install:
- @find ${WRKDIST} -name \*.bak -or -name \*.orig | xargs rm
+ @find ${WRKDIST} \( -name \*.bak -o -name \*.orig \) -delete
${INSTALL_SCRIPT} ${WRKSRC}/resmon ${PREFIX}/sbin
@cp -R ${WRKDIST}/lib/Resmon ${INSTDIR}
${INSTALL_DATA_DIR} ${DOCSDIR}
Index: textproc/calibre/Makefile
===================================================================
RCS file: /cvs/ports/textproc/calibre/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- textproc/calibre/Makefile 6 Mar 2020 12:13:22 -0000 1.76
+++ textproc/calibre/Makefile 19 Mar 2020 20:26:35 -0000
@@ -80,8 +80,8 @@ MODPY_DISTUTILS_INSTALL = install --pref
# Remove bundled cherrypy so it uses the system version
pre-configure:
cd ${WRKSRC} && (rm -rf src/cherrypy ; \
- find . -name '*.py' -print0 | xargs -0 perl -pi.beforesubst -e \
- 's,#!/usr/bin/env python(2)?,#!${MODPY_BIN},' )
+ find . -name '*.py' -exec perl -pi.beforesubst -e \
+ 's,#!/usr/bin/env python(2)?,#!${MODPY_BIN},' {} + )
cd ${WRKSRC}/setup && ${SUBST_CMD} build.py build_environment.py
cp ${FILESDIR}/fake-xdg ${WRKDIR}/bin; chmod +x ${WRKDIR}/bin/fake-xdg
.for i in xdg-icon-resource xdg-desktop-menu xdg-mime
Index: textproc/groff/Makefile
===================================================================
RCS file: /cvs/ports/textproc/groff/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- textproc/groff/Makefile 30 Dec 2019 12:34:55 -0000 1.48
+++ textproc/groff/Makefile 19 Mar 2020 20:26:35 -0000
@@ -40,7 +40,6 @@ CONFIGURE_ENV += ac_cv_prog_PDFFONTS= \
TEST_TARGET = check
pre-configure:
- find ${WRKBUILD} -name \*.pl -type f -print0 | \
- xargs -0 ${MODPERL_BIN_ADJ}
+ find ${WRKBUILD} -name \*.pl -type f -exec ${MODPERL_BIN_ADJ} {} +
.include <bsd.port.mk>
Index: textproc/icu4c/Makefile
===================================================================
RCS file: /cvs/ports/textproc/icu4c/Makefile,v
retrieving revision 1.78
diff -u -p -r1.78 Makefile
--- textproc/icu4c/Makefile 14 Mar 2020 13:22:07 -0000 1.78
+++ textproc/icu4c/Makefile 19 Mar 2020 20:26:35 -0000
@@ -81,7 +81,7 @@ TEST_ENV += ICU_DATA="${WRKBUILD}/data/
TEST_DEPENDS= ${BASE_PKGPATH}=${VERSION}
post-install:
- find ${PREFIX}/lib -type l -name 'libicu*.so*' -exec rm '{}' \;
+ find ${PREFIX}/lib -type l -name 'libicu*.so*' -delete
${INSTALL_DATA_DIR} ${WRKINST}/var/www${TRUEPREFIX}/share/icu/${VERSION}
${INSTALL_DATA} ${PREFIX}/share/icu/${VERSION}/${ENDIAN_DATA}.dat \
${WRKINST}/var/www${TRUEPREFIX}/share/icu/${VERSION}/
Index: www/blogsum/Makefile
===================================================================
RCS file: /cvs/ports/www/blogsum/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- www/blogsum/Makefile 12 Jul 2019 20:50:18 -0000 1.16
+++ www/blogsum/Makefile 19 Mar 2020 20:26:37 -0000
@@ -34,7 +34,7 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/examples/httpd-blogsum.conf
do-install:
- @find ${WRKDIST} -name \*.bak -or -name \*.orig | xargs rm
+ @find ${WRKDIST} \( -name \*.bak -o -name \*.orig \) -delete
@cp -R ${WRKDIST} ${INSTDIR}
.include <bsd.port.mk>
Index: www/kibana/Makefile
===================================================================
RCS file: /cvs/ports/www/kibana/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- www/kibana/Makefile 13 Mar 2020 21:01:20 -0000 1.40
+++ www/kibana/Makefile 19 Mar 2020 20:26:38 -0000
@@ -35,7 +35,7 @@ do-install:
${PREFIX}/share/examples/kibana/
rm -r ${WRKDIST}/*.{orig,txt} ${WRKDIST}/{data,plugins} \
${WRKDIST}/{bin/*.{orig,beforesubst},config,node}
- find ${WRKDIST} \( -name \*~ -or -name \.*~ \) -print0 | xargs -0 rm
+ find ${WRKDIST} \( -name \*~ -o -name \.*~ \) -delete
cd ${WRKDIST} && cp -R * ${PREFIX}/kibana/
${INSTALL_DATA_DIR} ${PREFIX}/kibana/config
cd ${PREFIX}/kibana && \
Index: www/larbin/Makefile
===================================================================
RCS file: /cvs/ports/www/larbin/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- www/larbin/Makefile 12 Jul 2019 20:50:47 -0000 1.16
+++ www/larbin/Makefile 19 Mar 2020 20:26:38 -0000
@@ -30,12 +30,12 @@ USE_X11 = Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/global.cc
# Now fixup some C++ constructs not supported by clang
- find ${WRKSRC}/src -name '*.cc' -or -name '*.h' | xargs \
+ find ${WRKSRC}/src \( -name '*.cc' -o -name '*.h' \) -exec \
sed -i -e 's|<iostream.h>|<iostream>| ; \
s|<string.h>|<cstring>| ; \
s|\([[:blank:]]\)cerr|\1std::cerr|g ; \
s|\([[:blank:]]\)cout|\1std::cout|g ; \
- s|\([[:blank:]]\)endl|\1std::endl|g'
+ s|\([[:blank:]]\)endl|\1std::endl|g' {} +
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/larbin ${PREFIX}/bin
Index: www/moinmoin/Makefile
===================================================================
RCS file: /cvs/ports/www/moinmoin/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- www/moinmoin/Makefile 12 Jul 2019 20:50:48 -0000 1.35
+++ www/moinmoin/Makefile 19 Mar 2020 20:26:38 -0000
@@ -26,7 +26,7 @@ pre-configure:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/moinmoin
- find ${PREFIX}/share/moin -type f -exec chmod 0644 {} \;
+ find ${PREFIX}/share/moin -type f -exec chmod 0644 {} +
cd ${WRKSRC}/docs && ${INSTALL_DATA} CHANGES INSTALL.html \
README.migration UPDATE.html ${PREFIX}/share/doc/moinmoin
Index: www/p5-HTTP-Message/Makefile
===================================================================
RCS file: /cvs/ports/www/p5-HTTP-Message/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/p5-HTTP-Message/Makefile 12 Jul 2019 20:50:55 -0000 1.6
+++ www/p5-HTTP-Message/Makefile 19 Mar 2020 20:26:38 -0000
@@ -22,6 +22,6 @@ RUN_DEPENDS = textproc/p5-Encode-Locale>
TEST_DEPENDS = devel/p5-Try-Tiny
post-build:
- @find ${WRKSRC}/blib \( -name "*.orig" -or -name "*.rej" \)
-exec rm -f {} \;
+ @find ${WRKSRC}/blib \( -name "*.orig" -o -name "*.rej" \)
-delete
.include <bsd.port.mk>
Index: www/pear/Makefile
===================================================================
RCS file: /cvs/ports/www/pear/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- www/pear/Makefile 26 Sep 2019 21:57:42 -0000 1.28
+++ www/pear/Makefile 19 Mar 2020 20:26:39 -0000
@@ -43,13 +43,13 @@ do-build:
cd ${WRKSRC}; perl ${FILESDIR}/run-go-pear ${WRKINST} ${PREFIX}
${MODPHP_BIN}
do-install:
- @find ${WRKINST}${PREFIX-main} -name "*.php" -exec perl -pi -e
"s,${WRKINST},,g" {} \;
- @find ${WRKINST}${PREFIX-utils}/bin -type f -exec perl -pi -e
"s,${WRKINST},,g" {} \;
+ @find ${WRKINST}${PREFIX-main} -name "*.php" -exec perl -pi -e
"s,${WRKINST},,g" {} +
+ @find ${WRKINST}${PREFIX-utils}/bin -type f -exec perl -pi -e
"s,${WRKINST},,g" {} +
@for _f in patch-usr_local_bin_pear patch-usr_local_bin_peardev \
patch-usr_local_bin_pecl
patch-var_www_pear_lib_PEAR_Config_php; do \
patch -d ${WRKINST} < ${FILESDIR}/$${_f}; done
- @find ${WRKINST}/usr/local/bin -type f -exec ${SUBST_CMD} {} \;
+ @find ${WRKINST}/usr/local/bin -type f -exec ${SUBST_CMD} {} +
@perl -pi -e "s,OPENBSD_PEAR_ROOT,'${PREFIX-main}/pear',g" \
${WRKINST}${PREFIX-main}/pear/lib/PEAR/Config.php
@touch ${WRKINST}${PREFIX-main}/pear/.lock
Index: www/phpldapadmin/Makefile
===================================================================
RCS file: /cvs/ports/www/phpldapadmin/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- www/phpldapadmin/Makefile 26 Sep 2019 21:59:31 -0000 1.49
+++ www/phpldapadmin/Makefile 19 Mar 2020 20:26:39 -0000
@@ -30,7 +30,7 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/phpldapadmin
cd ${WRKBUILD} && tar -cf - * .* | \
tar -C ${PREFIX}/phpldapadmin -xf -
- find ${PREFIX}/phpldapadmin -name '*.orig' | xargs -r rm -f
+ find ${PREFIX}/phpldapadmin -name '*.orig' -delete
chown -R root:daemon ${PREFIX}/phpldapadmin
.include <bsd.port.mk>
Index: www/phpmyadmin/Makefile
===================================================================
RCS file: /cvs/ports/www/phpmyadmin/Makefile,v
retrieving revision 1.139
diff -u -p -r1.139 Makefile
--- www/phpmyadmin/Makefile 23 Jan 2020 13:54:49 -0000 1.139
+++ www/phpmyadmin/Makefile 19 Mar 2020 20:26:39 -0000
@@ -37,7 +37,7 @@ post-extract:
${WRKSRC}/examples/phpMyAdmin-nginx.conf
do-install:
- @find ${WRKSRC} -type f -name "*.orig" -exec rm -f {} \;
+ @find ${WRKSRC} -type f -name "*.orig" -delete
${INSTALL_DATA_DIR} ${INSTDIR}/
cd ${WRKSRC}; pax -rw ./ ${INSTDIR}/
Index: www/py-webob/Makefile
===================================================================
RCS file: /cvs/ports/www/py-webob/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- www/py-webob/Makefile 8 Nov 2019 23:37:32 -0000 1.15
+++ www/py-webob/Makefile 19 Mar 2020 20:26:39 -0000
@@ -31,7 +31,7 @@ EXAMPLES = comment-example.txt file-exam
wiki-example.txt
post-extract:
- find ${WRKSRC} -perm 0666 -exec chmod 0644 {} \;
+ find ${WRKSRC} -perm 0666 -exec chmod 0644 {} +
PYPKGNAME = ${MODPY_PY_PREFIX}webob
Index: www/ruby-passenger/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-passenger/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- www/ruby-passenger/Makefile 24 Jan 2020 13:25:03 -0000 1.66
+++ www/ruby-passenger/Makefile 19 Mar 2020 20:26:39 -0000
@@ -75,7 +75,7 @@ post-build:
${PASS_DIR}/buildout/support-binaries/
mv ${PASS_DIR}/buildout/ruby/openbsd/*.so ${PASS_DIR}/buildout/
rm -r ${PASS_DIR}/buildout/ruby/
- find ${PASS_DIR} -name '*.beforesubst' -or -name '*.orig' | xargs rm
+ find ${PASS_DIR} \( -name '*.beforesubst' -o -name '*.orig' \) -delete
post-install:
cd ${WRKINST}/${LOCALBASE}/${GEM_LIB}/gems/${DISTNAME}/man && \
Index: www/sope/Makefile
===================================================================
RCS file: /cvs/ports/www/sope/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- www/sope/Makefile 16 Mar 2020 06:59:00 -0000 1.82
+++ www/sope/Makefile 19 Mar 2020 20:26:39 -0000
@@ -65,7 +65,7 @@ WRKDIST = ${WRKDIR}/SOPE
post-extract:
# those fhs.make files are not needed and may cause harm if they exist
- @find ${WRKSRC} -name fhs.make -exec rm {} \;
+ @find ${WRKSRC} -name fhs.make -delete
post-patch:
${SUBST_CMD} ${WRKSRC}/configure
Index: www/syweb/Makefile
===================================================================
RCS file: /cvs/ports/www/syweb/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- www/syweb/Makefile 26 Sep 2019 21:59:31 -0000 1.28
+++ www/syweb/Makefile 19 Mar 2020 20:26:39 -0000
@@ -23,7 +23,7 @@ RUN_DEPENDS= net/rrdtool
WRKDIST= ${WRKDIR}/syweb
do-install:
- find ${WRKDIR} -name \*.orig -exec rm {} \;
+ find ${WRKDIR} -name \*.orig -delete
${TAR} -C ${WRKDIST} -cf - htdocs symon | ${TAR} -C ${PREFIX} -xpf -
${INSTALL_DATA_DIR} ${PREFIX}/symon
${INSTALL_SCRIPT} ${WRKDIST}/install_rrdtool.sh ${PREFIX}/symon
Index: www/wwwcount/Makefile
===================================================================
RCS file: /cvs/ports/www/wwwcount/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- www/wwwcount/Makefile 12 Jul 2019 20:51:07 -0000 1.34
+++ www/wwwcount/Makefile 19 Mar 2020 20:26:40 -0000
@@ -46,9 +46,8 @@ do-install:
@cd ${WRKSRC}/docs; cp -RP * ${PREFIX}/share/doc/wwwcount
@chown -R ${SHAREOWN}:${SHAREGRP} \
${PREFIX}/share/doc/wwwcount
- @find ${PREFIX}/share/doc/wwwcount -type f -print | \
- xargs chmod ${SHAREMODE}
- @find ${PREFIX}/share/doc/wwwcount -type d -print | \
- xargs chmod ${BINMODE}
+ @find ${PREFIX}/share/doc/wwwcount \
+ -type f -exec chmod ${SHAREMODE} {} + -o \
+ -type d -exec chmod ${BINMODE} {} +
.include <bsd.port.mk>
Index: x11/faba-icon-theme/Makefile
===================================================================
RCS file: /cvs/ports/x11/faba-icon-theme/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- x11/faba-icon-theme/Makefile 12 Jul 2019 20:51:10 -0000 1.6
+++ x11/faba-icon-theme/Makefile 19 Mar 2020 20:26:40 -0000
@@ -25,7 +25,7 @@ ICONSDIR = ${PREFIX}/share/icons/
do-install:
${INSTALL_DATA_DIR} ${ICONSDIR}
# Fix perms
- find ${WRKDIST}/../faba* ! -perm 644 -type f -exec chmod 644 {} \;
+ find ${WRKDIST}/../faba* ! -perm 644 -type f -exec chmod 644 {} +
cd ${WRKDIST} ; pax -L -rw Faba ${ICONSDIR}
cd ${WRKDIST}/../faba-mono-icons-4.2/ ; pax -rw Faba-* ${ICONSDIR}
Index: x11/gammapage/Makefile
===================================================================
RCS file: /cvs/ports/x11/gammapage/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- x11/gammapage/Makefile 12 Jul 2019 20:51:11 -0000 1.9
+++ x11/gammapage/Makefile 19 Mar 2020 20:26:40 -0000
@@ -24,8 +24,8 @@ NO_TEST= Yes
PKG_ARCH= *
pre-configure:
- @find ${WRKDIST} -name \*.py | \
- xargs perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g'
+ @find ${WRKDIST} -name \*.py -exec \
+ perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g' {} +
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/GAMMApage.py ${PREFIX}/bin/GAMMApage
Index: x11/gnustep/fisicalab/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/fisicalab/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- x11/gnustep/fisicalab/Makefile 20 Oct 2019 08:03:01 -0000 1.22
+++ x11/gnustep/fisicalab/Makefile 19 Mar 2020 20:26:41 -0000
@@ -23,6 +23,6 @@ WRKSRC = ${WRKDIR}/fisicalab-${VERSION}
pre-configure:
cd ${WRKBUILD} && \
- find . -name COPYING.txt~ -exec rm {} \;
+ find . -name COPYING.txt~ -delete
.include <bsd.port.mk>
Index: x11/gnustep/neos-theme/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/neos-theme/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- x11/gnustep/neos-theme/Makefile 20 Oct 2019 08:03:03 -0000 1.11
+++ x11/gnustep/neos-theme/Makefile 19 Mar 2020 20:26:41 -0000
@@ -20,7 +20,7 @@ WRKSRC = ${WRKDIR}/Neos.theme
do-install:
mkdir -p ${PREFIX}/lib/GNUstep/Themes
- find ${WRKSRC} -name CVS -type d | xargs rm -r
+ find ${WRKSRC} -name CVS -type d -prune -exec rm -r {} +
cp -r ${WRKSRC} ${PREFIX}/lib/GNUstep/Themes
chmod -R a+r ${PREFIX}/lib/GNUstep/Themes
Index: x11/gtk2-aurora-engine/Makefile
===================================================================
RCS file: /cvs/ports/x11/gtk2-aurora-engine/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- x11/gtk2-aurora-engine/Makefile 12 Jul 2019 20:51:12 -0000 1.23
+++ x11/gtk2-aurora-engine/Makefile 19 Mar 2020 20:26:41 -0000
@@ -40,7 +40,7 @@ post-extract:
tar xzf ${_DNAME}.tar.gz && \
tar xjf Aurora${EXTRACT_SUFX}
chmod +x ${WRKSRC}/install-sh
- find ${WRKDIR} -name '*\~' -exec rm {} \;
+ find ${WRKDIR} -name '*\~' -delete
post-install:
rm ${PREFIX}/lib/gtk-2.0/2.10.0/engines/*.{a,la}
Index: x11/gtk2-equinox-engine/Makefile
===================================================================
RCS file: /cvs/ports/x11/gtk2-equinox-engine/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- x11/gtk2-equinox-engine/Makefile 12 Jul 2019 20:51:12 -0000 1.24
+++ x11/gtk2-equinox-engine/Makefile 19 Mar 2020 20:26:41 -0000
@@ -46,10 +46,10 @@ post-install:
cp -R ${WRKDIR}/Equinox_Evolution* ${PREFIX}/share/themes/
chown -R ${SHAREOWN}:${SHAREGRP} \
${PREFIX}/share/themes/Equinox_Evolution*
- find ${PREFIX}/share/themes/ -type f -name index.theme | \
- xargs perl -pi -e 's,Equinox Evolution,Equinox_Evolution,g;' \
- -e 's,Evolution ,Evolution_,g'
- find ${PREFIX}/share/themes/ -type f -name \*.crx \
- -or -name README -or -name ChangeLog | xargs rm
+ find ${PREFIX}/share/themes/ -type f -name index.theme -exec \
+ perl -pi -e 's,Equinox Evolution,Equinox_Evolution,g;' \
+ -e 's,Evolution ,Evolution_,g' {} +
+ find ${PREFIX}/share/themes/ -type f \( -name \*.crx \
+ -o -name README -o -name ChangeLog \) -delete
.include <bsd.port.mk>
Index: x11/kde/kde.port.mk
===================================================================
RCS file: /cvs/ports/x11/kde/kde.port.mk,v
retrieving revision 1.44
diff -u -p -r1.44 kde.port.mk
--- x11/kde/kde.port.mk 19 Mar 2016 22:48:28 -0000 1.44
+++ x11/kde/kde.port.mk 19 Mar 2020 20:26:41 -0000
@@ -104,8 +104,9 @@ DPB_PROPERTIES += tag:kde3
MODKDE_FIXUP_DATADIR ?= No
.if ${MODKDE_FIXUP_DATADIR:L} == "yes"
-MODKDE_post-patch = find ${WRKSRC} -name Makefile.in -or -name Makefile.am | \
- xargs perl -pi.datadir \
+MODKDE_post-patch = find ${WRKSRC} \( -name Makefile.in -o -name Makefile.am
\) \
+ -exec perl -pi.datadir \
-e 's!^datadir\s*=\s*\$$\(kde_datadir\)(.*)$$!datadir =
${PREFIX}/${MODKDE_DATA_SUBDIR}$$1!;' \
- -e 's!^datadir\s*=\s*\$$\(kde_htmldir\)(.*)$$!datadir =
${PREFIX}/${MODKDE_HTML_SUBDIR}$$1!;'
+ -e 's!^datadir\s*=\s*\$$\(kde_htmldir\)(.*)$$!datadir =
${PREFIX}/${MODKDE_HTML_SUBDIR}$$1!;' \
+ {} +
.endif
Index: x11/kde/base3/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde/base3/Makefile,v
retrieving revision 1.165
diff -u -p -r1.165 Makefile
--- x11/kde/base3/Makefile 25 Jun 2019 20:25:23 -0000 1.165
+++ x11/kde/base3/Makefile 19 Mar 2020 20:26:41 -0000
@@ -120,6 +120,6 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/kdesurc ${PREFIX}/${MODKDE_CONFIG_SUBDIR}
${INSTALL_DATA_DIR} ${PREFIX}/${MODKDE_HTML_SUBDIR}/en/common
rm -R ${PREFIX}/share/desktop-directories
- find ${PREFIX}/share/icons -name 'knetattach*' | xargs rm
+ find ${PREFIX}/share/icons -name 'knetattach*' -delete
.include <bsd.port.mk>
Index: x11/kde4/runtime/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/runtime/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- x11/kde4/runtime/Makefile 10 Nov 2019 15:32:55 -0000 1.40
+++ x11/kde4/runtime/Makefile 19 Mar 2020 20:26:42 -0000
@@ -95,6 +95,6 @@ post-extract:
post-install:
rm -R ${PREFIX}/share/desktop-directories
- find ${PREFIX}/share/icons -name 'knetattach*' | xargs rm
+ find ${PREFIX}/share/icons -name 'knetattach*' -delete
.include <bsd.port.mk>
Index: x11/py-gtk2/Makefile
===================================================================
RCS file: /cvs/ports/x11/py-gtk2/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- x11/py-gtk2/Makefile 16 Dec 2019 15:50:42 -0000 1.68
+++ x11/py-gtk2/Makefile 19 Mar 2020 20:26:43 -0000
@@ -50,8 +50,8 @@ MODGNOME_LDFLAGS=-lintl -liconv
TEST_IS_INTERACTIVE= x11
pre-configure:
- @find ${WRKDIST} -name \*.py | \
- xargs perl -i -pe 's,^#!/usr/bin/env python,#!${MODPY_BIN},'
+ @find ${WRKDIST} -name \*.py -exec \
+ perl -i -pe 's,^#!/usr/bin/env python,#!${MODPY_BIN},' {} +
post-install:
rm
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/gtk-2.0/{,gtk}/*.{a,la}
Index: x11/qt3/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt3/Makefile,v
retrieving revision 1.131
diff -u -p -r1.131 Makefile
--- x11/qt3/Makefile 6 Feb 2020 00:40:40 -0000 1.131
+++ x11/qt3/Makefile 19 Mar 2020 20:26:43 -0000
@@ -208,13 +208,13 @@ post-configure:
perl -pi.bak -e 's,-L(\Q${WRKDIST}\E|\Q$$(LOCALBASE)\E)/lib,,'
${WRKDIST}/lib/qt-mt.pc
.if !${FLAVOR:Mdebug}
@cd ${WRKSRC} && cp -R examples examples-src
- @find ${WRKSRC}/examples-src -name '*.orig' |xargs rm -f
- @find ${WRKSRC}/examples-src -name '.moc' |xargs rm -rf
- @find ${WRKSRC}/examples-src -name '.obj' |xargs rm -rf
+ @find ${WRKSRC}/examples-src \
+ \( -name '*.orig' -o -name '.moc' -o -name '.obj' \) \
+ -exec rm -rf {} +
@cd ${WRKSRC} && cp -R tutorial tutorial-src
- @find ${WRKSRC}/tutorial-src -name '*.orig' |xargs rm -f
- @find ${WRKSRC}/tutorial-src -name '.moc' |xargs rm -rf
- @find ${WRKSRC}/tutorial-src -name '.obj' |xargs rm -rf
+ @find ${WRKSRC}/tutorial-src \
+ \( -name '*.orig' -o -name '.moc' -o -name '.obj' \) \
+ -exec rm -rf {} +
pre-install:
${INSTALL_DATA_DIR} ${QT_EXAMPLES}
Index: x11/qt5/Makefile.inc
===================================================================
RCS file: /cvs/ports/x11/qt5/Makefile.inc,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile.inc
--- x11/qt5/Makefile.inc 13 Mar 2020 16:53:49 -0000 1.14
+++ x11/qt5/Makefile.inc 19 Mar 2020 20:26:43 -0000
@@ -150,11 +150,11 @@ qt5-post-install:
done; \
fi
# CMake files get values from QMake config "as is"
- find ${QT_CMAKEDIR} -type f -print0 | xargs -0r perl -pi \
+ -find ${QT_CMAKEDIR} -type f -exec perl -pi \
-e 's,\$$\(LOCALBASE\),${LOCALBASE},g;' \
- -e 's,\$$\(X11BASE\),${X11BASE},g;'
+ -e 's,\$$\(X11BASE\),${X11BASE},g;' {} +
# remove unpatched files
- find ${QT_BASEDIR}/mkspecs -name '*${PATCHORIG}' | xargs -r rm
+ -find ${QT_BASEDIR}/mkspecs -name '*${PATCHORIG}' -delete
.if ${CONFIGURE_STYLE:Mqmake} && ${BUILD_PACKAGES:M-examples}
# install examples sources
${INSTALL_DATA_DIR} ${PREFIX}/lib/qt5/examples
Index: x11/qt5/qt5.port.mk
===================================================================
RCS file: /cvs/ports/x11/qt5/qt5.port.mk,v
retrieving revision 1.24
diff -u -p -r1.24 qt5.port.mk
--- x11/qt5/qt5.port.mk 8 Mar 2019 20:00:56 -0000 1.24
+++ x11/qt5/qt5.port.mk 19 Mar 2020 20:26:43 -0000
@@ -143,5 +143,5 @@ MODQT_VERSION ?= ${MODQT5_VERSION}
_MODQT5_PKGMATCH !=
show_deps: patch
@cpkgs=$$(echo ${_MODQT5_CMAKE_PKGS:NQt5} | sed 's/ /|/g'); \
- find ${WRKSRC} \( -name '*.pr[iof]' -or -iname '*cmake*' \) -print0 | \
- xargs -0r egrep -hA 2
"\\<(qtHaveModule|QT_CONFIG|$$cpkgs)\\>|Qt5::"
+ find ${WRKSRC} \( -name '*.pr[iof]' -o -iname '*cmake*' \) -exec \
+ egrep -hA 2 "\\<(qtHaveModule|QT_CONFIG|$$cpkgs)\\>|Qt5::" {} +
Index: x11/qt5/qtwebkit/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- x11/qt5/qtwebkit/Makefile 25 Feb 2020 14:03:00 -0000 1.19
+++ x11/qt5/qtwebkit/Makefile 19 Mar 2020 20:26:43 -0000
@@ -120,8 +120,7 @@ CXXFLAGS += -march=i686
.endif
post-install:
- find ${WRKINST} -type f -print0 | xargs -0r perl -pi \
- -e 's,${WRKINST},,g;'
+ find ${WRKINST} -type f -exec perl -pi -e 's,${WRKINST},,g;' {} +
.include <bsd.port.mk>
--
Christian "naddy" Weisgerber [email protected]
