Add user-destdir installation support.

6 files changed, 97 insertions, 5 deletions

diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index fdcc4a42c97..63ff33d7027 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2010/03/17 15:34:15 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2011/03/05 09:14:23 obache Exp $
 #
 
 DISTNAME=	gdb-5.3
@@ -12,6 +12,8 @@ COMMENT=	Symbolic debugger for multiple language frontends
 
 NOT_FOR_PLATFORM=	Darwin-*-* DragonFly-*-* NetBSD-*-x86_64
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BROKEN_GETTEXT_DETECTION=	yes
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/devel/gdb/distinfo b/devel/gdb/distinfo
index eb3eb76e551..253c562026f 100644
--- a/devel/gdb/distinfo
+++ b/devel/gdb/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2008/01/06 19:25:09 rillig Exp $
+$NetBSD: distinfo,v 1.13 2011/03/05 09:14:23 obache Exp $
 
 SHA1 (gdb-5.3.tar.gz) = 24a6c9da6e89b1b82b7508f27f94098d989ff662
 RMD160 (gdb-5.3.tar.gz) = 3f88dc11115de08708c50c73b10acaf00ed25e96
 Size (gdb-5.3.tar.gz) = 14707600 bytes
-SHA1 (patch-aa) = 8d3f7748c645b520488ee5499eb81a1e0a82593c
+SHA1 (patch-aa) = 03b55af0a826f107143ca4846000084739f7c453
 SHA1 (patch-ab) = 56fe49b2f0b6a99053f48d6cf0df91c78ae24a92
 SHA1 (patch-ac) = 681168205196ad6451674f703fcf9148b673d4de
 SHA1 (patch-ad) = f831cd919d75ba8ab76c1f90b47ee443615397f8
@@ -21,4 +21,9 @@ SHA1 (patch-ao) = 7a38b55945cf6d9fc422e460d67b88a1e4416e62
 SHA1 (patch-ap) = e79d8a70d12098716791e3349d8606d07f8acd47
 SHA1 (patch-aq) = f7c356f7c500b84feb141ba693390378e5f71642
 SHA1 (patch-as) = 77a2f8eb5e1f076cba915c80113cfe5bf617efaf
+SHA1 (patch-bfd_po_Make-in) = 9e09652c95dbea0d7017102546c4e959abc199da
+SHA1 (patch-gdb_Makefile.in) = 229c14522ddf8f5ddfdd414d77be1ddefc5635db
+SHA1 (patch-gdb_doc_Makefile.in) = 44f1fc8db2f37dae1ba0db3ae1192ec8ef47f4a3
+SHA1 (patch-mmalloc_Makefile.in) = 1c45f0b326b838d442979e4ada45c0e5fc2da1c5
 SHA1 (patch-ob) = 52c017dfa9f535edc9520144efa8ef04a8020832
+SHA1 (patch-opcodes_po_Make-in) = c4f9d3d19a52acab6c18454b1ff95c9e1302c5bf
diff --git a/devel/gdb/patches/patch-aa b/devel/gdb/patches/patch-aa
index a6320c0d7e5..57465132604 100644
--- a/devel/gdb/patches/patch-aa
+++ b/devel/gdb/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2003/03/10 23:50:49 seb Exp $
+$NetBSD: patch-aa,v 1.4 2011/03/05 09:14:24 obache Exp $
 
 --- Makefile.in.orig	2002-12-10 21:30:40.000000000 +0000
 +++ Makefile.in
@@ -17,7 +17,15 @@ $NetBSD: patch-aa,v 1.3 2003/03/10 23:50:49 seb Exp $
  
  INSTALL_DOSREL = install-dosrel-fake
  
-@@ -707,7 +707,6 @@ INSTALL_MODULES = \
+@@ -372,6 +372,7 @@ BASE_FLAGS_TO_PASS = \
+ 	"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
+ 	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
+ 	"DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
++	"DESTDIR=$(DESTDIR)" \
+ 	"INSTALL=$(INSTALL)" \
+ 	"INSTALL_DATA=$(INSTALL_DATA)" \
+ 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+@@ -707,7 +708,6 @@ INSTALL_MODULES = \
  	install-perl \
  	install-prms \
  	install-rcs \
