Mon Oct 22 02:06:19 2012 UTC ()
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


(rh)
diff -r1.51 -r1.52 pkgsrc/devel/gnustep-make/Makefile
diff -r1.21 -r1.22 pkgsrc/devel/gnustep-make/PLIST
diff -r1.19 -r1.20 pkgsrc/devel/gnustep-make/buildlink3.mk
diff -r1.25 -r1.26 pkgsrc/devel/gnustep-make/distinfo
diff -r1.20 -r1.21 pkgsrc/devel/gnustep-make/gnustep.mk
diff -r1.10 -r1.11 pkgsrc/devel/gnustep-make/patches/patch-ad
diff -r1.8 -r1.9 pkgsrc/devel/gnustep-make/patches/patch-ae
cvs diff -r1.51 -r1.52 pkgsrc/devel/gnustep-make/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-make/Makefile 2011/04/07 01:41:31 1.51
+++ pkgsrc/devel/gnustep-make/Makefile 2012/10/22 02:06:19 1.52
@@ -1,61 +1,71 @@ @@ -1,61 +1,71 @@
1# $NetBSD: Makefile,v 1.51 2011/04/07 01:41:31 rh Exp $ 1# $NetBSD: Makefile,v 1.52 2012/10/22 02:06:19 rh Exp $
2 2
3DISTNAME= gnustep-make-2.4.0 3DISTNAME= gnustep-make-2.6.2
4CATEGORIES= devel gnustep 4CATEGORIES= devel gnustep
5MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/} 5MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
6 6
7MAINTAINER= rh@NetBSD.org 7MAINTAINER= rh@NetBSD.org
8HOMEPAGE= http://www.gnustep.org/ 8HOMEPAGE= http://www.gnustep.org/
9COMMENT= GNUstep makefile package 9COMMENT= GNUstep makefile package
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14 14
15USE_LANGUAGES= objc 15USE_LANGUAGES+= c99 objc c++ obj-c++
16USE_TOOLS+= csh 16USE_TOOLS+= csh
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q} 18CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
19CONFIGURE_ARGS+= --disable-importing-config-file 19CONFIGURE_ARGS+= --disable-importing-config-file
20CONFIGURE_ARGS+= --with-layout=fhs 20CONFIGURE_ARGS+= --with-layout=fhs
 21CONFIGURE_ARGS+= --enable-native-objc-exceptions
21CONFIGURE_ARGS+= --with-config-file=${PKG_SYSCONFDIR}/GNUstep.conf 22CONFIGURE_ARGS+= --with-config-file=${PKG_SYSCONFDIR}/GNUstep.conf
 23CONFIGURE_ARGS+= --with-objc-lib-flag="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lobjc"
22MAKE_FILE= GNUmakefile 24MAKE_FILE= GNUmakefile
23 25
24CONF_FILES+= ${PREFIX}/share/examples/GNUstep/GNUstep.conf \ 26CONF_FILES+= ${PREFIX}/share/examples/GNUstep/GNUstep.conf \
25 ${PKG_SYSCONFDIR}/GNUstep.conf 27 ${PKG_SYSCONFDIR}/GNUstep.conf
26 28
 29.include "gnustep.mk"
27.include "../../mk/pthread.buildlink3.mk" 30.include "../../mk/pthread.buildlink3.mk"
28 31
29.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 32.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
30PTHREAD_LIBS+= -lpth 33PTHREAD_LIBS+= -lpth
31.endif 34.endif
32 35
33CONFIGURE_ARGS+= --with-thread-lib=${PTHREAD_LIBS:Q} 36CONFIGURE_ARGS+= --with-thread-lib=${PTHREAD_LIBS:Q}
34 37.if empty(PKG_OPTIONS:Mfragile)
35.include "gnustep.mk" 38CONFIGURE_ARGS+= --enable-objc-nonfragile-abi
 39.endif
