4 files changed, 39 insertions, 58 deletions

diff --git a/games/spring/Makefile b/games/spring/Makefile
index ecbb621bdfef..c575e187897b 100644
--- a/games/spring/Makefile
+++ b/games/spring/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	spring
-PORTVERSION=	0.77b5
-PORTREVISION=	2
+PORTVERSION=	0.78.2.1
 CATEGORIES=	games
 MASTER_SITES=	http://spring.clan-sy.com/dl/ \
 		http://mirror.amdmi3.ru/
@@ -25,7 +24,9 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
-USE_BZIP2=	yes
+ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS_REASON=	relies on x86 floating-point math
+
 USE_SDL=	sdl
 USE_GL=		gl glu
 USE_XORG=	x11 xcursor
@@ -33,6 +34,7 @@ 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
 CMAKE_ARGS=	-DDATADIR:STRING="share/${PORTNAME}" \
@@ -42,17 +44,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
 PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -E -e '/FIND_PACKAGE.*(Python|JNI)/ d' \
 		${WRKSRC}/tools/unitsync/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|x1F3F|x0F3F|g' \
 		${WRKSRC}/rts/System/FPUCheck.h
+	@${RM} -f ${WRKSRC}/rts/.gitignore ${WRKSRC}/game/.gitignore
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -61,4 +58,4 @@ post-install:
 .endif
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/spring/distinfo b/games/spring/distinfo
index 957809d3e89f..dfa014a9b570 100644
--- a/games/spring/distinfo
+++ b/games/spring/distinfo
@@ -1,3 +1,3 @@
-MD5 (spring_0.77b5_src.tar.bz2) = a6a7e2b281810952940c320701d60c79
-SHA256 (spring_0.77b5_src.tar.bz2) = 14ada1e5c0942ed741242fa70b5a5e994b5b26421cf5b5f6141c47f9073d6921
-SIZE (spring_0.77b5_src.tar.bz2) = 7188686
+MD5 (spring_0.78.2.1_src.tar.gz) = 8f3dd6c79b254fde9c1b6643eca97729
+SHA256 (spring_0.78.2.1_src.tar.gz) = 76821d17a2974aacd2b66d9c844584567ee5c9201af73760bd66e18aea270c92
+SIZE (spring_0.78.2.1_src.tar.gz) = 7797996
diff --git a/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt b/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt
index 160b481167ac..c28eb7b9123a 100644
--- a/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt
+++ b/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt
@@ -1,11 +1,11 @@
---- 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)

- else (MINGW)

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

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

- endif (MINGW)

- 

- ADD_EXECUTABLE(spring-dedicated main)

+--- tools/DedicatedServer/CMakeLists.txt.orig	2009-01-12 21:56:58.000000000 +0300
++++ tools/DedicatedServer/CMakeLists.txt	2009-01-13 17:24:41.000000000 +0300
+@@ -41,7 +41,7 @@
+ if (MINGW)
+ 	TARGET_LINK_LIBRARIES (springserver ws2_32)
+ else (MINGW)
+-	ADD_DEFINITIONS (-fvisibility=default ) #overwrite hidden visibility
++	ADD_DEFINITIONS (${VISIBILITY_DEFAULT}) #overwrite hidden visibility
+ endif (MINGW)
+ 
+ ADD_EXECUTABLE(spring-dedicated main)
diff --git a/games/spring/pkg-plist b/games/spring/pkg-plist
index 3056b04fa563..8a1188a32c3b 100644
--- a/games/spring/pkg-plist
+++ b/games/spring/pkg-plist
@@ -2,6 +2,18 @@ bin/spring
 bin/spring-dedicated
 lib/libspringserver.so
 lib/libunitsync.so
+lib/spring/AI/Bot-libs/libAAI.so
+lib/spring/AI/Bot-libs/libKAI-0.2.so
+lib/spring/AI/Bot-libs/libKAIK-0.13.so
+lib/spring/AI/Bot-libs/libRAI.so
+lib/spring/AI/Bot-libs/libTestGlobalAI.so
+lib/spring/AI/Helper-libs/libCentralBuildAI.so
+lib/spring/AI/Helper-libs/libEconomyAI.so
+lib/spring/AI/Helper-libs/libMetalMakerAI.so
+lib/spring/AI/Helper-libs/libMexUpgraderAI.so
+lib/spring/AI/Helper-libs/libRadarAI.so
+lib/spring/AI/Helper-libs/libReportIdleAI.so
+lib/spring/AI/Helper-libs/libSimpleFormationAI.so
 share/applications/spring.desktop
 share/mime/packages/spring.xml
 share/pixmaps/application-x-spring-demo.png
