3 files changed, 88 insertions, 115 deletions

diff --git a/games/iourbanterror/Makefile b/games/iourbanterror/Makefile
index e0853d726379..8480fa2c564d 100644
--- a/games/iourbanterror/Makefile
+++ b/games/iourbanterror/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	iourbanterror
-DISTVERSION=	2007_04_02
+DISTVERSION=	2007_12_20
 CATEGORIES=	games
 MASTER_SITES=	http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/
 DISTNAME=	ioUrbanTerrorSource_${DISTVERSION}
@@ -18,7 +18,8 @@ RUN_DEPENDS=	${Q3DIR}/q3ut4:${PORTSDIR}/games/urbanterror-data
 
 USE_ZIP=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME:C/_.*//}
+ALL_TARGET=	release
+WRKSRC=		${WRKDIR}/ioUrbanTerrorClientSource
 
 OPTIONS=	CLIENT "Build client" on \
 		CELLSHADING "Enable Cell Shading effect" off \
@@ -146,10 +147,6 @@ post-patch:
 # There are new variables in the config files, so keep them in another dir.
 	@${REINPLACE_CMD} -E 's|/\.q3a|/.ioUrbanTerror|' \
 		${WRKSRC}/code/unix/unix_shared.c
-# BattlEye development has stopped, and UT website recommends to disable it,
-# also it's binary only, so it won't work anyways.
-	@${REINPLACE_CMD} -Ee 's|("sv_battleye",) "1"|\1 "0"|' \
-		${WRKSRC}/code/server/sv_init.c
 
 do-install:
 .for bin in ${Q3BIN}
diff --git a/games/iourbanterror/distinfo b/games/iourbanterror/distinfo
index 5986ec9794e2..5d5c23210bff 100644
--- a/games/iourbanterror/distinfo
+++ b/games/iourbanterror/distinfo
@@ -1,3 +1,3 @@
-MD5 (ioUrbanTerrorSource_2007_04_02.zip) = 225988ec27f498d4752a999f48b8dc15
-SHA256 (ioUrbanTerrorSource_2007_04_02.zip) = 4148834471d1dc0e15b895e7323cda9b7f21995a0d3e8928aa9236cfe7784d95
-SIZE (ioUrbanTerrorSource_2007_04_02.zip) = 8691615
+MD5 (ioUrbanTerrorSource_2007_12_20.zip) = 4dbe5a03a10f23138f42b5e0dc39598b
+SHA256 (ioUrbanTerrorSource_2007_12_20.zip) = 96d58662852d31fa6ab03431120328dab7f36bf60010a2cfdc1b427d6ac23ce8
+SIZE (ioUrbanTerrorSource_2007_12_20.zip) = 17284593
diff --git a/games/iourbanterror/files/patch-Makefile b/games/iourbanterror/files/patch-Makefile
index bda1d4a3dd90..39084ba0bb59 100644
--- a/games/iourbanterror/files/patch-Makefile
+++ b/games/iourbanterror/files/patch-Makefile
@@ -1,12 +1,12 @@
---- Makefile.orig	Sun Apr  1 19:55:18 2007
-+++ Makefile	Fri Sep 28 22:39:05 2007
+--- Makefile.orig	Sun Dec 16 18:09:18 2007
++++ Makefile	Fri Jan  4 10:40:41 2008
 @@ -27,16 +27,22 @@
    endif
  endif
  
 -BUILD_CLIENT     =1
 -BUILD_CLIENT_SMP =0
--BUILD_SERVER     =1
+-BUILD_SERVER     =0
 -BUILD_GAME_SO    =0
 -BUILD_GAME_QVM   =0
 -OPTIMIZE         =1
@@ -31,9 +31,9 @@
 +USE_SDL_AUDIO?=0
 +USE_SDL_VIDEO?=0
  
- #############################################################################
- #
-@@ -98,38 +104,10 @@
+ ifeq ($(V),1)
+ echo_cmd=@:
+@@ -106,38 +112,10 @@
  USE_SDL=1
  endif
  
@@ -67,13 +67,14 @@
 -
  #############################################################################
  
- BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
+-BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
 -BR=$(BUILD_DIR)/release-$(PLATFORM)-$(ARCH)
++BD=$(BUILD_DIR)/debug
 +BR=$(BUILD_DIR)/release
  CDIR=$(MOUNT_DIR)/client
  SDIR=$(MOUNT_DIR)/server
  RDIR=$(MOUNT_DIR)/renderer
-@@ -217,6 +195,10 @@
+@@ -221,6 +199,10 @@
      BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
    endif
  
@@ -83,8 +84,8 @@
 +
    ifeq ($(USE_SDL),1)
      BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
-     GL_CFLAGS =
-@@ -389,6 +371,11 @@
+   else
+@@ -385,6 +367,11 @@
      endif
    endif
  
@@ -96,7 +97,7 @@
    ifeq ($(USE_CODEC_VORBIS),1)
      BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
      CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
-@@ -483,6 +470,10 @@
+@@ -476,6 +463,10 @@
      endif
    endif
  
@@ -107,7 +108,7 @@
    ifeq ($(USE_CODEC_VORBIS),1)
      CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
    endif
-@@ -504,18 +495,12 @@
+@@ -497,17 +488,10 @@
  
  ifeq ($(PLATFORM),freebsd)
  
@@ -118,18 +119,16 @@
 -  endif #alpha test
 -
 -
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+-                -I/usr/X11R6/include
 +  BASE_CFLAGS = -DARCH='\"$(ARCH)\"' -DLIBDIR='\"$(LIBDIR)\"' -I$(LOCALBASE)/include -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
  
--  GL_CFLAGS = -I/usr/X11R6/include
-+  GL_CFLAGS = -I$(X11BASE)/include
- 
    DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 +  RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe
  
    ifeq ($(USE_OPENAL),1)
      BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -528,47 +513,61 @@
+@@ -520,45 +504,61 @@
      BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
    endif
  
@@ -144,13 +143,11 @@
    endif
  
 -  ifeq ($(ARCH),axp)
--    CC=gcc
 -    BASE_CFLAGS += -DNO_VM_COMPILED
 -    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
 -      -fomit-frame-pointer -fexpensive-optimizations
 -  else
 -  ifeq ($(ARCH),i386)
--    CC=gcc
 -    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
 -      -march=pentium -fomit-frame-pointer -pipe -ffast-math \
 -      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
@@ -160,7 +157,7 @@
 -    BASE_CFLAGS += -DNO_VM_COMPILED
 +  ifeq ($(USE_SDL_AUDIO),1)
 +    BASE_CFLAGS += -DUSE_SDL_SOUND=1
-   endif
++  endif
 +
 +  ifeq ($(USE_SDL_VIDEO),1)
 +    BASE_CFLAGS += -DUSE_SDL_VIDEO=1
@@ -173,7 +170,7 @@
 +      RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
 +         -fstrength-reduce
 +    endif
-+  endif
+   endif
 +
 +  ifneq ($(HAVE_VM_COMPILED),true)
 +    BASE_CFLAGS += -DNO_VM_COMPILED
@@ -214,7 +211,7 @@
      endif
    endif
  
-@@ -576,7 +575,6 @@
+@@ -566,7 +566,6 @@
      CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
    endif
  
@@ -222,7 +219,7 @@
  else # ifeq freebsd
  
  #############################################################################
-@@ -731,24 +729,25 @@
+@@ -717,24 +716,25 @@
  TARGETS =
  
  ifneq ($(BUILD_SERVER),0)
@@ -259,21 +256,29 @@
  endif
  
  ifneq ($(BUILD_GAME_QVM),0)
-@@ -810,11 +809,11 @@
- 	$(MAKE)  targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS) $(DEPEND_CFLAGS)"
- 
- build_release: B=$(BR)
--build_release: makedirs tools
-+build_release: makedirs
- 	$(MAKE)  targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS) $(DEPEND_CFLAGS)"
- 
- #Build both debug and release builds
--all:build_debug build_release
-+all:build_release
- 
- targets: $(TARGETS)
- 
-@@ -897,8 +896,13 @@
+@@ -824,10 +824,10 @@
+ all: debug release
+ 
+ debug:
+-	@$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS)" V=$(V)
++	@$(MAKE) targets B=$(BD) CFLAGS+="$(CFLAGS) $(DEBUG_CFLAGS)" V=$(V)
+ 
+ release:
+-	@$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS)" V=$(V)
++	@$(MAKE) targets B=$(BR) CFLAGS+="$(CFLAGS) $(RELEASE_CFLAGS)" V=$(V)
+ 
+ # Create the build directories and tools, print out
+ # an informational message, then start building
+@@ -880,7 +880,7 @@
+ Q3LCC=$(TOOLSDIR)/q3lcc$(BINEXT)
+ Q3ASM=$(TOOLSDIR)/q3asm$(BINEXT)
+ 
+-ifeq ($(CROSS_COMPILING),1)
++ifeq ($(BUILD_GAME_QVM),0)
+ tools:
+ 	@echo QVM tools not built when cross-compiling
+ else
+@@ -943,8 +943,13 @@
    $(B)/client/snd_main.o \
    $(B)/client/snd_codec.o \
    $(B)/client/snd_codec_wav.o \
@@ -289,28 +294,23 @@
    $(B)/client/qal.o \
    $(B)/client/snd_openal.o \
    \
-@@ -1026,16 +1030,16 @@
- endif
- 
- ifeq ($(HAVE_VM_COMPILED),true)
--  ifeq ($(ARCH),i386)
-+  ifeq ($(ARCH),x86)
+@@ -1078,9 +1083,15 @@
+   ifeq ($(ARCH),x86)
      Q3OBJ += $(B)/client/vm_x86.o
    endif
--  ifeq ($(ARCH),x86)
-+  ifeq ($(ARCH),i386)
-     Q3OBJ += $(B)/client/vm_x86.o
-   endif
--  ifeq ($(ARCH),x86_64)
 +  ifeq ($(ARCH),amd64)
-     Q3OBJ += $(B)/client/vm_x86_64.o
++    Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
++  endif
+   ifeq ($(ARCH),x86_64)
+     Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
    endif
--  ifeq ($(ARCH),ppc)
 +  ifeq ($(ARCH),powerpc)
-     Q3OBJ += $(B)/client/$(VM_PPC).o
++    Q3OBJ += $(B)/client/vm_ppc.o
++  endif
+   ifeq ($(ARCH),ppc)
+     Q3OBJ += $(B)/client/vm_ppc.o
    endif
- endif
-@@ -1071,7 +1075,7 @@
+@@ -1113,7 +1124,7 @@
  
    ifeq ($(USE_SDL),1)
      ifneq ($(PLATFORM),darwin)
@@ -319,105 +319,81 @@
      endif
    endif
  
-@@ -1084,10 +1088,10 @@
-     $(B)/client/sdl_glimp_smp.o
+@@ -1126,12 +1137,12 @@
+     $(B)/clientsmp/sdl_glimp.o
  endif
  
 -$(B)/ioUrbanTerror.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
 +$(B)/ioUrbanTerror$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
- 	$(CC)  -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
+ 	$(echo_cmd) "LD $@"
+ 	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
+ 		$(LDFLAGS) $(LIBSDLMAIN)
  
 -$(B)/ioUrbanTerror-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
 +$(B)/ioUrbanTerror-smp$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
- 	$(CC)  -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
+ 	$(echo_cmd) "LD $@"
+ 	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
  		$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
