DESTDIR support

32 files changed, 222 insertions, 112 deletions

diff --git a/net/tcpdstat/Makefile b/net/tcpdstat/Makefile
index 6b429ca4665..bad139fcb5f 100644
--- a/net/tcpdstat/Makefile
+++ b/net/tcpdstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:24 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2010/02/11 22:57:40 joerg Exp $
 
 DISTNAME=	tcpd-tools-0.8
 PKGNAME=	tcpdstat-0.8
@@ -8,9 +8,15 @@ MASTER_SITES=	ftp://tracer.csl.sony.co.jp/pub/mawi/tools/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Analyze tcpdump output
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NOT_FOR_PLATFORM=	Interix-*-*
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tcpdstat
-MAKE_ENV+=	BINDIR=${PREFIX:Q}/bin
+
+INSTALLATION_DIRS=	bin
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/tcpdstat ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile
index 0d67d599be8..6ae581f49d0 100644
--- a/net/tcpillust/Makefile
+++ b/net/tcpillust/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/12/02 13:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/02/11 22:59:24 joerg Exp $
 
 DISTNAME=	tcpillust-1.0a
 PKGREVISION=	4
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.sonycsl.co.jp/person/nishida/tcpillust.html
 COMMENT=	Graphical TCP connection analysis tool
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_IMAKE=	yes
 GNU_CONFIGURE=	yes
 
@@ -20,14 +22,14 @@ CONFIGURE_ARGS+=--with-tk-lib=${BUILDLINK_PREFIX.tk}/lib
 DOCS=		README
 SAMPLES=	tcpclient.log tcpserver.log
 
+INSTALLATION_DIRS+=	share/doc/tcpillust/sample
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcpillust
 	for i in ${DOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/tcpillust; \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${DESTDIR}${PREFIX}/share/doc/tcpillust; \
 	done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcpillust/sample
 	for i in ${SAMPLES}; do \
-		${INSTALL_DATA} ${WRKSRC}/sample/$$i ${PREFIX}/share/doc/tcpillust/sample; \
+		${INSTALL_DATA} ${WRKSRC}/sample/$$i ${DESTDIR}${PREFIX}/share/doc/tcpillust/sample; \
 	done
 
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index 989aa20f4f5..718df9bffaf 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:07 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2010/02/11 22:59:14 joerg Exp $
 
 DISTNAME=	tcptrace-6.6.7
 CATEGORIES=	net
@@ -8,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tcptrace.org/
 COMMENT=	TCP dump file analysis tool
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 
 BUILD_TARGET=		tcptrace
@@ -16,14 +18,13 @@ DOCFILES=		COPYRIGHT FAQ README README.tput_graphs
 
 LDFLAGS.SunOS+=		-lm
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/tcptrace
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tcptrace ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/tcptrace.man ${PREFIX}/${PKGMANDIR}/man1/tcptrace.1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcptrace
+	${INSTALL_PROGRAM} ${WRKSRC}/tcptrace ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/tcptrace.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/tcptrace.1
 .for f in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/tcptrace
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/tcptrace
 .endfor
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 33604f6e2bc..c2add8a7cd8 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/03/02 09:28:55 adrianp Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/11 23:00:57 joerg Exp $
 #
 
 DISTNAME=		tcptraceroute-1.4
@@ -10,11 +10,14 @@ MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://michael.toren.net/code/tcptraceroute/
 COMMENT=		Traceroute implementation using TCP packets
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_TARGET=		tcptraceroute
 BUILDLINK_API_DEPENDS.libnet10+=	libnet10>=1.0.2anb1
 
 DOCDIR=			${PREFIX}/share/doc/tcptraceroute
-BINMODE=		4711
+
+SPECIAL_PERMS+=		sbin/tcptraceroute ${SETUID_ROOT_PERMS}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,13 +27,12 @@ SUBST_FILES.conf=	Makefile
 SUBST_SED.conf=		-e "s|libnet-config|libnet10-config|g"
 SUBST_MESSAGE.conf=	Fixing configuration script.
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin ${DOCDIR}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tcptraceroute ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/tcptraceroute.8 ${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples.txt ${DOCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/tcptraceroute ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/tcptraceroute.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_DATA} ${WRKSRC}/examples.txt ${DESTDIR}${DOCDIR}
 
 .include "../../devel/libnet10/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/net/ttt/Makefile b/net/ttt/Makefile
index b4e52196ed8..f30e77de1cb 100644
--- a/net/ttt/Makefile
+++ b/net/ttt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/12/02 13:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/02/11 23:06:39 joerg Exp $
 #
 
 DISTNAME=	ttt-1.8.2
@@ -9,9 +9,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.sonycsl.co.jp/person/kjc/software.html
 COMMENT=	Tele Traffic Tapper
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 INSTALL_TARGET=	install install-man
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
+			exec_prefix=${DESTDIR}${PREFIX} \
+			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/ucarp/Makefile b/net/ucarp/Makefile
index 60a4df5909f..6a0c5f24093 100644
--- a/net/ucarp/Makefile
+++ b/net/ucarp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:01:24 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/11 23:06:05 joerg Exp $
 #
 
 DISTNAME=		ucarp-1.1
@@ -11,6 +11,8 @@ MAINTAINER=		joel@carnat.net
 HOMEPAGE=		http://www.ucarp.org/project/ucarp
 COMMENT=		Common Address Redundancy Protocol (CARP) for Unix
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		msgfmt
@@ -18,14 +20,14 @@ USE_TOOLS+=		msgfmt
 # pcap_freecode with one argument only
 BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.6.0
 
+INSTALLATION_DIRS+=	share/doc/ucarp share/examples/ucarp
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucarp
 	for DOC in AUTHORS COPYING NEWS README; do \
-		${INSTALL_DATA} ${WRKSRC}/$$DOC ${PREFIX}/share/doc/ucarp; \
+		${INSTALL_DATA} ${WRKSRC}/$$DOC ${DESTDIR}${PREFIX}/share/doc/ucarp; \
 	done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ucarp
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/bsd/*sh \
-		${PREFIX}/share/examples/ucarp
+	    ${DESTDIR}${PREFIX}/share/examples/ucarp
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/net/udptunnel/Makefile b/net/udptunnel/Makefile
index 556c75402b0..04dfebca8d3 100644
--- a/net/udptunnel/Makefile
+++ b/net/udptunnel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/02/11 23:07:16 joerg Exp $
 #
 
 DISTNAME=	udptunnel-1.1
@@ -10,10 +10,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www1.cs.columbia.edu/~lennox/udptunnel/
 COMMENT=	Tunnel UDP packets over a TCP connection
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 INSTALLATION_DIRS=	bin share/doc/html
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/udptunnel.html ${PREFIX}/share/doc/html/
+	${INSTALL_DATA} ${WRKSRC}/udptunnel.html ${DESTDIR}${PREFIX}/share/doc/html/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/upclient/Makefile b/net/upclient/Makefile
index de34ceb489e..6d127d7973b 100644
--- a/net/upclient/Makefile
+++ b/net/upclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2010/02/11 23:08:17 joerg Exp $
 #
 
 DISTNAME=	upclient-4.2.1.23
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://uptimes.hostingwired.com/
 COMMENT=	Keeps track of your server uptime, and compares it to other hosts
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "DragonFly"
@@ -26,7 +28,7 @@ RCD_SCRIPTS=	upclient
 
 BUILD_DIRS=	${WRKSRC}/src
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/doc/upclient ${EGDIR}
 
 pre-configure:
 	${MV} ${WRKSRC}/scripts/upchk ${WRKSRC}/scripts/upchk.bak
@@ -35,15 +37,13 @@ pre-configure:
 		>${WRKSRC}/scripts/upchk <${WRKSRC}/scripts/upchk.bak
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/upclient ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/upclient
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/upclient
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/upclient
-	${INSTALL_DATA} ${WRKSRC}/HISTORY ${PREFIX}/share/doc/upclient
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/upclient
-	${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/upclient
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/upclient
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/upclient.conf ${EGDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/upclient ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${PREFIX}/share/doc/upclient
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/upclient
+	${INSTALL_DATA} ${WRKSRC}/HISTORY ${DESTDIR}${PREFIX}/share/doc/upclient
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/upclient
+	${INSTALL_DATA} ${WRKSRC}/FAQ ${DESTDIR}${PREFIX}/share/doc/upclient
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/share/doc/upclient
+	${INSTALL_DATA} ${WRKSRC}/conf/upclient.conf ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wimon/Makefile b/net/wimon/Makefile
index 1e077a54822..63748eeed7f 100644
--- a/net/wimon/Makefile
+++ b/net/wimon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/02/11 23:08:34 joerg Exp $
 #
 
 DISTNAME=	wimon-0.3
@@ -10,6 +10,7 @@ MAINTAINER=	imil@gcu.info
 HOMEPAGE=	http://imil.net/wimon/
 COMMENT=	Tool that shows a real-time graph of your wireless connection
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 ONLY_FOR_PLATFORM=	FreeBSD-*-* NetBSD-*-* OpenBSD-*-* DragonFly-*-*
@@ -22,8 +23,8 @@ WRKSRC=		${WRKDIR}/wimon
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wimon ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/wimon.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/wimon ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/wimon.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/wistumbler/Makefile b/net/wistumbler/Makefile
index 064b10491fc..c25cec69cf7 100644
--- a/net/wistumbler/Makefile
+++ b/net/wistumbler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:26 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2010/02/11 23:12:21 joerg Exp $
 
 DISTNAME=	wistumbler-20020816
 PKGNAME=	wistumbler-20020816.0
@@ -10,11 +10,19 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gongon.com/persons/iseki/wistumbler/
 COMMENT=	Network stumbler for WaveLAN/IEEE wireless networking
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/wistumbler
 
 NOT_FOR_PLATFORM=	NetBSD-0.*-* NetBSD-1.[01234]*-* NetBSD-1.5-*
 NOT_FOR_PLATFORM+=	NetBSD-1.5.*-* NetBSD-1.5[A-V]-*
 NOT_FOR_PLATFORM+=	Interix-*-*
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wistumbler ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/wistumbler.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wmget/Makefile b/net/wmget/Makefile
index 4c6d9217ed9..564d53ec636 100644
--- a/net/wmget/Makefile
+++ b/net/wmget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/01/17 12:02:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/02/11 23:12:10 joerg Exp $
 
 DISTNAME=	wmget-0.6.0-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://amtrickey.net/wmget/index.html
 COMMENT=	Background download manager in a Window Maker dock app
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 SUBST_CLASSES+=		ldflags
 SUBST_MESSAGE.ldflags=	Fixing hardcoded LDFLAGS.
 SUBST_STAGE.ldflags=	pre-configure
@@ -25,6 +27,12 @@ SUBST_SED.paths=	-e 's|^PREFIX=.*|PREFIX=${LOCALBASE}|'
 
 USE_TOOLS+=	gmake
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wmget ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/wmget.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/net/wminet/Makefile b/net/wminet/Makefile
index a663de4f476..9b0f8b42982 100644
--- a/net/wminet/Makefile
+++ b/net/wminet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:39 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/11 23:13:17 joerg Exp $
 
 DISTNAME=	wmnet-1.2
 PKGNAME=	wminet-1.2
@@ -10,10 +10,18 @@ MAINTAINER=	coto@core.de
 HOMEPAGE=	http://users.rcn.com/rneswold/
 COMMENT=	Dockable network monitor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NOT_FOR_PLATFORM=	Interix-*-* # no userland protocol stack support
 
 USE_X11BASE=	YES
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wminet ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/wminet.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index bd5f397fa66..5e752f70e64 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/05/01 13:21:51 zafer Exp $
+# $NetBSD: Makefile,v 1.34 2010/02/11 23:14:14 joerg Exp $
 
 DISTNAME=	wu-ftpd-2.6.2
 PKGREVISION=	3
@@ -18,6 +18,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.wu-ftpd.org/
 COMMENT=	Replacement ftp server for Un*x systems
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	wu-ftpd-vr-[0-9]*
 CONFLICTS+=	beroftpd-[0-9]*
 CONFLICTS+=	kth-krb4-[0-9]*
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 5e8929f3da9..6eb6163ad7d 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/06/14 22:58:07 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2010/02/11 23:18:29 joerg Exp $
 #
 
 DISTNAME=	xipdump-1.5.4
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.lse.epita.fr/twiki/bin/view/Projects/XipDump
 COMMENT=	Displays IP packets using X Window System
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PLIST_SRC=	${WRKDIR}/PLIST
 
 USE_X11BASE=	yes
@@ -19,6 +21,8 @@ CFLAGS+=	-I${PREFIX}/include
 LIBS+=		-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lnet
 
 INSTALLATION_DIRS=	bin lib/X11/app-defaults ${PKGMANDIR}/man8
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
+			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 post-build:
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
@@ -26,12 +30,12 @@ post-build:
 		${SED} -e 's|^|share/xipdump/|' >> ${PLIST_SRC})
 
 post-install:
-	${FIND} ${PREFIX}/share/xipdump -name *.pkc | \
+	${FIND} ${DESTDIR}${PREFIX}/share/xipdump -name *.pkc | \
 		${XARGS} ${CHMOD} ${DOCMODE}
-	${FIND} ${PREFIX}/share/xipdump -name *.pkt | \
+	${FIND} ${DESTDIR}${PREFIX}/share/xipdump -name *.pkt | \
 		${XARGS} ${CHMOD} ${DOCMODE}
-	${CHMOD} ${MANMODE} ${PREFIX}/${PKGMANDIR}/man8/xipdump.8
-	${CHMOD} ${SHAREMODE} ${PREFIX}/lib/X11/app-defaults/Xipdump
+	${CHMOD} ${MANMODE} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/xipdump.8
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Xipdump
 
 .include "../../devel/libnet10/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
diff --git a/net/xipdump/distinfo b/net/xipdump/distinfo
index 0b00ac9d81b..fbcbe6dfb90 100644
--- a/net/xipdump/distinfo
+++ b/net/xipdump/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/02/24 01:34:36 joerg Exp $
+$NetBSD: distinfo,v 1.6 2010/02/11 23:18:29 joerg Exp $
 
 SHA1 (xipdump-1.5.4.tgz) = 8fa152cc9114fb3862a223be47e104394f00b250
 RMD160 (xipdump-1.5.4.tgz) = 4202c4c3ac7a749d1b7a25caa9577a6529ee87df
@@ -7,5 +7,5 @@ SHA1 (patch-aa) = 4dc89157456a3d223456babcbdca4ac501b6a664
 SHA1 (patch-ab) = 5018ade12779648836a866be510fc42af54162f2
 SHA1 (patch-ac) = 71c25f1fe5bb52667902c5a10f2a56d8809eb560
 SHA1 (patch-ad) = 0c7bd3c0be1bffe19a7823add4c5c2ae3ff29ba3
-SHA1 (patch-ae) = 57d725a8f458799dc2a9b68a897c7d4bd1b6d435
+SHA1 (patch-ae) = 7653b883f53ec90a231fa25d506f51f8cb75470a
 SHA1 (patch-af) = 115aca8ae051caf44accb9b8d2a7acd691cd78fc
diff --git a/net/xipdump/patches/patch-ae b/net/xipdump/patches/patch-ae
index a2df5ffc720..912dd2e4d9d 100644
--- a/net/xipdump/patches/patch-ae
+++ b/net/xipdump/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2002/06/27 20:52:07 agc Exp $
+$NetBSD: patch-ae,v 1.2 2010/02/11 23:18:29 joerg Exp $
 
 --- Makefile.in	2002/06/27 20:47:49	1.1
 +++ Makefile.in	2002/06/27 20:49:00
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.1 2002/06/27 20:52:07 agc Exp $
  	$(INSTALL) data/pkt/* $(datadir)/xipdump/pkt
  	$(INSTALL) data/pkc/* $(datadir)/xipdump/pkc
 -	$(INSTALL) Xipdump.ad @APP_DEFAULTS_DIR@/Xipdump
-+	$(INSTALL) Xipdump.ad @prefix@/lib/X11/app-defaults/Xipdump
++	$(INSTALL) Xipdump.ad ${DESTDIR}@prefix@/lib/X11/app-defaults/Xipdump
  
  .SUFFIXES: .E .w
  
diff --git a/net/xmftp/Makefile b/net/xmftp/Makefile
index a7a3d211fa2..522dca4d0cf 100644
--- a/net/xmftp/Makefile
+++ b/net/xmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:00 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2010/02/11 23:21:26 joerg Exp $
 #
 
 DISTNAME=	xmftp-1.0.4
@@ -10,15 +10,16 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://viraj.org/old/xmftp/
 COMMENT=	X/Motif FTP client
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/xmftp/source
 USE_X11BASE=	yes
 USE_TOOLS+=	gmake
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/doc/xmftp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xmftp ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmftp
+	${INSTALL_PROGRAM} ${WRKSRC}/xmftp ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/../BUGS ${PREFIX}/share/doc/xmftp
 	${INSTALL_DATA} ${WRKSRC}/../CHANGES ${PREFIX}/share/doc/xmftp
 	${INSTALL_DATA} ${WRKSRC}/../FAQ ${PREFIX}/share/doc/xmftp
diff --git a/net/xnap/Makefile b/net/xnap/Makefile
index 3a2403f9f78..97d2788f641 100644
--- a/net/xnap/Makefile
+++ b/net/xnap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:01 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/02/11 23:23:11 joerg Exp $
 #
 
 DISTNAME=	xnap-2.0
@@ -10,9 +10,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://xnap.sourceforge.net/
 COMMENT=	Java filesharing client with support for OpenNap
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/xnap share/doc/xnap
 
 post-extract:
 	cd ${WRKSRC} && ${MV} xnap.sh xnap.sh.in
@@ -22,12 +24,9 @@ pre-configure:
 		-e 's|@PREFIX@|${PREFIX}|g' < xnap.sh.in > xnap.sh
 
 do-install:
-	${CP} ${WRKSRC}/xnap.sh ${PREFIX}/bin/xnap
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/share/xnap
-	${CP} ${WRKSRC}/xnap.jar ${PREFIX}/share/xnap/xnap.jar
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/share/doc/xnap
-	${CP} ${WRKSRC}/README ${PREFIX}/share/doc/xnap
-	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/xnap ${PREFIX}/share/doc/xnap
+	${INSTALL_SCRIPT} ${WRKSRC}/xnap.sh ${DESTDIR}${PREFIX}/bin/xnap
+	${INSTALL_DATA} ${WRKSRC}/xnap.jar ${PREFIX}/share/xnap/xnap.jar
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xnap
 
 .include "../../mk/java-vm.mk"
 
diff --git a/net/xrmftp/Makefile b/net/xrmftp/Makefile
index 06d170aae94..ac37977894e 100644
--- a/net/xrmftp/Makefile
+++ b/net/xrmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/02/11 23:23:54 joerg Exp $
 
 DISTNAME=	xrmftp-1.2.4
 PKGREVISION=	6
@@ -16,7 +16,7 @@ USE_X11BASE=	yes
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xrmftp ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xrmftp ${DESTDIR}${PREFIX}/bin
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index f02c67dbf44..85ce91a4e9e 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2010/02/11 23:26:12 joerg Exp $
 #
 
 DISTNAME=	xtraceroute-0.8.14
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dtek.chalmers.se/~d3august/xt/index.html
 COMMENT=	Graphical version of traceroute, which traces the route IP packets go
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt
@@ -30,10 +32,11 @@ CONFIGURE_ARGS+= --with-lib-MesaGL
 CONFIGURE_ARGS+=	--with-traceroute=/usr/etc/traceroute
 .endif
 
+INSTALLATION_DIRS+=	share/xtraceroute
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xtraceroute
-	${INSTALL_DATA} ${WRKDIR}/hosts.cache    ${PREFIX}/share/xtraceroute/hosts.cache
-	${INSTALL_DATA} ${WRKDIR}/networks.cache ${PREFIX}/share/xtraceroute/networks.cache
+	${INSTALL_DATA} ${WRKDIR}/hosts.cache    ${DESTDIR}${PREFIX}/share/xtraceroute/hosts.cache
+	${INSTALL_DATA} ${WRKDIR}/networks.cache ${DESTDIR}${PREFIX}/share/xtraceroute/networks.cache
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/net/xtraceroute/distinfo b/net/xtraceroute/distinfo
index 6325b3c0706..cd4fd94a631 100644
--- a/net/xtraceroute/distinfo
+++ b/net/xtraceroute/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:14:07 agc Exp $
+$NetBSD: distinfo,v 1.4 2010/02/11 23:26:12 joerg Exp $
 
 SHA1 (xtraceroute-0.8.14.tar.gz) = f7e21072fb653842aaed7ae2be5a0d33573bb654
 RMD160 (xtraceroute-0.8.14.tar.gz) = b468783f00afdc9e346dabcb9ccc4b4ecdba1536
@@ -9,3 +9,4 @@ Size (ndg_files.tar.gz) = 90437 bytes
 SHA1 (patch-aa) = f2477f850ffd683fc6c6ef7fd7040ecff20ffa97
 SHA1 (patch-ab) = 752713d3ec6d013987f6b8c48f3a2e59636b421c
 SHA1 (patch-ac) = 7dbf4818d90c6cf85e06ae423daf56e2e1f1df66
+SHA1 (patch-ad) = f9eccd1d4fd9223f436de3b669c7f265a01ae271
diff --git a/net/xtraceroute/patches/patch-ad b/net/xtraceroute/patches/patch-ad
new file mode 100644
index 00000000000..3b4614fc8ab
--- /dev/null
+++ b/net/xtraceroute/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.1 2010/02/11 23:26:12 joerg Exp $
+
+--- po/Makefile.in.in.orig	2010-02-11 23:24:45.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/net/ywho/Makefile b/net/ywho/Makefile
index 9620520cd0a..a0dfe0d0897 100644
--- a/net/ywho/Makefile
+++ b/net/ywho/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/09/20 08:57:53 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2010/02/11 23:25:51 joerg Exp $
 #
 
 DISTNAME=		ywho-1.3
@@ -8,9 +8,13 @@ MASTER_SITES=		ftp://ftp.gw.com/pub/people/kim/
 MAINTAINER=		kim@tac.nyc.ny.us
 COMMENT=		Who, users, uptime on clients in a sun-RPC network
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=		yes
-MAKE_FLAGS+=		DEST=${PREFIX}
+MAKE_FLAGS+=		DEST=${DESTDIR}${PREFIX}
 BUILD_TARGET=		all
+
 INSTALL_TARGET=		install install.man
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/cleanscore/Makefile b/news/cleanscore/Makefile
index 73e98d8427c..4867b7390c5 100644
--- a/news/cleanscore/Makefile
+++ b/news/cleanscore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/10/12 12:30:47 is Exp $
+# $NetBSD: Makefile,v 1.2 2010/02/11 23:27:24 joerg Exp $
 #
 
 DISTNAME=		cleanscore-0.9.8.1
@@ -9,14 +9,17 @@ MAINTAINER=		is@NetBSD.org
 HOMEPAGE=		http://slrn.sourceforge.net/cleanscore/
 COMMENT=		Clean SLRN's score file
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS=		perl
 REPLACE_PERL=		cleanscore
 
 NO_BUILD=		yes
 
+INSTALLATION_DIRS+=	bin share/doc/cleanscore
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/cleanscore ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cleanscore
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cleanscore
+	${INSTALL_SCRIPT} ${WRKSRC}/cleanscore ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cleanscore
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/nget/Makefile b/news/nget/Makefile
index 90712bdd300..05242557c46 100644
--- a/news/nget/Makefile
+++ b/news/nget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/02/11 23:30:22 joerg Exp $
 #
 
 DISTNAME=		nget-0.27.1
@@ -10,6 +10,8 @@ MAINTAINER=		joel@carnat.net
 HOMEPAGE=		http://nget.sourceforge.net/
 COMMENT=		Command line nntp file grabber
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
@@ -22,11 +24,13 @@ EGDIR=			${PREFIX}/share/examples/nget
 MESSAGE_SUBST+=		EGDIR=${EGDIR}
 
 INSTALLATION_DIRS=	share/nget share/examples/nget
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
+			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 post-install:
 	for f in COPYING Changelog FAQ README TODO; do \
-		${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/share/nget; done
-	${INSTALL_DATA} ${WRKSRC}/.ngetrc ${EGDIR}/dot.ngetrc
+		${INSTALL_DATA} ${WRKSRC}/$${f} ${DESTDIR}${PREFIX}/share/nget; done
+	${INSTALL_DATA} ${WRKSRC}/.ngetrc ${DESTDIR}${EGDIR}/dot.ngetrc
 
 .include "../../converters/uulib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/news/suck/Makefile b/news/suck/Makefile
index f49afe07d62..2a518ba4f7f 100644
--- a/news/suck/Makefile
+++ b/news/suck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2010/01/17 12:02:37 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/02/11 23:33:41 joerg Exp $
 #
 
 DISTNAME=	suck-4.3.2
@@ -10,6 +10,8 @@ MAINTAINER=	drankin@bohemians.lexington.ky.us
 HOMEPAGE=	http://home.comcast.net/~bobyetman/
 COMMENT=	Feed a local news server without a dedicated newsfeed
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_FEATURES=	snprintf
 
@@ -22,10 +24,12 @@ post-patch:
 		${WRKSRC}/Makefile.in >${WRKSRC}/Makefile.tmp
 	@${MV} ${WRKSRC}/Makefile.tmp ${WRKSRC}/Makefile.in
 
+INSTALLATION_DIRS+=	share/examples/suck
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
+			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/suck
-	${CP} ${WRKSRC}/sample/* ${PREFIX}/share/examples/suck
-	${CHMOD} 644 ${PREFIX}/share/examples/suck/*
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${DESTDIR}${PREFIX}/share/examples/suck
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/xrn/Makefile b/news/xrn/Makefile
index 7bc2fc0155d..90cf49def5d 100644
--- a/news/xrn/Makefile
+++ b/news/xrn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/11/10 17:21:37 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/02/11 23:32:50 joerg Exp $
 #
 
 DISTNAME=	9.01
@@ -12,16 +12,19 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mit.edu/people/jik/software/xrn.html
 COMMENT=	Usenet News reader for the X window system
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	xrn
 
 USE_TOOLS+=	lex yacc
 USE_IMAKE=	yes
 
+INSTALLATION_DIRS+=	share/doc/xrn
+
 pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xrn
 	for f in COMMON-PROBLMS COPYRIGHT CREDITS ChangeLog; do		\
-		${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/xrn;	\
+		${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/share/doc/xrn;	\
 	done
 
 .include "../../x11/libXaw/buildlink3.mk"
diff --git a/print/chktex/Makefile b/print/chktex/Makefile
index 5050cb2e8b5..6ed240e27d1 100644
--- a/print/chktex/Makefile
+++ b/print/chktex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:10:35 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/11 23:50:51 joerg Exp $
 #
 
 DISTNAME=	chktex-1.6.3
@@ -10,6 +10,8 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://baruch.ev-en.org/proj/chktex/
 COMMENT=	LaTeX semantic checker
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	lynx-[0-9]*:../../www/lynx
 
 EGDIR=      ${PREFIX}/share/examples/chktex
@@ -21,8 +23,7 @@ CFLAGS+=	-D__unix__
 CONFIGURE_ENV+=	PERL5=${PERL5:Q}
 MAKE_ENV+=	INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} EGDIR=${EGDIR:Q}
 
-pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
+INSTALLATION_DIRS+=	${EGDIR}
 
 .include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cnprint/Makefile b/print/cnprint/Makefile
index f2f590506f3..f0e163e0a80 100644
--- a/print/cnprint/Makefile
+++ b/print/cnprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:28 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/11 23:42:13 joerg Exp $
 
 DISTNAME=		#
 PKGNAME=		cnprint-3.30b
@@ -26,9 +26,11 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.neurophys.wisc.edu/~cai/software/index.html
 COMMENT=		Print & convert CJK style text to PostScript
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=		${PKGNAME_NOREV}
 USE_TOOLS+=		gtar gunzip
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/cnprint
 
 do-extract:
 	${MKDIR} ${WRKSRC}
@@ -48,13 +50,12 @@ do-build:
 		>cnprint.cmd <cnprint33.cmd
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/cnprint.cmd ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/*.sym ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/*.htf ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/*.hbf ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/*.bin ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${PREFIX}/share/cnprint
-	${INSTALL_PROGRAM} ${WRKSRC}/cnprint ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/cnprint.cmd ${DESTDIR}${PREFIX}/share/cnprint
+	${INSTALL_DATA} ${WRKSRC}/*.sym ${DESTDIR}${PREFIX}/share/cnprint
+	${INSTALL_DATA} ${WRKSRC}/*.htf ${DESTDIR}${PREFIX}/share/cnprint
+	${INSTALL_DATA} ${WRKSRC}/*.hbf ${DESTDIR}${PREFIX}/share/cnprint
+	${INSTALL_DATA} ${WRKSRC}/*.bin ${DESTDIR}${PREFIX}/share/cnprint
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DESTDIR}${PREFIX}/share/cnprint
+	${INSTALL_PROGRAM} ${WRKSRC}/cnprint ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dvidvi/Makefile b/print/dvidvi/Makefile
index e2984f875b8..81616df3e1e 100644
--- a/print/dvidvi/Makefile
+++ b/print/dvidvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/09/08 14:25:49 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/11 23:41:32 joerg Exp $
 #
 
 DISTNAME=	dvidvi-1.0
@@ -8,6 +8,8 @@ MASTER_SITES=	ftp://sunsite.univie.ac.at/pub/distfiles/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Select and/or rearrange pages in a TeX dvi file
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 RESTRICTED=	Unable to determine distribution license
 NO_SRC_ON_FTP=	${RESTRICTED}
 NO_SRC_ON_CDROM=${RESTRICTED}
@@ -17,7 +19,7 @@ NO_BIN_ON_CDROM=${RESTRICTED}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dvidvi ${PREFIX}/bin/dvidvi
-	${INSTALL_MAN} ${WRKSRC}/dvidvi.1 ${PREFIX}/${PKGMANDIR}/man1/dvidvi.1
+	${INSTALL_PROGRAM} ${WRKSRC}/dvidvi ${DESTDIR}${PREFIX}/bin/dvidvi
+	${INSTALL_MAN} ${WRKSRC}/dvidvi.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/dvidvi.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/flpsed/Makefile b/print/flpsed/Makefile
index 3848e8cd794..7e1e9e2532d 100644
--- a/print/flpsed/Makefile
+++ b/print/flpsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/03/24 01:57:44 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/11 23:58:34 joerg Exp $
 
 DISTNAME=		flpsed-0.3.9
 CATEGORIES=		print
@@ -8,13 +8,16 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.ecademix.com/JohannesHofmann/flpsed.html
 COMMENT=		WYSIWYG PostScript2 annotator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_LANGUAGES+=		c c++
 USE_TOOLS+=		gmake gs:run
 
+INSTALLATION_DIRS+=	share/doc/flpsed
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/flpsed
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/flpsed
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/flpsed
 
 .include "../../x11/fltk/buildlink3.mk"
 
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index d0e7188de32..145fb1573d4 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2007/02/22 19:27:03 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/02/11 23:59:39 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
@@ -57,7 +59,9 @@ REQD_DIRS=	${EGDIR}
 OWN_DIRS=	${CONFDIR}
 CONF_FILES=	${EGDIR}/filter.conf ${CONFDIR}/filter.conf
 
+INSTALLATION_DIRS+=	${EGDIR}
+
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/filter.conf ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/filter.conf ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"