ports/169376: Update port games/megaglest to 3.6.0.3

Sun Jun 24 15:50:10 UTC 2012

>Number:         169376
>Category:       ports
>Synopsis:       Update port games/megaglest to 3.6.0.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 24 15:50:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Rusty Nejdl
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD tethys.ringofsaturn.com 9.0-STABLE FreeBSD 9.0-STABLE #0: Sat Jun 16 08:27:21 CDT 2012 root at tethys.ringofsaturn.com:/usr/obj/usr/src/sys/GENERIC amd64



>Description:
	These two diffs update megaglest and megaglest-data to 3.6.0.3 and also include build dependencies on libircclient and miniupnpc.

>How-To-Repeat:

>Fix:

--- megaglest-3.6.0.3.diff begins here ---
diff -ruN megaglest/Makefile megaglest.new/Makefile
--- megaglest/Makefile	2012-06-01 07:34:15.000000000 -0500
+++ megaglest.new/Makefile	2012-06-24 10:01:51.000000000 -0500
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	megaglest
-PORTVERSION=	3.5.2
-PORTREVISION=	2
+PORTVERSION=	3.6.0.3
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/current_release/
-DISTNAME=	${PORTNAME}-source-${PORTVERSION}.3
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/
+DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 
 MAINTAINER=	smoeller at nichthelfer.de
 COMMENT=	Open source 3D real-time strategy game
@@ -20,7 +19,9 @@
 		png15:${PORTSDIR}/graphics/png \
 		xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
-RUN_DEPENDS=	${DATADIR}/tutorials/basic_tutorial/basic_tutorial.xml:${PORTSDIR}/games/megaglest-data
+BUILD_DEPENDS=  ${LOCALBASE}/include/libircclient.h:${PORTSDIR}/irc/libircclient \
+		${LOCALBASE}/include/miniupnpc/miniupnpc.h:${PORTSDIR}/net/miniupnpc
+RUN_DEPENDS=	${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:${PORTSDIR}/games/megaglest-data
 
 SUB_FILES=	pkg-message
 
diff -ruN megaglest/distinfo megaglest.new/distinfo
--- megaglest/distinfo	2011-07-21 08:17:09.000000000 -0500
+++ megaglest.new/distinfo	2012-06-24 08:54:04.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (megaglest-source-3.5.2.3.tar.xz) = 76e1c899aeffa54cbf0de38104a7bc4d6abcc5a504922636bfba4c44d9d40454
-SIZE (megaglest-source-3.5.2.3.tar.xz) = 1185872
+SHA256 (megaglest-source-3.6.0.3.tar.xz) = 700b1eef534d72fa5efd329445aa085259a87dcea5e739eda629e6c41386b9f7
+SIZE (megaglest-source-3.6.0.3.tar.xz) = 1336432
diff -ruN megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp megaglest.new/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp
--- megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp	1969-12-31 18:00:00.000000000 -0600
+++ megaglest.new/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp	2012-06-24 09:52:37.000000000 -0500
@@ -0,0 +1,14 @@
+--- source/shared_lib/sources/platform/posix/ircclient.cpp	2012-01-23 14:36:15.000000000 -0600
++++ source/shared_lib/sources/platform/posix/ircclient.cpp.new	2012-06-24 09:51:37.000000000 -0500
+@@ -14,11 +14,7 @@
+ #include "util.h"
+ #include "platform_common.h"
+ #include "libircclient.h"
+-
+-// upstream moved some defines into new headers as of 1.6
+-#ifndef LIBIRCCLIENT_PRE1_6
+ #include "libirc_rfcnumeric.h"
+-#endif
+ 
+ #include <stdio.h>
+ #include <stdarg.h>
--- megaglest-3.6.0.3.diff ends here ---

--- megaglest-data-3.6.0.3.diff begins here ---
diff -ruN megaglest-data/Makefile megaglest-data.new/Makefile
--- megaglest-data/Makefile	2011-07-24 08:10:51.000000000 -0500
+++ megaglest-data.new/Makefile	2012-06-24 09:06:24.000000000 -0500
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	megaglest
-PORTVERSION=	3.5.2
+PORTVERSION=	3.6.0.3
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/current_release/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/
 PKGNAMESUFFIX=	-data
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}.3
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 MAINTAINER=	smoeller at nichthelfer.de
 COMMENT=	MegaGlest data files
