Both data and program:

- Update to version 2008.

Only for games/alienarena:
- Remove local patches (now integrated upstream).
- Check for WITH_* instead of !WITHOUT_* (avoid double negation).
- Add note about using the SDL version in FreeBSD >= 7 because of sound
  problems.

19 files changed, 469 insertions, 1092 deletions

diff --git a/games/alienarena-data/Makefile b/games/alienarena-data/Makefile
index e984e91..2dd7f77 100644
--- a/games/alienarena-data/Makefile
+++ b/games/alienarena-data/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2007.610
+PORTVERSION=	2008
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.simtel.com/pub/gamezone/31/5/17/
+MASTER_SITES=	http://offload1.icculus.org/alienarena/Files/
 PKGNAMESUFFIX=	-data
-DISTNAME=	${PORTNAME}2007-20071011-linux
+DISTNAME=	${PORTNAME}2008-linux20080227
 
 MAINTAINER=	alepulver@FreeBSD.org
-COMMENT=	Alien Arena 2006 (data)
+COMMENT=	Alien Arena 2008 (data)
 
 USE_ZIP=	yes
 NO_BUILD=	yes
 NO_PACKAGE=	Package will be 185MB, set FORCE_PACKAGE if you want it
-WRKSRC=		${WRKDIR}/${PORTNAME}2007
+WRKSRC=		${WRKDIR}/${PORTNAME}2008
 
 .include <bsd.port.pre.mk>
 
diff --git a/games/alienarena-data/distinfo b/games/alienarena-data/distinfo
index f2ad41d..2271faf 100644
--- a/games/alienarena-data/distinfo
+++ b/games/alienarena-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (alienarena2007-20071011-linux.zip) = 7ebb0dfeec4be80311921a075379c8dc
-SHA256 (alienarena2007-20071011-linux.zip) = 33036bd0dec77ae06c113d8e06718bd6f9e42efb634ee304c3fd9d48184c2e20
-SIZE (alienarena2007-20071011-linux.zip) = 245067302
+MD5 (alienarena2008-linux20080227.zip) = 5fcb17a65e220b1aad5ec25f97b35932
+SHA256 (alienarena2008-linux20080227.zip) = fe4325465b1b12e8a39552022d812531adae5273a79c2940514568b533e73e44
+SIZE (alienarena2008-linux20080227.zip) = 223329701
diff --git a/games/alienarena-data/pkg-descr b/games/alienarena-data/pkg-descr
index e1204eb..3db04ad 100644
--- a/games/alienarena-data/pkg-descr
+++ b/games/alienarena-data/pkg-descr
@@ -1,16 +1,12 @@
-AA2K7 is the latest version of a freeware online deathmatch game that was
-first introduced to the public in October, 2004. Since that initial release,
-nearly every aspect of the game has been revamped, in fact, much of the
-content and code from the November 2005 release of Alien Arena 2006 has been
-redone as well.  It's like an entirely new game, and it may shock people just
-how much it has improved in less than a year's time. With 35 levels, five
-modes of play, loads of mutators, built-in bots, 11 player characters, 8
-weapons(with alt-fire modes), the game has an endless supply of replayability.
-With so many new features, AA2K7 is nearly an entirely new game when held in
-comparison to it's predecessor. With the trials and tribulations of software
-development, endless hours of playing, gathering feedback, COR Entertainment
-has been able to not only fine tune and perfect it's flagship game, but add
-completely new dimensions to it.
+Alien Arena 2008 is a free standalone deathmatch game based on source code
+released by id Software. Begun by COR Entertainment in 2004, the game combines
+a 1950s-era sci-fi atmosphere with gameplay similar to the Quake, Doom, and
+Unreal Tournament series. Alien Arena focuses mainly on online multiplayer
+action, although it does contain single player campaigns against bots.
+
+Alien Arena has been released for Microsoft Windows, Linux and FreeBSD. Alien
+Arena has been free-to-play since its inception, and there are currently no
+plans to change it to pay-to-play.
 
 Note: this port only contains the data needed to run Alien Arena, shared by
 the Linux and native ports of the game engine. To play Alien Arena you have to
diff --git a/games/alienarena-data/pkg-plist b/games/alienarena-data/pkg-plist
index 7db2864..2307a96 100644
--- a/games/alienarena-data/pkg-plist
+++ b/games/alienarena-data/pkg-plist
@@ -25,21 +25,28 @@
 %%DATADIR%%/botinfo/Yoz.cfg
 %%DATADIR%%/botinfo/allbots.tmp
 %%DATADIR%%/botinfo/aoa-atlantis.tmp
+%%DATADIR%%/botinfo/aoa-corrosion.tmp
 %%DATADIR%%/botinfo/aoa-frost.tmp
 %%DATADIR%%/botinfo/aoa-morpheus.tmp
+%%DATADIR%%/botinfo/aoa-zorn.tmp
 %%DATADIR%%/botinfo/db-chromium.tmp
 %%DATADIR%%/botinfo/db-icarus.tmp
 %%DATADIR%%/botinfo/db-vesuvius.tmp
+%%DATADIR%%/botinfo/dm-aquous.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-command.tmp
+%%DATADIR%%/botinfo/dm-corrosion.tmp
 %%DATADIR%%/botinfo/dm-crucible.tmp
 %%DATADIR%%/botinfo/dm-deimos.tmp
+%%DATADIR%%/botinfo/dm-dismal.tmp
 %%DATADIR%%/botinfo/dm-dread.tmp
 %%DATADIR%%/botinfo/dm-dynamo2.tmp
 %%DATADIR%%/botinfo/dm-europa.tmp
+%%DATADIR%%/botinfo/dm-europa2k8.tmp
 %%DATADIR%%/botinfo/dm-frontier2.tmp
 %%DATADIR%%/botinfo/dm-furious.tmp
 %%DATADIR%%/botinfo/dm-grindery.tmp
@@ -49,36 +56,50 @@
 %%DATADIR%%/botinfo/dm-omega.tmp
 %%DATADIR%%/botinfo/dm-saucer.tmp
 %%DATADIR%%/botinfo/dm-titan.tmp
+%%DATADIR%%/botinfo/dm-titan2k8.tmp
+%%DATADIR%%/botinfo/dm-turbo.tmp
 %%DATADIR%%/botinfo/dm-vesuvius.tmp
 %%DATADIR%%/botinfo/dm-violator.tmp
 %%DATADIR%%/botinfo/dm-zion.tmp
+%%DATADIR%%/botinfo/dm-zorn.tmp
 %%DATADIR%%/botinfo/nav/aoa-atlantis.nod
+%%DATADIR%%/botinfo/nav/aoa-corrosion.nod
 %%DATADIR%%/botinfo/nav/aoa-frost.nod
 %%DATADIR%%/botinfo/nav/aoa-morpheus.nod
+%%DATADIR%%/botinfo/nav/aoa-zorn.nod
 %%DATADIR%%/botinfo/nav/cp-grindery.nod
 %%DATADIR%%/botinfo/nav/ctf-atlantis.nod
 %%DATADIR%%/botinfo/nav/ctf-chromium.nod
+%%DATADIR%%/botinfo/nav/ctf-corrosion.nod
 %%DATADIR%%/botinfo/nav/ctf-europa.nod
+%%DATADIR%%/botinfo/nav/ctf-europa2k8.nod
 %%DATADIR%%/botinfo/nav/ctf-frost.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
+%%DATADIR%%/botinfo/nav/ctf-titan2k8.nod
 %%DATADIR%%/botinfo/nav/ctf-vesuvius.nod
+%%DATADIR%%/botinfo/nav/ctf-zorn.nod
 %%DATADIR%%/botinfo/nav/db-chromium.nod
 %%DATADIR%%/botinfo/nav/db-icarus.nod
 %%DATADIR%%/botinfo/nav/db-vesuvius.nod
+%%DATADIR%%/botinfo/nav/dm-aquous.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-command.nod
+%%DATADIR%%/botinfo/nav/dm-corrosion.nod
 %%DATADIR%%/botinfo/nav/dm-crucible.nod
 %%DATADIR%%/botinfo/nav/dm-deimos.nod
+%%DATADIR%%/botinfo/nav/dm-dismal.nod
 %%DATADIR%%/botinfo/nav/dm-dread.nod
 %%DATADIR%%/botinfo/nav/dm-dynamo2.nod
 %%DATADIR%%/botinfo/nav/dm-europa.nod
+%%DATADIR%%/botinfo/nav/dm-europa2k8.nod
 %%DATADIR%%/botinfo/nav/dm-frontier2.nod
 %%DATADIR%%/botinfo/nav/dm-furious.nod
 %%DATADIR%%/botinfo/nav/dm-grindery.nod
@@ -88,12 +109,18 @@
 %%DATADIR%%/botinfo/nav/dm-omega.nod
 %%DATADIR%%/botinfo/nav/dm-saucer.nod
 %%DATADIR%%/botinfo/nav/dm-titan.nod
+%%DATADIR%%/botinfo/nav/dm-titan2k8.nod
+%%DATADIR%%/botinfo/nav/dm-turbo.nod
 %%DATADIR%%/botinfo/nav/dm-vesuvius.nod
 %%DATADIR%%/botinfo/nav/dm-violator.nod
 %%DATADIR%%/botinfo/nav/dm-zion.nod
+%%DATADIR%%/botinfo/nav/dm-zorn.nod
+%%DATADIR%%/botinfo/nav/tca-corrosion.nod
 %%DATADIR%%/botinfo/nav/tca-europa.nod
+%%DATADIR%%/botinfo/nav/tca-europa2k8.nod
 %%DATADIR%%/botinfo/nav/tca-frost.nod
 %%DATADIR%%/botinfo/nav/tca-titan.nod
+%%DATADIR%%/botinfo/nav/tca-titan2k8.nod
 %%DATADIR%%/botinfo/nav/tca-zion.nod
 %%DATADIR%%/botinfo/sample.cfg
 %%DATADIR%%/botinfo/team.tmp
@@ -153,13 +180,14 @@
 %%DATADIR%%/data1/gfx/beamfx.tga
 %%DATADIR%%/data1/gfx/blasterfx.tga
 %%DATADIR%%/data1/gfx/bluelightning.tga
+%%DATADIR%%/data1/gfx/bluelightning2.tga
 %%DATADIR%%/data1/gfx/bubbles.tga
 %%DATADIR%%/data1/gfx/caustics.tga
 %%DATADIR%%/data1/gfx/chrome.tga
+%%DATADIR%%/data1/gfx/chrome2.tga
 %%DATADIR%%/data1/gfx/citymask.tga
 %%DATADIR%%/data1/gfx/comp1.tga
 %%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
@@ -171,10 +199,10 @@
 %%DATADIR%%/data1/gfx/flares/flare0.tga
 %%DATADIR%%/data1/gfx/flash.tga
 %%DATADIR%%/data1/gfx/gamarafx.tga
+%%DATADIR%%/data1/gfx/glightning.tga
 %%DATADIR%%/data1/gfx/gold.tga
 %%DATADIR%%/data1/gfx/grapplefx.tga
 %%DATADIR%%/data1/gfx/grchrome.tga
-%%DATADIR%%/data1/gfx/green.tga
 %%DATADIR%%/data1/gfx/greenlightning.tga
 %%DATADIR%%/data1/gfx/greenline.tga
 %%DATADIR%%/data1/gfx/hastebase.tga
@@ -186,14 +214,11 @@
 %%DATADIR%%/data1/gfx/lightning.tga
 %%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
 %%DATADIR%%/data1/gfx/plate5fx.tga
-%%DATADIR%%/data1/gfx/purple.tga
 %%DATADIR%%/data1/gfx/purpleline.tga
 %%DATADIR%%/data1/gfx/quadbase.tga
 %%DATADIR%%/data1/gfx/quadmask.tga
@@ -201,36 +226,43 @@
 %%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
+%%DATADIR%%/data1/gfx/rlauncherfx.tga
 %%DATADIR%%/data1/gfx/sconsole.tga
 %%DATADIR%%/data1/gfx/shardmask.tga
 %%DATADIR%%/data1/gfx/skullglow.tga
 %%DATADIR%%/data1/gfx/smartgunmask.tga
-%%DATADIR%%/data1/gfx/strykerfx.tga
+%%DATADIR%%/data1/gfx/tekwallmask.tga
+%%DATADIR%%/data1/gfx/trim2mask.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-corrosion.tga
+%%DATADIR%%/data1/levelshots/aoa-corrosion.txt
 %%DATADIR%%/data1/levelshots/aoa-frost.tga
 %%DATADIR%%/data1/levelshots/aoa-frost.txt
 %%DATADIR%%/data1/levelshots/aoa-morpheus.tga
 %%DATADIR%%/data1/levelshots/aoa-morpheus.txt
-%%DATADIR%%/data1/levelshots/aoa2.tga
+%%DATADIR%%/data1/levelshots/aoa-zorn.tga
+%%DATADIR%%/data1/levelshots/aoa-zorn.txt
+%%DATADIR%%/data1/levelshots/cft-corrosion.txt
 %%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-corrosion.tga
 %%DATADIR%%/data1/levelshots/ctf-europa.tga
 %%DATADIR%%/data1/levelshots/ctf-europa.txt
+%%DATADIR%%/data1/levelshots/ctf-europa2k8.tga
+%%DATADIR%%/data1/levelshots/ctf-europa2k8.txt
 %%DATADIR%%/data1/levelshots/ctf-frost.tga
 %%DATADIR%%/data1/levelshots/ctf-frost.txt
 %%DATADIR%%/data1/levelshots/ctf-icarus2.tga
@@ -239,16 +271,20 @@
 %%DATADIR%%/data1/levelshots/ctf-strongholdl.txt
 %%DATADIR%%/data1/levelshots/ctf-terminal.tga
 %%DATADIR%%/data1/levelshots/ctf-terminal.txt
