Install benchmarking programs under libexec/bytebench. Add patches to do

nicer report printing under BSD systems, provided by Greg Woods in pkg/6943.

Closes PRs: 6943, 6945, 6946

6 files changed, 165 insertions, 43 deletions

diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index e44e32c6df8..b94f84db94b 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/08/04 06:13:26 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/04 08:50:16 jlam Exp $
 
 DISTNAME=		byte
 PKGNAME=		bytebench-3.6
@@ -15,12 +15,16 @@ BENCHMARK_ENV+=		TESTDIR=${WRKSRC}/testdir
 post-patch:
 	${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/Run >${WRKSRC}/run-byte
 
+pre-install:
+	${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} {} \;
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/pgms/* ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/bytebench
-	${MKDIR} ${PREFIX}/share/doc/bytebench
+	${INSTALL_DATA_DIR} ${PREFIX}/libexec/bytebench
+	${INSTALL_SCRIPT} ${WRKSRC}/pgms/* ${PREFIX}/libexec/bytebench
+	${INSTALL_DATA_DIR} ${PREFIX}/share/bytebench
 	${INSTALL_DATA} ${WRKSRC}/testdir/* ${PREFIX}/share/bytebench
-	${INSTALL_MAN} ${WRKSRC}/doc/* ${PREFIX}/share/doc/bytebench
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bytebench
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/bytebench
 	${INSTALL_SCRIPT} ${WRKSRC}/run-byte ${PREFIX}/bin
 
 benchmark:
diff --git a/benchmarks/bytebench/files/patch-sum b/benchmarks/bytebench/files/patch-sum
index 7f58c617210..aa2760b92c5 100644
--- a/benchmarks/bytebench/files/patch-sum
+++ b/benchmarks/bytebench/files/patch-sum
@@ -1,5 +1,7 @@
-$NetBSD: patch-sum,v 1.3 2000/08/04 06:13:28 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/08/04 08:50:17 jlam Exp $
 
-MD5 (patch-aa) = 92f149689171a77764feaeae4704da99
+MD5 (patch-aa) = 620b79ecd5e3322de724b58b9a3661f0
 MD5 (patch-ab) = 8af9aa8181cc0fa37a0b9ba1e457fe7f
 MD5 (patch-ac) = d091ccb6de88383e5c5ed1507d8f81e8
+MD5 (patch-ad) = 0d0d5b621e084cbbd9325b18c5d226c7
+MD5 (patch-ae) = d3ce77de62999794b877824790072715
diff --git a/benchmarks/bytebench/patches/patch-aa b/benchmarks/bytebench/patches/patch-aa
index 23762171aa9..191fa0dd32b 100644
--- a/benchmarks/bytebench/patches/patch-aa
+++ b/benchmarks/bytebench/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2000/08/04 06:13:28 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2000/08/04 08:50:17 jlam Exp $
 
 --- Run.orig	Sat May 13 15:32:15 1995
-+++ Run	Fri Aug  4 01:56:34 2000
++++ Run	Fri Aug  4 02:24:27 2000
 @@ -1,6 +1,6 @@
  #! /bin/sh
  #################### set your defaults here ##############
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.4 2000/08/04 06:13:28 jlam Exp $
  cd $PWD
  
 -BINDIR=${BINDIR-${HOMEDIR}/pgms}
-+BINDIR=${BINDIR-${HOMEDIR}/bin}
++BINDIR=${BINDIR-${HOMEDIR}/libexec/bytebench}
  cd $BINDIR
  BINDIR=`pwd`
  cd $PWD
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.4 2000/08/04 06:13:28 jlam Exp $
  PATH="${PATH}:${BINDIR}"
  
 -SCRPDIR=${SCRPDIR-${HOMEDIR}/pgms}
-+SCRPDIR=${SCRPDIR-${HOMEDIR}/bin}
++SCRPDIR=${SCRPDIR-${HOMEDIR}/libexec/bytebench}
  cd $SCRPDIR
  SCRPDIR=`pwd`
  cd $PWD
diff --git a/benchmarks/bytebench/patches/patch-ad b/benchmarks/bytebench/patches/patch-ad
new file mode 100644
index 00000000000..f56d65651ab
--- /dev/null
+++ b/benchmarks/bytebench/patches/patch-ad
@@ -0,0 +1,65 @@
+$NetBSD: patch-ad,v 1.1 2000/08/04 08:50:17 jlam Exp $
+
+--- pgms/index.sh.orig	Sat May 13 15:31:48 1995
++++ pgms/index.sh	Fri Aug  4 02:33:42 2000
+@@ -20,12 +20,50 @@
+ BASE=${BASE-pgms/index.base}
+ TARGET=${TARGET-results/log}
+ TEMP=/tmp/$$.dat
++
++HAVEPRINT=false ; export HAVEPRINT
++if expr "`type print`" : '^print is shell builtint$' >/dev/null 2>&1 ; then
++	HAVEPRINT=true
++fi
++HAVEPRINTF=false ; export HAVEPRINTF
++if expr "`type printf`" : '^printf is shell builtint$' >/dev/null 2>&1 ; then
++	HAVEPRINTF=true
++elif expr "`type printf`" : '.* is .*/printf$' >/dev/null 2>&1 ; then
++	HAVEPRINTF=true
++fi
++if $HAVEPRINT ; then
++	# use ``$echo'' if any of the other variables...
++	echo=print
++	nl='\n'
++	n=''
++	c='\c'
++elif $HAVEPRINTF ; then
++	# use ``$echo'' if any of the other variables...
++	echo=printf
++	nl='\n'
++	n=''
++	c='\c'
++else
++	echo=echo
++	(echo "hi there\c" ; echo " ") >echotmp
++	# Configure checks to make sure grep returns a status...
++	if grep c echotmp >/dev/null 2>&1 ; then
++		nl=''
++		n='-n'
++		c=''
++	else
++		nl='\n'
++		n=''
++		c='\c'
++	fi
++	rm -f echotmp
++fi
+ #
+ # BASELINE DATA
+ #
+ if [ $# -lt 1 ]
+ then
+-	echo "Data File for baseline: \c"
++	$echo $n "Data File for baseline: $c"
+ 	read BASE
+ else
+ 	BASE=$1
+@@ -41,7 +79,7 @@
+ #
+ if [ $# -lt 2 ]
+ then
+-	echo "Source File for target machine results: \c"
++	$echo $n "Source File for target machine results: $c"
+ 	read TARGET
+ else
+ 	TARGET=$2
diff --git a/benchmarks/bytebench/patches/patch-ae b/benchmarks/bytebench/patches/patch-ae
new file mode 100644
index 00000000000..5c7b97bb4f9
--- /dev/null
+++ b/benchmarks/bytebench/patches/patch-ae
@@ -0,0 +1,50 @@
+$NetBSD: patch-ae,v 1.1 2000/08/04 08:50:17 jlam Exp $
+
+--- pgms/report.sh.orig	Sat May 13 15:31:52 1995
++++ pgms/report.sh	Fri Aug  4 02:40:20 2000
+@@ -18,11 +18,44 @@
+ ##############################################################################
+ BINDIR=${BINDIR-pgms}
+ TARGET=${TARGET-results/log}
++HAVEPRINTF=false ; export HAVEPRINTF
++if expr "`type printf`" : '^printf is shell builtint$' >/dev/null 2>&1 ; then
++	HAVEPRINTF=true
++elif expr "`type printf`" : '.* is .*/printf$' >/dev/null 2>&1 ; then
++	HAVEPRINTF=true
++fi
++if $HAVEPRINT ; then
++	# use ``$echo'' if any of the other variables...
++	echo=print
++	nl='\n'
++	n=''
++	c='\c'
++elif $HAVEPRINTF ; then
++	# use ``$echo'' if any of the other variables...
++	echo=printf
++	nl='\n'
++	n=''
++	c='\c'
++else
++	echo=echo
++	(echo "hi there\c" ; echo " ") >echotmp
++	# Configure checks to make sure grep returns a status...
++	if grep c echotmp >/dev/null 2>&1 ; then
++		nl=''
++		n='-n'
++		c=''
++	else
++		nl='\n'
++		n=''
++		c='\c'
++	fi
++	rm -f echotmp
++fi
+ # RESULTS TARGET
+ #
+ if [ $# -lt 1 ]
+ then
+-	echo "Source File for target machine results: \c"
++	$echo $n "Source File for target machine results: $c"
+ 	read TARGET
+ else
+ 	TARGET=$1
diff --git a/benchmarks/bytebench/pkg/PLIST b/benchmarks/bytebench/pkg/PLIST
index 2b8524f5503..0fe72267009 100644
--- a/benchmarks/bytebench/pkg/PLIST
+++ b/benchmarks/bytebench/pkg/PLIST
@@ -1,38 +1,39 @@
-@comment $NetBSD: PLIST,v 1.1 1998/08/30 17:35:58 garbled Exp $
-bin/int
-bin/arithoh
-bin/byte.logo
-bin/cleanup.sh
-bin/context1
-bin/dhry2
-bin/dhry2reg
-bin/double
-bin/execl
-bin/float
-bin/fs.awk
-bin/fstime
-bin/hanoi
-bin/index.awk
-bin/index.base
-bin/index.sh
-bin/long
-bin/looper
-bin/loopm.awk
-bin/loops.awk
-bin/multi.sh
-bin/pipe
-bin/register
-bin/report.awk
-bin/report.sh
-bin/short
-bin/spawn
-bin/syscall
-bin/tst.sh
+@comment $NetBSD: PLIST,v 1.2 2000/08/04 08:50:17 jlam Exp $
 bin/run-byte
-share/doc/bytebench/bench.doc
-share/doc/bytebench/bench3.doc
+libexec/bytebench/arithoh
+libexec/bytebench/byte.logo
+libexec/bytebench/cleanup.sh
+libexec/bytebench/context1
+libexec/bytebench/dhry2
+libexec/bytebench/dhry2reg
+libexec/bytebench/double
+libexec/bytebench/execl
+libexec/bytebench/float
+libexec/bytebench/fs.awk
+libexec/bytebench/fstime
+libexec/bytebench/hanoi
+libexec/bytebench/index.awk
+libexec/bytebench/index.base
+libexec/bytebench/index.sh
+libexec/bytebench/int
+libexec/bytebench/long
+libexec/bytebench/looper
+libexec/bytebench/loopm.awk
+libexec/bytebench/loops.awk
+libexec/bytebench/multi.sh
+libexec/bytebench/pipe
+libexec/bytebench/register
+libexec/bytebench/report.awk
+libexec/bytebench/report.sh
+libexec/bytebench/short
+libexec/bytebench/spawn
+libexec/bytebench/syscall
+libexec/bytebench/tst.sh
 share/bytebench/cctest.c
 share/bytebench/dc.dat
 share/bytebench/sort.src
+share/doc/bytebench/bench.doc
+share/doc/bytebench/bench3.doc
 @dirrm share/doc/bytebench
 @unexec rm -rf %D/share/bytebench
+@dirrm libexec/bytebench