diff --git a/devel/gdb/patches/patch-gdb_Makefile.in b/devel/gdb/patches/patch-gdb_Makefile.in
new file mode 100644
index 00000000000..baf1080f403
--- /dev/null
+++ b/devel/gdb/patches/patch-gdb_Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-gdb_Makefile.in,v 1.1 2011/03/05 09:14:24 obache Exp $
+
+* destdir installation support.
+
+--- gdb/Makefile.in.orig	2002-11-25 22:05:38.000000000 +0000
++++ gdb/Makefile.in
+@@ -437,6 +437,7 @@ FLAGS_TO_PASS = \
+ 	"CXX=$(CXX)" \
+ 	"CXXFLAGS=$(CXXFLAGS)" \
+ 	"DLLTOOL=$(DLLTOOL)" \
++	"DESTDIR=$(DESTDIR)" \
+ 	"RANLIB=$(RANLIB)" \
+ 	"MAKEINFO=$(MAKEINFO)" \
+ 	"MAKEHTML=$(MAKEHTML)" \
+@@ -909,7 +910,7 @@ install-only: $(CONFIG_INSTALL)
+ 		else \
+ 		  true ; \
+ 		fi ; \
+-		$(srcdir)/../mkinstalldirs $(bindir) ; \
++		$(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) ; \
+ 		$(INSTALL_PROGRAM) gdb$(EXEEXT) \
+ 			$(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \
+ 		$(srcdir)/../mkinstalldirs \
diff --git a/devel/gdb/patches/patch-gdb_doc_Makefile.in b/devel/gdb/patches/patch-gdb_doc_Makefile.in
new file mode 100644
index 00000000000..ef02fa47e39
--- /dev/null
+++ b/devel/gdb/patches/patch-gdb_doc_Makefile.in
@@ -0,0 +1,35 @@
+$NetBSD: patch-gdb_doc_Makefile.in,v 1.1 2011/03/05 09:14:24 obache Exp $
+
+* destdir installation support.
+
+--- gdb/doc/Makefile.in.orig	2002-11-26 22:43:57.000000000 +0000
++++ gdb/doc/Makefile.in
+@@ -145,14 +145,14 @@ all-doc: info dvi ps # pdf
+ diststuff: info
+ 
+ install-info: $(INFO_DEPS)
+-	$(SHELL) $(srcdir)/../../mkinstalldirs $(infodir)
++	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(infodir)
+ 	@list='$(INFO_DEPS)'; \
+ 	for file in $$list; do \
+ 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+ 	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+ 	    if test -f $$d/$$ifile; then \
+-	      echo " $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile"; \
+-	      $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
++	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
++	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+ 	    else : ; fi; \
+ 	  done; \
+ 	done
+@@ -160,8 +160,8 @@ install-info: $(INFO_DEPS)
+ 	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+ 	  list='$(INFO_DEPS)'; \
+ 	  for file in $$list; do \
+-	    echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
+-	    install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
++	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
++	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+ 	  done; \
+ 	else : ; fi
+ 
diff --git a/devel/gdb/patches/patch-mmalloc_Makefile.in b/devel/gdb/patches/patch-mmalloc_Makefile.in
new file mode 100644
index 00000000000..366c08fa396
--- /dev/null
+++ b/devel/gdb/patches/patch-mmalloc_Makefile.in
@@ -0,0 +1,19 @@
+$NetBSD: patch-mmalloc_Makefile.in,v 1.1 2011/03/05 09:14:24 obache Exp $
+
+* destdir installation support.
+
+--- mmalloc/Makefile.in.orig	2002-11-28 16:48:37.000000000 +0000
++++ mmalloc/Makefile.in
+@@ -156,9 +156,9 @@ check: test1.c
+ #	./a.out
+ 
+ install:	all install-info
+-		$(INSTALL_DATA) $(TARGETLIB) $(libdir)/$(TARGETLIB)n
+-		$(RANLIB) $(libdir)/$(TARGETLIB)n
+-		mv -f $(libdir)/$(TARGETLIB)n $(libdir)/$(TARGETLIB)
++		$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(TARGETLIB)n
++		$(RANLIB) $(DESTDIR)$(libdir)/$(TARGETLIB)n
++		mv -f $(DESTDIR)$(libdir)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(TARGETLIB)
+ 
+ uninstall:	uninstall-info
+