-%%DATADIR%%/data1/levelshots/ctf-titan.tga
-%%DATADIR%%/data1/levelshots/ctf-titan.txt
+%%DATADIR%%/data1/levelshots/ctf-titan2k8.tga
+%%DATADIR%%/data1/levelshots/ctf-titan2k8.txt
 %%DATADIR%%/data1/levelshots/ctf-vesuvius.tga
 %%DATADIR%%/data1/levelshots/ctf-vesuvius.txt
+%%DATADIR%%/data1/levelshots/ctf-zorn.tga
+%%DATADIR%%/data1/levelshots/ctf-zorn.txt
 %%DATADIR%%/data1/levelshots/db-chromium.tga
 %%DATADIR%%/data1/levelshots/db-chromium.txt
 %%DATADIR%%/data1/levelshots/db-icarus.tga
 %%DATADIR%%/data1/levelshots/db-icarus.txt
 %%DATADIR%%/data1/levelshots/db-vesuvius.tga
 %%DATADIR%%/data1/levelshots/db-vesuvius.txt
+%%DATADIR%%/data1/levelshots/dm-aquous.tga
+%%DATADIR%%/data1/levelshots/dm-aquous.txt
 %%DATADIR%%/data1/levelshots/dm-atlantis.tga
 %%DATADIR%%/data1/levelshots/dm-atlantis.txt
 %%DATADIR%%/data1/levelshots/dm-babel.tga
@@ -259,140 +295,169 @@
 %%DATADIR%%/data1/levelshots/dm-bloodfactory.txt
 %%DATADIR%%/data1/levelshots/dm-chasmatic.tga
 %%DATADIR%%/data1/levelshots/dm-chasmatic.txt
+%%DATADIR%%/data1/levelshots/dm-command.tga
+%%DATADIR%%/data1/levelshots/dm-command.txt
+%%DATADIR%%/data1/levelshots/dm-corrosion.tga
+%%DATADIR%%/data1/levelshots/dm-corrosion.txt
 %%DATADIR%%/data1/levelshots/dm-crucible.tga
 %%DATADIR%%/data1/levelshots/dm-crucible.txt
-%%DATADIR%%/data1/levelshots/dm-deimos.tga
-%%DATADIR%%/data1/levelshots/dm-deimos.txt
+%%DATADIR%%/data1/levelshots/dm-dismal.tga
+%%DATADIR%%/data1/levelshots/dm-dismal.txt
 %%DATADIR%%/data1/levelshots/dm-dread.tga
 %%DATADIR%%/data1/levelshots/dm-dread.txt
 %%DATADIR%%/data1/levelshots/dm-dynamo2.tga
 %%DATADIR%%/data1/levelshots/dm-dynamo2.txt
-%%DATADIR%%/data1/levelshots/dm-europa.tga
-%%DATADIR%%/data1/levelshots/dm-europa.txt
-%%DATADIR%%/data1/levelshots/dm-frontier2.tga
-%%DATADIR%%/data1/levelshots/dm-frontier2.txt
-%%DATADIR%%/data1/levelshots/dm-furious.tga
-%%DATADIR%%/data1/levelshots/dm-furious.txt
-%%DATADIR%%/data1/levelshots/dm-grindery.tga
-%%DATADIR%%/data1/levelshots/dm-grindery.txt
+%%DATADIR%%/data1/levelshots/dm-europa2k8.tga
+%%DATADIR%%/data1/levelshots/dm-europa2k8.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
 %%DATADIR%%/data1/levelshots/dm-omega.txt
 %%DATADIR%%/data1/levelshots/dm-saucer.tga
 %%DATADIR%%/data1/levelshots/dm-saucer.txt
-%%DATADIR%%/data1/levelshots/dm-titan.tga
-%%DATADIR%%/data1/levelshots/dm-titan.txt
+%%DATADIR%%/data1/levelshots/dm-titan2k8.tga
+%%DATADIR%%/data1/levelshots/dm-titan2k8.txt
+%%DATADIR%%/data1/levelshots/dm-turbo.tga
+%%DATADIR%%/data1/levelshots/dm-turbo.txt
 %%DATADIR%%/data1/levelshots/dm-vesuvius.tga
 %%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/dm-zorn.tga
+%%DATADIR%%/data1/levelshots/dm-zorn.txt
+%%DATADIR%%/data1/levelshots/tca-corrosion.tga
+%%DATADIR%%/data1/levelshots/tca-corrosion.txt
 %%DATADIR%%/data1/levelshots/tca-europa.txt
+%%DATADIR%%/data1/levelshots/tca-europa2k8.tga
+%%DATADIR%%/data1/levelshots/tca-europa2k8.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/tca-titan2k8.tga
+%%DATADIR%%/data1/levelshots/tca-titan2k8.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-corrosion.bsp
 %%DATADIR%%/data1/maps/aoa-frost.bsp
 %%DATADIR%%/data1/maps/aoa-morpheus.bsp
-%%DATADIR%%/data1/maps/compile.bat
+%%DATADIR%%/data1/maps/aoa-zorn.bsp
 %%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-corrosion.bsp
+%%DATADIR%%/data1/maps/ctf-europa2k8.bsp
 %%DATADIR%%/data1/maps/ctf-frost.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
+%%DATADIR%%/data1/maps/ctf-titan2k8.bsp
 %%DATADIR%%/data1/maps/ctf-vesuvius.bsp
+%%DATADIR%%/data1/maps/ctf-zorn.bsp
 %%DATADIR%%/data1/maps/db-chromium.bsp
 %%DATADIR%%/data1/maps/db-icarus.bsp
 %%DATADIR%%/data1/maps/db-vesuvius.bsp
+%%DATADIR%%/data1/maps/dm-aquous.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-command.bsp
+%%DATADIR%%/data1/maps/dm-corrosion.bsp
 %%DATADIR%%/data1/maps/dm-crucible.bsp
-%%DATADIR%%/data1/maps/dm-deimos.bsp
+%%DATADIR%%/data1/maps/dm-dismal.bsp
 %%DATADIR%%/data1/maps/dm-dread.bsp
 %%DATADIR%%/data1/maps/dm-dynamo2.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-europa2k8.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-titan2k8.bsp
+%%DATADIR%%/data1/maps/dm-turbo.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/dm-zorn.bsp
 %%DATADIR%%/data1/maps/scripts/aoa-atlantis.mus
+%%DATADIR%%/data1/maps/scripts/aoa-corrosion.fog
+%%DATADIR%%/data1/maps/scripts/aoa-corrosion.mus
+%%DATADIR%%/data1/maps/scripts/aoa-frost.fog
 %%DATADIR%%/data1/maps/scripts/aoa-frost.mus
 %%DATADIR%%/data1/maps/scripts/aoa-morpheus.mus
+%%DATADIR%%/data1/maps/scripts/aoa-zorn.mus
 %%DATADIR%%/data1/maps/scripts/aoa2.fog
 %%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-corrosion.fog
+%%DATADIR%%/data1/maps/scripts/ctf-corrosion.mus
 %%DATADIR%%/data1/maps/scripts/ctf-europa.mus
+%%DATADIR%%/data1/maps/scripts/ctf-europa2k8.mus
+%%DATADIR%%/data1/maps/scripts/ctf-frost.fog
 %%DATADIR%%/data1/maps/scripts/ctf-frost.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
+%%DATADIR%%/data1/maps/scripts/ctf-titan2k8.mus
 %%DATADIR%%/data1/maps/scripts/ctf-vesuvius.mus
+%%DATADIR%%/data1/maps/scripts/ctf-zorn.mus
 %%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-aquous.fog
+%%DATADIR%%/data1/maps/scripts/dm-aquous.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.fog
 %%DATADIR%%/data1/maps/scripts/dm-bloodfactory.mus
 %%DATADIR%%/data1/maps/scripts/dm-chasmatic.mus
+%%DATADIR%%/data1/maps/scripts/dm-command.mus
+%%DATADIR%%/data1/maps/scripts/dm-corrosion.fog
+%%DATADIR%%/data1/maps/scripts/dm-corrosion.mus
 %%DATADIR%%/data1/maps/scripts/dm-crucible.mus
 %%DATADIR%%/data1/maps/scripts/dm-deimos.mus
+%%DATADIR%%/data1/maps/scripts/dm-dismal.fog
+%%DATADIR%%/data1/maps/scripts/dm-dismal.mus
 %%DATADIR%%/data1/maps/scripts/dm-dread.mus
 %%DATADIR%%/data1/maps/scripts/dm-dynamo2.mus
 %%DATADIR%%/data1/maps/scripts/dm-europa.mus
+%%DATADIR%%/data1/maps/scripts/dm-europa2k8.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.fog
 %%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
 %%DATADIR%%/data1/maps/scripts/dm-saucer.mus
-%%DATADIR%%/data1/maps/scripts/dm-titan.mus
+%%DATADIR%%/data1/maps/scripts/dm-titan2k8.mus
+%%DATADIR%%/data1/maps/scripts/dm-turbo.fog
+%%DATADIR%%/data1/maps/scripts/dm-turbo.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/dm-zorn.mus
+%%DATADIR%%/data1/maps/scripts/tca-corrosion.fog
+%%DATADIR%%/data1/maps/scripts/tca-corrosion.mus
 %%DATADIR%%/data1/maps/scripts/tca-europa.mus
+%%DATADIR%%/data1/maps/scripts/tca-europa2k8.mus
+%%DATADIR%%/data1/maps/scripts/tca-frost.fog
 %%DATADIR%%/data1/maps/scripts/tca-frost.mus
-%%DATADIR%%/data1/maps/scripts/tca-titan.mus
+%%DATADIR%%/data1/maps/scripts/tca-titan2k8.mus
 %%DATADIR%%/data1/maps/scripts/tca-zion.mus
 %%DATADIR%%/data1/maps/scripts/tourney0.fog
-%%DATADIR%%/data1/maps/tca-europa.bsp
+%%DATADIR%%/data1/maps/tca-corrosion.bsp
+%%DATADIR%%/data1/maps/tca-europa2k8.bsp
 %%DATADIR%%/data1/maps/tca-frost.bsp
-%%DATADIR%%/data1/maps/tca-titan.bsp
+%%DATADIR%%/data1/maps/tca-titan2k8.bsp
 %%DATADIR%%/data1/maps/tca-zion.bsp
 %%DATADIR%%/data1/models/cow/helmet.md2
 %%DATADIR%%/data1/models/cow/skin.tga
@@ -468,7 +533,6 @@
 %%DATADIR%%/data1/models/objects/debris3/tris.md2
 %%DATADIR%%/data1/models/objects/dmspot/skin.tga
 %%DATADIR%%/data1/models/objects/dmspot/tris.md2
-%%DATADIR%%/data1/models/objects/electroball/skin.pcx
 %%DATADIR%%/data1/models/objects/electroball/skin.tga
 %%DATADIR%%/data1/models/objects/electroball/tris.md2
 %%DATADIR%%/data1/models/objects/fireball/skin.tga
@@ -483,48 +547,45 @@
 %%DATADIR%%/data1/models/objects/rocket/tris.md2
 %%DATADIR%%/data1/models/weapons/g_bfg/tris.md2
 %%DATADIR%%/data1/models/weapons/g_chain/tris.md2
+%%DATADIR%%/data1/models/weapons/g_hyperb/cover.md2
 %%DATADIR%%/data1/models/weapons/g_hyperb/tris.md2
 %%DATADIR%%/data1/models/weapons/g_launch/skin.tga
 %%DATADIR%%/data1/models/weapons/g_launch/tris.md2
 %%DATADIR%%/data1/models/weapons/g_machn/tris.md2
 %%DATADIR%%/data1/models/weapons/g_rail/tris.md2
+%%DATADIR%%/data1/models/weapons/g_rocket/cover.md2
 %%DATADIR%%/data1/models/weapons/g_rocket/skin.tga
 %%DATADIR%%/data1/models/weapons/g_rocket/tris.md2
 %%DATADIR%%/data1/models/weapons/g_shotg/tris.md2
 %%DATADIR%%/data1/models/weapons/g_shotg2/tris.md2
-%%DATADIR%%/data1/models/weapons/v_bfg/skin.tga
+%%DATADIR%%/data1/models/weapons/v_bfg/skin.jpg
 %%DATADIR%%/data1/models/weapons/v_bfg/skin_normal.tga
 %%DATADIR%%/data1/models/weapons/v_bfg/tris.md2
-%%DATADIR%%/data1/models/weapons/v_blast/skin.tga
+%%DATADIR%%/data1/models/weapons/v_blast/skin.jpg
 %%DATADIR%%/data1/models/weapons/v_blast/skin_normal.tga
 %%DATADIR%%/data1/models/weapons/v_blast/tris.md2
-%%DATADIR%%/data1/models/weapons/v_chain/skin.tga
+%%DATADIR%%/data1/models/weapons/v_chain/skin.jpg
 %%DATADIR%%/data1/models/weapons/v_chain/skin_normal.tga
 %%DATADIR%%/data1/models/weapons/v_chain/tris.md2
-%%DATADIR%%/data1/models/weapons/v_hyperb/skin.tga
+%%DATADIR%%/data1/models/weapons/v_hyperb/cover.md2
+%%DATADIR%%/data1/models/weapons/v_hyperb/skin.jpg
 %%DATADIR%%/data1/models/weapons/v_hyperb/skin_normal.tga
 %%DATADIR%%/data1/models/weapons/v_hyperb/tris.md2
-%%DATADIR%%/data1/models/weapons/v_launch/skin.tga
-%%DATADIR%%/data1/models/weapons/v_launch/tris.md2
-%%DATADIR%%/data1/models/weapons/v_machn/skin.tga
 %%DATADIR%%/data1/models/weapons/v_machn/tris.md2
-%%DATADIR%%/data1/models/weapons/v_martian_blast/skin.pcx
-%%DATADIR%%/data1/models/weapons/v_martian_blast/skin.tga
-%%DATADIR%%/data1/models/weapons/v_martian_blast/skinold.pcx
-%%DATADIR%%/data1/models/weapons/v_martian_blast/tris.md2
-%%DATADIR%%/data1/models/weapons/v_rail/skin.tga
+%%DATADIR%%/data1/models/weapons/v_rail/skin.jpg
 %%DATADIR%%/data1/models/weapons/v_rail/skin_normal.tga
 %%DATADIR%%/data1/models/weapons/v_rail/tris.md2
