Make use of "find -exec {} +" (which is POSIX) and "find -delete"

(which is not) throughout the ports Makefiles. * Replace find|xargs with find -exec {} + * Replace -exec {} \; with -exec {} + if applicable. * Use the -delete operator to remove files and empty directories. * Combine and tweak some find(1) invocations while here. ok kn@ rsadowski@ espie@
2020-03-20 16:44:21 +00:00 · 2020-03-20 16:44:21 +00:00 · d159f8d1ad
commit d159f8d1ad
parent 23c7ccbf5d
136 changed files with 358 additions and 368 deletions
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2019/11/19 21:21:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.40 2020/03/20 16:44:21 naddy Exp $

 COMMENT =	music manager and player for GTK+ written in Python

@ -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>
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2019/11/19 21:21:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.52 2020/03/20 16:44:21 naddy Exp $

 COMMENT-main=	library to access the contents of an iPod
 COMMENT-python= python bindings for libgpod
@ -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
--- a/audio/squeezecenter/Makefile
+++ b/audio/squeezecenter/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2019/07/14 02:16:51 naddy Exp $
+# $OpenBSD: Makefile,v 1.22 2020/03/20 16:44:21 naddy Exp $

 COMMENT =	streaming audio server for Squeezebox network music players

@ -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>
--- a/books/JVMS/Makefile
+++ b/books/JVMS/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2019/07/14 02:16:51 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2020/03/20 16:44:21 naddy Exp $

 COMMENT =	Sun's official Java VM Specification, 2nd Ed.

@ -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>
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2019/07/12 20:43:47 sthen Exp $
+# $OpenBSD: Makefile,v 1.67 2020/03/20 16:44:21 naddy Exp $

 COMMENT=	MS-DOS Telix-like serial communication program

@ -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>
--- a/converters/lastools/Makefile
+++ b/converters/lastools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2020/02/14 10:40:04 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2020/03/20 16:44:21 naddy Exp $

 COMMENT =	tools for LiDAR processing
 DISTNAME =	lastools-0.20181229
@ -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

--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2019/11/12 22:05:27 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.12 2020/03/20 16:44:22 naddy Exp $

 COMMENT =	time-series datastore for metrics, events, and analytics

@ -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>
--- a/databases/mysql-zrm/Makefile
+++ b/databases/mysql-zrm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2019/07/12 20:43:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2020/03/20 16:44:22 naddy Exp $

 COMMENT =	MySQL backup scripts

@ -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/
--- a/databases/openldap23/Makefile
+++ b/databases/openldap23/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2019/07/12 20:43:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2020/03/20 16:44:22 naddy Exp $

 COMMENT=	open-source LDAP software (server, legacy version)

@ -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>
--- a/databases/p5-Rose-DB/Makefile
+++ b/databases/p5-Rose-DB/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2019/07/12 20:43:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2020/03/20 16:44:22 naddy Exp $

 COMMENT=	DBI wrapper and abstraction layer

@ -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>
--- a/databases/percona-toolkit/Makefile
+++ b/databases/percona-toolkit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2019/07/12 20:43:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2020/03/20 16:44:22 naddy Exp $

 COMMENT =	MySQL Percona tools

@ -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>
--- a/databases/pgfouine/Makefile
+++ b/databases/pgfouine/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2019/09/26 21:59:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2020/03/20 16:44:22 naddy Exp $

 COMMENT =	PostgreSQL log analyzer

@ -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
--- a/databases/ruby-redis/Makefile
+++ b/databases/ruby-redis/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2019/07/12 20:44:01 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2020/03/20 16:44:22 naddy Exp $

 COMMENT =	client library for the Redis key-value store

@ -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>
--- a/databases/skytools/Makefile
+++ b/databases/skytools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2020/02/06 00:40:06 jeremy Exp $
+# $OpenBSD: Makefile,v 1.32 2020/03/20 16:44:22 naddy Exp $

 COMMENT=	PostgreSQL tools from Skype

@ -41,6 +41,6 @@ BINFILES=	bulk_loader.py cube_dispatcher.py londiste.py \
 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>
--- a/devel/arduino-makefile/Makefile
+++ b/devel/arduino-makefile/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/07/12 21:02:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2020/03/20 16:44:22 naddy Exp $

 COMMENT=	Makefile to build and upload Arduino sketches

