[pkgsrc/trunk]: pkgsrc/devel/gnustep-make Fix regression, as Makefiles/Additi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b765910f002b
branches:  trunk
changeset: 557577:b765910f002b
user:      rh <rh%pkgsrc.org@localhost>
date:      Sat Apr 18 01:09:03 2009 +0000

description:
Fix regression, as Makefiles/Additional may also be installed by libFoundation

diffstat:

 devel/gnustep-make/PLIST      |   4 ++--
 devel/gnustep-make/gnustep.mk |  12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 67ee99cfdc39 -r b765910f002b devel/gnustep-make/PLIST
--- a/devel/gnustep-make/PLIST  Fri Apr 17 23:12:29 2009 +0000
+++ b/devel/gnustep-make/PLIST  Sat Apr 18 01:09:03 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/04/13 12:09:25 rh Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/04/18 01:09:03 rh Exp $
 bin/debugapp
 bin/gnustep-config
 bin/openapp
@@ -136,6 +136,6 @@
 @exec ${MKDIR} %D/share/GNUstep/Makefiles/Auxiliary
 @dirrm share/GNUstep/Makefiles/Auxiliary
 @exec ${MKDIR} %D/share/GNUstep/Makefiles/Additional
-@dirrm share/GNUstep/Makefiles/Additional
+@unexec ${RMDIR} %D/share/GNUstep/Makefiles/Additional 2>/dev/null || ${TRUE}
 @dirrm share/GNUstep/Makefiles
 @unexec ${RMDIR} %D/share/GNUstep 2>/dev/null || ${TRUE}
diff -r 67ee99cfdc39 -r b765910f002b devel/gnustep-make/gnustep.mk
--- a/devel/gnustep-make/gnustep.mk     Fri Apr 17 23:12:29 2009 +0000
+++ b/devel/gnustep-make/gnustep.mk     Sat Apr 18 01:09:03 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: gnustep.mk,v 1.9 2009/04/13 12:09:25 rh Exp $
+#      $NetBSD: gnustep.mk,v 1.10 2009/04/18 01:09:03 rh Exp $
 
 .if !defined(GNUSTEP_MK)
 GNUSTEP_MK=            #defined
@@ -7,6 +7,7 @@
 
 GNUSTEP_SUBDIR=                share/GNUstep
 GNUSTEP_ROOT=          ${PREFIX}
+GNUSTEP_LIB_DIR=       ${GNUSTEP_ROOT}/lib/GNUstep
 GNUSTEP_SYSTEM_ROOT=   ${GNUSTEP_ROOT}/System
 GNUSTEP_LOCAL_ROOT=    ${GNUSTEP_ROOT}/Local
 GNUSTEP_NETWORK_ROOT=  ${GNUSTEP_ROOT}/Network
@@ -38,6 +39,15 @@
 .endif
 GNUSTEP_LDFLAGS=       ${GNUSTEP_LFLAGS} ${GNUSTEP_RFLAGS}
 
+.if defined(FIX_GNUSTEP_INSTALLATION_DIR)
+SUBST_CLASSES+=                                gnustep_installation_dir
+SUBST_STAGE.gnustep_installation_dir=  post-patch
+SUBST_FILES.gnustep_installation_dir?= GNUmakefile
+SUBST_SED.gnustep_installation_dir+=   -e 's|GNUSTEP_INSTALLATION_DIR.*=.*..GNUSTEP_\(.*\)_ROOT.*|GNUSTEP_INSTALLATION_DOMAIN = \1|'
+SUBST_SED.gnustep_installation_dir+=   -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Libraries|$${DESTDIR}${GNUSTEP_LIB_DIR}/Libraries/${PKGNAME}|g'
+SUBST_SED.gnustep_installation_dir+=   -e 's|INSTALL_ROOT_DIR|DESTDIR|g'
+.endif
+
 .if !defined(NO_GNUSTEP_ENV)
 
 PATH:=         ${GNUSTEP_PATH}:${PATH}