9 files changed, 245 insertions, 265 deletions

diff --git a/games/oolite/Makefile b/games/oolite/Makefile
index 6c2d8b9daa5a..f9fbf3c1c98d 100644
--- a/games/oolite/Makefile
+++ b/games/oolite/Makefile
@@ -6,40 +6,36 @@
 #
 
 PORTNAME=	oolite
-PORTVERSION=	${OOLITE_BASE_VERSION}.${OOLITE_SRC_VERSION}
+PORTVERSION=	1.65
 CATEGORIES=	games
 MASTER_SITES=	http://download.berlios.de/oolite-linux/ \
 		http://download2.berlios.de/oolite-linux/ \
 		ftp://ftp.alioth.net/oolite/
-DISTFILES=	${PORTNAME}-src-${OOLITE_BASE_VERSION}-${OOLITE_SRC_VERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-data-${OOLITE_BASE_VERSION}-${OOLITE_DATA_VERSION}${EXTRACT_SUFX}
+DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} \
+		${PORTNAME}-${PORTVERSION}-data${EXTRACT_SUFX}
 
 MAINTAINER=	avg@icyb.net.ua
 COMMENT=	Trade and combat space simulator, clone of Elite
 
-OOLITE_BASE_VERSION=	1.62
-OOLITE_SRC_VERSION=	5
-OOLITE_DATA_VERSION=	5
-
-WRKSRC=			${WRKDIR}/${PORTNAME}-src
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 USE_SDL=		mixer image gfx
 USE_GMAKE=		yes
 USE_GNUSTEP=		yes
-USE_GNUSTEP_PREFIX=	yes
-USE_GNUSTEP_BACK=	yes
-USE_GNUSTEP_GUI=	yes
+USE_GNUSTEP_BASE=	yes
 USE_GNUSTEP_BUILD=	yes
-USE_GNUSTEP_INSTALL=	yes
+USE_GNUSTEP_PREFIX=	yes
 MAKEFILE=		GNUmakefile
 SUB_FILES=		pkg-message
 PKGMESSAGE=		${WRKDIR}/pkg-message
 
-post-extract:
-	${MV} ${WRKDIR}/${PORTNAME}-data/Resources ${WRKSRC}
-
 post-patch:
 	${REINPLACE_CMD} -e "s#sdl-config#${SDL_CONFIG}#g" ${WRKSRC}/${MAKEFILE}
 
+do-install:
+	${MKDIR} ${GNUSTEP_PREFIX}/Local/Applications
+	${CP} -R ${WRKSRC}/oolite.app ${GNUSTEP_PREFIX}/Local/Applications
+	${STRIP_CMD} ${GNUSTEP_PREFIX}/Local/Applications/oolite.app/oolite
+
 post-install:
 	${CAT} ${PKGMESSAGE}
 
