4 files changed, 25 insertions, 47 deletions

diff --git a/games/spring/Makefile b/games/spring/Makefile
index 7f6bc1439d3c..670aad81841c 100644
--- a/games/spring/Makefile
+++ b/games/spring/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spring
-PORTVERSION=	0.82.5.1
+PORTVERSION=	0.82.7.1
 CATEGORIES=	games
 MASTER_SITES=	SF/springrts/springrts/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
diff --git a/games/spring/distinfo b/games/spring/distinfo
index 5ba3bb0159ee..3dca17e827d2 100644
--- a/games/spring/distinfo
+++ b/games/spring/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (spring_0.82.7.1_src.tar.gz) = 24a02b9489a52d96bc78899dda577e05ab24933f501ea50b504ae197777fde74
+SIZE (spring_0.82.7.1_src.tar.gz) = 11277409
diff --git a/games/spring/files/patch-rts-Sim-Projectiles-PieceProjectile.cpp b/games/spring/files/patch-rts-Sim-Projectiles-PieceProjectile.cpp
deleted file mode 100644
index f8e0e2e8a6fa..000000000000
--- a/games/spring/files/patch-rts-Sim-Projectiles-PieceProjectile.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-plist b/games/spring/pkg-plist
index 259e2f941c56..eef1e8e387fb 100644
--- a/games/spring/pkg-plist
+++ b/games/spring/pkg-plist
@@ -33,28 +33,30 @@ share/pixmaps/spring.png
 %%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
+%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/tc.cfg
 %%DATADIR%%/AI/Skirmish/AAI/0.9/libSkirmishAI.so
 %%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.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/E323AI/3.25.0/AIInfo.lua
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/AIOptions.lua
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/BA-categorization-patch.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/BA-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/BA-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/BOTA-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/BOTA-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/NOTA-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/NOTA-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/SA-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/SA-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/XTA-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/XTA-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/ca-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/ca-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/ct-categorization.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/ct-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/template-config.cfg
+%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/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
@@ -64,14 +66,6 @@ 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
@@ -151,13 +145,11 @@ 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
@@ -182,16 +174,14 @@ 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.22.3/configs
-@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.22.3
+@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs
+@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.25.0
 @dirrm %%DATADIR%%/AI/Skirmish/E323AI
 @dirrm %%DATADIR%%/AI/Skirmish/CppTestAI/0.1
 @dirrm %%DATADIR%%/AI/Skirmish/CppTestAI