benchmarks/unixbench: updating to version 5.1.3

While I'm here:
* updating MAINTAINER entry
* adding the proper dependencies

Reviewed by:	mat
Approved by:	olivier (mentor)
Differential Revision:	https://reviews.freebsd.org/D12224

9 files changed, 122 insertions, 108 deletions

diff --git a/benchmarks/unixbench/files/patch-Makefile b/benchmarks/unixbench/files/patch-Makefile
index bb9d8cbe648d..f0ddc57d3c29 100644
--- a/benchmarks/unixbench/files/patch-Makefile
+++ b/benchmarks/unixbench/files/patch-Makefile
@@ -1,40 +1,46 @@
---- Makefile.orig	1999-07-28 22:05:02 UTC
+--- Makefile.orig	2015-06-04 17:20:18 UTC
 +++ Makefile
-@@ -30,9 +30,7 @@
+@@ -38,7 +38,7 @@
  ##############################################################################
- ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15";
+ 
  SHELL = /bin/sh
--#HZ = ????  	   #(read from environment)
--CFLAGS = -DTIME
--CC=gcc
+-
 +HZ = 128
+ # GRAPHICS TESTS: Uncomment the definition of "GRAPHIC_TESTS" to enable
+ # the building of the graphics benchmarks.  This will require the
+ # X11 libraries on your system.
+@@ -53,7 +53,7 @@ GL_LIBS = -lGL -lXext -lX11
+ # COMPILER CONFIGURATION: Set "CC" to the name of the compiler to use
+ # to build the binary benchmarks.  You should also set "$cCompiler" in the
+ # Run script to the name of the compiler you want to test.
+-CC=gcc
++#CC=gcc
  
- ## For Linux 486/Pentium, GCC 2.7.x and 2.8.x
- #OPTON = -O2 -fomit-frame-pointer -fforce-addr -fforce-mem -ffast-math \
-@@ -44,7 +42,7 @@ CC=gcc
+ # OPTIMISATION SETTINGS:
+ 
+@@ -71,14 +71,14 @@ CC=gcc
  #	-m386 -malign-loops=1 -malign-jumps=1 -malign-functions=1
  
  ## For Solaris 2, or general-purpose GCC 2.7.x
--OPTON = -O2 -fomit-frame-pointer -fforce-addr -fforce-mem -ffast-math -Wall
-+#OPTON = -O2 -fomit-frame-pointer -fforce-addr -fforce-mem -ffast-math -Wall
+-OPTON = -O2 -fomit-frame-pointer -fforce-addr -ffast-math -Wall
++OPTON = -O2 -fomit-frame-pointer -ffast-math -Wall
  
- ## Very generic
- #OPTON = -O
-@@ -54,14 +52,14 @@ OPTON = -O2 -fomit-frame-pointer -fforce
+ ## For Digital Unix v4.x, with DEC cc v5.x
+ #OPTON = -O4
  #CFLAGS = -DTIME -std1 -verbose -w0
  
- ## generic gcc CFLAGS.  -DTIME must be included
+ ## generic gcc CFLAGS.  -DTIME must be included.
 -CFLAGS = -DTIME -Wall -pedantic -ansi
 +CFLAGS += -DTIME -Wall -pedantic -ansi
  
- # local directories
+ 
+ ##############################################################################
+@@ -90,8 +90,6 @@ CFLAGS = -DTIME -Wall -pedantic -ansi
  PROGDIR = ./pgms
  SRCDIR = ./src
  TESTDIR = ./testdir
 -RESULTDIR = ./results
 -TMPDIR = ./tmp
-+#RESULTDIR = ./results
-+#TMPDIR = /var/tmp
  # other directories
  INCLDIR = /usr/include
  LIBDIR = /lib
diff --git a/benchmarks/unixbench/files/patch-Run b/benchmarks/unixbench/files/patch-Run
index 77dcee755c77..0661db387c74 100644
--- a/benchmarks/unixbench/files/patch-Run
+++ b/benchmarks/unixbench/files/patch-Run
@@ -1,61 +1,71 @@
---- Run.orig	1999-07-28 22:04:47 UTC
+--- Run.orig	2017-09-04 20:35:19 UTC
 +++ Run
