- Update to 0.77b3

- Get rid of java dependency
- Fix some comments and urls

14 files changed, 185 insertions, 104 deletions

diff --git a/games/spring/Makefile b/games/spring/Makefile
index e66cbe468a5..0ccdb40debd 100644
--- a/games/spring/Makefile
+++ b/games/spring/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	spring
-PORTVERSION=	0.76b1
-PORTREVISION=	3
-CATEGORIES=	games java
+PORTVERSION=	0.77b3
+CATEGORIES=	games
 MASTER_SITES=	http://spring.clan-sy.com/dl/ \
 		http://www.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	TA Spring is a project aiming to create a new RTS
+COMMENT=	A project aiming to create a new and versatile RTS Engine
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		openal.0:${PORTSDIR}/audio/openal \
@@ -27,47 +26,33 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
 USE_BZIP2=	yes
 USE_SDL=	sdl
-USE_PYTHON=	2.4+
-USE_GL=		yes
-USE_GMAKE=	yes
+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+
 
-USE_JAVA=	yes
-JAVA_VERSION=	1.5+
-
-USE_SCONS=	yes
-SCONS_ARGS=	prefix="${PREFIX}" datadir="share/${PORTNAME}" \
-		bindir="bin"
-SCONS_BUILDENV=	JAVA_INC="${JAVA_HOME}/include" ${SCONS_ENV}
+USE_CMAKE=	yes
+CMAKE_ARGS=	-DDATADIR:STRING="share/${PORTNAME}" \
+		-DMARCH_FLAG:STRING=
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
-PORTDOCS=	README.html
+PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 600000
-BROKEN=		Does not compile
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
-		${WRKSRC}/rts/build/scons/config.py
-	@${REINPLACE_CMD} -e 's|"make "|"${GMAKE} "|' ${WRKSRC}/SConstruct
-	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \
-		${WRKSRC}/rts/System/Platform/Linux/UnixFileSystemHandler.cpp
-
-do-configure:
-	@cd ${BUILD_WRKSRC} && ${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} \
-		${SCONS_ENV} ${SCONS_ARGS} configure
+	@${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
 
 post-install:
-	@${MKDIR} ${PREFIX}/etc/spring
-	@${ECHO_CMD} '$$HOME/.spring' > ${PREFIX}/etc/spring/datadir
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+	cd ${WRKSRC}/Documentation && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
diff --git a/games/spring/distinfo b/games/spring/distinfo
index 8c46583c243..bd1320f4ef6 100644
--- a/games/spring/distinfo
+++ b/games/spring/distinfo
@@ -1,3 +1,3 @@
-MD5 (spring_0.76b1_src.tar.bz2) = a89b38e1666c39ece32f0bafb2bfe17f
-SHA256 (spring_0.76b1_src.tar.bz2) = db4ab3d3e3ccf3143181945374e8f173e58077dbb672640c4620e98726f349d5
-SIZE (spring_0.76b1_src.tar.bz2) = 5087606
+MD5 (spring_0.77b3_src.tar.bz2) = e32818f4399711ad5fc153c0aa55210a
+SHA256 (spring_0.77b3_src.tar.bz2) = 965a3a9c6d4cd3f349ddfa0a448e47f916a298a1b80dd7d9155510b91ef02427
+SIZE (spring_0.77b3_src.tar.bz2) = 7189582
diff --git a/games/spring/files/patch-CMakeLists.txt b/games/spring/files/patch-CMakeLists.txt
new file mode 100644
index 00000000000..4a11351175e
--- /dev/null
+++ b/games/spring/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..35cbad8cf8d
--- /dev/null
+++ b/games/spring/files/patch-rts-CMakeLists.txt
@@ -0,0 +1,25 @@
+--- 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
new file mode 100644
index 00000000000..a9834d0fa6d
--- /dev/null
+++ b/games/spring/files/patch-rts-Game-GameServer.cpp
@@ -0,0 +1,11 @@
+--- 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-rts-Lua-LuaUtils.h b/games/spring/files/patch-rts-Lua-LuaUtils.h
new file mode 100644
index 00000000000..a523d65168b
--- /dev/null
+++ b/games/spring/files/patch-rts-Lua-LuaUtils.h
@@ -0,0 +1,11 @@
+--- rts/Lua/LuaUtils.h.orig	2008-07-16 02:42:48.000000000 +0400
++++ rts/Lua/LuaUtils.h	2008-10-09 21:41:37.000000000 +0400
+@@ -14,6 +14,8 @@
+ #include "LuaDefs.h"
+ #include "Sim/Units/CommandAI/Command.h"
+ 
++#undef isnumber
++
+ class LuaUtils {
+ 	public:
+ 		static int CopyData(lua_State* dst, lua_State* src, int count);
diff --git a/games/spring/files/patch-rts-System-Net-UDPSocket.h b/games/spring/files/patch-rts-System-Net-UDPSocket.h
deleted file mode 100644
index fe045a34fa9..00000000000
--- a/games/spring/files/patch-rts-System-Net-UDPSocket.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- rts/System/Net/UDPSocket.h.orig	2007-12-26 15:43:52.000000000 +0300
-+++ rts/System/Net/UDPSocket.h	2008-01-10 23:39:09.000000000 +0300
-@@ -7,6 +7,7 @@
- #ifdef _WIN32
- #include "Platform/Win/win32.h"
- #else
-+#include <sys/socket.h>
- #include <netinet/in.h>
- #endif
- 
diff --git a/games/spring/files/patch-rts-build-cmake-TestCXXAcceptsVisibilityFlag.cmake b/games/spring/files/patch-rts-build-cmake-TestCXXAcceptsVisibilityFlag.cmake
new file mode 100644
index 00000000000..7877155e777
--- /dev/null
+++ b/games/spring/files/patch-rts-build-cmake-TestCXXAcceptsVisibilityFlag.cmake
@@ -0,0 +1,18 @@
+--- 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-rts-build-scons-config.py b/games/spring/files/patch-rts-build-scons-config.py
deleted file mode 100644
index 3e0b98f678e..00000000000
--- a/games/spring/files/patch-rts-build-scons-config.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- rts/build/scons/config.py.orig	2007-12-18 14:56:55.000000000 +0300
-+++ rts/build/scons/config.py	2008-01-10 22:47:09.000000000 +0300
-@@ -205,6 +205,9 @@
- 
- def check_java(env, conf):
- 	print "Checking for Java...",
-+	env.AppendUnique(CPPPATH = [os.environ['JAVA_INC']])
-+	env.AppendUnique(CPPPATH = [os.path.join(os.environ['JAVA_INC'], "freebsd")])
-+	return
- 	if env.has_key('javapath') and env['javapath']:
- 		env.AppendUnique(CPPPATH = [env['javapath']])
- 		env.AppendUnique(CPPPATH = [os.path.join(env['javapath'], "linux")])
diff --git a/games/spring/files/patch-rts-lib-CMakeLists.txt b/games/spring/files/patch-rts-lib-CMakeLists.txt
new file mode 100644
index 00000000000..20ca30b0f87
--- /dev/null
+++ b/games/spring/files/patch-rts-lib-CMakeLists.txt
@@ -0,0 +1,15 @@
+--- rts/lib/CMakeLists.txt.orig	2008-09-18 23:31:26.000000000 +0400
++++ rts/lib/CMakeLists.txt	2008-10-09 21:31:06.000000000 +0400
+@@ -1,4 +1,4 @@
+-INCLUDE_DIRECTORIES(streflop lua/include luabind ${CMAKE_SOURCE_DIR}/rts/System)

++INCLUDE_DIRECTORIES(BEFORE streflop lua/include luabind ${CMAKE_SOURCE_DIR}/rts/System)

+ 

+ ADD_DEFINITIONS(${PIC_FLAG}) # all libraries need to be position independent (gives compiler warnings on 64bit-linux

+ 

+@@ -36,4 +36,4 @@
+ ENDIF (UNIX)

+ TARGET_LINK_LIBRARIES(minizip z)

+ 

+-ADD_SUBDIRECTORY(streflop)
+\ No newline at end of file
++ADD_SUBDIRECTORY(streflop)

diff --git a/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt b/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt
new file mode 100644
index 00000000000..558311e7376
--- /dev/null
+++ b/games/spring/files/patch-tools-DedicatedServer-CMakeLists.txt
@@ -0,0 +1,17 @@
+--- 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)

+ if (MINGW)

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

+ 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)

