Update GNUstep ports to their latest versions.

Also fix a few bits of generic infrastructure along the way.

Approved by:	bapt (mentor)
Differential Revision:	https://reviews.freebsd.org/D2961

6 files changed, 28 insertions, 66 deletions

diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index d326613fdb08..0a9f043e696d 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnustep-base
-PORTVERSION=	1.24.6
-PORTREVISION=	7
+PORTVERSION=	1.24.8
 CATEGORIES=	lang devel gnustep
 MASTER_SITES=	GNUSTEP/core
 
diff --git a/lang/gnustep-base/distinfo b/lang/gnustep-base/distinfo
index 9bbdb1c5dbee..997b2a3927ec 100644
--- a/lang/gnustep-base/distinfo
+++ b/lang/gnustep-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnustep-base-1.24.6.tar.gz) = b6d7bed40c52330928a1e27f8c7b5f8fcf24ede2113542546dcf157a9366d72a
-SIZE (gnustep-base-1.24.6.tar.gz) = 3502981
+SHA256 (gnustep-base-1.24.8.tar.gz) = 5b2a7042bc5001e97ac090143244a4344a6cba72cee53f3840e2492d3db443cb
+SIZE (gnustep-base-1.24.8.tar.gz) = 3515290
diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index 2952a9840012..dd41c7afdef1 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -6,12 +6,15 @@ GNUstep/System/Library/DTDs/gsdoc-1_0_1.dtd
 GNUstep/System/Library/DTDs/gsdoc-1_0_1.rnc
 GNUstep/System/Library/DTDs/gsdoc-1_0_2.dtd
 GNUstep/System/Library/DTDs/gsdoc-1_0_3.dtd
+GNUstep/System/Library/DTDs/gsdoc-1_0_4.dtd
 GNUstep/System/Library/DTDs/plist-0_9.dtd
+GNUstep/System/Library/Documentation/man/man1/HTMLLinker.1.gz
 GNUstep/System/Library/Documentation/man/man1/autogsdoc.1.gz
 GNUstep/System/Library/Documentation/man/man1/cvtenc.1.gz
 GNUstep/System/Library/Documentation/man/man1/defaults.1.gz
 GNUstep/System/Library/Documentation/man/man1/gdnc.1.gz
 GNUstep/System/Library/Documentation/man/man1/gspath.1.gz
+GNUstep/System/Library/Documentation/man/man1/make_strings.1.gz
 GNUstep/System/Library/Documentation/man/man1/pldes.1.gz
 GNUstep/System/Library/Documentation/man/man1/sfparse.1.gz
 GNUstep/System/Library/Documentation/man/man1/xmlparse.1.gz
@@ -122,10 +125,11 @@ GNUstep/System/Library/Headers/Foundation/NSURLProtectionSpace.h
 GNUstep/System/Library/Headers/Foundation/NSURLProtocol.h
 GNUstep/System/Library/Headers/Foundation/NSURLRequest.h
 GNUstep/System/Library/Headers/Foundation/NSURLResponse.h
+GNUstep/System/Library/Headers/Foundation/NSUUID.h
 GNUstep/System/Library/Headers/Foundation/NSUndoManager.h
 GNUstep/System/Library/Headers/Foundation/NSUserDefaults.h
+GNUstep/System/Library/Headers/Foundation/NSUserNotification.h
 GNUstep/System/Library/Headers/Foundation/NSUtilities.h
-GNUstep/System/Library/Headers/Foundation/NSUUID.h
 GNUstep/System/Library/Headers/Foundation/NSValue.h
 GNUstep/System/Library/Headers/Foundation/NSValueTransformer.h
 GNUstep/System/Library/Headers/Foundation/NSXMLDTD.h
@@ -147,7 +151,6 @@ 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/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
@@ -161,6 +164,7 @@ GNUstep/System/Library/Headers/GNUstepBase/NSDebug+GNUstepBase.h
 GNUstep/System/Library/Headers/GNUstepBase/NSFileHandle+GNUstepBase.h
 GNUstep/System/Library/Headers/GNUstepBase/NSLock+GNUstepBase.h
 GNUstep/System/Library/Headers/GNUstepBase/NSMutableString+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSNetServices+GNUstepBase.h
 GNUstep/System/Library/Headers/GNUstepBase/NSNumber+GNUstepBase.h
 GNUstep/System/Library/Headers/GNUstepBase/NSObject+GNUstepBase.h
 GNUstep/System/Library/Headers/GNUstepBase/NSProcessInfo+GNUstepBase.h
