From d66d55c1389d8e9d495b2bde463dca04a4d27054 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 4 Mar 2008 15:39:09 +0000
Subject: [PATCH] Mechanical changes to add DESTDIR support to packages that
 install their files via a custom do-install target.

---
 graphics/3DKit/Makefile             |  9 ++++---
 graphics/CRWInfo/Makefile           | 10 ++++---
 graphics/OpenRM/Makefile            | 24 +++++++++--------
 graphics/PanoTools/Makefile         | 33 +++++++++++++----------
 graphics/blender-doc/Makefile       | 11 +++++---
 graphics/dcraw/Makefile             | 14 ++++++----
 graphics/ewipe/Makefile             | 13 +++++----
 graphics/f4l/Makefile               |  6 +++--
 graphics/fly/Makefile               | 16 ++++++-----
 graphics/fotox/Makefile             | 21 +++++++++------
 graphics/fujiplay/Makefile          | 18 ++++++++-----
 graphics/get_ds7/Makefile           | 16 ++++++-----
 graphics/gfract/Makefile            | 18 +++++++------
 graphics/gif320/Makefile            | 19 +++++++------
 graphics/giftrans/Makefile          |  9 ++++---
 graphics/gimp-fix-ca/Makefile       |  6 +++--
 graphics/gimp-rawphoto/Makefile     |  6 +++--
 graphics/gimp-warp-sharp/Makefile   |  6 +++--
 graphics/glx-utils/Makefile         | 10 ++++---
 graphics/gmngview/Makefile          |  6 +++--
 graphics/iGMT/Makefile              | 24 ++++++++++-------
 graphics/jhead/Makefile             | 12 +++++----
 graphics/jpeg2ps/Makefile           |  8 +++---
 graphics/jpeg_ls/Makefile           | 20 ++++++++------
 graphics/metacam/Makefile           |  6 +++--
 graphics/mpeg2codec/Makefile        | 13 ++++-----
 graphics/ns-cult3d/Makefile         | 10 ++++---
 graphics/php-jpgraph/Makefile       | 41 ++++++++++++++++-------------
 graphics/phpsview/Makefile          |  5 ++--
 graphics/ploticus-examples/Makefile |  8 +++---
 graphics/ploticus/Makefile          | 10 ++++---
 graphics/png2html/Makefile          | 17 +++++++-----
 graphics/pngcheck/Makefile          | 11 +++++---
 graphics/pngcrush/Makefile          |  6 +++--
 graphics/ppmtoxvpic/Makefile        |  7 ++---
 graphics/prag/Makefile              |  8 +++---
 graphics/py-gdchart/Makefile        | 10 ++++---
 graphics/rayshade/Makefile          | 23 +++++++++-------
 graphics/resize_image/Makefile      |  6 +++--
 graphics/s10sh/Makefile             | 10 ++++---
 graphics/tkpiechart/Makefile        |  7 ++---
 graphics/vid/Makefile               | 11 ++++----
 graphics/vtk-data/Makefile          |  9 ++++---
 graphics/vtk-docs/Makefile          | 10 ++++---
 graphics/xdvipresent/Makefile       | 25 ++++++++++--------
 graphics/xzgv/Makefile              | 11 +++++---
 46 files changed, 360 insertions(+), 239 deletions(-)

diff --git a/graphics/3DKit/Makefile b/graphics/3DKit/Makefile
index 6e9895dd63805..95e1bf1d9b4b6 100644
--- a/graphics/3DKit/Makefile
+++ b/graphics/3DKit/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2008/01/18 05:06:37 tnn Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/04 15:39:09 jlam Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../graphics/3DKit/Makefile.common"
 PKGREVISION=	13
 
@@ -13,8 +15,9 @@ NO_BUILD=	YES
 WRKSRC=		${WRKDIR}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/3DKit
-	${INSTALL_DATA} ${WRKSRC}/${DISTFILES} ${PREFIX}/share/doc/3DKit
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/3DKit
+	${INSTALL_DATA} ${WRKSRC}/${DISTFILES} \
+		${DESTDIR}${PREFIX}/share/doc/3DKit
 
 .include "../../graphics/GlutKit/buildlink3.mk"
 .include "../../graphics/GLXKit/buildlink3.mk"
diff --git a/graphics/CRWInfo/Makefile b/graphics/CRWInfo/Makefile
index 4e50c1cfda279..7327fc51e6a00 100644
--- a/graphics/CRWInfo/Makefile
+++ b/graphics/CRWInfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:59 tv Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	CRWInfo-0.2
@@ -9,13 +9,15 @@ MAINTAINER=	kirtai@users.sourceforge.net
 HOMEPAGE=	http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/
 COMMENT=	Extracts exposure information and thumbnails from Canon RAW files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=		yes
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/crwinfo ${PREFIX}/bin/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/crwinfo/
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/crwinfo/
+	${INSTALL_PROGRAM} ${WRKSRC}/crwinfo ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/crwinfo/
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/crwinfo/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/OpenRM/Makefile b/graphics/OpenRM/Makefile
index 22bd3db7a6f7f..9dd7568a96d4e 100644
--- a/graphics/OpenRM/Makefile
+++ b/graphics/OpenRM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/01/19 09:16:24 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=		openrm-devel-1.5.2
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.openrm.org/
 COMMENT=		The OpenRM Scene Graph API
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/rm152
 CFLAGS+=		-I${X11BASE}/include
 BUILD_TARGET=		libtool docs
@@ -28,18 +30,18 @@ do-install:
 	# install libraries
 	for name in rm rmaux rmi rmv; do				\
 		${LIBTOOL} --mode=install ${INSTALL_LIB}		\
-			${WRKSRC}/$$name/lib$$name.la ${PREFIX}/lib;	\
+		 ${WRKSRC}/$$name/lib$$name.la ${DESTDIR}${PREFIX}/lib;	\
 	done
 	# install includes
