1 files changed, 28 insertions, 35 deletions

diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index 188b8f1b1878..6774b4153922 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -28,6 +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/NSCalendarDate.h
 GNUstep/System/Library/Headers/Foundation/NSCharacterSet.h
 GNUstep/System/Library/Headers/Foundation/NSClassDescription.h
@@ -65,6 +66,7 @@ GNUstep/System/Library/Headers/Foundation/NSInvocation.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/NSLock.h
 GNUstep/System/Library/Headers/Foundation/NSMapTable.h
 GNUstep/System/Library/Headers/Foundation/NSMethodSignature.h
@@ -89,6 +91,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/NSRunLoop.h
 GNUstep/System/Library/Headers/Foundation/NSScanner.h
 GNUstep/System/Library/Headers/Foundation/NSSerialization.h
@@ -98,6 +101,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/NSThread.h
 GNUstep/System/Library/Headers/Foundation/NSTimeZone.h
 GNUstep/System/Library/Headers/Foundation/NSTimer.h
@@ -140,6 +144,7 @@ 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/GSObjCRuntime.h
 GNUstep/System/Library/Headers/GNUstepBase/GSUnion.h
 GNUstep/System/Library/Headers/GNUstepBase/GSVersionMacros.h
@@ -168,45 +173,27 @@ GNUstep/System/Library/Headers/GNUstepBase/Unicode.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_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/Additions.h
-GNUstep/System/Library/Headers/gnustep/base/GCObject.h
-GNUstep/System/Library/Headers/gnustep/base/GNUstep.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/GSBlocks.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/System/Library/Headers/gnustep/base/GSFileHandle.h
-GNUstep/System/Library/Headers/gnustep/base/GSFunctions.h
-GNUstep/System/Library/Headers/gnustep/base/GSIArray.h
-GNUstep/System/Library/Headers/gnustep/base/GSIMap.h
-GNUstep/System/Library/Headers/gnustep/base/GSLocale.h
-GNUstep/System/Library/Headers/gnustep/base/GSLock.h
-GNUstep/System/Library/Headers/gnustep/base/GSMime.h
-GNUstep/System/Library/Headers/gnustep/base/GSObjCRuntime.h
-GNUstep/System/Library/Headers/gnustep/base/GSUnion.h
-GNUstep/System/Library/Headers/gnustep/base/GSVersionMacros.h
-GNUstep/System/Library/Headers/gnustep/base/GSXML.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSArray+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSAttributedString+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSBundle+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSCalendarDate+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSData+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSDebug+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSFileHandle+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSLock+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSMutableString+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSNumber+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSObject+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSProcessInfo+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSStream+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSString+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSTask+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSThread+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSURL+GNUstepBase.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/System/Library/Headers/gnustep/base/Unicode.h
-GNUstep/System/Library/Headers/gnustep/base/behavior.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/System/Library/Headers/gnustep/base/preface.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/preface.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
@@ -229,6 +216,7 @@ 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.encodings
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Russian
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Slovak
@@ -400,6 +388,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 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/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
@@ -412,6 +401,7 @@ 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/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
@@ -438,6 +428,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 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/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
@@ -783,6 +774,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/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
@@ -808,6 +800,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/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