Add user-destdir installation support.

5 files changed, 70 insertions, 2 deletions

diff --git a/www/w3/Makefile b/www/w3/Makefile
index b24f6b6ce50..7dd1673febd 100644
--- a/www/w3/Makefile
+++ b/www/w3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/10/11 09:31:58 uebayasi Exp $
+# $NetBSD: Makefile,v 1.26 2011/03/31 13:25:56 obache Exp $
 
 DISTNAME=	w3-4.0pre.47
 PKGNAME=	${EMACS_PKGNAME_PREFIX}w3-4.0b47
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/w3/
 COMMENT=	World Wide Web browser for Emacs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # included in xemacs-packages
 # emacs22 doesn't work
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20
diff --git a/www/w3/distinfo b/www/w3/distinfo
index ceee6d53857..6ad723bfbcf 100644
--- a/www/w3/distinfo
+++ b/www/w3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:08:39 wiz Exp $
+$NetBSD: distinfo,v 1.5 2011/03/31 13:25:56 obache Exp $
 
 SHA1 (w3-4.0pre.47.tar.gz) = 51cce63a0507fc5dd3486674c678f24067d6611d
 RMD160 (w3-4.0pre.47.tar.gz) = 4d7f7ada9704299b61c2b8925fc651cfa2c7d90f
@@ -6,3 +6,6 @@ Size (w3-4.0pre.47.tar.gz) = 503062 bytes
 SHA1 (patch-aa) = 3b02015ed680630dbceb0e20e2f24850893beabd
 SHA1 (patch-ab) = 1a805be496d385152388ae9b00ad2ffa9f8fdb53
 SHA1 (patch-ac) = 7edc0023e3ad88a126a6ea39955e246da6101f76
+SHA1 (patch-etc_Makefile.in) = a4f4998b66662bd6079b04ae57f8b72264312ef1
+SHA1 (patch-lisp_Makefile.in) = 2aa79a7399daca4589322a43ef70a83e49817e86
+SHA1 (patch-texi_Makefile.in) = 528c07c13f35f09266073ad7c8db8edc0f1a143c
diff --git a/www/w3/patches/patch-etc_Makefile.in b/www/w3/patches/patch-etc_Makefile.in
new file mode 100644
index 00000000000..5bba25e28f0
--- /dev/null
+++ b/www/w3/patches/patch-etc_Makefile.in
@@ -0,0 +1,22 @@
+$NetBSD: patch-etc_Makefile.in,v 1.1 2011/03/31 13:25:57 obache Exp $
+
+* staged installation support.
+
+--- etc/Makefile.in.orig	2001-11-28 20:04:22.000000000 +0000
++++ etc/Makefile.in
+@@ -12,12 +12,12 @@ TARGETS = default.css
+ all:
+ 
+ install:
+-	( if [ ! -d $(datadir) ]; then mkdir -p $(datadir); fi )
++	( if [ ! -d $(DESTDIR)$(datadir) ]; then mkdir -p $(DESTDIR)$(datadir); fi )
+ 	for x in $(TARGETS); do					\
+ 		if [ -f $$x ]; then				\
+-			$(INSTALL) $$x $(datadir);		\
++			$(INSTALL) $$x $(DESTDIR)$(datadir);	\
+ 		else						\
+-			$(INSTALL) $(srcdir)/$$x $(datadir);	\
++			$(INSTALL) $(srcdir)/$$x $(DESTDIR)$(datadir);	\
+ 		fi						\
+ 	done
+ 
diff --git a/www/w3/patches/patch-lisp_Makefile.in b/www/w3/patches/patch-lisp_Makefile.in
new file mode 100644
index 00000000000..bc54f60c898
--- /dev/null
+++ b/www/w3/patches/patch-lisp_Makefile.in
@@ -0,0 +1,22 @@
+$NetBSD: patch-lisp_Makefile.in,v 1.1 2011/03/31 13:25:57 obache Exp $
+
+* staged installation support.
+
+--- lisp/Makefile.in.orig	2001-11-28 20:04:22.000000000 +0000
++++ lisp/Makefile.in
+@@ -92,12 +92,12 @@ autoloads:
+ 
+ install: all
+ 	@echo Installing in $(lispdir)
+-	( if [ ! -d $(lispdir) ]; then mkdir -p $(lispdir); fi )
++	( if [ ! -d $(DESTDIR)$(lispdir) ]; then mkdir -p $(DESTDIR)$(lispdir); fi )
+ 	for x in $(ALLSOURCES) $(EXTRAS) $(ALLOBJECTS); do		\
+ 		if [ -f $$x ]; then					\
+-			$(INSTALL) -m 644 $$x $(lispdir);		\
++			$(INSTALL) -m 644 $$x $(DESTDIR)$(lispdir);	\
+ 		else							\
+-			$(INSTALL) -m 644 $(srcdir)/$$x $(lispdir);	\
++			$(INSTALL) -m 644 $(srcdir)/$$x $(DESTDIR)$(lispdir);	\
+ 		fi							\
+ 	done;
+ 
diff --git a/www/w3/patches/patch-texi_Makefile.in b/www/w3/patches/patch-texi_Makefile.in
new file mode 100644
index 00000000000..21d4abeae2f
--- /dev/null
+++ b/www/w3/patches/patch-texi_Makefile.in
@@ -0,0 +1,19 @@
+$NetBSD: patch-texi_Makefile.in,v 1.1 2011/03/31 13:25:57 obache Exp $
+
+* staged installation support.
+
+--- texi/Makefile.in.orig	2001-11-28 20:04:22.000000000 +0000
++++ texi/Makefile.in
+@@ -39,9 +39,9 @@ MANUALS=w3.txi w3-faq.txi
+ all: info dvi
+ 
+ install:
+-	( if [ ! -d $(infodir) ]; then mkdir -p $(infodir); fi )
+-	for x in *.info*; do $(INSTALL) $$x $(infodir); done
+-	-for x in *.info; do $(INSTALLINFO) $$x $(infodir)/dir; done
++	( if [ ! -d $(DESTDIR)$(infodir) ]; then mkdir -p $(DESTDIR)$(infodir); fi )
++	for x in *.info*; do $(INSTALL) $$x $(DESTDIR)$(infodir); done
++	-for x in *.info; do $(INSTALLINFO) $$x $(DESTDIR)$(infodir)/dir; done
+ 
+ distclean: clean
+ 	$(RM) Makefile