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

53 files changed, 70 insertions, 67 deletions

diff --git a/palm/sitescooper/Makefile b/palm/sitescooper/Makefile
index 6e001550f01f..29a1269776b0 100644
--- a/palm/sitescooper/Makefile
+++ b/palm/sitescooper/Makefile
@@ -46,9 +46,9 @@ do-install:
 	${MKDIR} ${SITE_PERL}/${D}
 	${INSTALL_DATA} ${WRKSRC}/lib/${D}/* ${SITE_PERL}/${D}
 .endfor
-	(cd ${WRKSRC}; /usr/bin/find profile_samples site_samples -type d \
+	(cd ${WRKSRC}; ${FIND} profile_samples site_samples -type d \
 		-exec ${MKDIR} "${PREFIX}/share/sitescooper/{}" \;)
-	(cd ${WRKSRC}; /usr/bin/find profile_samples site_samples -type f \
+	(cd ${WRKSRC}; ${FIND} profile_samples site_samples -type f \
 		-exec ${INSTALL_DATA} "{}" "${PREFIX}/share/sitescooper/{}" \;)
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
diff --git a/print/adobe-cmaps/Makefile b/print/adobe-cmaps/Makefile
index 75636c4ef407..14e08fb0406a 100644
--- a/print/adobe-cmaps/Makefile
+++ b/print/adobe-cmaps/Makefile
@@ -22,7 +22,7 @@ RESOURCE=	${PREFIX}/share/ghostscript/Resource
 do-install:
 	@${MKDIR} ${RESOURCE}/CIDFont
 	@${MKDIR} ${RESOURCE}/Font
-	@cd ${WRKSRC} && find . \! -name '.*' \
+	@cd ${WRKSRC} && ${FIND} . \! -name '.*' \
 		| cpio --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${RESOURCE}
 
 .include <bsd.port.mk>
diff --git a/print/libgnomeprint20/Makefile b/print/libgnomeprint20/Makefile
index 969938700afc..0cedfbfd7d8e 100644
--- a/print/libgnomeprint20/Makefile
+++ b/print/libgnomeprint20/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@find ${WRKSRC} -name '*.[ch]' | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<malloc[.]h>|<stdlib.h>|'
 
 post-install:
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 3698937374ed..20e12b9e72f2 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -60,7 +60,7 @@ post-install:
 	cd ${WRKSRC}/input ; \
 	${TAR} -chf - --exclude=out --exclude=CVS --exclude=GNUmakefile . | \
 		${TAR} -xf - -C ${EXAMPLESDIR};\
-	${FIND} ${EXAMPLESDIR} -name "out" | xargs ${RM} -rf ;
+	${FIND} ${EXAMPLESDIR} -name "out" | ${XARGS} ${RM} -rf ;
 .for ii in login profile
 	${INSTALL_SCRIPT} ${WRKSRC}/buildscripts/out/lilypond-${ii} \
 		${EXAMPLESDIR}/scripts
diff --git a/print/tex/Makefile b/print/tex/Makefile
index ba2e8fb1109c..bab59db82c76 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -37,7 +37,7 @@ INFO=		kpathsea web2c
 MAKE_FLAGS=	fmts= all_mems=
 
 pre-configure:
-	cd ${WRKDIR} && find . -name \*.gz | xargs gunzip -f
+	cd ${WRKDIR} && ${FIND} . -name \*.gz | ${XARGS} gunzip -f
 
 post-configure:
 	@cd ${WRKSRC}/web2c; \
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 20e2b4afd3a8..68dd6d005667 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=YES
 MAN1=xdvi.1 gsftopk.1
 
 pre-build:
-	(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
+	(cd ${WRKSRC} ; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;)
 
 do-install:
 	(cd ${WRKSRC}/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile
index 03571bde881e..5280678ecae2 100644
--- a/russian/apache13-modssl/Makefile
+++ b/russian/apache13-modssl/Makefile
@@ -217,7 +217,7 @@ pre-patch:
 
 post-patch:
 	@cd ${WRKSRC} \
-	&& find . -type f -name "*.orig" -print | xargs ${RM} -f
+	&& ${FIND} . -type f -name "*.orig" -print | ${XARGS} ${RM} -f
 
 post-build:
 	@cd ${WRKSRC} \
diff --git a/science/at/Makefile b/science/at/Makefile
index 802be85d757d..0fb0bcabbb40 100644
--- a/science/at/Makefile
+++ b/science/at/Makefile
@@ -23,7 +23,8 @@ do-install:
 	${MKDIR} ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/libexec/at
-	${INSTALL_PROGRAM} `find ${WRKSRC} -name \*.out -print` ${PREFIX}/libexec/at
+	${INSTALL_PROGRAM} `${FIND} ${WRKSRC} -name \*.out -print` \
+		${PREFIX}/libexec/at
 	${MKDIR} ${PREFIX}/share/examples/at
 	${CP} -rp ${WRKSRC}/tests/* ${PREFIX}/share/examples/at
 	${INSTALL_SCRIPT} ${WRKSRC}/at_init ${PREFIX}/share/examples/at
diff --git a/security/gcipher/Makefile b/security/gcipher/Makefile
index d67ee0fd8afa..5a9ae341ea7f 100644
--- a/security/gcipher/Makefile
+++ b/security/gcipher/Makefile
@@ -42,7 +42,7 @@ do-install:
 	(cd ${WRKSRC}/src; \
 	 ${INSTALL_SCRIPT} gcipher ${PREFIX}/bin/gcipher; \
 	 ${INSTALL_DATA} gcipher.desktop ${PREFIX}/share/gnome/applications; \
-	 for i in `find . -name '*.py' \
+	 for i in `${FIND} . -name '*.py' \
 		       -o -name '*.pyc' \
 		       -o -name '*.glade' \
 		       -o -name '*.gladep'`; do \
@@ -50,7 +50,7 @@ do-install:
 	 done)
 
 	(cd ${WRKSRC}/plugins; \
-	 for i in `find . -name '*.py' \
+	 for i in `${FIND} . -name '*.py' \
 		       -o -name '*.glade' \
 		       -o -name '*.gladep'`; do \
 		${INSTALL_DATA} "$$i" "${GCIPHER_PREFIX}/plugins/$$i"; \
diff --git a/security/l0phtcrack/Makefile b/security/l0phtcrack/Makefile
index bb24f79f37c8..a375b7f56cc2 100644
--- a/security/l0phtcrack/Makefile
+++ b/security/l0phtcrack/Makefile
@@ -32,7 +32,7 @@ do-build:
 pre-install:
 	${ECHO_CMD} bin/lc_CLI > ${PLIST}
 .if !defined(NOPORTDOCS)
-	for i in `find ${WRKDIR} -name '*txt'`; \
+	for i in `${FIND} ${WRKDIR} -name '*txt'`; \
 		do ${ECHO_CMD} ${DOCDIR}/`${BASENAME} $${i}` >> ${PLIST}; \
 	done
 	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
diff --git a/security/skip/Makefile b/security/skip/Makefile
index 49dad581c95f..078f760c5e5d 100644
--- a/security/skip/Makefile
+++ b/security/skip/Makefile
@@ -49,15 +49,15 @@ MAN4=			skipd.conf.4 raw_keys.4
 # Also, we remove all the "#pragma ident" lines that generate
 # a bazillion warnings from the compiler.
 post-patch:
-	@find ${WRKSRC} -name '*.orig' -print | xargs ${RM}
+	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM}
 	@cd ${WRKSRC}; \
-	FILES=`find . -type f -print | xargs ${GREP} -l @@PREFIX@@`; \
+	FILES=`${FIND} . -type f -print | ${XARGS} ${GREP} -l @@PREFIX@@`; \
 	for FILE in $$FILES; do \
 	  ${SED} 's!@@PREFIX@@!${PREFIX}!g' < $$FILE > $$FILE.new ; \
 	  ${MV} $$FILE.new $$FILE; \
 	done; \
-	FILES=`find . -type f -name '*.[cCh]' -print \
-	  | xargs ${GREP} -l '^#pragma ident'`; \
+	FILES=`${FIND} . -type f -name '*.[cCh]' -print \
+	  | ${XARGS} ${GREP} -l '^#pragma ident'`; \
 	for FILE in $$FILES; do \
 	  ${SED} '/^#pragma ident/d' < $$FILE > $$FILE.new ; \
 	  ${MV} $$FILE.new $$FILE; \
diff --git a/sysutils/freesbie/Makefile b/sysutils/freesbie/Makefile
index 5cd8a8303e8a..53857b917a25 100644
--- a/sysutils/freesbie/Makefile
+++ b/sysutils/freesbie/Makefile
@@ -30,7 +30,7 @@ pre-install:
 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
 	@ cd ${PREFIX} && ${FIND} share/${PORTNAME} -type f -print | ${SORT} > ${TMPPLIST}
 	@ cd ${PREFIX} && ${FIND} share/${PORTNAME} -type d -print | ${SORT} | ${SED} -e 's#^#@dirrm #' >> ${TMPPLIST}
 
diff --git a/sysutils/gupsc/Makefile b/sysutils/gupsc/Makefile
index c2ed5e6adb48..b1d69b2c2b0b 100644
--- a/sysutils/gupsc/Makefile
+++ b/sysutils/gupsc/Makefile
@@ -26,7 +26,7 @@ pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure \
 		${WRKSRC}/src/Makefile.in
-	@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/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile
index 7d45bf45eee8..bfdfefadc8dc 100644
--- a/sysutils/whowatch/Makefile
+++ b/sysutils/whowatch/Makefile
@@ -21,8 +21,8 @@ USE_REINPLACE=	yes
 
 .if ${OSVERSION} >= 500014
 pre-patch:
-	@find ${WRKSRC} -name 'proc????.c' | xargs ${REINPLACE_CMD} -E -e \
-		's/kp_.?proc\.._/ki_/ ; s/pcred\.p_//'
+	@${FIND} ${WRKSRC} -name 'proc????.c' | ${XARGS} ${REINPLACE_CMD} -E \
+		-e 's/kp_.?proc\.._/ki_/ ; s/pcred\.p_//'
 .endif
 
 GNU_CONFIGURE=	yes
diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index 7b69f815d5a4..0d0e9319041e 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -40,7 +40,7 @@ pre-patch:
 
 # delete dust files before build
 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}.*
 
 .include <bsd.port.mk>
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index 7b1ee10ef2ec..bc08fa7f6f0f 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -35,8 +35,8 @@ do-build:
 
 pre-install:
 	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
-	@find ${WRKDIR} -name '*~' -exec ${RM} {} \;
-	@find ${WRKDIR} -name '*.orig' -exec ${RM} {} \;
+	@${FIND} ${WRKDIR} -name '*~' -exec ${RM} {} \;
+	@${FIND} ${WRKDIR} -name '*.orig' -exec ${RM} {} \;
 
 do-install:
 	@${CP} -Rp ${WRKSRC}/* ${INSTDIR}
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index e13599ce333e..d644dcc18ca5 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -26,7 +26,8 @@ JAVA_LIBDIR=	${PREFIX}/share/java/classes
 
 pre-install:
 	${MKDIR} ${JAVA_LIBDIR} ${DATADIR} ${DOCSDIR}
-	find ${WRKSRC} \( -name \*.orig -o -name \*~ -o -name CVS \) -exec ${RM} -rf \{} \;
+	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ -o -name CVS \) \
+		-exec ${RM} -rf \{} \;
 
 do-install:
 	cd ${WRKSRC}; \
diff --git a/textproc/html/Makefile b/textproc/html/Makefile
index cb66cfe61c19..2a7fb8e55e7c 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -34,7 +34,7 @@ pre-install:
 
 do-install:
 	@zcat ${DISTDIR}/${DISTFILES} |(cd ${INSTDIR}; pax -r)
-	@${CHMOD} ${SHAREMODE} `find ${INSTDIR} -type f`
+	@${CHMOD} ${SHAREMODE} `${FIND} ${INSTDIR} -type f`
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
 post-install:
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index f9116e773434..377a7171808d 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -34,7 +34,8 @@ post-extract:
 	@${CHMOD} u+w ${WRKSRC}/configure
 
 pre-install:
-	@find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	@${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) \
+		-exec ${RM} -f \{} \;
 
 post-install:
 .for i in jade nsgmls sgmlnorm spam spent sx
diff --git a/textproc/p5-RDF-Core/Makefile b/textproc/p5-RDF-Core/Makefile
index f5bf623f652a..29b2d7aa87b0 100644
--- a/textproc/p5-RDF-Core/Makefile
+++ b/textproc/p5-RDF-Core/Makefile
@@ -40,7 +40,7 @@ DOCSUBDIR=	/ RDF RDF/Core RDF/Core/Enumerator RDF/Core/Model \
 		RDF/Core/Storage
 
 pre-patch:
-	@find ${WRKSRC} -name "*.pm" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "*.pm" | ${XARGS} ${PERL} -pi -e \
 	'$$package=$$1 if /^package\s+([^\s;]*);/; s!^require 5.005_62;!!; s!^use warnings;!!; s!^our\s+(\$$)(VERSION)\s+=!$$1$${package}::$$2=!;'
 
 post-install:
diff --git a/textproc/p5-RDF-Notation3/Makefile b/textproc/p5-RDF-Notation3/Makefile
index 6e1e36a364b4..b8dcc66818b5 100644
--- a/textproc/p5-RDF-Notation3/Makefile
+++ b/textproc/p5-RDF-Notation3/Makefile
@@ -32,7 +32,7 @@ MAN3=		RDF::Notation3.3 RDF::Notation3::PrefTriples.3 \
 		RDF::Notation3::XML.3
 
 pre-patch:
-	@${FIND} ${WRKSRC} -name "*.pm" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "*.pm" | ${XARGS} ${PERL} -pi -e \
 	'$$package=$$1 if /^package\s+([^\s;]*);/; s!^require 5.005_62;!!; s!^use warnings;!!; s!^our\s+(\$$)(VERSION)\s+=!$$1$${package}::$$2=!;'
 
 .include <bsd.port.pre.mk>
diff --git a/textproc/p5-SVG/Makefile b/textproc/p5-SVG/Makefile
index 89216e2cedbe..8e499593a1cc 100644
--- a/textproc/p5-SVG/Makefile
+++ b/textproc/p5-SVG/Makefile
@@ -21,7 +21,7 @@ MAN3=		SVG.3 SVG::DOM.3 SVG::Element.3 SVG::Manual.3 SVG::XML.3
 
 post-patch:
 	@${FIND} ${WRKSRC} \( -name "*.p[lm]" -or -name "*.cgi" \
-		-or -name "*.pod" \)|xargs ${PERL} -pi -e 's/\x0d//g;'
+		-or -name "*.pod" \)|${XARGS} ${PERL} -pi -e 's/\x0d//g;'
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/textproc/p5-XML-Directory/Makefile b/textproc/p5-XML-Directory/Makefile
index bebe61e08b61..cca041900583 100644
--- a/textproc/p5-XML-Directory/Makefile
+++ b/textproc/p5-XML-Directory/Makefile
@@ -26,7 +26,7 @@ MAN3=		XML::Directory.3 XML::Directory::Apache.3 \
 
 
 pre-patch:
-		@find ${WRKSRC} -name "*.pm" | xargs ${PERL} -pi -e \
+		@${FIND} ${WRKSRC} -name "*.pm" | ${XARGS} ${PERL} -pi -e \
 		'$$package=$$1 if /^package\s+([^\s;]*);/; s!^require 5.005_62;!!; s!^use warnings;!!; s!^our\s+(\$$|@)(VERSION|ISA|EXPORT|EXPORT_OK)\s+=!$$1$${package}::$$2=!;'
 
 .include <bsd.port.pre.mk>
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index adb92ca4444e..3db18f469bf3 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -37,10 +37,10 @@ post-install:
 .for docfile in ANNOUNCE CREDITS LICENCE README* TODO
 	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
-	@ cd ${WRKSRC}/doc && find * \
+	@ cd ${WRKSRC}/doc && ${FIND} * \
 	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 	@ ${MKDIR} ${EXAMPLESDIR}
-	@ cd ${WRKSRC} && find demo test \
+	@ cd ${WRKSRC} && ${FIND} demo test \
 	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index baf33bc16df6..1edc7cacfcf3 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -62,7 +62,7 @@ MTREE_FILE=     /etc/mtree/BSD.x11-4.dist
 .endif
 
 post-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e   \
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e   \
 		's|[(]LN_S[)] -f -n|(LN_S) -f|g'
 	@${REINPLACE_CMD} -e 's|/usr/share/locale|${PREFIX}/share/locale|g' \
 		${WRKSRC}/libs/scrollkeeper.h.in
diff --git a/textproc/webcpp/Makefile b/textproc/webcpp/Makefile
index 2e61ff1e48c5..c1889b23664f 100644
--- a/textproc/webcpp/Makefile
+++ b/textproc/webcpp/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE=	yes
 .endif
 
 pre-patch:
-	${FIND} ${WRKSRC} -name '*.h' | xargs ${REINPLACE_CMD} \
+	${FIND} ${WRKSRC} -name '*.h' | ${XARGS} ${REINPLACE_CMD} \
 		's|IO->close()|if(IO) IO->close()|g'
 
 post-install:
diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index 92d2fc9f0a80..b773267ef8f1 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 INSTALL_TARGET=	install INST=${PREFIX}/${PORTNAME}
 
 post-extract:
-	find ${WRKSRC} -name CVS | xargs ${RM} -rf
+	${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
 
 post-install:
 # Headers
diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index 61e843ed9d15..c940b39294c5 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -120,7 +120,7 @@ PLIST_SUB+=	SUEXEC="@comment "
 post-patch:
 .if !defined(PATCH_DEBUG)
 	@ cd ${WRKSRC} \
-		&& find . -type f -name "*.orig" -print | xargs ${RM} -f
+		&& ${FIND} . -type f -name "*.orig" -print | ${XARGS} ${RM} -f
 .endif
 
 # Create apache user and group
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 3925ef83003b..0762c3adfdf6 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -81,7 +81,7 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}-gtk2|g' \
 		${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
 		 's|-lpthread|${PTHREAD_LIBS}|g'
 	@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index 09fceaa8b86f..565ce8cce83c 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -49,7 +49,7 @@ post-configure:
 
 do-install:
 	@ ${MKDIR} -m 0755 ${PREFIX}/${GALLERYDIR}
-	@ cd ${WRKSRC} && find * -name \*.bat ${EXCEPTFILES:S/^/-o -name /} \
+	@ cd ${WRKSRC} && ${FIND} * -name \*.bat ${EXCEPTFILES:S/^/-o -name /} \
 	  -o -print | ${CPIO} ${WWWOWN}:${WWWGRP} ${PREFIX}/${GALLERYDIR}
 
 post-install:
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index 09fceaa8b86f..565ce8cce83c 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -49,7 +49,7 @@ post-configure:
 
 do-install:
 	@ ${MKDIR} -m 0755 ${PREFIX}/${GALLERYDIR}
-	@ cd ${WRKSRC} && find * -name \*.bat ${EXCEPTFILES:S/^/-o -name /} \
+	@ cd ${WRKSRC} && ${FIND} * -name \*.bat ${EXCEPTFILES:S/^/-o -name /} \
 	  -o -print | ${CPIO} ${WWWOWN}:${WWWGRP} ${PREFIX}/${GALLERYDIR}
 
 post-install:
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index 09fceaa8b86f..565ce8cce83c 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -49,7 +49,7 @@ post-configure:
 
 do-install:
 	@ ${MKDIR} -m 0755 ${PREFIX}/${GALLERYDIR}
-	@ cd ${WRKSRC} && find * -name \*.bat ${EXCEPTFILES:S/^/-o -name /} \
+	@ cd ${WRKSRC} && ${FIND} * -name \*.bat ${EXCEPTFILES:S/^/-o -name /} \
 	  -o -print | ${CPIO} ${WWWOWN}:${WWWGRP} ${PREFIX}/${GALLERYDIR}
 
 post-install:
diff --git a/www/jakarta-tomcat3/Makefile b/www/jakarta-tomcat3/Makefile
index 08aa854cf782..3959bce53a75 100644
--- a/www/jakarta-tomcat3/Makefile
+++ b/www/jakarta-tomcat3/Makefile
@@ -143,7 +143,7 @@ do-install:
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `find ${APP_HOME} -type d`
+	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Creating PID file..."
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index ea8aae5d34cf..722844832b58 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -155,7 +155,7 @@ do-install:
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `find ${APP_HOME} -type d`
+	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Creating PID file..."
diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index b869d635de3c..e326850ca12d 100644
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/Makefile
@@ -156,7 +156,7 @@ do-install:
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `find ${APP_HOME} -type d`
+	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Creating PID file..."
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index 2202a0a1846a..faf5abbd416d 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -154,7 +154,7 @@ do-install:
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `find ${APP_HOME} -type d`
+	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Creating PID file..."
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
index 2202a0a1846a..faf5abbd416d 100644
--- a/www/jakarta-tomcat55/Makefile
+++ b/www/jakarta-tomcat55/Makefile
@@ -154,7 +154,7 @@ do-install:
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `find ${APP_HOME} -type d`
+	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Creating PID file..."
diff --git a/www/linux-mozilla-devel/Makefile b/www/linux-mozilla-devel/Makefile
index 7a0d5a8c96ef..0f882f07458f 100644
--- a/www/linux-mozilla-devel/Makefile
+++ b/www/linux-mozilla-devel/Makefile
@@ -145,11 +145,11 @@ pre-install:
 	${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST}
 	${ECHO_CMD} "@unexec ${FIND} ${FULL_INSTALL_DIR}/plugins \
 		-type l -exec ${RM} {} \;" >> ${PLIST}
-	cd ${WRKSRC}/bin; for i in `find * \! -type d | sort`; do \
+	cd ${WRKSRC}/bin; for i in `${FIND} * \! -type d | sort`; do \
 		${ECHO_CMD} lib/${INSTALL_DIR}/$${i} >> ${PLIST}; \
 	done
 	cd ${WRKSRC}/bin; \
-	for i in `find -d * -type d`; do \
+	for i in `${FIND} -d * -type d`; do \
 		${ECHO_CMD} @dirrm lib/${INSTALL_DIR}/$${i} >> ${PLIST}; \
 	done
 	${ECHO_CMD} lib/${INSTALL_DIR}/linkfarm >> ${PLIST}
diff --git a/www/linux-mozilla/Makefile b/www/linux-mozilla/Makefile
index 26e59c0f8227..4353eb0b9278 100644
--- a/www/linux-mozilla/Makefile
+++ b/www/linux-mozilla/Makefile
@@ -146,11 +146,11 @@ pre-install:
 	${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST}
 	${ECHO_CMD} "@unexec ${FIND} ${PREFIX}/lib/linux-mozilla/plugins -type l \
 		-exec ${RM} {} \;" >> ${PLIST}
-	cd ${WRKSRC}/bin; for i in `find * \! -type d | sort`; do \
+	cd ${WRKSRC}/bin; for i in `${FIND} * \! -type d | sort`; do \
 		${ECHO_CMD} lib/linux-mozilla/$${i} >> ${PLIST}; \
 	done
 	cd ${WRKSRC}/bin; \
-	for i in `find -d * -type d`; do \
+	for i in `${FIND} -d * -type d`; do \
 		${ECHO_CMD} @dirrm lib/linux-mozilla/$${i} >> ${PLIST}; \
 	done
 	${ECHO_CMD} lib/linux-mozilla/linkfarm >> ${PLIST}
diff --git a/www/mmosaic/Makefile b/www/mmosaic/Makefile
index 4c5f05c5db4b..dab64c9652cc 100644
--- a/www/mmosaic/Makefile
+++ b/www/mmosaic/Makefile
@@ -36,7 +36,7 @@ post-patch:
 
 pre-install:
 	${ECHO_CMD} bin/mmosaic > ${PLIST}
-	cd ${WRKSRC}/Copyrights; for i in `find * -type f`; do \
+	cd ${WRKSRC}/Copyrights; for i in `${FIND} * -type f`; do \
 		${ECHO_CMD} share/doc/mmosaic/$${i} >> ${PLIST}; \
 	done
 
diff --git a/www/neowebscript/Makefile b/www/neowebscript/Makefile
index 4f1022c0a93c..6e1cdac39249 100644
--- a/www/neowebscript/Makefile
+++ b/www/neowebscript/Makefile
@@ -31,11 +31,11 @@ EXTRACT_AFTER_ARGS:=| ${TAR} -xf - ${SUBDIRS:%=${PORTNAME}-${PORTVERSION}/%}
 post-patch:
 	# Replacing writeGIF with writePNG
 	${PERL} -pi -e 's/writeGIF/writePNG/g' \
-		`find ${WRKSRC}/.. -type f | xargs fgrep -l --mmap writeGIF`
+		`${FIND} ${WRKSRC}/.. -type f|${XARGS} fgrep -l --mmap writeGIF`
 
 pre-install:
 	# Removing *.orig files and empty directories:
-	find ${WRKSRC}/../neowebscript ${WRKSRC}/../htdocs \
+	${FIND} ${WRKSRC}/../neowebscript ${WRKSRC}/../htdocs \
 		\( -type f -name \*.orig -o -type d -empty \) -delete
 
 CONFSCRIPT=	${LOCALBASE}/etc/apache/neowebscript.conf
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index de37e237ddf0..4a395ab7b92f 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -92,14 +92,14 @@ do-configure:
 
 pre-install:
 	${ECHO_CMD} bin/${MAJ}${NETSCAPE_LANG} > ${PLIST}
-	cd ${WRKSRC}/bin; for ii in `find * \! -type d | sort`; do \
+	cd ${WRKSRC}/bin; for ii in `${FIND} * \! -type d | sort`; do \
 		${ECHO_CMD} ${INSTALL_DIR}/$${ii} >> ${PLIST}; \
 	done
-	cd ${WRKSRC}/plugins; for ii in `find * \! -type d | sort`; do \
+	cd ${WRKSRC}/plugins; for ii in `${FIND} * \! -type d | sort`; do \
 		${ECHO_CMD} ${INSTALL_DIR}/plugins/$${ii} >> ${PLIST}; \
 	done
 	cd ${WRKSRC}/bin; \
-	for ii in `find -d * -type d`; do \
+	for ii in `${FIND} -d * -type d`; do \
 		${ECHO_CMD} @dirrm ${INSTALL_DIR}/$${ii} >> ${PLIST}; \
 	done
 	${ECHO_CMD} @dirrm ${INSTALL_DIR} >> ${PLIST}
diff --git a/www/orion/Makefile b/www/orion/Makefile
index 0c824c90de4a..a0f9b5a6a8d9 100644
--- a/www/orion/Makefile
+++ b/www/orion/Makefile
@@ -158,7 +158,7 @@ do-install:
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `find ${APP_HOME} -type d`
+	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Creating PID file..."
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index b869d635de3c..e326850ca12d 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -156,7 +156,7 @@ do-install:
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `find ${APP_HOME} -type d`
+	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Creating PID file..."
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 2202a0a1846a..faf5abbd416d 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -154,7 +154,7 @@ do-install:
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `find ${APP_HOME} -type d`
+	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Creating PID file..."
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 2202a0a1846a..faf5abbd416d 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -154,7 +154,7 @@ do-install:
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `find ${APP_HOME} -type d`
+	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Creating PID file..."
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 2202a0a1846a..faf5abbd416d 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -154,7 +154,7 @@ do-install:
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `find ${APP_HOME} -type d`
+	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Creating PID file..."
diff --git a/www/wb0/Makefile b/www/wb0/Makefile
index e6372cc6a621..e619da4a8449 100644
--- a/www/wb0/Makefile
+++ b/www/wb0/Makefile
@@ -40,7 +40,7 @@ pre-install:
 	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 	${ECHO_CMD} etc/wb0.config >> ${PLIST}
-	for i in `find ${PREFIX}/share/wb0 -type f`; \
+	for i in `${FIND} ${PREFIX}/share/wb0 -type f`; \
 		do ${ECHO_CMD} share/wb0/`${BASENAME} $${i}` >> ${PLIST}; \
 	done
 	${ECHO_CMD} @dirrm share/wb0 >> ${PLIST}
diff --git a/www/webcpp/Makefile b/www/webcpp/Makefile
index 2e61ff1e48c5..c1889b23664f 100644
--- a/www/webcpp/Makefile
+++ b/www/webcpp/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE=	yes
 .endif
 
 pre-patch:
-	${FIND} ${WRKSRC} -name '*.h' | xargs ${REINPLACE_CMD} \
+	${FIND} ${WRKSRC} -name '*.h' | ${XARGS} ${REINPLACE_CMD} \
 		's|IO->close()|if(IO) IO->close()|g'
 
 post-install:
diff --git a/www/zope-guf/Makefile b/www/zope-guf/Makefile
index 82532ecca252..f9d039b95d6d 100644
--- a/www/zope-guf/Makefile
+++ b/www/zope-guf/Makefile
@@ -38,7 +38,7 @@ do-build:
 
 do-install:
 	@ ${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
-	@ cd ${WRKSRC} && find * | ${CPIO} ${BINOWN}:${BINGRP} \
+	@ cd ${WRKSRC} && ${FIND} * | ${CPIO} ${BINOWN}:${BINGRP} \
 	  ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
 
 post-install:
diff --git a/www/zope-zmysqlda/Makefile b/www/zope-zmysqlda/Makefile
index ec50d8f3401c..ce0547342993 100644
--- a/www/zope-zmysqlda/Makefile
+++ b/www/zope-zmysqlda/Makefile
@@ -40,7 +40,7 @@ do-build:
 
 do-install:
 	@ ${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
-	@ cd ${WRKSRC} && find * | ${CPIO} ${BINOWN}:${BINGRP} \
+	@ cd ${WRKSRC} && ${FIND} * | ${CPIO} ${BINOWN}:${BINGRP} \
 	  ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
 
 post-install:
diff --git a/www/zope-zpt/Makefile b/www/zope-zpt/Makefile
index 5de4f48c487d..3d099a87fb01 100644
--- a/www/zope-zpt/Makefile
+++ b/www/zope-zpt/Makefile
@@ -50,12 +50,12 @@ do-install:
 .endfor
 .for product in TAL ZTUtils
 	@ ${MKDIR} ${ZOPEBASEDIR}/${ZOPEPYTHONDIR}/${product}
-	@ cd ${WRKDIR}/${product} && find * \
+	@ cd ${WRKDIR}/${product} && ${FIND} * \
 	  | ${CPIO} ${BINOWN}:${BINGRP} \
 	  ${ZOPEBASEDIR}/${ZOPEPYTHONDIR}/${product}/
 .endfor
 	@ ${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
-	@ cd ${WRKSRC} && find * \( -name examples -a -prune \) -o -print \
+	@ cd ${WRKSRC} && ${FIND} * \( -name examples -a -prune \) -o -print \
 	  | ${CPIO} ${BINOWN}:${BINGRP} \
 	  ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
 	@ ${MKDIR} ${ZOPEBASEDIR}/import
diff --git a/www/zope-zwiki/Makefile b/www/zope-zwiki/Makefile
index 8501009cc71e..d82aa8e22048 100644
--- a/www/zope-zwiki/Makefile
+++ b/www/zope-zwiki/Makefile
@@ -40,7 +40,7 @@ do-build:
 do-install:
 	@ ${CHMOD} -R og+rX ${WRKSRC}/
 	@ ${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
-	@ cd ${WRKSRC} && find * \! -name \*.zexp \
+	@ cd ${WRKSRC} && ${FIND} * \! -name \*.zexp \
 	  | ${CPIO} ${BINOWN}:${BINGRP} \
 	  ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}