replaced some commands by their ${COMMAND} counterparts

15 files changed, 56 insertions, 59 deletions

diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile
index d0327fc4d69..905957a2ee2 100644
--- a/games/angband-tty/Makefile
+++ b/games/angband-tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/02/20 22:48:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2000/01/02 03:20:06 wiz Exp $
 #
 
 DISTNAME=		angband-283
@@ -15,9 +15,9 @@ ALL_TARGET=		angband
 do-install:
 	${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/angband
 	${CP} -R ${WRKDIR}/${DISTNAME}/lib/* ${PREFIX}/share/angband
-	chown -R bin:games ${PREFIX}/share/angband
-	chmod -R 0664 ${PREFIX}/share/angband/*
-	(cd ${PREFIX}/share/angband && chmod 0775 apex bone data edit file help info save user xtra)
+	${CHOWN} -R bin:games ${PREFIX}/share/angband
+	${CHMOD} -R 0664 ${PREFIX}/share/angband/*
+	(cd ${PREFIX}/share/angband && ${CHMOD} 0775 apex bone data edit file help info save user xtra)
 	${INSTALL} -c -s -o bin -g games -m 2755 ${WRKSRC}/angband ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index 02888aad258..f4061a03cec 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/04/26 18:38:28 garbled Exp $
+# $NetBSD: Makefile,v 1.4 2000/01/02 03:20:07 wiz Exp $
 #
 
 DISTNAME=		angband-283
@@ -21,9 +21,9 @@ ALLFILES=		${DISTFILES}	# don't checksum shared patches
 do-install:
 	${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/angband
 	${CP} -R ${WRKDIR}/${DISTNAME}/lib/* ${PREFIX}/share/angband
-	chown -R bin:games ${PREFIX}/share/angband
-	chmod -R 0664 ${PREFIX}/share/angband/*
-	(cd ${PREFIX}/share/angband && chmod 0775 apex bone data edit file help info save user xtra)
+	${CHOWN} -R bin:games ${PREFIX}/share/angband
+	${CHMOD} -R 0664 ${PREFIX}/share/angband/*
+	(cd ${PREFIX}/share/angband && ${CHMOD} 0775 apex bone data edit file help info save user xtra)
 	${INSTALL} -c -s -o bin -g games -m 2755 ${WRKSRC}/angband ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index 244e3865fca..72f03991cac 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/09/29 22:58:43 tron Exp $
+# $NetBSD: Makefile,v 1.15 2000/01/02 03:20:07 wiz Exp $
 #
 
 DISTNAME=		battalion
@@ -34,9 +34,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho ${PREFIX}/share/battalion/battalion.data
 	${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man ${PREFIX}/man/man6/battalion.6
 	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/* ${PREFIX}/share/battalion/HELP
-	@cat /dev/null >>/var/games/battalion_hiscore
-	chown bin:games /var/games/battalion_hiscore
-	chmod 664 /var/games/battalion_hiscore
+	${INSTALL} -o bin -g games -m 664 /dev/null /var/games/battalion_hiscore
 
 pre-clean:
 	@${RM} -rf ${WRKDIR}/battalionSUN4
diff --git a/games/craft/Makefile b/games/craft/Makefile
index 5a9e02e04a3..5773230087f 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/08/11 22:42:22 tron Exp $
+# $NetBSD: Makefile,v 1.6 2000/01/02 03:20:10 wiz Exp $
 
 DISTNAME=	craftcc35
 PKGNAME=	craft-3.5
@@ -14,7 +14,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/crossfire/Makefile b/games/crossfire/Makefile
index b45719ff36a..f05a9674c29 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/04/05 17:23:02 mycroft Exp $
+# $NetBSD: Makefile,v 1.5 2000/01/02 03:20:11 wiz Exp $
 #
 
 DISTNAME=	crossfire-0.94.2
@@ -45,18 +45,18 @@ post-install:
 	    ${GZCAT} ${DISTDIR}/${CF_MAPS} | ${GTAR} xmf -
 	cd ${X11BASE}/lib/crossfire && \
 	    ${GZCAT} ${DISTDIR}/${CF_SOUND} | ${GTAR} xmf -
-	@/usr/bin/find ${X11BASE}/lib/crossfire/sounds -name \*.au -type f \
+	@${FIND} ${X11BASE}/lib/crossfire/sounds -name \*.au -type f \
 		> ${WRKDIR}/.RPLAY
 	@${CAT} ${WRKDIR}/.RPLAY >> ${LOCALBASE}/etc/rplay.conf
 	@${CAT} ${WRKDIR}/.RPLAY >> ${DEINSTALL_FILE}
 	@${CAT} ${WRKDIR}/.RPLAY >> ${INSTALL_FILE}
 	@${ECHO} "EOF" >> ${INSTALL_FILE}
-	@chown root:games ${X11BASE}/bin/crossfire
-	@chmod 2755 ${X11BASE}/bin/crossfire
-	@chown -R root:games ${X11BASE}/lib/crossfire
-	@chmod 775 ${X11BASE}/lib/crossfire/players
-	@chmod 775 ${X11BASE}/lib/crossfire
-	@chmod 664 ${X11BASE}/lib/crossfire/highscore
+	@${CHOWN} root:games ${X11BASE}/bin/crossfire
+	@${CHMOD} 2755 ${X11BASE}/bin/crossfire
+	@${CHOWN} -R root:games ${X11BASE}/lib/crossfire
+	@${CHMOD} 775 ${X11BASE}/lib/crossfire/players
+	@${CHMOD} 775 ${X11BASE}/lib/crossfire
+	@${CHMOD} 664 ${X11BASE}/lib/crossfire/highscore
 
 pre-clean:
 	@${RM} -f ${DEINSTALL_FILE} ${INSTALL_FILE} ${WRKDIR}/.RPLAY
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index ab544b303c8..ff4eb547c97 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/04/15 20:39:42 tron Exp $
+# $NetBSD: Makefile,v 1.7 2000/01/02 03:20:11 wiz Exp $
 
 DISTNAME=		imaze1.3
 PKGNAME=		imaze-1.3
@@ -16,6 +16,6 @@ USE_MOTIF=		yes
 USE_X11BASE=		yes
 
 post-build:
-	cd ${WRKSRC} && /bin/pax -rf ${DISTDIR}/imaze-sounds.tar
+	cd ${WRKSRC} && ${PAX} -rf ${DISTDIR}/imaze-sounds.tar
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/jetpack/Makefile b/games/jetpack/Makefile
index 4f72a90cc66..e1346fd450d 100644
--- a/games/jetpack/Makefile
+++ b/games/jetpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/09/13 22:31:32 garbled Exp $
+# $NetBSD: Makefile,v 1.3 2000/01/02 03:20:12 wiz Exp $
 # $FreeBSD: Makefile,v 1.16 1997/01/03 09:36:43 obrien Exp $
 #
 
@@ -14,13 +14,11 @@ USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
-	@chown bin:games ${PREFIX}/bin/jetpack
-	@chown bin:games ${PREFIX}/share/jetpack
-	@chmod 2755 ${PREFIX}/bin/jetpack
-	@cat /dev/null >>/var/games/jetpack.scores
-	@chown bin:games /var/games/jetpack.scores
-	@chmod 0664 /var/games/jetpack.scores
-	@chmod 0775 ${PREFIX}/share/jetpack
+	@${CHOWN} bin:games ${PREFIX}/bin/jetpack
+	@${CHOWN} bin:games ${PREFIX}/share/jetpack
+	@${CHMOD} 2755 ${PREFIX}/bin/jetpack
+	${INSTALL} -o bin -g games -m 664 /dev/null /var/games/jetpack.scores
+	@${CHMOD} 0775 ${PREFIX}/share/jetpack
 	${INSTALL_MAN} ${WRKSRC}/jetpack.man ${PREFIX}/man/man6/jetpack.6
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index e549e46cfcd..12450eefd20 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/04/15 20:39:42 tron Exp $
+# $NetBSD: Makefile,v 1.6 2000/01/02 03:20:12 wiz Exp $
 #
 
 DISTNAME=		mirrormagic-1.3
@@ -15,14 +15,14 @@ do-install:
 	${INSTALL_PROGRAM} -o bin -g games -m 2755 ${WRKSRC}/mirrormagic ${X11BASE}/bin
 	${MKDIR} ${X11BASE}/share/mirrormagic/sounds
 	${MKDIR} ${X11BASE}/share/mirrormagic/graphics
-	chown bin:games ${X11BASE}/share/mirrormagic
-	chmod 775 ${X11BASE}/share/mirrormagic
+	${CHOWN} bin:games ${X11BASE}/share/mirrormagic
+	${CHMOD} 775 ${X11BASE}/share/mirrormagic
 	${INSTALL_DATA} ${WRKSRC}/sounds/* ${X11BASE}/share/mirrormagic/sounds
 	${INSTALL_DATA} ${WRKSRC}/graphics/* ${X11BASE}/share/mirrormagic/graphics
 	${INSTALL_DATA} ${WRKSRC}/RAY.* ${X11BASE}/share/mirrormagic
 	${GUNZIP_CMD} ${X11BASE}/share/mirrormagic/graphics/*.gz
 	${TOUCH} ${X11BASE}/share/mirrormagic/RAY.score
-	chown bin:games ${X11BASE}/share/mirrormagic/RAY.score
-	chmod 664 ${X11BASE}/share/mirrormagic/RAY.score
+	${CHOWN} bin:games ${X11BASE}/share/mirrormagic/RAY.score
+	${CHMOD} 664 ${X11BASE}/share/mirrormagic/RAY.score
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/moria/Makefile b/games/moria/Makefile
index 873071c586d..6ae04ddad48 100644
--- a/games/moria/Makefile
+++ b/games/moria/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/01/23 20:22:26 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/01/02 03:20:12 wiz Exp $
 
 DISTNAME=		um5.5.2
 PKGNAME=		moria-5.5.2
@@ -15,7 +15,7 @@ WRKSRC=			${WRKDIR}/umoria
 
 do-configure:
 	@rm -f ${WRKSRC}/*.[ch] ${WRKSRC}/Makefile
-	@cd ${WRKSRC}; ln -s source/* unix/* .
+	@cd ${WRKSRC}; ${LN} -s source/* unix/* .
 
 post-install:
 	@if [ ! -f /var/games/moria.scores ]; then \
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index b1629a4c2ee..7ca42a903bc 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/04/23 12:33:19 kleink Exp $
+# $NetBSD: Makefile,v 1.4 2000/01/02 03:20:12 wiz Exp $
 #
 
 DISTNAME=		nighthawk-2.1
@@ -6,6 +6,7 @@ WRKSRC=			${WRKDIR}/nighthawk
 CATEGORIES=		x11 games
 MASTER_SITES=		http://www.downunder.net.au/~jsno/rel/unix_projects/
 EXTRACT_SUFX=		.tgz
+
 PATCH_SITES=		${MASTER_SITES}
 PATCHFILES=		nighthawk-2.1a.patch
 PATCH_DIST_STRIP=	-p1
@@ -27,8 +28,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/games/pysol/Makefile b/games/pysol/Makefile
index 2bff4ab0f38..4c6a98d3784 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/12/23 08:07:04 sakamoto Exp $
+# $NetBSD: Makefile,v 1.4 2000/01/02 03:20:13 wiz Exp $
 # FreeBSD Id: ports/games/pysol/Makefile,v 1.20 1999/12/08 11:01:01 tg Exp
 
 DISTNAME=       pysol-3.10
@@ -29,9 +29,9 @@ do-install:
 post-install:
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	@(cd ${PREFIX}; \
-	  find share/pysol \( -type f -or -type l \) | \
+	  ${FIND} share/pysol \( -type f -or -type l \) | \
 	    sort >> ${PLIST_SRC}; \
-	  for DIR in `find share/pysol -type d | sort -r`; do \
+	  for DIR in `${FIND} share/pysol -type d | sort -r`; do \
 	  ${ECHO} "@dirrm $$DIR" >> ${PLIST_SRC}; \
 	  done)
 
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index 7afa42689f5..5bbe023a75d 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/12/22 05:09:19 sakamoto Exp $
+# $NetBSD: Makefile,v 1.7 2000/01/02 03:20:13 wiz Exp $
 #
 
 DISTNAME=	Rollemup
@@ -53,8 +53,8 @@ do-install:
 		${PREFIX}/${GAMES_DIR}/Rollemup
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	@(cd ${PREFIX}; \
-	  find ${GAMES_DIR}/Rollemup -type f >> ${PLIST_SRC}; \
-	  for DIR in `find ${GAMES_DIR}/Rollemup -type d | sort -r`; do \
+	  ${FIND} ${GAMES_DIR}/Rollemup -type f >> ${PLIST_SRC}; \
+	  for DIR in `${FIND} ${GAMES_DIR}/Rollemup -type d | sort -r`; do \
 	    ${ECHO} "@dirrm $$DIR" >> ${PLIST_SRC}; \
 	  done)
 	@${CHOWN} root:games ${PREFIX}/bin/Rollemup
diff --git a/games/svb/Makefile b/games/svb/Makefile
index 0835268725d..b300ba5094d 100644
--- a/games/svb/Makefile
+++ b/games/svb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/04/01 14:07:53 agc Exp $
+# $NetBSD: Makefile,v 1.3 2000/01/02 03:20:13 wiz Exp $
 
 DISTNAME=		svb
 PKGNAME=		svb-1.0
@@ -15,10 +15,10 @@ NO_INSTALL_MANPAGES=	yes
 
 post-install:
 	${TOUCH} /var/games/svb.scorefile
-	chown games:games /var/games/svb.scorefile
-	chmod 664 /var/games/svb.scorefile
-	chown bin:games ${PREFIX}/bin/svb
-	chmod 2755 ${PREFIX}/bin/svb
+	${CHOWN} games:games /var/games/svb.scorefile
+	${CHMOD} 664 /var/games/svb.scorefile
+	${CHOWN} bin:games ${PREFIX}/bin/svb
+	${CHMOD} 2755 ${PREFIX}/bin/svb
 	${INSTALL_MAN} ${WRKSRC}/svb.man ${PREFIX}/man/man6/svb.6
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index d751b6c5936..e4a1f436ae5 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:42 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/01/02 03:20:14 wiz Exp $
 #
 
 DISTNAME=		xboing2.4
@@ -16,8 +16,8 @@ NO_INSTALL_MANPAGES=	yes
 USE_IMAKE=		yes
 
 post-install:
-	chown bin:games ${X11BASE}/bin/xboing
-	chmod 2755 ${X11BASE}/bin/xboing
+	${CHOWN} bin:games ${X11BASE}/bin/xboing
+	${CHMOD} 2755 ${X11BASE}/bin/xboing
 	${INSTALL_MAN} ${WRKSRC}/xboing.man ${X11BASE}/man/man6/xboing.6
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 6eea95d0dc1..805fbe4d77e 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/11/12 01:08:24 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2000/01/02 03:20:14 wiz Exp $
 #
 
 DISTNAME=	xscrabble
@@ -27,8 +27,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/OSPD3.gz ${PREFIX}/share/games/xscrabble
 	${INSTALL_DATA} ${WRKSRC}/scrabble_permutations ${PREFIX}/share/games/xscrabble
 	${INSTALL_DATA} ${WRKSRC}/xscrabble.scores ${PREFIX}/share/games/xscrabble/xscrabble.scores.dist
-	chown ${BINOWN}:games ${PREFIX}/share/games/xscrabble/xscrabble.scores.dist
-	chmod 0664 ${PREFIX}/share/games/xscrabble/xscrabble.scores.dist
+	${CHOWN} ${BINOWN}:games ${PREFIX}/share/games/xscrabble/xscrabble.scores.dist
+	${CHMOD} 0664 ${PREFIX}/share/games/xscrabble/xscrabble.scores.dist
 	${INSTALL_DATA} ${WRKSRC}/XScrabble ${PREFIX}/lib/X11/app-defaults
 	@if [ ! -f /var/games/xscrabble.scores ]; then \
 		${CP} -p ${PREFIX}/share/games/xscrabble/xscrabble.scores.dist \