diff --git a/games/oolite/distinfo b/games/oolite/distinfo
index 2cd2074e515f..6654bb0dbe0c 100644
--- a/games/oolite/distinfo
+++ b/games/oolite/distinfo
@@ -1,6 +1,6 @@
-MD5 (oolite-src-1.62-5.tar.gz) = 82a5014b2b6ed4ef601d5c66a4731759
-SHA256 (oolite-src-1.62-5.tar.gz) = 7a828736b10e17a9cd603395bcf80f5c62f82e32500320a5ca8a58bfa68df8d8
-SIZE (oolite-src-1.62-5.tar.gz) = 366390
-MD5 (oolite-data-1.62-5.tar.gz) = dd9ffed6f0d0236fcff1fa4b36b3d9b8
-SHA256 (oolite-data-1.62-5.tar.gz) = af688adef76fc17ccf33419b53ee961941b00be6453a515348a611af79cf0869
-SIZE (oolite-data-1.62-5.tar.gz) = 17495246
+MD5 (oolite-1.65-src.tar.gz) = d2c36dc886919547543ee4baedfba4a4
+SHA256 (oolite-1.65-src.tar.gz) = ece90f42f3f176330c6af4815521ca769f81ba308974005040185474e0c207d7
+SIZE (oolite-1.65-src.tar.gz) = 1077489
+MD5 (oolite-1.65-data.tar.gz) = 321538d43ea21a8dea637a720a8d3076
+SHA256 (oolite-1.65-data.tar.gz) = eed8c4864dcf508a043d2c4e58906c91042ae5fb4310f8aff3cf11aef9bdce21
+SIZE (oolite-1.65-data.tar.gz) = 16815628
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
diff --git a/games/oolite/pkg-plist b/games/oolite/pkg-plist
index 895596239699..4d3ceb34ebd2 100644
--- a/games/oolite/pkg-plist
+++ b/games/oolite/pkg-plist
@@ -1,233 +1,225 @@
-Local/Applications/oolite.app/oolite
-Local/Applications/oolite.app/library_paths.openapp
-Local/Applications/oolite.app/Resources/Info-gnustep.plist
-Local/Applications/oolite.app/Resources/oolite.desktop
-Local/Applications/oolite.app/stamp.make
-Local/Applications/oolite.app/Contents/Resources/AIs/route2sunskimAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/sunSkimExitAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/risingShuttleAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/homeAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/minerAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/fallingShuttleAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/pirateAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/thargoidAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/timebombAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIReference.html
+Local/Applications/oolite.app/Contents/Resources/AIs/buoyAI.plist
 Local/Applications/oolite.app/Contents/Resources/AIs/collectLootAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/enteringTraderAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/route2patrolAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/stationAI.plist
 Local/Applications/oolite.app/Contents/Resources/AIs/dockingAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/dumbAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/enteringPirateAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/enteringTraderAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/escortAI.plist
 Local/Applications/oolite.app/Contents/Resources/AIs/exitingTraderAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/fallingShuttleAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/fttAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/gotoWaypointAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/hardMissileAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/homeAI.plist
 Local/Applications/oolite.app/Contents/Resources/AIs/interceptAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/nullAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/thargletAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/minerAI.plist
 Local/Applications/oolite.app/Contents/Resources/AIs/missileAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/dumbAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/nullAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/pirateAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/planetPatrolAI.plist
 Local/Applications/oolite.app/Contents/Resources/AIs/policeInterceptAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/receiveDockingAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/risingShuttleAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/rockHermitAI.plist
 Local/Applications/oolite.app/Contents/Resources/AIs/route1patrolAI.plist
 Local/Applications/oolite.app/Contents/Resources/AIs/route1traderAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/shuttleAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/escortAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/route2patrolAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/route2sunskimAI.plist
 Local/Applications/oolite.app/Contents/Resources/AIs/scavengerAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/planetPatrolAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/crewroles.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/hardMissileAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/rockHermitAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/enteringPirateAI.plist
