- update to 1.24.0

5 files changed, 53 insertions, 136 deletions

diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index c4372efdec48..99d7524fd2b9 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -6,11 +6,7 @@
 #
 
 PORTNAME=	gnustep
-.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION=	1.22.0
-.else
-PORTVERSION=	1.19.3
-.endif
+PORTVERSION=	1.24.0
 CATEGORIES=	devel lang gnustep
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 3c9c04c811cb..ebf1612770dc 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -6,13 +6,7 @@
 #
 
 PORTNAME=	gnustep-base
-.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION=	1.22.0
-PORTREvISION=	1
-.else
-PORTVERSION=	1.19.3
-PORTREVISION=	5
-.endif
+PORTVERSION=	1.24.0
 CATEGORIES=	lang devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
@@ -53,9 +47,6 @@ ETCDIR=		${LOCALBASE}/etc
 .if !defined(WITHOUT_GNUSTEP_FAKEMAIN)
 CONFIGURE_ARGS+=	--enable-fake-main
 .endif
-.if !defined(WITH_GNUSTEP_DEVEL)
-EXTRA_PATCHES+=	${FILESDIR}/config.objc.m.patch
-.endif
 
 PLIST_SUB+=	BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1}
 EXTRA_PATCHES+=	${FILESDIR}/NSFileManager.m.patch
diff --git a/lang/gnustep-base/distinfo b/lang/gnustep-base/distinfo
index a1faaed78c2f..667bf94d61fb 100644
--- a/lang/gnustep-base/distinfo
+++ b/lang/gnustep-base/distinfo
@@ -1,4 +1,2 @@
-SHA256 (gnustep-base-1.19.3.tar.gz) = e804922a6717b6341b5182b19bac022ef2314f3cb2b00f62a0c43b65a5f40bd8
-SIZE (gnustep-base-1.19.3.tar.gz) = 2612479
-SHA256 (gnustep-base-1.22.0.tar.gz) = ebb86cdcf194891194079506b2e08bd09df7d5be5413cbbfa521d4ea76a77b3a
-SIZE (gnustep-base-1.22.0.tar.gz) = 2880760
+SHA256 (gnustep-base-1.24.0.tar.gz) = e07040e85a6bf3e89a9d66424a40dc8d3be749fbe7c0c98942cff5e4f35a6b11
+SIZE (gnustep-base-1.24.0.tar.gz) = 2947759
diff --git a/lang/gnustep-base/files/config.objc.m.patch b/lang/gnustep-base/files/config.objc.m.patch
deleted file mode 100644
index c64cf195efc1..000000000000
--- a/lang/gnustep-base/files/config.objc.m.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- config/config.objc.m.orig	2006-02-11 19:22:57.000000000 +0100
-+++ config/config.objc.m	2010-11-12 15:10:59.000000000 +0100
-@@ -6,13 +6,41 @@
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.
- */
--#ifndef NeXT_RUNTIME
--#include <objc/NXConstStr.h>
-+
-+#include <objc/objc.h>
-+#include <objc/objc-api.h>
-+
-+#include <objc/Object.h>
-+
-+#if !defined(NeXT_RUNTIME) && !defined(__GNUSTEP_RUNTIME__)
- @implementation NXConstantString
-+- (const char*) cString
-+{
-+  return 0;
-+}
-+- (unsigned int) length
-+{
-+  return 0;
-+}
- @end
- #endif
- 
--#include <objc/Object.h>
-+/* Provide dummy implementations for NSObject and NSConstantString
-+ * for runtime implementations which won't link without them.
-+ */
-+
-+@interface NSObject
-+{ 
-+ id isa;
-+}
-+@end
-+@implementation NSObject
-+@end
-+
-+@interface NSConstantString : NSObject
-+@end
-+@implementation NSConstantString
-+@end
- 
- @interface Test : Object
- +(int) testResult;
diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index 6774b4153922..2a9477d62ccf 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -28,7 +28,7 @@ GNUstep/System/Library/Headers/Foundation/NSAutoreleasePool.h
 GNUstep/System/Library/Headers/Foundation/NSBundle.h
 GNUstep/System/Library/Headers/Foundation/NSByteOrder.h
 GNUstep/System/Library/Headers/Foundation/NSCache.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/Foundation/NSCalendar.h
+GNUstep/System/Library/Headers/Foundation/NSCalendar.h
 GNUstep/System/Library/Headers/Foundation/NSCalendarDate.h
 GNUstep/System/Library/Headers/Foundation/NSCharacterSet.h
 GNUstep/System/Library/Headers/Foundation/NSClassDescription.h
@@ -63,10 +63,11 @@ GNUstep/System/Library/Headers/Foundation/NSHost.h
 GNUstep/System/Library/Headers/Foundation/NSIndexPath.h
 GNUstep/System/Library/Headers/Foundation/NSIndexSet.h
 GNUstep/System/Library/Headers/Foundation/NSInvocation.h