+ 

+ ADD_EXECUTABLE(spring-dedicated main)

diff --git a/games/spring/files/patch-tools-unitsync-CMakeLists.txt b/games/spring/files/patch-tools-unitsync-CMakeLists.txt
new file mode 100644
index 00000000000..b8ed8c66337
--- /dev/null
+++ b/games/spring/files/patch-tools-unitsync-CMakeLists.txt
@@ -0,0 +1,20 @@
+--- 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-message b/games/spring/pkg-message
index 10e5a5ad6e0..447411c1cba 100644
--- a/games/spring/pkg-message
+++ b/games/spring/pkg-message
@@ -7,6 +7,6 @@ OTA content as well.
 
 For further instructions, see:
 
-   http://spring.clan-sy.com/wiki/SetupGuide#Finalizing_installation
+   http://spring.clan-sy.com/wiki/Read_Me_First
 
 ==========================================================================
diff --git a/games/spring/pkg-plist b/games/spring/pkg-plist
index 305a959385f..8813acbb50b 100644
--- a/games/spring/pkg-plist
+++ b/games/spring/pkg-plist
@@ -1,17 +1,10 @@
 bin/spring
-etc/spring/datadir
-lib/spring/AI/Bot-libs/AAI.so
-lib/spring/AI/Bot-libs/KAIK-0.13.so
-lib/spring/AI/Bot-libs/TestGlobalAI.so
-lib/spring/AI/Helper-libs/CentralBuildAI.so
-lib/spring/AI/Helper-libs/EconomyAI.so
-lib/spring/AI/Helper-libs/MetalMakerAI.so
-lib/spring/AI/Helper-libs/MexUpgraderAI.so
-lib/spring/AI/Helper-libs/RadarAI.so
-lib/spring/AI/Helper-libs/ReportIdleAI.so
-lib/spring/AI/Helper-libs/SimpleFormationAI.so
-lib/spring/unitsync.so
+bin/spring-dedicated
+lib/libspringserver.so
+lib/libunitsync.so
 share/applications/spring.desktop