-	${INSTALL_DATA_DIR} ${PREFIX}/include/rm
-	${INSTALL_DATA} ${WRKSRC}/include/rm/*.h ${PREFIX}/include/rm
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/FUTUREPLANS ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/RELEASENOTES ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/HTML/*.html ${DOCDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}/images
-	${INSTALL_DATA} ${WRKSRC}/doc/HTML/images/* ${DOCDIR}/images
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/rm
+	${INSTALL_DATA} ${WRKSRC}/include/rm/*.h ${DESTDIR}${PREFIX}/include/rm
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/FUTUREPLANS ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/RELEASENOTES ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/HTML/*.html ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/doc/HTML/images/* ${DESTDIR}${DOCDIR}/images
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
diff --git a/graphics/PanoTools/Makefile b/graphics/PanoTools/Makefile
index 9e33291fdd655..09b1d426412f8 100644
--- a/graphics/PanoTools/Makefile
+++ b/graphics/PanoTools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/07/29 05:19:27 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=		PanoTools
@@ -14,6 +14,8 @@ COMMENT=		View, create, edit, and remap panoramic images
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	base jpeg png tiff
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/PTLinux
 BUILD_DIRS=		# empty
 USE_JAVA=		run
@@ -24,44 +26,47 @@ PLIST_SUBST+=		JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}"
 INSTALLATION_DIRS=	bin lib
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libpano12.so ${EMULDIR}/lib
+	${INSTALL_DATA} ${WRKSRC}/libpano12.so ${DESTDIR}${EMULDIR}/lib
+	${INSTALL_LIB_DIR} ${DESTDIR}${PKG_JAVA_HOME}/lib/${MACHINE_ARCH}
 	${LN} -s ${EMULDIR}/lib/libpano12.so				\
-		${PKG_JAVA_HOME}/lib/${MACHINE_ARCH}/libpano12.lib.so
-	${INSTALL_DATA_DIR} ${PREFIX}/share/PanoTools
+		${DESTDIR}${PKG_JAVA_HOME}/lib/${MACHINE_ARCH}/libpano12.lib.so
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/PanoTools
 .for jar in ptcrypt pteditor ptpicker
-	${INSTALL_DATA} ${WRKSRC}/${jar}.jar ${PREFIX}/share/PanoTools
+	${INSTALL_DATA} ${WRKSRC}/${jar}.jar				\
+		${DESTDIR}${PREFIX}/share/PanoTools
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/PanoTools
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/PanoTools
 .for doc in Readme.html Readme.txt Copyright/COPYRIGHT_TIFF		\
 	Copyright/Copying.html Copyright/README_JPEG			\
 	Scripts/Optimizer_Script.txt Scripts/Stitcher_Script.txt
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/PanoTools
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DESTDIR}${PREFIX}/share/doc/PanoTools
 .endfor
 .for bin in ptcrypt pteditor ptpicker
 	${SED} < ${FILESDIR}/ptfile.sh > ${WRKDIR}/${bin}		\
 		-e 's|@@prefix@@|${PREFIX}|g'				\
 		-e 's|@@javahome@@|${PKG_JAVA_HOME}|g'			\
 		-e 's|@@ptfile@@|${bin}|g'
-	${INSTALL_SCRIPT} ${WRKDIR}/${bin} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${bin} ${DESTDIR}${PREFIX}/bin
 .endfor
 	${SED} < ${FILESDIR}/mkpthelpers.sh > ${WRKDIR}/mkpthelpers	\
 		-e 's|@@prefix@@|${PREFIX}|g'				\
 		-e 's|@@javahome@@|${PKG_JAVA_HOME}|g'			\
 		-e 's|@@ptfile@@|${bin}|g'
-	${INSTALL_SCRIPT} ${WRKDIR}/mkpthelpers ${PREFIX}/bin
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/PanoTools
+	${INSTALL_SCRIPT} ${WRKDIR}/mkpthelpers ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/libexec/PanoTools
 .for bin in PTAverage PTInterpolate PTMorpher PTOptimizer PTStereo	\
 	PTStitcher PTStripe
-	${INSTALL_SCRIPT} ${WRKSRC}/Helpers/${bin} ${PREFIX}/libexec/PanoTools
+	${INSTALL_SCRIPT} ${WRKSRC}/Helpers/${bin}			\
+		${DESTDIR}${PREFIX}/libexec/PanoTools
 	[ ! -f ${WRKSRC}/Helpers/${bin}.txt ] ||			\
 	${INSTALL_DATA} ${WRKSRC}/Helpers/${bin}.txt			\
-		${PREFIX}/share/doc/PanoTools
+		${DESTDIR}${PREFIX}/share/doc/PanoTools
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/PanoTools/Templates
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/PanoTools/Templates
 .for hlp in 3DMF_HEADER 3DMF_TRIMESH INDEXED_FACE_FMT LP_ivr		\
 	LPjava_html LPjava_ivr VRML_HEADER vrml_wrl
 	${INSTALL_DATA} ${WRKSRC}/Helpers/Templates/${hlp}		\
-		${PREFIX}/share/PanoTools/Templates
+		${DESTDIR}${PREFIX}/share/PanoTools/Templates
 .endfor
 
 .include "../../mk/java-vm.mk"
diff --git a/graphics/blender-doc/Makefile b/graphics/blender-doc/Makefile
index c24218a72f2a9..4ec4c84fbb441 100644
--- a/graphics/blender-doc/Makefile
+++ b/graphics/blender-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/04/12 21:02:35 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/04 15:39:09 jlam Exp $
 
 DISTNAME=	BlenderManual.html
 PKGNAME=	blender-doc-20030922
@@ -12,14 +12,17 @@ COMMENT=	Documentation for Blender
 
 CONFLICTS=	blender<=2.31
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/doc
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/blender
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/blender
 	cd ${WRKDIR}/html && ${PAX} -s,.*/CVS.*,, -s,.*/.xvpics.*,, \
-		-rw . ${PREFIX}/share/doc/blender
-	cd ${PREFIX}/share/doc/blender && ${LN} -s book1.html index.html
+		-rw . ${DESTDIR}${PREFIX}/share/doc/blender
+	cd ${DESTDIR}${PREFIX}/share/doc/blender && \
+		${LN} -s book1.html index.html
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile
index 3bf0254d9d2b2..ca667c931f06f 100644
--- a/graphics/dcraw/Makefile
+++ b/graphics/dcraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/03/02 09:48:42 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	dcraw-8.82
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cybercom.net/~dcoffin/dcraw/
 COMMENT=	Raw digital camera decoder
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 WRKSRC=			${WRKDIR}/${PKGBASE}
 USE_TOOLS+=		msgfmt
@@ -51,13 +53,15 @@ do-build:
 	done;
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dcraw ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/dcraw.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/dcraw ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/dcraw.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .for l in ${DCRAW_MANS}
-	${INSTALL_MAN} ${WRKSRC}/dcraw_${l}.1 ${PREFIX}/${PKGMANDIR}/${l}/man1/dcraw.1
+	${INSTALL_MAN} ${WRKSRC}/dcraw_${l}.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/${l}/man1/dcraw.1
 .endfor
 .for l in ${DCRAW_LOCALES}
