Mechanical changes to add full DESTDIR support to packages that install

their files via a custom do-install target.

21 files changed, 112 insertions, 79 deletions

diff --git a/benchmarks/benchfft/Makefile b/benchmarks/benchfft/Makefile
index fda5806e34b..d22e069778d 100644
--- a/benchmarks/benchfft/Makefile
+++ b/benchmarks/benchfft/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2008/01/19 09:16:17 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2008/03/03 00:51:43 jlam Exp $
 
 DISTNAME=		benchfft-2.0
-PKGREVISION=	2
+PKGREVISION=		2
 CATEGORIES=		benchmarks math
 MASTER_SITES=		ftp://ftp.fftw.org/pub/fftw/ \
 			ftp://ftp.fftw.org/pub/fftw/old/benchfft/
@@ -12,6 +12,7 @@ HOMEPAGE=		http://www.fftw.org/benchfft/
 COMMENT=		Benchmark your machine with a number of FFT algorithms
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
@@ -28,8 +29,10 @@ INSTALLATION_DIRS=	bin
 CONFIGURE_DIRS=		${WRKDIR}/fftw-2.0.1 ${WRKSRC}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bench ${PREFIX}/bin/bench-fft
-	${INSTALL_SCRIPT} ${WRKSRC}/submit-script ${PREFIX}/bin/run-fftbench
+	${INSTALL_PROGRAM} ${WRKSRC}/bench \
+		${DESTDIR}${PREFIX}/bin/bench-fft
+	${INSTALL_SCRIPT} ${WRKSRC}/submit-script \
+		${DESTDIR}${PREFIX}/bin/run-fftbench
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index 61912a9102c..327c780ba73 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/01/19 09:16:17 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=		unixbench-4.1.0
 PKGNAME=		${DISTNAME:S/unix/byte/}
@@ -11,7 +11,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		BYTE Magazine's Public Domain benchmark for UNIX
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 BENCHMARK_ENV+=		BINDIR=${WRKSRC}/pgms
 BENCHMARK_ENV+=		SCRPDIR=${WRKSRC}/pgms
@@ -37,13 +37,13 @@ pre-install:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/libexec/bytebench
-	${INSTALL_SCRIPT} ${WRKSRC}/pgms/* ${PREFIX}/libexec/bytebench
-	${INSTALL_DATA_DIR} ${PREFIX}/share/bytebench
-	${INSTALL_DATA} ${WRKSRC}/testdir/* ${PREFIX}/share/bytebench
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bytebench
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bytebench
-	${INSTALL_SCRIPT} ${WRKSRC}/run-byte ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/libexec/bytebench
+	${INSTALL_SCRIPT} ${WRKSRC}/pgms/* ${DESTDIR}${PREFIX}/libexec/bytebench
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/bytebench
+	${INSTALL_DATA} ${WRKSRC}/testdir/* ${DESTDIR}${PREFIX}/share/bytebench
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/bytebench
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/bytebench
+	${INSTALL_SCRIPT} ${WRKSRC}/run-byte ${DESTDIR}${PREFIX}/bin
 
 benchmark:
 	@if [ `${ID} -u` != 0 ]; then					\
diff --git a/benchmarks/dhrystone/Makefile b/benchmarks/dhrystone/Makefile
index 65c471638e9..5727615847c 100644
--- a/benchmarks/dhrystone/Makefile
+++ b/benchmarks/dhrystone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/19 09:16:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=		dhry2.1
 PKGNAME=		dhrystone-2.1
@@ -10,17 +10,20 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Reinhold Weicker's DHRYSTONE 2.1 integer benchmark
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dry2 ${PREFIX}/bin/dry2
-	${INSTALL_PROGRAM} ${WRKSRC}/dry2reg ${PREFIX}/bin/dry2reg
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dhrystone
-	${INSTALL_DATA} ${WRKSRC}/clarify.doc ${PREFIX}/share/doc/dhrystone
-	${INSTALL_DATA} ${WRKSRC}/Rationale ${PREFIX}/share/doc/dhrystone
+	${INSTALL_PROGRAM} ${WRKSRC}/dry2 ${DESTDIR}${PREFIX}/bin/dry2
+	${INSTALL_PROGRAM} ${WRKSRC}/dry2reg ${DESTDIR}${PREFIX}/bin/dry2reg
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/dhrystone
+	${INSTALL_DATA} ${WRKSRC}/clarify.doc \
+		${DESTDIR}${PREFIX}/share/doc/dhrystone
+	${INSTALL_DATA} ${WRKSRC}/Rationale \
+		${DESTDIR}${PREFIX}/share/doc/dhrystone
 
 benchmark:
 	-@${ECHO} 5000000 | ${WRKSRC}/dry2 | tee ${WRKSRC}/dry.out
diff --git a/benchmarks/fib/Makefile b/benchmarks/fib/Makefile
index 6ccd30d4962..dcbb6f2bd68 100644
--- a/benchmarks/fib/Makefile
+++ b/benchmarks/fib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/19 09:16:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=		fib.c
 PKGNAME=		fib-980203
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Mathematical benchmark
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
 
@@ -23,7 +24,7 @@ do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -DUNIX -o fib fib.c -lm)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fib ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/fib ${DESTDIR}${PREFIX}/bin
 
 benchmark:
 	-@${WRKSRC}/fib | tee ${WRKSRC}/fib.out
diff --git a/benchmarks/flops/Makefile b/benchmarks/flops/Makefile
index ddd8a60c1f6..0d4011afbd5 100644
--- a/benchmarks/flops/Makefile
+++ b/benchmarks/flops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/19 09:16:18 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=		flops
 PKGNAME=		flops-2.0
@@ -11,6 +11,7 @@ HOMEPAGE=		http://performance.netlib.org/performance/html/flops.html
 COMMENT=		Floating point benchmark to give your MFLOPS rating
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
 
@@ -25,9 +26,9 @@ do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -DUNIX -o flops flops.c -lm)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/flops ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/flops
-	${INSTALL_DATA} ${WRKSRC}/flops.doc ${PREFIX}/share/doc/flops
+	${INSTALL_PROGRAM} ${WRKSRC}/flops ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/flops
+	${INSTALL_DATA} ${WRKSRC}/flops.doc ${DESTDIR}${PREFIX}/share/doc/flops
 
 benchmark:
 	-@${WRKSRC}/flops | tee ${WRKSRC}/flops.out
diff --git a/benchmarks/forkbomb/Makefile b/benchmarks/forkbomb/Makefile
index 90f454cd61c..20cb8153948 100644
--- a/benchmarks/forkbomb/Makefile
+++ b/benchmarks/forkbomb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/04 21:29:01 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/03 00:51:44 jlam Exp $
 #
 
 DISTNAME=	forkbomb-1.4
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://home.tiscali.cz:8080/~cz210552/forkbomb.html
 COMMENT=	Classic Unix fork() bomber
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS+=	bin man/man8
 
 do-build:
@@ -16,8 +18,8 @@ do-build:
 		${WRKSRC}/forkbomb
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/forkbomb ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/forkbomb.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/forkbomb ${DESTDIR}${PREFIX}/bin
+	1${INSTALL_MAN} ${WRKSRC}/forkbomb.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/heapsort/Makefile b/benchmarks/heapsort/Makefile
index 8c12cd5cd7e..ad92785d598 100644
--- a/benchmarks/heapsort/Makefile
+++ b/benchmarks/heapsort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/01/19 09:16:18 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=		heapsort.c
 PKGNAME=		heapsort-1.0
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Benchmark program for variable sized arrays
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
 
@@ -23,7 +24,7 @@ do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -DUNIX -o heapsort heapsort.c -lm)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/heapsort ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/heapsort ${DESTDIR}${PREFIX}/bin
 
 benchmark:
 	-@${WRKSRC}/heapsort | tee ${WRKSRC}/heapsort.out
diff --git a/benchmarks/hint/Makefile b/benchmarks/hint/Makefile
index 5e57d1d6156..d3cf4c1794c 100644
--- a/benchmarks/hint/Makefile
+++ b/benchmarks/hint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/01/07 09:13:47 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=	hint_unix_serial
 PKGNAME=	hint.serial-98.06.12
@@ -11,6 +11,7 @@ HOMEPAGE=	http://hint.byu.edu/
 COMMENT=	Scalable benchmark for testing CPU and memory performance
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_TARGET=	DOUBLE INT
 
@@ -22,9 +23,9 @@ post-extract:
 	${CP} ${FILESDIR}/hint.1 ${WRKSRC}/hint.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/DOUBLE ${PREFIX}/bin/hint-double
-	${INSTALL_PROGRAM} ${WRKSRC}/INT ${PREFIX}/bin/hint-int
-	${INSTALL_MAN} ${WRKSRC}/hint.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/DOUBLE ${DESTDIR}${PREFIX}/bin/hint-double
+	${INSTALL_PROGRAM} ${WRKSRC}/INT ${DESTDIR}${PREFIX}/bin/hint-int
+	${INSTALL_MAN} ${WRKSRC}/hint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 benchmark:
 	cd ${WRKSRC} ; ${MKDIR} data ; ./DOUBLE | tee hint.out
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 9df27742f79..21dbe0fbee1 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2008/01/19 09:16:18 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=	iozone3_263
 PKGNAME=	iozone-3.263
@@ -16,6 +16,7 @@ LICENSE=	iozone-license
 NOT_FOR_PLATFORM=	Interix-*-* # has only 32-bit off_t
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src/current
 MAKE_FILE=		makefile
@@ -42,11 +43,12 @@ BUILD_TARGET=		generic
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/iozone ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/IOzone
+	${INSTALL_PROGRAM} ${WRKSRC}/iozone ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/IOzone
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/Iozone_ps.gz \
-		${PREFIX}/share/doc/IOzone
+		${DESTDIR}${PREFIX}/share/doc/IOzone
 
 benchmark:
 	cd ${WRKSRC}; ./iozone -Ea | ${TEE} iozone.out
diff --git a/benchmarks/linpack-bench/Makefile b/benchmarks/linpack-bench/Makefile
index f9abc18cbe8..9dab163ee3e 100644
--- a/benchmarks/linpack-bench/Makefile
+++ b/benchmarks/linpack-bench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/01/19 09:16:18 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=		linpackc
 PKGNAME=		linpack-bench-940225
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Collection of benchmarks for floating point
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
 
@@ -24,8 +25,8 @@ do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -DROLL -DSP -o linpacks linpack.c -lm)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/linpackd ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/linpacks ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/linpackd ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/linpacks ${DESTDIR}${PREFIX}/bin
 
 benchmark:
 	-@${WRKSRC}/linpacks | tee ${WRKSRC}/linpacks.out
diff --git a/benchmarks/nbench/Makefile b/benchmarks/nbench/Makefile
index a16cfaf2270..8e6d2203f82 100644
--- a/benchmarks/nbench/Makefile
+++ b/benchmarks/nbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:29:01 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/03 00:51:44 jlam Exp $
 #
 
 DISTNAME=	nbench-byte-2.2.2
@@ -10,11 +10,13 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tux.org/~mayer/linux/
 COMMENT=	Benchmark tool for CPU, FPU and memory
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_TARGET=	default
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nbench ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/nbench ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index 9ded7b74e74..eb207c67dc6 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:48 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=	NetPIPE_2.4
 PKGNAME=	netpipe-2.4
@@ -10,6 +10,8 @@ HOMEPAGE=	http://www.scl.ameslab.gov/netpipe/
 COMMENT=	TCP/PVM/MPI testing and performance measuring tool
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/netpipe-2.4
 
 .include "../../mk/bsd.prefs.mk"
@@ -23,8 +25,9 @@ MAKE_ENV+=	EXTRA_LIBS="-lsocket -lnsl"
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	cd ${WRKSRC} ; \
-	${INSTALL_PROGRAM} NPtcp ${PREFIX}/bin/NPtcp ; \
-	${INSTALL_MAN} netpipe.1 ${PREFIX}/${PKGMANDIR}/man1/netpipe.1
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} NPtcp \
+		${DESTDIR}${PREFIX}/bin/NPtcp
+	cd ${WRKSRC} && ${INSTALL_MAN} netpipe.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/netpipe.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/nsieve/Makefile b/benchmarks/nsieve/Makefile
index cc0ef0fb630..5488d03b576 100644
--- a/benchmarks/nsieve/Makefile
+++ b/benchmarks/nsieve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/19 09:16:18 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=		nsieve.c
 PKGNAME=		nsieve-1.2b
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Sieve of Eratosthenes benchmark
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
 
@@ -23,7 +24,7 @@ do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -DUNIX -o nsieve nsieve.c -lm)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nsieve ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/nsieve ${DESTDIR}${PREFIX}/bin
 
 benchmark:
 	-@${WRKSRC}/nsieve | tee ${WRKSRC}/nsieve.out
diff --git a/benchmarks/nttcp/Makefile b/benchmarks/nttcp/Makefile
index 498165d3c36..6511b427812 100644
--- a/benchmarks/nttcp/Makefile
+++ b/benchmarks/nttcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:48 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=	nttcp-1.47
 PKGREVISION=	1
@@ -10,6 +10,7 @@ HOMEPAGE=	http://home.leo.org/~elmar/nttcp/
 COMMENT=	New TCP testing and performance measuring tool
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -20,8 +21,9 @@ MAKE_ENV+=	LIB="-lsocket -lnsl"
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	cd ${WRKSRC} ; \
-	${INSTALL_PROGRAM} nttcp ${PREFIX}/bin/nttcp ; \
-	${INSTALL_MAN} nttcp.1 ${PREFIX}/${PKGMANDIR}/man1/nttcp.1
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} nttcp \
+		${DESTDIR}${PREFIX}/bin/nttcp
+	cd ${WRKSRC} && ${INSTALL_MAN} nttcp.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nttcp.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/paranoia/Makefile b/benchmarks/paranoia/Makefile
index 68b6c892cb0..468b75d3ed7 100644
--- a/benchmarks/paranoia/Makefile
+++ b/benchmarks/paranoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/01/19 09:16:18 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=		paranoia
 PKGNAME=		paranoia-960101
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Highly paranoid test of IEEE 754 conformance
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
 
@@ -19,7 +20,7 @@ do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -ffloat-store -o paranoia paranoia.c -lm)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/paranoia ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/paranoia ${DESTDIR}${PREFIX}/bin
 
 benchmark:
 	@(cd ${WRKSRC}; ./paranoia < ${FILESDIR}/paranoia.run | tee paranoia.out)
diff --git a/benchmarks/pipebench/Makefile b/benchmarks/pipebench/Makefile
index 2e01ab6823e..d113a4a4c69 100644
--- a/benchmarks/pipebench/Makefile
+++ b/benchmarks/pipebench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/04 21:29:01 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/03 00:51:44 jlam Exp $
 #
 
 DISTNAME=	pipebench-0.40
@@ -9,9 +9,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.habets.pp.se/synscan/programs.php?prog=pipebench
 COMMENT=	Measures the speed of a pipe
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pipebench ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/pipebench ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/postmark/Makefile b/benchmarks/postmark/Makefile
index 2b17dc0a88c..727e1bfefed 100644
--- a/benchmarks/postmark/Makefile
+++ b/benchmarks/postmark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/01/19 09:16:19 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=	postmark-1_5.c
 PKGNAME=	postmark-1.5
@@ -13,6 +13,7 @@ COMMENT=	NetApps file system benchmark
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} postmark.c
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
@@ -23,7 +24,7 @@ do-build:
 	(cd ${WRKSRC} && ${CC} ${CFLAGS} -o postmark postmark.c)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/postmark ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/postmark ${DESTDIR}${PREFIX}/sbin
 
 benchmark:
 	@(cd ${WRKSRC}; (${ECHO} "set number 5000" ;\
diff --git a/benchmarks/randread/Makefile b/benchmarks/randread/Makefile
index bacb9716bac..da783cc87ee 100644
--- a/benchmarks/randread/Makefile
+++ b/benchmarks/randread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/10/31 17:33:42 tv Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 00:51:44 jlam Exp $
 #
 
 DISTNAME=	randread-0.1
@@ -12,6 +12,7 @@ COMMENT=	Program to help benchmark random disk read performance
 NOT_FOR_PLATFORM=	Interix-*-*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_TARGET=	randread
 WRKSRC=		${WRKDIR}
@@ -19,6 +20,6 @@ WRKSRC=		${WRKDIR}
 INSTALLATION_DIRS=	sbin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/randread ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/randread ${DESTDIR}${PREFIX}/sbin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/skampi/Makefile b/benchmarks/skampi/Makefile
index e0fe7be1864..975e3b7f265 100644
--- a/benchmarks/skampi/Makefile
+++ b/benchmarks/skampi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/08/10 03:21:39 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/03 00:51:44 jlam Exp $
 #
 
 DISTNAME=	skampi4
@@ -16,6 +16,8 @@ COMMENT=	MPI (Message Passing Interface) benchmarks
 DEPENDS+=	gnuplot>=3.7.1:../../graphics/gnuplot
 TEX_ACCEPTED=	teTeX3
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_TOOLS+=	perl:run
@@ -31,26 +33,26 @@ do-build:
 		${PREFIX}/bin/mpicc -o skosfile skosfile.c -lm)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/skosfile ${PREFIX}/bin/skosfile
+	${INSTALL_PROGRAM} ${WRKSRC}/skosfile ${DESTDIR}${PREFIX}/bin/skosfile
 	${INSTALL_SCRIPT} ${WRKSRC}/report_generator/dorep4.pl 	\
-		${PREFIX}/bin/dorep4.pl
-	${INSTALL_DATA_DIR} ${PREFIX}/share/skampi/dri
+		${DESTDIR}${PREFIX}/bin/dorep4.pl
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/skampi/dri
 	(cd ${WRKSRC}/report_generator/dri && 			\
-		${PAX} -rw . ${PREFIX}/share/skampi/dri)
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/skampi
+		${PAX} -rw . ${DESTDIR}${PREFIX}/share/skampi/dri)
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/skampi
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}_userman.ps 	\
-		${PREFIX}/share/doc/skampi/
+		${DESTDIR}${PREFIX}/share/doc/skampi/
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/skampili.ps 	\
-		${PREFIX}/share/doc/skampi/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/skampi
+		${DESTDIR}${PREFIX}/share/doc/skampi/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/skampi
 	${INSTALL_DATA} ${WRKSRC}/.skampi 			\
-		${PREFIX}/share/examples/skampi/dot.skampi
+		${DESTDIR}${PREFIX}/share/examples/skampi/dot.skampi
 	${INSTALL_DATA} ${WRKSRC}/.skampi-all-collectives 	\
-		${PREFIX}/share/examples/skampi/dot.skampi-all-collectives
+		${DESTDIR}${PREFIX}/share/examples/skampi/dot.skampi-all-collectives
 	${INSTALL_DATA} ${WRKSRC}/.skampi-dt-long 		\
-		${PREFIX}/share/examples/skampi/dot.skampi-dt-long
+		${DESTDIR}${PREFIX}/share/examples/skampi/dot.skampi-dt-long
 	${INSTALL_DATA} ${WRKSRC}/.skampi-dt-short 		\
-		${PREFIX}/share/examples/skampi/dot.skampi-dt-short
+		${DESTDIR}${PREFIX}/share/examples/skampi/dot.skampi-dt-short
 
 .include "../../parallel/mpi-ch/buildlink3.mk"
 .include "../../mk/tex.buildlink3.mk"
diff --git a/benchmarks/whetstone/Makefile b/benchmarks/whetstone/Makefile
index 0833e9c1262..d5356ef1f8d 100644
--- a/benchmarks/whetstone/Makefile
+++ b/benchmarks/whetstone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/01/19 09:16:19 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=		whetstone
 PKGNAME=		whetstone-1.2
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Benchmark for processors that gives you a MIPS rating
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
 
@@ -19,7 +20,7 @@ do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -o whetstone whetstone.c -lm)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/whetstone ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/whetstone ${DESTDIR}${PREFIX}/bin
 
 benchmark:
 	@${WRKSRC}/whetstone 80000 | tee ${WRKSRC}/whetstone.out
diff --git a/benchmarks/zelibm/Makefile b/benchmarks/zelibm/Makefile
index 84b3a2b69af..e0ebc65960f 100644
--- a/benchmarks/zelibm/Makefile
+++ b/benchmarks/zelibm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/26 21:56:40 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/03 00:51:44 jlam Exp $
 #
 
 DISTNAME=		zelibm
@@ -11,10 +11,12 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://people.redhat.com/drepper/libm/
 COMMENT=		Visual Math Library Quality Check
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/libmtest ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/libmtest ${DESTDIR}${PREFIX}/bin
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"