-%%DATADIR%%/data1/models/weapons/v_rocket/skin.tga
+%%DATADIR%%/data1/models/weapons/v_rocket/cover.md2
+%%DATADIR%%/data1/models/weapons/v_rocket/skin.jpg
 %%DATADIR%%/data1/models/weapons/v_rocket/skin_normal.tga
 %%DATADIR%%/data1/models/weapons/v_rocket/tris.md2
-%%DATADIR%%/data1/models/weapons/v_shotg/skin.tga
+%%DATADIR%%/data1/models/weapons/v_shotg/skin.jpg
 %%DATADIR%%/data1/models/weapons/v_shotg/skin_normal.tga
 %%DATADIR%%/data1/models/weapons/v_shotg/tris.md2
-%%DATADIR%%/data1/models/weapons/v_shotg2/skin.tga
+%%DATADIR%%/data1/models/weapons/v_shotg2/skin.jpg
 %%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.jpg
 %%DATADIR%%/data1/models/weapons/v_violator/skin_normal.tga
 %%DATADIR%%/data1/models/weapons/v_violator/tris.md2
 %%DATADIR%%/data1/particles/aflash.tga
@@ -579,32 +640,17 @@
 %%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
-%%DATADIR%%/data1/pics/bots/enforcer/blue_i.tga
-%%DATADIR%%/data1/pics/bots/enforcer/default_i.tga
-%%DATADIR%%/data1/pics/bots/enforcer/red_i.tga
-%%DATADIR%%/data1/pics/bots/enforcer/stryker_i.tga
-%%DATADIR%%/data1/pics/bots/infantry/blue_i.tga
-%%DATADIR%%/data1/pics/bots/infantry/default_i.tga
-%%DATADIR%%/data1/pics/bots/infantry/red_i.tga
-%%DATADIR%%/data1/pics/bots/martian/aliengrunt_i.tga
-%%DATADIR%%/data1/pics/bots/martian/blue_i.tga
-%%DATADIR%%/data1/pics/bots/martian/bluebot_i.tga
-%%DATADIR%%/data1/pics/bots/martian/default_i.tga
-%%DATADIR%%/data1/pics/bots/martian/destoroyah_i.tga
-%%DATADIR%%/data1/pics/bots/martian/mogera_i.tga
-%%DATADIR%%/data1/pics/bots/martian/red_i.tga
-%%DATADIR%%/data1/pics/bots/martian/redbot_i.tga
-%%DATADIR%%/data1/pics/bots/martiancyborg/blue_i.tga
-%%DATADIR%%/data1/pics/bots/martiancyborg/default_i.tga
-%%DATADIR%%/data1/pics/bots/martiancyborg/red_i.tga
-%%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/bots/enforcer/blue_i.jpg
+%%DATADIR%%/data1/pics/bots/enforcer/default_i.jpg
+%%DATADIR%%/data1/pics/bots/enforcer/red_i.jpg
+%%DATADIR%%/data1/pics/bots/enforcer/stryker_i.jpg
+%%DATADIR%%/data1/pics/bots/martiancyborg/blue_i.jpg
+%%DATADIR%%/data1/pics/bots/martiancyborg/default_i.jpg
+%%DATADIR%%/data1/pics/bots/martiancyborg/red_i.jpg
+%%DATADIR%%/data1/pics/bots/martianenforcer/blue_i.jpg
+%%DATADIR%%/data1/pics/bots/martianenforcer/default_i.jpg
+%%DATADIR%%/data1/pics/bots/martianenforcer/gamara_i.jpg
+%%DATADIR%%/data1/pics/bots/martianenforcer/red_i.jpg
 %%DATADIR%%/data1/pics/ch1.tga
 %%DATADIR%%/data1/pics/ch2.tga
 %%DATADIR%%/data1/pics/ch3.tga
@@ -618,7 +664,6 @@
 %%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
@@ -650,6 +695,8 @@
 %%DATADIR%%/data1/pics/hover.tga
 %%DATADIR%%/data1/pics/huds/20061.tga
 %%DATADIR%%/data1/pics/huds/20062.tga
+%%DATADIR%%/data1/pics/huds/20071.tga
+%%DATADIR%%/data1/pics/huds/20072.tga
 %%DATADIR%%/data1/pics/huds/8bit1.tga
 %%DATADIR%%/data1/pics/huds/8bit2.tga
 %%DATADIR%%/data1/pics/huds/alien1.tga
@@ -715,7 +762,6 @@
 %%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
@@ -735,16 +781,14 @@
 %%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/menu_back.jpg
 %%DATADIR%%/data1/pics/net.tga
 %%DATADIR%%/data1/pics/num_0.tga
 %%DATADIR%%/data1/pics/num_1.tga
@@ -789,111 +833,72 @@
 %%DATADIR%%/data1/pics/zoomscope1.tga
 %%DATADIR%%/data1/pics/zoomscope2.tga
 %%DATADIR%%/data1/pics/zoomscope3.tga
-%%DATADIR%%/data1/players/brainlet/alien
-%%DATADIR%%/data1/players/brainlet/blaster.tga
-%%DATADIR%%/data1/players/brainlet/blue.tga
-%%DATADIR%%/data1/players/brainlet/blue_i.tga
-%%DATADIR%%/data1/players/brainlet/bump1.wav
-%%DATADIR%%/data1/players/brainlet/death1.wav
-%%DATADIR%%/data1/players/brainlet/death2.wav
-%%DATADIR%%/data1/players/brainlet/death3.wav
-%%DATADIR%%/data1/players/brainlet/death4.wav
-%%DATADIR%%/data1/players/brainlet/default.tga
-%%DATADIR%%/data1/players/brainlet/default_i.tga
-%%DATADIR%%/data1/players/brainlet/default_normal.tga
-%%DATADIR%%/data1/players/brainlet/drown1.wav
-%%DATADIR%%/data1/players/brainlet/fall1.wav
-%%DATADIR%%/data1/players/brainlet/fall2.wav
-%%DATADIR%%/data1/players/brainlet/gunrack.md2
-%%DATADIR%%/data1/players/brainlet/gunrack.tga
-%%DATADIR%%/data1/players/brainlet/gurp1.wav
-%%DATADIR%%/data1/players/brainlet/gurp2.wav
-%%DATADIR%%/data1/players/brainlet/jump1.wav
-%%DATADIR%%/data1/players/brainlet/pain100_1.wav
-%%DATADIR%%/data1/players/brainlet/pain100_2.wav
-%%DATADIR%%/data1/players/brainlet/pain25_1.wav
-%%DATADIR%%/data1/players/brainlet/pain25_2.wav
-%%DATADIR%%/data1/players/brainlet/pain50_1.wav
-%%DATADIR%%/data1/players/brainlet/pain50_2.wav
-%%DATADIR%%/data1/players/brainlet/pain75_1.wav
-%%DATADIR%%/data1/players/brainlet/pain75_2.wav
-%%DATADIR%%/data1/players/brainlet/red.tga
-%%DATADIR%%/data1/players/brainlet/red_i.tga
-%%DATADIR%%/data1/players/brainlet/tris.md2
-%%DATADIR%%/data1/players/brainlet/w_bfg.md2
-%%DATADIR%%/data1/players/brainlet/w_blaster.md2
-%%DATADIR%%/data1/players/brainlet/w_chaingun.md2
-%%DATADIR%%/data1/players/brainlet/w_glauncher.md2
-%%DATADIR%%/data1/players/brainlet/w_hyperblaster.md2
-%%DATADIR%%/data1/players/brainlet/w_machinegun.md2
-%%DATADIR%%/data1/players/brainlet/w_railgun.md2
-%%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
-%%DATADIR%%/data1/players/construct/blue.tga
-%%DATADIR%%/data1/players/construct/blue_i.tga
-%%DATADIR%%/data1/players/construct/bump1.wav
-%%DATADIR%%/data1/players/construct/death1.wav
-%%DATADIR%%/data1/players/construct/death2.wav
-%%DATADIR%%/data1/players/construct/death3.wav
-%%DATADIR%%/data1/players/construct/death4.wav
-%%DATADIR%%/data1/players/construct/default.tga
-%%DATADIR%%/data1/players/construct/default_i.tga
-%%DATADIR%%/data1/players/construct/default_normal.tga
-%%DATADIR%%/data1/players/construct/drown1.wav
-%%DATADIR%%/data1/players/construct/fall1.wav
-%%DATADIR%%/data1/players/construct/fall2.wav
-%%DATADIR%%/data1/players/construct/gurp1.wav
-%%DATADIR%%/data1/players/construct/gurp2.wav
-%%DATADIR%%/data1/players/construct/human
-%%DATADIR%%/data1/players/construct/jump1.wav
-%%DATADIR%%/data1/players/construct/pain100_1.wav
-%%DATADIR%%/data1/players/construct/pain100_2.wav
-%%DATADIR%%/data1/players/construct/pain25_1.wav
-%%DATADIR%%/data1/players/construct/pain25_2.wav
-%%DATADIR%%/data1/players/construct/pain50_1.wav
-%%DATADIR%%/data1/players/construct/pain50_2.wav
-%%DATADIR%%/data1/players/construct/pain75_1.wav
-%%DATADIR%%/data1/players/construct/pain75_2.wav
-%%DATADIR%%/data1/players/construct/red.tga
-%%DATADIR%%/data1/players/construct/red_i.tga
-%%DATADIR%%/data1/players/construct/tris.md2
-%%DATADIR%%/data1/players/construct/w_bfg.md2
-%%DATADIR%%/data1/players/construct/w_blaster.md2
-%%DATADIR%%/data1/players/construct/w_chaingun.md2
-%%DATADIR%%/data1/players/construct/w_glauncher.md2
-%%DATADIR%%/data1/players/construct/w_hyperblaster.md2
-%%DATADIR%%/data1/players/construct/w_machinegun.md2
-%%DATADIR%%/data1/players/construct/w_railgun.md2
-%%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
-%%DATADIR%%/data1/players/enforcer/blue.tga
-%%DATADIR%%/data1/players/enforcer/blue_i.tga
+%%DATADIR%%/data1/players/cybergirl/blue.jpg
+%%DATADIR%%/data1/players/cybergirl/blue_i.jpg
+%%DATADIR%%/data1/players/cybergirl/bump1.wav
+%%DATADIR%%/data1/players/cybergirl/death1.wav
+%%DATADIR%%/data1/players/cybergirl/death2.wav
+%%DATADIR%%/data1/players/cybergirl/death3.wav
+%%DATADIR%%/data1/players/cybergirl/death4.wav
+%%DATADIR%%/data1/players/cybergirl/default.jpg
+%%DATADIR%%/data1/players/cybergirl/default_i.jpg
+%%DATADIR%%/data1/players/cybergirl/default_normal.tga
+%%DATADIR%%/data1/players/cybergirl/drown1.wav
+%%DATADIR%%/data1/players/cybergirl/fall1.wav
+%%DATADIR%%/data1/players/cybergirl/fall2.wav
+%%DATADIR%%/data1/players/cybergirl/green.jpg
+%%DATADIR%%/data1/players/cybergirl/green_i.jpg
+%%DATADIR%%/data1/players/cybergirl/grey.jpg
+%%DATADIR%%/data1/players/cybergirl/grey_i.jpg
+%%DATADIR%%/data1/players/cybergirl/gurp1.wav
+%%DATADIR%%/data1/players/cybergirl/gurp2.wav
+%%DATADIR%%/data1/players/cybergirl/human
+%%DATADIR%%/data1/players/cybergirl/jump1.wav
+%%DATADIR%%/data1/players/cybergirl/pain100_1.wav
+%%DATADIR%%/data1/players/cybergirl/pain100_2.wav
+%%DATADIR%%/data1/players/cybergirl/pain25_1.wav
+%%DATADIR%%/data1/players/cybergirl/pain25_2.wav
+%%DATADIR%%/data1/players/cybergirl/pain50_1.wav
+%%DATADIR%%/data1/players/cybergirl/pain50_2.wav
+%%DATADIR%%/data1/players/cybergirl/pain75_1.wav
+%%DATADIR%%/data1/players/cybergirl/pain75_2.wav
+%%DATADIR%%/data1/players/cybergirl/red.jpg
+%%DATADIR%%/data1/players/cybergirl/red_i.jpg
+%%DATADIR%%/data1/players/cybergirl/tris.md2
+%%DATADIR%%/data1/players/cybergirl/w_bfg.md2
+%%DATADIR%%/data1/players/cybergirl/w_blaster.md2
+%%DATADIR%%/data1/players/cybergirl/w_chaingun.md2
+%%DATADIR%%/data1/players/cybergirl/w_hyperblaster.md2
+%%DATADIR%%/data1/players/cybergirl/w_machinegun.md2
+%%DATADIR%%/data1/players/cybergirl/w_railgun.md2
+%%DATADIR%%/data1/players/cybergirl/w_rlauncher.md2
+%%DATADIR%%/data1/players/cybergirl/w_shotgun.md2
+%%DATADIR%%/data1/players/cybergirl/w_sshotgun.md2
+%%DATADIR%%/data1/players/cybergirl/w_violator.md2
+%%DATADIR%%/data1/players/cybergirl/weapon.jpg
+%%DATADIR%%/data1/players/cybergirl/weapon.md2
+%%DATADIR%%/data1/players/enforcer/arm.md2
+%%DATADIR%%/data1/players/enforcer/blue.jpg
+%%DATADIR%%/data1/players/enforcer/blue_i.jpg
+%%DATADIR%%/data1/players/enforcer/body.md2
 %%DATADIR%%/data1/players/enforcer/bump1.wav
 %%DATADIR%%/data1/players/enforcer/death1.wav
 %%DATADIR%%/data1/players/enforcer/death2.wav
 %%DATADIR%%/data1/players/enforcer/death3.wav
 %%DATADIR%%/data1/players/enforcer/death4.wav