36 40
37.if ${MACHINE_ARCH} == "i386" 41.if ${MACHINE_ARCH} == "i386"
38GNUSTEP_ARCH= ix86 42GNUSTEP_ARCH= ix86
39.else 43.else
40GNUSTEP_ARCH= ${MACHINE_ARCH} 44GNUSTEP_ARCH= ${MACHINE_ARCH}
41.endif 45.endif
42PLIST_SUBST+= GNUSTEP_ARCH=${GNUSTEP_ARCH} 46PLIST_SUBST+= GNUSTEP_ARCH=${GNUSTEP_ARCH}
43 47
44SUBST_CLASSES+= target 48SUBST_CLASSES+= target
45SUBST_STAGE.target= post-patch 49SUBST_STAGE.target= post-patch
46SUBST_FILES.target= target.make 50SUBST_FILES.target= target.make
47SUBST_SED.target+= -e 's|/usr/pkg|${PREFIX}|g' 51SUBST_SED.target+= -e 's|/usr/pkg|${PREFIX}|g'
48 52
49SUBST_CLASSES+= maninfo 53SUBST_CLASSES+= maninfo
50SUBST_STAGE.maninfo= pre-configure 54SUBST_STAGE.maninfo= pre-configure
51SUBST_MESSAGE.maninfo= Fixing man directory references. 55SUBST_MESSAGE.maninfo= Fixing man directory references.
52SUBST_FILES.maninfo= ${WRKSRC}/FilesystemLayouts/fhs 56SUBST_FILES.maninfo= ${WRKSRC}/FilesystemLayouts/fhs
53SUBST_SED.maninfo= -e 's|share/man|${PKGMANDIR}|' 57SUBST_SED.maninfo= -e 's|share/man|${PKGMANDIR}|'
54SUBST_SED.maninfo+= -e 's|share/info|${PKGINFODIR}|' 58SUBST_SED.maninfo+= -e 's|share/info|${PKGINFODIR}|'
55 59
 60SUBST_CLASSES+= unwrapping
 61SUBST_STAGE.unwrapping= post-build
 62SUBST_MESSAGE.unwrapping=Unwrapping wrapper scripts.
 63SUBST_FILES.unwrapping= TestFramework/gnustep-tests
 64SUBST_SED.unwrapping= -e 's|${TOOLS_DIR}|${PREFIX}|g'
 65
56INSTALLATION_DIRS+= share/GNUstep/Library 66INSTALLATION_DIRS+= share/GNUstep/Library
57INSTALLATION_DIRS+= share/GNUstep/Makefiles/${GNUSTEP_ARCH} 67INSTALLATION_DIRS+= share/GNUstep/Makefiles/${GNUSTEP_ARCH}
58INSTALLATION_DIRS+= share/GNUstep/Makefiles/Additional 68INSTALLATION_DIRS+= share/GNUstep/Makefiles/Additional
59INSTALLATION_DIRS+= share/GNUstep/Makefiles/Auxiliary 69INSTALLATION_DIRS+= share/GNUstep/Makefiles/Auxiliary
60 70
61.include "../../mk/bsd.pkg.mk" 71.include "../../mk/bsd.pkg.mk"
cvs diff -r1.21 -r1.22 pkgsrc/devel/gnustep-make/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-make/PLIST 2011/04/07 01:41:31 1.21
+++ pkgsrc/devel/gnustep-make/PLIST 2012/10/22 02:06:19 1.22
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1@comment $NetBSD: PLIST,v 1.21 2011/04/07 01:41:31 rh Exp $ 1@comment $NetBSD: PLIST,v 1.22 2012/10/22 02:06:19 rh Exp $
2bin/debugapp 2bin/debugapp
3bin/gnustep-config 3bin/gnustep-config
 4bin/gnustep-tests
