8 files changed, 25 insertions, 166 deletions

diff --git a/games/openastromenace/Makefile b/games/openastromenace/Makefile
index 937abc11dcdb..63e7c393bc55 100644
--- a/games/openastromenace/Makefile
+++ b/games/openastromenace/Makefile
@@ -2,62 +2,43 @@
 # $FreeBSD$
 
 PORTNAME=	openastromenace
-PORTVERSION=	1.2.0
-PORTREVISION=	11
+PORTVERSION=	1.3.2
 CATEGORIES=	games
-MASTER_SITES=	SF/openastromenace/openastromenace/1.2.0/:source \
-		SF/openastromenace/openastromenace%20vfs/1.2.0/:data
-DISTFILES=	openamenace-src-${PORTVERSION}${EXTRACT_SUFX}:source \
-		oamenace-data-1.2.0.tar.bz2:data \
-		oamenace-lang-${LANGPACK}-${PORTVERSION}${EXTRACT_SUFX}:data
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
+DISTNAME=	astromenace-src-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Hardcore 3D space shooter with spaceship upgrade possibilities
 
-LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LICENSE=	GPLv3
 
-USES=		tar:bzip2 cmake dos2unix openal:al,alut
+LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+
+USES=		tar:bzip2 cmake openal:al,alut
+USE_XORG=	x11 xinerama
 USE_GL=		gl glu
 USE_SDL=	sdl
-WRKSRC=		${WRKDIR}/OpenAstroMenaceSVN
+WRKSRC=		${WRKDIR}/AstroMenace
+CMAKE_ARGS=	-DDATADIR="${DATADIR}"
 
 PLIST_FILES=	bin/AstroMenace
 PORTDATA=	*
+PORTDOCS=	*
 
