Changes 1.13.0:

Debug libraries now have the same name as normal libraries (i.e. no "_d"
suffix). This reduces the possiblity of multiple libraries being loaded
into the same executable.

   Added dragonfly OS to make targets.

   Spaces and backslashes are no longer allowed in paths used by the
make package (e.g. with Windows OS). The libraries can still use native
paths.

10 files changed, 70 insertions, 84 deletions

diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile
index 100e8a4c3a1..1751f5ecc10 100644
--- a/devel/gnustep-base/Makefile
+++ b/devel/gnustep-base/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2006/07/22 05:10:54 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2006/08/30 14:55:00 adam Exp $
 
-DISTNAME=	gnustep-base-1.12.0
+DISTNAME=	gnustep-base-1.13.0
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -22,7 +22,7 @@ SUBST_FILES.pthread=	configure base.make.in
 SUBST_SED.pthread=	-e 's|@PTHREAD_LIBS@|${PTHREAD_LIBS}|g'
 
 pre-configure:
-	${SED} 's|@PREFIX@|${PREFIX}|g' <${FILESDIR:Q}/openapp >${WRKDIR:Q}/openapp
+	sed 's|@PREFIX@|${PREFIX}|g' <${FILESDIR:Q}/openapp >${WRKDIR:Q}/openapp
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR:Q}/openapp ${PREFIX:Q}/bin
diff --git a/devel/gnustep-base/PLIST b/devel/gnustep-base/PLIST
index 6f0ec00672e..ebb3a83da89 100644
--- a/devel/gnustep-base/PLIST
+++ b/devel/gnustep-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/04/03 18:20:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2006/08/30 14:55:00 adam Exp $
 bin/openapp
 share/GNUstep/System/Library/Bundles/SSL.bundle/Resources/Info-gnustep.plist
 share/GNUstep/System/Library/Bundles/SSL.bundle/SSL
@@ -34,6 +34,8 @@ share/GNUstep/System/Library/Headers/Foundation/NSCalendarDate.h
 share/GNUstep/System/Library/Headers/Foundation/NSCharacterSet.h
 share/GNUstep/System/Library/Headers/Foundation/NSClassDescription.h
 share/GNUstep/System/Library/Headers/Foundation/NSCoder.h
+share/GNUstep/System/Library/Headers/Foundation/NSComparisonPredicate.h
+share/GNUstep/System/Library/Headers/Foundation/NSCompoundPredicate.h
 share/GNUstep/System/Library/Headers/Foundation/NSConnection.h
 share/GNUstep/System/Library/Headers/Foundation/NSData.h
 share/GNUstep/System/Library/Headers/Foundation/NSDate.h
@@ -48,10 +50,13 @@ share/GNUstep/System/Library/Headers/Foundation/NSDistributedNotificationCenter.
 share/GNUstep/System/Library/Headers/Foundation/NSEnumerator.h
 share/GNUstep/System/Library/Headers/Foundation/NSError.h
 share/GNUstep/System/Library/Headers/Foundation/NSException.h
+share/GNUstep/System/Library/Headers/Foundation/NSExpression.h
 share/GNUstep/System/Library/Headers/Foundation/NSFileHandle.h
 share/GNUstep/System/Library/Headers/Foundation/NSFileManager.h
 share/GNUstep/System/Library/Headers/Foundation/NSFormatter.h
 share/GNUstep/System/Library/Headers/Foundation/NSGeometry.h
+share/GNUstep/System/Library/Headers/Foundation/NSHTTPCookie.h
+share/GNUstep/System/Library/Headers/Foundation/NSHTTPCookieStorage.h
 share/GNUstep/System/Library/Headers/Foundation/NSHashTable.h
 share/GNUstep/System/Library/Headers/Foundation/NSHost.h
 share/GNUstep/System/Library/Headers/Foundation/NSIndexPath.h
@@ -74,6 +79,7 @@ share/GNUstep/System/Library/Headers/Foundation/NSPort.h
 share/GNUstep/System/Library/Headers/Foundation/NSPortCoder.h
 share/GNUstep/System/Library/Headers/Foundation/NSPortMessage.h
 share/GNUstep/System/Library/Headers/Foundation/NSPortNameServer.h
