These two diffs update megaglest and megaglest-data to 3.6.0.3 and also include build dependencies on libircclient and miniupnpc.
Maintainer of games/megaglest, Please note that PR ports/169376 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/169376 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
I approve this patch. I also suggest that Rusty Nejdl should be made maintainer for the games/megaglest and games/megaglest-data ports. I'm running out of time for maintaining these ports. Sven -- Sven Möller Schöneberger Str. 14 21502 Geesthacht
State Changed From-To: feedback->open Maintainer approved. Maintainer is also willing to let submitter become new maintainer.
Responsible Changed From-To: freebsd-ports-bugs->cs I'll take it
State Changed From-To: open->feedback My tinderbox gives the following error: -- =====> Found Define: STREFLOP_SSE -- =====> Found Define: CURL_STATICLIB -- =====> DirDefs: STREFLOP_SSECURL_STATICLIB CMake Error: The following variables are used in this project, but they are set to NOTFOUND. Please set them or make sure they are set and tested correctly in the CMake files: FTGL_INCLUDE_DIR used as include directory in directory /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/shared_lib FTGL_LIBRARY linked by target "libmegaglest" in directory /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/shared_lib GLEW_INCLUDE_PATH used as include directory in directory /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/shared_lib used as include directory in directory /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/glest_game used as include directory in directory /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/glest_game used as include directory in directory /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/g3d_viewer GLEW_LIBRARY linked by target "libmegaglest" in directory /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/shared_lib linked by target "megaglest" in directory /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/glest_game linked by target "megaglest_g3dviewer" in directory /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/g3d_viewer -- Configuring incomplete, errors occurred! *** Error code 1 Stop in /a/ports/games/megaglest. ================================================================ build of /usr/ports/games/megaglest ended at Thu Jul 19 21:11:45 UTC 2012 Would you mind investigating this.
Here's corrected diffs that I think fixes the tinderbox issues. Rusty
I wanted to follow up on this and see if this could be committed with the fixes that I sent? I seem to have a backlog of patches waiting for committing. Thanks! Rusty Nejdl On 2012-07-20 11:02, Rusty Nejdl wrote: > Thanks for the heads up and I'll look at it over the weekend. > > Rusty Nejdl > > On 2012-07-20 10:48, cs@FreeBSD.org wrote: >> Synopsis: Update port games/megaglest to 3.6.0.3 >> >> State-Changed-From-To: open->feedback >> State-Changed-By: cs >> State-Changed-When: Fri Jul 20 15:48:20 UTC 2012 >> State-Changed-Why: >> My tinderbox gives the following error: >> >> -- =====> Found Define: STREFLOP_SSE >> -- =====> Found Define: CURL_STATICLIB >> -- =====> DirDefs: STREFLOP_SSECURL_STATICLIB >> CMake Error: The following variables are used in this project, but >> they are set to NOTFOUND. >> Please set them or make sure they are set and tested correctly in >> the >> CMake files: >> FTGL_INCLUDE_DIR >> used as include directory in directory >> >> /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/shared_lib >> FTGL_LIBRARY >> linked by target "libmegaglest" in directory >> >> /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/shared_lib >> GLEW_INCLUDE_PATH >> used as include directory in directory >> >> /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/shared_lib >> used as include directory in directory >> >> /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/glest_game >> used as include directory in directory >> >> /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/glest_game >> used as include directory in directory >> >> /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/g3d_viewer >> GLEW_LIBRARY >> linked by target "libmegaglest" in directory >> >> /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/shared_lib >> linked by target "megaglest" in directory >> >> /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/glest_game >> linked by target "megaglest_g3dviewer" in directory >> >> /work/a/ports/games/megaglest/work/megaglest-3.6.0.3/source/g3d_viewer >> >> -- Configuring incomplete, errors occurred! >> *** Error code 1 >> >> Stop in /a/ports/games/megaglest. >> ================================================================ >> build of /usr/ports/games/megaglest ended at Thu Jul 19 21:11:45 UTC >> 2012 >> >> >> Would you mind investigating this. >> >> http://www.freebsd.org/cgi/query-pr.cgi?pr=169376
State Changed From-To: feedback->open Back to pool.
Responsible Changed From-To: cs->freebsd-ports-bugs Back to pool.
Author: cs Date: Mon Sep 3 19:01:55 2012 New Revision: 303609 URL: http://svn.freebsd.org/changeset/ports/303609 Log: - Update to 3.6.0.3 - Submitter becomes new maintainer PR: ports/169376 Submitted by: Rusty Nejdl <rnejdl@ringofsaturn.com> Approved by: smoeller@nichthelfer.de (maintainer) Added: head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp (contents, props changed) Modified: head/games/megaglest-data/Makefile head/games/megaglest-data/distinfo head/games/megaglest/Makefile head/games/megaglest/distinfo Modified: head/games/megaglest-data/Makefile ============================================================================== --- head/games/megaglest-data/Makefile Mon Sep 3 18:43:38 2012 (r303608) +++ head/games/megaglest-data/Makefile Mon Sep 3 19:01:55 2012 (r303609) @@ -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 Modified: head/games/megaglest-data/distinfo ============================================================================== --- head/games/megaglest-data/distinfo Mon Sep 3 18:43:38 2012 (r303608) +++ head/games/megaglest-data/distinfo Mon Sep 3 19:01:55 2012 (r303609) @@ -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 Modified: head/games/megaglest/Makefile ============================================================================== --- head/games/megaglest/Makefile Mon Sep 3 18:43:38 2012 (r303608) +++ head/games/megaglest/Makefile Mon Sep 3 19:01:55 2012 (r303609) @@ -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} Modified: head/games/megaglest/distinfo ============================================================================== --- head/games/megaglest/distinfo Mon Sep 3 18:43:38 2012 (r303608) +++ head/games/megaglest/distinfo Mon Sep 3 19:01:55 2012 (r303609) @@ -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 Added: head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp Mon Sep 3 19:01:55 2012 (r303609) @@ -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> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thank you very much.
Responsible Changed From-To: freebsd-ports-bugs->cs Committed. Thank you very much.