7 files changed, 31 insertions, 53 deletions

diff --git a/games/spring/Makefile b/games/spring/Makefile
index 026d56947c62..f4f3026df013 100644
--- a/games/spring/Makefile
+++ b/games/spring/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spring
-PORTVERSION=	0.80.5.2
+PORTVERSION=	0.81.1.3
 CATEGORIES=	games
 MASTER_SITES=	SF/springrts/springrts/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
@@ -31,9 +31,6 @@ USE_OPENAL=	al
 USE_GL=		gl glu
 USE_XORG=	x11 xcursor
 USE_LDCONFIG=	yes
-# built with < 4.0 will not sync in multiplayer...
-# ...but it won't build with gcc42 from ports
-#USE_GCC=	4.2+
 MAKE_JOBS_SAFE=	yes
 
 USE_CMAKE=	yes
diff --git a/games/spring/distinfo b/games/spring/distinfo
index 3d27796a5c0f..d6c1e4118b5f 100644
--- a/games/spring/distinfo
+++ b/games/spring/distinfo
@@ -1,3 +1,3 @@
-MD5 (spring_0.80.5.2_src.tar.gz) = 169b74ae3d3c66c72381690a3f87eb67
-SHA256 (spring_0.80.5.2_src.tar.gz) = 39c083045051a1ede42d507660feaf53043428bfd0dc3faa47e494874a4e83fb
-SIZE (spring_0.80.5.2_src.tar.gz) = 9229078
+MD5 (spring_0.81.1.3_src.tar.gz) = 8ed06d31fcfe5b5373afcc7c7beddf73
+SHA256 (spring_0.81.1.3_src.tar.gz) = df743cd8ac69ea089a7165a8af578843e1e2d7ff5fbea6801e04ddd83b34e3f6
+SIZE (spring_0.81.1.3_src.tar.gz) = 8582324
diff --git a/games/spring/files/patch-rts-build-cmake-TestCXXAcceptsVisibilityFlag.cmake b/games/spring/files/patch-rts-build-cmake-TestCXXAcceptsVisibilityFlag.cmake
deleted file mode 100644
index 7877155e777e..000000000000
--- a/games/spring/files/patch-rts-build-cmake-TestCXXAcceptsVisibilityFlag.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
---- rts/build/cmake/TestCXXAcceptsVisibilityFlag.cmake.orig	2008-09-18 23:31:26.000000000 +0400
-+++ rts/build/cmake/TestCXXAcceptsVisibilityFlag.cmake	2008-10-10 01:22:32.000000000 +0400
-@@ -19,6 +19,15 @@
- 		SET(VISIBILITY_HIDDEN "")
- 	ENDIF(HAS_VISIBILITY_HIDDEN AND NOT MINGW)
- ENDIF(NOT DEFINED VISIBILITY_HIDDEN)
-+
-+IF(NOT DEFINED VISIBILITY_DEFAULT)
-+	CHECK_CXX_ACCEPTS_FLAG(-fvisibility=default HAS_VISIBILITY_DEFAULT)
-+	IF(HAS_VISIBILITY_DEFAULT AND NOT MINGW)
-+		SET(VISIBILITY_DEFAULT "-fvisibility=default")
-+	ELSE(HAS_VISIBILITY_DEFAULT AND NOT MINGW)
-+		SET(VISIBILITY_DEFAULT "")
-+	ENDIF(HAS_VISIBILITY_DEFAULT AND NOT MINGW)
-+ENDIF(NOT DEFINED VISIBILITY_DEFAULT)
- 	
- IF(NOT DEFINED VISIBILITY_INLINES_HIDDEN)
- 	CHECK_CXX_ACCEPTS_FLAG(-fvisibility-inlines-hidden HAS_VISIBILITY_INLINES_HIDDEN)
diff --git a/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt b/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt
deleted file mode 100644
index 03e15ba7ea45..000000000000
--- a/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- tools/DedicatedServer/CMakeLists.txt.orig	2009-05-16 16:06:57.000000000 +0400
-+++ tools/DedicatedServer/CMakeLists.txt	2009-05-18 21:23:42.000000000 +0400
-@@ -45,7 +45,9 @@
- if (MINGW)
- 	TARGET_LINK_LIBRARIES (springserver ws2_32)
- else (MINGW)
--	set_target_properties(springserver PROPERTIES COMPILE_FLAGS "-fvisibility=default")
-+	IF(VISIBILITY_DEFAULT)
-+		set_target_properties(springserver PROPERTIES COMPILE_FLAGS ${VISIBILITY_DEFAULT})
-+	ENDIF(VISIBILITY_DEFAULT)
- endif (MINGW)
- 
- ADD_EXECUTABLE(spring-dedicated main)
diff --git a/games/spring/files/patch-tools-unitsync-unitsync.cpp b/games/spring/files/patch-tools-unitsync-unitsync.cpp
index 05ebe2fa3f51..625a06946873 100644
--- a/games/spring/files/patch-tools-unitsync-unitsync.cpp
+++ b/games/spring/files/patch-tools-unitsync-unitsync.cpp
@@ -1,13 +1,16 @@
---- tools/unitsync/unitsync.cpp.orig	2009-09-04 21:32:13.000000000 +0400
-+++ tools/unitsync/unitsync.cpp	2009-09-08 04:13:16.000000000 +0400
-@@ -264,7 +264,9 @@
+--- tools/unitsync/unitsync.cpp.orig	2010-01-31 20:03:33.000000000 +0300
++++ tools/unitsync/unitsync.cpp	2010-02-04 16:13:38.000000000 +0300
+@@ -259,8 +259,11 @@
+ EXPORT(int) Init(bool isServer, int id)
+ {
  	try {
- 		if (!logOutputInitialised)
- 		{
--			logOutput.SetFilename("unitsync.log");
+-		if (!logOutputInitialised)
+-			logOutput.SetFileName("unitsync.log");
++		if (!logOutputInitialised) {
 +			string fname = getenv("HOME");
 +			fname += "/.spring/unitsync.log";
-+			logOutput.SetFilename(fname.c_str());
- 			logOutput.Initialize();
- 			logOutputInitialised = true;
- 		}
++			logOutput.SetFileName(fname.c_str());
++		}
+ 		if (!configHandler)
+ 			ConfigHandler::Instantiate(); // use the default config file
+ 		FileSystemHandler::Initialize(false);
diff --git a/games/spring/pkg-message b/games/spring/pkg-message
index b1943196586b..f6ff7cb5c848 100644
--- a/games/spring/pkg-message
+++ b/games/spring/pkg-message
@@ -9,4 +9,7 @@ For further instructions, see:
 
    http://springrts.com/wiki/Read_Me_First
 
+Alternatively, you can use games/springlobby port which allows you
+to download maps and setup single- and multiplayer games.
+
 ==========================================================================
diff --git a/games/spring/pkg-plist b/games/spring/pkg-plist
index ef338a09df47..92800f8fb5eb 100644
--- a/games/spring/pkg-plist
+++ b/games/spring/pkg-plist
@@ -119,15 +119,20 @@ share/pixmaps/spring.png
 %%DATADIR%%/AI/Skirmish/CppTestAI/0.1/AIInfo.lua
 %%DATADIR%%/AI/Skirmish/CppTestAI/0.1/AIOptions.lua
 %%DATADIR%%/AI/Skirmish/CppTestAI/0.1/libSkirmishAI.so
+%%DATADIR%%/AI/Skirmish/E323AI/3.14.5/AIInfo.lua
+%%DATADIR%%/AI/Skirmish/E323AI/3.14.5/AIOptions.lua
+%%DATADIR%%/AI/Skirmish/E323AI/3.14.5/configs/BA704-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.14.5/configs/BA704-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.14.5/configs/XTAPEV959-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.14.5/configs/XTAPEV959-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.14.5/configs/template-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.14.5/libSkirmishAI.so
 %%DATADIR%%/AI/Skirmish/KAIK/0.13/AIInfo.lua
 %%DATADIR%%/AI/Skirmish/KAIK/0.13/AIOptions.lua
 %%DATADIR%%/AI/Skirmish/KAIK/0.13/libSkirmishAI.so
 %%DATADIR%%/AI/Skirmish/NullAI/0.1/AIInfo.lua
 %%DATADIR%%/AI/Skirmish/NullAI/0.1/AIOptions.lua
 %%DATADIR%%/AI/Skirmish/NullAI/0.1/libSkirmishAI.so
-%%DATADIR%%/AI/Skirmish/NullLegacyCppAI/0.1/AIInfo.lua
-%%DATADIR%%/AI/Skirmish/NullLegacyCppAI/0.1/AIOptions.lua
-%%DATADIR%%/AI/Skirmish/NullLegacyCppAI/0.1/libSkirmishAI.so
 %%DATADIR%%/AI/Skirmish/RAI/0.601/AIInfo.lua
 %%DATADIR%%/AI/Skirmish/RAI/0.601/AIOptions.lua
 %%DATADIR%%/AI/Skirmish/RAI/0.601/libSkirmishAI.so
@@ -237,12 +242,13 @@ share/pixmaps/spring.png
 @dirrm %%DATADIR%%/LuaUI
 @dirrm %%DATADIR%%/AI/Skirmish/RAI/0.601
 @dirrm %%DATADIR%%/AI/Skirmish/RAI
-@dirrm %%DATADIR%%/AI/Skirmish/NullLegacyCppAI/0.1
-@dirrm %%DATADIR%%/AI/Skirmish/NullLegacyCppAI
 @dirrm %%DATADIR%%/AI/Skirmish/NullAI/0.1
 @dirrm %%DATADIR%%/AI/Skirmish/NullAI
 @dirrm %%DATADIR%%/AI/Skirmish/KAIK/0.13
 @dirrm %%DATADIR%%/AI/Skirmish/KAIK
+@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.14.5/configs
+@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.14.5
+@dirrm %%DATADIR%%/AI/Skirmish/E323AI
 @dirrm %%DATADIR%%/AI/Skirmish/CppTestAI/0.1
 @dirrm %%DATADIR%%/AI/Skirmish/CppTestAI
 @dirrm %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod