ports/156896: Update of megaglest-data Port

[Sven Moeller]

>Number:         156896
>Category:       ports
>Synopsis:       Update of megaglest-data Port
>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:   Mon May 09 00:00:20 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 of MegaGlest. This is the update for the corresponding megaglest-data port.

Please find attached diff file.

Thanks.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN megaglest-data.orig/Makefile megaglest-data/Makefile
--- megaglest-data.orig/Makefile	2011-04-07 07:13:40.000000000 +0200
+++ megaglest-data/Makefile	2011-05-09 01:03:25.000000000 +0200
@@ -6,38 +6,36 @@
 #
 
 PORTNAME=	megaglest
-PORTVERSION=	3.4.0
+PORTVERSION=	3.5.1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/current_release/
 PKGNAMESUFFIX=	-data
-DISTNAME=	${PORTNAME}-fixed${PKGNAMESUFFIX:S/-/_/}-${PORTVERSION}
-EXTRACT_SUFX=	.7z
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 MAINTAINER=	smoeller at nichthelfer.de
 COMMENT=	MegaGlest data files
 
-EXTRACT_DEPENDS=7z:${PORTSDIR}/archivers/p7zip
+EXTRACT_DEPENDS=xz:${PORTSDIR}/archivers/xz
 
+USE_XZ=		yes
 USE_DOS2UNIX=	*.log *.ini *.html *.txt *.lng
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_game
+WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}
 
-PLIST=		${WRKDIR}/pkg-plist
-
-do-extract:
-	@${MKDIR} ${WRKSRC}
-	@cd ${WRKSRC} && \
-		${LOCALBASE}/bin/7z x ${DISTDIR}/${DISTFILES} >/dev/null
+#PLIST=		${WRKDIR}/pkg-plist
+#		this way $PLIST won't be deleted by "make clean"
+PLIST=		${PORTSDIR}/games/${PORTNAME}${PKGNAMESUFFIX}/pkg-plist
 
 pre-install:
-	@${ECHO_CMD} "%%DATADIR%%/megaglest.ico" >> ${PLIST}
-
+	${RM} ${PLIST}
 .for DIR in data maps scenarios techs tilesets tutorials
 	@cd ${WRKSRC} && \
 		${FIND} ${DIR} -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
 			${FIND} ${DIR} -type d | ${SORT} -r | ${SED} -e 's|^|@dirrmtry %%DATADIR%%/|' >> ${PLIST}
 .endfor
+	@${ECHO_CMD} "share/applications/megaglest.desktop" >> ${PLIST}
+	@${ECHO_CMD} "share/icons/megaglest.png" >> ${PLIST}
 	@${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST}
 
 .if !defined(NOPORTDOCS)
@@ -50,13 +48,14 @@
 do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/glest_factions
-.for f in AUTHORS CHANGELOG LICENSE README data_license.txt data_license_readme.txt
+.for f in AUTHORS.data.txt README.data-license.txt cc-by-sa-3.0-unported.txt COPYRIGHT.data.txt
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
 .endfor
 	(cd ${WRKSRC}/docs/glest_factions && ${COPYTREE_SHARE} "*" ${DOCSDIR}/glest_factions)
 .endif
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/megaglest.ico ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/megaglest.desktop ${PREFIX}/share/applications/
+	${INSTALL_DATA} ${WRKSRC}/megaglest.png ${PREFIX}/share/icons/
 
 .for DIR in data maps scenarios techs tilesets tutorials
 	${MKDIR} ${DATADIR}/${DIR}
diff -ruN megaglest-data.orig/distinfo megaglest-data/distinfo
--- megaglest-data.orig/distinfo	2011-04-07 07:13:40.000000000 +0200
+++ megaglest-data/distinfo	2011-05-08 21:21:51.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (megaglest-fixed_data-3.4.0.7z) = 3944c2549f03c64a75a1c33835b22aaed3748a2712c192b5705978d8caef1d45
-SIZE (megaglest-fixed_data-3.4.0.7z) = 189268275
+SHA256 (megaglest-data-3.5.1.tar.xz) = b2aad1adcf840cf468e53c6a69b9339bc8133ff528ccf2d02039a7987e2ad720
+SIZE (megaglest-data-3.5.1.tar.xz) = 188169468


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