4 files changed, 45 insertions, 66 deletions

diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 9becfa15ca4e..14830b4ec691 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -6,11 +6,7 @@
 #
 
 PORTNAME=	gnustep-base
-.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION=	1.9.2
-.else
-PORTVERSION=	1.10.1
-.endif
+PORTVERSION=	1.10.2
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
@@ -34,6 +30,7 @@ USE_GNUSTEP=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
+USE_ICONV=	yes
 MAKEFILE=
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 CFLAGS+=	-I${LOCALBASE}/include/libxml2/libxml
@@ -51,17 +48,8 @@ MAKE_APPS=	SSL
 INSTALL_APPS=	SSL
 .endif
 
-.if defined(WITH_GNUSTEP_DEVEL)
-LIBS+=		-lkvm
-CONFIGURE_ENV+=	LIBS="${LIBS}"
-.endif
-
-.if defined(WITH_GNUSTEP_DEVEL)
-PLIST_SUB+=	BASEVERSION=${PORTVERSION:C/([0-9]).*/\1/1}
-.else
 PLIST_SUB+=	BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1} 
 EXTRA_PATCHES+=	${FILESDIR}/NSFileManager.m.patch
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -86,11 +74,9 @@ post-install:
 	(cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} -d ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 .endfor
-.if !defined(WITH_GNUSTEP_DEVEL)
 	${RM} ${PREFIX}/System/Library/Libraries/libgnustep-base.so
 	${LN} -s libgnustep-base.so.${PORTVERSION} \
 	 ${PREFIX}/System/Library/Libraries/libgnustep-base.so
-.endif
 
 test:
 	@(cd ${WRKSRC}/Testing && . ${SYSTEMDIR}/Makefiles/GNUstep.sh; ${GMAKE})
diff --git a/lang/gnustep-base/distinfo b/lang/gnustep-base/distinfo
index 04123cc27e95..a6def47aa484 100644
--- a/lang/gnustep-base/distinfo
+++ b/lang/gnustep-base/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnustep-base-1.10.1.tar.gz) = 94eaac8feb8d5ae95194a37cedc27544
-SIZE (gnustep-base-1.10.1.tar.gz) = 1909988
+MD5 (gnustep-base-1.10.2.tar.gz) = 1b3fe2b48917ba1c63828d58295b1044
+SIZE (gnustep-base-1.10.2.tar.gz) = 1925577
diff --git a/lang/gnustep-base/files/NSFileManager.m.patch b/lang/gnustep-base/files/NSFileManager.m.patch
index d787ef095dae..e0f6cd636aa2 100644
--- a/lang/gnustep-base/files/NSFileManager.m.patch
+++ b/lang/gnustep-base/files/NSFileManager.m.patch
@@ -1,36 +1,28 @@
---- Source/NSFileManager.m.orig	Sat Jul 10 05:19:56 2004
-+++ Source/NSFileManager.m	Tue Sep 14 16:56:38 2004
-@@ -567,6 +567,12 @@
-   NSDictionary	*needChown = nil;
- #endif
- 
-+  if (path == nil) // don't try to do anything when path is nil
-+    {
-+      ASSIGN(_lastError, @"Could not create directory - name is nil");
-+      return NO;
-+    }
-+
-   /* This is consitent with MacOSX - just return NO for an invalid path. */
-   if ([path length] == 0)
-     return NO;
-@@ -599,7 +605,6 @@
-     }
- 
- #else
--
-   /*
-    * If there is no file owner specified, and we are running setuid to
-    * root, then we assume we need to change ownership to correct user.
-@@ -693,6 +698,12 @@
-   while (cur < len);
+--- Source/NSFileManager.m.orig	Fri Mar 18 05:17:39 2005
++++ Source/NSFileManager.m	Fri Apr  1 06:37:16 2005
+@@ -757,6 +757,12 @@
  
  #endif /* !MINGW */
-+
+ 
 +  // dont change when we have no attibutes
 +  if (attributes == nil)
 +    {
 +      return YES;
 +    }
- 
++
    // change attributes of last directory
    if ([attributes count] == 0)
+     {
+@@ -785,6 +791,12 @@
+   int	len;
+   int	written;
+ #endif
++
++  if (path == nil) // don't try to do anything when path is nil
++    {
++      ASSIGN(_lastError, @"Could not create directory - name is nil");
++      return NO;
++    }
+ 
+   /* This is consitent with MacOSX - just return NO for an invalid path. */
+   if ([path length] == 0)
diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index 2c6220268d8a..5598ceebc802 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -6,7 +6,7 @@ System/Library/DTDs/gsdoc-0_6_6.dtd
 System/Library/DTDs/gsdoc-0_6_7.dtd
 System/Library/DTDs/gsdoc-1_0_0.dtd
 System/Library/DTDs/gsdoc-1_0_1.dtd
-%%GNUSTEP_STABLE%%System/Library/DTDs/gsdoc-1_0_1.rnc
+System/Library/DTDs/gsdoc-1_0_1.rnc
 System/Library/DTDs/plist-0_9.dtd
 System/Library/Documentation/man/man1/autogsdoc.1.gz
 System/Library/Documentation/man/man1/cvtenc.1.gz
@@ -88,7 +88,7 @@ System/Library/Headers/Foundation/NSUndoManager.h
 System/Library/Headers/Foundation/NSUserDefaults.h
 System/Library/Headers/Foundation/NSUtilities.h
 System/Library/Headers/Foundation/NSValue.h
-%%GNUSTEP_STABLE%%System/Library/Headers/Foundation/NSXMLParser.h
+System/Library/Headers/Foundation/NSXMLParser.h
 System/Library/Headers/Foundation/NSZone.h
 System/Library/Headers/GNUstepBase/unicode/caseconv.h
 System/Library/Headers/GNUstepBase/unicode/cop.h
@@ -138,7 +138,7 @@ System/Library/Headers/GSConfig.h
 System/Library/Libraries/Resources/gnustep-base/English.lproj/Localizable.strings
 System/Library/Libraries/Resources/gnustep-base/French.lproj/Localizable.strings
 System/Library/Libraries/Resources/gnustep-base/German.lproj/Localizable.strings
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/Info-gnustep.plist
+System/Library/Libraries/Resources/gnustep-base/Info-gnustep.plist
 System/Library/Libraries/Resources/gnustep-base/Italian.lproj/Localizable.strings
 System/Library/Libraries/Resources/gnustep-base/Languages/Dutch
 System/Library/Libraries/Resources/gnustep-base/Languages/English
@@ -169,11 +169,11 @@ System/Library/Libraries/Resources/gnustep-base/NSTimeZones/GNUmakefile
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/GNUstep_zones
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/README
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/abbreviations
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/abbreviations.plist
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/create-abbrevs.m
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/create-regions.m
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/nstimezone.m
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/regions
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/.README.swp
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Africa/Abidjan
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Africa/Accra
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Africa/Addis_Ababa
@@ -231,21 +231,21 @@ System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Anchor
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Anguilla
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Antigua
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Araguaina
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Buenos_Aires
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Cordoba
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Tucuman
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/La_Rioja
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/San_Juan
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Jujuy
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Catamarca
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Mendoza
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/ComodRivadavia
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Rio_Gallegos
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Ushuaia
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Buenos_Aires
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Cordoba
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Tucuman
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/La_Rioja
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/San_Juan
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Jujuy
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Catamarca
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Mendoza
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/ComodRivadavia
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Rio_Gallegos
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina/Ushuaia
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Aruba
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Asuncion
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Atka
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Bahia
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Bahia
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Barbados
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Belem
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Belize
@@ -255,7 +255,7 @@ System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Boise
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Buenos_Aires
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Cambridge_Bay
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Cancun
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Campo_Grande
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Campo_Grande
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Caracas
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Catamarca
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Cayenne
@@ -357,7 +357,7 @@ System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Teguci
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Thule
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Thunder_Bay
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Tijuana
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Toronto
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Toronto
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Tortola
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Vancouver
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Virgin
@@ -371,7 +371,7 @@ System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Antarctica/Dum
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Antarctica/Mawson
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Antarctica/McMurdo
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Antarctica/Palmer
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Antarctica/Rothera
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Antarctica/Rothera
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Antarctica/South_Pole
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Antarctica/Syowa
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Antarctica/Vostok
@@ -577,7 +577,7 @@ System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/London
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Luxembourg
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Madrid
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Malta
-%%GNUSTEP_STABLE%%System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Mariehamn
+System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Mariehamn
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Minsk
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Monaco
 System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Europe/Moscow
@@ -764,6 +764,7 @@ System/Tools/defaults
 System/Tools/gdnc
 System/Tools/gdomap
 System/Tools/make_strings
+System/Tools/pl
 System/Tools/pl2link
 System/Tools/pldes
 System/Tools/plmerge
@@ -791,7 +792,7 @@ System/Tools/xmlparse
 @dirrm System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/North_Dakota
 @dirrm System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Kentucky
 @dirrm System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Indiana
-%%GNUSTEP_STABLE%%@dirrm System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina
+@dirrm System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America/Argentina
 @dirrm System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/America
 @dirrm System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Africa
 @dirrm System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones