Add DESTDIR support.

45 files changed, 185 insertions, 82 deletions

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 8c7d54c4f95..54f4700fb84 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2008/04/28 08:28:05 sborrill Exp $
+# $NetBSD: Makefile,v 1.58 2008/06/20 01:09:35 joerg Exp $
 
 DISTNAME=		apcupsd-3.14.3
 CATEGORIES=		sysutils
@@ -8,6 +8,8 @@ MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://www.apcupsd.org/
 COMMENT=		UPS power management for APCC Products
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		msgfmt sh makedepend
 USE_LANGUAGES=		c c++
 
@@ -68,7 +70,8 @@ EGFILES= netbsd/apccontrol etc/changeme etc/commfailure etc/commok \
     etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf
 MANFILES= apcupsd apctest
 
-INSTALLATION_DIRS=	share/examples/apcupsd share/examples/rc.d
+INSTALLATION_DIRS=	share/examples/apcupsd share/examples/rc.d \
+			share/doc/html/apcupsd
 
 SUBST_CLASSES+=		strip
 SUBST_STAGE.strip=	pre-configure
@@ -93,17 +96,16 @@ HTMLDOCS= apcupsd.gif bclogo.gif bugs.html bugs.wml index.html index.wml \
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/platforms/etc/apcupsd.conf \
-		${PREFIX}/share/examples/apcupsd
+		${DESTDIR}${PREFIX}/share/examples/apcupsd
 	${INSTALL_DATA} ${WRKSRC}/src/cgi/apcupsd.css \
-		${PREFIX}/share/examples/apcupsd
+		${DESTDIR}${PREFIX}/share/examples/apcupsd
 .for file in ${EGFILES}
 	${INSTALL_SCRIPT} ${WRKSRC}/platforms/${file} \
-		${PREFIX}/share/examples/apcupsd
+		${DESTDIR}${PREFIX}/share/examples/apcupsd
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/apcupsd
 .for file in ${HTMLDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/home-page/${file} \
-		${PREFIX}/share/doc/html/apcupsd
+		${DESTDIR}${PREFIX}/share/doc/html/apcupsd
 .endfor
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo
index 3a7016ed76c..788c5d76c33 100644
--- a/sysutils/apcupsd/distinfo
+++ b/sysutils/apcupsd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2008/04/28 08:28:05 sborrill Exp $
+$NetBSD: distinfo,v 1.14 2008/06/20 01:09:35 joerg Exp $
 
 SHA1 (apcupsd-3.14.3.tar.gz) = b9f75732752cdee9792a5be526656c153c2d1274
 RMD160 (apcupsd-3.14.3.tar.gz) = 092726b2076e56368cdb7e3c790ee8d5e2a7d2f9
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 3db85accf1b05c8723dd7625278dfac02909dc34
 SHA1 (patch-ac) = 98e8853dd030e09d5a487e57a277ff1269baa517
 SHA1 (patch-ad) = 48818f95966f5c9f742e333614b0ab5387886e62
 SHA1 (patch-ae) = 5e2ded84436b1da8b0eec6577065e0630ce00e78
-SHA1 (patch-af) = c4a52226d83ac50adcd9296afd786b42867a7a6d
+SHA1 (patch-af) = 68e1bdc56a435dbd21551a86848e93491034b4f7
 SHA1 (patch-ag) = 2b77e969d6cbe8ed06797cd753eb443bd6a3881b
 SHA1 (patch-ah) = 738b93b481310aa92ee16d0fbf91b5723b8cabb8
 SHA1 (patch-ai) = be802d4ea438ac991f7e0ebd1c086699aade0b2b
diff --git a/sysutils/apcupsd/patches/patch-af b/sysutils/apcupsd/patches/patch-af
index f67c48d2484..764ec2f0065 100644
--- a/sysutils/apcupsd/patches/patch-af
+++ b/sysutils/apcupsd/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2006/11/15 21:46:25 bouyer Exp $
+$NetBSD: patch-af,v 1.6 2008/06/20 01:09:35 joerg Exp $
 
 --- Makefile.in.orig	2004-02-07 11:04:05.000000000 +0100
 +++ Makefile.in	2006-11-15 17:48:50.000000000 +0100
@@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.5 2006/11/15 21:46:25 bouyer Exp $
  install-directories: install-dir@CGI@
  	$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)	
  	$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)  
-+	$(SHELL) $(MKINSTALLDIRS) $(prefix)/share/examples/apcupsd
++	$(SHELL) $(MKINSTALLDIRS) ${DESTDIR}$(prefix)/share/examples/apcupsd
  	@if [ ! -d $(DESTDIR)$(sysconfdir) ] ; then \
  	      $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir); \
  	      chmod 755 $(DESTDIR)$(sysconfdir); \
diff --git a/sysutils/bbsload/Makefile b/sysutils/bbsload/Makefile
index cbbda169c62..ae02e0c0dd9 100644
--- a/sysutils/bbsload/Makefile
+++ b/sysutils/bbsload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/15 21:46:54 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:35 joerg Exp $
 #
 
 DISTNAME=	bbsload-0.2.6
@@ -10,10 +10,14 @@ MAINTAINER=	pino@dohd.org
 HOMEPAGE=	http://bbtools.windsofstorm.net/
 COMMENT=	Small (in dimensions) tool to display the average load
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_X11BASE=		YES
 
+INSTALLATION_DIRS=	${PKGMANDIR}/man1
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "DragonFly"
@@ -21,7 +25,7 @@ MAKE_ENV+=	LIBS.pkgsrc=-lkinfo
 .endif
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/bbsload.1 ${PREFIX}/${PKGMANDIR}/man1/bbsload.1
+	${INSTALL_MAN} ${WRKSRC}/bbsload.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/bbsload.1
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile
index 504f908f967..132123fa38c 100644
--- a/sysutils/bchunk/Makefile
+++ b/sysutils/bchunk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/11/16 12:03:42 dillo Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:35 joerg Exp $
 
 DISTNAME=	bchunk-1.2.0
 CATEGORIES=	sysutils
@@ -8,12 +8,14 @@ MAINTAINER=	dillo@NetBSD.org
 HOMEPAGE=	http://he.fi/bchunk/
 COMMENT=	".bin/.cue" CD image converter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_FLAGS+=	CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:M*:Q}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bchunk ${PREFIX}/bin/bchunk
-	${INSTALL_MAN} ${WRKSRC}/bchunk.1 ${PREFIX}/${PKGMANDIR}/man1/bchunk.1
+	${INSTALL_PROGRAM} ${WRKSRC}/bchunk ${DESTDIR}${PREFIX}/bin/bchunk
+	${INSTALL_MAN} ${WRKSRC}/bchunk.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/bchunk.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bcmfw/Makefile b/sysutils/bcmfw/Makefile
index ce34c37bb0b..12e1d8476fe 100644
--- a/sysutils/bcmfw/Makefile
+++ b/sysutils/bcmfw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/04/07 16:40:26 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:35 joerg Exp $
 
 DISTNAME=		bcmfw-1.0
 CATEGORIES=		sysutils
@@ -11,6 +11,8 @@ SITES.bluez-firmware-1.2.tar.gz= \
 MAINTAINER=		plunky@rya-online.net
 COMMENT=		Broadcom 2033 Bluetooth Firmware Loader
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 LICENSE=		bcmfw-license
 
 RESTRICTED=		No clear permission redistribute firmware
@@ -35,10 +37,10 @@ SUBST_STAGE.dir=	post-patch
 SUBST_MESSAGE.dir=	Fixing path to firmware directory.
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bcmfw ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/bcmfw.8 ${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_DATA} ${WRKDIR}/bluez-firmware-1.2/broadcom/BCM-LEGAL.txt ${PREFIX}/${FIRMWARE_DIR}
-	${INSTALL_DATA} ${WRKDIR}/bluez-firmware-1.2/broadcom/BCM2033-FW.bin ${PREFIX}/${FIRMWARE_DIR}
-	${INSTALL_DATA} ${WRKDIR}/bluez-firmware-1.2/broadcom/BCM2033-MD.hex ${PREFIX}/${FIRMWARE_DIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bcmfw ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/bcmfw.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_DATA} ${WRKDIR}/bluez-firmware-1.2/broadcom/BCM-LEGAL.txt ${DESTDIR}${PREFIX}/${FIRMWARE_DIR}
+	${INSTALL_DATA} ${WRKDIR}/bluez-firmware-1.2/broadcom/BCM2033-FW.bin ${DESTDIR}${PREFIX}/${FIRMWARE_DIR}
+	${INSTALL_DATA} ${WRKDIR}/bluez-firmware-1.2/broadcom/BCM2033-MD.hex ${DESTDIR}${PREFIX}/${FIRMWARE_DIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index 00f725505e1..b44925b8a09 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/01/29 18:24:30 tnn Exp $
+# $NetBSD: Makefile,v 1.32 2008/06/20 01:09:35 joerg Exp $
 
 DISTNAME=	cdrtools-2.01.01a05
 PKGNAME=	cdrtools-ossdvd-2.01.1.36
@@ -19,6 +19,7 @@ COMMENT=	Software for creating ISO9660 images and writing CDs/CD-RWs/DVDs
 CONFLICTS=	mkisofs-[0-9]* cdrecord-[0-9]* cdrtools-[a-z0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -61,6 +62,8 @@ SUBST_FILES.fix=	cdrecord/defaults.c cdrecord/cdrecord.1 \
 SUBST_SED.fix=		-e "s,@CDRECORD_CONF@,${CDRECORD_CONF},g"
 SUBST_MESSAGE.fix=	Fixing paths.
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
+
 post-extract:
 	${LN} -s Defaults.freebsd ${WRKSRC}/DEFAULTS/Defaults.dragonfly
 	${LN} -s Defaults.freebsd ${WRKSRC}/DEFAULTS_ENG/Defaults.dragonfly
@@ -87,22 +90,22 @@ post-build:
 
 do-install:
 	cd ${WRKSRC}/cdda2wav;						\
-		${INSTALL_PROGRAM} OBJ/*/cdda2wav ${PREFIX}/bin;	\
-		${INSTALL_MAN} cdda2wav.1 ${PREFIX}/${PKGMANDIR}/man1
+		${INSTALL_PROGRAM} OBJ/*/cdda2wav ${DESTDIR}${PREFIX}/bin;	\
+		${INSTALL_MAN} cdda2wav.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	cd ${WRKSRC}/cdrecord;						\
-		${INSTALL_PROGRAM} OBJ/*/cdrecord ${PREFIX}/bin;	\
-		${INSTALL_MAN} cdrecord.1 ${PREFIX}/${PKGMANDIR}/man1
+		${INSTALL_PROGRAM} OBJ/*/cdrecord ${DESTDIR}${PREFIX}/bin;	\
+		${INSTALL_MAN} cdrecord.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	cd ${WRKSRC}/mkisofs;						\
-		${INSTALL_PROGRAM} OBJ/*/mkisofs ${PREFIX}/bin;		\
-		${INSTALL_MAN} mkisofs.8 ${PREFIX}/${PKGMANDIR}/man8
+		${INSTALL_PROGRAM} OBJ/*/mkisofs ${DESTDIR}${PREFIX}/bin;		\
+		${INSTALL_MAN} mkisofs.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	cd ${WRKSRC}/mkisofs/diag;					\
 		for f in devdump isodump isoinfo isovfy; do		\
-			${INSTALL_PROGRAM} OBJ/*/$$f ${PREFIX}/bin;	\
-			${INSTALL_MAN} isoinfo.8 ${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
+			${INSTALL_PROGRAM} OBJ/*/$$f ${DESTDIR}${PREFIX}/bin;	\
+			${INSTALL_MAN} isoinfo.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
 		done
 	cd ${WRKSRC}/readcd;						\
-		${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin;		\
-		${INSTALL_MAN} readcd.1 ${PREFIX}/${PKGMANDIR}/man1
+		${INSTALL_PROGRAM} OBJ/*/readcd ${DESTDIR}${PREFIX}/bin;		\
+		${INSTALL_MAN} readcd.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h)
 LDFLAGS+=	-lrt
diff --git a/sysutils/cfengine2-doc/Makefile b/sysutils/cfengine2-doc/Makefile
index 368ef28874e..f5ba5eaf3ad 100644
--- a/sysutils/cfengine2-doc/Makefile
+++ b/sysutils/cfengine2-doc/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:10 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:35 joerg Exp $
 #
 
 PKGNAME=	cfengine-doc-${CFENGINE_VERSION}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../sysutils/cfengine2/Makefile.common"
 
 COMMENT=	Documentation for cfengine
@@ -17,8 +19,8 @@ INSTALLATION_DIRS=	${PKGINFODIR} ${HTMLDIR}
 do-install:
 	cd ${WRKSRC}/doc; 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} ${WRKSRC}/doc/cfengine-*.html ${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.html ${DESTDIR}${HTMLDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 2f413c0c973..81126efa52c 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2008/06/20 01:09:35 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../sysutils/cdrdao/Makefile.common"
 
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 0d413fc0549..fcb9405e448 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/02/05 23:10:50 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2008/06/20 01:09:35 joerg Exp $
 #
 
 DISTNAME=		gcombust-0.1.54
@@ -10,6 +10,8 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.abo.fi/~jmunsin/gcombust/
 COMMENT=		Graphical frontend for CD mastering (mkisofs, cdrecord, ...)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		cdrtools>=1.10:../../sysutils/cdrtools
 DEPENDS+=		cdlabelgen-[0-9]*:../../graphics/cdlabelgen
 DEPENDS+=		gv-[0-9]*:../../print/gv
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index c04067a514b..479c3d2bbb9 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2008/05/29 11:08:52 drochner Exp $
+# $NetBSD: Makefile,v 1.40 2008/06/20 01:09:35 joerg Exp $
 #
 
 DISTNAME=	gnome-menus-2.22.2
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Implementation of the desktop menu specification for GNOME
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.2
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index 819c6cbbdda..9c1bdb78f75 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2008/06/20 01:09:35 joerg Exp $
 #
 
 DISTNAME=	gnome-pkgview-1.0.6
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.greatnorthern.demon.co.uk/gnome-pkgview.html
 COMMENT=	Displays the version of GNOME components installed
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		intltool msgfmt pkg-config
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 5c66563b3f3..2284a7ec417 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/06/05 10:14:54 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/20 01:09:35 joerg Exp $
 #
 
 DISTNAME=	gnome-settings-daemon-2.22.2.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME settings daemon
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config intltool gmake msgfmt
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 77f398f0ab5..e1a189954ac 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/05/29 17:08:43 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/20 01:09:35 joerg Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.22.2
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME 2 system monitor program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_DIRS+=		gnome2-1.5
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/sysutils/gnome-vfs-monikers/Makefile b/sysutils/gnome-vfs-monikers/Makefile
index 6b0d01ee635..a9dcae73102 100644
--- a/sysutils/gnome-vfs-monikers/Makefile
+++ b/sysutils/gnome-vfs-monikers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	gnome-vfs-monikers-2.15.3
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	VFS namespace moniker for Bonobo
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	intltool pkg-config gmake
diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common
index fc0a74fe155..271c1e4c9f2 100644
--- a/sysutils/gnome-vfs/Makefile.common
+++ b/sysutils/gnome-vfs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2008/04/30 13:38:16 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.10 2008/06/20 01:09:35 joerg Exp $
 #
 
 GNOME_VFS_VERSION=	2.22.0
@@ -115,13 +115,14 @@ PRINT_PLIST_AWK+=	/^@dirrm share\/examples\/gnome-vfs-2.0$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm share\/examples\/gnome-vfs-2.0\/modules$$/ \
 				{ print "@comment in gnome-vfs: " $$0; next; }
 
+INSTALLATION_DIRS+=	lib/gnome-vfs-2.0/modules
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/gnome-vfs-2.0/modules
 	cd ${WRKSRC}/modules && ${LIBTOOL} --mode=install \
 		${INSTALL_DATA} lib${GNOME_VFS_NAME}.la \
-			${PREFIX}/lib/gnome-vfs-2.0/modules
+			${DESTDIR}${PREFIX}/lib/gnome-vfs-2.0/modules
 	cd ${WRKSRC}/modules && ${LIBTOOL} --mode=finish \
-			${PREFIX}/lib/gnome-vfs-2.0/modules
+			${DESTDIR}${PREFIX}/lib/gnome-vfs-2.0/modules
 .endif
 
 .include "../../devel/GConf/buildlink3.mk"
diff --git a/sysutils/gnome-vfsmm/Makefile b/sysutils/gnome-vfsmm/Makefile
index 35b104ffa6b..0f808efbd98 100644
--- a/sysutils/gnome-vfsmm/Makefile
+++ b/sysutils/gnome-vfsmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/04/26 01:07:15 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:36 joerg Exp $
 
 DISTNAME=	gnome-vfsmm-2.22.0
 CATEGORIES=	sysutils
@@ -9,6 +9,8 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://gtkmm.sourceforge.net/
 COMMENT=	C++ bindings for gnome-vfs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DEPENDS+=		doxygen-[0-9]*:../../devel/doxygen
 
 USE_LANGUAGES=		c c++
diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
index 14eaa0b9261..68b30cffcc3 100644
--- a/sysutils/gnometoaster/Makefile
+++ b/sysutils/gnometoaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/09 21:04:45 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	gtoaster1.0Beta5
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gnometoaster.rulez.org/
 COMMENT=	CD recording frontend for X/GTK+
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/gtoaster
 USE_TOOLS+=		gmake
 
diff --git a/sysutils/gnometoaster/distinfo b/sysutils/gnometoaster/distinfo
index 53fe5bb08f7..5aa7bc3c1e4 100644
--- a/sysutils/gnometoaster/distinfo
+++ b/sysutils/gnometoaster/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/05/21 23:02:29 wiz Exp $
+$NetBSD: distinfo,v 1.7 2008/06/20 01:09:36 joerg Exp $
 
 SHA1 (gtoaster1.0Beta5.tgz) = c55bf7e8e532956a8907cd29cbfb98a721c5bb3a
 RMD160 (gtoaster1.0Beta5.tgz) = f8c7386497c56b8e1bf924e099ddf68cbcbd02a0
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = 8d3d500572dbfac5263f7902655ff3269db4102f
 SHA1 (patch-ac) = 8bbb117badd4430eb2fc0eb2ad130671ceb46f47
 SHA1 (patch-ad) = b8b5349fe092cbf9d8a40da272d379e5fae7ef91
 SHA1 (patch-ae) = b1a6f1f9bbaa605b9782f67dd8f6cdaf6770a438
+SHA1 (patch-af) = ca8bb1aa0b5eb267448dc8761ccfcd8428d00503
diff --git a/sysutils/gnometoaster/patches/patch-af b/sysutils/gnometoaster/patches/patch-af
new file mode 100644
index 00000000000..68e9b7638eb
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-af
@@ -0,0 +1,25 @@
+$NetBSD: patch-af,v 1.1 2008/06/20 01:10:02 joerg Exp $
+
+--- po/Makefile.in.in.orig	2008-06-18 16:07:54.000000000 +0000
++++ po/Makefile.in.in
+@@ -111,16 +111,16 @@ install-data: install-data-@USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+ 	if test -r "$(MKINSTALLDIRS)"; then \
+-	  $(MKINSTALLDIRS) $(datadir); \
++	  $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
+ 	else \
+-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++	  $(SHELL) $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
+ 	fi
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+-	    *)     destdir=$(localedir);; \
++	    *.gmo) destdir=${DESTDIR}$(gnulocaledir);; \
++	    *)     destdir=${DESTDIR}$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/sysutils/gst-plugins0.10-gnomevfs/Makefile b/sysutils/gst-plugins0.10-gnomevfs/Makefile
index 1efebcc384d..ec889819179 100644
--- a/sysutils/gst-plugins0.10-gnomevfs/Makefile
+++ b/sysutils/gst-plugins0.10-gnomevfs/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2008/04/10 12:01:16 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2008/06/20 01:09:36 joerg Exp $
 #
 
 GST_PLUGINS0.10_NAME=	gnomevfs
 GST_PLUGINS0.10_DIRS=	ext/gnomevfs
 GST_PLUGINS0.10_FLAGS=	gnome_vfs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../multimedia/gst-plugins0.10-base/Makefile.common"
 
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/sysutils/gst-plugins0.8-gnomevfs/Makefile b/sysutils/gst-plugins0.8-gnomevfs/Makefile
index 9fa03f6eafa..870ed67c231 100644
--- a/sysutils/gst-plugins0.8-gnomevfs/Makefile
+++ b/sysutils/gst-plugins0.8-gnomevfs/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/20 01:09:36 joerg Exp $
 #
 
 GST_PLUGINS0.8_NAME=	gnomevfs
 GST_PLUGINS0.8_DIR=	ext/gnomevfs
 GST_PLUGINS0.8_FLAG=	gnome_vfs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
 PKGREVISION=		10
 
diff --git a/sysutils/notification-daemon/Makefile b/sysutils/notification-daemon/Makefile
index 79237583e23..881ac92da96 100644
--- a/sysutils/notification-daemon/Makefile
+++ b/sysutils/notification-daemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/04/30 13:38:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	notification-daemon-0.3.7
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.galago-project.org/
 COMMENT=	Shows notification messages on the desktop
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake intltool pkg-config msgfmt
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index 2222d628e8d..f9534869097 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/03/08 08:56:47 adam Exp $
+# $NetBSD: Makefile,v 1.8 2008/06/20 01:09:36 joerg Exp $
 
 DISTNAME=	ntfsprogs-2.0.0
 CATEGORIES=	sysutils
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.linux-ntfs.org/
 COMMENT=	Linux-NTFS project utilities for the Windows NT Filesystem
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/sysutils/p5-File-Remove/Makefile b/sysutils/p5-File-Remove/Makefile
index 68a30e450d5..67da6bb17fb 100644
--- a/sysutils/p5-File-Remove/Makefile
+++ b/sysutils/p5-File-Remove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/04/23 19:52:32 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:36 joerg Exp $
 
 DISTNAME=	File-Remove-1.40
 PKGNAME=	p5-${DISTNAME}
@@ -10,6 +10,7 @@ HOMEPAGE=	http://search.cpan.org/dist/File-Remove/
 COMMENT=	Remove files and directories
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=	auto/File/Remove/.packlist
 
diff --git a/sysutils/p5-GTop/Makefile b/sysutils/p5-GTop/Makefile
index 4cba7ebd150..27484feb892 100644
--- a/sysutils/p5-GTop/Makefile
+++ b/sysutils/p5-GTop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/09/20 21:12:57 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:36 joerg Exp $
 
 DISTNAME=		GTop-0.16
 PKGNAME=		p5-GTop-0.16
@@ -10,9 +10,10 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/GTop/
 COMMENT=		Perl interface to libgtop
 
-USE_TOOLS+=		pkg-config
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_TOOLS+=		pkg-config
 
 PERL5_PACKLIST=		auto/GTop/.packlist
 
diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
index 27ed0617bac..6348bf80f79 100644
--- a/sysutils/pftop/Makefile
+++ b/sysutils/pftop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/06/15 14:09:03 peter Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:36 joerg Exp $
 
 DISTNAME=	pftop-0.7
 CATEGORIES=	sysutils net
@@ -8,6 +8,8 @@ MAINTAINER=	peter@NetBSD.org
 HOMEPAGE=	http://www.eee.metu.edu.tr/~canacar/pftop/
 COMMENT=	Utility for real-time display of statistics for PF
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 
 MAKE_ENV+=	OSLEVEL=${PF_VERSION:S/.//}
diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index d402caabf86..69d1a2599f9 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/05/30 14:45:45 hauke Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	radmind-1.11.1
@@ -9,6 +9,8 @@ MAINTAINER=	hf@spg.tu-darmstadt.de
 HOMEPAGE=	http://rsug.itd.umich.edu/software/radmind/
 COMMENT=	Remote file administration and integrity tool
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-radminddir=${RADMINDDIR}
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 2acf27b1ebe..edb9ec69ba3 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/04/25 20:39:12 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	rdiff-backup-1.0.5
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/rdiff-backup/
 COMMENT=	Remote incremental backup utility
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PYDISTUTILSPKG=		yes
 
 SUBST_CLASSES+=		path
diff --git a/sysutils/same/Makefile b/sysutils/same/Makefile
index 4ec3f6bad19..9ad68d45961 100644
--- a/sysutils/same/Makefile
+++ b/sysutils/same/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/04 11:02:25 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/20 01:09:36 joerg Exp $
 
 DISTNAME=	same-1.8
 CATEGORIES=	sysutils
@@ -9,6 +9,7 @@ HOMEPAGE=	http://www.bitwizard.nl/
 COMMENT=	Find identical files and link(2) them to save disk space
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 AUTO_MKDIRS=			yes
 USE_BSD_MAKEFILE=	yes
diff --git a/sysutils/setquota/Makefile b/sysutils/setquota/Makefile
index 4bc2429dcf4..d8aa0be05cd 100644
--- a/sysutils/setquota/Makefile
+++ b/sysutils/setquota/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/03/24 19:21:32 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	setquota-0.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	# unknown
 COMMENT=	Command line quota tools
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # BSD oriented, haven't checked on other environment now
 ONLY_FOR_PLATFORM=	NetBSD-*-* DragonFly-*-*
 
diff --git a/sysutils/shmux/Makefile b/sysutils/shmux/Makefile
index 0bf0635485a..7a412b9ed27 100644
--- a/sysutils/shmux/Makefile
+++ b/sysutils/shmux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/04/12 21:38:24 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/20 01:09:36 joerg Exp $
 
 DISTNAME=	shmux-1.0
 CATEGORIES=	sysutils
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://web.taranis.org/shmux/
 COMMENT=	Shell Multiplexor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 BUILD_TARGET=	shmux
 TEST_TARGET=	test
diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile
index 639566a380a..ab2595b6eba 100644
--- a/sysutils/stow/Makefile
+++ b/sysutils/stow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/10/28 21:29:47 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	stow-1.3.3
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.gnu.org/software/stow/stow.html
 COMMENT=	Maps several separate packages into a tree without merging them
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	perl:run
diff --git a/sysutils/swatch/Makefile b/sysutils/swatch/Makefile
index 8606371052e..b1a389cf4bf 100644
--- a/sysutils/swatch/Makefile
+++ b/sysutils/swatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/04 11:02:25 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	swatch-3.2.1
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://swatch.sourceforge.net/
 COMMENT=	Simple log file watcher
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Date-Calc>=0:../../devel/p5-Date-Calc
 DEPENDS+=	p5-Date-Manip>=0:../../devel/p5-Date-Manip
 DEPENDS+=	p5-File-Tail>=0:../../misc/p5-File-Tail
diff --git a/sysutils/ups-nut-snmp/Makefile b/sysutils/ups-nut-snmp/Makefile
index ec5f5d1fa9e..4d5003b825a 100644
--- a/sysutils/ups-nut-snmp/Makefile
+++ b/sysutils/ups-nut-snmp/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/16 13:30:35 ghen Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:36 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../sysutils/ups-nut/Makefile.common"
 
diff --git a/sysutils/ups-nut-usb/Makefile b/sysutils/ups-nut-usb/Makefile
index 4eab0ed039c..0deff2a02cd 100644
--- a/sysutils/ups-nut-usb/Makefile
+++ b/sysutils/ups-nut-usb/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/16 13:23:16 ghen Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:36 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../sysutils/ups-nut/Makefile.common"
 
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index 1f5137f62cd..a0cbf26c15e 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/12/15 14:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	vcdimager-0.7.23
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.vcdimager.org/
 COMMENT=	Mastering suite for Video CDs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake pkg-config
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	yes
diff --git a/sysutils/vcdimager/Makefile b/sysutils/vcdimager/Makefile
index f3f60937be5..b72fac65797 100644
--- a/sysutils/vcdimager/Makefile
+++ b/sysutils/vcdimager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/12/15 14:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	vcdimager-0.6.2
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.gnu.org/software/vcdimager/
 COMMENT=	Mastering suite for Video CDs
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile
index 095b9e05ef6..b8eacd6ad13 100644
--- a/sysutils/vifm/Makefile
+++ b/sysutils/vifm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:43 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	vifm-0.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://vifm.sourceforge.net/
 COMMENT=	Ncurses based file manager with vi like keybindings
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 
diff --git a/sysutils/vip/Makefile b/sysutils/vip/Makefile
index 9741cd3c91b..5a89014379e 100644
--- a/sysutils/vip/Makefile
+++ b/sysutils/vip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:13 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/20 01:09:36 joerg Exp $
 
 DISTNAME=	vip-19971113
 PKGREVISION=	2
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.cs.duke.edu/~des/vip.html
 COMMENT=	Script to edit the data at any point in a pipeline
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
@@ -25,7 +26,7 @@ do-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/vip.man ${WRKSRC}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/vip ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/vip.man ${PREFIX}/${PKGMANDIR}/man8/vip.8
+	${INSTALL_SCRIPT} ${WRKSRC}/vip ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/vip.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/vip.8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile
index fb23b386ef7..1a374d556c6 100644
--- a/sysutils/vobcopy/Makefile
+++ b/sysutils/vobcopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:13 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:36 joerg Exp $
 #
 
 DISTNAME=	vobcopy-0.5.14
@@ -12,14 +12,15 @@ HOMEPAGE=	http://lpn.rnbhq.org/projects/c/c.shtml
 COMMENT=	Copies DVD .vob files to harddisk
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_TARGET=	vobcopy
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/vobcopy ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/vobcopy.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/vobcopy ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/vobcopy.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vxargs/Makefile b/sysutils/vxargs/Makefile
index f4bc2d95644..12518250fa3 100644
--- a/sysutils/vxargs/Makefile
+++ b/sysutils/vxargs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/04/30 13:38:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:37 joerg Exp $
 #
 
 DISTNAME=	vxargs-0.3.3
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://dharma.cis.upenn.edu/planetlab/vxargs/
 COMMENT=	Runs parallel jobs with visualization and redirection
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_CMD=	${CP} $${extract_file} ${WRKSRC}/vxargs.py
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
@@ -22,6 +24,6 @@ PYTHON_PATCH_SCRIPTS=	vxargs.py
 .include "../../lang/python/application.mk"
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/vxargs.py ${PREFIX}/bin/vxargs
+	${INSTALL_SCRIPT} ${WRKSRC}/vxargs.py ${DESTDIR}${PREFIX}/bin/vxargs
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile
index 3e456f0a7fc..d35319d3306 100644
--- a/sysutils/wmcpuload/Makefile
+++ b/sysutils/wmcpuload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/04 08:00:50 obache Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:37 joerg Exp $
 #
 
 DISTNAME=	wmcpuload-1.0.1
@@ -11,6 +11,8 @@ MAINTAINER=	coto@core.de
 HOMEPAGE=	http://seiichisato.jp/dockapps/
 COMMENT=	Dockable CPU monitor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	YES
 
 post-extract:
diff --git a/sysutils/wmmemmon/Makefile b/sysutils/wmmemmon/Makefile
index 3727e0eb77d..296948f54a2 100644
--- a/sysutils/wmmemmon/Makefile
+++ b/sysutils/wmmemmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:23:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:37 joerg Exp $
 #
 
 DISTNAME=	wmmemmon-1.0.1
@@ -10,6 +10,8 @@ MAINTAINER=	coto@core.de
 HOMEPAGE=	http://seiichisato.jp/dockapps/\#wmmemmon
 COMMENT=	Dockapp to monitor memory and swap usages
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	YES
 
 post-extract:
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index bd71dff67eb..e11d17d2c60 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/12/02 11:41:48 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:37 joerg Exp $
 #
 
 DISTNAME=	xdu-3.0
@@ -14,6 +14,8 @@ MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://sd.wareonearth.com/~phil/xdu/
 COMMENT=	Display the output of "du" in an X window
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_IMAKE=	yes