11 files changed, 87 insertions, 112 deletions

diff --git a/games/alienarena-data/Makefile b/games/alienarena-data/Makefile
index e1ae45516984..1fbe4c7cb788 100644
--- a/games/alienarena-data/Makefile
+++ b/games/alienarena-data/Makefile
@@ -6,37 +6,30 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2007
+PORTVERSION=	2007.602
 CATEGORIES=	games
-MASTER_SITES=	http://www.alienarena.org/downloads/ \
-		http://www.forsakenweb.com/gamepage/loaders/games/
+MASTER_SITES=	http://forsakenweb.com/alienarena/download/
 PKGNAMESUFFIX=	-data
-DISTNAME=	${PORTNAME}-${PORTVERSION}-x86
-EXTRACT_SUFX=	.run
+DISTNAME=	${PORTNAME}2007-linux
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Alien Arena 2006 (data)
 
+USE_ZIP=	yes
 NO_BUILD=	yes
-NO_PACKAGE=	Package will be 163MB, set FORCE_PACKAGE if you want it
-NO_WRKSUBDIR=	yes
+NO_PACKAGE=	Package will be 185MB, set FORCE_PACKAGE if you want it
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-linux//}
 
 .include <bsd.port.pre.mk>
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && \
-		${TAIL} +377 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
-		${TAR} zxf -
-	@${TAR} jxf ${WRKDIR}/${PORTNAME}${PORTVERSION}-data.tar.bz2 \
-		-C ${WRKDIR}
+post-extract:
+	@${RM} ${WRKSRC}/arena/gamei386.so ${WRKSRC}/data1/gamei386.so
 
 do-install:
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC} && ${CP} -R arena botinfo data1 ${DATADIR}
 	@${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE}
 	@${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
-	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/alienarena.xpm ${PREFIX}/share/pixmaps
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/games/alienarena-data/distinfo b/games/alienarena-data/distinfo
index 41c0840249f8..a7a3cc6462a4 100644
--- a/games/alienarena-data/distinfo
+++ b/games/alienarena-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (alienarena-2007-x86.run) = b70c1591b2638b3281d5f054e7bc39a9
-SHA256 (alienarena-2007-x86.run) = f9c9f7c0383f58d4a2dd5caa7adffa7dd756f2ee40125bf04c4e3eb6c45fdea0
-SIZE (alienarena-2007-x86.run) = 199500838
+MD5 (alienarena2007-linux.zip) = 4f5c1c2fa5fc6d7b6f107864cdc8253e
+SHA256 (alienarena2007-linux.zip) = 3920eed3f2b191d3a78642a77cc126b5af9e5d63d96756dc89b73aef3c9bb788
+SIZE (alienarena2007-linux.zip) = 218448953
diff --git a/games/alienarena-data/pkg-plist b/games/alienarena-data/pkg-plist
index 7f6700184c1b..1b2aff3a0556 100644
--- a/games/alienarena-data/pkg-plist
+++ b/games/alienarena-data/pkg-plist
@@ -9,7 +9,6 @@
 %%DATADIR%%/arena/pics/m_banner_video.tga
 %%DATADIR%%/arena/pics/m_main.tga
 %%DATADIR%%/arena/server.cfg
-%%DATADIR%%/arena/video/intro.cin
 %%DATADIR%%/botinfo/Astral.cfg
 %%DATADIR%%/botinfo/Beavis.cfg
 %%DATADIR%%/botinfo/Butthead.cfg
@@ -50,6 +49,7 @@
 %%DATADIR%%/botinfo/dm-gauntlet.tmp
 %%DATADIR%%/botinfo/dm-inferno.tmp
 %%DATADIR%%/botinfo/dm-obsidian.tmp
+%%DATADIR%%/botinfo/dm-obsidian2.tmp
 %%DATADIR%%/botinfo/dm-probe.tmp
 %%DATADIR%%/botinfo/dm-redred.tmp
 %%DATADIR%%/botinfo/dm-titan.tmp
@@ -87,6 +87,7 @@
 %%DATADIR%%/botinfo/nav/dm-gauntlet.nod
 %%DATADIR%%/botinfo/nav/dm-inferno.nod
 %%DATADIR%%/botinfo/nav/dm-obsidian.nod
+%%DATADIR%%/botinfo/nav/dm-obsidian2.nod
 %%DATADIR%%/botinfo/nav/dm-probe.nod
 %%DATADIR%%/botinfo/nav/dm-redred.nod
 %%DATADIR%%/botinfo/nav/dm-titan.nod
@@ -138,11 +139,14 @@
 %%DATADIR%%/data1/gfx/aaglow.tga
 %%DATADIR%%/data1/gfx/adrenalbase.tga
 %%DATADIR%%/data1/gfx/adrenalmask.tga
+%%DATADIR%%/data1/gfx/alienarena2gl.tga
 %%DATADIR%%/data1/gfx/armorbase.tga
 %%DATADIR%%/data1/gfx/armorfx.tga
 %%DATADIR%%/data1/gfx/armormask.tga
 %%DATADIR%%/data1/gfx/armormask2.tga
 %%DATADIR%%/data1/gfx/bannerfx.tga
+%%DATADIR%%/data1/gfx/bconsole.tga
+%%DATADIR%%/data1/gfx/bconsole2.tga
 %%DATADIR%%/data1/gfx/beamfx.tga
 %%DATADIR%%/data1/gfx/beammask.tga
 %%DATADIR%%/data1/gfx/blasterfx.tga
@@ -162,6 +166,7 @@
 %%DATADIR%%/data1/gfx/electrics3.tga
 %%DATADIR%%/data1/gfx/electrics3a.tga
 %%DATADIR%%/data1/gfx/electrics3b.tga
+%%DATADIR%%/data1/gfx/electrics3d.tga
 %%DATADIR%%/data1/gfx/flares/flare0.tga
 %%DATADIR%%/data1/gfx/flash.tga
 %%DATADIR%%/data1/gfx/gamarafx.tga
@@ -171,6 +176,9 @@
 %%DATADIR%%/data1/gfx/greenline.tga
 %%DATADIR%%/data1/gfx/hastebase.tga
 %%DATADIR%%/data1/gfx/hastemask.tga
+%%DATADIR%%/data1/gfx/hconsole.tga
+%%DATADIR%%/data1/gfx/hconsole2.tga
+%%DATADIR%%/data1/gfx/hconsole3.tga
 %%DATADIR%%/data1/gfx/hoverfx.tga
 %%DATADIR%%/data1/gfx/lightning.tga
 %%DATADIR%%/data1/gfx/m_banner_main_mask.tga
@@ -181,15 +189,19 @@
 %%DATADIR%%/data1/gfx/marsmask.tga
 %%DATADIR%%/data1/gfx/metal3glow.tga
 %%DATADIR%%/data1/gfx/napalmfx.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
+%%DATADIR%%/data1/gfx/r_lightning.tga
 %%DATADIR%%/data1/gfx/red.tga
 %%DATADIR%%/data1/gfx/redlightning.tga
 %%DATADIR%%/data1/gfx/reflect.tga
 %%DATADIR%%/data1/gfx/rocketfx.tga
+%%DATADIR%%/data1/gfx/sconsole.tga
 %%DATADIR%%/data1/gfx/shardmask.tga
 %%DATADIR%%/data1/gfx/shellsfx.tga
 %%DATADIR%%/data1/gfx/skullglow.tga
@@ -224,8 +236,6 @@
 %%DATADIR%%/data1/levelshots/ctf1.txt
 %%DATADIR%%/data1/levelshots/ctf2.tga
 %%DATADIR%%/data1/levelshots/ctf2.txt
-%%DATADIR%%/data1/levelshots/ctf3.tga
-%%DATADIR%%/data1/levelshots/ctf3.txt
 %%DATADIR%%/data1/levelshots/db-egyptian.tga
 %%DATADIR%%/data1/levelshots/db-egyptian.txt
 %%DATADIR%%/data1/levelshots/db-electro.tga
@@ -258,19 +268,14 @@
 %%DATADIR%%/data1/levelshots/dm-inferno.txt
 %%DATADIR%%/data1/levelshots/dm-obsidian.tga
 %%DATADIR%%/data1/levelshots/dm-obsidian.txt
+%%DATADIR%%/data1/levelshots/dm-obsidian2.tga
+%%DATADIR%%/data1/levelshots/dm-obsidian2.txt
 %%DATADIR%%/data1/levelshots/dm-probe.tga
 %%DATADIR%%/data1/levelshots/dm-probe.txt
 %%DATADIR%%/data1/levelshots/dm-redred.tga
 %%DATADIR%%/data1/levelshots/dm-redred.txt
 %%DATADIR%%/data1/levelshots/dm-titan.tga
 %%DATADIR%%/data1/levelshots/dm-titan.txt
-%%DATADIR%%/data1/levelshots/dm14.tga
-%%DATADIR%%/data1/levelshots/dm7.tga
-%%DATADIR%%/data1/levelshots/dm7.txt
-%%DATADIR%%/data1/levelshots/dm8.tga
-%%DATADIR%%/data1/levelshots/dm8.txt
-%%DATADIR%%/data1/levelshots/dmintro.tga
-%%DATADIR%%/data1/levelshots/dmintro.txt
 %%DATADIR%%/data1/levelshots/tca-europa.tga
 %%DATADIR%%/data1/levelshots/tca-europa.txt
 %%DATADIR%%/data1/levelshots/tca-frost.tga
@@ -311,11 +316,10 @@
 %%DATADIR%%/data1/maps/dm-furious.bsp
 %%DATADIR%%/data1/maps/dm-gauntlet.bsp
 %%DATADIR%%/data1/maps/dm-inferno.bsp
-%%DATADIR%%/data1/maps/dm-obsidian.bsp
+%%DATADIR%%/data1/maps/dm-obsidian2.bsp
 %%DATADIR%%/data1/maps/dm-probe.bsp
 %%DATADIR%%/data1/maps/dm-redred.bsp
 %%DATADIR%%/data1/maps/dm-titan.bsp
-%%DATADIR%%/data1/maps/dm14.bsp
 %%DATADIR%%/data1/maps/scripts/aoa-frost.mus
 %%DATADIR%%/data1/maps/scripts/aoa1.mus
 %%DATADIR%%/data1/maps/scripts/aoa2.fog
@@ -348,6 +352,7 @@
 %%DATADIR%%/data1/maps/scripts/dm-gauntlet.mus
 %%DATADIR%%/data1/maps/scripts/dm-inferno.mus
 %%DATADIR%%/data1/maps/scripts/dm-obsidian.mus
+%%DATADIR%%/data1/maps/scripts/dm-obsidian2.mus
 %%DATADIR%%/data1/maps/scripts/dm-probe.mus
 %%DATADIR%%/data1/maps/scripts/dm-redred.mus
 %%DATADIR%%/data1/maps/scripts/dm-titan.mus
@@ -613,7 +618,7 @@
 %%DATADIR%%/data1/pics/ch3.tga
 %%DATADIR%%/data1/pics/colormap.pcx
 %%DATADIR%%/data1/pics/conback.pcx
-%%DATADIR%%/data1/pics/conchars.pcx
+%%DATADIR%%/data1/pics/conchars.tga
 %%DATADIR%%/data1/pics/field_3.pcx
 %%DATADIR%%/data1/pics/help.tga
 %%DATADIR%%/data1/pics/i_bodyarmor.tga
@@ -648,9 +653,6 @@
 %%DATADIR%%/data1/pics/m_main_video.tga
 %%DATADIR%%/data1/pics/m_main_video_sel.tga
 %%DATADIR%%/data1/pics/m_mouse_cursor.tga
-%%DATADIR%%/data1/pics/mars.tga
-%%DATADIR%%/data1/pics/master.tga
-%%DATADIR%%/data1/pics/net.tga
 %%DATADIR%%/data1/pics/num_0.tga
 %%DATADIR%%/data1/pics/num_1.tga
 %%DATADIR%%/data1/pics/num_2.tga
@@ -1137,6 +1139,7 @@
 %%DATADIR%%/data1/players/war/weapon.tga
 %%DATADIR%%/data1/scripts/caustics.rscript
 %%DATADIR%%/data1/scripts/chrome.rscript
+%%DATADIR%%/data1/scripts/consoles.rscript
 %%DATADIR%%/data1/scripts/electrics.rscript
 %%DATADIR%%/data1/scripts/electrics2.rscript
 %%DATADIR%%/data1/scripts/electrics3.rscript
@@ -1166,6 +1169,7 @@
 %%DATADIR%%/data1/scripts/maps/dm-gauntlet.rscript
 %%DATADIR%%/data1/scripts/maps/dm-inferno.rscript
 %%DATADIR%%/data1/scripts/maps/dm-obsidian.rscript
+%%DATADIR%%/data1/scripts/maps/dm-obsidian2.rscript
 %%DATADIR%%/data1/scripts/maps/dm-probe.rscript
 %%DATADIR%%/data1/scripts/maps/dm-redred.rscript
 %%DATADIR%%/data1/scripts/maps/dm-titan.rscript
@@ -1206,6 +1210,9 @@
 %%DATADIR%%/data1/sound/items/respawn1.wav
 %%DATADIR%%/data1/sound/items/s_health.wav
 %%DATADIR%%/data1/sound/items/sproing.wav
+%%DATADIR%%/data1/sound/misc/1frags.wav
+%%DATADIR%%/data1/sound/misc/2frags.wav
+%%DATADIR%%/data1/sound/misc/3frags.wav
 %%DATADIR%%/data1/sound/misc/am_pkup.wav
 %%DATADIR%%/data1/sound/misc/ar1_pkup.wav
 %%DATADIR%%/data1/sound/misc/ar2_pkup.wav
@@ -1221,13 +1228,17 @@
 %%DATADIR%%/data1/sound/misc/bluevulnerable.wav
 %%DATADIR%%/data1/sound/misc/db_pickup.wav
 %%DATADIR%%/data1/sound/misc/db_score.wav
+%%DATADIR%%/data1/sound/misc/fight.wav
+%%DATADIR%%/data1/sound/misc/godlike.wav
 %%DATADIR%%/data1/sound/misc/hit.wav
 %%DATADIR%%/data1/sound/misc/lasfly.wav
 %%DATADIR%%/data1/sound/misc/menu1.wav
 %%DATADIR%%/data1/sound/misc/menu2.wav
 %%DATADIR%%/data1/sound/misc/menu3.wav
 %%DATADIR%%/data1/sound/misc/menumusic.wav
+%%DATADIR%%/data1/sound/misc/one.wav
 %%DATADIR%%/data1/sound/misc/pc_up.wav
+%%DATADIR%%/data1/sound/misc/rampage.wav
 %%DATADIR%%/data1/sound/misc/red_picked.wav
 %%DATADIR%%/data1/sound/misc/red_returned.wav
 %%DATADIR%%/data1/sound/misc/red_scores.wav
@@ -1242,6 +1253,8 @@
 %%DATADIR%%/data1/sound/misc/talk1.wav
 %%DATADIR%%/data1/sound/misc/tele1.wav
 %%DATADIR%%/data1/sound/misc/tele_up.wav
+%%DATADIR%%/data1/sound/misc/three.wav
+%%DATADIR%%/data1/sound/misc/two.wav
 %%DATADIR%%/data1/sound/misc/w_pkup.wav
 %%DATADIR%%/data1/sound/music/aat0.wav
 %%DATADIR%%/data1/sound/music/aat1.wav
@@ -1691,6 +1704,8 @@
 %%DATADIR%%/data1/textures/arena5/trim.wal
 %%DATADIR%%/data1/textures/arena6/alienarena.tga
 %%DATADIR%%/data1/textures/arena6/alienarena.wal
+%%DATADIR%%/data1/textures/arena6/alienarena2.tga
+%%DATADIR%%/data1/textures/arena6/alienarena2.wal
 %%DATADIR%%/data1/textures/arena6/bricks1.tga
 %%DATADIR%%/data1/textures/arena6/bricks1.wal
 %%DATADIR%%/data1/textures/arena6/city20.tga
@@ -1699,6 +1714,10 @@
 %%DATADIR%%/data1/textures/arena6/ctfwinblue.wal
 %%DATADIR%%/data1/textures/arena6/ctfwinred.tga
 %%DATADIR%%/data1/textures/arena6/ctfwinred.wal
+%%DATADIR%%/data1/textures/arena6/flamejet.tga
+%%DATADIR%%/data1/textures/arena6/flamejet.wal
+%%DATADIR%%/data1/textures/arena6/flare.tga
+%%DATADIR%%/data1/textures/arena6/flare.wal
 %%DATADIR%%/data1/textures/arena6/fodblue.tga
 %%DATADIR%%/data1/textures/arena6/fodblue.wal
 %%DATADIR%%/data1/textures/arena6/girder1.tga
@@ -1729,8 +1748,12 @@
 %%DATADIR%%/data1/textures/arena6/rings.wal
 %%DATADIR%%/data1/textures/arena6/skull.tga
 %%DATADIR%%/data1/textures/arena6/skull.wal
+%%DATADIR%%/data1/textures/arena6/skullite.tga
+%%DATADIR%%/data1/textures/arena6/skullite.wal
 %%DATADIR%%/data1/textures/arena6/snow.tga
 %%DATADIR%%/data1/textures/arena6/snow.wal
+%%DATADIR%%/data1/textures/arena6/tech1.tga
+%%DATADIR%%/data1/textures/arena6/tech1.wal
 %%DATADIR%%/data1/textures/arena6/wires1.tga
 %%DATADIR%%/data1/textures/arena6/wires1.wal
 %%DATADIR%%/data1/textures/clockwork/clock2.tga
@@ -2260,8 +2283,6 @@ share/pixmaps/alienarena.xpm
 @dirrm %%DATADIR%%/data1
 @dirrm %%DATADIR%%/botinfo/nav
 @dirrm %%DATADIR%%/botinfo
-@dirrm %%DATADIR%%/arena/video
 @dirrm %%DATADIR%%/arena/pics
 @dirrm %%DATADIR%%/arena
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 576440686ba5..327b7151c548 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -6,25 +6,23 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2007
-PORTREVISION=	1
+PORTVERSION=	2007.602
 CATEGORIES=	games
-MASTER_SITES=	http://www.alienarena.org/downloads/ \
-		http://www.forsakenweb.com/gamepage/loaders/games/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-x86
-EXTRACT_SUFX=	.run
+MASTER_SITES=	http://forsakenweb.com/alienarena/download/
+DISTNAME=	${PORTNAME}2007-linux
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Alien Arena 2006 (native version)
 
 RUN_DEPENDS=	${DATADIR}/arena/default.cfg:${PORTSDIR}/games/alienarena-data
 
+USE_ZIP=	yes
 USE_DOS2UNIX=	yes
-USE_GCC=	3.2+
+USE_GCC=	3.4+
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/source
-BUILD_WRKSRC=	${WRKDIR}/source/linux
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-linux//}/source
+BUILD_WRKSRC=	${WRKSRC}/linux
 ALL_TARGET=	build_release
 
 OPTIONS=	CLIENT "Build client" on \
@@ -84,19 +82,14 @@ PLIST_SUB+=	SDL=""
 PLIST_SUB+=	SDL="@comment "
 .endif
 
+post-extract:
+	@${FIND} ${WRKSRC} | ${XARGS} ${CHMOD} u+w
+
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${GREP} -Ev \
 		'(game/g_main|linux/(gl_glx|(q_sh|snd_)linux))\.c' | \
 		${XARGS} ${REINPLACE_CMD} -e 's/__linux__/__unix__/g'
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && \
-		${TAIL} +377 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
-		${TAR} zxf -
-	@${TAR} zxf ${WRKDIR}/${PORTNAME}${PORTVERSION}-src.tar.gz \
-		-C ${WRKDIR}
-
 do-install:
 	${MKDIR} ${LIBDIR}/arena ${LIBDIR}/data1
 	cd ${BUILD_WRKSRC}/release && \
diff --git a/games/alienarena/distinfo b/games/alienarena/distinfo
index 41c0840249f8..a7a3cc6462a4 100644
--- a/games/alienarena/distinfo
+++ b/games/alienarena/distinfo
@@ -1,3 +1,3 @@
-MD5 (alienarena-2007-x86.run) = b70c1591b2638b3281d5f054e7bc39a9
-SHA256 (alienarena-2007-x86.run) = f9c9f7c0383f58d4a2dd5caa7adffa7dd756f2ee40125bf04c4e3eb6c45fdea0
-SIZE (alienarena-2007-x86.run) = 199500838
+MD5 (alienarena2007-linux.zip) = 4f5c1c2fa5fc6d7b6f107864cdc8253e
+SHA256 (alienarena2007-linux.zip) = 3920eed3f2b191d3a78642a77cc126b5af9e5d63d96756dc89b73aef3c9bb788
+SIZE (alienarena2007-linux.zip) = 218448953
diff --git a/games/alienarena/files/patch-linux__Makefile b/games/alienarena/files/patch-linux__Makefile
index 6ff24b05c448..ab475dedfc32 100644
--- a/games/alienarena/files/patch-linux__Makefile
+++ b/games/alienarena/files/patch-linux__Makefile
@@ -1,5 +1,5 @@
---- linux/Makefile.orig	Fri Sep  1 16:23:43 2006
-+++ linux/Makefile	Fri Sep  1 16:24:20 2006
+--- linux/Makefile.orig	Tue Jan  9 17:59:39 2007
++++ linux/Makefile	Tue Jan  9 18:02:46 2007
 @@ -11,25 +11,14 @@
  GLIBC=
  endif
@@ -42,9 +42,9 @@
 -else
 -_LIB := lib
 -endif
-+BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp
++BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include
  
--BASE_CFLAGS=-Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__linux__
+-BASE_CFLAGS=-Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__unix__
 +RELEASE_CFLAGS=$(BASE_CFLAGS)
  
 -ifeq ($(ARCH),axp)
@@ -83,7 +83,7 @@
 +SVGALDFLAGS=-lvga -lm
  
 -ARENA_CFLAGS=-DARENA
-+GLCFLAGS=-I$(X11BASE)/include
++GLCFLAGS=
  
 -DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 -LDFLAGS=-ldl -lm
@@ -129,7 +129,7 @@
  endif
  
  ifeq ($(strip $(SDLSOUND)),1)
-@@ -599,7 +572,7 @@
+@@ -597,7 +570,7 @@
  
  
  
@@ -138,7 +138,7 @@
  	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
  
  
-@@ -763,7 +736,7 @@
+@@ -753,7 +726,7 @@
  	$(BUILDDIR)/arena/p_weapon.o \
  	$(BUILDDIR)/arena/vehicles.o
  
diff --git a/games/alienarena/files/patch-linux__snd_linux.c b/games/alienarena/files/patch-linux__snd_linux.c
index c86de1f4d769..ffcfd1bac6e7 100644
--- a/games/alienarena/files/patch-linux__snd_linux.c
+++ b/games/alienarena/files/patch-linux__snd_linux.c
@@ -1,5 +1,5 @@
---- ./linux/snd_linux.c.orig	Tue May 16 15:20:09 2006
-+++ ./linux/snd_linux.c	Tue May 16 15:20:10 2006
+--- linux/snd_linux.c.orig	Tue Jan  9 17:56:35 2007
++++ linux/snd_linux.c	Tue Jan  9 17:58:43 2007
 @@ -25,13 +25,17 @@
  #include <sys/mman.h>
  #include <sys/shm.h>
@@ -19,39 +19,17 @@
  int snd_inited;
  
  cvar_t *sndbits;
-@@ -39,24 +43,26 @@
- cvar_t *sndchannels;
- cvar_t *snddevice;
- 
--static int tryrates[] = { 11025, 22051, 44100, 8000 };
-+static int tryrates[] = { 11025, 22051, 44100, 48000, 8000 };
- 
- qboolean SNDDMA_Init(void)
- {
- 
- 	int rc;
--    int fmt;
-+	int fmt;
- 	int tmp;
--    int i;
--    char *s;
-+	int i;
- 	struct audio_buf_info info;
- 	int caps;
+@@ -54,7 +58,9 @@
  	extern uid_t saved_euid;
  
  	if (snd_inited)
 -		return;
 +		return 1;
- 
--	if (!snddevice) {
++
 +	snd_inited = 0;
-+	
-+	if (!snddevice)
-+	{
+ 
+ 	if (!snddevice) {
  		sndbits = Cvar_Get("sndbits", "16", CVAR_ARCHIVE);
- 		sndspeed = Cvar_Get("sndspeed", "0", CVAR_ARCHIVE);
- 		sndchannels = Cvar_Get("sndchannels", "2", CVAR_ARCHIVE);
 @@ -65,165 +71,182 @@
  
  // open /dev/dsp, confirm capability to mmap, and get size of dma buffer
diff --git a/games/alienarena/pkg-plist b/games/alienarena/pkg-plist
index 088a971b11c4..cf0b0195115a 100644
--- a/games/alienarena/pkg-plist
+++ b/games/alienarena/pkg-plist
@@ -8,7 +8,6 @@
 %%LIBDIR%%/arena/motd.txt
 %%LIBDIR%%/arena/pics
 %%LIBDIR%%/arena/server.cfg
-%%LIBDIR%%/arena/video
 %%LIBDIR%%/botinfo
 %%DEDICATED%%%%LIBDIR%%/crded
 %%CLIENT%%%%LIBDIR%%/crx
diff --git a/games/linux-alienarena/Makefile b/games/linux-alienarena/Makefile
index 4d27b0564dec..0e1a314cfb8a 100644
--- a/games/linux-alienarena/Makefile
+++ b/games/linux-alienarena/Makefile
@@ -6,25 +6,23 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2007
-PORTREVISION=	1
+PORTVERSION=	2007.602
 PORTEPOCH=	1
 CATEGORIES=	games linux
-MASTER_SITES=	http://www.alienarena.org/downloads/ \
-		http://www.forsakenweb.com/gamepage/loaders/games/
+MASTER_SITES=	http://forsakenweb.com/alienarena/download/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-x86
-EXTRACT_SUFX=	.run
+DISTNAME=	${PORTNAME}2007-linux
 
-MAINTAINER=	acm@FreeBSD.org
+MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Alien Arena 2006 (Linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
 		${DATADIR}/arena/default.cfg:${PORTSDIR}/games/alienarena-data
 
+USE_ZIP=	yes
 USE_LINUX=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-linux//}
 
 SUB_FILES=	linux-alienarena linux-alienarena-ded
 SUB_LIST=	LIBDIR="${LIBDIR}"
@@ -48,22 +46,16 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && \
-		${TAIL} +377 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
-		${TAR} zxf -
-
 do-install:
 	${MKDIR} ${LIBDIR}/arena ${LIBDIR}/data1
-	cd ${WRKSRC}/engine/x86 && \
+	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} arena/gamei386.so ${LIBDIR}/arena && \
 		${INSTALL_PROGRAM} data1/gamei386.so ${LIBDIR}/data1
 	${LN} -sf ${DATADIR}/arena/* ${LIBDIR}/arena
 	${LN} -sf ${DATADIR}/botinfo ${LIBDIR}
 	${LN} -sf ${DATADIR}/data1/* ${LIBDIR}/data1
 .for f in crx.sdl crded
-	${INSTALL_PROGRAM} ${WRKSRC}/engine/x86/${f} ${LIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${LIBDIR}
 .endfor
 .for f in linux-alienarena linux-alienarena-ded
 	${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin
diff --git a/games/linux-alienarena/distinfo b/games/linux-alienarena/distinfo
index 41c0840249f8..a7a3cc6462a4 100644
--- a/games/linux-alienarena/distinfo
+++ b/games/linux-alienarena/distinfo
@@ -1,3 +1,3 @@
-MD5 (alienarena-2007-x86.run) = b70c1591b2638b3281d5f054e7bc39a9
-SHA256 (alienarena-2007-x86.run) = f9c9f7c0383f58d4a2dd5caa7adffa7dd756f2ee40125bf04c4e3eb6c45fdea0
-SIZE (alienarena-2007-x86.run) = 199500838
+MD5 (alienarena2007-linux.zip) = 4f5c1c2fa5fc6d7b6f107864cdc8253e
+SHA256 (alienarena2007-linux.zip) = 3920eed3f2b191d3a78642a77cc126b5af9e5d63d96756dc89b73aef3c9bb788
+SIZE (alienarena2007-linux.zip) = 218448953
diff --git a/games/linux-alienarena/pkg-plist b/games/linux-alienarena/pkg-plist
index dcca1d79ba5b..5349cf133667 100644
--- a/games/linux-alienarena/pkg-plist
+++ b/games/linux-alienarena/pkg-plist
@@ -7,7 +7,6 @@ bin/linux-alienarena-ded
 %%LIBDIR%%/arena/motd.txt
 %%LIBDIR%%/arena/pics
 %%LIBDIR%%/arena/server.cfg
-%%LIBDIR%%/arena/video
 %%LIBDIR%%/botinfo
 %%LIBDIR%%/crded
 %%LIBDIR%%/crx.sdl