Sat May 28 23:02:33 2011 UTC ()
Add trivial patch to makefile, now passes MAKE_JOBS=4.


(dholland)
diff -r1.43 -r1.44 pkgsrc/benchmarks/hbench/Makefile
diff -r1.13 -r1.14 pkgsrc/benchmarks/hbench/distinfo
diff -r1.2 -r1.3 pkgsrc/benchmarks/hbench/patches/patch-aq
cvs diff -r1.43 -r1.44 pkgsrc/benchmarks/hbench/Makefile (expand / switch to unified diff)

--- pkgsrc/benchmarks/hbench/Makefile 2009/10/29 18:20:36 1.43
+++ pkgsrc/benchmarks/hbench/Makefile 2011/05/28 23:02:33 1.44
@@ -1,30 +1,29 @@ @@ -1,30 +1,29 @@
1# $NetBSD: Makefile,v 1.43 2009/10/29 18:20:36 joerg Exp $ 1# $NetBSD: Makefile,v 1.44 2011/05/28 23:02:33 dholland Exp $
2 2
3DISTNAME= hbench-OS-1.0 3DISTNAME= hbench-OS-1.0
4PKGNAME= hbench-1.0 4PKGNAME= hbench-1.0
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= benchmarks 6CATEGORIES= benchmarks
7MASTER_SITES= http://www.eecs.harvard.edu/vino/perf/hbench/ 7MASTER_SITES= http://www.eecs.harvard.edu/vino/perf/hbench/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.eecs.harvard.edu/vino/perf/hbench/ 10HOMEPAGE= http://www.eecs.harvard.edu/vino/perf/hbench/
11COMMENT= Suite of portable benchmarks to measure the OS and the hardware 11COMMENT= Suite of portable benchmarks to measure the OS and the hardware
12 12
13DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot 13DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17MAKE_JOBS_SAFE= no 
18 17
19WRKSRC= ${WRKDIR}/hbench-OS 18WRKSRC= ${WRKDIR}/hbench-OS
20OSVERSION_SPECIFIC= YES 19OSVERSION_SPECIFIC= YES
21BUILD_TARGET= build 20BUILD_TARGET= build
22USE_TOOLS+= perl:run 21USE_TOOLS+= perl:run
23OVERRIDE_GNU_CONFIG_SCRIPTS= yes 22OVERRIDE_GNU_CONFIG_SCRIPTS= yes
24 23
25DIST_SUBDIR= ${PKGNAME_NOREV} 24DIST_SUBDIR= ${PKGNAME_NOREV}
26 25
27GET_ARCH_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/-.*-.*$$//' 26GET_ARCH_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/-.*-.*$$//'
28GET_OS_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/^.*-.*-//' 27GET_OS_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/^.*-.*-//'
29PLIST_SUBST+= PLATFORM=${GET_OS_CMD:sh:Q}-${GET_ARCH_CMD:sh:Q} 28PLIST_SUBST+= PLATFORM=${GET_OS_CMD:sh:Q}-${GET_ARCH_CMD:sh:Q}
30 29
cvs diff -r1.13 -r1.14 pkgsrc/benchmarks/hbench/distinfo (expand / switch to unified diff)