-	${INSTALL_DATA} ${WRKSRC}/dcraw_${l}.mo ${PREFIX}/${PKGLOCALEDIR}/locale/${l}/LC_MESSAGES/dcraw.mo
+	${INSTALL_DATA} ${WRKSRC}/dcraw_${l}.mo \
+		${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale/${l}/LC_MESSAGES/dcraw.mo
 .endfor
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/ewipe/Makefile b/graphics/ewipe/Makefile
index de00f247b4cc6..adc835097e5f2 100644
--- a/graphics/ewipe/Makefile
+++ b/graphics/ewipe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/01/31 15:47:58 reed Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	ewipe-1.2.0
@@ -9,6 +9,8 @@ MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.jnet-jp.to/~sekisita/ewipe/index-e.html
 COMMENT=	Presentation editor and viewer based on Tcl/Tk
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 USE_LANGUAGES=	# none
@@ -24,15 +26,16 @@ SUBST_SED.wish+=	-e 's,PATH \.,PATH ${PREFIX}/share/ewipe,'
 INSTALLATION_DIRS=	bin share/ewipe share/doc/ewipe share/examples/ewipe
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/ewipe ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/ewipe ${DESTDIR}${PREFIX}/bin
 .for i in definefont.tcl edittable.tcl setpointer.tcl viewer.tcl tclIndex
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/ewipe/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/ewipe/
 .endfor
 .for i in README dot.ewipe Changes.jp README.jp
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/ewipe/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/ewipe/
 .endfor
 .for i in a1.gif a2.gif a3.gif a4.gif blue1.gif sample.ewp test.ewp tutorial-e.ewp tutorial.ewp
-	${INSTALL_DATA} ${WRKSRC}/sample/${i} ${PREFIX}/share/examples/ewipe/
+	${INSTALL_DATA} ${WRKSRC}/sample/${i} \
+		${DESTDIR}${PREFIX}/share/examples/ewipe/
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/f4l/Makefile b/graphics/f4l/Makefile
index 71cbc9ec1fcf5..ebf73d394c16c 100644
--- a/graphics/f4l/Makefile
+++ b/graphics/f4l/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/05/22 19:06:28 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/04 15:39:09 jlam Exp $
 
 DISTNAME=	f4l-0.2.1
 CATEGORIES=	graphics
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://f4l.sourceforge.net/
 COMMENT=	Development environment for Macromedia Flash
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=		yes
 USE_LANGUAGES=		c++
 USE_LIBTOOL=		yes
@@ -17,7 +19,7 @@ USE_TOOLS+=		gmake
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/f4l ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/f4l ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index 3915571acb510..b67a2a4f89e3d 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/12/15 20:32:57 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2008/03/04 15:39:09 jlam Exp $
 
 DISTNAME=	fly-1.6.5
 PKGREVISION=	8
@@ -11,6 +11,8 @@ COMMENT=	Command-file interface for creating and modifying PNG images
 
 BUILD_DEPENDS+=	gif2png>=2.4.2:../../graphics/gif2png
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	examples/cgi-perl-example.pl \
 		examples/fly-tester.pl \
@@ -27,13 +29,15 @@ pre-configure:
 		${WRKSRC}/examples/cgi-perl-example.pl
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fly ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fly
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fly
+	${INSTALL_PROGRAM} ${WRKSRC}/fly ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/fly
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/fly
 	cd ${WRKSRC}/doc; ${LOCALBASE}/bin/gif2png *.gif
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.png ${PREFIX}/share/doc/fly
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.png \
+		${DESTDIR}${PREFIX}/share/doc/fly
 	${RM} -f ${WRKSRC}/examples/*.orig
-	cd ${WRKSRC}/examples; ${INSTALL_DATA} * ${PREFIX}/share/examples/fly
+	cd ${WRKSRC}/examples; ${INSTALL_DATA} * \
+		${DESTDIR}${PREFIX}/share/examples/fly
 
 .include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
diff --git a/graphics/fotox/Makefile b/graphics/fotox/Makefile
index 931a625edce74..b813da3b57a4b 100644
--- a/graphics/fotox/Makefile
+++ b/graphics/fotox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/01/11 13:14:39 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	fotox.34
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://kornelix.squarespace.com/fotox/
 COMMENT=	Simple image manipulation program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/fotox
 USE_LANGUAGES=	c++
 USE_TOOLS+=	pkg-config
@@ -21,17 +23,20 @@ SUBST_STAGE.data=	pre-build
 SUBST_FILES.data=	zfuncs.cpp
 SUBST_VARS.data=	FDATA
 
+INSTALLATION_DIRS=	bin share/applications
+
 do-build:
 	(cd ${WRKSRC} && ${SH} build ${PREFIX} y)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fotox ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${FDATA}
-	${INSTALL_DATA} ${WRKSRC}/parameters.txt ${FDATA}
-	${CP} -r ${WRKSRC}/icons ${FDATA}
-	${INSTALL_DATA} ${WRKSRC}/fotox-guide.pdf ${FDATA}
-	${INSTALL_DATA} ${WRKSRC}/*.xtext ${FDATA}
-	${INSTALL_DATA} ${WRKSRC}/fotox.desktop ${PREFIX}/share/applications
+	${INSTALL_PROGRAM} ${WRKSRC}/fotox ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${FDATA}
+	${INSTALL_DATA} ${WRKSRC}/parameters.txt ${DESTDIR}${FDATA}
+	${CP} -r ${WRKSRC}/icons ${DESTDIR}${FDATA}
+	${INSTALL_DATA} ${WRKSRC}/fotox-guide.pdf ${DESTDIR}${FDATA}
+	${INSTALL_DATA} ${WRKSRC}/*.xtext ${DESTDIR}${FDATA}
+	${INSTALL_DATA} ${WRKSRC}/fotox.desktop \
+		${DESTDIR}${PREFIX}/share/applications
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/graphics/fujiplay/Makefile b/graphics/fujiplay/Makefile
index 840ab03b661fc..7127ed15856a6 100644
--- a/graphics/fujiplay/Makefile
+++ b/graphics/fujiplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/05/04 16:39:53 tv Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	fujiplay
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://topo.math.u-psud.fr/~bousch/fujiplay.html
 COMMENT=	Download pictures from some Fujifilm digital cameras
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	fujiplay-1.33
 WRKSRC=		${WRKDIR}
 
@@ -25,11 +27,13 @@ SUBST_FILES.cvsid=	fujiplay.c
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fujiplay	${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/yycc2ppm	${PREFIX}/bin
-	${INSTALL_MAN_DIR} ${PREFIX}/share/doc/fujiplay
-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/fujiplay
-	${INSTALL_MAN} ${WRKSRC}/fujiplay.lsm ${PREFIX}/share/doc/fujiplay
-	${INSTALL_MAN} ${WRKSRC}/mx700-commands.html ${PREFIX}/share/doc/fujiplay
+	${INSTALL_PROGRAM} ${WRKSRC}/fujiplay	${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/yycc2ppm	${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/fujiplay
+	${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/fujiplay
+	${INSTALL_MAN} ${WRKSRC}/fujiplay.lsm \
+		${DESTDIR}${PREFIX}/share/doc/fujiplay
+	${INSTALL_MAN} ${WRKSRC}/mx700-commands.html \
+		${DESTDIR}${PREFIX}/share/doc/fujiplay
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/get_ds7/Makefile b/graphics/get_ds7/Makefile
index 72e3e39088f81..94a0b1a9566e7 100644
--- a/graphics/get_ds7/Makefile
+++ b/graphics/get_ds7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:47 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	get_ds7_1.2.4
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.yk.rim.or.jp/~mamo/Computer/DS-7/index-e.html
 COMMENT=	Read pictures from a FUJIFILM DS-7(DS series) digital camera
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	perl:run
 
 WRKSRC=		${WRKDIR}/ds-7_1.2.4
@@ -28,12 +30,12 @@ post-patch:
 		<${WRKSRC}/get_ds7 >${WRKSRC}/get_ds7.exe
 
 do-install:
-	${INSTALL_DATA_DIR} ${PERL5_INSTALLVENDORLIB}
-	${INSTALL_DATA} ${WRKSRC}/ds7_lib.pm ${PERL5_INSTALLVENDORLIB}
-	${INSTALL_SCRIPT} ${WRKSRC}/get_ds7.exe ${PREFIX}/bin/get_ds7
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCDIR}
-	${INSTALL_MAN} ${WRKSRC}/README.english ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PERL5_INSTALLVENDORLIB}
+	${INSTALL_DATA} ${WRKSRC}/ds7_lib.pm ${DESTDIR}${PERL5_INSTALLVENDORLIB}
+	${INSTALL_SCRIPT} ${WRKSRC}/get_ds7.exe ${DESTDIR}${PREFIX}/bin/get_ds7
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+	${INSTALL_MAN} ${WRKSRC}/README.english ${DESTDIR}${DOCDIR}
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index 0f0f1fe3b1896..226e24926067c 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/12/15 14:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=		gfract-0.32
@@ -11,12 +11,13 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.oskusoft.com/osku/gfract/index.html
 COMMENT=		Gtk-based fractal program
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake pkg-config
 BUILD_TARGET=		gfract
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Fixing prefix.
 SUBST_STAGE.prefix=	post-extract
@@ -32,10 +33,11 @@ post-extract:
 	${MV} ${WRKDIR}/monk2\'.map ${WRKDIR}/monk2.map
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/gfract
-	${INSTALL_DATA_DIR} ${PREFIX}/share/gfract/palettes
-	${INSTALL_DATA} ${WRKDIR}/*.map ${PREFIX}/share/gfract/palettes/
-	${INSTALL_DATA} ${WRKSRC}/gfract.xpm ${PREFIX}/share/gfract/
-	${INSTALL_PROGRAM} ${WRKSRC}/gfract ${PREFIX}/bin/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/gfract
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/gfract/palettes
+	${INSTALL_DATA} ${WRKDIR}/*.map \
+		${DESTDIR}${PREFIX}/share/gfract/palettes/
+	${INSTALL_DATA} ${WRKSRC}/gfract.xpm ${DESTDIR}${PREFIX}/share/gfract/
+	${INSTALL_PROGRAM} ${WRKSRC}/gfract ${DESTDIR}${PREFIX}/bin/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gif320/Makefile b/graphics/gif320/Makefile
index 14fa952a14ce8..f8712edec5dc1 100644
--- a/graphics/gif320/Makefile
+++ b/graphics/gif320/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:55 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	gif320-3.3
@@ -9,18 +9,21 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	GIF file viewer for use with VT-320 terminals
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_TARGET=	# empty
 WRKSRC=		${WRKDIR}/gif320
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gif320 ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/gif320.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gif320
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gif320
-	${INSTALL_DATA} ${WRKSRC}/README.VMS ${PREFIX}/share/doc/gif320
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/gif320
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/gif320
+	${INSTALL_PROGRAM} ${WRKSRC}/gif320 ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/gif320.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gif320
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/gif320
+	${INSTALL_DATA} ${WRKSRC}/README.VMS \
+		${DESTDIR}${PREFIX}/share/doc/gif320
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/share/doc/gif320
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/gif320
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/giftrans/Makefile b/graphics/giftrans/Makefile
index 9dfee5af6f86f..180be5f198027 100644
--- a/graphics/giftrans/Makefile
+++ b/graphics/giftrans/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:55 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	sgif1122
@@ -11,12 +11,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	ftp://ftp.rz.uni-karlsruhe.de/pub/net/www/tools/giftrans/
 COMMENT=	Manipulate GIF89a images' transparency, comment and other data
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/usr/src/${PKGNAME_NOREV}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/giftrans ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/giftrans.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/giftrans ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/giftrans.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp-fix-ca/Makefile b/graphics/gimp-fix-ca/Makefile
index 4401bffe036a9..526044db0c58a 100644
--- a/graphics/gimp-fix-ca/Makefile
+++ b/graphics/gimp-fix-ca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/01/18 05:06:39 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=		gimp-fix-ca-3.0.1
@@ -11,6 +11,8 @@ MAINTAINER=		dsainty@NetBSD.org
 HOMEPAGE=		http://kcd.sourceforge.net/fix-ca.php
 COMMENT=		GIMP plugin to correct chromatic aberration (CA)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 FETCH_BEFORE_ARGS+=	-o ${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		yes
@@ -30,7 +32,7 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} \
-		${PREFIX}/lib/gimp/2.0/plug-ins/fix-ca
+		${DESTDIR}${PREFIX}/lib/gimp/2.0/plug-ins/fix-ca
 
 .include "../../graphics/gimp/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/graphics/gimp-rawphoto/Makefile b/graphics/gimp-rawphoto/Makefile
index 2573dac3010cd..a755822181b48 100644
--- a/graphics/gimp-rawphoto/Makefile
+++ b/graphics/gimp-rawphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/01/18 05:06:40 tnn Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=		rawphoto-200410220928
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://web.archive.org/web/20060207024636/http://ptj.rozeta.com.pl/Soft/RawPhoto
 COMMENT=		Digicam RAW file importer for GIMP
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/rawphoto-200410220910/src
 BUILD_TARGET=		build
 INSTALLATION_DIRS=	lib/gimp/2.0/plug-ins
@@ -24,7 +26,7 @@ pre-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rawphoto \
-		${PREFIX}/lib/gimp/2.0/plug-ins
+		${DESTDIR}${PREFIX}/lib/gimp/2.0/plug-ins
 
 .include "../../graphics/gimp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp-warp-sharp/Makefile b/graphics/gimp-warp-sharp/Makefile
index 16d24c8be60c5..1163219b8f667 100644
--- a/graphics/gimp-warp-sharp/Makefile
+++ b/graphics/gimp-warp-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:09:31 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 15:39:09 jlam Exp $
 
 DISTNAME=	warp-sharp
 PKGNAME=	gimp-${DISTNAME}-1.4
@@ -13,6 +13,8 @@ COMMENT=	Image sharpening script for GIMP
 
 DEPENDS+=	gimp>=2.0:../../graphics/gimp
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -23,6 +25,6 @@ INSTALLATION_DIRS=	share/gimp/2.0/scripts
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}${EXTRACT_SUFX} \
-		${PREFIX}/share/gimp/2.0/scripts
+		${DESTDIR}${PREFIX}/share/gimp/2.0/scripts
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/glx-utils/Makefile b/graphics/glx-utils/Makefile
index ce0f59afa0f8b..dac16edf246db 100644
--- a/graphics/glx-utils/Makefile
+++ b/graphics/glx-utils/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2006/08/01 21:40:20 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/04 15:39:10 jlam Exp $
 
 DISTNAME=	MesaDemos-${MESA_VERSION}
 PKGNAME=	glx-utils-${MESA_VERSION}
 CATEGORIES=	x11 graphics
 COMMENT=	OpenGL glxgears and glxinfo
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../graphics/Mesa/Makefile.common"
 
 INSTALLATION_DIRS=	bin
@@ -23,7 +25,9 @@ do-build:
 		-L../../lib -lGLU -lGL -lm -lXext ${PTHREAD_LIBS} -o glxinfo
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/glxgears ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/glxinfo ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/glxgears \
+		${DESTDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/glxinfo \
+		${DESTDIR}${PREFIX}/bin/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gmngview/Makefile b/graphics/gmngview/Makefile
index 55e80b5bfc1e2..bdab9d3b32c05 100644
--- a/graphics/gmngview/Makefile
+++ b/graphics/gmngview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/12/02 12:38:19 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=	libmng-1.0.10
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=
 COMMENT=	Simple GTK-based MNG viewer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/contrib/gcc/gtk-mng-view
 MAKE_ENV+=	LIBMNG_PREFIX=${BUILDLINK_PREFIX.mng:Q}
 
@@ -18,7 +20,7 @@ INSTALLATION_DIRS=	bin
 USE_TOOLS+=		pkg-config
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gmngview ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/gmngview ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile
index e42243e611f1c..c71f56bb48766 100644
--- a/graphics/iGMT/Makefile
+++ b/graphics/iGMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/09/02 13:33:44 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2008/03/04 15:39:10 jlam Exp $
 
 DISTNAME=		igmt_v1.2
 PKGNAME=		iGMT-1.2
@@ -16,6 +16,8 @@ DEPENDS+=		tk>=8.0:../../x11/tk
 DEPENDS+=		gv-[0-9]*:../../print/gv
 DEPENDS+=		ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/igmt_1.2
 NO_BUILD=		yes
 
@@ -37,22 +39,24 @@ do-configure:
 	done
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/igmt ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/igmt
+	${INSTALL_SCRIPT} ${WRKSRC}/igmt ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/igmt
 	cd ${WRKSRC} && ${INSTALL_DATA} manual.ps README.TXT NOTES.TXT 	\
-		COPYING COPYRIGHT ${PREFIX}/share/igmt/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/igmt/colormaps
-	${INSTALL_DATA} ${WRKSRC}/colormaps/* ${PREFIX}/share/igmt/colormaps/
+		COPYING COPYRIGHT ${DESTDIR}${PREFIX}/share/igmt/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/igmt/colormaps
+	${INSTALL_DATA} ${WRKSRC}/colormaps/*				\
+		${DESTDIR}${PREFIX}/share/igmt/colormaps/
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} igmt*.tcl *.awk 		\
-		igmt_helper* *.batch ${PREFIX}/share/igmt/
+		igmt_helper* *.batch ${DESTDIR}${PREFIX}/share/igmt/
 	cd ${WRKSRC} && ${INSTALL_DATA} 01_02-98.cmt			\
 		gps.vel hotspots.dat nuvel.yx igmt_def.gif		\
 		allslabs_rum.gmt volcanoes.dat wcity.dat		\
 		wcity_major.dat	igmt_gmtdefaults_3.0			\
 		igmt_gmtdefaults_3.1 igmt_gmtdefaults_3.2		\
-		igmt_gmtdefaults_3.3 ${PREFIX}/share/igmt/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/igmt
+		igmt_gmtdefaults_3.3 ${DESTDIR}${PREFIX}/share/igmt/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/igmt
 	cd ${WRKSRC} && ${INSTALL_DATA} example*.ps.gz			\
-		${WRKSRC}/example*.dat ${PREFIX}/share/examples/igmt/
+		${WRKSRC}/example*.dat					\
+		${DESTDIR}${PREFIX}/share/examples/igmt/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jhead/Makefile b/graphics/jhead/Makefile
index 2e1029f0dc4ef..56756ea19af99 100644
--- a/graphics/jhead/Makefile
+++ b/graphics/jhead/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/02/04 14:42:14 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=	jhead-2.4
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.sentex.net/~mwandel/jhead/
 COMMENT=	Extract EXIF header from JPEG image
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	gunzip
 MAKE_FILE=	makefile
@@ -20,9 +21,10 @@ post-extract:
 	${GUNZIP_CMD} ${WRKSRC}/jhead.1.gz
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/jhead
-	${INSTALL_PROGRAM} ${WRKSRC}/jhead ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/jhead.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/usage.html ${PREFIX}/share/doc/html/jhead
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/jhead
+	${INSTALL_PROGRAM} ${WRKSRC}/jhead ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/jhead.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/usage.html \
+		${DESTDIR}${PREFIX}/share/doc/html/jhead
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jpeg2ps/Makefile b/graphics/jpeg2ps/Makefile
index ad56b8e01545a..d62cc490066d5 100644
--- a/graphics/jpeg2ps/Makefile
+++ b/graphics/jpeg2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:56 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=	jpeg2ps-1.9
@@ -9,15 +9,15 @@ MAINTAINER=	dillo@NetBSD.org
 HOMEPAGE=	http://www.pdflib.com/products/more/jpeg2ps.html
 COMMENT=	Convert jpeg images to PostScript level 2 or 3
 
-
 RESTRICTED=		may not be sold
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/jpeg2ps ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/jpeg2ps.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/jpeg2ps ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/jpeg2ps.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jpeg_ls/Makefile b/graphics/jpeg_ls/Makefile
index e5f7a250d339f..0220170d0b517 100644
--- a/graphics/jpeg_ls/Makefile
+++ b/graphics/jpeg_ls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/10/04 21:44:47 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=		jpeg_ls_v2.2
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://kt.ijs.si/aleks/jpeg-ls/mirror.htm
 COMMENT=		JPEG-LS codec (lossless/near-lossless codec)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DIRS=		${WRKSRC}/Decoder ${WRKSRC}/Encoder
 MAKE_FILE=		makefile
 
@@ -17,12 +19,14 @@ LICENSE=		no-commercial-use
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Decoder/locod ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/Encoder/locoe ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jpeg_ls
-	${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/jpeg_ls
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/jpeg_ls
-	${INSTALL_DATA} ${WRKSRC}/*.jls ${PREFIX}/share/examples/jpeg_ls
-	${INSTALL_DATA} ${WRKSRC}/table* ${PREFIX}/share/examples/jpeg_ls
+	${INSTALL_PROGRAM} ${WRKSRC}/Decoder/locod ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/Encoder/locoe ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/jpeg_ls
+	${INSTALL_DATA} ${WRKSRC}/README* ${DESTDIR}${PREFIX}/share/doc/jpeg_ls
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/jpeg_ls
+	${INSTALL_DATA} ${WRKSRC}/*.jls \
+		${DESTDIR}${PREFIX}/share/examples/jpeg_ls
+	${INSTALL_DATA} ${WRKSRC}/table* \
+		${DESTDIR}${PREFIX}/share/examples/jpeg_ls
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/metacam/Makefile b/graphics/metacam/Makefile
index a5ecd07a5d9f1..e980ea9945f4d 100644
--- a/graphics/metacam/Makefile
+++ b/graphics/metacam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/05 17:25:23 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=		metacam-1.2
@@ -10,13 +10,15 @@ MAINTAINER=		simonb@NetBSD.org
 HOMEPAGE=		http://www.cheeseplant.org/~daniel/pages/metacam.html
 COMMENT=		Digital camera image meta-information reader
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake
 BUILD_TARGET=		default
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/metacam ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/metacam ${DESTDIR}${PREFIX}/bin
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile
index de4da8b71f484..cf8b873ceb48c 100644
--- a/graphics/mpeg2codec/Makefile
+++ b/graphics/mpeg2codec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/01/10 09:48:55 abs Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/04 15:39:10 jlam Exp $
 
 DISTNAME=	mpeg2vidcodec_v12
 PKGNAME=	mpeg2codec-1.2
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.mpeg.org/MSSG/
 COMMENT=	MPEG Software Simulation Group's MPEG-2 Encoder and Decoder
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/mpeg2
 USE_X11BASE=		yes
@@ -25,11 +26,11 @@ do-install:
 	${INSTALL_PROGRAM} \
 	  ${WRKSRC}/src/mpeg2dec/mpeg2decode \
 	  ${WRKSRC}/src/mpeg2enc/mpeg2encode \
-	  ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mpeg2codec
+	  ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/mpeg2codec
 	${INSTALL_DATA} ${WRKSRC}/doc/mpeg2enc.doc \
-	  ${PREFIX}/share/doc/mpeg2codec
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mpeg2codec
-	${INSTALL_DATA} ${WRKSRC}/par/* ${PREFIX}/share/mpeg2codec
+	  ${DESTDIR}${PREFIX}/share/doc/mpeg2codec
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/mpeg2codec
+	${INSTALL_DATA} ${WRKSRC}/par/* ${DESTDIR}${PREFIX}/share/mpeg2codec
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ns-cult3d/Makefile b/graphics/ns-cult3d/Makefile
index 8c1f868f55b02..b92692b170b58 100644
--- a/graphics/ns-cult3d/Makefile
+++ b/graphics/ns-cult3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:34 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=	Cult3D_NS4_5.2b1
@@ -13,6 +13,8 @@ COMMENT=	Netscape plugin for cult 3d files
 NOT_FOR_PLATFORM=	Interix-*-*
 ONLY_FOR_PLATFORM=	*-*-i386
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/cult3d-5.2-b1-linux-x86
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
@@ -26,7 +28,9 @@ post-extract:
 	chmod -R go-w ${WRKSRC}
 
 do-install:
-	cd ${WRKSRC} && pax -wr cult3d ${PREFIX}/lib/netscape/plugins
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ns-cult3d.txt
+	cd ${WRKSRC} && pax -wr cult3d \
+		${DESTDIR}${PREFIX}/lib/netscape/plugins
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/ns-cult3d.txt
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php-jpgraph/Makefile b/graphics/php-jpgraph/Makefile
index d4abd86cf5bc0..75e29b8ebc3a7 100644
--- a/graphics/php-jpgraph/Makefile
+++ b/graphics/php-jpgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:35 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 15:39:10 jlam Exp $
 
 DISTNAME=	jpgraph-1.18
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
@@ -13,6 +13,8 @@ CONFLICTS=	php-jgraph-[0-9]*
 
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=4.3.1:../../graphics/php-gd
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
@@ -26,32 +28,33 @@ PKG_SYSCONFSUBDIR?=	php-jpgraph
 MESSAGE_SUBST+=	PJCONFFILE=${PJCONFFILE} PJDIR=${PJDIR} EXDIR=${EXDIR}
 
 do-install:
-	${INSTALL_DATA_DIR} ${EXDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/php-jpgraph
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/php-jpgraph/html
-	${INSTALL_DATA_DIR} ${PJDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EXDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/php-jpgraph
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/php-jpgraph/html
+	${INSTALL_DATA_DIR} ${DESTDIR}${PJDIR}
 
-	${INSTALL_SCRIPT} ${WRKSRC}/src/Examples/*.php ${EXDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/Examples/*.png ${EXDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/Examples/*.gif ${EXDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/Examples/*.jpg ${EXDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/src/Examples/*.php ${DESTDIR}${EXDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/Examples/*.png ${DESTDIR}${EXDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/Examples/*.gif ${DESTDIR}${EXDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/Examples/*.jpg ${DESTDIR}${EXDIR}
 
-	${RM} -f ${PJDIR}/jpg-config.inc
+	${RM} -f ${DESTDIR}${PJDIR}/jpg-config.inc
 
-	${INSTALL_SCRIPT} ${WRKSRC}/src/*.php ${PJDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/*.inc ${PJDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/*.dat ${PJDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/src/*.php ${DESTDIR}${PJDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/*.inc ${DESTDIR}${PJDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/*.dat ${DESTDIR}${PJDIR}
 
-	${MV} -f ${PJDIR}/jpg-config.inc ${EXDIR}
-	${LN} -sf ${PJCONFFILE} ${PJDIR}/jpg-config.inc
+	${MV} -f ${PJDIR}/jpg-config.inc ${DESTDIR}${EXDIR}
+	${LN} -sf ${PJCONFFILE} ${DESTDIR}${PJDIR}/jpg-config.inc
 
 	for f in README QPL.txt; do \
 		${INSTALL_DATA} ${WRKSRC}/$$f \
-			${PREFIX}/share/doc/php-jpgraph; \
+			${DESTDIR}${PREFIX}/share/doc/php-jpgraph; \
 	done
-	cd ${WRKSRC}/docs && ${PAX} -rw . ${PREFIX}/share/doc/php-jpgraph/html
-	${FIND} ${PREFIX}/share/doc/php-jpgraph/html -type d | ${XARGS} \
-		${CHMOD} ${PKGDIRMODE}
+	cd ${WRKSRC}/docs && ${PAX} -rw . \
+		${DESTDIR}${PREFIX}/share/doc/php-jpgraph/html
+	${FIND} ${DESTDIR}${PREFIX}/share/doc/php-jpgraph/html -type d |
+	${XARGS} ${CHMOD} ${PKGDIRMODE}
 
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/phpsview/Makefile b/graphics/phpsview/Makefile
index 2df479cf2531f..43644a2034279 100644
--- a/graphics/phpsview/Makefile
+++ b/graphics/phpsview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:35 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=	pwc-9.0.2
@@ -15,6 +15,7 @@ MAINTAINER=	hamajima@NetBSD.org
 HOMEPAGE=	http://www.medias.ne.jp/~takam/bsd/NetBSD.html#qcamPro
 COMMENT=	Philips USB Cameras Utilities
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	bin
 
 do-build:
@@ -27,7 +28,7 @@ do-build:
 do-install:
 	for f in phpsshot phpsview ; do				\
 		cd ${WRKSRC}/2.4 &&				\
-		${INSTALL_PROGRAM} $$f ${PREFIX}/bin ;	\
+		${INSTALL_PROGRAM} $$f ${DESTDIR}${PREFIX}/bin 	\
 	done
 
 .include "../../graphics/imlib/buildlink3.mk"
diff --git a/graphics/ploticus-examples/Makefile b/graphics/ploticus-examples/Makefile
index 5d9b96f92ee8a..19e038667992e 100644
--- a/graphics/ploticus-examples/Makefile
+++ b/graphics/ploticus-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/15 14:58:22 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=	plnode141
@@ -12,6 +12,8 @@ MAINTAINER=	rh@NetBSD.org
 # domain squatted
 COMMENT=	Examples for the ploticus data plotting suite
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
@@ -19,8 +21,8 @@ DIST_SUBDIR=	${PKGNAME_NOREV:S/-examples//}
 EXDIR=		${PREFIX}/share/examples/ploticus
 
 do-install:
-	${INSTALL_DATA_DIR} ${EXDIR}
-	cd ${WRKSRC} && ${PAX} -rw -pp doc gallery tabgallery thumbnails thumbpng ${EXDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EXDIR}
+	cd ${WRKSRC} && ${PAX} -rw -pp doc gallery tabgallery thumbnails thumbpng ${DESTDIR}${EXDIR}
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile
index 0fd3a8543bf8b..3310d9f3b8a55 100644
--- a/graphics/ploticus/Makefile
+++ b/graphics/ploticus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2007/02/15 14:58:21 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2008/03/04 15:39:10 jlam Exp $
 
 DISTNAME=	pl231src
 PKGNAME=	ploticus-2.31pl4
@@ -10,6 +10,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://ploticus.sourceforge.net/
 COMMENT=	Versatile data visualization engine
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 NO_CONFIGURE=		yes
 
@@ -26,8 +28,8 @@ MAKE_ENV+=	XINCLUDEDIR="-I${X11BASE}/include"
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pl ${PREFIX}/bin/pl
-	${INSTALL_DATA_DIR} ${PREFABDST}
+	${INSTALL_PROGRAM} ${WRKSRC}/pl ${DESTDIR}${PREFIX}/bin/pl
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFABDST}
 .for file in \
 	README chron.pl chunk_area chunk_chronfilter chunk_doheatmap \
 	chunk_heatmapfilter chunk_logstubs chunk_logtics chunk_read \
@@ -35,7 +37,7 @@ do-install:
 	chunk_xaxis chunk_yaxis compare.pl cumufrac.pl dist.pl draw.pl \
 	heatmap.pl lines.pl multidist.pl pie.pl processdata.pl scat.pl \
 	stack.pl vbars.pl vdist.pl
-	${INSTALL_DATA} ${PREFABSRC}/${file} ${PREFABDST}/${file}
+	${INSTALL_DATA} ${PREFABSRC}/${file} ${DESTDIR}${PREFABDST}/${file}
 .endfor
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index 5a7affc232eaf..169d1918dda4d 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/04/17 13:46:34 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=	png2html-1.1
@@ -10,17 +10,20 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.engr.mun.ca/~holden/png2html.html
 COMMENT=	Takes a PNG image and transforms it to a web page
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 FIX_RPATH+=	CFLAGS
-CFLAGS+=	-L${BUILDLINK_PREFIX.gd}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gd}/lib
+CFLAGS+=	-L${BUILDLINK_PREFIX.gd}/lib \
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gd}/lib
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-		${INSTALL_MAN_DIR} ${PREFIX}/share/doc/png2html
-		${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/png2html
-		${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/png2html
-		${INSTALL_MAN} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/png2html
-		${INSTALL_PROGRAM} ${WRKSRC}/png2html ${PREFIX}/bin
+	${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/png2html
+	${INSTALL_MAN} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/png2html
+	${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/png2html
+	${INSTALL_MAN} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/share/doc/png2html
+	${INSTALL_PROGRAM} ${WRKSRC}/png2html ${DESTDIR}${PREFIX}/bin
 
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pngcheck/Makefile b/graphics/pngcheck/Makefile
index 13d0b884f4c7f..6d42c1b32620a 100644
--- a/graphics/pngcheck/Makefile
+++ b/graphics/pngcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/12/08 18:00:20 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=	pngcheck-2.2.0
@@ -9,14 +9,17 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.libpng.org/pub/png/apps/pngcheck.html
 COMMENT=	Verify the integrity of PNG, JNG, and MNG files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS=	bin
+
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} -DUSE_ZLIB \
 		-o pngcheck pngcheck.c -lz
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pngcheck ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pngcheck
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pngcheck
+	${INSTALL_PROGRAM} ${WRKSRC}/pngcheck ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/pngcheck
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/pngcheck
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index a75c170caebfb..06b97300cd46e 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/07/06 20:51:25 adam Exp $
+# $NetBSD: Makefile,v 1.26 2008/03/04 15:39:10 jlam Exp $
 
 DISTNAME=	pngcrush-1.6.4-nolib
 PKGNAME=	pngcrush-1.6.4
@@ -10,6 +10,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://pmt.sourceforge.net/pngcrush/index.html
 COMMENT=	Optimizer for PNG (Portable Network Graphics) files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=		yes
 INSTALLATION_DIRS=	bin
 
@@ -19,7 +21,7 @@ do-build:
 		`libpng-config --ldflags` -lz
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${DESTDIR}${PREFIX}/bin
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ppmtoxvpic/Makefile b/graphics/ppmtoxvpic/Makefile
index cafced81b007b..69df149db0804 100644
--- a/graphics/ppmtoxvpic/Makefile
+++ b/graphics/ppmtoxvpic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:51 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 15:39:10 jlam Exp $
 #
 
 PKGNAME=	ppmtoxvpic-0.99.9
@@ -8,10 +8,11 @@ CATEGORIES=	graphics
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Convert PPM image to preview pic readable by xv and gimp
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	bin
 
 do-install:
-		${INSTALL_SCRIPT} ${WRKSRC}/utils/xvpicmaker ${PREFIX}/bin
-		${INSTALL_PROGRAM} ${WRKSRC}/utils/ppmtoxvpic ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/xvpicmaker ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/utils/ppmtoxvpic ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/dfm/Makefile.common"
diff --git a/graphics/prag/Makefile b/graphics/prag/Makefile
index c75980afd3988..8c9fe50244bce 100644
--- a/graphics/prag/Makefile
+++ b/graphics/prag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/11/17 13:40:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/04 15:39:10 jlam Exp $
 
 DISTNAME=	prag-1.0pl2
 PKGNAME=	prag-1.0.2
@@ -9,6 +9,8 @@ EXTRACT_SUFX=	.shar
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Replacement to "grap" graph generator backend to pic
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/prag-1.0
 NO_BUILD=	yes
 
@@ -19,7 +21,7 @@ post-patch:
 	(cd ${WRKSRC}; ${SED} -e "1s,/bin/nawk,${AWK}," < prag.orig >prag)
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/prag ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/prag.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/prag ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/prag.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile
index f7ad6a096379e..0c3427b87b5fc 100644
--- a/graphics/py-gdchart/Makefile
+++ b/graphics/py-gdchart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/04/17 13:46:35 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=	gdchart-py-0.6
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://athani.pair.com/msteed/software/gdchart/
 COMMENT=	Python interface to GDChart
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 MAKE_ENV+=	GD_INCLUDE=${LOCALBASE}/include \
 		GDCHART_INCLUDE=${LOCALBASE}/include \
@@ -28,11 +30,11 @@ INSTALLATION_DIRS=	${PYSITELIB:S/^${PREFIX}\///}
 
 do-install:
 .for f in ${MODULE_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${PYSITELIB}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PYSITELIB}
 .endfor
-	${INSTALL_DATA_DIR} ${EXAMPLE_DIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLE_DIR}
 .for f in ${EXAMPLE_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLE_DIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${EXAMPLE_DIR}
 .endfor
 
 .include "../../graphics/gdchart/buildlink3.mk"
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index 06cc3bbb10b45..9f9e9b0ef4c86 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:36 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/04 15:39:10 jlam Exp $
 
 DISTNAME=	rayshade.4.0
 PKGNAME=	rayshade-4.0
@@ -11,20 +11,25 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Extensible system for creating ray-traced images
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 BUILD_TARGET=
 INSTALLATION_DIRS=	bin lib share/doc/rayshade share/examples/rayshade
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rayshade/rayshade ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/libray/libray.a ${PREFIX}/lib
-	${RANLIB} ${PREFIX}/lib/libray.a
-	${INSTALL_DATA} ${WRKSRC}/libshade/libshade.a ${PREFIX}/lib
-	${RANLIB} ${PREFIX}/lib/libshade.a
-	${INSTALL_DATA} ${WRKSRC}/Doc/Guide/* ${PREFIX}/share/doc/rayshade
-	${INSTALL_DATA} ${WRKSRC}/Doc/quickref.txt ${PREFIX}/share/doc/rayshade
-	${INSTALL_DATA} ${WRKSRC}/Examples/* ${PREFIX}/share/examples/rayshade
+	${INSTALL_PROGRAM} ${WRKSRC}/rayshade/rayshade ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/libray/libray.a ${DESTDIR}${PREFIX}/lib
+	${RANLIB} ${DESTDIR}${PREFIX}/lib/libray.a
+	${INSTALL_DATA} ${WRKSRC}/libshade/libshade.a ${DESTDIR}${PREFIX}/lib
+	${RANLIB} ${DESTDIR}${PREFIX}/lib/libshade.a
+	${INSTALL_DATA} ${WRKSRC}/Doc/Guide/* \
+		${DESTDIR}${PREFIX}/share/doc/rayshade
+	${INSTALL_DATA} ${WRKSRC}/Doc/quickref.txt \
+		${DESTDIR}${PREFIX}/share/doc/rayshade
+	${INSTALL_DATA} ${WRKSRC}/Examples/* \
+		${DESTDIR}${PREFIX}/share/examples/rayshade
 
 .include "../../graphics/urt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/resize_image/Makefile b/graphics/resize_image/Makefile
index f49bcd9f1bad3..7c2918b22df90 100644
--- a/graphics/resize_image/Makefile
+++ b/graphics/resize_image/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:51 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=	resize_image-0.6
@@ -10,13 +10,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://lab.erasme.org/resize_image/
 COMMENT=	Fast image resizing tool
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 CFLAGS+=	-DUNIX
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/resize_image ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/resize_image ${DESTDIR}${PREFIX}/bin
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/s10sh/Makefile b/graphics/s10sh/Makefile
index fd1f9411317aa..db8e03d6934e1 100644
--- a/graphics/s10sh/Makefile
+++ b/graphics/s10sh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/10/04 21:44:47 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 15:39:10 jlam Exp $
 #
 
 DISTNAME=	s10sh-0.2.0
@@ -10,15 +10,17 @@ MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://www.kyuzz.org/antirez/s10sh/
 COMMENT=	USB/serial userspace driver for Canon PowerShot cameras
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE:Q}
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/s10sh ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/s10sh
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/s10sh
+	${INSTALL_PROGRAM} ${WRKSRC}/s10sh ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/s10sh
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/s10sh
 
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tkpiechart/Makefile b/graphics/tkpiechart/Makefile
index a98ea5d0780e7..6567c2cd4d83c 100644
--- a/graphics/tkpiechart/Makefile
+++ b/graphics/tkpiechart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/04/22 09:22:09 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/04 15:39:11 jlam Exp $
 
 DISTNAME=	tkpiechart-5.4
 PKGREVISION=	1
@@ -13,6 +13,7 @@ DEPENDS+=	tk>=8.3.2:../../x11/tk
 DEPENDS+=	stooop>=3.7:../../devel/stooop
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -28,7 +29,7 @@ post-patch:
 	${CHMOD} a+x ${WRKSRC}/instapkg.tcl
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl/tkpiechart
-	cd ${WRKSRC}; ./instapkg.tcl ${PREFIX}/lib/tcl/tkpiechart
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/tcl/tkpiechart
+	cd ${WRKSRC}; ./instapkg.tcl ${DESTDIR}${PREFIX}/lib/tcl/tkpiechart
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/vid/Makefile b/graphics/vid/Makefile
index 2702e192f0599..a41ca3174b53f 100644
--- a/graphics/vid/Makefile
+++ b/graphics/vid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/04/17 13:46:36 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/04 15:39:11 jlam Exp $
 #
 
 DISTNAME=	vid-1.0.1
@@ -10,8 +10,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://members.home.com/housel/projects.htm
 COMMENT=	Simple-minded image capture program for some USB webcams
 
-BUILD_TARGET=	vid
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+BUILD_TARGET=	vid
 
 DOCDIR=		share/doc/${PKGBASE}
 PLIST_SUBST+=	DOCDIR=${DOCDIR:Q}
@@ -19,9 +20,9 @@ PLIST_SUBST+=	DOCDIR=${DOCDIR:Q}
 INSTALLATION_DIRS=	bin
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/vid ${PREFIX}/bin
-		${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-		${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${DOCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/vid ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/vtk-data/Makefile b/graphics/vtk-data/Makefile
index 52764a077910a..02d235596784c 100644
--- a/graphics/vtk-data/Makefile
+++ b/graphics/vtk-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/11/10 11:48:23 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/04 15:39:11 jlam Exp $
 #
 
 DISTNAME=	VTKData-4.2
@@ -6,14 +6,17 @@ PKGNAME=	vtk-data-4.2
 PKGREVISION=	1
 COMMENT=	Example data for VTK
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/VTKData-release-4-2
 NO_BUILD=	yes
 
 EXAMPLES_DIR=	share/vtk
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${EXAMPLES_DIR}
-	cd ${WRKSRC} && ${PAX} -rw -pe -s '|.*/CVS/.*||' . ${PREFIX}/${EXAMPLES_DIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${EXAMPLES_DIR}
+	cd ${WRKSRC} && ${PAX} -rw -pe -s '|.*/CVS/.*||' . \
+		${DESTDIR}${PREFIX}/${EXAMPLES_DIR}
 
 .include "../../graphics/vtk/Makefile.common"
 
diff --git a/graphics/vtk-docs/Makefile b/graphics/vtk-docs/Makefile
index 51da921c72204..7f3426882050d 100644
--- a/graphics/vtk-docs/Makefile
+++ b/graphics/vtk-docs/Makefile
@@ -1,19 +1,23 @@
-# $NetBSD: Makefile,v 1.5 2006/11/10 16:30:08 tv Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 15:39:11 jlam Exp $
 #
 
 DISTNAME=	VTKDocHtml-4.2
 PKGNAME=	vtk-docs-4.2
 COMMENT=	Documentation for VTK (HTML)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/html
 NO_BUILD=	yes
 
 HTML_DIR=	share/doc/${PKGNAME}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX:Q}/${HTML_DIR:Q}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/${HTML_DIR:Q}
 	${FIND} ${WRKSRC:Q} -type f -print | \
