10 files changed, 147 insertions, 34 deletions

diff --git a/games/spring/Makefile b/games/spring/Makefile
index effd7fdcf79c..7f6bc1439d3c 100644
--- a/games/spring/Makefile
+++ b/games/spring/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	spring
-PORTVERSION=	0.81.2.1
-PORTREVISION=	1
+PORTVERSION=	0.82.5.1
 CATEGORIES=	games
 MASTER_SITES=	SF/springrts/springrts/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
@@ -36,7 +35,9 @@ MAKE_JOBS_SAFE=	yes
 USE_CMAKE=	yes
 CMAKE_ARGS=	-DDATADIR:STRING="share/${PORTNAME}" \
 		-DMARCH_FLAG:STRING= \
-		-DAIINTERFACES:STRING="NATIVE"
+		-DAI_TYPES:STRING="NATIVE" \
+		-DMANDIR:STRING="man" \
+		-DCREATE_MAN_PAGES:BOOL=false
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
@@ -45,6 +46,8 @@ PORTDOCS=	*
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SYNC_DEBUG)
+CFLAGS=		# empty
+CXXFLAGS=	# empty
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=DEBUG2 -DTRACE_SYNC=true -DSYNCDEBUG=true
 .endif
 
@@ -62,11 +65,16 @@ post-patch:
 		${WRKSRC}/rts/System/FPUCheck.h
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/rts/build/cmake/*.cmake
+	@${REINPLACE_CMD} -e 's|execinfo|${LOCALBASE}/lib/libexecinfo.so|' \
+		${WRKSRC}/rts/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
+		${WRKSRC}/rts/System/Platform/Misc.cpp
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/Documentation && ${COPYTREE_SHARE} . ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "userdocs DevGuide.html HowTo* \
+		SelectionKeys.txt StartScriptFormat.txt changelog.txt" ${DOCSDIR}/
 .endif
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
diff --git a/games/spring/distinfo b/games/spring/distinfo
index 9461dbc9b665..5ba3bb0159ee 100644
--- a/games/spring/distinfo
+++ b/games/spring/distinfo
@@ -1,3 +1,3 @@
-MD5 (spring_0.81.2.1_src.tar.gz) = da6732a3c9930872955004a67573ca67
-SHA256 (spring_0.81.2.1_src.tar.gz) = e7f75b0285f1151e8aecff2ec9e98feb712c704cf8551b1a42d01bb64c5ef8e1
-SIZE (spring_0.81.2.1_src.tar.gz) = 8600725
+MD5 (spring_0.82.5.1_src.tar.gz) = fe4f2080e6f923e37676cdfd90d7fd3c
+SHA256 (spring_0.82.5.1_src.tar.gz) = da858f981bfe679fffd1d283a8e20532fcfd78faabfc124328f545e730eb7645
+SIZE (spring_0.82.5.1_src.tar.gz) = 11216225
diff --git a/games/spring/files/patch-rts-CMakeLists.txt b/games/spring/files/patch-rts-CMakeLists.txt
index 070b2247b21c..2e18d6e9335b 100644
--- a/games/spring/files/patch-rts-CMakeLists.txt
+++ b/games/spring/files/patch-rts-CMakeLists.txt
@@ -1,11 +1,20 @@
---- rts/CMakeLists.txt.orig	2009-08-25 19:54:09.000000000 +0400
-+++ rts/CMakeLists.txt	2009-08-25 19:54:18.000000000 +0400
-@@ -63,6 +63,8 @@
- INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})
- LIST(APPEND spring_libraries ${FREETYPE_LIBRARIES})
+--- ./rts/CMakeLists.txt.orig	2010-09-06 16:16:17.000000000 +0400
++++ ./rts/CMakeLists.txt	2010-09-15 23:05:01.000000000 +0400
+@@ -46,6 +46,8 @@
+ 
+ LIST(APPEND engineCommonLibraries ${DEVIL_IL_LIBRARY})
  
 +LIST(APPEND spring_libraries execinfo)
 +
  ### Find include directories and add platform specific libraries
+ LIST(APPEND engineCommonLibraries ${Boost_REGEX_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_SIGNALS_LIBRARY})
+ 
+@@ -53,7 +55,7 @@
+ 
+ IF    (UNIX)
+ 	# Needed for dynamically loading shared libraries (on some OS)
+-	LIST(APPEND engineCommonLibraries dl)
++	LIST(APPEND engineCommonLibraries execinfo)
+ ENDIF (UNIX)
+ 
  IF (MINGW)
- 	FIND_PACKAGE(Win32Libs REQUIRED)
diff --git a/games/spring/files/patch-rts-Sim-Projectiles-PieceProjectile.cpp b/games/spring/files/patch-rts-Sim-Projectiles-PieceProjectile.cpp
new file mode 100644
index 000000000000..f8e0e2e8a6fa
--- /dev/null
+++ b/games/spring/files/patch-rts-Sim-Projectiles-PieceProjectile.cpp
@@ -0,0 +1,11 @@
+--- rts/Sim/Projectiles/PieceProjectile.cpp.orig	2010-09-06 16:16:18.000000000 +0400
++++ rts/Sim/Projectiles/PieceProjectile.cpp	2010-09-23 03:36:30.000000000 +0400
+@@ -64,7 +64,7 @@
+ CPieceProjectile::CPieceProjectile(const float3& pos, const float3& speed, LocalModelPiece* lmp, int f, CUnit* owner, float radius):
+ 	CProjectile(pos, speed, owner, true, false, true),
+ 	flags(f),
+-	dispList(lmp? lmp->displist: 0),
++	dispList(),
+ 	omp(NULL),
+ 	spinAngle(0.0f),
+ 	alphaThreshold(0.1f),
diff --git a/games/spring/files/patch-rts-System-Platform-Misc.cpp b/games/spring/files/patch-rts-System-Platform-Misc.cpp
new file mode 100644
index 000000000000..1a484ff123c7
--- /dev/null
+++ b/games/spring/files/patch-rts-System-Platform-Misc.cpp
@@ -0,0 +1,11 @@
+--- rts/System/Platform/Misc.cpp.orig	2010-09-06 16:16:18.000000000 +0400
++++ rts/System/Platform/Misc.cpp	2010-09-15 22:44:06.000000000 +0400
+@@ -106,7 +106,7 @@
+ 		procExeFilePath = std::string(pathReal);
+ 	}
+ #else
+-	#error implement this
++	return "%%PREFIX%%/bin/spring";
+ #endif
+ 
+ 	if (procExeFilePath.empty()) {
diff --git a/games/spring/files/patch-rts-System-SpringApp.cpp b/games/spring/files/patch-rts-System-SpringApp.cpp
new file mode 100644
index 000000000000..8f1bcac3ca2e
--- /dev/null
+++ b/games/spring/files/patch-rts-System-SpringApp.cpp
@@ -0,0 +1,11 @@
+--- rts/System/SpringApp.cpp.orig	2010-09-06 16:16:18.000000000 +0400
++++ rts/System/SpringApp.cpp	2010-09-15 23:03:15.000000000 +0400
+@@ -255,7 +255,7 @@
+ 			logOutput.Print("CPU: affinity failed");
+ 		}
+ 	}
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__) // may still use something like below for FreeBSD
+ 	// no-op
+ #else
+ 	if (affinity > 0) {
diff --git a/games/spring/files/patch-rts-builds-DS-CMakeLists.txt b/games/spring/files/patch-rts-builds-DS-CMakeLists.txt
new file mode 100644
index 000000000000..4e143fd198d1
--- /dev/null
+++ b/games/spring/files/patch-rts-builds-DS-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- rts/builds/DS/CMakeLists.txt.orig	2010-09-06 16:16:18.000000000 +0400
++++ rts/builds/DS/CMakeLists.txt	2010-09-15 23:46:32.000000000 +0400
+@@ -21,7 +21,7 @@
+ LIST(APPEND engineDedicatedLibraries headlessStubs)
+ IF    (UNIX)
+ 	# Needed for dynamically loading shared libraries (on some OS)
+-	LIST(APPEND engineDedicatedLibraries dl)
++	#LIST(APPEND engineDedicatedLibraries dl)
+ ENDIF (UNIX)
+ 
+ IF    (MINGW OR APPLE)
diff --git a/games/spring/files/patch-rts-lib-gml-gmlcls.h b/games/spring/files/patch-rts-lib-gml-gmlcls.h
new file mode 100644
index 000000000000..982cf8bb3265
--- /dev/null
+++ b/games/spring/files/patch-rts-lib-gml-gmlcls.h
@@ -0,0 +1,20 @@
+--- ./rts/lib/gml/gmlcls.h.orig	2010-09-06 16:16:18.000000000 +0400
++++ ./rts/lib/gml/gmlcls.h	2010-09-15 23:36:35.000000000 +0400
+@@ -60,7 +60,7 @@
+ //#define BOOST_AC_USE_PTHREADS
+ 
+ // memory barriers for different platforms
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__)
+ #	include <libkern/OSAtomic.h>
+ #	define GML_MEMBAR OSMemoryBarrier()
+ #elif defined(__GNUC__)
+@@ -112,7 +112,7 @@
+ #	define GML_TYPENAME
+ #endif
+ 
+-#ifndef _WIN32 //defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__APPLE__)
+ #	define GML_USE_SPEEDY_TLS 1
+ #	include "System/Platform/errorhandler.h"
+ #	include "speedy-tls.h"
diff --git a/games/spring/files/patch-rts-lib-gml-speedy-tls.cpp b/games/spring/files/patch-rts-lib-gml-speedy-tls.cpp
new file mode 100644
index 000000000000..aee5a9213c1a
--- /dev/null
+++ b/games/spring/files/patch-rts-lib-gml-speedy-tls.cpp
@@ -0,0 +1,11 @@
+--- rts/lib/gml/speedy-tls.cpp.orig	2010-09-06 16:16:18.000000000 +0400
++++ rts/lib/gml/speedy-tls.cpp	2010-09-15 23:37:21.000000000 +0400
+@@ -3,7 +3,7 @@
+ //Contains macros that can be used to very quickly (one instruction) access thread-local memory.
+ 
+ #ifdef USE_GML
+-#ifndef _WIN32
++#if defined(__linux__) || defined(__APPLE__)
+ 
+ #include "speedy-tls.h"
+ #include <stdlib.h>
diff --git a/games/spring/pkg-plist b/games/spring/pkg-plist
index 80fd7c499226..259e2f941c56 100644
--- a/games/spring/pkg-plist
+++ b/games/spring/pkg-plist
@@ -1,5 +1,7 @@
 bin/spring
 bin/spring-dedicated
+bin/spring-headless
+bin/spring-multithreaded
 lib/libspringserver.so
 lib/libunitsync.so
 share/applications/spring.desktop
@@ -17,20 +19,17 @@ share/pixmaps/spring.png
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/help/example_mod.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/AA5.0project.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/AAIA10.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BA695.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BA696.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BA701.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BA704.cfg
+%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BA.cfg
+%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BOTA.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BOTA_14.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/Balanced_Annihilation_V7.12.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/CA-BETA1.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/Expand_and_Exterminate_v_0.171.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/FF 1.21 S.cfg
+%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/FF_1.21_S.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/KuroTA-v047.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/PURE0.51.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/S44Lyuban_v106.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/StarWars01.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/XTAPEV958.cfg
+%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/XTA.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/XTAPEV9585.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/gundam_1.1_epic.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/gundam_1.1_tiny.cfg
@@ -38,18 +37,24 @@ 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.18.1/AIInfo.lua
-%%DATADIR%%/AI/Skirmish/E323AI/3.18.1/AIOptions.lua
-%%DATADIR%%/AI/Skirmish/E323AI/3.18.1/configs/BA704-categorization.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.18.1/configs/BA704-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.18.1/configs/BA711-categorization.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.18.1/configs/BA711-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.18.1/configs/BOTA16b4-categorization.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.18.1/configs/BOTA16b4-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.18.1/configs/XTAPEV96-categorization.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.18.1/configs/XTAPEV96-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.18.1/configs/template-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.18.1/libSkirmishAI.so
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/AIInfo.lua
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/AIOptions.lua
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/BA-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/BA-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/BOTA-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/BOTA-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/NOTA-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/NOTA-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/SA-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/SA-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/XTA-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/XTA-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/ca-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/ca-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/ct-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/ct-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/template-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/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
@@ -59,6 +64,14 @@ share/pixmaps/spring.png
 %%DATADIR%%/AI/Skirmish/RAI/0.601/AIInfo.lua
 %%DATADIR%%/AI/Skirmish/RAI/0.601/AIOptions.lua
 %%DATADIR%%/AI/Skirmish/RAI/0.601/libSkirmishAI.so
+%%DATADIR%%/CMakeFiles/CMakeDirectoryInformation.cmake
+%%DATADIR%%/CMakeFiles/gamedata.dir/DependInfo.cmake
+%%DATADIR%%/CMakeFiles/gamedata.dir/build.make
+%%DATADIR%%/CMakeFiles/gamedata.dir/cmake_clean.cmake
+%%DATADIR%%/CMakeFiles/gamedata.dir/depend.internal
+%%DATADIR%%/CMakeFiles/gamedata.dir/depend.make
+%%DATADIR%%/CMakeFiles/gamedata.dir/progress.make
+%%DATADIR%%/CMakeFiles/progress.marks
 %%DATADIR%%/LuaUI/CHANGELOG.txt
 %%DATADIR%%/LuaUI/Config/README.txt
 %%DATADIR%%/LuaUI/Fonts/FreeMonoBold_12.lua
@@ -108,11 +121,14 @@ share/pixmaps/spring.png
 %%DATADIR%%/LuaUI/Sounds/teamgrab.wav
 %%DATADIR%%/LuaUI/Widgets/camera_shake.lua
 %%DATADIR%%/LuaUI/Widgets/camera_smooth_move.lua
+%%DATADIR%%/LuaUI/Widgets/gui_buildspacing.lua
 %%DATADIR%%/LuaUI/Widgets/gui_comm_ends.lua
 %%DATADIR%%/LuaUI/Widgets/gui_hilight_unit.lua
 %%DATADIR%%/LuaUI/Widgets/gui_selbuttons.lua
 %%DATADIR%%/LuaUI/Widgets/gui_team_platter.lua
 %%DATADIR%%/LuaUI/Widgets/gui_xray_shader.lua
+%%DATADIR%%/LuaUI/Widgets/headless_setup.lua
+%%DATADIR%%/LuaUI/Widgets/ingame_lobby.example.lua
 %%DATADIR%%/LuaUI/Widgets/minimap_relative.lua
 %%DATADIR%%/LuaUI/Widgets/minimap_startbox.lua
 %%DATADIR%%/LuaUI/Widgets/unit_factory_guard.lua
@@ -135,11 +151,13 @@ share/pixmaps/spring.png
 %%DATADIR%%/LuaUI/tweakmode.lua
 %%DATADIR%%/LuaUI/utils.lua
 %%DATADIR%%/LuaUI/widgets.lua
+%%DATADIR%%/Makefile
 %%DATADIR%%/PALETTE.PAL
 %%DATADIR%%/base/cursors.sdz
 %%DATADIR%%/base/maphelper.sdz
 %%DATADIR%%/base/spring/bitmaps.sdz
 %%DATADIR%%/base/springcontent.sdz
+%%DATADIR%%/cmake_install.cmake
 %%DATADIR%%/cmdcolors.txt
 %%DATADIR%%/ctrlpanel.txt
 %%DATADIR%%/fonts/AUTHORS
@@ -149,6 +167,7 @@ share/pixmaps/spring.png
 %%DATADIR%%/fonts/README
 %%DATADIR%%/luaui.lua
 %%DATADIR%%/selectkeys.txt
+%%DATADIR%%/springrc-template-headless.txt
 %%DATADIR%%/teamcolors.lua
 %%DATADIR%%/uikeys.txt
 @dirrm %%DATADIR%%/fonts
@@ -163,14 +182,16 @@ share/pixmaps/spring.png
 @dirrm %%DATADIR%%/LuaUI/Fonts
 @dirrm %%DATADIR%%/LuaUI/Config
 @dirrm %%DATADIR%%/LuaUI
+@dirrm %%DATADIR%%/CMakeFiles/gamedata.dir
+@dirrm %%DATADIR%%/CMakeFiles
 @dirrm %%DATADIR%%/AI/Skirmish/RAI/0.601
 @dirrm %%DATADIR%%/AI/Skirmish/RAI
 @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.18.1/configs
-@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.18.1
+@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs
+@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.22.3
 @dirrm %%DATADIR%%/AI/Skirmish/E323AI
 @dirrm %%DATADIR%%/AI/Skirmish/CppTestAI/0.1
 @dirrm %%DATADIR%%/AI/Skirmish/CppTestAI