From owner-svn-ports-all@freebsd.org Mon Jun 25 15:08:28 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 24EC91012C56; Mon, 25 Jun 2018 15:08:28 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CAEAE80AEF; Mon, 25 Jun 2018 15:08:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A837E2EB29; Mon, 25 Jun 2018 15:08:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5PF8R1h037539; Mon, 25 Jun 2018 15:08:27 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5PF8RGU037537; Mon, 25 Jun 2018 15:08:27 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201806251508.w5PF8RGU037537@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 25 Jun 2018 15:08:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473322 - in head/games/stratagus: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/stratagus: . files X-SVN-Commit-Revision: 473322 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2018 15:08:28 -0000 Author: amdmi3 Date: Mon Jun 25 15:08:26 2018 New Revision: 473322 URL: https://svnweb.freebsd.org/changeset/ports/473322 Log: - Pet portlint - Fix build with clang 6 Added: head/games/stratagus/files/ head/games/stratagus/files/patch-src_ai_ai__plan.cpp (contents, props changed) head/games/stratagus/files/patch-src_stratagus_script.cpp (contents, props changed) Modified: head/games/stratagus/Makefile Modified: head/games/stratagus/Makefile ============================================================================== --- head/games/stratagus/Makefile Mon Jun 25 15:06:22 2018 (r473321) +++ head/games/stratagus/Makefile Mon Jun 25 15:08:26 2018 (r473322) @@ -3,8 +3,8 @@ PORTNAME= stratagus PORTVERSION= 2.4.1 -PORTREVISION= 2 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -13,22 +13,24 @@ COMMENT= Free cross-platform real-time strategy gaming LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_powerpc64= fails to compile: cc1plus: unrecognized command line option "-std=gnu++0x" + LIB_DEPENDS= libpng.so:graphics/png \ libtolua++-${LUA_VER}.so:lang/tolua++ -BROKEN_powerpc64= fails to compile: cc1plus: unrecognized command line option "-std=gnu++0x" - USE_GITHUB= yes GH_ACCOUNT= Wargus +USES= cmake:outsource lua:51 pkgconfig sqlite USE_GL= gl glu USE_SDL= sdl -USES= cmake:outsource lua:51 pkgconfig sqlite 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 + +CXXFLAGS+= -Wno-c++11-narrowing PORTDOCS= * Added: head/games/stratagus/files/patch-src_ai_ai__plan.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/stratagus/files/patch-src_ai_ai__plan.cpp Mon Jun 25 15:08:26 2018 (r473322) @@ -0,0 +1,11 @@ +--- 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; Added: head/games/stratagus/files/patch-src_stratagus_script.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/stratagus/files/patch-src_stratagus_script.cpp Mon Jun 25 15:08:26 2018 (r473322) @@ -0,0 +1,20 @@ +--- 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");