DESTDIR support.

9 files changed, 61 insertions, 21 deletions

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