-OPTIONS_SINGLE=	LANG
-OPTIONS_SINGLE_LANG=	EN DE RU
-OPTIONS_DEFAULT=EN
-
-EN_DESC=	"English language pack"
-DE_DESC=	"German language pack"
-RU_DESC=	"Russian language pack"
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MEN}
-LANGPACK=	en
-.elif ${PORT_OPTIONS:MDE}
-LANGPACK=	de
-.elif ${PORT_OPTIONS:MRU}
-LANGPACK=	ru
-.endif
-
-.if !defined(WITHOUT_NOUVEAU)
-CFLAGS+=	-DOLD_MESA
-.endif
+OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	${REINPLACE_CMD} -e 's|/usr/local/share/openastromenace|${DATADIR}|' \
-		${WRKSRC}/AstroMenaceSource/Main.cpp
+post-build:
+	cd ${WRKSRC} && ./AstroMenace dos2unix --pack --rawdata=./RAW_VFS_DATA --dir="${WRKSRC}"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/AstroMenace ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/AstroMenace ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/gamedata.vfs ${STAGEDIR}${DATADIR}/
-	${MKDIR} ${STAGEDIR}${DATADIR}/DATA/SCRIPT
-	${INSTALL_DATA} ${WRKDIR}/DATA/SCRIPT/* ${STAGEDIR}${DATADIR}/DATA/SCRIPT
-	${INSTALL_DATA} ${WRKDIR}/gamelang_${LANGPACK}.vfs \
-		${STAGEDIR}${DATADIR}/gamelang.vfs
+	${INSTALL_DATA} ${WRKSRC}/gamedata.vfs ${STAGEDIR}${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog.txt ${STAGEDIR}${DOCSDIR}/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/openastromenace/distinfo b/games/openastromenace/distinfo
index e995e0f0403f..d2cd121195e5 100644
--- a/games/openastromenace/distinfo
+++ b/games/openastromenace/distinfo
@@ -1,10 +1,2 @@
-SHA256 (openamenace-src-1.2.0.tar.bz2) = d81526228b634e7447aaa6cc20023220a542c68837afbf34f4a5a0618e3eecae
-SIZE (openamenace-src-1.2.0.tar.bz2) = 1021718
-SHA256 (oamenace-data-1.2.0.tar.bz2) = e55fd843b7e6331e3724dd33d160565ae3f154abc790fb95e3566f5fedcb1d3f
-SIZE (oamenace-data-1.2.0.tar.bz2) = 33384465
-SHA256 (oamenace-lang-en-1.2.0.tar.bz2) = 7890431ca80a7456dc77b102c58f9dd9a3f6fc41574ffc4234f805e7dae79d88
-SIZE (oamenace-lang-en-1.2.0.tar.bz2) = 1382975
-SHA256 (oamenace-lang-de-1.2.0.tar.bz2) = 3c7f4b580c1491c1fe6db521477e644f5139323e3e427bf99effe2da0bd3b7bd
-SIZE (oamenace-lang-de-1.2.0.tar.bz2) = 1656853
-SHA256 (oamenace-lang-ru-1.2.0.tar.bz2) = bf4231baae0b3e1f3327da249ab9bb50c226c71bf0fd12b98a05820b5646cb5d
-SIZE (oamenace-lang-ru-1.2.0.tar.bz2) = 2344872
+SHA256 (astromenace-src-1.3.2.tar.bz2) = 9b775df2b157565b97aca008dd879b867cd3377c07b829cee6b5342639357fe6
+SIZE (astromenace-src-1.3.2.tar.bz2) = 55390211
diff --git a/games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h b/games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
deleted file mode 100644
index 0e0c60249027..000000000000
--- a/games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- AstroMenaceSource/Core/Base.h~
-+++ AstroMenaceSource/Core/Base.h
-@@ -46,10 +46,14 @@
- 	#include <OpenGL/gl.h>	// Header File For The OpenGL32 Library
- 	#include <OpenGL/glu.h>	// Header File For The GLu32 Library
- #else
-+    #ifdef OLD_MESA
- 	#define __glext_h_  // Don't let gl.h include glext.h
-+    #endif
- 	#include <GL/gl.h>	// Header File For The OpenGL32 Library
- 	#include <GL/glu.h>	// Header File For The GLu32 Library
-+    #ifdef OLD_MESA
- 	#undef __glext_h_
-+    #endif
- #endif
- 
- #include <stdlib.h> // rand, ...
diff --git a/games/openastromenace/files/patch-AstroMenaceSource-Core-RendererInterface-RendererInterface.h b/games/openastromenace/files/patch-AstroMenaceSource-Core-RendererInterface-RendererInterface.h
deleted file mode 100644
index f0e93ba98689..000000000000
--- a/games/openastromenace/files/patch-AstroMenaceSource-Core-RendererInterface-RendererInterface.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- AstroMenaceSource/Core/RendererInterface/RendererInterface.h.orig	2012-08-25 13:33:11.000000000 +0400
-+++ AstroMenaceSource/Core/RendererInterface/RendererInterface.h	2012-08-25 13:36:09.000000000 +0400
-@@ -37,7 +37,7 @@
- #include "../Base.h"
- #include "../Math/Math.h"
- #include "../Texture/Texture.h"
--
-+#define PFNGLCLIENTACTIVETEXTUREPROC PFNGLACTIVETEXTUREPROC
- 
- 
- struct eDevCaps
diff --git a/games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h b/games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h
deleted file mode 100644
index 9c3af7078a64..000000000000
--- a/games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- AstroMenaceSource/Core/VirtualFileSystem/VFS.h~
-+++ AstroMenaceSource/Core/VirtualFileSystem/VFS.h
-@@ -34,6 +34,7 @@
- #define VFS_H
- 
- 
-+#include <cstdio>
- #include "../Base.h"
- 
- 
diff --git a/games/openastromenace/files/patch-AstroMenaceSource-Main.cpp b/games/openastromenace/files/patch-AstroMenaceSource-Main.cpp
deleted file mode 100644
index 85cb76b9ebf7..000000000000
--- a/games/openastromenace/files/patch-AstroMenaceSource-Main.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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);
- 
--	bool dirpresent = false;
--	for (int i=1; i<argc; i++)
--	{
--		if (!strncmp(argv[i], "--dir=", sizeof("--dir")))
--		{
--			dirpresent = true;
--			// если передали относительный путь в папку пользователя с тильдой
--			if (argv[i][6] != '~')
--				strncpy(ProgrammDir, argv[i]+strlen("--dir="), strlen(argv[i])-strlen("--dir=")+1);
--			else
--			{
--				strcpy(ProgrammDir, homeval);// -1, это тильда... а в кол-ве нет, т.к. /0 там должен остаться
--				strncat(ProgrammDir, argv[i]+strlen("--dir=")+1, strlen(argv[i])-strlen("--dir="));
--			}
--			// если в конце нет слеша - ставим его
--			if (ProgrammDir[strlen(ProgrammDir)-1] != '/')
--				strncat(ProgrammDir, "/", strlen("/"));
--
--		}
--	}
--	if (!dirpresent)
--	{
--#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(ScreenshotDir, homeval);
diff --git a/games/openastromenace/files/patch-CMakeLists.txt b/games/openastromenace/files/patch-CMakeLists.txt
deleted file mode 100644
index 077b4ae7d21d..000000000000
--- a/games/openastromenace/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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)
-+
- # project name
- PROJECT(AstroMenace)
- 
-@@ -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)
- 	TARGET_LINK_LIBRARIES(AstroMenace -lGL.dll  -lGLU.dll -lglfw -lX11.dll)
- #	ADD_DEFINITIONS(-mno-cygwin)
diff --git a/games/openastromenace/files/pkg-message.in b/games/openastromenace/files/pkg-message.in
deleted file mode 100644
index 2250d7ca0cee..000000000000
--- a/games/openastromenace/files/pkg-message.in
+++ /dev/null
@@ -1,8 +0,0 @@
-=======================================================================
-OpenAstroMenace is now installed. 
-
-You can run game:
-
-AstroMenace --dir=/usr/local/share/openastromenace
-
-=======================================================================