-Local/Applications/oolite.app/Contents/Resources/AIs/buoyAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/shuttleAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/stationAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/sunSkimExitAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/thargletAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/thargoidAI.plist
+Local/Applications/oolite.app/Contents/Resources/AIs/timebombAI.plist
+Local/Applications/oolite.app/Contents/Resources/Config/characters.plist
+Local/Applications/oolite.app/Contents/Resources/Config/commodities.plist
+Local/Applications/oolite.app/Contents/Resources/Config/customsounds.plist
+Local/Applications/oolite.app/Contents/Resources/Config/demoships.plist
+Local/Applications/oolite.app/Contents/Resources/Config/descriptions.plist
+Local/Applications/oolite.app/Contents/Resources/Config/equipment.plist
+Local/Applications/oolite.app/Contents/Resources/Config/hud-small.plist
+Local/Applications/oolite.app/Contents/Resources/Config/hud.plist
+Local/Applications/oolite.app/Contents/Resources/Config/illegal_goods.plist
+Local/Applications/oolite.app/Contents/Resources/Config/keyconfig.plist
+Local/Applications/oolite.app/Contents/Resources/Config/missiontext.plist
+Local/Applications/oolite.app/Contents/Resources/Config/script.plist
+Local/Applications/oolite.app/Contents/Resources/Config/shipdata.plist
+Local/Applications/oolite.app/Contents/Resources/Config/shipyard.plist
+Local/Applications/oolite.app/Contents/Resources/Config/speech_pronunciation_guide.plist
+Local/Applications/oolite.app/Contents/Resources/Images/greendot.png
+Local/Applications/oolite.app/Contents/Resources/Images/reddot.png
+Local/Applications/oolite.app/Contents/Resources/Images/solar.png
+Local/Applications/oolite.app/Contents/Resources/Images/splash.png
+Local/Applications/oolite.app/Contents/Resources/Images/splashback.png
+Local/Applications/oolite.app/Contents/Resources/Images/trumblebox.png
+Local/Applications/oolite.app/Contents/Resources/InfoPlist.strings
+Local/Applications/oolite.app/Contents/Resources/Models/adder_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/alloy.dat
+Local/Applications/oolite.app/Contents/Resources/Models/anaconda_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/arcdetail.dat
+Local/Applications/oolite.app/Contents/Resources/Models/asp_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/asteroid.dat
+Local/Applications/oolite.app/Contents/Resources/Models/asteroid1.dat
+Local/Applications/oolite.app/Contents/Resources/Models/barrel.dat
+Local/Applications/oolite.app/Contents/Resources/Models/boa2_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/boa_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/boulder.dat
+Local/Applications/oolite.app/Contents/Resources/Models/boulder1.dat
+Local/Applications/oolite.app/Contents/Resources/Models/buoy.dat
+Local/Applications/oolite.app/Contents/Resources/Models/cobra1_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/cobra1_redux1.dat
+Local/Applications/oolite.app/Contents/Resources/Models/cobra1_redux2.dat
+Local/Applications/oolite.app/Contents/Resources/Models/cobra3_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/cobra3_redux1.dat
+Local/Applications/oolite.app/Contents/Resources/Models/constrictor_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/dock-flat.dat
+Local/Applications/oolite.app/Contents/Resources/Models/dock.dat
+Local/Applications/oolite.app/Contents/Resources/Models/escpod_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/exhaust.dat
+Local/Applications/oolite.app/Contents/Resources/Models/ferdelance_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/gecko_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/icosahedron.dat
+Local/Applications/oolite.app/Contents/Resources/Models/icostextured.dat
+Local/Applications/oolite.app/Contents/Resources/Models/krait_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/mamba_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/mamba_redux1.dat
+Local/Applications/oolite.app/Contents/Resources/Models/missile.dat
+Local/Applications/oolite.app/Contents/Resources/Models/moray_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/moray_redux1.dat
+Local/Applications/oolite.app/Contents/Resources/Models/new-dodo.dat
+Local/Applications/oolite.app/Contents/Resources/Models/new-icos.dat
+Local/Applications/oolite.app/Contents/Resources/Models/new-rock.dat
+Local/Applications/oolite.app/Contents/Resources/Models/new_coriolis.dat
+Local/Applications/oolite.app/Contents/Resources/Models/python_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/python_redux1.dat
+Local/Applications/oolite.app/Contents/Resources/Models/python_redux2.dat
+Local/Applications/oolite.app/Contents/Resources/Models/qbomb.dat
+Local/Applications/oolite.app/Contents/Resources/Models/ring.dat
+Local/Applications/oolite.app/Contents/Resources/Models/rock-box.dat
+Local/Applications/oolite.app/Contents/Resources/Models/rock-dock.dat
+Local/Applications/oolite.app/Contents/Resources/Models/scarred_alloy.dat
+Local/Applications/oolite.app/Contents/Resources/Models/shuttle_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/sidewinder_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/splinter.dat
+Local/Applications/oolite.app/Contents/Resources/Models/splinter1.dat
+Local/Applications/oolite.app/Contents/Resources/Models/strut.dat
+Local/Applications/oolite.app/Contents/Resources/Models/thargoid_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/thargon_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/transporter_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/transporter_redux1.dat
+Local/Applications/oolite.app/Contents/Resources/Models/viper_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/viperi_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/worm_redux.dat
+Local/Applications/oolite.app/Contents/Resources/Models/worm_redux1.dat
+Local/Applications/oolite.app/Contents/Resources/Models/wreck1.dat
+Local/Applications/oolite.app/Contents/Resources/Models/wreck2.dat
+Local/Applications/oolite.app/Contents/Resources/Models/wreck3.dat
+Local/Applications/oolite.app/Contents/Resources/Models/wreck4.dat
+Local/Applications/oolite.app/Contents/Resources/Models/wreck5.dat
+Local/Applications/oolite.app/Contents/Resources/Music/BlueDanube.ogg
+Local/Applications/oolite.app/Contents/Resources/Music/OoliteTheme.ogg
+Local/Applications/oolite.app/Contents/Resources/README.TXT
+Local/Applications/oolite.app/Contents/Resources/Sounds/afterburner1.ogg
 Local/Applications/oolite.app/Contents/Resources/Sounds/afterburner2.ogg
