cp -> ${CP}, chmod -> ${CHMOD}

14 files changed, 34 insertions, 34 deletions

diff --git a/benchmarks/benchfft/Makefile b/benchmarks/benchfft/Makefile
index fcd3bd8645a..b36ca6a92af 100644
--- a/benchmarks/benchfft/Makefile
+++ b/benchmarks/benchfft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/03/08 10:50:23 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/03/16 12:16:49 wiz Exp $
 
 DISTNAME=		benchfft-2.0
 CATEGORIES=		benchmarks math
@@ -29,12 +29,12 @@ benchmark:
 .if defined(BATCH)
 	@${ECHO} "*** This benchmark should be run in non-batch mode"
 	@${SED} -e 's|bench-fft|./bench|g' <${WRKSRC}/submit-script> ${WRKSRC}/run_bench
-	@chmod 755 ${WRKSRC}/run_bench
+	@${CHMOD} 755 ${WRKSRC}/run_bench
 	@${SED} -e 's|@machine@|'`uname -m`'|'				\
 	${FILESDIR}/setup.answers | (cd ${WRKSRC} ; ./run_bench)
 .else
 	@${SED} -e 's|bench-fft|./bench|g' <${WRKSRC}/submit-script> ${WRKSRC}/run_bench
-	@chmod 755 ${WRKSRC}/run_bench
+	@${CHMOD} 755 ${WRKSRC}/run_bench
 	@(cd ${WRKSRC} ; ./run_bench)
 	@${ECHO} ${PKGNAME} results:
 	${CAT} submit.txt
@@ -42,6 +42,6 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/submit.txt /tmp/benches/`domainname`/fft.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/submit.txt /tmp/benches/`domainname`/fft.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 85ac37401cb..7a74cddac28 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/07/02 08:37:21 agc Exp $
+# $NetBSD: Makefile,v 1.15 2000/03/16 12:16:50 wiz Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/26 23:09:14 jseger Exp
 #
 
@@ -23,6 +23,6 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/bonnie.out /tmp/benches/`domainname`/bonnie.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/bonnie.out /tmp/benches/`domainname`/bonnie.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index 57f02af49a5..f60f5c1cfef 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/01/05 12:23:55 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/03/16 12:16:50 wiz Exp $
 
 DISTNAME=		byte
 PKGNAME=		bytebench-3.6
@@ -24,6 +24,6 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/bytebench.out /tmp/benches/`domainname`/bytebench.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/bytebench.out /tmp/benches/`domainname`/bytebench.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/dhrystone/Makefile b/benchmarks/dhrystone/Makefile
index 74daa74a499..712e0edca0b 100644
--- a/benchmarks/dhrystone/Makefile
+++ b/benchmarks/dhrystone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/12/26 15:59:55 garbled Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/16 12:16:51 wiz Exp $
 
 DISTNAME=		dhry2.1
 PKGNAME=		dhrystone-2.1
@@ -23,6 +23,6 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/dry.out /tmp/benches/`domainname`/dhrystone.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/dry.out /tmp/benches/`domainname`/dhrystone.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/fib/Makefile b/benchmarks/fib/Makefile
index 075ad7c4729..67eff2304e1 100644
--- a/benchmarks/fib/Makefile
+++ b/benchmarks/fib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/03/16 09:02:26 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/16 12:16:51 wiz Exp $
 
 DISTNAME=		fib.c
 PKGNAME=		fib-980203
@@ -25,6 +25,6 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/fib.out /tmp/benches/`domainname`/fib.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/fib.out /tmp/benches/`domainname`/fib.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/flops/Makefile b/benchmarks/flops/Makefile
index 7e7399bfa66..eaaaf78f0be 100644
--- a/benchmarks/flops/Makefile
+++ b/benchmarks/flops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/03/16 09:02:26 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/16 12:16:51 wiz Exp $
 
 DISTNAME=		flops
 PKGNAME=		flops-2.0
@@ -29,6 +29,6 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/flops.out /tmp/benches/`domainname`/flops.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/flops.out /tmp/benches/`domainname`/flops.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/heapsort/Makefile b/benchmarks/heapsort/Makefile
index 8625f740f3d..c347927ee3d 100644
--- a/benchmarks/heapsort/Makefile
+++ b/benchmarks/heapsort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/03/16 09:02:26 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/16 12:16:51 wiz Exp $
 
 DISTNAME=		heapsort.c
 PKGNAME=		heapsort-1.0
@@ -25,6 +25,6 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/heapsort.out /tmp/benches/`domainname`/heapsort.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/heapsort.out /tmp/benches/`domainname`/heapsort.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/hint/Makefile b/benchmarks/hint/Makefile
index 199e4770927..01a84ac0b47 100644
--- a/benchmarks/hint/Makefile
+++ b/benchmarks/hint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/28 04:26:18 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/03/16 12:16:52 wiz Exp $
 # FreeBSD: Makefile,v 1.1.1.1 1998/06/15 18:09:43 ghelmer Exp
 #
 
