Index: head/games/ioquake3/Makefile
===================================================================
--- head/games/ioquake3/Makefile	(revision 414031)
+++ head/games/ioquake3/Makefile	(revision 414032)
@@ -1,248 +1,198 @@
 # Created by: alepulver
 # $FreeBSD$
 
 PORTNAME?=	ioquake3
 DISTVERSION?=	1.36
 PORTREVISION?=	15
 CATEGORIES=	games
 MASTER_SITES?=	http://ioquake3.org/files/${DISTVERSION}/
 # Using zip this way enables slaves to override it.
 EXTRACT_SUFX?=	.zip
 
-MAINTAINER?=	kamikaze@bsdforen.de
+MAINTAINER?=	kami@freebsd.org
 COMMENT?=	Cleaned-up and enhanced version of Quake 3
 
+LICENSE?=	GPLv2
+LICENSE_FILE?=	${WRKSRC}/COPYING.txt
+
 USES=		pkgconfig gmake
 
 # Port configuration flags:
 # 	CLIENT SERVER TOOLS DLRENDERER GAMELIBS OPUS OPENGL2
 IOQ3?=		CLIENT TOOLS GAMELIBS
 IOQ3ARCH?=	${ARCH}
+IOQ3SDL?=	sdl
 
 .if ! ${IOQ3:MCLIENT} && ! ${IOQ3:MSERVER}
 BROKEN=		Slave ports must at least specify IOQ3=CLIENT or IOQ3=SERVER
 .endif
 
 # Client options
 .if ${IOQ3:MCLIENT}
 OPTIONS_DEFINE=	SERVER CURL OPENAL MUMBLE VORBIS DEBUG
 OPTIONS_DEFAULT=	SERVER CURL OPENAL MUMBLE VORBIS
 SERVER_DESC=	Install dedicated server
 MUMBLE_DESC=	Enable Mumble support (no dependencies)
 .endif
-.if ${IOQ3:MTOOLS}
-OPTIONS_DEFINE+=	TOOLS
-OPTIONS_DEFAULT+=	TOOLS
+IOQ3_OPTIONS=	${IOQ3:MTOOLS} ${IOQ3:MDLRENDERER} ${IOQ3:MGAMELIBS} \
+		${IOQ3:MOPUS}
+OPTIONS_DEFINE+=	${IOQ3_OPTIONS} DOCS
+OPTIONS_DEFAULT+=	${IOQ3_OPTIONS}
+
 TOOLS_DESC=	Enable modding tools
-.endif
-.if ${IOQ3:MDLRENDERER}
-OPTIONS_DEFINE+=	DLRENDERER
-OPTIONS_DEFAULT+=	DLRENDERER
 DLRENDERER_DESC=	Build dynamically loaded renderer
-.endif
-.if ${IOQ3:MGAMELIBS}
-OPTIONS_DEFINE+=	GAMELIBS
-OPTIONS_DEFAULT+=	GAMELIBS
 GAMELIBS_DESC=	Build game libraries
-.endif
-.if ${IOQ3:MOPUS}
-OPTIONS_DEFINE+=	OPUS
-OPTIONS_DEFAULT+=	OPUS
-.endif
-OPTIONS_DEFINE+=DOCS
 
 MAKE_ARGS+=	DEFAULT_BASEDIR="${Q3DIR}" \
 		DEFAULT_LIBDIR="${PREFIX}/${LIBDIR}" \
 		HOMEPATH="${HOMEPATH}" \
 		VERSION="${Q3ENGINEVER}" \
 		ARCH="${IOQ3ARCH}" \
 		TOOLS_CC="${CC}" \
 		USE_LOCAL_HEADERS=0
 ALL_TARGET=	release
 
 LIBDIR=		lib/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	share/doc/${PORTNAME}${PKGNAMESUFFIX}
 BUILDDIR=	${WRKSRC}/build/${ALL_TARGET}-freebsd-${IOQ3ARCH}
 BINSUFFIX?=
 HOMEPATH?=	/.${PORTNAME}
 Q3CLIENT?=	ioquake3
 Q3SERVER?=	ioq3ded
 Q3TOOLS?=	q3asm \
 		q3cpp \
 		q3lcc \
 		q3rcc
 Q3DOCS?=	README \
 		id-readme.txt \
 		md4-readme.txt \
 		voip-readme.txt
 Q3BASE?=	baseq3 \
 		missionpack
 Q3GAMELIBS?=	cgame \
 		qagame \
 		ui
 Q3ICON?=	${PREFIX}/share/pixmaps/quake3.xpm
 .if ${IOQ3:MOPENGL2}
 Q3RENDERER?=	renderer_opengl1_${IOQ3ARCH} renderer_opengl2_${IOQ3ARCH}
 .else
 Q3RENDERER?=	renderer_opengl1_${IOQ3ARCH}
 .endif
 Q3INSTALL?=
 Q3ENGINEVER?=	${DISTVERSION}
 
 ONLY_FOR_ARCHS=	amd64 i386
 
+DEBUG_VARS=		ALL_TARGET=debug
+SERVER_RUN_DEPENDS=	${Q3SERVER}${BINSUFFIX}:games/${PORTNAME}-server
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_MAKE_ARGS=		USE_CURL=1 USE_CURL_DLOPEN=0
+CURL_MAKE_ARGS_OFF=	USE_CURL=0
+OPENAL_USES=		openal:al
+OPENAL_MAKE_ARGS=	USE_OPENAL=1 USE_OPENAL_DLOPEN=0
+OPENAL_MAKE_ARGS_OFF=	USE_OPENAL=0
+VORBIS_VARS=		NEED_OGG=yes
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
+VORBIS_MAKE_ARGS=	USE_CODEC_VORBIS=1
+VORBIS_MAKE_ARGS_OFF=	USE_CODEC_VORBIS=0
+OPUS_VARS=		NEED_OGG=yes
+OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile \
+			libopus.so:audio/opus
+OPUS_MAKE_ARGS=		USE_CODEC_OPUS=1 USE_INTERNAL_OPUS=0
+OPUS_MAKE_ARGS_OFF=	USE_CODEC_OPUS=0
+MUMBLE_MAKE_ARGS=	USE_MUMBLE=1
+MUMBLE_MAKE_ARGS_OFF=	USE_MUMBLE=0
+GAMELIBS_MAKE_ARGS=	BUILD_GAME_SO=1
+GAMELIBS_MAKE_ARGS_OFF=	BUILD_GAME_SO=0
+# Note that SMP is only supported on OS-X, hence the option has been removed.
+SMP_VARS=		Q3BIN+=${Q3CLIENT}-smp
+SMP_MAKE_ARGS=		BUILD_CLIENT_SMP=1
+SMP_MAKE_ARGS_OFF=	BUILD_CLIENT_SMP=0
+DLRENDERER_MAKE_ARGS=	USE_RENDERER_DLOPEN=1
+DLRENDERER_MAKE_ARGS_OFF=	USE_RENDERER_DLOPEN=0
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDEBUG}
-ALL_TARGET=	debug
-.endif
-
-.if ${PORT_OPTIONS:MSERVER}
-RUN_DEPENDS+=	${Q3SERVER}${BINSUFFIX}:games/${PORTNAME}-server
-.endif
-
 .if !defined(DESKTOP_ENTRIES)
 . if ${IOQ3:MCLIENT}
 DESKTOP_ENTRIES+=	"${Q3CLIENT} ${Q3ENGINEVER}" "${COMMENT}"  \
-		"${Q3ICON}" \
-		"${Q3CLIENT}${BINSUFFIX}" "Game;" false
+			"${Q3ICON}" "${Q3CLIENT}${BINSUFFIX}" "Game;" false
 . endif
 . if ${PORT_OPTIONS:MSMP}
 DESKTOP_ENTRIES+=	"${Q3CLIENT} ${Q3ENGINEVER} SMP" "${COMMENT}" \
-		"${Q3ICON}" \
-		"${Q3CLIENT}-smp${BINSUFFIX}" "Game;" false
+			"${Q3ICON}" "${Q3CLIENT}-smp${BINSUFFIX}" "Game;" false
 . endif
 .endif
 
 .if ${IOQ3:MCLIENT}
 MAKE_ARGS+=	BUILD_CLIENT=1
 Q3BIN+=		${Q3CLIENT}
-USE_SDL=	sdl
+USE_SDL=	${IOQ3SDL}
 .else
 MAKE_ARGS+=	BUILD_CLIENT=0
 .endif
 
 .if ${IOQ3:MSERVER}
 MAKE_ARGS+=	BUILD_SERVER=1
 Q3BIN+=		${Q3SERVER}
 .else
 MAKE_ARGS+=	BUILD_SERVER=0
 .endif
 
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:ftp/curl
-MAKE_ARGS+=	USE_CURL=1 USE_CURL_DLOPEN=0
-.else
-MAKE_ARGS+=	USE_CURL=0
-.endif
-
-.if ${PORT_OPTIONS:MOPENAL}
-USES+=		openal:al
-MAKE_ARGS+=	USE_OPENAL=1 USE_OPENAL_DLOPEN=0
-.else
-MAKE_ARGS+=	USE_OPENAL=0
-.endif
-
-.if ${PORT_OPTIONS:MVORBIS}
-NEED_OGG=	yes
-LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
-MAKE_ARGS+=	USE_CODEC_VORBIS=1
-.else
-MAKE_ARGS+=	USE_CODEC_VORBIS=0
-.endif
-
-.if ${PORT_OPTIONS:MOPUS}
-NEED_OGG=	yes
-LIB_DEPENDS+=	libopusfile.so:audio/opusfile \
-		libopus.so:audio/opus
-MAKE_ARGS+=	USE_CODEC_OPUS=1 USE_INTERNAL_OPUS=0
-.else
-MAKE_ARGS+=	USE_CODEC_OPUS=0
-.endif
-
 .if defined(NEED_OGG)
 LIB_DEPENDS+=	libogg.so:audio/libogg
 MAKE_ARGS+=	USE_INTERNAL_OGG=0