4bin/openapp 5bin/openapp
5bin/opentool 6bin/opentool
6man/man1/debugapp.1 7man/man1/debugapp.1
7man/man1/gnustep-config.1 8man/man1/gnustep-config.1
8man/man1/openapp.1 9man/man1/openapp.1
9man/man1/opentool.1 10man/man1/opentool.1
10man/man7/GNUstep.7 11man/man7/GNUstep.7
11man/man7/library-combo.7 12man/man7/library-combo.7
12share/GNUstep/Makefiles/GNUstep-reset.sh 13share/GNUstep/Makefiles/GNUstep-reset.sh
13share/GNUstep/Makefiles/GNUstep.csh 14share/GNUstep/Makefiles/GNUstep.csh
14share/GNUstep/Makefiles/GNUstep.sh 15share/GNUstep/Makefiles/GNUstep.sh
15share/GNUstep/Makefiles/Instance/Documentation/autogsdoc.make 16share/GNUstep/Makefiles/Instance/Documentation/autogsdoc.make
16share/GNUstep/Makefiles/Instance/Documentation/gsdoc.make 17share/GNUstep/Makefiles/Instance/Documentation/gsdoc.make
@@ -60,26 +61,40 @@ share/GNUstep/Makefiles/Master/objc.make @@ -60,26 +61,40 @@ share/GNUstep/Makefiles/Master/objc.make
60share/GNUstep/Makefiles/Master/palette.make 61share/GNUstep/Makefiles/Master/palette.make
61share/GNUstep/Makefiles/Master/parallel-subdirectories.make 62share/GNUstep/Makefiles/Master/parallel-subdirectories.make
62share/GNUstep/Makefiles/Master/resource-set.make 63share/GNUstep/Makefiles/Master/resource-set.make
63share/GNUstep/Makefiles/Master/rpm.make 64share/GNUstep/Makefiles/Master/rpm.make
64share/GNUstep/Makefiles/Master/rules.make 65share/GNUstep/Makefiles/Master/rules.make
65share/GNUstep/Makefiles/Master/serial-subdirectories.make 66share/GNUstep/Makefiles/Master/serial-subdirectories.make
66share/GNUstep/Makefiles/Master/service.make 67share/GNUstep/Makefiles/Master/service.make
67share/GNUstep/Makefiles/Master/source-distribution.make 68share/GNUstep/Makefiles/Master/source-distribution.make
68share/GNUstep/Makefiles/Master/subproject.make 69share/GNUstep/Makefiles/Master/subproject.make
69share/GNUstep/Makefiles/Master/test-application.make 70share/GNUstep/Makefiles/Master/test-application.make
70share/GNUstep/Makefiles/Master/test-library.make 71share/GNUstep/Makefiles/Master/test-library.make
71share/GNUstep/Makefiles/Master/test-tool.make 72share/GNUstep/Makefiles/Master/test-tool.make
72share/GNUstep/Makefiles/Master/tool.make 73share/GNUstep/Makefiles/Master/tool.make
 74share/GNUstep/Makefiles/TestFramework/GNUmakefile.in
 75share/GNUstep/Makefiles/TestFramework/ObjectTesting.h
 76share/GNUstep/Makefiles/TestFramework/README
 77share/GNUstep/Makefiles/TestFramework/Summary.sh
 78share/GNUstep/Makefiles/TestFramework/Testing.h
 79share/GNUstep/Makefiles/TestFramework/example1.m
 80share/GNUstep/Makefiles/TestFramework/example2.m
 81share/GNUstep/Makefiles/TestFramework/example3.m
 82share/GNUstep/Makefiles/TestFramework/example4.m
 83share/GNUstep/Makefiles/TestFramework/example5.m
 84share/GNUstep/Makefiles/TestFramework/example6.m
 85share/GNUstep/Makefiles/TestFramework/example7.m
 86share/GNUstep/Makefiles/TestFramework/example8.m
 87share/GNUstep/Makefiles/TestFramework/example9.m
73share/GNUstep/Makefiles/aggregate.make 88share/GNUstep/Makefiles/aggregate.make
74share/GNUstep/Makefiles/app-wrapper.template 89share/GNUstep/Makefiles/app-wrapper.template
75share/GNUstep/Makefiles/application.make 90share/GNUstep/Makefiles/application.make
76share/GNUstep/Makefiles/bundle.make 91share/GNUstep/Makefiles/bundle.make
77share/GNUstep/Makefiles/clean_cpu.sh 92share/GNUstep/Makefiles/clean_cpu.sh
78share/GNUstep/Makefiles/clean_os.sh 93share/GNUstep/Makefiles/clean_os.sh
79share/GNUstep/Makefiles/clean_vendor.sh 94share/GNUstep/Makefiles/clean_vendor.sh
80share/GNUstep/Makefiles/clibrary.make 95share/GNUstep/Makefiles/clibrary.make
81share/GNUstep/Makefiles/common.make 96share/GNUstep/Makefiles/common.make
82share/GNUstep/Makefiles/config-noarch.make 97share/GNUstep/Makefiles/config-noarch.make
83share/GNUstep/Makefiles/config.guess 98share/GNUstep/Makefiles/config.guess
84share/GNUstep/Makefiles/config.make 99share/GNUstep/Makefiles/config.make
85share/GNUstep/Makefiles/config.sub 100share/GNUstep/Makefiles/config.sub
cvs diff -r1.19 -r1.20 pkgsrc/devel/gnustep-make/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-make/buildlink3.mk 2012/05/07 01:53:22 1.19
+++ pkgsrc/devel/gnustep-make/buildlink3.mk 2012/10/22 02:06:19 1.20
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.19 2012/05/07 01:53:22 dholland Exp $ 1# $NetBSD: buildlink3.mk,v 1.20 2012/10/22 02:06:19 rh Exp $
2 2
3BUILDLINK_TREE+= gnustep-make 3BUILDLINK_TREE+= gnustep-make
4 4
5.if !defined(GNUSTEP_MAKE_BUILDLINK3_MK) 5.if !defined(GNUSTEP_MAKE_BUILDLINK3_MK)
6GNUSTEP_MAKE_BUILDLINK3_MK:= 6GNUSTEP_MAKE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gnustep-make+= gnustep-make>=2.4.0 8BUILDLINK_API_DEPENDS.gnustep-make+= gnustep-make>=2.6.2
9BUILDLINK_ABI_DEPENDS.gnustep-make+= gnustep-make>=2.4.0 9BUILDLINK_ABI_DEPENDS.gnustep-make+= gnustep-make>=2.6.2
10BUILDLINK_PKGSRCDIR.gnustep-make?= ../../devel/gnustep-make 10BUILDLINK_PKGSRCDIR.gnustep-make?= ../../devel/gnustep-make
11 11
12.include "../../devel/gnustep-make/gnustep.mk" 12.include "../../devel/gnustep-make/gnustep.mk"
13 13
14BUILDLINK_LIBDIRS.gnustep-make= lib ${GNUSTEP_BLDIRS} 14BUILDLINK_LIBDIRS.gnustep-make= lib ${GNUSTEP_BLDIRS}
15BUILDLINK_INCDIRS.gnustep-make= include ${GNUSTEP_BIDIRS} 15BUILDLINK_INCDIRS.gnustep-make= include ${GNUSTEP_BIDIRS}
16.endif # GNUSTEP_MAKE_BUILDLINK3_MK 16.endif # GNUSTEP_MAKE_BUILDLINK3_MK
17 17
18BUILDLINK_TREE+= -gnustep-make 18BUILDLINK_TREE+= -gnustep-make
cvs diff -r1.25 -r1.26 pkgsrc/devel/gnustep-make/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-make/distinfo 2011/04/07 01:41:31 1.25
+++ pkgsrc/devel/gnustep-make/distinfo 2012/10/22 02:06:19 1.26
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.25 2011/04/07 01:41:31 rh Exp $ 1$NetBSD: distinfo,v 1.26 2012/10/22 02:06:19 rh Exp $
2 2
3SHA1 (gnustep-make-2.4.0.tar.gz) = afda14186394c65b0871dba93f92dc965b2fc724 3SHA1 (gnustep-make-2.6.2.tar.gz) = 3f85cb25f4f7fd35cdcbd8d948a2673c84c605ff
4RMD160 (gnustep-make-2.4.0.tar.gz) = 6f1dd81039c9935e41eb7988923c3b3c6507e383 4RMD160 (gnustep-make-2.6.2.tar.gz) = 683b6a034d4bb7e17b64209c7e7e289e9e94a042
5Size (gnustep-make-2.4.0.tar.gz) = 521818 bytes 5Size (gnustep-make-2.6.2.tar.gz) = 562770 bytes
6SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b 6SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
7SHA1 (patch-ab) = ac45dbe789292feb263cbde11fc8bdaf2e0cb71d 7SHA1 (patch-ab) = ac45dbe789292feb263cbde11fc8bdaf2e0cb71d
8SHA1 (patch-ad) = 2fbb4459bfe9a3bde83c6dc14fde5363ee01aad8 8SHA1 (patch-ad) = 8e4d864a05ea824ff5243c87ef9d6f43892ca661
9SHA1 (patch-ae) = 96948468119a93e557f79d12b522ebd0ad4647a4 9SHA1 (patch-ae) = f91fb89ab2c11b73592bae7fe62476e7a353d8d8
cvs diff -r1.20 -r1.21 pkgsrc/devel/gnustep-make/gnustep.mk (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-make/gnustep.mk 2009/12/28 10:49:23 1.20
+++ pkgsrc/devel/gnustep-make/gnustep.mk 2012/10/22 02:06:19 1.21
@@ -1,19 +1,31 @@ @@ -1,19 +1,31 @@
1# $NetBSD: gnustep.mk,v 1.20 2009/12/28 10:49:23 obache Exp $ 1# $NetBSD: gnustep.mk,v 1.21 2012/10/22 02:06:19 rh Exp $
2 2
3.if !defined(GNUSTEP_MK) 3.if !defined(GNUSTEP_MK)
4GNUSTEP_MK= #defined 4GNUSTEP_MK= #defined
5 5
6.include "../../mk/bsd.prefs.mk" 6.ifndef GNUSTEP_SKIP_DEFAULT_OPTIONS
 7PKG_OPTIONS_VAR?= PKG_OPTIONS.gnustep
 8PKG_SUPPORTED_OPTIONS+= fragile
 9PKGSRC_COMPILER+= clang
 10
 11.include "../../mk/bsd.options.mk"
 12
 13.if empty(PKG_OPTIONS:Mfragile)
 14ONLY_FOR_COMPILER= clang
 15BUILDLINK_API_DEPENDS.clang+= clang>=3.1
 16.include "../../lang/clang/buildlink3.mk"
 17.endif
 18.endif
7 19
8GNUSTEP_SUBDIR= share/GNUstep 20GNUSTEP_SUBDIR= share/GNUstep
9GNUSTEP_ROOT= ${PREFIX} 21GNUSTEP_ROOT= ${PREFIX}
10GNUSTEP_LIB_DIR= ${GNUSTEP_ROOT}/lib/GNUstep 22GNUSTEP_LIB_DIR= ${GNUSTEP_ROOT}/lib/GNUstep
11GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_ROOT}/System 23GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_ROOT}/System
12GNUSTEP_LOCAL_ROOT= ${GNUSTEP_ROOT}/Local 24GNUSTEP_LOCAL_ROOT= ${GNUSTEP_ROOT}/Local
13GNUSTEP_NETWORK_ROOT= ${GNUSTEP_ROOT}/Network 25GNUSTEP_NETWORK_ROOT= ${GNUSTEP_ROOT}/Network
14GNUSTEP_MAKEFILES= ${GNUSTEP_ROOT}/${GNUSTEP_SUBDIR}/Makefiles 26GNUSTEP_MAKEFILES= ${GNUSTEP_ROOT}/${GNUSTEP_SUBDIR}/Makefiles
15GNUSTEP_HOST= ${MACHINE_GNU_PLATFORM} 27GNUSTEP_HOST= ${MACHINE_GNU_PLATFORM}
16GNUSTEP_HOST_CPU= ${MACHINE_GNU_ARCH:S/i386/ix86/} 28GNUSTEP_HOST_CPU= ${MACHINE_GNU_ARCH:S/i386/ix86/}
17GNUSTEP_HOST_VENDOR= ${LOWER_VENDOR} 29GNUSTEP_HOST_VENDOR= ${LOWER_VENDOR}
18GNUSTEP_HOST_OS= ${LOWER_OPSYS} 30GNUSTEP_HOST_OS= ${LOWER_OPSYS}
19GNUSTEP_CONFIG_FILE= ${PKG_SYSCONFDIR}/GNUstep.conf 31GNUSTEP_CONFIG_FILE= ${PKG_SYSCONFDIR}/GNUstep.conf
cvs diff -r1.10 -r1.11 pkgsrc/devel/gnustep-make/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-make/patches/patch-ad 2011/04/07 01:41:31 1.10
+++ pkgsrc/devel/gnustep-make/patches/patch-ad 2012/10/22 02:06:19 1.11
@@ -1,83 +1,38 @@ @@ -1,83 +1,38 @@
1$NetBSD: patch-ad,v 1.10 2011/04/07 01:41:31 rh Exp $ 1$NetBSD: patch-ad,v 1.11 2012/10/22 02:06:19 rh Exp $
2 2
3# This patch is a conglomeration of removing bash'isms to make 3--- configure.orig 2011-05-03 15:28:07.000000000 +0000
4# this work properly with pkgsrc and lesser /bin/sh's 
5# 
6# At the moment, this patch is not ready to be sent upstream 
7# as it replaces some hard-coded entries with environment 
8# variables provided by pkgsrc. A proper upstream fix would 
9# require re-modelling the corresponding pkgsrc logic from 
10# scratch using configure macros 
11 
12--- configure.orig 2010-03-13 19:41:20.000000000 +0000 
13+++ configure 4+++ configure
14@@ -2813,13 +2813,13 @@ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } 5@@ -2918,13 +2918,13 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
15 if test "$ac_test_CFLAGS" = set; then 6 if test "$ac_test_CFLAGS" = set; then
16 CFLAGS=$ac_save_CFLAGS 7 CFLAGS=$ac_save_CFLAGS
17 elif test $ac_cv_prog_cc_g = yes; then 8 elif test $ac_cv_prog_cc_g = yes; then
18- if test "$GCC" = yes; then 9- if test "$GCC" = yes; then
19+ if test "X${GCC}" = "Xyes" ; then 10+ if test "X${GCC}" = "Xyes" ; then
20 CFLAGS="-g -O2" 11 CFLAGS="-g -O2"
21 else 12 else
22 CFLAGS="-g" 13 CFLAGS="-g"
23 fi 14 fi
24 else 15 else
25- if test "$GCC" = yes; then 16- if test "$GCC" = yes; then
26+ if test "X${GCC}" = "Xyes" ; then 17+ if test "X${GCC}" = "Xyes" ; then
27 CFLAGS="-O2" 18 CFLAGS="-O2"
28 else 19 else
29 CFLAGS= 20 CFLAGS=
30@@ -5884,7 +5884,7 @@ fi 21@@ -5484,7 +5484,7 @@ fi
31  22
32 fi 23 fi
33 if test x"$objc_threaded" = x""; then 24 if test x"$objc_threaded" = x""; then
34- LIBS="$OBJCRT $saved_LIBS -lthread " 25- LIBS="$OBJCRT $saved_LIBS -lthread "
35+ LIBS="$OBJCRT $saved_LIBS ${OBJC_THREAD} " 26+ LIBS="$OBJCRT $saved_LIBS ${OBJC_THREAD} "
36 if test "$cross_compiling" = yes; then 27 if test "$cross_compiling" = yes; then :
37 objc_threaded="" 28 objc_threaded=""
38 else 29 else
39@@ -5965,7 +5965,7 @@ echo $ECHO_N "checking whether we should 30@@ -5493,7 +5493,7 @@ else
40 if test x"$USE_OBJC_EXCEPTIONS" = x"yes"; then 31 #include "config_thread.m"
41 # What we want to do: set USE_OBJC_EXCEPTIONS to yes if we can compile 32 _ACEOF
42 # something with @try/@catch/@finally in it. 33 if ac_fn_c_try_run "$LINENO"; then :
43- if test ! ${GCC} = "yes" ; then 34- objc_threaded="-lthread"
44+ if test "X${GCC}" != "Xyes" ; then 35+ objc_threaded="${OBJC_THREAD}"
45 USE_OBJC_EXCEPTIONS=no 
46 { echo "$as_me:$LINENO: result: no: compiler isn't gcc" >&5 
47 echo "${ECHO_T}no: compiler isn't gcc" >&6; } 
48@@ -6162,7 +6162,7 @@ fi 
49  
50 { echo "$as_me:$LINENO: checking for the GCC version" >&5 
51 echo $ECHO_N "checking for the GCC version... $ECHO_C" >&6; } 
52-if test ! ${GCC} = "yes" ; then 
53+if test "X${GCC}" != "Xyes" ; then 
54 { echo "$as_me:$LINENO: result: no: it's not gcc" >&5 
55 echo "${ECHO_T}no: it's not gcc" >&6; } 
56 else 
57@@ -6208,7 +6208,7 @@ AUTO_DEPENDENCIES="" 
58 if test "$CYGWIN" = yes; then 
59 { echo "$as_me:$LINENO: result: no: autodependencies do not work on cygwin" >&5 
60 echo "${ECHO_T}no: autodependencies do not work on cygwin" >&6; } 
61-elif test ! ${GCC} = "yes" ; then 
62+elif test "X${GCC}" != "Xyes" ; then 
63 { echo "$as_me:$LINENO: result: no: it's not gcc" >&5 
64 echo "${ECHO_T}no: it's not gcc" >&6; } 
65 else 
66@@ -6251,7 +6251,7 @@ GCC_WITH_PRECOMPILED_HEADERS="no" 
67  
68 # First, a preliminary test. If this is not gcc, precompiled headers 
69 # are not supported. 
70-if test ! "${GCC}" = "yes" ; then 
71+if test "X${GCC}" != "Xyes" ; then 
72 { echo "$as_me:$LINENO: result: no: it's not gcc" >&5 
73 echo "${ECHO_T}no: it's not gcc" >&6; } 
74 else 
75@@ -6293,7 +6293,7 @@ echo $ECHO_N "checking if the compiler r 
76 # set SOLARIS_SHARED to yes if gcc => 4.x 
77  
78 SOLARIS_SHARED="" 
79-if test ! ${GCC} = "yes" ; then 
80+if test "X${GCC}" != "Xyes" ; then 
81 { echo "$as_me:$LINENO: result: no: it's not gcc" >&5 
82 echo "${ECHO_T}no: it's not gcc" >&6; } 
83 else 36 else
 37 objc_threaded=""
 38 fi
