Index: head/games/stratagus/files/patch-src_ai_ai__plan.cpp =================================================================== --- head/games/stratagus/files/patch-src_ai_ai__plan.cpp (revision 518172) +++ head/games/stratagus/files/patch-src_ai_ai__plan.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/ai/ai_plan.cpp.orig 2016-11-08 14:38:09 UTC -+++ src/ai/ai_plan.cpp -@@ -343,7 +343,7 @@ int GetTotalBoardCapacity(ITERATOR begin - int AiForce::PlanAttack() - { - CPlayer &player = *AiPlayer->Player; -- DebugPrint("%d: Planning for force #%lu of player #%d\n"_C_ player.Index -+ DebugPrint("%d: Planning for force #%lu of player #%d\n" _C_ player.Index - _C_(long unsigned int)(this - & (AiPlayer->Force[0])) _C_ player.Index); - - TerrainTraversal transporterTerrainTraversal; Property changes on: head/games/stratagus/files/patch-src_ai_ai__plan.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/stratagus/files/patch-src_stratagus_script.cpp =================================================================== --- head/games/stratagus/files/patch-src_stratagus_script.cpp (revision 518172) +++ head/games/stratagus/files/patch-src_stratagus_script.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- src/stratagus/script.cpp.orig 2016-11-08 14:38:09 UTC -+++ src/stratagus/script.cpp -@@ -767,7 +767,7 @@ NumberDesc *CclParseNumberDesc(lua_State - lua_pop(l, 1); // table. - } else { - lua_pop(l, 1); -- LuaError(l, "unknow condition '%s'"_C_ key); -+ LuaError(l, "unknow condition '%s'" _C_ key); - } - } else { - LuaError(l, "Parse Error in ParseNumber"); -@@ -881,7 +881,7 @@ StringDesc *CclParseStringDesc(lua_State - res->D.PlayerName = CclParseNumberDesc(l); - } else { - lua_pop(l, 1); -- LuaError(l, "unknow condition '%s'"_C_ key); -+ LuaError(l, "unknow condition '%s'" _C_ key); - } - } else { - LuaError(l, "Parse Error in ParseString"); Property changes on: head/games/stratagus/files/patch-src_stratagus_script.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/stratagus/Makefile =================================================================== --- head/games/stratagus/Makefile (revision 518172) +++ head/games/stratagus/Makefile (revision 518173) @@ -1,67 +1,70 @@ # Created by: Travis Poppe # $FreeBSD$ PORTNAME= stratagus -PORTVERSION= 2.4.1 +PORTVERSION= 2.4.2 DISTVERSIONPREFIX= v -PORTREVISION= 6 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Free cross-platform real-time strategy gaming engine LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libtolua++-${LUA_VER}.so:lang/tolua++ USE_GITHUB= yes GH_ACCOUNT= Wargus -USES= cmake compiler:c++11-lang gl lua:51 pkgconfig sdl sqlite +USES= cmake compiler:c++11-lang gl lua:51 pkgconfig sdl sqlite python:run USE_GL= gl glu USE_SDL= sdl CMAKE_ARGS= -DGAMEDIR:STRING="bin" \ -DTOLUA++_APP:STRING="tolua++-${LUA_VER}" \ -DTOLUA++_INCLUDE_DIR:STRING="${LUA_INCDIR}" \ - -DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so" \ - -DENABLE_DEV:BOOL=ON + -DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so" +CMAKE_ON= ENABLE_DEV CXXFLAGS+= -Wno-c++11-narrowing PORTDOCS= * OPTIONS_DEFINE= MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH DOCS OPTIONS_DEFAULT=MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod MIKMOD_CMAKE_BOOL= WITH_MIKMOD MNG_DESC= MNG image library support MNG_LIB_DEPENDS= libmng.so:graphics/libmng MNG_CMAKE_BOOL= WITH_MNG THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora THEORA_CMAKE_BOOL= WITH_THEORA VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg VORBIS_CMAKE_BOOL= WITH_OGGVORBIS X11_DESC= X11 clipboard pasting support X11_USES= xorg X11_USE= XORG=x11 X11_CMAKE_BOOL= WITH_X11 FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth FLUIDSYNTH_CMAKE_BOOL= WITH_FLUIDSYNTH + +post-patch: + @${REINPLACE_CMD} -e 's|"python"|"${PYTHON_CMD}"|' \ + ${WRKSRC}/gameheaders/stratagus-tinyfiledialogs.h post-install: ${INSTALL_DATA} ${WRKSRC}/doc/stratagus.6 ${STAGEDIR}${MAN6PREFIX}/man/man6 post-install-DOCS-on: @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "[a-z]*.html *.txt graphics scripts" \ ${STAGEDIR}${DOCSDIR} .include Index: head/games/stratagus/distinfo =================================================================== --- head/games/stratagus/distinfo (revision 518172) +++ head/games/stratagus/distinfo (revision 518173) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491831354 -SHA256 (Wargus-stratagus-v2.4.1_GH0.tar.gz) = 4f77d0e3cb09c6322a9d5576b55bc2eb498e041a4d77c79dfc3a9b5612913788 -SIZE (Wargus-stratagus-v2.4.1_GH0.tar.gz) = 1087678 +TIMESTAMP = 1538587339 +SHA256 (Wargus-stratagus-v2.4.2_GH0.tar.gz) = 366be8255c7e7cb694661b5db08b81908885a8ff89007d6e24769bf619235b89 +SIZE (Wargus-stratagus-v2.4.2_GH0.tar.gz) = 1114717 Index: head/games/stratagus/pkg-plist =================================================================== --- head/games/stratagus/pkg-plist (revision 518172) +++ head/games/stratagus/pkg-plist (revision 518173) @@ -1,7 +1,9 @@ bin/png2stratagus +bin/metaserver bin/stratagus @comment include/stratagus-game-installer.nsi include/stratagus-game-launcher.h +include/stratagus-gameutils.h +include/stratagus-tinyfiledialogs.h @comment include/stratagus-maemo-extract.h man/man6/stratagus.6.gz -sbin/metaserver