4 files changed, 36 insertions, 32 deletions

diff --git a/games/openastromenace/Makefile b/games/openastromenace/Makefile
index 0df35bad34ae..922af2c98066 100644
--- a/games/openastromenace/Makefile
+++ b/games/openastromenace/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	openastromenace
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF
-DISTFILES=	oamenace-src-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	openamenace-src-${PORTVERSION}${EXTRACT_SUFX} \
 		oamenace-data-${PORTVERSION}${EXTRACT_SUFX} \
 		oamenace-lang-${LANGPACK}-${PORTVERSION}${EXTRACT_SUFX}
 
@@ -27,6 +27,7 @@ USE_GL=		gl glu
 WANT_SDL=	yes
 USE_SDL=	sdl
 USE_CMAKE=	yes
+WRKSRC=		${WRKDIR}/OpenAstroMenaceSVN
 
 OPTIONS=	EN	"English language pack"	on \
 		DE	"German language pack"	off \
diff --git a/games/openastromenace/distinfo b/games/openastromenace/distinfo
index f299f41b43b9..121a55552419 100644
--- a/games/openastromenace/distinfo
+++ b/games/openastromenace/distinfo
@@ -1,6 +1,6 @@
-MD5 (oamenace-src-1.2.0.tar.bz2) = 16d9b4abee736fa91540802a5b600cb4
-SHA256 (oamenace-src-1.2.0.tar.bz2) = 392ea356c15f3b14c2221aebe6fd8bc12f4451ad9174ea9c728f25b24e36bd8d
-SIZE (oamenace-src-1.2.0.tar.bz2) = 562125
+MD5 (openamenace-src-1.2.0.tar.bz2) = 3c8e7013aa64fcde7ba8a7750df51ab8
+SHA256 (openamenace-src-1.2.0.tar.bz2) = d81526228b634e7447aaa6cc20023220a542c68837afbf34f4a5a0618e3eecae
+SIZE (openamenace-src-1.2.0.tar.bz2) = 1021718
 MD5 (oamenace-data-1.2.0.tar.bz2) = a8ad3495f8eac419ebcf93473008484d
 SHA256 (oamenace-data-1.2.0.tar.bz2) = e55fd843b7e6331e3724dd33d160565ae3f154abc790fb95e3566f5fedcb1d3f
 SIZE (oamenace-data-1.2.0.tar.bz2) = 33384465
diff --git a/games/openastromenace/files/patch-AstroMenaceSource-Main.cpp b/games/openastromenace/files/patch-AstroMenaceSource-Main.cpp
index 694ff12fa93f..85cb76b9ebf7 100644
--- a/games/openastromenace/files/patch-AstroMenaceSource-Main.cpp
+++ b/games/openastromenace/files/patch-AstroMenaceSource-Main.cpp
@@ -1,6 +1,6 @@
---- AstroMenaceSource/Main.cpp.orig	2007-09-23 00:51:32.000000000 +0400
-+++ AstroMenaceSource/Main.cpp	2008-05-19 04:59:05.387115362 +0400
-@@ -312,35 +312,7 @@
+--- AstroMenaceSource/Main.cpp.orig	2008-12-27 18:25:49.000000000 +0100
++++ AstroMenaceSource/Main.cpp	2008-12-27 18:35:49.000000000 +0100
+@@ -312,38 +312,7 @@
  	const char* key = "HOME";
  	const char* homeval = getenv(key);
  
@@ -26,14 +26,17 @@
 -	}
 -	if (!dirpresent)
 -	{
--		strcpy(ProgrammDir, argv[0]);
--		char* s = strrchr(ProgrammDir,'/');
--		if (s) s[0]=0x0;
--		const char *Fi = "/";
--		strcat( ProgrammDir, Fi );
+-#ifdef DATADIR
+-		strcpy(ProgrammDir, DATADIR "/");
+-#else
+- 		strcpy(ProgrammDir, argv[0]);
+- 		char* s = strrchr(ProgrammDir,'/');
+- 		if (s) s[0]=0x0;
+- 		const char *Fi = "/";
+- 		strcat( ProgrammDir, Fi );
+-#endif
 -	}
--
-+	strcpy(ProgrammDir, "/usr/local/share/openastromenace/");
++        strcpy(ProgrammDir, "/usr/local/share/openastromenace/");
+ 
  
  	strcpy(ScreenshotDir, homeval);
- 	strcat(ScreenshotDir, "/Desktop/AstroMenaceScreenshot");
diff --git a/games/openastromenace/files/patch-CMakeLists.txt b/games/openastromenace/files/patch-CMakeLists.txt
index 581b17f0bc30..077b4ae7d21d 100644
--- a/games/openastromenace/files/patch-CMakeLists.txt
+++ b/games/openastromenace/files/patch-CMakeLists.txt
@@ -1,7 +1,7 @@
---- CMakeLists.txt.orig	2007-09-23 00:51:32.000000000 +0400
-+++ CMakeLists.txt	2008-05-19 04:24:59.253802609 +0400
-@@ -12,6 +12,8 @@
- # into current directory and run ./AstroMenace
+--- CMakeLists.txt.orig	2008-12-27 18:32:26.000000000 +0100
++++ CMakeLists.txt	2008-12-27 18:33:33.000000000 +0100
+@@ -13,6 +13,8 @@
+ # ./AstroMenace
  #
  
 +CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
@@ -9,18 +9,18 @@
  # project name
  PROJECT(AstroMenace)
  
-@@ -34,9 +36,12 @@
- FILE(GLOB_RECURSE astromenace_SRCS AstroMenaceSource/*.cpp)
- 
- # targets
--ADD_DEFINITIONS(`${SDL_CONFIG} --cflags` -g -Wall)
-+EXEC_PROGRAM(${SDL_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL_CFLAGS)
-+EXEC_PROGRAM(${SDL_CONFIG} ARGS "--libs" OUTPUT_VARIABLE SDL_LIBS)
+@@ -43,9 +45,12 @@
+  IF(DEFINED DATADIR)
+ 	ADD_DEFINITIONS(-DDATADIR=\\"${DATADIR}\\")
+  ENDIF(DEFINED DATADIR)
+- ADD_DEFINITIONS(`${SDL_CONFIG} --cflags` -Wall)
++ EXEC_PROGRAM(${SDL_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL_CFLAGS)
++ EXEC_PROGRAM(${SDL_CONFIG} ARGS "--libs" OUTPUT_VARIABLE SDL_LIBS)
 +
-+ADD_DEFINITIONS(${SDL_CFLAGS})
- ADD_EXECUTABLE(AstroMenace ${astromenace_SRCS})
--TARGET_LINK_LIBRARIES(AstroMenace `${SDL_CONFIG} --libs` ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile)
-+TARGET_LINK_LIBRARIES(AstroMenace ${SDL_LIBS} ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile)
- IF(CYGWIN)
++ ADD_DEFINITIONS(${SDL_CFLAGS})
+  ADD_EXECUTABLE(AstroMenace ${astromenace_SRCS})
+- TARGET_LINK_LIBRARIES(AstroMenace `${SDL_CONFIG} --libs` ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile)
++ TARGET_LINK_LIBRARIES(AstroMenace ${SDL_LIBS} ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile)
+  IF(CYGWIN)
  	TARGET_LINK_LIBRARIES(AstroMenace -lGL.dll  -lGLU.dll -lglfw -lX11.dll)
  #	ADD_DEFINITIONS(-mno-cygwin)