DESTDIR support

18 files changed, 81 insertions, 53 deletions

diff --git a/editors/kdissert/Makefile b/editors/kdissert/Makefile
index f83f0143fd2..b9ba152be7a 100644
--- a/editors/kdissert/Makefile
+++ b/editors/kdissert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/02/03 21:55:04 joerg Exp $
 #
 
 DISTNAME=		kdissert-1.0.7
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://freehackers.org/~tnagy/kdissert/
 COMMENT=		Mindmapping-like tool to generate text templates
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		msgfmt
@@ -28,7 +30,7 @@ do-build:
 do-install:
 	${RUN} ${_ULIMIT_CMD} \
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-	${PYTHONBIN} waf install
+	${PYTHONBIN} waf install --destdir=${DESTDIR}
 
 .include "../../lang/python/application.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/graphics/ov519view/Makefile b/graphics/ov519view/Makefile
index 1647be7850d..d6b3d2d57e7 100644
--- a/graphics/ov519view/Makefile
+++ b/graphics/ov519view/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/02/03 05:40:23 obache Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/03 22:32:00 joerg Exp $
 #
 
 DISTNAME=	ov51x-1.65-1.11-mark
@@ -16,7 +16,9 @@ MAINTAINER=	hamajima@NetBSD.org
 HOMEPAGE=	http://home.384.jp/takam/bsd/NetBSD.html#ov519
 COMMENT=	USB cameras based OV519 Utility Programs
 
-INSTALLATION_DIRS=	${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 
 MAKE_ENV+=	${BSD_MAKE_ENV}
 
@@ -30,7 +32,7 @@ do-build:
 do-install:
 	for f in ov519shot ov519view ; do                       \
 		cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}           \
-		${MAKE_PROGRAM} -f ${MAKE_FILE}.$$f install ;    \
+		${MAKE_PROGRAM} -f ${MAKE_FILE}.$$f install ${INSTALL_MAKE_FLAGS};    \
 	done
 
 .include "../../graphics/imlib/buildlink3.mk"
diff --git a/graphics/qcamview/Makefile b/graphics/qcamview/Makefile
index 9e7d349bf7a..75eec8d2158 100644
--- a/graphics/qcamview/Makefile
+++ b/graphics/qcamview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/02/03 22:28:35 joerg Exp $
 #
 
 DISTNAME=	qce-ga-0.40d
@@ -15,7 +15,9 @@ MAINTAINER=	hamajima@NetBSD.org
 HOMEPAGE=	http://www.medias.ne.jp/~takam/bsd/NetBSD.html#qcam
 COMMENT=	Logitech Quickcam Express USB Utilities
 
-INSTALLATION_DIRS=	${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 
 MAKE_ENV+=	${BSD_MAKE_ENV}
 
@@ -29,7 +31,7 @@ do-build:
 do-install:
 	for f in qcamshot qcamview ; do				\
 		cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}		\
-		${MAKE_PROGRAM} -f ${MAKE_FILE}.$$f install ;	\
+		${MAKE_PROGRAM} -f ${MAKE_FILE}.$$f install ${INSTALL_MAKE_FLAGS} ;	\
 	done
 
 .include "../../graphics/imlib/buildlink3.mk"
diff --git a/graphics/qvplay/Makefile b/graphics/qvplay/Makefile
index cef2b39aa0c..e90222fb329 100644
--- a/graphics/qvplay/Makefile
+++ b/graphics/qvplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/03 22:24:06 joerg Exp $
 #
 
 DISTNAME=	qvplay-0.94
@@ -10,6 +10,8 @@ HOMEPAGE=	http://www.asahi-net.or.jp/~xg2k-hys/index-e.html
 COMMENT=	Software for use with CASIO QV digital cameras
 LICENSE=	generic-nonlicense
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 RESTRICTED=	No permission to distribute
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
@@ -20,4 +22,6 @@ WRKSRC=		${WRKDIR}/QVplay094/src
 GNU_CONFIGURE=	yes
 CONFIGURE_HAS_MANDIR=	NO
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/qvplay/distinfo b/graphics/qvplay/distinfo
index 7251170bda7..ae0db84043a 100644
--- a/graphics/qvplay/distinfo
+++ b/graphics/qvplay/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 08:45:12 agc Exp $
+$NetBSD: distinfo,v 1.4 2010/02/03 22:24:06 joerg Exp $
 
 SHA1 (qvplay-0.94.tar.gz) = ecc48babf604f802833de16eb404186820c93edc
 RMD160 (qvplay-0.94.tar.gz) = 2f84c15541913736ea53c089ae409c60c6dfdae2
 Size (qvplay-0.94.tar.gz) = 110612 bytes
