- Update to version 2007.610.

- Mark Linux version as DEPRECATED (it is to be decided if it will remain in
  the tree) and BROKEN (needs dependencies which aren't in the tree or are
  outdated). In the meantime use the native version.

12 files changed, 615 insertions, 142 deletions

diff --git a/games/alienarena-data/Makefile b/games/alienarena-data/Makefile
index 62e1bae3f2ea..e984e91fef71 100644
--- a/games/alienarena-data/Makefile
+++ b/games/alienarena-data/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2007.605
+PORTVERSION=	2007.610
 CATEGORIES=	games
-MASTER_SITES=	http://offload1.icculus.org/alienarena/files/ \
-		http://distfiles.gentoo.org/distfiles/
+MASTER_SITES=	ftp://ftp.simtel.com/pub/gamezone/31/5/17/
 PKGNAMESUFFIX=	-data
-DISTNAME=	${PORTNAME}2007-20070613-linux
+DISTNAME=	${PORTNAME}2007-20071011-linux
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Alien Arena 2006 (data)
@@ -24,14 +23,15 @@ WRKSRC=		${WRKDIR}/${PORTNAME}2007
 .include <bsd.port.pre.mk>
 
 post-extract:
-	@cd ${WRKSRC}/arena && ${RM} *.dll *.so
-	@cd ${WRKSRC}/data1 && ${RM} *.dll *.so
+	@cd ${WRKSRC} && ${RM} arena/*.so data1/*.so
 
 do-install:
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC} && ${CP} -R arena botinfo data1 ${DATADIR}
 	@${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE}
 	@${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
+	${INSTALL_DATA} ${WRKSRC}/aa.png \
+		${PREFIX}/share/pixmaps/${PORTNAME}.png
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
diff --git a/games/alienarena-data/distinfo b/games/alienarena-data/distinfo
index 1877022f3f02..f2ad41d5aa9f 100644
--- a/games/alienarena-data/distinfo
+++ b/games/alienarena-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (alienarena2007-20070613-linux.zip) = 65d2948fa636cbc28c82da2264df2fea
-SHA256 (alienarena2007-20070613-linux.zip) = 593a7b106768abaff4c55f0b06dc20b5914601516c98ca5dfe93526de0559933
-SIZE (alienarena2007-20070613-linux.zip) = 223204178
+MD5 (alienarena2007-20071011-linux.zip) = 7ebb0dfeec4be80311921a075379c8dc
+SHA256 (alienarena2007-20071011-linux.zip) = 33036bd0dec77ae06c113d8e06718bd6f9e42efb634ee304c3fd9d48184c2e20
+SIZE (alienarena2007-20071011-linux.zip) = 245067302
diff --git a/games/alienarena-data/pkg-plist b/games/alienarena-data/pkg-plist
index 012af85982fa..7db2864e4272 100644
--- a/games/alienarena-data/pkg-plist
+++ b/games/alienarena-data/pkg-plist
@@ -14,44 +14,53 @@
 %%DATADIR%%/botinfo/Ghidora.cfg
 %%DATADIR%%/botinfo/Hedorah.cfg
 %%DATADIR%%/botinfo/Johnny.cfg
+%%DATADIR%%/botinfo/Martian_is_lame.cfg
+%%DATADIR%%/botinfo/Martian_jr.cfg
+%%DATADIR%%/botinfo/Martian_owns_u.cfg
 %%DATADIR%%/botinfo/Mogera.cfg
 %%DATADIR%%/botinfo/Mothra.cfg
+%%DATADIR%%/botinfo/Real_Martian.cfg
 %%DATADIR%%/botinfo/Squirtney.cfg
 %%DATADIR%%/botinfo/Stryker.cfg
 %%DATADIR%%/botinfo/Yoz.cfg
 %%DATADIR%%/botinfo/allbots.tmp
+%%DATADIR%%/botinfo/aoa-atlantis.tmp
 %%DATADIR%%/botinfo/aoa-frost.tmp
 %%DATADIR%%/botinfo/aoa-morpheus.tmp
-%%DATADIR%%/botinfo/aoa2.tmp
 %%DATADIR%%/botinfo/db-chromium.tmp
 %%DATADIR%%/botinfo/db-icarus.tmp
 %%DATADIR%%/botinfo/db-vesuvius.tmp
+%%DATADIR%%/botinfo/dm-atlantis.tmp
 %%DATADIR%%/botinfo/dm-babel.tmp
 %%DATADIR%%/botinfo/dm-beyond.tmp
+%%DATADIR%%/botinfo/dm-bloodfactory.tmp
 %%DATADIR%%/botinfo/dm-chasmatic.tmp
 %%DATADIR%%/botinfo/dm-crucible.tmp
 %%DATADIR%%/botinfo/dm-deimos.tmp
 %%DATADIR%%/botinfo/dm-dread.tmp
 %%DATADIR%%/botinfo/dm-dynamo2.tmp
-%%DATADIR%%/botinfo/dm-electro.tmp
 %%DATADIR%%/botinfo/dm-europa.tmp
 %%DATADIR%%/botinfo/dm-frontier2.tmp
 %%DATADIR%%/botinfo/dm-furious.tmp
 %%DATADIR%%/botinfo/dm-grindery.tmp
+%%DATADIR%%/botinfo/dm-horus.tmp
+%%DATADIR%%/botinfo/dm-leviathan.tmp
 %%DATADIR%%/botinfo/dm-obsidian2.tmp
 %%DATADIR%%/botinfo/dm-omega.tmp
 %%DATADIR%%/botinfo/dm-saucer.tmp
 %%DATADIR%%/botinfo/dm-titan.tmp
 %%DATADIR%%/botinfo/dm-vesuvius.tmp
 %%DATADIR%%/botinfo/dm-violator.tmp
+%%DATADIR%%/botinfo/dm-zion.tmp
+%%DATADIR%%/botinfo/nav/aoa-atlantis.nod
 %%DATADIR%%/botinfo/nav/aoa-frost.nod
 %%DATADIR%%/botinfo/nav/aoa-morpheus.nod
-%%DATADIR%%/botinfo/nav/aoa2.nod
 %%DATADIR%%/botinfo/nav/cp-grindery.nod
+%%DATADIR%%/botinfo/nav/ctf-atlantis.nod
 %%DATADIR%%/botinfo/nav/ctf-chromium.nod
 %%DATADIR%%/botinfo/nav/ctf-europa.nod
 %%DATADIR%%/botinfo/nav/ctf-frost.nod
-%%DATADIR%%/botinfo/nav/ctf-icarus.nod
+%%DATADIR%%/botinfo/nav/ctf-icarus2.nod
 %%DATADIR%%/botinfo/nav/ctf-stronghold.nod
 %%DATADIR%%/botinfo/nav/ctf-terminal.nod
 %%DATADIR%%/botinfo/nav/ctf-titan.nod
@@ -59,31 +68,35 @@
 %%DATADIR%%/botinfo/nav/db-chromium.nod
 %%DATADIR%%/botinfo/nav/db-icarus.nod
 %%DATADIR%%/botinfo/nav/db-vesuvius.nod
+%%DATADIR%%/botinfo/nav/dm-atlantis.nod
 %%DATADIR%%/botinfo/nav/dm-babel.nod
 %%DATADIR%%/botinfo/nav/dm-beyond.nod
+%%DATADIR%%/botinfo/nav/dm-blood.nod
+%%DATADIR%%/botinfo/nav/dm-bloodfactory.nod
 %%DATADIR%%/botinfo/nav/dm-chasmatic.nod
 %%DATADIR%%/botinfo/nav/dm-crucible.nod
 %%DATADIR%%/botinfo/nav/dm-deimos.nod
 %%DATADIR%%/botinfo/nav/dm-dread.nod
 %%DATADIR%%/botinfo/nav/dm-dynamo2.nod
-%%DATADIR%%/botinfo/nav/dm-electro.nod
 %%DATADIR%%/botinfo/nav/dm-europa.nod
 %%DATADIR%%/botinfo/nav/dm-frontier2.nod
 %%DATADIR%%/botinfo/nav/dm-furious.nod
 %%DATADIR%%/botinfo/nav/dm-grindery.nod
+%%DATADIR%%/botinfo/nav/dm-horus.nod
+%%DATADIR%%/botinfo/nav/dm-leviathan.nod
 %%DATADIR%%/botinfo/nav/dm-obsidian2.nod
 %%DATADIR%%/botinfo/nav/dm-omega.nod
 %%DATADIR%%/botinfo/nav/dm-saucer.nod
 %%DATADIR%%/botinfo/nav/dm-titan.nod
 %%DATADIR%%/botinfo/nav/dm-vesuvius.nod
 %%DATADIR%%/botinfo/nav/dm-violator.nod
+%%DATADIR%%/botinfo/nav/dm-zion.nod
 %%DATADIR%%/botinfo/nav/tca-europa.nod
 %%DATADIR%%/botinfo/nav/tca-frost.nod
 %%DATADIR%%/botinfo/nav/tca-titan.nod
-%%DATADIR%%/botinfo/nav/tourney0.nod
+%%DATADIR%%/botinfo/nav/tca-zion.nod
 %%DATADIR%%/botinfo/sample.cfg
 %%DATADIR%%/botinfo/team.tmp
-%%DATADIR%%/botinfo/tourney0.tmp
 %%DATADIR%%/data1/default.cfg
 %%DATADIR%%/data1/env/alienbk.tga
 %%DATADIR%%/data1/env/aliendn.tga
@@ -91,6 +104,12 @@
 %%DATADIR%%/data1/env/alienlf.tga
 %%DATADIR%%/data1/env/alienrt.tga
 %%DATADIR%%/data1/env/alienup.tga
+%%DATADIR%%/data1/env/egyptbk.tga
+%%DATADIR%%/data1/env/egyptdn.tga
+%%DATADIR%%/data1/env/egyptft.tga
+%%DATADIR%%/data1/env/egyptlf.tga
+%%DATADIR%%/data1/env/egyptrt.tga
+%%DATADIR%%/data1/env/egyptup.tga
 %%DATADIR%%/data1/env/greenbk.tga
 %%DATADIR%%/data1/env/greendn.tga
 %%DATADIR%%/data1/env/greenft.tga
@@ -109,30 +128,32 @@
 %%DATADIR%%/data1/env/martianlf.tga
 %%DATADIR%%/data1/env/martianrt.tga
 %%DATADIR%%/data1/env/martianup.tga
+%%DATADIR%%/data1/env/seabk.tga
+%%DATADIR%%/data1/env/seadn.tga
+%%DATADIR%%/data1/env/seaft.tga
+%%DATADIR%%/data1/env/sealf.tga
+%%DATADIR%%/data1/env/seart.tga
+%%DATADIR%%/data1/env/seaup.tga
 %%DATADIR%%/data1/env/space1bk.tga
 %%DATADIR%%/data1/env/space1dn.tga
 %%DATADIR%%/data1/env/space1ft.tga
 %%DATADIR%%/data1/env/space1lf.tga
 %%DATADIR%%/data1/env/space1rt.tga
 %%DATADIR%%/data1/env/space1up.tga
-%%DATADIR%%/data1/fonts/bold.tga
 %%DATADIR%%/data1/fonts/default.tga
 %%DATADIR%%/data1/fonts/digital.tga
+%%DATADIR%%/data1/fonts/fat.tga
 %%DATADIR%%/data1/gfx/aaglow.tga
 %%DATADIR%%/data1/gfx/adrenalbase.tga
 %%DATADIR%%/data1/gfx/adrenalmask.tga
 %%DATADIR%%/data1/gfx/alienarena2gl.tga
-%%DATADIR%%/data1/gfx/armorbase.tga
-%%DATADIR%%/data1/gfx/armorfx.tga
-%%DATADIR%%/data1/gfx/armormask.tga
-%%DATADIR%%/data1/gfx/armormask2.tga
 %%DATADIR%%/data1/gfx/bannerfx.tga
 %%DATADIR%%/data1/gfx/bconsole.tga
 %%DATADIR%%/data1/gfx/bconsole2.tga
 %%DATADIR%%/data1/gfx/beamfx.tga
-%%DATADIR%%/data1/gfx/beammask.tga
 %%DATADIR%%/data1/gfx/blasterfx.tga
 %%DATADIR%%/data1/gfx/bluelightning.tga
+%%DATADIR%%/data1/gfx/bubbles.tga
 %%DATADIR%%/data1/gfx/caustics.tga
 %%DATADIR%%/data1/gfx/chrome.tga
 %%DATADIR%%/data1/gfx/citymask.tga
@@ -140,6 +161,7 @@
 %%DATADIR%%/data1/gfx/comp2.tga
 %%DATADIR%%/data1/gfx/destoroyahfx.tga
 %%DATADIR%%/data1/gfx/disruptormask.tga
+%%DATADIR%%/data1/gfx/egypt5_mask.tga
 %%DATADIR%%/data1/gfx/electrics.tga
 %%DATADIR%%/data1/gfx/electrics2.tga
 %%DATADIR%%/data1/gfx/electrics3.tga
@@ -149,6 +171,7 @@
 %%DATADIR%%/data1/gfx/flares/flare0.tga
 %%DATADIR%%/data1/gfx/flash.tga
 %%DATADIR%%/data1/gfx/gamarafx.tga
+%%DATADIR%%/data1/gfx/gold.tga
 %%DATADIR%%/data1/gfx/grapplefx.tga
 %%DATADIR%%/data1/gfx/grchrome.tga
 %%DATADIR%%/data1/gfx/green.tga
@@ -164,6 +187,8 @@
 %%DATADIR%%/data1/gfx/m_banner_main_fx.tga
 %%DATADIR%%/data1/gfx/m_banner_main_mask.tga
 %%DATADIR%%/data1/gfx/m_sel_fx.tga
+%%DATADIR%%/data1/gfx/menubar1.tga
+%%DATADIR%%/data1/gfx/menubar2.tga
 %%DATADIR%%/data1/gfx/metal3glow.tga
 %%DATADIR%%/data1/gfx/noise.tga
 %%DATADIR%%/data1/gfx/orange.tga
@@ -175,6 +200,7 @@
 %%DATADIR%%/data1/gfx/r_lightning.tga
 %%DATADIR%%/data1/gfx/radar/around.tga
 %%DATADIR%%/data1/gfx/radar/radarmap.tga
+%%DATADIR%%/data1/gfx/rain.tga
 %%DATADIR%%/data1/gfx/red.tga
 %%DATADIR%%/data1/gfx/redlightning.tga
 %%DATADIR%%/data1/gfx/reflect.tga
@@ -185,10 +211,13 @@
 %%DATADIR%%/data1/gfx/strykerfx.tga
 %%DATADIR%%/data1/gfx/vaporbase.tga
 %%DATADIR%%/data1/gfx/vapormask.tga
+%%DATADIR%%/data1/gfx/violatorfx.tga
 %%DATADIR%%/data1/gfx/water/distort1.tga
 %%DATADIR%%/data1/gfx/water/normal1.tga
 %%DATADIR%%/data1/gfx/yellow.tga
 %%DATADIR%%/data1/gfx/yellowline.tga
+%%DATADIR%%/data1/levelshots/aoa-atlantis.tga
+%%DATADIR%%/data1/levelshots/aoa-atlantis.txt
 %%DATADIR%%/data1/levelshots/aoa-frost.tga
 %%DATADIR%%/data1/levelshots/aoa-frost.txt
 %%DATADIR%%/data1/levelshots/aoa-morpheus.tga
@@ -196,14 +225,16 @@
 %%DATADIR%%/data1/levelshots/aoa2.tga
 %%DATADIR%%/data1/levelshots/cp-grindery.tga
 %%DATADIR%%/data1/levelshots/cp-grindery.txt
+%%DATADIR%%/data1/levelshots/ctf-atlantis.tga
+%%DATADIR%%/data1/levelshots/ctf-atlantis.txt
 %%DATADIR%%/data1/levelshots/ctf-chromium.tga
 %%DATADIR%%/data1/levelshots/ctf-chromium.txt
 %%DATADIR%%/data1/levelshots/ctf-europa.tga
 %%DATADIR%%/data1/levelshots/ctf-europa.txt
 %%DATADIR%%/data1/levelshots/ctf-frost.tga
 %%DATADIR%%/data1/levelshots/ctf-frost.txt
-%%DATADIR%%/data1/levelshots/ctf-icarus.tga
-%%DATADIR%%/data1/levelshots/ctf-icarus.txt
+%%DATADIR%%/data1/levelshots/ctf-icarus2.tga
+%%DATADIR%%/data1/levelshots/ctf-icarus2.txt
 %%DATADIR%%/data1/levelshots/ctf-stronghold.tga
 %%DATADIR%%/data1/levelshots/ctf-strongholdl.txt
 %%DATADIR%%/data1/levelshots/ctf-terminal.tga
@@ -218,10 +249,14 @@
 %%DATADIR%%/data1/levelshots/db-icarus.txt
 %%DATADIR%%/data1/levelshots/db-vesuvius.tga
 %%DATADIR%%/data1/levelshots/db-vesuvius.txt
+%%DATADIR%%/data1/levelshots/dm-atlantis.tga
+%%DATADIR%%/data1/levelshots/dm-atlantis.txt
 %%DATADIR%%/data1/levelshots/dm-babel.tga
 %%DATADIR%%/data1/levelshots/dm-babel.txt
 %%DATADIR%%/data1/levelshots/dm-beyond.tga
 %%DATADIR%%/data1/levelshots/dm-beyond.txt
+%%DATADIR%%/data1/levelshots/dm-bloodfactory.tga
+%%DATADIR%%/data1/levelshots/dm-bloodfactory.txt
 %%DATADIR%%/data1/levelshots/dm-chasmatic.tga
 %%DATADIR%%/data1/levelshots/dm-chasmatic.txt
 %%DATADIR%%/data1/levelshots/dm-crucible.tga
@@ -232,8 +267,6 @@
 %%DATADIR%%/data1/levelshots/dm-dread.txt
 %%DATADIR%%/data1/levelshots/dm-dynamo2.tga
 %%DATADIR%%/data1/levelshots/dm-dynamo2.txt
-%%DATADIR%%/data1/levelshots/dm-electro.tga
-%%DATADIR%%/data1/levelshots/dm-electro.txt
 %%DATADIR%%/data1/levelshots/dm-europa.tga
 %%DATADIR%%/data1/levelshots/dm-europa.txt
 %%DATADIR%%/data1/levelshots/dm-frontier2.tga
@@ -242,6 +275,10 @@
 %%DATADIR%%/data1/levelshots/dm-furious.txt
 %%DATADIR%%/data1/levelshots/dm-grindery.tga
 %%DATADIR%%/data1/levelshots/dm-grindery.txt
+%%DATADIR%%/data1/levelshots/dm-horus.tga
+%%DATADIR%%/data1/levelshots/dm-horus.txt
+%%DATADIR%%/data1/levelshots/dm-leviathan.tga
+%%DATADIR%%/data1/levelshots/dm-leviathan.txt
 %%DATADIR%%/data1/levelshots/dm-obsidian2.tga
 %%DATADIR%%/data1/levelshots/dm-obsidian2.txt
 %%DATADIR%%/data1/levelshots/dm-omega.tga
@@ -254,24 +291,27 @@
 %%DATADIR%%/data1/levelshots/dm-vesuvius.txt
 %%DATADIR%%/data1/levelshots/dm-violator.tga
 %%DATADIR%%/data1/levelshots/dm-violator.txt
+%%DATADIR%%/data1/levelshots/dm-zion.tga
+%%DATADIR%%/data1/levelshots/dm-zion.txt
 %%DATADIR%%/data1/levelshots/tca-europa.tga
 %%DATADIR%%/data1/levelshots/tca-europa.txt
 %%DATADIR%%/data1/levelshots/tca-frost.tga
 %%DATADIR%%/data1/levelshots/tca-frost.txt
 %%DATADIR%%/data1/levelshots/tca-titan.tga
 %%DATADIR%%/data1/levelshots/tca-titan.txt
-%%DATADIR%%/data1/levelshots/tourney0.tga
-%%DATADIR%%/data1/levelshots/tourney0.txt
+%%DATADIR%%/data1/levelshots/tca-zion.tga
+%%DATADIR%%/data1/levelshots/tca-zion.txt
 %%DATADIR%%/data1/maps.lst
+%%DATADIR%%/data1/maps/aoa-atlantis.bsp
 %%DATADIR%%/data1/maps/aoa-frost.bsp
 %%DATADIR%%/data1/maps/aoa-morpheus.bsp
-%%DATADIR%%/data1/maps/aoa2.bsp
 %%DATADIR%%/data1/maps/compile.bat
 %%DATADIR%%/data1/maps/cp-grindery.bsp
+%%DATADIR%%/data1/maps/ctf-atlantis.bsp
 %%DATADIR%%/data1/maps/ctf-chromium.bsp
 %%DATADIR%%/data1/maps/ctf-europa.bsp
 %%DATADIR%%/data1/maps/ctf-frost.bsp
-%%DATADIR%%/data1/maps/ctf-icarus.bsp
+%%DATADIR%%/data1/maps/ctf-icarus2.bsp
 %%DATADIR%%/data1/maps/ctf-stronghold.bsp
 %%DATADIR%%/data1/maps/ctf-terminal.bsp
 %%DATADIR%%/data1/maps/ctf-titan.bsp
@@ -279,36 +319,41 @@
 %%DATADIR%%/data1/maps/db-chromium.bsp
 %%DATADIR%%/data1/maps/db-icarus.bsp
 %%DATADIR%%/data1/maps/db-vesuvius.bsp
+%%DATADIR%%/data1/maps/dm-atlantis.bsp
 %%DATADIR%%/data1/maps/dm-babel.bsp
 %%DATADIR%%/data1/maps/dm-beyond.bsp
+%%DATADIR%%/data1/maps/dm-bloodfactory.bsp
 %%DATADIR%%/data1/maps/dm-chasmatic.bsp
 %%DATADIR%%/data1/maps/dm-crucible.bsp
 %%DATADIR%%/data1/maps/dm-deimos.bsp
 %%DATADIR%%/data1/maps/dm-dread.bsp
 %%DATADIR%%/data1/maps/dm-dynamo2.bsp
-%%DATADIR%%/data1/maps/dm-electro.bsp
 %%DATADIR%%/data1/maps/dm-europa.bsp
 %%DATADIR%%/data1/maps/dm-frontier2.bsp
 %%DATADIR%%/data1/maps/dm-furious.bsp
 %%DATADIR%%/data1/maps/dm-grindery.bsp
+%%DATADIR%%/data1/maps/dm-horus.bsp
+%%DATADIR%%/data1/maps/dm-leviathan.bsp
 %%DATADIR%%/data1/maps/dm-obsidian2.bsp
 %%DATADIR%%/data1/maps/dm-omega.bsp
 %%DATADIR%%/data1/maps/dm-saucer.bsp
 %%DATADIR%%/data1/maps/dm-titan.bsp
 %%DATADIR%%/data1/maps/dm-vesuvius.bsp
 %%DATADIR%%/data1/maps/dm-violator.bsp
+%%DATADIR%%/data1/maps/dm-zion.bsp
 %%DATADIR%%/data1/maps/qbsp3.exe
 %%DATADIR%%/data1/maps/qrad3.exe
 %%DATADIR%%/data1/maps/qvis3.exe
+%%DATADIR%%/data1/maps/scripts/aoa-atlantis.mus
 %%DATADIR%%/data1/maps/scripts/aoa-frost.mus
 %%DATADIR%%/data1/maps/scripts/aoa-morpheus.mus
 %%DATADIR%%/data1/maps/scripts/aoa2.fog
-%%DATADIR%%/data1/maps/scripts/aoa2.mus
 %%DATADIR%%/data1/maps/scripts/cp-grindery.mus
+%%DATADIR%%/data1/maps/scripts/ctf-atlantis.mus
 %%DATADIR%%/data1/maps/scripts/ctf-chromium.mus
 %%DATADIR%%/data1/maps/scripts/ctf-europa.mus
 %%DATADIR%%/data1/maps/scripts/ctf-frost.mus
-%%DATADIR%%/data1/maps/scripts/ctf-icarus.mus
+%%DATADIR%%/data1/maps/scripts/ctf-icarus2.mus
 %%DATADIR%%/data1/maps/scripts/ctf-stronghold.mus
 %%DATADIR%%/data1/maps/scripts/ctf-terminal.mus
 %%DATADIR%%/data1/maps/scripts/ctf-titan.mus
@@ -316,19 +361,22 @@
 %%DATADIR%%/data1/maps/scripts/db-chromium.mus
 %%DATADIR%%/data1/maps/scripts/db-icarus.mus
 %%DATADIR%%/data1/maps/scripts/db-vesuvius.mus
+%%DATADIR%%/data1/maps/scripts/dm-atlantis.mus
 %%DATADIR%%/data1/maps/scripts/dm-babel.fog
 %%DATADIR%%/data1/maps/scripts/dm-babel.mus
 %%DATADIR%%/data1/maps/scripts/dm-beyond.mus
+%%DATADIR%%/data1/maps/scripts/dm-bloodfactory.mus
 %%DATADIR%%/data1/maps/scripts/dm-chasmatic.mus
 %%DATADIR%%/data1/maps/scripts/dm-crucible.mus
 %%DATADIR%%/data1/maps/scripts/dm-deimos.mus
 %%DATADIR%%/data1/maps/scripts/dm-dread.mus
 %%DATADIR%%/data1/maps/scripts/dm-dynamo2.mus
-%%DATADIR%%/data1/maps/scripts/dm-electro.mus
 %%DATADIR%%/data1/maps/scripts/dm-europa.mus
 %%DATADIR%%/data1/maps/scripts/dm-frontier2.mus
 %%DATADIR%%/data1/maps/scripts/dm-furious.mus
 %%DATADIR%%/data1/maps/scripts/dm-grindery.mus
+%%DATADIR%%/data1/maps/scripts/dm-horus.mus
+%%DATADIR%%/data1/maps/scripts/dm-leviathan.mus
 %%DATADIR%%/data1/maps/scripts/dm-obsidian2.mus
 %%DATADIR%%/data1/maps/scripts/dm-omega.mus
 %%DATADIR%%/data1/maps/scripts/dm-saucer.fog
@@ -336,15 +384,16 @@
 %%DATADIR%%/data1/maps/scripts/dm-titan.mus
 %%DATADIR%%/data1/maps/scripts/dm-vesuvius.mus
 %%DATADIR%%/data1/maps/scripts/dm-violator.mus
+%%DATADIR%%/data1/maps/scripts/dm-zion.mus
 %%DATADIR%%/data1/maps/scripts/tca-europa.mus
 %%DATADIR%%/data1/maps/scripts/tca-frost.mus
 %%DATADIR%%/data1/maps/scripts/tca-titan.mus
+%%DATADIR%%/data1/maps/scripts/tca-zion.mus
 %%DATADIR%%/data1/maps/scripts/tourney0.fog
-%%DATADIR%%/data1/maps/scripts/tourney0.mus
 %%DATADIR%%/data1/maps/tca-europa.bsp
 %%DATADIR%%/data1/maps/tca-frost.bsp
 %%DATADIR%%/data1/maps/tca-titan.bsp
-%%DATADIR%%/data1/maps/tourney0.bsp
+%%DATADIR%%/data1/maps/tca-zion.bsp
 %%DATADIR%%/data1/models/cow/helmet.md2
 %%DATADIR%%/data1/models/cow/skin.tga
 %%DATADIR%%/data1/models/cow/tris.md2
@@ -363,7 +412,6 @@
 %%DATADIR%%/data1/models/items/armor/body/skin.tga
 %%DATADIR%%/data1/models/items/armor/body/tris.md2
 %%DATADIR%%/data1/models/items/armor/combat/skin.tga
-%%DATADIR%%/data1/models/items/armor/combat/skin_normal.tga
 %%DATADIR%%/data1/models/items/armor/combat/tris.md2
 %%DATADIR%%/data1/models/items/armor/jacket/skin.tga
 %%DATADIR%%/data1/models/items/armor/jacket/tris.md2
@@ -385,15 +433,6 @@
 %%DATADIR%%/data1/models/items/healing/small/tris.md2
 %%DATADIR%%/data1/models/items/invulner/skin.tga
 %%DATADIR%%/data1/models/items/invulner/tris.md2
-%%DATADIR%%/data1/models/items/keys/key/skin.pcx
-%%DATADIR%%/data1/models/items/keys/key/skin.tga
-%%DATADIR%%/data1/models/items/keys/key/tris.md2
-%%DATADIR%%/data1/models/items/keys/pass/skin.pcx
-%%DATADIR%%/data1/models/items/keys/pass/skin.tga
-%%DATADIR%%/data1/models/items/keys/pass/tris.md2
-%%DATADIR%%/data1/models/items/keys/red_key/skin.pcx
-%%DATADIR%%/data1/models/items/keys/red_key/skin.tga
-%%DATADIR%%/data1/models/items/keys/red_key/tris.md2
 %%DATADIR%%/data1/models/items/quaddama/skin.tga
 %%DATADIR%%/data1/models/items/quaddama/tris.md2
 %%DATADIR%%/data1/models/items/quaddama/unit.md2
@@ -434,26 +473,10 @@
 %%DATADIR%%/data1/models/objects/electroball/tris.md2
 %%DATADIR%%/data1/models/objects/fireball/skin.tga
 %%DATADIR%%/data1/models/objects/fireball/tris.md2
-%%DATADIR%%/data1/models/objects/gibs/bigmech_arm/skin.tga
-%%DATADIR%%/data1/models/objects/gibs/bigmech_arm/tris.md2
-%%DATADIR%%/data1/models/objects/gibs/bigmech_bod/tris.md2
-%%DATADIR%%/data1/models/objects/gibs/bone/skin.tga
-%%DATADIR%%/data1/models/objects/gibs/bone/tris.md2
-%%DATADIR%%/data1/models/objects/gibs/head2/skin.tga
-%%DATADIR%%/data1/models/objects/gibs/head2/tris.md2
 %%DATADIR%%/data1/models/objects/gibs/mart_gut/skin.tga
 %%DATADIR%%/data1/models/objects/gibs/mart_gut/tris.md2
-%%DATADIR%%/data1/models/objects/gibs/mart_head/skin.tga
-%%DATADIR%%/data1/models/objects/gibs/mart_head/tris.md2
-%%DATADIR%%/data1/models/objects/gibs/robot_leg/skin.tga
-%%DATADIR%%/data1/models/objects/gibs/robot_leg/tris.md2
 %%DATADIR%%/data1/models/objects/gibs/sm_meat/skin.tga
 %%DATADIR%%/data1/models/objects/gibs/sm_meat/tris.md2
-%%DATADIR%%/data1/models/objects/gibs/war_body/tris.md2
-%%DATADIR%%/data1/models/objects/gibs/war_leg/skin.tga
-%%DATADIR%%/data1/models/objects/gibs/war_leg/tris.md2
-%%DATADIR%%/data1/models/objects/gibs/war_tent/skin.tga
-%%DATADIR%%/data1/models/objects/gibs/war_tent/tris.md2
 %%DATADIR%%/data1/models/objects/laser/skin.tga
 %%DATADIR%%/data1/models/objects/laser/tris.md2
 %%DATADIR%%/data1/models/objects/rocket/skin.tga
@@ -501,6 +524,9 @@
 %%DATADIR%%/data1/models/weapons/v_shotg2/skin.tga
 %%DATADIR%%/data1/models/weapons/v_shotg2/skin_normal.tga
 %%DATADIR%%/data1/models/weapons/v_shotg2/tris.md2
+%%DATADIR%%/data1/models/weapons/v_violator/skin.tga
+%%DATADIR%%/data1/models/weapons/v_violator/skin_normal.tga
+%%DATADIR%%/data1/models/weapons/v_violator/tris.md2
 %%DATADIR%%/data1/particles/aflash.tga
 %%DATADIR%%/data1/particles/basic.tga
 %%DATADIR%%/data1/particles/beam.tga
@@ -508,6 +534,7 @@
 %%DATADIR%%/data1/particles/blaster.tga
 %%DATADIR%%/data1/particles/blood.tga
 %%DATADIR%%/data1/particles/bubble.tga
+%%DATADIR%%/data1/particles/bullethole.tga
 %%DATADIR%%/data1/particles/cflash.tga
 %%DATADIR%%/data1/particles/deathfield.tga
 %%DATADIR%%/data1/particles/dflash.tga
@@ -528,6 +555,7 @@
 %%DATADIR%%/data1/particles/shell.tga
 %%DATADIR%%/data1/particles/smoke.tga
 %%DATADIR%%/data1/particles/smoke_org.tga
+%%DATADIR%%/data1/particles/voltage.tga
 %%DATADIR%%/data1/pics/a_bullets.tga
 %%DATADIR%%/data1/pics/a_cells.tga
 %%DATADIR%%/data1/pics/a_grenades.tga
@@ -548,6 +576,9 @@
 %%DATADIR%%/data1/pics/backtile.pcx
 %%DATADIR%%/data1/pics/bar_background.tga
 %%DATADIR%%/data1/pics/bar_loading.tga
+%%DATADIR%%/data1/pics/beamgun.tga
+%%DATADIR%%/data1/pics/blaster.tga
+%%DATADIR%%/data1/pics/bomber.tga
 %%DATADIR%%/data1/pics/bots/construct/blue_i.tga
 %%DATADIR%%/data1/pics/bots/construct/default_i.tga
 %%DATADIR%%/data1/pics/bots/construct/red_i.tga
@@ -572,71 +603,57 @@
 %%DATADIR%%/data1/pics/bots/martianenforcer/blue_i.tga
 %%DATADIR%%/data1/pics/bots/martianenforcer/default_i.tga
 %%DATADIR%%/data1/pics/bots/martianenforcer/gamara_i.tga
+%%DATADIR%%/data1/pics/bots/martianenforcer/gunmen_i.tga
 %%DATADIR%%/data1/pics/bots/martianenforcer/red_i.tga
 %%DATADIR%%/data1/pics/ch1.tga
 %%DATADIR%%/data1/pics/ch2.tga
 %%DATADIR%%/data1/pics/ch3.tga
+%%DATADIR%%/data1/pics/chaingun.tga
 %%DATADIR%%/data1/pics/colormap.pcx
-%%DATADIR%%/data1/pics/conback.pcx
-%%DATADIR%%/data1/pics/conchars.pcx
+%%DATADIR%%/data1/pics/conback.tga
 %%DATADIR%%/data1/pics/conchars.tga
-%%DATADIR%%/data1/pics/crosshairs/4_Way_Mouse.tga
 %%DATADIR%%/data1/pics/crosshairs/alien.tga
 %%DATADIR%%/data1/pics/crosshairs/alien2.tga
-%%DATADIR%%/data1/pics/crosshairs/alien3.tga
-%%DATADIR%%/data1/pics/crosshairs/alien3a.tga
-%%DATADIR%%/data1/pics/crosshairs/alien3b.tga
-%%DATADIR%%/data1/pics/crosshairs/alien3c.tga
-%%DATADIR%%/data1/pics/crosshairs/alien3d.tga
-%%DATADIR%%/data1/pics/crosshairs/dot.tga
+%%DATADIR%%/data1/pics/crosshairs/alien2a.tga
+%%DATADIR%%/data1/pics/crosshairs/alien2b.tga
+%%DATADIR%%/data1/pics/crosshairs/chexcross.tga
+%%DATADIR%%/data1/pics/crosshairs/dot1.tga
+%%DATADIR%%/data1/pics/crosshairs/dot2.tga
 %%DATADIR%%/data1/pics/crosshairs/freezy.tga
 %%DATADIR%%/data1/pics/crosshairs/hardcorech.tga
 %%DATADIR%%/data1/pics/crosshairs/havoc.tga
 %%DATADIR%%/data1/pics/crosshairs/havoc2.tga
 %%DATADIR%%/data1/pics/crosshairs/havoc3.tga
-%%DATADIR%%/data1/pics/crosshairs/havoc4.tga
-%%DATADIR%%/data1/pics/crosshairs/havoc5.tga
+%%DATADIR%%/data1/pics/crosshairs/intimidator.tga
 %%DATADIR%%/data1/pics/crosshairs/intimidator2.tga
 %%DATADIR%%/data1/pics/crosshairs/intimidator3.tga
-%%DATADIR%%/data1/pics/crosshairs/intimidator4.tga
-%%DATADIR%%/data1/pics/crosshairs/intimidator5.tga
-%%DATADIR%%/data1/pics/crosshairs/intimidator6.tga
-%%DATADIR%%/data1/pics/crosshairs/intimidator7.tga
-%%DATADIR%%/data1/pics/crosshairs/intimidator8.tga
-%%DATADIR%%/data1/pics/crosshairs/intimidator9.tga
 %%DATADIR%%/data1/pics/crosshairs/mechano.tga
-%%DATADIR%%/data1/pics/crosshairs/ncool2.tga
-%%DATADIR%%/data1/pics/crosshairs/ncool3.tga
-%%DATADIR%%/data1/pics/crosshairs/new33x.tga
+%%DATADIR%%/data1/pics/crosshairs/ncool.tga
 %%DATADIR%%/data1/pics/crosshairs/nile.tga
 %%DATADIR%%/data1/pics/crosshairs/nile2.tga
 %%DATADIR%%/data1/pics/crosshairs/nile3.tga
-%%DATADIR%%/data1/pics/crosshairs/nile4.tga
-%%DATADIR%%/data1/pics/crosshairs/nile5.tga
-%%DATADIR%%/data1/pics/crosshairs/nile6.tga
-%%DATADIR%%/data1/pics/crosshairs/nile7.tga
-%%DATADIR%%/data1/pics/crosshairs/oldman.tga
 %%DATADIR%%/data1/pics/crosshairs/rage_cross.tga
 %%DATADIR%%/data1/pics/crosshairs/rgb.tga
 %%DATADIR%%/data1/pics/crosshairs/robot.tga
-%%DATADIR%%/data1/pics/crosshairs/smile.tga
+%%DATADIR%%/data1/pics/crosshairs/sniper.tga
 %%DATADIR%%/data1/pics/crosshairs/sungod.tga
 %%DATADIR%%/data1/pics/crosshairs/tech.tga
 %%DATADIR%%/data1/pics/crosshairs/tech2.tga
-%%DATADIR%%/data1/pics/crosshairs/tech3.tga
-%%DATADIR%%/data1/pics/crosshairs/tech4.tga
-%%DATADIR%%/data1/pics/crosshairs/tech5.tga
+%%DATADIR%%/data1/pics/crosshairs/transcircle.tga
 %%DATADIR%%/data1/pics/crosshairs/vista.tga
+%%DATADIR%%/data1/pics/disruptor.tga
 %%DATADIR%%/data1/pics/dnarrow.tga
 %%DATADIR%%/data1/pics/field_3.pcx
+%%DATADIR%%/data1/pics/flamethrower.tga
+%%DATADIR%%/data1/pics/grapple.tga
 %%DATADIR%%/data1/pics/help.tga
+%%DATADIR%%/data1/pics/hover.tga
 %%DATADIR%%/data1/pics/huds/20061.tga
 %%DATADIR%%/data1/pics/huds/20062.tga
 %%DATADIR%%/data1/pics/huds/8bit1.tga
 %%DATADIR%%/data1/pics/huds/8bit2.tga
 %%DATADIR%%/data1/pics/huds/alien1.tga
 %%DATADIR%%/data1/pics/huds/alien2.tga
-%%DATADIR%%/data1/pics/huds/alien_neon2.tga
 %%DATADIR%%/data1/pics/huds/alienblood1.tga
 %%DATADIR%%/data1/pics/huds/alienblood2.tga
 %%DATADIR%%/data1/pics/huds/blood1.tga
@@ -655,6 +672,8 @@
 %%DATADIR%%/data1/pics/huds/cpu2.tga
 %%DATADIR%%/data1/pics/huds/freezy1.tga
 %%DATADIR%%/data1/pics/huds/freezy2.tga
+%%DATADIR%%/data1/pics/huds/gtv1.tga
+%%DATADIR%%/data1/pics/huds/gtv2.tga
 %%DATADIR%%/data1/pics/huds/marscreen1.tga
 %%DATADIR%%/data1/pics/huds/marscreen2.tga
 %%DATADIR%%/data1/pics/huds/mechanic1.tga
@@ -694,12 +713,19 @@
 %%DATADIR%%/data1/pics/m_background.pcx
 %%DATADIR%%/data1/pics/m_banner_main.tga
 %%DATADIR%%/data1/pics/m_banner_player.tga
+%%DATADIR%%/data1/pics/m_bots.tga
+%%DATADIR%%/data1/pics/m_controls.tga
+%%DATADIR%%/data1/pics/m_controls_back.tga
 %%DATADIR%%/data1/pics/m_cursor0.tga
+%%DATADIR%%/data1/pics/m_dmoptions.tga
+%%DATADIR%%/data1/pics/m_joinserver.tga
 %%DATADIR%%/data1/pics/m_main.tga
 %%DATADIR%%/data1/pics/m_main_game.tga
 %%DATADIR%%/data1/pics/m_main_game_sel.tga
-%%DATADIR%%/data1/pics/m_main_multiplayer.tga
-%%DATADIR%%/data1/pics/m_main_multiplayer_sel.tga
+%%DATADIR%%/data1/pics/m_main_host.tga
+%%DATADIR%%/data1/pics/m_main_host_sel.tga
+%%DATADIR%%/data1/pics/m_main_join.tga
+%%DATADIR%%/data1/pics/m_main_join_sel.tga
 %%DATADIR%%/data1/pics/m_main_options.tga
 %%DATADIR%%/data1/pics/m_main_options_sel.tga
 %%DATADIR%%/data1/pics/m_main_quit.tga
@@ -707,6 +733,16 @@
 %%DATADIR%%/data1/pics/m_main_video.tga
 %%DATADIR%%/data1/pics/m_main_video_sel.tga
 %%DATADIR%%/data1/pics/m_mouse_cursor.tga
+%%DATADIR%%/data1/pics/m_mutators.tga
+%%DATADIR%%/data1/pics/m_options.tga
+%%DATADIR%%/data1/pics/m_options_back.tga
+%%DATADIR%%/data1/pics/m_player.tga
+%%DATADIR%%/data1/pics/m_player_back.tga
+%%DATADIR%%/data1/pics/m_quit.tga
+%%DATADIR%%/data1/pics/m_single.tga
+%%DATADIR%%/data1/pics/m_startserver.tga
+%%DATADIR%%/data1/pics/m_startserver_back.tga
+%%DATADIR%%/data1/pics/m_video.tga
 %%DATADIR%%/data1/pics/mars.tga
 %%DATADIR%%/data1/pics/master.tga
 %%DATADIR%%/data1/pics/net.tga
@@ -729,11 +765,16 @@
 %%DATADIR%%/data1/pics/p_sproing.tga
 %%DATADIR%%/data1/pics/pause.pcx
 %%DATADIR%%/data1/pics/quit.pcx
+%%DATADIR%%/data1/pics/rocketlauncher.tga
 %%DATADIR%%/data1/pics/sbfctf1.tga
 %%DATADIR%%/data1/pics/sbfctf2.tga
+%%DATADIR%%/data1/pics/smartgun.tga
+%%DATADIR%%/data1/pics/strafer.tga
 %%DATADIR%%/data1/pics/tag1.tga
 %%DATADIR%%/data1/pics/tag2.tga
 %%DATADIR%%/data1/pics/uparrow.tga
+%%DATADIR%%/data1/pics/vaporizor.tga
+%%DATADIR%%/data1/pics/violator.tga
 %%DATADIR%%/data1/pics/w_bfg.tga
 %%DATADIR%%/data1/pics/w_blaster.tga
 %%DATADIR%%/data1/pics/w_chaingun.tga
@@ -789,6 +830,7 @@
 %%DATADIR%%/data1/players/brainlet/w_rlauncher.md2
 %%DATADIR%%/data1/players/brainlet/w_shotgun.md2
 %%DATADIR%%/data1/players/brainlet/w_sshotgun.md2
+%%DATADIR%%/data1/players/brainlet/w_violator.md2
 %%DATADIR%%/data1/players/brainlet/weapon.md2
 %%DATADIR%%/data1/players/brainlet/weapon.tga
 %%DATADIR%%/data1/players/construct/blaster.tga
@@ -830,6 +872,7 @@
 %%DATADIR%%/data1/players/construct/w_rlauncher.md2
 %%DATADIR%%/data1/players/construct/w_shotgun.md2
 %%DATADIR%%/data1/players/construct/w_sshotgun.md2
+%%DATADIR%%/data1/players/construct/w_violator.md2
 %%DATADIR%%/data1/players/construct/weapon.md2
 %%DATADIR%%/data1/players/construct/weapon.tga
 %%DATADIR%%/data1/players/enforcer/blaster.tga
@@ -874,6 +917,7 @@
 %%DATADIR%%/data1/players/enforcer/w_rlauncher.md2
 %%DATADIR%%/data1/players/enforcer/w_shotgun.md2
 %%DATADIR%%/data1/players/enforcer/w_sshotgun.md2
+%%DATADIR%%/data1/players/enforcer/w_violator.md2
 %%DATADIR%%/data1/players/enforcer/weapon.md2
 %%DATADIR%%/data1/players/enforcer/weapon.tga
 %%DATADIR%%/data1/players/infantry/blaster.tga
@@ -915,6 +959,7 @@
 %%DATADIR%%/data1/players/infantry/w_rlauncher.md2
 %%DATADIR%%/data1/players/infantry/w_shotgun.md2
 %%DATADIR%%/data1/players/infantry/w_sshotgun.md2
+%%DATADIR%%/data1/players/infantry/w_violator.md2
 %%DATADIR%%/data1/players/infantry/weapon.md2
 %%DATADIR%%/data1/players/infantry/weapon.tga
 %%DATADIR%%/data1/players/lauren/blue.tga
@@ -957,10 +1002,10 @@
 %%DATADIR%%/data1/players/lauren/w_rlauncher.md2
 %%DATADIR%%/data1/players/lauren/w_shotgun.md2
 %%DATADIR%%/data1/players/lauren/w_sshotgun.md2
+%%DATADIR%%/data1/players/lauren/w_violator.md2
 %%DATADIR%%/data1/players/lauren/weapon.md2
 %%DATADIR%%/data1/players/lauren/weapon.tga
 %%DATADIR%%/data1/players/martian/alien
-%%DATADIR%%/data1/players/martian/aliengrunt.pcx
 %%DATADIR%%/data1/players/martian/aliengrunt.tga
 %%DATADIR%%/data1/players/martian/aliengrunt_i.tga
 %%DATADIR%%/data1/players/martian/blaster.tga
@@ -1012,6 +1057,7 @@
 %%DATADIR%%/data1/players/martian/w_rlauncher.md2
 %%DATADIR%%/data1/players/martian/w_shotgun.md2
 %%DATADIR%%/data1/players/martian/w_sshotgun.md2
+%%DATADIR%%/data1/players/martian/w_violator.md2
 %%DATADIR%%/data1/players/martian/weapon.md2
 %%DATADIR%%/data1/players/martian/weapon.tga
 %%DATADIR%%/data1/players/martiancyborg/blaster.tga
@@ -1054,6 +1100,7 @@
 %%DATADIR%%/data1/players/martiancyborg/w_rlauncher.md2
 %%DATADIR%%/data1/players/martiancyborg/w_shotgun.md2
 %%DATADIR%%/data1/players/martiancyborg/w_sshotgun.md2
+%%DATADIR%%/data1/players/martiancyborg/w_violator.md2
 %%DATADIR%%/data1/players/martiancyborg/weapon.md2
 %%DATADIR%%/data1/players/martiancyborg/weapon.tga
 %%DATADIR%%/data1/players/martianenforcer/alien
@@ -1075,6 +1122,8 @@
 %%DATADIR%%/data1/players/martianenforcer/gamara_i.tga
 %%DATADIR%%/data1/players/martianenforcer/gasp1.wav
 %%DATADIR%%/data1/players/martianenforcer/gasp2.wav
+%%DATADIR%%/data1/players/martianenforcer/gunmen.tga
+%%DATADIR%%/data1/players/martianenforcer/gunmen_i.tga
 %%DATADIR%%/data1/players/martianenforcer/gurp1.wav
 %%DATADIR%%/data1/players/martianenforcer/gurp2.wav
 %%DATADIR%%/data1/players/martianenforcer/helmet.md2
@@ -1101,6 +1150,7 @@
 %%DATADIR%%/data1/players/martianenforcer/w_rlauncher.md2
 %%DATADIR%%/data1/players/martianenforcer/w_shotgun.md2
 %%DATADIR%%/data1/players/martianenforcer/w_sshotgun.md2
+%%DATADIR%%/data1/players/martianenforcer/w_violator.md2
 %%DATADIR%%/data1/players/martianenforcer/weapon.md2
 %%DATADIR%%/data1/players/martianenforcer/weapon.tga
 %%DATADIR%%/data1/players/robot/blaster.tga
@@ -1144,6 +1194,7 @@
 %%DATADIR%%/data1/players/robot/w_rlauncher.md2
 %%DATADIR%%/data1/players/robot/w_shotgun.md2
 %%DATADIR%%/data1/players/robot/w_sshotgun.md2
+%%DATADIR%%/data1/players/robot/w_violator.md2
 %%DATADIR%%/data1/players/robot/weapon.md2
 %%DATADIR%%/data1/players/robot/weapon.tga
 %%DATADIR%%/data1/players/rustbot/atlas.tga
@@ -1188,6 +1239,7 @@
 %%DATADIR%%/data1/players/rustbot/w_rlauncher.md2
 %%DATADIR%%/data1/players/rustbot/w_shotgun.md2
 %%DATADIR%%/data1/players/rustbot/w_sshotgun.md2
+%%DATADIR%%/data1/players/rustbot/w_violator.md2
 %%DATADIR%%/data1/players/rustbot/weapon.md2
 %%DATADIR%%/data1/players/rustbot/weapon.tga
 %%DATADIR%%/data1/players/war/blue.tga
@@ -1228,15 +1280,18 @@
 %%DATADIR%%/data1/scripts/electrics.rscript
 %%DATADIR%%/data1/scripts/electrics2.rscript
 %%DATADIR%%/data1/scripts/electrics3.rscript
+%%DATADIR%%/data1/scripts/gunmen.rscript
+%%DATADIR%%/data1/scripts/maps/aoa-atlantis.rscript
 %%DATADIR%%/data1/scripts/maps/aoa-frost.rscript
 %%DATADIR%%/data1/scripts/maps/aoa-morpheus.rscript
 %%DATADIR%%/data1/scripts/maps/aoa2.rscript
 %%DATADIR%%/data1/scripts/maps/cp-grindery.rscript
+%%DATADIR%%/data1/scripts/maps/ctf-atlantis.rscript
 %%DATADIR%%/data1/scripts/maps/ctf-blood.rscript
 %%DATADIR%%/data1/scripts/maps/ctf-chromium.rscript
 %%DATADIR%%/data1/scripts/maps/ctf-europa.rscript
 %%DATADIR%%/data1/scripts/maps/ctf-frost.rscript
-%%DATADIR%%/data1/scripts/maps/ctf-icarus.rscript
+%%DATADIR%%/data1/scripts/maps/ctf-icarus2.rscript
 %%DATADIR%%/data1/scripts/maps/ctf-stronghold.rscript
 %%DATADIR%%/data1/scripts/maps/ctf-terminal.rscript
 %%DATADIR%%/data1/scripts/maps/ctf-titan.rscript
@@ -1244,8 +1299,10 @@
 %%DATADIR%%/data1/scripts/maps/db-chromium.rscript
 %%DATADIR%%/data1/scripts/maps/db-icarus.rscript
 %%DATADIR%%/data1/scripts/maps/db-vesuvius.rscript
+%%DATADIR%%/data1/scripts/maps/dm-atlantis.rscript
 %%DATADIR%%/data1/scripts/maps/dm-babel.rscript
 %%DATADIR%%/data1/scripts/maps/dm-beyond.rscript
+%%DATADIR%%/data1/scripts/maps/dm-bloodfactory.rscript
 %%DATADIR%%/data1/scripts/maps/dm-chasmatic.rscript
 %%DATADIR%%/data1/scripts/maps/dm-crucible.rscript
 %%DATADIR%%/data1/scripts/maps/dm-deimos.rscript
@@ -1256,15 +1313,19 @@
 %%DATADIR%%/data1/scripts/maps/dm-frontier2.rscript
 %%DATADIR%%/data1/scripts/maps/dm-furious.rscript
 %%DATADIR%%/data1/scripts/maps/dm-grindery.rscript
+%%DATADIR%%/data1/scripts/maps/dm-horus.rscript
+%%DATADIR%%/data1/scripts/maps/dm-leviathan.rscript
 %%DATADIR%%/data1/scripts/maps/dm-obsidian2.rscript
 %%DATADIR%%/data1/scripts/maps/dm-omega.rscript
 %%DATADIR%%/data1/scripts/maps/dm-saucer.rscript
 %%DATADIR%%/data1/scripts/maps/dm-titan.rscript
 %%DATADIR%%/data1/scripts/maps/dm-vesuvius.rscript
 %%DATADIR%%/data1/scripts/maps/dm-violator.rscript
+%%DATADIR%%/data1/scripts/maps/dm-zion.rscript
 %%DATADIR%%/data1/scripts/maps/tca-europa.rscript
 %%DATADIR%%/data1/scripts/maps/tca-frost.rscript
 %%DATADIR%%/data1/scripts/maps/tca-titan.rscript
+%%DATADIR%%/data1/scripts/maps/tca-zion.rscript
 %%DATADIR%%/data1/scripts/maps/tourney0.rscript
 %%DATADIR%%/data1/scripts/menu.rscript
 %%DATADIR%%/data1/scripts/models.rscript
@@ -1349,20 +1410,18 @@
 %%DATADIR%%/data1/sound/misc/trigger1.wav
 %%DATADIR%%/data1/sound/misc/two.wav
 %%DATADIR%%/data1/sound/misc/w_pkup.wav
-%%DATADIR%%/data1/sound/music/aat0.wav
 %%DATADIR%%/data1/sound/music/aat2.wav
 %%DATADIR%%/data1/sound/music/aat3.wav
 %%DATADIR%%/data1/sound/music/aoa-frost.wav
 %%DATADIR%%/data1/sound/music/ctf-terminal.wav
 %%DATADIR%%/data1/sound/music/dm-beyond.wav
 %%DATADIR%%/data1/sound/music/dm-blood.wav
-%%DATADIR%%/data1/sound/music/dm-bootcamp.wav
 %%DATADIR%%/data1/sound/music/dm-deimos.wav
 %%DATADIR%%/data1/sound/music/dm-dynamo.wav
-%%DATADIR%%/data1/sound/music/dm-electro.wav
 %%DATADIR%%/data1/sound/music/dm-frontier.wav
 %%DATADIR%%/data1/sound/music/dm-furious.wav
 %%DATADIR%%/data1/sound/music/dm-gauntlet.wav
+%%DATADIR%%/data1/sound/music/dm-horus.wav
 %%DATADIR%%/data1/sound/music/dm-inferno.wav
 %%DATADIR%%/data1/sound/music/dm-obsidian.wav
 %%DATADIR%%/data1/sound/music/dm-probe.wav
@@ -1453,6 +1512,9 @@
 %%DATADIR%%/data1/sound/weapons/rocklx1a.wav
 %%DATADIR%%/data1/sound/weapons/shotgf1b.wav
 %%DATADIR%%/data1/sound/weapons/smartgun_hum.wav
+%%DATADIR%%/data1/sound/weapons/vaporizer_hum.wav
+%%DATADIR%%/data1/sound/weapons/viofire1.wav
+%%DATADIR%%/data1/sound/weapons/viofire2.wav
 %%DATADIR%%/data1/sound/weapons/whoosh.wav
 %%DATADIR%%/data1/sound/world/botwon.wav
 %%DATADIR%%/data1/sound/world/button1.wav
@@ -1791,6 +1853,7 @@
 %%DATADIR%%/data1/textures/arena7/floor2.tga
 %%DATADIR%%/data1/textures/arena7/floor2.wal
 %%DATADIR%%/data1/textures/arena7/floor2_nm.tga
+%%DATADIR%%/data1/textures/arena7/glass.tga
 %%DATADIR%%/data1/textures/arena7/grate1.tga
 %%DATADIR%%/data1/textures/arena7/grate1.wal
 %%DATADIR%%/data1/textures/arena7/light1.tga
@@ -1838,6 +1901,8 @@
 %%DATADIR%%/data1/textures/arena7/piston1.wal
 %%DATADIR%%/data1/textures/arena7/redgrid.tga
 %%DATADIR%%/data1/textures/arena7/redgrid.wal
+%%DATADIR%%/data1/textures/arena7/tekfloor1.tga
+%%DATADIR%%/data1/textures/arena7/tekfloor1.wal
 %%DATADIR%%/data1/textures/arena7/tekwall1.tga
 %%DATADIR%%/data1/textures/arena7/tekwall1.wal
 %%DATADIR%%/data1/textures/arena7/tekwall2.tga
@@ -1870,9 +1935,19 @@
 %%DATADIR%%/data1/textures/arena8/brickwall1.tga
 %%DATADIR%%/data1/textures/arena8/brickwall1.wal
 %%DATADIR%%/data1/textures/arena8/brickwall1_nm.tga
+%%DATADIR%%/data1/textures/arena8/egyptbrick1.tga
+%%DATADIR%%/data1/textures/arena8/egyptbrick1.wal
+%%DATADIR%%/data1/textures/arena8/egyptfloor1.tga
+%%DATADIR%%/data1/textures/arena8/egyptfloor1.wal
+%%DATADIR%%/data1/textures/arena8/egyptrock1.tga
+%%DATADIR%%/data1/textures/arena8/egyptrock1.wal
+%%DATADIR%%/data1/textures/arena8/egyptrock2.tga
+%%DATADIR%%/data1/textures/arena8/egyptrock2.wal
 %%DATADIR%%/data1/textures/arena8/floor3.tga
 %%DATADIR%%/data1/textures/arena8/floor3.wal
 %%DATADIR%%/data1/textures/arena8/floor3_nm.tga
+%%DATADIR%%/data1/textures/arena8/floor4.tga
+%%DATADIR%%/data1/textures/arena8/floor4.wal
 %%DATADIR%%/data1/textures/arena8/grate1.tga
 %%DATADIR%%/data1/textures/arena8/grate1.wal
 %%DATADIR%%/data1/textures/arena8/lavalmetal.tga
@@ -1889,6 +1964,10 @@
 %%DATADIR%%/data1/textures/arena8/rock1.tga
 %%DATADIR%%/data1/textures/arena8/rock1.wal
 %%DATADIR%%/data1/textures/arena8/rock1_nm.tga
+%%DATADIR%%/data1/textures/arena8/sand1.tga
+%%DATADIR%%/data1/textures/arena8/sand1.wal
+%%DATADIR%%/data1/textures/arena8/sand2.tga
+%%DATADIR%%/data1/textures/arena8/sand2.wal
 %%DATADIR%%/data1/textures/arena8/slime.tga
 %%DATADIR%%/data1/textures/arena8/slime.wal
 %%DATADIR%%/data1/textures/arena8/wood1.tga
@@ -2068,6 +2147,7 @@
 %%DATADIR%%/data1/vehicles/bomber/skin.tga
 %%DATADIR%%/data1/vehicles/bomber/tris.md2
 %%DATADIR%%/data1/vehicles/bomber/v_wep.md2
+%%DATADIR%%/data1/vehicles/bomber/window.md2
 %%DATADIR%%/data1/vehicles/deathball/deathball.md2
 %%DATADIR%%/data1/vehicles/deathball/deathball.tga
 %%DATADIR%%/data1/vehicles/deathball/deathmask.tga
@@ -2079,10 +2159,12 @@
 %%DATADIR%%/data1/vehicles/hover/skin.tga
 %%DATADIR%%/data1/vehicles/hover/tris.md2
 %%DATADIR%%/data1/vehicles/hover/v_wep.md2
+%%DATADIR%%/data1/vehicles/hover/window.md2
 %%DATADIR%%/data1/vehicles/strafer/console.tga
 %%DATADIR%%/data1/vehicles/strafer/skin.tga
 %%DATADIR%%/data1/vehicles/strafer/tris.md2
 %%DATADIR%%/data1/vehicles/strafer/v_wep.md2
+%%DATADIR%%/data1/vehicles/strafer/window.md2
 %%PORTDOCS%%%%DOCSDIR%%/AA Dutch.txt
 %%PORTDOCS%%%%DOCSDIR%%/AA French.txt
 %%PORTDOCS%%%%DOCSDIR%%/AA German.txt
@@ -2094,7 +2176,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/AA Russian.txt
 %%PORTDOCS%%%%DOCSDIR%%/AA_ES.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
+share/pixmaps/alienarena.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/data1/vehicles/strafer
 @dirrm %%DATADIR%%/data1/vehicles/hover
@@ -2154,6 +2237,7 @@
 @dirrm %%DATADIR%%/data1/pics/bots
 @dirrm %%DATADIR%%/data1/pics
 @dirrm %%DATADIR%%/data1/particles
+@dirrm %%DATADIR%%/data1/models/weapons/v_violator
 @dirrm %%DATADIR%%/data1/models/weapons/v_shotg2
 @dirrm %%DATADIR%%/data1/models/weapons/v_shotg
 @dirrm %%DATADIR%%/data1/models/weapons/v_rocket
@@ -2177,17 +2261,8 @@
 @dirrm %%DATADIR%%/data1/models/weapons
 @dirrm %%DATADIR%%/data1/models/objects/rocket
 @dirrm %%DATADIR%%/data1/models/objects/laser
-@dirrm %%DATADIR%%/data1/models/objects/gibs/war_tent
-@dirrm %%DATADIR%%/data1/models/objects/gibs/war_leg
-@dirrm %%DATADIR%%/data1/models/objects/gibs/war_body
 @dirrm %%DATADIR%%/data1/models/objects/gibs/sm_meat
-@dirrm %%DATADIR%%/data1/models/objects/gibs/robot_leg
-@dirrm %%DATADIR%%/data1/models/objects/gibs/mart_head
 @dirrm %%DATADIR%%/data1/models/objects/gibs/mart_gut
-@dirrm %%DATADIR%%/data1/models/objects/gibs/head2
-@dirrm %%DATADIR%%/data1/models/objects/gibs/bone
-@dirrm %%DATADIR%%/data1/models/objects/gibs/bigmech_bod
-@dirrm %%DATADIR%%/data1/models/objects/gibs/bigmech_arm
 @dirrm %%DATADIR%%/data1/models/objects/gibs
 @dirrm %%DATADIR%%/data1/models/objects/fireball
 @dirrm %%DATADIR%%/data1/models/objects/electroball
@@ -2208,10 +2283,6 @@
 @dirrm %%DATADIR%%/data1/models/misc
 @dirrm %%DATADIR%%/data1/models/items/sproing
 @dirrm %%DATADIR%%/data1/models/items/quaddama
-@dirrm %%DATADIR%%/data1/models/items/keys/red_key
-@dirrm %%DATADIR%%/data1/models/items/keys/pass
-@dirrm %%DATADIR%%/data1/models/items/keys/key
-@dirrm %%DATADIR%%/data1/models/items/keys
 @dirrm %%DATADIR%%/data1/models/items/invulner
 @dirrm %%DATADIR%%/data1/models/items/healing/small
 @dirrm %%DATADIR%%/data1/models/items/healing/medium
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 34bc2e720fbd..92f29f029bef 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2007.605
+PORTVERSION=	2007.610
 CATEGORIES=	games
-MASTER_SITES=	http://offload1.icculus.org/alienarena/files/ \
-		http://distfiles.gentoo.org/distfiles/
-DISTNAME=	${PORTNAME}2007-20070613-linux
+MASTER_SITES=	ftp://ftp.simtel.com/pub/gamezone/31/5/17/
+DISTNAME=	${PORTNAME}2007-20071011-linux
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Alien Arena 2006 (native version)
@@ -24,7 +23,6 @@ USE_GMAKE=	yes
 MAKE_ENV=	WITH_DATADIR=yes WITH_LIBDIR=yes \
 		DATADIR="${DATADIR}" LIBDIR="${LIBDIR}"
 WRKSRC=		${WRKDIR}/${PORTNAME}2007/source
-BUILD_WRKSRC=	${WRKSRC}/..
 ALL_TARGET=	build-release
 
 OPTIONS=	CLIENT "Build client" on \
@@ -44,7 +42,9 @@ IGNORE=		needs at least one executable (CLIENT, DEDICATED or SDL)
 .endif
 
 .if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL)
-LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS+=	curl.4:${PORTSDIR}/ftp/curl \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png
 USE_GL=		yes
 .endif
 
@@ -80,22 +80,22 @@ PLIST_SUB+=	SDL="@comment "
 
 do-install:
 	${MKDIR} ${LIBDIR}/arena ${LIBDIR}/data1
-	cd ${BUILD_WRKSRC}/release && \
+	cd ${WRKSRC}/release && \
 		${INSTALL_PROGRAM} arena/game.so ${LIBDIR}/arena && \
 		${INSTALL_PROGRAM} game.so ${LIBDIR}/data1
 	${LN} -s ${DATADIR}/arena/* ${LIBDIR}/arena
 	${LN} -s ${DATADIR}/botinfo ${LIBDIR}
 	${LN} -s ${DATADIR}/data1/* ${LIBDIR}/data1
 .if !defined(WITHOUT_CLIENT)
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/crx \
+	${INSTALL_PROGRAM} ${WRKSRC}/release/crx \
 		${PREFIX}/bin/${PORTNAME}
 .endif
 .if !defined(WITHOUT_DEDICATED)
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/crded \
+	${INSTALL_PROGRAM} ${WRKSRC}/release/crded \
 		${PREFIX}/bin/${PORTNAME}-ded
 .endif
 .if !defined(WITHOUT_SDL)
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/crx.sdl \
+	${INSTALL_PROGRAM} ${WRKSRC}/release/crx.sdl \
 		${PREFIX}/bin/${PORTNAME}-sdl
 .endif
 
diff --git a/games/alienarena/distinfo b/games/alienarena/distinfo
index 1877022f3f02..f2ad41d5aa9f 100644
--- a/games/alienarena/distinfo
+++ b/games/alienarena/distinfo
@@ -1,3 +1,3 @@
-MD5 (alienarena2007-20070613-linux.zip) = 65d2948fa636cbc28c82da2264df2fea
-SHA256 (alienarena2007-20070613-linux.zip) = 593a7b106768abaff4c55f0b06dc20b5914601516c98ca5dfe93526de0559933
-SIZE (alienarena2007-20070613-linux.zip) = 223204178
+MD5 (alienarena2007-20071011-linux.zip) = 7ebb0dfeec4be80311921a075379c8dc
+SHA256 (alienarena2007-20071011-linux.zip) = 33036bd0dec77ae06c113d8e06718bd6f9e42efb634ee304c3fd9d48184c2e20
+SIZE (alienarena2007-20071011-linux.zip) = 245067302
diff --git a/games/alienarena/files/patch-Makefile b/games/alienarena/files/patch-Makefile
index 8eb73d19d1ac..3316dd54ec77 100644
--- a/games/alienarena/files/patch-Makefile
+++ b/games/alienarena/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ../Makefile.orig	Fri May 25 01:00:34 2007
-+++ ../Makefile	Sat Jul 21 13:39:48 2007
+--- ./Makefile.orig	Fri May 25 01:00:34 2007
++++ ./Makefile	Sat Jul 21 13:39:48 2007
 @@ -22,6 +22,10 @@
  # Build binary that uses SDL for sound when "1".
  SDLSOUND?=1
diff --git a/games/alienarena/files/patch-client__menu.c b/games/alienarena/files/patch-client__menu.c
new file mode 100644
index 000000000000..51abd7e0bf14
--- /dev/null
+++ b/games/alienarena/files/patch-client__menu.c
@@ -0,0 +1,148 @@
+--- ./client/menu.c.orig	Tue Dec 11 18:57:14 2007
++++ ./client/menu.c	Wed Dec 12 00:31:03 2007
+@@ -5104,143 +5104,16 @@
+ 
+ static void PlayerConfig_ScanDirectories( void )
+ {
+-	char findname[1024];
+ 	char scratch[1024];
+ 	int ndirs = 0, npms = 0;
+ 	char **dirnames;
+ 	int i;
+ 
+-	extern char **FS_ListFiles( char *, int *, unsigned, unsigned );
++	extern char **FS_ListFiles2( char *, int *, unsigned, unsigned );
+ 
+ 	s_numplayermodels = 0;
+ 
+-	//get dirs from gamedir first.
+-
+-	Com_sprintf( findname, sizeof(findname), "%s/players/*.*", FS_Gamedir() );
+-
+-	dirnames = FS_ListFiles( findname, &ndirs, SFF_SUBDIR, 0 );
+-	
+-	if ( dirnames ) {
+-		
+-		/*
+-		** go through the subdirectories
+-		*/
+-		npms = ndirs;
+-		if ( npms > MAX_PLAYERMODELS )
+-			npms = MAX_PLAYERMODELS;
+-
+-		for ( i = 0; i < npms; i++ )
+-		{
+-			int k, s;
+-			char *a, *b, *c;
+-			char **pcxnames;
+-			char **skinnames;
+-			int npcxfiles;
+-			int nskins = 0;
+-
+-			if ( dirnames[i] == 0 )
+-				continue;
+-
+-			// verify the existence of tris.md2
+-			strcpy( scratch, dirnames[i] );
+-			strcat( scratch, "/tris.md2" );
+-			if ( !Sys_FindFirst( scratch, 0, SFF_SUBDIR | SFF_HIDDEN | SFF_SYSTEM ) )
+-			{
+-				free( dirnames[i] );
+-				dirnames[i] = 0;
+-				Sys_FindClose();
+-				continue;
+-			}
+-			Sys_FindClose();
+-
+-			// verify the existence of at least one skin
+-			strcpy( scratch, dirnames[i] );
+-			strcat( scratch, "/*.tga" );
+-			pcxnames = FS_ListFiles( scratch, &npcxfiles, 0, SFF_SUBDIR | SFF_HIDDEN | SFF_SYSTEM );
+-
+-			if ( !pcxnames )
+-			{
+-				free( dirnames[i] );
+-				dirnames[i] = 0;
+-				continue;
+-			}
+-
+-			// count valid skins, which consist of a skin with a matching "_i" icon
+-			for ( k = 0; k < npcxfiles-1; k++ )
+-			{
+-				if ( !strstr( pcxnames[k], "_i.tga" ) )
+-				{
+-					if ( IconOfSkinExists( pcxnames[k], pcxnames, npcxfiles - 1 ) )
+-					{
+-						nskins++;
+-					}
+-				}
+-			}
+-			if ( !nskins )
+-				continue;
+-
+-			skinnames = malloc( sizeof( char * ) * ( nskins + 1 ) );
+-			memset( skinnames, 0, sizeof( char * ) * ( nskins + 1 ) );
+-
+-			// copy the valid skins
+-			for ( s = 0, k = 0; k < npcxfiles-1; k++ )
+-			{
+-				char *a, *b, *c;
+-
+-				if ( !strstr( pcxnames[k], "_i.tga" ) )
+-				{
+-					if ( IconOfSkinExists( pcxnames[k], pcxnames, npcxfiles - 1 ) )
+-					{
+-						a = strrchr( pcxnames[k], '/' );
+-						b = strrchr( pcxnames[k], '\\' );
+-
+-						if ( a > b )
+-							c = a;
+-						else
+-							c = b;
+-
+-						strcpy( scratch, c + 1 );
+-
+-						if ( strrchr( scratch, '.' ) )
+-							*strrchr( scratch, '.' ) = 0;
+-
+-						skinnames[s] = strdup( scratch );
+-						s++;
+-					}
+-				}
+-			}
+-
+-			// at this point we have a valid player model
+-			s_pmi[s_numplayermodels].nskins = nskins;
+-			s_pmi[s_numplayermodels].skindisplaynames = skinnames;
+-
+-			// make short name for the model
+-			a = strrchr( dirnames[i], '/' );
+-			b = strrchr( dirnames[i], '\\' );
+-
+-			if ( a > b )
+-				c = a;
+-			else
+-				c = b;
+-
+-			strncpy( s_pmi[s_numplayermodels].displayname, c + 1, MAX_DISPLAYNAME-1 );
+-			strcpy( s_pmi[s_numplayermodels].directory, c + 1 );
+-
+-			FreeFileList( pcxnames, npcxfiles );
+-
+-			s_numplayermodels++;
+-		}
+-		if ( dirnames )
+-			FreeFileList( dirnames, ndirs );
+-	}
+-
+-	/*
+-	** get a list of directories from basedir
+-	*/
+-
+-	Com_sprintf( findname, sizeof(findname), "%s/players/*.*", BASEDIRNAME);
+-
+-	 dirnames = FS_ListFiles( findname, &ndirs, SFF_SUBDIR, 0 );
++	dirnames = FS_ListFiles2( "players/*.*", &ndirs, SFF_SUBDIR, 0 );
+ 
+ 	if ( !dirnames )
+ 		return;
diff --git a/games/alienarena/files/patch-game__acesrc__acebot_nodes.c b/games/alienarena/files/patch-game__acesrc__acebot_nodes.c
index 7b1d1e531d65..86f0fc03d700 100644
--- a/games/alienarena/files/patch-game__acesrc__acebot_nodes.c
+++ b/games/alienarena/files/patch-game__acesrc__acebot_nodes.c
@@ -4,7 +4,7 @@
  
  	safe_bprintf(PRINT_MEDIUM,"Saving node table...");
  
