replaced a whole lot more commands with ${COMMAND}

12 files changed, 30 insertions, 28 deletions

diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 117a392f612..2ccb5ddff17 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/04/26 18:56:14 garbled Exp $
+# $NetBSD: Makefile,v 1.12 2000/01/10 00:57:13 wiz Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/04/20 13:19:32 wosch Exp
 #
 
@@ -13,8 +13,10 @@ DEPENDS=	tk-8.0.5:../../x11/tk80
 USE_X11=	yes
 
 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; \
+	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
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Business-CreditCard/Makefile b/misc/p5-Business-CreditCard/Makefile
index fac1113a0c6..9df3ae81f35 100644
--- a/misc/p5-Business-CreditCard/Makefile
+++ b/misc/p5-Business-CreditCard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/04/15 20:39:45 tron Exp $
+# $NetBSD: Makefile,v 1.7 2000/01/10 00:57:14 wiz Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:06 jfitz Exp
 #
 
@@ -18,6 +18,6 @@ do-install:
 		@ ${CP} ${WRKSRC}/CreditCard.pm ${WRKSRC}/CreditCard-0.1.pm
 		@ ${MKDIR} ${PREFIX}/lib/perl5/site_perl/Business/
 		@ ${INSTALL_DATA} ${WRKSRC}/CreditCard-0.1.pm ${PREFIX}/lib/perl5/site_perl/Business/
-		@ ln -sf ${PREFIX}/lib/perl5/site_perl/Business/CreditCard-0.1.pm ${PREFIX}/lib/perl5/site_perl/Business/CreditCard.pm
+		@ ${LN} -sf ${PREFIX}/lib/perl5/site_perl/Business/CreditCard-0.1.pm ${PREFIX}/lib/perl5/site_perl/Business/CreditCard.pm
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index 2b67328466d..464383df9b6 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/11/19 12:32:26 agc Exp $
+# $NetBSD: Makefile,v 1.10 2000/01/10 00:57:15 wiz Exp $
 #
 
 DISTNAME=	arpwatch-2.1a4
