Mechanical changes to add full DESTDIR support to packages that install

their files via a custom do-install target.

16 files changed, 135 insertions, 98 deletions

diff --git a/cad/MyHDL-gplcver/Makefile b/cad/MyHDL-gplcver/Makefile
index a417691ecf7..bc492677379 100644
--- a/cad/MyHDL-gplcver/Makefile
+++ b/cad/MyHDL-gplcver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/09/09 02:41:55 obache Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/03 01:50:26 jlam Exp $
 #
 
 DISTNAME=	myhdl-0.5.1
@@ -10,12 +10,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://jandecaluwe.com/Tools/MyHDL/Overview.html
 COMMENT=	GPL Cver cosimulation support for py-MyHDL
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DIRS+=	cosimulation/cver
 MAKE_FILE=	makefile.lnx
 
 do-install:
+	${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/gplcver
 	${INSTALL_DATA} ${WRKSRC}/cosimulation/cver/myhdl_vpi.so \
-		${PREFIX}/lib/gplcver
+		${DESTDIR}${PREFIX}/lib/gplcver
 
 .include "../../cad/gplcver/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/MyHDL-iverilog/Makefile b/cad/MyHDL-iverilog/Makefile
index c2397496707..0bc256d3f75 100644
--- a/cad/MyHDL-iverilog/Makefile
+++ b/cad/MyHDL-iverilog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/05/04 16:58:05 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/03 01:50:26 jlam Exp $
 #
 
 DISTNAME=	myhdl-0.5.1
@@ -10,11 +10,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://jandecaluwe.com/Tools/MyHDL/Overview.html
 COMMENT=	Icarus Verilog cosimulation support for py-MyHDL
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DIRS+=	cosimulation/icarus
 
 do-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ivl
 	${INSTALL_DATA} ${WRKSRC}/cosimulation/icarus/myhdl.vpi \
-		${PREFIX}/lib/ivl
+		${DESTDIR}${PREFIX}/lib/ivl
 
 .include "../../cad/verilog/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/dinotrace-mode/Makefile b/cad/dinotrace-mode/Makefile
index dfc1b01291d..65e2d125b41 100644
--- a/cad/dinotrace-mode/Makefile
+++ b/cad/dinotrace-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/03/02 02:46:15 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 01:50:26 jlam Exp $
 #
 
 DISTNAME=	dinotrace-9.3c
@@ -13,8 +13,9 @@ COMMENT=	Emacs major mode for dinotrace
 
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}verilog-mode>=3.13:../../cad/verilog-mode
 
-.include "../../mk/bsd.prefs.mk"
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+.include "../../mk/bsd.prefs.mk"
 .include "../../mk/emacs.mk"
 
 .if ${EMACS_FLAVOR} == "emacs"
@@ -28,11 +29,12 @@ SRCS=	dinotrace.el sim-log.el
 do-build:
 	for f in ${SRCS}; do						\
 		${EMACS} --no-init-file --no-site-file -batch		\
