Use the FIND and XARGS macros introduced in bsd.port.mk 1.391.

97 files changed, 190 insertions, 163 deletions

diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile
index 9298ff2..81be157 100644
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@@ -41,7 +41,7 @@ post-install:
 	done
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}
-	@cd ${WRKSRC}/doc && find * | \
+	@cd ${WRKSRC}/doc && ${FIND} * | \
 	  ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCDIR}
 .endif
 	@${SED} -e "s#%%PREFIX%%#${PREFIX}#" ${PKGMESSAGE}
diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile
index 2c0ba22..6fb9b20 100644
--- a/biology/py-biopython/Makefile
+++ b/biology/py-biopython/Makefile
@@ -115,7 +115,7 @@ post-install:
 .endfor
 	@ ${MKDIR} ${EXAMPLESDIR}
 	@ ${INSTALL_DATA} ${WRKSRC}/Doc/examples/* ${EXAMPLESDIR}
-	@ cd ${WRKSRC}/Scripts && find * \
+	@ cd ${WRKSRC}/Scripts && ${FIND} * \
 	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .if defined(WITH_CORBA)
 	@ ${MKDIR} ${DOCSDIR}/BioCorba
diff --git a/biology/t_coffee/Makefile b/biology/t_coffee/Makefile
index 7a70657..3dc4436 100644
--- a/biology/t_coffee/Makefile
+++ b/biology/t_coffee/Makefile
@@ -46,7 +46,7 @@ post-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 	@ ${MKDIR} ${EXAMPLESDIR}
 	@ ${RMDIR} ${WRKSRC}/example/aln 2>/dev/null || ${TRUE}
-	@ cd ${WRKSRC}/example && find * \
+	@ cd ${WRKSRC}/example && ${FIND} * \
 	  | cpio --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 	@ ${SED} -e 's#%%DATADIR%%#${DATADIR}#' ${.CURDIR}/pkg-message \
 	  > ${PKGMESSAGE}
diff --git a/cad/linux-eagle/Makefile b/cad/linux-eagle/Makefile
index 5c05398..6209701 100644
--- a/cad/linux-eagle/Makefile
+++ b/cad/linux-eagle/Makefile
@@ -39,7 +39,7 @@ CPIO?=		/usr/bin/cpio --quiet -pdum -R
 do-install:
 	@${MKDIR} ${DATADIR}
 	@ cd ${WRKSRC} && ${FIND} * -type f -print | ${CPIO} ${BINOWN}:${BINGRP} ${DATADIR}
-	@ cd ${DATADIR} && ${FIND} * -type d -print | xargs ${CHMOD} 0755
+	@ cd ${DATADIR} && ${FIND} * -type d -print | ${XARGS} ${CHMOD} 0755
 	@${LN} -sf ${DATADIR}/bin/eagle ${PREFIX}/bin/eagle
 	@${INSTALL_MAN} ${DATADIR}/man/eagle.1 ${PREFIX}/man/man1
 
diff --git a/cad/linux-eagle5/Makefile b/cad/linux-eagle5/Makefile
index 5c05398..6209701 100644
--- a/cad/linux-eagle5/Makefile
+++ b/cad/linux-eagle5/Makefile
@@ -39,7 +39,7 @@ CPIO?=		/usr/bin/cpio --quiet -pdum -R
 do-install:
 	@${MKDIR} ${DATADIR}
 	@ cd ${WRKSRC} && ${FIND} * -type f -print | ${CPIO} ${BINOWN}:${BINGRP} ${DATADIR}
-	@ cd ${DATADIR} && ${FIND} * -type d -print | xargs ${CHMOD} 0755
+	@ cd ${DATADIR} && ${FIND} * -type d -print | ${XARGS} ${CHMOD} 0755
 	@${LN} -sf ${DATADIR}/bin/eagle ${PREFIX}/bin/eagle
 	@${INSTALL_MAN} ${DATADIR}/man/eagle.1 ${PREFIX}/man/man1
 
diff --git a/chinese/chinput/Makefile b/chinese/chinput/Makefile
index a1e9970..7452185 100644
--- a/chinese/chinput/Makefile
+++ b/chinese/chinput/Makefile
@@ -26,6 +26,6 @@ BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4 \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-extract:
-	find ${WRKSRC} -name CVS | xargs ${RM} -rf
+	${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
 
 .include <bsd.port.mk>
diff --git a/chinese/chinput2/Makefile b/chinese/chinput2/Makefile
index 3392525..b8b0493 100644
--- a/chinese/chinput2/Makefile
+++ b/chinese/chinput2/Makefile
@@ -29,7 +29,7 @@ BROKEN=         "Does not build"
 .endif
 
 post-extract:
-	find ${WRKSRC} -name CVS | xargs ${RM} -rf
+	${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
 
 post-install:
 	@echo
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 7b8c136..18158e0 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -31,7 +31,7 @@ MAN1=	halifax.1 ghfaxviewer.1
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/comms/tkscanfax/Makefile b/comms/tkscanfax/Makefile
index 9d9e565..6b4e0aa 100644
--- a/comms/tkscanfax/Makefile
+++ b/comms/tkscanfax/Makefile
@@ -19,7 +19,7 @@ WRKSRC=	${WRKDIR}/${PORTNAME}
 NO_BUILD=	YES
 
 post-extract:
-	find ${WRKSRC} -name '*~' -delete
+	${FIND} ${WRKSRC} -name '*~' -delete
 
 do-install:
 	(\
diff --git a/comms/vpb2/Makefile b/comms/vpb2/Makefile
index 9d08f1f..3429ca6 100644
--- a/comms/vpb2/Makefile
+++ b/comms/vpb2/Makefile
@@ -25,7 +25,7 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
 
 post-extract:
-	@find ${WRKSRC} -name "Makefile.in" | \
-		xargs ${REINPLACE_CMD} -e 's|-release \$$\(LT_RELEASE\)||g'
+	@${FIND} ${WRKSRC} -name "Makefile.in" | \
+		${XARGS} ${REINPLACE_CMD} -e 's|-release \$$\(LT_RELEASE\)||g'
 
 .include <bsd.port.mk>
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 7dfe86a..8bb8656 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 post-patch:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|share/idl|share/gnome/idl|g'
 
 .include <bsd.port.mk>
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index d91c879..0057a81 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -185,7 +185,8 @@ post-install:
 
 # This is for the maintainer only...
 make-plist:
-	/usr/bin/find foo -type f -or -type l | /usr/bin/cut -d / -f 2- | /usr/bin/sort  > ${.CURDIR}/pkg-plist.new
+	${FIND} foo -type f -or -type l | /usr/bin/cut -d / -f 2- | \
+		/usr/bin/sort  > ${.CURDIR}/pkg-plist.new
 	/usr/bin/perl -i -ne 'if (m#share/doc/#) { print "%%PORTDOCS%%", $$_; } else { print $$_; }' ${.CURDIR}/pkg-plist.new
 
 .include <bsd.port.post.mk>
diff --git a/databases/pgaccess/Makefile b/databases/pgaccess/Makefile
index 6005c11..029cd47 100644
--- a/databases/pgaccess/Makefile
+++ b/databases/pgaccess/Makefile
@@ -38,7 +38,7 @@ do-build:
 do-install:
 	@${MKDIR} ${PGACCESSDIR} ; \
 	 cd ${WRKSRC} ;\
-	 ${TAR} cf - `find * ! \( -path win32\* -o -path doc\* \)` | \
+	 ${TAR} cf - `${FIND} * ! \( -path win32\* -o -path doc\* \)` | \
 	 ( cd ${PGACCESSDIR}; ${TAR} xf - ) ; \
 	 ${CHOWN} -R 0:0 ${PGACCESSDIR}
 .for file in pgaccess pgmonitor
diff --git a/deskutils/yank/Makefile b/deskutils/yank/Makefile
index 647bb79d..f0df83d 100644
--- a/deskutils/yank/Makefile
+++ b/deskutils/yank/Makefile
@@ -27,10 +27,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 pre-patch:
 	@${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's^\$\(datadir\)/gnome/^\$\(datadir\)/^g ; \
 		 s^\$\(datadir\)/locale^\$\(prefix\)/share/locale^g'
-	@find ${WRKSRC}/src/Plugins -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC}/src/Plugins -name "Makefile.in" | \
+		${XARGS} ${PERL} -pi -e \
 		's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g'
 
 .include <bsd.port.mk>
diff --git a/devel/adasdl/Makefile b/devel/adasdl/Makefile
index 5874263..78c6a78 100644
--- a/devel/adasdl/Makefile
+++ b/devel/adasdl/Makefile
@@ -25,10 +25,10 @@ USE_GMAKE=     yes
 USE_REINPLACE= yes
 
 do-patch:
-	for i in `find ${WRKSRC} -name 'Makefile'`; do \
+	for i in `${FIND} ${WRKSRC} -name 'Makefile'`; do \
 		${REINPLACE_CMD} -e '/gnatmake/!s/make\ /gmake\ /' $${i}; \
 	done
-	for i in `find ${WRKSRC} -name 'make.conf_x11'`; do \
+	for i in `${FIND} ${WRKSRC} -name 'make.conf_x11'`; do \
 		${REINPLACE_CMD} \
 			-e 's,/usr/local,${LOCALBASE},g' \
 			-e 's,/usr/X11R6,${X11BASE},g' \
@@ -67,33 +67,40 @@ do-build:
 do-install:
 	${MKDIR} ${PREFIX}/lib/adaSDL
 	for i in `cat pkg-plist|grep "lib/adaSDL/"|grep -v framebuffer|grep -v _mixer|grep -v _image|sed "s/lib\/adaSDL\///"`; do \
-		find ${WRKSRC}/AdaSDL/binding -name $${i} -maxdepth 1|${INSTALL_DATA} `grep ""` ${PREFIX}/lib/adaSDL; \
+		${FIND} ${WRKSRC}/AdaSDL/binding -name $${i} -maxdepth 1 | \
+			${INSTALL_DATA} `grep ""` ${PREFIX}/lib/adaSDL; \
 	done
 	for i in `cat pkg-plist|grep "lib/adaSDL/"|grep framebuffer|sed "s/lib\/adaSDL\///"`; do \
-		find ${WRKSRC}/AdaSDL_framebuff -name $${i} -maxdepth 1|${INSTALL_DATA} `grep ""` ${PREFIX}/lib/adaSDL; \
+		${FIND} ${WRKSRC}/AdaSDL_framebuff -name $${i} -maxdepth 1 | \
+			${INSTALL_DATA} `grep ""` ${PREFIX}/lib/adaSDL; \
 	done
 	${MKDIR} ${PREFIX}/share/adaSDL
 	${MKDIR} ${PREFIX}/share/adaSDL/examples
 	for i in `cat pkg-plist|grep "share/adaSDL/examples"|grep -v dirrm|sed "s/share\/adaSDL\/examples\///"`; do \
-		find ${WRKSRC}/AdaSDL_framebuff/sdltests -name $${i} -maxdepth 1|${INSTALL_DATA} `grep ""` ${PREFIX}/share/adaSDL/examples; \
+		${FIND} ${WRKSRC}/AdaSDL_framebuff/sdltests -name $${i} \
+			-maxdepth 1 | ${INSTALL_DATA} \
+			`grep ""` ${PREFIX}/share/adaSDL/examples; \
 	done
 
 .if !defined(WITHOUT_SDL_IMAGE)
 	for i in `cat pkg-plist|grep "lib/adaSDL/"|grep _image|sed "s/lib\/adaSDL\///"`; do \
-		find ${WRKSRC}/AdaSDL_image -name $${i} -maxdepth 1|${INSTALL_DATA} `grep ""` ${PREFIX}/lib/adaSDL; \
+		${FIND} ${WRKSRC}/AdaSDL_image -name $${i} -maxdepth 1 | \
+			${INSTALL_DATA} `grep ""` ${PREFIX}/lib/adaSDL; \
 	done
 .endif
 
 .if !defined(WITHOUT_SDL_MIXER)
 	for i in `cat pkg-plist|grep "lib/adaSDL/"|grep _mixer|sed "s/lib\/adaSDL\///"`; do \
-		find ${WRKSRC}/AdaSDL_mixer -name $${i} -maxdepth 1|${INSTALL_DATA} `grep ""` ${PREFIX}/lib/adaSDL; \
+		${FIND} ${WRKSRC}/AdaSDL_mixer -name $${i} -maxdepth 1 | \
+			${INSTALL_DATA} `grep ""` ${PREFIX}/lib/adaSDL; \
 	done
 .endif
 
 .if !defined(WITHOUT_OPENGL)
 	${MKDIR} ${PREFIX}/lib/adaGL
 	for i in `cat pkg-plist|grep "/adaGL/"|sed "s/lib\/adaGL\///"`; do \
-		find ${WRKSRC}/AdaGL/GL -name $${i} -maxdepth 1|${INSTALL_DATA} `grep ""` ${PREFIX}/lib/adaGL; \
+		${FIND} ${WRKSRC}/AdaGL/GL -name $${i} -maxdepth 1 | \
+			${INSTALL_DATA} `grep ""` ${PREFIX}/lib/adaGL; \
 	done
 .endif
 
diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 8733d2f..66b92c2 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -75,11 +75,11 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 post-patch:
-	@find -d ${WRKSRC} -name CVS -type d -exec ${RM} -rf {} \;
-	@find -d ${WRKSRC} -name sgml -type d -exec ${RM} -rf {} \;
-	@find ${WRKSRC} -name .cvsignore -type f -exec ${RM} -f {} \;
-	@find ${WRKSRC} -name README.docs -type f -exec ${RM} -f {} \;
-	@find ${WRKSRC} -name \*.orig -type f -exec ${RM} -f {} \;
+	@${FIND} -d ${WRKSRC} -name CVS -type d -exec ${RM} -rf {} \;
+	@${FIND} -d ${WRKSRC} -name sgml -type d -exec ${RM} -rf {} \;
+	@${FIND} ${WRKSRC} -name .cvsignore -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} -name README.docs -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} -name \*.orig -type f -exec ${RM} -f {} \;
 .for i in ${BONSAIPERLWC}
 	@${REINPLACE_CMD} -e 's@#!/usr/bonsaitools/bin/perl@#!/usr/bin/perl@' \
 		${WRKSRC}/$i
@@ -88,16 +88,16 @@ post-patch:
 	@${REINPLACE_CMD} -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' \
 		${WRKSRC}/$i
 .endfor
-	@find ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \;
 
 pre-install:
-	@find ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;
-	@find ${WRKSRC}/docs -type f -exec ${CHMOD} ${MANMODE} {} \;
-	@find ${WRKSRC}/docs -type f -exec ${CHOWN} root:wheel {} \;
+	@${FIND} ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;
+	@${FIND} ${WRKSRC}/docs -type f -exec ${CHMOD} ${MANMODE} {} \;
+	@${FIND} ${WRKSRC}/docs -type f -exec ${CHOWN} root:wheel {} \;
 
 do-install:
 	${MKDIR} ${PREFIX}/${BUGZILLADIR}
-	find ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
+	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/${BUGZILLADIR} \;
 	${TAR} -C ${WRKSRC} -cf - template css | ${TAR} --unlink -C ${PREFIX}/${BUGZILLADIR} -xf -
 .if !defined(NOPORTDOCS)
diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile
index 8733d2f..66b92c2 100644
--- a/devel/bugzilla2/Makefile
+++ b/devel/bugzilla2/Makefile
@@ -75,11 +75,11 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 post-patch:
-	@find -d ${WRKSRC} -name CVS -type d -exec ${RM} -rf {} \;
-	@find -d ${WRKSRC} -name sgml -type d -exec ${RM} -rf {} \;
-	@find ${WRKSRC} -name .cvsignore -type f -exec ${RM} -f {} \;
-	@find ${WRKSRC} -name README.docs -type f -exec ${RM} -f {} \;
-	@find ${WRKSRC} -name \*.orig -type f -exec ${RM} -f {} \;
+	@${FIND} -d ${WRKSRC} -name CVS -type d -exec ${RM} -rf {} \;
+	@${FIND} -d ${WRKSRC} -name sgml -type d -exec ${RM} -rf {} \;
+	@${FIND} ${WRKSRC} -name .cvsignore -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} -name README.docs -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} -name \*.orig -type f -exec ${RM} -f {} \;
 .for i in ${BONSAIPERLWC}
 	@${REINPLACE_CMD} -e 's@#!/usr/bonsaitools/bin/perl@#!/usr/bin/perl@' \
 		${WRKSRC}/$i
@@ -88,16 +88,16 @@ post-patch:
 	@${REINPLACE_CMD} -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' \
 		${WRKSRC}/$i
 .endfor
-	@find ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \;
 
 pre-install:
-	@find ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;
-	@find ${WRKSRC}/docs -type f -exec ${CHMOD} ${MANMODE} {} \;
-	@find ${WRKSRC}/docs -type f -exec ${CHOWN} root:wheel {} \;
+	@${FIND} ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;
+	@${FIND} ${WRKSRC}/docs -type f -exec ${CHMOD} ${MANMODE} {} \;
+	@${FIND} ${WRKSRC}/docs -type f -exec ${CHOWN} root:wheel {} \;
 
 do-install:
 	${MKDIR} ${PREFIX}/${BUGZILLADIR}
-	find ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
+	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/${BUGZILLADIR} \;
 	${TAR} -C ${WRKSRC} -cf - template css | ${TAR} --unlink -C ${PREFIX}/${BUGZILLADIR} -xf -
 .if !defined(NOPORTDOCS)
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index 8733d2f..66b92c2 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -75,11 +75,11 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 post-patch:
-	@find -d ${WRKSRC} -name CVS -type d -exec ${RM} -rf {} \;
-	@find -d ${WRKSRC} -name sgml -type d -exec ${RM} -rf {} \;
-	@find ${WRKSRC} -name .cvsignore -type f -exec ${RM} -f {} \;
-	@find ${WRKSRC} -name README.docs -type f -exec ${RM} -f {} \;
-	@find ${WRKSRC} -name \*.orig -type f -exec ${RM} -f {} \;
+	@${FIND} -d ${WRKSRC} -name CVS -type d -exec ${RM} -rf {} \;
+	@${FIND} -d ${WRKSRC} -name sgml -type d -exec ${RM} -rf {} \;
+	@${FIND} ${WRKSRC} -name .cvsignore -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} -name README.docs -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} -name \*.orig -type f -exec ${RM} -f {} \;
 .for i in ${BONSAIPERLWC}
 	@${REINPLACE_CMD} -e 's@#!/usr/bonsaitools/bin/perl@#!/usr/bin/perl@' \
 		${WRKSRC}/$i
@@ -88,16 +88,16 @@ post-patch:
 	@${REINPLACE_CMD} -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' \
 		${WRKSRC}/$i
 .endfor
-	@find ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \;
 
 pre-install:
-	@find ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;
-	@find ${WRKSRC}/docs -type f -exec ${CHMOD} ${MANMODE} {} \;
-	@find ${WRKSRC}/docs -type f -exec ${CHOWN} root:wheel {} \;
+	@${FIND} ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;
+	@${FIND} ${WRKSRC}/docs -type f -exec ${CHMOD} ${MANMODE} {} \;
+	@${FIND} ${WRKSRC}/docs -type f -exec ${CHOWN} root:wheel {} \;
 
 do-install:
 	${MKDIR} ${PREFIX}/${BUGZILLADIR}
-	find ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
+	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/${BUGZILLADIR} \;
 	${TAR} -C ${WRKSRC} -cf - template css | ${TAR} --unlink -C ${PREFIX}/${BUGZILLADIR} -xf -
 .if !defined(NOPORTDOCS)
diff --git a/devel/ccdoc/Makefile b/devel/ccdoc/Makefile
index 7451d26..13dab00 100644
--- a/devel/ccdoc/Makefile
+++ b/devel/ccdoc/Makefile
@@ -24,7 +24,7 @@ DOCDIR=${PREFIX}/share/doc/ccdoc
 
 pre-patch:
 	@${ECHO} "Stripping ^M from all the files..."
-	@find ${WRKSRC} -type f | xargs perl -pi -e 's/\r//'
+	@${FIND} ${WRKSRC} -type f | ${XARGS} perl -pi -e 's/\r//'
 
 do-build:
 	(cd ${WRKSRC}/ccdoc_dev/libjdl/src; ${PERL} mk.pl opt)
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index 7cf1a29..daa77eb 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -48,7 +48,7 @@ MAN1=		directfb-csource.1 dfbg.1
 MAN5=		directfbrc.5
 
 post-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 	's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index ce18092..413217f 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -45,7 +45,7 @@ post-build:
 
 post-install:
 	@ ${MKDIR} ${FNORB_DIR}/script
-	@ cd ${WRKSRC} && find *.py *.pyc *.pyo compiler cos orb parser \
+	@ cd ${WRKSRC} && ${FIND} *.py *.pyc *.pyo compiler cos orb parser \
 	  script/*.py script/*.pyc script/*.pyo \! -name \*.orig \
 	  | ${CPIO} ${BINOWN}:${BINGRP} ${FNORB_DIR}
 	@ ${MKDIR} ${PREFIX}/bin
@@ -56,10 +56,10 @@ post-install:
 	  ${PREFIX}/etc/fnorb.cfg.sample
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${EXAMPLESDIR}
-	@ cd ${WRKSRC}/examples && find * \
+	@ cd ${WRKSRC}/examples && ${FIND} * \
 	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 	@ ${MKDIR} ${DOCSDIR}
-	@ cd ${WRKSRC}/doc && find . \
+	@ cd ${WRKSRC}/doc && ${FIND} . \
 	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 	@ ${CHMOD} -R u-x ${DOCSDIR} && ${CHMOD} -R u+X ${DOCSDIR}
 .for file in ANNOUNCE CHANGES README LICENSE.HTML
diff --git a/devel/glg/Makefile b/devel/glg/Makefile
index fd22caf..47847f8 100644
--- a/devel/glg/Makefile
+++ b/devel/glg/Makefile
@@ -28,7 +28,7 @@ USE_GNOME+=	gnomelibs
 .endif
 
 pre-build:
-	find ${WRKSRC} -name Makefile | xargs ${PERL} \
+	${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${PERL} \
 		-pi -e "s@gtk-config@${GTK_CONFIG}@g"
 
 .include <bsd.port.post.mk>
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 194622e..b7decdb 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -48,7 +48,7 @@ LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in \
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 58740ed..12fe85e 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
 post-patch:
-	@find ${WRKSRC} -name 'xml-i18n-*' | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name 'xml-i18n-*' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/usr/local/bin/perl|${PERL}|g'
 	@${REINPLACE_CMD} -e 's|\%\%LOCALBASE\%\%|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/libcharset/Makefile.in
diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index 58740ed..12fe85e 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
 post-patch:
-	@find ${WRKSRC} -name 'xml-i18n-*' | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name 'xml-i18n-*' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/usr/local/bin/perl|${PERL}|g'
 	@${REINPLACE_CMD} -e 's|\%\%LOCALBASE\%\%|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/libcharset/Makefile.in
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 194622e..b7decdb 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -48,7 +48,7 @@ LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in \
diff --git a/devel/invitation_to_ruby/Makefile b/devel/invitation_to_ruby/Makefile
index 964b356..2554ab2 100644
--- a/devel/invitation_to_ruby/Makefile
+++ b/devel/invitation_to_ruby/Makefile
@@ -47,7 +47,8 @@ pre-install:
 do-install:
 	${RM} -fr ${DOCSDIR}
 	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}; find . | ${CPIO} -pdmv -R ${DOCOWN}:${DOCGRP} ${DOCSDIR}
+	cd ${WRKSRC}; ${FIND} . \
+		| ${CPIO} -pdmv -R ${DOCOWN}:${DOCGRP} ${DOCSDIR}
 	${CHMOD} -R ugo-w,ugo+rX ${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/devel/moonshine/Makefile b/devel/moonshine/Makefile
index 3af8fa7..b13ff7e 100644
--- a/devel/moonshine/Makefile
+++ b/devel/moonshine/Makefile
@@ -32,7 +32,7 @@ CFLAGS+=	-O0
 .endif
 
 pre-configure:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's|\$$\{prefix\}/moonshine|\$$\{prefix\}/share/moonshine| ; \
 		 s|\@INSTBIN\@|${PREFIX}/bin| ; s|moc -o|\$$\(MOC\) -o|'
 	@${PERL} -pi -e 's|/usr/share/moonshine|${PREFIX}/share/moonshine|' \
diff --git a/devel/p4db/Makefile b/devel/p4db/Makefile
index 9c30adc..17a5bd2 100644
--- a/devel/p4db/Makefile
+++ b/devel/p4db/Makefile
@@ -49,7 +49,7 @@ post-patch:
 		-e 's,!!PERFORCE_PORT!!,${PERFORCE_PORT},g;' \
 		-e 's,!!FQDN!!,${FQDN},g;' \
 		${WRKSRC}/${PORTNAME}/P4DB.conf.sample
-	find ${WRKSRC}/${PORTNAME} -name '*.orig' -delete
+	${FIND} ${WRKSRC}/${PORTNAME} -name '*.orig' -delete
 
 do-install:
 	${MKDIR} ${P4DB_HOME}/www
diff --git a/devel/p5-Class-Contract/Makefile b/devel/p5-Class-Contract/Makefile
index 5580bd7..d0e0544 100644
--- a/devel/p5-Class-Contract/Makefile
+++ b/devel/p5-Class-Contract/Makefile
@@ -22,7 +22,7 @@ MAN3=		Class::Contract.3 Class::Contract::Production.3
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -name "*.p[lm]" | \
-		xargs ${PERL} -pi -e 's/\x0d//g;'
+		${XARGS} ${PERL} -pi -e 's/\x0d//g;'
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/examples
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index a801c7c..3878e2b 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -26,7 +26,7 @@ pre-patch:
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile
index 22f805b..2ca080e 100644
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@@ -47,7 +47,7 @@ EXAMPLESDIR=	${PREFIX}/share/examples/omniORBpy
 
 pre-configure:
 	@ ${MKDIR} ${CONFIGURE_WRKSRC}
-	@ cd ${OMNIORB_WRKSRC} && find idl | ${CPIO} ${WRKSRC}
+	@ cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} ${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#' \
@@ -61,7 +61,7 @@ pre-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy/* ${DOCSDIR}/html
 	@ ${INSTALL_DATA} ${WRKSRC}/doc/tex/* ${DOCSDIR}/tex
 	@ ${MKDIR} ${EXAMPLESDIR}
-	@ cd ${WRKSRC}/examples && find . \
+	@ cd ${WRKSRC}/examples && ${FIND} . \
 	  | ${CPIO} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
diff --git a/devel/qtez/Makefile b/devel/qtez/Makefile
index 297e811..c5354cc 100644
--- a/devel/qtez/Makefile
+++ b/devel/qtez/Makefile
@@ -39,7 +39,7 @@ post-patch:
 		 s|include/qaction.h|include/${QTNAME}/qaction.h|g ; \
 		 s|qtdir/include$$|qtdir/include/${QTNAME}|g ; \
 		 s|-lqt|-l${QTNAME}|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's|doc po images|doc images|g ; \
 		 s|prefix\)/qtez/plugins|prefix\)/lib/qtez/plugins|g ; \
 		 s|prefix\)/qtez/img|QTEZ\)/img|g'
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index 4f625d9..0f2a6c6 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -71,14 +71,15 @@ PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L}
 NO_FILTER_SHLIBS=	yes
 
 post-extract:
-	find ${WRKSRC}/ -type f -name '.cvsignore' -delete
+	${FIND} ${WRKSRC}/ -type f -name '.cvsignore' -delete
 
 post-patch:
 	${RUBY} -i~ -p \
 		-e 'gsub(/-lpthread/, "-pthread");' \
 		-e 'gsub(/-lgmodel/, "");' \
 		${WRKSRC}/Source/${MAKEFILE}
-	find ${WRKSRC}/ -type f | xargs ${RUBY} -i -pe 'gsub(/ ruby -/, " ${RUBY} -")'
+	${FIND} ${WRKSRC}/ -type f | \
+		${XARGS} ${RUBY} -i -pe 'gsub(/ ruby -/, " ${RUBY} -")'
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/swig13-doc/Makefile b/devel/swig13-doc/Makefile
index 2dddd4f..c934b7f 100644
--- a/devel/swig13-doc/Makefile
+++ b/devel/swig13-doc/Makefile
@@ -25,7 +25,9 @@ do-build:
 
 do-install:
 	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && find Examples Doc -type d -exec ${INSTALL} -d ${DOCSDIR}/{} \;
-	cd ${WRKSRC} && find Examples Doc -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	cd ${WRKSRC} && ${FIND} Examples Doc -type d \
+		-exec ${INSTALL} -d ${DOCSDIR}/{} \;
+	cd ${WRKSRC} && ${FIND} Examples Doc -type f \
+		-exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 
 .include <bsd.port.mk>
diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index a709b23..9a6aa9e 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -23,7 +23,7 @@ WRKSRC=	${WRKDIR}/tls1.4
 
 pre-patch:
 	# Fixing the end-of-lines:
-	for f in `find ${WRKSRC}/.. -type f` ; do \
+	for f in `${FIND} ${WRKSRC}/.. -type f` ; do \
 		${TR} -d '\015' < $$f > $$f.noms && \
 			${CAT} $$f.noms > $$f && ${RM} $$f.noms; done
 
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index e9323a3..6f2227d 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -35,7 +35,8 @@ test:
 .if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${DOCSDIR}; \
-	for f in `find ${ORIGWRKSRC}/docs-tla/html -type f -name '*.html' -exec ${BASENAME} {} \;`; do \
+	for f in `${FIND} ${ORIGWRKSRC}/docs-tla/html -type f -name '*.html' \
+		-exec ${BASENAME} {} \;`; do \
 		${INSTALL_DATA} ${ORIGWRKSRC}/docs-tla/html/$$f ${DOCSDIR}/; \
 		printf "share/doc/${PORTNAME}/%s\n" $$f >> ${TMPPLIST}; \
 	done; \
diff --git a/devel/wxGlade/Makefile b/devel/wxGlade/Makefile
index c957b51..7c4e83d 100644
--- a/devel/wxGlade/Makefile
+++ b/devel/wxGlade/Makefile
@@ -23,14 +23,14 @@ do-install:
 	@${MKDIR} ${PYTHON_SITELIBDIR}/${PORTNAME}
 	(cd ${WRKSRC} && ${FIND} [^d]* \! -name ".cvsignore" -type f | cpio -R ${SHAREOWN}:${SHAREGRP} -pdum ${PYTHON_SITELIBDIR}/${PORTNAME})
 	${CHMOD} -R 644 ${PYTHON_SITELIBDIR}/${PORTNAME}
-	${FIND} ${PYTHON_SITELIBDIR}/${PORTNAME} -type d | xargs ${CHMOD} 755
+	${FIND} ${PYTHON_SITELIBDIR}/${PORTNAME} -type d | ${XARGS} ${CHMOD} 755
 	${CHMOD} 755 ${PYTHON_SITELIBDIR}/${PORTNAME}/wxglade.py \
 		${PYTHON_SITELIBDIR}/${PORTNAME}/xrc2wxg.py
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${FIND} . -type f | cpio -R ${SHAREOWN}:${SHAREGRP} -pdum ${DOCSDIR})
 	${CHMOD} -R 644 ${DOCSDIR}
-	${FIND} ${DOCSDIR} -type d | xargs ${CHMOD} 755
+	${FIND} ${DOCSDIR} -type d | ${XARGS} ${CHMOD} 755
 .endif
 
 .include <bsd.port.mk>
diff --git a/dns/bind9-dlz/Makefile b/dns/bind9-dlz/Makefile
index f93fe25..c3a0b6a 100644
--- a/dns/bind9-dlz/Makefile
+++ b/dns/bind9-dlz/Makefile
@@ -172,9 +172,9 @@ pre-install:
 	@${ECHO_CMD} `${BASENAME} ${i}` | \
 	${SED}  -e "s=^=%%EXTRA_DOCSDIR%%/=" >>${PLIST}
 .endfor
-	@(cd ${WRKSRC}/.. && find dlz_docs -type f ) | \
+	@(cd ${WRKSRC}/.. && ${FIND} dlz_docs -type f ) | \
 	${SED}  -e "s=^=%%EXTRA_DOCSDIR%%/=" >>${PLIST}
-	@(cd ${WRKSRC}/.. && find -d dlz_docs -type d ) | \
+	@(cd ${WRKSRC}/.. && ${FIND} -d dlz_docs -type d ) | \
 	${SED} -e "s=^=@dirrm %%EXTRA_DOCSDIR%%/=" >>${PLIST}
 	@${ECHO_CMD} "@dirrm %%EXTRA_DOCSDIR%%" >>${PLIST}
 .endif
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index 31ca636..6a383be 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -83,7 +83,7 @@ pre-configure:
 	@cd ${WRKSRC}/ac-helpers && ${RM} -f install-sh mkinstalldirs missing
 	@${RM} -f ${WRKSRC}/configure.ac
 	@cd ${WRKSRC} && ./autogen.sh && ${TRUE}
-	@${FIND} ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
 		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g; \
 		 s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 31ca636..6a383be 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -83,7 +83,7 @@ pre-configure:
 	@cd ${WRKSRC}/ac-helpers && ${RM} -f install-sh mkinstalldirs missing
 	@${RM} -f ${WRKSRC}/configure.ac
 	@cd ${WRKSRC} && ./autogen.sh && ${TRUE}
-	@${FIND} ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
 		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g; \
 		 s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 31ca636..6a383be 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -83,7 +83,7 @@ pre-configure:
 	@cd ${WRKSRC}/ac-helpers && ${RM} -f install-sh mkinstalldirs missing
 	@${RM} -f ${WRKSRC}/configure.ac
 	@cd ${WRKSRC} && ./autogen.sh && ${TRUE}
-	@${FIND} ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
 		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g; \
 		 s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index 4f7f206..8fa191c7 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -29,7 +29,7 @@ MAN1=		dedit.1
 MANLANG=	"" ja
 
 pre-patch:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|dedit.ja.1||'
 
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 378b98f..4b98cd8 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -118,7 +118,7 @@ BROKEN=		First you should build install a port for mule except mule-common
 .endif
 
 pre-build::
-	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VERSION}.*
 
 post-build:
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index ab77d66..37acb4d 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -141,7 +141,7 @@ post-patch:
 .endif
 
 pre-build:
-	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VERSION}.*
 
 post-build:
diff --git a/editors/ooodict-all/Makefile b/editors/ooodict-all/Makefile
index 79ad658..327698a 100644
--- a/editors/ooodict-all/Makefile
+++ b/editors/ooodict-all/Makefile
@@ -106,7 +106,8 @@ post-install:
 			cd ${PREFIX} && ${FIND} -s ${DICT_DIR} -type f | \
 			    ${GREP} $${LANGUAGE}_$${COUNTRY} >> ${TMPPLIST} ; \
 			cd ${PREFIX} && ${FIND} -s ${DICT_DIR} -type f | \
-			    ${GREP} $${LANGUAGE}_$${COUNTRY} | xargs chmod 755 ; \
+			    ${GREP} $${LANGUAGE}_$${COUNTRY} | \
+			    ${XARGS} chmod 755 ; \
 			${ECHO} "@unexec ${CP} ${DICT_LIST} \
 			    ${DICT_LIST}.$${LANGUAGE}_$${COUNTRY}" >> ${TMPPLIST} ; \
 			${ECHO} "@unexec \
@@ -123,10 +124,10 @@ post-install:
 				${ECHO} "@exec ${ECHO} \"DICT $${LANGUAGE} AT de_AT\" \
 				    >> ${DICT_LIST}" >> ${TMPPLIST} ; \
 				${ECHO_CMD} "DICT $$LANGUAGE AT $${ABRV}" >> ${DICT_LIST_INST} ; \
-				cd ${PREFIX} && ${FIND} -s ${DICT_DIR} -type f | \
-				    ${GREP} $${LANGUAGE}_AT >> ${TMPPLIST} ; \
-				cd ${PREFIX} && ${FIND} -s ${DICT_DIR} -type l | \
-				    ${GREP} $${LANGUAGE}_AT >> ${TMPPLIST} ; \
+				cd ${PREFIX} && ${FIND} -s ${DICT_DIR} -type f \
+				    | ${GREP} $${LANGUAGE}_AT >> ${TMPPLIST} ; \
+				cd ${PREFIX} && ${FIND} -s ${DICT_DIR} -type l \
+				    | ${GREP} $${LANGUAGE}_AT >> ${TMPPLIST} ; \
 				${ECHO} "@unexec ${CP} ${DICT_LIST} \
 				    ${DICT_LIST}.$${LANGUAGE}_AT" >> ${TMPPLIST} ; \
 				${ECHO} "@unexec \
@@ -165,7 +166,7 @@ post-install:
 			cd ${PREFIX} && ${FIND} -s ${DICT_DIR} -type f | \
 			    ${GREP} hyph_$${ABRV}.dic >> ${TMPPLIST} ; \
 			cd ${PREFIX} && ${FIND} -s ${DICT_DIR} -type f | \
-			    ${GREP} hyph_$${ABRV}.dic | xargs chmod 755 ; \
+			    ${GREP} hyph_$${ABRV}.dic | ${XARGS} chmod 755 ; \
 			${ECHO} "@unexec ${CP} ${DICT_LIST} \
 			    ${DICT_LIST}.hyph_$${LANGUAGE}_$${COUNTRY}" >> ${TMPPLIST} ; \
 			${ECHO} "@unexec \
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 05e3256..47d1890 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -159,7 +159,8 @@ pre-configure::
 .endfor
 
 pre-build:
-	@find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	@${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) \
+		-exec ${RM} -f \{} \;
 	@${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
 
 post-install::
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index bb0562a..824b9cc 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -169,7 +169,8 @@ pre-configure::
 .endfor
 
 pre-build:
-	@find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	@${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) \
+		-exec ${RM} -f \{} \;
 	@${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
 
 post-install::
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index 3bf66b5..e1741a5 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -158,8 +158,8 @@ pre-install:
 		&& ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
 do-install:
-	cd ${WRKSRC} && find * | cpio -dlmp ${PREFIX}
-	find ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
+	cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${PREFIX}
+	${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
 
 post-install:
 	@${ECHO} ''
diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index 3bf66b5..e1741a5 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -158,8 +158,8 @@ pre-install:
 		&& ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
 do-install:
-	cd ${WRKSRC} && find * | cpio -dlmp ${PREFIX}
-	find ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
+	cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${PREFIX}
+	${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
 
 post-install:
 	@${ECHO} ''
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index 3bf66b5..e1741a5 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -158,8 +158,8 @@ pre-install:
 		&& ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
 do-install:
-	cd ${WRKSRC} && find * | cpio -dlmp ${PREFIX}
-	find ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
+	cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${PREFIX}
+	${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
 
 post-install:
 	@${ECHO} ''
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index 3bf66b5..e1741a5 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -158,8 +158,8 @@ pre-install:
 		&& ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
 do-install:
-	cd ${WRKSRC} && find * | cpio -dlmp ${PREFIX}
-	find ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
+	cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${PREFIX}
+	${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
 
 post-install:
 	@${ECHO} ''
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index 3bf66b5..e1741a5 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -158,8 +158,8 @@ pre-install:
 		&& ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
 do-install:
-	cd ${WRKSRC} && find * | cpio -dlmp ${PREFIX}
-	find ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
+	cd ${WRKSRC} && ${FIND} * | cpio -dlmp ${PREFIX}
+	${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
 
 post-install:
 	@${ECHO} ''
diff --git a/emulators/sim/Makefile b/emulators/sim/Makefile
index 763e2d6..c56de8c 100644
--- a/emulators/sim/Makefile
+++ b/emulators/sim/Makefile
@@ -31,7 +31,7 @@ BIN_FILES=	altair h316 ibm1130 pdp11 pdp8 \
 
 pre-patch:
 	@${MKDIR} ${WRKSRC}/BIN
-	@for i in ${WRKSRC}/makefile `find ${WRKSRC} -name "*.[hc]"`; do \
+	@for i in ${WRKSRC}/makefile `${FIND} ${WRKSRC} -name "*.[hc]"`; do \
 		${CAT} $$i | ${TR} -d '\r' > $$i.new; \
 		${MV} $$i.new $$i; \
 	done
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 763e2d6..c56de8c 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -31,7 +31,7 @@ BIN_FILES=	altair h316 ibm1130 pdp11 pdp8 \
 
 pre-patch:
 	@${MKDIR} ${WRKSRC}/BIN
-	@for i in ${WRKSRC}/makefile `find ${WRKSRC} -name "*.[hc]"`; do \
+	@for i in ${WRKSRC}/makefile `${FIND} ${WRKSRC} -name "*.[hc]"`; do \
 		${CAT} $$i | ${TR} -d '\r' > $$i.new; \
 		${MV} $$i.new $$i; \
 	done
diff --git a/ftp/ftpsearch/Makefile b/ftp/ftpsearch/Makefile
index 481f48b..55366cc 100644
--- a/ftp/ftpsearch/Makefile
+++ b/ftp/ftpsearch/Makefile
@@ -40,7 +40,7 @@ MAN8=	astat.8 autoupdateconfig.pl.8 cardusage.8 checkenv.pl.8 chknavig.8 \
 	search.8 sgateway.8 siteadmin.pl.8 sortsuffix.8
 
 pre-install:
-	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} \{} \;
+	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} \{} \;
 
 post-install:
 	${LN} -sf ${PREFIX}/ftpsearch/bin/gateway ${PREFIX}/bin/ftpsearch
diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile
index b522f6a..115a4de 100644
--- a/games/bomberinstinct/Makefile
+++ b/games/bomberinstinct/Makefile
@@ -28,6 +28,7 @@ CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
 
 pre-patch:
-	@find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e 's|<SDL/|<|g'
+	@${FIND} ${WRKSRC} -name "*.[ch]" | \
+		${XARGS} ${PERL} -pi -e 's|<SDL/|<|g'
 
 .include <bsd.port.mk>
diff --git a/games/egoboo/Makefile b/games/egoboo/Makefile
index 37579dd..bb922f2 100644
--- a/games/egoboo/Makefile
+++ b/games/egoboo/Makefile
@@ -24,7 +24,7 @@ SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 USE_REINPLACE=	yes
 
 pre-patch:
-	@find ${WRKSRC}/.. -type d -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC}/.. -type d -name CVS | ${XARGS} ${RM} -rf
 
 post-patch:
 	@cd ${WRKSRC}/code && ${GMAKE} clean
diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile
index cca2433..d308de5 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index 16eff1b..33666f6 100644
--- a/games/gnomechess/Makefile
+++ b/games/gnomechess/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/games/hlserver-cs/Makefile b/games/hlserver-cs/Makefile
index 3ae96a5..efed0fa 100644
--- a/games/hlserver-cs/Makefile
+++ b/games/hlserver-cs/Makefile
@@ -54,7 +54,7 @@ post-extract: slaveport-post-extract
 
 pre-patch:
 # remove trailing ^M
-	@find -E ${WRKSRC} -type f \
+	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|lst|sc|scr|txt)" \
 		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
 
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index e5c0d17..6b6f59a 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -25,8 +25,8 @@ CONFIGURE_ENV=	LIBS="-lcompat" \
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@find ${WRKSRC} \( -name "*.[ch]" -or -name "*.cpp" \) | \
-		xargs ${PERL} -pi -e 's|"SDL/SDL|"SDL|g ; s|<SDL/SDL|<SDL|g'
+	@${FIND} ${WRKSRC} \( -name "*.[ch]" -or -name "*.cpp" \) | \
+		${XARGS} ${PERL} -pi -e 's|"SDL/SDL|"SDL|g ; s|<SDL/SDL|<SDL|g'
 
 pre-install:
 	${MKDIR} /var/games/${PORTNAME}
diff --git a/games/moonlander/Makefile b/games/moonlander/Makefile
index d6510a8..94900b07 100644
--- a/games/moonlander/Makefile
+++ b/games/moonlander/Makefile
@@ -43,6 +43,7 @@ do-install:
 .endfor
 
 post-install:
-	@find ${PREFIX}/share/moonlander -type f -print0 |xargs -0 ${CHMOD} 444
+	@${FIND} ${PREFIX}/share/moonlander -type f -print0 | \
+		${XARGS} -0 ${CHMOD} 444
 
 .include <bsd.port.mk>
diff --git a/games/nil/Makefile b/games/nil/Makefile
index 80242f5..c6cfde6 100644
--- a/games/nil/Makefile
+++ b/games/nil/Makefile
@@ -32,9 +32,9 @@ BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
 pre-patch:
-	@find ${WRKSRC} \( -name "*.[ch]" -or -name "*.cpp" \) | \
-		xargs ${PERL} -pi -e 's|"SDL/|"|g ; s|<SDL/|<|g'
-	@find ${WRKSRC}/.. -type d -name CVS | xargs ${RM} -rf
+	@${FIND} ${WRKSRC} \( -name "*.[ch]" -or -name "*.cpp" \) | \
+		${XARGS} ${PERL} -pi -e 's|"SDL/|"|g ; s|<SDL/|<|g'
+	@${FIND} ${WRKSRC}/.. -type d -name CVS | ${XARGS} ${RM} -rf
 
 post-configure:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/nil/configuration.cpp
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index cca2433..d308de5 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/games/ptkei/Makefile b/games/ptkei/Makefile
index 363d19e..c49b631 100644
--- a/games/ptkei/Makefile
+++ b/games/ptkei/Makefile
@@ -19,9 +19,9 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
 USE_PYTHON=	yes
 
 do-build:
-	@find ${WRKSRC} -name "*.pyc" | xargs ${RM}
-	@find ${WRKSRC} \( -type f -or -type l \) | xargs ${CHMOD} 644
-	@find ${WRKSRC} -type d | xargs ${CHMOD} 755
+	@${FIND} ${WRKSRC} -name "*.pyc" | ${XARGS} ${RM}
+	@${FIND} ${WRKSRC} \( -type f -or -type l \) | ${XARGS} ${CHMOD} 644
+	@${FIND} ${WRKSRC} -type d | ${XARGS} ${CHMOD} 755
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} 2>/dev/null
 
 do-install:
diff --git a/games/q3server-ra3/Makefile b/games/q3server-ra3/Makefile
index d62d1de..aa2b868 100644
--- a/games/q3server-ra3/Makefile
+++ b/games/q3server-ra3/Makefile
@@ -61,7 +61,7 @@ post-extract:
 
 pre-patch:
 # remove trailing ^M
-	@find -E ${WRKSRC} -type f \
+	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|lst|sc|scr|txt|url)" \
 		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
 
diff --git a/games/quake3-ra3/Makefile b/games/quake3-ra3/Makefile
index d62d1de..aa2b868 100644
--- a/games/quake3-ra3/Makefile
+++ b/games/quake3-ra3/Makefile
@@ -61,7 +61,7 @@ post-extract:
 
 pre-patch:
 # remove trailing ^M
-	@find -E ${WRKSRC} -type f \
+	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|lst|sc|scr|txt|url)" \
 		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
 
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index 42a6ad2..bc41498 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -32,7 +32,7 @@ do-extract:
 
 pre-patch:
 # remove trailing ^M
-	@find -E ${WRKSRC} -type f \
+	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|lst|sc|scr|txt|url)" \
 		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
 
diff --git a/games/teg/Makefile b/games/teg/Makefile
index 176afab..aa3e76b 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}"
 
 post-patch:
-	@find ${WRKSRC} -name "*.[ch]" -type f | xargs ${REINPLACE_CMD} -e \
-		's|LIST_NEXT|TEG_LIST_NEXT|g'
+	@${FIND} ${WRKSRC} -name "*.[ch]" -type f | ${XARGS} \
+		${REINPLACE_CMD} -e 's|LIST_NEXT|TEG_LIST_NEXT|g'
 
 .include <bsd.port.mk>
diff --git a/games/toppler/Makefile b/games/toppler/Makefile
index b47aada..96a1df7 100644
--- a/games/toppler/Makefile
+++ b/games/toppler/Makefile
@@ -27,8 +27,8 @@ MAN6=		toppler.6
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@find ${WRKSRC} \( -name "*.[ch]" -or -name "*.cc" \) | \
-		xargs ${PERL} -pi -e 's|"SDL/SDL|"SDL|g ; s|<SDL/SDL|<SDL|g'
+	@${FIND} ${WRKSRC} \( -name "*.[ch]" -or -name "*.cc" \) | \
+		${XARGS} ${PERL} -pi -e 's|"SDL/SDL|"SDL|g ; s|<SDL/SDL|<SDL|g'
 
 post-install:
 	@cd ${WRKSRC} && ${MAKE} global_highscore
diff --git a/games/utserver-to/Makefile b/games/utserver-to/Makefile
index 04a5fce..c4ea2e4 100644
--- a/games/utserver-to/Makefile
+++ b/games/utserver-to/Makefile
@@ -66,12 +66,12 @@ post-extract:
 
 pre-patch:
 # remove trailing ^M
-	@find -E ${WRKDIR} -type f \
+	@${FIND} -E ${WRKDIR} -type f \
 		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|int|lst|pl|pm|sc|sh|scr|txt|url|uhtm)" \
 		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
 .ifdef(EXTRA_CLEAN_FILES)
 .for pattern in ${EXTRA_CLEAN_FILES}
-	@find -E ${WRKDIR} -type f \
+	@${FIND} -E ${WRKDIR} -type f \
 		-iregex "${pattern}" \
 		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
 .endfor
diff --git a/games/utserver/Makefile b/games/utserver/Makefile
index e96ce90..efd86c8 100644
--- a/games/utserver/Makefile
+++ b/games/utserver/Makefile
@@ -39,7 +39,7 @@ EXECUTABLES=	ucc ucc-bin ngStatsUT ngStatsUT.exe ngWorldStats \
 
 pre-patch:
 # remove trailing ^M
-	@find -E ${WRKSRC} -type f \
+	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|int|lst|pl|pm|sc|sh|scr|txt|url|uhtm)" \
 		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
 	@${SED} -e "s!%%LOCALBASE%%!${LOCALBASE}!" \
diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile
index 8076ea8..a288f2c 100644
--- a/games/xbomber/Makefile
+++ b/games/xbomber/Makefile
@@ -24,8 +24,10 @@ do-install:
 	@${MKDIR} ${PREFIX}/share/xbomber
 	${TAR} -C ${WRKSRC} -cf - bitmaps jungle levels pixmaps sounds | \
 		${TAR} -C ${PREFIX}/share/xbomber --unlink -xf -
-	@find ${PREFIX}/share/xbomber | xargs ${CHOWN} ${SHAREOWN}:${SHAREGRP}
-	@find ${PREFIX}/share/xbomber -type f | xargs ${CHMOD} ${SHAREMODE}
+	@${FIND} ${PREFIX}/share/xbomber | \
+		${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
+	@${FIND} ${PREFIX}/share/xbomber -type f | \
+		${XARGS} ${CHMOD} ${SHAREMODE}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/xbomber
 .for file in README.txt LEVELS.txt SOUND.txt GRAPHICS.txt
diff --git a/german/manpages/Makefile b/german/manpages/Makefile
index 07b260b..36f280b 100644
--- a/german/manpages/Makefile
+++ b/german/manpages/Makefile
@@ -29,7 +29,7 @@ do-build:
 .endif
 
 pre-install:
-	find ${WRKSRC}/${manpages} -type f -print | \
+	${FIND} ${WRKSRC}/${manpages} -type f -print | \
 		 ${SED} "s%${WRKSRC}/${manpages}%man/${LANG}%" > ${PLIST}
 
 do-install:
diff --git a/graphics/GIFgraph/Makefile b/graphics/GIFgraph/Makefile
index 3f450dc..71074e2 100644
--- a/graphics/GIFgraph/Makefile
+++ b/graphics/GIFgraph/Makefile
@@ -24,6 +24,6 @@ PERL_CONFIGURE=	YES
 MAN3=		GIFgraph.3 GIFgraph::colour.3
 
 post-patch:
-	find ${WRKSRC} -name '*.orig' -delete
+	${FIND} ${WRKSRC} -name '*.orig' -delete
 
 .include <bsd.port.mk>
diff --git a/graphics/dc20pack/Makefile b/graphics/dc20pack/Makefile
index 7bcee90..11e3485 100644
--- a/graphics/dc20pack/Makefile
+++ b/graphics/dc20pack/Makefile
@@ -19,7 +19,10 @@ WRKSRC=			${WRKDIR}
 USE_REINPLACE=		yes
 
 post-extract:
-	for file in `/usr/bin/find ${WRKSRC} -type f`; do ${TR} -d '\015' < $${file} > $${file}.new; mv $${file}.new $${file}; done
+	for file in `${FIND} ${WRKSRC} -type f`; do \
+		${TR} -d '\015' < $${file} > $${file}.new; \
+		mv $${file}.new $${file}; \
+	done
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/dc20dump ${PREFIX}/bin
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 05709a7..4864359 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -47,7 +47,7 @@ pre-everything::
 
 .if defined(LOCALBASE) && ${LOCALBASE} != "/usr/local"
 pre-configure:
-	${PERL} -pi -e 's,/usr/local,${LOCALBASE},g' `find ${WRKSRC} \
+	${PERL} -pi -e 's,/usr/local,${LOCALBASE},g' `${FIND} ${WRKSRC} \
 		-type f -print0 | ${XARGS} -0 ${GREP} -Fl --mmap /usr/local`
 .endif
 
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 8fe646d..a394d10 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -46,7 +46,7 @@ AC_FAKE_FILES=	aclocal.m4 config.h.in stamp-h stamp-h.in
 
 post-configure:
 	cd ${WRKSRC}; ${TOUCH} ${AC_FAKE_FILES}
-	find ${WRKSRC} -name Makefile.in | xargs ${TOUCH}
+	${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${TOUCH}
 
 pre-install:
 	${MKDIR} ${PREFIX}/share/geomview
diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
index a79094f..64b4fc4 100644
--- a/graphics/utah-glx/Makefile
+++ b/graphics/utah-glx/Makefile
@@ -57,8 +57,8 @@ IGNORE=		"Requires XFree86 3.3.* - will not work with XFree86 4.*"
 .endif
 
 pre-build:
-	@find ${WRKSRC} -type f | xargs grep -l linux/agpgart | \
-		xargs perl -pi -e "s|linux/agpgart|sys/agpio|"
+	@${FIND} ${WRKSRC} -type f | ${XARGS} grep -l linux/agpgart | \
+		${XARGS} perl -pi -e "s|linux/agpgart|sys/agpio|"
 
 pre-install:
 .if exists(${PREFIX}/lib/libGL.so.${GLVER}) && !defined(GL_CHECK_OVERRIDE) && !defined(PACKAGE_BUILDING)
diff --git a/japanese/balsa/Makefile b/japanese/balsa/Makefile
index bb7db1c..67b222f 100644
--- a/japanese/balsa/Makefile
+++ b/japanese/balsa/Makefile
@@ -32,7 +32,7 @@ MAN1=		balsa.1
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
 		 s|\$\(gnomedatadir\)/gnome|\$\(gnomedatadir\)|g'
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index f57cc97..9dd0d22 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -150,7 +150,7 @@ pre-fetch:
 	@${CAT} ${FILESDIR}/emcws-message
 
 pre-build:
-	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -rf ${WRKSRC}/info/*
 	@(cd ${WRKSRC}/src/../lisp; \
 	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${LOCALBASE}/bin/emacs-${EMACS_VER})
diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
index cedad24..cedf674 100644
--- a/japanese/emacs20-emcws/Makefile
+++ b/japanese/emacs20-emcws/Makefile
@@ -145,7 +145,7 @@ pre-fetch:
 	@${CAT} ${FILESDIR}/emcws-message
 
 pre-build:
-	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -rf ${WRKSRC}/info/*
 	@(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs)
 	@(cd ${WRKSRC}/src/../lisp; \
diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile
index f57cc97..9dd0d22 100644
--- a/japanese/emacs21-emcws/Makefile
+++ b/japanese/emacs21-emcws/Makefile
@@ -150,7 +150,7 @@ pre-fetch:
 	@${CAT} ${FILESDIR}/emcws-message
 
 pre-build:
-	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -rf ${WRKSRC}/info/*
 	@(cd ${WRKSRC}/src/../lisp; \
 	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${LOCALBASE}/bin/emacs-${EMACS_VER})
diff --git a/japanese/gal/Makefile b/japanese/gal/Makefile
index a3c83c3..2b4ea3b 100644
--- a/japanese/gal/Makefile
+++ b/japanese/gal/Makefile
@@ -14,6 +14,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 post-patch:
 	perl -pi -e  's/gdk_font_load(\s)\(.*\)/gdk_fontset_load$$1\("-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"\)/' \
-		`find ${WRKSRC} -name "*.c" -print`
+		`${FIND} ${WRKSRC} -name "*.c" -print`
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/hns/Makefile b/japanese/hns/Makefile
index 3ed38c5e..03c623df 100644
--- a/japanese/hns/Makefile
+++ b/japanese/hns/Makefile
@@ -28,8 +28,10 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/todayhns/todayhns ${PREFIX}/bin/todayhns
 
 post-install:
-	@cd ${WRKSRC} && find . -type f -o -type l | sed 's,^\.,share/${PORTNAME},' | sort >> ${TMPPLIST}
-	@cd ${WRKSRC} && find . -type d | sed 's,^\.,@dirrm share/${PORTNAME},' | sort -r >> ${TMPPLIST}
+	@cd ${WRKSRC} && ${FIND} . -type f -o -type l | \
+		sed 's,^\.,share/${PORTNAME},' | sort >> ${TMPPLIST}
+	@cd ${WRKSRC} && ${FIND} . -type d | \
+		sed 's,^\.,@dirrm share/${PORTNAME},' | sort -r >> ${TMPPLIST}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/postgresql/Makefile b/japanese/postgresql/Makefile
index a3891da..1a21164 100644
--- a/japanese/postgresql/Makefile
+++ b/japanese/postgresql/Makefile
@@ -104,7 +104,7 @@ pre-fetch:
 .include <bsd.port.pre.mk>
 
 post-patch:
-	find ${WRKDIR} -name '*.orig' -exec ${RM} {} \;
+	${FIND} ${WRKDIR} -name '*.orig' -exec ${RM} {} \;
 
 post-build:
 	@ ${ECHO} "------------------------------------------------------------"
diff --git a/japanese/tkdesk/Makefile b/japanese/tkdesk/Makefile
index 1ad20a9..75d2e60 100644
--- a/japanese/tkdesk/Makefile
+++ b/japanese/tkdesk/Makefile
@@ -37,7 +37,7 @@ pre-patch:
 	@cd ${WRKSRC}; ${PATCH} -s < ${FILESDIR}/pre-patch
 
 post-patch:
-	@/usr/bin/find ${WRKSRC}/tcldesk '(' -name '*.orig' -o -name '*~' ')' \
+	@${FIND} ${WRKSRC}/tcldesk '(' -name '*.orig' -o -name '*~' ')' \
 	-exec ${RM} -f {} \;
 	@${RM} ${WRKSRC}/config.h ${WRKSRC}/config.cache
 
diff --git a/japanese/vje30-trial/Makefile b/japanese/vje30-trial/Makefile
index 39c179a..af07aff 100644
--- a/japanese/vje30-trial/Makefile
+++ b/japanese/vje30-trial/Makefile
@@ -46,7 +46,7 @@ BINSTUFF=	vje	\
 
 post-patch:
 	@cd ${WRKSRC}/vje30/bin && ${RM} swingall.jar
-	@find ${WRKSRC} -name '*.orig' -delete
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${CP} ${FILESDIR}/vje.sh ${WRKSRC}/etc/rc.d/
 .if defined(NOPORTDOCS)
 	@cd ${WRKSRC}/vje30 && ${RM} -rf doc README FAQ
diff --git a/japanese/xdvik-vflib/Makefile b/japanese/xdvik-vflib/Makefile
index 64752ab..3dc86f3 100644
--- a/japanese/xdvik-vflib/Makefile
+++ b/japanese/xdvik-vflib/Makefile
@@ -154,7 +154,7 @@ pre-fetch:
 	${ECHO} "**************************************************************")
 
 pre-build:
-	@(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
+	@(cd ${WRKSRC} ; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;)
 
 do-install:
 	@(cd ${WRKSRC}/texk/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} \
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 64752ab..3dc86f3 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -154,7 +154,7 @@ pre-fetch:
 	${ECHO} "**************************************************************")
 
 pre-build:
-	@(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
+	@(cd ${WRKSRC} ; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;)
 
 do-install:
 	@(cd ${WRKSRC}/texk/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} \
diff --git a/java/jdk12/Makefile b/java/jdk12/Makefile
index 9bda99e..168fe82 100644
--- a/java/jdk12/Makefile
+++ b/java/jdk12/Makefile
@@ -146,8 +146,9 @@ post-build:
 		done; \
 	done
 	for dir in ${JDKIMAGEDIR} ${JREIMAGEDIR}; do \
-		find $${dir} -type  f | xargs file | ${GREP} 'not stripped$$' | \
-			${SED} 's|:.*$$||' | xargs strip; \
+		${FIND} $${dir} -type  f | ${XARGS} file | \
+			${GREP} 'not stripped$$' | \
+			${SED} 's|:.*$$||' | ${XARGS} strip; \
 	done
 
 .if !defined(NODEBUG)
diff --git a/java/linux-blackdown-jdk12/Makefile b/java/linux-blackdown-jdk12/Makefile
index 6f15c83..5abcc03 100644
--- a/java/linux-blackdown-jdk12/Makefile
+++ b/java/linux-blackdown-jdk12/Makefile
@@ -37,7 +37,7 @@ CPIO?=		/usr/bin/cpio
 
 post-patch:
 	${FIND} ${WRKSRC} \( -name '*.orig' -o -name '.*.orig' \) -print \
-	  | xargs ${RM} -f
+	  | ${XARGS} ${RM} -f
 
 do-install:
 	${MKDIR} ${APP_HOME}
diff --git a/java/linux-sun-jdk12/Makefile b/java/linux-sun-jdk12/Makefile
index 634c198..9ece974 100644
--- a/java/linux-sun-jdk12/Makefile
+++ b/java/linux-sun-jdk12/Makefile
@@ -41,7 +41,7 @@ IGNORE=You must manually fetch the Sun Java 2 Standard Edition SDK ${JDK_VERSION
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f
+	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
 
 do-install:
 	@${ECHO_CMD} -n ">> Creating destination directory ${APP_HOME}..."
diff --git a/java/linux-sun-jdk13/Makefile b/java/linux-sun-jdk13/Makefile
index 8f659b6..a3a6221 100644
--- a/java/linux-sun-jdk13/Makefile
+++ b/java/linux-sun-jdk13/Makefile
@@ -67,7 +67,7 @@ do-extract:
 	&& ${WRKDIR}/install.sfx > /dev/null
 
 post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f
+	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
 
 do-install:
 	${MKDIR} ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION}
diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile
index 4c710f7..117ad82 100644
--- a/java/linux-sun-jdk14/Makefile
+++ b/java/linux-sun-jdk14/Makefile
@@ -59,7 +59,7 @@ do-extract:
 	&& ${WRKDIR}/install.sfx > /dev/null
 
 post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f
+	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
 
 do-install:
 	${MKDIR} ${APP_HOME}
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index 1d40c7f..7a2d22f 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -86,11 +86,11 @@ pre-build:
 		@echo "===>    ${CLASSESDIR}"
 		@cd ${WRKDIR}/${CLASSESDIR}; \
 		${MKDIR} classes; \
-		find . | ${GREP} '\.java$$' | xargs jikes -g \
+		${FIND} . | ${GREP} '\.java$$' | ${XARGS} jikes -g \
 		    -target 1.1 -d classes \
 		    -bootclasspath src:classes -classpath src:classes \
 		    -sourcepath src || exit 1; \
-		find resource -type f | cut -d\/ -f2- \
+		${FIND} resource -type f | cut -d\/ -f2- \
 		    | ${AWK} '{print "cp resource/" $$0 " classes/" $$0 }' \
 		    | ${SH}; \
 		${CHMOD} -R a+rX classes