@@ -18,7 +18,7 @@ pre-patch:
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/arpwatch.8 ${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/arpsnmp.8 ${PREFIX}/man/man8
-	@/bin/test -e /var/db/arpwatch || ${MKDIR} /var/db/arpwatch
+	@${TEST} -e /var/db/arpwatch || ${MKDIR} /var/db/arpwatch
 	${TOUCH} /var/db/arpwatch/arp.dat
 	${INSTALL_DATA} ${WRKSRC}/ethercodes.dat ${PREFIX}/etc
 
diff --git a/net/coda_doc/Makefile b/net/coda_doc/Makefile
index 6f540b99b6a..3c9aefbb349 100644
--- a/net/coda_doc/Makefile
+++ b/net/coda_doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/10/27 19:12:22 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/01/10 00:57:15 wiz Exp $
 #
 
 DISTNAME=	coda-doc-4.6.5-3
@@ -19,7 +19,7 @@ do-build:
 	@${ECHO} "available.  It should appear in a release or two."
 
 do-install:
-	cd ${WRKSRC}; pax -r -w man ${PREFIX}
-	cd ${WRKSRC}; pax -r -w doc ${PREFIX}/share
+	cd ${WRKSRC}; ${PAX} -r -w man ${PREFIX}
+	cd ${WRKSRC}; ${PAX} -r -w doc ${PREFIX}/share
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/coda_intro/Makefile b/net/coda_intro/Makefile
index aee663f21cc..1651d05149e 100644
--- a/net/coda_intro/Makefile
+++ b/net/coda_intro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/10/27 14:36:05 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/01/10 00:57:15 wiz Exp $
 #
 
 DISTNAME=	coda-intro-4.6.6
@@ -14,6 +14,7 @@ do-build:
 	@${TRUE}
 
 do-install:
-	cd ${WRKSRC}; pax -r -w -s '|.*CVS||' -s '|.*\.FreeBSD||' doc ${PREFIX}/share
+	cd ${WRKSRC}; ${PAX} -r -w -s '|.*CVS||' -s '|.*\.FreeBSD||' \
+		doc ${PREFIX}/share
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ircII/Makefile b/net/ircII/Makefile
index 2cca15cd869..6e37289bab3 100644
--- a/net/ircII/Makefile
+++ b/net/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1999/09/23 16:28:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.23 2000/01/10 00:57:15 wiz Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/05/14 10:35:13 torstenb Exp
 #
 
@@ -30,7 +30,6 @@ DEPENDS+=               socks5-1.0.2:../../net/socks5
 .endif
 .endif
 
-
 pre-install:
 	@(if [ "X${MANZ}" != X"" ]; then \
 		GZSUFFIX=.gz; \
@@ -40,7 +39,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/net/nocol/Makefile b/net/nocol/Makefile
index 8b7cb011f4d..60500aadd3e 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/06 21:09:12 abs Exp $
+# $NetBSD: Makefile,v 1.6 2000/01/10 00:57:16 wiz Exp $
 #
 
 DISTNAME=	nocol-4.2.2beta4
@@ -16,7 +16,7 @@ INSTALL_TARGET=	install root
 post-patch:
 	@(hostname=`/bin/hostname`;					\
 	dir="";								\
-	for d in /usr/bin /usr/sbin `${ECHO} $$PATH | tr ':' ' '`; do	\
+	for d in /usr/bin /usr/sbin `${ECHO} $$PATH | ${TR} ':' ' '`; do \
 		if [ -x $$d/host ]; then				\
 			dir=$$d;					\
 			break;						\
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index c2d95a0c8d6..1e02d819030 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/11/14 05:23:26 fredb Exp $
+# $NetBSD: Makefile,v 1.11 2000/01/10 00:57:16 wiz Exp $
 #
 
 DISTNAME=	ntp-4.0.98f
@@ -22,7 +22,7 @@ post-build:
 
 post-install:
 	cd ${WRKSRC}; \
-	    ${RM} html/.cvsignore* 2> /dev/null || true; \
+	    ${RM} html/.cvsignore* 2> /dev/null || ${TRUE}; \
 	    ${PAX} -r -w -s "/html/ntp4/" html ${DOCDIR}; \
 	    ${PAX} -r -w -s "/conf/ntp4/" conf ${EXAMPLESDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}/ntp4 ${EXAMPLESDIR}/ntp4
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 775210dc25d..78efae6f0f0 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/12/24 02:58:31 sakamoto Exp $
+# $NetBSD: Makefile,v 1.4 2000/01/10 00:57:16 wiz Exp $
 #
 
 DISTNAME=	xipdump-1.5.4
@@ -22,7 +22,7 @@ CONFIGURE_ENV+=	CFLAGS="`${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines`
 
 post-build:
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	@(cd ${WRKSRC}/data; find pkc pkt ! -type d | \
+	@(cd ${WRKSRC}/data; ${FIND} pkc pkt ! -type d | \
 		${SED} -e 's|^|share/xipdump/|' >> ${PLIST_SRC})
 	@${ECHO} "@dirrm share/xipdump/pkt" >> ${PLIST_SRC}
 	@${ECHO} "@dirrm share/xipdump/pkc" >> ${PLIST_SRC}
diff --git a/news/nntpclnt/Makefile b/news/nntpclnt/Makefile
index 1a2ee6e56db..32856b80e3e 100644
--- a/news/nntpclnt/Makefile
+++ b/news/nntpclnt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/09/20 19:21:21 kim Exp $
+# $NetBSD: Makefile,v 1.9 2000/01/10 00:57:16 wiz Exp $
 #
 
 DISTNAME=	nntpclnt-1.6.1
@@ -17,7 +17,7 @@ CONFIG_SH=	${FILESDIR}/config.${OPSYS}.sh
 
 do-configure:
 	${SED} -e s,@PREFIX@,${PREFIX}, ${CONFIG_SH} >${WRKSRC}/config.sh
-	@cd ${WRKSRC} && sh Makefile.SH && sh config.h.SH
+	@cd ${WRKSRC} && ${SH} Makefile.SH && ${SH} config.h.SH
 
 post-build:
 	cd ${WRKSRC} && \
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index f84582d2970..aa2abc7daa9 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 1999/10/07 17:41:57 tron Exp $
+# $NetBSD: Makefile,v 1.20 2000/01/10 00:57:16 wiz Exp $
 
 DISTNAME=	magicfilter-1.2
 CATEGORIES=	print
@@ -33,8 +33,8 @@ post-install:
 	    ${ECHO} "Installing $$FILTER as $$TARGET"; \
 	    ${SED} 's/-sOutputFile=-/-sOutputFile=- -sPAPERSIZE='$$paper'/' \
 		<$$FILTER >${PREFIX}/${FILTER_DIR}/$$FILTER; \
-	    chown ${BINOWN}:${BINGRP} $$TARGET; \
-	    chmod ${BINMODE} $$TARGET; \
+	    ${CHOWN} ${BINOWN}:${BINGRP} $$TARGET; \
+	    ${CHMOD} ${BINMODE} $$TARGET; \
 	    ${ECHO} ${FILTER_DIR}/$$FILTER >>${PLIST_SRC}; \
 	  done)
 	@${ECHO} "@dirrm ${FILTER_DIR}" >>${PLIST_SRC}
diff --git a/print/mp/Makefile b/print/mp/Makefile
index c762d43a6da..b8aea4b9c9e 100644
--- a/print/mp/Makefile
+++ b/print/mp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/28 19:52:26 kim Exp $
+# $NetBSD: Makefile,v 1.2 2000/01/10 00:57:17 wiz Exp $
 #
 
 DISTNAME=	mp
@@ -30,6 +30,6 @@ ALL_TARGET=	mp PREFIX=${PREFIX} X11BASE=${X11BASE} CC='${CC}' \
 INSTALL_TARGET=	install-mp PREFIX=${PREFIX}
 
 pre-patch:
-	cp ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile
+	${CP} ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile
 
 .include "../../mk/bsd.pkg.mk"