-		while read f; do ${INSTALL_DATA} $$f ${PREFIX:Q}/${HTML_DIR:Q}; done
+	while read f; do \
+		${INSTALL_DATA} $$f ${DESTDIR}${PREFIX:Q}/${HTML_DIR:Q}; \
+	done
 
 .include "../../graphics/vtk/Makefile.common"
 
diff --git a/graphics/xdvipresent/Makefile b/graphics/xdvipresent/Makefile
index f883c3c93917b..471ce75b8fea9 100644
--- a/graphics/xdvipresent/Makefile
+++ b/graphics/xdvipresent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:56 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/04 15:39:11 jlam Exp $
 #
 
 DISTNAME=	xdvipresent-0.6p14
@@ -13,6 +13,8 @@ COMMENT=	Slide Presentations Using LaTeX/xdvi
 
 DEPENDS+=	latex2html>=2002.2:../../textproc/latex2html
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/xdvipresent
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
@@ -25,16 +27,17 @@ HTML_DIR=	${PREFIX}/share/doc/xdvipresent
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_DATA_DIR} ${STYDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.cls ${STYDIR}
-	${INSTALL_DATA_DIR} ${STYDIR}/images
-	${INSTALL_DATA} ${WRKSRC}/images/* ${STYDIR}/images
-	${INSTALL_SCRIPT} ${WRKSRC}/xdvipresent ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xdvipresent
-	${INSTALL_DATA} ${WRKSRC}/example.tex ${EXAMPLES_DIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/xdvipresent.manl ${PREFIX}/${PKGMANDIR}/man1/xdvipresent.1
-	${INSTALL_DATA_DIR} ${HTML_DIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/xdvipresent_html/* ${HTML_DIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${STYDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.cls ${DESTDIR}${STYDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${STYDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/images/* ${DESTDIR}${STYDIR}/images
+	${INSTALL_SCRIPT} ${WRKSRC}/xdvipresent ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/xdvipresent
+	${INSTALL_DATA} ${WRKSRC}/example.tex ${DESTDIR}${EXAMPLES_DIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/xdvipresent.manl \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xdvipresent.1
+	${INSTALL_DATA_DIR} ${DESTDIR}${HTML_DIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/xdvipresent_html/* ${DESTDIR}${HTML_DIR}
 
 .include "../../print/teTeX/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index ac2796b98f7e8..c318f14fde9df 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/09/23 14:59:34 adrianp Exp $
+# $NetBSD: Makefile,v 1.36 2008/03/04 15:39:11 jlam Exp $
 
 DISTNAME=	xzgv-0.8
 PKGNAME=	xzgv-0.8.0.1
@@ -14,18 +14,21 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://rus.members.beeb.net/xzgv.html
 COMMENT=	Image viewer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=		yes
 USE_TOOLS+=		gmake makeinfo
 INFO_FILES=		# PLIST
 INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/xzgv ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/xzgv.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xzgv ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/xzgv.1				\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	@(cd ${WRKSRC}/doc && ${MAKEINFO} xzgv.texi)
 	cd ${WRKSRC}/doc; for f in xzgv xzgv-[0-9]*; do			\
 		${TEST} ! -f "$$f" ||					\
-		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+		${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\
 	done
 
 .include "../../graphics/imlib/buildlink3.mk"