cvs diff -r1.8 -r1.9 pkgsrc/devel/gnustep-make/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-make/patches/patch-ae 2009/04/13 12:09:26 1.8
+++ pkgsrc/devel/gnustep-make/patches/patch-ae 2012/10/22 02:06:19 1.9
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ae,v 1.8 2009/04/13 12:09:26 rh Exp $ 1$NetBSD: patch-ae,v 1.9 2012/10/22 02:06:19 rh Exp $
2 2
3--- GNUmakefile.in.orig 2008-10-22 00:45:48.000000000 +1000 3--- GNUmakefile.in.orig 2011-03-16 10:25:42.000000000 +0000
4+++ GNUmakefile.in 4+++ GNUmakefile.in
5@@ -171,9 +171,9 @@ install: generated-files 5@@ -180,9 +180,9 @@ install: generated-files
6 "$(makedir)/Instance" \ 
7 "$(makedir)/Instance/Shared" \ 6 "$(makedir)/Instance/Shared" \
8 "$(makedir)/Instance/Documentation") 7 "$(makedir)/Instance/Documentation" \
 8 "$(testdir)")
9- $(EC)(echo "Installing GNUstep configuration file in $(GNUSTEP_CONFIG_FILE)"; \ 9- $(EC)(echo "Installing GNUstep configuration file in $(GNUSTEP_CONFIG_FILE)"; \
10- "$(srcdir)/mkinstalldirs" "$(GNUSTEP_CONFIG_FILE_DIR)"; \ 10- "$(srcdir)/mkinstalldirs" "$(GNUSTEP_CONFIG_FILE_DIR)"; \
11- $(INSTALL_DATA) $(GNUSTEP_DOT_CONF_FILE) "$(GNUSTEP_CONFIG_FILE)") 11- $(INSTALL_DATA) $(GNUSTEP_DOT_CONF_FILE) "$(GNUSTEP_CONFIG_FILE)")
12+ $(EC)(echo "Installing GNUstep configuration file"; \ 12+ $(EC)(echo "Installing GNUstep configuration file in ${DESTDIR}${PREFIX}/share/examples/GNUstep"; \
13+ "$(srcdir)/mkinstalldirs" "${DESTDIR}${PREFIX}/share/examples/GNUstep"; \ 13+ "$(srcdir)/mkinstalldirs" "${DESTDIR}${PREFIX}/share/examples/GNUstep"; \
14+ $(INSTALL_DATA) $(GNUSTEP_DOT_CONF_FILE) "${DESTDIR}${PREFIX}/share/examples/GNUstep") 14+ $(INSTALL_DATA) $(GNUSTEP_DOT_CONF_FILE) "${DESTDIR}${PREFIX}/share/examples/GNUstep")
15 $(EC)(echo "Installing gnustep-make support software") 15 $(EC)(echo "Installing gnustep-make support software")
16 $(EC)(for f in config.guess config.sub install-sh mkinstalldirs \ 16 $(EC)(for f in config.guess config.sub install-sh mkinstalldirs \
17 clean_cpu.sh clean_os.sh \ 17 clean_cpu.sh clean_os.sh \