-SHA1 (patch-aa) = 1090a066cfe312a83b19ec06c5d9e97bce83b7a9
+SHA1 (patch-aa) = 7e7c81c9253095b8b01fe0b083c4f0ae62c9da0e
diff --git a/graphics/qvplay/patches/patch-aa b/graphics/qvplay/patches/patch-aa
index 14e7420c165..c2413f68c44 100644
--- a/graphics/qvplay/patches/patch-aa
+++ b/graphics/qvplay/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/09/17 03:46:32 jwise Exp $
+$NetBSD: patch-aa,v 1.2 2010/02/03 22:24:06 joerg Exp $
 --- Makefile.in.orig	Wed May  5 10:24:39 1999
 +++ Makefile.in	Sun Jun 20 19:21:55 1999
 @@ -10,8 +10,8 @@
@@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/09/17 03:46:32 jwise Exp $
 -bindir	= /usr/local/bin
 -mandir  = /usr/local/man/man1
 +bindir	= $(PREFIX)/bin
-+mandir  = $(PREFIX)/man/man1
++mandir  = $(PREFIX)/${PKGMANDIR}/man1
  
  SRCS1	= tty.c command.c command1.c getuint.c jpeg.c ppm.c bmp.c qvplay.c
  OBJS1	= tty.o command.o command1.o getuint.o jpeg.o ppm.o bmp.o qvplay.o
@@ -22,12 +22,12 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/09/17 03:46:32 jwise Exp $
 -	$(INSTALL_PROGRAM) -o root -g bin -m 444 $(MAN1) $(mandir)/$(MAN1)
 -	$(INSTALL_PROGRAM) -o root -g bin -m 444 $(MAN2) $(mandir)/$(MAN2)
 -	$(INSTALL_PROGRAM) -o root -g bin -m 444 $(MAN3) $(mandir)/$(MAN3)
-+	$(INSTALL_PROGRAM) $(PROG1) $(bindir)/$(PROG1)
-+	$(INSTALL_PROGRAM) $(PROG2) $(bindir)/$(PROG2)
-+	$(INSTALL_PROGRAM) $(PROG3) $(bindir)/$(PROG3)
-+	$(INSTALL_DATA) $(MAN1) $(mandir)/$(MAN1)
-+	$(INSTALL_DATA) $(MAN2) $(mandir)/$(MAN2)
-+	$(INSTALL_DATA) $(MAN3) $(mandir)/$(MAN3)
++	$(INSTALL_PROGRAM) $(PROG1) ${DESTDIR}$(bindir)/$(PROG1)
++	$(INSTALL_PROGRAM) $(PROG2) ${DESTDIR}$(bindir)/$(PROG2)
++	$(INSTALL_PROGRAM) $(PROG3) ${DESTDIR}$(bindir)/$(PROG3)
++	$(INSTALL_DATA) $(MAN1) ${DESTDIR}$(mandir)/$(MAN1)
++	$(INSTALL_DATA) $(MAN2) ${DESTDIR}$(mandir)/$(MAN2)
++	$(INSTALL_DATA) $(MAN3) ${DESTDIR}$(mandir)/$(MAN3)
  depend: .depend
  .depend:
  	mkdep $(SRCS1)
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index ee78b80c656..8eeabc4b791 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/02/03 22:24:30 joerg Exp $
 #
 
 DISTNAME=	showimg-0.9.5
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	kde graphics x11
 MASTER_SITES=	http://www.jalix.org/projects/showimg/download/0.9.5/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,6 +11,8 @@ MAINTAINER=	ianzag@mail.ru
 HOMEPAGE=	http://www.jalix.org/projects/showimg/
 COMMENT=	Feature-rich image viewer for KDE including an image management system
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake pkg-config perl:run
 REPLACE_PERL+=	showimg/showimg/misc/convert2png.pl
 USE_LANGUAGES=	c c++
