5 files changed, 324 insertions, 287 deletions

diff --git a/games/boswars/Makefile b/games/boswars/Makefile
index f4b65d1d13d4..7590f7f6284f 100644
--- a/games/boswars/Makefile
+++ b/games/boswars/Makefile
@@ -6,56 +6,47 @@
 #
 
 PORTNAME=	boswars
-PORTVERSION=	2.5
-PORTREVISION=	3
+PORTVERSION=	2.6.1
 CATEGORIES=	games
 MASTER_SITES=	http://www.boswars.org/dist/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	martin@arp242.net
 COMMENT=	A real-time strategy game
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 		theora.0:${PORTSDIR}/multimedia/libtheora \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
 
-USE_LUA=	5.0
+USE_LUA=	5.1
 USE_SDL=	sdl
+USE_GL=		yes
 USE_SCONS=	yes
+SCONS_ARGS+=	opengl=1
 CPPPATH=	${LOCALBASE}/include ${LUA_INCDIR}
 LIBPATH=	${LOCALBASE}/lib ${LUA_LIBDIR}
 CFLAGS+=	-DSTRATAGUS_LIB_PATH='"\"${DATADIR}\""'
 
-OPTIONS=	GL "Enable OpenGL support" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_GL)
-USE_GL=		yes
-SCONS_ARGS+=	opengl=1
-CPPPATH+=	${LOCALBASE}/include
-LIBPATH+=	${LOCALBASE}/lib
-.endif
-
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
-CFLAGS+=	-fomit-frame-pointer -fexpensive-optimizations -ffast-math
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/SConstruct
+	@${REINPLACE_CMD} -e '\
+		s|-pthread|${PTHREAD_LIBS}|g; \
+		s|/usr/local|${LOCALBASE}|g; \
+		s|lua51|lua-${LUA_VER}|g;' \
+	${WRKSRC}/SConstruct
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${MKDIR} ${DATADIR}
-.for f in campaigns graphics intro languages maps scripts sounds units
+.for f in campaigns graphics intro languages maps patches scripts sounds units
 	${CP} -R ${WRKSRC}/${f} ${DATADIR}
 .endfor
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.txt ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc ${DOCSDIR}
+	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/boswars/distinfo b/games/boswars/distinfo
index c71fd3e4357f..59986c2266c5 100644
--- a/games/boswars/distinfo
+++ b/games/boswars/distinfo
@@ -1,2 +1,2 @@
-SHA256 (boswars-2.5-src.tar.gz) = ac5d9c8227fec012087ff617ea62666c7517b7bf2ac4c52be9030bd5ccef7f13
-SIZE (boswars-2.5-src.tar.gz) = 63851225
+SHA256 (boswars-2.6.1-src.tar.gz) = 6003307692bde9913f6b5c227bf351e43e33d44ffaab198f0d0677e8fef86315
+SIZE (boswars-2.6.1-src.tar.gz) = 64708620
diff --git a/games/boswars/files/patch-SConstruct b/games/boswars/files/patch-SConstruct
index 77261e3da2cc..4580ff0feb4b 100644
--- a/games/boswars/files/patch-SConstruct
+++ b/games/boswars/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- SConstruct.orig	2008-04-13 19:55:45.000000000 -0500
-+++ SConstruct	2008-04-13 19:56:57.000000000 -0500
-@@ -48,8 +48,10 @@
+--- SConstruct.orig	2011-11-11 23:38:26.000000000 +0100
++++ SConstruct	2011-11-11 23:38:53.000000000 +0100
+@@ -49,8 +49,10 @@
  
  
  opts = DefineOptions("build_options.py", ARGUMENTS)
@@ -11,9 +11,9 @@
 +env['CPPPATH'] = Split(env['CPPPATH'])
 +env['LIBPATH'] = Split(env['LIBPATH'])
  Help(opts.GenerateHelpText(env))
- mingw = env.Copy()
+ mingw = env.Clone()
  optionsChanged = True
-@@ -143,6 +145,10 @@
+@@ -144,6 +146,10 @@
        'LIBS': ['GL'], 
        'LIBPATH': ['/usr/lib', '/usr/X11R6/lib'],
        'CPPPATH': ['/usr/include']}