-		-f batch-byte-compile ${WRKSRC}/lisp/$$f;			\
+		-f batch-byte-compile ${WRKSRC}/lisp/$$f;		\
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/${PKGBASE}
-	cd ${WRKSRC}/lisp && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${EMACS_LISPPREFIX}/${PKGBASE}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
+	cd ${WRKSRC}/lisp && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc}	\
+		${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile
index d9d74c50a36..a7fea14648c 100644
--- a/cad/eagle/Makefile
+++ b/cad/eagle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/07/29 05:18:36 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=		eagle-lin-eng-4.14
@@ -12,6 +12,8 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.cadsoft.de/
 COMMENT=		Easy to use printed circuit board editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 RESTRICTED=		Redistribution not permitted
 LICENSE=		fee-based-commercial-use
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -29,8 +31,8 @@ do-configure:
 	${SED} -e "s:@@PREFIX@@:${PREFIX}:g" <${FILESDIR}/eagle >${WRKDIR}/eagle
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/eagle
-	cd ${WRKSRC} && ${CP} -R ${WRKSRC}/* ${PREFIX}/eagle
-	${INSTALL_SCRIPT} ${WRKDIR}/eagle ${PREFIX}/bin
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/eagle
+	cd ${WRKSRC} && ${CP} -R ${WRKSRC}/* ${DESTDIR}${PREFIX}/eagle
+	${INSTALL_SCRIPT} ${WRKDIR}/eagle ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index a708b5a2cd9..583e7db3dd7 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/08/10 03:21:39 minskim Exp $
+# $NetBSD: Makefile,v 1.31 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=	fastcap-2.0-18Sep92
@@ -12,6 +12,8 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.rle.mit.edu/cpg/research_codes.htm
 COMMENT=	Fast 3-D capacitance solver
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_USING=	gtar	# cannot be extracted with pax as tar
 
 WRKSRC=			${WRKDIR}
@@ -37,52 +39,52 @@ post-build:
 .endfor
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/fastcap ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/cubegen ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/capgen ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/busgen ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pipedgen ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pyragen ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/1x1bus.lst ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/1x1coarse.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/1x1fine.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/1x1nonuni.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/README ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/big_sphere1.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/coated_sph.lst ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/cond_air_1x1.qui ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/cond_dielec_1x1.qui ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/connector2.sh ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/connector3.sh ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/connector4.sh ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/cubeeg.fig ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/dielec_face.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/dielec_sides.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/dielec_sides_2x2.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/dielec_topbot.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/pin ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/pipeeg.fig ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/ramcell.lst ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/ramcell.out ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_bitl.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_botd.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_cond.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_gnd.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_test.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_topd.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/ramgen.sh ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/sphere1.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/sphere2.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/sphere3.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/testgen.sh ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/testrun.sh ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA} ${WRKSRC}/examples/via.neu ${PREFIX}/share/examples/fastcap
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fastcap
-	${INSTALL_DATA} ${WRKSRC}/doc/mtt.ps  ${PREFIX}/share/doc/fastcap
-	${INSTALL_DATA} ${WRKSRC}/doc/tcad.ps  ${PREFIX}/share/doc/fastcap
-	${INSTALL_DATA} ${WRKSRC}/doc/ug.ps  ${PREFIX}/share/doc/fastcap
-	${INSTALL_DATA} ${WRKSRC}/README.docs ${PREFIX}/share/doc/fastcap
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/fastcap ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/cubegen ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/capgen ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/busgen ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/pipedgen ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/pyragen ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/1x1bus.lst ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/1x1coarse.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/1x1fine.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/1x1nonuni.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/README ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/big_sphere1.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/coated_sph.lst ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/cond_air_1x1.qui ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/cond_dielec_1x1.qui ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/connector2.sh ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/connector3.sh ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/connector4.sh ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/cubeeg.fig ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/dielec_face.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/dielec_sides.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/dielec_sides_2x2.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/dielec_topbot.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/pin ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/pipeeg.fig ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/ramcell.lst ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/ramcell.out ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_bitl.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_botd.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_cond.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_gnd.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_test.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/ramcell_topd.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/ramgen.sh ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/sphere1.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/sphere2.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/sphere3.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/testgen.sh ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/testrun.sh ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA} ${WRKSRC}/examples/via.neu ${DESTDIR}${PREFIX}/share/examples/fastcap
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/fastcap
+	${INSTALL_DATA} ${WRKSRC}/doc/mtt.ps  ${DESTDIR}${PREFIX}/share/doc/fastcap
+	${INSTALL_DATA} ${WRKSRC}/doc/tcad.ps  ${DESTDIR}${PREFIX}/share/doc/fastcap
+	${INSTALL_DATA} ${WRKSRC}/doc/ug.ps  ${DESTDIR}${PREFIX}/share/doc/fastcap
+	${INSTALL_DATA} ${WRKSRC}/README.docs ${DESTDIR}${PREFIX}/share/doc/fastcap
 
 .include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gplcver/Makefile b/cad/gplcver/Makefile
index ef20a8b652c..4568479770e 100644
--- a/cad/gplcver/Makefile
+++ b/cad/gplcver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/09/09 02:41:55 obache Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=		gplcver-2.11a.src
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.pragmatic-c.com/gpl-cver/
 COMMENT=		Verilog simulator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DIRS=		src
 MAKE_FILE=		makefile.freebsd
 BUILDLINK_LIBS.dl=	${BUILDLINK_LDADD.dl}
@@ -18,8 +20,9 @@ BUILDLINK_LIBS.dl=	${BUILDLINK_LDADD.dl}
 .include "../../mk/dlopen.buildlink3.mk"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/cver ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/gplcver/pli_incs
-	${INSTALL_DATA} ${WRKSRC}/pli_incs/*.h ${PREFIX}/lib/gplcver/pli_incs
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/cver ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gplcver/pli_incs
+	${INSTALL_DATA} ${WRKSRC}/pli_incs/*.h \
+		${DESTDIR}${PREFIX}/lib/gplcver/pli_incs
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/mcalc/Makefile b/cad/mcalc/Makefile
index 655de902b85..2fb7304aa02 100644
--- a/cad/mcalc/Makefile
+++ b/cad/mcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:52 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=	mcalc-1.5
@@ -10,6 +10,7 @@ HOMEPAGE=	http://mcalc.sourceforge.net/
 COMMENT=	JavaScript based microstrip analysis/synthesis calculator
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_BUILD=	yes
 
@@ -19,7 +20,7 @@ PLIST_SUBST+=	MCALCBASE=${MCALCBASE:Q}
 MESSAGE_SUBST+=	MCALCBASE=${MCALCBASE}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${MCALCBASE}
-	${INSTALL_DATA} ${WRKSRC}/* ${PREFIX}/${MCALCBASE}/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${MCALCBASE}
+	${INSTALL_DATA} ${WRKSRC}/* ${DESTDIR}${PREFIX}/${MCALCBASE}/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/mpac/Makefile b/cad/mpac/Makefile
index d5653805fbe..95faa9248fd 100644
--- a/cad/mpac/Makefile
+++ b/cad/mpac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:22 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=	mpac-0.2.2
@@ -11,14 +11,16 @@ COMMENT=	Microstrip Patch Antenna Calculator
 
 DEPENDS+=	tk>=8.1:../../x11/tk
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin
 
 do-build:
 	${SED} 's;patch.gif;${PREFIX}/share/mpac/patch.gif;g' ${WRKSRC}/mpac.tcl > ${WRKSRC}/mpac
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mpac ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mpac
-	${INSTALL_DATA} ${WRKSRC}/patch.gif ${PREFIX}/share/mpac
+	${INSTALL_SCRIPT} ${WRKSRC}/mpac ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/mpac
+	${INSTALL_DATA} ${WRKSRC}/patch.gif ${DESTDIR}${PREFIX}/share/mpac
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/ntesla/Makefile b/cad/ntesla/Makefile
index 50e8501c288..f6207560a82 100644
--- a/cad/ntesla/Makefile
+++ b/cad/ntesla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:41 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 01:50:26 jlam Exp $
 #
 
 DISTNAME=		ntesla-1.7
@@ -9,9 +9,11 @@ MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.nic.funet.fi/pub/sci/electrical/tesla/
 COMMENT=		Tesla coil design program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ntesla ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/ntesla ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/qcad-partlibrary/Makefile b/cad/qcad-partlibrary/Makefile
index 3c50d1377ba..b84a5bbf742 100644
--- a/cad/qcad-partlibrary/Makefile
+++ b/cad/qcad-partlibrary/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/01/02 13:44:23 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=		partlibrary-2.0.1.2-1
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.ribbonsoft.com/qcad/
 COMMENT=	About 4500 mech, elec, etc. parts for the QCad 2D CAD system
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
@@ -22,7 +24,7 @@ post-extract:
 	cd ${WRKSRC}/electrical/denzuq && chmod -x */*/*.dxf
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/qcad/library
-	cd ${WRKSRC} && pax -rwpm . ${PREFIX}/share/qcad/library
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/qcad/library
+	cd ${WRKSRC} && pax -rwpm . ${DESTDIR}${PREFIX}/share/qcad/library
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index a8013d22f76..84adca88dec 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/02/15 14:10:52 rillig Exp $
+# $NetBSD: Makefile,v 1.46 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=		qcad-2.0.5.0-1-community.src
@@ -7,6 +7,8 @@ DISTNAME=		qcad-2.0.5.0-1-community.src
 # thing after the hyphen, which always seems to be 1. Can I use four digits?
 PKGNAME=		qcad-2.0.5.0
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "./Makefile.common"
 
 COMMENT=		2D CAD system
@@ -54,10 +56,10 @@ pre-build:
 	done
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/qcad/qcad ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/qcad
+	${INSTALL_PROGRAM} ${WRKSRC}/qcad/qcad ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/qcad
 	cd ${WRKSRC}/qcad && umask 022 && \
-	pax -rwpm data fonts patterns qm ${PREFIX}/share/qcad
+	pax -rwpm data fonts patterns qm ${DESTDIR}${PREFIX}/share/qcad
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt3-libs+=	qt3-libs>=3.3.4
diff --git a/cad/simian-docs/Makefile b/cad/simian-docs/Makefile
index 151dba5ae6b..c8d439ca261 100644
--- a/cad/simian-docs/Makefile
+++ b/cad/simian-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:01:15 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=	simian_man_12_98
@@ -18,13 +18,16 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simian
-	${INSTALL_DATA} ${DISTDIR}/${DISTFILES:Q} ${PREFIX}/share/doc/simian
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/simian
+	${INSTALL_DATA} ${DISTDIR}/${DISTFILES:Q} \
+		${DESTDIR}${PREFIX}/share/doc/simian
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/simian/Makefile b/cad/simian/Makefile
index 0b93324adce..148968b100b 100644
--- a/cad/simian/Makefile
+++ b/cad/simian/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:52 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=	simian_12_98
@@ -17,6 +17,8 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c++
 GCC_REQD+=		3.0
 
@@ -28,8 +30,9 @@ BUILD_TARGET=	simian
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/simian ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/simian
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/simian
+	${INSTALL_PROGRAM} ${WRKSRC}/src/simian ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/simian
+	${INSTALL_DATA} ${WRKSRC}/examples/* \
+		${DESTDIR}${PREFIX}/share/examples/simian
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/spiceprm/Makefile b/cad/spiceprm/Makefile
index bcb5840f17a..bd674cd689b 100644
--- a/cad/spiceprm/Makefile
+++ b/cad/spiceprm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:02 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=	spiceprm-0.11
@@ -8,6 +8,8 @@ MASTER_SITES=	http://metalab.unc.edu/pub/Linux/apps/circuits/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Spice preprocessor for parameterized subcircuits
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/spiceprm
 NO_BUILD=		YES
 USE_TOOLS+=		perl:run
@@ -15,10 +17,10 @@ REPLACE_PERL=		spiceprm
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/spiceprm ${PREFIX}/bin/spiceprm
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/spiceprm
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/spiceprm
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/spiceprm
-	${INSTALL_DATA} ${WRKSRC}/EXAMPLES ${PREFIX}/share/examples/spiceprm
+	${INSTALL_SCRIPT} ${WRKSRC}/spiceprm ${DESTDIR}${PREFIX}/bin/spiceprm
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/spiceprm
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/spiceprm
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/spiceprm
+	${INSTALL_DATA} ${WRKSRC}/EXAMPLES ${DESTDIR}${PREFIX}/share/examples/spiceprm
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/verilog-mode/Makefile b/cad/verilog-mode/Makefile
index f05dff54507..6ca305e9974 100644
--- a/cad/verilog-mode/Makefile
+++ b/cad/verilog-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:23 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=		verilog-mode-3.60
@@ -13,6 +13,8 @@ MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.verilog.com/verilog-mode.html
 COMMENT=		Verilog mode for Emacs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 
 .include "../../mk/emacs.mk"
@@ -32,7 +34,8 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${EMACS_LISPPREFIX}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc}	\
+		${DESTDIR}${EMACS_LISPPREFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/xchiplogo/Makefile b/cad/xchiplogo/Makefile
index c445deff2cb..f24764e880b 100644
--- a/cad/xchiplogo/Makefile
+++ b/cad/xchiplogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/03 01:50:27 jlam Exp $
 #
 
 DISTNAME=	xchiplogo
@@ -11,10 +11,12 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.eleceng.adelaide.edu.au/Personal/moini/chiplogo.html
 COMMENT=	Program for generating pretty logos on VLSI chips
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xchiplogo ${PREFIX}/bin/xchiplogo
+	${INSTALL_PROGRAM} ${WRKSRC}/xchiplogo ${DESTDIR}${PREFIX}/bin/xchiplogo
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"