DESTDIR support.

38 files changed, 297 insertions, 100 deletions

diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index 96acaa7ba19..7dee4ca3885 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/10/17 12:28:12 tron Exp $
+# $NetBSD: Makefile,v 1.17 2006/11/05 17:31:09 joerg Exp $
 
 DISTNAME=	libtorrent-0.10.3
 CATEGORIES=	net
@@ -8,6 +8,8 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://libtorrent.rakshasa.no/
 COMMENT=	BitTorrent library written in C++ for *nix
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
diff --git a/net/p5-INET6/Makefile b/net/p5-INET6/Makefile
index 6aba73dac8e..a26376d17de 100644
--- a/net/p5-INET6/Makefile
+++ b/net/p5-INET6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/06 06:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/11/05 17:31:09 joerg Exp $
 #
 
 DISTNAME=	INET6-2.01
@@ -11,6 +11,8 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/~mondejar/INET6/
 COMMENT=	Object interface for AF_INET|AF_INET6 domain sockets
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Socket6>=0.12:../../net/p5-Socket6
 
 PERL5_PACKLIST=	auto/IO/Socket/INET6/.packlist
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index e13128ed597..0fa24e3a3e9 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/09/03 16:55:15 heinz Exp $
+# $NetBSD: Makefile,v 1.33 2006/11/05 17:31:10 joerg Exp $
 
 DISTNAME=		Net-DNS-0.58
 PKGNAME=		p5-${DISTNAME}
@@ -12,6 +12,7 @@ HOMEPAGE=		http://www.net-dns.org/
 COMMENT=		Perl5 module for DNS resolution
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_DEPENDS+=		{p5-Test-Simple>=0.44,perl{,-thread}>=5.8.0}:../../devel/p5-Test-Simple
 DEPENDS+=		p5-Digest-HMAC>=1.0:../../security/p5-Digest-HMAC
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index a5880e35b7a..6d32bcd89cd 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/10/17 22:18:02 heinz Exp $
+# $NetBSD: Makefile,v 1.41 2006/11/05 17:31:10 joerg Exp $
 
 DISTNAME=	libnet-1.19
 PKGNAME=	p5-Net-1.19
@@ -12,6 +12,7 @@ HOMEPAGE=	http://search.cpan.org/dist/libnet/
 COMMENT=	Perl5 modules to access and use network protocols
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/Net/.packlist
 
diff --git a/net/p5-Socket6/Makefile b/net/p5-Socket6/Makefile
index a112693a0ec..276e041d8e4 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:30:23 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/11/05 17:31:10 joerg Exp $
 #
 
 DISTNAME=		Socket6-0.19
@@ -12,6 +12,7 @@ HOMEPAGE=		http://search.cpan.org/~umemoto/${DISTNAME}/
 COMMENT=		Perl5 module to support getaddrinfo() and getnameinfo()
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/Socket6/.packlist
 
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 717e3bbb37d..e191aff7265 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2006/04/28 16:08:37 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2006/11/05 17:31:10 joerg Exp $
 
 DISTNAME=	rsync-2.6.8
 CATEGORIES=	net
@@ -15,6 +15,8 @@ HOMEPAGE=	http://rsync.samba.org/
 COMMENT=	Network file distribution/synchronisation utility
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/doc/rsync
 
 GNU_CONFIGURE=		YES
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index bb8f9fbbe6c..298b58cb20f 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/10/17 12:28:13 tron Exp $
+# $NetBSD: Makefile,v 1.15 2006/11/05 17:31:10 joerg Exp $
 
 DISTNAME=	rtorrent-0.6.3
 CATEGORIES=	net
@@ -8,6 +8,8 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://libtorrent.rakshasa.no/
 COMMENT=	Ncurses based torrent client with support for sessions
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_NCURSES=		yes
@@ -29,10 +31,11 @@ CXXFLAGS+=	-fpermissive -fno-strength-reduce -fno-thread-jumps \
 		-fno-inline -fforce-addr
 .endif
 
