From owner-svn-ports-all@FreeBSD.ORG Sun Jun 1 15:28:34 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DAFBC18F; Sun, 1 Jun 2014 15:28:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C4FE6256F; Sun, 1 Jun 2014 15:28:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51FSX7B024993; Sun, 1 Jun 2014 15:28:33 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s51FST1L024969; Sun, 1 Jun 2014 15:28:29 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406011528.s51FST1L024969@svn.freebsd.org> From: John Marino Date: Sun, 1 Jun 2014 15:28:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356137 - in head/games: ioquake3 ioquake3-devel ioquake3-devel-server ioquake3-server ioquake3/files iourbanterror iourbanterror-server iourbanterror/files openarena openarena-data ope... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2014 15:28:34 -0000 Author: marino Date: Sun Jun 1 15:28:29 2014 New Revision: 356137 URL: http://svnweb.freebsd.org/changeset/ports/356137 QAT: https://qat.redports.org/buildarchive/r356137/ Log: 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) Added: head/games/openarena/files/patch-code-qcommon-vm_x86.c (contents, props changed) Modified: head/games/ioquake3-devel-server/Makefile head/games/ioquake3-devel/Makefile head/games/ioquake3-devel/distinfo head/games/ioquake3-devel/pkg-descr head/games/ioquake3-server/Makefile head/games/ioquake3/Makefile head/games/ioquake3/files/patch-code-qcommon-vm_x86.c head/games/iourbanterror-server/Makefile head/games/iourbanterror/Makefile head/games/iourbanterror/files/patch-code-qcommon-q_shared.h head/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c head/games/iourbanterror/files/patch-code-qcommon-vm_x86.c head/games/openarena-data/Makefile head/games/openarena-oax/Makefile head/games/openarena-oax/distinfo head/games/openarena-server/Makefile head/games/openarena/Makefile head/games/urbanterror-data/Makefile head/games/urbanterror-data/distinfo head/games/urbanterror-data/pkg-plist Modified: head/games/ioquake3-devel-server/Makefile ============================================================================== --- head/games/ioquake3-devel-server/Makefile Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/ioquake3-devel-server/Makefile Sun Jun 1 15:28:29 2014 (r356137) @@ -12,5 +12,4 @@ MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER GAMELIBS -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/games/ioquake3-devel/Makefile ============================================================================== --- head/games/ioquake3-devel/Makefile Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/ioquake3-devel/Makefile Sun Jun 1 15:28:29 2014 (r356137) @@ -17,11 +17,16 @@ DISTINFO_FILE?= ${.CURDIR}/../${PORTNAME PATCHDIR?= ${.CURDIR}/../${PORTNAME}/files PKGMESSAGE?= ${.CURDIR}/../${PORTNAME}/pkg-message -GITREVISION?= 2178 +GITREVISION?= 2390 BINSUFFIX?= -devel IOQ3?= CLIENT TOOLS DLRENDERER GAMELIBS OPUS OPENGL2 IOQ3ARCH?= ${ARCH:S/i386/x86/:S/amd64/x86_64/} -NO_STAGE= yes +Q3DOCS?= README.md \ + id-readme.txt \ + md4-readme.txt \ + opengl2-readme.txt \ + voip-readme.txt + .include "${MASTERDIR}/Makefile" Modified: head/games/ioquake3-devel/distinfo ============================================================================== --- head/games/ioquake3-devel/distinfo Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/ioquake3-devel/distinfo Sun Jun 1 15:28:29 2014 (r356137) @@ -1,2 +1,2 @@ -SHA256 (ioquake3-devel-GIT2178.tar.xz) = 9567243047c7c0ef6f9e329a1c8be826bdce4f12d02685eb51ec3a8058324eb9 -SIZE (ioquake3-devel-GIT2178.tar.xz) = 4167780 +SHA256 (ioquake3-devel-GIT2390.tar.xz) = 1ad3a8bfccaa54ed39221f86539676479187f5f832a4140cf5d7ee7be9a1b1be +SIZE (ioquake3-devel-GIT2390.tar.xz) = 4310568 Modified: head/games/ioquake3-devel/pkg-descr ============================================================================== --- head/games/ioquake3-devel/pkg-descr Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/ioquake3-devel/pkg-descr Sun Jun 1 15:28:29 2014 (r356137) @@ -2,4 +2,7 @@ This port builds development snapshots o known to seldomly produce releases. Due to the conservative development goals of the project, development snapshots are generally considered reliable. +This port is based of a repository with FreeBSD specific changes: +https://github.com/lonkamikaze/ioq3-freebsd/tree/freebsd + WWW: http://ioquake3.org/ Modified: head/games/ioquake3-server/Makefile ============================================================================== --- head/games/ioquake3-server/Makefile Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/ioquake3-server/Makefile Sun Jun 1 15:28:29 2014 (r356137) @@ -12,5 +12,4 @@ MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER GAMELIBS -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/games/ioquake3/Makefile ============================================================================== --- head/games/ioquake3/Makefile Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/ioquake3/Makefile Sun Jun 1 15:28:29 2014 (r356137) @@ -14,7 +14,6 @@ COMMENT?= Cleaned-up and enhanced versio USES= pkgconfig gmake -NO_STAGE= yes # Port configuration flags: # CLIENT SERVER TOOLS DLRENDERER GAMELIBS OPUS OPENGL2 IOQ3?= CLIENT TOOLS GAMELIBS @@ -131,7 +130,7 @@ MAKE_ARGS+= BUILD_SERVER=0 .endif .if ${PORT_OPTIONS:MCURL} -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl MAKE_ARGS+= USE_CURL=1 USE_CURL_DLOPEN=0 .else MAKE_ARGS+= USE_CURL=0 @@ -145,18 +144,27 @@ MAKE_ARGS+= USE_OPENAL=0 .endif .if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis +NEED_OGG= yes +LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis MAKE_ARGS+= USE_CODEC_VORBIS=1 .else MAKE_ARGS+= USE_CODEC_VORBIS=0 .endif .if ${PORT_OPTIONS:MOPUS} -MAKE_ARGS+= USE_CODEC_OPUS=1 USE_INTERNAL_OPUS=1 +NEED_OGG= yes +LIB_DEPENDS+= libopusfile.so:${PORTSDIR}/audio/opusfile \ + libopus.so:${PORTSDIR}/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:${PORTSDIR}/audio/libogg +MAKE_ARGS+= USE_INTERNAL_OGG=0 +.endif + .if ${PORT_OPTIONS:MMUMBLE} MAKE_ARGS+= USE_MUMBLE=1 .else @@ -226,11 +234,11 @@ PLIST_FILES+= ${inst:C/.*;//} # Generate install target do-install: ${Q3INSTALL} .for dir in ${PLIST_DIRS} - ${MKDIR} ${PREFIX}/${dir} + ${MKDIR} ${STAGEDIR}${PREFIX}/${dir} .endfor .for inst in ${IOQ3_INST} ${INSTALL_${inst:C/;.*//}} ${BUILDDIR}/${inst:C/[^;]*;//:C/;.*//} \ - ${PREFIX}/${inst:C/.*;//} + ${STAGEDIR}${PREFIX}/${inst:C/.*;//} .endfor post-install: Modified: head/games/ioquake3/files/patch-code-qcommon-vm_x86.c ============================================================================== --- head/games/ioquake3/files/patch-code-qcommon-vm_x86.c Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/ioquake3/files/patch-code-qcommon-vm_x86.c Sun Jun 1 15:28:29 2014 (r356137) @@ -1,5 +1,5 @@ --- code/qcommon/vm_x86.c.orig 2008-08-18 01:22:06.000000000 +0200 -+++ code/qcommon/vm_x86.c 2010-11-27 14:01:33.000000000 +0100 ++++ code/qcommon/vm_x86.c 2013-11-14 11:44:27.000000000 +0100 @@ -36,7 +36,25 @@ /* need this on NX enabled systems (i386 with PAE kernel or @@ -27,3 +27,15 @@ #define VM_X86_MMAP #endif +@@ -90,7 +108,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; Modified: head/games/iourbanterror-server/Makefile ============================================================================== --- head/games/iourbanterror-server/Makefile Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/iourbanterror-server/Makefile Sun Jun 1 15:28:29 2014 (r356137) @@ -12,5 +12,4 @@ MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/games/iourbanterror/Makefile ============================================================================== --- head/games/iourbanterror/Makefile Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/iourbanterror/Makefile Sun Jun 1 15:28:29 2014 (r356137) @@ -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' \ Modified: head/games/iourbanterror/files/patch-code-qcommon-q_shared.h ============================================================================== --- head/games/iourbanterror/files/patch-code-qcommon-q_shared.h Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/iourbanterror/files/patch-code-qcommon-q_shared.h Sun Jun 1 15:28:29 2014 (r356137) @@ -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" Modified: head/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c ============================================================================== --- head/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c Sun Jun 1 15:28:29 2014 (r356137) @@ -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; Modified: head/games/iourbanterror/files/patch-code-qcommon-vm_x86.c ============================================================================== --- head/games/iourbanterror/files/patch-code-qcommon-vm_x86.c Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/iourbanterror/files/patch-code-qcommon-vm_x86.c Sun Jun 1 15:28:29 2014 (r356137) @@ -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) { Modified: head/games/openarena-data/Makefile ============================================================================== --- head/games/openarena-data/Makefile Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/openarena-data/Makefile Sun Jun 1 15:28:29 2014 (r356137) @@ -20,15 +20,14 @@ NO_BUILD= yes OA_DATA= ${PKGNAMEPREFIX}${OA_DATA_VER}.zip OA_DATA_VER= 0.8.8 -NO_STAGE= yes .include "${.CURDIR}/../openarena/Makefile.include" do-install: - ${MKDIR} ${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR} .for _file in ${DISTFILES:C/:[^:]*//} - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${_file} \ - ${EXTRACT_AFTER_ARGS} -C ${DATADIR} --strip-components 2 \ - ${PKGNAMEPREFIX}\?.\?.\?/baseoa/ + ${TAR} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${_file} \ + ${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${DATADIR} \ + --strip-components 2 ${PKGNAMEPREFIX}\?.\?.\?/baseoa/ .endfor .include Modified: head/games/openarena-oax/Makefile ============================================================================== --- head/games/openarena-oax/Makefile Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/openarena-oax/Makefile Sun Jun 1 15:28:29 2014 (r356137) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= oax -PORTVERSION= B50 +PORTVERSION= B51 CATEGORIES= games MASTER_SITES= http://files.poulsander.com/~poul19/public_files/eliminationSource/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -18,10 +18,9 @@ NO_BUILD= yes OABASE= ${DISTNAME} -NO_STAGE= yes do-install: - ${MKDIR} ${DATADIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR}) + ${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}) .include "../openarena/Makefile.include" Modified: head/games/openarena-oax/distinfo ============================================================================== --- head/games/openarena-oax/distinfo Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/openarena-oax/distinfo Sun Jun 1 15:28:29 2014 (r356137) @@ -1,2 +1,2 @@ -SHA256 (oaxB50.zip) = 8c3a8846544acc4498a0bdc2fdbeb2206f9dd003be06498aab62e4573d7d108f -SIZE (oaxB50.zip) = 472236 +SHA256 (oaxB51.zip) = cbc6580f608367718c69f139fba2fdd0a6bf68c18efd73bef620217931762656 +SIZE (oaxB51.zip) = 481791 Modified: head/games/openarena-server/Makefile ============================================================================== --- head/games/openarena-server/Makefile Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/openarena-server/Makefile Sun Jun 1 15:28:29 2014 (r356137) @@ -12,5 +12,4 @@ MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/games/openarena/Makefile ============================================================================== --- head/games/openarena/Makefile Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/openarena/Makefile Sun Jun 1 15:28:29 2014 (r356137) @@ -38,5 +38,4 @@ Q3DIR= ${DATADIR} # No icon included with OpenArena Q3ICON= -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Added: head/games/openarena/files/patch-code-qcommon-vm_x86.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openarena/files/patch-code-qcommon-vm_x86.c Sun Jun 1 15:28:29 2014 (r356137) @@ -0,0 +1,14 @@ +--- 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; Modified: head/games/urbanterror-data/Makefile ============================================================================== --- head/games/urbanterror-data/Makefile Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/urbanterror-data/Makefile Sun Jun 1 15:28:29 2014 (r356137) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= data -PORTVERSION= 4.2.014 +PORTVERSION= 4.2.018 CATEGORIES= games MASTER_SITES= http://cdn.urbanterror.info/urt/42/zips/ \ http://www.f1m.fr/uploads/urt/ \ @@ -28,16 +28,22 @@ PLIST_SUB+= VER=${URT_VER} OPTIONS_DEFINE= DOCS +UTDOCS= readme${URT_VER}.txt \ + How_To_Install.txt \ + QIIIA_Game_Source_License.doc + .include do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/q3ut4 - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \ + ${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} - ${MV} ${STAGEDIR}${DATADIR}/q3ut4/readme${URT_VER}.txt ${STAGEDIR}${DOCSDIR} +.for utdoc in ${UTDOCS} + ${MV} ${STAGEDIR}${DATADIR}/q3ut4/${utdoc} ${STAGEDIR}${DOCSDIR} +.endfor .else ${RM} ${STAGEDIR}${DATADIR}/q3ut4/readme${URT_VER}.txt .endif Modified: head/games/urbanterror-data/distinfo ============================================================================== --- head/games/urbanterror-data/distinfo Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/urbanterror-data/distinfo Sun Jun 1 15:28:29 2014 (r356137) @@ -1,2 +1,2 @@ -SHA256 (UrbanTerror42_full014.zip) = 52618f40223baedf37b0a97fc99fd05d3915d20eaff38c71e4eeb66835c7d169 -SIZE (UrbanTerror42_full014.zip) = 1548345447 +SHA256 (UrbanTerror42_full018.zip) = 10710c5b762687a75a7abd3cc56de005ce12dcb7ac14c08f40bcb4e9d96f4e83 +SIZE (UrbanTerror42_full018.zip) = 1702949967 Modified: head/games/urbanterror-data/pkg-plist ============================================================================== --- head/games/urbanterror-data/pkg-plist Sun Jun 1 15:27:24 2014 (r356136) +++ head/games/urbanterror-data/pkg-plist Sun Jun 1 15:28:29 2014 (r356137) @@ -1,6 +1,6 @@ %%PORTDOCS%%%%DOCSDIR%%/readme%%VER%%.txt -%%DATADIR%%/q3ut4/How_To_Install.txt -%%DATADIR%%/q3ut4/QIIIA_Game_Source_License.doc +%%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 @@ -28,7 +28,11 @@ %%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_qvm.pk3 @dirrm %%DATADIR%%/q3ut4 -@dirrmtry %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrmtry %%DATADIR%%%%PORTDOCS%% +@dirrm %%DOCSDIR%%