+GNUstep/System/Library/Headers/Foundation/NSJSONSerialization.h
 GNUstep/System/Library/Headers/Foundation/NSKeyValueCoding.h
 GNUstep/System/Library/Headers/Foundation/NSKeyValueObserving.h
 GNUstep/System/Library/Headers/Foundation/NSKeyedArchiver.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/Foundation/NSLocale.h
+GNUstep/System/Library/Headers/Foundation/NSLocale.h
 GNUstep/System/Library/Headers/Foundation/NSLock.h
 GNUstep/System/Library/Headers/Foundation/NSMapTable.h
 GNUstep/System/Library/Headers/Foundation/NSMethodSignature.h
@@ -91,7 +92,7 @@ GNUstep/System/Library/Headers/Foundation/NSPropertyList.h
 GNUstep/System/Library/Headers/Foundation/NSProtocolChecker.h
 GNUstep/System/Library/Headers/Foundation/NSProxy.h
 GNUstep/System/Library/Headers/Foundation/NSRange.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/Foundation/NSRegularExpression.h
+GNUstep/System/Library/Headers/Foundation/NSRegularExpression.h
 GNUstep/System/Library/Headers/Foundation/NSRunLoop.h
 GNUstep/System/Library/Headers/Foundation/NSScanner.h
 GNUstep/System/Library/Headers/Foundation/NSSerialization.h
@@ -101,7 +102,7 @@ GNUstep/System/Library/Headers/Foundation/NSSpellServer.h
 GNUstep/System/Library/Headers/Foundation/NSStream.h
 GNUstep/System/Library/Headers/Foundation/NSString.h
 GNUstep/System/Library/Headers/Foundation/NSTask.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/Foundation/NSTextCheckingResult.h
+GNUstep/System/Library/Headers/Foundation/NSTextCheckingResult.h
 GNUstep/System/Library/Headers/Foundation/NSThread.h
 GNUstep/System/Library/Headers/Foundation/NSTimeZone.h
 GNUstep/System/Library/Headers/Foundation/NSTimer.h
@@ -131,69 +132,44 @@ GNUstep/System/Library/Headers/Foundation/NSXMLNode.h
 GNUstep/System/Library/Headers/Foundation/NSXMLNodeOptions.h
 GNUstep/System/Library/Headers/Foundation/NSXMLParser.h
 GNUstep/System/Library/Headers/Foundation/NSZone.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/Additions.h
+GNUstep/System/Library/Headers/GNUstepBase/Additions.h
 GNUstep/System/Library/Headers/GNUstepBase/GCObject.h
 GNUstep/System/Library/Headers/GNUstepBase/GNUstep.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/GSBlocks.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/GNUstepBase/GSCategories.h
+GNUstep/System/Library/Headers/GNUstepBase/GSBlocks.h
 GNUstep/System/Library/Headers/GNUstepBase/GSConfig.h
-GNUstep/System/Library/Headers/GNUstepBase/GSFileHandle.h
 GNUstep/System/Library/Headers/GNUstepBase/GSFunctions.h
 GNUstep/System/Library/Headers/GNUstepBase/GSIArray.h
 GNUstep/System/Library/Headers/GNUstepBase/GSIMap.h
 GNUstep/System/Library/Headers/GNUstepBase/GSLocale.h
 GNUstep/System/Library/Headers/GNUstepBase/GSLock.h
 GNUstep/System/Library/Headers/GNUstepBase/GSMime.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSNetServices+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSNetServices+GNUstepBase.h
 GNUstep/System/Library/Headers/GNUstepBase/GSObjCRuntime.h
 GNUstep/System/Library/Headers/GNUstepBase/GSUnion.h
 GNUstep/System/Library/Headers/GNUstepBase/GSVersionMacros.h
 GNUstep/System/Library/Headers/GNUstepBase/GSXML.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSArray+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSAttributedString+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSBundle+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSCalendarDate+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSData+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSDebug+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSFileHandle+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSLock+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSMutableString+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSNumber+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSObject+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSProcessInfo+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSStream+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSString+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSTask+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSThread+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSURL+GNUstepBase.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/GNUstepBase/NSTask+GS.h
+GNUstep/System/Library/Headers/GNUstepBase/NSArray+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSAttributedString+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSBundle+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSCalendarDate+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSData+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSDebug+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSFileHandle+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSLock+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSMutableString+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSNumber+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSObject+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSProcessInfo+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSStream+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSString+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSTask+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSThread+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSURL+GNUstepBase.h
 GNUstep/System/Library/Headers/GNUstepBase/Unicode.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/GNUstepBase/behavior.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/GNUstepBase/objc-gnu2next.h
