DESTDIR support

7 files changed, 22 insertions, 16 deletions

diff --git a/geography/xrmap-base/Makefile b/geography/xrmap-base/Makefile
index 20eb3b9e799..ccf588c105f 100644
--- a/geography/xrmap-base/Makefile
+++ b/geography/xrmap-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/06/30 00:07:16 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2010/02/01 02:31:28 joerg Exp $
 #
 
 DISTNAME=		xrmap-2.29
@@ -8,6 +8,8 @@ CATEGORIES=		geography
 MASTER_SITES=		ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/
 EXTRACT_SUFX=		.tar.bz2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://frmas.free.fr/li_1.htm
 COMMENT=		Earth map viewer - base program
@@ -17,9 +19,7 @@ MAKE_JOBS_SAFE=		no
 USE_IMAKE=		yes
 MAKE_FLAGS+=		MANPATH=${PREFIX}/${PKGMANDIR}
 
-# directory shared by factbook_text and factbook_html
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/rmap/factbook
+INSTALLATION_DIRS+=	share/rmap/factbook
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/graphics/GlutKit/Makefile b/graphics/GlutKit/Makefile
index 1d9eaaa0319..b47af4ef876 100644
--- a/graphics/GlutKit/Makefile
+++ b/graphics/GlutKit/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2009/07/07 05:40:51 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/02/01 02:32:34 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../graphics/3DKit/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/3DKit/GlutKit/}
diff --git a/graphics/GlutKit/distinfo b/graphics/GlutKit/distinfo
index 94e166d3d25..2326bd76879 100644
--- a/graphics/GlutKit/distinfo
+++ b/graphics/GlutKit/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/07/07 05:40:51 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/02/01 02:32:34 joerg Exp $
 
 SHA1 (3DKit/3DKit-0.3.1r2.tar.gz) = 780e7dc975cb2ac0b96f8f605aa6ad0b3af596b9
 RMD160 (3DKit/3DKit-0.3.1r2.tar.gz) = bc6f154479156a10fb336fcf6a142b1474df4c61
 Size (3DKit/3DKit-0.3.1r2.tar.gz) = 216093 bytes
 SHA1 (patch-aa) = a12e85937d5b5eb23111749985cdf4099b9d26b4
-SHA1 (patch-ab) = be0d82a2f00ca77642785fe59ff38160fc94f7c8
+SHA1 (patch-ab) = 7c3e7c4cce76f58669fd70e8e8c58cc4285b5504
diff --git a/graphics/GlutKit/patches/patch-ab b/graphics/GlutKit/patches/patch-ab
index 0bb5f7f0d8e..0daa15065ae 100644
--- a/graphics/GlutKit/patches/patch-ab
+++ b/graphics/GlutKit/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2009/07/07 05:40:51 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2010/02/01 02:32:34 joerg Exp $
 
 --- GNUmakefile.orig	2010-05-31 23:24:27.000000000 +0200
 +++ GNUmakefile
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2009/07/07 05:40:51 joerg Exp $
  #
  
 +# Install into the system root by default
-+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
++GNUSTEP_INSTALLATION_DIR = ${DESTDIR}$(GNUSTEP_SYSTEM_ROOT)
 +
  include $(GNUSTEP_MAKEFILES)/common.make
  include Version
diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile
index 0af41292c4c..fc53f250bef 100644
--- a/graphics/Ngraph/Makefile
+++ b/graphics/Ngraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/02/17 13:02:20 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2010/02/01 02:37:56 joerg Exp $
 #
 
 DISTNAME=	Ngraph-6.3.30-src
@@ -14,15 +14,19 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www2e.biglobe.ne.jp/~isizaka/
 COMMENT=	The 2D graph and data analysis program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_TOOLS+=		gmake gtar
 
+INSTALLATION_DIRS+=	bin
+
 post-extract:
 	${GTAR} -C ${WRKSRC}/combo -xzf ${DISTDIR}/ileaf-widgets.tar.Z
 
 post-install:
-	${GTAR} -C ${PREFIX}/libexec/Ngraph -xzf ${DISTDIR}/Ngraph-6.3.30-doc.tar.gz
+	${GTAR} -C ${DESTDIR}${PREFIX}/libexec/Ngraph -xzf ${DISTDIR}/Ngraph-6.3.30-doc.tar.gz
 
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Ngraph/distinfo b/graphics/Ngraph/distinfo
index d055e7f007a..aacdc13add1 100644
--- a/graphics/Ngraph/distinfo
+++ b/graphics/Ngraph/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 08:45:02 agc Exp $
+$NetBSD: distinfo,v 1.9 2010/02/01 02:37:56 joerg Exp $
 
 SHA1 (Ngraph-6.3.30-src.tar.gz) = 81574241f35258bb14139c6ae57b28789f0d297c
 RMD160 (Ngraph-6.3.30-src.tar.gz) = 60de19f14d672cddcdb9452d7e40196f9b9b588c
@@ -9,5 +9,5 @@ Size (Ngraph-6.3.30-doc.tar.gz) = 557066 bytes
 SHA1 (ileaf-widgets.tar.Z) = db0f6425f77bc3013b7aae163be558683661560e
 RMD160 (ileaf-widgets.tar.Z) = cf3f260ce294ef839da74f19d327257978b12b3f
 Size (ileaf-widgets.tar.Z) = 70223 bytes
-SHA1 (patch-aa) = 5b1f01b6a5e75489a8782d89ddfeeb60bc1c29fa
+SHA1 (patch-aa) = ad4ad58145a1d5523111c7e60a72c6c217f32bdf
 SHA1 (patch-ab) = f2e9df51aeed77ebd6670abf0e34650f006b8c28
diff --git a/graphics/Ngraph/patches/patch-aa b/graphics/Ngraph/patches/patch-aa
index f16e1341692..c018d7098f7 100644
--- a/graphics/Ngraph/patches/patch-aa
+++ b/graphics/Ngraph/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2004/11/29 20:31:44 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2010/02/01 02:37:56 joerg Exp $
 --- Makefile.orig	Sat Aug  7 19:57:39 2004
 +++ Makefile	Tue Aug 31 20:40:29 2004
 @@ -1,26 +1,42 @@
@@ -9,8 +9,8 @@ $NetBSD: patch-aa,v 1.6 2004/11/29 20:31:44 wiz Exp $
 -INSTALLDIR = /usr/local/lib/Ngraph
 -BINDIR = /usr/local/bin
 +LIBDIR = '"${PREFIX}/libexec/Ngraph"'
-+INSTALLDIR =${PREFIX}/libexec/Ngraph
-+BINDIR = ${PREFIX}/bin
++INSTALLDIR =${DESTDIR}${PREFIX}/libexec/Ngraph
++BINDIR = ${DESTDIR}${PREFIX}/bin
  #
  #
  ###############################################################################