Reinstate SSL patch to avoid inconsistent behaviour on systems with and

without OpenSSL installed (hi adam!)
Bump PKGREVISION.

5 files changed, 26 insertions, 16 deletions

diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile
index 7c574026247..2fbd8e92c5a 100644
--- a/devel/gnustep-base/Makefile
+++ b/devel/gnustep-base/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2004/11/05 14:25:19 adam Exp $
+# $NetBSD: Makefile,v 1.20 2004/11/16 01:16:06 rh Exp $
 
-DISTNAME=	gnustep-base-1.10.1
-CATEGORIES=	devel gnustep
-MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
+DISTNAME=		gnustep-base-1.10.1
+PKGREVISION=		1
+CATEGORIES=		devel gnustep
+MASTER_SITES=		ftp://ftp.gnustep.org/pub/gnustep/core/
 
-MAINTAINER=	rh@NetBSD.org
-HOMEPAGE=	http://www.gnustep.org/
-COMMENT=	GNUstep foundation classes
+MAINTAINER=		rh@NetBSD.org
+HOMEPAGE=		http://www.gnustep.org/
+COMMENT=		GNUstep foundation classes
 
 PTHREAD_LIBS=		-lpthread
 
diff --git a/devel/gnustep-base/PLIST b/devel/gnustep-base/PLIST
index 1c1be51937c..2bce23fd006 100644
--- a/devel/gnustep-base/PLIST
+++ b/devel/gnustep-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/11/05 14:25:19 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/11/16 01:16:06 rh Exp $
 bin/openapp
 share/GNUstep/System/Library/DTDs/gsdoc-0_6_5.dtd
 share/GNUstep/System/Library/DTDs/gsdoc-0_6_6.dtd
@@ -6,9 +6,6 @@ share/GNUstep/System/Library/DTDs/gsdoc-0_6_7.dtd
 share/GNUstep/System/Library/DTDs/gsdoc-1_0_0.dtd
 share/GNUstep/System/Library/DTDs/gsdoc-1_0_1.rnc
 share/GNUstep/System/Library/DTDs/plist-0_9.dtd
-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-1_0_1.dtd
 share/GNUstep/System/Library/Documentation/man/man1/gdnc.1
 share/GNUstep/System/Library/Documentation/man/man1/autogsdoc.1
@@ -812,6 +809,4 @@ share/GNUstep/System/Tools/xmlparse
 @dirrm share/GNUstep/System/Library/Headers/Foundation
 @dirrm share/GNUstep/System/Library/Documentation/man/man8
 @dirrm share/GNUstep/System/Library/Documentation/man/man1
-@dirrm share/GNUstep/System/Library/Bundles/SSL.bundle/Resources
-@dirrm share/GNUstep/System/Library/Bundles/SSL.bundle
 @dirrm share/GNUstep/System/Library/DTDs
diff --git a/devel/gnustep-base/buildlink3.mk b/devel/gnustep-base/buildlink3.mk
index 269a0e07412..a2cc254d2da 100644
--- a/devel/gnustep-base/buildlink3.mk
+++ b/devel/gnustep-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/09/27 00:36:32 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/11/16 01:16:06 rh Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_BASE_BUILDLINK3_MK:=	${GNUSTEP_BASE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gnustep-base
 
 .if !empty(GNUSTEP_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnustep-base+=	gnustep-base>=1.9.1
-BUILDLINK_RECOMMENDED.gnustep-base+=	gnustep-base>=1.10.0
+BUILDLINK_RECOMMENDED.gnustep-base+=	gnustep-base>=1.10.1nb1
 BUILDLINK_PKGSRCDIR.gnustep-base?=	../../devel/gnustep-base
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Headers\/Foundation$$/ { print "@comment in devel/gnustep-base: " $$0; next; }
diff --git a/devel/gnustep-base/distinfo b/devel/gnustep-base/distinfo
index e8fca91e9d3..cd6ef26ef24 100644
--- a/devel/gnustep-base/distinfo
+++ b/devel/gnustep-base/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2004/11/05 14:25:19 adam Exp $
+$NetBSD: distinfo,v 1.11 2004/11/16 01:16:06 rh Exp $
 
 SHA1 (gnustep-base-1.10.1.tar.gz) = 2835e23fe5627dc59028409acca288bbd9f8f524
 Size (gnustep-base-1.10.1.tar.gz) = 1909988 bytes
 SHA1 (patch-aa) = 315b09a68831654077c41d03b889f586c44b241a
 SHA1 (patch-ab) = 51b4273874c6f66a4c6ee6c7e78de7eadc9e7c95
 SHA1 (patch-ac) = 6a4a4213355645c654cd9ed6c232bfe875243720
+SHA1 (patch-ad) = 065f091ac008dddc3653bffa6af0cd5ea74a6037
diff --git a/devel/gnustep-base/patches/patch-ad b/devel/gnustep-base/patches/patch-ad
new file mode 100644
index 00000000000..5de441b36fa
--- /dev/null
+++ b/devel/gnustep-base/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2004/11/16 01:16:06 rh Exp $
+
+--- GNUmakefile.orig	2003-06-20 07:39:50.000000000 +1000
++++ GNUmakefile
+@@ -50,7 +50,7 @@ PACKAGE_NAME = gnustep-base
+ #
+ # The list of subproject directories
+ #
+-SUBPROJECTS = Source SSL Tools NSCharacterSets NSTimeZones Resources
++SUBPROJECTS = Source Tools NSCharacterSets NSTimeZones Resources
+ 
+ -include Makefile.preamble
+