- Update to 1.65

PR:		ports/100857
Submitted by:	Denis Shaposhnikov <dsh at vlink.ru>
Approved by:	Andriy Gapon <avg at icyb.net.ua> (maintainer)

6 files changed, 38 insertions, 46 deletions

diff --git a/games/oolite/files/patch-JoystickHandler.h b/games/oolite/files/patch-JoystickHandler.h
deleted file mode 100644
index fc0a83dce741..000000000000
--- a/games/oolite/files/patch-JoystickHandler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- JoystickHandler.h.orig	Mon Oct 17 16:30:19 2005
-+++ JoystickHandler.h	Mon Oct 17 16:30:52 2005
-@@ -91,7 +91,7 @@
- #define ENUMKEY(x) [NSString stringWithFormat: @"%d", x]
- 
- #import <Foundation/Foundation.h>
--#import <SDL/SDL.h>
-+#import <SDL.h>
- 
- @interface JoystickHandler : NSObject
- {
diff --git a/games/oolite/files/patch-MyOpenGLView.h b/games/oolite/files/patch-MyOpenGLView.h
deleted file mode 100644
index e9b658c50e25..000000000000
--- a/games/oolite/files/patch-MyOpenGLView.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- MyOpenGLView.h.orig	Thu Feb 23 20:26:20 2006
-+++ MyOpenGLView.h	Thu Feb 23 20:26:30 2006
-@@ -39,7 +39,7 @@
- #import "OOOpenGL.h"
- 
- #ifdef GNUSTEP
--#include <SDL/SDL.h>
-+#include <SDL.h>
- #endif
- 
- #define MAX_CLEAR_DEPTH		100000000.0
diff --git a/games/oolite/files/patch-OOCocoa.h b/games/oolite/files/patch-OOCocoa.h
index 28f10b5cf5e7..b03eb13c360d 100644
--- a/games/oolite/files/patch-OOCocoa.h
+++ b/games/oolite/files/patch-OOCocoa.h
@@ -1,5 +1,5 @@
---- OOCocoa.h.orig	Thu Apr 27 14:16:30 2006
-+++ OOCocoa.h	Thu Apr 27 15:14:04 2006
+--- src/Core/OOCocoa.h.orig	Thu Apr 27 14:16:30 2006
++++ src/Core/OOCocoa.h	Thu Apr 27 15:14:04 2006
 @@ -1,7 +1,7 @@
  // Import OpenStep main headers and define some Macisms and other compatibility stuff.
  
diff --git a/games/oolite/files/patch-OOFileManager.h b/games/oolite/files/patch-OOFileManager.h
index f6b369c22a74..379a180f183b 100644
--- a/games/oolite/files/patch-OOFileManager.h
+++ b/games/oolite/files/patch-OOFileManager.h
@@ -1,5 +1,5 @@
---- OOFileManager.h.orig	Mon Oct 17 16:42:31 2005
-+++ OOFileManager.h	Mon Oct 17 16:43:14 2005
+--- src/Core/OOFileManager.h.orig	Mon Oct 17 16:42:31 2005
++++ src/Core/OOFileManager.h	Mon Oct 17 16:43:14 2005
 @@ -16,7 +16,7 @@
  //
  #import <Foundation/Foundation.h>
diff --git a/games/oolite/files/patch-main.m b/games/oolite/files/patch-main.m
index e98fe0dd923a..b86c6a5d6e4e 100644
--- a/games/oolite/files/patch-main.m
+++ b/games/oolite/files/patch-main.m
@@ -1,14 +1,20 @@
---- main.m.orig	Fri Oct 14 00:32:51 2005
-+++ main.m	Wed Oct 19 14:08:21 2005
-@@ -23,6 +23,11 @@
+--- src/SDL/main.m.orig	Tue Jul 18 21:34:19 2006
++++ src/SDL/main.m	Thu Aug 17 11:03:44 2006
+@@ -1,5 +1,3 @@
+-#import <AppKit/NSApplication.h>
+-
+ #ifdef GNUSTEP
+ #import <Foundation/NSAutoreleasePool.h>
+ #import <Foundation/NSString.h>
+@@ -25,6 +23,11 @@
+ 	// Need this because we're not using the default run loop's autorelease
  	// pool.
  	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- 
++
 +	NSString *gstepdir = [NSHomeDirectory() stringByAppendingPathComponent:@"GNUstep"];
 +	NSString *libdir   = [gstepdir stringByAppendingPathComponent:@"Library"];
 +	[[NSFileManager defaultManager] createDirectoryAtPath:gstepdir attributes:nil];
 +	[[NSFileManager defaultManager] createDirectoryAtPath:libdir attributes:nil];
-+
+ 
  	// dajt: allocate and set the NSApplication delegate manually because not
  	// using NIB to do this
- 	controller = [[GameController alloc] init];
diff --git a/games/oolite/files/patch-makefile b/games/oolite/files/patch-makefile
index 1af104f74aed..33c51d889892 100644
--- a/games/oolite/files/patch-makefile
+++ b/games/oolite/files/patch-makefile
@@ -1,16 +1,24 @@
---- GNUmakefile.orig	Tue Oct  4 14:56:57 2005
-+++ GNUmakefile	Tue Oct  4 15:03:47 2005
-@@ -1,9 +1,9 @@
- include $(GNUSTEP_MAKEFILES)/common.make
- CP = cp
+--- GNUmakefile.orig	Tue Jul 18 21:34:25 2006
++++ GNUmakefile	Thu Jul 20 16:48:27 2006
+@@ -3,7 +3,7 @@
+ vpath %.m src/SDL:src/Core
+ vpath %.h src/SDL:src/Core
+ vpath %.c src/SDL:src/Core:src/BSDCompat
 -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_USER_ROOT)