+share/GNUstep/System/Library/Headers/Foundation/NSPredicate.h
 share/GNUstep/System/Library/Headers/Foundation/NSProcessInfo.h
 share/GNUstep/System/Library/Headers/Foundation/NSPropertyList.h
 share/GNUstep/System/Library/Headers/Foundation/NSProtocolChecker.h
@@ -91,7 +97,18 @@ share/GNUstep/System/Library/Headers/Foundation/NSThread.h
 share/GNUstep/System/Library/Headers/Foundation/NSTimeZone.h
 share/GNUstep/System/Library/Headers/Foundation/NSTimer.h
 share/GNUstep/System/Library/Headers/Foundation/NSURL.h
+share/GNUstep/System/Library/Headers/Foundation/NSURLAuthenticationChallenge.h
+share/GNUstep/System/Library/Headers/Foundation/NSURLCache.h
+share/GNUstep/System/Library/Headers/Foundation/NSURLConnection.h
+share/GNUstep/System/Library/Headers/Foundation/NSURLCredential.h
+share/GNUstep/System/Library/Headers/Foundation/NSURLCredentialStorage.h
+share/GNUstep/System/Library/Headers/Foundation/NSURLDownload.h
+share/GNUstep/System/Library/Headers/Foundation/NSURLError.h
 share/GNUstep/System/Library/Headers/Foundation/NSURLHandle.h
+share/GNUstep/System/Library/Headers/Foundation/NSURLProtectionSpace.h
+share/GNUstep/System/Library/Headers/Foundation/NSURLProtocol.h
+share/GNUstep/System/Library/Headers/Foundation/NSURLRequest.h
+share/GNUstep/System/Library/Headers/Foundation/NSURLResponse.h
 share/GNUstep/System/Library/Headers/Foundation/NSUndoManager.h
 share/GNUstep/System/Library/Headers/Foundation/NSUserDefaults.h
 share/GNUstep/System/Library/Headers/Foundation/NSUtilities.h
@@ -146,23 +163,28 @@ share/GNUstep/System/Library/Headers/gnustep/unicode/decomp.h
 share/GNUstep/System/Library/Headers/gnustep/unicode/latin2.h
 share/GNUstep/System/Library/Headers/gnustep/unicode/nextstep.h
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/English.lproj/Localizable.strings
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Esperanto.lproj/Localizable.strings
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/French.lproj/Localizable.strings
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/German.lproj/Localizable.strings
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Info-gnustep.plist
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Italian.lproj/Localizable.strings
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Korean.lproj/Localizable.strings
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/Dutch
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/English
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/Esperanto
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/French
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/German
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/Hungarian
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/Italian
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/Korean
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/Locale.aliases
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/Locale.encodings
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/Russian
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/Slovak
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/Spanish
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/TraditionalChinese
-share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/UkraineRussian
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages/Ukrainian
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/.README.swp
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/GNUmakefile
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/GNUstep_zones
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/README
@@ -242,11 +264,13 @@ share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Ushuaia
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Aruba
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Asuncion
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Atikokan
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Atka
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Bahia
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Barbados
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Belem
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Belize
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Blanc-Sablon
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Boa_Vista
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Bogota
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Boise
@@ -329,6 +353,7 @@ share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Nome
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Noronha
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/North_Dakota/Center
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/North_Dakota/New_Salem
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Panama
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Pangnirtung
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Paramaribo
@@ -570,8 +595,11 @@ share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Copenhagen
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Dublin
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Gibraltar
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Guernsey
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Helsinki
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Isle_of_Man
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Istanbul
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Jersey
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Kaliningrad
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Kiev
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Lisbon
@@ -605,6 +633,7 @@ share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Vatican
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Vienna
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Vilnius
+share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Volgograd
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Warsaw
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Zagreb
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Zaporozhye
@@ -755,6 +784,7 @@ share/GNUstep/System/Tools/gdnc
 share/GNUstep/System/Tools/gdomap
 share/GNUstep/System/Tools/gspath
 share/GNUstep/System/Tools/make_strings
+share/GNUstep/System/Tools/objctidy
 share/GNUstep/System/Tools/pl
 share/GNUstep/System/Tools/pl2link
 share/GNUstep/System/Tools/pldes
