Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 02 Jul 2011 23:54:34 +0200
From:      Sven Moeller <smoeller@nichthelfer.de>
To:        FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/156896: Update of megaglest-data Port
Message-ID:  <4E0F939A.8020305@nichthelfer.de>
In-Reply-To: <201105090000.p4900K5e027910@freefall.freebsd.org>
References:  <201105090000.p4900K5e027910@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------050909040105090602080508
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit

Am 09.05.2011 02:00, schrieb FreeBSD-gnats-submit@FreeBSD.org:
> Thank you very much for your problem report.
> It has the internal identification `ports/156896'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs.
>
> You can access the state of your problem report at any time
> via this link:
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=156896
>
>> Category:       ports
>> Responsible:    freebsd-ports-bugs
>> Synopsis:       Update of megaglest-data Port
>> Arrival-Date:   Mon May 09 00:00:20 UTC 2011

Hello,

this updated patch file fixes the use of PORTREVISION.

Thanks.

Sven

--------------050909040105090602080508
Content-Type: text/plain;
 name="megaglest-data-3.5.2-diff.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="megaglest-data-3.5.2-diff.txt"

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-07-02 23:10:47.000000000 +0200
@@ -6,38 +6,33 @@
 #
 
 PORTNAME=	megaglest
-PORTVERSION=	3.4.0
+PORTVERSION=	3.5.2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/current_release/
 PKGNAMESUFFIX=	-data
-DISTNAME=	${PORTNAME}-fixed${PKGNAMESUFFIX:S/-/_/}-${PORTVERSION}
-EXTRACT_SUFX=	.7z
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}.3
 
 MAINTAINER=	smoeller@nichthelfer.de
 COMMENT=	MegaGlest data files
 
-EXTRACT_DEPENDS=7z:${PORTSDIR}/archivers/p7zip
-
+USE_XZ=		yes
 USE_DOS2UNIX=	*.log *.ini *.html *.txt *.lng
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_game
-
-PLIST=		${WRKDIR}/pkg-plist
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-do-extract:
-	@${MKDIR} ${WRKSRC}
-	@cd ${WRKSRC} && \
-		${LOCALBASE}/bin/7z x ${DISTDIR}/${DISTFILES} >/dev/null
+#		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} -f ${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 +45,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-29 21:14:50.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.2.3.tar.xz) = d38aa14a1fb07e359946619138ed61b653bcc738fef043c16956da9acfa0b7d2
+SIZE (megaglest-data-3.5.2.3.tar.xz) = 188064952

--------------050909040105090602080508--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E0F939A.8020305>