Import oolite, 3d space combat/trading game in the style of elite.

tweaked by and ok aja
2010-04-19 23:44:55 +00:00 · 2010-04-19 23:44:55 +00:00 · 3575d8b12b
commit 3575d8b12b
parent 8291e5d334
21 changed files with 678 additions and 0 deletions
--- a/games/oolite/Makefile
+++ b/games/oolite/Makefile
@ -0,0 +1,45 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+
+COMMENT=	space combat and trading game in the style of Elite
+
+VERSION=	1.73.4
+DISTNAME=	oolite-dev-source-${VERSION}
+PKGNAME=	oolite-${VERSION}
+CATEGORIES=	games
+
+HOMEPAGE=	http://www.oolite.org/
+
+MAINTAINER=	Nicholas Marriott <nicm@openbsd.org>
+
+# GPLv2
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=	${MASTER_SITE_BERLIOS:=oolite-linux/}
+EXTRACT_SUFX=	.tar.bz2
+
+MODULES=	gcc4
+MODGCC4_ARCHES=	*
+MODGCC4_LANGS=	c
+
+LIB_DEPENDS=	SDL_mixer::devel/sdl-mixer \
+		objc:gobjc->=4.2,<4.3|gobjc->=4.2v0,<4.3v0:lang/gcc/4.2,-objc \
+		gnustep-base::x11/gnustep/base \
+		png::graphics/png
+
+WANTLIB += GL GLU SDL c m pthread
+
+USE_GMAKE=	Yes
+MAKE_ENV=	GNUSTEP_MAKEFILES=`gnustep-config --variable=GNUSTEP_MAKEFILES`
+ALL_TARGET=	release
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKBUILD}/oolite.app/oolite ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/oolite
+	cp -R ${WRKBUILD}/oolite.app/Resources ${PREFIX}/share/oolite
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/oolite
+	cp -R ${WRKSRC}/Doc/*.{TXT,pdf} ${PREFIX}/share/doc/oolite
+
+.include <bsd.port.mk>
--- a/games/oolite/distinfo
+++ b/games/oolite/distinfo
@ -0,0 +1,5 @@
+MD5 (oolite-dev-source-1.73.4.tar.bz2) = HLkj9jVBXlkD4WYZW0uOmQ==
+RMD160 (oolite-dev-source-1.73.4.tar.bz2) = cQ5JjcnY7Vus6yNqeJtkrGIkDVg=
+SHA1 (oolite-dev-source-1.73.4.tar.bz2) = 8XpOVlXR5QK3swUSclS0ZZgkCQ8=
+SHA256 (oolite-dev-source-1.73.4.tar.bz2) = na/9vog5IHJSIvI+wqoQGSa97ygc/mLEE7PP9KEMMAc=
+SIZE (oolite-dev-source-1.73.4.tar.bz2) = 37486680
--- a/games/oolite/patches/patch-GNUmakefile
+++ b/games/oolite/patches/patch-GNUmakefile
@ -0,0 +1,16 @@
+$OpenBSD: patch-GNUmakefile,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- GNUmakefile.orig	Sun Aug 30 12:46:42 2009
+++ GNUmakefile	Wed Mar 31 00:22:10 2010
+@@ -20,10 +21,10 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
+ else
+ 	LIBJS_SRC_DIR = deps/Cross-platform-deps/SpiderMonkey/js/src
+ 	LIBJS_BIN_DIR = $(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
+-	ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR)  -I$(LIBJS_BIN_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
+	ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LOCALBASE)/include/libpng -I$(LIBJS_BIN_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
+ 	ADDITIONAL_OBJC_LIBS = -lpng $(LIBJS_BIN_DIR)/libjs.a -lGLU -lGL -lSDL -lSDL_mixer -lgnustep-base
+ 	ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
+-	ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import `sdl-config --cflags`
+	ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import -DBUNDLE_PATH='@"$(LOCALBASE)/share/oolite"' `sdl-config --cflags`
+ 	oolite_LIB_DIRS += -L/usr/X11R6/lib/
+ endif
+ ifeq ($(libespeak),yes)
--- a/games/oolite/patches/patch-GNUmakefile_postamble
+++ b/games/oolite/patches/patch-GNUmakefile_postamble
@ -0,0 +1,24 @@
+$OpenBSD: patch-GNUmakefile_postamble,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- GNUmakefile.postamble.orig	Tue Mar 30 22:22:40 2010
+++ GNUmakefile.postamble	Tue Mar 30 22:22:48 2010
+@@ -18,15 +18,15 @@ PROGDIR=$(OBJC_PROGRAM_NAME).app
+ after-all:: 
+ 	$(MKDIRS) $(PROGDIR)
+ 	$(MKDIRS) $(PROGDIR)/Resources
+-	$(CP) -r -u -f Resources $(PROGDIR)
+-	$(CP) -r -u -f Schemata $(PROGDIR)/Resources
+-	$(CP) -u -f src/Cocoa/Info-Oolite.plist $(PROGDIR)/Resources/Info-gnustep.plist
+-	$(CP) -u -f $(GNUSTEP_OBJ_DIR_NAME)/$(SRC_BIN) $(PROGDIR)/$(DEST_BIN)
+	$(CP) -r -f Resources $(PROGDIR)
+	$(CP) -r -f Schemata $(PROGDIR)/Resources
+	$(CP) -f src/Cocoa/Info-Oolite.plist $(PROGDIR)/Resources/Info-gnustep.plist
+	$(CP) -f $(GNUSTEP_OBJ_DIR_NAME)/$(SRC_BIN) $(PROGDIR)/$(DEST_BIN)
+ ifeq ($(debug),no)
+ 	strip $(PROGDIR)/$(DEST_BIN)
+ endif
+ ifeq ($(GNUSTEP_HOST_OS),mingw32)
+-	$(CP) -r -u -f deps/Windows-x86-deps/DLLs/*.dll $(PROGDIR)
+	$(CP) -r -f deps/Windows-x86-deps/DLLs/*.dll $(PROGDIR)
+ endif
+ 
+ after-clean::
--- a/games/oolite/patches/patch-Makefile
+++ b/games/oolite/patches/patch-Makefile
@ -0,0 +1,39 @@
+$OpenBSD: patch-Makefile,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- Makefile.orig	Tue Mar 30 21:28:52 2010
+++ Makefile	Tue Mar 30 21:35:58 2010
+@@ -4,7 +4,7 @@ VER_MAJ     := $(shell echo "${VERSION}" | cut -d '.' 
+ VER_MIN     := $(shell echo "${VERSION}" | cut -d '.' -f 2)
+ VER_REV     := $(shell echo "${VERSION}" | cut -d '.' -f 3)
+ VER_REV     := $(if ${VER_REV},${VER_REV},0)
+-SVNREVISION := $(shell svn info  | grep Revision | cut -d ' ' -f 2)
+#SVNREVISION := $(shell svn info  | grep Revision | cut -d ' ' -f 2)
+ VER         := $(shell echo "${VER_MAJ}.${VER_MIN}.${VER_REV}.${SVNREVISION}")
+ BUILDTIME   := $(shell date "+%Y.%m.%d %H:%M")
+ DEB_BUILDTIME   := $(shell date "+%a, %d %b %Y %H:%M:%S %z")
+@@ -36,8 +36,8 @@ DEPS=$(LIBJS)
+ # Here are our default targets
+ #
+ .PHONY: release
+-release: $(DEPS)
+-	make -f GNUmakefile debug=no
+release: libjs $(DEPS)
+	${MAKE} -f GNUmakefile debug=no
+ 	
+ .PHONY: release-snapshot
+ release-snapshot: $(DEPS)
+@@ -47,13 +47,13 @@ release-snapshot: $(DEPS)
+ debug: $(DEPS)
+ 	make -f GNUmakefile debug=yes
+ 
+-$(LIBJS):
+libjs:
+ ifeq ($(GNUSTEP_HOST_OS),mingw32)
+ 	@echo "ERROR - this Makefile can't (yet) build the Javascript DLL"
+ 	@echo "        Please build it yourself and copy it to $(LIBJS)."
+ 	false
+ endif
+-	make -C $(LIBJS_SRC_DIR) -f Makefile.ref BUILD_OPT=1
+	${MAKE} -C $(LIBJS_SRC_DIR) -f Makefile.ref BUILD_OPT=1
+ 
+ .PHONY: clean
+ clean:
--- a/games/oolite/patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_Linux_All_mk
+++ b/games/oolite/patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_Linux_All_mk
@ -0,0 +1,35 @@
+$OpenBSD: patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_Linux_All_mk,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- deps/Cross-platform-deps/SpiderMonkey/js/src/config/Linux_All.mk.orig	Sun Aug 30 12:41:18 2009
+++ deps/Cross-platform-deps/SpiderMonkey/js/src/config/Linux_All.mk	Tue Mar 30 21:59:00 2010
+@@ -41,9 +41,9 @@
+ # Config for all versions of Linux
+ #
+ 
+-CC = gcc
+-CCC = g++
+-CFLAGS +=  -Wall -Wno-format
+#CC = gcc
+#CCC = g++
+#CFLAGS +=  -Wall -Wno-format
+ OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
+ 
+ RANLIB = echo
+@@ -90,14 +90,14 @@ endif
+ # Use the editline library to provide line-editing support.
+ JS_EDITLINE = 1
+ 
+-ifeq ($(CPU_ARCH),x86_64)
+#ifeq ($(CPU_ARCH),x86_64)
+ # Use VA_COPY() standard macro on x86-64
+ # FIXME: better use it everywhere
+ OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
+-endif
+#endif
+ 
+-ifeq ($(CPU_ARCH),x86_64)
+#ifeq ($(CPU_ARCH),x86_64)
+ # We need PIC code for shared libraries
+ # FIXME: better patch rules.mk & fdlibm/Makefile*
+ OS_CFLAGS += -DPIC -fPIC
+-endif
+#endif
--- a/games/oolite/patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_mk
+++ b/games/oolite/patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_mk
@ -0,0 +1,30 @@
+$OpenBSD: patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_mk,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- deps/Cross-platform-deps/SpiderMonkey/js/src/config.mk.orig	Sun Aug 30 12:41:24 2009
+++ deps/Cross-platform-deps/SpiderMonkey/js/src/config.mk	Tue Mar 30 22:01:54 2010
+@@ -94,6 +94,9 @@ endif
+ ifeq ($(OS_ARCH),Linux)
+ OS_CONFIG      := Linux_All
+ else
+ifeq ($(OS_ARCH),OpenBSD)
+OS_CONFIG      := Linux_All
+else
+ ifeq ($(OS_ARCH),dgux)
+ OS_CONFIG      := dgux
+ else
+@@ -104,6 +107,7 @@ OS_CONFIG       := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE
+ endif
+ endif
+ endif
+endif
+ 
+ ASFLAGS         =
+ DEFINES         =
+@@ -117,7 +121,7 @@ CP = cp
+ endif
+ 
+ ifdef BUILD_OPT
+-OPTIMIZER  = -O
+#OPTIMIZER  = -O
+ DEFINES    += -UDEBUG -DNDEBUG -UDEBUG_$(USER)
+ OBJDIR_TAG = _OPT
+ else
--- a/games/oolite/patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m
+++ b/games/oolite/patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m
@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Core_Debug_OODebugTCPConsoleClient_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- src/Core/Debug/OODebugTCPConsoleClient.m.orig	Wed Mar 31 21:55:57 2010
+++ src/Core/Debug/OODebugTCPConsoleClient.m	Wed Mar 31 21:56:52 2010
+@@ -157,7 +157,7 @@ OOINLINE BOOL StatusIsSendable(OOTCPClientConnectionSt
+ 			// Attempt to connect
+ 			parameters = [NSDictionary dictionaryWithObjectsAndKeys:
+ 							[NSNumber numberWithUnsignedInt:kOOTCPProtocolVersion_1_1_0], kOOTCPProtocolVersion,
+-							[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"], kOOTCPOoliteVersion,
+							[[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"], kOOTCPOoliteVersion,
+ 							nil];
+ 			[self sendPacket:kOOTCPPacket_RequestConnection
+ 			   withParameters:parameters];
--- a/games/oolite/patches/patch-src_Core_Entities_PlayerEntity_m
+++ b/games/oolite/patches/patch-src_Core_Entities_PlayerEntity_m
@ -0,0 +1,21 @@
+$OpenBSD: patch-src_Core_Entities_PlayerEntity_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- src/Core/Entities/PlayerEntity.m.orig	Wed Mar 31 21:43:01 2010
+++ src/Core/Entities/PlayerEntity.m	Wed Mar 31 21:43:50 2010
+@@ -306,7 +306,7 @@ static PlayerEntity *sSharedPlayer = nil;
+ {
+ 	NSMutableDictionary *result = [NSMutableDictionary dictionary];
+ 	
+-	[result setObject:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"written_by_version"];
+	[result setObject:[[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"written_by_version"];
+ 	
+ 	NSString *gal_seed = [NSString stringWithFormat:@"%d %d %d %d %d %d",galaxy_seed.a, galaxy_seed.b, galaxy_seed.c, galaxy_seed.d, galaxy_seed.e, galaxy_seed.f];
+ 	NSString *gal_coords = [NSString stringWithFormat:@"%d %d",(int)galaxy_coordinates.x,(int)galaxy_coordinates.y];
+@@ -5361,7 +5361,7 @@ static int last_outfitting_index;
+ 			if ([[arguments objectAtIndex:i] isEqual:@"-showversion"])
+ 			{
+ 				int ms_start = msgLine;
+-				NSString *version = [NSString stringWithFormat:@"Version %@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]];
+				NSString *version = [NSString stringWithFormat:@"Version %@", [[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"]];
+ 				int i = msgLine = [gui addLongText:version startingAtRow:ms_start align:GUI_ALIGN_CENTER];
+ 				for (i-- ; i >= ms_start; i--) [gui setColor:[OOColor magentaColor] forRow:i];
+ 			}
--- a/games/oolite/patches/patch-src_Core_GameController_h
+++ b/games/oolite/patches/patch-src_Core_GameController_h
@ -0,0 +1,21 @@
+$OpenBSD: patch-src_Core_GameController_h,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- src/Core/GameController.h.orig	Tue Mar 30 23:56:11 2010
+++ src/Core/GameController.h	Tue Mar 30 23:55:57 2010
+@@ -34,7 +34,7 @@ MA 02110-1301, USA.
+ #define DISPLAY_MIN_WIDTH		640
+ #define DISPLAY_MIN_HEIGHT		480
+ 
+-#ifndef GNUSTEP
+//#ifndef GNUSTEP
+ /*	OS X apps are permitted to assume 800x600 screens. Under OS X, we always
+ 	start up in windowed mode. Therefore, the default size fits an 800x600
+ 	screen and leaves space for the menu bar and title bar.
+@@ -42,7 +42,7 @@ MA 02110-1301, USA.
+ #define DISPLAY_DEFAULT_WIDTH	800
+ #define DISPLAY_DEFAULT_HEIGHT	540
+ #define DISPLAY_DEFAULT_REFRESH	75
+-#endif
+//#endif
+ 
+ #define DISPLAY_MAX_WIDTH		2400
+ #define DISPLAY_MAX_HEIGHT		1800
--- a/games/oolite/patches/patch-src_Core_GameController_m
+++ b/games/oolite/patches/patch-src_Core_GameController_m
@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Core_GameController_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- src/Core/GameController.m.orig	Wed Mar 31 00:04:47 2010
+++ src/Core/GameController.m	Wed Mar 31 00:18:38 2010
+@@ -855,7 +855,7 @@ static NSComparisonResult CompareDisplayModes(id arg1,
+ 	NSString				*path = nil;
+ 	
+ 	// Set contents of Help window
+-	path = [[NSBundle mainBundle] pathForResource:@"ReadMe" ofType:@"rtfd"];
+	path = [[NSBundle bundleWithPath: BUNDLE_PATH] pathForResource:@"ReadMe" ofType:@"rtfd"];
+ 	if (path != nil)
+ 	{
+ 		[helpView readRTFDFromFile:path];
--- a/games/oolite/patches/patch-src_Core_OOCacheManager_m
+++ b/games/oolite/patches/patch-src_Core_OOCacheManager_m
@ -0,0 +1,21 @@
+$OpenBSD: patch-src_Core_OOCacheManager_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- src/Core/OOCacheManager.m.orig	Wed Mar 31 00:04:56 2010
+++ src/Core/OOCacheManager.m	Wed Mar 31 00:19:13 2010
+@@ -306,7 +306,7 @@ static OOCacheManager *sSingleton = nil;
+ 	BOOL					accept = YES;
+ 	uint64_t				endianTagValue = 0;
+ 	
+-	ooliteVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:kCacheKeyVersion];
+	ooliteVersion = [[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:kCacheKeyVersion];
+ 	
+ 	[self clear];
+ 	
+@@ -385,7 +385,7 @@ static OOCacheManager *sSingleton = nil;
+ #endif
+ 	
+ 	OOLog(@"dataCache.willWrite", @"About to write data cache.");	// Added for 1.69 to detect possible write-related crash. -- Ahruman
+-	ooliteVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:kCacheKeyVersion];
+	ooliteVersion = [[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:kCacheKeyVersion];
+ 	endianTag = [NSData dataWithBytes:&endianTagValue length:sizeof endianTagValue];
+ 	formatVersion = [NSNumber numberWithUnsignedInt:kFormatVersionValue];
+ 	
--- a/games/oolite/patches/patch-src_Core_OOLogHeader_m
+++ b/games/oolite/patches/patch-src_Core_OOLogHeader_m
@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Core_OOLogHeader_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- src/Core/OOLogHeader.m.orig	Wed Mar 31 00:05:05 2010
+++ src/Core/OOLogHeader.m	Wed Mar 31 00:19:27 2010
+@@ -130,7 +130,7 @@ void OOPrintLogHeader(void)
+ 		#define systemString @OS_TYPE_STRING
+ 	#endif
+ 	
+-	NSString *versionString = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
+	NSString *versionString = [[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"];
+ 	if (versionString == nil)  versionString = @"<unknown version>";
+ 	
+ 	NSMutableString *miscString = [NSMutableString stringWithFormat:@"Opening log for Oolite version %@ (" CPU_TYPE_STRING RELEASE_VARIANT_STRING ") under %@ at %@.\n", versionString, systemString, [NSDate date]];
--- a/games/oolite/patches/patch-src_Core_OOLogOutputHandler_m
+++ b/games/oolite/patches/patch-src_Core_OOLogOutputHandler_m
@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Core_OOLogOutputHandler_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- src/Core/OOLogOutputHandler.m.orig	Wed Mar 31 00:04:42 2010
+++ src/Core/OOLogOutputHandler.m	Wed Mar 31 00:18:24 2010
+@@ -634,7 +634,7 @@ static NSString *GetAppName(void)
+ 	
+ 	if (appName == nil)
+ 	{
+-		bundle = [NSBundle mainBundle];
+		bundle = [NSBundle bundleWithPath: BUNDLE_PATH];
+ 		appName = [bundle objectForInfoDictionaryKey:@"CFBundleName"];
+ 		if (appName == nil)  appName = [bundle bundleIdentifier];
+ 		if (appName == nil)  appName = @"<unknown application>";
--- a/games/oolite/patches/patch-src_Core_OXPVerifier_OOCheckRequiresPListVerifierStage_m
+++ b/games/oolite/patches/patch-src_Core_OXPVerifier_OOCheckRequiresPListVerifierStage_m
@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Core_OXPVerifier_OOCheckRequiresPListVerifierStage_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- src/Core/OXPVerifier/OOCheckRequiresPListVerifierStage.m.orig	Wed Mar 31 21:55:41 2010
+++ src/Core/OXPVerifier/OOCheckRequiresPListVerifierStage.m	Wed Mar 31 21:56:38 2010
+@@ -114,7 +114,7 @@ static NSString * const kStageName	= @"Checking requir
+ 	
+ 	if (version != nil || maxVersion != nil)
+ 	{
+-		ooVersionComponents = ComponentsFromVersionString([[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]);
+		ooVersionComponents = ComponentsFromVersionString([[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"]);
+ 		if (ooVersionComponents == nil)
+ 		{
+ 			OOLog(@"verifyOXP.requiresPList.cantFindOoliteVersion", @"----- WARNING: could not find Oolite's version for requires.plist sanity check.");
--- a/games/oolite/patches/patch-src_Core_ResourceManager_m
+++ b/games/oolite/patches/patch-src_Core_ResourceManager_m
@ -0,0 +1,30 @@
+$OpenBSD: patch-src_Core_ResourceManager_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- src/Core/ResourceManager.m.orig	Sun Sep  6 18:52:33 2009
+++ src/Core/ResourceManager.m	Wed Mar 31 00:56:08 2010
+@@ -153,7 +153,7 @@ static NSMutableDictionary *string_cache;
+ 	*/
+ 	return @"Resources";
+ #else
+-	return [[NSBundle mainBundle] resourcePath];
+	return [[NSBundle bundleWithPath: BUNDLE_PATH] resourcePath];
+ #endif
+ }
+ 
+@@ -276,7 +276,7 @@ static NSMutableDictionary *string_cache;
+ 	if (requirementsMet)  [searchPaths addObject:path];
+ 	else
+ 	{
+-		NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
+		NSString *version = [[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"];
+ 		OOLog(@"oxp.versionMismatch", @"OXP %@ is incompatible with version %@ of Oolite.", path, version);
+ 		[self addErrorWithKey:@"oxp-is-incompatible" param1:[path lastPathComponent] param2:version];
+ 	}
+@@ -296,7 +296,7 @@ static NSMutableDictionary *string_cache;
+ 	
+ 	if (ooVersionComponents == nil)
+ 	{
+-		ooVersionComponents = ComponentsFromVersionString([[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]);
+		ooVersionComponents = ComponentsFromVersionString([[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"]);
+ 		[ooVersionComponents retain];
+ 	}
+ 	
--- a/games/oolite/patches/patch-src_Core_Scripting_OOJSOolite_m
+++ b/games/oolite/patches/patch-src_Core_Scripting_OOJSOolite_m
@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Core_Scripting_OOJSOolite_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- src/Core/Scripting/OOJSOolite.m.orig	Wed Mar 31 21:55:16 2010
+++ src/Core/Scripting/OOJSOolite.m	Wed Mar 31 21:56:45 2010
+@@ -130,7 +130,7 @@ static JSBool OoliteGetProperty(JSContext *context, JS
+ 
+ static NSString *VersionString(void)
+ {
+-	return [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
+	return [[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"];
+ }
+ 
+ 
--- a/games/oolite/patches/patch-src_SDL_MyOpenGLView_m
+++ b/games/oolite/patches/patch-src_SDL_MyOpenGLView_m
@ -0,0 +1,30 @@
+$OpenBSD: patch-src_SDL_MyOpenGLView_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+--- src/SDL/MyOpenGLView.m.orig	Wed Mar 31 00:27:49 2010
+++ src/SDL/MyOpenGLView.m	Wed Mar 31 00:28:33 2010
+@@ -128,7 +128,7 @@ MA 02110-1301, USA.
+ 
+ 	// Generate the window caption, containing the version number and the date the executable was compiled.
+ 	static char windowCaption[128];
+-	NSString *versionString = [NSString stringWithFormat:@"Oolite v%@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]];
+	NSString *versionString = [NSString stringWithFormat:@"Oolite v%@", [[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"]];
+ 
+ 	strcpy (windowCaption, [versionString UTF8String]);
+ 	strcat (windowCaption, " - "__DATE__);
+@@ -144,7 +144,7 @@ MA 02110-1301, USA.
+ 
+ #endif
+ 
+-	imagesDir = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Images"];
+	imagesDir = [[[NSBundle bundleWithPath: BUNDLE_PATH] resourcePath] stringByAppendingPathComponent:@"Images"];
+ 	icon = SDL_LoadBMP([[imagesDir stringByAppendingPathComponent:@"WMicon.bmp"] cString]);
+ 
+ 	if (icon != NULL)
+@@ -487,7 +487,7 @@ MA 02110-1301, USA.
+   #if OOLITE_WINDOWS
+ 	NSString		*imagesDir = @"Resources/Images";
+   #else
+-	NSString		*imagesDir = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Images"];
+	NSString		*imagesDir = [[[NSBundle bundleWithPath: BUNDLE_PATH] resourcePath] stringByAppendingPathComponent:@"Images"];
+   #endif
+ 
+ 	image = SDL_LoadBMP([[imagesDir stringByAppendingPathComponent:@"splash.bmp"] cString]);
--- a/games/oolite/pkg/DESCR
+++ b/games/oolite/pkg/DESCR
@ -0,0 +1,4 @@
+Oolite is a space sim game, inspired by Elite, powered by Objective-C
+and OpenGL, and designed as a small game that is easy for users to pick
+up, modify and expand upon. Almost every aspect of the game can be
+changed by using simple, free graphics packages and text editors.
--- a/games/oolite/pkg/MESSAGE
+++ b/games/oolite/pkg/MESSAGE
@ -0,0 +1,5 @@
+If you experience poor game performance, you can try adding the
+following lines to ~/GNUstep/Defaults/.GNUstepDefaults:
+    "max-texture-size" = 64;
+    "texture-anisotropy-scale" = 0;
+    "use-texture-lod-bias" = NO;
--- a/games/oolite/pkg/PLIST
+++ b/games/oolite/pkg/PLIST
@ -0,0 +1,280 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
+@bin bin/oolite
+share/doc/oolite/
+share/doc/oolite/AdviceForNewCommanders.pdf
+share/doc/oolite/CHANGELOG.TXT
+share/doc/oolite/FAQ.TXT
+share/doc/oolite/GPL.TXT
+share/doc/oolite/LICENSE.TXT
+share/doc/oolite/OoliteRS.pdf
+share/doc/oolite/OoliteReadMe.pdf
+share/doc/oolite/PORTING.TXT
+share/doc/oolite/README_LINUX.TXT
+share/oolite/
+share/oolite/Resources/
+share/oolite/Resources/AIReference.html
+share/oolite/Resources/AIs/
+share/oolite/Resources/AIs/buoyAI.plist
+share/oolite/Resources/AIs/collectLootAI.plist
+share/oolite/Resources/AIs/delayedReactToAttackAI.plist
+share/oolite/Resources/AIs/dockingAI.plist
+share/oolite/Resources/AIs/dumbAI.plist
+share/oolite/Resources/AIs/enteringPirateAI.plist
+share/oolite/Resources/AIs/enteringTraderAI.plist
+share/oolite/Resources/AIs/escortAI.plist
+share/oolite/Resources/AIs/exitingTraderAI.plist
+share/oolite/Resources/AIs/fallingShuttleAI.plist
+share/oolite/Resources/AIs/fttAI.plist
+share/oolite/Resources/AIs/gotoWaypointAI.plist
+share/oolite/Resources/AIs/hardMissileAI.plist
+share/oolite/Resources/AIs/homeAI.plist
+share/oolite/Resources/AIs/interceptAI.plist
+share/oolite/Resources/AIs/minerAI.plist
+share/oolite/Resources/AIs/missileAI.plist
+share/oolite/Resources/AIs/nullAI.plist
+share/oolite/Resources/AIs/oolite-constrictor-AI.plist
+share/oolite/Resources/AIs/pirateAI.plist
+share/oolite/Resources/AIs/planetPatrolAI.plist
+share/oolite/Resources/AIs/policeInterceptAI.plist
+share/oolite/Resources/AIs/receiveDockingAI.plist
+share/oolite/Resources/AIs/risingShuttleAI.plist
+share/oolite/Resources/AIs/rockHermitAI.plist
+share/oolite/Resources/AIs/route1patrolAI.plist
+share/oolite/Resources/AIs/route1traderAI.plist
+share/oolite/Resources/AIs/route2patrolAI.plist
+share/oolite/Resources/AIs/route2sunskimAI.plist
+share/oolite/Resources/AIs/scavengerAI.plist
+share/oolite/Resources/AIs/stationAI.plist
+share/oolite/Resources/AIs/sunSkimExitAI.plist
+share/oolite/Resources/AIs/thargletAI.plist
+share/oolite/Resources/AIs/thargoidAI.plist
+share/oolite/Resources/AIs/timebombAI.plist
+share/oolite/Resources/AIs/traderInterceptAI.plist
+share/oolite/Resources/Config/
+share/oolite/Resources/Config/autoAImap.plist
+share/oolite/Resources/Config/changedScriptHandlers.plist
+share/oolite/Resources/Config/characters.plist
+share/oolite/Resources/Config/commodities.plist
+share/oolite/Resources/Config/crosshairs.plist
+share/oolite/Resources/Config/customsounds.plist
+share/oolite/Resources/Config/demoships.plist
+share/oolite/Resources/Config/descriptions.plist
+share/oolite/Resources/Config/equipment.plist
+share/oolite/Resources/Config/hud-small.plist
+share/oolite/Resources/Config/hud.plist
+share/oolite/Resources/Config/illegal_goods.plist
+share/oolite/Resources/Config/keyconfig.plist
+share/oolite/Resources/Config/logcontrol.plist
+share/oolite/Resources/Config/material-defaults.plist
+share/oolite/Resources/Config/missiontext.plist
+share/oolite/Resources/Config/nebulatextures.plist
+share/oolite/Resources/Config/oolite-font.plist
+share/oolite/Resources/Config/oolite-javascript-errors.plist
+share/oolite/Resources/Config/pirate-victim-roles.plist
+share/oolite/Resources/Config/planetinfo.plist
+share/oolite/Resources/Config/shipdata.plist
+share/oolite/Resources/Config/shipyard.plist
+share/oolite/Resources/Config/speech_pronunciation_guide.plist
+share/oolite/Resources/Config/startextures.plist
+share/oolite/Resources/Config/verifyOXP.plist
+share/oolite/Resources/Config/whitelist.plist
+share/oolite/Resources/Config/world-scripts.plist
+share/oolite/Resources/Images/
+share/oolite/Resources/Images/WMicon.bmp
+share/oolite/Resources/Images/solar.png
+share/oolite/Resources/Images/splash.bmp
+share/oolite/Resources/Images/splash.png
+share/oolite/Resources/Images/splashback.png
+share/oolite/Resources/Images/trumblebox.png
+share/oolite/Resources/Info-gnustep.plist
+share/oolite/Resources/InfoPlist.strings
+share/oolite/Resources/Models/
+share/oolite/Resources/Models/adder_redux.dat
+share/oolite/Resources/Models/alloy.dat
+share/oolite/Resources/Models/anaconda_redux.dat
+share/oolite/Resources/Models/arcdetail.dat
+share/oolite/Resources/Models/asp_redux.dat
+share/oolite/Resources/Models/asteroid.dat
+share/oolite/Resources/Models/asteroid1.dat
+share/oolite/Resources/Models/barrel.dat
+share/oolite/Resources/Models/boa2_redux.dat
+share/oolite/Resources/Models/boa_redux.dat
+share/oolite/Resources/Models/boulder.dat
+share/oolite/Resources/Models/boulder1.dat
+share/oolite/Resources/Models/buoy.dat
+share/oolite/Resources/Models/cobra1_redux.dat
+share/oolite/Resources/Models/cobra1_redux1.dat
+share/oolite/Resources/Models/cobra1_redux2.dat
+share/oolite/Resources/Models/cobra3_redux.dat
+share/oolite/Resources/Models/cobra3_redux1.dat
+share/oolite/Resources/Models/constrictor_redux.dat
+share/oolite/Resources/Models/dock-flat.dat
+share/oolite/Resources/Models/dock.dat
+share/oolite/Resources/Models/escpod_redux.dat
+share/oolite/Resources/Models/exhaust.dat
+share/oolite/Resources/Models/ferdelance_redux.dat
+share/oolite/Resources/Models/gecko_redux.dat
+share/oolite/Resources/Models/icosahedron.dat
+share/oolite/Resources/Models/icostextured.dat
+share/oolite/Resources/Models/krait_redux.dat
+share/oolite/Resources/Models/mamba_redux.dat
+share/oolite/Resources/Models/mamba_redux1.dat
+share/oolite/Resources/Models/missile.dat
+share/oolite/Resources/Models/moray_redux.dat
+share/oolite/Resources/Models/moray_redux1.dat
+share/oolite/Resources/Models/new-dodo.dat
+share/oolite/Resources/Models/new-icos.dat
+share/oolite/Resources/Models/new-rock.dat
+share/oolite/Resources/Models/new_coriolis.dat
+share/oolite/Resources/Models/oolite-ball-turret.dat
+share/oolite/Resources/Models/oolite-unknown-ship.dat
+share/oolite/Resources/Models/python_redux.dat
+share/oolite/Resources/Models/python_redux1.dat
+share/oolite/Resources/Models/python_redux2.dat
+share/oolite/Resources/Models/qbomb.dat
+share/oolite/Resources/Models/ring.dat
+share/oolite/Resources/Models/rock-box.dat
+share/oolite/Resources/Models/rock-dock.dat
+share/oolite/Resources/Models/scarred_alloy.dat
+share/oolite/Resources/Models/shuttle_redux.dat
+share/oolite/Resources/Models/sidewinder_redux.dat
+share/oolite/Resources/Models/splinter.dat
+share/oolite/Resources/Models/splinter1.dat
+share/oolite/Resources/Models/strut.dat
+share/oolite/Resources/Models/thargoid_redux.dat
+share/oolite/Resources/Models/thargon_redux.dat
+share/oolite/Resources/Models/transporter_redux.dat
+share/oolite/Resources/Models/transporter_redux1.dat
+share/oolite/Resources/Models/viper_redux.dat
+share/oolite/Resources/Models/viperi_redux.dat
+share/oolite/Resources/Models/worm_redux.dat
+share/oolite/Resources/Models/worm_redux1.dat
+share/oolite/Resources/Models/wreck1.dat
+share/oolite/Resources/Models/wreck2.dat
+share/oolite/Resources/Models/wreck3.dat
+share/oolite/Resources/Models/wreck4.dat
+share/oolite/Resources/Models/wreck5.dat
+share/oolite/Resources/Music/
+share/oolite/Resources/Music/BlueDanube.ogg
+share/oolite/Resources/Music/OoliteTheme.ogg
+share/oolite/Resources/README.TXT
+share/oolite/Resources/Schemata/
+share/oolite/Resources/Schemata/README.txt
+share/oolite/Resources/Schemata/demoshipsSchema.plist
+share/oolite/Resources/Schemata/hudSchema.plist
+share/oolite/Resources/Schemata/plistschema.plist
+share/oolite/Resources/Schemata/shipdataEntrySchema.plist
+share/oolite/Resources/Schemata/shipyardSchema.plist
+share/oolite/Resources/Scripts/
+share/oolite/Resources/Scripts/oolite-cloaking-device-mission.js
+share/oolite/Resources/Scripts/oolite-cloaking-device-pod.js
+share/oolite/Resources/Scripts/oolite-cloaking-device-target-ship.js
+share/oolite/Resources/Scripts/oolite-constrictor-hunt-mission.js
+share/oolite/Resources/Scripts/oolite-constrictor.js
+share/oolite/Resources/Scripts/oolite-default-ship-script.js
+share/oolite/Resources/Scripts/oolite-global-prefix.js
+share/oolite/Resources/Scripts/oolite-nova-mission.js
+share/oolite/Resources/Scripts/oolite-thargoid-plans-mission.js
+share/oolite/Resources/Scripts/oolite-thargoid-warship.js
+share/oolite/Resources/Scripts/oolite-trumbles-mission.js
+share/oolite/Resources/Shaders/
+share/oolite/Resources/Shaders/oolite-default-shader.fragment
+share/oolite/Resources/Shaders/oolite-standard-vertex.vertex
+share/oolite/Resources/Shaders/oolite-tangent-space-vertex.vertex
+share/oolite/Resources/Sounds/
+share/oolite/Resources/Sounds/afterburner1.ogg
+share/oolite/Resources/Sounds/beep.ogg
+share/oolite/Resources/Sounds/bigbang.ogg
+share/oolite/Resources/Sounds/boop.ogg
+share/oolite/Resources/Sounds/breakpattern.ogg
+share/oolite/Resources/Sounds/buy.ogg
+share/oolite/Resources/Sounds/ecm.ogg
+share/oolite/Resources/Sounds/guiclick.ogg
+share/oolite/Resources/Sounds/hit.ogg
+share/oolite/Resources/Sounds/hullbang.ogg
+share/oolite/Resources/Sounds/laser.ogg
+share/oolite/Resources/Sounds/laserhits.ogg
+share/oolite/Resources/Sounds/missile.ogg
+share/oolite/Resources/Sounds/scoop.ogg
+share/oolite/Resources/Sounds/sell.ogg
+share/oolite/Resources/Sounds/trumble.ogg
+share/oolite/Resources/Sounds/trumblesqueal.ogg
+share/oolite/Resources/Sounds/warning.ogg
+share/oolite/Resources/Sounds/witchabort.ogg
+share/oolite/Resources/Textures/
+share/oolite/Resources/Textures/MorayMED_bottom.png
+share/oolite/Resources/Textures/MorayMED_top.png
+share/oolite/Resources/Textures/adder_redux.png
+share/oolite/Resources/Textures/anaconda_redux.png
+share/oolite/Resources/Textures/arcdetail.png
+share/oolite/Resources/Textures/asp_redux.png
+share/oolite/Resources/Textures/asteroid.png
+share/oolite/Resources/Textures/back_metal.png
+share/oolite/Resources/Textures/barrel_metal.png
+share/oolite/Resources/Textures/blur256.png
+share/oolite/Resources/Textures/boa2_left.png
+share/oolite/Resources/Textures/boa2_rear.png
+share/oolite/Resources/Textures/boa2_redux.png
+share/oolite/Resources/Textures/boa2_right.png
+share/oolite/Resources/Textures/boa2_top.png
+share/oolite/Resources/Textures/boa_redux.png
+share/oolite/Resources/Textures/bottom_metal.png
+share/oolite/Resources/Textures/cobra1_redux.png
+share/oolite/Resources/Textures/cobra1_redux1.png
+share/oolite/Resources/Textures/cobra1_redux2.png
+share/oolite/Resources/Textures/cobra1miner_top.png
+share/oolite/Resources/Textures/cobra3_redux.png
+share/oolite/Resources/Textures/cobra3_redux1.png
+share/oolite/Resources/Textures/constrictor_redux.png
+share/oolite/Resources/Textures/dark_metal.png
+share/oolite/Resources/Textures/ferdelance_redux.png
+share/oolite/Resources/Textures/flare256.png
+share/oolite/Resources/Textures/front_metal.png
+share/oolite/Resources/Textures/galaxy256.png
+share/oolite/Resources/Textures/gecko_redux.png
+share/oolite/Resources/Textures/krait_redux.png
+share/oolite/Resources/Textures/left_metal.png
+share/oolite/Resources/Textures/mamba_redux.png
+share/oolite/Resources/Textures/mamba_redux1.png
+share/oolite/Resources/Textures/metal.png
+share/oolite/Resources/Textures/missile.png
+share/oolite/Resources/Textures/moray_redux.png
+share/oolite/Resources/Textures/moray_redux1.png
+share/oolite/Resources/Textures/oolite-ball-turret.png
+share/oolite/Resources/Textures/oolite-barrel-specular.png
+share/oolite/Resources/Textures/oolite-document.png
+share/oolite/Resources/Textures/oolite-expansion-document.png
+share/oolite/Resources/Textures/oolite-font.png
+share/oolite/Resources/Textures/oolite-logo.png
+share/oolite/Resources/Textures/oolite-logo1.png
+share/oolite/Resources/Textures/oolite-nebula-1.png
+share/oolite/Resources/Textures/oolite-nebula-2.png
+share/oolite/Resources/Textures/oolite-nebula-3.png
+share/oolite/Resources/Textures/oolite-nebula-4.png
+share/oolite/Resources/Textures/oolite-scarred-metal-specular.png
+share/oolite/Resources/Textures/oolite-star-1.png
+share/oolite/Resources/Textures/pod2_redux.png
+share/oolite/Resources/Textures/python_redux.png
+share/oolite/Resources/Textures/python_redux1.png
+share/oolite/Resources/Textures/python_redux2.png
+share/oolite/Resources/Textures/qbomb.png
+share/oolite/Resources/Textures/right_metal.png
+share/oolite/Resources/Textures/scarred_metal.png
+share/oolite/Resources/Textures/shuttle_redux.png
+share/oolite/Resources/Textures/sidewinder_redux.png
+share/oolite/Resources/Textures/star64.png
+share/oolite/Resources/Textures/target_metal.png
+share/oolite/Resources/Textures/thargoid_redux.png
+share/oolite/Resources/Textures/thargon_redux.png
+share/oolite/Resources/Textures/top_metal.png
+share/oolite/Resources/Textures/transporter_redux.png
+share/oolite/Resources/Textures/transporter_redux1.png
+share/oolite/Resources/Textures/trumblekit.png
+share/oolite/Resources/Textures/viper_redux.png
+share/oolite/Resources/Textures/viperi_redux.png
+share/oolite/Resources/Textures/worm_redux.png
+share/oolite/Resources/Textures/worm_redux1.png
+share/oolite/Resources/Textures/wreck.png
+share/oolite/Resources/oolite-document.icns
+share/oolite/Resources/oolite-expansion-document.icns
+share/oolite/Resources/oolite-icon.icns