5 files changed, 48 insertions, 53 deletions

diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 11d5a317870e..34bc2e720fbd 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2007.604
-PORTREVISION=	2
+PORTVERSION=	2007.605
 CATEGORIES=	games
-MASTER_SITES=	http://cor.planetquake.gamespy.com/codered/files/
-DISTNAME=	${PORTNAME}2007-linux20070225-x86
+MASTER_SITES=	http://offload1.icculus.org/alienarena/files/ \
+		http://distfiles.gentoo.org/distfiles/
+DISTNAME=	${PORTNAME}2007-20070613-linux
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Alien Arena 2006 (native version)
@@ -19,19 +19,19 @@ RUN_DEPENDS=	${DATADIR}/arena/default.cfg:${PORTSDIR}/games/alienarena-data
 
 USE_ZIP=	yes
 USE_DOS2UNIX=	yes
-USE_GCC=	3.4+
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME:C/-linux.*//}/source
-BUILD_WRKSRC=	${WRKSRC}/linux
-ALL_TARGET=	build_release
+MAKE_ENV=	WITH_DATADIR=yes WITH_LIBDIR=yes \
+		DATADIR="${DATADIR}" LIBDIR="${LIBDIR}"
+WRKSRC=		${WRKDIR}/${PORTNAME}2007/source
+BUILD_WRKSRC=	${WRKSRC}/..
+ALL_TARGET=	build-release
 
 OPTIONS=	CLIENT "Build client" on \
 		DEDICATED "Build dedicated server" on \
 		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		SDL "Build client that uses SDL for sound" on
+		SDL "Build SDL sound client (needs CLIENT)" on
 