@@ -24,7 +24,7 @@
    opengl['cygwin'] = {
        'LIBS': ['opengl3']}
    opengl['darwin'] = {
-@@ -154,6 +160,8 @@
+@@ -155,6 +161,8 @@
    else:
       if sys.platform[:5] == 'linux':
          platform = 'linux'
@@ -33,10 +33,10 @@
       glconfig = opengl.get(platform, {})
    for key in glconfig:
        if key != 'LIBS':
-@@ -283,7 +291,6 @@
+@@ -265,7 +273,6 @@
  
  # define the different build environments (variants)
- release = env.Copy()
+ release = env.Clone()
 -release.Append(CCFLAGS = Split('-O2 -pipe -fomit-frame-pointer -fexpensive-optimizations -ffast-math'))
  
  if mingw['extrapath']:
diff --git a/games/boswars/pkg-descr b/games/boswars/pkg-descr
index a1cf86b2619b..2a163dfcbe82 100644
--- a/games/boswars/pkg-descr
+++ b/games/boswars/pkg-descr
@@ -1,4 +1,22 @@
 Bos Wars is a real-time strategy game that uses a modified version of the
 Stratagus game engine.
 
+Bos Wars is a futuristic real time strategy game (RTS). In a RTS game, the
+player has to combat his enemies while developing his war economy. Everything
+runs in real-time, as opposed to turn-based games where the player always has
+to wait for his turn. The trick is to balance the effort put into building his
+economy and building an army to defend and attack the enemies. 
+
+Bos Wars has a dynamic rate based economy. Energy is produced by power plants
+and magma gets pumped from hot spots. Buildings and mobile units are also
+built at a continuous rate. Control of larger parts of the map creates the
+potential to increase your economy throughput. Holding key points like roads
+and passages allow for different strategies. 
+
+It is possible to play against human opponents over LAN, internet, or against
+the computer. Bos Wars successfully runs under Linux, MS Windows, BSD, and Mac
+OS X. 
+
+Bos Wars aims to create a completely original and fun open source RTS game.
+
 WWW: http://www.boswars.org/
diff --git a/games/boswars/pkg-plist b/games/boswars/pkg-plist
index 0a9e2fbf35ac..03e49842b3ef 100644
--- a/games/boswars/pkg-plist
+++ b/games/boswars/pkg-plist
@@ -1,36 +1,41 @@
 bin/boswars
-%%DATADIR%%/campaigns/elites/campaign.lua
-%%DATADIR%%/campaigns/elites/level01.smp
-%%DATADIR%%/campaigns/elites/level01.sms
-%%DATADIR%%/campaigns/elites/level01.txt
-%%DATADIR%%/campaigns/elites/level02.smp
-%%DATADIR%%/campaigns/elites/level02.sms
-%%DATADIR%%/campaigns/elites/level02.txt
-%%DATADIR%%/campaigns/elites/level03.smp
-%%DATADIR%%/campaigns/elites/level03.sms
-%%DATADIR%%/campaigns/elites/level03.txt
-%%DATADIR%%/campaigns/elites/level04.smp
-%%DATADIR%%/campaigns/elites/level04.sms
-%%DATADIR%%/campaigns/elites/level04.txt
-%%DATADIR%%/campaigns/elites/level05.smp
-%%DATADIR%%/campaigns/elites/level05.sms
-%%DATADIR%%/campaigns/elites/level05.txt
-%%DATADIR%%/campaigns/elites/level06.smp
-%%DATADIR%%/campaigns/elites/level06.sms
-%%DATADIR%%/campaigns/elites/level06.txt
-%%DATADIR%%/campaigns/elites/level07.smp
-%%DATADIR%%/campaigns/elites/level07.sms
-%%DATADIR%%/campaigns/elites/level07.txt
-%%DATADIR%%/campaigns/elites/level08.smp
-%%DATADIR%%/campaigns/elites/level08.sms
-%%DATADIR%%/campaigns/elites/level08.txt
-%%DATADIR%%/campaigns/elites/level09.smp
-%%DATADIR%%/campaigns/elites/level09.sms
-%%DATADIR%%/campaigns/elites/level09.txt
-%%DATADIR%%/campaigns/elites/level10.smp
-%%DATADIR%%/campaigns/elites/level10.sms
-%%DATADIR%%/campaigns/elites/level10.txt
-%%DATADIR%%/campaigns/tutorial/campaign.lua
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/unittype.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/config.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/findlua.py
+%%PORTDOCS%%%%DOCSDIR%%/scripts/game.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/index.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/limits.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/magic.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/makeindex.py
+%%PORTDOCS%%%%DOCSDIR%%/scripts/mappresentation.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/mapsetup.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/savegame.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/showindex.py
+%%PORTDOCS%%%%DOCSDIR%%/scripts/sound.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/triggers.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/ui.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/ai.html
+%%PORTDOCS%%%%DOCSDIR%%/tolua-copyright.txt
+%%PORTDOCS%%%%DOCSDIR%%/stratagus-changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/media.html
+%%PORTDOCS%%%%DOCSDIR%%/lua5-copyright.txt
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/guichan-copyright.txt
+%%PORTDOCS%%%%DOCSDIR%%/gpl3.txt
+%%PORTDOCS%%%%DOCSDIR%%/gpl.html
+%%PORTDOCS%%%%DOCSDIR%%/gcclibs-copyright.txt
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/development.html
+%%PORTDOCS%%%%DOCSDIR%%/xiph-copyright.txt
+%%PORTDOCS%%%%DOCSDIR%%/README-SDL.txt
+%%DATADIR%%/campaigns/swindler/campaign.lua
+%%DATADIR%%/campaigns/swindler/level01.smp
+%%DATADIR%%/campaigns/swindler/level01.sms
+%%DATADIR%%/campaigns/swindler/swindler.png
+%%DATADIR%%/campaigns/tutorial/level03.sms
 %%DATADIR%%/campaigns/tutorial/level01-01.wav
 %%DATADIR%%/campaigns/tutorial/level01-03.wav
 %%DATADIR%%/campaigns/tutorial/level01-04.wav
@@ -41,8 +46,8 @@ bin/boswars
 %%DATADIR%%/campaigns/tutorial/level02.smp
 %%DATADIR%%/campaigns/tutorial/level02.sms
 %%DATADIR%%/campaigns/tutorial/level03.smp
-%%DATADIR%%/campaigns/tutorial/level03.sms
-%%DATADIR%%/graphics/explosions/expl_160x128x1.png
+%%DATADIR%%/campaigns/tutorial/campaign.lua
+%%DATADIR%%/graphics/explosions/smokelight48.png
 %%DATADIR%%/graphics/explosions/expl_288x288x1.png
 %%DATADIR%%/graphics/explosions/expl_64x64x1.png
 %%DATADIR%%/graphics/explosions/explosion.png
@@ -97,8 +102,8 @@ bin/boswars
 %%DATADIR%%/graphics/explosions/smokelight36.png
 %%DATADIR%%/graphics/explosions/smokelight40.png
 %%DATADIR%%/graphics/explosions/smokelight44.png
-%%DATADIR%%/graphics/explosions/smokelight48.png
-%%DATADIR%%/graphics/general/commands.png
+%%DATADIR%%/graphics/explosions/expl_160x128x1.png
+%%DATADIR%%/graphics/general/mana2.png
 %%DATADIR%%/graphics/general/dejavusans10.png
 %%DATADIR%%/graphics/general/dejavusans12.png
 %%DATADIR%%/graphics/general/dejavusans14.png
@@ -108,22 +113,20 @@ bin/boswars
 %%DATADIR%%/graphics/general/fog.png
 %%DATADIR%%/graphics/general/freesansbold14.png
 %%DATADIR%%/graphics/general/health2.png
-%%DATADIR%%/graphics/general/mana2.png
+%%DATADIR%%/graphics/general/commands.png
 %%DATADIR%%/graphics/missiles/big_fire.png
 %%DATADIR%%/graphics/missiles/green_cross.png
 %%DATADIR%%/graphics/missiles/grenade.png
 %%DATADIR%%/graphics/missiles/nuke.png
 %%DATADIR%%/graphics/missiles/rocket.png
 %%DATADIR%%/graphics/missiles/small_fire.png
+%%DATADIR%%/graphics/neutral/units/corpses.png
 %%DATADIR%%/graphics/neutral/destroyed_site.png
 %%DATADIR%%/graphics/neutral/small_destroyed_site.png
-%%DATADIR%%/graphics/neutral/units/corpses.png
 %%DATADIR%%/graphics/screens/defeat.png
 %%DATADIR%%/graphics/screens/menu.png
 %%DATADIR%%/graphics/screens/victory.png
-%%DATADIR%%/graphics/tiles/desert.png
-%%DATADIR%%/graphics/ui/cursor-info.png
-%%DATADIR%%/graphics/ui/cursors/arrow_E.png
+%%DATADIR%%/graphics/ui/cursors/yellow.png
 %%DATADIR%%/graphics/ui/cursors/arrow_N.png
 %%DATADIR%%/graphics/ui/cursors/arrow_NE.png
 %%DATADIR%%/graphics/ui/cursors/arrow_NW.png
@@ -135,7 +138,29 @@ bin/boswars
 %%DATADIR%%/graphics/ui/cursors/green.png
 %%DATADIR%%/graphics/ui/cursors/red.png
 %%DATADIR%%/graphics/ui/cursors/small_green_cross.png
-%%DATADIR%%/graphics/ui/cursors/yellow.png
+%%DATADIR%%/graphics/ui/cursors/arrow_E.png
+%%DATADIR%%/graphics/ui/patcheditor/water.png
+%%DATADIR%%/graphics/ui/patcheditor/impassable.png
+%%DATADIR%%/graphics/ui/patcheditor/speed0-small.png
+%%DATADIR%%/graphics/ui/patcheditor/speed0.png
+%%DATADIR%%/graphics/ui/patcheditor/speed1-small.png
+%%DATADIR%%/graphics/ui/patcheditor/speed1.png
+%%DATADIR%%/graphics/ui/patcheditor/speed2-small.png
+%%DATADIR%%/graphics/ui/patcheditor/speed2.png
+%%DATADIR%%/graphics/ui/patcheditor/speed3-small.png
+%%DATADIR%%/graphics/ui/patcheditor/speed3.png
+%%DATADIR%%/graphics/ui/patcheditor/speed4-small.png
+%%DATADIR%%/graphics/ui/patcheditor/speed4.png
+%%DATADIR%%/graphics/ui/patcheditor/speed5-small.png
+%%DATADIR%%/graphics/ui/patcheditor/speed5.png
+%%DATADIR%%/graphics/ui/patcheditor/speed6-small.png
+%%DATADIR%%/graphics/ui/patcheditor/speed6.png
+%%DATADIR%%/graphics/ui/patcheditor/speed7-small.png
+%%DATADIR%%/graphics/ui/patcheditor/speed7.png
+%%DATADIR%%/graphics/ui/patcheditor/transparent-small.png
+%%DATADIR%%/graphics/ui/patcheditor/transparent.png
+%%DATADIR%%/graphics/ui/patcheditor/water-small.png
+%%DATADIR%%/graphics/ui/patcheditor/impassable-small.png
 %%DATADIR%%/graphics/ui/elites_claw.png
 %%DATADIR%%/graphics/ui/rosace1.png
 %%DATADIR%%/graphics/ui/ui_1024_bpanel.png
@@ -146,18 +171,22 @@ bin/boswars
 %%DATADIR%%/graphics/ui/ui_info.png
 %%DATADIR%%/graphics/ui/ui_minimap.png
 %%DATADIR%%/graphics/ui/ui_res_icons.png
+%%DATADIR%%/graphics/ui/cursor-info.png
 %%DATADIR%%/graphics/ui/x_startpoint.png
+%%DATADIR%%/graphics/ui/editor_patch.png
 %%DATADIR%%/intro/boswars_intro.ogg
 %%DATADIR%%/intro/logo_boswars.png
-%%DATADIR%%/languages/bg.po
+%%DATADIR%%/languages/updatepo.sh
 %%DATADIR%%/languages/bos-cs.po
 %%DATADIR%%/languages/bos-da.po
 %%DATADIR%%/languages/bos-de.po
 %%DATADIR%%/languages/bos-es.po
 %%DATADIR%%/languages/bos-fi.po
 %%DATADIR%%/languages/bos-fr.po
+%%DATADIR%%/languages/bos-it.po
 %%DATADIR%%/languages/bos-nl.po
-%%DATADIR%%/languages/bos-pt.po
+%%DATADIR%%/languages/bos-pt-br.po
+%%DATADIR%%/languages/bos-pt-pt.po
 %%DATADIR%%/languages/bos-sv.po
 %%DATADIR%%/languages/bos-tr.po
 %%DATADIR%%/languages/bos.pot
@@ -169,128 +198,170 @@ bin/boswars
 %%DATADIR%%/languages/fi.po
 %%DATADIR%%/languages/fr.po
 %%DATADIR%%/languages/genpot.sh
+%%DATADIR%%/languages/it.po
 %%DATADIR%%/languages/makesame.py
 %%DATADIR%%/languages/nl.po
 %%DATADIR%%/languages/pl.po
-%%DATADIR%%/languages/pt.po
+%%DATADIR%%/languages/pt-br.po
+%%DATADIR%%/languages/pt-pt.po
 %%DATADIR%%/languages/sv.po
 %%DATADIR%%/languages/tr.po
-%%DATADIR%%/languages/updatepo.sh
+%%DATADIR%%/languages/bg.po
+%%DATADIR%%/maps/go-east.map/presentation.smp
+%%DATADIR%%/maps/go-east.map/setup.sms
+%%DATADIR%%/maps/antarticum.map/patch.lua
 %%DATADIR%%/maps/antarticum.map/presentation.smp
 %%DATADIR%%/maps/antarticum.map/setup.sms
-%%DATADIR%%/maps/antarticum.map/terrain.lua
 %%DATADIR%%/maps/antarticum.map/terrain.png
+%%DATADIR%%/maps/battlefield.map/patch.lua
 %%DATADIR%%/maps/battlefield.map/presentation.smp
 %%DATADIR%%/maps/battlefield.map/setup.sms
-%%DATADIR%%/maps/battlefield.map/terrain.lua
 %%DATADIR%%/maps/battlefield.map/terrain.png
-%%DATADIR%%/maps/braza.map/presentation.smp
-%%DATADIR%%/maps/braza.map/setup.sms
-%%DATADIR%%/maps/bridge.map/access-fast.lua
-%%DATADIR%%/maps/bridge.map/access-water.lua
+%%DATADIR%%/maps/bottleneck.map/presentation.smp
+%%DATADIR%%/maps/bottleneck.map/setup.sms
+%%DATADIR%%/maps/bridge.map/patch.lua
 %%DATADIR%%/maps/bridge.map/presentation.smp
 %%DATADIR%%/maps/bridge.map/setup.sms
-%%DATADIR%%/maps/bridge.map/terrain.lua
 %%DATADIR%%/maps/bridge.map/terrain.png
-%%DATADIR%%/maps/bridge2far.map/access-unpassable.lua
 %%DATADIR%%/maps/bridge2far.map/class-no-pass.png
+%%DATADIR%%/maps/bridge2far.map/patch.lua
 %%DATADIR%%/maps/bridge2far.map/presentation.smp
 %%DATADIR%%/maps/bridge2far.map/setup.sms
-%%DATADIR%%/maps/bridge2far.map/terrain.lua
 %%DATADIR%%/maps/bridge2far.map/terrain.png
-%%DATADIR%%/maps/campaigns/elites/Aiglier.map/presentation.smp
-%%DATADIR%%/maps/campaigns/elites/Aiglier.map/setup.sms
-%%DATADIR%%/maps/campaigns/elites/Bellegarde.map/presentation.smp
-%%DATADIR%%/maps/campaigns/elites/Bellegarde.map/setup.sms
-%%DATADIR%%/maps/campaigns/elites/Buffy_Forest.map/presentation.smp
-%%DATADIR%%/maps/campaigns/elites/Buffy_Forest.map/setup.sms
-%%DATADIR%%/maps/campaigns/elites/Fort_Savoy.map/presentation.smp
-%%DATADIR%%/maps/campaigns/elites/Fort_Savoy.map/setup.sms
-%%DATADIR%%/maps/campaigns/elites/Green_Valley.map/presentation.smp
-%%DATADIR%%/maps/campaigns/elites/Green_Valley.map/setup.sms
-%%DATADIR%%/maps/campaigns/elites/Rochebrune.map/presentation.smp
-%%DATADIR%%/maps/campaigns/elites/Rochebrune.map/setup.sms
-%%DATADIR%%/maps/campaigns/elites/Savoy_Lake.map/presentation.smp
-%%DATADIR%%/maps/campaigns/elites/Savoy_Lake.map/setup.sms
-%%DATADIR%%/maps/campaigns/elites/Savoy_Steps.map/presentation.smp
-%%DATADIR%%/maps/campaigns/elites/Savoy_Steps.map/setup.sms
-%%DATADIR%%/maps/campaigns/elites/Shield_of_Wasteland.map/presentation.smp
-%%DATADIR%%/maps/campaigns/elites/Shield_of_Wasteland.map/setup.sms
-%%DATADIR%%/maps/campaigns/elites/The_River.map/presentation.smp
-%%DATADIR%%/maps/campaigns/elites/The_River.map/setup.sms
-%%DATADIR%%/maps/campaigns/tutorial/tutorial.map/access-unpassable.lua
 %%DATADIR%%/maps/campaigns/tutorial/tutorial.map/presentation.smp
 %%DATADIR%%/maps/campaigns/tutorial/tutorial.map/setup.sms
-%%DATADIR%%/maps/campaigns/tutorial/tutorial.map/terrain.lua
-%%DATADIR%%/maps/campaigns/tutorial/tutorial.map/terrain.png
-%%DATADIR%%/maps/campaigns/tutorial/tutorial.map/unpassable.png
-%%DATADIR%%/maps/canyon.map/access-unpassable.lua
 %%DATADIR%%/maps/canyon.map/class-no-pass.png
+%%DATADIR%%/maps/canyon.map/patch.lua
 %%DATADIR%%/maps/canyon.map/presentation.smp
 %%DATADIR%%/maps/canyon.map/setup.sms
-%%DATADIR%%/maps/canyon.map/terrain.lua
 %%DATADIR%%/maps/canyon.map/terrain.png
-%%DATADIR%%/maps/cross.map/presentation.smp
-%%DATADIR%%/maps/cross.map/setup.sms
-%%DATADIR%%/maps/forest.map/presentation.smp
-%%DATADIR%%/maps/forest.map/setup.sms
-%%DATADIR%%/maps/guerillawarfare.map/access-unpassable.lua
+%%DATADIR%%/maps/4on4.map/presentation.smp
+%%DATADIR%%/maps/4on4.map/setup.sms
+%%DATADIR%%/maps/4on4.map/spacious.lua
+%%DATADIR%%/maps/guerillawarfare.map/patch.lua
 %%DATADIR%%/maps/guerillawarfare.map/presentation.smp
 %%DATADIR%%/maps/guerillawarfare.map/setup.sms
 %%DATADIR%%/maps/guerillawarfare.map/terrain-no-access.png
-%%DATADIR%%/maps/guerillawarfare.map/terrain.lua
 %%DATADIR%%/maps/guerillawarfare.map/terrain.png
-%%DATADIR%%/maps/highlands.map/presentation.smp
-%%DATADIR%%/maps/highlands.map/setup.sms
-%%DATADIR%%/maps/islandwar.map/access-fast.lua
-%%DATADIR%%/maps/islandwar.map/access-water.lua
+%%DATADIR%%/maps/hospitality.map/presentation.smp
+%%DATADIR%%/maps/hospitality.map/setup.sms
+%%DATADIR%%/maps/islandwar.map/patch.lua
 %%DATADIR%%/maps/islandwar.map/presentation.smp
 %%DATADIR%%/maps/islandwar.map/setup.sms
-%%DATADIR%%/maps/islandwar.map/terrain.lua
 %%DATADIR%%/maps/islandwar.map/terrain.png
-%%DATADIR%%/maps/labyrinth.map/presentation.smp
-%%DATADIR%%/maps/labyrinth.map/setup.sms
-%%DATADIR%%/maps/lake.map/presentation.smp
-%%DATADIR%%/maps/lake.map/setup.sms
-%%DATADIR%%/maps/multiplayer.map/presentation.smp
-%%DATADIR%%/maps/multiplayer.map/setup.sms
-%%DATADIR%%/maps/patches.map/128x.png
-%%DATADIR%%/maps/patches.map/256x.png
-%%DATADIR%%/maps/patches.map/32x.png
-%%DATADIR%%/maps/patches.map/512-hill-01x.png
-%%DATADIR%%/maps/patches.map/512-hill-02x.png
-%%DATADIR%%/maps/patches.map/512-hill-03x.png
-%%DATADIR%%/maps/patches.map/512-hill-04x.png
-%%DATADIR%%/maps/patches.map/512-lake-01x.png
-%%DATADIR%%/maps/patches.map/512x.png
-%%DATADIR%%/maps/patches.map/64x.png
-%%DATADIR%%/maps/patches.map/access-unpassable.lua
+%%DATADIR%%/maps/lava-river.map/air_attack.lua
+%%DATADIR%%/maps/lava-river.map/presentation.smp
+%%DATADIR%%/maps/lava-river.map/setup.sms
 %%DATADIR%%/maps/patches.map/presentation.smp
 %%DATADIR%%/maps/patches.map/setup.sms
-%%DATADIR%%/maps/patches.map/terrain.lua
-%%DATADIR%%/maps/patches.map/terrain.png
-%%DATADIR%%/maps/patches.map/unpassable.png
+%%DATADIR%%/maps/river.map/patch.lua
 %%DATADIR%%/maps/river.map/presentation.smp
 %%DATADIR%%/maps/river.map/setup.sms
-%%DATADIR%%/maps/river.map/terrain.lua
 %%DATADIR%%/maps/river.map/terrain.png
-%%DATADIR%%/maps/wetlands01.map/access-unpassable.lua
+%%DATADIR%%/maps/wetlands01.map/patch.lua
 %%DATADIR%%/maps/wetlands01.map/presentation.smp
-%%DATADIR%%/maps/wetlands01.map/terrain.lua
+%%DATADIR%%/maps/wetlands01.map/setup.sms
+%%DATADIR%%/maps/wetlands01.map/terrain.png
 %%DATADIR%%/maps/wetlands01.map/wetlands01-nopass.png
-%%DATADIR%%/maps/wetlands01.map/wetlands01.png
-%%DATADIR%%/maps/wetlands01.map/wetlands01.sms
-%%DATADIR%%/maps/wetlands02.map/access-water.lua
+%%DATADIR%%/maps/wetlands02.map/patch.lua
 %%DATADIR%%/maps/wetlands02.map/presentation.smp
 %%DATADIR%%/maps/wetlands02.map/setup.sms
 %%DATADIR%%/maps/wetlands02.map/terrain.png
 %%DATADIR%%/maps/wetlands02.map/wetlands02-access-water.png
-%%DATADIR%%/scripts/ai.lua
+%%DATADIR%%/patches/grass/Water-plain.png
+%%DATADIR%%/patches/grass/Grass-cliff-curve-NW.png
+%%DATADIR%%/patches/grass/Grass-cliff-curve-SE.png
+%%DATADIR%%/patches/grass/Grass-cliff-curve-SW.png
+%%DATADIR%%/patches/grass/Grass-cliff-horizontal-S.png
+%%DATADIR%%/patches/grass/Grass-cliff-horizontal-end-E.png
+%%DATADIR%%/patches/grass/Grass-cliff-horizontal-end-W.png
+%%DATADIR%%/patches/grass/Grass-cliff-vertical-E-end-N.png
+%%DATADIR%%/patches/grass/Grass-cliff-vertical-E-end-S.png
+%%DATADIR%%/patches/grass/Grass-cliff-vertical-E.png
+%%DATADIR%%/patches/grass/Grass-cliff-vertical-W-end-N.png
+%%DATADIR%%/patches/grass/Grass-cliff-vertical-W-end-S.png
+%%DATADIR%%/patches/grass/Grass-cliff-vertical-W.png
+%%DATADIR%%/patches/grass/Grass-plain-huge.png
+%%DATADIR%%/patches/grass/Grass-plain-large.png
+%%DATADIR%%/patches/grass/Grass-plain-small.png
+%%DATADIR%%/patches/grass/Grass-plain.png
+%%DATADIR%%/patches/grass/Grass-road-X.png
+%%DATADIR%%/patches/grass/Grass-road-curve-NE.png
+%%DATADIR%%/patches/grass/Grass-road-curve-NW.png
+%%DATADIR%%/patches/grass/Grass-road-curve-SE.png
+%%DATADIR%%/patches/grass/Grass-road-curve-SW.png
+%%DATADIR%%/patches/grass/Grass-road-horizontal.png
+%%DATADIR%%/patches/grass/Grass-road-tee-E.png
+%%DATADIR%%/patches/grass/Grass-road-tee-N.png
+%%DATADIR%%/patches/grass/Grass-road-tee-S.png
+%%DATADIR%%/patches/grass/Grass-road-tee-W.png
+%%DATADIR%%/patches/grass/Grass-road-vertical.png
+%%DATADIR%%/patches/grass/Water-coast-curve-EN.png
+%%DATADIR%%/patches/grass/Water-coast-curve-ES.png
+%%DATADIR%%/patches/grass/Water-coast-curve-NE.png
+%%DATADIR%%/patches/grass/Water-coast-curve-NW.png
+%%DATADIR%%/patches/grass/Water-coast-curve-SE.png
+%%DATADIR%%/patches/grass/Water-coast-curve-SW.png
+%%DATADIR%%/patches/grass/Water-coast-curve-WN.png
+%%DATADIR%%/patches/grass/Water-coast-curve-WS.png
+%%DATADIR%%/patches/grass/Water-coast-horizontal-down.png
+%%DATADIR%%/patches/grass/Water-coast-horizontal-up.png
+%%DATADIR%%/patches/grass/Water-coast-vertical-left.png
+%%DATADIR%%/patches/grass/Water-coast-vertical-right.png
+%%DATADIR%%/patches/grass/Grass-cliff-curve-NE.png
+%%DATADIR%%/patches/dirtyPlain.png
+%%DATADIR%%/patches/dirtyPlain2.lua
+%%DATADIR%%/patches/dirtyPlain2.png
+%%DATADIR%%/patches/dirtyPlain3.lua
+%%DATADIR%%/patches/dirtyPlain3.png
+%%DATADIR%%/patches/grass.lua
+%%DATADIR%%/patches/greenMountain.lua
+%%DATADIR%%/patches/greenMountain.png
+%%DATADIR%%/patches/lake.lua
+%%DATADIR%%/patches/lake.png
+%%DATADIR%%/patches/pikeMountain.lua
+%%DATADIR%%/patches/pikeMountain.png
+%%DATADIR%%/patches/plain1.lua
+%%DATADIR%%/patches/plain1.png
+%%DATADIR%%/patches/plain16.lua
+%%DATADIR%%/patches/plain16.png
+%%DATADIR%%/patches/plain2.lua
+%%DATADIR%%/patches/plain2.png
+%%DATADIR%%/patches/plain4.lua
+%%DATADIR%%/patches/te0.lua
+%%DATADIR%%/patches/plain4.png
+%%DATADIR%%/patches/plain8.lua
+%%DATADIR%%/patches/plain8.png
+%%DATADIR%%/patches/rockyMountainL.lua
+%%DATADIR%%/patches/rockyMountainL.png
+%%DATADIR%%/patches/rockyMountainR.lua
+%%DATADIR%%/patches/rockyMountainR.png
+%%DATADIR%%/patches/smallWetPlain.lua
+%%DATADIR%%/patches/smallWetPlain.png
+%%DATADIR%%/patches/te0.png
+%%DATADIR%%/patches/te1.lua
+%%DATADIR%%/patches/te1.png
+%%DATADIR%%/patches/te2.lua
+%%DATADIR%%/patches/te2.png
+%%DATADIR%%/patches/te3.lua
+%%DATADIR%%/patches/te3.png
+%%DATADIR%%/patches/te4.lua
+%%DATADIR%%/patches/te4.png
+%%DATADIR%%/patches/te5.lua
+%%DATADIR%%/patches/dirtyPlain.lua
+%%DATADIR%%/patches/te5.png
+%%DATADIR%%/scripts/menus/ingame/editor.lua
+%%DATADIR%%/scripts/menus/ingame/game.lua
+%%DATADIR%%/scripts/menus/campaigns.lua
+%%DATADIR%%/scripts/menus/credits.lua
+%%DATADIR%%/scripts/menus/network.lua
+%%DATADIR%%/scripts/menus/options.lua
+%%DATADIR%%/scripts/menus/patch.lua
 %%DATADIR%%/scripts/ais/blitz.lua
+%%DATADIR%%/scripts/ais/default.lua
 %%DATADIR%%/scripts/ais/passive.lua
 %%DATADIR%%/scripts/ais/rush.lua
 %%DATADIR%%/scripts/ais/tankrush.lua
-%%DATADIR%%/scripts/anim.lua
 %%DATADIR%%/scripts/boswars.lua
 %%DATADIR%%/scripts/buttons.lua
 %%DATADIR%%/scripts/buttonstyles.lua
@@ -303,35 +374,26 @@ bin/boswars
 %%DATADIR%%/scripts/guichan.lua
 %%DATADIR%%/scripts/helpers.lua
 %%DATADIR%%/scripts/icons.lua
-%%DATADIR%%/scripts/maps.lua
-%%DATADIR%%/scripts/menus/campaigns.lua
-%%DATADIR%%/scripts/menus/credits.lua
-%%DATADIR%%/scripts/menus/ingame/editor.lua
-%%DATADIR%%/scripts/menus/ingame/game.lua
-%%DATADIR%%/scripts/menus/network.lua
-%%DATADIR%%/scripts/menus/options.lua
 %%DATADIR%%/scripts/missiles.lua
+%%DATADIR%%/scripts/patches.lua
 %%DATADIR%%/scripts/sound.lua
 %%DATADIR%%/scripts/spells.lua
-%%DATADIR%%/scripts/tilesets/desert.lua
 %%DATADIR%%/scripts/ui.lua
 %%DATADIR%%/scripts/uilayout.lua
+%%DATADIR%%/scripts/ai.lua
 %%DATADIR%%/scripts/units.lua
-%%DATADIR%%/sounds/bazoo_g_hit.wav
-%%DATADIR%%/sounds/grenadier_g_hit.wav
+%%DATADIR%%/scripts/anim.lua
 %%DATADIR%%/sounds/ui/chatmessage.wav
 %%DATADIR%%/sounds/ui/click.wav.gz
-%%DATADIR%%/units/aircraftfactory/aircraftfactory.completed.wav
-%%DATADIR%%/units/aircraftfactory/aircraftfactory.png
-%%DATADIR%%/units/aircraftfactory/aircraftfactory.underattack.wav
-%%DATADIR%%/units/aircraftfactory/aircraftfactory_c.png
-%%DATADIR%%/units/aircraftfactory/aircraftfactory_i.png
-%%DATADIR%%/units/aircraftfactory/aircraftfactory_s.png
-%%DATADIR%%/units/aircraftfactory/unit-aircraftfactory.lua
+%%DATADIR%%/sounds/bazoo_g_hit.wav
+%%DATADIR%%/sounds/grenadier_g_hit.wav
+%%DATADIR%%/units/hotspot/hotspot.png
+%%DATADIR%%/units/hotspot/hotspot_i.png
+%%DATADIR%%/units/hotspot/unit-hotspot.lua
 %%DATADIR%%/units/antharus/antharus.png
 %%DATADIR%%/units/antharus/icon.png
 %%DATADIR%%/units/antharus/unit-antharus.lua
-%%DATADIR%%/units/apcs/ico_apcs.png
+%%DATADIR%%/units/apcs/unit_apcs_s.png
 %%DATADIR%%/units/apcs/smolder.completed.wav
 %%DATADIR%%/units/apcs/smolder.underattack.wav
 %%DATADIR%%/units/apcs/smolder_action.wav
@@ -340,14 +402,14 @@ bin/boswars
 %%DATADIR%%/units/apcs/smolder_select.wav
 %%DATADIR%%/units/apcs/unit-apcs.lua
 %%DATADIR%%/units/apcs/unit_apcs.png
-%%DATADIR%%/units/apcs/unit_apcs_s.png
+%%DATADIR%%/units/apcs/ico_apcs.png
 %%DATADIR%%/units/artil/artil.ready.wav
 %%DATADIR%%/units/artil/artil.underattack.wav
 %%DATADIR%%/units/artil/ico_artil.png
 %%DATADIR%%/units/artil/unit-artil.lua
 %%DATADIR%%/units/artil/unit_artil.png
 %%DATADIR%%/units/artil/unit_artil_s.png
-%%DATADIR%%/units/assault/assault.unit.ready.wav
+%%DATADIR%%/units/assault/unit_assault_s.png
 %%DATADIR%%/units/assault/assault.unit.underattack.wav
 %%DATADIR%%/units/assault/assault_action.wav
 %%DATADIR%%/units/assault/assault_attack.wav
@@ -357,8 +419,8 @@ bin/boswars
 %%DATADIR%%/units/assault/unit-assault.lua
 %%DATADIR%%/units/assault/unit_assault.png
 %%DATADIR%%/units/assault/unit_assault_c.png
-%%DATADIR%%/units/assault/unit_assault_s.png
-%%DATADIR%%/units/bazoo/bazoo.ready.wav
+%%DATADIR%%/units/assault/assault.unit.ready.wav
+%%DATADIR%%/units/bazoo/unit_bazoo_s.png
 %%DATADIR%%/units/bazoo/bazoo.underattack.wav
 %%DATADIR%%/units/bazoo/bazoo_action.wav
 %%DATADIR%%/units/bazoo/bazoo_attack.wav
@@ -368,15 +430,19 @@ bin/boswars
 %%DATADIR%%/units/bazoo/unit-bazoo.lua
 %%DATADIR%%/units/bazoo/unit_bazoo.png
 %%DATADIR%%/units/bazoo/unit_bazoo_c.png
-%%DATADIR%%/units/bazoo/unit_bazoo_s.png
-%%DATADIR%%/units/bomber/bomber.ready.wav
+%%DATADIR%%/units/bazoo/bazoo.ready.wav
+%%DATADIR%%/units/biggunturret/gturret.png
+%%DATADIR%%/units/biggunturret/gturret_i.png
+%%DATADIR%%/units/biggunturret/gturret_s.png
+%%DATADIR%%/units/biggunturret/unit-biggunturret.lua
+%%DATADIR%%/units/bomber/missile.png
 %%DATADIR%%/units/bomber/bomber.underattack.wav
 %%DATADIR%%/units/bomber/ico_bomber.png
-%%DATADIR%%/units/bomber/missile.png
+%%DATADIR%%/units/bomber/bomber.ready.wav
 %%DATADIR%%/units/bomber/unit-bomber.lua
 %%DATADIR%%/units/bomber/unit_bomber.png
 %%DATADIR%%/units/bomber/unit_bomber_s.png
-%%DATADIR%%/units/buggy/buggy_action.wav
+%%DATADIR%%/units/buggy/unit_buggy_s.png
 %%DATADIR%%/units/buggy/buggy_attacked.wav
 %%DATADIR%%/units/buggy/buggy_die.wav
 %%DATADIR%%/units/buggy/buggy_ready.wav
@@ -384,16 +450,16 @@ bin/boswars
 %%DATADIR%%/units/buggy/ico_buggy.png
 %%DATADIR%%/units/buggy/unit-buggy.lua
 %%DATADIR%%/units/buggy/unit_buggy.png
-%%DATADIR%%/units/buggy/unit_buggy_s.png
-%%DATADIR%%/units/camera/camera.completed.wav
+%%DATADIR%%/units/buggy/buggy_action.wav
+%%DATADIR%%/units/camera/unit-camera.lua
 %%DATADIR%%/units/camera/camera.png
 %%DATADIR%%/units/camera/camera.underattack.wav
 %%DATADIR%%/units/camera/camera_c.png
 %%DATADIR%%/units/camera/camera_i.png
 %%DATADIR%%/units/camera/camera_s.png
 %%DATADIR%%/units/camera/sfx_camera.select.wav
-%%DATADIR%%/units/camera/unit-camera.lua
-%%DATADIR%%/units/camp/sfx_camp.die.wav
+%%DATADIR%%/units/camera/camera.completed.wav
+%%DATADIR%%/units/camp/unit-camp.lua
 %%DATADIR%%/units/camp/sfx_camp.select.wav
 %%DATADIR%%/units/camp/training.camp.completed.wav
 %%DATADIR%%/units/camp/training.camp.underattack.wav
@@ -401,8 +467,8 @@ bin/boswars
 %%DATADIR%%/units/camp/training_camp_c.png
 %%DATADIR%%/units/camp/training_camp_i.png
 %%DATADIR%%/units/camp/training_camp_s.png
-%%DATADIR%%/units/camp/unit-camp.lua
-%%DATADIR%%/units/cannon/cannon.completed.wav
+%%DATADIR%%/units/camp/sfx_camp.die.wav
+%%DATADIR%%/units/cannon/weapon_s.png
 %%DATADIR%%/units/cannon/cannon.png
 %%DATADIR%%/units/cannon/cannon.underattack.wav
 %%DATADIR%%/units/cannon/cannon_c.png
@@ -411,7 +477,7 @@ bin/boswars
 %%DATADIR%%/units/cannon/cannon_selected.wav
 %%DATADIR%%/units/cannon/unit-cannon.lua
 %%DATADIR%%/units/cannon/weapon.png
-%%DATADIR%%/units/cannon/weapon_s.png
+%%DATADIR%%/units/cannon/cannon.completed.wav
 %%DATADIR%%/units/chopper/chopper.ready.wav
 %%DATADIR%%/units/chopper/chopper.underattack.wav
 %%DATADIR%%/units/chopper/ico_chopper.png
@@ -420,11 +486,7 @@ bin/boswars
 %%DATADIR%%/units/chopper/unit_chopper_s.png
 %%DATADIR%%/units/corpses/build-dead-2.png
 %%DATADIR%%/units/corpses/unit-corpses.lua
-%%DATADIR%%/units/dorcoz/ico_dorcoz.png
-%%DATADIR%%/units/dorcoz/mis_plasma_sml.png
-%%DATADIR%%/units/dorcoz/unit-dorcoz.lua
-%%DATADIR%%/units/dorcoz/unit_dorcoz.png
-%%DATADIR%%/units/engineer/engineer.lua
+%%DATADIR%%/units/engineer/unit_engineer_s.png
 %%DATADIR%%/units/engineer/engineer.ready.wav
 %%DATADIR%%/units/engineer/engineer.underattack.wav
 %%DATADIR%%/units/engineer/engineer_action.wav
@@ -435,8 +497,8 @@ bin/boswars
 %%DATADIR%%/units/engineer/ico_engineer.png
 %%DATADIR%%/units/engineer/unit_engineer.png
 %%DATADIR%%/units/engineer/unit_engineer_c.png
-%%DATADIR%%/units/engineer/unit_engineer_s.png
-%%DATADIR%%/units/grenadier/grenadier.ready.wav
+%%DATADIR%%/units/engineer/engineer.lua
+%%DATADIR%%/units/grenadier/unit_grenadier_s.png
 %%DATADIR%%/units/grenadier/grenadier.underattack.wav
 %%DATADIR%%/units/grenadier/grenadier_action.wav
 %%DATADIR%%/units/grenadier/grenadier_attack.wav
@@ -446,8 +508,8 @@ bin/boswars
 %%DATADIR%%/units/grenadier/unit-grenadier.lua
 %%DATADIR%%/units/grenadier/unit_grenadier.png
 %%DATADIR%%/units/grenadier/unit_grenadier_c.png
-%%DATADIR%%/units/grenadier/unit_grenadier_s.png
-%%DATADIR%%/units/gturret/gturret.completed.wav
+%%DATADIR%%/units/grenadier/grenadier.ready.wav
+%%DATADIR%%/units/gturret/unit-gturret.lua
 %%DATADIR%%/units/gturret/gturret.png
 %%DATADIR%%/units/gturret/gturret.underattack.wav
 %%DATADIR%%/units/gturret/gturret_attack.wav
@@ -455,8 +517,8 @@ bin/boswars
 %%DATADIR%%/units/gturret/gturret_i.png
 %%DATADIR%%/units/gturret/gturret_s.png
 %%DATADIR%%/units/gturret/gturret_select.wav
-%%DATADIR%%/units/gturret/unit-gturret.lua
-%%DATADIR%%/units/harvester/harvester.completed.wav
+%%DATADIR%%/units/gturret/gturret.completed.wav
+%%DATADIR%%/units/harvester/unit_harv_s.png
 %%DATADIR%%/units/harvester/harvester.underattack.wav
 %%DATADIR%%/units/harvester/harvester_action.wav
 %%DATADIR%%/units/harvester/harvester_attack.wav
@@ -465,8 +527,12 @@ bin/boswars
 %%DATADIR%%/units/harvester/ico_harv.png
 %%DATADIR%%/units/harvester/unit-harvester.lua
 %%DATADIR%%/units/harvester/unit_harv.png
-%%DATADIR%%/units/harvester/unit_harv_s.png
-%%DATADIR%%/units/hospital/hospital.completed.wav
+%%DATADIR%%/units/harvester/harvester.completed.wav
+%%DATADIR%%/units/heli/ico_heli.png
+%%DATADIR%%/units/heli/unit-heli.lua
+%%DATADIR%%/units/heli/unit_heli.png
+%%DATADIR%%/units/heli/unit_heli_s.png
+%%DATADIR%%/units/hospital/unit-hospital.lua
 %%DATADIR%%/units/hospital/hospital.png
 %%DATADIR%%/units/hospital/hospital.underattack.wav
 %%DATADIR%%/units/hospital/hospital_c.png
@@ -474,18 +540,22 @@ bin/boswars
 %%DATADIR%%/units/hospital/hospital_s.png
 %%DATADIR%%/units/hospital/sfx_hosp.die.wav
 %%DATADIR%%/units/hospital/sfx_hosp.select.wav
-%%DATADIR%%/units/hospital/unit-hospital.lua
-%%DATADIR%%/units/hotspot/hotspot.png
-%%DATADIR%%/units/hotspot/hotspot_i.png
-%%DATADIR%%/units/hotspot/unit-hotspot.lua
-%%DATADIR%%/units/jet/ico_jet.png
+%%DATADIR%%/units/hospital/hospital.completed.wav
+%%DATADIR%%/units/aircraftfactory/aircraftfactory_c.png
+%%DATADIR%%/units/aircraftfactory/aircraftfactory.png
+%%DATADIR%%/units/aircraftfactory/aircraftfactory.underattack.wav
+%%DATADIR%%/units/aircraftfactory/aircraftfactory.completed.wav
+%%DATADIR%%/units/aircraftfactory/aircraftfactory_i.png
+%%DATADIR%%/units/aircraftfactory/aircraftfactory_s.png
+%%DATADIR%%/units/aircraftfactory/unit-aircraftfactory.lua
+%%DATADIR%%/units/jet/missile.png
 %%DATADIR%%/units/jet/jet.ready.wav
 %%DATADIR%%/units/jet/jet.underattack.wav
-%%DATADIR%%/units/jet/missile.png
+%%DATADIR%%/units/jet/ico_jet.png
 %%DATADIR%%/units/jet/unit-jet.lua
 %%DATADIR%%/units/jet/unit_jet.png
 %%DATADIR%%/units/jet/unit_jet_s.png
-%%DATADIR%%/units/magmapump/magmapump.completed.wav
+%%DATADIR%%/units/magmapump/unit-magmapump.lua
 %%DATADIR%%/units/magmapump/magmapump.png
 %%DATADIR%%/units/magmapump/magmapump.select.wav
 %%DATADIR%%/units/magmapump/magmapump.underattack.wav
@@ -493,8 +563,8 @@ bin/boswars
 %%DATADIR%%/units/magmapump/magmapump_i.png
 %%DATADIR%%/units/magmapump/magmapump_s.png
 %%DATADIR%%/units/magmapump/sfx_pplnt.die.wav
-%%DATADIR%%/units/magmapump/unit-magmapump.lua
-%%DATADIR%%/units/medic/heal.png
+%%DATADIR%%/units/magmapump/magmapump.completed.wav
+%%DATADIR%%/units/medic/unit_medic_s.png
 %%DATADIR%%/units/medic/ico_heal.png
 %%DATADIR%%/units/medic/ico_medic.png
 %%DATADIR%%/units/medic/medic.ready.wav
@@ -506,13 +576,13 @@ bin/boswars
 %%DATADIR%%/units/medic/unit-medic.lua
 %%DATADIR%%/units/medic/unit_medic.png
 %%DATADIR%%/units/medic/unit_medic_c.png
-%%DATADIR%%/units/medic/unit_medic_s.png
+%%DATADIR%%/units/medic/heal.png
 %%DATADIR%%/units/missilesilo/missile_silo.png
 %%DATADIR%%/units/missilesilo/missile_silo_c.png
 %%DATADIR%%/units/missilesilo/missile_silo_i.png
 %%DATADIR%%/units/missilesilo/missile_silo_s.png
 %%DATADIR%%/units/missilesilo/unit-missilesilo.lua
-%%DATADIR%%/units/morels/morel_1.png
+%%DATADIR%%/units/morels/unit-morels.lua
 %%DATADIR%%/units/morels/morel_1i.png
 %%DATADIR%%/units/morels/morel_1s.png
 %%DATADIR%%/units/morels/morel_2.png
@@ -533,8 +603,8 @@ bin/boswars
 %%DATADIR%%/units/morels/morel_7.png
 %%DATADIR%%/units/morels/morel_7i.png
 %%DATADIR%%/units/morels/morel_7s.png
-%%DATADIR%%/units/morels/unit-morels.lua
-%%DATADIR%%/units/nukeplant/nukeplant.png
+%%DATADIR%%/units/morels/morel_1.png
+%%DATADIR%%/units/nukeplant/unit-nukeplant.lua
 %%DATADIR%%/units/nukeplant/nukeplant_c.png
 %%DATADIR%%/units/nukeplant/nukeplant_i.png
 %%DATADIR%%/units/nukeplant/nukeplant_s.png
@@ -542,15 +612,15 @@ bin/boswars
 %%DATADIR%%/units/nukeplant/power.plant.underattack.wav
 %%DATADIR%%/units/nukeplant/sfx_pplnt.die.wav
 %%DATADIR%%/units/nukeplant/sfx_pplnt.select.wav
-%%DATADIR%%/units/nukeplant/unit-nukeplant.lua
-%%DATADIR%%/units/plants/pitcher.png
+%%DATADIR%%/units/nukeplant/nukeplant.png
+%%DATADIR%%/units/plants/rafflesia.png
 %%DATADIR%%/units/plants/pitcher_icon.png
 %%DATADIR%%/units/plants/pitcher_shadow.png
-%%DATADIR%%/units/plants/rafflesia.png
+%%DATADIR%%/units/plants/pitcher.png
 %%DATADIR%%/units/plants/rafflesia_icon.png
 %%DATADIR%%/units/plants/rafflesia_shadow.png
 %%DATADIR%%/units/plants/unit-plant.lua
-%%DATADIR%%/units/powerplant/power.plant.completed.wav
+%%DATADIR%%/units/powerplant/unit-powerplant.lua
 %%DATADIR%%/units/powerplant/power.plant.underattack.wav
 %%DATADIR%%/units/powerplant/powerplant.png
 %%DATADIR%%/units/powerplant/powerplant_c.png
@@ -558,15 +628,15 @@ bin/boswars
 %%DATADIR%%/units/powerplant/powerplant_s.png
 %%DATADIR%%/units/powerplant/sfx_pplnt.die.wav
 %%DATADIR%%/units/powerplant/sfx_pplnt.select.wav
-%%DATADIR%%/units/powerplant/unit-powerplant.lua
-%%DATADIR%%/units/radar/radar.completed.wav
+%%DATADIR%%/units/powerplant/power.plant.completed.wav
+%%DATADIR%%/units/radar/radar_i.png
 %%DATADIR%%/units/radar/radar.png
 %%DATADIR%%/units/radar/radar.underattack.wav
-%%DATADIR%%/units/radar/radar_i.png
+%%DATADIR%%/units/radar/radar.completed.wav
 %%DATADIR%%/units/radar/radar_s.png
 %%DATADIR%%/units/radar/sfx_rdar.select.wav
 %%DATADIR%%/units/radar/unit-radar.lua
-%%DATADIR%%/units/rocks/rock_1.png
+%%DATADIR%%/units/rocks/unit-rocks.lua
 %%DATADIR%%/units/rocks/rock_1i.png
 %%DATADIR%%/units/rocks/rock_1s.png
 %%DATADIR%%/units/rocks/rock_2.png
@@ -584,7 +654,7 @@ bin/boswars
 %%DATADIR%%/units/rocks/rock_6.png
 %%DATADIR%%/units/rocks/rock_6i.png
 %%DATADIR%%/units/rocks/rock_6s.png
-%%DATADIR%%/units/rocks/unit-rocks.lua
+%%DATADIR%%/units/rocks/rock_1.png
 %%DATADIR%%/units/rocksfield/ico_rocks_field.png
 %%DATADIR%%/units/rocksfield/rocks_field.png
 %%DATADIR%%/units/rocksfield/rocks_field_s.png
@@ -614,7 +684,7 @@ bin/boswars
 %%DATADIR%%/units/tree04/tree04.png
 %%DATADIR%%/units/tree04/tree04_s.png
 %%DATADIR%%/units/tree04/unit-tree04.lua
-%%DATADIR%%/units/vault/sfx_fort.die.wav
+%%DATADIR%%/units/vault/vault_s.png
 %%DATADIR%%/units/vault/sfx_fort.select.wav
 %%DATADIR%%/units/vault/vault-i.png
 %%DATADIR%%/units/vault/vault.completed.wav
@@ -622,8 +692,8 @@ bin/boswars
 %%DATADIR%%/units/vault/vault.png
 %%DATADIR%%/units/vault/vault.underattack.wav
 %%DATADIR%%/units/vault/vault_c.png
-%%DATADIR%%/units/vault/vault_s.png
-%%DATADIR%%/units/vehiclefactory/sfx_vfac.die.wav
+%%DATADIR%%/units/vault/sfx_fort.die.wav
+%%DATADIR%%/units/vehiclefactory/vehiclefactory.lua
 %%DATADIR%%/units/vehiclefactory/sfx_vfac.select.wav
 %%DATADIR%%/units/vehiclefactory/vehicle.factory.completed.wav
 %%DATADIR%%/units/vehiclefactory/vehicle.factory.underattack.wav
@@ -631,45 +701,12 @@ bin/boswars
 %%DATADIR%%/units/vehiclefactory/vehicle_factory.png
 %%DATADIR%%/units/vehiclefactory/vehicle_factory_i.png
 %%DATADIR%%/units/vehiclefactory/vehicle_factory_s.png
-%%DATADIR%%/units/vehiclefactory/vehiclefactory.lua
+%%DATADIR%%/units/vehiclefactory/sfx_vfac.die.wav
 %%DATADIR%%/units/weakhotspot/hotspot.png
 %%DATADIR%%/units/weakhotspot/hotspot_i.png
 %%DATADIR%%/units/weakhotspot/unit-weakhotspot.lua
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/README-SDL.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/development.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/gcclibs-copyright.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/gpl.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/guichan-copyright.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/install.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lua5-copyright.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/media.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/ai.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/config.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/findlua.py
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/game.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/magic.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/makeindex.py
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/mappresentation.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/mapsetup.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/research.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/savegame.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/showindex.py
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/sound.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/tileset.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/triggers.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/ui.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/unittype.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/stratagus-changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/tolua-copyright.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/xiph-copyright.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc/scripts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/licenses/boswars-2.6.1
+@dirrm share/licenses
 @dirrm %%DATADIR%%/units/weakhotspot
 @dirrm %%DATADIR%%/units/vehiclefactory
 @dirrm %%DATADIR%%/units/vault
@@ -690,13 +727,13 @@ bin/boswars
 @dirrm %%DATADIR%%/units/medic
 @dirrm %%DATADIR%%/units/magmapump
 @dirrm %%DATADIR%%/units/jet
-@dirrm %%DATADIR%%/units/hotspot
+@dirrm %%DATADIR%%/units/aircraftfactory
 @dirrm %%DATADIR%%/units/hospital
+@dirrm %%DATADIR%%/units/heli
 @dirrm %%DATADIR%%/units/harvester
 @dirrm %%DATADIR%%/units/gturret
 @dirrm %%DATADIR%%/units/grenadier
 @dirrm %%DATADIR%%/units/engineer
-@dirrm %%DATADIR%%/units/dorcoz
 @dirrm %%DATADIR%%/units/corpses
 @dirrm %%DATADIR%%/units/chopper
 @dirrm %%DATADIR%%/units/cannon
@@ -704,58 +741,47 @@ bin/boswars
 @dirrm %%DATADIR%%/units/camera
 @dirrm %%DATADIR%%/units/buggy
 @dirrm %%DATADIR%%/units/bomber
+@dirrm %%DATADIR%%/units/biggunturret
 @dirrm %%DATADIR%%/units/bazoo
 @dirrm %%DATADIR%%/units/assault
 @dirrm %%DATADIR%%/units/artil
 @dirrm %%DATADIR%%/units/apcs
 @dirrm %%DATADIR%%/units/antharus
-@dirrm %%DATADIR%%/units/aircraftfactory
+@dirrm %%DATADIR%%/units/hotspot
 @dirrm %%DATADIR%%/units
 @dirrm %%DATADIR%%/sounds/ui
 @dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/scripts/tilesets
+@dirrm %%DATADIR%%/scripts/ais
 @dirrm %%DATADIR%%/scripts/menus/ingame
 @dirrm %%DATADIR%%/scripts/menus
-@dirrm %%DATADIR%%/scripts/ais
 @dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/patches/grass
+@dirrm %%DATADIR%%/patches
 @dirrm %%DATADIR%%/maps/wetlands02.map
 @dirrm %%DATADIR%%/maps/wetlands01.map
 @dirrm %%DATADIR%%/maps/river.map
 @dirrm %%DATADIR%%/maps/patches.map
-@dirrm %%DATADIR%%/maps/multiplayer.map
-@dirrm %%DATADIR%%/maps/lake.map
-@dirrm %%DATADIR%%/maps/labyrinth.map
+@dirrm %%DATADIR%%/maps/lava-river.map
 @dirrm %%DATADIR%%/maps/islandwar.map
-@dirrm %%DATADIR%%/maps/highlands.map
+@dirrm %%DATADIR%%/maps/hospitality.map
 @dirrm %%DATADIR%%/maps/guerillawarfare.map
-@dirrm %%DATADIR%%/maps/forest.map
-@dirrm %%DATADIR%%/maps/cross.map
+@dirrm %%DATADIR%%/maps/4on4.map
 @dirrm %%DATADIR%%/maps/canyon.map
 @dirrm %%DATADIR%%/maps/campaigns/tutorial/tutorial.map
 @dirrm %%DATADIR%%/maps/campaigns/tutorial
-@dirrm %%DATADIR%%/maps/campaigns/elites/The_River.map
-@dirrm %%DATADIR%%/maps/campaigns/elites/Shield_of_Wasteland.map
-@dirrm %%DATADIR%%/maps/campaigns/elites/Savoy_Steps.map
-@dirrm %%DATADIR%%/maps/campaigns/elites/Savoy_Lake.map
-@dirrm %%DATADIR%%/maps/campaigns/elites/Rochebrune.map
-@dirrm %%DATADIR%%/maps/campaigns/elites/Green_Valley.map
-@dirrm %%DATADIR%%/maps/campaigns/elites/Fort_Savoy.map
-@dirrm %%DATADIR%%/maps/campaigns/elites/Buffy_Forest.map
-@dirrm %%DATADIR%%/maps/campaigns/elites/Bellegarde.map
-@dirrm %%DATADIR%%/maps/campaigns/elites/Aiglier.map
-@dirrm %%DATADIR%%/maps/campaigns/elites
 @dirrm %%DATADIR%%/maps/campaigns
 @dirrm %%DATADIR%%/maps/bridge2far.map
 @dirrm %%DATADIR%%/maps/bridge.map
-@dirrm %%DATADIR%%/maps/braza.map
+@dirrm %%DATADIR%%/maps/bottleneck.map
 @dirrm %%DATADIR%%/maps/battlefield.map
 @dirrm %%DATADIR%%/maps/antarticum.map
+@dirrm %%DATADIR%%/maps/go-east.map
 @dirrm %%DATADIR%%/maps
 @dirrm %%DATADIR%%/languages
 @dirrm %%DATADIR%%/intro
+@dirrm %%DATADIR%%/graphics/ui/patcheditor
 @dirrm %%DATADIR%%/graphics/ui/cursors
 @dirrm %%DATADIR%%/graphics/ui
-@dirrm %%DATADIR%%/graphics/tiles
 @dirrm %%DATADIR%%/graphics/screens
 @dirrm %%DATADIR%%/graphics/neutral/units
 @dirrm %%DATADIR%%/graphics/neutral
@@ -764,6 +790,8 @@ bin/boswars
 @dirrm %%DATADIR%%/graphics/explosions
 @dirrm %%DATADIR%%/graphics
 @dirrm %%DATADIR%%/campaigns/tutorial
-@dirrm %%DATADIR%%/campaigns/elites
+@dirrm %%DATADIR%%/campaigns/swindler
 @dirrm %%DATADIR%%/campaigns
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%