--#ifdef __linux__
+-#ifdef __unix__
 -	strcpy(filename,"botinfo/nav/");
 -#else
 -	strcpy(filename,"botinfo\\nav\\");
diff --git a/games/alienarena/files/patch-qcommon__files.c b/games/alienarena/files/patch-qcommon__files.c
index 15c4e13ac71b..06f0f58e91b2 100644
--- a/games/alienarena/files/patch-qcommon__files.c
+++ b/games/alienarena/files/patch-qcommon__files.c
@@ -1,6 +1,6 @@
---- ./qcommon/files.c.orig	Wed Apr 18 14:28:43 2007
-+++ ./qcommon/files.c	Sat Jul 21 09:36:05 2007
-@@ -776,6 +776,12 @@
+--- ./qcommon/files.c.orig	Tue Dec 11 18:57:14 2007
++++ ./qcommon/files.c	Tue Dec 11 21:51:48 2007
+@@ -734,6 +734,12 @@
  	else
  	{
  		Cvar_FullSet ("gamedir", dir, CVAR_SERVERINFO|CVAR_NOSET);
@@ -10,10 +10,176 @@
 +#ifdef LIBDIR
 +		FS_AddGameDirectory (va("%s/%s", LIBDIR, dir) );
 +#endif
- 		if (fs_cddir->string[0])
- 			FS_AddGameDirectory (va("%s/%s", fs_cddir->string, dir) );
  		FS_AddGameDirectory (va("%s/%s", fs_basedir->string, dir) );
-@@ -1020,6 +1026,19 @@
+ #ifdef __unix__
+ 		FS_AddHomeAsGameDirectory(dir);
+@@ -834,7 +840,156 @@
+ 	return list;
+ }
+ 
+-//#ifdef __unix__
++/*
++ * CompareAttributesPack
++ *
++ * Compare file attributes (musthave and canthave) in packed files. If
++ * "output" is not NULL, "size" is greater than zero and the file matches the
++ * attributes then a copy of the matching string will be placed there (with
++ * SFF_SUBDIR it changes).
++ *
++ * Returns a boolean value, true if the attributes match the file.
++ */
++qboolean
++ComparePackFiles(const char *findname, const char *name,
++    unsigned musthave, unsigned canthave, char *output, int size)
++{
++	qboolean	 retval;
++	char		*ptr;
++	char		 buffer[MAX_OSPATH];
++
++	strncpy(buffer, name, sizeof(buffer)-1);
++	buffer[sizeof(buffer)-1] = '\0';
++
++	if ((canthave & SFF_SUBDIR) && name[strlen(name)-1] == '/')
++		return (false);
++
++	if (musthave & SFF_SUBDIR) {
++		if ((ptr = strrchr(buffer, '/')) != NULL)
++			*ptr = '\0';
++		else
++			return (false);
++	}
++
++	if ((musthave & SFF_HIDDEN) || (canthave & SFF_HIDDEN)) {
++		if ((ptr = strrchr(buffer, '/')) == NULL)
++			ptr = buffer;
++		if (((musthave & SFF_HIDDEN) && ptr[1] != '.') ||
++		    ((canthave & SFF_HIDDEN) && ptr[1] == '.'))
++			return (false);
++	}
++
++	if (canthave & SFF_RDONLY)
++		return (false);
++
++	retval = glob_match((char *)findname, buffer);
++
++	if (retval && output != NULL) {
++		strncpy(output, buffer, size-1);
++		buffer[size-1] = '\0';
++	}
++
++	return (retval);
++}
++
++/*
++ * FS_ListFiles2
++ *
++ * Create a list of files that match a criteria.
++ *
++ * Searchs are relative to the game directory and use all the search paths
++ * including .pak and .pk3 files.
++ */
++char **
++FS_ListFiles2(char *findname, int *numfiles, unsigned musthave, unsigned canthave)
++{
++	searchpath_t	*search;		/* Search path. */
++	int		i, j;			/* Loop counters. */
++	int		nfiles;			/* Number of files found. */
++	int		tmpnfiles;		/* Temp number of files. */
++	char		**tmplist;		/* Temporary list of files. */
++	char		**list;			/* List of files found. */
++	char		path[MAX_OSPATH];	/* Temporary path. */
++
++	nfiles = 0;
++	list = malloc(sizeof(char *));
++
++	for (search = fs_searchpaths; search != NULL; search = search->next) {
++		if (search->pack != NULL) {
++			for (i = 0, j = 0; i < search->pack->numfiles; i++)
++				if (ComparePackFiles(findname,
++				    search->pack->files[i].name,
++				    musthave, canthave, NULL, 0))
++					j++;
++			if (j == 0)
++				continue;
++			nfiles += j;
++			list = realloc(list, nfiles * sizeof(char *));
++			for (i = 0, j = nfiles - j;
++			    i < search->pack->numfiles;
++			    i++)
++				if (ComparePackFiles(findname,
++				    search->pack->files[i].name,
++				    musthave, canthave, path, sizeof(path)))
++					list[j++] = strdup(path);
++		} else if (search->filename != NULL) {
++			Com_sprintf(path, sizeof(path), "%s/%s",
++			    search->filename, findname);
++			tmplist = FS_ListFiles(path, &tmpnfiles, musthave,
++			    canthave);
++			if (tmplist != NULL) {
++				tmpnfiles--;
++				nfiles += tmpnfiles;
++				list = realloc(list, nfiles * sizeof(char *));
++				for (i = 0, j = nfiles - tmpnfiles;
++				    i < tmpnfiles;
++				    i++, j++)
++					list[j] = strdup(tmplist[i] +
++					    strlen(search->filename) + 1);
++				FS_FreeFileList(tmplist, tmpnfiles);
++			}
++		}
++	}
++
++	/* Delete duplicates. */
++	tmpnfiles = 0;
++	for (i = 0; i < nfiles; i++) {
++		if (list[i] == NULL)
++			continue;
++		for (j = i + 1; j < nfiles; j++)
++			if (list[j] != NULL &&
++			    strcmp(list[i], list[j]) == 0) {
++				free(list[j]);
++				list[j] = NULL;
++				tmpnfiles++;
++			}
++	}
++
++	if (tmpnfiles > 0) {
++		nfiles -= tmpnfiles;
++		tmplist = malloc(nfiles * sizeof(char *));
++		for (i = 0, j = 0; i < nfiles + tmpnfiles; i++)
++			if (list[i] != NULL)
++				tmplist[j++] = list[i];
++		free(list);
++		list = tmplist;
++	}
++
++	/* Add a guard. */
++	if (nfiles > 0) {
++		nfiles++;
++		list = realloc(list, nfiles * sizeof(char *));
++		list[nfiles - 1] = NULL;
++	} else {
++		free(list);
++		list = NULL;
++	}
++
++	*numfiles = nfiles;
++
++	return (list);
++}
++
+ void FS_FreeFileList (char **list, int n) // jit
+ {
+ 	int i;
+@@ -850,7 +1005,6 @@
+ 
+ 	free(list);
+ }
+-//#endif
+ 
+ /*
+ ** FS_Dir_f
+@@ -976,6 +1130,19 @@
  	Cmd_AddCommand ("path", FS_Path_f);
  	Cmd_AddCommand ("link", FS_Link_f);
  	Cmd_AddCommand ("dir", FS_Dir_f );
diff --git a/games/alienarena/files/patch-ref_gl__r_script.c b/games/alienarena/files/patch-ref_gl__r_script.c
new file mode 100644
index 000000000000..67c682a277b4
--- /dev/null
+++ b/games/alienarena/files/patch-ref_gl__r_script.c
@@ -0,0 +1,83 @@
+--- ref_gl/r_script.c.orig	Wed Dec 12 01:22:30 2007
++++ ref_gl/r_script.c	Wed Dec 12 01:21:49 2007
+@@ -1020,35 +1020,16 @@
+ 	free(buf);
+ }
+ 
+-extern char **FS_ListFiles( char *, int *, unsigned, unsigned );
++extern char **FS_ListFiles2( char *, int *, unsigned, unsigned );
+ extern void FS_FreeFileList (char **list, int n);
+ void RS_ScanPathForScripts (void)
+ {
+ 	char	script[MAX_OSPATH];
+-	char	dirstring[1024], *c;
++	char	*c;
+ 	char	**script_list;
+ 	int	script_count, i;
+-	char *path = NULL;
+-
+-
+-	Com_sprintf(dirstring, sizeof(dirstring), "%s/scripts/*.rscript", FS_Gamedir());
+-	script_list = FS_ListFiles(dirstring, &script_count, 0, SFF_SUBDIR | SFF_HIDDEN | SFF_SYSTEM);
+-
+-	if(script_list) {
+-		for (i = 0; i < script_count-1; i++)
+-		{
+-			c = COM_SkipPath(script_list[i]);
+-			Com_sprintf(script, MAX_OSPATH, "scripts/%s", c);
+-			RS_LoadScript(script);
+-		}
+-
+-		FS_FreeFileList(script_list, script_count);
+-	}
+-
+-	script_count = 0;
+ 
+-	Com_sprintf(dirstring, sizeof(dirstring), "%s/scripts/*.rscript", BASEDIRNAME);
+-	script_list = FS_ListFiles(dirstring, &script_count, 0, SFF_SUBDIR | SFF_HIDDEN | SFF_SYSTEM);
++	script_list = FS_ListFiles2("scripts/*.rscript", &script_count, 0, SFF_SUBDIR | SFF_HIDDEN | SFF_SYSTEM);
+ 
+ 	if(script_list) {
+ 		for (i = 0; i < script_count-1; i++)
+@@ -1057,32 +1038,12 @@
+ 			Com_sprintf(script, MAX_OSPATH, "scripts/%s", c);
+ 			RS_LoadScript(script);
+ 		}
+-
+ 		FS_FreeFileList(script_list, script_count);
+ 	}
+ 
+ 	script_count = 0;
+ 	if(gl_normalmaps->value) { //search for normal map scripts ONLY if we are using normal mapping
+-		
+-		Com_sprintf(dirstring, sizeof(dirstring), "%s/scripts/normals/*.rscript", FS_Gamedir());
+-		script_list = FS_ListFiles(dirstring, &script_count, 0, SFF_SUBDIR | SFF_HIDDEN | SFF_SYSTEM);
+-
+-		if(script_list) {
+-			for (i = 0; i < script_count-1; i++)
+-			{
+-				c = COM_SkipPath(script_list[i]);
+-				Com_sprintf(script, MAX_OSPATH, "scripts/normals/%s", c);
+-				RS_LoadScript(script);
+-			}
+-
+-			FS_FreeFileList(script_list, script_count);
+-		}
+-
+-		script_count = 0;
+-
+-		Com_sprintf(dirstring, sizeof(dirstring), "%s/scripts/normals/*.rscript", BASEDIRNAME);
+-		script_list = FS_ListFiles(dirstring, &script_count, 0, SFF_SUBDIR | SFF_HIDDEN | SFF_SYSTEM);
+-	
++		script_list = FS_ListFiles("scripts/normals/*.rscript", &script_count, 0, SFF_SUBDIR | SFF_HIDDEN | SFF_SYSTEM);
+ 		if(script_list) {
+ 			for (i = 0; i < script_count-1; i++)
+ 			{
+@@ -1090,7 +1051,6 @@
+ 				Com_sprintf(script, MAX_OSPATH, "scripts/normals/%s", c);
+ 				RS_LoadScript(script);
+ 			}
+-
+ 			FS_FreeFileList(script_list, script_count);
+ 		}
+ 	}
diff --git a/games/linux-alienarena/Makefile b/games/linux-alienarena/Makefile
index 7fc716a9a90e..efabb5e68b90 100644
--- a/games/linux-alienarena/Makefile
+++ b/games/linux-alienarena/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2007.605
+PORTVERSION=	2007.610
 CATEGORIES=	games linux
-MASTER_SITES=	http://offload1.icculus.org/alienarena/files/ \
-		http://distfiles.gentoo.org/distfiles/
+MASTER_SITES=	ftp://ftp.simtel.com/pub/gamezone/31/5/17/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}2007-20070613-linux
+DISTNAME=	${PORTNAME}2007-20071011-linux
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Alien Arena 2006 (Linux version)
 
+DEPRECATED=	needs missing/outdated Linux dependencies; use native instead
+BROKEN=		${DEPRECATED}
+
 RUN_DEPENDS=	${DATADIR}/arena/default.cfg:${PORTSDIR}/games/alienarena-data
 
 USE_ZIP=	yes
@@ -40,6 +42,9 @@ IGNORE=		needs at least one executable (CLIENT, DEDICATED or SDL)
 .endif
 
 .if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL)
+# FIXME: needs OpenSSL 0.9.8 and libidn for Linux (not updated/available).
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libcurl.so.3:${PORTSDIR}/ftp/linux-curl \
+		${LINUXBASE}/lib/libssl.so.5:${PORTSDIR}/security/linux-openssl
 USE_GL=		linux
 .endif
 
diff --git a/games/linux-alienarena/distinfo b/games/linux-alienarena/distinfo
index 1877022f3f02..f2ad41d5aa9f 100644
--- a/games/linux-alienarena/distinfo
+++ b/games/linux-alienarena/distinfo
@@ -1,3 +1,3 @@
-MD5 (alienarena2007-20070613-linux.zip) = 65d2948fa636cbc28c82da2264df2fea
-SHA256 (alienarena2007-20070613-linux.zip) = 593a7b106768abaff4c55f0b06dc20b5914601516c98ca5dfe93526de0559933
-SIZE (alienarena2007-20070613-linux.zip) = 223204178
+MD5 (alienarena2007-20071011-linux.zip) = 7ebb0dfeec4be80311921a075379c8dc
+SHA256 (alienarena2007-20071011-linux.zip) = 33036bd0dec77ae06c113d8e06718bd6f9e42efb634ee304c3fd9d48184c2e20
+SIZE (alienarena2007-20071011-linux.zip) = 245067302