- Update to version 2007.605.

7 files changed, 89 insertions, 45 deletions

diff --git a/games/linux-alienarena/Makefile b/games/linux-alienarena/Makefile
index 0b69e7b0666b..7fc716a9a90e 100644
--- a/games/linux-alienarena/Makefile
+++ b/games/linux-alienarena/Makefile
@@ -6,59 +6,88 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2007.604
-PORTEPOCH=	1
+PORTVERSION=	2007.605
 CATEGORIES=	games linux
-MASTER_SITES=	http://cor.planetquake.gamespy.com/codered/files/
+MASTER_SITES=	http://offload1.icculus.org/alienarena/files/ \
+		http://distfiles.gentoo.org/distfiles/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}2007-linux20070225-x86
+DISTNAME=	${PORTNAME}2007-20070613-linux
 
 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
+RUN_DEPENDS=	${DATADIR}/arena/default.cfg:${PORTSDIR}/games/alienarena-data
 
 USE_ZIP=	yes
 USE_LINUX=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME:C/-linux.*//}
+WRKSRC=		${WRKDIR}/${PORTNAME}2007
+
+OPTIONS=	CLIENT "Install client" on \
+		DEDICATED "Install dedicated server" on \
+		SDL "Install client that uses SDL for sound" on
 
-SUB_FILES=	linux-alienarena linux-alienarena-ded
 SUB_LIST=	LIBDIR="${LIBDIR}"
 PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
 
 LIBDIR=		${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME}
 
-DESKTOP_ENTRIES="Alien Arena 2006 (Linux version)" \
-		"Play Alien Arena 2006 (Linux version)" \
-		"alienarena.xpm" \
-		"linux-alienarena" \
-		"Application;Game;" \
-		false
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_NVIDIA_GL)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
+.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && \
+    defined(WITHOUT_SDL)
+IGNORE=		needs at least one executable (CLIENT, DEDICATED or SDL)
+.endif
+
+.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL)
+USE_GL=		linux
+.endif
+
+.if !defined(WITHOUT_CLIENT)
+AA_SCRIPTS+=	linux-alienarena
+AA_TARGETS+=	crx
+PLIST_SUB+=	CLIENT=""
+.else
+PLIST_SUB+=	CLIENT="@comment "
+.endif
+
+.if !defined(WITHOUT_DEDICATED)
+AA_SCRIPTS+=	linux-alienarena-ded
+AA_TARGETS+=	crded
+PLIST_SUB+=	DEDICATED=""
 .else
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux_dri
+PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
+.if !defined(WITHOUT_SDL)
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
+AA_SCRIPTS+=	linux-alienarena-sdl
+AA_TARGETS+=	crx.sdl
+PLIST_SUB+=	SDL=""
+.else
+PLIST_SUB+=	SDL="@comment "
+.endif
+
+SUB_FILES+=	${AA_SCRIPTS}
+
 do-install:
 	${MKDIR} ${LIBDIR}/arena ${LIBDIR}/data1
 	cd ${WRKSRC} && \
-		${INSTALL_PROGRAM} arena/gamei386.so ${LIBDIR}/arena && \
-		${INSTALL_PROGRAM} data1/gamei386.so ${LIBDIR}/data1
+		${INSTALL_PROGRAM} arena/game.so ${LIBDIR}/arena && \
+		${INSTALL_PROGRAM} data1/game.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}/${f} ${LIBDIR}
-.endfor
-.for f in linux-alienarena linux-alienarena-ded
+.for f in ${AA_SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin
 .endfor
+.for f in ${AA_TARGETS}
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${LIBDIR}
+.endfor
+
+post-install:
+	@${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff --git a/games/linux-alienarena/distinfo b/games/linux-alienarena/distinfo
index 2608e2108c1d..1877022f3f02 100644
--- a/games/linux-alienarena/distinfo
+++ b/games/linux-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/linux-alienarena/files/linux-alienarena-ded.in b/games/linux-alienarena/files/linux-alienarena-ded.in
index 59170f845405..8ad328bfc17c 100644
--- a/games/linux-alienarena/files/linux-alienarena-ded.in
+++ b/games/linux-alienarena/files/linux-alienarena-ded.in
@@ -2,4 +2,4 @@
 
 cd %%LIBDIR%% || exit 1
 
-exec ./crded +set game arena +set port 27910 "$@"
+exec ./crded +set port 27910 "$@"
diff --git a/games/linux-alienarena/files/linux-alienarena-sdl.in b/games/linux-alienarena/files/linux-alienarena-sdl.in
new file mode 100644
index 000000000000..2576b654f57d
--- /dev/null
+++ b/games/linux-alienarena/files/linux-alienarena-sdl.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd %%LIBDIR%% || exit 1
+
+exec ./crx.sdl "$@"
diff --git a/games/linux-alienarena/files/linux-alienarena.in b/games/linux-alienarena/files/linux-alienarena.in
index d09ae2fdf5c2..6d96e32c7cd7 100644
--- a/games/linux-alienarena/files/linux-alienarena.in
+++ b/games/linux-alienarena/files/linux-alienarena.in
@@ -2,4 +2,4 @@
 
 cd %%LIBDIR%% || exit 1
 
-exec ./crx.sdl +set game arena "$@"
+exec ./crx +set  "$@"
diff --git a/games/linux-alienarena/pkg-descr b/games/linux-alienarena/pkg-descr
index a19014498bfe..fccdb62cfa82 100644
--- a/games/linux-alienarena/pkg-descr
+++ b/games/linux-alienarena/pkg-descr
@@ -1,10 +1,18 @@
-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.
+
+Note: this port contains the Linux version of Alien Arena. See
+"games/alienarena" for the native version.
 
 WWW: http://red.planetarena.org/
diff --git a/games/linux-alienarena/pkg-plist b/games/linux-alienarena/pkg-plist
index 5349cf133667..ac61d5508ff9 100644
--- a/games/linux-alienarena/pkg-plist
+++ b/games/linux-alienarena/pkg-plist
@@ -1,18 +1,20 @@
-bin/linux-alienarena
-bin/linux-alienarena-ded
-%%LIBDIR%%/arena/ctf.cfg
+%%CLIENT%%bin/linux-alienarena
+%%DEDICATED%%bin/linux-alienarena-ded
+%%SDL%%bin/linux-alienarena-sdl
 %%LIBDIR%%/arena/default.cfg
-%%LIBDIR%%/arena/gamei386.so
+%%LIBDIR%%/arena/game.so
 %%LIBDIR%%/arena/maps.lst
 %%LIBDIR%%/arena/motd.txt
 %%LIBDIR%%/arena/pics
 %%LIBDIR%%/arena/server.cfg
 %%LIBDIR%%/botinfo
-%%LIBDIR%%/crded
-%%LIBDIR%%/crx.sdl
+%%DEDICATED%%%%LIBDIR%%/crded
+%%CLIENT%%%%LIBDIR%%/crx
+%%SDL%%%%LIBDIR%%/crx.sdl
 %%LIBDIR%%/data1/default.cfg
 %%LIBDIR%%/data1/env
-%%LIBDIR%%/data1/gamei386.so
+%%LIBDIR%%/data1/fonts
+%%LIBDIR%%/data1/game.so
 %%LIBDIR%%/data1/gfx
 %%LIBDIR%%/data1/levelshots
 %%LIBDIR%%/data1/maps