Allow gnustep packages to override INSTALL variables to enable unprivileged

DESTDIR builds.  Bump PKGREVISION.

5 files changed, 31 insertions, 6 deletions

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 3ad7b9a77d4..3ff3ca93169 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2009/04/13 12:09:25 rh Exp $
+# $NetBSD: Makefile,v 1.45 2009/04/18 03:10:33 rh Exp $
 
 DISTNAME=	gnustep-make-2.0.8
+PKGREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
diff --git a/devel/gnustep-make/buildlink3.mk b/devel/gnustep-make/buildlink3.mk
index 5de1083829f..a448176b4c3 100644
--- a/devel/gnustep-make/buildlink3.mk
+++ b/devel/gnustep-make/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/04/13 12:09:25 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/04/18 03:10:33 rh Exp $
 
 BUILDLINK_TREE+=	gnustep-make
 
 .if !defined(GNUSTEP_MAKE_BUILDLINK3_MK)
 GNUSTEP_MAKE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnustep-make+=	gnustep-make>=2.0.8
-BUILDLINK_ABI_DEPENDS.gnustep-make?=	gnustep-make>=2.0.8
+BUILDLINK_API_DEPENDS.gnustep-make+=	gnustep-make>=2.0.8nb1
+BUILDLINK_ABI_DEPENDS.gnustep-make?=	gnustep-make>=2.0.8nb1
 BUILDLINK_PKGSRCDIR.gnustep-make?=	../../devel/gnustep-make
 
 .include "../../devel/gnustep-make/gnustep.mk"
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 999c569074f..179c2383d42 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.23 2009/04/13 12:09:25 rh Exp $
+$NetBSD: distinfo,v 1.24 2009/04/18 03:10:33 rh Exp $
 
 SHA1 (gnustep-make-2.0.8.tar.gz) = b84cf87747e7f97470b882279a564726151a2fd8
 RMD160 (gnustep-make-2.0.8.tar.gz) = c6b3dc6b1d94f20ea521964e5b5380eef6311e55
 Size (gnustep-make-2.0.8.tar.gz) = 484117 bytes
 SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
+SHA1 (patch-ab) = ac45dbe789292feb263cbde11fc8bdaf2e0cb71d
 SHA1 (patch-ad) = 38851511848356dbe591f76f599aae643cfa1c6e
 SHA1 (patch-ae) = 96948468119a93e557f79d12b522ebd0ad4647a4
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index b4e9a861beb..d73ec64ff9b 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: gnustep.mk,v 1.10 2009/04/18 01:09:03 rh Exp $
+#	$NetBSD: gnustep.mk,v 1.11 2009/04/18 03:10:33 rh Exp $
 
 .if !defined(GNUSTEP_MK)
 GNUSTEP_MK=		#defined
@@ -48,6 +48,12 @@ SUBST_SED.gnustep_installation_dir+=	-e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Librari
 SUBST_SED.gnustep_installation_dir+=	-e 's|INSTALL_ROOT_DIR|DESTDIR|g'
 .endif
 
+.if defined(GNUSTEP_OVERRIDE_INSTALL)
+MAKE_ENV+=	INSTALL=${INSTALL:Q}
+MAKE_ENV+=	INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
+MAKE_ENV+=	INSTALL_DATA=${INSTALL_DATA:Q}
+.endif
+
 .if !defined(NO_GNUSTEP_ENV)
 
 PATH:=		${GNUSTEP_PATH}:${PATH}
diff --git a/devel/gnustep-make/patches/patch-ab b/devel/gnustep-make/patches/patch-ab
new file mode 100644
index 00000000000..a1f949d7bb8
--- /dev/null
+++ b/devel/gnustep-make/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.6 2009/04/18 03:10:33 rh Exp $
+
+--- config.make.in.orig	2008-05-22 23:16:43.000000000 +1000
++++ config.make.in
+@@ -116,9 +116,9 @@ LEX             = lex
+ CHOWN           = chown
+ STRIP           = strip
+ 
+-INSTALL		= @HOST_INSTALL@
+-INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+-INSTALL_DATA	= @INSTALL_DATA@
++INSTALL		?= @HOST_INSTALL@
++INSTALL_PROGRAM	?= @INSTALL_PROGRAM@
++INSTALL_DATA	?= @INSTALL_DATA@
+ TAR		= @TAR@
+ MKDIRS		= $(GNUSTEP_MAKEFILES)/mkinstalldirs
+