- Update to 1.9.7

5 files changed, 9 insertions, 65 deletions

diff --git a/games/wyrmgus/Makefile b/games/wyrmgus/Makefile
index 5c14e881c1a3..49edc875471d 100644
--- a/games/wyrmgus/Makefile
+++ b/games/wyrmgus/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wyrmgus
-PORTVERSION=	1.6.0
+PORTVERSION=	1.9.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games devel
 
@@ -33,7 +33,7 @@ PORTDOCS=	*
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/wyrmsun.ico
 
-OPTIONS_DEFINE=	MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH DOCS
+OPTIONS_DEFINE=	MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH PHYSFS DOCS
 OPTIONS_DEFAULT=VORBIS X11
 
 MIKMOD_LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
@@ -63,6 +63,11 @@ FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
 FLUIDSYNTH_CMAKE_ON=	-DWITH_FLUIDSYNTH:BOOL=ON
 FLUIDSYNTH_CMAKE_OFF=	-DWITH_FLUIDSYNTH:BOOL=OFF
 
+PHYSFS_DESC=		PhysFS support
+PHYSFS_LIB_DEPENDS=	libphysfs.so:devel/physfs
+PHYSFS_CMAKE_ON=	-DWITH_PHYSFS:BOOL=ON
+PHYSFS_CMAKE_OFF=	-DWITH_PHYSFS:BOOL=OFF
+
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == gcc
diff --git a/games/wyrmgus/distinfo b/games/wyrmgus/distinfo
index 68c24cf64c5c..e1b44845abb0 100644
--- a/games/wyrmgus/distinfo
+++ b/games/wyrmgus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Andrettin-Wyrmgus-v1.6.0_GH0.tar.gz) = f8710d2a258e1f1fcf7a47d29c70add0654c7fbcab615d2418e0157a688289bf
-SIZE (Andrettin-Wyrmgus-v1.6.0_GH0.tar.gz) = 1184771
+SHA256 (Andrettin-Wyrmgus-v1.9.7_GH0.tar.gz) = 1c59caca22c7e95f0484e30f280d9332895970271594c40baa0098e8a0d5780d
+SIZE (Andrettin-Wyrmgus-v1.9.7_GH0.tar.gz) = 1235663
diff --git a/games/wyrmgus/files/patch-src_include_unittype.h b/games/wyrmgus/files/patch-src_include_unittype.h
deleted file mode 100644
index 57b47cabf8e2..000000000000
--- a/games/wyrmgus/files/patch-src_include_unittype.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/include/unittype.h.orig	2015-11-10 20:52:37 UTC
-+++ src/include/unittype.h
-@@ -59,6 +59,7 @@
- #include <vector>
- #include <algorithm>
- #include <map>
-+#include <cstring>
- 
- /*----------------------------------------------------------------------------
- --  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();
diff --git a/games/wyrmgus/files/patch-src_unit_unittype.cpp b/games/wyrmgus/files/patch-src_unit_unittype.cpp
deleted file mode 100644
index 3762f9efbb1e..000000000000
--- a/games/wyrmgus/files/patch-src_unit_unittype.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
- }
- 
diff --git a/games/wyrmgus/files/patch-src_unit_upgrade.cpp b/games/wyrmgus/files/patch-src_unit_upgrade.cpp
deleted file mode 100644
index 66143aa99606..000000000000
--- a/games/wyrmgus/files/patch-src_unit_upgrade.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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));