diff options
| -rw-r--r-- | benchmarks/hbench/Makefile | 11 | ||||
| -rw-r--r-- | benchmarks/hbench/distinfo | 10 | ||||
| -rw-r--r-- | benchmarks/hbench/patches/patch-ah | 26 |
3 files changed, 25 insertions, 22 deletions
diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile index 3859542ff87..1e60e90804e 100644 --- a/benchmarks/hbench/Makefile +++ b/benchmarks/hbench/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2011/05/28 23:02:33 dholland Exp $ +# $NetBSD: Makefile,v 1.45 2011/09/12 10:47:11 dholland Exp $ -DISTNAME= hbench-OS-1.0 -PKGNAME= hbench-1.0 -PKGREVISION= 6 +DISTNAME= hbench-OS-1.1 +PKGNAME= hbench-1.1 CATEGORIES= benchmarks MASTER_SITES= http://www.eecs.harvard.edu/vino/perf/hbench/ @@ -15,14 +14,12 @@ DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/hbench-OS +WRKSRC= ${WRKDIR}/HBenchOS OSVERSION_SPECIFIC= YES BUILD_TARGET= build USE_TOOLS+= perl:run OVERRIDE_GNU_CONFIG_SCRIPTS= yes -DIST_SUBDIR= ${PKGNAME_NOREV} - GET_ARCH_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/-.*-.*$$//' GET_OS_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/^.*-.*-//' PLIST_SUBST+= PLATFORM=${GET_OS_CMD:sh:Q}-${GET_ARCH_CMD:sh:Q} diff --git a/benchmarks/hbench/distinfo b/benchmarks/hbench/distinfo index 94bc82105d4..d5d29fa1e43 100644 --- a/benchmarks/hbench/distinfo +++ b/benchmarks/hbench/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.15 2011/08/01 03:54:53 dholland Exp $ +$NetBSD: distinfo,v 1.16 2011/09/12 10:47:11 dholland Exp $ -SHA1 (hbench-1.0/hbench-OS-1.0.tar.gz) = b1a72287e2d04561141f296ba04d142f60152fe0 -RMD160 (hbench-1.0/hbench-OS-1.0.tar.gz) = 2e2702c035689e1dec39328e47dc9dc9ff558103 -Size (hbench-1.0/hbench-OS-1.0.tar.gz) = 206216 bytes +SHA1 (hbench-OS-1.1.tar.gz) = b6c98f5fc9cd306df6bdd2cf7d8254100118b01a +RMD160 (hbench-OS-1.1.tar.gz) = 023131dc9ae6239b9d64671e4128d691b78b310a +Size (hbench-OS-1.1.tar.gz) = 205361 bytes SHA1 (patch-aa) = f08f8feefec200af85895384dc0b436580dffa9f SHA1 (patch-ab) = ce446b5836aadc690c127ab41d52dee27fdb987c SHA1 (patch-ac) = f6f570b66b5e32e8da14aec1b7afb8edc9088842 @@ -10,7 +10,7 @@ SHA1 (patch-ad) = f591b706c15daf4375896a4e47f005e422857a94 SHA1 (patch-ae) = faa6e73c7fffa23ab6ee8632b972ccaeef26d42c SHA1 (patch-af) = 8c0562be1732807ea6fbce48fc51c83be1b3888a SHA1 (patch-ag) = 037db0b965aad72ad8a1b93f9cf4b4af9f446fdf -SHA1 (patch-ah) = 6c01c679b394985d0570df4fe29c09642cbde6c3 +SHA1 (patch-ah) = 52e3597539ebde61cb8d46a9f7feee51fd8f0185 SHA1 (patch-ai) = d59d05c9d73aa4c06f5ac5153a069694a4267fd1 SHA1 (patch-aj) = 7bca0c1062626b5c03f04b7bce17f7c2d8c14231 SHA1 (patch-al) = 53ac43ab3287f4ae7dc246aa9b047923e8acd8b6 diff --git a/benchmarks/hbench/patches/patch-ah b/benchmarks/hbench/patches/patch-ah index 2db61586cae..10fe84f450e 100644 --- a/benchmarks/hbench/patches/patch-ah +++ b/benchmarks/hbench/patches/patch-ah @@ -1,17 +1,23 @@ -$NetBSD: patch-ah,v 1.2 1998/09/23 16:56:01 agc Exp $ ---- scripts/maindriver.orig Sat Sep 5 09:24:50 1998 -+++ scripts/maindriver Sat Sep 5 09:28:52 1998 -@@ -48,9 +48,6 @@ +$NetBSD: patch-ah,v 1.3 2011/09/12 10:47:11 dholland Exp $ + +Make it installable (it was originally meant to be run out of its source tree) + +--- scripts/maindriver.orig 2003-03-19 17:54:05.000000000 +0000 ++++ scripts/maindriver +@@ -48,12 +48,6 @@ else fi -# Step 1: Discover hbench root path -HBENCHROOT=`(cd \`dirname $0\`/.. ; pwd)` +-if [ X${HBENCHROOT}X = XX ]; then +- HBENCHROOT=$PWD +-fi - + echo Current directory is $HBENCHROOT + # Step 2: Get run file name, check arguments, etc - if [ $# -lt 1 ]; then - echo "Usage: `basename $0` <run_file>" -@@ -94,16 +91,16 @@ +@@ -99,16 +93,16 @@ if [ X${SCRATCHDIR}X = XX ]; then fi if [ X${PLAINBINDIR}X = XX ]; then @@ -32,7 +38,7 @@ $NetBSD: patch-ah,v 1.2 1998/09/23 16:56:01 agc Exp $ fi RESULTDIRB=${RESULTDIRBASE}/${SYSTEMNAME} -@@ -120,10 +117,10 @@ +@@ -125,10 +119,10 @@ if [ -f $TESTFILE ]; then TESTS=${TESTFILE} elif [ -f ${TESTFILE}.test ]; then TESTS=${TESTFILE}.test @@ -47,7 +53,7 @@ $NetBSD: patch-ah,v 1.2 1998/09/23 16:56:01 agc Exp $ else echo "Unable to locate test file ${TESTFILE}." echo "Fix run file $1 and retry" -@@ -427,9 +424,9 @@ +@@ -432,9 +426,9 @@ run_remote_test() { ;; esac else @@ -59,7 +65,7 @@ $NetBSD: patch-ah,v 1.2 1998/09/23 16:56:01 agc Exp $ $RSH $machine -n /tmp/$1 0 $3 -s 2>> $STDERR & fi -@@ -788,12 +785,12 @@ +@@ -793,12 +787,12 @@ echo "done." if [ X`perl -e 'print "perltest\n";' 2>&1`X = XperltestX ]; then echo $ECHON "Generating summary information...${ECHOC}" rm -f ${RESULTDIR}/summary |