replaced some more commands by their ${COMMAND} counterparts

32 files changed, 81 insertions, 81 deletions

diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile
index c7d9c3a271e..fb00d779c8d 100644
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/25 22:23:10 wiz Exp $
+# $NetBSD: Makefile,v 1.6 1999/12/28 04:19:57 wiz Exp $
 
 DISTNAME=	festdoc-1.4.0.1
 PKGNAME=	festival-doc-1.4.0.1
@@ -14,13 +14,13 @@ FDOC=		${PREFIX}/share/doc/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} ${WRKSRC}/festival/src-manual/c3750.htm~
 	${RM} ${WRKSRC}/speechtools/c16909.htm~
 
 do-install:
 	${INSTALL_DATA_DIR} ${FDOC}
-	cd ${WRKSRC} && info=`find . -name '*.info*' -type f` && \
+	cd ${WRKSRC} && info=`${FIND} . -name '*.info*' -type f` && \
 	  ${CP} $$info ${PREFIX}/info && \
 	  ${CP} -r ${WRKSRC}/* ${FDOC} && \
 	  cd ${FDOC} && \
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 89b459e62f0..e3d7b630148 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/12/28 03:42:56 wiz Exp $
+# $NetBSD: Makefile,v 1.11 1999/12/28 04:19:58 wiz Exp $
 
 DISTNAME=	festival-1.4.0
 WRKSRC=		${WRKDIR}
@@ -57,7 +57,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 deb1494f446..c266ce61f1e 100644
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/12/25 22:25:32 wiz Exp $
+# $NetBSD: Makefile,v 1.7 1999/12/28 04:19:58 wiz Exp $
 
 DISTNAME=	festlex_CMU
 PKGNAME=	festlex-cmu-1.4.0
@@ -17,7 +17,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 f785f6b2880..f80183e16de 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/12/25 22:26:04 wiz Exp $
+# $NetBSD: Makefile,v 1.7 1999/12/28 04:19:58 wiz Exp $
 
 DISTNAME=	festlex_OALD
 PKGNAME=	festlex-oald-1.4.0
@@ -17,7 +17,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 2cfea4dc64b..3df1fc888f0 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/12/25 22:38:56 wiz Exp $
+# $NetBSD: Makefile,v 1.7 1999/12/28 04:19:58 wiz Exp $
 
 DISTNAME=	OGIlexicon-2.0
 PKGNAME=	festlex-ogi-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/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index b0920bfebb5..555e8a65b24 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/12/25 22:38:56 wiz Exp $
+# $NetBSD: Makefile,v 1.7 1999/12/28 04:19:59 wiz Exp $
 
 DISTNAME=	festlex_POSLEX
 PKGNAME=	festlex-poslex-1.4.0
@@ -17,7 +17,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 4b9454e21c9..ac6672b60d0 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/12/25 22:38:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 1999/12/28 04:19:59 wiz Exp $
 
 DISTNAME=	OGIspanish-2.0
 PKGNAME=	festogi-spanish-2.0
@@ -19,7 +19,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 82f87e80ffa..d6d61e02854 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/25 22:38:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 1999/12/28 04:19:59 wiz Exp $
 
 DISTNAME=	voice_abc_di-2.0
 PKGNAME=	festvox-abc-2.0
@@ -21,9 +21,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 07143626829..a1f204bab77 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/25 22:38:58 wiz Exp $
+# $NetBSD: Makefile,v 1.9 1999/12/28 04:19:59 wiz Exp $
 
 DISTNAME=	voice_aec_di-2.0
 PKGNAME=	festvox-aec-2.0
@@ -20,8 +20,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 17613f439ac..e00c127e749 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/25 22:38:58 wiz Exp $
+# $NetBSD: Makefile,v 1.9 1999/12/28 04:19:59 wiz Exp $
 
 DISTNAME=	festvox_don
 PKGNAME=	festvox-don-1.4.0
@@ -19,7 +19,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 7e1735d8533..16b0bbc03c6 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/12/25 22:38:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 1999/12/28 04:19:59 wiz Exp $
 
 DISTNAME=	festvox_ellpc11k
 PKGNAME=	festvox-el11-1.4.0
@@ -19,7 +19,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 4cd901a4584..5465b56872c 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/12/25 22:38:58 wiz Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/28 04:20:00 wiz Exp $
 
 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
@@ -24,12 +24,12 @@ MBROLA=		${FHOME}/lib/voices/english/en1_mbrola
 
 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}
 #ugh
-	ln -fs ../../../../../mbrola/voices/en1 ${MBROLA}
-	ln -fs ../../../../../mbrola/voices/en1/en1mrpa ${MBROLA}
+	${LN} -fs ../../../../../mbrola/voices/en1 ${MBROLA}
+	${LN} -fs ../../../../../mbrola/voices/en1/en1mrpa ${MBROLA}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index e645116d25b..b94bc58e0c8 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/25 22:38:59 wiz Exp $
+# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:00 wiz Exp $
 
 DISTNAME=	voice_hvs_di-2.0
 PKGNAME=	festvox-hvs-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-jph/Makefile b/audio/festvox-jph/Makefile
index ae2edce69f0..82b5807654a 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/25 22:38:59 wiz Exp $
+# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:00 wiz Exp $
 
 DISTNAME=	voice_jph_di-2.0
 PKGNAME=	festvox-jph-2.0
@@ -20,8 +20,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 6b1b15a859c..0c108c8b8ea 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/12/25 22:38:59 wiz Exp $
+# $NetBSD: Makefile,v 1.7 1999/12/28 04:20:00 wiz Exp $
 
 DISTNAME=	festvox_kallpc16k
 PKGNAME=	festvox-kal16-1.4.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/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index 703858d5e56..5636537e2e9 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/25 22:39:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:00 wiz Exp $
 
 DISTNAME=	festvox_kallpc8k
 PKGNAME=	festvox-kal8-1.4.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/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index 20afb9760ee..f3a0cb75c45 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/12/25 22:39:00 wiz Exp $
+# $NetBSD: Makefile,v 1.7 1999/12/28 04:20:01 wiz Exp $
 
 DISTNAME=	festvox_kedlpc16k
 PKGNAME=	festvox-ked16-1.4.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/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index d9b370575fb..cc2f6634ca7 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/12/25 22:39:00 wiz Exp $
+# $NetBSD: Makefile,v 1.10 1999/12/28 04:20:01 wiz Exp $
 
 DISTNAME=	festvox_kedlpc8k
 PKGNAME=	festvox-ked8-1.4.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/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index 814e360d3cd..6edf875f2fd 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/25 22:39:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:01 wiz Exp $
 
 DISTNAME=	voice_mwm_di-2.0
 PKGNAME=	festvox-mwm-2.0
@@ -20,8 +20,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 bf91cf5030f..1b7d1a3befb 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/25 22:39:01 wiz Exp $
+# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:01 wiz Exp $
 
 DISTNAME=	voice_ogirab_di-2.0
 PKGNAME=	festvox-ogirab-2.0
@@ -20,8 +20,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 d53c0f5ebb7..7ce803868be 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/12/25 22:39:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/28 04:20:01 wiz Exp $
 
 DISTNAME=	festvox_rablpc16k
 PKGNAME=	festvox-rab16-1.4.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/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 1a22ff3bc6f..7dfea56ba1e 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/12/25 22:39:01 wiz Exp $
+# $NetBSD: Makefile,v 1.11 1999/12/28 04:20:01 wiz Exp $
 
 DISTNAME=	festvox_rablpc8k
 PKGNAME=	festvox-rab8-1.4.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/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index 000a8939723..e811fc86892 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/25 22:39:01 wiz Exp $
+# $NetBSD: Makefile,v 1.9 1999/12/28 04:20:02 wiz Exp $
 
 DISTNAME=	voice_tll_di-2.0
 PKGNAME=	festvox-tll-2.0
@@ -20,8 +20,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 8abde364f15..b356f35a770 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/25 22:39:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 1999/12/28 04:20:02 wiz Exp $
 
 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
@@ -24,12 +24,12 @@ MBROLA=		${FHOME}/lib/voices/english/us1_mbrola
 
 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}
 #ugh
-	ln -fs ../../../../../mbrola/voices/us1 ${MBROLA}
-	ln -fs ../../../../../mbrola/voices/us1/us1mrpa ${MBROLA}
+	${LN} -fs ../../../../../mbrola/voices/us1 ${MBROLA}
+	${LN} -fs ../../../../../mbrola/voices/us1/us1mrpa ${MBROLA}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index afaaf243db8..56ff3135dcb 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/25 22:39:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 1999/12/28 04:20:02 wiz Exp $
 
 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
@@ -24,12 +24,12 @@ MBROLA=		${FHOME}/lib/voices/english/us2_mbrola
 
 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}
 #ugh
-	ln -fs ../../../../../mbrola/voices/us2 ${MBROLA}
-	ln -fs ../../../../../mbrola/voices/us2/us2mrpa ${MBROLA}
+	${LN} -fs ../../../../../mbrola/voices/us2 ${MBROLA}
+	${LN} -fs ../../../../../mbrola/voices/us2/us2mrpa ${MBROLA}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index 6186beb1066..9d0a6dfff0e 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/25 22:39:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 1999/12/28 04:20:02 wiz Exp $
 
 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
@@ -24,12 +24,12 @@ MBROLA=		${FHOME}/lib/voices/english/us3_mbrola
 
 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}
 #ugh
-	ln -fs ../../../../../mbrola/voices/us3 ${MBROLA}
-	ln -fs ../../../../../mbrola/voices/us3/us3mrpa ${MBROLA}
+	${LN} -fs ../../../../../mbrola/voices/us3 ${MBROLA}
+	${LN} -fs ../../../../../mbrola/voices/us3/us3mrpa ${MBROLA}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-us1/Makefile b/audio/mbrolavox-us1/Makefile
index 064b95e347c..00c7c0efe15 100644
--- a/audio/mbrolavox-us1/Makefile
+++ b/audio/mbrolavox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/12/25 22:39:03 wiz Exp $
+# $NetBSD: Makefile,v 1.4 1999/12/28 04:20:02 wiz Exp $
 
 DISTNAME=	us1-980512
 PKGNAME=	mbrolavox-us1-980512
@@ -23,7 +23,7 @@ MHOME=		${PREFIX}/share/mbrola/voices
 
 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 5a7eae7759a..ecea96d6c5c 100644
--- a/audio/mbrolavox-us2/Makefile
+++ b/audio/mbrolavox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/25 22:39:03 wiz Exp $
+# $NetBSD: Makefile,v 1.3 1999/12/28 04:20:03 wiz Exp $
 
 DISTNAME=	us2-980812
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -23,7 +23,7 @@ MHOME=		${PREFIX}/share/mbrola/voices
 
 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 5957d274cb1..d3b6dfbb09c 100644
--- a/audio/mbrolavox-us3/Makefile
+++ b/audio/mbrolavox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/25 22:39:04 wiz Exp $
+# $NetBSD: Makefile,v 1.3 1999/12/28 04:20:03 wiz Exp $
 
 DISTNAME=	us3-990208
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -23,7 +23,7 @@ MHOME=		${PREFIX}/share/mbrola/voices
 
 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/mikmod/Makefile b/audio/mikmod/Makefile
index 1aba920e756..c2c0b9ed3c7 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/07/06 07:54:35 jlam Exp $
+# $NetBSD: Makefile,v 1.18 1999/12/28 04:20:03 wiz Exp $
 #
 
 DISTNAME=	mikmod-3.0.3
@@ -14,7 +14,7 @@ DEPENDS+=	ncurses-4.2:../../devel/ncurses
 USE_GMAKE=	yes
 
 post-patch:
-	chmod a+x ${WRKSRC}/build-mikmod.netbsd.sh
+	${CHMOD} a+x ${WRKSRC}/build-mikmod.netbsd.sh
 
 do-build:
 	@( cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build-mikmod.netbsd.sh )
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 53f44992cff..28702a9e3cf 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/03/08 10:53:55 agc Exp $
+# $NetBSD: Makefile,v 1.14 1999/12/28 04:20:03 wiz Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
 #
 
@@ -21,7 +21,7 @@ pre-configure:
 	for f in `find ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
 		${SED} -e 's:/usr/local:'${PREFIX}':g' < $$f > $$f.pdone && ${MV} $$f.pdone $$f; \
 	done
-	chmod +x ${WRKSRC}/configure
+	${CHMOD} +x ${WRKSRC}/configure
 
 post-build:
 	cd ${WRKSRC}/doc ; ${MAKE} info
@@ -31,7 +31,7 @@ post-install:
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/rplayd.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/rplayd.sh; \
 		${ECHO} "[ -x ${PREFIX}/sbin/rplayd ] && ( ${PREFIX}/sbin/rplayd & ) && ${ECHO} -n ' rplayd'" >> ${PREFIX}/etc/rc.d/rplayd.sh; \
-		chmod 751 ${PREFIX}/etc/rc.d/rplayd.sh; \
+		${CHMOD} 751 ${PREFIX}/etc/rc.d/rplayd.sh; \
 	fi
 	@if [ ! -f ${PREFIX}/etc/rplay.hosts ]; then \
 		${ECHO} localhost > ${PREFIX}/etc/rplay.hosts; \
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index a03af3d1509..786ef549756 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/08/20 15:16:40 tsarna Exp $
+# $NetBSD: Makefile,v 1.13 1999/12/28 04:20:03 wiz Exp $
 # FreeBSD ID: Makefile,v 1.5 1997/09/08 13:37:47 tg Exp
 #
 
@@ -15,7 +15,7 @@ USE_MOTIF=	yes
 post-patch:
 	for file in ${WRKSRC}/XMmix.ad ${WRKSRC}/resource.h; do \
 		${CP} $$file $$file.orig; \
-		chmod +w $$file; \
+		${CHMOD} +w $$file; \
 		${SED} "s^/usr/lib/X11/xmmix.hlp^${PREFIX}/lib/X11/xmmix.hlp^" $$file.orig > $$file; \
 	done