Support staged installation.

15 files changed, 147 insertions, 43 deletions

diff --git a/lang/kali/Makefile b/lang/kali/Makefile
index c1dc0a4635e..2aedf2e1964 100644
--- a/lang/kali/Makefile
+++ b/lang/kali/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/09/06 22:37:04 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2009/12/12 21:58:18 asau Exp $
 
 DISTNAME=	kali-0.47
 CATEGORIES=	lang
@@ -8,9 +8,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.neci.nj.nec.com/PLS/Kali.html
 COMMENT=	Distributed implementation of Scheme
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 BUILD_TARGET=	# empty
-INSTALLATION_DIRS=	bin include lib
+MAKE_ENV=	mandir=$(PREFIX)/$(PKGMANDIR)/man1
+INSTALLATION_DIRS=	bin include lib $(PKGMANDIR)/man1
 
 # Thoroughly broken on 64-bit architectures.
 NOT_FOR_PLATFORM=	*-*-alpha *-*-sparc64 *-*-x86_64
diff --git a/lang/kali/distinfo b/lang/kali/distinfo
index 4cff15d95c9..40e14c50a83 100644
--- a/lang/kali/distinfo
+++ b/lang/kali/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2007/06/17 15:38:54 salo Exp $
+$NetBSD: distinfo,v 1.5 2009/12/12 21:58:18 asau Exp $
 
 SHA1 (kali-0.47.tar.gz) = 6f55c4b58304b337453e51c284e08e50d355fd55
 RMD160 (kali-0.47.tar.gz) = f2ea2b3ba55e534365c3d6082f91feb773285cd7
 Size (kali-0.47.tar.gz) = 970455 bytes
-SHA1 (patch-aa) = 1852dd676cd52676bcfe6f745eb5ed667df91c6f
+SHA1 (patch-aa) = 4a4625a7dfeece3f13b738f43b94ff698af78732
diff --git a/lang/kali/patches/patch-aa b/lang/kali/patches/patch-aa
index a381865d68c..5ad7d7c2e92 100644
--- a/lang/kali/patches/patch-aa
+++ b/lang/kali/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2007/06/17 15:38:54 salo Exp $
+$NetBSD: patch-aa,v 1.2 2009/12/12 21:58:18 asau Exp $
 
---- Makefile.in.orig	1997-01-21 23:41:37.000000000 +0100
-+++ Makefile.in	2007-06-17 17:32:26.000000000 +0200
-@@ -98,7 +98,7 @@ CONFIG_FILES = scheme/interfaces.scm sch
+--- Makefile.in.orig	1997-01-22 01:41:37.000000000 +0300
++++ Makefile.in	2009-12-13 00:48:07.000000000 +0300
+@@ -98,7 +98,7 @@
  
  # The following is the first rule and therefore the "make" command's
  # default target.
@@ -11,3 +11,90 @@ $NetBSD: patch-aa,v 1.1 2007/06/17 15:38:54 salo Exp $
  
  # The developers are curious to know.  Don't be concerned if this fails.
  .notify: build/minor-version-number
