From 30484f2a4a2842150bc804596742a3b312659c97 Mon Sep 17 00:00:00 2001 From: cs Date: Mon, 3 Sep 2012 19:01:55 +0000 Subject: - Update to 3.6.0.3 - Submitter becomes new maintainer PR: ports/169376 Submitted by: Rusty Nejdl Approved by: smoeller@nichthelfer.de (maintainer) --- games/megaglest-data/Makefile | 10 +++++----- games/megaglest-data/distinfo | 4 ++-- games/megaglest/Makefile | 17 ++++++++++------- games/megaglest/distinfo | 4 ++-- ...urce-shared_lib-sources-platform-posix-ircclient.cpp | 14 ++++++++++++++ 5 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp (limited to 'games') diff --git a/games/megaglest-data/Makefile b/games/megaglest-data/Makefile index 7fd87a84c3d3..599df60774a6 100644 --- a/games/megaglest-data/Makefile +++ b/games/megaglest-data/Makefile @@ -6,13 +6,13 @@ # 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@nichthelfer.de +MAINTAINER= rnejdl@ringofsaturn.com COMMENT= MegaGlest data files USE_XZ= yes @@ -39,7 +39,7 @@ pre-install: .if !defined(NOPORTDOCS) @cd ${WRKSRC}/docs && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%PORTDOCS%%%%DOCSDIR%%/|' >> ${PLIST} && \ + ${FIND} * -type f | ${GREP} -v CHANGELOG.txt | ${GREP} -v README.txt | ${SORT} | ${SED} -e 's|^|%%PORTDOCS%%%%DOCSDIR%%/|' >> ${PLIST} && \ ${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|%%PORTDOCS%%@dirrm %%DOCSDIR%%/|' >> ${PLIST} @${ECHO_CMD} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST} .endif diff --git a/games/megaglest-data/distinfo b/games/megaglest-data/distinfo index e4bb893f8f5d..95131ddebf4f 100644 --- a/games/megaglest-data/distinfo +++ b/games/megaglest-data/distinfo @@ -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 --git a/games/megaglest/Makefile b/games/megaglest/Makefile index 72d6b9f84a90..c1266436bae7 100644 --- a/games/megaglest/Makefile +++ b/games/megaglest/Makefile @@ -6,32 +6,35 @@ # PORTNAME= megaglest -PORTVERSION= 3.5.2 -PORTREVISION= 3 +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@nichthelfer.de +MAINTAINER= rnejdl@ringofsaturn.com COMMENT= Open source 3D real-time strategy game LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ jpeg.11:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \ + ftgl.2:${PORTSDIR}/graphics/ftgl \ 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 USE_XZ= yes USE_CMAKE= yes USE_DOS2UNIX= yes -USE_GL= yes +USE_GL= glew gl glu USE_LUA= 5.1 USE_OPENAL= al alut USE_SDL= yes USE_WX= 2.8+ +MAKE_JOBS_SAFE= yes CFLAGS+= -I${LOCALBASE}/include/libpng15 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/games/megaglest/distinfo b/games/megaglest/distinfo index 6bd3e3ff5256..46ca250c8421 100644 --- a/games/megaglest/distinfo +++ b/games/megaglest/distinfo @@ -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 --git a/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp b/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp new file mode 100644 index 000000000000..c38c0172d74c --- /dev/null +++ b/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp @@ -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 + #include -- cgit