Add user-destdir installation support.

4 files changed, 87 insertions, 2 deletions

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
+