5 files changed, 26 insertions, 56 deletions

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