4 files changed, 66 insertions, 38 deletions

diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 5b0276c6a89e..b56c095a3df0 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -6,33 +6,31 @@
 #
 
 PORTNAME=	alienarena
-DISTVERSION=	2006.ue
+PORTVERSION=	2007
 CATEGORIES=	games
-MASTER_SITES=	http://offload1.icculus.org/~ravage/alienarena2006/ \
-		http://cor.planetquake.gamespy.com/codered/files/ \
+MASTER_SITES=	http://www.alienarena.org/downloads/ \
 		http://www.forsakenweb.com/gamepage/loaders/games/
-DISTNAME=	${PORTNAME}-${DISTVERSION:S/.//}-x86
+DISTNAME=	${PORTNAME}-${PORTVERSION}-x86
 EXTRACT_SUFX=	.run
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Alien Arena 2006 (native version)
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	${DATADIR}/arena/default.cfg:${PORTSDIR}/games/alienarena-data
 
 USE_DOS2UNIX=	yes
 USE_GCC=	3.2+
-USE_GL=		yes
 USE_GMAKE=	yes
 
-BUILD_WRKSRC=	${WRKDIR}/source/linux
 WRKSRC=		${WRKDIR}/source
+BUILD_WRKSRC=	${WRKDIR}/source/linux
 ALL_TARGET=	build_release
 
-OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
+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
 
-SUB_FILES=	alienarena alienarena-ded
 SUB_LIST=	LIBDIR=${LIBDIR}
 PLIST_SUB=	LIBDIR=${LIBDIR:S/${PREFIX}\///}
 
@@ -40,12 +38,35 @@ LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		does not extract (gzip error)
+.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)
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
+USE_GL=		yes
 .endif
 
-EXE_TARGETS=	crx crded
-SCRIPTS=	alienarena alienarena-ded
+.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 "
+.endif
 
 .if !defined(WITHOUT_OPTIMIZED_CFLAGS)
 MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
@@ -54,8 +75,8 @@ MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
 .if !defined(WITHOUT_SDL)
 USE_SDL=	sdl
 MAKE_ENV+=	SDLSOUND=1
-EXE_TARGETS+=	crx.sdl
-SCRIPTS+=	alienarena-sdl
+AA_TARGETS+=	crx.sdl
+AA_SCRIPTS+=	alienarena-sdl
 SUB_FILES+=	alienarena-sdl
 PLIST_SUB+=	SDL=""
 .else
@@ -72,7 +93,7 @@ do-extract:
 	@cd ${WRKDIR} && \
 		${TAIL} +377 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -
-	@${TAR} zxf ${WRKDIR}/${PORTNAME}-${DISTVERSION:S/.//}-src.tar.gz \
+	@${TAR} zxf ${WRKDIR}/${PORTNAME}${PORTVERSION}-src.tar.gz \
 		-C ${WRKDIR}
 
 do-install:
@@ -83,10 +104,10 @@ do-install:
 	${LN} -s ${DATADIR}/arena/* ${LIBDIR}/arena
 	${LN} -s ${DATADIR}/botinfo ${LIBDIR}
 	${LN} -s ${DATADIR}/data1/* ${LIBDIR}/data1
-.for f in ${EXE_TARGETS}
+.for f in ${AA_TARGETS}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${f} ${LIBDIR}
 .endfor
-.for f in ${SCRIPTS}
+.for f in ${AA_SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin
 .endfor
 
diff --git a/games/alienarena/distinfo b/games/alienarena/distinfo
index 939cc28025ba..41c0840249f8 100644
--- a/games/alienarena/distinfo
+++ b/games/alienarena/distinfo
@@ -1,3 +1,3 @@
-MD5 (alienarena-2006ue-x86.run) = 7b6416646db832fbc9761925240b5ff4
-SHA256 (alienarena-2006ue-x86.run) = a9ee5e69e37c1e511a21e3a0a698de0b0a297995827c806df0a08ce0a3276fde
-SIZE (alienarena-2006ue-x86.run) = 168878681
+MD5 (alienarena-2007-x86.run) = b70c1591b2638b3281d5f054e7bc39a9
+SHA256 (alienarena-2007-x86.run) = f9c9f7c0383f58d4a2dd5caa7adffa7dd756f2ee40125bf04c4e3eb6c45fdea0
+SIZE (alienarena-2007-x86.run) = 199500838
diff --git a/games/alienarena/files/patch-linux__Makefile b/games/alienarena/files/patch-linux__Makefile
index bae475f435ec..6ff24b05c448 100644
--- a/games/alienarena/files/patch-linux__Makefile
+++ b/games/alienarena/files/patch-linux__Makefile
@@ -1,5 +1,5 @@
---- ./linux/Makefile.orig	Tue May 16 15:20:10 2006
-+++ ./linux/Makefile	Tue May 16 15:22:41 2006
+--- linux/Makefile.orig	Fri Sep  1 16:23:43 2006
++++ linux/Makefile	Fri Sep  1 16:24:20 2006
 @@ -11,25 +11,14 @@
  GLIBC=
  endif
@@ -104,25 +104,32 @@
  
  SHLIBEXT=so
  
-@@ -117,13 +90,13 @@
+@@ -115,15 +88,15 @@
+ # SETUP AND BUILD
+ #############################################################################
  
- ifeq ($(ARCH),axp)
- TARGETS=$(BUILDDIR)/crded \
+-ifeq ($(ARCH),axp)
+-TARGETS=$(BUILDDIR)/crded \
 -	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
 -	$(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT)
-+	$(BUILDDIR)/game.$(SHLIBEXT) \
-+	$(BUILDDIR)/arena/game.$(SHLIBEXT)
- else
- TARGETS=$(BUILDDIR)/crded \
- 	$(BUILDDIR)/crx \
+-else
+-TARGETS=$(BUILDDIR)/crded \
+-	$(BUILDDIR)/crx \
 -	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
 -	$(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT)
-+	$(BUILDDIR)/game.$(SHLIBEXT) \
++TARGETS=$(BUILDDIR)/game.$(SHLIBEXT) \
 +	$(BUILDDIR)/arena/game.$(SHLIBEXT)
++
++ifeq ($(strip $(CLIENT)),1)
++	TARGETS+=$(BUILDDIR)/crx
++endif
++
++ifeq ($(strip $(DEDICATED)),1)
++	TARGETS+=$(BUILDDIR)/crded
  endif
  
  ifeq ($(strip $(SDLSOUND)),1)
-@@ -617,7 +590,7 @@
+@@ -599,7 +572,7 @@
  
  
  
@@ -131,7 +138,7 @@
  	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
  
  
-@@ -853,7 +826,7 @@
+@@ -763,7 +736,7 @@
  	$(BUILDDIR)/arena/p_weapon.o \
  	$(BUILDDIR)/arena/vehicles.o
  
diff --git a/games/alienarena/pkg-plist b/games/alienarena/pkg-plist
index c243ecc98551..088a971b11c4 100644
--- a/games/alienarena/pkg-plist
+++ b/games/alienarena/pkg-plist
@@ -1,5 +1,5 @@
-bin/alienarena
-bin/alienarena-ded
+%%CLIENT%%bin/alienarena
+%%DEDICATED%%bin/alienarena-ded
 %%SDL%%bin/alienarena-sdl
 %%LIBDIR%%/arena/ctf.cfg
 %%LIBDIR%%/arena/default.cfg
@@ -10,8 +10,8 @@ bin/alienarena-ded
 %%LIBDIR%%/arena/server.cfg
 %%LIBDIR%%/arena/video
 %%LIBDIR%%/botinfo
-%%LIBDIR%%/crded
-%%LIBDIR%%/crx
+%%DEDICATED%%%%LIBDIR%%/crded
+%%CLIENT%%%%LIBDIR%%/crx
 %%SDL%%%%LIBDIR%%/crx.sdl
 %%LIBDIR%%/data1/default.cfg
 %%LIBDIR%%/data1/env