+Local/Applications/oolite.app/Contents/Resources/Sounds/beep.ogg
+Local/Applications/oolite.app/Contents/Resources/Sounds/bigbang.ogg
+Local/Applications/oolite.app/Contents/Resources/Sounds/boop.ogg
+Local/Applications/oolite.app/Contents/Resources/Sounds/breakpattern.ogg
+Local/Applications/oolite.app/Contents/Resources/Sounds/buy.ogg
 Local/Applications/oolite.app/Contents/Resources/Sounds/ecm.ogg
 Local/Applications/oolite.app/Contents/Resources/Sounds/guiclick.ogg
 Local/Applications/oolite.app/Contents/Resources/Sounds/hit.ogg
+Local/Applications/oolite.app/Contents/Resources/Sounds/hullbang.ogg
+Local/Applications/oolite.app/Contents/Resources/Sounds/laser.ogg
+Local/Applications/oolite.app/Contents/Resources/Sounds/laserhits.ogg
+Local/Applications/oolite.app/Contents/Resources/Sounds/missile.ogg
 Local/Applications/oolite.app/Contents/Resources/Sounds/scoop.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/bigbang.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/boop.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/buy.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/warning.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/breakpattern.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/beep.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/afterburner1.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/trumble.ogg
 Local/Applications/oolite.app/Contents/Resources/Sounds/sell.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/missile.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/laserhits.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/hullbang.ogg
+Local/Applications/oolite.app/Contents/Resources/Sounds/trumble.ogg
 Local/Applications/oolite.app/Contents/Resources/Sounds/trumblesqueal.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/laser.ogg
+Local/Applications/oolite.app/Contents/Resources/Sounds/warning.ogg
 Local/Applications/oolite.app/Contents/Resources/Sounds/witchabort.ogg
-Local/Applications/oolite.app/Contents/Resources/Textures/asteroid.png
-Local/Applications/oolite.app/Contents/Resources/Textures/cobra1_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/pod2_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/asciitext.png
-Local/Applications/oolite.app/Contents/Resources/Textures/viperi_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/trumblebox.png
-Local/Applications/oolite.app/Contents/Resources/Textures/cobra3_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/boa2_left.png
-Local/Applications/oolite.app/Contents/Resources/Textures/python_redux2.png
 Local/Applications/oolite.app/Contents/Resources/Textures/MorayMED_bottom.png
-Local/Applications/oolite.app/Contents/Resources/Textures/blur256.png
-Local/Applications/oolite.app/Contents/Resources/Textures/zoom.png
-Local/Applications/oolite.app/Contents/Resources/Textures/thargon_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/dark_metal.png
-Local/Applications/oolite.app/Contents/Resources/Textures/trumblekit.png
-Local/Applications/oolite.app/Contents/Resources/Textures/python_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/shuttle_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/gecko_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/boa2_top.png
-Local/Applications/oolite.app/Contents/Resources/Textures/crosshair.png
-Local/Applications/oolite.app/Contents/Resources/Textures/worm_redux1.png
-Local/Applications/oolite.app/Contents/Resources/Textures/moray_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/mamba_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/MorayMED_top.png
+Local/Applications/oolite.app/Contents/Resources/Textures/adder_redux.png
 Local/Applications/oolite.app/Contents/Resources/Textures/anaconda_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/cursor.png
-Local/Applications/oolite.app/Contents/Resources/Textures/cobra3_redux1.png
-Local/Applications/oolite.app/Contents/Resources/Textures/constrictor_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/bottom_metal.png
+Local/Applications/oolite.app/Contents/Resources/Textures/arcdetail.png
+Local/Applications/oolite.app/Contents/Resources/Textures/asciitext.png
 Local/Applications/oolite.app/Contents/Resources/Textures/asp_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/top_metal.png
-Local/Applications/oolite.app/Contents/Resources/Textures/krait_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/transporter_redux1.png
-Local/Applications/oolite.app/Contents/Resources/Textures/python_redux1.png
-Local/Applications/oolite.app/Contents/Resources/Textures/thargoid_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/MorayMED_top.png
-Local/Applications/oolite.app/Contents/Resources/Textures/qbomb.png
-Local/Applications/oolite.app/Contents/Resources/Textures/worm_skin.png
-Local/Applications/oolite.app/Contents/Resources/Textures/boa2_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/boa2_rear.png
+Local/Applications/oolite.app/Contents/Resources/Textures/asteroid.png
+Local/Applications/oolite.app/Contents/Resources/Textures/back_metal.png
 Local/Applications/oolite.app/Contents/Resources/Textures/barrel_metal.png