-.endif
-
-.if ${PORT_OPTIONS:MMUMBLE}
-MAKE_ARGS+=	USE_MUMBLE=1
-.else
-MAKE_ARGS+=	USE_MUMBLE=0
-.endif
-
-.if ${PORT_OPTIONS:MGAMELIBS}
-MAKE_ARGS+=	BUILD_GAME_SO=1
-.else
-MAKE_ARGS+=	BUILD_GAME_SO=0
-.endif
-
-# Note that SMP is only supported on OS-X, hence the option has been removed.
-.if ${PORT_OPTIONS:MSMP}
-MAKE_ARGS+=	BUILD_CLIENT_SMP=1
-Q3BIN+=		${Q3CLIENT}-smp
-.else
-MAKE_ARGS+=	BUILD_CLIENT_SMP=0
-.endif
-
-.if ${PORT_OPTIONS:MDLRENDERER}
-MAKE_ARGS+=	USE_RENDERER_DLOPEN=1
-. if ${IOQ3:MOPENGL2}
-Q3DOCS+=	opengl2-readme.txt
-. endif
-.else
-MAKE_ARGS+=	USE_RENDERER_DLOPEN=0
 .endif
 
 # Generate a set of install instruction tuples: <cmd>;<src>;<dst>
 .for bin in ${Q3BIN}
 IOQ3_INST+=	PROGRAM;${bin}.${IOQ3ARCH};bin/${bin}${BINSUFFIX}
 .endfor
 .if ${PORT_OPTIONS:MTOOLS}
 . for bin in ${Q3TOOLS}
 IOQ3_INST+=	PROGRAM;tools/${bin};bin/${bin}${BINSUFFIX}
 . endfor
 .endif
 .if ${PORT_OPTIONS:MDLRENDERER}
 . for renderer in ${Q3RENDERER}
 IOQ3_INST+=	LIB;${renderer}.so;${LIBDIR}/${renderer}.so
 . endfor
 .endif
 .if ${PORT_OPTIONS:MGAMELIBS}
 . for dir in ${Q3BASE}
 PLIST_DIRS+=	${LIBDIR}/${dir}
 .  for lib in ${Q3GAMELIBS}
 IOQ3_INST+=	LIB;${dir}/${lib}${IOQ3ARCH}.so;${LIBDIR}/${dir}/${lib}${IOQ3ARCH}.so
 .  endfor
 . endfor
 .endif
 .if ${PORT_OPTIONS:MDLRENDERER} || ${PORT_OPTIONS:MGAMELIBS}
 PLIST_DIRS+=	${LIBDIR}
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 PLIST_DIRS+=	${DOCSDIR}
 . for doc in ${Q3DOCS:O:u}
 IOQ3_INST+=	DATA;../../${doc};${DOCSDIR}/${doc}
 . endfor
 .endif
 
 # Generate PLIST_FILES
 .for inst in ${IOQ3_INST}
 PLIST_FILES+=	${inst:C/.*;//}
 .endfor
 
 # Generate install target
 do-install: ${Q3INSTALL}
 .for dir in ${PLIST_DIRS}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${dir}
 .endfor
 .for inst in ${IOQ3_INST}
 	${INSTALL_${inst:C/;.*//}} ${BUILDDIR}/${inst:C/[^;]*;//:C/;.*//} \
 		${STAGEDIR}${PREFIX}/${inst:C/.*;//}
 .endfor
 
 .if !defined(Q3TOTALCONV)
 .include "${.CURDIR}/../quake3-data/Makefile.include"
 .endif
 
 .include <bsd.port.mk>
Index: head/games/ioquake3/files/patch-Makefile
===================================================================
--- head/games/ioquake3/files/patch-Makefile	(revision 414031)
+++ head/games/ioquake3/files/patch-Makefile	(revision 414032)
@@ -1,162 +1,162 @@
---- Makefile.orig	2009-04-22 22:54:48.000000000 +0400
-+++ Makefile	2015-09-28 20:24:27.956819000 +0300
-@@ -187,6 +187,8 @@
+--- Makefile.orig	2009-04-22 18:54:48 UTC
++++ Makefile
+@@ -187,6 +187,8 @@ ifeq ($(shell which pkg-config > /dev/nu
    # FIXME: introduce CLIENT_CFLAGS
    SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//')
    SDL_LIBS=$(shell pkg-config --libs sdl)
 +  VORBIS_CFLAGS=$(shell pkg-config --silence-errors --cflags vorbis vorbisfile)
 +  VORBIS_LIBS=$(shell pkg-config --silence-errors --libs vorbis vorbisfile)
  endif
  
  # version info
-@@ -521,44 +523,25 @@
+@@ -521,44 +523,25 @@ else # ifeq mingw32
  
  ifeq ($(PLATFORM),freebsd)
  
 -  ifneq (,$(findstring alpha,$(shell uname -m)))
 -    ARCH=axp
 -  else #default to i386
 -    ARCH=i386
 -  endif #alpha test
 -
 -
 -  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
 -    -DUSE_ICON $(shell sdl-config --cflags)
 -
 -  ifeq ($(USE_OPENAL),1)
 -    BASE_CFLAGS += -DUSE_OPENAL
 -    ifeq ($(USE_OPENAL_DLOPEN),1)
 -      BASE_CFLAGS += -DUSE_OPENAL_DLOPEN
 -    endif
 -  endif
 -
 -  ifeq ($(USE_CODEC_VORBIS),1)
 -    BASE_CFLAGS += -DUSE_CODEC_VORBIS
 -  endif
 -
 -  ifeq ($(ARCH),axp)
 -    BASE_CFLAGS += -DNO_VM_COMPILED
 -    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
 -      -fomit-frame-pointer -fexpensive-optimizations
 -  else
 -  ifeq ($(ARCH),i386)
 -    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 \
 -      -funroll-loops -fstrength-reduce
 -    HAVE_VM_COMPILED=true
 -  else
 -    BASE_CFLAGS += -DNO_VM_COMPILED
 -  endif
 -  endif
 +   ifndef HOMEPATH
 +     HOMEPATH = /.ioquake3
 +   endif
 + 
 +   ifndef DEFAULT_LIBDIR
 +     DEFAULT_LIBDIR = /usr/local/lib/ioquake3
 +   endif
 + 
 +  # flags
 +  BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \
 +    -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
 +    -DHOMEPATH=\\\"$(HOMEPATH)\\\" \
 +    -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\" \
 +    -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
 +  CLIENT_CFLAGS += $(SDL_CFLAGS)
 +  HAVE_VM_COMPILED = true
  
 -  DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 +  OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
 +  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
  
    SHLIBEXT=so
    SHLIBCFLAGS=-fPIC
-@@ -568,20 +551,52 @@
+@@ -568,20 +551,52 @@ ifeq ($(PLATFORM),freebsd)
    # don't need -ldl (FreeBSD)
    LIBS=-lm
  
 -  CLIENT_LIBS =
 -
 -  CLIENT_LIBS += $(shell sdl-config --libs) -lGL
 +  CLIENT_LIBS = $(SDL_LIBS) -lGL
  
 +  # optional features/libraries
    ifeq ($(USE_OPENAL),1)
 -    ifneq ($(USE_OPENAL_DLOPEN),1)
 -      CLIENT_LIBS += $(THREAD_LIBS) -lopenal
 +    CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
 +    CLIENT_CFLAGS += -DUSE_OPENAL
 +    ifneq ($(USE_LOCAL_HEADERS),1)
 +      CLIENT_CFLAGS += $(OPENAL_CFLAGS)
 +    endif
 +  endif
 +
 +  ifeq ($(USE_CURL),1)
 +    CLIENT_LIBS += $(CURL_LIBS)
 +    CLIENT_CFLAGS += -DUSE_CURL
 +    ifneq ($(USE_LOCAL_HEADERS),1)
 +      CLIENT_CFLAGS += $(CURL_CFLAGS)
      endif
    endif
  
    ifeq ($(USE_CODEC_VORBIS),1)
 -    CLIENT_LIBS += -lvorbisfile -lvorbis -logg
 +    CLIENT_LIBS += $(VORBIS_LIBS)
 +    CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
 +    ifneq ($(USE_LOCAL_HEADERS),1)
 +      CLIENT_CFLAGS += $(VORBIS_CFLAGS)
 +    endif
    endif
  
 +  ifeq ($(BUILD_CLIENT),1)
 +    BASE_CFLAGS += $(CLIENT_CFLAGS)
 +  endif
 +
 +  # cross-compiling tweaks
 +  ifeq ($(ARCH),i386)
 +    ifeq ($(CROSS_COMPILING),1)
 +      BASE_CFLAGS += -m32
 +    endif
 +  endif
 +  ifeq ($(ARCH),amd64)
 +    ifeq ($(CROSS_COMPILING),1)
 +      BASE_CFLAGS += -m64
 +    endif
 +  endif
 +
 +  RELEASE_CFLAGS = $(BASE_CFLAGS)
 +  DEBUG_CFLAGS = $(BASE_CFLAGS) -g
 +
  else # ifeq freebsd
  
  #############################################################################
-@@ -831,7 +846,7 @@
+@@ -831,7 +846,7 @@ endif
  ifeq ($(USE_VOIP),1)
    BASE_CFLAGS += -DUSE_VOIP
    ifeq ($(USE_INTERNAL_SPEEX),1)
 -    BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
 +    BASE_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(BASE_CFLAGS)
    else
      CLIENT_LIBS += -lspeex
    endif
-@@ -1442,6 +1457,9 @@
+@@ -1442,6 +1457,9 @@ ifeq ($(HAVE_VM_COMPILED),true)
    ifeq ($(ARCH),x86_64)
      Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
    endif
 +  ifeq ($(ARCH),amd64)
 +    Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
 +  endif
    ifeq ($(ARCH),ppc)
      Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
    endif
-@@ -1591,6 +1609,9 @@
+@@ -1591,6 +1609,9 @@ ifeq ($(HAVE_VM_COMPILED),true)
    ifeq ($(ARCH),x86_64)
      Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
    endif
 +  ifeq ($(ARCH),amd64)
 +    Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
 +  endif
    ifeq ($(ARCH),ppc)
      Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o
    endif
Index: head/games/ioquake3/files/patch-README
===================================================================
--- head/games/ioquake3/files/patch-README	(revision 414031)
+++ head/games/ioquake3/files/patch-README	(revision 414032)
@@ -1,11 +1,11 @@
---- README.orig	2009-04-08 05:36:16.000000000 +0200
-+++ README	2011-10-27 13:13:59.000000000 +0200
-@@ -79,6 +79,8 @@
+--- README.orig	2009-04-08 03:36:16 UTC
++++ README
+@@ -79,6 +79,8 @@ Makefile.local:
    CFLAGS            - use this for custom CFLAGS
    V                 - set to show cc command line when building
    DEFAULT_BASEDIR   - extra path to search for baseq3 and such
 +  DEFAULT_LIBDIR    - extra path to search for libraries (FreeBSD only)
 +  HOMEPATH          - alternative home directory (FreeBSD only)
    BUILD_SERVER      - build the 'ioq3ded' server binary
    BUILD_CLIENT      - build the 'ioquake3' client binary
    BUILD_CLIENT_SMP  - build the 'ioquake3-smp' client binary
Index: head/games/ioquake3/files/patch-code-client-snd_openal.c
===================================================================
--- head/games/ioquake3/files/patch-code-client-snd_openal.c	(revision 414031)
+++ head/games/ioquake3/files/patch-code-client-snd_openal.c	(revision 414032)
@@ -1,11 +1,11 @@
---- code/client/snd_openal.c.orig	2009-12-26 18:10:44.000000000 +0100
-+++ code/client/snd_openal.c	2009-12-26 18:11:00.000000000 +0100
-@@ -1719,7 +1719,7 @@
+--- code/client/snd_openal.c.orig	2009-03-15 12:39:53 UTC
++++ code/client/snd_openal.c
+@@ -1719,7 +1719,7 @@ static cvar_t *s_alCapture;
  #elif defined(MACOS_X)
  #define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL"
  #else
 -#define ALDRIVER_DEFAULT "libopenal.so.0"
 +#define ALDRIVER_DEFAULT "libopenal.so"
  #endif
  
  /*
Index: head/games/ioquake3/files/patch-code-qcommon-files.c
===================================================================
--- head/games/ioquake3/files/patch-code-qcommon-files.c	(revision 414031)
+++ head/games/ioquake3/files/patch-code-qcommon-files.c	(revision 414032)
@@ -1,18 +1,18 @@
---- code/qcommon/files.c.orig	2009-12-08 11:07:08.000000000 +0100
-+++ code/qcommon/files.c	2009-12-08 11:08:41.000000000 +0100
-@@ -241,6 +241,7 @@
+--- code/qcommon/files.c.orig	2009-02-26 13:02:59 UTC
++++ code/qcommon/files.c
+@@ -241,6 +241,7 @@ static  cvar_t          *fs_apppath;
  #endif
  
  static	cvar_t		*fs_basepath;
 +static	cvar_t		*fs_libpath;
  static	cvar_t		*fs_basegame;
  static	cvar_t		*fs_gamedirvar;
  static	searchpath_t	*fs_searchpaths;
-@@ -2761,6 +2762,7 @@
+@@ -2761,6 +2762,7 @@ static void FS_Startup( const char *game
  	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
  	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
  	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
 +	fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
  	homePath = Sys_DefaultHomePath();
  	if (!homePath || !homePath[0]) {
  		homePath = fs_basepath->string;
Index: head/games/ioquake3/files/patch-code-qcommon-q_platform.h
===================================================================
--- head/games/ioquake3/files/patch-code-qcommon-q_platform.h	(revision 414031)
+++ head/games/ioquake3/files/patch-code-qcommon-q_platform.h	(revision 414032)
@@ -1,11 +1,11 @@
---- code/qcommon/q_platform.h.orig	2009-08-30 19:30:01.000000000 +0200
-+++ code/qcommon/q_platform.h	2009-08-30 19:28:38.000000000 +0200
-@@ -199,6 +199,8 @@
+--- code/qcommon/q_platform.h.orig	2009-03-02 17:29:30 UTC
++++ code/qcommon/q_platform.h
+@@ -199,6 +199,8 @@ Foundation, Inc., 51 Franklin St, Fifth 
  
  #ifdef __i386__
  #define ARCH_STRING "i386"
 +#elif defined __amd64__
 +#define ARCH_STRING "amd64"
  #elif defined __axp__
  #define ARCH_STRING "alpha"
  #endif
Index: head/games/ioquake3/files/patch-code-qcommon-qcommon.h
===================================================================
--- head/games/ioquake3/files/patch-code-qcommon-qcommon.h	(revision 414031)
+++ head/games/ioquake3/files/patch-code-qcommon-qcommon.h	(revision 414032)
@@ -1,12 +1,12 @@
---- code/qcommon/qcommon.h.orig	2009-12-08 11:09:48.000000000 +0100
-+++ code/qcommon/qcommon.h	2009-12-08 11:10:43.000000000 +0100
-@@ -1069,6 +1069,9 @@
+--- code/qcommon/qcommon.h.orig	2009-01-17 23:09:58 UTC
++++ code/qcommon/qcommon.h
+@@ -1069,6 +1069,9 @@ char	*Sys_DefaultInstallPath(void);
  char    *Sys_DefaultAppPath(void);
  #endif
  
 +void	Sys_SetDefaultLibPath(const char *path);
 +char	*Sys_DefaultLibPath(void);
 +
  void  Sys_SetDefaultHomePath(const char *path);
  char	*Sys_DefaultHomePath(void);
  const char *Sys_Dirname( char *path );
Index: head/games/ioquake3/files/patch-code-qcommon-vm_interpreted.c
===================================================================
--- head/games/ioquake3/files/patch-code-qcommon-vm_interpreted.c	(revision 414031)
+++ head/games/ioquake3/files/patch-code-qcommon-vm_interpreted.c	(revision 414032)
@@ -1,34 +1,34 @@
---- code/qcommon/vm_interpreted.c	2009/11/01 19:58:07	1717
-+++ code/qcommon/vm_interpreted.c	2010/01/16 10:55:51	1772
-@@ -516,18 +516,20 @@
+--- code/qcommon/vm_interpreted.c.orig	2008-08-23 22:45:30 UTC
++++ code/qcommon/vm_interpreted.c
+@@ -526,18 +526,20 @@ nextInstruction2:
  
  //VM_LogSyscalls( (int *)&image[ programStack + 4 ] );
  				{
 -					intptr_t* argptr = (intptr_t *)&image[ programStack + 4 ];
 -				#if __WORDSIZE == 64
 -				// the vm has ints on the stack, we expect
 -				// longs so we have to convert it
 -					intptr_t argarr[16];
 -					int i;
 -					for (i = 0; i < 16; ++i) {
 -						argarr[i] = *(int*)&image[ programStack + 4 + 4*i ];
 +					// the vm has ints on the stack, we expect
 +					// pointers so we might have to convert it
 +					if (sizeof(intptr_t) != sizeof(int)) {
 +						intptr_t argarr[16];
 +						int *imagePtr = (int *)&image[programStack];
 +						int i;
 +						for (i = 0; i < 16; ++i) {
 +							argarr[i] = *(++imagePtr);
 +						}
 +						r = vm->systemCall( argarr );
 +					} else {
 +						intptr_t* argptr = (intptr_t *)&image[ programStack + 4 ];
 +						r = vm->systemCall( argptr );
  					}
 -					argptr = argarr;
 -				#endif
 -					r = vm->systemCall( argptr );
  				}
  
  #ifdef DEBUG_VM
Index: head/games/ioquake3/files/patch-code-qcommon-vm_x86.c
===================================================================
--- head/games/ioquake3/files/patch-code-qcommon-vm_x86.c	(revision 414031)
+++ head/games/ioquake3/files/patch-code-qcommon-vm_x86.c	(revision 414032)
@@ -1,41 +1,41 @@
---- code/qcommon/vm_x86.c.orig	2008-08-18 01:22:06.000000000 +0200
-+++ code/qcommon/vm_x86.c	2013-11-14 11:44:27.000000000 +0100
-@@ -36,7 +36,25 @@
+--- code/qcommon/vm_x86.c.orig	2008-08-17 23:22:06 UTC
++++ code/qcommon/vm_x86.c
+@@ -36,7 +36,25 @@ Foundation, Inc., 51 Franklin St, Fifth 
  
  /* need this on NX enabled systems (i386 with PAE kernel or
   * noexec32=on x86_64) */
 -#ifdef __linux__
 +//     Rambetter's note: I'm adding the test for __FreeBSD__ in addition to the [already
 +// existing] test for __linux__.  Here is why.  I own a 32 bit FreeBSD 8.0 server with
 +// a PAE kernel.  Without VM_X86_MMAP, ioq3ded segfaults shortly after starting
 +// (this should come as no surprise).  With VM_X86_MMAP, ioq3ded runs very smoothly.
 +// So, at a very minimum, we need to set VM_X86_MMAP for FreeBSD PAE kernels.
 +//     Now, I also happen to own a 32 bit FreeBSD 7.1 server with just the standard kernel
 +// (non-PAE).  I have run ioq3ded successfully on it with and without VM_X86_MMAP for many
 +// months.  So, in the case of non-PAE FreeBSD, we can go either way - use VM_X86_MMAP or
 +// not use it.  The absolute safest fix to this problem is to only set VM_X86_MMAP on
 +// PAE FreeBSD kernels (in addition to Linux); however, I don't know of a way to detect
 +// the PAE kernel easily.  Therefore, since using VM_X86_MMAP won't break anything on
 +// non-PAE kernels [apparently], we'll just use it all the time on FreeBSD 32 bit.
 +//     Now, you may ask the question: Why not change the entire test for just __unix__?
 +// Unfortunately I cannot say anything about this because I don't have access to every
 +// other system that has __unix__ defined, so I cannot possibly test all those cases to
 +// make sure things work.  We'll just leave it with __linux__ and __FreeBSD__ to be safe.
 +// If someone with a different flavor of UNIX running a PAE kernel has this problem too,
 +// they can report the bug and we will adjust the line below accordingly.
 +#if defined(__linux__) || defined(__FreeBSD__)
  #define VM_X86_MMAP
  #endif
  
-@@ -90,7 +108,11 @@
+@@ -90,7 +108,11 @@ void AsmCall(void);
  static void (*const asmCallPtr)(void) = AsmCall;
  
  
 +#ifdef __clang__
 +	int		callMask = 0;
 +#else
  static	int		callMask = 0;
 +#endif
  
  static	int	instruction, pass;
  static	int	lastConst = 0;
Index: head/games/ioquake3/files/patch-code-qcommon-vm_x86_64.c
===================================================================
--- head/games/ioquake3/files/patch-code-qcommon-vm_x86_64.c	(revision 414031)
+++ head/games/ioquake3/files/patch-code-qcommon-vm_x86_64.c	(revision 414032)
@@ -1,11 +1,11 @@
---- code/qcommon/vm_x86_64.c.orig	2009-08-30 20:50:41.000000000 +0200
-+++ code/qcommon/vm_x86_64.c	2009-08-30 20:51:43.000000000 +0200
-@@ -246,7 +246,7 @@
+--- code/qcommon/vm_x86_64.c.orig	2008-08-06 16:09:29 UTC
++++ code/qcommon/vm_x86_64.c
+@@ -246,7 +246,7 @@ void emit(const char* fmt, ...)
  #else
  #define JMPIARG \
  	emit("movq $%lu, %%rax", vm->codeBase+vm->instructionPointers[iarg]); \
 -	emit("jmpq *%rax");
 +	emit("jmpq *%%rax");
  #endif
   
  // integer compare and jump
Index: head/games/ioquake3/files/patch-code-sys-sys_main.c
===================================================================
--- head/games/ioquake3/files/patch-code-sys-sys_main.c	(revision 414031)
+++ head/games/ioquake3/files/patch-code-sys-sys_main.c	(revision 414032)
@@ -1,94 +1,94 @@
---- code/sys/sys_main.c.orig	2009-03-02 23:26:36.000000000 +0100
-+++ code/sys/sys_main.c	2009-12-08 11:31:12.000000000 +0100
-@@ -49,6 +49,7 @@
+--- code/sys/sys_main.c.orig	2009-03-02 22:26:36 UTC
++++ code/sys/sys_main.c
+@@ -49,6 +49,7 @@ Foundation, Inc., 51 Franklin St, Fifth 
  
  static char binaryPath[ MAX_OSPATH ] = { 0 };
  static char installPath[ MAX_OSPATH ] = { 0 };
 +static char libPath[ MAX_OSPATH ] = { 0 };
  
  /*
  =================
-@@ -95,6 +96,30 @@
+@@ -95,6 +96,30 @@ char *Sys_DefaultInstallPath(void)
  
  /*
  =================
 +Sys_SetDefaultLibPath
 +=================
 +*/
 +void Sys_SetDefaultLibPath(const char *path)
 +{
 +	Q_strncpyz(libPath, path, sizeof(libPath));
 +}
 +
 +/*
 +=================
 +Sys_DefaultLibPath
 +=================
 +*/
 +char *Sys_DefaultLibPath(void)
 +{
 +	if (*libPath)
 +		return libPath;
 +	else
 +		return Sys_Cwd();
 +}
 +
 +
 +/*
 +=================
  Sys_DefaultAppPath
  =================
  */
-@@ -384,6 +409,7 @@
+@@ -384,6 +409,7 @@ Used to load a development dll instead o
  #1 look down current path
  #2 look in fs_homepath
  #3 look in fs_basepath
 +#4 look in fs_libpath
  =================
  */
  void *Sys_LoadDll( const char *name, char *fqpath ,
-@@ -394,6 +420,7 @@
+@@ -394,6 +420,7 @@ void *Sys_LoadDll( const char *name, cha
  	void  (*dllEntry)( intptr_t (*syscallptr)(intptr_t, ...) );
  	char  fname[MAX_OSPATH];
  	char  *basepath;
 +	char  *libpath;
  	char  *homepath;
  	char  *pwdpath;
  	char  *gamedir;
-@@ -405,6 +432,7 @@
+@@ -405,6 +432,7 @@ void *Sys_LoadDll( const char *name, cha
  	// TODO: use fs_searchpaths from files.c
  	pwdpath = Sys_Cwd();
  	basepath = Cvar_VariableString( "fs_basepath" );
 +	libpath = Cvar_VariableString( "fs_libpath" );
  	homepath = Cvar_VariableString( "fs_homepath" );
  	gamedir = Cvar_VariableString( "fs_game" );
  
-@@ -413,6 +441,9 @@
+@@ -413,6 +441,9 @@ void *Sys_LoadDll( const char *name, cha
  	if(!libHandle && homepath)
  		libHandle = Sys_TryLibraryLoad(homepath, gamedir, fname, fqpath);
  
 +	if(!libHandle && libpath)
 +		libHandle = Sys_TryLibraryLoad(libpath, gamedir, fname, fqpath);
 +
  	if(!libHandle && basepath)
  		libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
  
-@@ -469,6 +500,10 @@
+@@ -469,6 +500,10 @@ void Sys_ParseArgs( int argc, char **arg
  #	endif
  #endif
  
 +#ifndef DEFAULT_LIBDIR
 +#	define DEFAULT_LIBDIR DEFAULT_BASEDIR
 +#endif
 +
  /*
  =================
  Sys_SigHandler
-@@ -540,6 +575,7 @@
+@@ -540,6 +575,7 @@ int main( int argc, char **argv )
  	Sys_ParseArgs( argc, argv );
  	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
  	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );
 +	Sys_SetDefaultLibPath( DEFAULT_LIBDIR );
  
  	// Concatenate the command line for passing to Com_Init
  	for( i = 1; i < argc; i++ )
Index: head/games/ioquake3/files/patch-code-sys-sys_unix.c
===================================================================
--- head/games/ioquake3/files/patch-code-sys-sys_unix.c	(revision 414031)
+++ head/games/ioquake3/files/patch-code-sys-sys_unix.c	(revision 414032)
@@ -1,13 +1,13 @@
---- code/sys/sys_unix.c.orig	2008-11-11 00:55:22.000000000 +0100
-+++ code/sys/sys_unix.c	2011-10-27 13:11:15.000000000 +0200
-@@ -53,7 +53,9 @@
+--- code/sys/sys_unix.c.orig	2008-11-10 23:55:22 UTC
++++ code/sys/sys_unix.c
+@@ -53,7 +53,9 @@ char *Sys_DefaultHomePath(void)
  		if( ( p = getenv( "HOME" ) ) != NULL )
  		{
  			Q_strncpyz( homePath, p, sizeof( homePath ) );
 -#ifdef MACOS_X
 +#ifdef HOMEPATH
 +			Q_strcat( homePath, sizeof( homePath ), HOMEPATH );
 +#elif defined MACOS_X
  			Q_strcat( homePath, sizeof( homePath ), "/Library/Application Support/Quake3" );
  #else
  			Q_strcat( homePath, sizeof( homePath ), "/.q3a" );
Index: head/games/ioquake3-devel/files/patch-Makefile
===================================================================
--- head/games/ioquake3-devel/files/patch-Makefile	(revision 414031)
+++ head/games/ioquake3-devel/files/patch-Makefile	(nonexistent)
@@ -1,11 +0,0 @@
---- Makefile.orig	2015-10-25 13:13:52 UTC
-+++ Makefile
-@@ -1043,7 +1043,7 @@ ifeq ($(USE_VOIP),1)
-   CLIENT_CFLAGS += -DUSE_VOIP
-   SERVER_CFLAGS += -DUSE_VOIP
-   ifeq ($(USE_INTERNAL_SPEEX),1)
--    CLIENT_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
-+    CLIENT_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(CLIENT_CFLAGS)
-   else
-     CLIENT_LIBS += -lspeex -lspeexdsp
-   endif

Property changes on: head/games/ioquake3-devel/files/patch-Makefile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/games/ioquake3-devel/Makefile
===================================================================
--- head/games/ioquake3-devel/Makefile	(revision 414031)
+++ head/games/ioquake3-devel/Makefile	(revision 414032)
@@ -1,32 +1,35 @@
 # Created by: Dominic Fandrey
 # $FreeBSD$
 
 PORTNAME?=	ioquake3-devel
 DISTVERSION?=	GIT${GITREVISION}
-PORTREVISION?=	2
+PORTREVISION?=	0
 MASTER_SITES?=	ftp://deponie.yamagi.org/freebsd/distfiles/ioquake3/ \
 		http://deponie.yamagi.org/freebsd/distfiles/ioquake3/
 EXTRACT_SUFX?=	.tar.xz
 
-MAINTAINER?=	kamikaze@bsdforen.de
+MAINTAINER?=	kami@freebsd.org
 COMMENT?=	Development GIT snapshots of ioquake3
 
+LICENSE?=	GPLv2
+
 MASTERDIR=	${.CURDIR}/../ioquake3
 DESCR?=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DISTINFO_FILE?=	${.CURDIR}/../${PORTNAME}/distinfo
 PATCHDIR?=	${.CURDIR}/../${PORTNAME}/files
 PKGMESSAGE?=	${.CURDIR}/../${PORTNAME}/pkg-message
 
-GITREVISION?=	2390
+GITREVISION?=	2808
 BINSUFFIX?=	-devel
 
 IOQ3?=		CLIENT TOOLS DLRENDERER GAMELIBS OPUS OPENGL2
 IOQ3ARCH?=	${ARCH:S/i386/x86/:S/amd64/x86_64/}
+IOQ3SDL?=	sdl2
 
 Q3DOCS?=	README.md \
 		id-readme.txt \
 		md4-readme.txt \
-		opengl2-readme.txt \
+		opengl2-readme.md \
 		voip-readme.txt
 
 .include "${MASTERDIR}/Makefile"
Index: head/games/ioquake3-devel/distinfo
===================================================================
--- head/games/ioquake3-devel/distinfo	(revision 414031)
+++ head/games/ioquake3-devel/distinfo	(revision 414032)
@@ -1,2 +1,2 @@
-SHA256 (ioquake3-devel-GIT2390.tar.xz) = 1ad3a8bfccaa54ed39221f86539676479187f5f832a4140cf5d7ee7be9a1b1be
-SIZE (ioquake3-devel-GIT2390.tar.xz) = 4310568
+SHA256 (ioquake3-devel-GIT2808.tar.xz) = a9fe73c4c29e218e64d782ce8b458a93e4860e81d4c1fc08e6556cd32dfabbb2
+SIZE (ioquake3-devel-GIT2808.tar.xz) = 8166804
Index: head/games/ioquake3-devel-server/Makefile
===================================================================
--- head/games/ioquake3-devel-server/Makefile	(revision 414031)
+++ head/games/ioquake3-devel-server/Makefile	(revision 414032)
@@ -1,14 +1,16 @@
 # Created by: Dominic Fandrey
 # $FreeBSD$
 
 PORTNAME=	ioquake3-devel
 PKGNAMESUFFIX=	-server
 
-MAINTAINER=	kamikaze@bsdforen.de
+MAINTAINER=	kami@freebsd.org
 COMMENT=	Ioquake3 development snapshot dedicated server
+
+LICENSE=	GPLv2
 
 MASTERDIR=	${.CURDIR}/../${PORTNAME}
 
 IOQ3=		SERVER GAMELIBS
 
 .include "${MASTERDIR}/Makefile"
Index: head/games/ioquake3-server/Makefile
===================================================================
--- head/games/ioquake3-server/Makefile	(revision 414031)
+++ head/games/ioquake3-server/Makefile	(revision 414032)
@@ -1,14 +1,16 @@
 # Created by: Dominic Fandrey <kamikaze@bsdforen.de>
 # $FreeBSD$
 
 PORTNAME=	ioquake3
 PKGNAMESUFFIX=	-server
 
-MAINTAINER=	kamikaze@bsdforen.de
+MAINTAINER=	kami@freebsd.org
 COMMENT=	Ioquake3 dedicated server
+
+LICENSE=	GPLv2
 
 MASTERDIR=	${.CURDIR}/../${PORTNAME}
 
 IOQ3=		SERVER GAMELIBS
 
 .include "${MASTERDIR}/Makefile"
Index: head/games/iourbanterror/Makefile
===================================================================
--- head/games/iourbanterror/Makefile	(revision 414031)
+++ head/games/iourbanterror/Makefile	(revision 414032)
@@ -1,48 +1,52 @@
 # Created by: alepulver
 # $FreeBSD$
 
 PORTNAME=	iourbanterror
 PORTVERSION=	${GAMEVERSION}.${DISTVERSION}
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	games
 DISTNAME=	ioquake3-${DISTVERSION}
 
-MAINTAINER=	kamikaze@bsdforen.de
+MAINTAINER=	kami@freebsd.org
 COMMENT=	Quake 3 engine modified for Urban Terror (based on ioquake3)
 
 RUN_DEPENDS=	urbanterror-data>0:games/urbanterror-data
 
+LICENSE?=	GPLv2
+
 MASTERDIR=	${.CURDIR}/../ioquake3
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+PATCHDIR=	${.CURDIR}/../${PORTNAME}/files
 
 IOQ3?=		CLIENT
 
 # The docs belong to ioquake3
 OPTIONS_EXCLUDE=	DOCS
-GAMEVERSION=	4.2.018
+GAMEVERSION=	4.2.023
 Q3ENGINEVER=	${DISTVERSION}+${GAMEVERSION}
 Q3TOTALCONV=	yes
 Q3DIR=		${PREFIX}/share/quake3
 Q3ICON=		${PREFIX}/share/quake3/q3ut4/q3ut.ico
 Q3CLIENT=	ioUrbanTerror
 Q3SERVER=	ioUrTded
 Q3BASE=		q3ut4
 BINSUFFIX=
 HOMEPATH=	/.ioUrbanTerror
 
 MAKE_ARGS+=	BUILD_MISSIONPACK=0 \
 		BUILD_STANDALONE=1
 
-post-patch:
+pre-patch:
 	@(cd ${WRKSRC} && \
-	for pfile in ${.CURDIR}/../${PORTNAME}/files/patch-*; do \
+	for pfile in ${MASTERDIR}/files/patch-*; do \
 		${PATCH} < $${pfile}; \
 	done)
+	@${FIND} ${WRKSRC} -name \*.orig -delete
 	@${REINPLACE_CMD} \
 		-e 's/ioquake3/${Q3CLIENT}/g' \
 		-e 's/ioq3ded/${Q3SERVER}/g' \
 		-e 's/baseq3/${Q3BASE}/g' \
 		"${WRKSRC}/Makefile"
 
 .include "${MASTERDIR}/Makefile"
Index: head/games/iourbanterror/files/patch-code-qcommon-q_shared.h
===================================================================
--- head/games/iourbanterror/files/patch-code-qcommon-q_shared.h	(revision 414031)
+++ head/games/iourbanterror/files/patch-code-qcommon-q_shared.h	(revision 414032)
@@ -1,20 +1,20 @@
---- code/qcommon/q_shared.h.orig	2014-03-23 17:10:02.000000000 +0100
-+++ code/qcommon/q_shared.h	2014-03-23 17:12:24.000000000 +0100
-@@ -27,11 +27,12 @@
+--- code/qcommon/q_shared.h.orig	2008-11-03 17:03:54 UTC
++++ code/qcommon/q_shared.h
+@@ -27,11 +27,12 @@ Foundation, Inc., 51 Franklin St, Fifth 
  // A user mod should never modify this file
  
  #ifdef STANDALONE
 -  #define PRODUCT_NAME			"iofoo3"
 -  #define BASEGAME			"foobar"
 -  #define CLIENT_WINDOW_TITLE     	"changeme"
 -  #define CLIENT_WINDOW_MIN_TITLE 	"changeme2"
 -  #define GAMENAME_FOR_MASTER		"iofoo3"	// must NOT contain whitespaces
 +  #define PRODUCT_NAME			"ioq3+UT"
 +  #define BASEGAME			"q3ut4"
 +  #define CLIENT_WINDOW_TITLE     	"ioUrbanTerror"
 +  #define CLIENT_WINDOW_MIN_TITLE 	"ioUT"
 +  #define GAMENAME_FOR_MASTER		"Quake3Arena"	// must NOT contain whitespace
 +  #define LEGACY_PROTOCOL
  #else
    #define PRODUCT_NAME			"ioq3"
    #define BASEGAME			"baseq3"
Index: head/games/iourbanterror/files/patch-code-qcommon-qcommon.h
===================================================================
--- head/games/iourbanterror/files/patch-code-qcommon-qcommon.h	(nonexistent)
+++ head/games/iourbanterror/files/patch-code-qcommon-qcommon.h	(revision 414032)
@@ -0,0 +1,11 @@
+--- code/qcommon/qcommon.h.orig	2016-03-31 19:41:05 UTC
++++ code/qcommon/qcommon.h
+@@ -254,7 +254,7 @@ extern int demo_protocols[];
+   #endif
+ #endif
+ 
+-#define	PORT_MASTER			27950
++#define	PORT_MASTER			27900
+ #define	PORT_UPDATE			27951
+ #define	PORT_SERVER			27960
+ #define	NUM_SERVER_PORTS	4		// broadcast scan this many ports after

Property changes on: head/games/iourbanterror/files/patch-code-qcommon-qcommon.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c
===================================================================
--- head/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c	(revision 414031)
+++ head/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c	(revision 414032)
@@ -1,16 +1,16 @@
---- code/qcommon/vm_interpreted.c.orig	2014-03-23 17:14:22.000000000 +0100
-+++ code/qcommon/vm_interpreted.c	2014-03-23 17:17:07.000000000 +0100
-@@ -458,11 +458,11 @@
+--- code/qcommon/vm_interpreted.c.orig	2016-03-31 19:41:05 UTC
++++ code/qcommon/vm_interpreted.c
+@@ -458,11 +458,11 @@ nextInstruction2:
  			goto nextInstruction2;
  
  		case OP_STORE4:
 -			*(int *)&image[ r1&(dataMask & ~3) ] = r0;
 +			*(int *)&image[ r1&(dataMask) ] = r0;
  			opStack -= 2;
  			goto nextInstruction;
  		case OP_STORE2:
 -			*(short *)&image[ r1&(dataMask & ~1) ] = r0;
 +			*(short *)&image[ r1&(dataMask) ] = r0;
  			opStack -= 2;
  			goto nextInstruction;
  		case OP_STORE1:
Index: head/games/iourbanterror/files/patch-code-qcommon-vm_x86.c
===================================================================
--- head/games/iourbanterror/files/patch-code-qcommon-vm_x86.c	(revision 414031)
+++ head/games/iourbanterror/files/patch-code-qcommon-vm_x86.c	(revision 414032)
@@ -1,20 +1,20 @@
---- code/qcommon/vm_x86.c.orig	2014-03-23 17:23:18.000000000 +0100
-+++ code/qcommon/vm_x86.c	2014-03-23 17:24:58.000000000 +0100
-@@ -512,7 +512,7 @@
+--- code/qcommon/vm_x86.c.orig	2016-03-31 19:41:05 UTC
++++ code/qcommon/vm_x86.c
+@@ -512,7 +512,7 @@ void VM_Compile( vm_t *vm, vmHeader_t *h
  				break;
  			}
  			if (code[pc+4] == OP_STORE4) {
 -				opt = EmitMovEBXEDI(vm, (vm->dataMask & ~3));
 +				opt = EmitMovEBXEDI(vm, (vm->dataMask));
  				EmitString( "B8" );			// mov	eax, 0x12345678
  				Emit4( Constant4() );
  //				if (!opt) {
-@@ -527,7 +527,7 @@
+@@ -527,7 +527,7 @@ void VM_Compile( vm_t *vm, vmHeader_t *h
  				break;
  			}
  			if (code[pc+4] == OP_STORE2) {
 -				opt = EmitMovEBXEDI(vm, (vm->dataMask & ~1));
 +				opt = EmitMovEBXEDI(vm, (vm->dataMask));
  				EmitString( "B8" );			// mov	eax, 0x12345678
  				Emit4( Constant4() );
  //				if (!opt) {
Index: head/games/iourbanterror-server/Makefile
===================================================================
--- head/games/iourbanterror-server/Makefile	(revision 414031)
+++ head/games/iourbanterror-server/Makefile	(revision 414032)
@@ -1,14 +1,16 @@
 # Created by: Dominic Fandrey
 # $FreeBSD$
 
 PORTNAME=	iourbanterror
 PKGNAMESUFFIX=	-server
 
-MAINTAINER=	kamikaze@bsdforen.de
+MAINTAINER=	kami@freebsd.org
 COMMENT=	Urban Terror dedicated server
+
+LICENSE=	GPLv2
 
 MASTERDIR=	${.CURDIR}/../${PORTNAME}
 
 IOQ3=		SERVER
 
 .include "${MASTERDIR}/Makefile"
Index: head/games/openarena/Makefile
===================================================================
--- head/games/openarena/Makefile	(revision 414031)
+++ head/games/openarena/Makefile	(revision 414032)
@@ -1,41 +1,46 @@
 # Created by: Josh Tolbert
 # $FreeBSD$
 
 PORTNAME=	openarena
 PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
 PORTREVISION=	2
 PORTEPOCH=	1
 MASTER_SITES=	SF/oarena/src \
 		http://files.poulsander.com/~poul19/public_files/oa/dev088/
-DISTNAME=	${PORTNAME}-engine-source-0.8.8
+DISTNAME=	${PORTNAME}-engine-source-${GAMEVERSION}
 # Master port defines EXTRACT_SUFX unless already defined
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kamikaze@bsdforen.de
+MAINTAINER=	kami@freebsd.org
 COMMENT=	Quake3 total conversion based on the ioquake3 engine
 
+LICENSE?=	GPLv2
+
 RUN_DEPENDS=	${DATADIR}/${Q3BASE}/pak0.pk3:games/openarena-data
 
 MASTERDIR=	${.CURDIR}/../ioquake3
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DISTINFO_FILE=	${.CURDIR}/../${PORTNAME}/distinfo
 PATCHDIR=	${.CURDIR}/../${PORTNAME}/files
 PKGMESSAGE=	${.CURDIR}/../${PORTNAME}/pkg-message
 
 IOQ3?=		CLIENT
 IOQ3ARCH?=	${ARCH}
 # OpenArena doc is too messy to bother
 OPTIONS_EXCLUDE=	DOCS
 
 GAMEVERSION=	0.8.8
 SVNREVISION=	1910
 Q3ENGINEVER=	SVN${SVNREVISION}+${GAMEVERSION}
 Q3TOTALCONV=	yes
 Q3CLIENT=	openarena
 Q3SERVER=	oa_ded
 Q3BASE=		baseoa
 Q3DIR=		${DATADIR}
 # No icon included with OpenArena
 Q3ICON=
+
+pre-patch:
+	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 .include "${MASTERDIR}/Makefile"
Index: head/games/openarena/files/patch-feature-DEFAULT_LIBDIR
===================================================================
--- head/games/openarena/files/patch-feature-DEFAULT_LIBDIR	(revision 414031)
+++ head/games/openarena/files/patch-feature-DEFAULT_LIBDIR	(nonexistent)
@@ -1,105 +0,0 @@
---- code/qcommon/files.c.orig	2011-12-24 13:29:32.000000000 +0100
-+++ code/qcommon/files.c	2012-03-07 23:00:53.000000000 +0100
-@@ -250,6 +250,7 @@
- #endif
- 
- static	cvar_t		*fs_basepath;
-+static	cvar_t		*fs_libpath;
- static	cvar_t		*fs_basegame;
- static	cvar_t		*fs_gamedirvar;
- static	searchpath_t	*fs_searchpaths;
-@@ -2859,6 +2860,7 @@
- 	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
- 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
- 	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
-+	fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
- 	homePath = Sys_DefaultHomePath();
- 	if (!homePath || !homePath[0]) {
- 		homePath = fs_basepath->string;
-@@ -2878,6 +2880,11 @@
- 	if (fs_apppath->string[0])
- 		FS_AddGameDirectory(fs_apppath->string, gameName);
- 	#endif
-+
-+	// Search default library location if given
-+	if (fs_libpath->string[0]) {
-+		FS_AddGameDirectory ( fs_libpath->string, gameName );
-+	}
- 	
- 	// NOTE: same filtering below for mods and basegame
- 	if (fs_homepath->string[0] && Q_stricmp(fs_homepath->string,fs_basepath->string)) {
---- code/qcommon/qcommon.h.orig	2011-12-24 13:29:32.000000000 +0100
-+++ code/qcommon/qcommon.h	2012-03-07 23:00:53.000000000 +0100
-@@ -1099,6 +1099,9 @@
- char    *Sys_DefaultAppPath(void);
- #endif
- 
-+void	Sys_SetDefaultLibPath(const char *path);
-+char	*Sys_DefaultLibPath(void);
-+
- void  Sys_SetDefaultHomePath(const char *path);
- char	*Sys_DefaultHomePath(void);
- const char	*Sys_TempPath(void);
---- code/sys/sys_main.c.orig	2011-12-24 13:29:37.000000000 +0100
-+++ code/sys/sys_main.c	2012-03-07 23:00:53.000000000 +0100
-@@ -49,6 +49,7 @@
- 
- static char binaryPath[ MAX_OSPATH ] = { 0 };
- static char installPath[ MAX_OSPATH ] = { 0 };
-+static char libPath[ MAX_OSPATH ] = { 0 };
- 
- /*
- =================
-@@ -95,6 +96,29 @@
- 
- /*
- =================
-+Sys_SetDefaultLibPath
-+=================
-+*/
-+void Sys_SetDefaultLibPath(const char *path)
-+{
-+	Q_strncpyz(libPath, path, sizeof(libPath));
-+}
-+
-+/*
-+=================
-+Sys_DefaultLibPath
-+=================
-+*/
-+char *Sys_DefaultLibPath(void)
-+{
-+	if (*libPath)
-+		return libPath;
-+	else
-+		return Sys_Cwd();
-+}
-+
-+/*
-+=================
- Sys_DefaultAppPath
- =================
- */
-@@ -490,6 +514,14 @@
- #	endif
- #endif
- 
-+#ifndef DEFAULT_LIBDIR
-+#	ifdef MACOS_X
-+#		define DEFAULT_LIBDIR Sys_StripAppBundle(Sys_BinaryPath())
-+#	else
-+#		define DEFAULT_LIBDIR Sys_BinaryPath()
-+#	endif
-+#endif
-+
- /*
- =================
- Sys_SigHandler
-@@ -564,6 +596,7 @@
- 	Sys_ParseArgs( argc, argv );
- 	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
- 	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );
-+	Sys_SetDefaultLibPath( DEFAULT_LIBDIR );
- 
- 	// Concatenate the command line for passing to Com_Init
- 	for( i = 1; i < argc; i++ )

Property changes on: head/games/openarena/files/patch-feature-DEFAULT_LIBDIR
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/games/openarena/files/patch-code-qcommon-vm_x86.c
===================================================================
--- head/games/openarena/files/patch-code-qcommon-vm_x86.c	(revision 414031)
+++ head/games/openarena/files/patch-code-qcommon-vm_x86.c	(nonexistent)
@@ -1,14 +0,0 @@
---- code/qcommon/vm_x86.c.orig	2014-03-23 14:53:59.000000000 +0100
-+++ code/qcommon/vm_x86.c	2014-03-23 14:55:33.000000000 +0100
-@@ -91,7 +91,11 @@
- static void (*const asmCallPtr)(void) = AsmCall;
- 
- 
-+#ifdef __clang__
-+	int		callMask = 0;
-+#else
- static	int		callMask = 0;
-+#endif
- 
- static	int	instruction, pass;
- static	int	lastConst = 0;

Property changes on: head/games/openarena/files/patch-code-qcommon-vm_x86.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/games/openarena/files/patch-Makefile
===================================================================
--- head/games/openarena/files/patch-Makefile	(revision 414031)
+++ head/games/openarena/files/patch-Makefile	(revision 414032)
@@ -1,70 +1,70 @@
---- Makefile.orig	2011-12-13 02:48:49.000000000 +0400
-+++ Makefile	2015-09-30 17:16:31.951089000 +0300
-@@ -205,6 +205,8 @@
+--- Makefile.orig	2011-12-12 22:48:49 UTC
++++ Makefile
+@@ -205,6 +205,8 @@ ifneq ($(BUILD_CLIENT),0)
      OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
      SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
      SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
 +    VORBIS_CFLAGS=$(shell pkg-config --silence-errors --cflags vorbis vorbisfile)
 +    VORBIS_LIBS=$(shell pkg-config --silence-errors --libs vorbis vorbisfile)
    endif
    # Use sdl-config if all else fails
    ifeq ($(SDL_CFLAGS),)
-@@ -570,9 +572,15 @@
+@@ -570,9 +572,15 @@ else # ifeq mingw32
  
  ifeq ($(PLATFORM),freebsd)
  
 +  # system integration
 +  ifndef DEFAULT_LIBDIR
 +    DEFAULT_LIBDIR = /usr/local/lib/openarena
 +  endif
 +
    # flags
    BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \
      -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
 +    -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\" \
      -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
    CLIENT_CFLAGS = $(SDL_CFLAGS)
    SERVER_CFLAGS = 
-@@ -595,27 +603,24 @@
+@@ -595,27 +603,24 @@ ifeq ($(PLATFORM),freebsd)
  
    # optional features/libraries
    ifeq ($(USE_OPENAL),1)
 -    CLIENT_CFLAGS += -DUSE_OPENAL
 +    CLIENT_CFLAGS += -DUSE_OPENAL $(OPENAL_CFLAGS)
 +    CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
      ifeq ($(USE_OPENAL_DLOPEN),1)
        CLIENT_CFLAGS += -DUSE_OPENAL_DLOPEN
 -      CLIENT_LIBS += $(THREAD_LIBS) -lopenal
      endif
    endif
  
    ifeq ($(USE_CURL),1)
 -    CLIENT_CFLAGS += -DUSE_CURL
 +    CLIENT_CFLAGS += -DUSE_CURL $(CURL_CFLAGS)
 +    CLIENT_LIBS += $(CURL_LIBS)
      ifeq ($(USE_CURL_DLOPEN),1)
        CLIENT_CFLAGS += -DUSE_CURL_DLOPEN
 -      CLIENT_LIBS += -lcurl
      endif
    endif
  
    ifeq ($(USE_CODEC_VORBIS),1)
 -    CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
 -  endif
 -
 -  ifeq ($(USE_CODEC_VORBIS),1)
 -    CLIENT_LIBS += -lvorbisfile -lvorbis -logg
 +    CLIENT_CFLAGS += -DUSE_CODEC_VORBIS $(VORBIS_CFLAGS)
 +    CLIENT_LIBS += $(VORBIS_LIBS)
    endif
  
    # cross-compiling tweaks
-@@ -897,7 +902,7 @@
+@@ -897,7 +902,7 @@ ifeq ($(USE_VOIP),1)
    CLIENT_CFLAGS += -DUSE_VOIP
    SERVER_CFLAGS += -DUSE_VOIP
    ifeq ($(USE_INTERNAL_SPEEX),1)
 -    CLIENT_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
 +    CLIENT_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(CLIENT_CFLAGS)
    else
      CLIENT_LIBS += -lspeex -lspeexdsp
    endif
Index: head/games/openarena/files/patch-code_qcommon_files.c
===================================================================
--- head/games/openarena/files/patch-code_qcommon_files.c	(nonexistent)
+++ head/games/openarena/files/patch-code_qcommon_files.c	(revision 414032)
@@ -0,0 +1,30 @@
+--- code/qcommon/files.c.orig	2011-12-24 12:29:32 UTC
++++ code/qcommon/files.c
+@@ -250,6 +250,7 @@ static  cvar_t          *fs_apppath;
+ #endif
+ 
+ static	cvar_t		*fs_basepath;
++static	cvar_t		*fs_libpath;
+ static	cvar_t		*fs_basegame;
+ static	cvar_t		*fs_gamedirvar;
+ static	searchpath_t	*fs_searchpaths;
+@@ -2859,6 +2860,7 @@ static void FS_Startup( const char *game
+ 	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
+ 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
+ 	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
++	fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
+ 	homePath = Sys_DefaultHomePath();
+ 	if (!homePath || !homePath[0]) {
+ 		homePath = fs_basepath->string;
+@@ -2878,6 +2880,11 @@ static void FS_Startup( const char *game
+ 	if (fs_apppath->string[0])
+ 		FS_AddGameDirectory(fs_apppath->string, gameName);
+ 	#endif
++
++	// Search default library location if given
++	if (fs_libpath->string[0]) {
++		FS_AddGameDirectory ( fs_libpath->string, gameName );
++	}
+ 	
+ 	// NOTE: same filtering below for mods and basegame
+ 	if (fs_homepath->string[0] && Q_stricmp(fs_homepath->string,fs_basepath->string)) {

Property changes on: head/games/openarena/files/patch-code_qcommon_files.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/openarena/files/patch-code_qcommon_qcommon.h
===================================================================
--- head/games/openarena/files/patch-code_qcommon_qcommon.h	(nonexistent)
+++ head/games/openarena/files/patch-code_qcommon_qcommon.h	(revision 414032)
@@ -0,0 +1,12 @@
+--- code/qcommon/qcommon.h.orig	2011-12-24 12:29:32 UTC
++++ code/qcommon/qcommon.h
+@@ -1099,6 +1099,9 @@ char	*Sys_DefaultInstallPath(void);
+ char    *Sys_DefaultAppPath(void);
+ #endif
+ 
++void	Sys_SetDefaultLibPath(const char *path);
++char	*Sys_DefaultLibPath(void);
++
+ void  Sys_SetDefaultHomePath(const char *path);
+ char	*Sys_DefaultHomePath(void);
+ const char	*Sys_TempPath(void);

Property changes on: head/games/openarena/files/patch-code_qcommon_qcommon.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/openarena/files/patch-code_qcommon_vm__x86.c
===================================================================
--- head/games/openarena/files/patch-code_qcommon_vm__x86.c	(nonexistent)
+++ head/games/openarena/files/patch-code_qcommon_vm__x86.c	(revision 414032)
@@ -0,0 +1,15 @@
+--- code/qcommon/vm_x86.c.orig	2016-04-01 10:07:17 UTC
++++ code/qcommon/vm_x86.c
+@@ -90,8 +90,11 @@ static	int		ftolPtr = (int)qftol0F7F;
+ void AsmCall(void);
+ static void (*const asmCallPtr)(void) = AsmCall;
+ 
+-
++#ifdef __clang__
++	int		callMask = 0;
++#else
+ static	int		callMask = 0;
++#endif
+ 
+ static	int	instruction, pass;
+ static	int	lastConst = 0;

Property changes on: head/games/openarena/files/patch-code_qcommon_vm__x86.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/openarena/files/patch-code_sys_sys__main.c
===================================================================
--- head/games/openarena/files/patch-code_sys_sys__main.c	(nonexistent)
+++ head/games/openarena/files/patch-code_sys_sys__main.c	(revision 414032)
@@ -0,0 +1,63 @@
+--- code/sys/sys_main.c.orig	2011-12-24 12:29:37 UTC
++++ code/sys/sys_main.c
+@@ -49,6 +49,7 @@ Foundation, Inc., 51 Franklin St, Fifth 
+ 
+ static char binaryPath[ MAX_OSPATH ] = { 0 };
+ static char installPath[ MAX_OSPATH ] = { 0 };
++static char libPath[ MAX_OSPATH ] = { 0 };
+ 
+ /*
+ =================
+@@ -95,6 +96,29 @@ char *Sys_DefaultInstallPath(void)
+ 
+ /*
+ =================
++Sys_SetDefaultLibPath
++=================
++*/
++void Sys_SetDefaultLibPath(const char *path)
++{
++	Q_strncpyz(libPath, path, sizeof(libPath));
++}
++
++/*
++=================
++Sys_DefaultLibPath
++=================
++*/
++char *Sys_DefaultLibPath(void)
++{
++	if (*libPath)
++		return libPath;
++	else
++		return Sys_Cwd();
++}
++
++/*
++=================
+ Sys_DefaultAppPath
+ =================
+ */
+@@ -490,6 +514,14 @@ void Sys_ParseArgs( int argc, char **arg
+ #	endif
+ #endif
+ 
++#ifndef DEFAULT_LIBDIR
++#	ifdef MACOS_X
++#		define DEFAULT_LIBDIR Sys_StripAppBundle(Sys_BinaryPath())
++#	else
++#		define DEFAULT_LIBDIR Sys_BinaryPath()
++#	endif
++#endif
++
+ /*
+ =================
+ Sys_SigHandler
+@@ -564,6 +596,7 @@ int main( int argc, char **argv )
+ 	Sys_ParseArgs( argc, argv );
+ 	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
+ 	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );
++	Sys_SetDefaultLibPath( DEFAULT_LIBDIR );
+ 
+ 	// Concatenate the command line for passing to Com_Init
+ 	for( i = 1; i < argc; i++ )

Property changes on: head/games/openarena/files/patch-code_sys_sys__main.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/openarena-data/Makefile
===================================================================
--- head/games/openarena-data/Makefile	(revision 414031)
+++ head/games/openarena-data/Makefile	(revision 414032)
@@ -1,33 +1,35 @@
 # Created by: Dominic Fandrey
 # $FreeBSD$
 
 PORTNAME=	data
 PORTVERSION=	0.8.8
 CATEGORIES=	games
 MASTER_SITES=	SF/oarena:data \
 		http://openarena.ws/request.php?4%23/:data \
 		SF/oarena:patch \
 		http://openarena.ws/request.php?5%23/:patch
 DISTFILES=	${OA_DATA}:data
 EXTRACT_ONLY=
 
-MAINTAINER=	kamikaze@bsdforen.de
+MAINTAINER=	kami@freebsd.org
 COMMENT=	OpenArena game data files
+
+LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/baseoa
 NO_BUILD=	yes
 
 OA_DATA=	${PKGNAMEPREFIX}${OA_DATA_VER}.zip
 OA_DATA_VER=	0.8.8
 
 .include "${.CURDIR}/../openarena/Makefile.include"
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for _file in ${DISTFILES:C/:[^:]*//}
 	${TAR} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${_file} \
 		${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${DATADIR} \
 		--strip-components 2 ${PKGNAMEPREFIX}\?.\?.\?/baseoa/
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/games/openarena-oax/Makefile
===================================================================
--- head/games/openarena-oax/Makefile	(revision 414031)
+++ head/games/openarena-oax/Makefile	(revision 414032)
@@ -1,28 +1,31 @@
 # Created by: Dominic Fandrey
 # $FreeBSD$
 
 PORTNAME=	oax
 PORTVERSION=	B51
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://files.poulsander.com/~poul19/public_files/eliminationSource/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	kamikaze@bsdforen.de
+MAINTAINER=	kami@freebsd.org
 COMMENT=	OpenArena Mod: OpenArena Xpanded
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 PLIST_SUB+=	DISTNAME="${DISTNAME}" \
 		PORTNAME="${PORTNAME}"
 
 USES=		zip
 NO_BUILD=	yes
 
 OABASE=		${DISTNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 
 .include "../openarena/Makefile.include"
 
 .include <bsd.port.post.mk>
Index: head/games/openarena-server/Makefile
===================================================================
--- head/games/openarena-server/Makefile	(revision 414031)
+++ head/games/openarena-server/Makefile	(revision 414032)
@@ -1,14 +1,16 @@
 # Created by: Dominic Fandrey
 # $FreeBSD$
 
 PORTNAME=	openarena
 PKGNAMESUFFIX=	-server
 
-MAINTAINER=	kamikaze@bsdforen.de
+MAINTAINER=	kami@freebsd.org
 COMMENT=	OpenArena dedicated server
+
+LICENSE=	GPLv2
 
 MASTERDIR=	${.CURDIR}/../${PORTNAME}
 
 IOQ3=		SERVER
 
 .include "${MASTERDIR}/Makefile"
Index: head/games/urbanterror-data/Makefile
===================================================================
--- head/games/urbanterror-data/Makefile	(revision 414031)
+++ head/games/urbanterror-data/Makefile	(revision 414032)
@@ -1,51 +1,50 @@
 # Created by: alepulver
 # $FreeBSD$
 
 PORTNAME=	data
-PORTVERSION=	4.2.018
+PORTVERSION=	4.2.023
 CATEGORIES=	games
 MASTER_SITES=	http://cdn.urbanterror.info/urt/42/zips/ \
 		http://www.f1m.fr/uploads/urt/ \
 		http://mirror.urtstats.net/urbanterror/
 PKGNAMEPREFIX=	urbanterror-
 DISTNAME=	UrbanTerror${URT_VER}_full${URT_REV}
 EXTRACT_SUFX=	.zip
 EXTRACT_ONLY=
 
-MAINTAINER=	kamikaze@bsdforen.de
+MAINTAINER=	kami@freebsd.org
 COMMENT=	Standalone realism based mod originally for Quake III Arena
 
 NO_BUILD=	yes
 NO_CDROM=	The mod files may not be sold or distributed on physical media unless with permission from id Software.
 
 DATADIR=	${PREFIX}/share/quake3
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 URT_VER=	${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 URT_REV=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\2/}
 
 PLIST_SUB+=	VER=${URT_VER}
 
 OPTIONS_DEFINE=	DOCS
+OPTIONS_SUB=	yes
 
 UTDOCS=		readme${URT_VER}.txt \
 		How_To_Install.txt \
 		QIIIA_Game_Source_License.doc
 
 .include <bsd.port.options.mk>
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/q3ut4
 	${TAR} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \
 		${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${DATADIR} --strip-components 1 \
 		UrbanTerror${URT_VER}/q3ut4
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for utdoc in ${UTDOCS}
-	${MV} ${STAGEDIR}${DATADIR}/q3ut4/${utdoc} ${STAGEDIR}${DOCSDIR}
-.endfor
+	${MV} ${UTDOCS:C!^!${STAGEDIR}${DATADIR}/q3ut4/!} ${STAGEDIR}${DOCSDIR}/
 .else
-	${RM} ${STAGEDIR}${DATADIR}/q3ut4/readme${URT_VER}.txt
+	${RM} ${UTDOCS:C!^!${STAGEDIR}${DATADIR}/q3ut4/!}
 .endif
 
 .include <bsd.port.mk>
Index: head/games/urbanterror-data/distinfo
===================================================================
--- head/games/urbanterror-data/distinfo	(revision 414031)
+++ head/games/urbanterror-data/distinfo	(revision 414032)
@@ -1,2 +1,2 @@
-SHA256 (UrbanTerror42_full018.zip) = 10710c5b762687a75a7abd3cc56de005ce12dcb7ac14c08f40bcb4e9d96f4e83
-SIZE (UrbanTerror42_full018.zip) = 1702949967
+SHA256 (UrbanTerror42_full023.zip) = e287e2a17432b81551f5c16e431d752484ce9be10508e756542f653757a29090
+SIZE (UrbanTerror42_full023.zip) = 1924172827
Index: head/games/urbanterror-data/pkg-plist
===================================================================
--- head/games/urbanterror-data/pkg-plist	(revision 414031)
+++ head/games/urbanterror-data/pkg-plist	(revision 414032)
@@ -1,35 +1,39 @@
-%%PORTDOCS%%%%DOCSDIR%%/readme%%VER%%.txt
-%%PORTDOCS%%%%DOCSDIR%%/How_To_Install.txt
-%%PORTDOCS%%%%DOCSDIR%%/QIIIA_Game_Source_License.doc
 %%DATADIR%%/q3ut4/autoexec_example.cfg
 %%DATADIR%%/q3ut4/mapcycle_example.txt
 %%DATADIR%%/q3ut4/server_example.cfg
 %%DATADIR%%/q3ut4/ut4_commune.pk3
 %%DATADIR%%/q3ut4/ut4_jumpents.pk3
 %%DATADIR%%/q3ut4/zUrT42_0001.pk3
 %%DATADIR%%/q3ut4/zUrT42_0002.pk3
 %%DATADIR%%/q3ut4/zUrT42_0003.pk3
 %%DATADIR%%/q3ut4/zUrT42_0004.pk3
 %%DATADIR%%/q3ut4/zUrT42_0005.pk3
 %%DATADIR%%/q3ut4/zUrT42_0006.pk3
 %%DATADIR%%/q3ut4/zUrT42_0007.pk3
 %%DATADIR%%/q3ut4/zUrT42_0008.pk3
 %%DATADIR%%/q3ut4/zUrT42_0009.pk3
 %%DATADIR%%/q3ut4/zUrT42_0010.pk3
 %%DATADIR%%/q3ut4/zUrT42_0011.pk3
 %%DATADIR%%/q3ut4/zUrT42_0012.pk3
 %%DATADIR%%/q3ut4/zUrT42_0013.pk3
 %%DATADIR%%/q3ut4/zUrT42_0014.pk3
 %%DATADIR%%/q3ut4/zUrT42_0015.pk3
 %%DATADIR%%/q3ut4/zUrT42_0016.pk3
 %%DATADIR%%/q3ut4/zUrT42_0017.pk3
 %%DATADIR%%/q3ut4/zUrT42_0018.pk3
 %%DATADIR%%/q3ut4/zUrT42_0019.pk3
 %%DATADIR%%/q3ut4/zUrT42_0020.pk3
 %%DATADIR%%/q3ut4/zUrT42_0021.pk3
 %%DATADIR%%/q3ut4/zUrT42_0022.pk3
 %%DATADIR%%/q3ut4/zUrT42_0023.pk3
 %%DATADIR%%/q3ut4/zUrT42_0024.pk3
 %%DATADIR%%/q3ut4/zUrT42_0025.pk3
 %%DATADIR%%/q3ut4/zUrT42_0026.pk3
+%%DATADIR%%/q3ut4/zUrT42_0027.pk3
+%%DATADIR%%/q3ut4/zUrT42_0028.pk3
+%%DATADIR%%/q3ut4/zUrT42_0029.pk3
+%%DATADIR%%/q3ut4/zUrT42_0030.pk3
 %%DATADIR%%/q3ut4/zUrT42_qvm.pk3
+%%DOCS%%%%DOCSDIR%%/How_To_Install.txt
+%%DOCS%%%%DOCSDIR%%/QIIIA_Game_Source_License.doc
+%%DOCS%%%%DOCSDIR%%/readme42.txt