Support staged installation.

3 files changed, 65 insertions, 35 deletions

diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index ed806e5b647..d0fdb0b5002 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2010/07/30 10:36:31 asau Exp $
+# $NetBSD: Makefile,v 1.83 2011/04/01 23:50:50 asau Exp $
 #
 
 DISTNAME=	${SCIBASE}-src
@@ -11,6 +11,7 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.scilab.org/
 COMMENT=	High-level scientific math programming environment with graphics
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=	no
 
 SCIBASE=	scilab-4.1
@@ -109,20 +110,20 @@ pre-install:
 # delete some .orig files that got created by patching
 # also fix the libtool link
 post-install:
-	${RM} -f ${PREFIX}/lib/${SCIBASE}/bin/scilink.orig
-	${RM} -f ${PREFIX}/lib/${SCIBASE}/config/Makeso.incl.in.orig
-	${RM} -f ${PREFIX}/lib/${SCIBASE}/macros/util/scipad.sci.orig
-	${RM} -f ${PREFIX}/lib/${SCIBASE}/util/scidem.orig
-	${RM} -f ${PREFIX}/lib/${SCIBASE}/util/scidoc.orig
-	${RM} -f ${PREFIX}/lib/${SCIBASE}/libtool
-	${LN} -s ${LOCALBASE}/bin/libtool ${PREFIX}/lib/${SCIBASE}/libtool
-	${RM} -f ${PREFIX}/lib/${SCIBASE}/bin/dold
-	${RM} -f ${PREFIX}/lib/${SCIBASE}/config/*.subst.sav
-	${RM} -f ${PREFIX}/lib/${SCIBASE}/config/config.guess
-	${RM} -f ${PREFIX}/lib/${SCIBASE}/config/config.sub
+	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/bin/scilink.orig
+	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/config/Makeso.incl.in.orig
+	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/macros/util/scipad.sci.orig
+	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/util/scidem.orig
+	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/util/scidoc.orig
+	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/libtool
+	${LN} -s ${LOCALBASE}/bin/libtool ${DESTDIR}${PREFIX}/lib/${SCIBASE}/libtool
+	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/bin/dold
+	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/config/*.subst.sav
+	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/config/config.guess
+	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/config/config.sub
 
 .for __tmp__ in scilab.g scilab.g.in scilab-gtk.g scilab-gtk.g.in
-	${RM} -f ${PREFIX}/lib/${SCIBASE}/scripts/${__tmp__}
+	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/scripts/${__tmp__}
 .endfor
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
diff --git a/math/scilab/distinfo b/math/scilab/distinfo
index 11b58586f43..1a173554fc7 100644
--- a/math/scilab/distinfo
+++ b/math/scilab/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2008/11/15 01:19:08 dmcmahill Exp $
+$NetBSD: distinfo,v 1.27 2011/04/01 23:50:50 asau Exp $
 
 SHA1 (scilab-4.1-src.tar.gz) = 7a8381a9a69ce280ae718ee59f4c14001b61f4b7
 RMD160 (scilab-4.1-src.tar.gz) = 6ed27ce7dcfb9231b5f3042cb7b830015d102df7
@@ -22,7 +22,7 @@ SHA1 (patch-ar) = fba20ba23ec78262c6eba1248b662d08e727cada
 SHA1 (patch-at) = a24eedcea09e3fc4530b305561b7a9298a2cb4a3
 SHA1 (patch-au) = 029d77b4358dbf87e9761f85840f93191294a894
 SHA1 (patch-av) = da0565e94302d79a494fb099b5b5d7c251937c94
-SHA1 (patch-aw) = 2ac72cf020562baa454c59182aae3dd1d25167df
+SHA1 (patch-aw) = 9b707948ae18b443163d22fff4cb56027a4f8892
 SHA1 (patch-ax) = b7e080f0037cc4532100fdf679844724f59d6ba6
 SHA1 (patch-ay) = e521844001d6ed4d560918fac6d026799f2c02a5
 SHA1 (patch-az) = 3b23b82750469e12ea3ee522dfb889c8935df993
diff --git a/math/scilab/patches/patch-aw b/math/scilab/patches/patch-aw
index ee2e32098c4..62412508d02 100644
--- a/math/scilab/patches/patch-aw
+++ b/math/scilab/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.7 2007/03/23 22:08:58 dmcmahill Exp $
+$NetBSD: patch-aw,v 1.8 2011/04/01 23:50:51 asau Exp $
 
---- Makefile.in.orig	2006-12-11 12:41:55.000000000 +0000
-+++ Makefile.in
-@@ -4,7 +4,7 @@ binary:
+--- Makefile.in.orig	2006-12-11 15:41:55.000000000 +0300
++++ Makefile.in	2011-04-02 03:23:57.000000000 +0400
+@@ -4,7 +4,7 @@
  	@if test -f .binary; then \
  		echo "Humm... this is a binary version"; \
  		config/findpath; \
@@ -11,7 +11,7 @@ $NetBSD: patch-aw,v 1.7 2007/03/23 22:08:58 dmcmahill Exp $
  		echo "Installation done"; \
  	else \
  		echo "***************************************"; \
-@@ -103,7 +103,7 @@ manclean:	
+@@ -103,7 +103,7 @@
  	done
  
  tests:
@@ -20,7 +20,7 @@ $NetBSD: patch-aw,v 1.7 2007/03/23 22:08:58 dmcmahill Exp $
  	@echo "  to test the  distribution"
  
  distclean::
-@@ -184,7 +184,7 @@ BINDISTFILES = \
+@@ -184,7 +184,7 @@
  tarbindist:
  	touch .binary
  	@STRIP@ bin/scilex
@@ -29,34 +29,52 @@ $NetBSD: patch-aw,v 1.7 2007/03/23 22:08:58 dmcmahill Exp $
  	cd .. ; tar cvf $(SCIBASE)/$(SCIBASE)-bin.tar $(BINDISTFILES) @PVMINST@ 
  	$(RM) .binary
  
-@@ -263,14 +263,14 @@ DOCNAME=$(SCIBASE)
+@@ -263,44 +263,42 @@
  
  install:
  	@if test `pwd`/..  != $(PREFIX)/lib ; then \
 -		install -d $(PREFIX)/lib/$(SCIBASE); \
-+		$(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib/$(SCIBASE); \
- 		( for file in $(INSTBINDISTFILES) @PVMINST1@; do tar cf - $${file}  | (cd $(PREFIX)/lib/$(SCIBASE); tar xf -); done); \
+-		( for file in $(INSTBINDISTFILES) @PVMINST1@; do tar cf - $${file}  | (cd $(PREFIX)/lib/$(SCIBASE); tar xf -); done); \
 -		(cd $(PREFIX)/lib/$(SCIBASE);touch .binary; make postinstall PREFIX=$(PREFIX) ) \
-+		(cd $(PREFIX)/lib/$(SCIBASE);touch .binary; $(MAKE) postinstall PREFIX=$(PREFIX) ) \
++		$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(PREFIX)/lib/$(SCIBASE); \
++		( for file in $(INSTBINDISTFILES) @PVMINST1@; do tar cf - $${file}  | (cd $(DESTDIR)$(PREFIX)/lib/$(SCIBASE); tar xf -); done); \
++		(cd $(DESTDIR)$(PREFIX)/lib/$(SCIBASE);touch .binary; $(MAKE) postinstall PREFIX=$(PREFIX) ) \
  	fi
 -	install -d $(PREFIX)/share/doc/$(DOCNAME)/
 -	install ACKNOWLEDGEMENTS CHANGES README_Unix Version.incl \
 -		licence.txt license.txt  $(PREFIX)/share/doc/$(DOCNAME)
 -	install -d $(PREFIX)/bin 
-+	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/doc/$(DOCNAME)/
+-	$(RM)  $(PREFIX)/bin/scilab
+-	ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/scilab $(PREFIX)/bin/scilab
+-	$(RM)  $(PREFIX)/bin/intersci
+-	ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/intersci $(PREFIX)/bin/intersci
+-	$(RM)  $(PREFIX)/bin/intersci-n
+-	ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/intersci-n $(PREFIX)/bin/intersci-n
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/doc/$(DOCNAME)/
 +	for f in  ACKNOWLEDGEMENTS CHANGES README_Unix Version.incl licence.txt license.txt  ; do \
-+		$(BSD_INSTALL_DATA) $$f $(PREFIX)/share/doc/$(DOCNAME) ; done
-+	$(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin 
- 	$(RM)  $(PREFIX)/bin/scilab
- 	ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/scilab $(PREFIX)/bin/scilab
- 	$(RM)  $(PREFIX)/bin/intersci
-@@ -287,13 +287,13 @@ DESTDIR=$(PREFIX)/lib
++		$(BSD_INSTALL_DATA) $$f $(DESTDIR)$(PREFIX)/share/doc/$(DOCNAME) ; done
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(PREFIX)/bin 
++	$(RM)  $(DESTDIR)$(PREFIX)/bin/scilab
++	ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/scilab $(DESTDIR)$(PREFIX)/bin/scilab
++	$(RM)  $(DESTDIR)$(PREFIX)/bin/intersci
++	ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/intersci $(DESTDIR)$(PREFIX)/bin/intersci
++	$(RM)  $(DESTDIR)$(PREFIX)/bin/intersci-n
++	ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/intersci-n $(DESTDIR)$(PREFIX)/bin/intersci-n
+ 
+ # DESTDIR is the final destination of the file 
+ # it can be different from $(PREFIX)/lib
+ # when we use package builders for rpm or deb files 
+ 
+-DESTDIR=$(PREFIX)/lib
+-
  postinstall: 
- 	@echo "creating Path.incl SCIDIR=$(DESTDIR)/$(SCIBASE)"
- 	@echo "SCIDIR=$(DESTDIR)/$(SCIBASE)"  > Path.incl
+-	@echo "creating Path.incl SCIDIR=$(DESTDIR)/$(SCIBASE)"
+-	@echo "SCIDIR=$(DESTDIR)/$(SCIBASE)"  > Path.incl
 -	@cd scripts; make
 -	@cd examples ; make distclean > /dev/null
-+	@cd scripts; $(MAKE)
++	@echo "creating Path.incl SCIDIR=$(PREFIX)/lib/$(SCIBASE)"
++	@echo "SCIDIR=$(PREFIX)/lib/$(SCIBASE)"  > Path.incl
++	@cd scripts; $(MAKE) SCILIB=$(PREFIX)/lib
 +	@cd examples ; $(MAKE) distclean > /dev/null
  	@cp contrib/loader.sce contrib-loader.sce 
  	@$(RM) -f -r contrib 
@@ -67,3 +85,14 @@ $NetBSD: patch-aw,v 1.7 2007/03/23 22:08:58 dmcmahill Exp $
  	@@STRIP@ bin/scilex;
  
  uninstall:
+-	$(RM) -r $(PREFIX)/$(SCIBASE)
+-	$(RM) $(PREFIX)/bin/scilab
+-	$(RM) $(PREFIX)/bin/intersci
+-	$(RM) $(PREFIX)/bin/intersci-n
++	$(RM) -r $(DESTDIR)$(PREFIX)/$(SCIBASE)
++	$(RM) $(DESTDIR)$(PREFIX)/bin/scilab
++	$(RM) $(DESTDIR)$(PREFIX)/bin/intersci
++	$(RM) $(DESTDIR)$(PREFIX)/bin/intersci-n
+ 
+ cvsclean::
+ 	@$(RM) -f -r geci xless wless xmetanet routines/comm routines/libcomm