-Local/Applications/oolite.app/Contents/Resources/Textures/transporter_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/moray_redux1.png
-Local/Applications/oolite.app/Contents/Resources/Textures/adder_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/placard.png
+Local/Applications/oolite.app/Contents/Resources/Textures/blur256.png
+Local/Applications/oolite.app/Contents/Resources/Textures/boa2_left.png
+Local/Applications/oolite.app/Contents/Resources/Textures/boa2_rear.png
+Local/Applications/oolite.app/Contents/Resources/Textures/boa2_redux.png
 Local/Applications/oolite.app/Contents/Resources/Textures/boa2_right.png
-Local/Applications/oolite.app/Contents/Resources/Textures/flare256.png
-Local/Applications/oolite.app/Contents/Resources/Textures/compass.png
-Local/Applications/oolite.app/Contents/Resources/Textures/worm_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/solar.png
-Local/Applications/oolite.app/Contents/Resources/Textures/aegis.png
-Local/Applications/oolite.app/Contents/Resources/Textures/ferdelance_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/metalhighq.png
-Local/Applications/oolite.app/Contents/Resources/Textures/oolite-logo1.png
-Local/Applications/oolite.app/Contents/Resources/Textures/missile.png
-Local/Applications/oolite.app/Contents/Resources/Textures/hemisphere.png
-Local/Applications/oolite.app/Contents/Resources/Textures/oolite-document.png
-Local/Applications/oolite.app/Contents/Resources/Textures/splashback.png
+Local/Applications/oolite.app/Contents/Resources/Textures/boa2_top.png
+Local/Applications/oolite.app/Contents/Resources/Textures/boa_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/bottom_metal.png
+Local/Applications/oolite.app/Contents/Resources/Textures/cobra1_redux.png
 Local/Applications/oolite.app/Contents/Resources/Textures/cobra1_redux1.png
-Local/Applications/oolite.app/Contents/Resources/Textures/galaxy256.png
-Local/Applications/oolite.app/Contents/Resources/Textures/capsule_front.png
+Local/Applications/oolite.app/Contents/Resources/Textures/cobra1_redux2.png
 Local/Applications/oolite.app/Contents/Resources/Textures/cobra1miner_top.png
-Local/Applications/oolite.app/Contents/Resources/Textures/oolite-expansion-document.png
-Local/Applications/oolite.app/Contents/Resources/Textures/back_metal.png
-Local/Applications/oolite.app/Contents/Resources/Textures/left_metal.png
+Local/Applications/oolite.app/Contents/Resources/Textures/cobra3_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/cobra3_redux1.png
+Local/Applications/oolite.app/Contents/Resources/Textures/constrictor_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/dark_metal.png
+Local/Applications/oolite.app/Contents/Resources/Textures/ferdelance_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/flare256.png
 Local/Applications/oolite.app/Contents/Resources/Textures/front_metal.png
-Local/Applications/oolite.app/Contents/Resources/Textures/splash.png
-Local/Applications/oolite.app/Contents/Resources/Textures/viper_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/target_metal.png
-Local/Applications/oolite.app/Contents/Resources/Textures/boa_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/galaxy256.png
+Local/Applications/oolite.app/Contents/Resources/Textures/gecko_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/krait_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/left_metal.png
+Local/Applications/oolite.app/Contents/Resources/Textures/mamba_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/mamba_redux1.png
 Local/Applications/oolite.app/Contents/Resources/Textures/metal.png
-Local/Applications/oolite.app/Contents/Resources/Textures/star64.png
+Local/Applications/oolite.app/Contents/Resources/Textures/missile.png
+Local/Applications/oolite.app/Contents/Resources/Textures/moray_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/moray_redux1.png
+Local/Applications/oolite.app/Contents/Resources/Textures/oolite-document.png
+Local/Applications/oolite.app/Contents/Resources/Textures/oolite-expansion-document.png
+Local/Applications/oolite.app/Contents/Resources/Textures/oolite-logo.png
+Local/Applications/oolite.app/Contents/Resources/Textures/oolite-logo1.png
+Local/Applications/oolite.app/Contents/Resources/Textures/pod2_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/python_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/python_redux1.png
+Local/Applications/oolite.app/Contents/Resources/Textures/python_redux2.png
+Local/Applications/oolite.app/Contents/Resources/Textures/qbomb.png
 Local/Applications/oolite.app/Contents/Resources/Textures/right_metal.png