@@ -21,10 +21,10 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/hint.1 ${PREFIX}/man/man1
 
 benchmark:
-	cd ${WRKSRC} ; ${MKDIR} -p data ; ./DOUBLE | tee hint.out
+	cd ${WRKSRC} ; ${MKDIR} data ; ./DOUBLE | tee hint.out
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/hint.out /tmp/benches/`domainname`/hint.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/hint.out /tmp/benches/`domainname`/hint.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 7b34ca9141d..62d7ec29495 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/06/21 09:57:03 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/03/16 12:16:52 wiz Exp $
 
 DISTNAME=		iozone
 PKGNAME=		iozone-1.14b
@@ -27,6 +27,6 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/iozone.out /tmp/benches/`domainname`/iozone.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/iozone.out /tmp/benches/`domainname`/iozone.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/linpack/Makefile b/benchmarks/linpack/Makefile
index 1bf4f9c7653..6c2a7201913 100644
--- a/benchmarks/linpack/Makefile
+++ b/benchmarks/linpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/03/16 09:02:27 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/03/16 12:16:52 wiz Exp $
 
 DISTNAME=		linpackc
 PKGNAME=		linpack-940225
@@ -28,7 +28,7 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/linpacks.out /tmp/benches/`domainname`/linpacks.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/linpacks.out /tmp/benches/`domainname`/linpacks.`uname`-`uname -m`-`uname -r`.`hostname`
 	-@cp ${WRKSRC}/linpackd.out /tmp/benches/`domainname`/linpackd.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index e482e947c61..e872f518eac 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/01/05 11:42:49 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/03/16 12:16:53 wiz Exp $
 
 DISTNAME=		lmbench-2alpha11
 PKGNAME=		lmbench-2.11a
@@ -20,10 +20,10 @@ post-configure:
 		${MV} $$f $$f.in;				\
 		${SED} -e 's|@PREFIX@|${PREFIX}|g' $$f.in > $$f; \
 	done
-	@chmod 0755 ${WRKSRC}/scripts/config-run
-	@chmod 0755 ${WRKSRC}/scripts/os
-	@chmod 0755 ${WRKSRC}/scripts/results
-	@chmod 0755 ${WRKSRC}/scripts/lmbench
+	@${CHMOD} 0755 ${WRKSRC}/scripts/config-run
+	@${CHMOD} 0755 ${WRKSRC}/scripts/os
+	@${CHMOD} 0755 ${WRKSRC}/scripts/results
+	@${CHMOD} 0755 ${WRKSRC}/scripts/lmbench
 
 do-install:
 	@${SETENV} PREFIX=${PREFIX} WRKSRC=${WRKSRC} \
diff --git a/benchmarks/nsieve/Makefile b/benchmarks/nsieve/Makefile
index 7975100e56e..2a97a3baf4e 100644
--- a/benchmarks/nsieve/Makefile
+++ b/benchmarks/nsieve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/03/16 09:02:27 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/16 12:16:53 wiz Exp $
 
 DISTNAME=		nsieve.c
 PKGNAME=		nsieve-1.2b
@@ -25,6 +25,6 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/nsieve.out /tmp/benches/`domainname`/nsieve.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/nsieve.out /tmp/benches/`domainname`/nsieve.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/paranoia/Makefile b/benchmarks/paranoia/Makefile
index 8e19cb3ac64..8113bdfbaaa 100644
--- a/benchmarks/paranoia/Makefile
+++ b/benchmarks/paranoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/04/01 14:07:53 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/03/16 12:16:53 wiz Exp $
 
 DISTNAME=		paranoia
 PKGNAME=		paranoia-960101
@@ -22,6 +22,6 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/paranoia.out /tmp/benches/`domainname`/paranoia.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/paranoia.out /tmp/benches/`domainname`/paranoia.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/whetstone/Makefile b/benchmarks/whetstone/Makefile
index 57a69fdf28a..5cbd116cc58 100644
--- a/benchmarks/whetstone/Makefile
+++ b/benchmarks/whetstone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/04/01 14:07:53 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/03/16 12:16:54 wiz Exp $
 
 DISTNAME=		whetstone
 PKGNAME=		whetstone-1.2
@@ -22,6 +22,6 @@ benchmark:
 
 results:
 	-@${MKDIR} /tmp/benches/`domainname`
-	-@cp ${WRKSRC}/whetstone.out /tmp/benches/`domainname`/whetstone.`uname`-`uname -m`-`uname -r`.`hostname`
+	-@${CP} ${WRKSRC}/whetstone.out /tmp/benches/`domainname`/whetstone.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"