-%%DATADIR%%/data1/players/enforcer/default.tga
-%%DATADIR%%/data1/players/enforcer/default_i.tga
+%%DATADIR%%/data1/players/enforcer/default.jpg
+%%DATADIR%%/data1/players/enforcer/default_i.jpg
 %%DATADIR%%/data1/players/enforcer/default_normal.tga
 %%DATADIR%%/data1/players/enforcer/drown1.wav
 %%DATADIR%%/data1/players/enforcer/fall1.wav
 %%DATADIR%%/data1/players/enforcer/fall2.wav
 %%DATADIR%%/data1/players/enforcer/gurp1.wav
 %%DATADIR%%/data1/players/enforcer/gurp2.wav
+%%DATADIR%%/data1/players/enforcer/head.md2
 %%DATADIR%%/data1/players/enforcer/helmet.md2
 %%DATADIR%%/data1/players/enforcer/human
 %%DATADIR%%/data1/players/enforcer/jump1.wav
+%%DATADIR%%/data1/players/enforcer/leg.md2
 %%DATADIR%%/data1/players/enforcer/pain100_1.wav
 %%DATADIR%%/data1/players/enforcer/pain100_2.wav
 %%DATADIR%%/data1/players/enforcer/pain25_1.wav
@@ -902,15 +907,15 @@
 %%DATADIR%%/data1/players/enforcer/pain50_2.wav
 %%DATADIR%%/data1/players/enforcer/pain75_1.wav
 %%DATADIR%%/data1/players/enforcer/pain75_2.wav
-%%DATADIR%%/data1/players/enforcer/red.tga
-%%DATADIR%%/data1/players/enforcer/red_i.tga
-%%DATADIR%%/data1/players/enforcer/stryker.tga
-%%DATADIR%%/data1/players/enforcer/stryker_i.tga
+%%DATADIR%%/data1/players/enforcer/red.jpg
+%%DATADIR%%/data1/players/enforcer/red_i.jpg
+%%DATADIR%%/data1/players/enforcer/stryker.jpg
+%%DATADIR%%/data1/players/enforcer/stryker_i.jpg
 %%DATADIR%%/data1/players/enforcer/tris.md2
+%%DATADIR%%/data1/players/enforcer/usegibs
 %%DATADIR%%/data1/players/enforcer/w_bfg.md2
 %%DATADIR%%/data1/players/enforcer/w_blaster.md2
 %%DATADIR%%/data1/players/enforcer/w_chaingun.md2
-%%DATADIR%%/data1/players/enforcer/w_glauncher.md2
 %%DATADIR%%/data1/players/enforcer/w_hyperblaster.md2
 %%DATADIR%%/data1/players/enforcer/w_machinegun.md2
 %%DATADIR%%/data1/players/enforcer/w_railgun.md2
@@ -920,66 +925,27 @@
 %%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
-%%DATADIR%%/data1/players/infantry/blue.tga
-%%DATADIR%%/data1/players/infantry/blue_i.tga
-%%DATADIR%%/data1/players/infantry/bump1.wav
-%%DATADIR%%/data1/players/infantry/death1.wav
-%%DATADIR%%/data1/players/infantry/death2.wav
-%%DATADIR%%/data1/players/infantry/death3.wav
-%%DATADIR%%/data1/players/infantry/death4.wav
-%%DATADIR%%/data1/players/infantry/default.tga
-%%DATADIR%%/data1/players/infantry/default_i.tga
-%%DATADIR%%/data1/players/infantry/default_normal.tga
-%%DATADIR%%/data1/players/infantry/drown1.wav
-%%DATADIR%%/data1/players/infantry/fall1.wav
-%%DATADIR%%/data1/players/infantry/fall2.wav
-%%DATADIR%%/data1/players/infantry/gurp1.wav
-%%DATADIR%%/data1/players/infantry/gurp2.wav
-%%DATADIR%%/data1/players/infantry/human
-%%DATADIR%%/data1/players/infantry/jump1.wav
-%%DATADIR%%/data1/players/infantry/pain100_1.wav
-%%DATADIR%%/data1/players/infantry/pain100_2.wav
-%%DATADIR%%/data1/players/infantry/pain25_1.wav
-%%DATADIR%%/data1/players/infantry/pain25_2.wav
-%%DATADIR%%/data1/players/infantry/pain50_1.wav
-%%DATADIR%%/data1/players/infantry/pain50_2.wav
-%%DATADIR%%/data1/players/infantry/pain75_1.wav
-%%DATADIR%%/data1/players/infantry/pain75_2.wav
-%%DATADIR%%/data1/players/infantry/red.tga
-%%DATADIR%%/data1/players/infantry/red_i.tga
-%%DATADIR%%/data1/players/infantry/tris.md2
-%%DATADIR%%/data1/players/infantry/w_bfg.md2
-%%DATADIR%%/data1/players/infantry/w_blaster.md2
-%%DATADIR%%/data1/players/infantry/w_chaingun.md2
-%%DATADIR%%/data1/players/infantry/w_glauncher.md2
-%%DATADIR%%/data1/players/infantry/w_hyperblaster.md2
-%%DATADIR%%/data1/players/infantry/w_machinegun.md2
-%%DATADIR%%/data1/players/infantry/w_railgun.md2
-%%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
-%%DATADIR%%/data1/players/lauren/blue_i.tga
+%%DATADIR%%/data1/players/lauren/arm.md2
+%%DATADIR%%/data1/players/lauren/blue.jpg
+%%DATADIR%%/data1/players/lauren/blue_i.jpg
+%%DATADIR%%/data1/players/lauren/body.md2
 %%DATADIR%%/data1/players/lauren/bump1.wav
 %%DATADIR%%/data1/players/lauren/death1.wav
 %%DATADIR%%/data1/players/lauren/death2.wav
 %%DATADIR%%/data1/players/lauren/death3.wav
 %%DATADIR%%/data1/players/lauren/death4.wav
-%%DATADIR%%/data1/players/lauren/default.tga
-%%DATADIR%%/data1/players/lauren/default_i.tga
+%%DATADIR%%/data1/players/lauren/default.jpg
+%%DATADIR%%/data1/players/lauren/default_i.jpg
 %%DATADIR%%/data1/players/lauren/default_normal.tga
 %%DATADIR%%/data1/players/lauren/drown1.wav
 %%DATADIR%%/data1/players/lauren/fall1.wav
 %%DATADIR%%/data1/players/lauren/fall2.wav
 %%DATADIR%%/data1/players/lauren/gurp1.wav
 %%DATADIR%%/data1/players/lauren/gurp2.wav
+%%DATADIR%%/data1/players/lauren/head.md2
 %%DATADIR%%/data1/players/lauren/human
 %%DATADIR%%/data1/players/lauren/jump1.wav
-%%DATADIR%%/data1/players/lauren/pain100_1.sfk
+%%DATADIR%%/data1/players/lauren/leg.md2
 %%DATADIR%%/data1/players/lauren/pain100_1.wav
 %%DATADIR%%/data1/players/lauren/pain100_2.wav
 %%DATADIR%%/data1/players/lauren/pain25_1.wav
@@ -988,14 +954,13 @@
 %%DATADIR%%/data1/players/lauren/pain50_2.wav
 %%DATADIR%%/data1/players/lauren/pain75_1.wav
 %%DATADIR%%/data1/players/lauren/pain75_2.wav
-%%DATADIR%%/data1/players/lauren/red.tga
-%%DATADIR%%/data1/players/lauren/red_i.tga
-%%DATADIR%%/data1/players/lauren/skin.pcx
+%%DATADIR%%/data1/players/lauren/red.jpg
+%%DATADIR%%/data1/players/lauren/red_i.jpg
 %%DATADIR%%/data1/players/lauren/tris.md2
+%%DATADIR%%/data1/players/lauren/usegibs
 %%DATADIR%%/data1/players/lauren/w_bfg.md2
 %%DATADIR%%/data1/players/lauren/w_blaster.md2
 %%DATADIR%%/data1/players/lauren/w_chaingun.md2
-%%DATADIR%%/data1/players/lauren/w_glauncher.md2
 %%DATADIR%%/data1/players/lauren/w_hyperblaster.md2
 %%DATADIR%%/data1/players/lauren/w_machinegun.md2
 %%DATADIR%%/data1/players/lauren/w_railgun.md2
@@ -1005,71 +970,15 @@
 %%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.tga
-%%DATADIR%%/data1/players/martian/aliengrunt_i.tga
-%%DATADIR%%/data1/players/martian/blaster.tga
-%%DATADIR%%/data1/players/martian/blue.tga
-%%DATADIR%%/data1/players/martian/blue_i.tga
-%%DATADIR%%/data1/players/martian/bluebot.tga
-%%DATADIR%%/data1/players/martian/bluebot_i.tga
-%%DATADIR%%/data1/players/martian/bump1.wav
-%%DATADIR%%/data1/players/martian/death1.wav
-%%DATADIR%%/data1/players/martian/death2.wav
-%%DATADIR%%/data1/players/martian/death3.wav
-%%DATADIR%%/data1/players/martian/death4.wav
-%%DATADIR%%/data1/players/martian/default.tga
-%%DATADIR%%/data1/players/martian/default_i.tga
-%%DATADIR%%/data1/players/martian/default_normal.tga
-%%DATADIR%%/data1/players/martian/destoroyah.tga
-%%DATADIR%%/data1/players/martian/destoroyah_i.tga
-%%DATADIR%%/data1/players/martian/drown1.wav
-%%DATADIR%%/data1/players/martian/fall1.wav
-%%DATADIR%%/data1/players/martian/fall2.wav
-%%DATADIR%%/data1/players/martian/gurp1.wav
-%%DATADIR%%/data1/players/martian/gurp2.wav
-%%DATADIR%%/data1/players/martian/helmet.md2
-%%DATADIR%%/data1/players/martian/helmet.pcx
-%%DATADIR%%/data1/players/martian/helmet.tga
-%%DATADIR%%/data1/players/martian/jump1.wav
-%%DATADIR%%/data1/players/martian/mogera.tga
-%%DATADIR%%/data1/players/martian/mogera_i.tga
-%%DATADIR%%/data1/players/martian/pain100_1.wav
-%%DATADIR%%/data1/players/martian/pain100_2.wav
-%%DATADIR%%/data1/players/martian/pain25_1.wav
-%%DATADIR%%/data1/players/martian/pain25_2.wav
-%%DATADIR%%/data1/players/martian/pain50_1.wav
-%%DATADIR%%/data1/players/martian/pain50_2.wav
-%%DATADIR%%/data1/players/martian/pain75_1.wav
-%%DATADIR%%/data1/players/martian/pain75_2.wav
-%%DATADIR%%/data1/players/martian/red.tga
-%%DATADIR%%/data1/players/martian/red_i.tga
-%%DATADIR%%/data1/players/martian/redbot.tga
-%%DATADIR%%/data1/players/martian/redbot_i.tga
-%%DATADIR%%/data1/players/martian/tris.md2
-%%DATADIR%%/data1/players/martian/w_bfg.md2
-%%DATADIR%%/data1/players/martian/w_blaster.md2
-%%DATADIR%%/data1/players/martian/w_chaingun.md2
-%%DATADIR%%/data1/players/martian/w_glauncher.md2
-%%DATADIR%%/data1/players/martian/w_hyperblaster.md2
-%%DATADIR%%/data1/players/martian/w_machinegun.md2
-%%DATADIR%%/data1/players/martian/w_railgun.md2
-%%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
-%%DATADIR%%/data1/players/martiancyborg/blue.tga
-%%DATADIR%%/data1/players/martiancyborg/blue_i.tga
+%%DATADIR%%/data1/players/martiancyborg/blue.jpg
+%%DATADIR%%/data1/players/martiancyborg/blue_i.jpg
 %%DATADIR%%/data1/players/martiancyborg/bump1.wav
 %%DATADIR%%/data1/players/martiancyborg/death1.wav
 %%DATADIR%%/data1/players/martiancyborg/death2.wav
 %%DATADIR%%/data1/players/martiancyborg/death3.wav
 %%DATADIR%%/data1/players/martiancyborg/death4.wav
-%%DATADIR%%/data1/players/martiancyborg/default.tga
-%%DATADIR%%/data1/players/martiancyborg/default_i.tga
+%%DATADIR%%/data1/players/martiancyborg/default.jpg
+%%DATADIR%%/data1/players/martiancyborg/default_i.jpg
 %%DATADIR%%/data1/players/martiancyborg/default_normal.tga
 %%DATADIR%%/data1/players/martiancyborg/drown1.wav
 %%DATADIR%%/data1/players/martiancyborg/fall1.wav
@@ -1086,14 +995,13 @@
 %%DATADIR%%/data1/players/martiancyborg/pain50_2.wav
 %%DATADIR%%/data1/players/martiancyborg/pain75_1.wav
 %%DATADIR%%/data1/players/martiancyborg/pain75_2.wav
-%%DATADIR%%/data1/players/martiancyborg/red.tga
-%%DATADIR%%/data1/players/martiancyborg/red_i.tga
+%%DATADIR%%/data1/players/martiancyborg/red.jpg
+%%DATADIR%%/data1/players/martiancyborg/red_i.jpg
 %%DATADIR%%/data1/players/martiancyborg/robot
 %%DATADIR%%/data1/players/martiancyborg/tris.md2
 %%DATADIR%%/data1/players/martiancyborg/w_bfg.md2
 %%DATADIR%%/data1/players/martiancyborg/w_blaster.md2
 %%DATADIR%%/data1/players/martiancyborg/w_chaingun.md2
-%%DATADIR%%/data1/players/martiancyborg/w_glauncher.md2
 %%DATADIR%%/data1/players/martiancyborg/w_hyperblaster.md2
 %%DATADIR%%/data1/players/martiancyborg/w_machinegun.md2
 %%DATADIR%%/data1/players/martiancyborg/w_railgun.md2