@ -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>
--- a/devel/arduino/Makefile
+++ b/devel/arduino/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2019/12/17 02:21:53 jcs Exp $
+# $OpenBSD: Makefile,v 1.22 2020/03/20 16:44:22 naddy Exp $

 COMMENT=	open-source electronics prototyping platform

@ -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>
--- a/devel/avr/gcc/Makefile
+++ b/devel/avr/gcc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2019/07/12 20:44:04 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2020/03/20 16:44:22 naddy Exp $

 COMMENT=	Atmel AVR 8-bit RISC microcontrollers' XGCC #'

@ -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
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.179 2020/01/11 08:01:09 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.180 2020/03/20 16:44:22 naddy Exp $

 DPB_PROPERTIES =	parallel

@ -60,10 +60,10 @@ SUBST_FILES =	${WRKSRC}/Source/cmLocalGenerator.cxx \
 		${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>
--- a/devel/jdk/1.8/Makefile
+++ b/devel/jdk/1.8/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2020/01/18 17:42:58 kurt Exp $
+# $OpenBSD: Makefile,v 1.51 2020/03/20 16:44:22 naddy Exp $

 ONLY_FOR_ARCHS=	i386 amd64
 USE_WXNEEDED=	Yes
@ -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*
--- a/devel/jdk/11/Makefile
+++ b/devel/jdk/11/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2020/02/26 02:17:12 kurt Exp $
+# $OpenBSD: Makefile,v 1.16 2020/03/20 16:44:22 naddy Exp $

 ONLY_FOR_ARCHS=	i386 amd64 aarch64
 USE_WXNEEDED=	Yes
@ -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*
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2019/07/12 20:44:42 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2020/03/20 16:44:22 naddy Exp $

 COMMENT=	software project management and comprehension tool

@ -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}/
--- a/devel/mingw/Makefile
+++ b/devel/mingw/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2019/07/12 20:44:42 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2020/03/20 16:44:22 naddy Exp $

 COMMENT =	development environment for native Windows applications

