Update gnustep-make to 2.6.2.

GNUstep now defaults to the modern, non-fragile ABI unless the fragile
option is set.

Upstream Changes in version `2.6.2'
===================================

Added standalone filesystem layout for putting everything in one
directory for easy deployment of relocatable. Other bug fixes.

Upstream Changes in version `2.6.1'
===================================

Bug fix release. Most notably to fix a problem compiling GNUstep with
clang.

Upstream Changes in version `2.6.0'
===================================

   * The default filesystem layout is now the 'fhs' layout

   * The default location of the configuration file changed when not
     installing system-wide

   * Removed the -with-system-root, -with-local-root and
     -with-network-root options

   * Removed obsolete variables (deprecated 4 years ago).

   * A new test framework is included in the pacakge

   * objc.make deprecated. Use tool.make instead

   * -enable-absolute-install-paths is now the default on Darwin

7 files changed, 73 insertions, 81 deletions

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 9782796abb5..3eaf222c00d 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2011/04/07 01:41:31 rh Exp $
+# $NetBSD: Makefile,v 1.52 2012/10/22 02:06:19 rh Exp $
 
-DISTNAME=	gnustep-make-2.4.0
+DISTNAME=	gnustep-make-2.6.2
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -12,18 +12,21 @@ LICENSE=	gnu-gpl-v3
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_LANGUAGES=		objc
+USE_LANGUAGES+=		c99 objc c++ obj-c++
 USE_TOOLS+=		csh
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
 CONFIGURE_ARGS+=	--disable-importing-config-file
 CONFIGURE_ARGS+=	--with-layout=fhs
+CONFIGURE_ARGS+=	--enable-native-objc-exceptions
 CONFIGURE_ARGS+=	--with-config-file=${PKG_SYSCONFDIR}/GNUstep.conf
+CONFIGURE_ARGS+=	--with-objc-lib-flag="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lobjc"
 MAKE_FILE=		GNUmakefile
 
 CONF_FILES+=		${PREFIX}/share/examples/GNUstep/GNUstep.conf \
 			${PKG_SYSCONFDIR}/GNUstep.conf
 
+.include "gnustep.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
@@ -31,8 +34,9 @@ PTHREAD_LIBS+=		-lpth
 .endif
 
 CONFIGURE_ARGS+=	--with-thread-lib=${PTHREAD_LIBS:Q}
-
-.include "gnustep.mk"
+.if empty(PKG_OPTIONS:Mfragile)
+CONFIGURE_ARGS+=	--enable-objc-nonfragile-abi
+.endif
 
 .if ${MACHINE_ARCH} == "i386"
 GNUSTEP_ARCH=	ix86
@@ -53,6 +57,12 @@ SUBST_FILES.maninfo=	${WRKSRC}/FilesystemLayouts/fhs
 SUBST_SED.maninfo=	-e 's|share/man|${PKGMANDIR}|'
 SUBST_SED.maninfo+=	-e 's|share/info|${PKGINFODIR}|'
 
+SUBST_CLASSES+=         unwrapping
+SUBST_STAGE.unwrapping= post-build
+SUBST_MESSAGE.unwrapping=Unwrapping wrapper scripts.
+SUBST_FILES.unwrapping= TestFramework/gnustep-tests
+SUBST_SED.unwrapping=   -e 's|${TOOLS_DIR}|${PREFIX}|g'
+
 INSTALLATION_DIRS+=	share/GNUstep/Library
 INSTALLATION_DIRS+=	share/GNUstep/Makefiles/${GNUSTEP_ARCH}
 INSTALLATION_DIRS+=	share/GNUstep/Makefiles/Additional
diff --git a/devel/gnustep-make/PLIST b/devel/gnustep-make/PLIST
index 5d15d8f3bd1..924a941bcad 100644
--- a/devel/gnustep-make/PLIST
+++ b/devel/gnustep-make/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.21 2011/04/07 01:41:31 rh Exp $
+@comment $NetBSD: PLIST,v 1.22 2012/10/22 02:06:19 rh Exp $
 bin/debugapp
 bin/gnustep-config
+bin/gnustep-tests
 bin/openapp
 bin/opentool
 man/man1/debugapp.1
@@ -70,6 +71,20 @@ share/GNUstep/Makefiles/Master/test-application.make
 share/GNUstep/Makefiles/Master/test-library.make
 share/GNUstep/Makefiles/Master/test-tool.make
 share/GNUstep/Makefiles/Master/tool.make
+share/GNUstep/Makefiles/TestFramework/GNUmakefile.in
+share/GNUstep/Makefiles/TestFramework/ObjectTesting.h
+share/GNUstep/Makefiles/TestFramework/README
+share/GNUstep/Makefiles/TestFramework/Summary.sh
+share/GNUstep/Makefiles/TestFramework/Testing.h
+share/GNUstep/Makefiles/TestFramework/example1.m
+share/GNUstep/Makefiles/TestFramework/example2.m
+share/GNUstep/Makefiles/TestFramework/example3.m
+share/GNUstep/Makefiles/TestFramework/example4.m
+share/GNUstep/Makefiles/TestFramework/example5.m
+share/GNUstep/Makefiles/TestFramework/example6.m
+share/GNUstep/Makefiles/TestFramework/example7.m
+share/GNUstep/Makefiles/TestFramework/example8.m
+share/GNUstep/Makefiles/TestFramework/example9.m
 share/GNUstep/Makefiles/aggregate.make
 share/GNUstep/Makefiles/app-wrapper.template
 share/GNUstep/Makefiles/application.make
diff --git a/devel/gnustep-make/buildlink3.mk b/devel/gnustep-make/buildlink3.mk
index 8040b6c2df0..beb52be2a15 100644
--- a/devel/gnustep-make/buildlink3.mk
+++ b/devel/gnustep-make/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.19 2012/05/07 01:53:22 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2012/10/22 02:06:19 rh Exp $
 
 BUILDLINK_TREE+=	gnustep-make
 
 .if !defined(GNUSTEP_MAKE_BUILDLINK3_MK)
 GNUSTEP_MAKE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnustep-make+=	gnustep-make>=2.4.0
-BUILDLINK_ABI_DEPENDS.gnustep-make+=	gnustep-make>=2.4.0
+BUILDLINK_API_DEPENDS.gnustep-make+=	gnustep-make>=2.6.2
+BUILDLINK_ABI_DEPENDS.gnustep-make+=	gnustep-make>=2.6.2
 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 a9ee31fa70d..a0ce8662a7c 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2011/04/07 01:41:31 rh Exp $
+$NetBSD: distinfo,v 1.26 2012/10/22 02:06:19 rh Exp $
 
-SHA1 (gnustep-make-2.4.0.tar.gz) = afda14186394c65b0871dba93f92dc965b2fc724
-RMD160 (gnustep-make-2.4.0.tar.gz) = 6f1dd81039c9935e41eb7988923c3b3c6507e383
-Size (gnustep-make-2.4.0.tar.gz) = 521818 bytes
+SHA1 (gnustep-make-2.6.2.tar.gz) = 3f85cb25f4f7fd35cdcbd8d948a2673c84c605ff
+RMD160 (gnustep-make-2.6.2.tar.gz) = 683b6a034d4bb7e17b64209c7e7e289e9e94a042
+Size (gnustep-make-2.6.2.tar.gz) = 562770 bytes
 SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
 SHA1 (patch-ab) = ac45dbe789292feb263cbde11fc8bdaf2e0cb71d
-SHA1 (patch-ad) = 2fbb4459bfe9a3bde83c6dc14fde5363ee01aad8
-SHA1 (patch-ae) = 96948468119a93e557f79d12b522ebd0ad4647a4
+SHA1 (patch-ad) = 8e4d864a05ea824ff5243c87ef9d6f43892ca661
+SHA1 (patch-ae) = f91fb89ab2c11b73592bae7fe62476e7a353d8d8
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index 8e3c0c1f620..488d64f384a 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,9 +1,21 @@
-#	$NetBSD: gnustep.mk,v 1.20 2009/12/28 10:49:23 obache Exp $
+#	$NetBSD: gnustep.mk,v 1.21 2012/10/22 02:06:19 rh Exp $
 
 .if !defined(GNUSTEP_MK)
 GNUSTEP_MK=		#defined
 
-.include "../../mk/bsd.prefs.mk"
+.ifndef GNUSTEP_SKIP_DEFAULT_OPTIONS
+PKG_OPTIONS_VAR?=	PKG_OPTIONS.gnustep
+PKG_SUPPORTED_OPTIONS+=	fragile
+PKGSRC_COMPILER+=	clang
+
+.include "../../mk/bsd.options.mk"
+
+.if empty(PKG_OPTIONS:Mfragile)
+ONLY_FOR_COMPILER=	clang
+BUILDLINK_API_DEPENDS.clang+=   clang>=3.1
+.include "../../lang/clang/buildlink3.mk"
+.endif
+.endif
 
 GNUSTEP_SUBDIR=		share/GNUstep
 GNUSTEP_ROOT=		${PREFIX}
diff --git a/devel/gnustep-make/patches/patch-ad b/devel/gnustep-make/patches/patch-ad
index 142f6110221..837b91ba001 100644
--- a/devel/gnustep-make/patches/patch-ad
+++ b/devel/gnustep-make/patches/patch-ad
@@ -1,17 +1,8 @@
-$NetBSD: patch-ad,v 1.10 2011/04/07 01:41:31 rh Exp $
+$NetBSD: patch-ad,v 1.11 2012/10/22 02:06:19 rh Exp $
 
-# This patch is a conglomeration of removing bash'isms to make
-# this work properly with pkgsrc and lesser /bin/sh's
-#
-# At the moment, this patch is not ready to be sent upstream
-# as it replaces some hard-coded entries with environment
-# variables provided by pkgsrc.  A proper upstream fix would
-# require re-modelling the corresponding pkgsrc logic from
-# scratch using configure macros
-
---- configure.orig	2010-03-13 19:41:20.000000000 +0000
+--- configure.orig	2011-05-03 15:28:07.000000000 +0000
 +++ configure
-@@ -2813,13 +2813,13 @@ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+@@ -2918,13 +2918,13 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
@@ -27,57 +18,21 @@ $NetBSD: patch-ad,v 1.10 2011/04/07 01:41:31 rh Exp $
      CFLAGS="-O2"
    else
      CFLAGS=
-@@ -5884,7 +5884,7 @@ fi
+@@ -5484,7 +5484,7 @@ fi
  
    fi
    if test x"$objc_threaded" = x""; then
 -    LIBS="$OBJCRT $saved_LIBS -lthread "
 +    LIBS="$OBJCRT $saved_LIBS ${OBJC_THREAD} "
-     if test "$cross_compiling" = yes; then
+     if test "$cross_compiling" = yes; then :
    objc_threaded=""
  else
-@@ -5965,7 +5965,7 @@ echo $ECHO_N "checking whether we should
- if test x"$USE_OBJC_EXCEPTIONS" = x"yes"; then
-   # What we want to do: set USE_OBJC_EXCEPTIONS to yes if we can compile
-   # something with @try/@catch/@finally in it.
--  if test ! ${GCC} = "yes" ; then
-+  if test "X${GCC}" != "Xyes" ; then
-     USE_OBJC_EXCEPTIONS=no
-     { echo "$as_me:$LINENO: result: no: compiler isn't gcc" >&5
- echo "${ECHO_T}no: compiler isn't gcc" >&6; }
-@@ -6162,7 +6162,7 @@ fi
- 
- { echo "$as_me:$LINENO: checking for the GCC version" >&5
- echo $ECHO_N "checking for the GCC version... $ECHO_C" >&6; }
--if test ! ${GCC} = "yes" ; then
-+if test "X${GCC}" != "Xyes" ; then
-   { echo "$as_me:$LINENO: result: no: it's not gcc" >&5
- echo "${ECHO_T}no: it's not gcc" >&6; }
- else
-@@ -6208,7 +6208,7 @@ AUTO_DEPENDENCIES=""
- if test "$CYGWIN" = yes; then
-   { echo "$as_me:$LINENO: result: no: autodependencies do not work on cygwin" >&5
- echo "${ECHO_T}no: autodependencies do not work on cygwin" >&6; }
--elif test ! ${GCC} = "yes" ; then
-+elif test "X${GCC}" != "Xyes" ; then
-   { echo "$as_me:$LINENO: result: no: it's not gcc" >&5
- echo "${ECHO_T}no: it's not gcc" >&6; }
- else
-@@ -6251,7 +6251,7 @@ GCC_WITH_PRECOMPILED_HEADERS="no"
- 
- # First, a preliminary test.  If this is not gcc, precompiled headers
- # are not supported.
--if test ! "${GCC}" = "yes" ; then
-+if test "X${GCC}" != "Xyes" ; then
-   { echo "$as_me:$LINENO: result: no: it's not gcc" >&5
- echo "${ECHO_T}no: it's not gcc" >&6; }
- else
-@@ -6293,7 +6293,7 @@ echo $ECHO_N "checking if the compiler r
- # set SOLARIS_SHARED to yes if gcc => 4.x
- 
- SOLARIS_SHARED=""
--if test ! ${GCC} = "yes" ; then
-+if test "X${GCC}" != "Xyes" ; then
-   { echo "$as_me:$LINENO: result: no: it's not gcc" >&5
- echo "${ECHO_T}no: it's not gcc" >&6; }
+@@ -5493,7 +5493,7 @@ else
+ #include "config_thread.m"
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+-  objc_threaded="-lthread"
++  objc_threaded="${OBJC_THREAD}"
  else
+   objc_threaded=""
+ fi
diff --git a/devel/gnustep-make/patches/patch-ae b/devel/gnustep-make/patches/patch-ae
index 9e79de46811..5603f244e22 100644
--- a/devel/gnustep-make/patches/patch-ae
+++ b/devel/gnustep-make/patches/patch-ae
@@ -1,15 +1,15 @@
-$NetBSD: patch-ae,v 1.8 2009/04/13 12:09:26 rh Exp $
+$NetBSD: patch-ae,v 1.9 2012/10/22 02:06:19 rh Exp $
 
---- GNUmakefile.in.orig	2008-10-22 00:45:48.000000000 +1000
+--- GNUmakefile.in.orig	2011-03-16 10:25:42.000000000 +0000
 +++ GNUmakefile.in
-@@ -171,9 +171,9 @@ install: generated-files
- 		"$(makedir)/Instance" \
+@@ -180,9 +180,9 @@ install: generated-files
  		"$(makedir)/Instance/Shared" \
- 		"$(makedir)/Instance/Documentation")
+ 		"$(makedir)/Instance/Documentation" \
+ 		"$(testdir)")
 -	$(EC)(echo "Installing GNUstep configuration file in $(GNUSTEP_CONFIG_FILE)"; \
 -	 "$(srcdir)/mkinstalldirs" "$(GNUSTEP_CONFIG_FILE_DIR)"; \
 -	 $(INSTALL_DATA) $(GNUSTEP_DOT_CONF_FILE) "$(GNUSTEP_CONFIG_FILE)")
-+	$(EC)(echo "Installing GNUstep configuration file"; \
++	$(EC)(echo "Installing GNUstep configuration file in ${DESTDIR}${PREFIX}/share/examples/GNUstep"; \
 +	 "$(srcdir)/mkinstalldirs" "${DESTDIR}${PREFIX}/share/examples/GNUstep"; \
 +	 $(INSTALL_DATA) $(GNUSTEP_DOT_CONF_FILE) "${DESTDIR}${PREFIX}/share/examples/GNUstep")
  	 $(EC)(echo "Installing gnustep-make support software")