Use ${XARGS} instead of invoking xargs directly.

61 files changed, 148 insertions, 148 deletions

diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile
index a7e3def668c..169692401f0 100644
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:30:35 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/19 03:56:23 jlam Exp $
 
 DISTNAME=	festdoc-1.4.0.1
 PKGNAME=	festival-doc-1.4.0.1
@@ -17,7 +17,7 @@ INFO_FILES=	festival.info
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	${RM} ${WRKSRC}/festival/src-manual/c3750.htm~
 	${RM} ${WRKSRC}/speechtools/c16909.htm~
 	${RMDIR} ${WRKSRC}/festival/src-manual/images_gen
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 670476a558b..1f6a36e2084 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/03/31 10:22:24 zuntum Exp $
+# $NetBSD: Makefile,v 1.15 2001/05/19 03:56:24 jlam Exp $
 
 DISTNAME=	festival-1.4.0
 WRKSRC=		${WRKDIR}
@@ -58,7 +58,7 @@ post-patch:
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
 	${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
-	${FIND} ${FESTIVAL}/lib -type d -print0| xargs -0 ${CHMOD} 755
+	${FIND} ${FESTIVAL}/lib -type d -print0| ${XARGS} -0 ${CHMOD} 755
 	cd ${FESTIVAL} && ${PAX} -r -w lib examples ${FHOME}
 	${RM} -f ${FHOME}/lib/etc/NetBSD/audsp
 	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/NetBSD/audsp ${PREFIX}/libexec
diff --git a/audio/festlex-cmu/Makefile b/audio/festlex-cmu/Makefile
index dd53addd818..9dc1282767a 100644
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:30:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/19 03:56:24 jlam Exp $
 
 DISTNAME=	festlex_CMU
 PKGNAME=	festlex-cmu-1.4.0
@@ -18,7 +18,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index 9f48fe590e8..d65ffa8fa63 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:30:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/19 03:56:24 jlam Exp $
 
 DISTNAME=	festlex_OALD
 PKGNAME=	festlex-oald-1.4.0
@@ -18,7 +18,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index 6e5a7cdb244..ec4c7e21610 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 13:30:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/05/19 03:56:25 jlam Exp $
 
 DISTNAME=	OGIlexicon-2.0
 PKGNAME=	festlex-ogi-2.0
@@ -21,7 +21,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index 297a0d5a210..959818e377f 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:30:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/19 03:56:25 jlam Exp $
 
 DISTNAME=	festlex_POSLEX
 PKGNAME=	festlex-poslex-1.4.0
@@ -18,7 +18,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
index 486b9cccb61..100499e4c3d 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:30:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/19 03:56:25 jlam Exp $
 
 DISTNAME=	OGIspanish-2.0
 PKGNAME=	festogi-spanish-2.0
@@ -20,7 +20,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index 0001f77839e..33a19e0513b 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/19 03:56:25 jlam Exp $
 
 DISTNAME=	voice_abc_di-2.0
 PKGNAME=	festvox-abc-2.0
@@ -22,9 +22,9 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	${RM} -f ${WRKSRC}/lib/voices/spanish/abc_diphone/group/hvslpcOGI16k.group
-	${FIND} ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
+	${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -fr
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index dd0afb9b153..7d012dadbe0 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/19 03:56:26 jlam Exp $
 
 DISTNAME=	voice_aec_di-2.0
 PKGNAME=	festvox-aec-2.0
@@ -21,8 +21,8 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
-	${FIND} ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
+	${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+	${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -fr
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index b0b1275afd8..ccb0314ebed 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/19 03:56:26 jlam Exp $
 
 DISTNAME=	festvox_don
 PKGNAME=	festvox-don-1.4.0
@@ -20,7 +20,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index ceb300fad78..6c3d49f9399 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:30:37 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/19 03:56:26 jlam Exp $
 
 DISTNAME=	festvox_ellpc11k
 PKGNAME=	festvox-el11-1.4.0
@@ -20,7 +20,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-en1/Makefile b/audio/festvox-en1/Makefile
index 89b0ac2dcfe..0698b438b38 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/19 03:56:26 jlam Exp $
 
 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
@@ -27,7 +27,7 @@ ONLY_FOR_PLATFORM=      NetBSD-*-i386
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index 5bad009224c..395675a367c 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/19 03:56:27 jlam Exp $
 
 DISTNAME=	voice_hvs_di-2.0
 PKGNAME=	festvox-hvs-2.0
@@ -22,8 +22,8 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
-	${FIND} ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
+	${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+	${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -fr
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index c6645977c60..068572424d7 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/19 03:56:27 jlam Exp $
 
 DISTNAME=	voice_jph_di-2.0
 PKGNAME=	festvox-jph-2.0
@@ -21,8 +21,8 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
-	${FIND} ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
+	${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+	${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -fr
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index 7afcdbafecc..f7b42f88f9f 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 13:30:38 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/05/19 03:56:27 jlam Exp $
 
 DISTNAME=	festvox_kallpc16k
 PKGNAME=	festvox-kal16-1.4.0
@@ -22,7 +22,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index 166007acd00..e97ae665c3f 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/19 03:56:28 jlam Exp $
 
 DISTNAME=	festvox_kallpc8k
 PKGNAME=	festvox-kal8-1.4.0
@@ -22,7 +22,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index 1801f4e3ca4..64945eede88 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 13:30:38 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/05/19 03:56:28 jlam Exp $
 
 DISTNAME=	festvox_kedlpc16k
 PKGNAME=	festvox-ked16-1.4.0
@@ -22,7 +22,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index aab724e5ff9..0bcbe027b7a 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/16 13:30:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/05/19 03:56:28 jlam Exp $
 
 DISTNAME=	festvox_kedlpc8k
 PKGNAME=	festvox-ked8-1.4.0
@@ -22,7 +22,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index d70575ee7a5..42d21f90655 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/19 03:56:29 jlam Exp $
 
 DISTNAME=	voice_mwm_di-2.0
 PKGNAME=	festvox-mwm-2.0
@@ -21,8 +21,8 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
-	${FIND} ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
+	${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+	${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -fr
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index 168e0bfb67d..e6af0ee73e1 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/19 03:56:29 jlam Exp $
 
 DISTNAME=	voice_ogirab_di-2.0
 PKGNAME=	festvox-ogirab-2.0
@@ -21,8 +21,8 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
-	${FIND} ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
+	${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+	${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -fr
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index b8c103a77ba..60553a61fb1 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 13:30:39 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/05/19 03:56:29 jlam Exp $
 
 DISTNAME=	festvox_rablpc16k
 PKGNAME=	festvox-rab16-1.4.0
@@ -22,7 +22,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index c1b4ab3cbf6..dd36a37ef68 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/16 13:30:39 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/05/19 03:56:30 jlam Exp $
 
 DISTNAME=	festvox_rablpc8k
 PKGNAME=	festvox-rab8-1.4.0
@@ -22,7 +22,7 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index 9fc22946aa0..9279c40730f 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:40 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/19 03:56:30 jlam Exp $
 
 DISTNAME=	voice_tll_di-2.0
 PKGNAME=	festvox-tll-2.0
@@ -21,8 +21,8 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
-	${FIND} ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
+	${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+	${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -fr
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
diff --git a/audio/festvox-us1/Makefile b/audio/festvox-us1/Makefile
index 88406a8b2de..fd3d2ccbea9 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 13:30:40 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/05/19 03:56:30 jlam Exp $
 
 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
@@ -27,7 +27,7 @@ ONLY_FOR_PLATFORM=      NetBSD-*-i386
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index 6f08963c0ed..2026463f794 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 13:30:40 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/05/19 03:56:31 jlam Exp $
 
 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
@@ -27,7 +27,7 @@ ONLY_FOR_PLATFORM=      NetBSD-*-i386
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index 80fe11642c9..19b31e9d3bf 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 13:30:40 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/05/19 03:56:31 jlam Exp $
 
 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
@@ -27,7 +27,7 @@ ONLY_FOR_PLATFORM=      NetBSD-*-i386
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
diff --git a/audio/mbrolavox-en1/Makefile b/audio/mbrolavox-en1/Makefile
index 9ea7a35e0e6..84da228bc38 100644
--- a/audio/mbrolavox-en1/Makefile
+++ b/audio/mbrolavox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/20 11:40:08 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/05/19 03:56:31 jlam Exp $
 
 DISTNAME=	en1-980910
 PKGNAME=	mbrolavox-en1-980910
@@ -23,7 +23,7 @@ ONLY_FOR_PLATFORM=      NetBSD-*-i386
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${MHOME}
diff --git a/audio/mbrolavox-us1/Makefile b/audio/mbrolavox-us1/Makefile
index ca44d39f846..1edcf6730ca 100644
--- a/audio/mbrolavox-us1/Makefile
+++ b/audio/mbrolavox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/20 11:40:08 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/05/19 03:56:32 jlam Exp $
 
 DISTNAME=	us1-980512
 PKGNAME=	mbrolavox-us1-980512
@@ -23,7 +23,7 @@ ONLY_FOR_PLATFORM=      NetBSD-*-i386
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${MHOME}
diff --git a/audio/mbrolavox-us2/Makefile b/audio/mbrolavox-us2/Makefile
index fc86ba1df02..e037769e0b3 100644
--- a/audio/mbrolavox-us2/Makefile
+++ b/audio/mbrolavox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/20 11:40:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/05/19 03:56:32 jlam Exp $
 
 DISTNAME=	us2-980812
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -23,7 +23,7 @@ ONLY_FOR_PLATFORM=      NetBSD-*-i386
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${MHOME}
diff --git a/audio/mbrolavox-us3/Makefile b/audio/mbrolavox-us3/Makefile
index dc7693ed894..67e21229d7c 100644
--- a/audio/mbrolavox-us3/Makefile
+++ b/audio/mbrolavox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/20 11:40:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/05/19 03:56:32 jlam Exp $
 
 DISTNAME=	us3-990208
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -23,7 +23,7 @@ ONLY_FOR_PLATFORM=      NetBSD-*-i386
 
 post-extract:
 	@ ${CHMOD} -R a+r ${WRKSRC}
-	@ ${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	@ ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${MHOME}
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 3e08516987f..a028e12a30a 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/12 10:35:41 wennmach Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/19 03:56:32 jlam Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/05/14 10:35:13 torstenb Exp
 #
 
@@ -52,7 +52,7 @@ pre-install:
 post-install:
 	@if [ "X${MANZ}" != X"" ]; then \
 		${ECHO} Compressing help files; \
-		${FIND} ${PREFIX}/share/irc/help -type f -print | xargs ${GZIP_CMD}; \
+		${FIND} ${PREFIX}/share/irc/help -type f -print | ${XARGS} ${GZIP_CMD}; \
 	fi
 	${RM} -f ${PREFIX}/man/man1/irc.1
 	${LN} -s ircII.1 ${PREFIX}/man/man1/irc.1
diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile
index 20746a7391c..962272374db 100644
--- a/cross/binutils/Makefile
+++ b/cross/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/03/13 12:01:43 agc Exp $
+# $NetBSD: Makefile,v 1.27 2001/05/19 03:56:32 jlam Exp $
 #
 # GNU binutils configured to hold `as many targets as the cross system is
 # capable of using'.  Configures and builds everything except gas, which
@@ -45,8 +45,8 @@ ENABLE_TARGETS+=	alpha-netbsd arm-netbsd \
 
 # make sure configure/Makefile.in is newer than configure.in/Makefile.am
 post-patch:
-	${FIND} ${WRKSRC} -name configure -print | xargs ${TOUCH}
-	${FIND} ${WRKSRC} -name Makefile.in -print | xargs ${TOUCH}
+	${FIND} ${WRKSRC} -name configure -print | ${XARGS} ${TOUCH}
+	${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} ${TOUCH}
 
 # check that path does not contain cwd
 pre-configure:
diff --git a/devel/mit-pthreads/Makefile b/devel/mit-pthreads/Makefile
index a0fadd2ff5e..6d8f3ca708d 100644
--- a/devel/mit-pthreads/Makefile
+++ b/devel/mit-pthreads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2001/04/11 16:21:21 skrll Exp $
+# $NetBSD: Makefile,v 1.33 2001/05/19 03:56:33 jlam Exp $
 #
 
 DISTNAME=		pthreads-1_60_beta6
@@ -36,9 +36,9 @@ pre-install:
 
 post-install:
 	@${RM} -f ${PREFIX}/pthreads/lib/libpthread_pic.a
-	@${FIND} ${PREFIX}/pthreads/include -name '*.orig'|xargs ${RM}
-	@${FIND} ${PREFIX}/pthreads/include -type f -print|xargs ${CHMOD} 644
-	@${FIND} ${PREFIX}/pthreads/include -type d -print|xargs ${CHMOD} 755
+	@${FIND} ${PREFIX}/pthreads/include -name '*.orig' | ${XARGS} ${RM}
+	@${FIND} ${PREFIX}/pthreads/include -type f -print | ${XARGS} ${CHMOD} 644
+	@${FIND} ${PREFIX}/pthreads/include -type d -print | ${XARGS} ${CHMOD} 755
 	@${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/pthreads/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-perl-headers/Makefile b/devel/p5-perl-headers/Makefile
index 293a974fa51..ec6aede4024 100644
--- a/devel/p5-perl-headers/Makefile
+++ b/devel/p5-perl-headers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 14:38:55 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/19 03:56:33 jlam Exp $
 
 DISTNAME=		p5-perl-headers
 PKGNAME=		${DISTNAME}-${OS_VERSION}
@@ -34,7 +34,7 @@ do-build:
 do-install:
 	${CP} -R ${WRKSRC}/h2ph/* ${PERL5_SITEARCH}
 	${INSTALL_DATA} ${WRKSRC}/packlist ${PERL5_PACKLIST}
-	${CAT} ${PERL5_PACKLIST} | xargs ${CHMOD} a-w
-	${CAT} ${PERL5_PACKLIST} | xargs ${CHOWN} ${SHAREOWN}:${SHAREGRP}
+	${CAT} ${PERL5_PACKLIST} | ${XARGS} ${CHMOD} a-w
+	${CAT} ${PERL5_PACKLIST} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ptl2/Makefile b/devel/ptl2/Makefile
index 87107af9c6a..e0f8584e745 100644
--- a/devel/ptl2/Makefile
+++ b/devel/ptl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2001/04/30 04:16:09 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2001/05/19 03:56:33 jlam Exp $
 
 DISTNAME=		PTL-2.1.7
 PKGNAME=		ptl-2.1.7
@@ -18,9 +18,9 @@ PLIST_SRC=		${WRKDIR}/PLIST
 
 post-install:
 	@${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/PTL/include
-	@${FIND} ${PREFIX}/PTL/include -type f -name "*.orig" | xargs ${RM}
-	@${FIND} ${PREFIX}/PTL/include -type d -print | xargs ${CHMOD} 755
-	@${FIND} ${PREFIX}/PTL/include -type f -print | xargs ${CHMOD} 444
+	@${FIND} ${PREFIX}/PTL/include -type f -name "*.orig" | ${XARGS} ${RM}
+	@${FIND} ${PREFIX}/PTL/include -type d -print | ${XARGS} ${CHMOD} 755
+	@${FIND} ${PREFIX}/PTL/include -type f -print | ${XARGS} ${CHMOD} 444
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	@cd ${PREFIX}; \
 	${FIND} PTL -type f >>${PLIST_SRC}; \
diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile
index 9db382e4a7a..cab4ee9ea9c 100644
--- a/devel/unproven-pthreads/Makefile
+++ b/devel/unproven-pthreads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/04/12 16:10:32 skrll Exp $
+# $NetBSD: Makefile,v 1.25 2001/05/19 03:56:34 jlam Exp $
 #
 
 DISTNAME=		unproven-pthreads-0.17
@@ -25,9 +25,9 @@ pre-install:
 
 post-install:
 	@${RM} -f ${PREFIX}/pthreads/lib/libpthread_pic.a
-	@${FIND} ${PREFIX}/pthreads/include -name '*.orig'|xargs ${RM}
-	@${FIND} ${PREFIX}/pthreads/include -type f -print|xargs ${CHMOD} 644
-	@${FIND} ${PREFIX}/pthreads/include -type d -print|xargs ${CHMOD} 755
+	@${FIND} ${PREFIX}/pthreads/include -name '*.orig' | ${XARGS} ${RM}
+	@${FIND} ${PREFIX}/pthreads/include -type f -print | ${XARGS} ${CHMOD} 644
+	@${FIND} ${PREFIX}/pthreads/include -type d -print | ${XARGS} ${CHMOD} 755
 	@${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/pthreads/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 035d2e2178b..34839322a33 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2001/02/16 14:40:49 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2001/05/19 03:56:34 jlam Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 
 DISTNAME=	emacs-20.7
@@ -41,7 +41,7 @@ INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff \
 INSTALL_PROGRAM=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
 pre-install:
-	@${FIND} ${WRKSRC} -type f -name "*.orig" | xargs ${RM} -f
+	@${FIND} ${WRKSRC} -type f -name "*.orig" | ${XARGS} ${RM} -f
 
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 52db8739f80..d3042eed75a 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/05/03 16:00:02 agc Exp $
+# $NetBSD: Makefile,v 1.17 2001/05/19 03:56:34 jlam Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/22 22:16:53 gj Exp
 
 DISTNAME=	xemacs-packages
@@ -59,7 +59,7 @@ do-install:
 	@cd ${PREFIX} && \
 	${GREP} '\$${ELSUFX}$$' ${PLIST_SRC} | \
 	${SED} -e 's#\$${ELSUFX}$$##' | \
-	xargs ${GZIP_CMD}
+	${XARGS} ${GZIP_CMD}
 	@${ECHO_MSG} "done"
 .endif
 
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index c31f0f20811..077b894aa16 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/03/27 03:19:54 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2001/05/19 03:56:35 jlam Exp $
 
 DISTNAME=	Atari800-0.9.9a
 PKGNAME=	atari800-0.9.9a
@@ -27,7 +27,7 @@ MAKE_FLAGS=	LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" OBJ="atari_x11.o" \
 MAKE_ENV+=      HOME=${WRKSRC}
 
 post-extract:
-	@${FIND} ${WRKDIR} -type f -print | xargs ${CHMOD} 0644
+	@${FIND} ${WRKDIR} -type f -print | ${XARGS} ${CHMOD} 0644
 	@${MV} ${WRKDIR}/Atari800-0.9.9a/* ${WRKSRC}/
 
 do-build:
diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile
index 2da196f0866..8ee27c5dfa9 100644
--- a/emulators/freebsd_lib/Makefile
+++ b/emulators/freebsd_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 18:38:17 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/05/19 03:56:35 jlam Exp $
 #
 
 DISTNAME=		freebsd_lib-2.2.7
@@ -16,7 +16,7 @@ NO_WRKSUBDIR=		yes
 do-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/emul/freebsd
 	@(cd ${WRKSRC} && ${FIND} usr -type d -print) | \
-		(cd ${PREFIX}/emul/freebsd && xargs ${INSTALL_DATA_DIR})
+		(cd ${PREFIX}/emul/freebsd && ${XARGS} ${INSTALL_DATA_DIR})
 	@cd ${WRKSRC} && for file in `${FIND} usr -name '*.*' -print`; do \
 		${INSTALL_DATA} $$file ${PREFIX}/emul/freebsd/$$file; \
 	done
diff --git a/games/craft/Makefile b/games/craft/Makefile
index f004a4b4de3..8109e7948ec 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/16 15:10:45 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/05/19 03:56:35 jlam Exp $
 
 DISTNAME=	craftcc35
 PKGNAME=	craft-3.5
@@ -15,7 +15,7 @@ USE_X11BASE=	yes
 WRKSRC=		${WRKDIR}
 
 post-extract:
-	@${FIND} ${WRKSRC} -type f -name '*~' | xargs ${RM} -f
+	@${FIND} ${WRKSRC} -type f -name '*~' | ${XARGS} ${RM} -f
 	@${LN} -fs ${FILESDIR}/Makefile ${WRKSRC}
 
 post-patch:
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index f0f869ed0c6..9a3c949e451 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/16 15:10:56 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/05/19 03:56:35 jlam Exp $
 #
 
 DISTNAME=		nighthawk-2.1
@@ -29,8 +29,8 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/nighthawk/data
 	( cd ${WRKSRC}/data ; tar plcf - . ) | ( cd ${PREFIX}/share/nighthawk/data ; tar plvxf - )
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/nighthawk
-	${FIND} ${PREFIX}/share/nighthawk -type f -print | xargs ${CHMOD} 444
-	${FIND} ${PREFIX}/share/nighthawk -type d -print | xargs ${CHMOD} 555
+	${FIND} ${PREFIX}/share/nighthawk -type f -print | ${XARGS} ${CHMOD} 444
+	${FIND} ${PREFIX}/share/nighthawk -type d -print | ${XARGS} ${CHMOD} 555
 	${INSTALL_PROGRAM} ${WRKSRC}/src/nighthawk ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src_sound/nighthawk_sound ${PREFIX}/bin
 	${CHGRP} games ${PREFIX}/bin/nighthawk
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index df9de876f46..3d8748d62f9 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/03/04 09:06:14 tron Exp $
+# $NetBSD: Makefile,v 1.18 2001/05/19 03:56:36 jlam Exp $
 #
 
 DISTNAME=       xart19980415
@@ -21,7 +21,7 @@ USE_XPM=	YES
 WRKSRC=		${WRKDIR}/19980415
 
 post-extract:
-	${FIND} ${WRKSRC} -type d -print | xargs ${CHMOD} 755
-	${FIND} ${WRKSRC} -type f -print | xargs ${CHMOD} 644
+	${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
+	${FIND} ${WRKSRC} -type f -print | ${XARGS} ${CHMOD} 644
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/blackdown-jdk13/Makefile b/lang/blackdown-jdk13/Makefile
index f8bbc45c47f..2e3d5e02346 100644
--- a/lang/blackdown-jdk13/Makefile
+++ b/lang/blackdown-jdk13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/05/11 09:15:43 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/19 03:56:36 jlam Exp $
 #
 
 DISTNAME=       blackdown-jdk-1.3.0.nb2
@@ -41,8 +41,8 @@ post-fetch:
 post-patch:
 	@${CP} ${WRKDIR}/libhpi.so \
 	    ${WRKSRC}/jre/lib/ppc/native_threads/libhpi.so
-	@${FIND} ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f
-	@${FIND} ${WRKSRC} -name '*.1.gz' -print | xargs ${GUNZIP_CMD}
+	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
+	@${FIND} ${WRKSRC} -name '*.1.gz' -print | ${XARGS} ${GUNZIP_CMD}
 
 # This is ugly.  The chown should happen after copying, ot tar should have
 # a way to override permissions.
@@ -50,8 +50,8 @@ do-install:
 	${INSTALL_PROGRAM_DIR} ${JDK_HOME}
 	${CHOWN} -hR ${BINOWN}:${BINGRP} ${WRKSRC}
 	${CHMOD} -R uog+r ${WRKSRC}
-	${FIND} ${WRKSRC}/bin ${WRKSRC}/jre/bin -type f | xargs ${CHMOD} uog+rx
-	${FIND} ${WRKSRC} -type d | xargs ${CHMOD} uog+rx
+	${FIND} ${WRKSRC}/bin ${WRKSRC}/jre/bin -type f | ${XARGS} ${CHMOD} uog+rx
+	${FIND} ${WRKSRC} -type d | ${XARGS} ${CHMOD} uog+rx
 	${GTAR} -C ${WRKSRC} -cf- . | ${GTAR} -C ${JDK_HOME} -xpf-
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/fort77/Makefile b/lang/fort77/Makefile
index 431a7c65c54..923714584cb 100644
--- a/lang/fort77/Makefile
+++ b/lang/fort77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 09:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.8 2001/05/19 03:56:36 jlam Exp $
 #
 
 DISTNAME=		fort77-1.14a
@@ -27,7 +27,7 @@ ALL_TARGET=		test
 USE_PERL5=		YES
 
 post-patch:
-	for f in `${FIND} ${WRKDIR} -type f -print|xargs ${GREP} -l '/usr'`; \
+	for f in `${FIND} ${WRKDIR} -type f -print | ${XARGS} ${GREP} -l '/usr'`; \
 	do \
 	  ${SED} -e 's:/usr:'${PREFIX}':g' <$$f >$$f.pdone && \
 	  ${MV} $$f.pdone $$f; \
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 7b67e4b2173..5c131e9ebab 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/15 21:09:44 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/05/19 03:56:36 jlam Exp $
 
 DISTNAME=		mercury-compiler-0.10.1
 PKGNAME=		mercury-0.10.1
@@ -27,8 +27,8 @@ post-install:
 	${LN} -sf ${PREFIX}/lib/libgc.a \
 		${PREFIX}/lib/mercury/lib/${MACHINE_ARCH}--${LOWER_OPSYS}/libgc.a
 	${LN} -sf ${PREFIX}/include/gc.h ${PREFIX}/lib/mercury/inc/gc.h
-	${FIND} ${WRKSRC} -type d -name "CVS" | xargs ${RM} -fr
-	${FIND} ${WRKSRC} -type f -name ".cvsignore" | xargs ${RM} -f
+	${FIND} ${WRKSRC} -type d -name "CVS" | ${XARGS} ${RM} -fr
+	${FIND} ${WRKSRC} -type f -name ".cvsignore" | ${XARGS} ${RM} -f
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mercury
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/samples
 	(cd ${WRKSRC}/samples; ${GTAR} cpf - . ) |			\
diff --git a/lang/smalleiffel/Makefile b/lang/smalleiffel/Makefile
index d5da81b7a02..4697bf2c4b9 100644
--- a/lang/smalleiffel/Makefile
+++ b/lang/smalleiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/27 21:36:07 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/19 03:56:37 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME:S/smalleiffel/se/}
@@ -23,7 +23,7 @@ LIBDIR=		${PREFIX}/share/smalleiffel
 LIBEXECDIR=	${PREFIX}/libexec/smalleiffel
 
 post-extract:
-	${FIND} ${WRKSRC} -type f -print0 | xargs -0 ${CHMOD} 644
+	${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
 
 post-patch:
 	${CHMOD} +x ${WRKSRC}/misc/GC.SH
@@ -38,8 +38,8 @@ post-build:
 
 pre-install:
 	${RM} -f ${WRKSRC}/sys/loadpath.*
-	${FIND} ${WRKSRC} -name ".gdb*" -print0 | xargs -0 ${RM} -f
-	${FIND} ${WRKSRC} -name "*.orig" -print0 | xargs -0 ${RM} -f
+	${FIND} ${WRKSRC} -name ".gdb*" -print0 | ${XARGS} -0 ${RM} -f
+	${FIND} ${WRKSRC} -name "*.orig" -print0 | ${XARGS} -0 ${RM} -f
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/smalleiffel.sh ${PREFIX}/bin/smalleiffel
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index f9d547bdfc1..460ef999c4a 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/17 15:03:00 abs Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/19 03:56:37 jlam Exp $
 #
 
 # MASTER_SITES is very special, and must end in "=":
@@ -47,7 +47,7 @@ post-extract:
 	@${RM} -rf ${WRKSRC}/jre
 
 post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f
+	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
 
 # This is ugly.  The chown should happen after copying, ot tar should have
 # a way to override permissions.
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index e6737d60d89..21ff987b71a 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/05/17 15:20:50 abs Exp $
+# $NetBSD: Makefile,v 1.8 2001/05/19 03:56:37 jlam Exp $
 #
 
 # MASTER_SITES is very special, and must end in "=":
@@ -42,7 +42,7 @@ post-fetch:
 	@${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 
 post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f
+	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
 
 # This is ugly.  The chown should happen after copying, or tar should have
 # a way to override permissions.
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 7e7a35e3208..b09ef9f0124 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/05/16 21:46:08 jtb Exp $
+# $NetBSD: Makefile,v 1.26 2001/05/19 03:56:37 jlam Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
 
 DISTNAME=	octave-2.0.16
@@ -31,7 +31,7 @@ INFO_FILES=	liboctave.info octave.info
 LIBOCTAVE_INFO=	liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3
 
 post-extract:
-	${FIND} ${WRKSRC}/doc -type f -name \*.info\* | xargs ${RM} -f
+	${FIND} ${WRKSRC}/doc -type f -name \*.info\* | ${XARGS} ${RM} -f
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/octave/2.0.16/doc
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 6a3477be49f..3e374433823 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/05/05 19:51:17 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/05/19 03:56:38 jlam Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/04/20 13:19:32 wosch Exp
 #
 
@@ -15,7 +15,7 @@ USE_X11=	yes
 
 pre-configure:
 	for f in `${FIND} ${WRKDIR}/. -type f -print \
-		| xargs ${GREP} -l '/usr/local'`; do \
+		| ${XARGS} ${GREP} -l '/usr/local'`; do \
 		${SED} -e 's:/usr/local:'${PREFIX}':g' < $$f \
 			> $$f.pdone && ${MV} $$f.pdone $$f; \
 	done
diff --git a/misc/tds/Makefile b/misc/tds/Makefile
index f2416eb9554..f3875f0a47c 100644
--- a/misc/tds/Makefile
+++ b/misc/tds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/12 16:06:25 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/19 03:56:38 jlam Exp $
 #
 
 DISTNAME=	tds-1.4.2
@@ -15,6 +15,6 @@ GNU_CONFIGURE=	YES
 NO_BUILD=	YES
 
 post-patch:
-	@${FIND} ${WRKSRC} -type f -name '*.orig' | xargs ${RM} -f
+	@${FIND} ${WRKSRC} -type f -name '*.orig' | ${XARGS} ${RM} -f
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 89bc431b103..f993caf4054 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2001/02/17 18:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2001/05/19 03:56:38 jlam Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
@@ -50,7 +50,7 @@ CFLAGS+=		-I${LOCALBASE}/include
 
 post-install:
 .if (${GCC_VERSION:C/-.*$$//} != egcs)
-	@${FIND} ${KDEBASEDIR}/share/kde/locale -name ksirc.mo | xargs ${RM}
+	@${FIND} ${KDEBASEDIR}/share/kde/locale -name ksirc.mo | ${XARGS} ${RM}
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 4749bacd7bd..8fd388b9668 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2001/03/20 19:21:55 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2001/05/19 03:56:39 jlam Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -178,7 +178,7 @@ fetch-depends:
 
 post-patch:
 	@# Make sure that "automake" is never run.
-	@${FIND} ${WRKSRC} -name Makefile.in -print | xargs ${TOUCH} ${TOUCH_FLAGS}
+	@${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} ${TOUCH} ${TOUCH_FLAGS}
 
 post-build:
 	@cd ${PKGDIR}; \
diff --git a/security/ssh6/Makefile b/security/ssh6/Makefile
index e7bbd8d84d9..2f52ecd2da4 100644
--- a/security/ssh6/Makefile
+++ b/security/ssh6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/03/20 19:21:56 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2001/05/19 03:56:39 jlam Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -173,7 +173,7 @@ fetch-depends:
 
 post-patch:
 	@# Make sure that "automake" is never run.
-	@${FIND} ${WRKSRC} -name Makefile.in -print | xargs ${TOUCH} ${TOUCH_FLAGS}
+	@${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} ${TOUCH} ${TOUCH_FLAGS}
 
 post-build:
 	@cd ${PKGDIR}; \
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index 24fb8a4bb69..d16251d3023 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/17 17:42:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/05/19 03:56:40 jlam Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/01/06 12:13:36 jkh Exp
 #
 
@@ -14,7 +14,7 @@ NO_WRKSUBDIR=   yes
 
 pre-configure:
 	${CHMOD} -R u+w ${WRKDIR}
-	for f in `${FIND} ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
+	for f in `${FIND} ${WRKDIR}/. -type f -print | ${XARGS} ${GREP} -l '/usr/local'`; do \
 		${ECHO} patching $$f ; \
 		${SED} -e 's:/usr/local:${PREFIX}:g' $$f > $$f.pdone && ${MV} $$f.pdone $$f; \
 	done
diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index 9411ba93981..8cdef112e31 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/02/17 17:37:54 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/05/19 03:56:40 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/04/27 00:11:48 asami Exp
 #
 
@@ -35,6 +35,6 @@ pre-patch:
 		${PATCH} ${PATCH_DIST_ARGS} -p1 < ${PATCH2})
 
 post-patch:
-	@(cd ${WRKSRC} && ${FIND} . -name '*.orig' -print | xargs ${RM} -f)
+	@(cd ${WRKSRC} && ${FIND} . -name '*.orig' -print | ${XARGS} ${RM} -f)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index 186e843fcaf..b7aa480f7cd 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/05/19 03:56:40 jlam Exp $
 
 DISTNAME=		enlightenment-0.16.4
 CATEGORIES=		x11 gnome wm
@@ -28,8 +28,8 @@ post-install:
 	  ${TOUCH} ${PREFIX}/$${FILE}; \
 	done
 	${FIND} ${PREFIX}/share/enlightenment/themes -type d | \
-	xargs ${CHMOD} ${BINMODE}
+	${XARGS} ${CHMOD} ${BINMODE}
 	${FIND} ${PREFIX}/share/enlightenment/themes -type f | \
-	xargs ${CHMOD} ${NONBINMODE}
+	${XARGS} ${CHMOD} ${NONBINMODE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 0c5946db83d..a4c0ffc31bf 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/05/01 00:31:24 kei Exp $
+# $NetBSD: Makefile,v 1.25 2001/05/19 03:56:41 jlam Exp $
 #
 
 DISTNAME=	w3m-0.2.1
@@ -106,7 +106,7 @@ post-extract:
 	@(cd ${WRKSRC}/doc-jp; ${RM} -fr CVS)
 
 post-patch:
-	${FIND} ${WRKSRC} -type f -name '*.orig'|xargs ${RM}
+	${FIND} ${WRKSRC} -type f -name '*.orig' | ${XARGS} ${RM}
 
 # do not look at previous configuration
 do-configure:
diff --git a/x11/egtk/Makefile b/x11/egtk/Makefile
index 140d45010ce..f0b53c8a690 100644
--- a/x11/egtk/Makefile
+++ b/x11/egtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:06:18 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/19 03:56:41 jlam Exp $
 #
 
 DISTNAME=	eGTK_0.3.4
@@ -18,9 +18,9 @@ USE_X11=	yes
 WRKSRC=		${WRKDIR}/eGTK
 
 post-extract:
-	${FIND} ${WRKSRC} -type d -name "CVS" -print0 | xargs -0 ${RM} -rf
-	${FIND} ${WRKSRC} -type d -name "ise" -print0 | xargs -0 ${RM} -rf
-	${FIND} ${WRKSRC} -type f -name "*.ace" -print0 | xargs -0 ${RM} -f
+	${FIND} ${WRKSRC} -type d -name "CVS" -print0 | ${XARGS} -0 ${RM} -rf
+	${FIND} ${WRKSRC} -type d -name "ise" -print0 | ${XARGS} -0 ${RM} -rf
+	${FIND} ${WRKSRC} -type f -name "*.ace" -print0 | ${XARGS} -0 ${RM} -f
 	${RMDIR} ${WRKSRC}/examples/toolbar
 	${RM} ${WRKSRC}/examples/Makefile
 	cd ${WRKSRC}/C/se; ${MAKE_PROGRAM} ${MAKE_FLAGS} -f Makefile.se clean
diff --git a/x11/py-Pmw/Makefile b/x11/py-Pmw/Makefile
index 16a4f700faf..4c68f5435fa 100644
--- a/x11/py-Pmw/Makefile
+++ b/x11/py-Pmw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/16 20:35:55 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2001/05/19 03:56:41 jlam Exp $
 #
 
 DISTNAME=	Pmw.0.8.5
@@ -20,7 +20,7 @@ do-build:
 
 do-install:
 	(cd ${WRKDIR}; ${FIND} Pmw -type d | \
-	    sed -e 's,^,${PREFIX}/${SITE_PKG}/,' | xargs ${INSTALL_DATA_DIR})
+	    sed -e 's,^,${PREFIX}/${SITE_PKG}/,' | ${XARGS} ${INSTALL_DATA_DIR})
 	(cd ${WRKDIR}; for f in `${FIND} Pmw -type f`; do \
 	    ${INSTALL_DATA} $$f ${PREFIX}/${SITE_PKG}/$$f; done)
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}