@ -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/* \
--- a/devel/ois/Makefile
+++ b/devel/ois/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2019/07/12 20:44:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2020/03/20 16:44:22 naddy Exp $

 COMMENT =		object-oriented input system

@ -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} \
--- a/devel/p5-OLE-Storage_Lite/Makefile
+++ b/devel/p5-OLE-Storage_Lite/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2019/07/12 20:45:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2020/03/20 16:44:22 naddy Exp $

 COMMENT=	simple class for OLE document interface

@ -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>
--- a/devel/py-bytecodeassembler/Makefile
+++ b/devel/py-bytecodeassembler/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2019/07/12 20:45:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2020/03/20 16:44:22 naddy Exp $

 COMMENT =		python bytecode assembler

@ -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
--- a/devel/py-decoratortools/Makefile
+++ b/devel/py-decoratortools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2019/07/12 20:45:47 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2020/03/20 16:44:23 naddy Exp $

 COMMENT=		class and function decorators

@ -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/

--- a/devel/py-symboltype/Makefile
+++ b/devel/py-symboltype/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2019/07/12 20:45:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2020/03/20 16:44:23 naddy Exp $

 COMMENT =		symbol type for python

@ -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
--- a/devel/ruby-highline/Makefile
+++ b/devel/ruby-highline/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2019/07/12 21:02:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2020/03/20 16:44:23 naddy Exp $

 COMMENT =		high-level IO library for Ruby

@ -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>
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.177 2019/12/19 19:43:14 stsp Exp $
+# $OpenBSD: Makefile,v 1.178 2020/03/20 16:44:23 naddy Exp $

 COMMENT-main=		subversion revision control system
 COMMENT-perl=		perl interface to subversion
@ -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>
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2020/02/27 14:29:46 jca Exp $
+# $OpenBSD: Makefile,v 1.16 2020/03/20 16:44:23 naddy Exp $

 COMMENT=	wysiwyw (what you see is what you want) editing platform

@ -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>
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2019/07/12 20:46:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2020/03/20 16:44:23 naddy Exp $

 COMMENT=		front-end for dynamips cisco emulator

@ -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
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2019/07/12 20:46:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2020/03/20 16:44:23 naddy Exp $

 COMMENT =	Playstation 1 emulator

@ -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>
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2019/07/12 21:02:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.49 2020/03/20 16:44:23 naddy Exp $

 COMMENT=	graphical multiplayer 3D tank war game

@ -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>
--- a/games/dungeon/Makefile
+++ b/games/dungeon/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2019/07/14 00:39:36 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2020/03/20 16:44:23 naddy Exp $

 COMMENT =		text adventure game

@ -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)

--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2019/11/18 19:57:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.72 2020/03/20 16:44:23 naddy Exp $

 COMMENT=	educational game for children

@ -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>
--- a/games/jag/Makefile
+++ b/games/jag/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2019/07/12 20:46:20 sthen Exp $ 
+# $OpenBSD: Makefile,v 1.11 2020/03/20 16:44:23 naddy Exp $ 
 COMMENT =		arcade-puzzle game
 V = 			0.3.2
 DISTNAME =		jag-${V}
@ -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>
--- a/games/moonlander/Makefile
+++ b/games/moonlander/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2019/07/12 20:46:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2020/03/20 16:44:23 naddy Exp $

 COMMENT=	clone of atari game
 DISTNAME=	moon-lander-1.0
@ -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>
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2019/07/12 20:46:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2020/03/20 16:44:23 naddy Exp $

 COMMENT-main =	tilt the floor to roll a ball through an obstacle course
 COMMENT-data =	data for Neverball/Neverputt
@ -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 \
--- a/games/openarena/Makefile
+++ b/games/openarena/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2019/07/12 20:46:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2020/03/20 16:44:23 naddy Exp $

 ONLY_FOR_ARCHS =	amd64 i386 macppc

@ -69,7 +69,7 @@ WRKDIST =		${WRKDIR}/openarena-engine-source-${E_V}
 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

--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2020/02/21 16:07:06 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.47 2020/03/20 16:44:23 naddy Exp $

 COMMENT=	texas hold'em poker game with online capabilities
 #'
@ -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
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2020/01/17 07:44:21 benoit Exp $
+# $OpenBSD: Makefile,v 1.42 2020/03/20 16:44:23 naddy Exp $

 ONLY_FOR_ARCHS =	${GCC4_ARCHS} ${CLANG_ARCHS}

@ -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
--- a/games/vegastrike/data/Makefile
+++ b/games/vegastrike/data/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2019/04/27 23:55:04 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2020/03/20 16:44:23 naddy Exp $

 COMMENT =	data files for vegastrike

@ -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

--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2019/07/14 00:39:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.29 2020/03/20 16:44:23 naddy Exp $

 COMMENT=	Zangband (Zelazny Angband) with color, X11 support

@ -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

--- a/geo/qlandkartegt/Makefile
+++ b/geo/qlandkartegt/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2019/10/05 22:29:30 naddy Exp $
+# $OpenBSD: Makefile,v 1.34 2020/03/20 16:44:23 naddy Exp $

 COMMENT =	garmin GPS map management tool

@ -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

--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.63 2020/03/01 10:04:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.64 2020/03/20 16:44:24 naddy Exp $

 COMMENT=	image processing tools with stable ABI

@ -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>
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2019/11/21 17:49:57 cwen Exp $
+# $OpenBSD: Makefile,v 1.39 2020/03/20 16:44:24 naddy Exp $

 BROKEN-i386 =		clang segfault compiling imagebufalgo_pixelmath.cpp

@ -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>
--- a/graphics/p5-Image-MetaData-JPEG/Makefile
+++ b/graphics/p5-Image-MetaData-JPEG/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2019/07/12 20:47:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2020/03/20 16:44:24 naddy Exp $

 COMMENT=	access and modify JPEG metadata

@ -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>
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2019/07/14 00:39:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.39 2020/03/20 16:44:24 naddy Exp $

 COMMENT=	3D image rendering package

@ -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' \
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.80 2020/03/10 03:31:45 daniel Exp $
+# $OpenBSD: Makefile,v 1.81 2020/03/20 16:44:24 naddy Exp $

 COMMENT=	Python charting and plotting API

@ -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:
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.89 2020/02/09 20:33:40 cwen Exp $
+# $OpenBSD: Makefile,v 1.90 2020/03/20 16:44:24 naddy Exp $

 BROKEN-alpha=		ICE hp5590.c:1141: error: unrecognizable insn

@ -74,7 +74,7 @@ FAKE_FLAGS=		configdir=${PREFIX}/share/examples/sane-backends/sane.d

 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*
--- a/graphics/scratch/Makefile
+++ b/graphics/scratch/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2019/07/12 20:47:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2020/03/20 16:44:24 naddy Exp $

 COMMENT =	visual programming environment and toolkit

@ -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
--- a/japanese/Wnn/Makefile
+++ b/japanese/Wnn/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.82 2019/07/12 20:47:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.83 2020/03/20 16:44:24 naddy Exp $

 COMMENT-main = 		Japanese input method
 COMMENT-dict =		dictionaries for Japanese Wnn
@ -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}
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2020/01/28 20:32:50 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2020/03/20 16:44:24 naddy Exp $

 BROKEN =		syscalls from main program
 ONLY_FOR_ARCHS =	amd64 i386
@ -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

--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.84 2020/03/05 15:29:13 jeremy Exp $
+# $OpenBSD: Makefile,v 1.85 2020/03/20 16:44:24 naddy Exp $

 # Runtime failures on i386 in IO#pos and IO#rewind
 ONLY_FOR_ARCHS = amd64
@ -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
--- a/lang/kawa/Makefile
+++ b/lang/kawa/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2020/01/30 07:52:29 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.21 2020/03/20 16:44:24 naddy Exp $

 COMMENT=		Scheme and language framework for the Java platform

@ -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
--- a/lang/racket-minimal/Makefile
+++ b/lang/racket-minimal/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2020/02/19 20:39:56 juanfra Exp $
+# $OpenBSD: Makefile,v 1.62 2020/03/20 16:44:24 naddy Exp $

 ONLY_FOR_ARCHS =	aarch64 amd64 arm i386 mips64el powerpc sparc64

@ -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
--- a/lang/ruby/Makefile.inc
+++ b/lang/ruby/Makefile.inc
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.23 2019/11/19 17:20:12 jeremy Exp $
+# $OpenBSD: Makefile.inc,v 1.24 2020/03/20 16:44:24 naddy Exp $

 COMMENT-main ?=		object oriented script language with threads
 COMMENT-gdbm ?=		gdbm interface for ruby
@ -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};
--- a/lang/ruby/ruby.port.mk
+++ b/lang/ruby/ruby.port.mk
@ -1,4 +1,4 @@
-# $OpenBSD: ruby.port.mk,v 1.99 2020/01/02 21:21:56 jeremy Exp $
+# $OpenBSD: ruby.port.mk,v 1.100 2020/03/20 16:44:24 naddy Exp $

 # ruby module

@ -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
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2019/07/12 20:47:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.46 2020/03/20 16:44:24 naddy Exp $

 # XXX consider moving to https://repo.or.cz/alpine.git

@ -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
--- a/mail/dovecot-pigeonhole/Makefile
+++ b/mail/dovecot-pigeonhole/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2020/03/07 09:53:47 sthen Exp $
+# $OpenBSD: Makefile,v 1.72 2020/03/20 16:44:25 naddy Exp $

 COMMENT=	Sieve mail filtering for Dovecot

@ -33,8 +33,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		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/
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.287 2020/03/07 11:36:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.288 2020/03/20 16:44:24 naddy Exp $

 COMMENT-server=	compact IMAP/POP3 server
 COMMENT-ldap=	LDAP authentication / dictionary support for Dovecot
@ -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>
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2019/07/17 14:46:33 danj Exp $
+# $OpenBSD: Makefile,v 1.37 2020/03/20 16:44:25 naddy Exp $

 COMMENT=		Tcl/Tk interface to the MH mail system

@ -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>
--- a/mail/kopano/core/Makefile
+++ b/mail/kopano/core/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2020/03/08 09:22:39 robert Exp $
+# $OpenBSD: Makefile,v 1.52 2020/03/20 16:44:25 naddy Exp $

 # undefined ref's to libicon*, libintl*
 USE_LLD=	Yes
@ -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 \
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.60 2019/07/12 20:47:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.61 2020/03/20 16:44:25 naddy Exp $

 COMMENT=	virus/spam scanning framework

@ -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
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2019/07/12 20:47:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2020/03/20 16:44:25 naddy Exp $

 COMMENT-main =		mother of Mail Transfer Agents
 COMMENT-libmilter =	mail filter support library for sendmail
@ -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}"
--- a/mail/z-push/Makefile
+++ b/mail/z-push/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2019/09/26 21:59:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.59 2020/03/20 16:44:25 naddy Exp $

 COMMENT=	ActiveSync protocol implementation

@ -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
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2019/07/12 20:47:40 sthen Exp $
+# $OpenBSD: Makefile,v 1.38 2020/03/20 16:44:25 naddy Exp $

 COMMENT=	environment for rapid engineering and scientific processing
 BROKEN-hppa =	undefined reference to lapack funcs
@ -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
--- a/math/prover9/p9m4/Makefile
+++ b/math/prover9/p9m4/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2015/11/02 11:56:55 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2020/03/20 16:44:25 naddy Exp $

 COMMENT=		prover9/mace4 GUI

@ -29,7 +29,7 @@ SAMPLES_DIR=		${PREFIX}/share/p9m4/Samples/
 # 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
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.70 2020/02/10 19:34:33 bket Exp $
+# $OpenBSD: Makefile,v 1.71 2020/03/20 16:44:25 naddy Exp $

 COMMENT=		free Norton Commander clone with many useful features

@ -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>
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.62 2019/07/12 20:47:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.63 2020/03/20 16:44:25 naddy Exp $

 COMMENT=	library for reading and writing QuickTime files

@ -52,7 +52,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		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>
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2019/07/12 20:47:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2020/03/20 16:44:25 naddy Exp $

 COMMENT =		video editor and a VJ tool

@ -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>
--- a/multimedia/sfml/Makefile
+++ b/multimedia/sfml/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2020/03/18 18:53:45 sebastia Exp $
+# $OpenBSD: Makefile,v 1.12 2020/03/20 16:44:25 naddy Exp $

 COMMENT =		simple and fast multimedia library

@ -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

--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.144 2019/12/25 15:50:45 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.145 2020/03/20 16:44:25 naddy Exp $

 COMMENT=	multimedia decoding library

@ -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>
--- a/net/apache-activemq/Makefile
+++ b/net/apache-activemq/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2019/07/12 20:47:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2020/03/20 16:44:25 naddy Exp $

 PKG_ARCH=	*

@ -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
--- a/net/argus-clients/Makefile
+++ b/net/argus-clients/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2019/07/12 20:47:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2020/03/20 16:44:25 naddy Exp $

 COMMENT =	utilities to read and parse Argus data

@ -33,7 +33,7 @@ MAKE_FLAGS =	CCOPT="${CFLAGS}" COMPATLIB="-lm -lz -L${LOCALBASE}/lib -lft"
 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/
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2019/07/12 20:47:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2020/03/20 16:44:25 naddy Exp $

 COMMENT =	Audit Record Generation and Utilization System

@ -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 \
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.72 2019/07/12 20:48:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.73 2020/03/20 16:44:25 naddy Exp $

 COMMENT=		IRC proxy to connect to AIM, ICQ, Jabber and Yahoo

@ -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
--- a/net/epic4/Makefile
+++ b/net/epic4/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.76 2019/07/12 20:48:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.77 2020/03/20 16:44:26 naddy Exp $

 COMMENT=	(E)nhanced (P)rogrammable (I)RC-II (C)lient

@ -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>
--- a/net/icinga/web/Makefile
+++ b/net/icinga/web/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2020/03/10 21:23:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.44 2020/03/20 16:44:26 naddy Exp $

 COMMENT =	API-based web UI for obsolete version of Icinga

@ -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 \
--- a/net/icinga/web2/Makefile
+++ b/net/icinga/web2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2020/03/12 09:39:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.40 2020/03/20 16:44:26 naddy Exp $

 COMMENT =	next-generation web UI for icinga

@ -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/

--- a/net/ircd-ratbox/Makefile
+++ b/net/ircd-ratbox/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2019/07/12 20:48:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2020/03/20 16:44:26 naddy Exp $

 COMMENT =	advanced, stable and fast irc server

@ -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>
--- a/net/librenms/Makefile
+++ b/net/librenms/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.99 2020/03/07 14:16:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.100 2020/03/20 16:44:26 naddy Exp $

 COMMENT =	auto-discovering network management/monitoring system

@ -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,' \
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2020/02/25 07:02:08 bentley Exp $
+# $OpenBSD: Makefile,v 1.62 2020/03/20 16:44:26 naddy Exp $

 COMMENT=		BitTorrent library written in C++

@ -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>
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2019/07/12 20:48:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2020/03/20 16:44:26 naddy Exp $

 COMMENT=	simple and performant DNS server

@ -21,7 +21,7 @@ MAKE_FLAGS=	CC="${CC}" FLAGS="${CFLAGS} -D_THREAD_SAFE -pthread"
 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:
--- a/net/mfi/Makefile
+++ b/net/mfi/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2019/07/14 02:16:52 naddy Exp $
+# $OpenBSD: Makefile,v 1.16 2020/03/20 16:44:26 naddy Exp $

 COMMENT=	Ubiquiti mfi wireless controller

@ -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

--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2019/07/12 20:48:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.68 2020/03/20 16:44:26 naddy Exp $

 PORTROACH=	limit:^2

@ -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>
--- a/net/nfsen/Makefile
+++ b/net/nfsen/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2020/02/03 20:40:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.46 2020/03/20 16:44:26 naddy Exp $

 COMMENT=	web-based front end for the nfdump netflow tools

@ -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

--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.79 2019/07/12 20:48:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.80 2020/03/20 16:44:26 naddy Exp $

 COMMENT=	Network Time Protocol reference implementation

@ -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.
--- a/net/p5-NetPacket/Makefile
+++ b/net/p5-NetPacket/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:41 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2020/03/20 16:44:26 naddy Exp $

 COMMENT=	Perl module for encoding/decoding network traffic

@ -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>
--- a/net/php-weathermap/Makefile
+++ b/net/php-weathermap/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2020/02/03 20:40:40 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2020/03/20 16:44:26 naddy Exp $

 COMMENT=	graphical network traffic map

@ -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>
--- a/net/pidgin/Makefile
+++ b/net/pidgin/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.145 2019/07/12 20:48:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.146 2020/03/20 16:44:26 naddy Exp $

 COMMENT-main=	multi-protocol instant messaging client
 COMMENT-finch=	multi-protocol instant messaging client, console client
@ -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>
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2019/07/12 20:48:47 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2020/03/20 16:44:26 naddy Exp $

 COMMENT=	Zolera SOAP Infrastructure

@ -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>
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2020/02/25 07:02:21 bentley Exp $
+# $OpenBSD: Makefile,v 1.69 2020/03/20 16:44:26 naddy Exp $

 COMMENT=		ncurses BitTorrent client based on libTorrent

@ -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>
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.286 2020/01/24 13:29:42 jca Exp $
+# $OpenBSD: Makefile,v 1.287 2020/03/20 16:44:26 naddy Exp $

 VERSION =		4.9.18
 DISTNAME =		samba-${VERSION}
@ -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:' \
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2019/07/14 00:39:38 naddy Exp $
+# $OpenBSD: Makefile,v 1.25 2020/03/20 16:44:27 naddy Exp $

 COMMENT=	threaded newsreader

@ -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

--- a/plan9/plan9port/Makefile
+++ b/plan9/plan9port/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2019/09/11 13:42:35 kn Exp $
+# $OpenBSD: Makefile,v 1.32 2020/03/20 16:44:27 naddy Exp $

 ONLY_FOR_ARCHS =	amd64 i386 powerpc
 BROKEN-powerpc =	threading issues
@ -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`
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2019/07/12 20:48:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.50 2020/03/20 16:44:27 naddy Exp $

 PKG_ARCH=		*

@ -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
--- a/print/ghostscript/gnu/Makefile
+++ b/print/ghostscript/gnu/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.114 2019/07/12 20:48:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.115 2020/03/20 16:44:27 naddy Exp $

 COMMENT=	GNU PostScript interpreter

@ -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 \
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.175 2020/03/14 14:12:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.176 2020/03/20 16:44:27 naddy Exp $

 PORTROACH=		skipv:${V}_py2.5

@ -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} \
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.90 2020/03/16 02:40:45 mariani Exp $
+# $OpenBSD: Makefile,v 1.91 2020/03/20 16:44:27 naddy Exp $

 COMMENT=	graphical frontend for LaTeX (nearly WYSIWYG)

@ -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 \
--- a/Show More
+++ b/Show More