@@ -790,9 +820,11 @@ share/GNUstep/System/Tools/xmlparse
 @dirrm share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones
 @dirrm share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones
 @dirrm share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Languages
+@dirrm share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Korean.lproj
 @dirrm share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Italian.lproj
 @dirrm share/GNUstep/System/Library/Libraries/Resources/gnustep-base/German.lproj
 @dirrm share/GNUstep/System/Library/Libraries/Resources/gnustep-base/French.lproj
+@dirrm share/GNUstep/System/Library/Libraries/Resources/gnustep-base/Esperanto.lproj
 @dirrm share/GNUstep/System/Library/Libraries/Resources/gnustep-base/English.lproj
 @dirrm share/GNUstep/System/Library/Libraries/Resources/gnustep-base
 @dirrm share/GNUstep/System/Library/Headers/gnustep/unicode
diff --git a/devel/gnustep-base/distinfo b/devel/gnustep-base/distinfo
index 9882d306081..eb7930ab7a1 100644
--- a/devel/gnustep-base/distinfo
+++ b/devel/gnustep-base/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2006/04/03 18:20:50 adam Exp $
+$NetBSD: distinfo,v 1.20 2006/08/30 14:55:00 adam Exp $
 
-SHA1 (gnustep-base-1.12.0.tar.gz) = 46d7dd5e97cc833147bd035479f7b9da3cce5f59
-RMD160 (gnustep-base-1.12.0.tar.gz) = 2722b38fcc7df9e810e427b95e9471d747770eb3
-Size (gnustep-base-1.12.0.tar.gz) = 2084468 bytes
-SHA1 (patch-aa) = d9985a7e4b926b90b7071a600c06522943b4d441
+SHA1 (gnustep-base-1.13.0.tar.gz) = 0d0578b5aabd6201fd36f4301296aad596475427
+RMD160 (gnustep-base-1.13.0.tar.gz) = 57a4dd3c9759e296d0a95304cd8b0624f1374bbf
+Size (gnustep-base-1.13.0.tar.gz) = 2282713 bytes
+SHA1 (patch-aa) = 038023e8962ac51160d64a0865477ec80b0c0b35
 SHA1 (patch-ab) = 51b4273874c6f66a4c6ee6c7e78de7eadc9e7c95
 SHA1 (patch-ac) = 0fe1b14c0d016e9279df84aaa26142b8ed06e63f
 SHA1 (patch-ae) = f249ee724e9b1eb7aa2967a8f5d3993e0bbcca46
-SHA1 (patch-af) = 16db471d87a5e12a818779a5ceae6519cd75e3b1
+SHA1 (patch-af) = d846b0ccfd666e1d475ec47725a870629ad45a97
diff --git a/devel/gnustep-base/patches/patch-aa b/devel/gnustep-base/patches/patch-aa
index 10bfa90a39f..6ce5b6f94b2 100644
--- a/devel/gnustep-base/patches/patch-aa
+++ b/devel/gnustep-base/patches/patch-aa
@@ -1,23 +1,23 @@
-$NetBSD: patch-aa,v 1.10 2006/04/03 18:20:50 adam Exp $
+$NetBSD: patch-aa,v 1.11 2006/08/30 14:55:00 adam Exp $
 
---- configure.orig	2006-03-07 11:58:10.000000000 +0100
+--- configure.orig	2006-08-10 13:53:13.000000000 +0200
 +++ configure
-@@ -2987,12 +2987,12 @@ echo $ECHO_N "checking the Objective-C r
+@@ -3601,12 +3601,12 @@ echo $ECHO_N "checking the Objective-C r
  if test "$OBJC_RUNTIME_LIB" = "nx" -o "$OBJC_RUNTIME_LIB" = "apple"; then
-   echo "$as_me:$LINENO: result: NeXT" >&5
- echo "${ECHO_T}NeXT" >&6
+   { echo "$as_me:$LINENO: result: NeXT" >&5
+ echo "${ECHO_T}NeXT" >&6; }
 -  LIBOBJC='-lobjc'
 +  LIBOBJC='-lobjc @PTHREAD_LIBS@'
    OBJCFLAGS="-fnext-runtime -DNeXT_RUNTIME"
  else