diff -ruN megaglest-data/Makefile.orig megaglest-data.new/Makefile.orig
--- megaglest-data/Makefile.orig	2011-04-07 00:13:40.000000000 -0500
+++ megaglest-data.new/Makefile.orig	1969-12-31 18:00:00.000000000 -0600
@@ -1,66 +0,0 @@
-# New ports collection makefile for:	megaglest-data
-# Date created:				2010-11-12
-# Whom:					Sven Moeller <smoeller at nichthelfer.de>
-#
-# $FreeBSD: ports/games/megaglest-data/Makefile,v 1.1 2011/04/07 05:13:40 beat Exp $
-#
-
-PORTNAME=	megaglest
-PORTVERSION=	3.4.0
-CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/current_release/
-PKGNAMESUFFIX=	-data
-DISTNAME=	${PORTNAME}-fixed${PKGNAMESUFFIX:S/-/_/}-${PORTVERSION}
-EXTRACT_SUFX=	.7z
-
-MAINTAINER=	smoeller at nichthelfer.de
-COMMENT=	MegaGlest data files
-
-EXTRACT_DEPENDS=7z:${PORTSDIR}/archivers/p7zip
-
-USE_DOS2UNIX=	*.log *.ini *.html *.txt *.lng
-NO_BUILD=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}_game
-
-PLIST=		${WRKDIR}/pkg-plist
-
-do-extract:
-	@${MKDIR} ${WRKSRC}
-	@cd ${WRKSRC} && \
-		${LOCALBASE}/bin/7z x ${DISTDIR}/${DISTFILES} >/dev/null
-
-pre-install:
-	@${ECHO_CMD} "%%DATADIR%%/megaglest.ico" >> ${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} "@dirrmtry %%DATADIR%%" >> ${PLIST}
-
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC}/docs && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%PORTDOCS%%%%DOCSDIR%%/|' >> ${PLIST} && \
-			${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/|' >> ${PLIST}
-	@${ECHO_CMD} "%%PORTDOCS%%@dirrmtry %%DOCSDIR%%" >> ${PLIST}
-.endif
-
-do-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/glest_factions
-.for f in AUTHORS CHANGELOG LICENSE README data_license.txt data_license_readme.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}
-
-.for DIR in data maps scenarios techs tilesets tutorials
-	${MKDIR} ${DATADIR}/${DIR}
-	(cd ${WRKSRC}/${DIR} && ${COPYTREE_SHARE} "*" ${DATADIR}/${DIR})
-.endfor
-
-.include <bsd.port.mk>
diff -ruN megaglest-data/distinfo megaglest-data.new/distinfo
--- megaglest-data/distinfo	2011-07-21 08:17:09.000000000 -0500
+++ megaglest-data.new/distinfo	2012-06-24 09:07:36.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (megaglest-data-3.5.2.3.tar.xz) = d38aa14a1fb07e359946619138ed61b653bcc738fef043c16956da9acfa0b7d2
-SIZE (megaglest-data-3.5.2.3.tar.xz) = 188064952
+SHA256 (megaglest-data-3.6.0.3.tar.xz) = 2a9f0293565a5ec56714b2f73f63e02b807478dce78251cedeeb25b57afb962e
+SIZE (megaglest-data-3.6.0.3.tar.xz) = 192795104
diff -ruN megaglest-data/distinfo.orig megaglest-data.new/distinfo.orig
--- megaglest-data/distinfo.orig	2011-04-07 00:13:40.000000000 -0500
+++ megaglest-data.new/distinfo.orig	1969-12-31 18:00:00.000000000 -0600
@@ -1,2 +0,0 @@
-SHA256 (megaglest-fixed_data-3.4.0.7z) = 3944c2549f03c64a75a1c33835b22aaed3748a2712c192b5705978d8caef1d45
-SIZE (megaglest-fixed_data-3.4.0.7z) = 189268275
--- megaglest-data-3.6.0.3.diff ends here ---


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

