Attachment #141129 for bug #187859

View | Details | Raw Unified | Return to bug 187859
Collapse All | Expand All





USES=		pkgconfig gmake zip

NO_STAGE=	yes
# Port configuration flags:
# 	CLIENT SERVER TOOLS DLRENDERER GAMELIBS OPUS OPENGL2
IOQ3?=		CLIENT TOOLS GAMELIBS

.endif

.if ${PORT_OPTIONS:MCURL}
LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
MAKE_ARGS+=	USE_CURL=1 USE_CURL_DLOPEN=0
.else
MAKE_ARGS+=	USE_CURL=0

.endif

.if ${PORT_OPTIONS:MVORBIS}
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}
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

# 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

post-install:




--- 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 @@
 
 /* need this on NX enabled systems (i386 with PAE kernel or

 #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;




PATCHDIR?=	${.CURDIR}/../${PORTNAME}/files
PKGMESSAGE?=	${.CURDIR}/../${PORTNAME}/pkg-message

GITREVISION?=	2390
BINSUFFIX?=	-devel

IOQ3?=		CLIENT TOOLS DLRENDERER GAMELIBS OPUS OPENGL2
IOQ3ARCH?=	${ARCH:S/i386/x86/:S/amd64/x86_64/}

Q3DOCS?=	README.md \
		id-readme.txt \
		md4-readme.txt \
		opengl2-readme.txt \
		voip-readme.txt

.include "${MASTERDIR}/Makefile"

Lines 1-2 Link Here

(-)games/ioquake3-devel/distinfo (-2 / +2 lines)
1	SHA256 (ioquake3-devel-GIT2178.tar.xz) = 9567243047c7c0ef6f9e329a1c8be826bdce4f12d02685eb51ec3a8058324eb9	1	SHA256 (ioquake3-devel-GIT2390.tar.xz) = 1ad3a8bfccaa54ed39221f86539676479187f5f832a4140cf5d7ee7be9a1b1be
2	SIZE (ioquake3-devel-GIT2178.tar.xz) = 4167780	2	SIZE (ioquake3-devel-GIT2390.tar.xz) = 4310568

Lines 2-5 Link Here

(-)games/ioquake3-devel/pkg-descr (+3 lines)
2	known to seldomly produce releases. Due to the conservative development goals	2	known to seldomly produce releases. Due to the conservative development goals
3	of the project, development snapshots are generally considered reliable.	3	of the project, development snapshots are generally considered reliable.
4		4
		5	This port is based of a repository with FreeBSD specific changes:
		6	https://github.com/lonkamikaze/ioq3-freebsd/tree/freebsd
		7
5	WWW: http://ioquake3.org/	8	WWW: http://ioquake3.org/

Lines 12-16 Link Here

(-)games/ioquake3-devel-server/Makefile (-1 lines)
12		12
13	IOQ3= SERVER GAMELIBS	13	IOQ3= SERVER GAMELIBS
14		14
15	NO_STAGE= yes
16	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Lines 12-16 Link Here

(-)games/ioquake3-server/Makefile (-1 lines)
12		12
13	IOQ3= SERVER GAMELIBS	13	IOQ3= SERVER GAMELIBS
14		14
15	NO_STAGE= yes
16	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"




# $FreeBSD$

PORTNAME=	iourbanterror
PORTVERSION=	${GAMEVERSION}.${DISTVERSION}
PORTREVISION=	0
PORTEPOCH=	1
CATEGORIES=	games
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
DISTINFO_FILE=	${.CURDIR}/../ioquake3-devel/distinfo

IOQ3?=		CLIENT

# The docs belong to ioquake3
OPTIONS_EXCLUDE=	DOCS
GAMEVERSION=	4.2.018
Q3ENGINEVER=	${DISTVERSION}+${GAMEVERSION}
Q3TOTALCONV=	yes
Q3DIR=		${PREFIX}/share/quake3
Q3ICON=		${PREFIX}/share/quake3/q3ut4/q3ut.ico

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' \




--- 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

-  #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
 #else
   #define PRODUCT_NAME			"ioq3"
   #define BASEGAME			"baseq3"




--- 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 @@
 				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 ];
 			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:
@@ -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;




--- 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) {
@@ -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");

Lines 12-16 Link Here

(-)games/iourbanterror-server/Makefile (-1 lines)
12		12
13	IOQ3= SERVER	13	IOQ3= SERVER
14		14
15	NO_STAGE= yes
16	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Lines 38-42 Link Here

(-)games/openarena/Makefile (-1 lines)
38	# No icon included with OpenArena	38	# No icon included with OpenArena
39	Q3ICON=	39	Q3ICON=
40		40
41	NO_STAGE= yes
42	.include "${MASTERDIR}/Makefile"	41	.include "${MASTERDIR}/Makefile"




--- 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;




OA_DATA=	${PKGNAMEPREFIX}${OA_DATA_VER}.zip
OA_DATA_VER=	0.8.8

NO_STAGE=	yes
.include "${.CURDIR}/../openarena/Makefile.include"

do-install:
	${MKDIR} ${STAGEDIR}${DATADIR}
.for _file in ${DISTFILES:C/:[^:]*//}
	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${_file} \
		${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${DATADIR} \
		--strip-components 2 ${PKGNAMEPREFIX}\?.\?.\?/baseoa/
.endfor

.include <bsd.port.post.mk>




# $FreeBSD$

PORTNAME=	oax
PORTVERSION=	B51
CATEGORIES=	games
MASTER_SITES=	http://files.poulsander.com/~poul19/public_files/eliminationSource/
DISTNAME=	${PORTNAME}${PORTVERSION}


OABASE=		${DISTNAME}

NO_STAGE=	yes
do-install:
	${MKDIR} ${STAGEDIR}${DATADIR}
	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})

