Index: games/iourbanterror/Makefile =================================================================== --- games/iourbanterror/Makefile +++ games/iourbanterror/Makefile @@ -2,29 +2,36 @@ # $FreeBSD$ PORTNAME= iourbanterror -PORTVERSION= ${GAMEVERSION}.${DISTVERSION} -PORTREVISION= 2 +DISTVERSION= ${GAMEVERSION} +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= games -DISTNAME= ioquake3-${DISTVERSION} +MASTER_SITES= 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 +DISTINFO_FILE= ${.CURDIR}/../${PORTNAME}/distinfo PATCHDIR= ${.CURDIR}/../${PORTNAME}/files +URTDATADIR= ${.CURDIR}/../urbanterror-data IOQ3?= CLIENT -# The docs belong to ioquake3 -OPTIONS_EXCLUDE= DOCS -GAMEVERSION= 4.2.023 -Q3ENGINEVER= ${DISTVERSION}+${GAMEVERSION} +USE_GITHUB= yes +GH_ACCOUNT= lonkamikaze +GH_PROJECT= urt4-freebsd +GH_TAGNAME= freebsd-${Q3ENGINEVER} + +# Not supported +OPTIONS_EXCLUDE= DOCS MUMBLE + +Q3ENGINEVER= ${GAMEVERSION}.1 Q3TOTALCONV= yes Q3DIR= ${PREFIX}/share/quake3 Q3ICON= ${PREFIX}/share/quake3/q3ut4/q3ut.ico @@ -34,19 +41,21 @@ 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 + +# Remove this when 9.x is EOL +MAKE_ARGS+= USE_SSE=${ARCH:Mi386:C/.+/0/:C/^$/1/} 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 = 1482958610 +SHA256 (lonkamikaze-urt4-freebsd-4.3.1-freebsd-4.3.1.1_GH0.tar.gz) = b513dd50778a70602103349ac1f2a19518fadc050f243b144b522989d1304bba +SIZE (lonkamikaze-urt4-freebsd-4.3.1-freebsd-4.3.1.1_GH0.tar.gz) = 12024469 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. Index: games/urbanterror-data/Makefile =================================================================== --- games/urbanterror-data/Makefile +++ games/urbanterror-data/Makefile @@ -2,19 +2,27 @@ # $FreeBSD$ PORTNAME= data -PORTVERSION= 4.2.023 +PORTVERSION= ${GAMEVERSION} CATEGORIES= games -MASTER_SITES= http://cdn.urbanterror.info/urt/42/zips/ \ - http://www.f1m.fr/uploads/urt/ \ - http://mirror.urtstats.net/urbanterror/ +MASTER_SITES= http://cdn.urbanterror.info/urt/${URT_VER}/releases/zips/ \ + https://up.barbatos.fr/urt/ \ + http://www.happyurtday.com/releases/4x/ \ + http://files.cucurb.net/UrbanTerror/ PKGNAMEPREFIX= urbanterror- -DISTNAME= UrbanTerror${URT_VER}_full${URT_REV} +DISTNAME= UrbanTerror${URT_VER}${URT_REV}_full EXTRACT_SUFX= .zip EXTRACT_ONLY= MAINTAINER= kami@freebsd.org COMMENT= Standalone realism based mod originally for Quake III Arena +LICENSE= EULA +LICENSE_NAME= Urban Terror Terms of Service +LICENSE_TEXT= Personal, non-commercial uses only, re-distribution \ + is not permitted: \ + http://www.urbanterror.info/support/36-terms-of-service/ +LICENSE_PERMS= none + NO_BUILD= yes NO_CDROM= The mod files may not be sold or distributed on physical media unless with permission from id Software. @@ -35,9 +43,10 @@ OPTIONS_SUB= yes UTDOCS= readme${URT_VER}.txt \ - How_To_Install.txt \ QIIIA_Game_Source_License.doc +.include "Makefile.include" + .include do-install: Index: games/urbanterror-data/Makefile.include =================================================================== --- /dev/null +++ games/urbanterror-data/Makefile.include @@ -0,0 +1 @@ +GAMEVERSION= 4.3.1 Index: games/urbanterror-data/distinfo =================================================================== --- games/urbanterror-data/distinfo +++ games/urbanterror-data/distinfo @@ -1,2 +1,3 @@ -SHA256 (UrbanTerror42_full023.zip) = e287e2a17432b81551f5c16e431d752484ce9be10508e756542f653757a29090 -SIZE (UrbanTerror42_full023.zip) = 1924172827 +TIMESTAMP = 1479836507 +SHA256 (UrbanTerror431_full.zip) = 9c19556ad462e45bfd97e6c8cc1fa04206719c13f7480e6fef4eb8fcc4f2d6b5 +SIZE (UrbanTerror431_full.zip) = 1462419175 Index: games/urbanterror-data/pkg-plist =================================================================== --- games/urbanterror-data/pkg-plist +++ games/urbanterror-data/pkg-plist @@ -1,39 +1,28 @@ %%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 +%%DATADIR%%/q3ut4/zUrT%%VER%%_001.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_002.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_003.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_004.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_005.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_006.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_007.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_008.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_009.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_010.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_011.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_012.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_013.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_014.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_015.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_016.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_017.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_018.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_019.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_020.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_021.pk3 +%%DATADIR%%/q3ut4/zUrT%%VER%%_qvm.pk3 %%DOCS%%%%DOCSDIR%%/QIIIA_Game_Source_License.doc -%%DOCS%%%%DOCSDIR%%/readme42.txt +%%DOCS%%%%DOCSDIR%%/readme%%VER%%.txt