-   echo "$as_me:$LINENO: result: GNU" >&5
- echo "${ECHO_T}GNU" >&6
+   { echo "$as_me:$LINENO: result: GNU" >&5
+ echo "${ECHO_T}GNU" >&6; }
 -  LIBOBJC='-lobjc'
 +  LIBOBJC='-lobjc @PTHREAD_LIBS@'
    OBJCFLAGS="-fgnu-runtime"
  fi
  
-@@ -3016,7 +3016,7 @@ fi
+@@ -3630,7 +3630,7 @@ fi
  # $GNUSTEP_HDIR are used before the standard ones
  #
  INCLUDE_FLAGS="$INCLUDE_FLAGS -I$GNUSTEP_HDIR"
diff --git a/devel/gnustep-base/patches/patch-af b/devel/gnustep-base/patches/patch-af
index b2964c3bf3a..797e16e4adf 100644
--- a/devel/gnustep-base/patches/patch-af
+++ b/devel/gnustep-base/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2006/01/17 07:38:34 adam Exp $
+$NetBSD: patch-af,v 1.3 2006/08/30 14:55:00 adam Exp $
 
---- Source/GSHTTPURLHandle.m.orig	2005-11-05 06:58:43.000000000 +0100
+--- Source/GSHTTPURLHandle.m.orig	2006-07-18 17:45:35.000000000 +0200
 +++ Source/GSHTTPURLHandle.m
-@@ -1152,8 +1152,6 @@ static void debugWrite(GSHTTPURLHandle *
+@@ -1254,8 +1254,6 @@ static void debugWrite(GSHTTPURLHandle *
  	}
        if (sock == nil)
  	{
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index c7aca888cc9..a4fab15c3e2 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2006/08/13 10:12:27 minskim Exp $
+# $NetBSD: Makefile,v 1.34 2006/08/30 14:53:28 adam Exp $
 
-DISTNAME=	gnustep-make-1.12.0
-PKGREVISION=	3
+DISTNAME=	gnustep-make-1.13.0
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 2a14ee3f428..7672181fa65 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.18 2006/04/03 18:16:12 adam Exp $
+$NetBSD: distinfo,v 1.19 2006/08/30 14:53:28 adam Exp $
 
-SHA1 (gnustep-make-1.12.0.tar.gz) = acb218ff066186150bc4ea0d377f2b4c5b8d8b95
-RMD160 (gnustep-make-1.12.0.tar.gz) = fc24625d45dce3c279220b461afcd912f3a0f09a
-Size (gnustep-make-1.12.0.tar.gz) = 395144 bytes
+SHA1 (gnustep-make-1.13.0.tar.gz) = 91f0494d58233e59254c365b338bca1bd684bea6
+RMD160 (gnustep-make-1.13.0.tar.gz) = b1d619d7c677463bf1a4adae82a412ad95157dc2
+Size (gnustep-make-1.13.0.tar.gz) = 400157 bytes
 SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
-SHA1 (patch-ac) = 89ef9d05f3059443b3bf262b2efb1c6679d62708
-SHA1 (patch-ad) = 9815debc95e9abf056b791560f32b41d4369cf2f
-SHA1 (patch-ae) = e918070acf5b4bcfb93f1e62b107720d72058730
+SHA1 (patch-ad) = fa8dd2528659f9247dcade96bfc449f064a6c747
+SHA1 (patch-ae) = 37bbb2561a1079d058df8c17107756d4ee7b0f07
diff --git a/devel/gnustep-make/patches/patch-ac b/devel/gnustep-make/patches/patch-ac
deleted file mode 100644
index dfca44d647b..00000000000
--- a/devel/gnustep-make/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2006/01/17 07:35:55 adam Exp $
-
---- target.make.orig	2005-12-06 11:54:03.000000000 +0100
-+++ target.make
-@@ -711,6 +711,39 @@ endif
- 
- ####################################################
- #
-+# DragonFly
-+#
-+ifeq ($(findstring dragonfly, $(GNUSTEP_TARGET_OS)), dragonfly)
-+HAVE_SHARED_LIBS    = yes
-+SHARED_LD_POSTFLAGS = -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
-+SHARED_LIB_LINK_CMD = \
-+	$(CC) -shared -Wl,-soname,$(LIB_LINK_VERSION_FILE) \
-+              $(ALL_LDFLAGS) -o $(LIB_LINK_OBJ_DIR)/$(LIB_LINK_VERSION_FILE) \
-+                 $^ $(INTERNAL_LIBRARIES_DEPEND_UPON) \
-+                 $(SHARED_LD_POSTFLAGS); \
-+	(cd $(LIB_LINK_OBJ_DIR); \
-+	  $(RM_LN_S) $(LIB_LINK_FILE); \
-+	  $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_FILE))
-+OBJ_MERGE_CMD		= \
-+	$(CC) -nostdlib -r $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
-+
-+SHARED_CFLAGS	+= -fPIC
-+SHARED_LIBEXT	= .so
-+
-+HAVE_BUNDLES	= yes
-+BUNDLE_LD	= $(CC)
-+BUNDLE_LDFLAGS	+= -shared
-+ADDITIONAL_LDFLAGS += -rdynamic -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib
-+ADDITIONAL_INCLUDE_DIRS += -I/usr/pkg/include
-+STATIC_LDFLAGS += -static
-+endif
-+#
-+# end DragonFly
-+#
-+####################################################
-+
-+####################################################
-+#
- # OpenBSD 3.x (though set for 3.3)
- #
- ifeq ($(findstring openbsd, $(GNUSTEP_TARGET_OS)), openbsd)
diff --git a/devel/gnustep-make/patches/patch-ad b/devel/gnustep-make/patches/patch-ad
index aded5e6e6ab..d072cb0159a 100644
--- a/devel/gnustep-make/patches/patch-ad
+++ b/devel/gnustep-make/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2006/01/17 07:35:55 adam Exp $
+$NetBSD: patch-ad,v 1.5 2006/08/30 14:53:28 adam Exp $
 
---- configure.orig	2005-12-20 17:39:33.000000000 +0100
+--- configure.orig	2006-07-29 16:52:03.000000000 +0200
 +++ configure
-@@ -5113,7 +5113,7 @@ echo $ECHO_N "checking if the compiler s
+@@ -6084,7 +6084,7 @@ echo $ECHO_N "checking if the compiler s
  
  # What we want to do: set AUTO_DEPENDENCIES to yes if gcc => 3.x
  
 -if test ! ${GCC} = "yes" ; then
 +if test "X${GCC}" != "Xyes" ; then
    AUTO_DEPENDENCIES=""
-   echo "$as_me:$LINENO: result: no: it's not gcc" >&5
- echo "${ECHO_T}no: it's not gcc" >&6
+   { echo "$as_me:$LINENO: result: no: it's not gcc" >&5
+ echo "${ECHO_T}no: it's not gcc" >&6; }
diff --git a/devel/gnustep-make/patches/patch-ae b/devel/gnustep-make/patches/patch-ae
index 44ddf5c18ce..058843f9d4e 100644
--- a/devel/gnustep-make/patches/patch-ae
+++ b/devel/gnustep-make/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2006/04/03 18:16:12 adam Exp $
+$NetBSD: patch-ae,v 1.5 2006/08/30 14:53:28 adam Exp $
 
---- GNUmakefile.in.orig	2006-03-14 05:42:20.000000000 +0100
+--- GNUmakefile.in.orig	2006-07-05 19:35:10.000000000 +0200
 +++ GNUmakefile.in
 @@ -115,7 +115,7 @@ all: generated-files which_lib$(EXEEXT)
  # used. (I mean: 'cd core/make; cd ..; mkdir make-build; cd
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.4 2006/04/03 18:16:12 adam Exp $
  
  ifeq ($(messages),yes)
    EC = 
-@@ -143,9 +143,9 @@ install: all @GNUSTEP_MOVE_OBSOLETE@
+@@ -144,9 +144,9 @@ install: all @GNUSTEP_MOVE_OBSOLETE@
  		$(makedir)/Instance \
  		$(makedir)/Instance/Shared \
  		$(makedir)/Instance/Documentation)