Update GNUstep core libraries.

Update the default Objective-C compiler.

Fix various build failures in GNUstep ports from newer versions of the GNUstep
core libraries and from changes to GNUstep Make.

Update various ports that use GNUstep and bump the portrevision of the ones
that haven't had a new release.

15 files changed, 48 insertions, 18 deletions

diff --git a/games/fortunate/Makefile b/games/fortunate/Makefile
index e82af916b241..81cd23013fa2 100644
--- a/games/fortunate/Makefile
+++ b/games/fortunate/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	fortunate
 PORTVERSION=	3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games gnustep
 MASTER_SITES=	GNUSTEP_CH
 
diff --git a/games/gmastermind/Makefile b/games/gmastermind/Makefile
index 8f313ef4bfc7..521b1c41cc2b 100644
--- a/games/gmastermind/Makefile
+++ b/games/gmastermind/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gmastermind
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnustep
 MASTER_SITES=	SAVANNAH/gap
 DISTNAME=	GMastermind-${PORTVERSION}
diff --git a/games/gmines/Makefile b/games/gmines/Makefile
index f0781a77c230..b9c9ae5be38e 100644
--- a/games/gmines/Makefile
+++ b/games/gmines/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gmines
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnustep
 MASTER_SITES=	SAVANNAH/gap
 DISTNAME=	GMines-${PORTVERSION}
diff --git a/games/gnustep-ladder/Makefile b/games/gnustep-ladder/Makefile
index eb64b4ed686c..fc83c7a55014 100644
--- a/games/gnustep-ladder/Makefile
+++ b/games/gnustep-ladder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ladder
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games gnustep
 MASTER_SITES=	SAVANNAH/gap
 PKGNAMEPREFIX=	gnustep-
diff --git a/games/gnustep-sudoku/Makefile b/games/gnustep-sudoku/Makefile
index d6f6f8ad0d63..746d03ffd6f8 100644
--- a/games/gnustep-sudoku/Makefile
+++ b/games/gnustep-sudoku/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	sudoku
 PORTVERSION=	0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnustep
 MASTER_SITES=	SAVANNAH/gap
 PKGNAMEPREFIX=	gnustep-
diff --git a/games/gomoku/Makefile b/games/gomoku/Makefile
index a152e0cc8fb0..27d2bf230ab7 100644
--- a/games/gomoku/Makefile
+++ b/games/gomoku/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gomoku
 PORTVERSION=	1.2.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://www.gnustep.it/nicola/Applications/Gomoku/
 DISTNAME=	Gomoku-${PORTVERSION}
diff --git a/games/grubik/Makefile b/games/grubik/Makefile
index 6f1d6099511e..3ef3fb1dbbf6 100644
--- a/games/grubik/Makefile
+++ b/games/grubik/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	grubik
 PORTVERSION=	0.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/Recreational/
 DISTNAME=	GRubik
@@ -17,8 +17,6 @@ USE_GNUSTEP=	back build
 
 post-patch:
 	${RM} -r ${WRKSRC}/GRubik.app/ix86
-	${REINPLACE_CMD} -e 's|^//|# //|' \
-		-e "/GNUSTEP_INSTALLATION_DIR/d" ${WRKSRC}/GNUmakefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/GRubik.app/GRubik
diff --git a/games/grubik/files/patch-GNUmakefile b/games/grubik/files/patch-GNUmakefile
new file mode 100644
index 000000000000..9cc8656aaff6
--- /dev/null
+++ b/games/grubik/files/patch-GNUmakefile
@@ -0,0 +1,21 @@
+--- GNUmakefile.orig	2017-08-13 19:04:30 UTC
++++ GNUmakefile
+@@ -1,8 +1,3 @@
+-
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+-
+-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
+-
+ include $(GNUSTEP_MAKEFILES)/common.make
+ 
+ # The application to be compiled
+@@ -16,9 +11,6 @@ GRubik_OBJC_FILES = main.m  \
+ 
+ SHARED_CFLAGS     += -g
+ 
+-# The Resource files to be copied into the app's resources directory
+-// GRubik_RESOURCE_FILES = Icons/*
+-
+ -include GNUmakefile.preamble
+ 
+ -include GNUmakefile.local
diff --git a/games/gshisen/Makefile b/games/gshisen/Makefile
index 069ad45fe5ac..9477b511579e 100644
--- a/games/gshisen/Makefile
+++ b/games/gshisen/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gshisen
 PORTVERSION=	1.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnustep
 MASTER_SITES=	SAVANNAH/gap
 DISTNAME=	GShisen-${PORTVERSION}
diff --git a/games/jigsaw/Makefile b/games/jigsaw/Makefile
index ff16961258e4..b3fbd5c17621 100644
--- a/games/jigsaw/Makefile
+++ b/games/jigsaw/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	jigsaw
 PORTVERSION=	0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnustep
 MASTER_SITES=	SAVANNAH/gap
 DISTNAME=	Jigsaw-${PORTVERSION}
diff --git a/games/lapispuzzle/Makefile b/games/lapispuzzle/Makefile
index 65eac24cf19e..9bb84814f509 100644
--- a/games/lapispuzzle/Makefile
+++ b/games/lapispuzzle/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lapispuzzle
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnustep
 MASTER_SITES=	SAVANNAH/gap
 DISTNAME=	LapisPuzzle-${PORTVERSION}
diff --git a/games/nextgo/Makefile b/games/nextgo/Makefile
index 45b42fcdc174..9fcc251f7def 100644
--- a/games/nextgo/Makefile
+++ b/games/nextgo/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nextgo
 PORTVERSION=	3.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games gnustep
 MASTER_SITES=	SAVANNAH/gap
 DISTNAME=	NeXTGo-${PORTVERSION}
diff --git a/games/nextgo/files/patch-GNUmakefile b/games/nextgo/files/patch-GNUmakefile
new file mode 100644
index 000000000000..6798d5aff6d6
--- /dev/null
+++ b/games/nextgo/files/patch-GNUmakefile
@@ -0,0 +1,11 @@
+--- GNUmakefile.orig	2017-08-13 18:43:49 UTC
++++ GNUmakefile
+@@ -28,8 +28,6 @@
+ 
+ #GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+ 
+-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Library/Makefiles
+-
+ NeXTGo_MAIN_MODEL_FILE = NeXTGo.gorm
+ 
+ include $(GNUSTEP_MAKEFILES)/common.make
diff --git a/games/nextgo/files/patch-smartgo.h b/games/nextgo/files/patch-smartgo.h
index 77e08ff5e3b8..729b20aaf459 100644
--- a/games/nextgo/files/patch-smartgo.h
+++ b/games/nextgo/files/patch-smartgo.h
@@ -1,6 +1,6 @@
---- smartgo.h.orig	Sun Jan 12 05:01:52 2003
-+++ smartgo.h	Sat Nov 18 17:18:57 2006
-@@ -122,7 +122,7 @@
+--- smartgo.h.orig	2003-01-12 04:01:52 UTC
++++ smartgo.h
+@@ -122,7 +122,7 @@ typedef struct _node {
  extern node* parse_tree(char* inputBuffer);
  
  /*   Routines from smartgoeval.c needed by other routines.   */
@@ -9,7 +9,7 @@
  
  
  /*   Routines from smartgotree.c needed by other routines.  */
-@@ -134,7 +134,7 @@
+@@ -134,7 +134,7 @@ extern node* findLast0(node* currentNode
  extern node* forwardOneVariant(node* currentNode);
  extern node* backOneVariant(node* currentNode);
  extern void clearNodeFlags(node* currentNode);
diff --git a/games/oolite/Makefile b/games/oolite/Makefile
index cd3ea70d089d..ced028f3b94c 100644
--- a/games/oolite/Makefile
+++ b/games/oolite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		oolite
 PORTVERSION=		1.84
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=		games gnustep
 MASTER_SITES=		https://github.com/OoliteProject/oolite/releases/download/1.84/
 DISTNAME=		${PORTNAME}-source-${PORTVERSION}