- update to 1.62

- portversion includes full version
- set GNUSTEP_PREFIX
- removed obsolete USE_REINPLACE
PR:		93763
Submitted by:	Andriy Gapon
Approved by:	portmgr (linimon)

4 files changed, 39 insertions, 17 deletions

diff --git a/games/oolite/Makefile b/games/oolite/Makefile
index 51d10bdc02b0..5fbdb2e060ba 100644
--- a/games/oolite/Makefile
+++ b/games/oolite/Makefile
@@ -6,19 +6,24 @@
 #
 
 PORTNAME=	oolite
-PORTVERSION=	1.55
+PORTVERSION=	${OOLITE_BASE_VERSION}.${OOLITE_SRC_VERSION}
 CATEGORIES=	games
-MASTER_SITES=	http://download.berlios.de/oolite-linux/ \
-		ftp://ftp.alioth.net/oolite/
-DISTFILES=	${PORTNAME}-src-${PORTVERSION}-1${EXTRACT_SUFX} ${PORTNAME}-data-${PORTVERSION}-1${EXTRACT_SUFX}
+MASTER_SITES=	http://download.berlios.de/oolite-linux/old/ \
+		ftp://ftp.alioth.net/oolite/old/
+DISTFILES=	${PORTNAME}-src-${OOLITE_BASE_VERSION}-${OOLITE_SRC_VERSION}${EXTRACT_SUFX} \
+		${PORTNAME}-data-${OOLITE_BASE_VERSION}-${OOLITE_DATA_VERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	avg@icyb.net.ua
 COMMENT=	Trade and combat space simulator, clone of Elite
 
+OOLITE_BASE_VERSION=	1.62
+OOLITE_SRC_VERSION=	3
+OOLITE_DATA_VERSION=	3
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-src
-PREFIX=		${LOCALBASE}/GNUstep
+GNUSTEP_PREFIX?=${LOCALBASE}/GNUstep
+PREFIX=		${GNUSTEP_PREFIX}
 NO_MTREE=	yes
-USE_REINPLACE=	yes
 USE_SDL=	mixer image gfx
 USE_GMAKE=	yes
 USE_GNUSTEP=	yes
diff --git a/games/oolite/distinfo b/games/oolite/distinfo
index 54a0d2b9f149..d64c258e1c21 100644
--- a/games/oolite/distinfo
+++ b/games/oolite/distinfo
@@ -1,6 +1,4 @@
-MD5 (oolite-src-1.55-1.tar.gz) = 67c4d8b6424a575480556f3d088fb837
-SHA256 (oolite-src-1.55-1.tar.gz) = 2cd7745cb87c528496161cb6d727c3845afd66d78ba64bca1a277cdce5353ead
-SIZE (oolite-src-1.55-1.tar.gz) = 342291
-MD5 (oolite-data-1.55-1.tar.gz) = a6746932cfd4bbb90eb4cd1afc54eef9
-SHA256 (oolite-data-1.55-1.tar.gz) = a2afb515d6510620a0877f000e13d86fb42406b0d9f14a1184b290225e12db9d
-SIZE (oolite-data-1.55-1.tar.gz) = 17425079
+MD5 (oolite-src-1.62-3.tar.gz) = f9352e1113a0694f275820d87c35bbe0
+SIZE (oolite-src-1.62-3.tar.gz) = 375269
+MD5 (oolite-data-1.62-3.tar.gz) = fb34aa076d819215132fb3b1253986c5
+SIZE (oolite-data-1.62-3.tar.gz) = 17500064
diff --git a/games/oolite/files/patch-MyOpenGLView.h b/games/oolite/files/patch-MyOpenGLView.h
new file mode 100644
index 000000000000..e9b658c50e25
--- /dev/null
+++ b/games/oolite/files/patch-MyOpenGLView.h
@@ -0,0 +1,11 @@
+--- 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/pkg-plist b/games/oolite/pkg-plist
index 5eb96785c5e7..895596239699 100644
--- a/games/oolite/pkg-plist
+++ b/games/oolite/pkg-plist
@@ -3,8 +3,6 @@ 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/dockingAI.plist
-Local/Applications/oolite.app/Contents/Resources/Info-Oolite.plist
 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
@@ -15,8 +13,10 @@ 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/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/exitingTraderAI.plist
 Local/Applications/oolite.app/Contents/Resources/AIs/interceptAI.plist
 Local/Applications/oolite.app/Contents/Resources/AIs/nullAI.plist
@@ -30,11 +30,16 @@ 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/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/Sounds/afterburner2.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/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
@@ -49,12 +54,13 @@ 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/trumblesqueal.ogg
 Local/Applications/oolite.app/Contents/Resources/Sounds/laser.ogg
-Local/Applications/oolite.app/Contents/Resources/Sounds/ecm.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
@@ -87,12 +93,12 @@ 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/barrel_metal.png
-Local/Applications/oolite.app/Contents/Resources/Textures/placard.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/boa2_rear.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/boa2_right.png
 Local/Applications/oolite.app/Contents/Resources/Textures/flare256.png
 Local/Applications/oolite.app/Contents/Resources/Textures/compass.png
@@ -164,6 +170,7 @@ 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
@@ -211,6 +218,7 @@ 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
 @dirrm Local/Applications/oolite.app/Resources
 @dirrm Local/Applications/oolite.app/Contents/Resources/AIs
 @dirrm Local/Applications/oolite.app/Contents/Resources/Sounds