Add DESTDIR support.

author: joerg <joerg@pkgsrc.org> 2008-06-20 01:09:05 +0000
committer: joerg <joerg@pkgsrc.org> 2008-06-20 01:09:05 +0000
commit: 3b0d97b0de8516db29699676c860489da3f7f0e1 (patch)
tree: bb388f6b2532587595653e67cce25229ed050cb8 /www
parent: 10abca39942a8f34d088f39ccc073fee44271274 (diff)
download: pkgsrc-3b0d97b0de8516db29699676c860489da3f7f0e1.tar.gz
92 files changed, 431 insertions, 272 deletions
diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index cb74ffb4884..ddd4d697630 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/05/26 02:13:25 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:40 joerg Exp $
 
 DISTNAME=	apache-tomcat-${TOMCAT_VERSION}
 CATEGORIES=	www java
@@ -9,6 +9,8 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://tomcat.apache.org/
 COMMENT=	The Apache Project's Java Servlet 2.4 and JSP 2.0 server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 TOMCAT_VERSION=	5.5.26
 
 USE_JAVA=	run
@@ -60,22 +62,23 @@ FILES_SUBST+=	JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q}
 
 do-build:
 	@${MV} ${WRKSRC}/conf ${WRKDIR}
+
+INSTALLATION_DIRS+=	${EGDIR2} ${TOMCAT_LIB}
+
 do-install:
-	${INSTALL_DATA_DIR} ${EGDIR2}
 .for f in ${CFILES}
-	${INSTALL_DATA} ${WRKDIR}/conf/${f} ${EGDIR}
+	${INSTALL_DATA} ${WRKDIR}/conf/${f} ${DESTDIR}${EGDIR}
 .endfor
 .for f in ${CF2FILES}
