games: ioquak3* iourbanterror* openarena*: Update and stage support

The patch applied without incident.  Tested on DragonFly poudriere,
everything built fine.  It include an i386 fix, which is why the
previous commit was reverted.

The only modification was to change EXTRACT_CMD to TAR in a couple
of places.

PR:		ports/187859
submitted by;	maintainer (Dominic Fandrey)

4 files changed, 43 insertions, 83 deletions

diff --git a/games/iourbanterror/Makefile b/games/iourbanterror/Makefile
index 7bd522d9758c..3277d5d10e0c 100644
--- a/games/iourbanterror/Makefile
+++ b/games/iourbanterror/Makefile
@@ -2,25 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	iourbanterror
-PORTVERSION=	${GAMEVERSION}.g${GITREVISION}
+PORTVERSION=	${GAMEVERSION}.${DISTVERSION}
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	games
-DISTNAME=	ioquake3-devel-GIT${GITREVISION}
+DISTNAME=	ioquake3-${DISTVERSION}
 
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Quake 3 engine modified for Urban Terror (based on ioquake3)
 
 RUN_DEPENDS=	${Q3DIR}/q3ut4:${PORTSDIR}/games/urbanterror-data
 
-MASTERDIR=	${.CURDIR}/../ioquake3-devel
-DISTINFO_FILE=	${.CURDIR}/../ioquake3-devel/distinfo
+MASTERDIR=	${.CURDIR}/../ioquake3
 
-IOQ3?=		CLIENT DLRENDERER OPUS OPENGL2
+IOQ3?=		CLIENT
 
 # The docs belong to ioquake3
 OPTIONS_EXCLUDE=	DOCS
-GAMEVERSION=	4.2.014
-Q3ENGINEVER=	GIT${GITREVISION}+${GAMEVERSION}
+GAMEVERSION=	4.2.018
+Q3ENGINEVER=	${DISTVERSION}+${GAMEVERSION}
 Q3TOTALCONV=	yes
 Q3DIR=		${PREFIX}/share/quake3
 Q3ICON=		${PREFIX}/share/quake3/q3ut4/q3ut.ico
@@ -33,8 +33,11 @@ HOMEPATH=	/.ioUrbanTerror
 MAKE_ARGS+=	BUILD_MISSIONPACK=0 \
 		BUILD_STANDALONE=1
 
-NO_STAGE=	yes
 post-patch:
+	@(cd ${WRKSRC} && \
+          for pfile in ${.CURDIR}/../${PORTNAME}/files/patch-*; do \
+		${PATCH} < $${pfile}; \
+	  done) 
 	@${REINPLACE_CMD} \
 		-e 's/ioquake3/${Q3CLIENT}/g' \
 		-e 's/ioq3ded/${Q3SERVER}/g' \
diff --git a/games/iourbanterror/files/patch-code-qcommon-q_shared.h b/games/iourbanterror/files/patch-code-qcommon-q_shared.h
index 75f9a0ea9d9b..633760e3d5bb 100644
--- a/games/iourbanterror/files/patch-code-qcommon-q_shared.h
+++ b/games/iourbanterror/files/patch-code-qcommon-q_shared.h
@@ -1,6 +1,6 @@
---- code/qcommon/q_shared.h.orig	2011-10-27 02:45:12.000000000 +0200
-+++ code/qcommon/q_shared.h	2011-10-27 02:47:17.000000000 +0200
-@@ -27,15 +27,15 @@
+--- 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 @@
  // A user mod should never modify this file
  
  #ifdef STANDALONE
@@ -8,17 +8,13 @@
 -  #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 HOMEPATH_NAME_UNIX		HOMEPATH
-   #define HOMEPATH_NAME_WIN		"FooBar"
-   #define HOMEPATH_NAME_MACOSX		HOMEPATH_NAME_WIN
--  #define GAMENAME_FOR_MASTER		"foobar"	// must NOT contain whitespace
--//  #define LEGACY_PROTOCOL	// You probably don't need this for your standalone game
 +  #define GAMENAME_FOR_MASTER		"Quake3Arena"	// must NOT contain whitespace
-+  #define LEGACY_PROTOCOL	// You probably don't need this for your standalone game
++  #define LEGACY_PROTOCOL
  #else
    #define PRODUCT_NAME			"ioq3"
    #define BASEGAME			"baseq3"
