- Update to 0.77b4

8 files changed, 9 insertions, 88 deletions

diff --git a/games/spring/Makefile b/games/spring/Makefile
index 0ccdb40debd8..a6d05e352330 100644
--- a/games/spring/Makefile
+++ b/games/spring/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spring
-PORTVERSION=	0.77b3
+PORTVERSION=	0.77b4
 CATEGORIES=	games
 MASTER_SITES=	http://spring.clan-sy.com/dl/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/spring/distinfo b/games/spring/distinfo
index bd1320f4ef67..0c8de2f74d1b 100644
--- a/games/spring/distinfo
+++ b/games/spring/distinfo
@@ -1,3 +1,3 @@
-MD5 (spring_0.77b3_src.tar.bz2) = e32818f4399711ad5fc153c0aa55210a
-SHA256 (spring_0.77b3_src.tar.bz2) = 965a3a9c6d4cd3f349ddfa0a448e47f916a298a1b80dd7d9155510b91ef02427
-SIZE (spring_0.77b3_src.tar.bz2) = 7189582
+MD5 (spring_0.77b4_src.tar.bz2) = e26e7fe4be5ccc57f6e45c08b55ebbf1
+SHA256 (spring_0.77b4_src.tar.bz2) = 514a8a205f39e3ae1c9a09b8a43eaacc8f1b672e3359289290bcef89d0316945
+SIZE (spring_0.77b4_src.tar.bz2) = 7174147
diff --git a/games/spring/files/patch-CMakeLists.txt b/games/spring/files/patch-CMakeLists.txt
deleted file mode 100644
index 4a11351175e7..000000000000
--- a/games/spring/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- CMakeLists.txt.orig	2008-10-09 23:25:29.000000000 +0400
-+++ CMakeLists.txt	2008-10-09 23:24:50.000000000 +0400
-@@ -55,6 +55,7 @@
- 	INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
- 
- 	FIND_PACKAGE(Boost 1.34.0 COMPONENTS thread regex REQUIRED)
-+	INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
- endif (MINGW)
- 
- ### Compiler flags and defines based on build type
diff --git a/games/spring/files/patch-rts-CMakeLists.txt b/games/spring/files/patch-rts-CMakeLists.txt
deleted file mode 100644
index 35cbad8cf8de..000000000000
--- a/games/spring/files/patch-rts-CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- rts/CMakeLists.txt.orig	2008-10-09 23:13:40.000000000 +0400
-+++ rts/CMakeLists.txt	2008-10-09 23:16:17.000000000 +0400
-@@ -42,11 +42,11 @@
- 

- 	FIND_PACKAGE(Freetype REQUIRED)

- 	INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})

--	LIST(APPEND spring_libraries openal GL GLU ${DEVIL_LIBRARIES} X11 Xcursor ${GLEW_LIBRARIES} ${Boost_REGEX_LIBRARY} ${Boost_THREAD_LIBRARY})

-+	LIST(APPEND spring_libraries ${OPENAL_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${DEVIL_LIBRARIES} ${X11_X11_LIB} ${X11_Xcursor_LIB} ${GLEW_LIBRARIES} ${Boost_REGEX_LIBRARY} ${Boost_THREAD_LIBRARY})

- ENDIF (MINGW)

- 

- ### libraries needed on all platforms

--LIST(APPEND spring_libraries SDL vorbisfile vorbis ogg freetype)

-+LIST(APPEND spring_libraries ${SDL_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY} ${FREETYPE_LIBRARIES})

- 

- ### build all libraries in lib (has its own CMakeLists.txt)

- ADD_SUBDIRECTORY(lib)

-@@ -56,7 +56,7 @@
- endif (USE_GML)

- 

- ### include directories needed for compiling spring

--INCLUDE_DIRECTORIES(lib/lua/include lib/luabind)

-+INCLUDE_DIRECTORIES(BEFORE lib/lua/include lib/luabind)

- 

- ### all spring source directories

- ### each directorie which contains source has to be here

diff --git a/games/spring/files/patch-rts-Game-GameServer.cpp b/games/spring/files/patch-rts-Game-GameServer.cpp
deleted file mode 100644
index a9834d0fa6de..000000000000
--- a/games/spring/files/patch-rts-Game-GameServer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- rts/Game/GameServer.cpp.orig	2008-10-05 04:39:05.000000000 +0400
-+++ rts/Game/GameServer.cpp	2008-10-09 21:37:00.000000000 +0400
-@@ -15,7 +15,7 @@
- #if defined DEDICATED || defined DEBUG
- #include <iostream>
- #endif
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "mmgr.h"
- 
diff --git a/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt b/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt
index 558311e7376c..160b481167ac 100644
--- a/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt
+++ b/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt
@@ -1,15 +1,9 @@
---- tools/DedicatedServer/CMakeLists.txt.orig	2008-10-08 19:59:52.000000000 +0400
-+++ tools/DedicatedServer/CMakeLists.txt	2008-10-10 01:23:52.000000000 +0400
-@@ -50,12 +50,12 @@
- 	../../rts/Lua/LuaUtils

- 	../../rts/Map/MapParser

- 	../../rts/Rendering/Textures/TAPalette)

