4 files changed, 25 insertions, 61 deletions

diff --git a/games/openssn/Makefile b/games/openssn/Makefile
index bb2060bb6530..562212811e52 100644
--- a/games/openssn/Makefile
+++ b/games/openssn/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openssn
-PORTVERSION=	0.3
-PORTREVISION=	1
+PORTVERSION=	0.6
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -16,6 +15,6 @@ COMMENT=	A modern submarine simulator
 
 USE_SDL=	sdl gfx image
 USE_XORG=	x11 xau xdmcp xext xmu xpm xxf86vm
-WRKSRC=		${WRKDIR}/${PORTNAME}/src
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/games/openssn/distinfo b/games/openssn/distinfo
index c40ad6596f2e..4fbeadc0e587 100644
--- a/games/openssn/distinfo
+++ b/games/openssn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openssn-0.3.tar.gz) = 10a0514a0d99f0a3b7343bba3eb56124c6f992ca030fce4d4ad9a9e018d6be04
-SIZE (openssn-0.3.tar.gz) = 1669161
+SHA256 (openssn-0.6.tar.gz) = c14b134ad96023add83b3b350516860c3755ed6058e7d9d9473ed4f4b0985916
+SIZE (openssn-0.6.tar.gz) = 5910349
diff --git a/games/openssn/files/patch-sonar.cpp b/games/openssn/files/patch-sonar.cpp
deleted file mode 100644
index 72b77fc506be..000000000000
--- a/games/openssn/files/patch-sonar.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./sonar.cpp.orig	2011-05-29 21:42:19.000000000 -0300
-+++ ./sonar.cpp	2011-05-29 21:42:56.000000000 -0300
-@@ -366,7 +366,7 @@
- 		int relative_bearing = bearing_to_target - recipbearing;
- 		if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true;
- 		if (!sensordeaf){	
--			noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) abs((flowandambientnoise - RandInt(40))) , 0);
-+			noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) fabs((flowandambientnoise - RandInt(40))) , 0);
- 			DPixel(sonarscreen, nbp, 0, noisecolor);
- 		}
- 		else{
-@@ -407,7 +407,7 @@
- 			int relative_bearing = bearing_to_target - recipbearing;
- 			if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true;		
- 			if (!sensordeaf){	
--				noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) abs((flowandambientnoise - RandInt(40))) , 0);
-+				noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) fabs((flowandambientnoise - RandInt(40))) , 0);
- 				DPixel(sonarscreen, nbp, 70, noisecolor);
- 			}
- 			else{
-@@ -448,7 +448,7 @@
- 			int relative_bearing = bearing_to_target - recipbearing;
- 			if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true;			
- 			if (!sensordeaf){	
--				noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) abs((flowandambientnoise - RandInt(40))) , 0);
-+				noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) fabs((flowandambientnoise - RandInt(40))) , 0);
- 				DPixel(sonarscreen, nbp, 140, noisecolor);
- 			}
- 			else{
-@@ -507,7 +507,7 @@
- 			int relative_bearing = bearing_to_target - array_heading;
- 			if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true;
- 			if(!sensordeaf){
--				noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)abs((flowandambientnoise - RandInt(40))), 0);
-+				noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)fabs((flowandambientnoise - RandInt(40))), 0);
- 				DPixel(towedarrayscreen, nbp, 0, noisecolor);
- 			}
- 			else{
-@@ -549,7 +549,7 @@
- 				int relative_bearing = bearing_to_target - array_heading;
- 				if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true;
- 				if(!sensordeaf){
--					noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)abs((flowandambientnoise - RandInt(40))), 0);
-+					noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)fabs((flowandambientnoise - RandInt(40))), 0);
- 					DPixel(towedarrayscreen, nbp, 70, noisecolor);
- 				}
- 				else{
-@@ -589,7 +589,7 @@
- 				int relative_bearing = bearing_to_target - array_heading;
- 				if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true;
- 				if(!sensordeaf){
--					noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)abs((flowandambientnoise - RandInt(40))), 0);
-+					noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)fabs((flowandambientnoise - RandInt(40))), 0);
- 					DPixel(towedarrayscreen, nbp, 140, noisecolor);
- 				}
- 				else{
diff --git a/games/openssn/pkg-plist b/games/openssn/pkg-plist
index 791515da4cd2..26e5c5e54e8e 100644
--- a/games/openssn/pkg-plist
+++ b/games/openssn/pkg-plist
@@ -1,7 +1,16 @@
 bin/openssn
 share/games/openssn/data/font.dat
+share/games/openssn/data/information.txt
 share/games/openssn/data/largefont.dat
+share/games/openssn/data/mission0.dat
+share/games/openssn/data/mission1.dat
+share/games/openssn/data/mission2.dat
+share/games/openssn/data/orders0.txt
+share/games/openssn/data/orders1.txt
+share/games/openssn/data/orders2.txt
 share/games/openssn/data/ships0.dat
+share/games/openssn/data/ships1.dat
+share/games/openssn/data/ships2.dat
 share/games/openssn/images/A13off.png
 share/games/openssn/images/A13on.png
 share/games/openssn/images/A23off.png
@@ -31,6 +40,7 @@ share/games/openssn/images/assigntrackeron.png
 share/games/openssn/images/blip.png
 share/games/openssn/images/centerbuttondown.png
 share/games/openssn/images/centerbuttonup.png
+share/games/openssn/images/cutarray.png
 share/games/openssn/images/depthdownoff.png
 share/games/openssn/images/depthdownon.png
 share/games/openssn/images/depthupoff.png
@@ -107,6 +117,9 @@ share/games/openssn/images/sonardown.png
 share/games/openssn/images/sonarup.png
 share/games/openssn/images/sphericaltowed.png
 share/games/openssn/images/styllus.png
+share/games/openssn/images/sub_menu.png
+share/games/openssn/images/sub_rising.png
+share/games/openssn/images/sub_surfacing.png
 share/games/openssn/images/sweep0.png
 share/games/openssn/images/sweep1.png
 share/games/openssn/images/sweep10.png
@@ -163,6 +176,14 @@ share/games/openssn/images/upbuttondown.png
 share/games/openssn/images/upbuttonup.png
 share/games/openssn/images/uppercrtoff.png
 share/games/openssn/images/uppercrton.png
+share/games/openssn/ships/class1.shp
+share/games/openssn/ships/class2.shp
+share/games/openssn/ships/class3.shp
+share/games/openssn/ships/class4.shp
+share/games/openssn/ships/class5.shp
+share/games/openssn/ships/class6.shp
+share/games/openssn/ships/information.txt
+@dirrm share/games/openssn/ships
 @dirrm share/games/openssn/images
 @dirrm share/games/openssn/data
 @dirrm share/games/openssn