@@ -1104,31 +1012,31 @@
 %%DATADIR%%/data1/players/martiancyborg/weapon.md2
 %%DATADIR%%/data1/players/martiancyborg/weapon.tga
 %%DATADIR%%/data1/players/martianenforcer/alien
-%%DATADIR%%/data1/players/martianenforcer/blaster.tga
-%%DATADIR%%/data1/players/martianenforcer/blue.tga
-%%DATADIR%%/data1/players/martianenforcer/blue_i.tga
+%%DATADIR%%/data1/players/martianenforcer/arm.md2
+%%DATADIR%%/data1/players/martianenforcer/blue.jpg
+%%DATADIR%%/data1/players/martianenforcer/blue_i.jpg
+%%DATADIR%%/data1/players/martianenforcer/body.md2
 %%DATADIR%%/data1/players/martianenforcer/bump1.wav
 %%DATADIR%%/data1/players/martianenforcer/death1.wav
 %%DATADIR%%/data1/players/martianenforcer/death2.wav
 %%DATADIR%%/data1/players/martianenforcer/death3.wav
 %%DATADIR%%/data1/players/martianenforcer/death4.wav
-%%DATADIR%%/data1/players/martianenforcer/default.tga
-%%DATADIR%%/data1/players/martianenforcer/default_i.tga
+%%DATADIR%%/data1/players/martianenforcer/default.jpg
+%%DATADIR%%/data1/players/martianenforcer/default_i.jpg
 %%DATADIR%%/data1/players/martianenforcer/default_normal.tga
 %%DATADIR%%/data1/players/martianenforcer/drown1.wav
 %%DATADIR%%/data1/players/martianenforcer/fall1.wav
 %%DATADIR%%/data1/players/martianenforcer/fall2.wav
-%%DATADIR%%/data1/players/martianenforcer/gamara.tga
-%%DATADIR%%/data1/players/martianenforcer/gamara_i.tga
+%%DATADIR%%/data1/players/martianenforcer/gamara.jpg
+%%DATADIR%%/data1/players/martianenforcer/gamara_i.jpg
 %%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/head.md2
 %%DATADIR%%/data1/players/martianenforcer/helmet.md2
-%%DATADIR%%/data1/players/martianenforcer/helmet.tga
 %%DATADIR%%/data1/players/martianenforcer/jump1.wav
+%%DATADIR%%/data1/players/martianenforcer/leg.md2
 %%DATADIR%%/data1/players/martianenforcer/pain100_1.wav
 %%DATADIR%%/data1/players/martianenforcer/pain100_2.wav
 %%DATADIR%%/data1/players/martianenforcer/pain25_1.wav
@@ -1137,13 +1045,13 @@
 %%DATADIR%%/data1/players/martianenforcer/pain50_2.wav
 %%DATADIR%%/data1/players/martianenforcer/pain75_1.wav
 %%DATADIR%%/data1/players/martianenforcer/pain75_2.wav
-%%DATADIR%%/data1/players/martianenforcer/red.tga
-%%DATADIR%%/data1/players/martianenforcer/red_i.tga
+%%DATADIR%%/data1/players/martianenforcer/red.jpg
+%%DATADIR%%/data1/players/martianenforcer/red_i.jpg
 %%DATADIR%%/data1/players/martianenforcer/tris.md2
+%%DATADIR%%/data1/players/martianenforcer/usegibs
 %%DATADIR%%/data1/players/martianenforcer/w_bfg.md2
 %%DATADIR%%/data1/players/martianenforcer/w_blaster.md2
 %%DATADIR%%/data1/players/martianenforcer/w_chaingun.md2
-%%DATADIR%%/data1/players/martianenforcer/w_glauncher.md2
 %%DATADIR%%/data1/players/martianenforcer/w_hyperblaster.md2
 %%DATADIR%%/data1/players/martianenforcer/w_machinegun.md2
 %%DATADIR%%/data1/players/martianenforcer/w_railgun.md2
@@ -1153,127 +1061,6 @@
 %%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
-%%DATADIR%%/data1/players/robot/blue.tga
-%%DATADIR%%/data1/players/robot/blue_i.tga
-%%DATADIR%%/data1/players/robot/bump1.wav
-%%DATADIR%%/data1/players/robot/death1.wav
-%%DATADIR%%/data1/players/robot/death2.wav
-%%DATADIR%%/data1/players/robot/death3.wav
-%%DATADIR%%/data1/players/robot/death4.wav
-%%DATADIR%%/data1/players/robot/default.tga
-%%DATADIR%%/data1/players/robot/default_i.tga
-%%DATADIR%%/data1/players/robot/default_normal.tga
-%%DATADIR%%/data1/players/robot/drown1.wav
-%%DATADIR%%/data1/players/robot/fall1.wav
-%%DATADIR%%/data1/players/robot/fall2.wav
-%%DATADIR%%/data1/players/robot/gurp1.wav
-%%DATADIR%%/data1/players/robot/gurp2.wav
-%%DATADIR%%/data1/players/robot/helmet.md2
-%%DATADIR%%/data1/players/robot/helmet.tga
-%%DATADIR%%/data1/players/robot/jump1.wav
-%%DATADIR%%/data1/players/robot/pain100_1.wav
-%%DATADIR%%/data1/players/robot/pain100_2.wav
-%%DATADIR%%/data1/players/robot/pain25_1.wav
-%%DATADIR%%/data1/players/robot/pain25_2.wav
-%%DATADIR%%/data1/players/robot/pain50_1.wav
-%%DATADIR%%/data1/players/robot/pain50_2.wav
-%%DATADIR%%/data1/players/robot/pain75_1.wav
-%%DATADIR%%/data1/players/robot/pain75_2.wav
-%%DATADIR%%/data1/players/robot/red.tga
-%%DATADIR%%/data1/players/robot/red_i.tga
-%%DATADIR%%/data1/players/robot/robot
-%%DATADIR%%/data1/players/robot/tris.md2
-%%DATADIR%%/data1/players/robot/w_bfg.md2
-%%DATADIR%%/data1/players/robot/w_blaster.md2
-%%DATADIR%%/data1/players/robot/w_chaingun.md2
-%%DATADIR%%/data1/players/robot/w_glauncher.md2
-%%DATADIR%%/data1/players/robot/w_hyperblaster.md2
-%%DATADIR%%/data1/players/robot/w_machinegun.md2
-%%DATADIR%%/data1/players/robot/w_railgun.md2
-%%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
-%%DATADIR%%/data1/players/rustbot/atlas_i.tga
-%%DATADIR%%/data1/players/rustbot/blue.tga
-%%DATADIR%%/data1/players/rustbot/blue_i.tga
-%%DATADIR%%/data1/players/rustbot/bump1.wav
-%%DATADIR%%/data1/players/rustbot/death1.wav
-%%DATADIR%%/data1/players/rustbot/death2.wav
-%%DATADIR%%/data1/players/rustbot/death3.wav
-%%DATADIR%%/data1/players/rustbot/death4.wav
-%%DATADIR%%/data1/players/rustbot/default.tga
-%%DATADIR%%/data1/players/rustbot/default_i.tga
-%%DATADIR%%/data1/players/rustbot/default_normal.tga
-%%DATADIR%%/data1/players/rustbot/drown1.wav
-%%DATADIR%%/data1/players/rustbot/fall1.wav
-%%DATADIR%%/data1/players/rustbot/fall2.wav
-%%DATADIR%%/data1/players/rustbot/gurp1.wav
-%%DATADIR%%/data1/players/rustbot/gurp2.wav
-%%DATADIR%%/data1/players/rustbot/helmet.md2
-%%DATADIR%%/data1/players/rustbot/helmet.tga
-%%DATADIR%%/data1/players/rustbot/jump1.wav
-%%DATADIR%%/data1/players/rustbot/pain100_1.wav
-%%DATADIR%%/data1/players/rustbot/pain100_2.wav
-%%DATADIR%%/data1/players/rustbot/pain25_1.wav
-%%DATADIR%%/data1/players/rustbot/pain25_2.wav
-%%DATADIR%%/data1/players/rustbot/pain50_1.wav
-%%DATADIR%%/data1/players/rustbot/pain50_2.wav
-%%DATADIR%%/data1/players/rustbot/pain75_1.wav
-%%DATADIR%%/data1/players/rustbot/pain75_2.wav
-%%DATADIR%%/data1/players/rustbot/red.tga
-%%DATADIR%%/data1/players/rustbot/red_i.tga
-%%DATADIR%%/data1/players/rustbot/robot
-%%DATADIR%%/data1/players/rustbot/tris.md2
-%%DATADIR%%/data1/players/rustbot/w_bfg.md2
-%%DATADIR%%/data1/players/rustbot/w_blaster.md2
-%%DATADIR%%/data1/players/rustbot/w_chaingun.md2
-%%DATADIR%%/data1/players/rustbot/w_glauncher.md2
-%%DATADIR%%/data1/players/rustbot/w_hyperblaster.md2
-%%DATADIR%%/data1/players/rustbot/w_machinegun.md2
-%%DATADIR%%/data1/players/rustbot/w_railgun.md2
-%%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
-%%DATADIR%%/data1/players/war/blue_i.tga
-%%DATADIR%%/data1/players/war/bump1.wav
-%%DATADIR%%/data1/players/war/death1.wav
-%%DATADIR%%/data1/players/war/death2.wav
-%%DATADIR%%/data1/players/war/death3.wav
-%%DATADIR%%/data1/players/war/death4.wav
-%%DATADIR%%/data1/players/war/default.tga
-%%DATADIR%%/data1/players/war/default_i.tga
-%%DATADIR%%/data1/players/war/default_normal.tga
-%%DATADIR%%/data1/players/war/drown1.wav
-%%DATADIR%%/data1/players/war/fall1.wav
-%%DATADIR%%/data1/players/war/fall2.wav
-%%DATADIR%%/data1/players/war/gurp1.wav
-%%DATADIR%%/data1/players/war/gurp2.wav
-%%DATADIR%%/data1/players/war/helmet.md2
-%%DATADIR%%/data1/players/war/helmet.tga
-%%DATADIR%%/data1/players/war/jump1.wav
-%%DATADIR%%/data1/players/war/pain100_1.wav
-%%DATADIR%%/data1/players/war/pain100_2.wav
-%%DATADIR%%/data1/players/war/pain25_1.wav
-%%DATADIR%%/data1/players/war/pain25_2.wav
-%%DATADIR%%/data1/players/war/pain50_1.wav
-%%DATADIR%%/data1/players/war/pain50_2.wav
-%%DATADIR%%/data1/players/war/pain75_1.wav
-%%DATADIR%%/data1/players/war/pain75_2.wav
-%%DATADIR%%/data1/players/war/red.tga
-%%DATADIR%%/data1/players/war/red_i.tga
-%%DATADIR%%/data1/players/war/robot
-%%DATADIR%%/data1/players/war/tris.md2
-%%DATADIR%%/data1/players/war/weapon.md2
-%%DATADIR%%/data1/players/war/weapon.tga
 %%DATADIR%%/data1/scripts/caustics.rscript
 %%DATADIR%%/data1/scripts/chrome.rscript
 %%DATADIR%%/data1/scripts/consoles.rscript
@@ -1282,35 +1069,39 @@
 %%DATADIR%%/data1/scripts/electrics3.rscript
 %%DATADIR%%/data1/scripts/gunmen.rscript
 %%DATADIR%%/data1/scripts/maps/aoa-atlantis.rscript
+%%DATADIR%%/data1/scripts/maps/aoa-corrosion.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/aoa-zorn.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-corrosion.rscript
 %%DATADIR%%/data1/scripts/maps/ctf-europa.rscript
+%%DATADIR%%/data1/scripts/maps/ctf-europa2k8.rscript
 %%DATADIR%%/data1/scripts/maps/ctf-frost.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
+%%DATADIR%%/data1/scripts/maps/ctf-titan2k8.rscript
 %%DATADIR%%/data1/scripts/maps/ctf-vesuvius.rscript
+%%DATADIR%%/data1/scripts/maps/ctf-zorn.rscript
 %%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-aquous.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-command.rscript
+%%DATADIR%%/data1/scripts/maps/dm-corrosion.rscript
 %%DATADIR%%/data1/scripts/maps/dm-crucible.rscript
-%%DATADIR%%/data1/scripts/maps/dm-deimos.rscript
+%%DATADIR%%/data1/scripts/maps/dm-dismal.rscript
 %%DATADIR%%/data1/scripts/maps/dm-dread.rscript
 %%DATADIR%%/data1/scripts/maps/dm-dynamo2.rscript
-%%DATADIR%%/data1/scripts/maps/dm-electro.rscript
-%%DATADIR%%/data1/scripts/maps/dm-europa.rscript
-%%DATADIR%%/data1/scripts/maps/dm-frontier2.rscript
+%%DATADIR%%/data1/scripts/maps/dm-europa2k8.rscript
 %%DATADIR%%/data1/scripts/maps/dm-furious.rscript
 %%DATADIR%%/data1/scripts/maps/dm-grindery.rscript
 %%DATADIR%%/data1/scripts/maps/dm-horus.rscript
@@ -1318,15 +1109,18 @@
 %%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-titan2k8.rscript
+%%DATADIR%%/data1/scripts/maps/dm-turbo.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/dm-zorn.rscript
+%%DATADIR%%/data1/scripts/maps/tca-corrosion.rscript
 %%DATADIR%%/data1/scripts/maps/tca-europa.rscript
+%%DATADIR%%/data1/scripts/maps/tca-europa2k8.rscript
 %%DATADIR%%/data1/scripts/maps/tca-frost.rscript
-%%DATADIR%%/data1/scripts/maps/tca-titan.rscript
+%%DATADIR%%/data1/scripts/maps/tca-titan2k8 .rscript
 %%DATADIR%%/data1/scripts/maps/tca-zion.rscript
-%%DATADIR%%/data1/scripts/maps/tourney0.rscript
 %%DATADIR%%/data1/scripts/menu.rscript
 %%DATADIR%%/data1/scripts/models.rscript
 %%DATADIR%%/data1/scripts/normals/normals.rscript
@@ -1427,6 +1221,7 @@
 %%DATADIR%%/data1/sound/music/dm-probe.wav
 %%DATADIR%%/data1/sound/music/dm-redred.wav
 %%DATADIR%%/data1/sound/music/dm-saucer.wav
+%%DATADIR%%/data1/sound/music/dm-turbo.wav
 %%DATADIR%%/data1/sound/music/dm_inferno.wav
 %%DATADIR%%/data1/sound/music/wl_hell.wav
 %%DATADIR%%/data1/sound/music/wl_mass.wav
@@ -1532,6 +1327,7 @@
 %%DATADIR%%/data1/sound/world/rocket.wav
 %%DATADIR%%/data1/sound/world/steam1.wav
 %%DATADIR%%/data1/sound/world/steam2.wav
+%%DATADIR%%/data1/sound/world/turbine1.wav
 %%DATADIR%%/data1/sound/world/youwin.wav
 %%DATADIR%%/data1/sprites/blood1.sp2
 %%DATADIR%%/data1/sprites/blood1_0.pcx
@@ -1540,6 +1336,7 @@
 %%DATADIR%%/data1/sprites/blood3.sp2
 %%DATADIR%%/data1/sprites/blood3_0.pcx
 %%DATADIR%%/data1/sprites/sight2.sp2
+%%DATADIR%%/data1/textures/alien/support5.tga
 %%DATADIR%%/data1/textures/arena1/jpad1a.tga
 %%DATADIR%%/data1/textures/arena1/jpad1a.wal
 %%DATADIR%%/data1/textures/arena1/jpad1b.tga
@@ -1652,6 +1449,7 @@
 %%DATADIR%%/data1/textures/arena3/floor1.wal
 %%DATADIR%%/data1/textures/arena3/floor2.tga
 %%DATADIR%%/data1/textures/arena3/floor2.wal
+%%DATADIR%%/data1/textures/arena3/floor2_nm.tga
 %%DATADIR%%/data1/textures/arena3/floor3.tga
 %%DATADIR%%/data1/textures/arena3/floor3.wal
 %%DATADIR%%/data1/textures/arena3/floor4.tga
@@ -1795,6 +1593,8 @@
 %%DATADIR%%/data1/textures/arena6/blacktrans.wal
 %%DATADIR%%/data1/textures/arena6/bricks1.tga
 %%DATADIR%%/data1/textures/arena6/bricks1.wal
+%%DATADIR%%/data1/textures/arena6/bricks1_nm.tga
+%%DATADIR%%/data1/textures/arena6/bricks1_sm.tga
 %%DATADIR%%/data1/textures/arena6/city20.tga
 %%DATADIR%%/data1/textures/arena6/city20.wal
 %%DATADIR%%/data1/textures/arena6/ctfwinblue.tga
@@ -1817,16 +1617,28 @@
 %%DATADIR%%/data1/textures/arena6/icerock.wal
 %%DATADIR%%/data1/textures/arena6/icerock2.tga
 %%DATADIR%%/data1/textures/arena6/icerock2.wal
+%%DATADIR%%/data1/textures/arena6/icerock2_nm.tga
+%%DATADIR%%/data1/textures/arena6/icerock_nm.tga
 %%DATADIR%%/data1/textures/arena6/plate1.tga
 %%DATADIR%%/data1/textures/arena6/plate1.wal
+%%DATADIR%%/data1/textures/arena6/plate1_nm.tga
+%%DATADIR%%/data1/textures/arena6/plate1_sm.tga
 %%DATADIR%%/data1/textures/arena6/plate2.tga
 %%DATADIR%%/data1/textures/arena6/plate2.wal
+%%DATADIR%%/data1/textures/arena6/plate2_nm.tga
+%%DATADIR%%/data1/textures/arena6/plate2_sm.tga
 %%DATADIR%%/data1/textures/arena6/plate3.tga
 %%DATADIR%%/data1/textures/arena6/plate3.wal
+%%DATADIR%%/data1/textures/arena6/plate3_nm.tga
+%%DATADIR%%/data1/textures/arena6/plate3_sm.tga
 %%DATADIR%%/data1/textures/arena6/plate4.tga
 %%DATADIR%%/data1/textures/arena6/plate4.wal
+%%DATADIR%%/data1/textures/arena6/plate4_nm.tga
+%%DATADIR%%/data1/textures/arena6/plate4_sm.tga
 %%DATADIR%%/data1/textures/arena6/plate5.tga
 %%DATADIR%%/data1/textures/arena6/plate5.wal
+%%DATADIR%%/data1/textures/arena6/plate5_nm.tga
+%%DATADIR%%/data1/textures/arena6/plate5_sm.tga
 %%DATADIR%%/data1/textures/arena6/rimlight.tga
 %%DATADIR%%/data1/textures/arena6/rimlight.wal
 %%DATADIR%%/data1/textures/arena6/rimlight2.tga
@@ -1835,10 +1647,13 @@
 %%DATADIR%%/data1/textures/arena6/rings.wal
 %%DATADIR%%/data1/textures/arena6/skull.tga
 %%DATADIR%%/data1/textures/arena6/skull.wal
+%%DATADIR%%/data1/textures/arena6/skull_nm.tga
 %%DATADIR%%/data1/textures/arena6/skullite.tga
 %%DATADIR%%/data1/textures/arena6/skullite.wal
+%%DATADIR%%/data1/textures/arena6/skullite_nm.tga
 %%DATADIR%%/data1/textures/arena6/snow.tga
 %%DATADIR%%/data1/textures/arena6/snow.wal
+%%DATADIR%%/data1/textures/arena6/snow_nm.tga
 %%DATADIR%%/data1/textures/arena6/tech1.tga
 %%DATADIR%%/data1/textures/arena6/tech1.wal
 %%DATADIR%%/data1/textures/arena6/wires1.tga
@@ -1895,6 +1710,7 @@
 %%DATADIR%%/data1/textures/arena7/metal2.tga
 %%DATADIR%%/data1/textures/arena7/metal2.wal
 %%DATADIR%%/data1/textures/arena7/metal2_nm.tga
+%%DATADIR%%/data1/textures/arena7/metal2_sm.tga
 %%DATADIR%%/data1/textures/arena7/metal3.tga
 %%DATADIR%%/data1/textures/arena7/metal3.wal
 %%DATADIR%%/data1/textures/arena7/piston1.tga
@@ -1903,6 +1719,8 @@
 %%DATADIR%%/data1/textures/arena7/redgrid.wal
 %%DATADIR%%/data1/textures/arena7/tekfloor1.tga
 %%DATADIR%%/data1/textures/arena7/tekfloor1.wal
+%%DATADIR%%/data1/textures/arena7/tekfloor1_nm.tga
+%%DATADIR%%/data1/textures/arena7/tekfloor1_sm.tga
 %%DATADIR%%/data1/textures/arena7/tekwall1.tga
 %%DATADIR%%/data1/textures/arena7/tekwall1.wal
 %%DATADIR%%/data1/textures/arena7/tekwall2.tga
@@ -1937,12 +1755,18 @@
 %%DATADIR%%/data1/textures/arena8/brickwall1_nm.tga
 %%DATADIR%%/data1/textures/arena8/egyptbrick1.tga
 %%DATADIR%%/data1/textures/arena8/egyptbrick1.wal
+%%DATADIR%%/data1/textures/arena8/egyptbrick1_nm.tga
+%%DATADIR%%/data1/textures/arena8/egyptbrick1_sm.tga
 %%DATADIR%%/data1/textures/arena8/egyptfloor1.tga
 %%DATADIR%%/data1/textures/arena8/egyptfloor1.wal
+%%DATADIR%%/data1/textures/arena8/egyptfloor1_nm.tga
+%%DATADIR%%/data1/textures/arena8/egyptfloor1_sm.tga
 %%DATADIR%%/data1/textures/arena8/egyptrock1.tga
 %%DATADIR%%/data1/textures/arena8/egyptrock1.wal
+%%DATADIR%%/data1/textures/arena8/egyptrock1_nm.tga
 %%DATADIR%%/data1/textures/arena8/egyptrock2.tga
 %%DATADIR%%/data1/textures/arena8/egyptrock2.wal
+%%DATADIR%%/data1/textures/arena8/egyptrock2_nm.tga
 %%DATADIR%%/data1/textures/arena8/floor3.tga
 %%DATADIR%%/data1/textures/arena8/floor3.wal
 %%DATADIR%%/data1/textures/arena8/floor3_nm.tga
@@ -1952,9 +1776,11 @@
 %%DATADIR%%/data1/textures/arena8/grate1.wal
 %%DATADIR%%/data1/textures/arena8/lavalmetal.tga
 %%DATADIR%%/data1/textures/arena8/lavalmetal.wal
+%%DATADIR%%/data1/textures/arena8/lavalmetal_nm.tga
 %%DATADIR%%/data1/textures/arena8/metal1.tga
 %%DATADIR%%/data1/textures/arena8/metal1.wal
 %%DATADIR%%/data1/textures/arena8/metal1_nm.tga
+%%DATADIR%%/data1/textures/arena8/metal1_sm.tga
 %%DATADIR%%/data1/textures/arena8/metaltrim1.tga
 %%DATADIR%%/data1/textures/arena8/metaltrim1.wal
 %%DATADIR%%/data1/textures/arena8/metaltrim1_nm.tga
@@ -1972,6 +1798,104 @@
 %%DATADIR%%/data1/textures/arena8/slime.wal
 %%DATADIR%%/data1/textures/arena8/wood1.tga
 %%DATADIR%%/data1/textures/arena8/wood1.wal
+%%DATADIR%%/data1/textures/arena8/wood1_nm.tga
+%%DATADIR%%/data1/textures/arena8/wood1_sm.tga
+%%DATADIR%%/data1/textures/arena9/factorybricks1.tga
+%%DATADIR%%/data1/textures/arena9/factorybricks1_nm.tga
+%%DATADIR%%/data1/textures/arena9/factorybricks1_sm.tga
+%%DATADIR%%/data1/textures/arena9/floor1.tga
+%%DATADIR%%/data1/textures/arena9/floor1.wal
+%%DATADIR%%/data1/textures/arena9/floor1_nm.tga
+%%DATADIR%%/data1/textures/arena9/floor2.tga
+%%DATADIR%%/data1/textures/arena9/floor2.wal
+%%DATADIR%%/data1/textures/arena9/floor2_nm.tga
+%%DATADIR%%/data1/textures/arena9/floor3.tga
+%%DATADIR%%/data1/textures/arena9/floor3_nm.tga
+%%DATADIR%%/data1/textures/arena9/grate1.tga
+%%DATADIR%%/data1/textures/arena9/grate1.wal
+%%DATADIR%%/data1/textures/arena9/grate1_nm.tga
+%%DATADIR%%/data1/textures/arena9/grate2.tga
+%%DATADIR%%/data1/textures/arena9/grate2.wal
+%%DATADIR%%/data1/textures/arena9/icefloor1.tga
+%%DATADIR%%/data1/textures/arena9/icefloor1.wal
+%%DATADIR%%/data1/textures/arena9/icefloor1_nm.tga
+%%DATADIR%%/data1/textures/arena9/icemetal1.tga
+%%DATADIR%%/data1/textures/arena9/icemetal1.wal
+%%DATADIR%%/data1/textures/arena9/iceplate.tga
+%%DATADIR%%/data1/textures/arena9/iceplate.wal
+%%DATADIR%%/data1/textures/arena9/iceplate_nm.tga
+%%DATADIR%%/data1/textures/arena9/iceplate_sm.tga
+%%DATADIR%%/data1/textures/arena9/icetrim1.tga
+%%DATADIR%%/data1/textures/arena9/icetrim1.wal
+%%DATADIR%%/data1/textures/arena9/icetrim2.tga
+%%DATADIR%%/data1/textures/arena9/icetrim2.wal
+%%DATADIR%%/data1/textures/arena9/icewall1.tga
+%%DATADIR%%/data1/textures/arena9/icewall1.wal
+%%DATADIR%%/data1/textures/arena9/metal1.tga
+%%DATADIR%%/data1/textures/arena9/metal1.wal
+%%DATADIR%%/data1/textures/arena9/metal1_nm.tga
+%%DATADIR%%/data1/textures/arena9/metal2.tga
+%%DATADIR%%/data1/textures/arena9/metal2.wal
+%%DATADIR%%/data1/textures/arena9/metal2_nm.tga
+%%DATADIR%%/data1/textures/arena9/metal3.tga
+%%DATADIR%%/data1/textures/arena9/metal3.wal
+%%DATADIR%%/data1/textures/arena9/metal3_nm.tga
+%%DATADIR%%/data1/textures/arena9/metal3_sm.tga
+%%DATADIR%%/data1/textures/arena9/metal4.tga
+%%DATADIR%%/data1/textures/arena9/metal4.wal
+%%DATADIR%%/data1/textures/arena9/metal5.tga
+%%DATADIR%%/data1/textures/arena9/metal5.wal
+%%DATADIR%%/data1/textures/arena9/metal6.tga
+%%DATADIR%%/data1/textures/arena9/metal6.wal
+%%DATADIR%%/data1/textures/arena9/panel1.tga
+%%DATADIR%%/data1/textures/arena9/panel1.wal
+%%DATADIR%%/data1/textures/arena9/panel2.tga
+%%DATADIR%%/data1/textures/arena9/panel2.wal
+%%DATADIR%%/data1/textures/arena9/panel3.tga
+%%DATADIR%%/data1/textures/arena9/panel3.wal
+%%DATADIR%%/data1/textures/arena9/panel3_nm.tga
+%%DATADIR%%/data1/textures/arena9/panel3_sm.tga
+%%DATADIR%%/data1/textures/arena9/panel4.tga
+%%DATADIR%%/data1/textures/arena9/panel4.wal
+%%DATADIR%%/data1/textures/arena9/panel5.tga
+%%DATADIR%%/data1/textures/arena9/panel5.wal
+%%DATADIR%%/data1/textures/arena9/trim1.tga
+%%DATADIR%%/data1/textures/arena9/trim1.wal
+%%DATADIR%%/data1/textures/arena9/trim2.tga
+%%DATADIR%%/data1/textures/arena9/trim2.wal
+%%DATADIR%%/data1/textures/arena9/wall1.tga
+%%DATADIR%%/data1/textures/arena9/wall1.wal
+%%DATADIR%%/data1/textures/arena9/wall1_nm.tga
+%%DATADIR%%/data1/textures/arena9/wall2.tga
+%%DATADIR%%/data1/textures/arena9/wall2.wal
+%%DATADIR%%/data1/textures/arena9/wall2_nm.tga
+%%DATADIR%%/data1/textures/arena9/wetbricks1.tga
+%%DATADIR%%/data1/textures/arena9/wetbricks1_nm.tga
+%%DATADIR%%/data1/textures/arena9/wires1.tga
+%%DATADIR%%/data1/textures/arena9/wires1.wal
+%%DATADIR%%/data1/textures/arena9/wires2.tga
+%%DATADIR%%/data1/textures/arena9/wires2.wal
+%%DATADIR%%/data1/textures/arena9/wires3.tga
+%%DATADIR%%/data1/textures/arena9/wires3.wal
+%%DATADIR%%/data1/textures/common/0_clip.tga
+%%DATADIR%%/data1/textures/common/0_hint.tga
+%%DATADIR%%/data1/textures/common/0_sky1.tga
+%%DATADIR%%/data1/textures/common/areaportal.tga
+%%DATADIR%%/data1/textures/common/caulk.tga
+%%DATADIR%%/data1/textures/common/clip.tga
+%%DATADIR%%/data1/textures/common/cushion.tga
+%%DATADIR%%/data1/textures/common/full_clip.tga
+%%DATADIR%%/data1/textures/common/hint.tga
+%%DATADIR%%/data1/textures/common/missileclip.tga
+%%DATADIR%%/data1/textures/common/nodraw.tga
+%%DATADIR%%/data1/textures/common/nodrop.tga
+%%DATADIR%%/data1/textures/common/nolightmap.tga
+%%DATADIR%%/data1/textures/common/origin.tga
+%%DATADIR%%/data1/textures/common/qer_portal.tga
+%%DATADIR%%/data1/textures/common/slick.tga
+%%DATADIR%%/data1/textures/common/trigger.tga
+%%DATADIR%%/data1/textures/common/weapclip.tga
+%%DATADIR%%/data1/textures/common/white.tga
 %%DATADIR%%/data1/textures/cr3blankclear.wal
 %%DATADIR%%/data1/textures/dalek/column1.tga
 %%DATADIR%%/data1/textures/dalek/column1.wal
@@ -1997,6 +1921,7 @@
 %%DATADIR%%/data1/textures/dalek/wall6.wal
 %%DATADIR%%/data1/textures/dalek/wall7.tga
 %%DATADIR%%/data1/textures/dalek/wall7.wal
+%%DATADIR%%/data1/textures/forsaken/glass.tga
 %%DATADIR%%/data1/textures/martian/console1.tga
 %%DATADIR%%/data1/textures/martian/console1.wal
 %%DATADIR%%/data1/textures/martian/console2.tga
@@ -2114,8 +2039,12 @@
 %%DATADIR%%/data1/textures/metal/trim2.wal
 %%DATADIR%%/data1/textures/metal/wall1.tga
 %%DATADIR%%/data1/textures/metal/wall1.wal
+%%DATADIR%%/data1/textures/metal/wall1_nm.tga
+%%DATADIR%%/data1/textures/metal/wall1_sm.tga
 %%DATADIR%%/data1/textures/metal/wall2.tga
 %%DATADIR%%/data1/textures/metal/wall2.wal
+%%DATADIR%%/data1/textures/metal/wall2_nm.tga
+%%DATADIR%%/data1/textures/metal/wall2_sm.tga
 %%DATADIR%%/data1/textures/metal/wall3.tga
 %%DATADIR%%/data1/textures/metal/wall3.wal
 %%DATADIR%%/data1/textures/metal/wall4.tga
@@ -2126,6 +2055,31 @@
 %%DATADIR%%/data1/textures/metal/wall6.wal
 %%DATADIR%%/data1/textures/metal/walllite.tga
 %%DATADIR%%/data1/textures/metal/walllite.wal
+%%DATADIR%%/data1/textures/rage/beam_purple.tga
+%%DATADIR%%/data1/textures/rage/ceiling.tga
+%%DATADIR%%/data1/textures/rage/ceiling2.tga
+%%DATADIR%%/data1/textures/rage/floor2.tga
+%%DATADIR%%/data1/textures/rage/floor5.tga
+%%DATADIR%%/data1/textures/rage/fod1.tga
+%%DATADIR%%/data1/textures/rage/grid1.tga
+%%DATADIR%%/data1/textures/rage/hexfloor.tga
+%%DATADIR%%/data1/textures/rage/hexfloor_blue.tga
+%%DATADIR%%/data1/textures/rage/hexfloor_red.tga
+%%DATADIR%%/data1/textures/rage/jpad1a.tga
+%%DATADIR%%/data1/textures/rage/lava.tga
+%%DATADIR%%/data1/textures/rage/light1.tga
+%%DATADIR%%/data1/textures/rage/light10.tga
+%%DATADIR%%/data1/textures/rage/light12.tga
+%%DATADIR%%/data1/textures/rage/light5.tga
+%%DATADIR%%/data1/textures/rage/light7.tga
+%%DATADIR%%/data1/textures/rage/metal_panel.tga
+%%DATADIR%%/data1/textures/rage/metallight_2.tga
+%%DATADIR%%/data1/textures/rage/rimlightpurple.tga
+%%DATADIR%%/data1/textures/rage/support_beam.tga
+%%DATADIR%%/data1/textures/rage/support_column.tga
+%%DATADIR%%/data1/textures/rage/support_trim.tga
+%%DATADIR%%/data1/textures/rage/trimlight_purple.tga
+%%DATADIR%%/data1/textures/rage/wall_blue.tga
 %%DATADIR%%/data1/textures/ramp1.tga
 %%DATADIR%%/data1/textures/ramp1.wal
 %%DATADIR%%/data1/textures/ramp1b.tga
@@ -2140,6 +2094,14 @@
 %%DATADIR%%/data1/textures/ramp1f.wal
 %%DATADIR%%/data1/textures/water/waterpx.tga
 %%DATADIR%%/data1/textures/water/waterpx.wal
+%%DATADIR%%/data1/textures/xempx/a3light1b.tga
+%%DATADIR%%/data1/textures/xempx/a7light1.tga
+%%DATADIR%%/data1/textures/xempx/a7light1b.tga
+%%DATADIR%%/data1/textures/xempx/a7light2.tga
+%%DATADIR%%/data1/textures/xempx/a7light3.tga
+%%DATADIR%%/data1/textures/xempx/a7light4.tga
+%%DATADIR%%/data1/textures/xempx/a9metal5.tga
+%%DATADIR%%/data1/textures/xempx/light1.tga
 %%DATADIR%%/data1/vehicles/bomber/bomb.md2
 %%DATADIR%%/data1/vehicles/bomber/bomb.tga
 %%DATADIR%%/data1/vehicles/bomber/console.tga
@@ -2184,10 +2146,15 @@ share/pixmaps/alienarena.png
 @dirrm %%DATADIR%%/data1/vehicles/deathball
 @dirrm %%DATADIR%%/data1/vehicles/bomber
 @dirrm %%DATADIR%%/data1/vehicles
+@dirrm %%DATADIR%%/data1/textures/xempx
 @dirrm %%DATADIR%%/data1/textures/water
+@dirrm %%DATADIR%%/data1/textures/rage
 @dirrm %%DATADIR%%/data1/textures/metal
 @dirrm %%DATADIR%%/data1/textures/martian
+@dirrm %%DATADIR%%/data1/textures/forsaken
 @dirrm %%DATADIR%%/data1/textures/dalek
+@dirrm %%DATADIR%%/data1/textures/common
+@dirrm %%DATADIR%%/data1/textures/arena9
 @dirrm %%DATADIR%%/data1/textures/arena8
 @dirrm %%DATADIR%%/data1/textures/arena7
 @dirrm %%DATADIR%%/data1/textures/arena6
@@ -2196,6 +2163,7 @@ share/pixmaps/alienarena.png
 @dirrm %%DATADIR%%/data1/textures/arena3
 @dirrm %%DATADIR%%/data1/textures/arena2
 @dirrm %%DATADIR%%/data1/textures/arena1
+@dirrm %%DATADIR%%/data1/textures/alien
 @dirrm %%DATADIR%%/data1/textures
 @dirrm %%DATADIR%%/data1/sprites
 @dirrm %%DATADIR%%/data1/sound/world
@@ -2214,26 +2182,17 @@ share/pixmaps/alienarena.png
 @dirrm %%DATADIR%%/data1/scripts/normals
 @dirrm %%DATADIR%%/data1/scripts/maps
 @dirrm %%DATADIR%%/data1/scripts
-@dirrm %%DATADIR%%/data1/players/war
-@dirrm %%DATADIR%%/data1/players/rustbot
-@dirrm %%DATADIR%%/data1/players/robot
 @dirrm %%DATADIR%%/data1/players/martianenforcer
 @dirrm %%DATADIR%%/data1/players/martiancyborg
-@dirrm %%DATADIR%%/data1/players/martian
 @dirrm %%DATADIR%%/data1/players/lauren
-@dirrm %%DATADIR%%/data1/players/infantry
 @dirrm %%DATADIR%%/data1/players/enforcer
-@dirrm %%DATADIR%%/data1/players/construct
-@dirrm %%DATADIR%%/data1/players/brainlet
+@dirrm %%DATADIR%%/data1/players/cybergirl
 @dirrm %%DATADIR%%/data1/players
 @dirrm %%DATADIR%%/data1/pics/huds
 @dirrm %%DATADIR%%/data1/pics/crosshairs
 @dirrm %%DATADIR%%/data1/pics/bots/martianenforcer
 @dirrm %%DATADIR%%/data1/pics/bots/martiancyborg
-@dirrm %%DATADIR%%/data1/pics/bots/martian
-@dirrm %%DATADIR%%/data1/pics/bots/infantry
 @dirrm %%DATADIR%%/data1/pics/bots/enforcer
-@dirrm %%DATADIR%%/data1/pics/bots/construct
 @dirrm %%DATADIR%%/data1/pics/bots
 @dirrm %%DATADIR%%/data1/pics
 @dirrm %%DATADIR%%/data1/particles
@@ -2242,9 +2201,7 @@ share/pixmaps/alienarena.png
 @dirrm %%DATADIR%%/data1/models/weapons/v_shotg
 @dirrm %%DATADIR%%/data1/models/weapons/v_rocket
 @dirrm %%DATADIR%%/data1/models/weapons/v_rail
-@dirrm %%DATADIR%%/data1/models/weapons/v_martian_blast
 @dirrm %%DATADIR%%/data1/models/weapons/v_machn
-@dirrm %%DATADIR%%/data1/models/weapons/v_launch
 @dirrm %%DATADIR%%/data1/models/weapons/v_hyperb
 @dirrm %%DATADIR%%/data1/models/weapons/v_chain
 @dirrm %%DATADIR%%/data1/models/weapons/v_blast
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 17ebafa..fe329a0 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2007.610
-PORTREVISION=	1
+PORTVERSION=	2008
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.simtel.com/pub/gamezone/31/5/17/
-DISTNAME=	${PORTNAME}2007-20071011-linux
+MASTER_SITES=	http://offload1.icculus.org/alienarena/Files/
+DISTNAME=	${PORTNAME}2008-linux20080227
 
 MAINTAINER=	alepulver@FreeBSD.org
-COMMENT=	Alien Arena 2006 (native version)
+COMMENT=	Alien Arena 2008 (native version)
 
 RUN_DEPENDS=	${DATADIR}/arena/default.cfg:${PORTSDIR}/games/alienarena-data
 
@@ -23,7 +22,7 @@ USE_GMAKE=	yes
 
 MAKE_ENV=	WITH_DATADIR=yes WITH_LIBDIR=yes \
 		DATADIR="${DATADIR}" LIBDIR="${LIBDIR}"
-WRKSRC=		${WRKDIR}/${PORTNAME}2007/source
+WRKSRC=		${WRKDIR}/${PORTNAME}2008/source
 ALL_TARGET=	build-release
 
 OPTIONS=	CLIENT "Build client" on \
@@ -42,36 +41,36 @@ LIBDIR=		${PREFIX}/lib/${PORTNAME}
 IGNORE=		needs at least one executable (CLIENT, DEDICATED or SDL)
 .endif
 
-.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL)
+.if defined(WITH_CLIENT) || defined(WITH_SDL)
 LIB_DEPENDS+=	curl.4:${PORTSDIR}/ftp/curl \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 USE_GL=		yes
 .endif
 
-.if defined(WITHOUT_CLIENT)
-MAKE_ENV+=	BUILD=DEDICATED
-.elif defined(WITHOUT_DEDICATED)
+.if defined(WITH_CLIENT)
 MAKE_ENV+=	BUILD=CLIENT
+.elif defined(WITH_DEDICATED)
+MAKE_ENV+=	BUILD=DEDICATED
 .endif
 
-.if !defined(WITHOUT_CLIENT)
+.if defined(WITH_CLIENT)
 PLIST_SUB+=	CLIENT=""
 .else
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if !defined(WITHOUT_DEDICATED)
+.if defined(WITH_DEDICATED)
 PLIST_SUB+=	DEDICATED=""
 .else
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
-MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
+.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+MAKE_ENV+=	OPTIMIZED_CFLAGS=no
 .endif
 
