3 files changed, 62 insertions, 25 deletions

diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 5ec43a01b6a8..cea28165fba4 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -6,8 +6,12 @@
 #
 
 PORTNAME=	gnustep-base
+.if defined(WITH_GNUSTEP_DEVEL)
+PORTVERSION=	1.21.0
+.else
 PORTVERSION=	1.19.3
-PORTREVISION=	1
+PORTREVISION=	2
+.endif
 CATEGORIES=	lang devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
@@ -18,10 +22,14 @@ COMMENT=	GNUstep Foundation library
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=	gnutls-openssl.40:${PORTSDIR}/security/gnutls
+BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
 
 USE_AUTOTOOLS=	autoconf:262
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-procfs
+CONFIGURE_ARGS=	--disable-procfs --disable-openssl --enable-tls \
+		--with-tls-prefix=${LOCALBASE} TLS_CONFIG="pkg-config -gnutls"
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_CONFIGURE=	yes
@@ -30,7 +38,6 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 USE_ICONV=	yes
 
-NO_PACKAGE=	GPL3
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 CFLAGS+=	-I${LOCALBASE}/include/libxml2/libxml
@@ -38,16 +45,6 @@ BREAKS_IF_PEDANTIC=	yes
 PLIST_SUB+=	LOCALBASE=${LOCALBASE}
 ETCDIR=		${LOCALBASE}/etc
 
-.if defined(WITHOUT_OPENSSL)
-CONFIGURE_ARGS+=	--disable-openssl
-PLIST_SUB+=	OPENSSL="@comment "
-.else
-USE_OPENSSL=	yes
-PLIST_SUB+=	OPENSSL=""
-MAKE_APPS=	SSL
-INSTALL_APPS=	SSL
-.endif
-
 .if !defined(WITHOUT_GNUSTEP_FAKEMAIN)
 CONFIGURE_ARGS+=	--enable-fake-main
 .endif
diff --git a/lang/gnustep-base/distinfo b/lang/gnustep-base/distinfo
index a2b8271f1737..75c46fb414d1 100644
--- a/lang/gnustep-base/distinfo
+++ b/lang/gnustep-base/distinfo
@@ -1,3 +1,6 @@
 MD5 (gnustep-base-1.19.3.tar.gz) = d73f70d5ab418e2a42a7c4b1bacdc5a6
 SHA256 (gnustep-base-1.19.3.tar.gz) = e804922a6717b6341b5182b19bac022ef2314f3cb2b00f62a0c43b65a5f40bd8
 SIZE (gnustep-base-1.19.3.tar.gz) = 2612479
+MD5 (gnustep-base-1.21.0.tar.gz) = c498bd19729b85ff923f8a6111f63079
+SHA256 (gnustep-base-1.21.0.tar.gz) = 4ba0e78e4793cf2bc0a4240a199e21928aa5a3430bcecf8b205396a9ed967807
+SIZE (gnustep-base-1.21.0.tar.gz) = 2530948
diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index 72360ba37230..3501450f1341 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -127,9 +127,11 @@ System/Library/Headers/Foundation/NSXMLNode.h
 System/Library/Headers/Foundation/NSXMLNodeOptions.h
 System/Library/Headers/Foundation/NSXMLParser.h
 System/Library/Headers/Foundation/NSZone.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/Additions.h
 System/Library/Headers/GNUstepBase/GCObject.h
 System/Library/Headers/GNUstepBase/GNUstep.h
-System/Library/Headers/GNUstepBase/GSCategories.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/GSBlocks.h
+%%GNUSTEP_STABLE%%System/Library/Headers/GNUstepBase/GSCategories.h
 System/Library/Headers/GNUstepBase/GSConfig.h
 System/Library/Headers/GNUstepBase/GSFileHandle.h
 System/Library/Headers/GNUstepBase/GSFunctions.h
@@ -142,14 +144,36 @@ System/Library/Headers/GNUstepBase/GSObjCRuntime.h
 System/Library/Headers/GNUstepBase/GSUnion.h
 System/Library/Headers/GNUstepBase/GSVersionMacros.h
 System/Library/Headers/GNUstepBase/GSXML.h