-Local/Applications/oolite.app/Contents/Resources/Textures/sidewinder_redux.png
-Local/Applications/oolite.app/Contents/Resources/Textures/cobra1_redux2.png
-Local/Applications/oolite.app/Contents/Resources/Textures/arcdetail.png
 Local/Applications/oolite.app/Contents/Resources/Textures/scarred_metal.png
-Local/Applications/oolite.app/Contents/Resources/Textures/mamba_redux1.png
-Local/Applications/oolite.app/Contents/Resources/Textures/oolite-logo.png
-Local/Applications/oolite.app/Contents/Resources/Models/gecko_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/cobra2.dat
-Local/Applications/oolite.app/Contents/Resources/Models/mamba_redux1.dat
-Local/Applications/oolite.app/Contents/Resources/Models/exhaust.dat
-Local/Applications/oolite.app/Contents/Resources/Models/buoy.dat
-Local/Applications/oolite.app/Contents/Resources/Models/adder_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/cobra1_redux1.dat
-Local/Applications/oolite.app/Contents/Resources/Models/mamba_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/arcdetail.dat
-Local/Applications/oolite.app/Contents/Resources/Models/viperi_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/transporter_redux1.dat
-Local/Applications/oolite.app/Contents/Resources/Models/asteroid1.dat
-Local/Applications/oolite.app/Contents/Resources/Models/moray_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/rock-dock.dat
-Local/Applications/oolite.app/Contents/Resources/Models/new-dodo.dat
-Local/Applications/oolite.app/Contents/Resources/Models/splinter.dat
-Local/Applications/oolite.app/Contents/Resources/Models/boulder1.dat
-Local/Applications/oolite.app/Contents/Resources/Models/barrel.dat
-Local/Applications/oolite.app/Contents/Resources/Models/strut.dat
-Local/Applications/oolite.app/Contents/Resources/Models/krait_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/rock-box.dat
-Local/Applications/oolite.app/Contents/Resources/Models/constrictor_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/new-icos.dat
-Local/Applications/oolite.app/Contents/Resources/Models/ring.dat
-Local/Applications/oolite.app/Contents/Resources/Models/boa_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/asp_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/worm_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/splinter1.dat
-Local/Applications/oolite.app/Contents/Resources/Models/thargon_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/python_redux2.dat
-Local/Applications/oolite.app/Contents/Resources/Models/cobra1_redux2.dat
-Local/Applications/oolite.app/Contents/Resources/Models/boa2_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/viper_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/thargoid_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/sidewinder_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/cobra1_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/shuttle_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/icostextured.dat
-Local/Applications/oolite.app/Contents/Resources/Models/new_coriolis.dat
-Local/Applications/oolite.app/Contents/Resources/Models/missile.dat
-Local/Applications/oolite.app/Contents/Resources/Models/boulder.dat
-Local/Applications/oolite.app/Contents/Resources/Models/anaconda_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/cobra3_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/worm_redux1.dat
-Local/Applications/oolite.app/Contents/Resources/Models/icosahedron.dat
-Local/Applications/oolite.app/Contents/Resources/Models/dock.dat
-Local/Applications/oolite.app/Contents/Resources/Models/python_redux1.dat
-Local/Applications/oolite.app/Contents/Resources/Models/benship.dat
-Local/Applications/oolite.app/Contents/Resources/Models/escpod_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/python_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/ferdelance_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/asteroid.dat
-Local/Applications/oolite.app/Contents/Resources/Models/qbomb.dat
-Local/Applications/oolite.app/Contents/Resources/Models/placard.dat
-Local/Applications/oolite.app/Contents/Resources/Models/moray_redux1.dat
-Local/Applications/oolite.app/Contents/Resources/Models/scarred_alloy.dat
-Local/Applications/oolite.app/Contents/Resources/Models/transporter_redux.dat
-Local/Applications/oolite.app/Contents/Resources/Models/cobra3_redux1.dat
-Local/Applications/oolite.app/Contents/Resources/Models/alloy.dat
-Local/Applications/oolite.app/Contents/Resources/Models/new-rock.dat
-Local/Applications/oolite.app/Contents/Resources/Config/hud.plist
-Local/Applications/oolite.app/Contents/Resources/Config/demoships.plist
-Local/Applications/oolite.app/Contents/Resources/Config/shipyard.plist
-Local/Applications/oolite.app/Contents/Resources/Config/hud-small.plist
-Local/Applications/oolite.app/Contents/Resources/Config/keyconfig.plist
-Local/Applications/oolite.app/Contents/Resources/Config/script.plist
-Local/Applications/oolite.app/Contents/Resources/Config/illegal_goods.plist
-Local/Applications/oolite.app/Contents/Resources/Config/speech_pronunciation_guide.plist
-Local/Applications/oolite.app/Contents/Resources/Config/commodities.plist
-Local/Applications/oolite.app/Contents/Resources/Config/shipdata.plist
-Local/Applications/oolite.app/Contents/Resources/Config/equipment.plist
-Local/Applications/oolite.app/Contents/Resources/Config/missiontext.plist
-Local/Applications/oolite.app/Contents/Resources/Config/descriptions.plist
-Local/Applications/oolite.app/Contents/Resources/Images/splash.png
-Local/Applications/oolite.app/Contents/Resources/Images/trumblekit.png
-Local/Applications/oolite.app/Contents/Resources/Images/cursor.png
-Local/Applications/oolite.app/Contents/Resources/Images/reddot.png
-Local/Applications/oolite.app/Contents/Resources/Images/compass.png
-Local/Applications/oolite.app/Contents/Resources/Images/solar.png
-Local/Applications/oolite.app/Contents/Resources/Images/aegis.png
-Local/Applications/oolite.app/Contents/Resources/Images/splashback.png
-Local/Applications/oolite.app/Contents/Resources/Images/greendot.png
-Local/Applications/oolite.app/Contents/Resources/Images/zoom.png
-Local/Applications/oolite.app/Contents/Resources/Music/BlueDanube.ogg
-Local/Applications/oolite.app/Contents/Resources/Music/OoliteTheme.ogg
-Local/Applications/oolite.app/Contents/Resources/Info-Oolite.plist
+Local/Applications/oolite.app/Contents/Resources/Textures/shuttle_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/sidewinder_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/star64.png
+Local/Applications/oolite.app/Contents/Resources/Textures/target_metal.png
+Local/Applications/oolite.app/Contents/Resources/Textures/thargoid_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/thargon_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/top_metal.png
+Local/Applications/oolite.app/Contents/Resources/Textures/transporter_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/transporter_redux1.png
+Local/Applications/oolite.app/Contents/Resources/Textures/trumblekit.png
+Local/Applications/oolite.app/Contents/Resources/Textures/viper_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/viperi_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/worm_redux.png
+Local/Applications/oolite.app/Contents/Resources/Textures/worm_redux1.png
+Local/Applications/oolite.app/Contents/Resources/Textures/wreck.png
+Local/Applications/oolite.app/Contents/Resources/oolite-document.icns
+Local/Applications/oolite.app/Contents/Resources/oolite-expansion-document.icns
+Local/Applications/oolite.app/Contents/Resources/oolite-icon.icns
+Local/Applications/oolite.app/Resources/Info-gnustep.plist
+Local/Applications/oolite.app/oolite
 @dirrm Local/Applications/oolite.app/Resources
-@dirrm Local/Applications/oolite.app/Contents/Resources/AIs
 @dirrm Local/Applications/oolite.app/Contents/Resources/Sounds
-@dirrm Local/Applications/oolite.app/Contents/Resources/Textures
-@dirrm Local/Applications/oolite.app/Contents/Resources/Models
 @dirrm Local/Applications/oolite.app/Contents/Resources/Config
-@dirrm Local/Applications/oolite.app/Contents/Resources/Images
 @dirrm Local/Applications/oolite.app/Contents/Resources/Music
+@dirrm Local/Applications/oolite.app/Contents/Resources/Images
+@dirrm Local/Applications/oolite.app/Contents/Resources/Textures
+@dirrm Local/Applications/oolite.app/Contents/Resources/Models
+@dirrm Local/Applications/oolite.app/Contents/Resources/AIs
 @dirrm Local/Applications/oolite.app/Contents/Resources
 @dirrm Local/Applications/oolite.app/Contents
 @dirrm Local/Applications/oolite.app
-@dirrm Local/Applications
+@dirrmtry Local/Applications