-@@ -88,11 +88,11 @@ else
- fi
- 
- # check that the required files are in the proper places
--if make check; then
--        :
--else
--	make all
--fi
-+#if make check; then
-+#        :
-+#else
-+#	make all
-+#fi
- 
- 
- # establish full paths to directories
-@@ -114,7 +114,7 @@ cd $SCRPDIR
- SCRPDIR=`pwd`
- cd $_WD
- 
--TMPDIR=${HOMEDIR}/tmp
-+TMPDIR=${TMPDIR-${HOMEDIR}/tmp}
- cd $TMPDIR
- TMPDIR=`pwd`
- cd $_WD
-@@ -367,10 +367,11 @@ do				# line argument processing
- 	C)  
- 		logmsg="C Compiler Throughput"
- 		prog="looper ${looper-60} ${CC} cctest.c"
-+		prog="looper ${looper-60} ${CC} cctest.c -o ${TMPDIR}/a.out"
- 		stdout=/dev/null
- 		repeat="$shortloop"
- 		cleanopt="-m $TMPTIMES"
--		rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out
-+		rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out
- 		;;
- 
- 	arithoh)
-@@ -385,8 +386,8 @@ do				# line argument processing
- 
- 	dc)  
- 		logmsg="Dc: sqrt(2) to 99 decimal places"
--		prog="looper ${looper-30} dc"
--		stdin=dc.dat
-+		prog="looper ${looper-30} \"dc < ${TESTDIR}/dc.dat\""
-+		stdin=
- 		stdout=/dev/null
- 		cleanopt="-m $TMPTIMES"
- 		;;
-@@ -508,7 +509,7 @@ do				# line argument processing
-     ########### some specific cleanup routines ##############
-     case $bench in
-       C)
--      rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out
-+      rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out
-       ;;
- 
-       fstime | fsbuffer | fsdisk)
+@@ -91,10 +91,10 @@ chomp($BASEDIR);
+ my $BINDIR = getDir('UB_BINDIR', $BASEDIR . "/pgms");
+ 
+ # Temp directory, for temp files.
+-my $TMPDIR = getDir('UB_TMPDIR', $BASEDIR . "/tmp");
++my $TMPDIR = "/tmp";
+ 
+ # Directory to put results in.
+-my $RESULTDIR = getDir('UB_RESULTDIR', $BASEDIR . "/results");
++my $RESULTDIR = "/tmp";
+ 
+ # Directory where the tests are executed.
+ my $TESTDIR = getDir('UB_TESTDIR', $BASEDIR . "/testdir");
+@@ -735,12 +735,10 @@ sub getSystemInfo {
+ 
+     # Get the language info.
+     my $lang = getCmdOutput("printenv LANG");
+-    my $map = getCmdOutput("locale -k LC_CTYPE | grep charmap");
++    my $map = getCmdOutput("locale -k | grep charmap");
+     $map =~ s/.*=//;
+-    my $coll = getCmdOutput("locale -k LC_COLLATE | grep collate-codeset");
+-    $coll =~ s/.*=//;
+-    $info->{'language'} = sprintf "%s (charmap=%s, collate=%s)",
+-                                   $lang, $map, $coll;
++    $info->{'language'} = sprintf "%s (charmap=%s)",
++                                   $lang, $map;
+ 
+     # Get details on the CPUs, if possible.
+     my $cpus = getCpuInfo();
+@@ -750,10 +748,9 @@ sub getSystemInfo {
+     }
+ 
+     # Get graphics hardware info.
+-    $info->{'graphics'} = getCmdOutput("3dinfo | cut -f1 -d\'(\'");
++    # $info->{'graphics'} = getCmdOutput("3dinfo | cut -f1 -d\'(\'");
+ 
+     # Get system run state, load and usage info.
+-    $info->{'runlevel'} = getCmdOutput("runlevel | cut -f2 -d\" \"");
+     $info->{'load'} = getCmdOutput("uptime");
+     $info->{'numUsers'} = getCmdOutput("who | wc -l");
+ 
+@@ -781,6 +778,7 @@ sub abortRun {
+ 
+ # Do checks that everything's ready for testing.
+ sub preChecks {
++    return;
+     # Set the language.
+     $ENV{'LANG'} = $language;
+ 
+@@ -1386,7 +1384,7 @@ sub displaySystem {
+     }
+ 
+     # Display system load and usage info.
+-    printf $fd "   %s; runlevel %s\n\n", $info->{'load'}, $info->{'runlevel'};
++    printf $fd "   %s; \n\n", $info->{'load'};
+ }
+ 
+ 
+@@ -1603,8 +1601,8 @@ sub displaySystemHtml {
+     # Display system runlevel, load and usage info.
+     printf $fd "<tr>\n";
+     printf $fd "   <td><b>Uptime:</b></td>\n";
+-    printf $fd "   <td colspan=2>%s; runlevel %s</td>\n",
+-                   $info->{'load'}, $info->{'runlevel'};
++    printf $fd "   <td colspan=2>%s</td>\n",
++                   $info->{'load'};
+     printf $fd "</tr>\n";
+ 
+     printf $fd "</table></p>\n\n";
diff --git a/benchmarks/unixbench/files/patch-pgms_cleanup.sh b/benchmarks/unixbench/files/patch-pgms_cleanup.sh
deleted file mode 100644
index 36eeaa7a9784..000000000000
--- a/benchmarks/unixbench/files/patch-pgms_cleanup.sh
+++ /dev/null
@@ -1,13 +0,0 @@
---- pgms/cleanup.sh.orig	1997-09-13 02:01:19 UTC
-+++ pgms/cleanup.sh
-@@ -107,8 +107,8 @@ do
- 	;;
-     
-     -r) # reason for failure
--	echo $1
--	echo $1 >>$LOGFILE
-+	echo -e $1
-+	echo -e $1 >>$LOGFILE
- 	shift
- 	;;
- 
diff --git a/benchmarks/unixbench/files/patch-pgms_multi.sh b/benchmarks/unixbench/files/patch-pgms_multi.sh
index 0b344228ae96..0a4dca1c2169 100644
--- a/benchmarks/unixbench/files/patch-pgms_multi.sh
+++ b/benchmarks/unixbench/files/patch-pgms_multi.sh
@@ -1,4 +1,4 @@
---- pgms/multi.sh.orig	1995-11-28 00:19:10 UTC
+--- pgms/multi.sh.orig	2015-06-04 17:20:18 UTC
 +++ pgms/multi.sh
 @@ -14,6 +14,7 @@
  #
@@ -7,4 +7,4 @@
 +cd ${TMPDIR}
  instance=1
  while [ $instance -le $1 ]; do
- 	/bin/sh $BINDIR/tst.sh &
+ 	/bin/sh "$UB_BINDIR/tst.sh" &
diff --git a/benchmarks/unixbench/files/patch-pgms_tst.sh b/benchmarks/unixbench/files/patch-pgms_tst.sh
index 4cd6b0073cce..910f7e614f4e 100644
--- a/benchmarks/unixbench/files/patch-pgms_tst.sh
+++ b/benchmarks/unixbench/files/patch-pgms_tst.sh
@@ -1,11 +1,11 @@
---- pgms/tst.sh.orig	1995-11-27 17:07:03 UTC
+--- pgms/tst.sh.orig	2015-06-04 17:20:18 UTC
 +++ pgms/tst.sh
 @@ -14,7 +14,7 @@
  #
  ###############################################################################
  ID="@(#)tst.sh:3.4 -- 5/15/91 19:30:24";
 -sort >sort.$$ <sort.src
-+sort >sort.$$ < ${TESTDIR}/sort.src
- od sort.$$ | sort -n +1 > od.$$
++sort >sort.$$ < ${UB_TESTDIR}/sort.src
+ od sort.$$ | sort -n -k 1 > od.$$
  grep the sort.$$ | tee grep.$$ | wc > wc.$$
  rm sort.$$ grep.$$ od.$$ wc.$$
diff --git a/benchmarks/unixbench/files/patch-src_big.c b/benchmarks/unixbench/files/patch-src_big.c
new file mode 100644
index 000000000000..7790317c2b9e
--- /dev/null
+++ b/benchmarks/unixbench/files/patch-src_big.c
@@ -0,0 +1,11 @@
+--- src/big.c.orig	2015-06-04 17:20:18 UTC
++++ src/big.c
+@@ -583,7 +583,7 @@ void dumpwork(void)
+ void fatal(char *s)
+ {
+     int	i;
+-    fprintf(stderr, s);
++    fprintf(stderr, "%s", s);
+     fflush(stderr);
+     perror("Reason?");
+     fflush(stderr);
diff --git a/benchmarks/unixbench/files/patch-src_dhry__1.c b/benchmarks/unixbench/files/patch-src_dhry__1.c
index 01821756b3b5..26b7ced39c54 100644
--- a/benchmarks/unixbench/files/patch-src_dhry__1.c
+++ b/benchmarks/unixbench/files/patch-src_dhry__1.c
@@ -1,4 +1,4 @@
---- src/dhry_1.c.orig	1999-07-28 21:43:08 UTC
+--- src/dhry_1.c.orig	2015-06-04 17:20:18 UTC
 +++ src/dhry_1.c
 @@ -34,6 +34,7 @@
   ***************************************************************************/
diff --git a/benchmarks/unixbench/files/patch-src_execl.c b/benchmarks/unixbench/files/patch-src_execl.c
deleted file mode 100644
index 434380383c9e..000000000000
--- a/benchmarks/unixbench/files/patch-src_execl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/execl.c.orig	1999-07-28 21:46:58 UTC
-+++ src/execl.c
-@@ -88,7 +88,7 @@ char	*argv[];
- 		fprintf(stderr, "%lu loops\n", iter);
- 		exit(0);
- 		}
--	execl(fullpath, fullpath, "0", dur_str, count_str, start_str, 0);
-+	execl(fullpath, fullpath, "0", dur_str, count_str, start_str, NULL);
- 	printf("Exec failed at iteration %lu\n", iter);
- 	perror("Reason");
- 	exit(1);
diff --git a/benchmarks/unixbench/files/patch-src_syscall.c b/benchmarks/unixbench/files/patch-src_syscall.c
new file mode 100644
index 000000000000..9e920f1e1390
--- /dev/null
+++ b/benchmarks/unixbench/files/patch-src_syscall.c
@@ -0,0 +1,11 @@
+--- src/syscall.c.orig	2015-06-04 17:20:18 UTC
++++ src/syscall.c
+@@ -90,7 +90,7 @@ char	*argv[];
+                     fprintf(stderr,"%s: fork failed\n", argv[0]);
+                     exit(1);
+                 } else if (pid == 0) {
+-                    execl("/bin/true", (char *) 0);
++                    execl("/bin/true", (char *) 0, (char *) 0);
+                     fprintf(stderr,"%s: exec /bin/true failed\n", argv[0]);
+                     exit(1);
+                 } else {