Support staged installation.

8 files changed, 59 insertions, 14 deletions

diff --git a/math/gtklife/Makefile b/math/gtklife/Makefile
index 7c888041cb6..1b8d94b6562 100644
--- a/math/gtklife/Makefile
+++ b/math/gtklife/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/08/26 19:57:59 sno Exp $
+# $NetBSD: Makefile,v 1.12 2009/12/12 20:49:21 asau Exp $
 
 DISTNAME=	gtklife-5.1
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ironphoenix.org/tril/gtklife/
 COMMENT=	The game of life
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-gtk2
 CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/gtklife
diff --git a/math/gtklife/distinfo b/math/gtklife/distinfo
index be0493b06ae..aeea3b3cee3 100644
--- a/math/gtklife/distinfo
+++ b/math/gtklife/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2008/11/02 16:56:15 snj Exp $
+$NetBSD: distinfo,v 1.7 2009/12/12 20:49:21 asau Exp $
 
 SHA1 (gtklife-5.1.tar.gz) = a23aaccaaa327e40cb2fd025d5bbcdcd07dc669e
 RMD160 (gtklife-5.1.tar.gz) = ad565e98aa622de4a3392add1271ad90209ff17e
 Size (gtklife-5.1.tar.gz) = 809542 bytes
+SHA1 (patch-ab) = c2ca9cf5744788149e224b8c32e730b75eba02b1
diff --git a/math/gtklife/patches/patch-ab b/math/gtklife/patches/patch-ab
new file mode 100644
index 00000000000..74acd82c2e1
--- /dev/null
+++ b/math/gtklife/patches/patch-ab
@@ -0,0 +1,39 @@
+$NetBSD: patch-ab,v 1.1 2009/12/12 20:49:21 asau Exp $
+
+Staged installation support.
+
+--- Makefile.in.orig	2006-09-14 00:55:36.000000000 +0400
++++ Makefile.in	2009-12-12 23:38:05.000000000 +0300
+@@ -34,21 +34,21 @@
+ all: gtklife
+ 
+ install: all install-data
+-	$(INSTALL) -d $(bindir)
+-	$(INSTALL_PROGRAM) gtklife $(bindir)
++	$(INSTALL) -d $(DESTDIR)$(bindir)
++	$(INSTALL_PROGRAM) gtklife $(DESTDIR)$(bindir)
+ 
+ install-strip: all install-data
+-	$(INSTALL) -d $(bindir)
+-	$(INSTALL_STRIP) gtklife $(bindir)
++	$(INSTALL) -d $(DESTDIR)$(bindir)
++	$(INSTALL_STRIP) gtklife $(DESTDIR)$(bindir)
+ 
+ install-data:
+-	$(INSTALL) -d $(pkgdatadir)
+-	$(INSTALL) -d $(pkgdatadir)/graphics
+-	$(INSTALL_DATA) graphics/* $(pkgdatadir)/graphics
+-	rm -rf $(pkgdatadir)/patterns
+-	umask 022; cp -r patterns $(pkgdatadir)
+-	$(INSTALL) -d $(docdir)
+-	$(INSTALL_DATA) doc/* $(docdir)
++	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)
++	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/graphics
++	$(INSTALL_DATA) graphics/* $(DESTDIR)$(pkgdatadir)/graphics
++	rm -rf $(DESTDIR)$(pkgdatadir)/patterns
++	umask 022; cp -r patterns $(DESTDIR)$(pkgdatadir)
++	$(INSTALL) -d $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) doc/* $(DESTDIR)$(docdir)
+ 
+ gtklife: $(OBJS)
+ 	$(CC) -o gtklife $(OBJS) $(LDFLAGS)
diff --git a/math/tasp-vsipl/Makefile b/math/tasp-vsipl/Makefile
index a7e6a3a4b12..0ef28144dd1 100644
--- a/math/tasp-vsipl/Makefile
+++ b/math/tasp-vsipl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/07/09 09:19:03 tron Exp $
+# $NetBSD: Makefile,v 1.14 2009/12/12 20:39:56 asau Exp $
 
 DISTNAME=	tvcpp0p8
 PKGNAME=	tasp-vsipl-20030710
@@ -13,6 +13,9 @@ COMMENT=	Vector Signal Image Processing Library
 WRKSRC=		${WRKDIR}/${DISTNAME}/lib
 DIST_SUBDIR=	tasp-vsipl
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_BSD_MAKEFILE=	yes
 INSTALLATION_DIRS+=	include
 INSTALLATION_DIRS+=	lib
 INSTALLATION_DIRS+=	share/doc/tasp-vsipl
@@ -22,7 +25,7 @@ post-extract:
 
 post-install:
 	cd ${WRKDIR}/${DISTNAME} && ${INSTALL_DATA} Copyright	\
-		README_FIRST *.pdf ${PREFIX}/share/doc/tasp-vsipl
+		README_FIRST *.pdf ${DESTDIR}${PREFIX}/share/doc/tasp-vsipl
 
 do-test:
 	cd ${WRKDIR}/${DISTNAME}/testing && ${SETENV} ${MAKE_ENV} ${MAKE} all
diff --git a/math/tasp-vsipl/distinfo b/math/tasp-vsipl/distinfo
index 14c3436db03..701d931e854 100644
--- a/math/tasp-vsipl/distinfo
+++ b/math/tasp-vsipl/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2006/03/03 19:19:35 kristerw Exp $
+$NetBSD: distinfo,v 1.9 2009/12/12 20:39:56 asau Exp $
 
 SHA1 (tasp-vsipl/tvcpp0p8.tar.gz) = e1f0dc818458393807a7a5c6e3357305720039a8
 RMD160 (tasp-vsipl/tvcpp0p8.tar.gz) = 5443143cacb6612f0454a50d210e7ffaad23b5c2
 Size (tasp-vsipl/tvcpp0p8.tar.gz) = 1461591 bytes
 SHA1 (patch-aa) = 225d275620785928564b9db187fead28d535e839
-SHA1 (patch-ab) = b3f18f45ad52657ce4f8143f210aa9f3c9d3d7de
-SHA1 (patch-ac) = 8606c3c9a11877296ead19d49ac355f475e6fcb6
-SHA1 (patch-ad) = 1ea7f8f3fdb109d875e4d9d0e48e2c66d0b42c7f
+SHA1 (patch-ab) = dabd2c59c5d70460e7b74405d923ccb03dae7b82
+SHA1 (patch-ac) = 8f0a43973368551bbe982a75719ff3d9e79e16df
+SHA1 (patch-ad) = 13be2c4a4f4765be39de955bfb4dc9c6961663cb
 SHA1 (patch-ae) = c4a3d4c74e9af434fafb77b7afd8fa2b565fdab3
diff --git a/math/tasp-vsipl/patches/patch-ab b/math/tasp-vsipl/patches/patch-ab
index 4d50ef5c951..64b337fb629 100644
--- a/math/tasp-vsipl/patches/patch-ab
+++ b/math/tasp-vsipl/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2003/07/10 12:43:10 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2009/12/12 20:39:57 asau Exp $
 
 --- /dev/null
 +++ libvsip/Makefile
@@ -475,6 +475,6 @@ $NetBSD: patch-ab,v 1.2 2003/07/10 12:43:10 jtb Exp $
 +
 +afterinstall:
 +	${BSD_INSTALL_DATA} ${.CURDIR}/../../include/vsip*.h 			\
-+		${PREFIX}/include
++		${DESTDIR}${PREFIX}/include
 +
 +.include <bsd.lib.mk>
diff --git a/math/tasp-vsipl/patches/patch-ac b/math/tasp-vsipl/patches/patch-ac
index 75232834fac..85f2e21a4db 100644
--- a/math/tasp-vsipl/patches/patch-ac
+++ b/math/tasp-vsipl/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2003/07/10 12:43:10 jtb Exp $
+$NetBSD: patch-ac,v 1.4 2009/12/12 20:39:57 asau Exp $
 
 --- /dev/null
 +++ libVU/Makefile
@@ -28,6 +28,6 @@ $NetBSD: patch-ac,v 1.3 2003/07/10 12:43:10 jtb Exp $
 +	${.CURDIR}/../../src_VU/utility/timer
 +
 +afterinstall:
-+	${BSD_INSTALL_DATA} ${.CURDIR}/../../include/VU.h ${PREFIX}/include
++	${BSD_INSTALL_DATA} ${.CURDIR}/../../include/VU.h ${DESTDIR}${PREFIX}/include
 +
 +.include <bsd.lib.mk>
diff --git a/math/tasp-vsipl/patches/patch-ad b/math/tasp-vsipl/patches/patch-ad
index 7f773151489..bc7d9fa1871 100644
--- a/math/tasp-vsipl/patches/patch-ad
+++ b/math/tasp-vsipl/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2003/07/10 12:43:10 jtb Exp $
+$NetBSD: patch-ad,v 1.2 2009/12/12 20:39:57 asau Exp $
 
 --- /dev/null
 +++ libVUX/Makefile
@@ -25,6 +25,6 @@ $NetBSD: patch-ad,v 1.1 2003/07/10 12:43:10 jtb Exp $
 +.PATH:	${.CURDIR}/../../src_VU/graphics/X_f
 +
 +afterinstall:
-+	${BSD_INSTALL_DATA} ${.CURDIR}/../../include/VUX.h ${PREFIX}/include
++	${BSD_INSTALL_DATA} ${.CURDIR}/../../include/VUX.h ${DESTDIR}${PREFIX}/include
 +
 +.include <bsd.lib.mk>