4 files changed, 20 insertions, 34 deletions

diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index 7abdd7b6f1bf..3a92fee431ef 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnustep
-PORTVERSION=	1.1.0
+PORTVERSION=	1.3.0
 CATEGORIES=	devel lang
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -35,9 +35,10 @@ GNU_ARCH=	ix86
 GNU_ARCH=	${MACHINE_ARCH}
 .endif
 
-SYSLIBDIR=	${PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}
+SYSTEMDIR=	${LOCALBASE}/GNUstep/System
+SYSLIBDIR=	${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
 COMBOLIBDIR=	${SYSLIBDIR}/gnu-gnu-gnu
-XGPSBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-xgps.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/
+XGPSBUNDLEDIR=	${SYSTEMDIR}/Library/Bundles/libgnustep-xgps.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/
 
 do-install:	# empty
 
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 9e0f831fb0ae..7ebd0a06667f 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnustep-base
-PORTVERSION=	1.1.0
+PORTVERSION=	1.3.0
 CATEGORIES=	lang devel
 MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/ \
 		http://ftp.codefactory.se/pub/gnu/gstep/ \
@@ -43,10 +43,11 @@ GNU_ARCH=	${MACHINE_ARCH}
 PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION} \
 		MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1}
 ETCDIR=		${PREFIX}/../etc
-SYSLIBDIR=	${PREFIX}/System/Libraries
+SYSTEMDIR=	${LOCALBASE}/GNUstep/System
+SYSLIBDIR=	${SYSTEMDIR}/Libraries
 
 do-configure:
-	@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
+	@(cd ${WRKSRC}; . ${SYSTEMDIR}/Makefiles/GNUstep.sh; \
 	    if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
@@ -61,11 +62,11 @@ do-configure:
 	    fi)
 
 do-build:
-	@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
+	@(cd ${WRKSRC}; . ${SYSTEMDIR}/Makefiles/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 
 do-install:
-	@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
+	@(cd ${WRKSRC}; . ${SYSTEMDIR}/Makefiles/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 post-install:
diff --git a/lang/gnustep-base/distinfo b/lang/gnustep-base/distinfo
index 874181482fd1..adc65e125bee 100644
--- a/lang/gnustep-base/distinfo
+++ b/lang/gnustep-base/distinfo
@@ -1 +1 @@
-MD5 (gnustep-base-1.1.0.tar.gz) = 47618e53405602dc7a6e2a79102891b0
+MD5 (gnustep-base-1.3.0.tar.gz) = 17ada29260cd7df0f00639c11ad0349b
diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index e226adc78fdd..b75804d5b38b 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -82,19 +82,6 @@ System/Headers/gnustep/base/Unicode.h
 System/Headers/gnustep/base/UnixFileHandle.h
 System/Headers/gnustep/base/behavior.h
 System/Headers/gnustep/base/numbers.h
-System/Headers/gnustep/base/o_array.h
-System/Headers/gnustep/base/o_array_bas.h
-System/Headers/gnustep/base/o_array_cbs.h
-System/Headers/gnustep/base/o_cbs.h
-System/Headers/gnustep/base/o_hash.h
-System/Headers/gnustep/base/o_hash_bas.h
-System/Headers/gnustep/base/o_hash_cbs.h
-System/Headers/gnustep/base/o_list.h
-System/Headers/gnustep/base/o_list_bas.h
-System/Headers/gnustep/base/o_list_cbs.h
-System/Headers/gnustep/base/o_map.h
-System/Headers/gnustep/base/o_map_bas.h
-System/Headers/gnustep/base/o_map_cbs.h
 System/Headers/gnustep/base/objc-gnu2next.h
 System/Headers/gnustep/base/preface.h
 System/Headers/gnustep/unicode/caseconv.h
@@ -223,6 +210,7 @@ System/Libraries/Resources/NSTimeZones/zones/America/Cordoba
 System/Libraries/Resources/NSTimeZones/zones/America/Costa_Rica
 System/Libraries/Resources/NSTimeZones/zones/America/Cuiaba
 System/Libraries/Resources/NSTimeZones/zones/America/Curacao
+System/Libraries/Resources/NSTimeZones/zones/America/Danmarkshavn
 System/Libraries/Resources/NSTimeZones/zones/America/Dawson
 System/Libraries/Resources/NSTimeZones/zones/America/Dawson_Creek
 System/Libraries/Resources/NSTimeZones/zones/America/Denver
@@ -246,6 +234,7 @@ System/Libraries/Resources/NSTimeZones/zones/America/Guyana
 System/Libraries/Resources/NSTimeZones/zones/America/Halifax
 System/Libraries/Resources/NSTimeZones/zones/America/Havana
 System/Libraries/Resources/NSTimeZones/zones/America/Hermosillo
+System/Libraries/Resources/NSTimeZones/zones/America/North_Dakota/Center
 System/Libraries/Resources/NSTimeZones/zones/America/Indiana/Indianapolis
 System/Libraries/Resources/NSTimeZones/zones/America/Indiana/Knox
 System/Libraries/Resources/NSTimeZones/zones/America/Indiana/Marengo
@@ -345,6 +334,8 @@ System/Libraries/Resources/NSTimeZones/zones/Asia/Beirut
 System/Libraries/Resources/NSTimeZones/zones/Asia/Bishkek
 System/Libraries/Resources/NSTimeZones/zones/Asia/Brunei
 System/Libraries/Resources/NSTimeZones/zones/Asia/Calcutta
+System/Libraries/Resources/NSTimeZones/zones/Asia/Choibalsan
+System/Libraries/Resources/NSTimeZones/zones/Asia/Chongqing
 System/Libraries/Resources/NSTimeZones/zones/Asia/Chungking
 System/Libraries/Resources/NSTimeZones/zones/Asia/Colombo
 System/Libraries/Resources/NSTimeZones/zones/Asia/Dacca
@@ -372,22 +363,26 @@ System/Libraries/Resources/NSTimeZones/zones/Asia/Kuala_Lumpur
 System/Libraries/Resources/NSTimeZones/zones/Asia/Kuching
 System/Libraries/Resources/NSTimeZones/zones/Asia/Kuwait
 System/Libraries/Resources/NSTimeZones/zones/Asia/Macao
+System/Libraries/Resources/NSTimeZones/zones/Asia/Macau
 System/Libraries/Resources/NSTimeZones/zones/Asia/Magadan
 System/Libraries/Resources/NSTimeZones/zones/Asia/Manila
 System/Libraries/Resources/NSTimeZones/zones/Asia/Muscat
 System/Libraries/Resources/NSTimeZones/zones/Asia/Nicosia
 System/Libraries/Resources/NSTimeZones/zones/Asia/Novosibirsk
 System/Libraries/Resources/NSTimeZones/zones/Asia/Omsk
+System/Libraries/Resources/NSTimeZones/zones/Asia/Oral
 System/Libraries/Resources/NSTimeZones/zones/Asia/Phnom_Penh
 System/Libraries/Resources/NSTimeZones/zones/Asia/Pontianak
 System/Libraries/Resources/NSTimeZones/zones/Asia/Pyongyang
 System/Libraries/Resources/NSTimeZones/zones/Asia/Qatar
+System/Libraries/Resources/NSTimeZones/zones/Asia/Qyzylorda
 System/Libraries/Resources/NSTimeZones/zones/Asia/Rangoon
 System/Libraries/Resources/NSTimeZones/zones/Asia/Riyadh
 System/Libraries/Resources/NSTimeZones/zones/Asia/Riyadh87
 System/Libraries/Resources/NSTimeZones/zones/Asia/Riyadh88
 System/Libraries/Resources/NSTimeZones/zones/Asia/Riyadh89
 System/Libraries/Resources/NSTimeZones/zones/Asia/Saigon
+System/Libraries/Resources/NSTimeZones/zones/Asia/Sakhalin
 System/Libraries/Resources/NSTimeZones/zones/Asia/Samarkand
 System/Libraries/Resources/NSTimeZones/zones/Asia/Seoul
 System/Libraries/Resources/NSTimeZones/zones/Asia/Shanghai
@@ -715,18 +710,6 @@ System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/plmerge
 System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/plparse
 System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/plser
 System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/sfparse
-System/Tools/HTMLLinker
-System/Tools/autogsdoc
-System/Tools/defaults
-System/Tools/gdnc
-System/Tools/gdomap
-System/Tools/gsdoc
-System/Tools/pl2link
-System/Tools/pldes
-System/Tools/plmerge
-System/Tools/plparse
-System/Tools/plser
-System/Tools/sfparse
 @exec ln -sf ../Resources %D/System/Library/Bundles/SSL.bundle/Contents/Resources
 @unexec rm -f %D/System/Library/Bundles/SSL.bundle/Contents/Resources
 @dirrm System/Library/Bundles/SSL.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
@@ -753,6 +736,7 @@ System/Tools/sfparse
 @dirrm System/Libraries/Resources/NSTimeZones/zones/Antarctica
 @dirrm System/Libraries/Resources/NSTimeZones/zones/America/Kentucky
 @dirrm System/Libraries/Resources/NSTimeZones/zones/America/Indiana
+@dirrm System/Libraries/Resources/NSTimeZones/zones/America/North_Dakota
 @dirrm System/Libraries/Resources/NSTimeZones/zones/America
 @dirrm System/Libraries/Resources/NSTimeZones/zones/Africa
 @dirrm System/Libraries/Resources/NSTimeZones/zones