+share/mime/packages/spring.xml
+share/pixmaps/application-x-spring-demo.png
 share/pixmaps/spring.png
 %%DATADIR%%/AI/AAI/AAI FAQ.txt
 %%DATADIR%%/AI/AAI/AAI ReadMe.txt
@@ -49,6 +42,7 @@ share/pixmaps/spring.png
 %%DATADIR%%/AI/AAI/cfg/map/Evergreen_Haven-Redux-v02.cfg
 %%DATADIR%%/AI/AAI/cfg/map/Evergreen_Haven-v03.cfg
 %%DATADIR%%/AI/AAI/cfg/map/Expandation v01.cfg
+%%DATADIR%%/AI/AAI/cfg/map/ExpandedTropics.cfg
 %%DATADIR%%/AI/AAI/cfg/map/FF-AsteroidBattle.cfg
 %%DATADIR%%/AI/AAI/cfg/map/FF-Surrounded.cfg
 %%DATADIR%%/AI/AAI/cfg/map/Flooded_Canyon-v2.cfg
@@ -107,6 +101,8 @@ share/pixmaps/spring.png
 %%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
@@ -129,13 +125,21 @@ share/pixmaps/spring.png
 %%DATADIR%%/AI/AAI/cfg/mod/TBT12.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/TLLv104.cfg
 %%DATADIR%%/AI/AAI/cfg/mod/XTAPE.cfg
+%%DATADIR%%/AI/AAI/cfg/mod/XTAPEV95.cfg
 %%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/AAI/learn/mod/BA58.dat
-%%DATADIR%%/AI/AAI/learn/mod/BA591.dat
-%%DATADIR%%/AI/AAI/learn/mod/XTA_Installer_Version.dat
-%%DATADIR%%/LuaUI/API.txt
+%%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
@@ -143,6 +147,7 @@ share/pixmaps/spring.png
 %%DATADIR%%/LuaUI/Fonts/README
 %%DATADIR%%/LuaUI/Headers/colors.h.lua
 %%DATADIR%%/LuaUI/Headers/keysym.h.lua
+%%DATADIR%%/LuaUI/Icons/chi.png
 %%DATADIR%%/LuaUI/Icons/cross.png
 %%DATADIR%%/LuaUI/Icons/diamond.png
 %%DATADIR%%/LuaUI/Icons/e.png
@@ -182,35 +187,15 @@ share/pixmaps/spring.png
 %%DATADIR%%/LuaUI/Sounds/message_team.wav
 %%DATADIR%%/LuaUI/Sounds/pop.wav
 %%DATADIR%%/LuaUI/Sounds/teamgrab.wav
-%%DATADIR%%/LuaUI/Widgets/camera_ctrl.lua
 %%DATADIR%%/LuaUI/Widgets/camera_shake.lua
 %%DATADIR%%/LuaUI/Widgets/camera_smooth_move.lua