@@ -19,8 +21,6 @@ GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--without-showimgdb
 
-BUILDLINK_DEPMETHOD.libXt?=	build
-
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
diff --git a/graphics/snx101view/Makefile b/graphics/snx101view/Makefile
index 24ea2d85ff7..56941d59aa3 100644
--- a/graphics/snx101view/Makefile
+++ b/graphics/snx101view/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/01/18 09:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/02/03 22:16:14 joerg Exp $
 #
 
 DISTNAME=	snx101util-0.2
@@ -10,10 +10,12 @@ MAINTAINER=	hamajima@NetBSD.org
 HOMEPAGE=	http://www.medias.ne.jp/~takam/bsd/NetBSD.html#sonix
 COMMENT=	USB Webcam based sonix SN9C101 chip Utility Programs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_ENV+=	NOGCCERROR=
 MAKE_ENV+=	${BSD_MAKE_ENV}
 
-INSTALLATION_DIRS=	${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
diff --git a/graphics/spcaview/Makefile b/graphics/spcaview/Makefile
index 9588acd74b9..4d71c8a67fd 100644
--- a/graphics/spcaview/Makefile
+++ b/graphics/spcaview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/03 22:15:27 joerg Exp $
 #
 
 DISTNAME=	spca5xx-20060402
@@ -16,10 +16,14 @@ MAINTAINER=	hamajima@NetBSD.org
 HOMEPAGE=	http://www.medias.ne.jp/~takam/bsd/NetBSD.html#spca561
 COMMENT=	USB Cameras based SPCA5xx Utilities
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/drivers/usb
 MAKE_ENV+=	NOGCCERROR=
 MAKE_ENV+=	${BSD_MAKE_ENV}
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
+
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
diff --git a/graphics/tuxpaint-config/Makefile b/graphics/tuxpaint-config/Makefile
index 110b346e342..5bf8d5e32a4 100644
--- a/graphics/tuxpaint-config/Makefile
+++ b/graphics/tuxpaint-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/09/04 21:16:05 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/02/03 22:13:09 joerg Exp $
 #
 
 DISTNAME=		tuxpaint-config-0.0.8
@@ -9,12 +9,17 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		ftp://ftp.billsgames.com/unix/x/tuxpaint/config/
 COMMENT=		Configuration program for tuxpaint
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake
 
+INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
 post-install:
-	-${FIND} ${PREFIX}/share/tuxpaint-config -name CVS -exec ${RM} -r {} \; 2>/dev/null
-	-${FIND} ${PREFIX}/share/tuxpaint-config -name .xvpics -exec ${RM} -r {} \; 2>/dev/null
+	-${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint-config -name CVS -exec ${RM} -r {} \; 2>/dev/null
+	-${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint-config -name .xvpics -exec ${RM} -r {} \; 2>/dev/null
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/fltk/buildlink3.mk"
diff --git a/graphics/tuxpaint-config/distinfo b/graphics/tuxpaint-config/distinfo
index 00a4b0f68c5..375c48b1d32 100644
--- a/graphics/tuxpaint-config/distinfo
+++ b/graphics/tuxpaint-config/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2007/09/04 21:16:06 drochner Exp $
+$NetBSD: distinfo,v 1.5 2010/02/03 22:13:09 joerg Exp $
 
 SHA1 (tuxpaint-config-0.0.8.tar.gz) = fadfc473f4b9ecce4584d4ca6ad6387e52eda1aa
 RMD160 (tuxpaint-config-0.0.8.tar.gz) = bce690059ff1a740e1c94779b305b2cdfd1761ea
 Size (tuxpaint-config-0.0.8.tar.gz) = 90683 bytes
-SHA1 (patch-aa) = 6590cfdccf092040b467b0ed17599dafddac0f9a
+SHA1 (patch-aa) = 408e97bd24332eeb3ed87d03ee914019e1e29c42
diff --git a/graphics/tuxpaint-config/patches/patch-aa b/graphics/tuxpaint-config/patches/patch-aa
index bc5036fbc59..494a2adb920 100644
--- a/graphics/tuxpaint-config/patches/patch-aa
+++ b/graphics/tuxpaint-config/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2007/09/04 21:16:06 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2010/02/03 22:13:09 joerg Exp $
 
 --- Makefile.orig	2007-07-01 17:06:18.000000000 +0200
 +++ Makefile
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.3 2007/09/04 21:16:06 drochner Exp $
  
  DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint-config/
 -MAN_PREFIX=$(PREFIX)/share/man/
-+MAN_PREFIX=$(PREFIX)/man/
++MAN_PREFIX=$(PREFIX)/${PKGMANDIR}
  
  
  # Tux Paint's 'System-wide' Config file:
diff --git a/graphics/tuxpaint-stamps/Makefile b/graphics/tuxpaint-stamps/Makefile
index 0c3db5289ed..b85031ae48b 100644
--- a/graphics/tuxpaint-stamps/Makefile
+++ b/graphics/tuxpaint-stamps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/09/04 21:22:05 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2010/02/03 22:13:09 joerg Exp $
 #
 
 DISTNAME=	tuxpaint-stamps-2007.07.01
@@ -9,13 +9,16 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tuxpaint.org/
 COMMENT=	Rubber stamps for Tux Paint
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	tuxpaint>=0.9.13:../../graphics/tuxpaint
 CONFLICTS+=	tuxpaint<0.9.13
 
 INSTALL_TARGET=	install-all
+INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
 
 post-install:
-	-${FIND} ${PREFIX}/share/tuxpaint/stamps -name CVS -exec \
+	-${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint/stamps -name CVS -exec \
 		 ${RM} -r {} \; 2>/dev/null
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index c61531fae81..8822fa78b9b 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2010/02/03 22:13:09 joerg Exp $
 #
 
 DISTNAME=	tuxpaint-0.9.17
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tuxpaint.org/
 COMMENT=	Drawing program for small children
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
 MANCOMPRESSED=		YES
@@ -27,6 +29,8 @@ MAKE_ENV+=		CONFDIR=${PKG_SYSCONFDIR:Q} CP=${CP:Q} CHMOD=${CHMOD:Q}
 EGDIR=			${PREFIX}/share/examples/tuxpaint
 CONF_FILES=		${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
 
+INSTALL_MAKE_FLAGS+=	PKG_ROOT=${DESTDIR}
+
 # this uses iconv and png functions directly, so link against them
 # explicitly.
 MAKE_ENV+=		LIBS=${LIBS:M*:Q}
@@ -34,8 +38,8 @@ LIBS+=			-liconv
 LIBS+=			-lpng
 
 post-install:
-	-${FIND} ${PREFIX}/share/doc/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null
-	-${FIND} ${PREFIX}/share/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null
+	-${FIND} ${DESTDIR}${PREFIX}/share/doc/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null
+	-${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo
index c89aedd2ed7..54262867744 100644
--- a/graphics/tuxpaint/distinfo
+++ b/graphics/tuxpaint/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2007/09/04 21:11:58 drochner Exp $
+$NetBSD: distinfo,v 1.20 2010/02/03 22:13:09 joerg Exp $
 
 SHA1 (tuxpaint-0.9.17.tar.gz) = 88e42d19339bb1faa03bce45a28d3fe11fbe05b4
 RMD160 (tuxpaint-0.9.17.tar.gz) = c7cf3636875cad87646cda4df978f9adbbf18630
 Size (tuxpaint-0.9.17.tar.gz) = 7570223 bytes
-SHA1 (patch-aa) = f08aa3c9096e17a5fed7b893ec04a9c86f6a4bc9
+SHA1 (patch-aa) = 85365ebbe02084a3f11dcd365e5e5ecdee8c86c9
 SHA1 (patch-ab) = 78cba52d776088c5ad8ba3ea77a8584d0f708159
 SHA1 (patch-ad) = ac33e71f3cd7e581d67206a86875492af2836f47
diff --git a/graphics/tuxpaint/patches/patch-aa b/graphics/tuxpaint/patches/patch-aa
index 020ff3845c0..81f176f2ec3 100644
--- a/graphics/tuxpaint/patches/patch-aa
+++ b/graphics/tuxpaint/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.12 2007/09/04 21:11:58 drochner Exp $
+$NetBSD: patch-aa,v 1.13 2010/02/03 22:13:09 joerg Exp $
 
 --- Makefile.orig	2007-07-01 17:05:57.000000000 +0200
 +++ Makefile
@@ -68,16 +68,15 @@ $NetBSD: patch-aa,v 1.12 2007/09/04 21:11:58 drochner Exp $
  	@echo
  	@echo "--------------------------------------------------------------"
  	@echo
-@@ -478,9 +466,9 @@ uninstall:	uninstall-i18n
+@@ -478,9 +466,8 @@ uninstall:	uninstall-i18n
  install-default-config:
  	@echo
  	@echo "...Installing default config file..."
 -	@install -d $(CONFDIR)
 -	@cp src/tuxpaint.conf $(CONFDIR)
 -	@chmod 644 $(CONFDIR)/tuxpaint.conf
-+	@$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/examples/tuxpaint
-+	@$(CP) src/tuxpaint.conf $(PREFIX)/share/examples/tuxpaint
-+	@$(CHMOD) 644 $(PREFIX)/share/examples/tuxpaint/tuxpaint.conf
++	@$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(PREFIX)/share/examples/tuxpaint
++	@$(BSD_INSTALL_DATA) src/tuxpaint.conf ${DESTDIR}$(PREFIX)/share/examples/tuxpaint
  
  
  # Install example stamps
diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile
index aef29f8bea7..16bc08aa4e6 100644
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/06/30 00:07:17 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/02/03 22:22:53 joerg Exp $
 
 DISTNAME=	vcg.1.30.r3.17
 PKGNAME=	vcg-1.30
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Visualization Tool for compiler graphs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
 WRKSRC=		${WRKDIR}/vcg.1.30
@@ -28,11 +29,11 @@ pre-patch:
 	${CP} ${FILESDIR}/globals.h ${WRKSRC}/preconf/X11ccDragonFly
 	${CP} ${FILESDIR}/tMakefile ${WRKSRC}/preconf/X11ccDragonFly
 
+INSTALLATION_DIRS+=	share/doc/vcg share/examples/vcg
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vcg
-	${INSTALL_DATA} ${WRKSRC}/doc/visual.ps  ${PREFIX}/share/doc/vcg
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vcg
-	${INSTALL_DATA} ${WRKSRC}/expl/*.vcg ${PREFIX}/share/examples/vcg
+	${INSTALL_DATA} ${WRKSRC}/doc/visual.ps ${DESTDIR}${PREFIX}/share/doc/vcg
+	${INSTALL_DATA} ${WRKSRC}/expl/*.vcg ${DESTDIR}${PREFIX}/share/examples/vcg
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/vcg/files/tMakefile b/graphics/vcg/files/tMakefile
index a322ed47c80..9c89d0b3f9b 100644
--- a/graphics/vcg/files/tMakefile
+++ b/graphics/vcg/files/tMakefile
@@ -17,7 +17,7 @@
 # /*                                                                    */
 # /*--------------------------------------------------------------------*/
 #
-# $NetBSD: tMakefile,v 1.5 2006/09/02 20:47:03 rillig Exp $
+# $NetBSD: tMakefile,v 1.6 2010/02/03 22:22:53 joerg Exp $
 # FreeBSD Id: tMakefile,v 1.1.1.1 1995/02/19 09:25:45 hsu Exp $
 #
 # FreeBSD Log: tMakefile,v $
@@ -39,12 +39,12 @@ SHELL = /bin/sh
 # where the binaries go
 # BINDIR = /usr/local/bin/
 # BINDIR = /RW/esprit/users/sander/PUBLIC/CMD/
-BINDIR = ${PREFIX}/bin
+BINDIR = ${DESTDIR}${PREFIX}/bin
 
 # where the manual pages go
 # MANDIR = /usr/local/man/manl/
 # MANDIR = /RW/esprit/users/sander/PUBLIC/MAN/
-MANDIR = ${PREFIX}/${PKGMANDIR}/manl
+MANDIR = ${DESTDIR}${PREFIX}/${PKGMANDIR}/manl
 
 # what the manual extension is
 MANEXT = l