--- pkgsrc/benchmarks/hbench/distinfo 2009/07/08 14:19:46 1.13
+++ pkgsrc/benchmarks/hbench/distinfo 2011/05/28 23:02:33 1.14
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.13 2009/07/08 14:19:46 joerg Exp $ 1$NetBSD: distinfo,v 1.14 2011/05/28 23:02:33 dholland Exp $
2 2
3SHA1 (hbench-1.0/hbench-OS-1.0.tar.gz) = b1a72287e2d04561141f296ba04d142f60152fe0 3SHA1 (hbench-1.0/hbench-OS-1.0.tar.gz) = b1a72287e2d04561141f296ba04d142f60152fe0
4RMD160 (hbench-1.0/hbench-OS-1.0.tar.gz) = 2e2702c035689e1dec39328e47dc9dc9ff558103 4RMD160 (hbench-1.0/hbench-OS-1.0.tar.gz) = 2e2702c035689e1dec39328e47dc9dc9ff558103
5Size (hbench-1.0/hbench-OS-1.0.tar.gz) = 206216 bytes 5Size (hbench-1.0/hbench-OS-1.0.tar.gz) = 206216 bytes
6SHA1 (patch-aa) = f08f8feefec200af85895384dc0b436580dffa9f 6SHA1 (patch-aa) = f08f8feefec200af85895384dc0b436580dffa9f
7SHA1 (patch-ab) = ce446b5836aadc690c127ab41d52dee27fdb987c 7SHA1 (patch-ab) = ce446b5836aadc690c127ab41d52dee27fdb987c
8SHA1 (patch-ac) = f6f570b66b5e32e8da14aec1b7afb8edc9088842 8SHA1 (patch-ac) = f6f570b66b5e32e8da14aec1b7afb8edc9088842
9SHA1 (patch-ad) = f591b706c15daf4375896a4e47f005e422857a94 9SHA1 (patch-ad) = f591b706c15daf4375896a4e47f005e422857a94
10SHA1 (patch-ae) = faa6e73c7fffa23ab6ee8632b972ccaeef26d42c 10SHA1 (patch-ae) = faa6e73c7fffa23ab6ee8632b972ccaeef26d42c
11SHA1 (patch-af) = 8c0562be1732807ea6fbce48fc51c83be1b3888a 11SHA1 (patch-af) = 8c0562be1732807ea6fbce48fc51c83be1b3888a
12SHA1 (patch-ag) = 037db0b965aad72ad8a1b93f9cf4b4af9f446fdf 12SHA1 (patch-ag) = 037db0b965aad72ad8a1b93f9cf4b4af9f446fdf
13SHA1 (patch-ah) = 6c01c679b394985d0570df4fe29c09642cbde6c3 13SHA1 (patch-ah) = 6c01c679b394985d0570df4fe29c09642cbde6c3
14SHA1 (patch-ai) = d59d05c9d73aa4c06f5ac5153a069694a4267fd1 14SHA1 (patch-ai) = d59d05c9d73aa4c06f5ac5153a069694a4267fd1
15SHA1 (patch-aj) = 7bca0c1062626b5c03f04b7bce17f7c2d8c14231 15SHA1 (patch-aj) = 7bca0c1062626b5c03f04b7bce17f7c2d8c14231
16SHA1 (patch-al) = 53ac43ab3287f4ae7dc246aa9b047923e8acd8b6 16SHA1 (patch-al) = 53ac43ab3287f4ae7dc246aa9b047923e8acd8b6
17SHA1 (patch-am) = 1d58355f664879ccd8880a63f574388fb61c0780 17SHA1 (patch-am) = 1d58355f664879ccd8880a63f574388fb61c0780
18SHA1 (patch-an) = 4cb762c246cdde99a219b8a4de2d354f2b6abb85 18SHA1 (patch-an) = 4cb762c246cdde99a219b8a4de2d354f2b6abb85
19SHA1 (patch-ao) = 69c92f83d10f061f8f0aa05da860cfc5cf764859 19SHA1 (patch-ao) = 69c92f83d10f061f8f0aa05da860cfc5cf764859
20SHA1 (patch-ap) = 057465b9f89e76367781401d91b333679a651cb4 20SHA1 (patch-ap) = 057465b9f89e76367781401d91b333679a651cb4
21SHA1 (patch-aq) = ecab68eae37cba0109225b82c4b18b48cd9f6498 21SHA1 (patch-aq) = 464f523a64af1c7d4ca61aa21c0c635e725ece43
22SHA1 (patch-ar) = 26c8cb68f6d5c8b878e5f600eba579e9cd2fce30 22SHA1 (patch-ar) = 26c8cb68f6d5c8b878e5f600eba579e9cd2fce30
23SHA1 (patch-as) = 5e6668a93610db020a4de0e46620b37f24e53309 23SHA1 (patch-as) = 5e6668a93610db020a4de0e46620b37f24e53309
cvs diff -r1.2 -r1.3 pkgsrc/benchmarks/hbench/patches/patch-aq (expand / switch to unified diff)

--- pkgsrc/benchmarks/hbench/patches/patch-aq 2006/01/23 18:07:51 1.2
+++ pkgsrc/benchmarks/hbench/patches/patch-aq 2011/05/28 23:02:33 1.3
@@ -1,13 +1,25 @@ @@ -1,13 +1,25 @@
1$NetBSD: patch-aq,v 1.2 2006/01/23 18:07:51 joerg Exp $ 1$NetBSD: patch-aq,v 1.3 2011/05/28 23:02:33 dholland Exp $
 2
 3- handle dragonfly
 4- fix parallel build
2 5
3--- src/Makefile.orig 1997-06-27 14:50:31.000000000 +0000 6--- src/Makefile.orig 1997-06-27 14:50:31.000000000 +0000
4+++ src/Makefile 7+++ src/Makefile
5@@ -89,7 +89,7 @@ COMPILE=$(CC) $(CFLAGS) $(CPPFLAGS) $(LD 8@@ -89,7 +89,7 @@ COMPILE=$(CC) $(CFLAGS) $(CPPFLAGS) $(LD
6 ##################################### 9 #####################################
7  10
8 # The following don't need special handling. 11 # The following don't need special handling.
9-freebsd netbsd openbsd sunos linux: 12-freebsd netbsd openbsd sunos linux:
10+dragonfly freebsd netbsd netbsdelf openbsd sunos linux: 13+dragonfly freebsd netbsd netbsdelf openbsd sunos linux:
11 @$(MAKE) binaries 14 @$(MAKE) binaries
12  15
13 bsdi: 16 bsdi:
 17@@ -145,7 +145,7 @@ EXES= $(BINDIR)/bw_bzero $(BINDIR)/bw_fi
 18 $(BINDIR)/mhz $(BINDIR)/mhz-counter
 19 # $(BINDIR)/lmdd $(BINDIR)/lat_pagefault
 20
 21-binaries: setupdirs $(EXES)
 22+binaries: setupdirs .WAIT $(EXES)
 23
 24 clean:
 25 @echo rm -rf ../bin/$(OS)-$(ARCH)*