ports/156895: Update for 3D RTS Game MegaGlest

[Sven Moeller]

>Number:         156895
>Category:       ports
>Synopsis:       Update for 3D RTS Game MegaGlest
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 08 23:50:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Sven Moeller
>Release:        8.1-RELEASE
>Organization:
>Environment:
FreeBSD pcbsd-7168 8.1-RELEASE FreeBSD 8.1-RELEASE #1: Sat Jul 17 14:19:59 PDT 2010     root at build8x64.pcbsd.org:/usr/obj/usr/pcbsd-build81/fbsd-source/8.1/sys/PCBSD  amd64
>Description:
Yesterday Upstream had released an Update for the OpenSource 3D RTS MegaGlest. This is an update for the corresponding FreeBSD Port.

Please find the attached diff file.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN megaglest.orig/Makefile megaglest/Makefile
--- megaglest.orig/Makefile	2011-04-10 02:45:08.000000000 +0200
+++ megaglest/Makefile	2011-05-09 01:21:33.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	megaglest
-PORTVERSION=	3.4.0
+PORTVERSION=	3.5.1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/current_release/
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
@@ -21,9 +21,11 @@
 		vorbis.4:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS=	${DATADIR}/tutorials/basic_tutorial/basic_tutorial.xml:${PORTSDIR}/games/megaglest-data
 
-SUB_FILES=	glest-wrapper pkg-message
+EXTRACT_DEPENDS=xz:${PORTSDIR}/archivers/xz
 
-USE_BZIP2=	yes
+SUB_FILES=	pkg-message
+
+USE_XZ=		yes
 USE_CMAKE=	yes
 USE_DOS2UNIX=	yes
 USE_GL=		yes
@@ -32,6 +34,8 @@
 USE_SDL=	yes
 USE_WX=		2.8+
 
+WRKSRC=         ${WRKDIR}/${DISTNAME}/${PORTNAME}-${PORTVERSION}
+
 OPTIONS=	EDITOR "Install MegaGlest Editor" off
 
 .include <bsd.port.options.mk>
@@ -43,22 +47,21 @@
 .endif
 
 do-install:
-	${STRIP_CMD} ${WRKSRC}/mk/linux/glest.bin
+	${STRIP_CMD} ${WRKSRC}/mk/linux/megaglest
 	@${MKDIR} ${DATADIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .endif
-	${INSTALL_PROGRAM} ${WRKSRC}/mk/linux/glest.bin ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/mk/linux/megaglest ${PREFIX}/bin/${PORTNAME}
 .for f in glest.ini glestkeys.ini servers.ini
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
 .endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/glest-wrapper ${PREFIX}/bin/${PORTNAME}
-.if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${WRKSRC}/code_license.txt ${DOCSDIR}
-.endif
+.for f in AUTHORS.source_code.txt CHANGELOG.txt README.txt COPYRIGHT.source_code.txt
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
 .if defined(WITH_EDITOR)
-	${INSTALL_PROGRAM} ${WRKSRC}/mk/linux/glest_editor ${PREFIX}/bin/megaglest_editor
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/mk/linux/megaglest_editor ${PREFIX}/bin/megaglest_editor
+.endif 
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff -ruN megaglest.orig/distinfo megaglest/distinfo
--- megaglest.orig/distinfo	2011-04-07 07:17:21.000000000 +0200
+++ megaglest/distinfo	2011-05-08 21:22:49.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (megaglest-source-3.4.0.tar.bz2) = da17c210fb6c3c366bf0e2b44e243740008c3a6ad62f27d631002e46f0210654
-SIZE (megaglest-source-3.4.0.tar.bz2) = 899312
+SHA256 (megaglest-source-3.5.1.tar.xz) = a60580acca668428277f32171165ce41a0bc2b4a07da179bcad61b0cb2018512
+SIZE (megaglest-source-3.5.1.tar.xz) = 3238128
diff -ruN megaglest.orig/files/glest-wrapper.in megaglest/files/glest-wrapper.in
--- megaglest.orig/files/glest-wrapper.in	2011-04-07 07:17:21.000000000 +0200
+++ megaglest/files/glest-wrapper.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# The executable needs to be run from its data directory, and needs to store
-# configuration in it. We therefore mirror the data directory hierarchy in
-# ~/.megaglest3.4.0, and create symlinks to the data files.
-
-if [ -d ~/.megaglest3.4.0 ]
-then
-        echo "Using existing ~/.megaglest3.4.0 directory."
-else
-        echo "Creating ~/.megaglest3.4.0 directory."
-        cd %%DATADIR%% || exit 1
-        find * -type d -exec mkdir -p ~/.megaglest3.4.0/{} \;
-        find * -type f -exec ln -s %%DATADIR%%/{} ~/.megaglest3.4.0/{} \; 2>/dev/null
-	mkdir -p ~/.megaglest3.4.0/screens
-	mkdir -p ~/.megaglest3.4.0/shaders/standard
-	touch ~/.megaglest3.4.0/megaglest.log
-	rm ~/.megaglest3.4.0/glest.ini ~/.megaglest3.4.0/megaglest ~/.megaglest3.4.0/servers.ini
-	cp -f %%DATADIR%%/glest.ini ~/.megaglest3.4.0/
-	cp -f %%DATADIR%%/glestkeys.ini ~/.megaglest3.4.0/
-	cp -f %%DATADIR%%/servers.ini ~/.megaglest3.4.0/
-	chmod 640 ~/.megaglest3.4.0/glest.ini ~/.megaglest3.4.0/servers.ini
-fi
-
-cd ~/.megaglest3.4.0 || exit 1
-echo "Please be patient while loading MegaGlest..."
-exec %%DATADIR%%/glest.bin "$@"
diff -ruN megaglest.orig/files/patch-CMakeLists.txt megaglest/files/patch-CMakeLists.txt
--- megaglest.orig/files/patch-CMakeLists.txt	2011-04-07 07:17:21.000000000 +0200
+++ megaglest/files/patch-CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-*** CMakeLists.txt	2011-02-10 17:41:19.000000000 +0100
---- CMakeLists.txt_FreeBSD	2011-02-10 17:41:56.000000000 +0100
-*************** IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
-*** 59,76 ****
-- 	OPTION(WANT_SVN_STAMP "use svn stamp" ON)
-- 	IF(WANT_SVN_STAMP)
-- 		# The stuff below gets SVN Global Revision # but ONLY when calling cmake!
-- 		# the FindSubversion.cmake module is part of the standard distribution
-- 		include(FindSubversion)
-- 		# extract working copy information for SOURCE_DIR into MY_XXX variables
-- 		Subversion_WC_INFO(${PROJECT_SOURCE_DIR} MG)
-- 		#add_definitions(-DSVNVERSION="${MG_WC_REVISION}")
-- 	ENDIF()
-- 
-- 	SET(SVN_VERSION_CMD "-DSVNVERSION='\\\"${MG_WC_REVISION}\\\"'")
-- 
-- 	IF(UNIX AND NOT APPLE)
-- 		# We do some funky character escaping to get the right stuff written out to 
-- 		# the final Makefile so we get the SVN Global Revsion #
-- 		SET(SVN_VERSION_CMD "-DSVNVERSION='\\\"`svnversion -n ${PROJECT_SOURCE_DIR}`\\\"'")
-- 	ENDIF()
-- 
---- 58 ----
diff -ruN megaglest.orig/files/pkg-message.in megaglest/files/pkg-message.in
--- megaglest.orig/files/pkg-message.in	2011-04-10 02:45:08.000000000 +0200
+++ megaglest/files/pkg-message.in	2011-04-25 22:33:49.000000000 +0200
@@ -13,4 +13,9 @@
 
 4) Enjoy it ;)
 
+5) If you did an updrade from version 3.4.0 your personal settings are stored
+   in ~/.megaglest3.4.0
+   When you copy glestuser.ini and glestuserkeys.ini to ~/.megaglest
+   you'll have your old settings again.
+
 ###############################################################################
diff -ruN megaglest.orig/pkg-plist megaglest/pkg-plist
--- megaglest.orig/pkg-plist	2011-04-10 02:45:08.000000000 +0200
+++ megaglest/pkg-plist	2011-05-09 00:41:29.000000000 +0200
@@ -1,9 +1,7 @@
 %%EDITOR%%bin/megaglest_editor
 bin/megaglest
-%%DATADIR%%/glest.bin
 %%DATADIR%%/glest.ini
 %%DATADIR%%/glestkeys.ini
 %%DATADIR%%/servers.ini
-%%PORTDOCS%%%%DOCSDIR%%/code_license.txt
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry %%DATADIR%%


>Release-Note:
>Audit-Trail:
>Unformatted: