[pkgsrc/trunk]: pkgsrc/devel/gnustep-make Allow gnustep packages to override ...

[rh <rh%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f316a775dc16
branches:  trunk
changeset: 391734:f316a775dc16
user:      rh <rh%pkgsrc.org@localhost>
date:      Sat Apr 18 03:10:33 2009 +0000

description:
Allow gnustep packages to override INSTALL variables to enable unprivileged
DESTDIR builds.  Bump PKGREVISION.

diffstat:

 devel/gnustep-make/Makefile         |   3 ++-
 devel/gnustep-make/buildlink3.mk    |   6 +++---
 devel/gnustep-make/distinfo         |   3 ++-
 devel/gnustep-make/gnustep.mk       |   8 +++++++-
 devel/gnustep-make/patches/patch-ab |  17 +++++++++++++++++
 5 files changed, 31 insertions(+), 6 deletions(-)

diffs (88 lines):

diff -r abf58ecb4c53 -r f316a775dc16 devel/gnustep-make/Makefile
--- a/devel/gnustep-make/Makefile       Sat Apr 18 02:33:33 2009 +0000
+++ b/devel/gnustep-make/Makefile       Sat Apr 18 03:10:33 2009 +0000
@@ -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 -r abf58ecb4c53 -r f316a775dc16 devel/gnustep-make/buildlink3.mk
--- a/devel/gnustep-make/buildlink3.mk  Sat Apr 18 02:33:33 2009 +0000
+++ b/devel/gnustep-make/buildlink3.mk  Sat Apr 18 03:10:33 2009 +0000
@@ -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 -r abf58ecb4c53 -r f316a775dc16 devel/gnustep-make/distinfo
--- a/devel/gnustep-make/distinfo       Sat Apr 18 02:33:33 2009 +0000
+++ b/devel/gnustep-make/distinfo       Sat Apr 18 03:10:33 2009 +0000
@@ -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 -r abf58ecb4c53 -r f316a775dc16 devel/gnustep-make/gnustep.mk
--- a/devel/gnustep-make/gnustep.mk     Sat Apr 18 02:33:33 2009 +0000
+++ b/devel/gnustep-make/gnustep.mk     Sat Apr 18 03:10:33 2009 +0000
@@ -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|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 -r abf58ecb4c53 -r f316a775dc16 devel/gnustep-make/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gnustep-make/patches/patch-ab       Sat Apr 18 03:10:33 2009 +0000
@@ -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
+