3 files changed, 46 insertions, 19 deletions

diff --git a/games/alienarena-data/Makefile b/games/alienarena-data/Makefile
index 33fc17e41db8..897dfb94df37 100644
--- a/games/alienarena-data/Makefile
+++ b/games/alienarena-data/Makefile
@@ -6,33 +6,39 @@
 #
 
 PORTNAME=	alienarena
-DISTVERSION=	2006.ge
+DISTVERSION=	2006.ue
 CATEGORIES=	games
-MASTER_SITES=	http://offload1.icculus.org/~ravage/alienarena2006/:data \
-		ftp://ftp.alepulver.com.ar/distfiles/:patch
+MASTER_SITES=	http://offload1.icculus.org/~ravage/alienarena2006/ \
+		http://cor.planetquake.gamespy.com/codered/files/ \
+		http://www.forsakenweb.com/gamepage/loaders/games/
 PKGNAMESUFFIX=	-data
-DISTFILES=	${PORTNAME}-2006ge-x86.run:data \
-		aa2k6updateGE501c-x86.zip:patch
+DISTNAME=	${PORTNAME}-${DISTVERSION:S/.//}-x86
+EXTRACT_SUFX=	.run
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Alien Arena 2006 (data)
 
-EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
-
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+NO_PACKAGE=	Package will be 163MB, set FORCE_PACKAGE if you want it
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BROKEN=		does not extract (gzip error)
+.endif
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@cd ${WRKDIR} && \
-		${TAIL} -c +8814 ${DISTDIR}/${PORTNAME}-2006ge-x86.run | \
+		${TAIL} +377 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -
-	@${TAR} jxf ${WRKDIR}/alienarena-2006ge-data.tar.bz2 -C ${WRKDIR}
-	@${UNZIP_CMD} -qod ${WRKDIR} ${DISTDIR}/aa2k6updateGE501c-x86.zip
+	@${TAR} zxf ${WRKDIR}/${PORTNAME}-${DISTVERSION:S/.//}-data.tar.bz2 \
+		-C ${WRKDIR}
 
 post-extract:
-	@cd ${WRKSRC} && ${RM} arena/game* data1/game*
+	@cd ${WRKSRC}/data1/levelshots && \
+		${MV} ctf-strongholdl.txt ctf-stronghold.txt
 
 do-install:
 	${MKDIR} ${DATADIR}
@@ -43,4 +49,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/alienarena-data/distinfo b/games/alienarena-data/distinfo
index ec80370b31eb..939cc28025ba 100644
--- a/games/alienarena-data/distinfo
+++ b/games/alienarena-data/distinfo
@@ -1,6 +1,3 @@
-MD5 (alienarena-2006ge-x86.run) = f27923b13dc586b649134d7a4bfc0709
-SHA256 (alienarena-2006ge-x86.run) = ce6b47c86bde5b3aefc572897c0e46fc5e8b2cafa178293835ee074951b50e1a
-SIZE (alienarena-2006ge-x86.run) = 164160207
-MD5 (aa2k6updateGE501c-x86.zip) = 87266deb278b2d88be0c5c08f16b4885
-SHA256 (aa2k6updateGE501c-x86.zip) = f08207ce05c8862fcf1a59344e4a815904486b636601d28287e54c10328fecc8
-SIZE (aa2k6updateGE501c-x86.zip) = 10860682
+MD5 (alienarena-2006ue-x86.run) = 7b6416646db832fbc9761925240b5ff4
+SHA256 (alienarena-2006ue-x86.run) = a9ee5e69e37c1e511a21e3a0a698de0b0a297995827c806df0a08ce0a3276fde
+SIZE (alienarena-2006ue-x86.run) = 168878681
diff --git a/games/alienarena-data/pkg-plist b/games/alienarena-data/pkg-plist
index 13279804dbfc..508298a039b4 100644
--- a/games/alienarena-data/pkg-plist
+++ b/games/alienarena-data/pkg-plist
@@ -53,6 +53,8 @@
 %%DATADIR%%/botinfo/nav/aoa2.nod
 %%DATADIR%%/botinfo/nav/ctf-blood.nod
 %%DATADIR%%/botinfo/nav/ctf-frost.nod
+%%DATADIR%%/botinfo/nav/ctf-stronghold.nod
+%%DATADIR%%/botinfo/nav/ctf-terminal.nod
 %%DATADIR%%/botinfo/nav/ctf0.nod
 %%DATADIR%%/botinfo/nav/ctf1.nod
 %%DATADIR%%/botinfo/nav/ctf2.nod
@@ -130,6 +132,7 @@
 %%DATADIR%%/data1/gfx/caustics.tga
 %%DATADIR%%/data1/gfx/cellfx.tga
 %%DATADIR%%/data1/gfx/chrome.tga
+%%DATADIR%%/data1/gfx/citymask.tga
 %%DATADIR%%/data1/gfx/disruptorbase.tga
 %%DATADIR%%/data1/gfx/disruptormask.tga
 %%DATADIR%%/data1/gfx/electrics.tga
@@ -182,6 +185,10 @@
 %%DATADIR%%/data1/levelshots/ctf-blood.txt
 %%DATADIR%%/data1/levelshots/ctf-frost.tga
 %%DATADIR%%/data1/levelshots/ctf-frost.txt
+%%DATADIR%%/data1/levelshots/ctf-stronghold.tga
+%%DATADIR%%/data1/levelshots/ctf-stronghold.txt
+%%DATADIR%%/data1/levelshots/ctf-terminal.tga
+%%DATADIR%%/data1/levelshots/ctf-terminal.txt
 %%DATADIR%%/data1/levelshots/ctf0.tga
 %%DATADIR%%/data1/levelshots/ctf0.txt
 %%DATADIR%%/data1/levelshots/ctf1.tga
@@ -239,6 +246,8 @@
 %%DATADIR%%/data1/maps/aoa2.bsp
 %%DATADIR%%/data1/maps/ctf-blood.bsp
 %%DATADIR%%/data1/maps/ctf-frost.bsp
+%%DATADIR%%/data1/maps/ctf-stronghold.bsp
+%%DATADIR%%/data1/maps/ctf-terminal.bsp
 %%DATADIR%%/data1/maps/ctf0.bsp
 %%DATADIR%%/data1/maps/ctf1.bsp
 %%DATADIR%%/data1/maps/ctf2.bsp
@@ -1058,6 +1067,7 @@
 %%DATADIR%%/data1/sound/music/aat2.wav
 %%DATADIR%%/data1/sound/music/aat3.wav
 %%DATADIR%%/data1/sound/music/aoa-frost.wav
+%%DATADIR%%/data1/sound/music/ctf-terminal.wav
 %%DATADIR%%/data1/sound/music/dm-beyond.wav
 %%DATADIR%%/data1/sound/music/dm-bootcamp.wav
 %%DATADIR%%/data1/sound/music/dm-egyptian.wav
@@ -1107,6 +1117,10 @@
 %%DATADIR%%/data1/sound/player/step2.wav
 %%DATADIR%%/data1/sound/player/step3.wav
 %%DATADIR%%/data1/sound/player/step4.wav
+%%DATADIR%%/data1/sound/player/step_metal1.wav
+%%DATADIR%%/data1/sound/player/step_metal2.wav
+%%DATADIR%%/data1/sound/player/step_metal3.wav
+%%DATADIR%%/data1/sound/player/step_metal4.wav
 %%DATADIR%%/data1/sound/player/wade1.wav
 %%DATADIR%%/data1/sound/player/wade2.wav
 %%DATADIR%%/data1/sound/player/wade3.wav
@@ -1481,6 +1495,14 @@
 %%DATADIR%%/data1/textures/arena6/alienarena.wal
 %%DATADIR%%/data1/textures/arena6/bricks1.tga
 %%DATADIR%%/data1/textures/arena6/bricks1.wal
+%%DATADIR%%/data1/textures/arena6/city20.tga
+%%DATADIR%%/data1/textures/arena6/city20.wal
+%%DATADIR%%/data1/textures/arena6/ctfwinblue.tga
+%%DATADIR%%/data1/textures/arena6/ctfwinblue.wal
+%%DATADIR%%/data1/textures/arena6/ctfwinred.tga
+%%DATADIR%%/data1/textures/arena6/ctfwinred.wal
+%%DATADIR%%/data1/textures/arena6/fodblue.tga
+%%DATADIR%%/data1/textures/arena6/fodblue.wal
 %%DATADIR%%/data1/textures/arena6/girder1.tga
 %%DATADIR%%/data1/textures/arena6/girder1.wal
 %%DATADIR%%/data1/textures/arena6/girder2.tga
@@ -1503,6 +1525,8 @@
 %%DATADIR%%/data1/textures/arena6/plate5.wal
 %%DATADIR%%/data1/textures/arena6/rimlight.tga
 %%DATADIR%%/data1/textures/arena6/rimlight.wal
+%%DATADIR%%/data1/textures/arena6/rimlight2.tga
+%%DATADIR%%/data1/textures/arena6/rimlight2.wal
 %%DATADIR%%/data1/textures/arena6/rings.tga
 %%DATADIR%%/data1/textures/arena6/rings.wal
 %%DATADIR%%/data1/textures/arena6/skull.tga