-	${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${EGDIR2}
+	${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${DESTDIR}${EGDIR2}
 .endfor
-	${INSTALL_DATA_DIR} ${TOMCAT_LIB}
 	${RM} -rf ${WRKSRC}/temp/*
-	@cd ${WRKSRC} && pax -rw -pm . ${TOMCAT_LIB}
+	cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${TOMCAT_LIB}
 
-	${FIND} ${TOMCAT_LIB} -type f -name \*.bat -print | ${XARGS} ${RM} -f
-	${FIND} ${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-	${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
-	${FIND} ${TOMCAT_LIB} -type f -name \*.sh -print | \
+	${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -name \*.bat -print | ${XARGS} ${RM} -f
+	${FIND} ${DESTDIR}${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+	${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+	${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -name \*.sh -print | \
 		${XARGS} ${CHMOD} ${BINMODE}
 
 .include "../../mk/java-vm.mk"
diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile
index 24fdc0ef24f..14ca7b0c2ee 100644
--- a/www/apc-gui/Makefile
+++ b/www/apc-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2008/06/20 01:09:40 joerg Exp $
 
 DISTNAME=	apc_gui-1.0.3
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://apc.neuropeans.com/
 COMMENT=	Web interface for managing APC (php-apc)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PHP_VERSIONS_ACCEPTED=	4
 
 .include "../../lang/php/phpversion.mk"
@@ -34,14 +36,14 @@ SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@APC_GUI_DIR@,${APC_GUI_DIR},g'
 SUBST_STAGE.paths=	post-patch
 
+INSTALLATION_DIRS=	${APC_GUI_DIR} ${EGDIR}
+
 post-extract:
 	${CP} ${FILESDIR}/apc_gui.conf.dist ${WRKDIR}
 
 do-install:
-	${INSTALL_DATA_DIR} ${APC_GUI_DIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKDIR}/apc_gui.conf.dist ${EGDIR}/apc_gui.conf
-	${CP} -R ${WRKSRC}/* ${APC_GUI_DIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${APC_GUI_DIR}
+	${INSTALL_DATA} ${WRKDIR}/apc_gui.conf.dist ${DESTDIR}${EGDIR}/apc_gui.conf
+	${CP} -R ${WRKSRC}/* ${DESTDIR}${APC_GUI_DIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${APC_GUI_DIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/asp2php/Makefile b/www/asp2php/Makefile
index 42a07e5dda4..3904808269b 100644
--- a/www/asp2php/Makefile
+++ b/www/asp2php/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/09/30 17:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/20 01:09:40 joerg Exp $
 #
 
 DISTNAME=	asp2php-0.76.17
@@ -9,5 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://asp2php.naken.cc/
 COMMENT=	Converts asp pages to php pages
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INSTALLATION_DIRS=	bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/asp2php/distinfo b/www/asp2php/distinfo
index 48868867edd..7b282f77117 100644
--- a/www/asp2php/distinfo
+++ b/www/asp2php/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 14:08:29 wiz Exp $
+$NetBSD: distinfo,v 1.9 2008/06/20 01:09:40 joerg Exp $
 
 SHA1 (asp2php-0.76.17.tar.gz) = 9fe485f8f738c11a7104b935cbcadf365195bac4
 RMD160 (asp2php-0.76.17.tar.gz) = a1173e3ded769234bcfbf38b3cc11f32346c0072
 Size (asp2php-0.76.17.tar.gz) = 53793 bytes
-SHA1 (patch-aa) = d9dea1ccabce8e79d032c3462cf59d3fb2303a8c
+SHA1 (patch-aa) = 9788bb50a07a32a8895c82580b21418114cae57f
 SHA1 (patch-ab) = a95a8ffcac811b32bb467482c0e208e9f8ab0bdd
 SHA1 (patch-ac) = e833373ae539b142849b9f89755d391532155846
diff --git a/www/asp2php/patches/patch-aa b/www/asp2php/patches/patch-aa
index edc7d068a32..e52deff7135 100644
--- a/www/asp2php/patches/patch-aa
+++ b/www/asp2php/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2004/07/11 00:31:25 salo Exp $
+$NetBSD: patch-aa,v 1.5 2008/06/20 01:09:40 joerg Exp $
 
 --- Makefile.orig	2003-03-26 19:35:11.000000000 +0100
 +++ Makefile	2004-07-11 02:22:19.000000000 +0200
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.4 2004/07/11 00:31:25 salo Exp $
 -	@if [ -e gtkasp2php ]; then install gtkasp2php /usr/local/bin; fi;
 -	@echo "Compiled programs have been installed in /usr/local/bin"
 -	@echo ""
-+	${BSD_INSTALL_PROGRAM} asp2php ${BINDIR}
++	${BSD_INSTALL_PROGRAM} asp2php ${DESTDIR}${BINDIR}
  
  uninstall:
  	@if [ -e /usr/local/bin/asp2php ]; then rm /usr/local/bin/asp2php; fi;
diff --git a/www/august/Makefile b/www/august/Makefile
index 13a4cfd6d4b..54c70e83c0d 100644
--- a/www/august/Makefile
+++ b/www/august/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:40 joerg Exp $
 #
 
 DISTNAME=	august0.63b.src
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.bostream.nu/johanb/august/
 COMMENT=	Simple Tk-based HTML editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
 
@@ -28,10 +30,10 @@ REPLACE_FILES.wish=	august
 # height of images, and Weblint to check html syntax.
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/august ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/license.txt ${PREFIX}/share/doc/august/
-	${INSTALL_MAN} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/august/
-	${INSTALL_MAN} ${WRKSRC}/specchars.txt ${PREFIX}/share/doc/august/
-	${INSTALL_MAN} ${WRKSRC}/keyname.tcl ${PREFIX}/share/doc/august/
+	${INSTALL_SCRIPT} ${WRKSRC}/august ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/license.txt ${DESTDIR}${PREFIX}/share/doc/august/
+	${INSTALL_MAN} ${WRKSRC}/readme.txt ${DESTDIR}${PREFIX}/share/doc/august/
+	${INSTALL_MAN} ${WRKSRC}/specchars.txt ${DESTDIR}${PREFIX}/share/doc/august/
+	${INSTALL_MAN} ${WRKSRC}/keyname.tcl ${DESTDIR}${PREFIX}/share/doc/august/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index e03a78c7a10..47fe4ada251 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/05/25 21:42:22 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2008/06/20 01:09:40 joerg Exp $
 
 DISTNAME=	awstats-6.7
 CATEGORIES=	www
@@ -8,6 +8,8 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://awstats.sourceforge.net/
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=		yes
 
 USE_TOOLS+=		perl:run pax
@@ -59,37 +61,37 @@ post-extract:
 	find ${WRKSRC} -name .cvsignore -exec rm {} \;
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/*.pl ${PREFIX}/awstats/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/*.pl ${DESTDIR}${PREFIX}/awstats/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/*.pl		\
-		${PREFIX}/awstats/cgi-bin
+	    ${DESTDIR}${PREFIX}/awstats/cgi-bin
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf	\
-		${PREFIX}/share/examples/awstats/awstats.conf
+	    ${DESTDIR}${PREFIX}/share/examples/awstats/awstats.conf
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/example/example.pm \
-		${PREFIX}/share/examples/awstats/example.pm
+	    ${DESTDIR}${PREFIX}/share/examples/awstats/example.pm
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/*.pm		\
-		${PREFIX}/awstats/cgi-bin/plugins
+	    ${DESTDIR}${PREFIX}/awstats/cgi-bin/plugins
 .for d in lang lib
 	cd ${WRKSRC}/wwwroot/cgi-bin					\
-		&& pax -rwpppm ${d} ${PREFIX}/awstats/cgi-bin/
-	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/awstats/cgi-bin/${d}
-	find ${PREFIX}/awstats/cgi-bin/${d} -type d -print	\
+		&& pax -rwpppm ${d} ${DESTDIR}${PREFIX}/awstats/cgi-bin/
+	chown -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/awstats/cgi-bin/${d}
+	find ${DESTDIR}${PREFIX}/awstats/cgi-bin/${d} -type d -print	\
 		| xargs chmod ${PKGDIRMODE}
-	find ${PREFIX}/awstats/cgi-bin/${d} -type f -print	\
+	find ${DESTDIR}${PREFIX}/awstats/cgi-bin/${d} -type f -print	\
 		| xargs chmod ${SHAREMODE}
 .endfor
 .for d in classes css icon js
-	cd ${WRKSRC}/wwwroot && pax -rwpppm ${d} ${PREFIX}/awstats/
-	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/awstats/${d}
-	find ${PREFIX}/awstats/${d} -type d -print	\
+	cd ${WRKSRC}/wwwroot && pax -rwpppm ${d} ${DESTDIR}${PREFIX}/awstats/
+	chown -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/awstats/${d}
+	find ${DESTDIR}${PREFIX}/awstats/${d} -type d -print	\
 		| xargs chmod ${PKGDIRMODE}
-	find ${PREFIX}/awstats/${d} -type f -print	\
+	find ${DESTDIR}${PREFIX}/awstats/${d} -type f -print	\
 		| xargs chmod ${SHAREMODE}
 .endfor
-	cd ${WRKSRC}/docs && pax -rwpppm . ${PREFIX}/share/doc/awstats/
-	chown -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/doc/awstats/
-	find ${PREFIX}/share/doc/awstats/ -type d -print	\
+	cd ${WRKSRC}/docs && pax -rwpppm . ${DESTDIR}${PREFIX}/share/doc/awstats/
+	chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PREFIX}/share/doc/awstats/
+	find ${DESTDIR}${PREFIX}/share/doc/awstats/ -type d -print	\
 		| xargs chmod ${PKGDIRMODE}
-	find ${PREFIX}/share/doc/awstats/ -type f -print	\
+	find ${DESTDIR}${PREFIX}/share/doc/awstats/ -type f -print	\
 		| xargs chmod ${DOCMODE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/bannerfilter/Makefile b/www/bannerfilter/Makefile
index f796f72879c..dba64eaf2c5 100644
--- a/www/bannerfilter/Makefile
+++ b/www/bannerfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/11/11 16:54:24 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	bannerfilter-1.31
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://phroggy.com/bannerfilter/
 COMMENT=	Blocks advertising banners as squid redirector script
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	YES
 USE_TOOLS+=	perl:run
 
@@ -26,10 +28,10 @@ INSTALLATION_DIRS=	bin ${SHAREDIR}/www ${SHAREDIR}/doc ${SHAREDIR}/data
 CHECK_PORTABILITY_SKIP+=	update.sh
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/www/* ${SHAREDIR}/www/
-	${INSTALL_DATA} ${WRKSRC}/*.data ${SHAREDIR}/data/
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/COPYING ${WRKSRC}/README ${SHAREDIR}/doc/
-	${INSTALL_DATA} ${WRKSRC}/bannerfilter.conf ${SHAREDIR}/
-	${INSTALL_SCRIPT} ${WRKSRC}/redirector.pl ${PREFIX}/bin/bannerfilter-redirector.pl
+	${INSTALL_DATA} ${WRKSRC}/www/* ${DESTDIR}${SHAREDIR}/www/
+	${INSTALL_DATA} ${WRKSRC}/*.data ${DESTDIR}${SHAREDIR}/data/
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/COPYING ${WRKSRC}/README ${DESTDIR}${SHAREDIR}/doc/
+	${INSTALL_DATA} ${WRKSRC}/bannerfilter.conf ${DESTDIR}${SHAREDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/redirector.pl ${DESTDIR}${PREFIX}/bin/bannerfilter-redirector.pl
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 958bbdc93e1..f6c887e59bf 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/01/07 09:14:15 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	bins-1.1.29
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://bins.sautret.org/
 COMMENT=	Static HTML photo album generator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-gettext>=1.01:../../devel/p5-gettext
 DEPENDS+=	p5-HTML-Clean>=0.8:../../www/p5-HTML-Clean
 DEPENDS+=	p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser
@@ -38,7 +40,8 @@ USE_TOOLS+=	perl:run
 REPLACE_PERL=	bins bins_edit bins-edit-gui tools/bins_addtext \
 		tools/bins_cleanupgallery tools/bins_txt2xml
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/html/bins \
+			share/examples/bins
 
 post-patch:
 	${MV} ${WRKSRC}/bins ${WRKSRC}/bins.bak
@@ -48,39 +51,36 @@ post-patch:
 
 do-install:
 	# Programs and manual pages
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/anti_bins ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bins ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/bins_cleanupgallery ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bins_edit ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/bins.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/bins_edit.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/anti_bins ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bins ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/bins_cleanupgallery ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bins_edit ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/bins.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/bins_edit.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	# HTML documentation
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/bins
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/html/bins/
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DESTDIR}${PREFIX}/share/doc/html/bins/
 	# Example configuration file
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins
-	${INSTALL_DATA} ${WRKSRC}/binsrc ${PREFIX}/share/examples/bins/
+	${INSTALL_DATA} ${WRKSRC}/binsrc ${DESTDIR}${PREFIX}/share/examples/bins/
 .for template in swigs
 	# template: default
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.${template}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/bins/templates.${template}
 	${INSTALL_DATA} ${WRKSRC}/templates.${template}/*.*		\
-		${PREFIX}/share/examples/bins/templates.${template}/
+		${DESTDIR}${PREFIX}/share/examples/bins/templates.${template}/
 .endfor
 .for template in joi marc martin mwolson petrus satyap
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.${template}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.${template}/static
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/bins/templates.${template}/static
 	${INSTALL_DATA} ${WRKSRC}/templates.${template}/*.*		\
-		${PREFIX}/share/examples/bins/templates.${template}/
+		${DESTDIR}${PREFIX}/share/examples/bins/templates.${template}/
 	${INSTALL_DATA}							\
 		${WRKSRC}/templates.${template}/static/*		\
-		${PREFIX}/share/examples/bins/templates.${template}/static/
+		${DESTDIR}${PREFIX}/share/examples/bins/templates.${template}/static/
 .endfor
 	# Translations
 	for lang in ca de eo es fi fr hu it ja nl pl ru zh_TW; do \
 		${INSTALL_DATA_DIR} \
-		${PREFIX}/${PKGLOCALEDIR}/locale/$$lang/LC_MESSAGES; \
+		${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale/$$lang/LC_MESSAGES; \
 		${INSTALL_DATA} ${WRKSRC}/intl/$$lang.mo \
-		${PREFIX}/${PKGLOCALEDIR}/locale/$$lang/LC_MESSAGES/bins.mo; \
+		${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale/$$lang/LC_MESSAGES/bins.mo; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/bkedit/distinfo b/www/bkedit/distinfo
index 8cf8a87c5c8..d58070db540 100644
--- a/www/bkedit/distinfo
+++ b/www/bkedit/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2006/06/25 13:46:37 wiz Exp $
+$NetBSD: distinfo,v 1.7 2008/06/20 01:09:41 joerg Exp $
 
 SHA1 (bk_edit-0.6.23.tar.gz) = fe37a0e213e54d8a60f70b6e03818e26f3690bf2
 RMD160 (bk_edit-0.6.23.tar.gz) = a9cc09925ccd0691d5a38b04ea2a81f877a3c102
 Size (bk_edit-0.6.23.tar.gz) = 113434 bytes
-SHA1 (patch-aa) = 84d7f99a8de035df2fd92586ded632aaf6edfc1e
+SHA1 (patch-aa) = 5849d18f67e6f99ab93a47b326e400d30099af89
 SHA1 (patch-ab) = 35434dd2df53738c6941f01f7fdd780bf20ea3fb
 SHA1 (patch-ac) = f2d604127d303ad1293c2990671a807a772da2ac
 SHA1 (patch-ad) = e1161633ecd78e5c195e97a70710f4af99950a76
diff --git a/www/bkedit/patches/patch-aa b/www/bkedit/patches/patch-aa
index 96bc03d5290..21241f80ba0 100644
--- a/www/bkedit/patches/patch-aa
+++ b/www/bkedit/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2004/06/02 21:50:31 recht Exp $
+$NetBSD: patch-aa,v 1.2 2008/06/20 01:09:41 joerg Exp $
 
---- src/Makefile.in.orig	2004-06-02 23:33:55.000000000 +0200
-+++ src/Makefile.in	2004-06-02 23:34:13.000000000 +0200
-@@ -3,8 +3,8 @@
+--- src/Makefile.in.orig	2003-11-29 13:14:14.000000000 +0000
++++ src/Makefile.in
+@@ -3,8 +3,8 @@ PROG = bkedit#
  CC = gcc
  LD = gcc
  
@@ -13,3 +13,18 @@ $NetBSD: patch-aa,v 1.1 2004/06/02 21:50:31 recht Exp $
  
  OBJS = bk_edit.o bk_edit_menu.o bk_edit_tree.o bk_edit_edit.o bk_edit_file.o \
  	bk_edit_ccp.o bk_edit_data.o bk_edit_undo.o bk_edit_dnd.o bk_edit_misc.o \
+@@ -29,10 +29,10 @@ plugs:
+ 	cd plugins && make
+ 
+ install:
+-	$(INSTALL) -d -m 755 @PREFIX@/bin/
+-	$(INSTALL) -m 755 $(PROG) @PREFIX@/bin/
+-	$(INSTALL) -d -m 755 @PREFIX@/share/bkedit/
+-	$(INSTALL) -m 755 ./plugins/*.so @PREFIX@/share/bkedit/
++	$(INSTALL) -d -m 755 ${DESTDIR}@PREFIX@/bin/
++	$(INSTALL) -m 755 $(PROG) ${DESTDIR}@PREFIX@/bin/
++	$(INSTALL) -d -m 755 ${DESTDIR}@PREFIX@/share/bkedit/
++	$(INSTALL) -m 755 ./plugins/*.so ${DESTDIR}@PREFIX@/share/bkedit/
+ 
+ uninstall:
+ 	$(RM) @PREFIX@/bin/$(PROG)
diff --git a/www/blur6ex/Makefile b/www/blur6ex/Makefile
index 3222eeb2154..b22f80d94e7 100644
--- a/www/blur6ex/Makefile
+++ b/www/blur6ex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:25 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	blur6ex-0.1.198
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.blursoft.com/
 COMMENT=	Weblog and content framework
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.0:../../www/ap-php
 DEPENDS+=	${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql
 DEPENDS+=	mysql-server>=4.1:../../databases/mysql5-server
@@ -40,18 +42,18 @@ CONF_FILES=	${PEGDIR}/db.php ${PKG_SYSCONFDIR.blur6exdb}/db.php
 CONF_FILES+=	${PEGDIR}/index.php ${PKG_SYSCONFDIR.blur6ex}/index.php
 
 pre-install:
-	${INSTALL_DATA} ${WRKSRC}/engine/core/db.php ${PEGDIR}
-	${INSTALL_DATA} ${WRKSRC}/index.php ${PEGDIR}
+	${INSTALL_DATA} ${WRKSRC}/engine/core/db.php ${DESTDIR}${PEGDIR}
+	${INSTALL_DATA} ${WRKSRC}/index.php ${DESTDIR}${PEGDIR}
 
 do-install:
 	${INSTALL_DATA}						\
 		${WRKSRC}/install/INSTALL.txt			\
 		${WRKSRC}/install/blur6ex_tables.sql		\
-		${PREFIX}/share/doc/${PKGBASE}
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	cd ${WRKSRC} && pax -rwppm '-s|.*/install.*$$||'	\
 		'-s|./index.php$$||'				\
 		'-s|./engine/core/db.php$$||' .			\
-		${PREFIX}/${HTTPD_ROOT}/blog
+		${DESTDIR}${PREFIX}/${HTTPD_ROOT}/blog
 
 .include "../../mk/apachever.mk"
 .include "../../lang/php/phpversion.mk"
diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile
index e2e3952c14e..3cc24388ee5 100644
--- a/www/browser-bookmarks-menu/Makefile
+++ b/www/browser-bookmarks-menu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:26 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	browser-bookmarks-menu-0.6
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://browserbookapp.sourceforge.net/
 COMMENT=	Easy access to web bookmarks through a GNOME Panel Applet
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 PYTHON_PATCH_SCRIPTS=	browser-bookmarks-menu.py
 
@@ -22,12 +24,14 @@ SUBST_SED.paths+= -e 's|/usr/share|${PREFIX}/share|g'
 
 PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
 
+INSTALLATION_DIRS=	lib/bonobo/servers libexec
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/BrowserBookmarksMenu.server \
-		${PREFIX}/lib/bonobo/servers/
+	    ${DESTDIR}${PREFIX}/lib/bonobo/servers/
 	${INSTALL_SCRIPT} ${WRKSRC}/browser-bookmarks-menu.py \
-		${PREFIX}/libexec
-	${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/libexec
+	    ${DESTDIR}${PREFIX}/libexec
+	${PYTHONBIN} ${PYCOMPILEALL} ${DESTDIR}${PREFIX}/libexec
 
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gnome2/buildlink3.mk"
diff --git a/www/calamaris/Makefile b/www/calamaris/Makefile
index 6664d13cd13..e57a3005ce8 100644
--- a/www/calamaris/Makefile
+++ b/www/calamaris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:15 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	calamaris-2.58
@@ -9,18 +9,19 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://cord.de/tools/squid/calamaris/
 COMMENT=	Squid logfile analyzer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	calamaris
 NO_BUILD=	YES
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/calamaris
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/calamaris ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/calamaris.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/calamaris
+	${INSTALL_SCRIPT} ${WRKSRC}/calamaris ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/calamaris.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .for doc in CHANGES COPYRIGHT EXAMPLES README
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/calamaris
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DESTDIR}${PREFIX}/share/doc/calamaris
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/cgic/distinfo b/www/cgic/distinfo
index 275a5a3f367..fdbb8bb7d2c 100644
--- a/www/cgic/distinfo
+++ b/www/cgic/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2006/01/06 22:46:51 adam Exp $
+$NetBSD: distinfo,v 1.4 2008/06/20 01:09:41 joerg Exp $
 
 SHA1 (cgic205.tar.gz) = 04646274466192570190572f0a70094c67fa2703
 RMD160 (cgic205.tar.gz) = 913d50cb04f70c44119eda3fd3f689572efb65e4
 Size (cgic205.tar.gz) = 50263 bytes
-SHA1 (patch-aa) = 4ab91a2b5ff67906ab7f87ffbf0647c3954fb039
+SHA1 (patch-aa) = ab2388d4fbf67a75cc1c970668ae08db571b680e
 SHA1 (patch-ab) = 42e8ee71eeb363e702dfab66344811a8967d382d
 SHA1 (patch-ac) = ee06539e395f5027291253c98ec103808f188a66
 SHA1 (patch-ad) = 6ef230a6cc265121dbcbaef392bc1d9c43d167b0
diff --git a/www/cgic/patches/patch-aa b/www/cgic/patches/patch-aa
index bb9027a850a..95e8948dfbe 100644
--- a/www/cgic/patches/patch-aa
+++ b/www/cgic/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2006/01/06 22:46:51 adam Exp $
+$NetBSD: patch-aa,v 1.3 2008/06/20 01:09:41 joerg Exp $
 
 --- Makefile.orig	2005-12-16 15:52:31.000000000 +0100
 +++ Makefile
@@ -51,17 +51,17 @@ $NetBSD: patch-aa,v 1.2 2006/01/06 22:46:51 adam Exp $
 +	${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ cgictest.lo $(LIBS)
 +
 +install: libcgic.la cgictest
-+	-mkdir -p ${PREFIX}/libexec/cgi-bin
-+	-mkdir -p ${PREFIX}/share/examples/cgiclib
-+	${INSTALL} -c -m 444 capture.c ${PREFIX}/share/examples/cgiclib
-+	${INSTALL} -c -m 444 cgictest.c ${PREFIX}/share/examples/cgiclib
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcgic.la ${PREFIX}/lib
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} capture ${PREFIX}/libexec/cgi-bin
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} cgictest ${PREFIX}/libexec/cgi-bin
-+	${INSTALL} -c -m 444 cgic.h ${PREFIX}/include
-+	-mkdir -p ${PREFIX}/share/doc/html/cgiclib
++	mkdir -p ${DESTDIR}${PREFIX}/libexec/cgi-bin
++	mkdir -p ${DESTDIR}${PREFIX}/share/examples/cgiclib
++	${INSTALL} -c -m 444 capture.c ${DESTDIR}${PREFIX}/share/examples/cgiclib
++	${INSTALL} -c -m 444 cgictest.c ${DESTDIR}${PREFIX}/share/examples/cgiclib
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcgic.la ${DESTDIR}${PREFIX}/lib
++	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} capture ${DESTDIR}${PREFIX}/libexec/cgi-bin
++	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} cgictest ${DESTDIR}${PREFIX}/libexec/cgi-bin
++	${INSTALL} -c -m 444 cgic.h ${DESTDIR}${PREFIX}/include
++	mkdir -p ${DESTDIR}${PREFIX}/share/doc/html/cgiclib
 +	for i in *.html; do \
-+	  ${INSTALL} -c -m 444 $$i ${PREFIX}/share/doc/html/cgiclib ; \
++	  ${INSTALL} -c -m 444 $$i ${DESTDIR}${PREFIX}/share/doc/html/cgiclib ; \
 +	done
 + 
  clean:
diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
index 6dce70bacee..51212ff474a 100644
--- a/www/geeklog/Makefile
+++ b/www/geeklog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/06/19 14:08:42 taca Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	geeklog-${VER}
@@ -11,6 +11,8 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.geeklog.net/
 COMMENT=	PHP/MySQL based application for managing dynamic web content
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
 DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=4.3.0:../../databases/php-mysql
 
@@ -86,7 +88,7 @@ SUBST_SED.conf+=	-e '/^Alias/s,^,\#,'
 SUBST_STAGE.conf=	post-configure
 
 INSTALLATION_DIRS=	${GEEKLOG_BASE} ${GEEKLOG_PUB} ${GEEKLOG_TMPL}/images \
-			share/examples/geeklog
+			share/examples/geeklog ${GEEKLOG_DOCDIR}
 
 post-extract:
 	${CP} ${FILESDIR}/README ${FILESDIR}/createdb.php \
@@ -101,29 +103,28 @@ pre-install:
 		${FIND} pear -type f -exec ${CHMOD} 0644 {} \;
 
 do-install:
-	${INSTALL_DATA_DIR} ${GEEKLOG_DOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/README ${GEEKLOG_DOCDIR}
+	${INSTALL_DATA} ${WRKDIR}/README ${DESTDIR}${GEEKLOG_DOCDIR}
 .for f in ${GEEKLOG_CONF_FILES}
-	${INSTALL_DATA_DIR} ${GEEKLOG_EXAMPLESDIR}/${f:H}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${GEEKLOG_EXAMPLESDIR}/${f}
+	${INSTALL_DATA_DIR} ${DESTDIR}${GEEKLOG_EXAMPLESDIR}/${f:H}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${GEEKLOG_EXAMPLESDIR}/${f}
 	${RM} ${WRKSRC}/${f}
 .endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/createdb.php ${GEEKLOG_DIR}
-	${INSTALL_DATA} ${WRKDIR}/geeklog.conf ${GEEKLOG_EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/createdb.php ${DESTDIR}${GEEKLOG_DIR}
+	${INSTALL_DATA} ${WRKDIR}/geeklog.conf ${DESTDIR}${GEEKLOG_EXAMPLESDIR}
 .for f in ${GEEKLOG_SYS}
-	cd ${WRKSRC}; pax -rw ${f} ${GEEKLOG_DIR}
+	cd ${WRKSRC}; pax -rw ${f} ${DESTDIR}${GEEKLOG_DIR}
 .endfor
 	cd ${WRKSRC}/public_html; \
-		pax -rw admin ${GEEKLOG_DIR}; \
+		pax -rw admin ${DESTDIR}${GEEKLOG_DIR}; \
 		${RM} -rf admin
 .for d in ${GEEKLOG_TMPL_SUB}
 	cd ${WRKSRC}/public_html; \
 		if [ -d ${d} ]; then \
-			pax -rw ${d} ${GEEKLOG_TMPL_DIR}; \
+			pax -rw ${d} ${DESTDIR}${GEEKLOG_TMPL_DIR}; \
 			${RM} -rf ${d}; \
 		fi
 .endfor
-	cd ${WRKSRC}/public_html; pax -rw . ${GEEKLOG_PUBDIR}
+	cd ${WRKSRC}/public_html; pax -rw . ${DESTDIR}${GEEKLOG_PUBDIR}
 
 .include "../../mk/apache.mk"
 .include "../../lang/php/phpversion.mk"
diff --git a/www/gitweb/Makefile b/www/gitweb/Makefile
index bea3e7eba17..96f0c06b9ed 100644
--- a/www/gitweb/Makefile
+++ b/www/gitweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/04/30 13:38:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	git-1.5.0.3
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://git.or.cz/
 COMMENT=	Web interface for GIT repositories
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	apache{,2,22}-[0-9]*:../../www/apache22
 DEPENDS+=	scm${DISTNAME:S/-/>=/}:../../devel/scmgit
 
@@ -33,18 +35,17 @@ GITWEB_EGDIR=	${PREFIX}/share/examples/gitweb
 CONF_FILES=	${GITWEB_EGDIR}/gitweb.conf ${PKG_SYSCONFDIR}/gitweb.conf
 MESSAGE_SUBST+=	CONFFILE=${PKG_SYSCONFDIR}/gitweb.conf
 
-INSTALLATION_DIRS=	libexec/cgi-bin share/httpd/htdocs
+INSTALLATION_DIRS=	libexec/cgi-bin share/httpd/htdocs  \
+			share/doc/gitweb \
+			${GITWEB_EGDIR} ${GITWEB_HTDOCS}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/gitweb/gitweb.cgi ${GITWEB_CGIBIN}
-	${INSTALL_DATA_DIR} ${GITWEB_HTDOCS}
+	${INSTALL_SCRIPT} ${WRKSRC}/gitweb/gitweb.cgi ${DESTDIR}${GITWEB_CGIBIN}
 .for f in git-favicon.png git-logo.png gitweb.css
-	${INSTALL_DATA} ${WRKSRC}/gitweb/${f} ${GITWEB_HTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/gitweb/${f} ${DESTDIR}${GITWEB_HTDOCS}
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gitweb
 	${INSTALL_DATA} ${WRKSRC}/gitweb/README \
-		${PREFIX}/share/doc/gitweb
-	${INSTALL_DATA_DIR} ${GITWEB_EGDIR}
-	${INSTALL_DATA} ${FILESDIR}/gitweb.conf ${GITWEB_EGDIR}
+		${DESTDIR}${PREFIX}/share/doc/gitweb
+	${INSTALL_DATA} ${FILESDIR}/gitweb.conf ${DESTDIR}${GITWEB_EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/opera-acroread7/Makefile b/www/opera-acroread7/Makefile
index f5d29d06e62..34f7c17e049 100644
--- a/www/opera-acroread7/Makefile
+++ b/www/opera-acroread7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/07/29 05:20:00 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:41 joerg Exp $
 
 DISTNAME=		opera-acroread7-1.0
 PKGREVISION=		3
@@ -6,6 +6,8 @@ PKGREVISION=		3
 MAINTAINER=		jschauma@NetBSD.org
 COMMENT=		Acrobat Reader 7 plugin for opera
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		acroread7-7.[0-9]*:../../print/acroread7
 CONFLICTS+=		opera-acroread-[0-9]*
 CONFLICTS+=		opera-acroread3-[0-9]*
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index d25881f8f77..c8dba4631a4 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/06/10 19:53:13 minskim Exp $
+# $NetBSD: Makefile,v 1.30 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	Apache-ASP-2.21
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.apache-asp.org/
 COMMENT=	Perl5/Apache module of Perl-coded Active Server Pages
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Apache-Filter>=1.019:../../www/p5-Apache-Filter
 DEPENDS+=	p5-Apache-SSI>=2.16:../../www/p5-Apache-SSI
 DEPENDS+=	p5-Compress-Zlib>=1.14:../../devel/p5-Compress-Zlib
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index a3d9a3f2a61..96471d6d34a 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/10/17 12:58:26 obache Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	Apache-AuthCookie-3.10
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Apache-AuthCookie/
 COMMENT=	Perl5 module for Authentication and Authorization via cookies
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	ap13-perl>=1.29:../../www/ap-perl
 DEPENDS+=	p5-Apache-Test-[0-9]*:../../www/p5-Apache-Test
 
diff --git a/www/p5-Apache-AuthCookieDBI/Makefile b/www/p5-Apache-AuthCookieDBI/Makefile
index 4eddda0bde1..8c6758a8708 100644
--- a/www/p5-Apache-AuthCookieDBI/Makefile
+++ b/www/p5-Apache-AuthCookieDBI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:59 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	Apache-AuthCookieDBI-1.19
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/~cromis/Apache-AuthCookieDBI-1.19/
 COMMENT=	Perl5 module AuthCookie backed by a DBI database
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Apache-AuthCookie>=3.05:../../www/p5-Apache-AuthCookie
 
 PERL5_PACKLIST=		auto/Apache/AuthCookieDBI/.packlist
diff --git a/www/p5-Apache-DBILogConfig/Makefile b/www/p5-Apache-DBILogConfig/Makefile
index 1db94956f7e..368ecadc679 100644
--- a/www/p5-Apache-DBILogConfig/Makefile
+++ b/www/p5-Apache-DBILogConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:59 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	Apache-DBILogConfig-0.02
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Apache-DBILogConfig/
 COMMENT=	Database-independent Apache database logger
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Apache-DBI>=0.87:../../databases/p5-Apache-DBI
 DEPENDS+=	p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 
diff --git a/www/p5-Apache-DBILogger/Makefile b/www/p5-Apache-DBILogger/Makefile
index 09c7e8565d2..e4675b2650b 100644
--- a/www/p5-Apache-DBILogger/Makefile
+++ b/www/p5-Apache-DBILogger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:59 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	Apache-DBILogger-0.93
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ask.netcetera.dk/
 COMMENT=	Database-independent httpd database logging module
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Apache-DBILogConfig-[0-9]*:../../www/p5-Apache-DBILogConfig
 
 PERL5_PACKLIST=		auto/Apache/DBILogger/.packlist
diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile
index c713412c37f..e8be4b413a5 100644
--- a/www/p5-Apache-Filter/Makefile
+++ b/www/p5-Apache-Filter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/06/20 01:09:41 joerg Exp $
 
 DISTNAME=	Apache-Filter-1.022
 PKGNAME=	p5-${DISTNAME}
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/~kwilliams/Apache-Filter-1.022/
 COMMENT=	Perl5 module to alter the output of previous Apache handlers
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/Apache/Filter/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-Apache-Reload/Makefile b/www/p5-Apache-Reload/Makefile
index 1f01b61f370..d835c98c314 100644
--- a/www/p5-Apache-Reload/Makefile
+++ b/www/p5-Apache-Reload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/06 06:19:36 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=		Apache-Reload-0.07
@@ -12,6 +12,7 @@ MAINTAINER=		hiramatu@boreas.dti.ne.jp
 COMMENT=		Perl5 module to reload changed modules
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/Apache/Reload/.packlist
 
diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index 4cc74dda5b6..a89f1fab62e 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/06/20 01:09:41 joerg Exp $
 
 DISTNAME=	Apache-SSI-2.16
 PKGNAME=	p5-${DISTNAME}
@@ -10,6 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Perl5 module to implement Server Side Includes
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-HTML-SimpleParse>=0.06:../../www/p5-HTML-SimpleParse
 
 PERL5_PACKLIST=		auto/Apache/SSI/.packlist
diff --git a/www/p5-Apache-Session-Wrapper/Makefile b/www/p5-Apache-Session-Wrapper/Makefile
index 3104c0d169d..f4c2041d4c6 100644
--- a/www/p5-Apache-Session-Wrapper/Makefile
+++ b/www/p5-Apache-Session-Wrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/08/16 09:51:17 he Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:41 joerg Exp $
 
 DISTNAME=		Apache-Session-Wrapper-0.33
 PKGNAME=		p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Apache-Session-Wrapper/
 COMMENT=		Perl5 module doing a wrapper around Apache::Session
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-Class-Container-[0-9]*:../../devel/p5-Class-Container
 DEPENDS+=		p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
 DEPENDS+=		p5-Apache-Session>=1.6:../../www/p5-Apache-Session
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index abd3b593a53..e495be58d68 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/04/23 20:43:06 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=		Apache-Session-1.86
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Apache-Session/
 COMMENT=		Perl5 module to provide persistent storage
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-Storable>=1.0.11:../../devel/p5-Storable
 DEPENDS+=		p5-Digest-MD5>=2.16:../../security/p5-Digest-MD5
 DEPENDS+=		p5-Test-Deep>=0.082:../../devel/p5-Test-Deep
diff --git a/www/p5-CGI-Application-Plugin-DBH/Makefile b/www/p5-CGI-Application-Plugin-DBH/Makefile
index 303acdf9c55..4f02f4aac02 100644
--- a/www/p5-CGI-Application-Plugin-DBH/Makefile
+++ b/www/p5-CGI-Application-Plugin-DBH/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/25 11:29:58 markd Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:41 joerg Exp $
 
 DISTNAME=		CGI-Application-Plugin-DBH-4.00
 PKGNAME=		p5-${DISTNAME}
@@ -9,11 +9,12 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/CGI-Application-Plugin-DBH
 COMMENT=		Easy DBI access from CGI::Application
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-CGI-Application-[0-9]*:../../www/p5-CGI-Application
 DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 PERL5_PACKLIST=		auto/CGI/Application/Plugin/DBH/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
index 326d3ed04b8..a73b522b8c2 100644
--- a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
+++ b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/25 11:31:35 markd Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:41 joerg Exp $
 
 DISTNAME=		CGI-Application-Plugin-ValidateRM-2.1
 PKGNAME=		p5-${DISTNAME}
@@ -9,12 +9,13 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/CGI-Application-Plugin-ValidateRM/
 COMMENT=		Help validate CGI::Application run modes using Data::FormValidator
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-CGI-Application-[0-9]*:../../www/p5-CGI-Application
 DEPENDS+=		p5-HTML-FillInForm-[0-9]*:../../www/p5-HTML-FillInForm
 DEPENDS+=		p5-Data-FormValidator-[0-9]*:../../textproc/p5-Data-FormValidator
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 PERL5_PACKLIST=		auto/CGI/Application/Plugin/ValidateRM/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index 6619fc44017..88042b0a4df 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:00 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:41 joerg Exp $
 
 DISTNAME=	CGI-FastTemplate-1.09
 PKGNAME=	p5-${DISTNAME}
@@ -10,6 +10,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=CGI/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Perl5 extension for managing templates
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/CGI/FastTemplate/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index 1e2c9acc3bf..8e6dd8169f1 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	CGI-Kwiki-0.18
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.kwiki.org/
 COMMENT=		Quickie Wiki that's not too Tricky
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-Test-Simple>=0.47:../../devel/p5-Test-Simple
 DEPENDS+=		p5-Locale-Maketext>=1.08:../../misc/p5-Locale-Maketext
 
diff --git a/www/p5-CGI-ProgressBar/Makefile b/www/p5-CGI-ProgressBar/Makefile
index 888cf4c5333..022f6740344 100644
--- a/www/p5-CGI-ProgressBar/Makefile
+++ b/www/p5-CGI-ProgressBar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/11/03 14:32:04 adrianp Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:41 joerg Exp $
 #
 
 DISTNAME=	CGI-ProgressBar-0.04
@@ -10,6 +10,8 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/CPAN/authors/id/L/LG/LGODDARD/
 COMMENT=	CGI.pm sub-class with a progress bar object
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-CGI>=3.15:../../www/p5-CGI
 
 PERL5_PACKLIST=	auto/CGI/ProgressBar/.packlist
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 4ae39d55648..33671cafcbb 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:21 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2008/06/20 01:09:42 joerg Exp $
 #
 
 NAME=			CGI-Lite-2.02
@@ -12,6 +12,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/}
 MAINTAINER=		bad@NetBSD.org
 COMMENT=		Simple perl5 module for writing forms-based CGI programs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/CGI/Lite/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-CSS-Squish/Makefile b/www/p5-CSS-Squish/Makefile
index 588ab866d2e..500e75ef0ba 100644
--- a/www/p5-CSS-Squish/Makefile
+++ b/www/p5-CSS-Squish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/03/16 18:56:11 tonnerre Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:42 joerg Exp $
 #
 
 DISTNAME=	CSS-Squish-0.07
@@ -10,6 +10,8 @@ MAINTAINER=	tonnerre@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/CSS-Squiish/
 COMMENT=	Compact many CSS files into one big file
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Test-LongString-[0-9]*:../../devel/p5-Test-LongString
 DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 
diff --git a/www/p5-CSS/Makefile b/www/p5-CSS/Makefile
index bdb1455fb71..9d84a5abe9c 100644
--- a/www/p5-CSS/Makefile
+++ b/www/p5-CSS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/08 18:42:31 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:42 joerg Exp $
 #
 
 DISTNAME=	CSS-1.07
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/CSS/
 COMMENT=	Object oriented access to Cascading Style Sheets
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Parse-RecDescent-[0-9]*:../../devel/p5-Parse-RecDescent
 
 USE_LANGUAGES=		# empty
diff --git a/www/p5-FCGI-ProcManager/Makefile b/www/p5-FCGI-ProcManager/Makefile
index 3f5c6726ee7..fdee0e0f2cb 100644
--- a/www/p5-FCGI-ProcManager/Makefile
+++ b/www/p5-FCGI-ProcManager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/06/07 11:44:22 abs Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=		FCGI-ProcManager-0.17
 PKGNAME=		p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/FCGI-ProcManager/
 COMMENT=		Functions for managing FastCGI applications
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/FCGI/ProcManager/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-FCGI/Makefile b/www/p5-FCGI/Makefile
index efe6633cd7f..4c93494a0f7 100644
--- a/www/p5-FCGI/Makefile
+++ b/www/p5-FCGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:21 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2008/06/20 01:09:42 joerg Exp $
 #
 
 PKGVER=			0.67
@@ -13,6 +13,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.fastcgi.com/
 COMMENT=		Perl5 library for FastCGI, a fast startup alternative to CGI
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/FCGI/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTML-Clean/Makefile b/www/p5-HTML-Clean/Makefile
index 771dc4f95e6..83f61c70e07 100644
--- a/www/p5-HTML-Clean/Makefile
+++ b/www/p5-HTML-Clean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:31:01 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=	HTML-Clean-0.8
 PKGNAME=	p5-${DISTNAME}
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Perl5 module that cleans up HTML code for web browsers
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/HTML/Clean/.packlist
 
diff --git a/www/p5-HTML-FillInForm/Makefile b/www/p5-HTML-FillInForm/Makefile
index 76668917249..a97cdedd169 100644
--- a/www/p5-HTML-FillInForm/Makefile
+++ b/www/p5-HTML-FillInForm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/05/25 11:20:29 markd Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=	HTML-FillInForm-1.06
 PKGNAME=	p5-${DISTNAME}
@@ -10,9 +10,10 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTML-FillInForm/
 COMMENT=	Perl5 module that populates HTML Forms with CGI data
 
-DEPENDS+=	p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+DEPENDS+=	p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser
 
 PERL5_PACKLIST=		auto/HTML/FillInForm/.packlist
 
diff --git a/www/p5-HTML-FixEntities/Makefile b/www/p5-HTML-FixEntities/Makefile
index a24c7265631..cd9ff9d919f 100644
--- a/www/p5-HTML-FixEntities/Makefile
+++ b/www/p5-HTML-FixEntities/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/06 06:19:39 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=		HTML-FixEntities-1.03
 PKGNAME=		p5-${DISTNAME}
@@ -11,6 +11,7 @@ HOMEPAGE=		http://www.mono.org/abs/tools/HTML-FixEntities/
 COMMENT=		Perl5 module to convert latin1 to equivalent HTML
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/HTML/FixEntities/.packlist
 
diff --git a/www/p5-HTML-Format/Makefile b/www/p5-HTML-Format/Makefile
index cad9c27a048..1a25813693e 100644
--- a/www/p5-HTML-Format/Makefile
+++ b/www/p5-HTML-Format/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/07/16 13:31:31 heinz Exp $
+# $NetBSD: Makefile,v 1.18 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=		HTML-Format-2.04
 PKGNAME=		p5-${DISTNAME}
@@ -11,11 +11,12 @@ MAINTAINER=		heinz@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/HTML-Format/
 COMMENT=		Perl5 modules for converting HTML to other text formats
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-Font-AFM>=1.18:../../fonts/p5-Font-AFM
 DEPENDS+=		p5-HTML-Tree>=3.15:../../www/p5-HTML-Tree
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/HTML-Format/.packlist
 
diff --git a/www/p5-HTML-LinkExtractor/Makefile b/www/p5-HTML-LinkExtractor/Makefile
index 64ef73bdebc..d56bfca1e1c 100644
--- a/www/p5-HTML-LinkExtractor/Makefile
+++ b/www/p5-HTML-LinkExtractor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/05/25 20:20:08 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=	HTML-LinkExtractor-0.121
 PKGNAME=	p5-${DISTNAME}
@@ -10,9 +10,10 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/~podmaster/${DISTNAME}/
 COMMENT=	Extract links from an HTML document
 
-DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 
 PERL5_PACKLIST=	auto/HTML/LinkExtractor/.packlist
 
diff --git a/www/p5-HTML-PrettyPrinter/Makefile b/www/p5-HTML-PrettyPrinter/Makefile
index cc6260e35e8..99a0a92af41 100644
--- a/www/p5-HTML-PrettyPrinter/Makefile
+++ b/www/p5-HTML-PrettyPrinter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=		HTML-PrettyPrinter-0.03
 PKGNAME=		p5-${DISTNAME}
@@ -10,11 +10,12 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Perl5 module for pretty-printing HTML
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-HTML-Tree>=3.0:../../www/p5-HTML-Tree
 DEPENDS+=		p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 PERL5_PACKLIST=		auto/HTML/PrettyPrinter/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTML-Prototype-Useful/Makefile b/www/p5-HTML-Prototype-Useful/Makefile
index 07c144c32d0..ea431c8805d 100644
--- a/www/p5-HTML-Prototype-Useful/Makefile
+++ b/www/p5-HTML-Prototype-Useful/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/02/15 06:29:00 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=	HTML-Prototype-Useful-0.04
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	kuli0020@umn.edu
 HOMEPAGE=	http://search.cpan.org/dist/HTML-Prototype-Useful
 COMMENT=	Some useful additions for the Prototype library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-HTML-Prototype>=1.32:../../www/p5-HTML-Prototype
 
 PERL5_MODULE_TYPE=	Module::Build
diff --git a/www/p5-HTML-Prototype/Makefile b/www/p5-HTML-Prototype/Makefile
index 4eaab105039..588c2275046 100644
--- a/www/p5-HTML-Prototype/Makefile
+++ b/www/p5-HTML-Prototype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/02/15 06:24:31 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=	HTML-Prototype-1.43
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	kuli0020@umn.edu
 HOMEPAGE=	http://search.cpan.org/dist/HTML-Prototype
 COMMENT=	Generate HTML and Javascript for the Prototype library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Class-Accessor>=0.22:../../devel/p5-Class-Accessor
 DEPENDS+=	p5-HTML-Tree>=3.19.01:../../www/p5-HTML-Tree
 
diff --git a/www/p5-HTML-SimpleParse/Makefile b/www/p5-HTML-SimpleParse/Makefile
index 533e6fab3b2..3333adefb40 100644
--- a/www/p5-HTML-SimpleParse/Makefile
+++ b/www/p5-HTML-SimpleParse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=	HTML-SimpleParse-0.12
 PKGNAME=	p5-${DISTNAME}
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Perl5 module implementing a bare-bones HTML parser
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/HTML/SimpleParse/.packlist
diff --git a/www/p5-HTML-StickyQuery/Makefile b/www/p5-HTML-StickyQuery/Makefile
index d274167626c..bf22685348d 100644
--- a/www/p5-HTML-StickyQuery/Makefile
+++ b/www/p5-HTML-StickyQuery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/06 06:19:39 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/20 01:09:42 joerg Exp $
 #
 
 DISTNAME=		HTML-StickyQuery-0.12
@@ -12,11 +12,12 @@ MAINTAINER=		hiramatu@boreas.dti.ne.jp
 HOMEPAGE=		http://search.cpan.org/search?dist=HTML-StickyQuery
 COMMENT=		Add sticky QUERY_STRING to a tag href attributes
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-HTML-Parser>=3.34:../../www/p5-HTML-Parser
 DEPENDS+=		p5-URI>=1.27:../../www/p5-URI
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 PERL5_PACKLIST=		auto/HTML/StickyQuery/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index bee31c2a266..a2a67643478 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/19 12:43:04 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=	HTML-Stream-1.55
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	kuli0020@umn.edu
 HOMEPAGE=	http://search.cpan.org/dist/HTML-Stream/
 COMMENT=	Perl5 HTML output stream class, and some markup utilities
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST= auto/HTML/Stream/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTML-Strip/Makefile b/www/p5-HTML-Strip/Makefile
index dba3e59c44f..81af3e96d7f 100644
--- a/www/p5-HTML-Strip/Makefile
+++ b/www/p5-HTML-Strip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/04/30 05:14:31 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=	HTML-Strip-1.06
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	kuli0020@umn.edu
 HOMEPAGE=	http://search.cpan.org/dist/HTML-Strip/
 COMMENT=	Perl5 module for strip HTML tag
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=	auto/HTML/Strip/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTML-StripScripts-Parser/Makefile b/www/p5-HTML-StripScripts-Parser/Makefile
index bff95effafd..6d19142f2a8 100644
--- a/www/p5-HTML-StripScripts-Parser/Makefile
+++ b/www/p5-HTML-StripScripts-Parser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/27 16:45:16 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=	HTML-StripScripts-Parser-1.02
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTML-HTML-StripScripts-Parser/
 COMMENT=	Perl5 module XSS filter using HTML::Parser
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+= 	p5-HTML-StripScripts>=1.04:../../www/p5-HTML-StripScripts
 
 PERL5_PACKLIST=	auto/HTML/StripScripts/Parser/.packlist
diff --git a/www/p5-HTML-StripScripts/Makefile b/www/p5-HTML-StripScripts/Makefile
index 56f34df7f45..c23d548426a 100644
--- a/www/p5-HTML-StripScripts/Makefile
+++ b/www/p5-HTML-StripScripts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/27 16:44:33 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=	HTML-StripScripts-1.04
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTML-StripScripts/
 COMMENT=	Perl5 module to strip scripting constructs out of HTML
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=	auto/HTML/StripScripts/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTML-Table/Makefile b/www/p5-HTML-Table/Makefile
index 85029eb81b0..58bdea369c9 100644
--- a/www/p5-HTML-Table/Makefile
+++ b/www/p5-HTML-Table/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=		HTML-Table-2.02
 PKGNAME=		p5-${DISTNAME}
@@ -12,6 +12,7 @@ HOMEPAGE=		http://search.cpan.org/dist/HTML-Table/
 COMMENT=		Perl5 module to simplify creating HTML tables
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/HTML/Table/.packlist
 
diff --git a/www/p5-HTML-WikiConverter/Makefile b/www/p5-HTML-WikiConverter/Makefile
index 79f976e23f6..d03f4bd2a25 100644
--- a/www/p5-HTML-WikiConverter/Makefile
+++ b/www/p5-HTML-WikiConverter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/08 18:43:23 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:42 joerg Exp $
 #
 
 DISTNAME=	HTML-WikiConverter-0.61
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTML-WikiConverter/
 COMMENT=	Convert HTML to wiki markup
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Class-Data-Inheritable-[0-9]*:../../devel/p5-Class-Data-Inheritable
 DEPENDS+=	p5-Params-Validate-[0-9]*:../../devel/p5-Params-Validate
 DEPENDS+=	p5-CSS-[0-9]*:../../www/p5-CSS
diff --git a/www/p5-HTMLObject/Makefile b/www/p5-HTMLObject/Makefile
index 3abb4aef60e..7f7bb66e70c 100644
--- a/www/p5-HTMLObject/Makefile
+++ b/www/p5-HTMLObject/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/11/14 10:07:14 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=		libhtmlobject-perl-${VERSION}
 PKGNAME=		p5-HTMLObject-${VERSION}
@@ -10,10 +10,12 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://htmlobject.sourceforge.net/
 COMMENT=		Perl5 module to quickly and easily create Dynamic HTML pages
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Data-FormValidator>=3.59:../../textproc/p5-Data-FormValidator
 
 VERSION=	2.28
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 PERL5_PACKLIST=		auto/HTMLObject/.packlist
 
diff --git a/www/p5-HTTP-Cache-Transparent/Makefile b/www/p5-HTTP-Cache-Transparent/Makefile
index a9b6b925b30..598af8a5d5d 100644
--- a/www/p5-HTTP-Cache-Transparent/Makefile
+++ b/www/p5-HTTP-Cache-Transparent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/02/27 14:12:05 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=	HTTP-Cache-Transparent-0.7
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTTP-Cache-Transparent/
 COMMENT=	Cache the result of http get-requests persistently
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 
 PERL5_PACKLIST=		auto/HTTP/Cache/Transparent/.packlist
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index db89389dc6a..b1de3d463b9 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:21 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:42 joerg Exp $
 #
 
 DISTNAME=	HTTP-DAV-0.31
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://webdav.org/perldav/
 COMMENT=	HTTP::DAV interface and 'dave'
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=	p5-XML-DOM-[0-9]*:../../textproc/p5-XML-DOM
 
diff --git a/www/p5-HTTP-GHTTP/Makefile b/www/p5-HTTP-GHTTP/Makefile
index dcbf5fa3541..b05430ccb5e 100644
--- a/www/p5-HTTP-GHTTP/Makefile
+++ b/www/p5-HTTP-GHTTP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:42 joerg Exp $
 #
 
 DISTNAME=	HTTP-GHTTP-1.07
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTTP-GHTTP/
 COMMENT=	Perl interface to the gnome ghttp library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST= auto/HTTP/GHTTP/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTTP-Lite/Makefile b/www/p5-HTTP-Lite/Makefile
index 95ef8ec4837..3a65b671eae 100644
--- a/www/p5-HTTP-Lite/Makefile
+++ b/www/p5-HTTP-Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/22 21:46:13 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:42 joerg Exp $
 
 DISTNAME=		HTTP-Lite-2.1.6
 PKGNAME=		p5-${DISTNAME}
@@ -11,6 +11,7 @@ HOMEPAGE=		http://search.cpan.org/dist/HTTP-Lite/
 COMMENT=		Lightweight HTTP client implementation
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/HTTP/Lite/.packlist
 
diff --git a/www/p5-HTTP-Proxy/Makefile b/www/p5-HTTP-Proxy/Makefile
index c16eae42ebf..660f9e51ec0 100644
--- a/www/p5-HTTP-Proxy/Makefile
+++ b/www/p5-HTTP-Proxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/23 18:06:52 christos Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=	HTTP-Proxy-0.18
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTTP-Proxy/
 COMMENT=	Perl5 module providing a simple HTTP proxy daemon
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/HTTP/Proxy/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTTP-Request-Form/Makefile b/www/p5-HTTP-Request-Form/Makefile
index aee88cb2d8c..036a954877d 100644
--- a/www/p5-HTTP-Request-Form/Makefile
+++ b/www/p5-HTTP-Request-Form/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:21 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=	HTTP-Request-Form-0.7
@@ -11,6 +11,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTTP/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Construct HTTP::Request objects for form processing
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=	p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
diff --git a/www/p5-HTTP-Server-Simple-Kwiki/Makefile b/www/p5-HTTP-Server-Simple-Kwiki/Makefile
index 6ae4b5d274a..daee15fd155 100644
--- a/www/p5-HTTP-Server-Simple-Kwiki/Makefile
+++ b/www/p5-HTTP-Server-Simple-Kwiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/05/02 04:45:09 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=	HTTP-Server-Simple-Kwiki-0.29
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTTP-Server-Simple-Kwiki/
 COMMENT=	standalone HTTP server for Kwiki
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/HTTP/Server/Simple/Kwiki/.packlist
 
diff --git a/www/p5-HTTP-Server-Simple-Mason/Makefile b/www/p5-HTTP-Server-Simple-Mason/Makefile
index a1182b1775c..4ce1d752f5c 100644
--- a/www/p5-HTTP-Server-Simple-Mason/Makefile
+++ b/www/p5-HTTP-Server-Simple-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=	HTTP-Server-Simple-Mason-0.09
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTTP-Server-Simple-Mason/
 COMMENT=	Perl5 module providing a simple mason server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/HTTP/Server/Simple/Mason/.packlist
 
 DEPENDS+=	p5-HTML-Mason>=1.25:../../www/p5-HTML-Mason
diff --git a/www/p5-HTTP-Server-Simple-Static/Makefile b/www/p5-HTTP-Server-Simple-Static/Makefile
index e7ac6515950..04a36954895 100644
--- a/www/p5-HTTP-Server-Simple-Static/Makefile
+++ b/www/p5-HTTP-Server-Simple-Static/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/02 04:41:37 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=	HTTP-Server-Simple-Static-0.02
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTTP-Server-Simple-Static/
 COMMENT=	Serve static files with HTTP::Server::Simple
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/HTTP/Server/Simple/Static/.packlist
 
diff --git a/www/p5-HTTP-Server-Simple/Makefile b/www/p5-HTTP-Server-Simple/Makefile
index a79fc5bb16d..5cd31f99aee 100644
--- a/www/p5-HTTP-Server-Simple/Makefile
+++ b/www/p5-HTTP-Server-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/04/23 20:46:56 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=	HTTP-Server-Simple-0.31
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTTP-Server-Simple/
 COMMENT=	Perl5 module providing a simple standalone HTTP daemon
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 
 PERL5_PACKLIST=		auto/HTTP/Server/Simple/.packlist
diff --git a/www/p5-Kwiki-ModPerl/Makefile b/www/p5-Kwiki-ModPerl/Makefile
index 8f040f86203..6f1de80c643 100644
--- a/www/p5-Kwiki-ModPerl/Makefile
+++ b/www/p5-Kwiki-ModPerl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/06/08 12:25:06 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=	Kwiki-ModPerl-0.09
 PKGNAME=	p5-${DISTNAME}
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
 COMMENT=	Kwiki integration with ModPerl
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Kwiki>=0.38:../../www/p5-Kwiki
 
 PERL5_PACKLIST=		auto/Kwiki/ModPerl/.packlist
diff --git a/www/p5-Kwiki-Notify-Mail/Makefile b/www/p5-Kwiki-Notify-Mail/Makefile
index 68efe26054b..0cb78345b25 100644
--- a/www/p5-Kwiki-Notify-Mail/Makefile
+++ b/www/p5-Kwiki-Notify-Mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=	Kwiki-Notify-Mail-0.04
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
 COMMENT=	Kwiki email notification plugin
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Kwiki>=0.37nb1:../../www/p5-Kwiki
 DEPENDS+=	p5-MIME-Lite>=2.111:../../mail/p5-MIME-Lite
 
diff --git a/www/p5-Kwiki-UserName/Makefile b/www/p5-Kwiki-UserName/Makefile
index 864603cbe16..8ffd7c7ab45 100644
--- a/www/p5-Kwiki-UserName/Makefile
+++ b/www/p5-Kwiki-UserName/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:23 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=	Kwiki-UserName-0.14
 PKGNAME=	p5-${DISTNAME}
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
 COMMENT=	Kwiki user name plugin
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Kwiki>=0.37nb1:../../www/p5-Kwiki
 DEPENDS+=	p5-Kwiki-UserPreferences>=0.13:../../www/p5-Kwiki-UserPreferences
 
diff --git a/www/p5-Kwiki-Users-Remote/Makefile b/www/p5-Kwiki-Users-Remote/Makefile
index 12cc8e88bba..13d46929ea8 100644
--- a/www/p5-Kwiki-Users-Remote/Makefile
+++ b/www/p5-Kwiki-Users-Remote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/11/25 12:44:24 obache Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=      	Kwiki-Users-Remote-0.04
 PKGREVISION=	1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
 COMMENT=	Kwiki plugin to automatically set user name from HTTP authentication
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Kwiki>=0.37nb1:../../www/p5-Kwiki
 DEPENDS+=	p5-Kwiki-UserName>=0.14:../../www/p5-Kwiki-UserName
 
diff --git a/www/p5-Kwiki-Weather/Makefile b/www/p5-Kwiki-Weather/Makefile
index 697eeb40805..26cdb4db2fa 100644
--- a/www/p5-Kwiki-Weather/Makefile
+++ b/www/p5-Kwiki-Weather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:23 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=	Kwiki-Weather-0.05
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
 COMMENT=	Weather button and WAFL for your Kwiki
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Kwiki>=0.34:../../www/p5-Kwiki
 DEPENDS+=	p5-Geo-Weather>=1.41:../../misc/p5-Geo-Weather
 DEPENDS+=	p5-Kwiki-Zipcode>=0.12:../../www/p5-Kwiki-Zipcode
diff --git a/www/p5-Kwiki/Makefile b/www/p5-Kwiki/Makefile
index 5cb9d3fe7f8..87975f2857d 100644
--- a/www/p5-Kwiki/Makefile
+++ b/www/p5-Kwiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:22 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=	Kwiki-0.38
 PKGNAME=	p5-${DISTNAME}
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
 COMMENT=	Extensible, modular, Perl-based Wiki
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Spoon>=0.21nb1:../../devel/p5-Spoon
 
 PERL5_PACKLIST=		auto/Kwiki/.packlist
diff --git a/www/p5-SVN-Web/Makefile b/www/p5-SVN-Web/Makefile
index ca66959831a..c2abb0e96a4 100644
--- a/www/p5-SVN-Web/Makefile
+++ b/www/p5-SVN-Web/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/10/15 05:56:22 minskim Exp $
+# $NetBSD: Makefile,v 1.24 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=	SVN-Web-0.53
 PKGNAME=	p5-${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/SVN-Web/
 COMMENT=	Unstable snapshot of Subversion repository browser
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 TEX_ACCEPTED=	teTeX3
 
 DEPENDS+=	p5-Apache-DBI>=0.87:../../databases/p5-Apache-DBI
diff --git a/www/p5-Template-Extract/Makefile b/www/p5-Template-Extract/Makefile
index 464e600710e..f12ee6508f6 100644
--- a/www/p5-Template-Extract/Makefile
+++ b/www/p5-Template-Extract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/02/27 13:36:42 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=		Template-Extract-0.40
 PKGNAME=		p5-${DISTNAME}
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/~autrijus/Template-Extract/
 COMMENT=		Perl5 module for extracting data structure from TT2-rendered documents
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 TEX_ACCEPTED=	teTeX3
 
 DEPENDS+=	p5-Template-Toolkit>=2.0:../../www/p5-Template-Toolkit
diff --git a/www/p5-Template-Generate/Makefile b/www/p5-Template-Generate/Makefile
index c241ba46218..ba5da5a83c5 100644
--- a/www/p5-Template-Generate/Makefile
+++ b/www/p5-Template-Generate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/08/10 03:21:40 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=		Template-Generate-0.04
 PKGNAME=		p5-${DISTNAME}
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/~autrijus/Template-Generate/
 COMMENT=		Perl5 module for generating TT2 templates from TT2-rendered documents
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 TEX_ACCEPTED=	teTeX3
 
 DEPENDS+=	p5-Template-Toolkit>=2.0:../../www/p5-Template-Toolkit
diff --git a/www/p5-WWW-Amazon-Wishlist/Makefile b/www/p5-WWW-Amazon-Wishlist/Makefile
index bf014125002..e22fb2579ff 100644
--- a/www/p5-WWW-Amazon-Wishlist/Makefile
+++ b/www/p5-WWW-Amazon-Wishlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/27 13:46:32 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=	WWW-Amazon-Wishlist-1.4
@@ -11,11 +11,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/WWW-Amazon-Wishlist/
 COMMENT=	Perl5 module to get details from your Amazon wishlist
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=	p5-Template-Extract-[0-9]*:../../www/p5-Template-Extract
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 PERL5_PACKLIST=		auto/WWW/Amazon/Wishlist/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/ruby-borges/Makefile b/www/ruby-borges/Makefile
index 62d7811d4c7..79ab6dbae72 100644
--- a/www/ruby-borges/Makefile
+++ b/www/ruby-borges/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/06/19 15:04:36 taca Exp $
+# $NetBSD: Makefile,v 1.18 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=	borges-1.1.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://borges.rubyforge.org/
 COMMENT=	Ruby web application framework
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_RUBY_SETUP=		yes
 CONFIGURE_ARGS+=	--site-ruby-common=${PREFIX}/${RUBY_VENDORLIB_BASE} \
 			--site-ruby=${PREFIX}/${RUBY_VENDORLIB} \
diff --git a/www/seamonkey-bin-flash/Makefile b/www/seamonkey-bin-flash/Makefile
index ebc4a9b9737..5b7ec9a1b67 100644
--- a/www/seamonkey-bin-flash/Makefile
+++ b/www/seamonkey-bin-flash/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2007/07/29 05:20:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:43 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../www/firefox-bin-flash/Makefile.common"
 
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index d4ad4e6d1b1..3bb5fb9850e 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2008/01/18 05:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.40 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=		sitecopy-0.16.2
 PKGREVISION=		1
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.lyra.org/sitecopy/
 COMMENT=		Utility for synchronizing remote and local web sites
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_FEATURES=		getopt_long
 USE_TOOLS+=		gmake msgfmt
 USE_PKGLOCALEDIR=	yes
diff --git a/www/snarf/Makefile b/www/snarf/Makefile
index 29797390d18..3552e1fd7a5 100644
--- a/www/snarf/Makefile
+++ b/www/snarf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:31:03 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=		snarf-7.0
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.xach.com/snarf/
 COMMENT=		Simple command-line tool to retrieve an HTTP URL
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index 751e22e3d39..25b48de52ce 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/05/22 10:50:59 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=	varnish-1.0.2
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://varnish-cache.org/
 COMMENT=	High-performace HTTP accelerator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	autoconf
diff --git a/www/visitors/Makefile b/www/visitors/Makefile
index da8433da668..02e0cfda2aa 100644
--- a/www/visitors/Makefile
+++ b/www/visitors/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/02 18:06:50 obache Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=		visitors-0.7
@@ -9,14 +9,14 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.hping.org/visitors/
 COMMENT=		Very fast web log analyzer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/visitors_0.7
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/visitors share/doc/visitors
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/visitors ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/visitors
-	${INSTALL_DATA} ${WRKSRC}/*.png ${PREFIX}/share/visitors
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/visitors
-	${INSTALL_DATA} ${WRKSRC}/doc.html ${PREFIX}/share/doc/visitors
+	${INSTALL_PROGRAM} ${WRKSRC}/visitors ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/*.png ${DESTDIR}${PREFIX}/share/visitors
+	${INSTALL_DATA} ${WRKSRC}/doc.html ${DESTDIR}${PREFIX}/share/doc/visitors
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index c4544a49f72..4e06a50624b 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/11/12 00:17:17 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2008/06/20 01:09:43 joerg Exp $
 
 DISTNAME=	w3c-httpd-3.0A
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.w3.org/Daemon/
 COMMENT=	WWW server from the W3 Consortium (W3C)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 BUILD_TARGET=	build-all
 # prevent conflict with directory All on non-case-sensitive file systems
@@ -42,7 +44,7 @@ SUBST_FILES.strcasestr=	Daemon/Implementation/HTWild.c \
 SUBST_SED.strcasestr=	-e 's,\([[:blank:]]\)\(strcasestr\),\1x\2,g'
 
 EGDIR=			${PREFIX}/share/examples/w3c-httpd
-INSTALLATION_DIRS=	bin sbin share/examples/w3c-httpd
+INSTALLATION_DIRS=	bin etc/w3c-httpd sbin share/w3c-httpd share/examples/w3c-httpd
 
 .for f in all.conf caching.conf httpd.conf prot.conf proxy.conf
 CONF_FILES+=	${EGDIR:Q}/${f:Q}	${PKG_SYSCONFDIR}/${f:Q}
@@ -63,13 +65,12 @@ pre-configure:
 .endif
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX:Q}/etc/w3c-httpd ${PREFIX:Q}/share/w3c-httpd
-	${CP} -R ${WRKSRC:Q}/server_root/icons ${PREFIX:Q}/share/w3c-httpd
-	${CP} ${WRKSRC:Q}/server_root/config/*.conf ${EGDIR:Q}
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/Daemon/${OSNAME:Q}/httpd ${PREFIX:Q}/sbin/w3c-httpd
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/Daemon/${OSNAME:Q}/htadm ${PREFIX:Q}/bin
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/Daemon/${OSNAME:Q}/htimage ${PREFIX:Q}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/Daemon/${OSNAME:Q}/cgiparse ${PREFIX:Q}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/Daemon/${OSNAME:Q}/cgiutils ${PREFIX:Q}/sbin
+	${CP} -R ${WRKSRC}/server_root/icons ${DESTDIR}${PREFIX}/share/w3c-httpd
+	${CP} ${WRKSRC}/server_root/config/*.conf ${DESTDIR}${EGDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/httpd ${DESTDIR}${PREFIX}/sbin/w3c-httpd
+	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/htadm ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/htimage ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/cgiparse ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/cgiutils ${DESTDIR}${PREFIX}/sbin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/wApua/Makefile b/www/wApua/Makefile
index 4b7f72fb5b1..890c8d0c257 100644
--- a/www/wApua/Makefile
+++ b/www/wApua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:24 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=	wApua-0.05.1
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://fsinfo.cs.uni-sb.de/~abe/wApua/
 COMMENT=	Web browser for WAP WML
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-URI>=1.03:../../www/p5-URI
 DEPENDS+=	p5-libwww>=5.47:../../www/p5-libwww
 DEPENDS+=	p5-Tk>=800.000:../../x11/p5-Tk
@@ -18,11 +20,12 @@ DEPENDS+=	p5-Net-[0-9]*:../../net/p5-Net
 
 PERL5_PACKLIST=		auto/wApua/.packlist
 
+INSTALLATION_DIRS=	share/doc/wApua
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wApua
 	cd ${WRKSRC}; \
 	for i in COPYING README wApua.rc ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/wApua ; \
+		${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/share/doc/wApua ; \
 	done
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/waplet/Makefile b/www/waplet/Makefile
index 72992994e00..362465e2da0 100644
--- a/www/waplet/Makefile
+++ b/www/waplet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/22 04:14:39 martti Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=	waplet
@@ -11,18 +11,20 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://waplet.sourceforge.net/
 COMMENT=	Java applet-based WAP emulator and WML browser
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 
+INSTALLATION_DIRS=	share/httpd/htdocs/waplet share/doc/waplet \
+			share/examples/waplet
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/htdocs/waplet
-	${INSTALL_DATA} ${WRKSRC}/waplet.jar ${PREFIX}/share/httpd/htdocs/waplet
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/waplet
+	${INSTALL_DATA} ${WRKSRC}/waplet.jar ${DESTDIR}${PREFIX}/share/httpd/htdocs/waplet
 .for file in README COPYING Parser.java Tag.java waplet.java
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/waplet
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/share/doc/waplet
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/waplet
 .for file in sample.html wap_content.wml
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/examples/waplet
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/share/examples/waplet
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile
index 8019cf55c75..e76d49746ca 100644
--- a/www/wdg-validate/Makefile
+++ b/www/wdg-validate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:25 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=	validate-1.2.2
@@ -11,9 +11,10 @@ MAINTAINER=	norm@sandbox.org.uk
 HOMEPAGE=	http://www.htmlhelp.com/tools/validator/offline/
 COMMENT=	HTML validator from the Web Design Group
 
-DEPENDS+=	lq-sp>=1.3.4.5:../../textproc/lq-sp
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+DEPENDS+=	lq-sp>=1.3.4.5:../../textproc/lq-sp
 
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	validate
@@ -31,16 +32,15 @@ SUBST_FILES.paths=	validate
 SUBST_SED.paths=	-e 's,/usr/local/share,${PREFIX}/share,g' \
 			-e 's,/usr/local/bin/lq-nsgmls,${LOCALBASE}/bin/lq-nsgmls,g'
 
-INSTALLATION_DIRS+=	bin share/doc
+INSTALLATION_DIRS+=	bin share/doc share/wdg/sgml-lib
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}/validate
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/README ${WRKSRC}/README
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/wdg/sgml-lib
-	${INSTALL_SCRIPT} ${WRKSRC}/validate ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/validate.README
-	cd ${WRKSRC}/wdg/sgml-lib && pax -rw * ${PREFIX}/share/wdg/sgml-lib/
+	${INSTALL_SCRIPT} ${WRKSRC}/validate ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/validate.README
+	cd ${WRKSRC}/wdg/sgml-lib && pax -rw * ${DESTDIR}${PREFIX}/share/wdg/sgml-lib/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/weblint/Makefile b/www/weblint/Makefile
index 965703cd9c1..acf40f5f3e0 100644
--- a/www/weblint/Makefile
+++ b/www/weblint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/12/02 12:34:01 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:43 joerg Exp $
 #
 
 DISTNAME=	weblint-1.020
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	HTML validator and sanity checker
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		perl:run
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
diff --git a/www/weblint/distinfo b/www/weblint/distinfo
index d4128da03f1..2ca39bd93f6 100644
--- a/www/weblint/distinfo
+++ b/www/weblint/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/12/27 22:19:12 reed Exp $
+$NetBSD: distinfo,v 1.5 2008/06/20 01:09:43 joerg Exp $
 
 SHA1 (weblint-1.020.tar.gz) = 445cc723ff2a25095c48aa52bd3f082fef22ba0c
 RMD160 (weblint-1.020.tar.gz) = f139b8e7c726ad21daab20288ed93b688193ac44
 Size (weblint-1.020.tar.gz) = 41264 bytes
-SHA1 (patch-aa) = f8f924e5d9ece331a36934a6b8edc45ed4268980
+SHA1 (patch-aa) = 7fae3054ede92615b3996c5a97543371e1d7d5a3
diff --git a/www/weblint/patches/patch-aa b/www/weblint/patches/patch-aa
index 903678d147f..b182405224f 100644
--- a/www/weblint/patches/patch-aa
+++ b/www/weblint/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2005/12/27 22:19:12 reed Exp $
+$NetBSD: patch-aa,v 1.5 2008/06/20 01:09:44 joerg Exp $
 
 --- Makefile.orig	Sat Aug 16 04:10:21 1997
 +++ Makefile	Tue Aug 15 05:58:06 2000
@@ -27,10 +27,10 @@ $NetBSD: patch-aa,v 1.4 2005/12/27 22:19:12 reed Exp $
 -	-chmod 755 $(BINDIR)/$(PROGRAM)
 -	-cp $(PROGRAM).1 $(MANDIR)
 -	-chmod 644 $(MANDIR)/$(PROGRAM).1
-+	${BSD_INSTALL_SCRIPT}	$(PROGRAM)   $(BINDIR)
-+	${BSD_INSTALL_DATA}	$(PROGRAM).1 $(MANDIR)
-+	${BSD_INSTALL_DATA_DIR}	$(LIBDIR)
-+	${BSD_INSTALL_DATA}	weblintrc    $(LIBDIR)
++	${BSD_INSTALL_SCRIPT}	$(PROGRAM)   ${DESTDIR}$(BINDIR)
++	${BSD_INSTALL_DATA}	$(PROGRAM).1 ${DESTDIR}$(MANDIR)
++	${BSD_INSTALL_DATA_DIR}	${DESTDIR}$(LIBDIR)
++	${BSD_INSTALL_DATA}	weblintrc    ${DESTDIR}$(LIBDIR)
  
  test:
  	@./test.pl
diff --git a/www/webnew/Makefile b/www/webnew/Makefile
index c6b15632c06..0a9363a9196 100644
--- a/www/webnew/Makefile
+++ b/www/webnew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:16 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=		webnew-1.3
@@ -9,6 +9,8 @@ MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://kimmo.suominen.com/sw/webnew/
 COMMENT=		Retrieve modification times of web documents
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		perl:run
 
 NO_CONFIGURE=		yes
@@ -17,7 +19,7 @@ BUILD_TARGET=		all DEST=${PREFIX} PERL=${PERL5}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/webnew ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/webnew.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/webnew ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/webnew.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/websvn/Makefile b/www/websvn/Makefile
index 798abb706fb..c7e8ef118d4 100644
--- a/www/websvn/Makefile
+++ b/www/websvn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/05/26 02:13:26 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=	WebSVN_161
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://websvn.tigris.org/
 COMMENT=	Subversion repository web frontend
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.0:../../www/ap-php
 DEPENDS+=	${PHP_PKG_PREFIX}-zlib-[0-9]*:../../archivers/php-zlib
 
@@ -29,21 +31,19 @@ HTTPD_ROOT?=	share/httpd/htdocs
 
 BUILD_DEFS+=	HTTPD_ROOT
 
-EGDIR=		${PREFIX}/share/examples/${PKGBASE}
+EGDIR=		${PREFIX}/share/examples/websvn
 REQD_DIRS=	${PREFIX}/${HTTPD_ROOT}/websvn/include
 CONF_FILES=	${EGDIR}/distconfig.inc ${PKG_SYSCONFDIR}/config.inc
 
-INSTALLATION_DIRS=	${HTTPD_ROOT}/websvn share/examples/${PKGBASE}
+INSTALLATION_DIRS=	${HTTPD_ROOT}/websvn share/examples/websvn
 
 post-extract:
 	chmod -R go-w ${WRKSRC}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/include/distconfig.inc ${EGDIR}
-	cd ${WRKSRC} && pax -rwppm . ${PREFIX}/${HTTPD_ROOT}/websvn
-
-post-install:
-	${RM} ${PREFIX}/${HTTPD_ROOT}/websvn/include/distconfig.inc
+	${INSTALL_DATA} ${WRKSRC}/include/distconfig.inc ${DESTDIR}${EGDIR}
+	cd ${WRKSRC} && pax -rwppm . ${DESTDIR}${PREFIX}/${HTTPD_ROOT}/websvn
+	${RM} ${DESTDIR}${PREFIX}/${HTTPD_ROOT}/websvn/include/distconfig.inc
 
 .include "../../mk/apachever.mk"
 .include "../../lang/php/phpversion.mk"
diff --git a/www/whisker/Makefile b/www/whisker/Makefile
index 7c87ccdd861..06a87d37d50 100644
--- a/www/whisker/Makefile
+++ b/www/whisker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:24 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/20 01:09:44 joerg Exp $
 
 DISTNAME=	whisker-2.1
 PKGREVISION=	1
@@ -9,26 +9,26 @@ MAINTAINER=	adrianp@stindustries.net
 HOMEPAGE=	http://www.wiretrip.net/rfp/
 COMMENT=	URL scanner used to search for known vulnerable CGIs on websites
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
 
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	whisker.pl
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/doc/whisker share/whisker
 
 do-build:
 	${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${WRKSRC}/whisker.pl > ${WRKSRC}/whisker
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/whisker
-	${INSTALL_DATA_DIR} ${PREFIX}/share/whisker
-	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/whisker
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/whisker
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/whisker
-	${INSTALL_SCRIPT} ${WRKSRC}/whisker ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/LW.pm ${PREFIX}/share/whisker
-	${INSTALL_DATA} ${WRKSRC}/html.plugin ${PREFIX}/share/whisker
-	${INSTALL_DATA} ${WRKSRC}/main.test ${PREFIX}/share/whisker
-	${INSTALL_DATA} ${WRKSRC}/newbie.help ${PREFIX}/share/whisker
+	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DESTDIR}${PREFIX}/share/doc/whisker
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/share/doc/whisker
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/whisker
+	${INSTALL_SCRIPT} ${WRKSRC}/whisker ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/LW.pm ${DESTDIR}${PREFIX}/share/whisker
+	${INSTALL_DATA} ${WRKSRC}/html.plugin ${DESTDIR}${PREFIX}/share/whisker
+	${INSTALL_DATA} ${WRKSRC}/main.test ${DESTDIR}${PREFIX}/share/whisker
+	${INSTALL_DATA} ${WRKSRC}/newbie.help ${DESTDIR}${PREFIX}/share/whisker
 
 .include "../../mk/bsd.pkg.mk"
author	joerg <joerg@pkgsrc.org>	2008-06-20 01:09:05 +0000
committer	joerg <joerg@pkgsrc.org>	2008-06-20 01:09:05 +0000
commit	3b0d97b0de8516db29699676c860489da3f7f0e1 (patch)
tree	bb388f6b2532587595653e67cce25229ed050cb8 /www
parent	10abca39942a8f34d088f39ccc073fee44271274 (diff)
download	pkgsrc-3b0d97b0de8516db29699676c860489da3f7f0e1.tar.gz