user-destdir support

4 files changed, 28 insertions, 4 deletions

diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index 8cb0cc68151..96f608c9052 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/01/14 12:20:57 sketch Exp $
+# $NetBSD: Makefile,v 1.42 2009/07/08 14:19:46 joerg Exp $
 
 DISTNAME=		hbench-OS-1.0
 PKGNAME=		hbench-1.0
@@ -13,6 +13,7 @@ COMMENT=		Suite of portable benchmarks to measure the OS and the hardware
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/hbench-OS
 OSVERSION_SPECIFIC=	YES
@@ -43,9 +44,12 @@ SUBST_FILES.hb+=	Results/Makefile
 SUBST_SED.hb=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.hb+=		-e 's,/bin/hbench,/libexec/hbench,g'
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${SETENV} ${MAKE_ENV} WRKSRC=${WRKSRC} BINOWN=${BINOWN} \
-		BINGRP=${BINGRP} ${WRKSRC}/do-install
+		REAL_PREFIX=${PREFIX} BINGRP=${BINGRP} \
+		PREFIX=${DESTDIR}${PREFIX} ${WRKSRC}/do-install
 
 benchmark:
 	@if [ `id -u` != 0 ]; then ${ECHO} "This benchmark must be run as root!" ; exit 1 ; fi
diff --git a/benchmarks/hbench/distinfo b/benchmarks/hbench/distinfo
index 3479f01a3e1..e01f1810ed7 100644
--- a/benchmarks/hbench/distinfo
+++ b/benchmarks/hbench/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2008/04/05 14:09:18 chris Exp $
+$NetBSD: distinfo,v 1.13 2009/07/08 14:19:46 joerg Exp $
 
 SHA1 (hbench-1.0/hbench-OS-1.0.tar.gz) = b1a72287e2d04561141f296ba04d142f60152fe0
 RMD160 (hbench-1.0/hbench-OS-1.0.tar.gz) = 2e2702c035689e1dec39328e47dc9dc9ff558103
@@ -20,3 +20,4 @@ SHA1 (patch-ao) = 69c92f83d10f061f8f0aa05da860cfc5cf764859
 SHA1 (patch-ap) = 057465b9f89e76367781401d91b333679a651cb4
 SHA1 (patch-aq) = ecab68eae37cba0109225b82c4b18b48cd9f6498
 SHA1 (patch-ar) = 26c8cb68f6d5c8b878e5f600eba579e9cd2fce30
+SHA1 (patch-as) = 5e6668a93610db020a4de0e46620b37f24e53309
diff --git a/benchmarks/hbench/patches/patch-as b/benchmarks/hbench/patches/patch-as
new file mode 100644
index 00000000000..90db7933dcf
--- /dev/null
+++ b/benchmarks/hbench/patches/patch-as
@@ -0,0 +1,15 @@
+$NetBSD: patch-as,v 1.1 2009/07/08 14:19:46 joerg Exp $
+
+--- do-install.orig	2009-07-08 16:18:25.000000000 +0200
++++ do-install
+@@ -27,8 +27,8 @@ for files in $DOCS; do
+ done
+ cat <<EOF >$PREFIX/bin/run-hbench
+ #!/bin/sh
+-${PREFIX}/bin/hbench/interactive-setup
+-${PREFIX}/bin/hbench/maindriver ${PREFIX}/share/hbench/conf/`hostname`.run
++${REAL_PREFIX}/bin/hbench/interactive-setup
++${REAL_PREFIX}/bin/hbench/maindriver ${REAL_PREFIX}/share/hbench/conf/`hostname`.run
+ EOF
+ chown $BINOWN:$BINGRP ${PREFIX}/bin/run-hbench
+ chmod 0755 ${PREFIX}/bin/run-hbench
diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index 44fd80affec..2f04f762534 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/11/10 00:46:57 ahoka Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/08 14:22:52 joerg Exp $
 
 DISTNAME=	httperf-0.8
 CATEGORIES=	benchmarks www
@@ -10,12 +10,16 @@ HOMEPAGE=	http://www.hpl.hp.com/research/linux/httperf/
 COMMENT=	Popular web server benchmarking program
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 MAKE_JOBS_SAFE=		no
 USE_TOOLS+=		gmake
 CFLAGS+=		-DFD_SETSIZE=16424
 
+INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} \
+			bindir=${DESTDIR}${PREFIX}/bin
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"