Update gnustep-base to 1.9.1.

Noteworthy changes in version `1.9.1'
=====================================

   * Default string encoding taken from system nl_langinfo if not set
     with GNUSTEP_STRING_ENCODING.
   * NSKeyedArchiver/NSKeyedUnarchiver classes added.
   * NSPropertyLists class added, also decodes Mac OS X binary propery
     lists.

Noteworthy changes in version `1.9.0'
=====================================

   * Lazy locking implemented (see GSLock documentation)
   * MacOSX PB files updated to 10.3
   * DO retain/release implementation simplified and also handles some
     complex DO retain/release problems.
   * GNUSTEP_STRING_ENCODING now supports any valid iconv name.
   * gdomap uid/gid fixes
   * NSString subclass heirarchy reorganized to fix problems with
     copying and ownership of data.

6 files changed, 76 insertions, 31 deletions

diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile
index 7abb98ce58f..dd6d916549f 100644
--- a/devel/gnustep-base/Makefile
+++ b/devel/gnustep-base/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/10 23:41:01 rh Exp $
 #
 
-DISTNAME=		gnustep-base-1.8.0
-PKGREVISION=		2
+DISTNAME=		gnustep-base-1.9.1
 CATEGORIES=		devel gnustep
 MASTER_SITES=		ftp://ftp.gnustep.org/pub/gnustep/core/
 
@@ -12,12 +11,8 @@ COMMENT=		GNUstep foundation classes
 
 PTHREAD_LIBS=		-lpthread
 
-USE_BUILDLINK2=		YES
-USE_GNU_TOOLS+=		make
-USE_X11=		YES
-MAKEFILE=		GNUmakefile
-GNU_CONFIGURE=		YES
-GNU_CONFIGURE_PREFIX=	${PREFIX}/share/GNUstep
+USE_BUILDLINK3=		yes
+USE_X11=		yes
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/libexec/GNUstep
 CONFIGURE_ENV+=		INSTALL_PROGRAM="${INSTALL_SCRIPT}"
 
@@ -32,17 +27,23 @@ pre-configure:
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/openapp ${PREFIX}/bin
 
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/ffcall/buildlink2.mk"
-.include "../../devel/gmp/buildlink2.mk"
-.include "../../devel/gnustep-objc/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/ffcall/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/gnustep-make/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/compiler.mk"
+
+.if empty(CC_VERSION:Mgcc-3*)
+.include "../../devel/gnustep-objc/buildlink3.mk"
+.endif
+
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
 PTHREAD_LIBS+=		-lpth
 .endif
 
+.include "../../devel/gnustep-make/gnustep.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gnustep-base/PLIST b/devel/gnustep-base/PLIST
index 3235140ea7f..fc58c15f839 100644
--- a/devel/gnustep-base/PLIST
+++ b/devel/gnustep-base/PLIST
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/05 09:55:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/10 23:41:01 rh Exp $
 bin/openapp
-share/GNUstep/System/Library/Bundles/SSL.bundle/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/SSL.bundle/SSL
-share/GNUstep/System/Library/Bundles/SSL.bundle/stamp.make
 share/GNUstep/System/Library/DTDs/gsdoc-0_6_5.dtd
 share/GNUstep/System/Library/DTDs/gsdoc-0_6_6.dtd
 share/GNUstep/System/Library/DTDs/gsdoc-0_6_7.dtd
@@ -26,7 +23,6 @@ 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/NSConcreteNumber.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
@@ -46,7 +42,9 @@ share/GNUstep/System/Library/Headers/Foundation/NSFormatter.h
 share/GNUstep/System/Library/Headers/Foundation/NSGeometry.h
 share/GNUstep/System/Library/Headers/Foundation/NSHashTable.h
 share/GNUstep/System/Library/Headers/Foundation/NSHost.h
+share/GNUstep/System/Library/Headers/Foundation/NSIndexSet.h
 share/GNUstep/System/Library/Headers/Foundation/NSInvocation.h
+share/GNUstep/System/Library/Headers/Foundation/NSKeyedArchiver.h
 share/GNUstep/System/Library/Headers/Foundation/NSKeyValueCoding.h
 share/GNUstep/System/Library/Headers/Foundation/NSLock.h
 share/GNUstep/System/Library/Headers/Foundation/NSMapTable.h
@@ -63,6 +61,7 @@ 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/NSProcessInfo.h
+share/GNUstep/System/Library/Headers/Foundation/NSPropertyList.h
 share/GNUstep/System/Library/Headers/Foundation/NSProtocolChecker.h
 share/GNUstep/System/Library/Headers/Foundation/NSProxy.h
 share/GNUstep/System/Library/Headers/Foundation/NSRange.h
@@ -89,6 +88,7 @@ share/GNUstep/System/Library/Headers/GNUstepBase/GSFileHandle.h
 share/GNUstep/System/Library/Headers/GNUstepBase/GSIArray.h
 share/GNUstep/System/Library/Headers/GNUstepBase/GSIMap.h
 share/GNUstep/System/Library/Headers/GNUstepBase/GSLocale.h
+share/GNUstep/System/Library/Headers/GNUstepBase/GSLock.h
 share/GNUstep/System/Library/Headers/GNUstepBase/GSMime.h
 share/GNUstep/System/Library/Headers/GNUstepBase/GSObjCRuntime.h
 share/GNUstep/System/Library/Headers/GNUstepBase/GSUnion.h
@@ -111,6 +111,7 @@ share/GNUstep/System/Library/Headers/gnustep/base/GSFileHandle.h
 share/GNUstep/System/Library/Headers/gnustep/base/GSIArray.h
 share/GNUstep/System/Library/Headers/gnustep/base/GSIMap.h
 share/GNUstep/System/Library/Headers/gnustep/base/GSLocale.h