-.if !defined(WITHOUT_SDL)
+.if defined(WITH_SDL)
 USE_SDL=	sdl
 PLIST_SUB+=	SDL=""
 .else
@@ -87,15 +86,15 @@ do-install:
 	${LN} -s ${DATADIR}/arena/* ${LIBDIR}/arena
 	${LN} -s ${DATADIR}/botinfo ${LIBDIR}
 	${LN} -s ${DATADIR}/data1/* ${LIBDIR}/data1
-.if !defined(WITHOUT_CLIENT)
+.if defined(WITH_CLIENT)
 	${INSTALL_PROGRAM} ${WRKSRC}/release/crx \
 		${PREFIX}/bin/${PORTNAME}
 .endif
-.if !defined(WITHOUT_DEDICATED)
+.if defined(WITH_DEDICATED)
 	${INSTALL_PROGRAM} ${WRKSRC}/release/crded \
 		${PREFIX}/bin/${PORTNAME}-ded
 .endif
-.if !defined(WITHOUT_SDL)
+.if defined(WITH_SDL)
 	${INSTALL_PROGRAM} ${WRKSRC}/release/crx.sdl \
 		${PREFIX}/bin/${PORTNAME}-sdl
 .endif
diff --git a/games/alienarena/distinfo b/games/alienarena/distinfo
index f2ad41d..2271faf 100644
--- a/games/alienarena/distinfo
+++ b/games/alienarena/distinfo
@@ -1,3 +1,3 @@
-MD5 (alienarena2007-20071011-linux.zip) = 7ebb0dfeec4be80311921a075379c8dc
-SHA256 (alienarena2007-20071011-linux.zip) = 33036bd0dec77ae06c113d8e06718bd6f9e42efb634ee304c3fd9d48184c2e20
-SIZE (alienarena2007-20071011-linux.zip) = 245067302
+MD5 (alienarena2008-linux20080227.zip) = 5fcb17a65e220b1aad5ec25f97b35932
+SHA256 (alienarena2008-linux20080227.zip) = fe4325465b1b12e8a39552022d812531adae5273a79c2940514568b533e73e44
+SIZE (alienarena2008-linux20080227.zip) = 223329701
diff --git a/games/alienarena/files/alienarena-ded.in b/games/alienarena/files/alienarena-ded.in
deleted file mode 100644
index 1071c8b..0000000
--- a/games/alienarena/files/alienarena-ded.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-cd %%LIBDIR%% || exit 1
-
-exec ./crded +set game arena "$@"
diff --git a/games/alienarena/files/alienarena-sdl.in b/games/alienarena/files/alienarena-sdl.in
deleted file mode 100644
index d09ae2f..0000000
--- a/games/alienarena/files/alienarena-sdl.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-cd %%LIBDIR%% || exit 1
-
-exec ./crx.sdl +set game arena "$@"
diff --git a/games/alienarena/files/alienarena.in b/games/alienarena/files/alienarena.in
deleted file mode 100644
index 2f71ae3..0000000
--- a/games/alienarena/files/alienarena.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-cd %%LIBDIR%% || exit 1
-
-exec ./crx +set game arena "$@"
diff --git a/games/alienarena/files/patch-Makefile b/games/alienarena/files/patch-Makefile
deleted file mode 100644
index 3316dd5..0000000
--- a/games/alienarena/files/patch-Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./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
- 
-+# Adds DATADIR/LIBDIR (see below) to the data and library search path.
-+WITH_DATADIR?=no
-+WITH_LIBDIR?=no
-+
- # Selects the component to build; ALL, GAME, or DEDICATED
- BUILD?=ALL
- 
-@@ -53,6 +57,20 @@
- 
- BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include
- 
-+# DATADIR / LIBDIR support.
-+
-+PREFIX?=/usr/local
-+
-+ifeq ($(strip $(WITH_DATADIR)),yes)
-+DATADIR?=$(PREFIX)/share/alienarena
-+BASE_CFLAGS+=-DDATADIR='\"$(DATADIR)\"'
-+endif
-+
-+ifeq ($(strip $(WITH_LIBDIR)),yes)
-+LIBDIR?=$(PREFIX)/lib/alienarena
-+BASE_CFLAGS+=-DLIBDIR='\"$(LIBDIR)\"'
-+endif
-+
- RELEASE_CFLAGS=$(BASE_CFLAGS)
- 
- ifeq ($(strip $(OPTIMIZED_CFLAGS)),yes)
-@@ -128,13 +146,13 @@
- 		$(BUILDDIR)/crx
- endif
- 
-+ifeq ($(strip $(BUILD)),CLIENT)
-+	TARGETS+=$(BUILDDIR)/crx
-+endif
-+
- ifeq ($(strip $(BUILD)),DEDICATED)
- 	SDLSOUND=0
- 	TARGETS+=$(BUILDDIR)/crded
--endif
--
--ifeq ($(strip $(BUILD)),GAME)
--	TARGETS+=$(BUILDDIR)/crx
- endif
- 
- ifeq ($(strip $(SDLSOUND)),1)
diff --git a/games/alienarena/files/patch-client__menu.c b/games/alienarena/files/patch-client__menu.c
deleted file mode 100644
index 51abd7e..0000000
--- a/games/alienarena/files/patch-client__menu.c
+++ /dev/null
@@ -1,148 +0,0 @@
---- ./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.h b/games/alienarena/files/patch-game__acesrc__acebot.h
deleted file mode 100644
index f37dff6..0000000
--- a/games/alienarena/files/patch-game__acesrc__acebot.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./game/acesrc/acebot.h.orig	Fri Jun  1 14:05:51 2007
-+++ ./game/acesrc/acebot.h	Sat Jul 21 09:32:13 2007
-@@ -60,6 +60,13 @@
- #ifndef _ACEBOT_H
- #define _ACEBOT_H
- 
-+// Directory for reading files in "botinfo", writing is always done in "."
-+#ifdef DATADIR
-+#define BOTDIR	DATADIR
-+#else
-+#define BOTDIR	"."
-+#endif
-+
- // Only 100 allowed for now (probably never be enough edicts for 'em
- #define MAX_BOTS 100
- 
diff --git a/games/alienarena/files/patch-game__acesrc__acebot_nodes.c b/games/alienarena/files/patch-game__acesrc__acebot_nodes.c
deleted file mode 100644
index 86f0fc0..0000000
--- a/games/alienarena/files/patch-game__acesrc__acebot_nodes.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./game/acesrc/acebot_nodes.c.orig	Fri Mar 23 23:28:55 2007
-+++ ./game/acesrc/acebot_nodes.c	Sat Jul 21 09:32:49 2007
-@@ -726,11 +726,7 @@
- 
- 	safe_bprintf(PRINT_MEDIUM,"Saving node table...");
- 
--#ifdef __unix__
--	strcpy(filename,"botinfo/nav/");
--#else
--	strcpy(filename,"botinfo\\nav\\");
--#endif
-+	strcpy(filename,BOTDIR"/botinfo/nav/");
- 	strcat(filename,level.mapname);
- 	strcat(filename,".nod");
- 
diff --git a/games/alienarena/files/patch-game__acesrc__acebot_spawn.c b/games/alienarena/files/patch-game__acesrc__acebot_spawn.c
deleted file mode 100644
index 7a79342..0000000
--- a/games/alienarena/files/patch-game__acesrc__acebot_spawn.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./game/acesrc/acebot_spawn.c.orig	Wed Apr 25 18:22:21 2007
-+++ ./game/acesrc/acebot_spawn.c	Sat Jul 21 09:34:40 2007
-@@ -126,11 +126,11 @@
- 
- //bots and configurations will be loaded level specific
- 	if (((int)(dmflags->value) & DF_SKINTEAMS) || ctf->value || tca->value || cp->value)
--		strcpy(bot_filename, "botinfo/team.tmp");
-+		strcpy(bot_filename, BOTDIR"/botinfo/team.tmp");
- 	else if(sv_custombots->value)
--		sprintf(bot_filename, "botinfo/custom%i.tmp", sv_custombots->integer);
-+		sprintf(bot_filename, BOTDIR"/botinfo/custom%i.tmp", sv_custombots->integer);
- 	else
--		sprintf(bot_filename, "botinfo/%s.tmp", level.mapname);
-+		sprintf(bot_filename, BOTDIR"/botinfo/%s.tmp", level.mapname);
- 
- 	if((pIn = fopen(bot_filename, "rb" )) == NULL)
- 		return; // bail
-@@ -543,7 +543,7 @@
- 		//if not a respawn, load bot configuration file(specific to each bot)
- 		info = Info_ValueForKey (bot->client->pers.userinfo, "name");
-  
--		sprintf(bot_configfilename, "botinfo/%s.cfg", info);
-+		sprintf(bot_configfilename, BOTDIR"/botinfo/%s.cfg", info);
- 		ACECO_ReadConfig(bot_configfilename);
- 
- 		//set config items
diff --git a/games/alienarena/files/patch-qcommon__files.c b/games/alienarena/files/patch-qcommon__files.c
deleted file mode 100644
index 06f0f58..0000000
--- a/games/alienarena/files/patch-qcommon__files.c
+++ /dev/null
@@ -1,201 +0,0 @@
---- ./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);
-+#ifdef DATADIR
-+		FS_AddGameDirectory (va("%s/%s", DATADIR, dir) );
-+#endif
-+#ifdef LIBDIR
-+		FS_AddGameDirectory (va("%s/%s", LIBDIR, dir) );
-+#endif
- 		FS_AddGameDirectory (va("%s/%s", fs_basedir->string, dir) );
- #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 );
-+
-+	//
-+	// DATADIR / LIBDIR support.
-+	// Both directories are used to load data and libraries from, allowing
-+	// different OSes to have them where they want, according to their
-+	// conventions.
-+	//
-+#ifdef DATADIR
-+	FS_AddGameDirectory (va("%s/"BASEDIRNAME, DATADIR));
-+#endif
-+#ifdef LIBDIR
-+	FS_AddGameDirectory (va("%s/"BASEDIRNAME, LIBDIR));
-+#endif
- 
- 	//
- 	// basedir <path>
diff --git a/games/alienarena/files/patch-ref_gl__qgl.h b/games/alienarena/files/patch-ref_gl__qgl.h
deleted file mode 100644
index 8469c64..0000000
--- a/games/alienarena/files/patch-ref_gl__qgl.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- ref_gl/qgl.h.orig	Sat Jul 21 11:52:11 2007
-+++ ref_gl/qgl.h	Sat Jul 21 11:54:16 2007
-@@ -393,6 +393,7 @@
- extern	void ( APIENTRY * qglClientActiveTextureARB)( GLenum );
- 
- extern	void ( APIENTRY * qglMultiTexCoord3fvARB)( GLenum, GLfloat * );
-+#if 0
- // jitwater - fragment programs (pixel shaders)
- typedef void (APIENTRY * PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
- typedef void (APIENTRY * PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-@@ -412,6 +413,7 @@
- typedef void (APIENTRY * PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
- typedef void (APIENTRY * PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
- typedef void (APIENTRY * PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-+#endif
- 
- #ifdef _WIN32
- 
diff --git a/games/alienarena/files/patch-ref_gl__r_script.c b/games/alienarena/files/patch-ref_gl__r_script.c
deleted file mode 100644
index 67c682a..0000000
--- a/games/alienarena/files/patch-ref_gl__r_script.c
+++ /dev/null
@@ -1,83 +0,0 @@
---- 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/alienarena/pkg-descr b/games/alienarena/pkg-descr
index 0ca0e5c..e47afdc 100644
--- a/games/alienarena/pkg-descr
+++ b/games/alienarena/pkg-descr
@@ -1,15 +1,11 @@
-AA2K7 is the latest version of a freeware online deathmatch game that was
-first introduced to the public in October, 2004. Since that initial release,
-nearly every aspect of the game has been revamped, in fact, much of the
-content and code from the November 2005 release of Alien Arena 2006 has been
-redone as well.  It's like an entirely new game, and it may shock people just
-how much it has improved in less than a year's time. With 35 levels, five
-modes of play, loads of mutators, built-in bots, 11 player characters, 8
-weapons(with alt-fire modes), the game has an endless supply of replayability.
-With so many new features, AA2K7 is nearly an entirely new game when held in
-comparison to it's predecessor. With the trials and tribulations of software
-development, endless hours of playing, gathering feedback, COR Entertainment
-has been able to not only fine tune and perfect it's flagship game, but add
-completely new dimensions to it.
+Alien Arena 2008 is a free standalone deathmatch game based on source code
+released by id Software. Begun by COR Entertainment in 2004, the game combines
+a 1950s-era sci-fi atmosphere with gameplay similar to the Quake, Doom, and
+Unreal Tournament series. Alien Arena focuses mainly on online multiplayer
+action, although it does contain single player campaigns against bots.
+
+Alien Arena has been released for Microsoft Windows, Linux and FreeBSD. Alien
+Arena has been free-to-play since its inception, and there are currently no
+plans to change it to pay-to-play.
 
 WWW: http://red.planetarena.org/
diff --git a/games/alienarena/pkg-message b/games/alienarena/pkg-message
index e53dc65..f2567ac 100644
--- a/games/alienarena/pkg-message
+++ b/games/alienarena/pkg-message
@@ -2,7 +2,7 @@
 
 Alien Arena (native version) has been installed.
 
-The OSS (native FreeBSD sound) version of Alien Arena 2006 (named
+The OSS (native FreeBSD sound) version of Alien Arena 2008 (named
 "alienarena") uses by default a slow sound speed, which causes a notable
 delay. To solve this you have to run it once like this:
 
@@ -12,4 +12,7 @@ Where <speed> could be 22050 and 44100 for example (the default that has the
 delay is 11025, and the SDL version uses 22050). The value of "sndspeed" will
 be saved in the configuration file for future runs.
 
+NOTE: in FreeBSD 7 or newer please use the SDL version, as the other one has
+problems with sound.
+
 ==============================================================================