.include "../openarena/Makefile.include"


Lines 1-2 Link Here

(-)games/openarena-oax/distinfo (-2 / +2 lines)
1	SHA256 (oaxB50.zip) = 8c3a8846544acc4498a0bdc2fdbeb2206f9dd003be06498aab62e4573d7d108f	1	SHA256 (oaxB51.zip) = cbc6580f608367718c69f139fba2fdd0a6bf68c18efd73bef620217931762656
2	SIZE (oaxB50.zip) = 472236	2	SIZE (oaxB51.zip) = 481791

Lines 12-16 Link Here

(-)games/openarena-server/Makefile (-1 lines)
12		12
13	IOQ3= SERVER	13	IOQ3= SERVER
14		14
15	NO_STAGE= yes
16	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Lines 2-8 Link Here

(-)games/urbanterror-data/Makefile (-2 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= data	4	PORTNAME= data
5	PORTVERSION= 4.2.014	5	PORTVERSION= 4.2.018
6	CATEGORIES= games	6	CATEGORIES= games
7	MASTER_SITES= http://cdn.urbanterror.info/urt/42/zips/ \	7	MASTER_SITES= http://cdn.urbanterror.info/urt/42/zips/ \
8	http://www.f1m.fr/uploads/urt/ \	8	http://www.f1m.fr/uploads/urt/ \
Lines 28-33 Link Here
28		28
29	OPTIONS_DEFINE= DOCS	29	OPTIONS_DEFINE= DOCS
30		30
		31	UTDOCS= readme${URT_VER}.txt \
		32	How_To_Install.txt \
		33	QIIIA_Game_Source_License.doc
		34
31	.include <bsd.port.options.mk>	35	.include <bsd.port.options.mk>
32		36
33	do-install:	37	do-install:
Lines 37-43 Link Here
37	UrbanTerror${URT_VER}/q3ut4	41	UrbanTerror${URT_VER}/q3ut4
38	.if ${PORT_OPTIONS:MDOCS}	42	.if ${PORT_OPTIONS:MDOCS}
39	${MKDIR} ${STAGEDIR}${DOCSDIR}	43	${MKDIR} ${STAGEDIR}${DOCSDIR}
40	${MV} ${STAGEDIR}${DATADIR}/q3ut4/readme${URT_VER}.txt ${STAGEDIR}${DOCSDIR}	44	.for utdoc in ${UTDOCS}
		45	${MV} ${STAGEDIR}${DATADIR}/q3ut4/${utdoc} ${STAGEDIR}${DOCSDIR}
		46	.endfor
41	.else	47	.else
42	${RM} ${STAGEDIR}${DATADIR}/q3ut4/readme${URT_VER}.txt	48	${RM} ${STAGEDIR}${DATADIR}/q3ut4/readme${URT_VER}.txt
43	.endif	49	.endif

Lines 1-2 Link Here

(-)games/urbanterror-data/distinfo (-2 / +2 lines)
1	SHA256 (UrbanTerror42_full014.zip) = 52618f40223baedf37b0a97fc99fd05d3915d20eaff38c71e4eeb66835c7d169	1	SHA256 (UrbanTerror42_full018.zip) = 10710c5b762687a75a7abd3cc56de005ce12dcb7ac14c08f40bcb4e9d96f4e83
2	SIZE (UrbanTerror42_full014.zip) = 1548345447	2	SIZE (UrbanTerror42_full018.zip) = 1702949967

Lines 1-6 Link Here

(-)games/urbanterror-data/pkg-plist (-2 / +6 lines)
1	%%PORTDOCS%%%%DOCSDIR%%/readme%%VER%%.txt	1	%%PORTDOCS%%%%DOCSDIR%%/readme%%VER%%.txt
2	%%DATADIR%%/q3ut4/How_To_Install.txt	2	%%PORTDOCS%%%%DOCSDIR%%/How_To_Install.txt
3	%%DATADIR%%/q3ut4/QIIIA_Game_Source_License.doc	3	%%PORTDOCS%%%%DOCSDIR%%/QIIIA_Game_Source_License.doc
4	%%DATADIR%%/q3ut4/autoexec_example.cfg	4	%%DATADIR%%/q3ut4/autoexec_example.cfg
5	%%DATADIR%%/q3ut4/mapcycle_example.txt	5	%%DATADIR%%/q3ut4/mapcycle_example.txt
6	%%DATADIR%%/q3ut4/server_example.cfg	6	%%DATADIR%%/q3ut4/server_example.cfg
Lines 28-33 Link Here
28	%%DATADIR%%/q3ut4/zUrT42_0020.pk3	28	%%DATADIR%%/q3ut4/zUrT42_0020.pk3
29	%%DATADIR%%/q3ut4/zUrT42_0021.pk3	29	%%DATADIR%%/q3ut4/zUrT42_0021.pk3
30	%%DATADIR%%/q3ut4/zUrT42_0022.pk3	30	%%DATADIR%%/q3ut4/zUrT42_0022.pk3
		31	%%DATADIR%%/q3ut4/zUrT42_0023.pk3
		32	%%DATADIR%%/q3ut4/zUrT42_0024.pk3
		33	%%DATADIR%%/q3ut4/zUrT42_0025.pk3
		34	%%DATADIR%%/q3ut4/zUrT42_0026.pk3
31	%%DATADIR%%/q3ut4/zUrT42_qvm.pk3	35	%%DATADIR%%/q3ut4/zUrT42_qvm.pk3
32	@dirrm %%DATADIR%%/q3ut4	36	@dirrm %%DATADIR%%/q3ut4
33	@dirrmtry %%DATADIR%%	37	@dirrmtry %%DATADIR%%

Return to bug 187859

Lines 13-19 Link Here

(-)games/ioquake3/Makefile (-6 / +14 lines)
13		13
14	USES= pkgconfig gmake zip	14	USES= pkgconfig gmake zip
15		15
16	NO_STAGE= yes
17	# Port configuration flags:	16	# Port configuration flags:
18	# CLIENT SERVER TOOLS DLRENDERER GAMELIBS OPUS OPENGL2	17	# CLIENT SERVER TOOLS DLRENDERER GAMELIBS OPUS OPENGL2
19	IOQ3?= CLIENT TOOLS GAMELIBS	18	IOQ3?= CLIENT TOOLS GAMELIBS
Lines 130-136 Link Here
130	.endif	129	.endif
131		130
132	.if ${PORT_OPTIONS:MCURL}	131	.if ${PORT_OPTIONS:MCURL}
133	LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl	132	LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
134	MAKE_ARGS+= USE_CURL=1 USE_CURL_DLOPEN=0	133	MAKE_ARGS+= USE_CURL=1 USE_CURL_DLOPEN=0
135	.else	134	.else
136	MAKE_ARGS+= USE_CURL=0	135	MAKE_ARGS+= USE_CURL=0
Lines 144-150 Link Here
144	.endif	143	.endif
145		144
146	.if ${PORT_OPTIONS:MVORBIS}	145	.if ${PORT_OPTIONS:MVORBIS}
147	LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis	146	NEED_OGG= yes
		147	LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis
148	MAKE_ARGS+= USE_CODEC_VORBIS=1	148	MAKE_ARGS+= USE_CODEC_VORBIS=1
149	.else	149	.else
150	MAKE_ARGS+= USE_CODEC_VORBIS=0	150	MAKE_ARGS+= USE_CODEC_VORBIS=0
Lines 151-161 Link Here
151	.endif	151	.endif
152		152
153	.if ${PORT_OPTIONS:MOPUS}	153	.if ${PORT_OPTIONS:MOPUS}
154	MAKE_ARGS+= USE_CODEC_OPUS=1 USE_INTERNAL_OPUS=1	154	NEED_OGG= yes
		155	LIB_DEPENDS+= libopusfile.so:${PORTSDIR}/audio/opusfile \
		156	libopus.so:${PORTSDIR}/audio/opus
		157	MAKE_ARGS+= USE_CODEC_OPUS=1 USE_INTERNAL_OPUS=0
155	.else	158	.else
156	MAKE_ARGS+= USE_CODEC_OPUS=0	159	MAKE_ARGS+= USE_CODEC_OPUS=0
157	.endif	160	.endif
158		161
		162	.if defined(NEED_OGG)
		163	LIB_DEPENDS+= libogg.so:${PORTSDIR}/audio/libogg
		164	MAKE_ARGS+= USE_INTERNAL_OGG=0
		165	.endif
		166
159	.if ${PORT_OPTIONS:MMUMBLE}	167	.if ${PORT_OPTIONS:MMUMBLE}
160	MAKE_ARGS+= USE_MUMBLE=1	168	MAKE_ARGS+= USE_MUMBLE=1
161	.else	169	.else
Lines 225-235 Link Here
225	# Generate install target	233	# Generate install target
226	do-install: ${Q3INSTALL}	234	do-install: ${Q3INSTALL}
227	.for dir in ${PLIST_DIRS}	235	.for dir in ${PLIST_DIRS}
228	${MKDIR} ${PREFIX}/${dir}	236	${MKDIR} ${STAGEDIR}${PREFIX}/${dir}
229	.endfor	237	.endfor
230	.for inst in ${IOQ3_INST}	238	.for inst in ${IOQ3_INST}
231	${INSTALL_${inst:C/;.//}} ${BUILDDIR}/${inst:C/[^;];//:C/;.*//} \	239	${INSTALL_${inst:C/;.//}} ${BUILDDIR}/${inst:C/[^;];//:C/;.*//} \
232	${PREFIX}/${inst:C/.*;//}	240	${STAGEDIR}${PREFIX}/${inst:C/.*;//}
233	.endfor	241	.endfor
234		242
235	post-install:	243	post-install:

Lines 1-5 Link Here

(-)games/ioquake3/files/patch-code-qcommon-vm_x86.c (-1 / +13 lines)
1	--- code/qcommon/vm_x86.c.orig 2008-08-18 01:22:06.000000000 +0200	1	--- code/qcommon/vm_x86.c.orig 2008-08-18 01:22:06.000000000 +0200
2	+++ code/qcommon/vm_x86.c 2010-11-27 14:01:33.000000000 +0100	2	+++ code/qcommon/vm_x86.c 2013-11-14 11:44:27.000000000 +0100
3	@@ -36,7 +36,25 @@	3	@@ -36,7 +36,25 @@
4		4
5	/* need this on NX enabled systems (i386 with PAE kernel or	5	/* need this on NX enabled systems (i386 with PAE kernel or
Lines 27-29 Link Here
27	#define VM_X86_MMAP	27	#define VM_X86_MMAP
28	#endif	28	#endif
29		29
		30	@@ -90,7 +108,11 @@
		31	static void (*const asmCallPtr)(void) = AsmCall;
		32
		33
		34	+#ifdef __clang__
		35	+ int callMask = 0;
		36	+#else
		37	static int callMask = 0;
		38	+#endif
		39
		40	static int instruction, pass;
		41	static int lastConst = 0;

Lines 17-27 Link Here

(-)games/ioquake3-devel/Makefile (-2 / +7 lines)
17	PATCHDIR?= ${.CURDIR}/../${PORTNAME}/files	17	PATCHDIR?= ${.CURDIR}/../${PORTNAME}/files
18	PKGMESSAGE?= ${.CURDIR}/../${PORTNAME}/pkg-message	18	PKGMESSAGE?= ${.CURDIR}/../${PORTNAME}/pkg-message
19		19
20	GITREVISION?= 2178	20	GITREVISION?= 2390
21	BINSUFFIX?= -devel	21	BINSUFFIX?= -devel
22		22
23	IOQ3?= CLIENT TOOLS DLRENDERER GAMELIBS OPUS OPENGL2	23	IOQ3?= CLIENT TOOLS DLRENDERER GAMELIBS OPUS OPENGL2
24	IOQ3ARCH?= ${ARCH:S/i386/x86/:S/amd64/x86_64/}	24	IOQ3ARCH?= ${ARCH:S/i386/x86/:S/amd64/x86_64/}
25		25
26	NO_STAGE= yes	26	Q3DOCS?= README.md \
		27	id-readme.txt \
		28	md4-readme.txt \
		29	opengl2-readme.txt \
		30	voip-readme.txt
		31
27	.include "${MASTERDIR}/Makefile"	32	.include "${MASTERDIR}/Makefile"

Lines 2-11 Link Here

(-)games/iourbanterror/Makefile (-8 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= iourbanterror	4	PORTNAME= iourbanterror
5	PORTVERSION= ${GAMEVERSION}.g${GITREVISION}	5	PORTVERSION= ${GAMEVERSION}.${DISTVERSION}
		6	PORTREVISION= 0
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= games	8	CATEGORIES= games
8	DISTNAME= ioquake3-devel-GIT${GITREVISION}	9	DISTNAME= ioquake3-${DISTVERSION}
9		10
10	MAINTAINER= kamikaze@bsdforen.de	11	MAINTAINER= kamikaze@bsdforen.de
11	COMMENT= Quake 3 engine modified for Urban Terror (based on ioquake3)	12	COMMENT= Quake 3 engine modified for Urban Terror (based on ioquake3)
Lines 12-26 Link Here
12		13
13	RUN_DEPENDS= ${Q3DIR}/q3ut4:${PORTSDIR}/games/urbanterror-data	14	RUN_DEPENDS= ${Q3DIR}/q3ut4:${PORTSDIR}/games/urbanterror-data
14		15
15	MASTERDIR= ${.CURDIR}/../ioquake3-devel	16	MASTERDIR= ${.CURDIR}/../ioquake3
16	DISTINFO_FILE= ${.CURDIR}/../ioquake3-devel/distinfo
17		17
18	IOQ3?= CLIENT DLRENDERER OPUS OPENGL2	18	IOQ3?= CLIENT
19		19
20	# The docs belong to ioquake3	20	# The docs belong to ioquake3
21	OPTIONS_EXCLUDE= DOCS	21	OPTIONS_EXCLUDE= DOCS
22	GAMEVERSION= 4.2.014	22	GAMEVERSION= 4.2.018
23	Q3ENGINEVER= GIT${GITREVISION}+${GAMEVERSION}	23	Q3ENGINEVER= ${DISTVERSION}+${GAMEVERSION}
24	Q3TOTALCONV= yes	24	Q3TOTALCONV= yes
25	Q3DIR= ${PREFIX}/share/quake3	25	Q3DIR= ${PREFIX}/share/quake3
26	Q3ICON= ${PREFIX}/share/quake3/q3ut4/q3ut.ico	26	Q3ICON= ${PREFIX}/share/quake3/q3ut4/q3ut.ico
Lines 33-40 Link Here
33	MAKE_ARGS+= BUILD_MISSIONPACK=0 \	33	MAKE_ARGS+= BUILD_MISSIONPACK=0 \
34	BUILD_STANDALONE=1	34	BUILD_STANDALONE=1
35		35
36	NO_STAGE= yes
37	post-patch:	36	post-patch:
		37	@(cd ${WRKSRC} && \
		38	for pfile in ${.CURDIR}/../${PORTNAME}/files/patch-*; do \
		39	${PATCH} < $${pfile}; \
		40	done)
38	@${REINPLACE_CMD} \	41	@${REINPLACE_CMD} \
39	-e 's/ioquake3/${Q3CLIENT}/g' \	42	-e 's/ioquake3/${Q3CLIENT}/g' \
40	-e 's/ioq3ded/${Q3SERVER}/g' \	43	-e 's/ioq3ded/${Q3SERVER}/g' \

Lines 1-6 Link Here

(-)games/iourbanterror/files/patch-code-qcommon-q_shared.h (-9 / +5 lines)
1	--- code/qcommon/q_shared.h.orig 2011-10-27 02:45:12.000000000 +0200	1	--- code/qcommon/q_shared.h.orig 2014-03-23 17:10:02.000000000 +0100
2	+++ code/qcommon/q_shared.h 2011-10-27 02:47:17.000000000 +0200	2	+++ code/qcommon/q_shared.h 2014-03-23 17:12:24.000000000 +0100
3	@@ -27,15 +27,15 @@	3	@@ -27,11 +27,12 @@
4	// A user mod should never modify this file	4	// A user mod should never modify this file
5		5
6	#ifdef STANDALONE	6	#ifdef STANDALONE
Lines 8-24 Link Here
8	- #define BASEGAME "foobar"	8	- #define BASEGAME "foobar"
9	- #define CLIENT_WINDOW_TITLE "changeme"	9	- #define CLIENT_WINDOW_TITLE "changeme"
10	- #define CLIENT_WINDOW_MIN_TITLE "changeme2"	10	- #define CLIENT_WINDOW_MIN_TITLE "changeme2"
		11	- #define GAMENAME_FOR_MASTER "iofoo3" // must NOT contain whitespaces
11	+ #define PRODUCT_NAME "ioq3+UT"	12	+ #define PRODUCT_NAME "ioq3+UT"
12	+ #define BASEGAME "q3ut4"	13	+ #define BASEGAME "q3ut4"
13	+ #define CLIENT_WINDOW_TITLE "ioUrbanTerror"	14	+ #define CLIENT_WINDOW_TITLE "ioUrbanTerror"
14	+ #define CLIENT_WINDOW_MIN_TITLE "ioUT"	15	+ #define CLIENT_WINDOW_MIN_TITLE "ioUT"
15	#define HOMEPATH_NAME_UNIX HOMEPATH
16	#define HOMEPATH_NAME_WIN "FooBar"
17	#define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN
18	- #define GAMENAME_FOR_MASTER "foobar" // must NOT contain whitespace
19	-// #define LEGACY_PROTOCOL // You probably don't need this for your standalone game
20	+ #define GAMENAME_FOR_MASTER "Quake3Arena" // must NOT contain whitespace	16	+ #define GAMENAME_FOR_MASTER "Quake3Arena" // must NOT contain whitespace
21	+ #define LEGACY_PROTOCOL // You probably don't need this for your standalone game	17	+ #define LEGACY_PROTOCOL
22	#else	18	#else
23	#define PRODUCT_NAME "ioq3"	19	#define PRODUCT_NAME "ioq3"
24	#define BASEGAME "baseq3"	20	#define BASEGAME "baseq3"

Lines 1-37 Link Here

(-)games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c (-28 / +7 lines)
1	--- code/qcommon/vm_interpreted.c.orig 2013-07-15 18:54:41.000000000 +0000	1	--- code/qcommon/vm_interpreted.c.orig 2014-03-23 17:14:22.000000000 +0100
2	+++ code/qcommon/vm_interpreted.c	2	+++ code/qcommon/vm_interpreted.c 2014-03-23 17:17:07.000000000 +0100
3	@@ -436,21 +436,21 @@ nextInstruction2:	3	@@ -458,11 +458,11 @@
4	return 0;
5	}
6	#endif
7	- r0 = opStack[opStackOfs] = (int ) &image[r0 & dataMask & ~3 ];
8	+ r0 = opStack[opStackOfs] = (int ) &image[r0 & dataMask ];
9	goto nextInstruction2;	4	goto nextInstruction2;
10	case OP_LOAD2:
11	- r0 = opStack[opStackOfs] = (unsigned short )&image[ r0&dataMask&~1 ];
12	+ r0 = opStack[opStackOfs] = (unsigned short )&image[ r0&dataMask ];
13	goto nextInstruction2;
14	case OP_LOAD1:
15	r0 = opStack[opStackOfs] = image[ r0&dataMask ];
16	goto nextInstruction2;
17		5
18	case OP_STORE4:	6	case OP_STORE4:
19	- (int )&image[ r1&(dataMask & ~3) ] = r0;	7	- (int )&image[ r1&(dataMask & ~3) ] = r0;
20	+ (int )&image[ r1&dataMask ] = r0;	8	+ (int )&image[ r1&(dataMask) ] = r0;
21	opStackOfs -= 2;	9	opStack -= 2;
22	goto nextInstruction;	10	goto nextInstruction;
23	case OP_STORE2:	11	case OP_STORE2:
24	- (short )&image[ r1&(dataMask & ~1) ] = r0;	12	- (short )&image[ r1&(dataMask & ~1) ] = r0;
25	+ (short )&image[ r1&dataMask ] = r0;	13	+ (short )&image[ r1&(dataMask) ] = r0;
26	opStackOfs -= 2;	14	opStack -= 2;
27	goto nextInstruction;	15	goto nextInstruction;
28	case OP_STORE1:	16	case OP_STORE1:
29	@@ -460,7 +460,7 @@ nextInstruction2:
30
31	case OP_ARG:
32	// single byte offset from programStack
33	- (int )&image[ (codeImage[programCounter] + programStack)&dataMask&~3 ] = r0;
34	+ (int )&image[ (codeImage[programCounter] + programStack)&dataMask ] = r0;
35	opStackOfs--;
36	programCounter += 1;
37	goto nextInstruction;

Lines 1-38 Link Here

(-)games/iourbanterror/files/patch-code-qcommon-vm_x86.c (-38 / +20 lines)
1	--- code/qcommon/vm_x86.c.orig 2013-07-15 18:54:41.000000000 +0000	1	--- code/qcommon/vm_x86.c.orig 2014-03-23 17:23:18.000000000 +0100
2	+++ code/qcommon/vm_x86.c	2	+++ code/qcommon/vm_x86.c 2014-03-23 17:24:58.000000000 +0100
3	@@ -783,7 +783,7 @@ qboolean ConstOptimize(vm_t *vm, int cal	3	@@ -512,7 +512,7 @@
4	return qtrue;	4	break;
5		5	}
6	case OP_STORE4:	6	if (code[pc+4] == OP_STORE4) {
7	- EmitMovEAXStack(vm, (vm->dataMask & ~3));	7	- opt = EmitMovEBXEDI(vm, (vm->dataMask & ~3));
8	+ EmitMovEAXStack(vm, vm->dataMask);	8	+ opt = EmitMovEBXEDI(vm, (vm->dataMask));
9	#if idx64	9	EmitString( "B8" ); // mov eax, 0x12345678
10	EmitRexString(0x41, "C7 04 01"); // mov dword ptr [r9 + eax], 0x12345678	10	Emit4( Constant4() );
11	Emit4(Constant4());	11	// if (!opt) {
12	@@ -798,7 +798,7 @@ qboolean ConstOptimize(vm_t *vm, int cal	12	@@ -527,7 +527,7 @@
13	return qtrue;	13	break;
14		14	}
15	case OP_STORE2:	15	if (code[pc+4] == OP_STORE2) {
16	- EmitMovEAXStack(vm, (vm->dataMask & ~1));	16	- opt = EmitMovEBXEDI(vm, (vm->dataMask & ~1));
17	+ EmitMovEAXStack(vm, vm->dataMask);	17	+ opt = EmitMovEBXEDI(vm, (vm->dataMask));
18	#if idx64	18	EmitString( "B8" ); // mov eax, 0x12345678
19	Emit1(0x66); // mov word ptr [r9 + eax], 0x1234	19	Emit4( Constant4() );
20	EmitRexString(0x41, "C7 04 01");	20	// if (!opt) {
21	@@ -1369,7 +1369,7 @@ void VM_Compile(vm_t vm, vmHeader_t he
22	case OP_STORE4:
23	EmitMovEAXStack(vm, 0);
24	EmitString("8B 54 9F FC"); // mov edx, dword ptr -4[edi + ebx * 4]
25	- MASK_REG("E2", vm->dataMask & ~3); // and edx, 0x12345678
26	+ MASK_REG("E2", vm->dataMask); // and edx, 0x12345678
27	#if idx64
28	EmitRexString(0x41, "89 04 11"); // mov dword ptr [r9 + edx], eax
29	#else
30	@@ -1381,7 +1381,7 @@ void VM_Compile(vm_t vm, vmHeader_t he
31	case OP_STORE2:
32	EmitMovEAXStack(vm, 0);
33	EmitString("8B 54 9F FC"); // mov edx, dword ptr -4[edi + ebx * 4]
34	- MASK_REG("E2", vm->dataMask & ~1); // and edx, 0x12345678
35	+ MASK_REG("E2", vm->dataMask); // and edx, 0x12345678
36	#if idx64
37	Emit1(0x66); // mov word ptr [r9 + edx], eax
38	EmitRexString(0x41, "89 04 11");

Line 0 Link Here

(-)games/openarena/files/patch-code-qcommon-vm_x86.c (+14 lines)
	1	--- code/qcommon/vm_x86.c.orig 2014-03-23 14:53:59.000000000 +0100
	2	+++ code/qcommon/vm_x86.c 2014-03-23 14:55:33.000000000 +0100
	3	@@ -91,7 +91,11 @@
	4	static void (*const asmCallPtr)(void) = AsmCall;
	5
	6
	7	+#ifdef __clang__
	8	+ int callMask = 0;
	9	+#else
	10	static int callMask = 0;
	11	+#endif
	12
	13	static int instruction, pass;
	14	static int lastConst = 0;

Lines 20-34 Link Here

(-)games/openarena-data/Makefile (-4 / +3 lines)
20	OA_DATA= ${PKGNAMEPREFIX}${OA_DATA_VER}.zip	20	OA_DATA= ${PKGNAMEPREFIX}${OA_DATA_VER}.zip
21	OA_DATA_VER= 0.8.8	21	OA_DATA_VER= 0.8.8
22		22
23	NO_STAGE= yes
24	.include "${.CURDIR}/../openarena/Makefile.include"	23	.include "${.CURDIR}/../openarena/Makefile.include"
25		24
26	do-install:	25	do-install:
27	${MKDIR} ${DATADIR}	26	${MKDIR} ${STAGEDIR}${DATADIR}
28	.for _file in ${DISTFILES:C/:[^:]*//}	27	.for _file in ${DISTFILES:C/:[^:]*//}
29	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${_file} \	28	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${_file} \
30	${EXTRACT_AFTER_ARGS} -C ${DATADIR} --strip-components 2 \	29	${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${DATADIR} \
31	${PKGNAMEPREFIX}\?.\?.\?/baseoa/	30	--strip-components 2 ${PKGNAMEPREFIX}\?.\?.\?/baseoa/
32	.endfor	31	.endfor
33		32
34	.include <bsd.port.post.mk>	33	.include <bsd.port.post.mk>

Lines 2-8 Link Here

(-)games/openarena-oax/Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= oax	4	PORTNAME= oax
5	PORTVERSION= B50	5	PORTVERSION= B51
6	CATEGORIES= games	6	CATEGORIES= games
7	MASTER_SITES= http://files.poulsander.com/~poul19/public_files/eliminationSource/	7	MASTER_SITES= http://files.poulsander.com/~poul19/public_files/eliminationSource/
8	DISTNAME= ${PORTNAME}${PORTVERSION}	8	DISTNAME= ${PORTNAME}${PORTVERSION}
Lines 18-27 Link Here
18		18
19	OABASE= ${DISTNAME}	19	OABASE= ${DISTNAME}
20		20
21	NO_STAGE= yes
22	do-install:	21	do-install:
23	${MKDIR} ${DATADIR}	22	${MKDIR} ${STAGEDIR}${DATADIR}
24	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR})	23	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
25		24
26	.include "../openarena/Makefile.include"	25	.include "../openarena/Makefile.include"
27		26