-%%DATADIR%%/LuaUI/Widgets/cmd_circle.lua
-%%DATADIR%%/LuaUI/Widgets/cmd_doline.lua
-%%DATADIR%%/LuaUI/Widgets/cmd_factoryclear.lua
-%%DATADIR%%/LuaUI/Widgets/cmd_givemobile.lua
-%%DATADIR%%/LuaUI/Widgets/cmd_savequeue.lua
-%%DATADIR%%/LuaUI/Widgets/dbg_debug.lua
-%%DATADIR%%/LuaUI/Widgets/gui_bigcursor.lua
-%%DATADIR%%/LuaUI/Widgets/gui_clock.lua
 %%DATADIR%%/LuaUI/Widgets/gui_comm_ends.lua
-%%DATADIR%%/LuaUI/Widgets/gui_eyes.lua
-%%DATADIR%%/LuaUI/Widgets/gui_fps.lua
-%%DATADIR%%/LuaUI/Widgets/gui_game_setup.lua
 %%DATADIR%%/LuaUI/Widgets/gui_hilight_unit.lua
-%%DATADIR%%/LuaUI/Widgets/gui_loadscreens.lua
-%%DATADIR%%/LuaUI/Widgets/gui_minimap.lua
-%%DATADIR%%/LuaUI/Widgets/gui_modeltest.lua
-%%DATADIR%%/LuaUI/Widgets/gui_mousetrail.lua
 %%DATADIR%%/LuaUI/Widgets/gui_selbuttons.lua
 %%DATADIR%%/LuaUI/Widgets/gui_team_platter.lua
-%%DATADIR%%/LuaUI/Widgets/gui_tooltip.lua
 %%DATADIR%%/LuaUI/Widgets/gui_xray_shader.lua
-%%DATADIR%%/LuaUI/Widgets/hook_copyqueue.lua
-%%DATADIR%%/LuaUI/Widgets/ico_customicons.lua
 %%DATADIR%%/LuaUI/Widgets/minimap_relative.lua
 %%DATADIR%%/LuaUI/Widgets/minimap_startbox.lua
-%%DATADIR%%/LuaUI/Widgets/snd_chatterbox.lua
 %%DATADIR%%/LuaUI/Widgets/unit_factory_guard.lua
 %%DATADIR%%/LuaUI/Widgets/unit_immobile_buider.lua
 %%DATADIR%%/LuaUI/Widgets/unit_metal_maker.lua
@@ -224,7 +209,6 @@ share/pixmaps/spring.png
 %%DATADIR%%/LuaUI/layout.lua
 %%DATADIR%%/LuaUI/loadmodel.lua
 %%DATADIR%%/LuaUI/main.lua
-%%DATADIR%%/LuaUI/modui_dialog.lua
 %%DATADIR%%/LuaUI/savetable.lua
 %%DATADIR%%/LuaUI/selector.lua
 %%DATADIR%%/LuaUI/setupdefs.lua
@@ -232,23 +216,27 @@ share/pixmaps/spring.png
 %%DATADIR%%/LuaUI/tweakmode.lua
 %%DATADIR%%/LuaUI/utils.lua
 %%DATADIR%%/LuaUI/widgets.lua
+%%DATADIR%%/PALETTE.PAL
+%%DATADIR%%/base/cursors.sdz
+%%DATADIR%%/base/maphelper.sdz
 %%DATADIR%%/base/spring/bitmaps.sdz
 %%DATADIR%%/base/springcontent.sdz
 %%DATADIR%%/cmdcolors.txt
 %%DATADIR%%/ctrlpanel.txt
 %%DATADIR%%/fonts/Luxi.ttf
 %%DATADIR%%/fonts/Vera.ttf
-%%DATADIR%%/gui.lua
+%%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
-%%DATADIR%%/usericons.tdf
-@dirrmtry share/applications
 @dirrm %%DATADIR%%/startscripts
+@dirrm %%DATADIR%%/mods
+@dirrm %%DATADIR%%/maps
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/base/spring
 @dirrm %%DATADIR%%/base
@@ -261,17 +249,20 @@ 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%%
-@dirrm lib/spring/AI/Helper-libs
-@dirrm lib/spring/AI/Bot-libs
-@dirrm lib/spring/AI
-@dirrm lib/spring
-@dirrm etc/spring
+@dirrmtry share/mime/packages
+@dirrmtry share/mime
+@dirrmtry share/applications