Date: Tue, 5 Sep 2017 07:53:13 +0000 (UTC) From: Luca Pizzamiglio <pizzamig@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449273 - in head/benchmarks/unixbench: . files Message-ID: <201709050753.v857rDsB036317@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pizzamig Date: Tue Sep 5 07:53:13 2017 New Revision: 449273 URL: https://svnweb.freebsd.org/changeset/ports/449273 Log: 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 Added: head/benchmarks/unixbench/files/patch-src_big.c (contents, props changed) head/benchmarks/unixbench/files/patch-src_syscall.c (contents, props changed) Deleted: head/benchmarks/unixbench/files/patch-pgms_cleanup.sh head/benchmarks/unixbench/files/patch-src_execl.c Modified: head/benchmarks/unixbench/Makefile head/benchmarks/unixbench/distinfo head/benchmarks/unixbench/files/patch-Makefile head/benchmarks/unixbench/files/patch-Run head/benchmarks/unixbench/files/patch-pgms_multi.sh head/benchmarks/unixbench/files/patch-pgms_tst.sh head/benchmarks/unixbench/files/patch-src_dhry__1.c head/benchmarks/unixbench/pkg-descr head/benchmarks/unixbench/pkg-message head/benchmarks/unixbench/pkg-plist Modified: head/benchmarks/unixbench/Makefile ============================================================================== --- head/benchmarks/unixbench/Makefile Tue Sep 5 07:02:32 2017 (r449272) +++ head/benchmarks/unixbench/Makefile Tue Sep 5 07:53:13 2017 (r449273) @@ -2,48 +2,49 @@ # $FreeBSD$ PORTNAME= unixbench -PORTVERSION= 4.1.0 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= 5.1.3 CATEGORIES= benchmarks -MASTER_SITES= http://ftp.osuosl.org/pub/nslu2/sources/ \ - http://www.tux.org/pub/tux/niemi/unixbench/ -MAINTAINER= luca.pizzamiglio@gmail.com +MAINTAINER= pizzamig@FreeBSD.org COMMENT= BYTE magazine's Public Domain benchmark for UNIX -USES= shebangfix tar:tgz -SHEBANG_FILES= pgms/perlbench -SUB_FILES= unixbench -MAKE_JOBS_UNSAFE= yes +LICENSE= GPLv2 -post-extract: - ${RM} ${WRKSRC}/pgms/select +RUN_DEPENDS= x11perf:x11/x11perf +USES= gmake perl5 shebangfix +USE_GITHUB= yes +GH_ACCOUNT= kdlucas +GH_PROJECT= byte-unixbench +WRKSRC_SUBDIR= UnixBench + +SUB_FILES= unixbench +SHEBANG_FILES= Run pgms/gfx-x11 + do-install: ${INSTALL_SCRIPT} ${WRKDIR}/unixbench ${STAGEDIR}${PREFIX}/bin/ - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/unixbench - for f in Run ; do \ - ${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${STAGEDIR}${PREFIX}/lib/unixbench/ ; \ - done - for f in Makefile README ; do \ - ${INSTALL_DATA} ${WRKSRC}/$${f} ${STAGEDIR}${PREFIX}/lib/unixbench/ ; \ - done - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/unixbench/pgms + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unixbench + ${INSTALL_SCRIPT} ${WRKSRC}/Run ${STAGEDIR}${PREFIX}/libexec/unixbench + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unixbench/pgms for f in ${WRKSRC}/pgms/* ; do \ case $$f in \ - *.awk|*.sh|*perlbench) \ - ${INSTALL_SCRIPT} $${f} ${STAGEDIR}${PREFIX}/lib/unixbench/pgms/ ;; \ - *.logo|*.base) \ - ${INSTALL_SCRIPT} $${f} ${STAGEDIR}${PREFIX}/lib/unixbench/pgms/ ;; \ - *.orig|*.rej|*~) \ - ;;\ - *) \ - ${INSTALL_PROGRAM} $${f} ${STAGEDIR}${PREFIX}/lib/unixbench/pgms/ ;; \ + *.sh|*gfx-x11) \ + ${INSTALL_SCRIPT} $${f} \ + ${STAGEDIR}${PREFIX}/libexec/unixbench/pgms/ ;; \ + *.logo|*.base) \ + ${INSTALL_DATA} $${f} \ + ${STAGEDIR}${PREFIX}/libexec/unixbench/pgms/ ;; \ + *.orig|*.rej|*~) \ + ;;\ + *) \ + ${INSTALL_PROGRAM} $${f} \ + ${STAGEDIR}${PREFIX}/libexec/unixbench/pgms/ ;; \ esac ; \ done - -${MKDIR} ${STAGEDIR}${PREFIX}/lib/unixbench/testdir - for f in ${WRKSRC}/testdir/* ; do \ - ${INSTALL_DATA} $${f} ${STAGEDIR}${PREFIX}/lib/unixbench/testdir/ ; \ - done + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unixbench/testdir + ${INSTALL_DATA} ${WRKSRC}/testdir/* ${STAGEDIR}${PREFIX}/libexec/unixbench/testdir/ + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/libexec/unixbench/ + ${INSTALL_DATA} ${WRKSRC}/Makefile ${STAGEDIR}${PREFIX}/libexec/unixbench/ .include <bsd.port.mk> Modified: head/benchmarks/unixbench/distinfo ============================================================================== --- head/benchmarks/unixbench/distinfo Tue Sep 5 07:02:32 2017 (r449272) +++ head/benchmarks/unixbench/distinfo Tue Sep 5 07:53:13 2017 (r449273) @@ -1,2 +1,3 @@ -SHA256 (unixbench-4.1.0.tgz) = 4605f3f0001afd3af91ffb554dfd65c5cd313b6b9ada52ae8b2efdccf894cfa2 -SIZE (unixbench-4.1.0.tgz) = 63075 +TIMESTAMP = 1503481858 +SHA256 (kdlucas-byte-unixbench-v5.1.3_GH0.tar.gz) = 3a6bb00f270a5329682dff20fd2c1ab5332ef046eb54a96a0d7bd371005d31a3 +SIZE (kdlucas-byte-unixbench-v5.1.3_GH0.tar.gz) = 145908 Modified: head/benchmarks/unixbench/files/patch-Makefile ============================================================================== --- head/benchmarks/unixbench/files/patch-Makefile Tue Sep 5 07:02:32 2017 (r449272) +++ head/benchmarks/unixbench/files/patch-Makefile Tue Sep 5 07:53:13 2017 (r449273) @@ -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 Modified: head/benchmarks/unixbench/files/patch-Run ============================================================================== --- head/benchmarks/unixbench/files/patch-Run Tue Sep 5 07:02:32 2017 (r449272) +++ head/benchmarks/unixbench/files/patch-Run Tue Sep 5 07:53:13 2017 (r449273) @@ -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 +@@ -91,10 +91,10 @@ chomp($BASEDIR); + my $BINDIR = getDir('UB_BINDIR', $BASEDIR . "/pgms"); - # 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 + # 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"; - # establish full paths to directories -@@ -114,7 +114,7 @@ cd $SCRPDIR - SCRPDIR=`pwd` - cd $_WD + # Directory where the tests are executed. + my $TESTDIR = getDir('UB_TESTDIR', $BASEDIR . "/testdir"); +@@ -735,12 +735,10 @@ sub getSystemInfo { --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 - ;; + # 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; - arithoh) -@@ -385,8 +386,8 @@ do # line argument processing + # Get details on the CPUs, if possible. + my $cpus = getCpuInfo(); +@@ -750,10 +748,9 @@ sub getSystemInfo { + } - 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 - ;; + # Get graphics hardware info. +- $info->{'graphics'} = getCmdOutput("3dinfo | cut -f1 -d\'(\'"); ++ # $info->{'graphics'} = getCmdOutput("3dinfo | cut -f1 -d\'(\'"); - fstime | fsbuffer | fsdisk) + # 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"; Modified: head/benchmarks/unixbench/files/patch-pgms_multi.sh ============================================================================== --- head/benchmarks/unixbench/files/patch-pgms_multi.sh Tue Sep 5 07:02:32 2017 (r449272) +++ head/benchmarks/unixbench/files/patch-pgms_multi.sh Tue Sep 5 07:53:13 2017 (r449273) @@ -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" & Modified: head/benchmarks/unixbench/files/patch-pgms_tst.sh ============================================================================== --- head/benchmarks/unixbench/files/patch-pgms_tst.sh Tue Sep 5 07:02:32 2017 (r449272) +++ head/benchmarks/unixbench/files/patch-pgms_tst.sh Tue Sep 5 07:53:13 2017 (r449273) @@ -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.$$ Added: head/benchmarks/unixbench/files/patch-src_big.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/unixbench/files/patch-src_big.c Tue Sep 5 07:53:13 2017 (r449273) @@ -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); Modified: head/benchmarks/unixbench/files/patch-src_dhry__1.c ============================================================================== --- head/benchmarks/unixbench/files/patch-src_dhry__1.c Tue Sep 5 07:02:32 2017 (r449272) +++ head/benchmarks/unixbench/files/patch-src_dhry__1.c Tue Sep 5 07:53:13 2017 (r449273) @@ -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 @@ ***************************************************************************/ Added: head/benchmarks/unixbench/files/patch-src_syscall.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/unixbench/files/patch-src_syscall.c Tue Sep 5 07:53:13 2017 (r449273) @@ -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 { Modified: head/benchmarks/unixbench/pkg-descr ============================================================================== --- head/benchmarks/unixbench/pkg-descr Tue Sep 5 07:02:32 2017 (r449272) +++ head/benchmarks/unixbench/pkg-descr Tue Sep 5 07:53:13 2017 (r449273) @@ -1,3 +1,3 @@ -UnixBench v4.1 based on the BYTE UNIX Benchmarks v3. +UnixBench based on the BYTE UNIX Benchmarks v3. -WWW: http://www.tux.org/pub/tux/benchmarks/System/unixbench/ +WWW: https://github.com/kdlucas/byte-unixbench Modified: head/benchmarks/unixbench/pkg-message ============================================================================== --- head/benchmarks/unixbench/pkg-message Tue Sep 5 07:02:32 2017 (r449272) +++ head/benchmarks/unixbench/pkg-message Tue Sep 5 07:53:13 2017 (r449273) @@ -1,5 +1,5 @@ ------------------------------------------------------------------------ -If you want to run unixbench, please type the following command: +If you want to run unixbench, please type the following commands: % unixbench ------------------------------------------------------------------------ Modified: head/benchmarks/unixbench/pkg-plist ============================================================================== --- head/benchmarks/unixbench/pkg-plist Tue Sep 5 07:02:32 2017 (r449272) +++ head/benchmarks/unixbench/pkg-plist Tue Sep 5 07:53:13 2017 (r449273) @@ -1,42 +1,31 @@ bin/unixbench -lib/unixbench/Makefile -lib/unixbench/README -lib/unixbench/Run -lib/unixbench/pgms/arithoh -lib/unixbench/pgms/cleanup.sh -lib/unixbench/pgms/context1 -lib/unixbench/pgms/dhry2 -lib/unixbench/pgms/dhry2reg -lib/unixbench/pgms/double -lib/unixbench/pgms/execl -lib/unixbench/pgms/float -lib/unixbench/pgms/fs.awk -lib/unixbench/pgms/fsbuffer -lib/unixbench/pgms/fsdisk -lib/unixbench/pgms/fstime -lib/unixbench/pgms/hanoi -lib/unixbench/pgms/index.awk -lib/unixbench/pgms/index.base -lib/unixbench/pgms/index.sh -lib/unixbench/pgms/int -lib/unixbench/pgms/long -lib/unixbench/pgms/looper -lib/unixbench/pgms/loopm.awk -lib/unixbench/pgms/loops.awk -lib/unixbench/pgms/lps.awk -lib/unixbench/pgms/multi.sh -lib/unixbench/pgms/mwips.awk -lib/unixbench/pgms/perlbench -lib/unixbench/pgms/pipe -lib/unixbench/pgms/register -lib/unixbench/pgms/report.awk -lib/unixbench/pgms/report.sh -lib/unixbench/pgms/short -lib/unixbench/pgms/spawn -lib/unixbench/pgms/syscall -lib/unixbench/pgms/tst.sh -lib/unixbench/pgms/unixbench.logo -lib/unixbench/pgms/whetstone-double -lib/unixbench/testdir/cctest.c -lib/unixbench/testdir/dc.dat -lib/unixbench/testdir/sort.src +libexec/unixbench/Makefile +libexec/unixbench/README +libexec/unixbench/Run +libexec/unixbench/pgms/arithoh +libexec/unixbench/pgms/context1 +libexec/unixbench/pgms/dhry2 +libexec/unixbench/pgms/dhry2reg +libexec/unixbench/pgms/double +libexec/unixbench/pgms/execl +libexec/unixbench/pgms/float +libexec/unixbench/pgms/fstime +libexec/unixbench/pgms/gfx-x11 +libexec/unixbench/pgms/hanoi +libexec/unixbench/pgms/index.base +libexec/unixbench/pgms/int +libexec/unixbench/pgms/long +libexec/unixbench/pgms/looper +libexec/unixbench/pgms/multi.sh +libexec/unixbench/pgms/pipe +libexec/unixbench/pgms/register +libexec/unixbench/pgms/short +libexec/unixbench/pgms/spawn +libexec/unixbench/pgms/syscall +libexec/unixbench/pgms/tst.sh +libexec/unixbench/pgms/unixbench.logo +libexec/unixbench/pgms/whetstone-double +libexec/unixbench/testdir/cctest.c +libexec/unixbench/testdir/dc.dat +libexec/unixbench/testdir/large.txt +libexec/unixbench/testdir/sort.src
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709050753.v857rDsB036317>