@@ -122,17 +134,6 @@ share/pixmaps/spring.png
 %%DATADIR%%/AI/AAI/cfg/mod/XTA_Installer_Version.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/gundam_1.1_epic.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/gundam_1.1_tiny.cfg
-%%DATADIR%%/AI/Bot-libs/libAAI.so
-%%DATADIR%%/AI/Bot-libs/libKAI-0.2.so
-%%DATADIR%%/AI/Bot-libs/libKAIK-0.13.so
-%%DATADIR%%/AI/Bot-libs/libTestGlobalAI.so
-%%DATADIR%%/AI/Helper-libs/libCentralBuildAI.so
-%%DATADIR%%/AI/Helper-libs/libEconomyAI.so
-%%DATADIR%%/AI/Helper-libs/libMetalMakerAI.so
-%%DATADIR%%/AI/Helper-libs/libMexUpgraderAI.so
-%%DATADIR%%/AI/Helper-libs/libRadarAI.so
-%%DATADIR%%/AI/Helper-libs/libReportIdleAI.so
-%%DATADIR%%/AI/Helper-libs/libSimpleFormationAI.so
 %%DATADIR%%/LuaUI/CHANGELOG.txt
 %%DATADIR%%/LuaUI/Config/README.txt
 %%DATADIR%%/LuaUI/Fonts/FreeMonoBold_12.lua
@@ -220,22 +221,8 @@ share/pixmaps/spring.png
 %%DATADIR%%/fonts/Vera.ttf
 %%DATADIR%%/luaui.lua
 %%DATADIR%%/selectkeys.txt
-%%DATADIR%%/startscripts/aistartscripttest.lua
-%%DATADIR%%/startscripts/cmdrscript.lua
-%%DATADIR%%/startscripts/missionhelper.lua
-%%DATADIR%%/startscripts/missiontest.lua
-%%DATADIR%%/startscripts/ordertroops.lua
 %%DATADIR%%/teamcolors.lua
 %%DATADIR%%/uikeys.txt
-@exec mkdir -p %D/%%DATADIR%%/AI/AAI/cache
-@exec mkdir -p %D/%%DATADIR%%/AI/AAI/learn/map
-@exec mkdir -p %D/%%DATADIR%%/AI/AAI/learn/mod
-@exec mkdir -p %D/%%DATADIR%%/AI/AAI/log
-@exec mkdir -p %D/%%DATADIR%%/maps
-@exec mkdir -p %D/%%DATADIR%%/mods
-@dirrm %%DATADIR%%/startscripts
-@dirrm %%DATADIR%%/mods
-@dirrm %%DATADIR%%/maps
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/base/spring
 @dirrm %%DATADIR%%/base
@@ -248,20 +235,17 @@ share/pixmaps/spring.png
 @dirrm %%DATADIR%%/LuaUI/Fonts
 @dirrm %%DATADIR%%/LuaUI/Config
 @dirrm %%DATADIR%%/LuaUI
-@dirrm %%DATADIR%%/AI/Helper-libs
-@dirrm %%DATADIR%%/AI/Bot-libs
-@dirrm %%DATADIR%%/AI/AAI/log
-@dirrm %%DATADIR%%/AI/AAI/learn/mod
-@dirrm %%DATADIR%%/AI/AAI/learn/map
-@dirrm %%DATADIR%%/AI/AAI/learn
 @dirrm %%DATADIR%%/AI/AAI/cfg/mod
 @dirrm %%DATADIR%%/AI/AAI/cfg/map
 @dirrm %%DATADIR%%/AI/AAI/cfg/help
 @dirrm %%DATADIR%%/AI/AAI/cfg
-@dirrm %%DATADIR%%/AI/AAI/cache
 @dirrm %%DATADIR%%/AI/AAI
 @dirrm %%DATADIR%%/AI
 @dirrm %%DATADIR%%
-@dirrmtry share/mime/packages
-@dirrmtry share/mime
+@dirrm share/mime/packages
+@dirrm share/mime
 @dirrmtry share/applications
+@dirrm lib/spring/AI/Helper-libs
+@dirrm lib/spring/AI/Bot-libs
+@dirrm lib/spring/AI
+@dirrm lib/spring