+@@ -150,21 +150,21 @@
+ install: enough dirs inst-script inst-vm inst-misc inst-man inst-inc inst-image
+ 
+ inst-vm:
+-	$(INSTALL_PROGRAM) $(VM) $(LIB)
++	$(INSTALL_PROGRAM) $(VM) $(DESTDIR)$(LIB)
+ 
+ inst-image:
+ 	rm -f '/tmp/$(IMAGE)' &&					\
+ 	build/build-usual-image . '$(LIB)' '/tmp/$(IMAGE)' './$(VM)'	\
+ 		'$(INITIAL)' &&						\
+-	$(INSTALL_DATA) /tmp/$(IMAGE) $(LIB) &&				\
++	$(INSTALL_DATA) /tmp/$(IMAGE) $(DESTDIR)$(LIB) &&		\
+ 	rm /tmp/$(IMAGE)
+ 
+ inst-man:
+-	if [ -d $(mandir) -a -w $(mandir) ]; then			   \
++	if [ -d $(DESTDIR)$(mandir) -a -w $(DESTDIR)$(mandir) ]; then	   \
+ 		sed 's=LBIN=$(bindir)=g' doc/scheme48.man |		   \
+ 			sed 's=LLIB=$(LIB)=g' |				   \
+ 			sed 's=LS48=$(RUNNABLE)=g' >$(MANPAGE) &&	   \
+-		$(INSTALL_DATA) $(MANPAGE) $(mandir) &&			   \
++		$(INSTALL_DATA) $(MANPAGE) $(DESTDIR)$(mandir) &&	   \
+ 		rm $(MANPAGE);						   \
+ 	else								   \
+ 		echo "$(mandir) not writable dir, not installing man page" \
+@@ -172,29 +172,29 @@
+ 	fi
+ 
+ inst-inc:
+-	$(INSTALL_DATA) c/kali.h $(incdir)
++	$(INSTALL_DATA) c/kali.h $(DESTDIR)$(incdir)
+ 
+ inst-misc:
+ 	for stub in env big opt misc link; do				\
+ 		for f in scheme/$$stub/*.scm; do			\
+-			$(INSTALL_DATA) $$f $(LIB)/$$stub || exit 1;	\
++			$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/$$stub || exit 1;	\
+ 		done;							\
+ 	done &&								\
+ 	for f in scheme/rts/*num.scm scheme/rts/jar-defrecord.scm; do	\
+-		$(INSTALL_DATA) $$f $(LIB)/rts || exit 1;		\
++		$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/rts || exit 1;	\
+ 	done &&								\
+ 	sed 's;LBIN;$(bindir);g' <daemon |				\
+-		sed 's;LS48;$(RUNNABLE);g' >$(LIB)/daemon &&		\
+-	chmod 655 $(LIB)/daemon
++		sed 's;LS48;$(RUNNABLE);g' >$(DESTDIR)$(LIB)/daemon &&	\
++	chmod 655 $(DESTDIR)$(LIB)/daemon
+ 
+ inst-script:
+ 	script=$(bindir)/$(RUNNABLE) &&					\
+-	echo '#!/bin/sh'	>$$script &&				\
+-	echo			>>$$script &&				\
+-	echo 'lib=$(LIB)'	>>$$script &&				\
++	(echo '#!/bin/sh'	 &&					\
++	echo			 &&					\
++	echo 'lib=$(LIB)'	 &&					\
+ 	echo 'exec $$lib/$(VM) -o $$lib/$(VM) -i $$lib/$(IMAGE) "$$@"'	\
+-				>>$$script &&				\
+-	chmod +x $$script
++				)>$(DESTDIR)$$script &&			\
++	chmod +x $(DESTDIR)$$script
+ 
+ # Script to run kali in this directory.
+ go:
+@@ -207,17 +207,17 @@
+ 
+ dirs:
+ 	for dir in $(libdir) $(bindir) $(incdir); do			 \
+-		[ -d $$dir -a -w $$dir ] || {				 \
++		[ -d $(DESTDIR)$$dir -a -w $(DESTDIR)$$dir ] || {	 \
+ 			echo "$$dir not a writable directory" >&2;	 \
+ 			exit 1;						 \
+ 		};							 \
+ 	done
+-	{ mkdir -p $(LIB) && [ -w $(LIB) ]; } || {			 \
++	{ mkdir -p $(DESTDIR)$(LIB) && [ -w $(DESTDIR)$(LIB) ]; } || {	 \
+ 		echo "$(LIB) not a writable directory" >&2;		 \
+ 		exit 1;							 \
+ 	}
+ 	for dir in rts env big opt misc link; do			  \
+-		{ mkdir -p $(LIB)/$$dir && [ -w $(LIB)/$$dir ]; } || {	  \
++		{ mkdir -p $(DESTDIR)$(LIB)/$$dir && [ -w $(DESTDIR)$(LIB)/$$dir ]; } || {	  \
+ 			echo "$(LIB)/$$dir not a writable directory" >&2; \
+ 			exit 1;						  \
+ 		};							  \
diff --git a/math/dcdflib.c/Makefile b/math/dcdflib.c/Makefile
index ef2a7655b3c..d1df94a0fce 100644
--- a/math/dcdflib.c/Makefile
+++ b/math/dcdflib.c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/03/24 19:21:27 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/12/12 22:29:00 asau Exp $
 
 DISTNAME=	dcdflib.c-1.1
 PKGREVISION=	1
@@ -14,11 +14,12 @@ BUILD_DIRS=	src
 DIST_SUBDIR=	${PKGNAME_NOREV}
 MAKE_ENV+=	LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	include lib share/doc/dcdflib.c
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/dcdflib.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/doc/dcdflib.h ${DESTDIR}${PREFIX}/include
 	cd ${WRKSRC} && ${INSTALL_DATA} README doc/dcdflib.chs		\
-		doc/dcdflib.fdoc ${PREFIX}/share/doc/dcdflib.c/
+		doc/dcdflib.fdoc ${DESTDIR}${PREFIX}/share/doc/dcdflib.c/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/dcdflib.f/Makefile b/math/dcdflib.f/Makefile
index 23b93f50a50..3322abdf05f 100644
--- a/math/dcdflib.f/Makefile
+++ b/math/dcdflib.f/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/12/03 13:06:54 asau Exp $
+# $NetBSD: Makefile,v 1.13 2009/12/12 22:18:00 asau Exp $
 
 DISTNAME=	dcdflib.f-1.1
 PKGREVISION=	3
@@ -13,10 +13,11 @@ WRKSRC=		${WRKDIR}/dcdflib.f
 BUILD_DIRS=	src
 USE_LANGUAGES=	c fortran
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	lib share/doc/dcdflib.f
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/dcdflib.f
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dcdflib.f
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/dcdflib.f
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/dcdflib.f
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/dcdflib.f/distinfo b/math/dcdflib.f/distinfo
index 684ce323d72..a347ce7544f 100644
--- a/math/dcdflib.f/distinfo
+++ b/math/dcdflib.f/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/06/09 10:26:05 rillig Exp $
+$NetBSD: distinfo,v 1.5 2009/12/12 22:18:00 asau Exp $
 
 SHA1 (dcdflib.f-1.1.tar.gz) = 9b5d730a9f8ac46bb3e1b202c91c444382316dbb
 RMD160 (dcdflib.f-1.1.tar.gz) = 8638d6baef6b115ef5e527836b943de7067c5ca8
 Size (dcdflib.f-1.1.tar.gz) = 62269 bytes
 SHA1 (patch-aa) = aa814270de9e785631cb753d0df37dd05d406e93
-SHA1 (patch-ab) = a60207c28ca7b84d7eb4c1dc093e8b3fe3707c89
+SHA1 (patch-ab) = 225c1d1ed66f8884a4abab1b801fad61f4f92170
diff --git a/math/dcdflib.f/patches/patch-ab b/math/dcdflib.f/patches/patch-ab
index 76b3c8f3293..7a51b4ad206 100644
--- a/math/dcdflib.f/patches/patch-ab
+++ b/math/dcdflib.f/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2006/06/09 10:26:05 rillig Exp $
+$NetBSD: patch-ab,v 1.3 2009/12/12 22:18:00 asau Exp $
 
 --- /dev/null	Tue Apr 17 00:09:25 2001
 +++ src/Makefile
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.2 2006/06/09 10:26:05 rillig Exp $
 +	${RANLIB} $@
 +
 +install:	lib${LIB}.a
-+	${BSD_INSTALL_DATA} $? ${PREFIX}/lib
++	${BSD_INSTALL_DATA} $? ${DESTDIR}${PREFIX}/lib
 +
 +clean:
 +	rm -f *.o lib${LIB}.a
diff --git a/math/dfftpack/Makefile b/math/dfftpack/Makefile
index 3e1d3bc91e5..05ebae387ea 100644
--- a/math/dfftpack/Makefile
+++ b/math/dfftpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/12/03 13:06:54 asau Exp $
+# $NetBSD: Makefile,v 1.15 2009/12/12 22:14:34 asau Exp $
 
 DISTNAME=		dfftpack-20001209
 PKGREVISION=		2
@@ -12,6 +12,7 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_LANGUAGES=		fortran
 WRKSRC=			${WRKDIR}/dfftpack
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	lib share/doc/dfftpack share/examples/dfftpack
 
 post-extract:
@@ -19,7 +20,7 @@ post-extract:
 
 post-install:
 	@for f in README doc doc.double ; do \
-	${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/dfftpack ; done
-	${INSTALL_DATA} ${WRKSRC}/test.f ${PREFIX}/share/examples/dfftpack
+	${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/share/doc/dfftpack ; done
+	${INSTALL_DATA} ${WRKSRC}/test.f ${DESTDIR}${PREFIX}/share/examples/dfftpack
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/dfftpack/files/Makefile b/math/dfftpack/files/Makefile
index 849b4f5a253..19e2c873d2b 100644
--- a/math/dfftpack/files/Makefile
+++ b/math/dfftpack/files/Makefile
@@ -17,7 +17,7 @@ lib$(LIB).a:	$(OBJS)
 	$(RANLIB) $@
 
 install:	lib$(LIB).a
-	$(BSD_INSTALL_DATA) $? $(LIBDIR)
+	$(BSD_INSTALL_DATA) $? $(DESTDIR)$(LIBDIR)
 
 clean: 
 	 rm -f *.o lib$(LIB).a
diff --git a/math/mprime-bin/Makefile b/math/mprime-bin/Makefile
index 61053e04555..1e55cff2642 100644
--- a/math/mprime-bin/Makefile
+++ b/math/mprime-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/06/02 12:40:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/12 22:24:21 asau Exp $
 #
 
 DISTNAME=		mprime2414
@@ -18,8 +18,8 @@ EMUL_MODULES.linux=	base
 do-build:
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mprime ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mprime
-	${INSTALL_DATA} ${WRKSRC}/*txt ${PREFIX}/share/doc/mprime
+	${INSTALL_PROGRAM} ${WRKSRC}/mprime ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/mprime
+	${INSTALL_DATA} ${WRKSRC}/*txt ${DESTDIR}${PREFIX}/share/doc/mprime
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/quadpack/Makefile b/math/quadpack/Makefile
index 612c6fc5164..6567a19761a 100644
--- a/math/quadpack/Makefile
+++ b/math/quadpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/12/03 13:06:55 asau Exp $
+# $NetBSD: Makefile,v 1.16 2009/12/12 22:52:57 asau Exp $
 
 DISTNAME=		quadpack-20001130
 PKGREVISION=		2
@@ -12,12 +12,13 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_LANGUAGES=		fortran
 WRKSRC=			${WRKDIR}/quadpack
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	lib share/doc/quadpack
 
 pre-build:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
-	cd ${WRKSRC} && ${INSTALL_DATA} doc readme ${PREFIX}/share/doc/quadpack
+	cd ${WRKSRC} && ${INSTALL_DATA} doc readme ${DESTDIR}${PREFIX}/share/doc/quadpack
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/quadpack/files/Makefile b/math/quadpack/files/Makefile
index a22ea3a0725..7613008036c 100644
--- a/math/quadpack/files/Makefile
+++ b/math/quadpack/files/Makefile
@@ -21,7 +21,7 @@ lib$(LIB).a:	$(OBJS)
 	$(RANLIB) $@
 
 install:	lib$(LIB).a
-	$(BSD_INSTALL_DATA) $? $(LIBDIR)
+	$(BSD_INSTALL_DATA) $? $(DESTDIR)$(LIBDIR)
 
 clean:
 	rm -f *.o lib$(LIB).a
diff --git a/math/vista/Makefile b/math/vista/Makefile
index f58a62b19b0..d6d4b84e463 100644
--- a/math/vista/Makefile
+++ b/math/vista/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/10/07 15:56:11 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/12/12 22:10:21 asau Exp $
 #
 
 DISTNAME=	vista
@@ -11,10 +11,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://forrest.psych.unc.edu/research/
 COMMENT=	Visual statistics system
 
-MAKE_JOBS_SAFE=	no
-
 DEPENDS+=	xlispstat>=3.52.9:../../math/xlispstat
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+MAKE_JOBS_SAFE=	no
+
 WRKSRC=		${WRKDIR}/vista-5.0.5
 USE_X11BASE=	yes
 USE_TOOLS+=	gmake
diff --git a/math/vista/distinfo b/math/vista/distinfo
index 9b07b6686b0..6bdc201d613 100644
--- a/math/vista/distinfo
+++ b/math/vista/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 12:06:58 agc Exp $
+$NetBSD: distinfo,v 1.4 2009/12/12 22:10:21 asau Exp $
 
 SHA1 (vista.tar.gz) = 2fd92743cd1677dfb74ae9a86b329794e2c3b790
 RMD160 (vista.tar.gz) = 40191ddbb444b5d7517e33779e97e738e3a2c090
 Size (vista.tar.gz) = 399121 bytes
 SHA1 (patch-aa) = 5064dcbbde8adab74b6ae6defcf983704ef9e6b7
-SHA1 (patch-ab) = 90e61dc8c28aaa86da40b4ba00471972821be357
+SHA1 (patch-ab) = a707f3d4e8c3c0b4da3eb81cc165fd04c132e2c6
diff --git a/math/vista/patches/patch-ab b/math/vista/patches/patch-ab
index 29982d5fad5..17af91cbb63 100644
--- a/math/vista/patches/patch-ab
+++ b/math/vista/patches/patch-ab
@@ -1,19 +1,27 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/10/03 20:33:46 frueauf Exp $
+$NetBSD: patch-ab,v 1.2 2009/12/12 22:10:21 asau Exp $
 
---- Makefile.orig	Thu Jul 23 21:07:50 1998
-+++ Makefile	Sat Oct  3 10:43:40 1998
-@@ -23,11 +23,11 @@
- 	@mkdir -p $(PREFIX)/$(DEST)
- 	@mkdir -p $(PREFIX)/$(BINDEST)
+--- Makefile.orig	1998-07-23 23:07:50.000000000 +0400
++++ Makefile	2009-12-13 01:07:37.000000000 +0300
+@@ -20,14 +20,14 @@
+ 	done
+ 
+ install:: all
+-	@mkdir -p $(PREFIX)/$(DEST)
+-	@mkdir -p $(PREFIX)/$(BINDEST)
++	@mkdir -p $(DESTDIR)$(PREFIX)/$(DEST)
++	@mkdir -p $(DESTDIR)$(PREFIX)/$(BINDEST)
  	@cat vista.in | \
 -	  $(SED) s:DEST:$(DEST): | \
 +	  $(SED) s:DEST:$(PREFIX)/$(DEST): | \
  	  $(SED) s:XLISP:$(XLISP): > vista;
- 	@install -m 755 vista $(PREFIX)/$(BINDEST)/vista
- 	@install -d -m 755 $(PREFIX)/$(DEST)/vista
+-	@install -m 755 vista $(PREFIX)/$(BINDEST)/vista
+-	@install -d -m 755 $(PREFIX)/$(DEST)/vista
 -	@cat statinit.lsp.in | $(SED) s:DEST:$(DEST): > statinit.lsp
 -	@cp -rpd code data examples prefs readme statinit.lsp \
+-	  $(PREFIX)/$(DEST)/vista/
++	@install -m 755 vista $(DESTDIR)$(PREFIX)/$(BINDEST)/vista
++	@install -d -m 755 $(DESTDIR)$(PREFIX)/$(DEST)/vista
 +	@cat statinit.lsp.in | $(SED) s:DEST:$(PREFIX)/$(DEST): > statinit.lsp
 +	@cp -Rp code data examples prefs readme statinit.lsp \
- 	  $(PREFIX)/$(DEST)/vista/
++	  $(DESTDIR)$(PREFIX)/$(DEST)/vista/