+share/GNUstep/System/Library/Headers/gnustep/base/GSLock.h
 share/GNUstep/System/Library/Headers/gnustep/base/GSMime.h
 share/GNUstep/System/Library/Headers/gnustep/base/GSObjCRuntime.h
 share/GNUstep/System/Library/Headers/gnustep/base/GSUnion.h
@@ -726,7 +727,7 @@ share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Zulu
 share/GNUstep/System/Library/Libraries/Resources/gnustep-base/TraditionalChinese.lproj/Localizable.strings
 share/GNUstep/System/Library/Libraries/libgnustep-base.so
-share/GNUstep/System/Library/Libraries/libgnustep-base.so.1.8.0
+share/GNUstep/System/Library/Libraries/libgnustep-base.so.1.9.1
 share/GNUstep/System/Library/Makefiles/Additional/base.make
 share/GNUstep/System/Tools/autogsdoc
 share/GNUstep/System/Tools/cvtenc
@@ -781,5 +782,3 @@ share/GNUstep/System/Tools/xmlparse
 @dirrm share/GNUstep/System/Library/Documentation/man/man8
 @dirrm share/GNUstep/System/Library/Documentation/man/man1
 @dirrm share/GNUstep/System/Library/DTDs
-@dirrm share/GNUstep/System/Library/Bundles/SSL.bundle/Resources
-@dirrm share/GNUstep/System/Library/Bundles/SSL.bundle
diff --git a/devel/gnustep-base/buildlink2.mk b/devel/gnustep-base/buildlink2.mk
index 3e377ef4411..2d202925717 100644
--- a/devel/gnustep-base/buildlink2.mk
+++ b/devel/gnustep-base/buildlink2.mk
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/04/10 23:41:01 rh Exp $
 #
 
 .if !defined(GNUSTEP_BASE_BUILDLINK2_MK)
 GNUSTEP_BASE_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnustep-base
-BUILDLINK_DEPENDS.gnustep-base?=	gnustep-base>=1.8.0
-BUILDLINK_RECOMMENDED.gnustep-base?=	gnustep-base>=1.8.0nb2
+BUILDLINK_DEPENDS.gnustep-base?=	gnustep-base>=1.9.1
 BUILDLINK_PKGSRCDIR.gnustep-base?=	../../devel/gnustep-base
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnustep-base=gnustep-base
@@ -21,7 +20,7 @@ BUILDLINK_FILES.gnustep-base+=	share/GNUstep/System/Library/Libraries/libgnustep
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/ffcall/buildlink2.mk"
 .include "../../devel/gmp/buildlink2.mk"
-.include "../../devel/gnustep-objc/buildlink2.mk"
+.include "../../devel/gnustep-make/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 
diff --git a/devel/gnustep-base/buildlink3.mk b/devel/gnustep-base/buildlink3.mk
new file mode 100644
index 00000000000..1f90b9f90a1
--- /dev/null
+++ b/devel/gnustep-base/buildlink3.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/10 23:41:01 rh Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GNUSTEP_BASE_BUILDLINK3_MK:=	${GNUSTEP_BASE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gnustep-base
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-base}
+BUILDLINK_PACKAGES+=	gnustep-base
+
+.if !empty(GNUSTEP_BASE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gnustep-base+=	gnustep-base>=1.9.1
+BUILDLINK_PKGSRCDIR.gnustep-base?=	../../devel/gnustep-base
+.endif	# GNUSTEP_BASE_BUILDLINK3_MK
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/ffcall/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/gnustep-make/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gnustep-base/distinfo b/devel/gnustep-base/distinfo
index b041fc06264..35cc56e34cb 100644
--- a/devel/gnustep-base/distinfo
+++ b/devel/gnustep-base/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2003/12/05 09:55:46 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/04/10 23:41:01 rh Exp $
 
-SHA1 (gnustep-base-1.8.0.tar.gz) = e9fa85bb98c13ffc2934bb23417fc987abdf0d15
-Size (gnustep-base-1.8.0.tar.gz) = 1629498 bytes
+SHA1 (gnustep-base-1.9.1.tar.gz) = 143b2fbbb0516e2d73312ff9950f2c99ff18c618
+Size (gnustep-base-1.9.1.tar.gz) = 1689980 bytes
 SHA1 (patch-aa) = 5ca3a4060645d6c27b24377610b199478f2427d7
 SHA1 (patch-ab) = ae62248abf728e4a6633e61b0a157200ab0deb20
 SHA1 (patch-ac) = 1723a6ca011507df5d54c00edf232954c94a157b
+SHA1 (patch-ad) = e2b243fc7d22ec46a1c53ae6f89c3b6220ef5fb8
diff --git a/devel/gnustep-base/patches/patch-ad b/devel/gnustep-base/patches/patch-ad
new file mode 100644
index 00000000000..92767576e71
--- /dev/null
+++ b/devel/gnustep-base/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2004/04/10 23:41:01 rh Exp $
+
+--- Headers/Foundation/NSCoder.h.orig	2004-01-22 19:37:07.000000000 +1000
++++ Headers/Foundation/NSCoder.h
+@@ -82,9 +82,15 @@
+  * MacOS-X adds some typedefs that GNUstep already has by another name.
+  */
+ #include <GSConfig.h>
++#ifndef	uint8_t
+ #define	uint8_t	gsu8
++#endif
++#ifndef	int32_t
+ #define	int32_t	gss32
++#endif
++#ifndef	int64_t
+ #define	int64_t	gss64
++#endif
+ 
+ 
+ /** <override-subclass />