Index: games/iourbanterror/Makefile
===================================================================
--- games/iourbanterror/Makefile
+++ games/iourbanterror/Makefile
@@ -2,29 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	iourbanterror
-PORTVERSION=	${GAMEVERSION}.${IOQUAKE3VER}
-PORTREVISION=	2
+DISTVERSION=	${GAMEVERSION}
+DISTVERSIONPREFIX= freebsd-
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	games
-DISTNAME=	ioquake3-${IOQUAKE3VER}
 
 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
 
+RUN_DEPENDS=	urbanterror-data>0:games/urbanterror-data
+
 MASTERDIR=	${.CURDIR}/../ioquake3
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+PKGMESSAGE=	${.CURDIR}/../${PORTNAME}/pkg-message
+DISTINFO_FILE=	${.CURDIR}/../${PORTNAME}/distinfo
 PATCHDIR=	${.CURDIR}/../${PORTNAME}/files
+URTDATADIR=	${.CURDIR}/../urbanterror-data
 
 IOQ3?=		CLIENT
+IOQ3SDL=	sdl
 
-# The docs belong to ioquake3
-OPTIONS_EXCLUDE=	DOCS
-GAMEVERSION=	4.2.023
-Q3ENGINEVER=	${DISTVERSION}+${GAMEVERSION}
+GH_PROJECT=	urt4-freebsd
+
+# Not supported
+OPTIONS_EXCLUDE=	DOCS MUMBLE
+
+Q3ENGINEVER=	${GAMEVERSION}.1
 Q3TOTALCONV=	yes
 Q3DIR=		${PREFIX}/share/quake3
 Q3ICON=		${PREFIX}/share/quake3/q3ut4/q3ut.ico
@@ -34,19 +40,18 @@
 BINSUFFIX=
 HOMEPATH=	/.ioUrbanTerror
 
-MAKE_ARGS+=	BUILD_MISSIONPACK=0 \
-		BUILD_STANDALONE=1
+.if ${IOQ3:MCLIENT}
+USE_XORG+=	x11 xxf86dga xxf86vm
+# Build without CURL is broken
+OPTIONS_SLAVE=	CURL
+.endif
 
 pre-patch:
-	@(cd ${WRKSRC} && \
-	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' \
+		-e 's/Quake3-UrT/${Q3CLIENT}/g' \
+		-e 's/ioUrbanTerror-Ded/${Q3SERVER}/g' \
 		"${WRKSRC}/Makefile"
 
+.include "${URTDATADIR}/Makefile.include"
+
 .include "${MASTERDIR}/Makefile"
Index: games/iourbanterror/distinfo
===================================================================
--- /dev/null
+++ games/iourbanterror/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1494520027
+SHA256 (lonkamikaze-urt4-freebsd-freebsd-4.3.2_GH0.tar.gz) = d1a2bddaba33cad273773bcc2e54b965955bf5f459f1a7b2cfac0006286d76ff
+SIZE (lonkamikaze-urt4-freebsd-freebsd-4.3.2_GH0.tar.gz) = 9561395
Index: games/iourbanterror/files/patch-code-qcommon-q_shared.h
===================================================================
--- games/iourbanterror/files/patch-code-qcommon-q_shared.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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: games/iourbanterror/files/patch-code-qcommon-qcommon.h
===================================================================
--- games/iourbanterror/files/patch-code-qcommon-qcommon.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
Index: games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c
===================================================================
--- games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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: games/iourbanterror/files/patch-code-qcommon-vm_x86.c
===================================================================
--- games/iourbanterror/files/patch-code-qcommon-vm_x86.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 @@ 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: games/iourbanterror/pkg-message
===================================================================
--- games/iourbanterror/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-Note, that the port was switched over to use the original ioquake project
-source code instead of code provided by the UrbanTerror project. The
-UrbanTerror project is switching to a closed source licensing model:
-	http://www.urbanterror.info/news/texts/285/
-
-Should the game have trouble meeting com_maxfps, set com_busywait 1 to restore
-the old behaviour.