--ADDITIONAL_GUI_LIBS = -lGLU -lGL -lSDL -lpthread -lSDL_mixer -lSDL_image -lSDL_gfx
--ADDITIONAL_CFLAGS = -DLINUX `sdl-config --cflags`
--ADDITIONAL_OBJCFLAGS = -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
 +GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
-+ADDITIONAL_GUI_LIBS = -lGLU -lGL -lSDL_mixer -lSDL_image -lSDL_gfx `sdl-config --libs`
-+ADDITIONAL_CFLAGS = -I/usr/X11R6/include -DLINUX `sdl-config --cflags`
-+ADDITIONAL_OBJCFLAGS = -I/usr/X11R6/include -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
- APP_NAME = oolite
- oolite_LIB_DIRS += -L/usr/X11R6/lib/
- 
+ ifeq ($(GNUSTEP_HOST_OS),mingw32)
+ 	ADDITIONAL_INCLUDE_DIRS =
+ 	ADDITIONAL_OBJC_LIBS = -lglu32 -lopengl32 -lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_image -lgnustep-base
+@@ -13,9 +13,9 @@
+ 	oolite_LIB_DIRS += -L$(GNUSTEP_LOCAL_ROOT)/lib
+ else
+ 	ADDITIONAL_INCLUDE_DIRS = -Isrc/SDL -Isrc/Core -Isrc/BSDCompat
+-	ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lSDL -lpthread -lSDL_mixer -lSDL_image -lgnustep-base
+-	ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
+-	ADDITIONAL_OBJCFLAGS = -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
++	ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lSDL_mixer -lSDL_image -lSDL_gfx -lgnustep-base `sdl-config --libs`
++	ADDITIONAL_CFLAGS = -I/usr/X11R6/include -DLINUX `sdl-config --cflags`
++	ADDITIONAL_OBJCFLAGS = -I/usr/X11R6/include -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
+ 	oolite_LIB_DIRS += -L/usr/X11R6/lib/
+ endif
+ OBJC_PROGRAM_NAME = oolite