+INSTALLATION_DIRS=	share/examples/rtorrent
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rtorrent
 	${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc \
-		${PREFIX}/share/examples/rtorrent
+		${DESTDIR}${PREFIX}/share/examples/rtorrent
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../net/libtorrent/buildlink3.mk"
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 020f17fbea9..10b5a323e5e 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/07/27 18:48:03 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/11/05 17:34:44 joerg Exp $
 
 DISTNAME=	ghostscript-${GS_VERS}
 PKGNAME=	ghostscript-gnu-${GS_VERS}
@@ -13,6 +13,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	GNU Postscript interpreter with all drivers
 HOMEPAGE=	http://www.cs.wisc.edu/~ghost/index.html
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	ghostscript{,-nox11}-[0-9]*
 CONFLICTS+=	ghostscript-afpl-[0-9]*
 CONFLICTS+=	ghostscript-esp{,-nox11}-[0-9]*
@@ -93,7 +95,7 @@ post-extract:
 
 # Reinstall the gs binary so that it's properly stripped.
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/gs ${PREFIX}/bin/gs
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/gs ${DESTDIR}${PREFIX}/bin/gs
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-gnu/distinfo b/print/ghostscript-gnu/distinfo
index 9abbdf9154c..7be0cca3f81 100644
--- a/print/ghostscript-gnu/distinfo
+++ b/print/ghostscript-gnu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/11/27 17:06:36 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2006/11/05 17:34:44 joerg Exp $
 
 SHA1 (ghostscript/ghostscript-8.15.tar.bz2) = 9b72a87e0521545265ec207bf12b7c20003ae2ad
 RMD160 (ghostscript/ghostscript-8.15.tar.bz2) = fb8f997c164c98c8c73dee032bb4f2fef3e90901
@@ -7,6 +7,6 @@ SHA1 (ghostscript/jpegsrc.v6b.tar.gz) = 7079f0d6c42fad0cfba382cf6ad322add1ace8f9
 RMD160 (ghostscript/jpegsrc.v6b.tar.gz) = 18892206014fbb8cae2a44e281f4ed53feaf7882
 Size (ghostscript/jpegsrc.v6b.tar.gz) = 613261 bytes
 SHA1 (patch-aa) = f9d706b19430c32f568316c0b02eee792e311236
-SHA1 (patch-ab) = ee1cad8503700d088e2a4dcf4c3d14237cb84b0e
+SHA1 (patch-ab) = f8c30796f284d504749adac1847ca6106253fe90
 SHA1 (patch-ac) = 9758dcf3427ab1a7b018060b928d60f42dd9fd5e
 SHA1 (patch-ad) = 964023e6d5e94f7cd471a9e7c5b29c4ce7db715e
diff --git a/print/ghostscript-gnu/patches/patch-ab b/print/ghostscript-gnu/patches/patch-ab
index 5df80803340..2ec10cd507a 100644
--- a/print/ghostscript-gnu/patches/patch-ab
+++ b/print/ghostscript-gnu/patches/patch-ab
@@ -1,8 +1,114 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/13 05:43:28 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2006/11/05 17:34:44 joerg Exp $
 
---- src/unixinst.mak.orig	Thu Apr 18 18:10:40 2002
+--- src/unixinst.mak.orig	2003-12-12 22:08:05.000000000 +0000
 +++ src/unixinst.mak
-@@ -133,7 +133,7 @@ install-man: $(PSMANDIR)/gs.1
+@@ -28,24 +28,24 @@ install: install-exec install-scripts in
+ # rules, just in case bindir or scriptdir is a subdirectory of any of these.
+ 
+ install-exec: STDDIRS $(GS_XE)
+-	-mkdir -p $(datadir)
+-	-mkdir -p $(gsdir)
+-	-mkdir -p $(gsdatadir)
+-	-mkdir -p $(bindir)
+-	$(INSTALL_PROGRAM) $(GS_XE) $(bindir)/$(GS)
++	-mkdir -p ${DESTDIR}$(datadir)
++	-mkdir -p ${DESTDIR}$(gsdir)
++	-mkdir -p ${DESTDIR}$(gsdatadir)
++	-mkdir -p ${DESTDIR}$(bindir)
++	$(INSTALL_PROGRAM) $(GS_XE) ${DESTDIR}$(bindir)/$(GS)
+ 
+ install-scripts: $(PSLIBDIR)/gsnd
+-	-mkdir -p $(datadir)
+-	-mkdir -p $(gsdir)
+-	-mkdir -p $(gsdatadir)
+-	-mkdir -p $(scriptdir)
++	-mkdir -p ${DESTDIR}$(datadir)
++	-mkdir -p ${DESTDIR}$(gsdir)
++	-mkdir -p ${DESTDIR}$(gsdatadir)
++	-mkdir -p ${DESTDIR}$(scriptdir)
+ 	$(SH) -c 'for f in \
+ gsbj gsdj gsdj500 gslj gslp gsnd \
+ bdftops dumphints dvipdf eps2eps font2c \
+ pdf2dsc pdf2ps pdfopt pf2afm pfbtopfa printafm \
+ ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr ps2ps wftopfa \
+ fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\
+-	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f $(scriptdir); fi;\
++	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f ${DESTDIR}$(scriptdir); fi;\
+ 	done'
+ 
+ PSRESDIR=$(PSLIBDIR)/../Resource
+@@ -59,10 +59,10 @@ install-data: install-libdata install-re
+ # one file from each subdirectory just as a sanity check.
+ 
+ install-libdata: 
+-	-mkdir -p $(datadir)
+-	-mkdir -p $(gsdir)
+-	-mkdir -p $(gsdatadir)
+-	-mkdir -p $(gsdatadir)/lib
++	-mkdir -p ${DESTDIR}$(datadir)
++	-mkdir -p ${DESTDIR}$(gsdir)
++	-mkdir -p ${DESTDIR}$(gsdatadir)
++	-mkdir -p ${DESTDIR}$(gsdatadir)/lib
+ 	$(SH) -c 'for f in \
+ Fontmap Fontmap.GS cidfmap \
+ FAPIcidfmap FAPIconfig FAPIfontmap xlatmap \
+@@ -79,24 +79,24 @@ viewcmyk.ps viewgif.ps viewjpeg.ps viewm
+ viewpcx.ps viewpbm.ps viewps2a.ps \
+ winmaps.ps wftopfa.ps wrfont.ps zeroline.ps \
+ pdf2dsc.ps pdfopt.ps ;\
+-	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(gsdatadir)/lib; fi;\
++	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f ${DESTDIR}$(gsdatadir)/lib; fi;\
+ 	done'
+ 	$(SH) -c 'for f in $(PSLIBDIR)/gs_*.ps $(PSLIBDIR)/pdf*.ps;\
+-	do $(INSTALL_DATA) $$f $(gsdatadir)/lib ;\
++	do $(INSTALL_DATA) $$f ${DESTDIR}$(gsdatadir)/lib ;\
+ 	done'
+ 	$(SH) -c 'for f in $(PSLIBDIR)/*.ppd $(PSLIBDIR)/*.rpd $(PSLIBDIR)/*.upp $(PSLIBDIR)/*.xbm $(PSLIBDIR)/*.xpm;\
+-	do $(INSTALL_DATA) $$f $(gsdatadir)/lib ;\
++	do $(INSTALL_DATA) $$f ${DESTDIR}$(gsdatadir)/lib ;\
+ 	done'
+ 
+ # install the default resource files
+ # copy in every category (directory) but CVS
+ RES_CATEGORIES=`ls $(PSRESDIR) | grep -v CVS` 
+ install-resdata: $(PSRESDIR)/Decoding/Unicode
+-	-mkdir -p $(datadir)
+-	-mkdir -p $(gsdir)
+-	-mkdir -p $(gsdatadir)/Resource
++	-mkdir -p ${DESTDIR}$(datadir)
++	-mkdir -p ${DESTDIR}$(gsdir)
++	-mkdir -p ${DESTDIR}$(gsdatadir)/Resource
+ 	$(SH) -c 'for dir in $(RES_CATEGORIES); do \
+-	  rdir=$(gsdatadir)/Resource/$$dir ; \
++	  rdir=${DESTDIR}$(gsdatadir)/Resource/$$dir ; \
+ 	  test -d $$rdir || mkdir -p $$rdir ; \
+ 	  for file in $(PSRESDIR)/$$dir/*; do \
+ 	    if test -f $$file; then $(INSTALL_DATA) $$file $$rdir ; fi \
+@@ -117,9 +117,9 @@ DOC_PAGES=PUBLIC README index.html gs.cs
+ 	   Psfiles.htm Public.htm Readme.htm Release.htm \
+ 	   Source.htm Tester.htm Unix-lpr.htm Use.htm Xfonts.htm
+ install-doc: $(PSDOCDIR)/News.htm
+-	-mkdir -p $(docdir)
++	-mkdir -p ${DESTDIR}$(docdir)
+ 	$(SH) -c 'for f in $(DOC_PAGES) ;\
+-	do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(docdir); fi;\
++	do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f ${DESTDIR}$(docdir); fi;\
+ 	done'
+ 
+ # install the man pages for each locale
+@@ -128,9 +128,9 @@ MAN1_LINKS_PS2PS=eps2eps
+ MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13
+ MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj
+ install-man: $(PSMANDIR)/gs.1
+-	$(SH) -c 'test -d $(mandir) || mkdir -p $(mandir)'
++	$(SH) -c 'test -d ${DESTDIR}$(mandir) || mkdir -p ${DESTDIR}$(mandir)'
+ 	$(SH) -c 'for d in $(MAN_LCDIRS) ;\
+-	do man1dir=$(mandir)/$$d/man$(man1ext) ;\
++	do man1dir=${DESTDIR}$(mandir)/$$d/man$(man1ext) ;\
+ 	  ( test -d $$man1dir || mkdir -p $$man1dir ) ;\
+ 	  for f in $(PSMANDIR)/$$d/*.1 ;\
+ 	    do $(INSTALL_DATA) $$f $$man1dir ;\
+@@ -146,7 +146,7 @@ install-man: $(PSMANDIR)/gs.1
  			  ln -s ps2pdf.$(man1ext) $$f.$(man1ext) ) ;\
  	      done ;\
  	    fi ;\
