3 files changed, 58 insertions, 23 deletions

diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 0ca23a7c74d9..1053b8d077f6 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	alienarena
-PORTVERSION=	2007.603
+PORTVERSION=	2007.604
 CATEGORIES=	games
 MASTER_SITES=	http://cor.planetquake.gamespy.com/codered/files/
-DISTNAME=	${PORTNAME}2007-linux20070121-x86
+DISTNAME=	${PORTNAME}2007-linux20070225-x86
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Alien Arena 2006 (native version)
diff --git a/games/alienarena/distinfo b/games/alienarena/distinfo
index 8f9751c62887..2608e2108c1d 100644
--- a/games/alienarena/distinfo
+++ b/games/alienarena/distinfo
@@ -1,3 +1,3 @@
-MD5 (alienarena2007-linux20070121-x86.zip) = a027e8707ae02fef1677bca59ba33796
-SHA256 (alienarena2007-linux20070121-x86.zip) = 79b96d150c7b966251b2edc5b20a862fdc3cb8db7e34fc0fc9a21208bbee07af
-SIZE (alienarena2007-linux20070121-x86.zip) = 231377165
+MD5 (alienarena2007-linux20070225-x86.zip) = 8fc9695acd3a2181a6bb762aae09762b
+SHA256 (alienarena2007-linux20070225-x86.zip) = 24ad8cbefa11f1db5eea96a776c520fe12b1247ab390779cb1bded30b1e8430e
+SIZE (alienarena2007-linux20070225-x86.zip) = 196391306
diff --git a/games/alienarena/files/patch-linux__Makefile b/games/alienarena/files/patch-linux__Makefile
index ff0762fc3659..4649055e8fc6 100644
--- a/games/alienarena/files/patch-linux__Makefile
+++ b/games/alienarena/files/patch-linux__Makefile
@@ -1,5 +1,5 @@
---- linux/Makefile.orig	Sun Jan 14 16:37:32 2007
-+++ linux/Makefile	Sun Jan 14 16:41:19 2007
+--- linux/Makefile.orig	Mon Mar 26 00:13:44 2007
++++ linux/Makefile	Mon Mar 26 00:14:51 2007
 @@ -11,25 +11,14 @@
  GLIBC=
  endif
@@ -30,7 +30,7 @@
  CLIENT_DIR=$(MOUNT_DIR)/client
  SERVER_DIR=$(MOUNT_DIR)/server
  REF_GL_DIR=$(MOUNT_DIR)/ref_gl
-@@ -42,51 +31,31 @@
+@@ -42,51 +31,29 @@
  
  EGCS=/usr/local/egcs-1.1.2/bin/gcc
  
@@ -42,23 +42,23 @@
 -_LIB := lib
 -endif
 -
--BASE_CFLAGS=-Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__linux__
-+CC?=gcc
- 
+-BASE_CFLAGS=-Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__unix__
+-
 -ifeq ($(ARCH),axp)
 -RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
 -	-fomit-frame-pointer -fexpensive-optimizations
 -endif
-+BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include
- 
+-
 -ifeq ($(ARCH),ppc)
 -RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops \
 -	-fomit-frame-pointer -fexpensive-optimizations
 -endif
-+RELEASE_CFLAGS=$(BASE_CFLAGS)
++CC?=gcc
  
 -ifeq ($(ARCH),sparc)
 -RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
++BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include
++RELEASE_CFLAGS=$(BASE_CFLAGS)
 +ifdef OPTIMIZED_CFLAGS
 +RELEASE_CFLAGS+=-O2 -ffast-math -funroll-loops \
  	-fomit-frame-pointer -fexpensive-optimizations
@@ -66,12 +66,12 @@
 -
 -ifeq ($(ARCH),i386)
 -RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -falign-loops=2 \
--	-falign-jumps=2 -falign-functions=2 -fno-strict-aliasing
+-	-fomit-frame-pointer -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -ftree-vectorize
 -endif
 -
 -ifeq ($(ARCH),x86_64)
--RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops \
--	-fomit-frame-pointer -fexpensive-optimizations -fno-strict-aliasing
+-RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -falign-loops=2 \
+-        -fomit-frame-pointer -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -ftree-vectorize
 +  ifeq ($(ARCH),i386)
 +RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
 +	-fno-strict-aliasing
@@ -95,17 +95,17 @@
  
  SDLCFLAGS=$(shell sdl-config --cflags)
  SDLLDFLAGS=$(shell sdl-config --libs)
-@@ -115,15 +84,15 @@
+@@ -115,19 +82,19 @@
  # SETUP AND BUILD
  #############################################################################
  
 -ifeq ($(ARCH),axp)
--TARGETS=$(BUILDDIR)/crded \
+-TARGETS=$(BUILDDIR)/crded.$(ARCH) \
 -	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
 -	$(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT)
 -else
--TARGETS=$(BUILDDIR)/crded \
--	$(BUILDDIR)/crx \
+-TARGETS=$(BUILDDIR)/crded.$(ARCH) \
+-	$(BUILDDIR)/crx.$(ARCH) \
 -	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
 -	$(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT)
 +TARGETS=$(BUILDDIR)/game.$(SHLIBEXT) \
@@ -120,7 +120,42 @@
  endif
  
  ifeq ($(strip $(SDLSOUND)),1)
-@@ -597,7 +566,7 @@
+-	TARGETS+=$(BUILDDIR)/crx.sdl.$(ARCH)
++	TARGETS+=$(BUILDDIR)/crx.sdl
+ endif
+ 
+ build_debug:
+@@ -234,18 +201,14 @@
+ SOUND_SDL_OBJS = \
+ 	$(BUILDDIR)/client/snd_sdl.o
+ 
+-ifeq ($(ARCH),axp)
+-CODERED_AS_OBJS =  #blank
+-else
+ CODERED_AS_OBJS = \
+ 	$(BUILDDIR)/client/snd_mixa.o
+-endif
+ 
+ 
+-$(BUILDDIR)/crx.$(ARCH) : $(CODERED_OBJS) $(SOUND_OSS_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
++$(BUILDDIR)/crx : $(CODERED_OBJS) $(SOUND_OSS_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
+ 	$(CC) $(CFLAGS) -o $@ $(CODERED_OBJS) $(SOUND_OSS_OBJS) $(CODERED_AS_OBJS) $(LDFLAGS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
+ 
+-$(BUILDDIR)/crx.sdl.$(ARCH) : $(CODERED_OBJS) $(SOUND_SDL_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
++$(BUILDDIR)/crx.sdl : $(CODERED_OBJS) $(SOUND_SDL_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
+ 	$(CC) $(CFLAGS) -o $@ $(CODERED_OBJS) $(SOUND_SDL_OBJS) $(CODERED_AS_OBJS) $(LDFLAGS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS) $(SDLLDFLAGS)
+ 
+ $(BUILDDIR)/client/cl_cin.o :     $(CLIENT_DIR)/cl_cin.c
+@@ -478,7 +441,7 @@
+ 	$(BUILDDIR)/ded/cl_null.o \
+ 	$(BUILDDIR)/ded/cd_null.o
+ 
+-$(BUILDDIR)/crded.$(ARCH) : $(CRDED_OBJS)
++$(BUILDDIR)/crded : $(CRDED_OBJS)
+ 	$(CC) $(CFLAGS) -o $@ $(CRDED_OBJS) $(LDFLAGS)
+ 
+ $(BUILDDIR)/ded/cmd.o :        $(COMMON_DIR)/cmd.c
+@@ -597,7 +560,7 @@
  
  
  
@@ -129,7 +164,7 @@
  	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
  
  
-@@ -753,7 +722,7 @@
+@@ -753,7 +716,7 @@
  	$(BUILDDIR)/arena/p_weapon.o \
  	$(BUILDDIR)/arena/vehicles.o