Index: head/games/wyrmgus/Makefile =================================================================== --- head/games/wyrmgus/Makefile (revision 401571) +++ head/games/wyrmgus/Makefile (revision 401572) @@ -1,77 +1,77 @@ # Created by: Travis Poppe # $FreeBSD$ PORTNAME= wyrmgus -PORTVERSION= 1.4.1 +PORTVERSION= 1.6.0 DISTVERSIONPREFIX= v CATEGORIES= games devel MAINTAINER= amdmi3@FreeBSD.org COMMENT= Modified Stratagus engine for Wyrmsun LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtolua++-${LUA_VER}.so:${PORTSDIR}/lang/tolua++ USE_GITHUB= yes GH_ACCOUNT= Andrettin GH_PROJECT= Wyrmgus USE_GL= gl glu USE_SDL= sdl USE_SQLITE= 3 USES= compiler:c++11-lib cmake:outsource lua:51 pkgconfig 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_USEGAMEDIR:BOOL=OFF PORTDOCS= * PLIST_FILES= bin/${PORTNAME} \ share/pixmaps/wyrmsun.ico OPTIONS_DEFINE= MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH DOCS OPTIONS_DEFAULT=VORBIS X11 MIKMOD_LIB_DEPENDS= libmikmod.so:${PORTSDIR}/audio/libmikmod MIKMOD_CMAKE_ON= -DWITH_MIKMOD:BOOL=ON MIKMOD_CMAKE_OFF= -DWITH_MIKMOD:BOOL=OFF MNG_DESC= MNG image library support MNG_LIB_DEPENDS= libmng.so:${PORTSDIR}/graphics/libmng MNG_CMAKE_ON= -DWITH_MNG:BOOL=ON MNG_CMAKE_OFF= -DWITH_MNG:BOOL=OFF THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CMAKE_ON= -DWITH_THEORA:BOOL=ON THEORA_CMAKE_OFF= -DWITH_THEORA:BOOL=OFF VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_CMAKE_ON= -DWITH_OGGVORBIS:BOOL=ON VORBIS_CMAKE_OFF= -DWITH_OGGVORBIS:BOOL=OFF X11_DESC= X11 clipboard pasting support X11_USE= XORG=x11 X11_CMAKE_ON= -DWITH_X11:BOOL=ON X11_CMAKE_OFF= -DWITH_X11:BOOL=OFF FLUIDSYNTH_DESC= FluidSynth sound library support FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth FLUIDSYNTH_CMAKE_ON= -DWITH_FLUIDSYNTH:BOOL=ON FLUIDSYNTH_CMAKE_OFF= -DWITH_FLUIDSYNTH:BOOL=OFF .include .if ${COMPILER_TYPE} == gcc CXXFLAGS+= -D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD .endif do-install: ${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/stratagus ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/src/win32/wyrmsun.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ .include Index: head/games/wyrmgus/distinfo =================================================================== --- head/games/wyrmgus/distinfo (revision 401571) +++ head/games/wyrmgus/distinfo (revision 401572) @@ -1,2 +1,2 @@ -SHA256 (Andrettin-Wyrmgus-v1.4.1_GH0.tar.gz) = bee4c96ddd74e6c3105d725c37dfb774a6be53465355c7b578824b28719b89dc -SIZE (Andrettin-Wyrmgus-v1.4.1_GH0.tar.gz) = 1176777 +SHA256 (Andrettin-Wyrmgus-v1.6.0_GH0.tar.gz) = f8710d2a258e1f1fcf7a47d29c70add0654c7fbcab615d2418e0157a688289bf +SIZE (Andrettin-Wyrmgus-v1.6.0_GH0.tar.gz) = 1184771 Index: head/games/wyrmgus/files/patch-src_include_unittype.h =================================================================== --- head/games/wyrmgus/files/patch-src_include_unittype.h (nonexistent) +++ head/games/wyrmgus/files/patch-src_include_unittype.h (revision 401572) @@ -0,0 +1,23 @@ +--- src/include/unittype.h.orig 2015-11-10 20:52:37 UTC ++++ src/include/unittype.h +@@ -59,6 +59,7 @@ + #include + #include + #include ++#include + + /*---------------------------------------------------------------------------- + -- Declarations +@@ -132,9 +133,9 @@ public: + FrameWidth(0), FrameHeight(0), + Animations(NULL), Construction(NULL), Sprite(NULL), ShadowSprite(NULL), LeftArmSprite(NULL), RightArmSprite(NULL), HairSprite(NULL), ClothingSprite(NULL), ClothingLeftArmSprite(NULL), ClothingRightArmSprite(NULL), PantsSprite(NULL), ShoesSprite(NULL), WeaponSprite(NULL), ShieldSprite(NULL), HelmetSprite(NULL) + { +- memset(SpriteWhenLoaded, NULL, sizeof(SpriteWhenLoaded)); +- memset(SpriteWhenEmpty, NULL, sizeof(SpriteWhenEmpty)); +- memset(ShieldAnimation, NULL, sizeof(ShieldAnimation)); ++ memset(SpriteWhenLoaded, 0, sizeof(SpriteWhenLoaded)); ++ memset(SpriteWhenEmpty, 0, sizeof(SpriteWhenEmpty)); ++ memset(ShieldAnimation, 0, sizeof(ShieldAnimation)); + } + + ~VariationInfo(); Property changes on: head/games/wyrmgus/files/patch-src_include_unittype.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/wyrmgus/files/patch-src_unit_unittype.cpp =================================================================== --- head/games/wyrmgus/files/patch-src_unit_unittype.cpp (nonexistent) +++ head/games/wyrmgus/files/patch-src_unit_unittype.cpp (revision 401572) @@ -0,0 +1,18 @@ +--- src/unit/unittype.cpp.orig 2015-11-10 20:52:37 UTC ++++ src/unit/unittype.cpp +@@ -761,13 +761,13 @@ CUnitType::CUnitType() : + //Wyrmgus end + memset(ResInfo, 0, sizeof(ResInfo)); + //Wyrmgus start +- memset(VarInfo, NULL, sizeof(VarInfo)); ++ memset(VarInfo, 0, sizeof(VarInfo)); + memset(Drops, 0, sizeof(Drops)); + // memset(ImproveIncomes, 0, sizeof(ImproveIncomes)); + //Wyrmgus end + memset(MissileOffsets, 0, sizeof(MissileOffsets)); + //Wyrmgus start +- memset(ShieldAnimation, NULL, sizeof(ShieldAnimation)); ++ memset(ShieldAnimation, 0, sizeof(ShieldAnimation)); + //Wyrmgus end + } + Property changes on: head/games/wyrmgus/files/patch-src_unit_unittype.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/wyrmgus/files/patch-src_unit_upgrade.cpp =================================================================== --- head/games/wyrmgus/files/patch-src_unit_upgrade.cpp (nonexistent) +++ head/games/wyrmgus/files/patch-src_unit_upgrade.cpp (revision 401572) @@ -0,0 +1,20 @@ +--- src/unit/upgrade.cpp.orig 2015-11-10 20:52:37 UTC ++++ src/unit/upgrade.cpp +@@ -298,7 +298,7 @@ static int CclDefineModifier(lua_State * + um->UpgradeId = UpgradeIdByIdent(upgrade_name); + + if (um->UpgradeId == -1) { +- LuaError(l, "Error when defining upgrade modifier: upgrade \"%s\" doesn't exist." _C_ upgrade_name); ++ LuaError(l, "Error when defining upgrade modifier: upgrade \"%s\" doesn't exist." _C_ upgrade_name.c_str()); + } + //Wyrmgus end + +@@ -546,7 +546,7 @@ static int CclAcquireTrait(lua_State *l) + if (!strncmp(ident, "upgrade-", 8)) { + TraitAcquire(*unit, CUpgrade::Get(ident)); + unit->Trait = ident; +- } else if (ident == "") { ++ } else if (strlen(ident) == 0) { + if (!unit->Trait.empty()) { //remove previous trait, if any + if (!GameSettings.NoRandomness || unit->Type->BoolFlag[HERO_INDEX].value) { // if in no randomness setting, only change trait modifiers if the unit is a hero + IndividualUpgradeLost(*unit, CUpgrade::Get(unit->Trait)); Property changes on: head/games/wyrmgus/files/patch-src_unit_upgrade.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property