-SUB_LIST=	LIBDIR=${LIBDIR}
 PLIST_SUB=	LIBDIR=${LIBDIR:S/${PREFIX}\///}
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
@@ -48,21 +48,19 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 USE_GL=		yes
 .endif
 
+.if defined(WITHOUT_CLIENT)
+MAKE_ENV+=	BUILD=DEDICATED
+.elif defined(WITHOUT_DEDICATED)
+MAKE_ENV+=	BUILD=CLIENT
+.endif
+
 .if !defined(WITHOUT_CLIENT)
-MAKE_ENV+=	CLIENT=1
-AA_TARGETS+=	crx
-AA_SCRIPTS+=	alienarena
-SUB_FILES+=	alienarena
 PLIST_SUB+=	CLIENT=""
 .else
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
 .if !defined(WITHOUT_DEDICATED)
-MAKE_ENV+=	DEDICATED=1
-AA_TARGETS+=	crded
-AA_SCRIPTS+=	alienarena-ded
-SUB_FILES+=	alienarena-ded
 PLIST_SUB+=	DEDICATED=""
 .else
 PLIST_SUB+=	DEDICATED="@comment "
@@ -74,23 +72,12 @@ MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
 
 .if !defined(WITHOUT_SDL)
 USE_SDL=	sdl
-MAKE_ENV+=	SDLSOUND=1
-AA_TARGETS+=	crx.sdl
-AA_SCRIPTS+=	alienarena-sdl
-SUB_FILES+=	alienarena-sdl
 PLIST_SUB+=	SDL=""
 .else
+MAKE_ENV+=	SDLSOUND=0
 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-install:
 	${MKDIR} ${LIBDIR}/arena ${LIBDIR}/data1
 	cd ${BUILD_WRKSRC}/release && \
@@ -99,12 +86,18 @@ do-install:
 	${LN} -s ${DATADIR}/arena/* ${LIBDIR}/arena
 	${LN} -s ${DATADIR}/botinfo ${LIBDIR}
 	${LN} -s ${DATADIR}/data1/* ${LIBDIR}/data1
-.for f in ${AA_TARGETS}
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${f} ${LIBDIR}
-.endfor
-.for f in ${AA_SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin
-.endfor
+.if !defined(WITHOUT_CLIENT)
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/crx \
+		${PREFIX}/bin/${PORTNAME}
+.endif
+.if !defined(WITHOUT_DEDICATED)
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/crded \
+		${PREFIX}/bin/${PORTNAME}-ded
+.endif
+.if !defined(WITHOUT_SDL)
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/crx.sdl \
+		${PREFIX}/bin/${PORTNAME}-sdl
+.endif
 
 post-install:
 	@${ECHO_CMD}
diff --git a/games/alienarena/distinfo b/games/alienarena/distinfo
index 2608e2108c1d..1877022f3f02 100644
--- a/games/alienarena/distinfo
+++ b/games/alienarena/distinfo
@@ -1,3 +1,3 @@
-MD5 (alienarena2007-linux20070225-x86.zip) = 8fc9695acd3a2181a6bb762aae09762b
-SHA256 (alienarena2007-linux20070225-x86.zip) = 24ad8cbefa11f1db5eea96a776c520fe12b1247ab390779cb1bded30b1e8430e
-SIZE (alienarena2007-linux20070225-x86.zip) = 196391306
+MD5 (alienarena2007-20070613-linux.zip) = 65d2948fa636cbc28c82da2264df2fea
+SHA256 (alienarena2007-20070613-linux.zip) = 593a7b106768abaff4c55f0b06dc20b5914601516c98ca5dfe93526de0559933
+SIZE (alienarena2007-20070613-linux.zip) = 223204178
diff --git a/games/alienarena/pkg-descr b/games/alienarena/pkg-descr
index a19014498bfe..0ca0e5c3a1dd 100644
--- a/games/alienarena/pkg-descr
+++ b/games/alienarena/pkg-descr
@@ -1,10 +1,15 @@
-AA2K6 is the latest in a series of standalone games based on a classic Sci-Fi
-theme with a modern, updated visual experience. With 25 levels, five modes of
-play, mutators, built-in bots, 9 characters, 8 weapons (3 with alt-fire
-modes), the game has an endless supply of replayability. Billed as the sequel
-to 2004's CodeRED: Alien Arena, AA2K6 is much more than that. 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.
+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.
 
 WWW: http://red.planetarena.org/
diff --git a/games/alienarena/pkg-message b/games/alienarena/pkg-message
index 62c982bae067..e53dc65ea779 100644
--- a/games/alienarena/pkg-message
+++ b/games/alienarena/pkg-message
@@ -1,12 +1,12 @@
 ==============================================================================
 
-Alien Arena 2006 (native version) has been installed.
+Alien Arena (native version) has been installed.
 
 The OSS (native FreeBSD sound) version of Alien Arena 2006 (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:
 
-alienarena +set sndspeed <speed>
+$ alienarena +set sndspeed <speed>
 
 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
diff --git a/games/alienarena/pkg-plist b/games/alienarena/pkg-plist
index cf0b0195115a..23a9bb978d6b 100644
--- a/games/alienarena/pkg-plist
+++ b/games/alienarena/pkg-plist
@@ -1,7 +1,6 @@
 %%CLIENT%%bin/alienarena
 %%DEDICATED%%bin/alienarena-ded
 %%SDL%%bin/alienarena-sdl
-%%LIBDIR%%/arena/ctf.cfg
 %%LIBDIR%%/arena/default.cfg
 %%LIBDIR%%/arena/game.so
 %%LIBDIR%%/arena/maps.lst
@@ -9,11 +8,9 @@
 %%LIBDIR%%/arena/pics
 %%LIBDIR%%/arena/server.cfg
 %%LIBDIR%%/botinfo
-%%DEDICATED%%%%LIBDIR%%/crded
-%%CLIENT%%%%LIBDIR%%/crx
-%%SDL%%%%LIBDIR%%/crx.sdl
 %%LIBDIR%%/data1/default.cfg
 %%LIBDIR%%/data1/env
+%%LIBDIR%%/data1/fonts
 %%LIBDIR%%/data1/game.so
 %%LIBDIR%%/data1/gfx
 %%LIBDIR%%/data1/levelshots