- 
-@@ -1124,6 +1128,7 @@
- $(B)/client/snd_codec.o : $(CDIR)/snd_codec.c; $(DO_CC)
- $(B)/client/snd_codec_wav.o : $(CDIR)/snd_codec_wav.c; $(DO_CC)
- $(B)/client/snd_codec_ogg.o : $(CDIR)/snd_codec_ogg.c; $(DO_CC)
-+$(B)/client/snd_codec_mp3.o : $(CDIR)/snd_codec_mp3.c; $(DO_CC)
- 
- $(B)/client/qal.o : $(CDIR)/qal.c; $(DO_CC)
- $(B)/client/snd_openal.o : $(CDIR)/snd_openal.c; $(DO_CC)
-@@ -1389,21 +1394,21 @@
- endif
- 
- ifeq ($(HAVE_VM_COMPILED),true)
--  ifeq ($(ARCH),i386)
-+  ifeq ($(ARCH),x86)
-     Q3DOBJ += $(B)/ded/vm_x86.o
-   endif
--  ifeq ($(ARCH),x86)
-+  ifeq ($(ARCH),i386)
-     Q3DOBJ += $(B)/ded/vm_x86.o
-   endif
--  ifeq ($(ARCH),x86_64)
-+  ifeq ($(ARCH),amd64)
-     Q3DOBJ += $(B)/ded/vm_x86_64.o
-   endif
--  ifeq ($(ARCH),ppc)
-+  ifeq ($(ARCH),powerpc)
-     Q3DOBJ += $(B)/ded/$(VM_PPC).o
+@@ -1248,7 +1259,7 @@
    endif
  endif
  
 -$(B)/ioUrTded.$(ARCH)$(BINEXT): $(Q3DOBJ)
 +$(B)/ioUrTded$(BINEXT): $(Q3DOBJ)
- 	$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
+ 	$(echo_cmd) "LD $@"
+ 	$(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
  
- $(B)/ded/sv_battleye.o : $(SDIR)/sv_battleye.c; $(DO_DED_CC)
-@@ -1522,7 +1527,7 @@
+@@ -1287,7 +1298,7 @@
  Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o
  Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
 -$(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) : $(Q3CGOBJ)
 +$(B)/baseq3/cgame.$(SHLIBEXT) : $(Q3CGOBJ)
- 	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
+ 	$(echo_cmd) "LD $@"
+ 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
  
- $(B)/baseq3/vm/cgame.qvm: $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm
-@@ -1563,7 +1568,7 @@
+@@ -1330,7 +1341,7 @@
  MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o
  MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
  
 -$(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) : $(MPCGOBJ)
 +$(B)/missionpack/cgame.$(SHLIBEXT) : $(MPCGOBJ)
- 	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
+ 	$(echo_cmd) "LD $@"
+ 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
  
- $(B)/missionpack/vm/cgame.qvm: $(MPCGVMOBJ) $(CGDIR)/cg_syscalls.asm
-@@ -1613,7 +1618,7 @@
+@@ -1382,7 +1393,7 @@
  Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o
  Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
 -$(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) : $(Q3GOBJ)
 +$(B)/baseq3/qagame.$(SHLIBEXT) : $(Q3GOBJ)
- 	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
+ 	$(echo_cmd) "LD $@"
+ 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
  
- $(B)/baseq3/vm/qagame.qvm: $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm
-@@ -1661,7 +1666,7 @@
+@@ -1432,7 +1443,7 @@
  MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o
  MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
  
 -$(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) : $(MPGOBJ)
 +$(B)/missionpack/qagame.$(SHLIBEXT) : $(MPGOBJ)
- 	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
+ 	$(echo_cmd) "LD $@"
+ 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
  
- $(B)/missionpack/vm/qagame.qvm: $(MPGVMOBJ) $(GDIR)/g_syscalls.asm
-@@ -1721,7 +1726,7 @@
+@@ -1494,7 +1505,7 @@
  Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
  Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
 -$(B)/baseq3/ui$(ARCH).$(SHLIBEXT) : $(Q3UIOBJ)
 +$(B)/baseq3/ui.$(SHLIBEXT) : $(Q3UIOBJ)
- 	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
+ 	$(echo_cmd) "LD $@"
+ 	$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
  
- $(B)/baseq3/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm
-@@ -1746,7 +1751,7 @@
+@@ -1521,7 +1532,7 @@
  MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
  MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
 -$(B)/missionpack/ui$(ARCH).$(SHLIBEXT) : $(MPUIOBJ)
 +$(B)/missionpack/ui.$(SHLIBEXT) : $(MPUIOBJ)
- 	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ)
+ 	$(echo_cmd) "LD $@"
+ 	$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ)
  
- $(B)/missionpack/vm/ui.qvm: $(MPUIVMOBJ) $(UIDIR)/ui_syscalls.asm