Support staged installation.

8 files changed, 117 insertions, 23 deletions

diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index 8bb28b4abb7..dfde143f341 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/12/03 13:06:55 asau Exp $
+# $NetBSD: Makefile,v 1.33 2009/12/11 02:11:52 asau Exp $
 
 DISTNAME=		xmgr-4.1.2
 PKGREVISION=		5
@@ -12,6 +12,8 @@ COMMENT=		Powerful XY plotting tool for workstations or X-terminals using X
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=		YES
 USE_LANGUAGES=		c fortran
 GNU_CONFIGURE=		YES
diff --git a/math/xmgr/distinfo b/math/xmgr/distinfo
index ef8500f0346..3f41196ee17 100644
--- a/math/xmgr/distinfo
+++ b/math/xmgr/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 12:06:58 agc Exp $
+$NetBSD: distinfo,v 1.4 2009/12/11 02:11:52 asau Exp $
 
 SHA1 (xmgr-4.1.2.tar.gz) = 7e679de2d48ca0de8dcb0435910df3f3d7a2c2ac
 RMD160 (xmgr-4.1.2.tar.gz) = 5f8b08b5e2cea0ca4e2c8b9d7d590f7bdb93a4ee
 Size (xmgr-4.1.2.tar.gz) = 881991 bytes
 SHA1 (patch-aa) = 04a521046a0c4877653e17a6966e6ea0737ba2b7
 SHA1 (patch-ab) = 60660554d658b62a454b36f732501864ddf01220
-SHA1 (patch-ac) = 41865e62f6df4545ced553e590526232e6a588f0
-SHA1 (patch-ad) = 333f927850fe9b7f38df114110d4f5d116384362
-SHA1 (patch-ae) = 7d68e2e8aba835ddb89229c41a4dc3ff4564e193
+SHA1 (patch-ac) = 6390bfee967129660513fa5dcf5c718424ea0845
+SHA1 (patch-ad) = 5aaa50b8bfa85eb5051ebc90fa23d67d47dd79ad
+SHA1 (patch-ae) = 4683a44f85f3f2ee7f8d1cd273d0601bce91e625
 SHA1 (patch-af) = 385c1fdd8861135b38b10b88956a3bc04b0c59a3
+SHA1 (patch-ag) = 545209ad9dd7a3b15f8b32caff494d03d611e757
+SHA1 (patch-ah) = b63f5a40aaf1ce70c65fc4576414bbbafef7a561
+SHA1 (patch-ai) = 8a1e5d1d29197502e54274a4622c997a08825709
diff --git a/math/xmgr/patches/patch-ac b/math/xmgr/patches/patch-ac
index 04bb992874e..0a29e32c567 100644
--- a/math/xmgr/patches/patch-ac
+++ b/math/xmgr/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/02/10 12:54:27 frueauf Exp $
+$NetBSD: patch-ac,v 1.2 2009/12/11 02:11:52 asau Exp $
 
---- examples/Makefile.orig	Fri Nov 28 01:00:16 1997
-+++ examples/Makefile	Tue Feb  9 15:23:34 1999
+--- examples/Makefile.orig	1997-11-28 03:00:16.000000000 +0300
++++ examples/Makefile	2009-12-11 05:02:39.000000000 +0300
 @@ -30,9 +30,9 @@
  devclean : dummy
  
@@ -9,9 +9,9 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/02/10 12:54:27 frueauf Exp $
 -	$(MKINSTALLDIRS) $(GR_HOME)/examples
 -	for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GR_HOME)/examples; done
 -	$(INSTALL_PROGRAM) $(DOTEST) $(GR_HOME)/examples/$(DOTEST)
-+	${MKINSTALLDIRS} ${PREFIX}/share/examples/${ACEGR}
-+	for i in $(EXAMPLES); do $(INSTALL_DATA) $$i ${PREFIX}/share/examples/${ACEGR}; done
-+	${INSTALL_SCRIPT} ${DOTEST} ${PREFIX}/share/examples/${ACEGR}/${DOTEST}
++	$(MKINSTALLDIRS) $(DESTDIR)$(PREFIX)/share/examples/$(ACEGR)
++	for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)$(PREFIX)/share/examples/$(ACEGR); done
++	$(INSTALL_SCRIPT) $(DOTEST) $(DESTDIR)$(PREFIX)/share/examples/$(ACEGR)/$(DOTEST)
  
  links : dummy
  
diff --git a/math/xmgr/patches/patch-ad b/math/xmgr/patches/patch-ad
index e1a2aabc98b..5b69b447fff 100644
--- a/math/xmgr/patches/patch-ad
+++ b/math/xmgr/patches/patch-ad
@@ -1,17 +1,24 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/02/10 12:54:27 frueauf Exp $
+$NetBSD: patch-ad,v 1.2 2009/12/11 02:11:52 asau Exp $
 
