From 4a9c1d564143fabb6e1ecea1c92d3e5ec68e82ba Mon Sep 17 00:00:00 2001
From: Alejandro Pulver <alepulver@FreeBSD.org>
Date: Sun, 14 Jan 2007 19:50:25 +0000
Subject: - Commit updated patch (missing from previous update).

Reported by:	"Mark Lu" <excelblue@gmail.com>
---
 games/alienarena/files/patch-linux__Makefile | 71 ++++++++++++----------------
 1 file changed, 31 insertions(+), 40 deletions(-)

(limited to 'games')

diff --git a/games/alienarena/files/patch-linux__Makefile b/games/alienarena/files/patch-linux__Makefile
index ab475dedfc32..ff0762fc3659 100644
--- a/games/alienarena/files/patch-linux__Makefile
+++ b/games/alienarena/files/patch-linux__Makefile
@@ -1,5 +1,5 @@
---- linux/Makefile.orig	Tue Jan  9 17:59:39 2007
-+++ linux/Makefile	Tue Jan  9 18:02:46 2007
+--- linux/Makefile.orig	Sun Jan 14 16:37:32 2007
++++ linux/Makefile	Sun Jan 14 16:41:19 2007
 @@ -11,25 +11,14 @@
  GLIBC=
  endif
@@ -30,81 +30,72 @@
  CLIENT_DIR=$(MOUNT_DIR)/client
  SERVER_DIR=$(MOUNT_DIR)/server
  REF_GL_DIR=$(MOUNT_DIR)/ref_gl
-@@ -42,54 +31,38 @@
+@@ -42,51 +31,31 @@
  
  EGCS=/usr/local/egcs-1.1.2/bin/gcc
  
 -CC=gcc
-+CC?=gcc
- 
+-
 -ifeq ($(ARCH),x86_64)
 -_LIB := lib64
 -else
 -_LIB := lib
 -endif
-+BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include
- 
--BASE_CFLAGS=-Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__unix__
-+RELEASE_CFLAGS=$(BASE_CFLAGS)
+-
+-BASE_CFLAGS=-Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__linux__
++CC?=gcc
  
 -ifeq ($(ARCH),axp)
 -RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
-+ifdef OPTIMIZED_CFLAGS
-+RELEASE_CFLAGS+=-O2 -ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations
-+  ifeq ($(ARCH),i386)
-+RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-+	-fno-strict-aliasing
-+  endif
- endif
+-	-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
-+ARENA_CFLAGS=-DARENA
++RELEASE_CFLAGS=$(BASE_CFLAGS)
  
 -ifeq ($(ARCH),sparc)
 -RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
--	-fomit-frame-pointer -fexpensive-optimizations
++ifdef OPTIMIZED_CFLAGS
++RELEASE_CFLAGS+=-O2 -ffast-math -funroll-loops \
+ 	-fomit-frame-pointer -fexpensive-optimizations
 -endif
-+DEBUG_CFLAGS=$(BASE_CFLAGS) -g
- 
+-
 -ifeq ($(ARCH),i386)
 -RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -falign-loops=2 \
 -	-falign-jumps=2 -falign-functions=2 -fno-strict-aliasing
 -endif
-+LDFLAGS+=-lm
- 
+-
 -ifeq ($(ARCH),x86_64)
 -RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops \
 -	-fomit-frame-pointer -fexpensive-optimizations -fno-strict-aliasing
--endif
-+SVGALDFLAGS=-lvga -lm
++  ifeq ($(ARCH),i386)
++RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
++	-fno-strict-aliasing
++  endif
+ endif
  
--ARENA_CFLAGS=-DARENA
-+GLCFLAGS=
+ ARENA_CFLAGS=-DARENA
  
--DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+ DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 -LDFLAGS=-ldl -lm
--SVGALDFLAGS=-lvga -lm
++LDFLAGS=-lm
+ SVGALDFLAGS=-lvga -lm
 -XLDFLAGS=-L/usr/X11R6/$(_LIB) -lX11 -lXext -lXxf86dga
--XCFLAGS=
 +XLDFLAGS=-L$(X11BASE)/lib -lX11 -lXext -lXxf86dga
+ XCFLAGS=
  
 -GLLDFLAGS=-L/usr/X11R6/$(_LIB) -L/usr/local/$(_LIB) -lX11 -lXext -lvga -lm
 -GLXLDFLAGS=-L/usr/X11R6/$(_LIB) -L/usr/local/$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lm -ljpeg -lGL -lGLU
 +GLLDFLAGS=-L$(X11BASE)/lib -L$(LOCALBASE)/lib -lX11 -lXext -lvga -lm
 +GLXLDFLAGS=-L$(X11BASE)/lib -L$(LOCALBASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm -ljpeg -lGL -lGLU
  
--SDLCFLAGS=$(shell sdl-config --cflags)
--SDLLDFLAGS=$(shell sdl-config --libs)
-+SDLCFLAGS=$(shell $(SDL_CONFIG) --cflags)
-+SDLLDFLAGS=$(shell $(SDL_CONFIG) --libs)
- 
- SHLIBEXT=so
- 
-@@ -115,15 +88,15 @@
+ SDLCFLAGS=$(shell sdl-config --cflags)
+ SDLLDFLAGS=$(shell sdl-config --libs)
+@@ -115,15 +84,15 @@
  # SETUP AND BUILD
  #############################################################################
  
@@ -129,7 +120,7 @@
  endif
  
  ifeq ($(strip $(SDLSOUND)),1)
-@@ -597,7 +570,7 @@
+@@ -597,7 +566,7 @@
  
  
  
@@ -138,7 +129,7 @@
  	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
  
  
-@@ -753,7 +726,7 @@
+@@ -753,7 +722,7 @@
  	$(BUILDDIR)/arena/p_weapon.o \
  	$(BUILDDIR)/arena/vehicles.o
  
-- 
cgit v1.2.3