--TARGET_LINK_LIBRARIES(springserver SDL hpiutil2 7zip minizip lua)

-+TARGET_LINK_LIBRARIES(springserver ${SDL_LIBRARY} hpiutil2 7zip minizip lua)

+--- tools/DedicatedServer/CMakeLists.txt.orig	2008-10-12 02:53:10.000000000 +0400
++++ tools/DedicatedServer/CMakeLists.txt	2008-10-15 18:43:49.000000000 +0400
+@@ -54,7 +54,7 @@
  if (MINGW)

- 	TARGET_LINK_LIBRARIES (springserver ws2_32 boost_thread-mt boost_regex-mt)

+ 	TARGET_LINK_LIBRARIES (springserver ws2_32)

  else (MINGW)

- 	TARGET_LINK_LIBRARIES (springserver ${Boost_REGEX_LIBRARY} ${Boost_THREAD_LIBRARY})

 -	ADD_DEFINITIONS (-fvisibility=default ) #overwrite hidden visibility

 +	ADD_DEFINITIONS (${VISIBILITY_DEFAULT}) #overwrite hidden visibility

  endif (MINGW)

diff --git a/games/spring/files/patch-tools-unitsync-CMakeLists.txt b/games/spring/files/patch-tools-unitsync-CMakeLists.txt
deleted file mode 100644
index b8ed8c663378..000000000000
--- a/games/spring/files/patch-tools-unitsync-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/unitsync/CMakeLists.txt.orig	2008-09-29 15:44:44.000000000 +0400
-+++ tools/unitsync/CMakeLists.txt	2008-10-09 23:53:57.000000000 +0400
-@@ -12,7 +12,7 @@
- 	
- 	FIND_PACKAGE(GLEW REQUIRED)
- 	
--	set (unitsync_libs ${GLEW_LIBRARIES} IL openal GL GLU)
-+	set (unitsync_libs ${GLEW_LIBRARIES} ${DEVIL_IL_LIBRARY} ${OPENAL_LIBRARY} ${GL_gl_LIBRARY} ${GL_glu_LIBRARY})
- 	list (APPEND unitsync_libs util) # sometimes this is needed (and I have no clue why)
- 	
- 	FIND_PACKAGE(PythonLibs)
-@@ -73,7 +73,7 @@
- 	list(APPEND unitsync_files javabind)
- endif (JAVA_FOUND)
- ADD_LIBRARY(unitsync SHARED ${platformfiles} ${unitsync_files} ${fsfiles} unitsync LuaParserAPI Syncer SyncServer stdafx)
--TARGET_LINK_LIBRARIES(unitsync ${unitsync_libs} hpiutil2 7zip minizip lua boost_regex-mt ILU SDL)
-+TARGET_LINK_LIBRARIES(unitsync ${unitsync_libs} hpiutil2 7zip minizip lua ${BOOST_regex_LIBRARY} ${DEVIL_ILU_LIBRARY} ${SDL_LIBRARY})
- if (PYTHONLIBS_FOUND)
- 	TARGET_LINK_LIBRARIES(unitsync ${PYTHON_LIBRARIES})
- endif (PYTHONLIBS_FOUND)
diff --git a/games/spring/pkg-plist b/games/spring/pkg-plist
index 8813acbb50b0..8ca4e813322d 100644
--- a/games/spring/pkg-plist
+++ b/games/spring/pkg-plist
@@ -93,16 +93,10 @@ share/pixmaps/spring.png
 %%DATADIR%%/AI/AAI/cfg/map/Winter_Wonderland.cfg
 %%DATADIR%%/AI/AAI/cfg/map/aftershock.cfg
 %%DATADIR%%/AI/AAI/cfg/map/cathralda.cfg
-%%DATADIR%%/AI/AAI/cfg/mod/1944DemoReleasev0.01b.cfg
-%%DATADIR%%/AI/AAI/cfg/mod/1944publicalpha_v0.01b3d.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/A-A-SBetaPack1.9B.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/AA3.2.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/AA5.0project.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/AAIA10.cfg
-%%DATADIR%%/AI/AAI/cfg/mod/BA58.cfg
-%%DATADIR%%/AI/AAI/cfg/mod/BA591.cfg
-%%DATADIR%%/AI/AAI/cfg/mod/BA60.cfg
-%%DATADIR%%/AI/AAI/cfg/mod/BA621.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/BA_Installer_Version.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/BOTA_13.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/BOTA_14.cfg
@@ -110,14 +104,13 @@ share/pixmaps/spring.png
 %%DATADIR%%/AI/AAI/cfg/mod/Expand&Exterminate v0.163.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/Expand_and_Exterminate_v_0.171.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/FF 1.21 S.cfg
-%%DATADIR%%/AI/AAI/cfg/mod/FleabowlNR10.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/KuroTA-v047.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/OTA_Classic_TA.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/OTA_Shiny_TA.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/OTA_with_Evolva_models.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/OTA_with_UTASP_BP.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/PURE0.51.cfg
-%%DATADIR%%/AI/AAI/cfg/mod/S44LiteRelease.cfg
+%%DATADIR%%/AI/AAI/cfg/mod/S44_Installer_Version.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/SmallMod.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/SpringWD5B65.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/StarWars01.cfg