Mechanical changes to add DESTDIR support to packages that install

their files via a custom do-install target.

40 files changed, 386 insertions, 263 deletions

diff --git a/lang/Cg-compiler/Makefile b/lang/Cg-compiler/Makefile
index 8ae6c37198f..b218667e8aa 100644
--- a/lang/Cg-compiler/Makefile
+++ b/lang/Cg-compiler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/08/23 18:20:31 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 16:38:11 jlam Exp $
 #
 
 DISTNAME=	CgLinux-1.3.0408-0400
@@ -15,6 +15,8 @@ EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	base
 EMUL_REQD=		suse>=7.3
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 BUILD_DIRS=		# empty
 RUN_LDCONFIG=		yes
@@ -22,15 +24,19 @@ RUN_LDCONFIG=		yes
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man3 share
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/include/Cg
-	${INSTALL_DATA_DIR} ${PREFIX}/include/CgFX
-	${INSTALL_DATA_DIR} ${PREFIX}/share/NVIDIA-Cg-linux
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/NVIDIA-Cg-linux
-	${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/cgc ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/usr/include/Cg/* ${PREFIX}/include/Cg
-	${INSTALL_DATA} ${WRKSRC}/usr/include/CgFX/* ${PREFIX}/include/CgFX
-	${INSTALL_DATA} ${WRKSRC}/usr/lib/* ${EMULDIR}/lib
-	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man3/* ${PREFIX}/${PKGMANDIR}/man3
-	cd ${WRKSRC}/usr/local && ${PAX} -rwppm . ${PREFIX}/share/NVIDIA-Cg-linux
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/Cg
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/CgFX
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/NVIDIA-Cg-linux
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/NVIDIA-Cg-linux
+	${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/cgc ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/usr/include/Cg/* \
+		${DESTDIR}${PREFIX}/include/Cg
+	${INSTALL_DATA} ${WRKSRC}/usr/include/CgFX/* \
+		${DESTDIR}${PREFIX}/include/CgFX
+	${INSTALL_DATA} ${WRKSRC}/usr/lib/* ${DESTDIR}${EMULDIR}/lib
+	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man3/* \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+	cd ${WRKSRC}/usr/local && ${PAX} -rwppm . \
+		${DESTDIR}${PREFIX}/share/NVIDIA-Cg-linux
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/SmartEiffel/Makefile b/lang/SmartEiffel/Makefile
index 651f511c5d3..84802184676 100644
--- a/lang/SmartEiffel/Makefile
+++ b/lang/SmartEiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:24 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/04 16:38:11 jlam Exp $
 
 DISTNAME=	se
 PKGNAME=	SmartEiffel-2.0
@@ -10,6 +10,8 @@ MAINTAINER=	lars.nordlund@hem.utfors.se
 HOMEPAGE=	http://smarteiffel.loria.fr/
 COMMENT=	The GNU Eiffel Compiler
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/SmartEiffel
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
@@ -31,6 +33,6 @@ post-build:
 	${RM} -f ${WRKSRC}/sys/system.se~
 
 do-install:
-	${CP} -r ${WRKSRC} ${PREFIX}
+	${CP} -r ${WRKSRC} ${DESTDIR}${PREFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/a60/Makefile b/lang/a60/Makefile
index e37bce177c2..7b0fe7d0265 100644
--- a/lang/a60/Makefile
+++ b/lang/a60/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 16:38:11 jlam Exp $
 
 DISTNAME=	a60-0.20a
 CATEGORIES=	lang
@@ -7,6 +7,8 @@ MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/algol60/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Algol 60 interpreter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-Dunix
@@ -16,23 +18,26 @@ INFO_FILES=	# PLIST
 INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/a60 ${PREFIX}/bin/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/a60/
-	${INSTALL_DATA} ${WRKSRC}/a60-mkc.inc ${PREFIX}/share/a60/
+	${INSTALL_PROGRAM} ${WRKSRC}/a60 ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/a60/
+	${INSTALL_DATA} ${WRKSRC}/a60-mkc.inc				\
+		${DESTDIR}${PREFIX}/share/a60/
 	cd ${WRKSRC}; for f in						\
 		RRA60.info RRA60.info-[0-9]*				\
 		a60.info a60.info-[0-9]*;				\
 	do								\
 		${TEST} ! -f "$$f" ||					\
-		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+		${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\
 	done
-	${INSTALL_MAN} ${WRKSRC}/a60.man ${PREFIX}/${PKGMANDIR}/man1/a60.1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/a60/
+	${INSTALL_MAN} ${WRKSRC}/a60.man				\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/a60.1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/a60/
 	cd ${WRKSRC}/examples && ${INSTALL_DATA} *.a60 README		\
-		${PREFIX}/share/examples/a60/
-	${INSTALL_DATA} ${WRKSRC}/xa60.* ${PREFIX}/share/examples/a60/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/a60/
+		${DESTDIR}${PREFIX}/share/examples/a60/
+	${INSTALL_DATA} ${WRKSRC}/xa60.*				\
+		${DESTDIR}${PREFIX}/share/examples/a60/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/a60/
 	cd ${WRKSRC} && ${INSTALL_DATA} a60.ps RRA60.ps			\
-		${PREFIX}/share/doc/a60/
+		${DESTDIR}${PREFIX}/share/doc/a60/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/baci/Makefile b/lang/baci/Makefile
index 74bed46f4ef..704554aed5f 100644
--- a/lang/baci/Makefile
+++ b/lang/baci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:37 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 16:38:11 jlam Exp $
 #
 
 DISTNAME=	bacisrc
@@ -14,25 +14,24 @@ COMMENT=	Ben-Ari Concurrent Interpreter
 
 DEPENDS+=	bison-[0-9]*:../../devel/bison
 
-USE_TOOLS+=	flex
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-PLIST_SRC=	${WRKDIR}/PLIST
+USE_TOOLS+=	flex
 
 INSTALLATION_DIRS=	bin
 
 do-build:
-		cd ${WRKSRC}/ccomp && ${MAKE}
-		cd ${WRKSRC}/disasm && ${MAKE}
-		cd ${WRKSRC}/interp && ${MAKE}
-		cd ${WRKSRC}/pascomp && ${MAKE}
+	cd ${WRKSRC}/ccomp && ${MAKE}
+	cd ${WRKSRC}/disasm && ${MAKE}
+	cd ${WRKSRC}/interp && ${MAKE}
+	cd ${WRKSRC}/pascomp && ${MAKE}
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/ccomp/bacc ${PREFIX}/bin
-		${INSTALL_PROGRAM} ${WRKSRC}/disasm/badis ${PREFIX}/bin
-		${INSTALL_PROGRAM} ${WRKSRC}/interp/bainterp ${PREFIX}/bin
-		${INSTALL_PROGRAM} ${WRKSRC}/pascomp/bapas ${PREFIX}/bin
-		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/baci
-		${INSTALL_DATA} ${WRKDIR}/bacidoc/* ${PREFIX}/share/doc/baci
-		${CP} ${PKGDIR}/PLIST ${WRKDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/ccomp/bacc ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/disasm/badis ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/interp/bainterp ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/pascomp/bapas ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/baci
+	${INSTALL_DATA} ${WRKDIR}/bacidoc/* ${DESTDIR}${PREFIX}/share/doc/baci
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common
index 96da2576caf..8ae7d62f9ec 100644
--- a/lang/blackdown-jre13/Makefile.common
+++ b/lang/blackdown-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2008/01/19 09:32:52 he Exp $
+# $NetBSD: Makefile.common,v 1.31 2008/03/04 16:38:11 jlam Exp $
 #
 
 RELVERSION=	1.3.1
@@ -18,6 +18,8 @@ EMUL_PLATFORMS+=	linux-i386 linux-powerpc linux-sparc
 EMUL_MODULES.linux+=	base
 EMUL_REQD=		suse>=7.3
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 BLACKDOWN_ARCH.${EMUL_ARCH}=	${EMUL_ARCH}
@@ -54,5 +56,5 @@ post-build:
 	${FIND} ${WRKSRC} -name '*.1.gz' -print | ${XARGS} ${GUNZIP_CMD}
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${JVM_HOME}
-	cd ${WRKSRC} && ${PAX} -rw . ${JVM_HOME}
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${JVM_HOME}
+	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${JVM_HOME}
diff --git a/lang/brandybasic/Makefile b/lang/brandybasic/Makefile
index a61f4e2fe42..639c108aab7 100644
--- a/lang/brandybasic/Makefile
+++ b/lang/brandybasic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/11/20 22:11:50 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 16:38:11 jlam Exp $
 #
 
 DISTNAME=	b116
@@ -15,6 +15,8 @@ COMMENT=	Brandy Basic V interpreter - Acorn ARM Computers BASIC dialect
 
 NOT_FOR_PLATFORM=	SunOS-*-* # needs porting
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/brandy-1.0.16
 DOCDIR=		${PREFIX}/share/doc/brandy
 EXAMPLEDIR=	${PREFIX}/share/examples/brandy
@@ -24,10 +26,12 @@ USE_TOOLS+=		gtar
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-	cd ${WRKSRC}/docs && ${GTAR} -cf - `ls |grep -v .orig` | (cd ${DOCDIR} && tar xf -)
-	cd ${WRKSRC}/examples && ${GTAR} -cf - [a-z]* | (cd ${EXAMPLEDIR} && tar xf -)
-	${INSTALL_PROGRAM} ${WRKSRC}/brandy ${PREFIX}/bin/brandy
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLEDIR}
+	cd ${WRKSRC}/docs && ${GTAR} -cf - `ls |grep -v .orig` | \
+		(cd ${DESTDIR}${DOCDIR} && tar xf -)
+	cd ${WRKSRC}/examples && ${GTAR} -cf - [a-z]* | \
+		(cd ${DESTDIR}${EXAMPLEDIR} && tar xf -)
+	${INSTALL_PROGRAM} ${WRKSRC}/brandy ${DESTDIR}${PREFIX}/bin/brandy
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ccsh/Makefile b/lang/ccsh/Makefile
index 36641e6ebb9..8a536adbb06 100644
--- a/lang/ccsh/Makefile
+++ b/lang/ccsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/04/22 09:22:10 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 16:38:11 jlam Exp $
 #
 
 DISTNAME=		ccsh-0.0.4
@@ -11,6 +11,7 @@ HOMEPAGE=		http://ccsh.sourceforge.net/
 COMMENT=		C-like syntax scripting
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake
 
@@ -23,6 +24,6 @@ SUBST_SED.options=	-e 's,^CFLAGS =,\#CFLAGS =,g'
 INSTALLATION_DIRS+=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ccsh ${PREFIX}/bin/ccsh
+	${INSTALL_PROGRAM} ${WRKSRC}/ccsh ${DESTDIR}${PREFIX}/bin/ccsh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index be04d6f46e2..1f1efda0bdb 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/11/09 11:12:06 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2008/03/04 16:38:11 jlam Exp $
 
 DISTNAME=		cint5.15
 PKGNAME=		cint-5.15.174
@@ -11,6 +11,8 @@ MAINTAINER=		drochner@NetBSD.org
 HOMEPAGE=		http://root.cern.ch/root/Cint.html
 COMMENT=		C/C++ interpreter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 #same distribution file name for minor versions
 DIST_SUBDIR=		${PKGNAME_NOREV}
 WRKSRC=			${WRKDIR}
@@ -44,37 +46,56 @@ do-build:
 	esac
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/cint
-	${INSTALL_PROGRAM} ${WRKDIR}/cint ${PREFIX}/cint
-	${INSTALL_PROGRAM} ${WRKDIR}/makecint ${PREFIX}/cint
-	${SED} "s;XXXPREFIXXXX;${PREFIX};g" <${FILESDIR}/cint.sh >${PREFIX}/bin/cint
-	${CHMOD} +x ${PREFIX}/bin/cint
-	rm -f ${PREFIX}/bin/makecint
-	${LN} ${PREFIX}/bin/cint ${PREFIX}/bin/makecint
-	${INSTALL_DATA} ${WRKDIR}/MAKEINFO ${PREFIX}/cint
-	${CP} -r ${WRKDIR}/include ${WRKDIR}/stl ${PREFIX}/cint
-	${RM} ${PREFIX}/cint/include/Makeit ${PREFIX}/cint/include/make*
-	${INSTALL_DATA_DIR} ${PREFIX}/cint/lib
-	${CP} -r ${WRKDIR}/lib/prec_stl ${PREFIX}/cint/lib
-	${INSTALL_DATA} ${WRKDIR}/G__ci.h ${PREFIX}/cint
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cint
-	${INSTALL_DATA} ${WRKSRC}/doc/bytecode.txt ${PREFIX}/share/doc/cint
-	${INSTALL_DATA} ${WRKSRC}/doc/cint.txt ${PREFIX}/share/doc/cint
-	${INSTALL_DATA} ${WRKSRC}/doc/cintapi.txt ${PREFIX}/share/doc/cint
-	${INSTALL_DATA} ${WRKSRC}/doc/extlib.txt ${PREFIX}/share/doc/cint
-	${INSTALL_DATA} ${WRKSRC}/doc/ifdef.txt ${PREFIX}/share/doc/cint
-	${INSTALL_DATA} ${WRKSRC}/doc/limitati.txt ${PREFIX}/share/doc/cint
-	${INSTALL_DATA} ${WRKSRC}/doc/limitnum.txt ${PREFIX}/share/doc/cint
-	${INSTALL_DATA} ${WRKSRC}/doc/makecint.txt ${PREFIX}/share/doc/cint
-	${INSTALL_DATA} ${WRKSRC}/doc/message.txt ${PREFIX}/share/doc/cint
-	${INSTALL_DATA} ${WRKSRC}/doc/ref.txt ${PREFIX}/share/doc/cint
-	${INSTALL_MAN} ${WRKSRC}/doc/man1/cint.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man1/makecint.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man2/garbage.2 ${PREFIX}/${PKGMANDIR}/man2
-	${INSTALL_MAN} ${WRKSRC}/doc/man2/security.2 ${PREFIX}/${PKGMANDIR}/man2
-	${INSTALL_MAN} ${WRKSRC}/doc/man2/unique.2 ${PREFIX}/${PKGMANDIR}/man2
-	${INSTALL_MAN} ${WRKSRC}/doc/man3/array.h.3 ${PREFIX}/${PKGMANDIR}/man3
-	${INSTALL_MAN} ${WRKSRC}/doc/man3/fft.h.3 ${PREFIX}/${PKGMANDIR}/man3
-	${INSTALL_MAN} ${WRKSRC}/doc/man3/statistics.h.3 ${PREFIX}/${PKGMANDIR}/man3
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/cint
+	${INSTALL_PROGRAM} ${WRKDIR}/cint ${DESTDIR}${PREFIX}/cint
+	${INSTALL_PROGRAM} ${WRKDIR}/makecint ${DESTDIR}${PREFIX}/cint
+	${SED} "s;XXXPREFIXXXX;${PREFIX};g" <${FILESDIR}/cint.sh >${DESTDIR}${PREFIX}/bin/cint
+	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/cint
+	rm -f ${DESTDIR}${PREFIX}/bin/makecint
+	cd ${DESTDIR}${PREFIX}/bin && ${LN} cint makecint
+	${INSTALL_DATA} ${WRKDIR}/MAKEINFO ${DESTDIR}${PREFIX}/cint
+	${CP} -r ${WRKDIR}/include ${WRKDIR}/stl ${DESTDIR}${PREFIX}/cint
+	${RM} ${DESTDIR}${PREFIX}/cint/include/Makeit \
+		${DESTDIR}${PREFIX}/cint/include/make*
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/cint/lib
+	${CP} -r ${WRKDIR}/lib/prec_stl ${DESTDIR}${PREFIX}/cint/lib
+	${INSTALL_DATA} ${WRKDIR}/G__ci.h ${DESTDIR}${PREFIX}/cint
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cint
+	${INSTALL_DATA} ${WRKSRC}/doc/bytecode.txt \
+		${DESTDIR}${PREFIX}/share/doc/cint
+	${INSTALL_DATA} ${WRKSRC}/doc/cint.txt \
+		${DESTDIR}${PREFIX}/share/doc/cint
+	${INSTALL_DATA} ${WRKSRC}/doc/cintapi.txt \
+		${DESTDIR}${PREFIX}/share/doc/cint
+	${INSTALL_DATA} ${WRKSRC}/doc/extlib.txt \
+		${DESTDIR}${PREFIX}/share/doc/cint
+	${INSTALL_DATA} ${WRKSRC}/doc/ifdef.txt \
+		${DESTDIR}${PREFIX}/share/doc/cint
+	${INSTALL_DATA} ${WRKSRC}/doc/limitati.txt \
+		${DESTDIR}${PREFIX}/share/doc/cint
+	${INSTALL_DATA} ${WRKSRC}/doc/limitnum.txt \
+		${DESTDIR}${PREFIX}/share/doc/cint
+	${INSTALL_DATA} ${WRKSRC}/doc/makecint.txt \
+		${DESTDIR}${PREFIX}/share/doc/cint
+	${INSTALL_DATA} ${WRKSRC}/doc/message.txt \
+		${DESTDIR}${PREFIX}/share/doc/cint
+	${INSTALL_DATA} ${WRKSRC}/doc/ref.txt \
+		${DESTDIR}${PREFIX}/share/doc/cint
+	${INSTALL_MAN} ${WRKSRC}/doc/man1/cint.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man1/makecint.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man2/garbage.2 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man2
+	${INSTALL_MAN} ${WRKSRC}/doc/man2/security.2 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man2
+	${INSTALL_MAN} ${WRKSRC}/doc/man2/unique.2 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man2
+	${INSTALL_MAN} ${WRKSRC}/doc/man3/array.h.3 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+	${INSTALL_MAN} ${WRKSRC}/doc/man3/fft.h.3 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+	${INSTALL_MAN} ${WRKSRC}/doc/man3/statistics.h.3 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/cu-prolog/Makefile b/lang/cu-prolog/Makefile
index 65e47ef4021..6a50033e8c3 100644
--- a/lang/cu-prolog/Makefile
+++ b/lang/cu-prolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/09/09 02:43:09 obache Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 16:38:11 jlam Exp $
 
 DISTNAME=	cu-prolog-3.94
 CATEGORIES=	lang
@@ -8,6 +8,8 @@ DISTFILES=	cupsrc.tar.gz cupdoc.tar.gz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Experimental constraint logic programming language
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/src
 DIST_SUBDIR=	${DISTNAME}
 MAKE_FILE=	makefile
@@ -16,11 +18,12 @@ BUILD_TARGET=	cup
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cup3 ${PREFIX}/bin/cuprolog
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cu-prolog
+	${INSTALL_PROGRAM} ${WRKSRC}/cup3 ${DESTDIR}${PREFIX}/bin/cuprolog
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cu-prolog
 	cd ${WRKDIR} && ${INSTALL_DATA} README* COPYRIGHT* CHANGES	\
-		doc/*.dvi doc/*.doc ${PREFIX}/share/doc/cu-prolog
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cu-prolog
-	${INSTALL_DATA} ${WRKDIR}/sample/* ${PREFIX}/share/examples/cu-prolog
+		doc/*.dvi doc/*.doc ${DESTDIR}${PREFIX}/share/doc/cu-prolog
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/cu-prolog
+	${INSTALL_DATA} ${WRKDIR}/sample/*				\
+		${DESTDIR}${PREFIX}/share/examples/cu-prolog
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile
index 15f41978a1b..30d3e23f83b 100644
--- a/lang/eieio/Makefile
+++ b/lang/eieio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/07/05 18:22:29 jnemeth Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=	eieio-0.17
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cedet.sourceforge.net/eieio.shtml
 COMMENT=	Enhanced Integration of Emacs Interpreted Objects
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EMACS_MODULES+=	base
 MAKEFLAGS+=	EMACS=${EMACS_BIN:Q}
 
@@ -27,12 +29,12 @@ SRCS+=	tree.el call-tree.el chart.el eieio-speedbar.el linemark.el
 INSTALLATION_DIRS=	${EMACS_INFOPREFIX}
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/eieio
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/eieio
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
-			${EMACS_LISPPREFIX}/eieio
+			${DESTDIR}${EMACS_LISPPREFIX}/eieio
 	cd ${WRKSRC}; for f in *.info *.info-[0-9]*; do			\
 		${TEST} ! -f "$$f" ||					\
-		${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX};		\
+		${INSTALL_DATA} "$$f" ${DESTDIR}${EMACS_INFOPREFIX};	\
 	done
 
 .include "../../mk/emacs.mk"
diff --git a/lang/focal/Makefile b/lang/focal/Makefile
index 4529ec92ecf..b4756cdc4a2 100644
--- a/lang/focal/Makefile
+++ b/lang/focal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/12/02 13:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=		focal
@@ -10,16 +10,17 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://home.scarlet.be/~be042720/44/focal.htm
 COMMENT=		Interpreted programming language
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 FOCALDOCDIR=	${PREFIX}/share/doc/focal
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/focal ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${FOCALDOCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/focal ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${FOCALDOCDIR}
 	for i in focal.doc queens.foc sieve.foc; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${FOCALDOCDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${DESTDIR}${FOCALDOCDIR}; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/jasmin/Makefile b/lang/jasmin/Makefile
index 1a0dcbe88ec..c8a13cdff08 100644
--- a/lang/jasmin/Makefile
+++ b/lang/jasmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/12/01 11:29:15 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=	jasmin-1.06
@@ -10,6 +10,8 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://mrl.nyu.edu/~meyer/jasmin/
 COMMENT=	Java "assembler" interface
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_JAVA=	run
 
 WRKSRC=		${WRKDIR}/jasmin
@@ -26,9 +28,9 @@ post-patch:
 	${RM} ${WRKSRC}/bin/jasmin.patch
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/jasmin
-	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}/jasmin
-	${LN} -s ${PREFIX}/jasmin/bin/jasmin ${PREFIX}/bin/jasmin
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/jasmin
+	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/jasmin
+	${LN} -s ../jasmin/bin/jasmin ${DESTDIR}${PREFIX}/bin/jasmin
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/java-lang-spec/Makefile b/lang/java-lang-spec/Makefile
index 159490a08e2..930a71da0f3 100644
--- a/lang/java-lang-spec/Makefile
+++ b/lang/java-lang-spec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/04/13 00:47:19 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 16:38:12 jlam Exp $
 
 DISTNAME=		langspec-2.0.html
 PKGNAME=		java-lang-spec-2.0
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://java.sun.com/docs/books/jls/index.html
 COMMENT=		The Java(TM) Language Specification (HTML)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
@@ -18,9 +20,9 @@ NO_BUILD=		yes
 HTMLDIR=		${PREFIX}/share/doc/java-lang-spec
 
 do-install:
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	${INSTALL_DATA_DIR} ${HTMLDIR}/chars
-	cd ${WRKSRC}; ${INSTALL_DATA} *.gif *.html ${HTMLDIR}
-	cd ${WRKSRC}/chars; ${INSTALL_DATA} *.gif ${HTMLDIR}/chars
+	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/chars
+	cd ${WRKSRC}; ${INSTALL_DATA} *.gif *.html ${DESTDIR}${HTMLDIR}
+	cd ${WRKSRC}/chars; ${INSTALL_DATA} *.gif ${DESTDIR}${HTMLDIR}/chars
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/java-vm-spec/Makefile b/lang/java-vm-spec/Makefile
index ea470d6f7ea..4eff20ad33b 100644
--- a/lang/java-vm-spec/Makefile
+++ b/lang/java-vm-spec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/04 16:38:12 jlam Exp $
 
 DISTNAME=		vmspec.2nded.html
 PKGNAME=		java-vm-spec-2.0
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://java.sun.com/docs/books/vmspec/index.html
 COMMENT=		The Java(TM) Virtual Machine Specification (HTML)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/vmspec
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
@@ -16,9 +18,9 @@ NO_BUILD=		yes
 HTMLDIR=		${PREFIX}/share/doc/html/java-vm-spec
 
 do-install:
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	${INSTALL_DATA_DIR} ${HTMLDIR}/chars
-	cd ${WRKSRC}; ${INSTALL_DATA} *.gif *.html ${HTMLDIR}
-	cd ${WRKSRC}/chars; ${INSTALL_DATA} *.gif ${HTMLDIR}/chars
+	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/chars
+	cd ${WRKSRC}; ${INSTALL_DATA} *.gif *.html ${DESTDIR}${HTMLDIR}
+	cd ${WRKSRC}/chars; ${INSTALL_DATA} *.gif ${DESTDIR}${HTMLDIR}/chars
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile
index b94b005abb7..1ec106da82e 100644
--- a/lang/jbuilder-jit/Makefile
+++ b/lang/jbuilder-jit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/12/02 12:11:09 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=	unix_jb35foundation
@@ -24,24 +24,28 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
-USE_TOOLS+=		gtar
-
-NO_BUILD=		yes
 
 # this package is only for Sun 1.3 JVMs built for x86 Linux
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i386 DragonFly-*-i386
 PKG_JVMS_ACCEPTED=	blackdown-jdk13
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_TOOLS+=		gtar
+NO_BUILD=		yes
+
 post-extract:
 	@cd ${WRKDIR} && ${GTAR} -xzf ${EXTRACT_ELEMENTS}
 
 do-install:
-	${INSTALL_LIB_DIR} ${PKG_JAVA_HOME}/lib/i386
+	${INSTALL_LIB_DIR} ${DESTDIR}${PKG_JAVA_HOME}/lib/i386
 	${INSTALL_PROGRAM} ${WRKSRC}/libjavacomp.so ${WRKSRC}/libjavacomp_g.so \
-		${PKG_JAVA_HOME}/lib/i386/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jbuilder-jit
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/jbuilder-jit/README.javacomp
-	${INSTALL_DATA} ${WRKSRC}/LICENSE.TXT ${PREFIX}/share/doc/jbuilder-jit/LICENSE.javacomp
+		${DESTDIR}${PKG_JAVA_HOME}/lib/i386/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/jbuilder-jit
+	${INSTALL_DATA} ${WRKSRC}/readme.txt \
+		${DESTDIR}${PREFIX}/share/doc/jbuilder-jit/README.javacomp
+	${INSTALL_DATA} ${WRKSRC}/LICENSE.TXT \
+		${DESTDIR}${PREFIX}/share/doc/jbuilder-jit/LICENSE.javacomp
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index 80e45179674..2eea0c84116 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2007/03/21 19:44:10 jwise Exp $
+# $NetBSD: Makefile,v 1.51 2008/03/04 16:38:12 jlam Exp $
 #
 
 VERSION=	1.1.8
@@ -14,6 +14,8 @@ COMMENT=	Sun's Java(tm) Development Kit
 
 LICENSE=	jdk-license
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 JAVA_HOME=	${PREFIX}/java/jdk-${VERSION}
@@ -88,8 +90,8 @@ do-build: # empty, but cannot use NO_BUILD with java-env.mk
 
 do-install:
 	${RM} -f ${WRKSRC}/*.orig
-	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
-	cd ${WRKSRC} && ${PAX} -rw . ${JAVA_HOME}
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${JAVA_HOME}
+	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${JAVA_HOME}
 	${RM} -f ${JAVA_HOME}/bin/i386/green_threads/javac.orig
 
 .include "../../mk/java-env.mk"
diff --git a/lang/jini/Makefile b/lang/jini/Makefile
index 7b40db5d9de..7aa4f7aba42 100644
--- a/lang/jini/Makefile
+++ b/lang/jini/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/11/30 20:54:05 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=		jini-${SUN_VERSION}-src
@@ -25,6 +25,8 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	destdir
+
 WRKSRC=			${WRKDIR}/jini${SUN_VERSION}
 VERSION=		1.2.1
 SUN_VERSION=		${VERSION:C/\./_/g}_001
@@ -47,9 +49,9 @@ FETCH_MESSAGE+=	"Technology Starter Kit must be fetched into ${DISTDIR} from"
 FETCH_MESSAGE+=	${DOWNLOAD:Q}
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/jini
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/jini
 	${CHOWN} -hR ${BINOWN}:${BINGRP} ${WRKSRC}
-	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}/jini
+	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/jini
 
 cleandir: clean
 	${RM} -fr ${JINI_HOME}
diff --git a/lang/joos/Makefile b/lang/joos/Makefile
index 69344854fa0..e8384e6afe2 100644
--- a/lang/joos/Makefile
+++ b/lang/joos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:38 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=	joos-0.2
@@ -10,12 +10,14 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.brics.dk/~mis/dOvs/index.html
 COMMENT=	Java Object Oriented Subset
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_JAVA=	run
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/joos
-	cd ${WRKSRC} && ${PAX} -s ,^./.*orig,, -rw . ${PREFIX}/joos
-	cd ${PREFIX}/joos/Bin && ${LN} -s joos.a- joos
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/joos
+	cd ${WRKSRC} && ${PAX} -s ,^./.*orig,, -rw . ${DESTDIR}${PREFIX}/joos
+	cd ${DESTDIR}${PREFIX}/joos/Bin && ${LN} -s joos.a- joos
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/libtcl-nothread/Makefile b/lang/libtcl-nothread/Makefile
index 8bdaa5e7bfb..1d3363dc2ac 100644
--- a/lang/libtcl-nothread/Makefile
+++ b/lang/libtcl-nothread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=		tcl8.4.6-src
@@ -13,6 +13,8 @@ COMMENT=		TCL library for embedding
 
 DEPENDS+=		tcl>=8.4.6nb5:../../lang/tcl
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/${DISTNAME:C/-src//}/unix
 GNU_CONFIGURE=		yes
 MAKE_ENV+=		TOUCH=${TOUCH:Q}
@@ -43,7 +45,8 @@ post-configure:
 
 do-install:
 	cd ${WRKSRC} && \
-	${LIBTOOL} --mode=install ${INSTALL_DATA} ${TCLLIB} ${PREFIX}/lib; \
-	${INSTALL_DATA} tclConfig-nothread.sh ${PREFIX}/lib
+	${LIBTOOL} --mode=install ${INSTALL_DATA} ${TCLLIB} \
+		${DESTDIR}${PREFIX}/lib; \
+	${INSTALL_DATA} tclConfig-nothread.sh ${DESTDIR}${PREFIX}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 1a1d68f678b..b836dca32fa 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2007/02/20 19:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2008/03/04 16:38:12 jlam Exp $
 
 DISTNAME=		mercury-compiler-0.11.0
 PKGNAME=		mercury-0.11.0
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.cs.mu.oz.au/research/mercury/
 COMMENT=		Modern logic/functional programming language
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_GNU_READLINE=	yes	# rl_prep_term_function
@@ -46,10 +48,11 @@ do-build:
 	cd ${WRKSRC} && ${BUILD_MAKE_CMD} install
 
 do-install:
-	cd ${WRKSRC}/tmp && ${PAX} -rw . ${PREFIX}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mercury
+	cd ${WRKSRC}/tmp && ${PAX} -rw . ${DESTDIR}${PREFIX}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/mercury
 	${FIND} ${WRKSRC} -type d -name "CVS" -print | ${XARGS} ${RM} -fr
 	${FIND} ${WRKSRC} -type f -name ".cvsignore" -print | ${XARGS} ${RM} -f
-	cd ${WRKSRC}/samples && ${PAX} -rw . ${PREFIX}/share/examples/mercury
+	cd ${WRKSRC}/samples && \
+	${PAX} -rw . ${DESTDIR}${PREFIX}/share/examples/mercury
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/minischeme/Makefile b/lang/minischeme/Makefile
index 66941c38288..5b432a464c2 100644
--- a/lang/minischeme/Makefile
+++ b/lang/minischeme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:29:55 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 16:38:12 jlam Exp $
 
 DISTNAME=	minischeme
 PKGNAME=	minischeme-0.85
@@ -8,16 +8,18 @@ MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Very tiny scheme interpreter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	bin
 
 post-extract:
 	${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/miniscm ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/minischeme
+	${INSTALL_PROGRAM} ${WRKSRC}/miniscm ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/minischeme
 	for i in init.scm nextleaf.scm tools.scm; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/minischeme; \
+		${INSTALL_DATA} ${WRKSRC}/$$i \
+			${DESTDIR}${PREFIX}/share/minischeme; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mit-scheme-bin/Makefile b/lang/mit-scheme-bin/Makefile
index bcfa85b8925..9fa260069c5 100644
--- a/lang/mit-scheme-bin/Makefile
+++ b/lang/mit-scheme-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/07/29 05:19:27 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=		mit-scheme-7.7.1-ix86-gnu-linux
@@ -13,6 +13,8 @@ COMMENT=		MIT/GNU Scheme (Linux binary)
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	base
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 INSTALLATION_DIRS=	bin libexec
 
@@ -22,12 +24,12 @@ do-build:
 		> ${WRKSRC}/bchscheme
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bchscheme ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/scheme ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/bchscheme ${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/scheme ${PREFIX}/libexec
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/mit-scheme
-	cd ${WRKSRC}/lib && ${PAX} -rw mit-scheme ${PREFIX}/lib
-	${RMDIR} ${PREFIX}/lib/mit-scheme/lib
+	${INSTALL_SCRIPT} ${WRKSRC}/bchscheme ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scheme ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/bchscheme ${DESTDIR}${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/scheme ${DESTDIR}${PREFIX}/libexec
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/mit-scheme
+	cd ${WRKSRC}/lib && ${PAX} -rw mit-scheme ${DESTDIR}${PREFIX}/lib
+	${RMDIR} ${DESTDIR}${PREFIX}/lib/mit-scheme/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index 88405dd9180..794ba093055 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:38 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2008/03/04 16:38:12 jlam Exp $
 
 DISTNAME=	nawk-20050424
 CATEGORIES=	lang
@@ -10,6 +10,7 @@ HOMEPAGE=	http://cm.bell-labs.com/who/bwk/
 COMMENT=	Brian Kernighan's pattern-directed scanning and processing language
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 CFLAGS+=	${CPPFLAGS}
 MAKE_FLAGS+=	CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q}
@@ -24,7 +25,8 @@ do-extract:
 	@${CP} -R ${FILESDIR} ${WRKSRC}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/a.out ${PREFIX}/bin/nawk
-	${INSTALL_MAN} ${WRKSRC}/nawk.1 ${PREFIX}/${PKGMANDIR}/man1/nawk.1
+	${INSTALL_PROGRAM} ${WRKSRC}/a.out ${DESTDIR}${PREFIX}/bin/nawk
+	${INSTALL_MAN} ${WRKSRC}/nawk.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nawk.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/pforth/Makefile b/lang/pforth/Makefile
index e06e524623e..07cdfa2acf2 100644
--- a/lang/pforth/Makefile
+++ b/lang/pforth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/09/09 02:43:09 obache Exp $
+# $NetBSD: Makefile,v 1.20 2008/03/04 16:38:12 jlam Exp $
 
 DISTNAME=		pfthpc21
 PKGNAME=		pforth-21
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.softsynth.com/pforth/
 COMMENT=		Portable ANS-like Forth
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake
@@ -29,15 +31,16 @@ post-patch:
 	> ${WRKSRC}/csrc/pf_main.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pforth ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/pforth
-	${INSTALL_DATA} ${WRKSRC}/pforth.dic ${PREFIX}/lib/pforth
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pforth
+	${INSTALL_PROGRAM} ${WRKSRC}/pforth ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pforth
+	${INSTALL_DATA} ${WRKSRC}/pforth.dic ${DESTDIR}${PREFIX}/lib/pforth
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/pforth
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${WRKSRC}/docs/* 		\
-		${PREFIX}/share/doc/pforth/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/pforth
-	${INSTALL_DATA} ${WRKSRC}/*.fth ${PREFIX}/share/pforth/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/pforth/utils
-	${INSTALL_DATA}  ${WRKSRC}/utils/*.fth ${PREFIX}/share/pforth/utils/
+		${DESTDIR}${PREFIX}/share/doc/pforth/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pforth
+	${INSTALL_DATA} ${WRKSRC}/*.fth ${DESTDIR}${PREFIX}/share/pforth/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pforth/utils
+	${INSTALL_DATA}  ${WRKSRC}/utils/*.fth				\
+		${DESTDIR}${PREFIX}/share/pforth/utils/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py-html-docs/Makefile b/lang/py-html-docs/Makefile
index ca3296b222a..93a34016270 100644
--- a/lang/py-html-docs/Makefile
+++ b/lang/py-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/07/22 09:16:02 recht Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=	html-2.0
@@ -11,6 +11,8 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.python.org/doc/
 COMMENT=	HTML Documentation for Python
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	python
 
@@ -21,11 +23,11 @@ HTMLDIR=	share/doc/html/python
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${PREFIX}/${HTMLDIR}
-	cd ${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
-	cd ${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
+	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
+	cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
+	cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py21-html-docs/Makefile b/lang/py21-html-docs/Makefile
index d8dddbeb915..be33b0faf50 100644
--- a/lang/py21-html-docs/Makefile
+++ b/lang/py21-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/07/22 09:16:02 recht Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=	html-2.1.3
@@ -11,6 +11,8 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.python.org/doc/
 COMMENT=	HTML Documentation for Python
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	python
 
@@ -21,11 +23,11 @@ HTMLDIR=	share/doc/html/python2.1
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${PREFIX}/${HTMLDIR}
-	cd ${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
-	cd ${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
+	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
+	cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
+	cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py22-html-docs/Makefile b/lang/py22-html-docs/Makefile
index dbf707752e7..5538ae912d7 100644
--- a/lang/py22-html-docs/Makefile
+++ b/lang/py22-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/07/22 09:16:03 recht Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=	html-2.2.2
@@ -11,6 +11,8 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.python.org/doc/
 COMMENT=	HTML Documentation for Python
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	python
 
@@ -21,11 +23,11 @@ HTMLDIR=	share/doc/html/python2.2
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${PREFIX}/${HTMLDIR}
-	cd ${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
-	cd ${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
+	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
+	cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
+	cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py23-html-docs/Makefile b/lang/py23-html-docs/Makefile
index 42884978a81..f158af24098 100644
--- a/lang/py23-html-docs/Makefile
+++ b/lang/py23-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:55 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 16:38:12 jlam Exp $
 #
 
 DISTNAME=	html-2.3.3
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.python.org/doc/
 COMMENT=	HTML Documentation for Python
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/Python-Docs-2.3.3/
 DIST_SUBDIR=	python
 
@@ -21,11 +23,11 @@ HTMLDIR=	share/doc/html/python2.3
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${PREFIX}/${HTMLDIR}
-	cd ${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
-	cd ${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
+	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
+	cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
+	cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby-doc-stdlib/Makefile b/lang/ruby-doc-stdlib/Makefile
index 689913c81ed..502b3746f04 100644
--- a/lang/ruby-doc-stdlib/Makefile
+++ b/lang/ruby-doc-stdlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/11/05 20:12:36 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/04 16:38:12 jlam Exp $
 
 DISTNAME=	ruby-doc-stdlib-0.10.1
 CATEGORIES=	lang ruby
@@ -9,6 +9,8 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.ruby-doc.org/
 COMMENT=	Ruby Standard Library Documentation
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
@@ -16,16 +18,17 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 DOCDIR=		share/doc/${PKGBASE}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-	${CP} -R ${WRKSRC}/stdlib/* ${PREFIX}/${DOCDIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${DOCDIR}
-	${FIND} ${PREFIX}/${DOCDIR} -type d -print |			\
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
+	${CP} -R ${WRKSRC}/stdlib/* ${DESTDIR}${PREFIX}/${DOCDIR}
+	${FIND} ${DESTDIR}${PREFIX}/${DOCDIR} -type d -print |		\
 		${XARGS} ${CHMOD} ${PKGDIRMODE}
-	${FIND} ${PREFIX}/${DOCDIR} -type f -print |			\
+	${FIND} ${DESTDIR}${PREFIX}/${DOCDIR} -type f -print |		\
 		${XARGS} ${CHMOD} ${SHAREMODE}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${PREFIX} &&	${FIND} ${DOCDIR} -type f -print >> ${PLIST_SRC}
-	cd ${PREFIX} && ${FIND} -d ${DOCDIR} -type d -print |		\
+	cd ${DESTDIR}${PREFIX} &&					\
+		${FIND} ${DOCDIR} -type f -print >> ${PLIST_SRC}
+	cd ${DESTDIR}${PREFIX} &&					\
+		${FIND} -d ${DOCDIR} -type d -print |			\
 		${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index d8014602eae..a4b265dff55 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/10/25 21:04:22 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2008/03/04 16:38:13 jlam Exp $
 
 DISTNAME=	# empty
 PKGNAME=	ruby-${RUBY_VERSION_SUFFIX}
@@ -11,6 +11,9 @@ HOMEPAGE=	http://www.ruby-lang.org/en/
 COMMENT=	Wrapper package for Ruby programming language
 
 CONFLICTS=	pkg_alternatives-[0-9]*
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -38,9 +41,9 @@ GENERATE_PLIST+=	${ECHO} man/man1/ruby.1;
 do-install:
 .if ${RUBY_NAME} != "ruby"
 .  for f in ${RUBY_COMMANDS}
-	${LN} -sf ${f}${RUBY_VER} ${PREFIX}/bin/${f}
+	${LN} -sf ${f}${RUBY_VER} ${DESTDIR}${PREFIX}/bin/${f}
 .  endfor
-	${LN} -sf ${RUBY_NAME}.1 ${PREFIX}/${PKGMANDIR}/man1/ruby.1
+	${LN} -sf ${RUBY_NAME}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ruby.1
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index d3edae3a8ff..0f43874663f 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/11/28 07:37:46 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2008/03/04 16:38:13 jlam Exp $
 
 DISTNAME=		sather-1.2.1
 PKGREVISION=		7
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/sather/
 COMMENT=		Compiler for the Sather object oriented programming language
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake makeinfo
 
 BUILD_TARGET=		full optional
@@ -59,14 +61,16 @@ post-build:
 	${RM} -fr ${WRKSRC}/System/Platforms/dualgui/dual_gui_server.code
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/sather
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/sather/Bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/sather
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/lib/sather/Bin
 	cd ${WRKSRC}/Bin;						\
-	${INSTALL_PROGRAM} sacomp sabrowse ${PREFIX}/lib/sather/Bin;	\
-	${INSTALL_SCRIPT} PP gen_html saprep ${PREFIX}/lib/sather/Bin
+	${INSTALL_PROGRAM} sacomp sabrowse				\
+		${DESTDIR}${PREFIX}/lib/sather/Bin;			\
+	${INSTALL_SCRIPT} PP gen_html saprep				\
+		${DESTDIR}${PREFIX}/lib/sather/Bin
 	${INSTALL_SCRIPT} ${WRKSRC}/debian/bin-wrapper			\
-		${PREFIX}/lib/sather/Bin
-	cd ${PREFIX}/bin;						\
+		${DESTDIR}${PREFIX}/lib/sather/Bin
+	cd ${DESTDIR}${PREFIX}/bin;					\
 		 ${LN} -sf ../lib/sather/Bin/bin-wrapper sacomp;	\
 		 ${LN} -sf ../lib/sather/Bin/bin-wrapper sabrowse;	\
 	cd ${WRKSRC} && ${PAX} -s ',.*\.sav,,' -rw Library		\
@@ -77,22 +81,24 @@ do-install:
 		System/Platforms/f77 System/Platforms/${LOWER_OPSYS}	\
 		System/Platforms/X System/Platforms/dualgui		\
 		System/Platforms/gui System/Platforms/tcltk		\
-		Browser	${PREFIX}/lib/sather
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/sather/Library \
-		${PREFIX}/lib/sather/System
-	${FIND} ${PREFIX}/lib/sather -name \*.config -o -name Makefile 	\
+		Browser	${DESTDIR}${PREFIX}/lib/sather
+	${FIND} ${DESTDIR}${PREFIX}/lib/sather				\
+		-name \*.config -o -name Makefile 			\
 		-o -name \*.orig -print | ${XARGS} ${RM} -f
 	cd ${WRKSRC}/Emacs; for f in *.info *.info-[0-9]*; do		\
 		${TEST} ! -f "$$f" ||					\
-		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+		${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\
 	done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sather
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/sather
 	cd ${WRKSRC}/Doc && ${PAX} -rw -s ',.*/man.*,,' .		\
-		${PREFIX}/share/doc/sather
-	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sacomp.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sabrowse.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Emacs/*.el ${PREFIX}/share/emacs/site-lisp
+		${DESTDIR}${PREFIX}/share/doc/sather
+	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sacomp.1			\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sabrowse.1		\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Emacs/*.el				\
+		${DESTDIR}${PREFIX}/share/emacs/site-lisp
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../x11/tk83/buildlink3.mk"
diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index 8ed9c257a09..cb60b60d8f0 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/01/23 06:08:31 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/04 16:38:13 jlam Exp $
 #
 
 DISTNAME=	boot.${BOX}-unix
@@ -31,6 +31,8 @@ COMMENT=	Popular functional language from Bell Labs
 
 SML_VERSION=	110.42
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # Other mirror sites that generally carry only released versions of SML
 # 	ftp://rodin.stanford.edu/pub/smlnj/release/
 # 	ftp://ftp.cl.cam.ac.uk/MIRRORED/smlnj/release/
@@ -100,8 +102,8 @@ post-build:
 # 2. copy the ./bin and ./lib directories across
 # 3. install links to executables in $PREFIX/bin
 do-install:
-	${INSTALL_DATA_DIR} ${SML_BASE}
-	cd ${WRKDIR} && ${PAX} -rw -pam bin lib ${SML_BASE}
-	cd ${PREFIX}/bin && ${LN} -sf ../lib/smlnj/bin/* .
+	${INSTALL_DATA_DIR} ${DESTDIR}${SML_BASE}
+	cd ${WRKDIR} && ${PAX} -rw -pam bin lib ${DESTDIR}${SML_BASE}
+	cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ../lib/smlnj/bin/* .
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index 4899aeff73a..4bb33118ef1 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/02/04 19:52:54 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2008/03/04 16:38:13 jlam Exp $
 #
 
 DISTNAME=	snobol-0.99.4
@@ -14,6 +14,8 @@ COMMENT=	Macro implementation of SNOBOL4 in C
 
 BUILD_DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 BUILD_TARGET=	it
@@ -23,19 +25,22 @@ USE_TOOLS+=		gzip m4
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 MAKE_JOBS_SAFE=		NO
 
+post-build:
+	${CP} ${WRKSRC}/doc/head ${WRKSRC}/doc/tutorial
+	unzip -d ${WRKSRC} -joqqLC ${DISTDIR}/vanilla.zip pm.exe
+	unzip -p -opaaqqLC ${WRKSRC}/pm.exe >> ${WRKSRC}/doc/tutorial
+	${GZIP_CMD} ${WRKSRC}/doc/tutorial
+
 do-install:
-	@${CP} ${WRKSRC}/doc/head ${WRKSRC}/doc/tutorial
-	@unzip -d ${WRKSRC} -joqqLC ${DISTDIR}/vanilla.zip pm.exe
-	@unzip -p -opaaqqLC ${WRKSRC}/pm.exe >> ${WRKSRC}/doc/tutorial
-	@${GZIP_CMD} ${WRKSRC}/doc/tutorial
-	@${INSTALL_PROGRAM} ${WRKSRC}/xsnobol4 ${PREFIX}/bin/snobol4
-	@${INSTALL_MAN} ${WRKSRC}/doc/snobol4.1 ${PREFIX}/${PKGMANDIR}/man1
-	@${INSTALL_DATA_DIR} ${PREFIX}/lib/snobol4
-	@cd ${WRKSRC} && ${INSTALL_DATA} snolib.a snolib/bq.sno \
-		${PREFIX}/lib/snobol4
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snobol4
-	@cd ${WRKSRC}/doc && ${INSTALL_DATA} load.doc design.doc tutorial.gz \
-		${PREFIX}/share/doc/snobol4
+	${INSTALL_PROGRAM} ${WRKSRC}/xsnobol4 ${DESTDIR}${PREFIX}/bin/snobol4
+	${INSTALL_MAN} ${WRKSRC}/doc/snobol4.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/snobol4
+	cd ${WRKSRC} && ${INSTALL_DATA} snolib.a snolib/bq.sno \
+		${DESTDIR}${PREFIX}/lib/snobol4
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/snobol4
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} load.doc design.doc tutorial.gz \
+		${DESTDIR}${PREFIX}/share/doc/snobol4
 	@${ECHO} ''
 	@${ECHO} '***********************************************************'
 	@${ECHO} '*  A helpful tutorial is at share/doc/snobol4/tutorial.gz *'
diff --git a/lang/sr-examples/Makefile b/lang/sr-examples/Makefile
index 958f404f6f1..1c34b919abb 100644
--- a/lang/sr-examples/Makefile
+++ b/lang/sr-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/17 18:40:33 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 16:38:13 jlam Exp $
 #
 
 DISTNAME=		vs233
@@ -12,6 +12,8 @@ MAINTAINER=		is@NetBSD.org
 HOMEPAGE=		http://www.cs.arizona.edu/sr/
 COMMENT=		The SR language compiler and run time system
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 NO_EXTRACT=		yes
 NO_CONFIGURE=		yes
@@ -22,9 +24,9 @@ DOMOD=
 #DOMOD=-pm
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/examples/sr
-	cd ${PREFIX:Q}/share/examples/sr &&				\
-	${PAX} -zr ${DOMOD} -f ${DISTDIR:Q}/${DISTFILES:Q}			\
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/examples/sr
+	cd ${DESTDIR}${PREFIX:Q}/share/examples/sr &&			\
+	${PAX} -zr ${DOMOD} -f ${DISTDIR:Q}/${DISTFILES:Q}		\
 		-s ,vsuite/examples,.,					\
 		vsuite/examples
 
diff --git a/lang/stalin/Makefile b/lang/stalin/Makefile
index f8e2d57c39a..50a5153a70a 100644
--- a/lang/stalin/Makefile
+++ b/lang/stalin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/09/23 15:30:23 obache Exp $
+# $NetBSD: Makefile,v 1.32 2008/03/04 16:38:13 jlam Exp $
 
 DISTNAME=		stalin-0.9
 PKGREVISION=		5
@@ -13,6 +13,8 @@ COMMENT=		Aggressively optimizing Scheme compiler
 # Only ported to these 4 archs
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc *-*-alpha *-*-mips
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 UNLIMIT_RESOURCES=	stacksize datasize
 
 .include "../../mk/bsd.prefs.mk"
@@ -31,15 +33,15 @@ post-patch:
 	${FILESDIR}/stalin.sh > ${WRKSRC}/stalin.sh
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/stalin
-	${INSTALL_PROGRAM} ${WRKSRC}/stalin ${PREFIX}/lib/stalin
-	${INSTALL_SCRIPT} ${WRKSRC}/stalin.sh ${PREFIX}/bin/stalin
-	${INSTALL_DATA} ${WRKSRC}/include/*.sc ${PREFIX}/lib/stalin
-	${INSTALL_DATA} ${WRKSRC}/libstalin.a ${PREFIX}/lib/stalin
-	${INSTALL_MAN} ${WRKSRC}/stalin.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/stalin
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/lib/stalin
+	${INSTALL_PROGRAM} ${WRKSRC}/stalin ${DESTDIR}${PREFIX}/lib/stalin
+	${INSTALL_SCRIPT} ${WRKSRC}/stalin.sh ${DESTDIR}${PREFIX}/bin/stalin
+	${INSTALL_DATA} ${WRKSRC}/include/*.sc ${DESTDIR}${PREFIX}/lib/stalin
+	${INSTALL_DATA} ${WRKSRC}/libstalin.a ${DESTDIR}${PREFIX}/lib/stalin
+	${INSTALL_MAN} ${WRKSRC}/stalin.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/stalin
 	cd ${WRKSRC} && ${INSTALL_DATA} ANNOUNCEMENT COPYING README	\
-		stalin.el ${PREFIX}/share/doc/stalin/
+		stalin.el ${DESTDIR}${PREFIX}/share/doc/stalin/
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common
index 864d50e6afc..d7a6a454f70 100644
--- a/lang/sun-jre13/Makefile.common
+++ b/lang/sun-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2007/08/22 14:03:48 jlam Exp $
+# $NetBSD: Makefile.common,v 1.35 2008/03/04 16:38:13 jlam Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 CATEGORIES=	lang java
@@ -18,6 +18,8 @@ NO_BIN_ON_FTP=	${RESTRICTED}
 
 EMUL_PLATFORMS=		linux-i386
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 EMUL_MODULES.linux=	compat locale x11
@@ -57,7 +59,7 @@ post-build:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
-	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${JAVA_HOME}
+	cd ${WRKSRC} && ${PAX} -rwp ma . ${DESTDIR}${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common
index d9537bf487f..735e8f0c232 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2008/01/20 12:51:43 obache Exp $
+# $NetBSD: Makefile.common,v 1.9 2008/03/04 16:38:13 jlam Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -17,6 +17,8 @@ NO_BIN_ON_FTP=	${RESTRICTED}
 
 EMUL_PLATFORMS=		linux-i386
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 EMUL_MODULES.linux=	compat locale x11
@@ -67,7 +69,7 @@ post-fetch:
 	fi
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
-	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${JAVA_HOME}
+	cd ${WRKSRC} && ${PAX} -rwp ma . ${DESTDIR}${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
diff --git a/lang/tk-expect/Makefile b/lang/tk-expect/Makefile
index 2843e734293..056aa728e79 100644
--- a/lang/tk-expect/Makefile
+++ b/lang/tk-expect/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:40 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/03/04 16:38:13 jlam Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../lang/tcl-expect/Makefile.common"
 
@@ -20,8 +22,9 @@ CONFIGURE_ARGS+=	--with-tkinclude=${PREFIX}/include/tk
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/expectk ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/expectk.man ${PREFIX}/${PKGMANDIR}/man1/expectk.1
+	${INSTALL_PROGRAM} ${WRKSRC}/expectk ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/expectk.man \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/expectk.1
 
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/umb-scheme/Makefile b/lang/umb-scheme/Makefile
index 8f4c35bdd1c..43d64fc49cb 100644
--- a/lang/umb-scheme/Makefile
+++ b/lang/umb-scheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:57 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 16:38:13 jlam Exp $
 
 DISTNAME=		umb-scheme-3.2
 CATEGORIES=		lang
@@ -8,6 +8,8 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		UMB Scheme interpreter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/scheme-3.2
 BUILD_TARGET=		default
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
@@ -30,13 +32,16 @@ post-patch:
 		>${WRKSRC}/SLIB-for-umb-scheme.init
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/umb-scheme ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/umb-scheme
-	${INSTALL_DATA} ${WRKSRC}/prelude.scheme ${PREFIX}/share/umb-scheme
+	${INSTALL_PROGRAM} ${WRKSRC}/umb-scheme ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/umb-scheme
+	${INSTALL_DATA} ${WRKSRC}/prelude.scheme \
+		${DESTDIR}${PREFIX}/share/umb-scheme
 	${INSTALL_DATA} ${WRKSRC}/SLIB-for-umb-scheme.init \
-		${PREFIX}/share/umb-scheme
-	${INSTALL_MAN} ${WRKSRC}/scheme.1 ${PREFIX}/${PKGMANDIR}/man1/umb-scheme.1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/umb-scheme/slib
-	${INSTALL_DATA} ${WRKSRC}/slib/*.scm ${PREFIX}/share/umb-scheme/slib
+		${DESTDIR}${PREFIX}/share/umb-scheme
+	${INSTALL_MAN} ${WRKSRC}/scheme.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/umb-scheme.1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/umb-scheme/slib
+	${INSTALL_DATA} ${WRKSRC}/slib/*.scm \
+		${DESTDIR}${PREFIX}/share/umb-scheme/slib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/vscm/Makefile b/lang/vscm/Makefile
index bc60ca0dc4c..f6da3eb09d2 100644
--- a/lang/vscm/Makefile
+++ b/lang/vscm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:57 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 16:38:13 jlam Exp $
 
 DISTNAME=	vscmV0r4
 PKGNAME=	vscm-0.4
@@ -13,6 +13,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cs.princeton.edu/~blume/vscm/
 COMMENT=	Portable scheme implementation
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 
 INSTALLATION_DIRS=	bin
@@ -21,11 +23,12 @@ post-patch:
 	${SED} -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/path.h >${WRKSRC}/path.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/vscm ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/vscm
-	${INSTALL_DATA} ${WRKSRC}/.scheme-boot ${PREFIX}/lib/vscm/vscm-boot
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vscm
+	${INSTALL_PROGRAM} ${WRKSRC}/vscm ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/vscm
+	${INSTALL_DATA} ${WRKSRC}/.scheme-boot				\
+		${DESTDIR}${PREFIX}/lib/vscm/vscm-boot
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/vscm
 	cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL DESCRIPTION	\
-			${PREFIX}/share/doc/vscm
+		${DESTDIR}${PREFIX}/share/doc/vscm
 
 .include "../../mk/bsd.pkg.mk"