diff --git a/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c b/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c
index 66e20bc6c3fb..d09b5be36ec6 100644
--- a/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c
+++ b/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c
@@ -1,37 +1,16 @@
---- code/qcommon/vm_interpreted.c.orig	2013-07-15 18:54:41.000000000 +0000
-+++ code/qcommon/vm_interpreted.c
-@@ -436,21 +436,21 @@ nextInstruction2:
- 				return 0;
- 			}
- #endif
--			r0 = opStack[opStackOfs] = *(int *) &image[r0 & dataMask & ~3 ];
-+			r0 = opStack[opStackOfs] = *(int *) &image[r0 & dataMask ];
- 			goto nextInstruction2;
- 		case OP_LOAD2:
--			r0 = opStack[opStackOfs] = *(unsigned short *)&image[ r0&dataMask&~1 ];
-+			r0 = opStack[opStackOfs] = *(unsigned short *)&image[ r0&dataMask ];
- 			goto nextInstruction2;
- 		case OP_LOAD1:
- 			r0 = opStack[opStackOfs] = image[ r0&dataMask ];
+--- 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 @@
  			goto nextInstruction2;
  
  		case OP_STORE4:
 -			*(int *)&image[ r1&(dataMask & ~3) ] = r0;
-+			*(int *)&image[ r1&dataMask ] = r0;
- 			opStackOfs -= 2;
++			*(int *)&image[ r1&(dataMask) ] = r0;
+ 			opStack -= 2;
  			goto nextInstruction;
  		case OP_STORE2:
 -			*(short *)&image[ r1&(dataMask & ~1) ] = r0;
-+			*(short *)&image[ r1&dataMask ] = r0;
- 			opStackOfs -= 2;
++			*(short *)&image[ r1&(dataMask) ] = r0;
+ 			opStack -= 2;
  			goto nextInstruction;
  		case OP_STORE1:
-@@ -460,7 +460,7 @@ nextInstruction2:
- 
- 		case OP_ARG:
- 			// single byte offset from programStack
--			*(int *)&image[ (codeImage[programCounter] + programStack)&dataMask&~3 ] = r0;
-+			*(int *)&image[ (codeImage[programCounter] + programStack)&dataMask ] = r0;
- 			opStackOfs--;
- 			programCounter += 1;
- 			goto nextInstruction;
diff --git a/games/iourbanterror/files/patch-code-qcommon-vm_x86.c b/games/iourbanterror/files/patch-code-qcommon-vm_x86.c
index c2e05d74b818..ce49e652baf8 100644
--- a/games/iourbanterror/files/patch-code-qcommon-vm_x86.c
+++ b/games/iourbanterror/files/patch-code-qcommon-vm_x86.c
@@ -1,38 +1,20 @@
---- code/qcommon/vm_x86.c.orig	2013-07-15 18:54:41.000000000 +0000
-+++ code/qcommon/vm_x86.c
-@@ -783,7 +783,7 @@ qboolean ConstOptimize(vm_t *vm, int cal
- 		return qtrue;
- 
- 	case OP_STORE4:
--		EmitMovEAXStack(vm, (vm->dataMask & ~3));
-+		EmitMovEAXStack(vm, vm->dataMask);
- #if idx64
- 		EmitRexString(0x41, "C7 04 01");		// mov dword ptr [r9 + eax], 0x12345678
- 		Emit4(Constant4());
-@@ -798,7 +798,7 @@ qboolean ConstOptimize(vm_t *vm, int cal
- 		return qtrue;
- 
- 	case OP_STORE2:
--		EmitMovEAXStack(vm, (vm->dataMask & ~1));
-+		EmitMovEAXStack(vm, vm->dataMask);
- #if idx64
- 		Emit1(0x66);					// mov word ptr [r9 + eax], 0x1234
- 		EmitRexString(0x41, "C7 04 01");
-@@ -1369,7 +1369,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *he
- 		case OP_STORE4:
- 			EmitMovEAXStack(vm, 0);	
- 			EmitString("8B 54 9F FC");			// mov edx, dword ptr -4[edi + ebx * 4]
--			MASK_REG("E2", vm->dataMask & ~3);		// and edx, 0x12345678
-+			MASK_REG("E2", vm->dataMask);			// and edx, 0x12345678
- #if idx64
- 			EmitRexString(0x41, "89 04 11");		// mov dword ptr [r9 + edx], eax
- #else
-@@ -1381,7 +1381,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *he
- 		case OP_STORE2:
- 			EmitMovEAXStack(vm, 0);	
- 			EmitString("8B 54 9F FC");			// mov edx, dword ptr -4[edi + ebx * 4]
--			MASK_REG("E2", vm->dataMask & ~1);		// and edx, 0x12345678
-+			MASK_REG("E2", vm->dataMask);			// and edx, 0x12345678
- #if idx64
- 			Emit1(0x66);					// mov word ptr [r9 + edx], eax
- 			EmitRexString(0x41, "89 04 11");
+--- 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 @@
+ 				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 @@
+ 				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) {