@@ -11,3 +117,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/09/13 05:43:28 jlam Exp $
  	      then for f in $(MAN1_LINKS_GSLP) ;\
  	        do ( cd $$man1dir; rm -f $$f.$(man1ext) ;\
  			  ln -s gslp.$(man1ext) $$f.$(man1ext) ) ;\
+@@ -157,10 +157,10 @@ install-man: $(PSMANDIR)/gs.1
+ 
+ # install the example files
+ install-examples:
+-	-mkdir -p $(exdir)
++	-mkdir -p ${DESTDIR}$(exdir)
+ 	for f in \
+ alphabet.ps chess.ps colorcir.ps doretree.ps escher.ps \
+ golfer.eps grayalph.ps snowflak.ps tiger.eps vasarely.ps waterfal.ps \
+ ridt91.eps ;\
+-	do $(INSTALL_DATA) $(PSEXDIR)/$$f $(exdir) ;\
++	do $(INSTALL_DATA) $(PSEXDIR)/$$f ${DESTDIR}$(exdir) ;\
+ 	done
diff --git a/print/gimp-print-lib/Makefile b/print/gimp-print-lib/Makefile
index 609956f1186..a3c4df9e9c9 100644
--- a/print/gimp-print-lib/Makefile
+++ b/print/gimp-print-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/11/05 17:34:44 joerg Exp $
 
 DISTNAME=	gimp-print-4.2.7
 PKGNAME=	gimp-print-lib-4.2.7
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gimp-print.sourceforge.net/
 COMMENT=	Drivers for Canon, Epson, Lexmark, and PCL printers
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake lex
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 74e996c7423..f2edcf05640 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/04/17 13:46:07 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2006/11/05 17:34:44 joerg Exp $
 #
 
 DISTNAME=	libgnomeprintui-2.12.1
@@ -11,6 +11,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.levien.com/gnome/print-arch.html
 COMMENT=	Graphical library for the GNOME2 Printing Architecture
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake msgfmt pkg-config
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 5ebaed7f5a6..4daf7cd9fb1 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2006/11/05 17:34:44 joerg Exp $
 #
 
 DISTNAME=	teTeX-3.0
@@ -11,6 +11,8 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Thomas Esser's TeX distribution for UNIX compatible systems, version 2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	texi2html>=1.52:../../textproc/texi2html
 
 CONFLICTS+=	teTeX2-[0-9]*
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 7536d53a431..a292229d5f1 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/10/09 03:08:24 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/11/05 17:34:44 joerg Exp $
 #
 
 DISTNAME=	tetex-texmf-3.0
@@ -11,6 +11,8 @@ MAINTAINER=	kei@NetBSD.org,pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Machine-independent part of teTeX
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	teTeX-share-[0-9]*
 
 WRKSRC=		${WRKDIR}/tetex
@@ -28,6 +30,6 @@ post-extract:
 	rm -f ${WRKSRC}/ls-R
 
 do-install:
-	cd ${WRKSRC} && pax -wr -s ',.*\.orig$$,,' * ${PREFIX}/share/texmf-dist
+	cd ${WRKSRC} && pax -wr -s ',.*\.orig$$,,' * ${DESTDIR}${PREFIX}/share/texmf-dist
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/caff/Makefile b/security/caff/Makefile
index e1664561f8c..8769c9c9ece 100644
--- a/security/caff/Makefile
+++ b/security/caff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/10/13 21:01:36 tonio Exp $
+# $NetBSD: Makefile,v 1.8 2006/11/05 17:35:58 joerg Exp $
 
 DISTNAME=	signing-party_0.4.8.orig
 PKGNAME=	caff-0.4.8
@@ -9,6 +9,8 @@ MAINTAINER=	ghen@NetBSD.org,tonio@NetBSD.org
 HOMEPAGE=	http://pgp-tools.alioth.debian.org/
 COMMENT=	Various GnuPG related tools
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//}
 
 USE_TOOLS+=	gmake pod2man
@@ -30,32 +32,32 @@ SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	caff/caff keylookup/keylookup.1
 SUBST_SED.paths=	-e 's,/usr/,${PREFIX}/,g'
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/caff share/examples/caff
+
 .include "../../mk/bsd.prefs.mk"
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/caff/caff ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/caff/pgp-fixkey ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/caff/pgp-clean ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/gpg-key2ps/gpg-key2ps ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/gpgsigs/gpgsigs ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/gpglist/gpglist ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/keylookup/keylookup ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/gpg-mailkeys/gpg-mailkeys ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/caff/caff.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/caff/pgp-fixkey.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/caff/pgp-clean.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/gpg-key2ps/gpg-key2ps.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/gpgsigs/gpgsigs.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/gpglist/gpglist.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/keylookup/keylookup.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/gpg-mailkeys/gpg-mailkeys.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/caff
-	${INSTALL_DATA} ${WRKSRC}/caff/README ${PREFIX}/share/doc/caff
-	${INSTALL_DATA} ${WRKSRC}/caff/README.many-keys ${PREFIX}/share/doc/caff
-	${INSTALL_DATA} ${WRKSRC}/caff/README.gpg-agent ${PREFIX}/share/doc/caff
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/caff
-	${INSTALL_DATA} ${WRKSRC}/caff/caffrc.sample ${PREFIX}/share/examples/caff
-	${INSTALL_DATA} ${WRKSRC}/gpgsigs/gpgsigs-lt2k5.txt ${PREFIX}/share/examples/caff
-	${INSTALL_DATA} ${WRKSRC}/gpgsigs/gpgsigs-lt2k5-annotated.txt ${PREFIX}/share/examples/caff
+	${INSTALL_SCRIPT} ${WRKSRC}/caff/caff ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/caff/pgp-fixkey ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/caff/pgp-clean ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gpg-key2ps/gpg-key2ps ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gpgsigs/gpgsigs ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gpglist/gpglist ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/keylookup/keylookup ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gpg-mailkeys/gpg-mailkeys ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/caff/caff.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/caff/pgp-fixkey.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/caff/pgp-clean.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/gpg-key2ps/gpg-key2ps.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/gpgsigs/gpgsigs.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/gpglist/gpglist.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/keylookup/keylookup.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/gpg-mailkeys/gpg-mailkeys.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/caff/README ${DESTDIR}${PREFIX}/share/doc/caff
+	${INSTALL_DATA} ${WRKSRC}/caff/README.many-keys ${DESTDIR}${PREFIX}/share/doc/caff
+	${INSTALL_DATA} ${WRKSRC}/caff/README.gpg-agent ${DESTDIR}${PREFIX}/share/doc/caff
+	${INSTALL_DATA} ${WRKSRC}/caff/caffrc.sample ${DESTDIR}${PREFIX}/share/examples/caff
+	${INSTALL_DATA} ${WRKSRC}/gpgsigs/gpgsigs-lt2k5.txt ${DESTDIR}${PREFIX}/share/examples/caff
+	${INSTALL_DATA} ${WRKSRC}/gpgsigs/gpgsigs-lt2k5-annotated.txt ${DESTDIR}${PREFIX}/share/examples/caff
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index a47669a3f5d..fa58d903b7c 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/09/15 15:08:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2006/11/05 17:35:58 joerg Exp $
 #
 
 DISTNAME=	gnome-keyring-0.6.0
@@ -10,6 +10,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME password and secret manager
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 3ab9c0e486c..60a50fea85a 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/09/16 06:21:22 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2006/11/05 17:35:58 joerg Exp $
 
 DISTNAME=	gnutls-1.4.4
 CATEGORIES=	security devel
@@ -14,6 +14,7 @@ HOMEPAGE=	http://www.gnutls.org/
 COMMENT=	GNU Transport Layer Security library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
@@ -34,15 +35,12 @@ MAKE_ENV+=		TZ=UTC
 DOCDIR=		${PREFIX}/share/doc/gnutls
 EGDIR=		${PREFIX}/share/examples/gnutls
 
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/include/gnutls
+INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} include/gnutls
 
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/TODO ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/gnutls.ps ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/TODO ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/gnutls.ps ${DESTDIR}${DOCDIR}
+	cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${DESTDIR}${EGDIR}
 
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 6ba23ec08b3..148c1214998 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/10/04 21:58:14 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2006/11/05 17:35:58 joerg Exp $
 
 DISTNAME=	libgcrypt-1.2.3
 PKGREVISION=	1
@@ -11,6 +11,7 @@ HOMEPAGE=	http://directory.fsf.org/security/libgcrypt.html
 COMMENT=	GNU cryptographic library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index a1ab51df40b..099214be270 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/10/20 16:15:49 shannonjr Exp $
+# $NetBSD: Makefile,v 1.21 2006/11/05 17:35:58 joerg Exp $
 #
 
 DISTNAME=	libgpg-error-1.4
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.gnupg.org/
 COMMENT=	Definitions of common error values for all GnuPG components
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index 4c6a6a9cd13..d68029d6b8a 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/07/04 15:29:34 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2006/11/05 17:35:58 joerg Exp $
 
 DISTNAME=	libtasn1-0.3.5
 CATEGORIES=	security devel
@@ -13,6 +13,7 @@ HOMEPAGE=	http://www.gnutls.org/
 COMMENT=	ASN.1 structure parser library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		makeinfo
 USE_LIBTOOL=		yes
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index f9a9b2e8a69..4f1302e2159 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/31 22:49:57 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2006/11/05 17:35:58 joerg Exp $
 
 DISTNAME=	opencdk-0.5.11
 CATEGORIES=	security devel
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.gnutls.org/
 COMMENT=	Open Crypto Development Kit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -25,13 +26,12 @@ HTMLDIR=	${PREFIX}/share/doc/html/opencdk
 
 PKGCONFIG_OVERRIDE=	src/opencdk.pc.in
 