-System/Library/Headers/GNUstepBase/NSTask+GS.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSArray+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSAttributedString+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSBundle+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSCalendarDate+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSData+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSDebug+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSFileHandle+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSLock+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSMutableString+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSNumber+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSObject+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSProcessInfo+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSStream+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSString+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSTask+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSThread+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/GNUstepBase/NSURL+GNUstepBase.h
+%%GNUSTEP_STABLE%%System/Library/Headers/GNUstepBase/NSTask+GS.h
 System/Library/Headers/GNUstepBase/Unicode.h
-System/Library/Headers/GNUstepBase/behavior.h
-System/Library/Headers/GNUstepBase/objc-gnu2next.h
+%%GNUSTEP_STABLE%%System/Library/Headers/GNUstepBase/behavior.h
+%%GNUSTEP_STABLE%%System/Library/Headers/GNUstepBase/objc-gnu2next.h
 System/Library/Headers/GNUstepBase/preface.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/ObjectiveC2/Availability.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/ObjectiveC2/blocks_runtime.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/ObjectiveC2/runtime.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/Additions.h
 System/Library/Headers/gnustep/base/GCObject.h
 System/Library/Headers/gnustep/base/GNUstep.h
-System/Library/Headers/gnustep/base/GSCategories.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/GSBlocks.h
+%%GNUSTEP_STABLE%%System/Library/Headers/gnustep/base/GSCategories.h
 System/Library/Headers/gnustep/base/GSFileHandle.h
 System/Library/Headers/gnustep/base/GSFunctions.h
 System/Library/Headers/gnustep/base/GSIArray.h
@@ -161,10 +185,27 @@ System/Library/Headers/gnustep/base/GSObjCRuntime.h
 System/Library/Headers/gnustep/base/GSUnion.h
 System/Library/Headers/gnustep/base/GSVersionMacros.h
 System/Library/Headers/gnustep/base/GSXML.h
-System/Library/Headers/gnustep/base/NSTask+GS.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSArray+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSAttributedString+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSBundle+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSCalendarDate+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSData+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSDebug+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSFileHandle+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSLock+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSMutableString+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSNumber+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSObject+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSProcessInfo+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSStream+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSString+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSTask+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSThread+GNUstepBase.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/NSURL+GNUstepBase.h
+%%GNUSTEP_STABLE%%System/Library/Headers/gnustep/base/NSTask+GS.h
 System/Library/Headers/gnustep/base/Unicode.h
 System/Library/Headers/gnustep/base/behavior.h
-System/Library/Headers/gnustep/base/objc-gnu2next.h
+%%GNUSTEP_STABLE%%System/Library/Headers/gnustep/base/objc-gnu2next.h
 System/Library/Headers/gnustep/base/preface.h
 System/Library/Headers/gnustep/unicode/caseconv.h
 System/Library/Headers/gnustep/unicode/cop.h
@@ -797,9 +838,6 @@ System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZ
 System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Zulu
 System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/Localizable.strings
 System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/TraditionalChinese.lproj/Localizable.strings
-%%OPENSSL%%System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/SSL.bundle/SSL
-%%OPENSSL%%System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/SSL.bundle/Resources/Info-gnustep.plist
-%%OPENSSL%%System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/SSL.bundle/stamp.make
 System/Library/Libraries/libgnustep-base.so
 System/Library/Libraries/libgnustep-base.so.%%BASEVERSION%%
 System/Library/Libraries/libgnustep-base.so.%%VERSION%%
@@ -821,8 +859,6 @@ System/Tools/plparse
 System/Tools/plser
 System/Tools/sfparse
 System/Tools/xmlparse
-%%OPENSSL%%@dirrm System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/SSL.bundle/Resources
-%%OPENSSL%%@dirrm System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/SSL.bundle
 @dirrm System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/TraditionalChinese.lproj
 @dirrm System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Spanish.lproj
 @dirrm System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/US
@@ -862,6 +898,7 @@ System/Tools/xmlparse
 @dirrm System/Library/Headers/gnustep/unicode
 @dirrm System/Library/Headers/gnustep/base
 @dirrm System/Library/Headers/gnustep
+%%GNUSTEP_DEVEL%%@dirrm System/Library/Headers/ObjectiveC2
 @dirrm System/Library/Headers/GNUstepBase/unicode
 @dirrm System/Library/Headers/GNUstepBase
 @dirrm System/Library/Headers/Foundation