-GNUstep/System/Library/Headers/GNUstepBase/preface.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/ObjectiveC2/Availability.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/ObjectiveC2/blocks_runtime.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/ObjectiveC2/capabilities.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/ObjectiveC2/runtime.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GCObject.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GNUstep.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSCategories.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSFileHandle.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSFunctions.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSIArray.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSIMap.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSLocale.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSLock.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSMime.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSObjCRuntime.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSUnion.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSVersionMacros.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSXML.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/NSTask+GS.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/Unicode.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/behavior.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/objc-gnu2next.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/preface.h
+GNUstep/System/Library/Headers/ObjectiveC2/objc/Availability.h
+GNUstep/System/Library/Headers/ObjectiveC2/objc/blocks_runtime.h
+GNUstep/System/Library/Headers/ObjectiveC2/objc/capabilities.h
+GNUstep/System/Library/Headers/ObjectiveC2/objc/runtime.h
 GNUstep/System/Library/Headers/gnustep/unicode/caseconv.h
 GNUstep/System/Library/Headers/gnustep/unicode/cop.h
 GNUstep/System/Library/Headers/gnustep/unicode/cyrillic.h
@@ -216,20 +192,18 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Italian
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Korean
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Locale.aliases
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Locale.canonical
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Locale.canonical
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Locale.encodings
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Russian
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Slovak
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Spanish
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/TraditionalChinese
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Ukrainian
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/.README.swp
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/GNUmakefile
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/GNUstep_zones
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/README
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/abbreviations
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/abbreviations.plist
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/.abbreviations.plist.swp
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/create-abbrevs.m
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/create-regions.m
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/nstimezone.m
@@ -260,6 +234,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Africa/Gaborone
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Africa/Harare
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Africa/Johannesburg
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Africa/Juba
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Africa/Kampala
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Africa/Khartoum
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Africa/Kigali
@@ -301,7 +276,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Mendoza
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Rio_Gallegos
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/San_Juan
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Salta
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Salta
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/San_Luis
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Tucuman
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Ushuaia
@@ -310,7 +285,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Atikokan
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Atka
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Bahia
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Bahia_Banderas
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Bahia_Banderas
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Barbados
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Belem
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Belize
@@ -374,21 +349,23 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Kentucky/Louisville
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Kentucky/Monticello
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Knox_IN
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Kralendijk
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/La_Paz
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Lima
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Los_Angeles
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Louisville
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Lower_Princes
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Maceio
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Managua
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Manaus
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Marigot
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Martinique
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Matamoros
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Matamoros
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Mazatlan
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Mendoza
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Menominee
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Merida
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Metlakatla
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Metlakatla
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Mexico_City
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Miquelon
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Moncton
@@ -401,11 +378,11 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Nipigon
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Nome
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Noronha
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/North_Dakota/Beulah
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/North_Dakota/Beulah
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/North_Dakota/Center
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/North_Dakota/New_Salem
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Panama
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Ojinaga
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Ojinaga
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Pangnirtung
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Paramaribo
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Phoenix
@@ -421,14 +398,14 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Resolute
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Rio_Branco
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Rosario
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Santa_Isabel
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Santa_Isabel
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Santarem
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Santiago
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Santo_Domingo
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Sao_Paulo
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Scoresbysund
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Shiprock
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Sitka
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Sitka
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/St_Barthelemy
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/St_Johns
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/St_Kitts
@@ -452,7 +429,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Davis
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/DumontDUrville
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Mawson
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Macquarie
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Macquarie
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/McMurdo
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Palmer
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Rothera
@@ -488,6 +465,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Dushanbe
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Gaza
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Harbin
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Hebron
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ho_Chi_Minh
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Hong_Kong
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Hovd
@@ -500,7 +478,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kamchatka
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Karachi
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kashgar
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kathmandu
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kathmandu
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Katmandu
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kolkata
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Krasnoyarsk
@@ -514,7 +492,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Manila
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Muscat
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Nicosia
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Novokuznetsk
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Novokuznetsk
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Novosibirsk
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Omsk
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Oral
@@ -774,7 +752,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Apia
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Auckland
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Chatham
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Chuuk
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Chuuk
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Easter
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Efate
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Enderbury
@@ -800,7 +778,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Pago_Pago
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Palau
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Pitcairn
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Pohnpei
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Pohnpei
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Ponape
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Port_Moresby
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Rarotonga
@@ -902,7 +880,8 @@ etc/rc.d/GNUstep.sh
 @dirrm GNUstep/System/Library/Headers/gnustep/unicode
 @dirrm GNUstep/System/Library/Headers/gnustep/base
 @dirrm GNUstep/System/Library/Headers/gnustep
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Headers/ObjectiveC2
+@dirrm GNUstep/System/Library/Headers/ObjectiveC2/objc
+@dirrm GNUstep/System/Library/Headers/ObjectiveC2
 @dirrm GNUstep/System/Library/Headers/GNUstepBase/unicode
 @dirrm GNUstep/System/Library/Headers/GNUstepBase
 @dirrm GNUstep/System/Library/Headers/Foundation