+INSTALLATION_DIRS=	${DOCDIR} ${HTMLDIR} ${EGDIR}
+
 pre-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/DETAILS ${DOCDIR}
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	${INSTALL_DATA}	${WRKSRC}/doc/opencdk-api.html ${HTMLDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}/tests && ${INSTALL_DATA} *.gpg *.c ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/DETAILS ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA}	${WRKSRC}/doc/opencdk-api.html ${DESTDIR}${HTMLDIR}
+	cd ${WRKSRC}/tests && ${INSTALL_DATA} *.gpg *.c ${DESTDIR}${EGDIR}
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
diff --git a/security/p5-Crypt-SSLeay/Makefile b/security/p5-Crypt-SSLeay/Makefile
index d0da97d0063..8e4320819be 100644
--- a/security/p5-Crypt-SSLeay/Makefile
+++ b/security/p5-Crypt-SSLeay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/08/22 22:04:51 abs Exp $
+# $NetBSD: Makefile,v 1.5 2006/11/05 17:35:58 joerg Exp $
 #
 
 DISTNAME=	Crypt-SSLeay-0.51
@@ -11,6 +11,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Crypt/}
 MAINTAINER=	shell@NetBSD.org
 COMMENT=	Crypt::SSLeay - OpenSSL glue that provides LWP https support
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/Crypt/SSLeay/.packlist
 
 SUBST_CLASSES+=		openssl
diff --git a/security/p5-Digest-HMAC/Makefile b/security/p5-Digest-HMAC/Makefile
index ac1e1b74a24..cb16a25a29f 100644
--- a/security/p5-Digest-HMAC/Makefile
+++ b/security/p5-Digest-HMAC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/08/06 06:19:30 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/11/05 17:35:58 joerg Exp $
 #
 
 DISTNAME=		Digest-HMAC-1.01
@@ -12,6 +12,8 @@ MAINTAINER=		heinz@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Digest-HMAC/
 COMMENT=		Perl5 module for HMAC
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-Digest-SHA1>=1.00:../../security/p5-Digest-SHA1
 DEPENDS+=		p5-Digest-MD5>=2.00:../../security/p5-Digest-MD5
 
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index 659854540cb..f798d23cfb5 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/01/01 22:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/11/05 17:35:58 joerg Exp $
 #
 
 DISTNAME=	Digest-MD5-2.36
@@ -11,12 +11,13 @@ MAINTAINER=	heinz@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Digest-MD5/
 COMMENT=	Perl5 extension interface for MD5 algorithm
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Digest>=1.00:../../security/p5-Digest
 
 CONFLICTS+=	p5-MD5-[0-9]*
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 PERL5_PACKLIST=		auto/Digest/MD5/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/security/p5-Digest-SHA1/Makefile b/security/p5-Digest-SHA1/Makefile
index ca51e739860..2eb1a4df5a8 100644
--- a/security/p5-Digest-SHA1/Makefile
+++ b/security/p5-Digest-SHA1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/01/22 20:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/11/05 17:35:59 joerg Exp $
 #
 
 DISTNAME=		Digest-SHA1-2.11
@@ -11,12 +11,13 @@ MAINTAINER=		heinz@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Digest-SHA1/
 COMMENT=		Perl5 module for SHA1
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-Digest>=1.00:../../security/p5-Digest
 
 CONFLICTS+=		p5-Digest-MD5<=2.12
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 PERL5_PACKLIST=		auto/Digest/SHA1/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/security/p5-Digest/Makefile b/security/p5-Digest/Makefile
index 1b26e6ad531..221d1e1bfa1 100644
--- a/security/p5-Digest/Makefile
+++ b/security/p5-Digest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/02 20:52:05 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/11/05 17:35:58 joerg Exp $
 #
 
 DISTNAME=	Digest-1.15
@@ -14,6 +14,7 @@ COMMENT=	Perl5 base class for Digest:: modules
 DEPENDS+=	p5-MIME-Base64>=2.18:../../converters/p5-MIME-Base64
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Digest/.packlist
diff --git a/security/p5-GnuPG-Interface/Makefile b/security/p5-GnuPG-Interface/Makefile
index 6e90decc28e..fa778c9b72a 100644
--- a/security/p5-GnuPG-Interface/Makefile
+++ b/security/p5-GnuPG-Interface/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/22 22:50:33 tv Exp $
+# $NetBSD: Makefile,v 1.8 2006/11/05 17:35:59 joerg Exp $
 #
 
 DISTNAME=		GnuPG-Interface-0.34
@@ -11,6 +11,8 @@ MAINTAINER=		tv@NetBSD.org
 HOMEPAGE=		http://gnupg-interface.sourceforge.net/
 COMMENT=		Perl interface to GnuPG
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-Class-MakeMethods>=1.010:../../devel/p5-Class-MakeMethods
 DEPENDS+=		gnupg>=1.2.3:../../security/gnupg
 
diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile
index d37b2c4cb40..5ad3ed3d25d 100644
--- a/security/p5-IO-Socket-SSL/Makefile
+++ b/security/p5-IO-Socket-SSL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/09/05 11:21:00 abs Exp $
+# $NetBSD: Makefile,v 1.24 2006/11/05 17:35:59 joerg Exp $
 
 DISTNAME=	IO-Socket-SSL-0.999
 PKGNAME=	p5-${DISTNAME}
@@ -10,9 +10,10 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/IO-Socket-SSL/
 COMMENT=	Perl5 SSL socket interface class
 
-DEPENDS+=	p5-Net-SSLeay>=1.26:../../security/p5-Net-SSLeay
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+DEPENDS+=	p5-Net-SSLeay>=1.26:../../security/p5-Net-SSLeay
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/IO/Socket/SSL/.packlist
diff --git a/security/p5-Net-SSLeay/Makefile b/security/p5-Net-SSLeay/Makefile
index 1cd3e28d8e0..abf728bc226 100644
--- a/security/p5-Net-SSLeay/Makefile
+++ b/security/p5-Net-SSLeay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/10/01 15:12:12 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2006/11/05 17:35:59 joerg Exp $
 
 DISTNAME=	Net_SSLeay.pm-1.30
 PKGNAME=	p5-${DISTNAME:S/Net_/Net-/:S/.pm//}
@@ -10,6 +10,7 @@ MAINTAINER=	shell@NetBSD.org
 COMMENT=	Perl5 module for using OpenSSL
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/Net/SSLeay/.packlist
 MAKE_PARAMS=		${SSLBASE}
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index f3337666270..b9525510257 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/09/16 12:20:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2006/11/05 17:37:55 joerg Exp $
 #
 
 DISTNAME=	libgtkhtml-2.6.3
@@ -11,6 +11,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Lightweight HTML rendering GTK2 widget
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		yes
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 0630626ff95..90e8c231a09 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2006/10/10 00:24:54 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.72 2006/11/05 17:37:55 joerg Exp $
 
 DISTNAME=		w3c-libwww-5.4.0
 PKGNAME=		libwww-5.4.0
@@ -14,6 +14,7 @@ HOMEPAGE=		http://www.w3.org/Library/
 COMMENT=		The W3C Reference Library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 SITES.libwww-configure-5.4.0nb1.gz=	${MASTER_SITE_LOCAL}
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index aef9cb0addb..3bf75e3700d 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2006/10/09 01:53:06 rillig Exp $
+# $NetBSD: Makefile,v 1.93 2006/11/05 17:37:55 joerg Exp $
 
 #
 # NOTE: Please do not enable the lynxcgi feature unless it is lynx
@@ -26,6 +26,7 @@ HOMEPAGE=	http://lynx.isc.org/
 COMMENT=	Alphanumeric display oriented World-Wide Web Client
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 DIST_SUBDIR=		lynx
 WRKSRC=			${WRKDIR}/${DISTNAME:S/./-/g}
@@ -78,10 +79,10 @@ CONFIGURE_ARGS+=	--enable-read-eta
 .include "../../security/openssl/buildlink3.mk"
 
 post-install:
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx
-	${FIND} ${PREFIX}/share/lynx -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/lynx
+	${FIND} ${DESTDIR}${PREFIX}/share/lynx -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	# gets created when applying 2.8.5.2 patch -- remove on
 	# patchless update
-	${RM} -f ${PREFIX}/share/lynx/lynx_doc/CHANGES.orig_dist
+	${RM} -f ${DESTDIR}${PREFIX}/share/lynx/lynx_doc/CHANGES.orig_dist
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.pkg.mk"
\ No newline at end of file
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index 0cfaf446706..98fd0a030e8 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2006/05/29 16:58:18 drochner Exp $
+$NetBSD: distinfo,v 1.21 2006/11/05 17:37:55 joerg Exp $
 
 SHA1 (lynx/lynx2.8.5.tar.bz2) = c70866f67c1365b55e0c9c0c569190f5919d28d4
 RMD160 (lynx/lynx2.8.5.tar.bz2) = 80d20261ac6eaebe1d940fb5de485daaad7bb3b7
@@ -18,7 +18,7 @@ Size (lynx/2.8.5rel.5.patch.gz) = 2117 bytes
 SHA1 (patch-aa) = ac17101b5dfa296298f1fcd58e8b14673c2855bb
 SHA1 (patch-ab) = 2cc647d06d97127546bf2511fbfac6a5eef67d07
 SHA1 (patch-ae) = 5dff036d9fc35dca528acb530f779dce4a98cddd
-SHA1 (patch-af) = 819cdfae5e8181423f5be68cc202a6e074560e75
+SHA1 (patch-af) = 852c574bc5600604b0b04b9f345dd0352d27b545
 SHA1 (patch-ag) = 93d1ff507f8533e54a45f50d0310d2bb8017f1d2
 SHA1 (patch-ba) = 14aa7dd1026127753f6f8e5bf18bcf83a7a246fc
 SHA1 (patch-bb) = 33ebf1ad1f7471ec5afba8b436b7fdc2214ac6d7
diff --git a/www/lynx/patches/patch-af b/www/lynx/patches/patch-af
index 0ee1607d35c..37aaef3108b 100644
--- a/www/lynx/patches/patch-af
+++ b/www/lynx/patches/patch-af
@@ -1,7 +1,18 @@
-$NetBSD: patch-af,v 1.1 2004/03/11 22:10:48 ben Exp $
+$NetBSD: patch-af,v 1.2 2006/11/05 17:37:55 joerg Exp $
 
---- po/makefile.inn.orig	2004-01-28 11:30:38.000000000 -0800
+--- po/makefile.inn.orig	2004-01-28 19:30:38.000000000 +0000
 +++ po/makefile.inn
+@@ -21,8 +21,8 @@ DESTDIR= @DESTDIR@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @NLS_DATADIR@
+-localedir = $(DESTDIR)$(datadir)/locale
+-gnulocaledir = $(DESTDIR)$(prefix)/share/locale
++localedir = /usr/pkg/share/locale
++gnulocaledir = /usr/pkg/share/locale
+ gettextsrcdir = $(DESTDIR)$(prefix)/share/gettext/po
+ subdir = po
+ 
 @@ -71,6 +71,11 @@ INSTOBJEXT = @INSTOBJEXT@
  	$(MSGFMT) -o $@ $<
  
@@ -14,3 +25,24 @@ $NetBSD: patch-af,v 1.1 2004/03/11 22:10:48 ben Exp $
  	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
  	  && rm -f $$file && $(GMSGFMT) -o $$file $<
  
+@@ -113,16 +118,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)/mkdirs.sh $(datadir); \
++	  $(SHELL) $(top_srcdir)/mkdirs.sh $(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/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index 4d8b11d0b58..cd829bc16f9 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/07/19 22:46:24 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/11/05 17:37:55 joerg Exp $
 #
 
 DISTNAME=		HTML-Parser-3.54
@@ -11,14 +11,15 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/HTML-Parser/
 COMMENT=		Perl5 module to parse HTML text documents
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-HTML-Tagset>=3.0:../../www/p5-HTML-Tagset
 DEPENDS+=		p5-URI-[0-9]*:../../www/p5-URI
 # needed for HTTP/Headers self-test, but this would create a circular
 # dependency -- weird.
 #DEPENDS+=		p5-libwww-[0-9]*:../../www/p5-libwww
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 PERL5_PACKLIST=		auto/HTML/Parser/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-HTML-Tagset/Makefile b/www/p5-HTML-Tagset/Makefile
index a21fe6be4f9..99d5999f842 100644
--- a/www/p5-HTML-Tagset/Makefile
+++ b/www/p5-HTML-Tagset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/11/05 17:37:55 joerg Exp $
 #
 
 DISTNAME=		HTML-Tagset-3.10
@@ -12,6 +12,7 @@ HOMEPAGE=		http://search.cpan.org/dist/HTML-Tagset/
 COMMENT=		Perl5 module of data tables useful in parsing HTML
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/HTML/Tagset/.packlist
diff --git a/www/p5-URI/Makefile b/www/p5-URI/Makefile
index 7a84410cbde..802734f787f 100644
--- a/www/p5-URI/Makefile
+++ b/www/p5-URI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:13 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2006/11/05 17:37:55 joerg Exp $
 #
 
 DISTNAME=	URI-1.35
@@ -12,12 +12,13 @@ MAINTAINER=	heinz@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/URI/
 COMMENT=	Perl5 Uniform Resource Identifiers class (URI, RFC 2396)
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DEPENDS+=	p5-MIME-Base64>=2.12:../../converters/p5-MIME-Base64
 
 CONFLICTS+=	p5-libwww-5.36	# URI used to be part of that package
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/URI/.packlist
 
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 38115e1c0a3..9e446f9e095 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/08/15 12:10:52 abs Exp $
+# $NetBSD: Makefile,v 1.46 2006/11/05 17:37:55 joerg Exp $
 
 DISTNAME=	libwww-perl-5.805
 PKGNAME=	p5-${DISTNAME:S/-perl-/-/}
@@ -11,6 +11,9 @@ MAINTAINER=	shell@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/libwww-perl/
 COMMENT=	Perl5 library for WWW access
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 DEPENDS+=	p5-Crypt-SSLeay>=0:../../security/p5-Crypt-SSLeay
 DEPENDS+=	p5-HTML-Parser>=3.33:../../www/p5-HTML-Parser
@@ -20,8 +23,6 @@ DEPENDS+=	p5-Net>=1.09:../../net/p5-Net		# for Net::FTP>=2.58
 DEPENDS+=	p5-URI>=1.10:../../www/p5-URI
 DEPENDS+= 	p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 PERL5_PACKLIST=		auto/LWP/.packlist
 MAKE_PARAMS=		-n