---- auxiliary/Makefile.orig	Fri Nov 28 01:00:55 1997
-+++ auxiliary/Makefile	Tue Feb  9 15:43:21 1999
-@@ -20,9 +20,9 @@
+--- auxiliary/Makefile.orig	1997-11-28 03:00:55.000000000 +0300
++++ auxiliary/Makefile	2009-12-11 05:05:17.000000000 +0300
+@@ -20,14 +20,14 @@
  devclean : dummy
  
  install : $(AUXILIARIES) fdf2fit
 -	$(MKINSTALLDIRS) $(GR_HOME)/auxiliary
 -	for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(GR_HOME)/auxiliary; done
 -	$(INSTALL_PROGRAM) fdf2fit $(GR_HOME)/auxiliary
-+	${MKINSTALLDIRS} ${PREFIX}/share/${ACEGR}
-+	for i in ${AUXILIARIES}; do ${INSTALL_DATA} $$i ${PREFIX}/share/${ACEGR}; done
-+	${INSTALL_SCRIPT} fdf2fit ${PREFIX}/bin
++	$(MKINSTALLDIRS) $(DESTDIR)$(PREFIX)/share/$(ACEGR)
++	for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(DESTDIR)$(PREFIX)/share/$(ACEGR); done
++	$(INSTALL_SCRIPT) fdf2fit $(DESTDIR)$(PREFIX)/bin
  
  tests : dummy
  
+ links : fdf2fit
+-	$(MKINSTALLDIRS) $(PREFIX)/bin
+-	cd $(PREFIX)/bin; $(RM) fdf2fit; $(LN_S) $(GR_HOME)/auxiliary/fdf2fit fdf2fit
++	$(MKINSTALLDIRS) $(DESTDIR)$(PREFIX)/bin
++	cd $(DESTDIR)$(PREFIX)/bin; $(RM) fdf2fit; $(LN_S) $(DESTDIR)$(GR_HOME)/auxiliary/fdf2fit fdf2fit
+ 
+ dummy :
diff --git a/math/xmgr/patches/patch-ae b/math/xmgr/patches/patch-ae
index 75c4783327b..66f41f15164 100644
--- a/math/xmgr/patches/patch-ae
+++ b/math/xmgr/patches/patch-ae
@@ -1,15 +1,15 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/02/10 12:54:27 frueauf Exp $
+$NetBSD: patch-ae,v 1.2 2009/12/11 02:11:52 asau Exp $
 
---- doc/Makefile.orig	Mon Dec  1 01:33:13 1997
-+++ doc/Makefile	Tue Feb  9 15:21:16 1999
+--- doc/Makefile.orig	1997-12-01 03:33:13.000000000 +0300
++++ doc/Makefile	2009-12-11 04:57:10.000000000 +0300
 @@ -25,8 +25,8 @@
  devclean : dummy
  
  install : $(DOCS)
 -	$(MKINSTALLDIRS) $(GR_HOME)/doc
 -	for i in $(DOCS); do $(INSTALL_DATA) $$i $(GR_HOME)/doc; done
-+	$(MKINSTALLDIRS) ${PREFIX}/share/doc/${ACEGR}
-+	for i in $(DOCS); do $(INSTALL_DATA) $$i ${PREFIX}/share/doc/${ACEGR}; done
++	$(MKINSTALLDIRS) $(DESTDIR)$(PREFIX)/share/doc/$(ACEGR)
++	for i in $(DOCS); do $(INSTALL_DATA) $$i $(DESTDIR)$(PREFIX)/share/doc/$(ACEGR); done
  
  links : dummy
  
diff --git a/math/xmgr/patches/patch-ag b/math/xmgr/patches/patch-ag
new file mode 100644
index 00000000000..e112c7248e1
--- /dev/null
+++ b/math/xmgr/patches/patch-ag
@@ -0,0 +1,27 @@
+$NetBSD: patch-ag,v 1.1 2009/12/11 02:11:52 asau Exp $
+
+--- src/Makefile.orig	1998-05-12 16:14:53.000000000 +0400
++++ src/Makefile	2009-12-11 04:45:59.000000000 +0300
+@@ -40,16 +40,16 @@
+ 	mv y.tab.c $@
+ 
+ install : $(ACEGR)
+-	$(MKINSTALLDIRS) $(GR_HOME)/bin
+-	$(INSTALL_PROGRAM) -s $(ACEGR) $(GR_HOME)/bin/$(ACEGR)
+-	cd $(GR_HOME)/bin; $(RM) $(GRBATCH); $(LN_S) $(ACEGR) $(GRBATCH)
++	$(MKINSTALLDIRS) $(DESTDIR)$(GR_HOME)/bin
++	$(INSTALL_PROGRAM) -s $(ACEGR) $(DESTDIR)$(GR_HOME)/bin/$(ACEGR)
++	cd $(DESTDIR)$(GR_HOME)/bin; $(RM) $(GRBATCH); $(LN_S) $(ACEGR) $(GRBATCH)
+ 
+ tests : dummy
+ 
+ links : $(ACEGR)
+-	$(MKINSTALLDIRS) $(PREFIX)/bin
+-	cd $(PREFIX)/bin; $(RM) $(ACEGR); $(LN_S) $(GR_HOME)/bin/$(ACEGR) $(ACEGR)
+-	cd $(PREFIX)/bin; $(RM) $(GRBATCH); $(LN_S) $(GR_HOME)/bin/$(ACEGR) $(GRBATCH)
++	$(MKINSTALLDIRS) $(DESTDIR)$(PREFIX)/bin
++	cd $(DESTDIR)$(PREFIX)/bin; $(RM) $(ACEGR); $(LN_S) $(DESTDIR)$(GR_HOME)/bin/$(ACEGR) $(ACEGR)
++	cd $(DESTDIR)$(PREFIX)/bin; $(RM) $(GRBATCH); $(LN_S) $(DESTDIR)$(GR_HOME)/bin/$(ACEGR) $(GRBATCH)
+ 
+ clean : 
+ 	$(RM) $(GROBJS) $(GUIOBJS)
diff --git a/math/xmgr/patches/patch-ah b/math/xmgr/patches/patch-ah
new file mode 100644
index 00000000000..2d5e860ac4a
--- /dev/null
+++ b/math/xmgr/patches/patch-ah
@@ -0,0 +1,29 @@
+$NetBSD: patch-ah,v 1.1 2009/12/11 02:11:52 asau Exp $
+
+--- acegr_np/Makefile.orig	1998-03-11 00:51:35.000000000 +0300
++++ acegr_np/Makefile	2009-12-11 04:51:03.000000000 +0300
+@@ -43,16 +43,16 @@
+ testf_np$(O) : $(LIB)
+ 
+ install : $(LIB)
+-	$(MKINSTALLDIRS) $(GR_HOME)/lib
+-	$(INSTALL_DATA) $(LIB) $(GR_HOME)/lib/$(LIB)
+-	$(MKINSTALLDIRS) $(GR_HOME)/include
+-	$(INSTALL_DATA) acegr_np.h $(GR_HOME)/include/acegr_np.h
++	$(MKINSTALLDIRS) $(DESTDIR)$(GR_HOME)/lib
++	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(GR_HOME)/lib/$(LIB)
++	$(MKINSTALLDIRS) $(DESTDIR)$(GR_HOME)/include
++	$(INSTALL_DATA) acegr_np.h $(DESTDIR)$(GR_HOME)/include/acegr_np.h
+ 
+ links : $(LIB)
+-	$(MKINSTALLDIRS) $(PREFIX)/lib
+-	cd $(PREFIX)/lib; $(RM) $(LIB); $(LN_S) $(GR_HOME)/lib/$(LIB) $(LIB)
+-	$(MKINSTALLDIRS) $(PREFIX)/include
+-	cd $(PREFIX)/include; $(RM) acegr_np.h; $(LN_S) $(GR_HOME)/include/acegr_np.h acegr_np.h
++	$(MKINSTALLDIRS) $(DESTDIR)$(PREFIX)/lib
++	cd $(DESTDIR)$(PREFIX)/lib; $(RM) $(LIB); $(LN_S) $(GR_HOME)/lib/$(LIB) $(LIB)
++	$(MKINSTALLDIRS) $(DESTDIR)$(PREFIX)/include
++	cd $(DESTDIR)$(PREFIX)/include; $(RM) acegr_np.h; $(LN_S) $(GR_HOME)/include/acegr_np.h acegr_np.h
+ 	
+ clean :
+ 	$(RM) *.o sample.gr $(TESTS)
diff --git a/math/xmgr/patches/patch-ai b/math/xmgr/patches/patch-ai
new file mode 100644
index 00000000000..2344c7d8db1
--- /dev/null
+++ b/math/xmgr/patches/patch-ai
@@ -0,0 +1,26 @@
+$NetBSD: patch-ai,v 1.1 2009/12/11 02:11:52 asau Exp $
+
+--- grconvert/Makefile.orig	1998-03-02 03:04:46.000000000 +0300
++++ grconvert/Makefile	2009-12-11 04:53:08.000000000 +0300
+@@ -30,8 +30,8 @@
+ tests : dummy
+ 
+ links : $(PROG)
+-	$(MKINSTALLDIRS) $(PREFIX)/bin
+-	cd $(PREFIX)/bin; $(RM) $(PROG); $(LN_S) $(GR_HOME)/bin/$(PROG) $(PROG)
++	$(MKINSTALLDIRS) $(DESTDIR)$(PREFIX)/bin
++	cd $(DESTDIR)$(PREFIX)/bin; $(RM) $(PROG); $(LN_S) $(DESTDIR)$(GR_HOME)/bin/$(PROG) $(PROG)
+ clean :
+ 	$(RM) $(OBJS) 
+ 
+@@ -42,8 +42,8 @@
+ 	$(RM) $(PROG) $(OBJS)
+ 
+ install : $(PROG)
+-	$(MKINSTALLDIRS) $(GR_HOME)/bin
+-	$(INSTALL_PROGRAM) -s $(PROG) $(GR_HOME)/bin/$(PROG)
++	$(MKINSTALLDIRS) $(DESTDIR)$(GR_HOME)/bin
++	$(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(GR_HOME)/bin/$(PROG)
+ 
+ dummy :
+