1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00

- Pet portlint

- Fix build with clang 6
This commit is contained in:
Dmitry Marakasov 2018-06-25 15:08:26 +00:00
parent f2d7da0b2b
commit e6ead4cee8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=473322
3 changed files with 37 additions and 4 deletions

View File

@ -3,8 +3,8 @@
PORTNAME= stratagus
PORTVERSION= 2.4.1
PORTREVISION= 2
DISTVERSIONPREFIX= v
PORTREVISION= 2
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
@ -13,23 +13,25 @@ COMMENT= Free cross-platform real-time strategy gaming engine
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= *
OPTIONS_DEFINE= MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH DOCS

View File

@ -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;

View File

@ -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");