@@ -179,6 +183,7 @@ GNUstep/System/Library/Headers/gnustep/unicode/nextstep.h
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/English.lproj/Localizable.strings
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Esperanto.lproj/Localizable.strings
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/French.lproj/Localizable.strings
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/GSTLS/ca-certificates.crt
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/German.lproj/Localizable.strings
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Info-gnustep.plist
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Italian.lproj/Localizable.strings
@@ -207,11 +212,6 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/create-abbrevs.m
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/create-regions.m
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/nstimezone.m
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/GSTLS/ca-certificates.crt
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Creston
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Khandyga
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ust-Nera
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Busingen
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/regions
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Africa/Abidjan
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Africa/Accra
@@ -280,8 +280,8 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/La_Rioja
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Mendoza
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Rio_Gallegos
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/San_Juan
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Salta
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/San_Juan
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/San_Luis
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Tucuman
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Ushuaia
@@ -311,6 +311,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Coral_Harbour
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Cordoba
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Costa_Rica
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Creston
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Cuiaba
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Curacao
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Danmarkshavn
@@ -386,8 +387,8 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 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
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Ojinaga
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Panama
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Pangnirtung
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Paramaribo
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Phoenix
@@ -433,13 +434,14 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Casey
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Davis
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/DumontDUrville
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Mawson
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Macquarie
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Mawson
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/McMurdo
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Palmer
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Rothera
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/South_Pole
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Syowa
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Troll
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Vostok
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Arctic/Longyearbyen
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Aden
@@ -458,6 +460,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Bishkek
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Brunei
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Calcutta
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Chita
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Choibalsan
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Chongqing
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Chungking
@@ -485,6 +488,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kashgar
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kathmandu
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Katmandu
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Khandyga
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kolkata
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Krasnoyarsk
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kuala_Lumpur
@@ -508,15 +512,13 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Qyzylorda
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Rangoon
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Riyadh
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Riyadh87
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Riyadh88
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Riyadh89
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Saigon
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Sakhalin
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Samarkand
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Seoul
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Shanghai
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Singapore
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Srednekolymsk
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Taipei
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Tashkent
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Tbilisi
@@ -529,6 +531,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ulaanbaatar
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ulan_Bator
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Urumqi
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ust-Nera
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Vientiane
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Vladivostok
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Yakutsk
@@ -637,6 +640,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Brussels
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Bucharest
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Budapest
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Busingen
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Chisinau
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Copenhagen
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Dublin
@@ -746,9 +750,6 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mexico/BajaNorte
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mexico/BajaSur
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mexico/General
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mideast/Riyadh87
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mideast/Riyadh88
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mideast/Riyadh89
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/NZ
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/NZ-CHAT
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Navajo
@@ -756,6 +757,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/PST8PDT
 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/Bougainville
 GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Chatham
 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
diff --git a/lang/libobjc2/Makefile b/lang/libobjc2/Makefile
index d135f51c576b..76d44f3322a8 100644
--- a/lang/libobjc2/Makefile
+++ b/lang/libobjc2/Makefile
@@ -5,30 +5,21 @@ PORTNAME=	libobjc2
 PORTVERSION=	1.7
 PORTREVISION=	1
 CATEGORIES=	lang devel gnustep
-MASTER_SITES=	http://download.gna.org/gnustep/
+USE_GITHUB=	yes
+GH_ACCOUNT=	gnustep
+GH_PROJECT=	libobjc2
+GH_TAGNAME=	857edd9
 
 MAINTAINER=	theraven@FreeBSD.org
 COMMENT=	Replacement Objective-C runtime supporting modern Objective-C features
 
 SSP_UNSAFE=	yes
 
-USES=		cmake tar:bzip2
+USES=		cmake objc:compiler
 BROKEN_powerpc=		Does not compile on powerpc: Unsupported relocation type 10
 
 .include <bsd.port.options.mk>
 
-_CLANG!=	if [ -f /usr/bin/clang ] ; then  /usr/bin/clang --version | head -1 | \
-		${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/' ; else ${ECHO} 0 ; fi
-
-.if ${_CLANG} < 34
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
-CC=		${LOCALBASE}/bin/clang34
-CXX=	${LOCALBASE}/bin/clang++34
-.else
-CC=		/usr/bin/clang
-CXX=	/usr/bin/clang++
-.endif
-
 SHLIB_MAJOR=	4
 SHLIB_MINOR=	6
 
diff --git a/lang/libobjc2/distinfo b/lang/libobjc2/distinfo
index 074720374190..cd317ee95c77 100644
--- a/lang/libobjc2/distinfo
+++ b/lang/libobjc2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libobjc2-1.7.tar.bz2) = 3a1b4af6ff6f3d8e57bfb27401d1b249670ac2e92ba54ad5683ff3d4439d3cc1
-SIZE (libobjc2-1.7.tar.bz2) = 132662
+SHA256 (gnustep-libobjc2-1.7-857edd9_GH0.tar.gz) = c69add3a57465d56e406b4307d6e734232a13a31336cdfefebe3c29abb9d25e8
+SIZE (gnustep-libobjc2-1.7-857edd9_GH0.tar.gz) = 173442
diff --git a/lang/libobjc2/files/patch-arc.m b/lang/libobjc2/files/patch-arc.m
deleted file mode 100644
index 1dc141a73067..000000000000
--- a/lang/libobjc2/files/patch-arc.m
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./arc.m.orig	2013-03-12 08:51:59.000000000 +0000
-+++ ./arc.m	2014-01-13 15:04:54.000000000 +0000
-@@ -219,15 +219,18 @@
- 		}
- 		else
- 		{
--			[AutoreleasePool class];
--			useARCAutoreleasePool = class_respondsToSelector(AutoreleasePool,
--			                                                 SELECTOR(_ARCCompatibleAutoreleasePool));
--			NewAutoreleasePool = class_getMethodImplementation(object_getClass(AutoreleasePool),
--			                                                   SELECTOR(new));
--			DeleteAutoreleasePool = class_getMethodImplementation(AutoreleasePool,
--			                                                      SELECTOR(release));
--			AutoreleaseAdd = class_getMethodImplementation(object_getClass(AutoreleasePool),
--			                                               SELECTOR(addObject:));
-+			useARCAutoreleasePool = (0 != class_getInstanceMethod(AutoreleasePool,
-+			                                                      SELECTOR(_ARCCompatibleAutoreleasePool)));
-+			if (!useARCAutoreleasePool)
-+			{
-+			        [AutoreleasePool class];
-+			        NewAutoreleasePool = class_getMethodImplementation(object_getClass(AutoreleasePool),
-+			                                                           SELECTOR(new));
-+			        DeleteAutoreleasePool = class_getMethodImplementation(AutoreleasePool,
-+			                                                              SELECTOR(release));
-+			        AutoreleaseAdd = class_getMethodImplementation(object_getClass(AutoreleasePool),
-+			                                                       SELECTOR(addObject:));
-+			}
- 		}
- 	}
- }