Attachment #66541 for bug #98296

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




#

PORTNAME=	quake3
PORTVERSION=	1.32c
PORTREVISION=	5
CATEGORIES=	games
MASTER_SITES=	http://www.proarena.com/p/ftpx/x8524/quake_3_arena/ \
		http://www.planetgargoyle.com/ \

		http://0day.icculus.org/mirrors/quake3/ \
		http://www.olpainless.net/files/ \
		${MASTER_SITE_IDSOFTWARE:S|$|source/|}
DISTNAME=	${PORTNAME}-${REALVERSION}-source

MAINTAINER=	shirshegsm@gmail.com
COMMENT=	Quake III Arena -- first person shooter (native build)

USE_DOS2UNIX=	yes
USE_GMAKE=	yes
USE_GCC=	3.2+
WRKSRC=		${WRKDIR}/${PORTNAME}-${REALVERSION}
BUILD_WRKSRC=	${WRKSRC}/code/unix

OPTIONS=	CLIENT "Build client" on \
		DEDICATED "Build dedicated server" on \
		GAMELIBS "Build game libraries (when not mandatory)" off \
		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
		SMP "Build SMP (threaded) client" on


PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"

LIBDIR=		${PREFIX}/lib/${PORTNAME}
REALVERSION=	1.32b

.include <bsd.port.pre.mk>


.endif

.if ${ARCH} == "i386"
BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
.endif

.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP)
USE_GL=		yes
.endif


PLIST_SUB+=	DEDICATED="@comment "
.endif

.if defined(WITH_GAMELIBS) || (${ARCH} != "i386" && ${ARCH} != "powerpc")
MAKE_ENV+=	GAMELIBS=YES
PLIST_SUB+=	GAMELIBS=""
.else

	@${REINPLACE_CMD} -e \
		's|//[[:blank:]]*\(Swap_Init[[:blank:]]*();\)|\1|' \
		${WRKSRC}/code/botlib/be_interface.c \
		${WRKSRC}/code/qcommon/common.c \
		${WRKSRC}/code/renderer/tr_init.c

do-install:
.for bin in ${Q3BIN}
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${PREFIX}/bin
.endfor
.if defined(WITH_GAMELIBS) || (${ARCH} != "i386" && ${ARCH} != "powerpc")
.for dir in baseq3 missionpack
	${MKDIR} ${LIBDIR}/${dir}
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir}




--- ./code/cgame/cg_weapons.c.orig	Wed May 31 18:55:11 2006
+++ ./code/cgame/cg_weapons.c	Wed May 31 19:05:20 2006
@@ -656,17 +656,17 @@
 	}
 
 	strcpy( path, item->world_model[0] );
-	COM_StripExtension( path, path );
+	COM_StripExtension( path, path, sizeof(path) );
 	strcat( path, "_flash.md3" );
 	weaponInfo->flashModel = trap_R_RegisterModel( path );
 
 	strcpy( path, item->world_model[0] );
-	COM_StripExtension( path, path );
+	COM_StripExtension( path, path, sizeof(path) );
 	strcat( path, "_barrel.md3" );
 	weaponInfo->barrelModel = trap_R_RegisterModel( path );
 
 	strcpy( path, item->world_model[0] );
-	COM_StripExtension( path, path );
+	COM_StripExtension( path, path, sizeof(path) );
 	strcat( path, "_hand.md3" );
 	weaponInfo->handsModel = trap_R_RegisterModel( path );
 

Lines 1-5 Link Here

(-)files/patch-code-client-cl_ui.c (-2 / +2 lines)
1	--- code/client/cl_ui.c.orig Thu May 25 15:41:27 2006	1	--- ./code/client/cl_ui.c.orig Wed May 31 18:55:11 2006
2	+++ code/client/cl_ui.c Thu May 25 15:46:39 2006	2	+++ ./code/client/cl_ui.c Wed May 31 18:55:13 2006
3	@@ -1166,7 +1166,7 @@	3	@@ -1166,7 +1166,7 @@
4	// init for this gamestate	4	// init for this gamestate
5	VM_Call( uivm, UI_INIT, (cls.state >= CA_AUTHORIZING && cls.state < CA_ACTIVE));	5	VM_Call( uivm, UI_INIT, (cls.state >= CA_AUTHORIZING && cls.state < CA_ACTIVE));

Lines 1-6 Link Here

(-)files/patch-code-game-q_shared.c (-7 / +34 lines)
1	--- code/game/q_shared.c.orig Thu May 25 13:42:26 2006	1	--- ./code/game/q_shared.c.orig Wed May 31 18:55:11 2006
2	+++ code/game/q_shared.c Thu May 25 13:44:30 2006	2	+++ ./code/game/q_shared.c Wed May 31 19:06:32 2006
3	@@ -99,29 +99,29 @@	3	@@ -58,13 +58,20 @@
		4	COM_StripExtension
		5	============
		6	*/
		7	-void COM_StripExtension( const char in, char out ) {
		8	- while ( in && in != '.' ) {
		9	- out++ = in++;
		10	- }
		11	- *out = 0;
		12	-}
		13	+void COM_StripExtension( const char in, char out, int destsize ) {
		14	+ int length;
		15
		16	+ Q_strncpyz(out, in, destsize);
		17	+
		18	+ length = strlen(out)-1;
		19	+ while (length > 0 && out[length] != '.') {
		20	+ length--;
		21	+ if (out[length] == '/')
		22	+ return; // no extension
		23	+ }
		24	+ if (length)
		25	+ out[length] = 0;
		26	+}
		27
		28	/*
		29	==================
		30	@@ -99,29 +106,29 @@
4		31
5	============================================================================	32	============================================================================
6	*/	33	*/
Lines 45-51 Link Here
45	{	72	{
46	byte b1,b2;	73	byte b1,b2;
47		74
48	@@ -131,12 +131,12 @@	75	@@ -131,12 +138,12 @@
49	return (b1<<8) + b2;	76	return (b1<<8) + b2;
50	}	77	}
51		78
Lines 60-66 Link Here
60	{	87	{
61	byte b1,b2,b3,b4;	88	byte b1,b2,b3,b4;
62		89
63	@@ -145,15 +145,15 @@	90	@@ -145,15 +152,15 @@
64	b3 = (l>>16)&255;	91	b3 = (l>>16)&255;
65	b4 = (l>>24)&255;	92	b4 = (l>>24)&255;
66		93
Lines 79-85 Link Here
79	{	106	{
80	qint64 result;	107	qint64 result;
81		108
82	@@ -199,7 +199,7 @@	109	@@ -199,7 +206,7 @@
83	Swap_Init	110	Swap_Init
84	================	111	================
85	*/	112	*/
Lines 88-94 Link Here
88	void Swap_Init (void)	115	void Swap_Init (void)
89	{	116	{
90	byte swaptest[2] = {1,0};	117	byte swaptest[2] = {1,0};
91	@@ -229,7 +229,7 @@	118	@@ -229,7 +236,7 @@
92	}	119	}
93		120
94	}	121	}

Lines 1-5 Link Here

(-)files/patch-code-game-q_shared.h (-2 / +11 lines)
1	--- code/game/q_shared.h.orig Thu May 25 13:26:31 2006	1	--- ./code/game/q_shared.h.orig Wed May 31 18:55:11 2006
2	+++ code/game/q_shared.h Thu May 25 13:26:58 2006	2	+++ ./code/game/q_shared.h Wed May 31 19:06:40 2006
3	@@ -150,12 +150,14 @@	3	@@ -150,12 +150,14 @@
4		4
5	#define ID_INLINE __inline	5	#define ID_INLINE __inline
Lines 102-107 Link Here
102		102
103	#if !( defined __VECTORC )	103	#if !( defined __VECTORC )
104	void Com_Memset (void* dest, const int val, const size_t count);	104	void Com_Memset (void* dest, const int val, const size_t count);
		105	@@ -787,7 +800,7 @@
		106	float Com_Clamp( float min, float max, float value );
		107
		108	char COM_SkipPath( char pathname );
		109	-void COM_StripExtension( const char in, char out );
		110	+void COM_StripExtension( const char in, char out, int destsize );
		111	void COM_DefaultExtension( char path, int maxSize, const char extension );
		112
		113	void COM_BeginParseSession( const char *name );
105	@@ -888,18 +901,18 @@	114	@@ -888,18 +901,18 @@
106	} qint64;	115	} qint64;
107		116

Added Link Here

(-)files/patch-code-q3_ui-ui_playermodel.c (+11 lines)
1	--- ./code/q3_ui/ui_playermodel.c.orig Wed May 31 18:55:11 2006
2	+++ ./code/q3_ui/ui_playermodel.c Wed May 31 19:07:38 2006
3	@@ -424,7 +424,7 @@
4	{
5	filelen = strlen(fileptr);
6
7	- COM_StripExtension(fileptr,skinname);
8	+ COM_StripExtension(fileptr, skinname, sizeof(skinname));
9
10	// look for icon_????
11	if (!Q_stricmpn(skinname,"icon_",5))




--- ./code/q3_ui/ui_players.c.orig	Wed May 31 18:55:11 2006
+++ ./code/q3_ui/ui_players.c	Wed May 31 19:07:49 2006
@@ -89,13 +89,13 @@
 
 	if ( weaponNum == WP_MACHINEGUN || weaponNum == WP_GAUNTLET || weaponNum == WP_BFG ) {
 		strcpy( path, item->world_model[0] );
-		COM_StripExtension( path, path );
+		COM_StripExtension( path, path, sizeof(path) );
 		strcat( path, "_barrel.md3" );
 		pi->barrelModel = trap_R_RegisterModel( path );
 	}
 
 	strcpy( path, item->world_model[0] );
-	COM_StripExtension( path, path );
+	COM_StripExtension( path, path, sizeof(path) );
 	strcat( path, "_flash.md3" );
 	pi->flashModel = trap_R_RegisterModel( path );
 

Added Link Here

(-)files/patch-code-q3_ui-ui_saveconfig.c (+11 lines)
1	--- ./code/q3_ui/ui_saveconfig.c.orig Wed May 31 18:55:11 2006
2	+++ ./code/q3_ui/ui_saveconfig.c Wed May 31 19:08:05 2006
3	@@ -85,7 +85,7 @@
4	return;
5	}
6
7	- COM_StripExtension(saveConfig.savename.field.buffer, configname );
8	+ COM_StripExtension(saveConfig.savename.field.buffer, configname, sizeof(configname) );
9	trap_Cmd_ExecuteText( EXEC_APPEND, va( "writeconfig %s.cfg\n", configname ) );
10	UI_PopMenu();
11	}




--- ./code/qcommon/common.c.orig	Wed May 31 18:55:11 2006
+++ ./code/qcommon/common.c	Wed May 31 18:55:13 2006
@@ -24,15 +24,8 @@
 #include "../game/q_shared.h"
 #include "qcommon.h"
 #include <setjmp.h>
-#ifdef __linux__
-#include <netinet/in.h>
 #include <netinet/in.h>
-#else
-#if defined(MACOS_X)
+#include <sys/types.h>
 #include <netinet/in.h>
-#else
-#include <winsock.h>
-#endif

 
 int demo_protocols[] =
 { 66, 67, 68, 0 };
@@ -2367,7 +2360,7 @@
 	// cvar and command buffer management
 	Com_ParseCommandLine( commandLine );
 
-//	Swap_Init ();
+	Swap_Init ();
 	Cbuf_Init ();
 
 	Com_InitZoneMemory();

Lines 1-5 Link Here

(-)files/patch-code-qcommon-files.c (-2 / +2 lines)
1	--- code/qcommon/files.c.orig Thu May 25 16:39:34 2006	1	--- ./code/qcommon/files.c.orig Wed May 31 18:55:11 2006
2	+++ code/qcommon/files.c Thu May 25 16:41:43 2006	2	+++ ./code/qcommon/files.c Wed May 31 18:55:13 2006
3	@@ -2763,6 +2763,7 @@	3	@@ -2763,6 +2763,7 @@
4	if (fs_basepath->string[0]) {	4	if (fs_basepath->string[0]) {
5	FS_AddGameDirectory( fs_basepath->string, gameName );	5	FS_AddGameDirectory( fs_basepath->string, gameName );

Lines 1-5 Link Here

(-)files/patch-code-qcommon-vm.c (-2 / +11 lines)
1	--- code/qcommon/vm.c.orig Sat May 27 14:56:20 2006	1	--- ./code/qcommon/vm.c.orig Wed May 31 18:55:11 2006
2	+++ code/qcommon/vm.c Sat May 27 15:40:59 2006	2	+++ ./code/qcommon/vm.c Wed May 31 19:08:19 2006
		3	@@ -225,7 +225,7 @@
		4	return;
		5	}
		6
		7	- COM_StripExtension( vm->name, name );
		8	+ COM_StripExtension( vm->name, name, sizeof(name) );
		9	Com_sprintf( symbols, sizeof( symbols ), "vm/%s.map", name );
		10	len = FS_ReadFile( symbols, (void **)&mapfile );
		11	if ( !mapfile ) {
3	@@ -826,7 +826,7 @@	12	@@ -826,7 +826,7 @@
4		13
5		14

Added Link Here

(-)files/patch-code-renderer-tr_bsp.c (+11 lines)
1	--- ./code/renderer/tr_bsp.c.orig Wed May 31 18:55:11 2006
2	+++ ./code/renderer/tr_bsp.c Wed May 31 19:09:13 2006
3	@@ -1820,7 +1820,7 @@
4	Q_strncpyz( s_worldData.name, name, sizeof( s_worldData.name ) );
5
6	Q_strncpyz( s_worldData.baseName, COM_SkipPath( s_worldData.name ), sizeof( s_worldData.name ) );
7	- COM_StripExtension( s_worldData.baseName, s_worldData.baseName );
8	+ COM_StripExtension( s_worldData.baseName, s_worldData.baseName , sizeof(s_worldData.baseName));
9
10	startMarker = ri.Hunk_Alloc(0, h_low);
11	c_gridVerts = 0;




--- ./code/renderer/tr_shader.c.orig	Wed May 31 18:55:11 2006
+++ ./code/renderer/tr_shader.c	Wed May 31 19:09:58 2006
@@ -92,7 +92,7 @@
 
 	// remap all the shaders with the given name
 	// even tho they might have different lightmaps
-	COM_StripExtension( shaderName, strippedName );
+	COM_StripExtension( shaderName, strippedName, sizeof(strippedName));
 	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
 	for (sh = hashTable[hash]; sh; sh = sh->next) {
 		if (Q_stricmp(sh->name, strippedName) == 0) {
@@ -2351,7 +2351,7 @@
 		return tr.defaultShader;
 	}
 
-	COM_StripExtension( name, strippedName );
+	COM_StripExtension( name, strippedName, sizeof(strippedName) );
 
 	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
 
@@ -2419,7 +2419,7 @@
 		lightmapIndex = LIGHTMAP_BY_VERTEX;
 	}
 
-	COM_StripExtension( name, strippedName );
+	COM_StripExtension( name, strippedName, sizeof(strippedName) );
 
 	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
 




--- code/server/sv_client.c.orig	Wed May 31 23:38:47 2006
+++ code/server/sv_client.c	Wed May 31 23:40:24 2006
@@ -756,28 +756,58 @@
 	int curindex;
 	int rate;
 	int blockspersnap;
-	int idPack, missionPack;
+	int idPack, missionPack, unreferenced = 1;
 	char errorMessage[1024];
+	char pakbuf[MAX_OSPATH], *pakptr;
+	const char *referencedPaks;
+	int numRefPaks;
 
 	if (!*cl->downloadName)
 		return;	// Nothing being downloaded
 
 	if (!cl->download) {
-		// We open the file here
+		// Chop off filename extension.
+		Com_sprintf(pakbuf, sizeof(pakbuf), "%s", cl->downloadName);
+		pakptr = Q_strrchr(pakbuf, '.');
 
-		Com_Printf( "clientDownload: %d : begining \"%s\"\n", cl - svs.clients, cl->downloadName );
+		if (pakptr) {
+			*pakptr = '\0';
 
-		missionPack = FS_idPak(cl->downloadName, "missionpack");
-		idPack = missionPack || FS_idPak(cl->downloadName, "baseq3");
+			// Check for pk3 filename extension
+			if (!Q_stricmp(pakptr + 1, "pk3")) {
+				referencedPaks = FS_ReferencedPakNames();
 
-		if ( !sv_allowDownload->integer || idPack ||
+				// Check whether the file appears in the list of referenced
+				// paks to prevent downloading of arbitrary files.
+				Cmd_TokenizeString(referencedPaks);
+				numRefPaks = Cmd_Argc();
+
+				for (curindex = 0; curindex < numRefPaks; curindex++) {
+					if (!FS_FilenameCompare(Cmd_Argv(curindex), pakbuf)) {
+						unreferenced = 0;
+
+						// now that we know the file is referenced,
+						// check whether it's legal to download it.
+						missionPack = FS_idPak(pakbuf, "missionpack");
+						idPack = missionPack || FS_idPak(pakbuf, BASEGAME);
+
+						break;
+					}
+				}
+			}
+		}
+
+		// We open the file here
+		if ( !sv_allowDownload->integer || idPack || unreferenced ||
 			( cl->downloadSize = FS_SV_FOpenFileRead( cl->downloadName, &cl->download ) ) <= 0 ) {
 			// cannot auto-download file
-			if (idPack) {
+			if (unreferenced) {
+				Com_sprintf(errorMessage, sizeof(errorMessage), "File \"%s\" is not referenced and cannot be downloaded.", cl->downloadName);
+			} else if (idPack) {
 				Com_Printf("clientDownload: %d : \"%s\" cannot download id pk3 files\n", cl - svs.clients, cl->downloadName);
 				if (missionPack) {
 					Com_sprintf(errorMessage, sizeof(errorMessage), "Cannot autodownload Team Arena file \"%s\"\n"
-									"The Team Arena mission pack can be found in your local game store.", cl->downloadName);
+					    "The Team Arena mission pack can be found in your local game store.", cl->downloadName);
 				}
 				else {
 					Com_sprintf(errorMessage, sizeof(errorMessage), "Cannot autodownload id pk3 file \"%s\"", cl->downloadName);
@@ -808,7 +838,9 @@
 			*cl->downloadName = 0;
 			return;
 		}
- 
+
+		Com_Printf( "clientDownload: %d : beginning \"%s\"\n", cl - svs.clients, cl->downloadName );
+
 		// Init
 		cl->downloadCurrentBlock = cl->downloadClientBlock = cl->downloadXmitBlock = 0;
 		cl->downloadCount = 0;

Added Link Here

(-)files/patch-code-ui-ui_main.c (+11 lines)
1	--- ./code/ui/ui_main.c.orig Wed May 31 18:55:11 2006
2	+++ ./code/ui/ui_main.c Wed May 31 19:10:12 2006
3	@@ -4988,7 +4988,7 @@
4	{
5	filelen = strlen(fileptr);
6
7	- COM_StripExtension(fileptr,skinname);
8	+ COM_StripExtension(fileptr, skinname, sizeof(skinname));
9
10	// look for icon_????
11	if (Q_stricmpn(skinname, "icon_", 5) == 0 && !(Q_stricmp(skinname,"icon_blue") == 0 \|\| Q_stricmp(skinname,"icon_red") == 0))




--- ./code/ui/ui_players.c.orig	Wed May 31 18:55:11 2006
+++ ./code/ui/ui_players.c	Wed May 31 19:10:27 2006
@@ -90,13 +90,13 @@
 
 	if ( weaponNum == WP_MACHINEGUN || weaponNum == WP_GAUNTLET || weaponNum == WP_BFG ) {
 		strcpy( path, item->world_model[0] );
-		COM_StripExtension( path, path );
+		COM_StripExtension( path, path, sizeof(path) );
 		strcat( path, "_barrel.md3" );
 		pi->barrelModel = trap_R_RegisterModel( path );
 	}
 
 	strcpy( path, item->world_model[0] );
-	COM_StripExtension( path, path );
+	COM_StripExtension( path, path, sizeof(path) );
 	strcat( path, "_flash.md3" );
 	pi->flashModel = trap_R_RegisterModel( path );
 

Lines 1-5 Link Here

(-)files/patch-code-unix-Makefile (-33 / +41 lines)
1	--- code/unix/Makefile.orig Thu May 25 16:59:37 2006	1	--- ./code/unix/Makefile.orig Wed May 31 18:55:11 2006
2	+++ code/unix/Makefile Thu May 25 17:04:46 2006	2	+++ ./code/unix/Makefile Wed May 31 18:55:13 2006
3	@@ -19,6 +19,7 @@	3	@@ -19,6 +19,7 @@
4		4
5	PLATFORM=$(shell uname\|tr A-Z a-z)	5	PLATFORM=$(shell uname\|tr A-Z a-z)
Lines 67-74 Link Here
67	GLLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm	67	GLLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
68		68
69	ifeq ($(ARCH),axp)	69	ifeq ($(ARCH),axp)
70	@@ -199,31 +200,27 @@	70	@@ -197,33 +198,35 @@
71		71
		72	ifeq ($(PLATFORM),freebsd)
		73
		74	+ifeq ($(ARCH),powerpc)
		75	+ARCH=ppc
		76	+endif
		77	+
72	GLIBC= #libc is irrelevant	78	GLIBC= #libc is irrelevant
73		79
74	-ifneq (,$(findstring alpha,$(shell uname -m)))	80	-ifneq (,$(findstring alpha,$(shell uname -m)))
Lines 108-114 Link Here
108	-CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi )	114	-CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi )
109	-RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing - fstrength-reduce	115	-RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing - fstrength-reduce
110	+ifneq ($(ARCH),i386)	116	+ifneq ($(ARCH),i386)
		117	+ ifneq ($(ARCH),ppc)
111	+DLL_ONLY=true	118	+DLL_ONLY=true
		119	+ endif
112	+endif	120	+endif
113	+	121	+
114	+ifeq ($(DLL_ONLY),true)	122	+ifeq ($(DLL_ONLY),true)
Lines 116-122 Link Here
116	endif	124	endif
117		125
118	LIBEXT=a	126	LIBEXT=a
119	@@ -235,25 +232,37 @@	127	@@ -235,25 +238,37 @@
120	ARFLAGS=ar rv	128	ARFLAGS=ar rv
121	RANLIB=ranlib	129	RANLIB=ranlib
122		130
Lines 169-175 Link Here
169	endif	177	endif
170		178
171	else # ifeq freebsd	179	else # ifeq freebsd
172	@@ -283,7 +292,7 @@	180	@@ -283,7 +298,7 @@
173	ARFLAGS=ar rv	181	ARFLAGS=ar rv
174	RANLIB=ranlib	182	RANLIB=ranlib
175		183
Lines 178-184 Link Here
178	GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm	186	GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm
179		187
180	TARGETS=$(B)/sgiquake3 \	188	TARGETS=$(B)/sgiquake3 \
181	@@ -310,9 +319,9 @@	189	@@ -310,9 +325,9 @@
182	RANLIB=ranlib	190	RANLIB=ranlib
183		191
184	ifeq ($(PLATFORM),freebsd)	192	ifeq ($(PLATFORM),freebsd)
Lines 190-196 Link Here
190	endif # ifeq freebsd	198	endif # ifeq freebsd
191		199
192	TARGETS=\	200	TARGETS=\
193	@@ -348,7 +357,7 @@	201	@@ -348,7 +363,7 @@
194	$(MAKE) targets B=$(BR) CFLAGS="$(RELEASE_CFLAGS)"	202	$(MAKE) targets B=$(BR) CFLAGS="$(RELEASE_CFLAGS)"
195		203
196	#Build both debug and release builds	204	#Build both debug and release builds
Lines 199-205 Link Here
199		207
200	targets:makedirs $(TARGETS)	208	targets:makedirs $(TARGETS)
201		209
202	@@ -516,20 +525,6 @@	210	@@ -516,20 +531,6 @@
203	$(B)/client/unix_net.o \	211	$(B)/client/unix_net.o \
204	$(B)/client/unix_shared.o \	212	$(B)/client/unix_shared.o \
205	\	213	\
Lines 220-226 Link Here
220	# $(B)/client/q_parse.o \	228	# $(B)/client/q_parse.o \
221	# $(B)/client/math_quaternion.o \	229	# $(B)/client/math_quaternion.o \
222	# $(B)/client/util_str.o \	230	# $(B)/client/util_str.o \
223	@@ -541,7 +536,9 @@	231	@@ -541,7 +542,9 @@
224	# $(B)/client/q_shared.o \	232	# $(B)/client/q_shared.o \
225		233
226	ifeq ($(ARCH),i386)	234	ifeq ($(ARCH),i386)
Lines 231-242 Link Here
231	endif	239	endif
232		240
233	ifeq ($(ARCH),ppc)	241	ifeq ($(ARCH),ppc)
234	@@ -559,10 +556,24 @@	242	@@ -559,10 +562,24 @@
235	$(B)/client/linux_qgl.o \	243	$(B)/client/linux_qgl.o \
236	$(B)/client/linux_glimp.o \	244	$(B)/client/linux_glimp.o \
237	$(B)/client/linux_snd.o \	245	$(B)/client/linux_snd.o \
238	+ $(B)/client/linux_signals.o \	246	+ $(B)/client/linux_signals.o \
239	+ $(B)/client/snd_mixa.o \	247	$(B)/client/snd_mixa.o \
		248	- $(B)/client/matha.o \
		249	- $(B)/client/ftol.o \
		250	- $(B)/client/snapvector.o
240	+ $(B)/client/matha.o	251	+ $(B)/client/matha.o
241	+	252	+
242	+ Q3POBJ_SMP=\	253	+ Q3POBJ_SMP=\
Lines 245-254 Link Here
245	+ $(B)/client/linux_glimp_smp.o \	256	+ $(B)/client/linux_glimp_smp.o \
246	+ $(B)/client/linux_snd.o \	257	+ $(B)/client/linux_snd.o \
247	+ $(B)/client/linux_signals.o \	258	+ $(B)/client/linux_signals.o \
248	$(B)/client/snd_mixa.o \	259	+ $(B)/client/snd_mixa.o \
249	- $(B)/client/matha.o \
250	- $(B)/client/ftol.o \
251	- $(B)/client/snapvector.o
252	+ $(B)/client/matha.o	260	+ $(B)/client/matha.o
253	+	261	+
254	+ ifeq ($(ARCH),i386)	262	+ ifeq ($(ARCH),i386)
Lines 259-265 Link Here
259	else	267	else
260	ifeq ($(PLATFORM),irix)	268	ifeq ($(PLATFORM),irix)
261	Q3POBJ=\	269	Q3POBJ=\
262	@@ -578,7 +589,6 @@	270	@@ -578,7 +595,6 @@
263	$(B)/client/linux_common.o \	271	$(B)/client/linux_common.o \
264	$(B)/client/linux_qgl.o \	272	$(B)/client/linux_qgl.o \
265	$(B)/client/linux_glimp.o \	273	$(B)/client/linux_glimp.o \
Lines 267-273 Link Here
267	$(B)/client/linux_snd.o \	275	$(B)/client/linux_snd.o \
268	$(B)/client/snd_mixa.o \	276	$(B)/client/snd_mixa.o \
269	$(B)/client/matha.o \	277	$(B)/client/matha.o \
270	@@ -587,7 +597,6 @@	278	@@ -587,7 +603,6 @@
271	$(B)/client/linux_common.o \	279	$(B)/client/linux_common.o \
272	$(B)/client/linux_qgl.o \	280	$(B)/client/linux_qgl.o \
273	$(B)/client/linux_glimp_smp.o \	281	$(B)/client/linux_glimp_smp.o \
Lines 275-281 Link Here
275	$(B)/client/linux_snd.o \	283	$(B)/client/linux_snd.o \
276	$(B)/client/snd_mixa.o \	284	$(B)/client/snd_mixa.o \
277	$(B)/client/matha.o	285	$(B)/client/matha.o
278	@@ -602,12 +611,12 @@	286	@@ -602,12 +617,12 @@
279	endif #FreeBSD	287	endif #FreeBSD
280	endif #IRIX	288	endif #IRIX
281		289
Lines 290-296 Link Here
290	$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \	298	$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \
291	$(THREAD_LDFLAGS) $(LDFLAGS)	299	$(THREAD_LDFLAGS) $(LDFLAGS)
292		300
293	@@ -754,10 +763,10 @@	301	@@ -754,10 +769,10 @@
294	$(B)/client/linux_common.o : $(UDIR)/linux_common.c; $(DO_CC)	302	$(B)/client/linux_common.o : $(UDIR)/linux_common.c; $(DO_CC)
295	$(B)/client/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) $(GL_CFLAGS)	303	$(B)/client/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) $(GL_CFLAGS)
296	$(B)/client/linux_glimp_smp.o : $(UDIR)/linux_glimp.c; $(DO_SMP_CC) $(GL_CFLAGS)	304	$(B)/client/linux_glimp_smp.o : $(UDIR)/linux_glimp.c; $(DO_SMP_CC) $(GL_CFLAGS)
Lines 302-308 Link Here
302	$(B)/client/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS)	310	$(B)/client/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS)
303	$(B)/client/matha.o : $(UDIR)/matha.s; $(DO_AS)	311	$(B)/client/matha.o : $(UDIR)/matha.s; $(DO_AS)
304		312
305	@@ -912,13 +921,17 @@	313	@@ -912,13 +927,17 @@
306	$(B)/ded/unix_main.o \	314	$(B)/ded/unix_main.o \
307	$(B)/ded/unix_net.o \	315	$(B)/ded/unix_net.o \
308	$(B)/ded/unix_shared.o \	316	$(B)/ded/unix_shared.o \
Lines 321-327 Link Here
321	endif	329	endif
322		330
323	ifeq ($(ARCH),ppc)	331	ifeq ($(ARCH),ppc)
324	@@ -927,7 +940,7 @@	332	@@ -927,7 +946,7 @@
325	endif	333	endif
326	endif	334	endif
327		335
Lines 330-336 Link Here
330	$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)	338	$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
331		339
332	$(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC)	340	$(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC)
333	@@ -988,6 +1001,7 @@	341	@@ -988,6 +1007,7 @@
334	$(B)/ded/unix_main.o : $(UDIR)/unix_main.c; $(DO_DED_CC)	342	$(B)/ded/unix_main.o : $(UDIR)/unix_main.c; $(DO_DED_CC)
335	$(B)/ded/unix_net.o : $(UDIR)/unix_net.c; $(DO_DED_CC)	343	$(B)/ded/unix_net.o : $(UDIR)/unix_net.c; $(DO_DED_CC)
336	$(B)/ded/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_DED_CC)	344	$(B)/ded/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_DED_CC)
Lines 338-344 Link Here
338	$(B)/ded/null_client.o : $(NDIR)/null_client.c; $(DO_DED_CC)	346	$(B)/ded/null_client.o : $(NDIR)/null_client.c; $(DO_DED_CC)
339	$(B)/ded/null_input.o : $(NDIR)/null_input.c; $(DO_DED_CC)	347	$(B)/ded/null_input.o : $(NDIR)/null_input.c; $(DO_DED_CC)
340	$(B)/ded/null_snddma.o : $(NDIR)/null_snddma.c; $(DO_DED_CC)	348	$(B)/ded/null_snddma.o : $(NDIR)/null_snddma.c; $(DO_DED_CC)
341	@@ -1068,7 +1082,7 @@	349	@@ -1068,7 +1088,7 @@
342	$(B)/baseq3/cgame/q_math.o \	350	$(B)/baseq3/cgame/q_math.o \
343	$(B)/baseq3/cgame/q_shared.o	351	$(B)/baseq3/cgame/q_shared.o
344		352
Lines 347-353 Link Here
347	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)	355	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
348		356
349	$(B)/baseq3/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)	357	$(B)/baseq3/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)
350	@@ -1128,7 +1142,7 @@	358	@@ -1128,7 +1148,7 @@
351	$(B)/missionpack/cgame/q_shared.o \	359	$(B)/missionpack/cgame/q_shared.o \
352	$(B)/missionpack/cgame/ui_shared.o	360	$(B)/missionpack/cgame/ui_shared.o
353		361
Lines 356-362 Link Here
356	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)	364	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
357		365
358	$(B)/missionpack/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) -DMISSIONPACK	366	$(B)/missionpack/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) -DMISSIONPACK
359	@@ -1200,7 +1214,7 @@	367	@@ -1200,7 +1220,7 @@
360	$(B)/baseq3/game/q_math.o \	368	$(B)/baseq3/game/q_math.o \
361	$(B)/baseq3/game/q_shared.o	369	$(B)/baseq3/game/q_shared.o
362		370
Lines 365-371 Link Here
365	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)	373	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
366		374
367	$(B)/baseq3/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC)	375	$(B)/baseq3/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC)
368	@@ -1278,7 +1292,7 @@	376	@@ -1278,7 +1298,7 @@
369	$(B)/missionpack/game/q_math.o \	377	$(B)/missionpack/game/q_math.o \
370	$(B)/missionpack/game/q_shared.o	378	$(B)/missionpack/game/q_shared.o
371		379
Lines 374-380 Link Here
374	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)	382	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
375		383
376	$(B)/missionpack/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) -DMISSIONPACK	384	$(B)/missionpack/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) -DMISSIONPACK
377	@@ -1367,7 +1381,7 @@	385	@@ -1367,7 +1387,7 @@
378	$(B)/baseq3/ui/q_math.o \	386	$(B)/baseq3/ui/q_math.o \
379	$(B)/baseq3/ui/q_shared.o	387	$(B)/baseq3/ui/q_shared.o
380		388
Lines 383-389 Link Here
383	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)	391	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
384		392
385	$(B)/baseq3/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)	393	$(B)/baseq3/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)
386	@@ -1410,7 +1424,7 @@	394	@@ -1410,7 +1430,7 @@
387	$(B)/baseq3/ui/ui_startserver.o : $(Q3UIDIR)/ui_startserver.c; $(DO_SHLIB_CC)	395	$(B)/baseq3/ui/ui_startserver.o : $(Q3UIDIR)/ui_startserver.c; $(DO_SHLIB_CC)
388	$(B)/baseq3/ui/ui_team.o : $(Q3UIDIR)/ui_team.c; $(DO_SHLIB_CC)	396	$(B)/baseq3/ui/ui_team.o : $(Q3UIDIR)/ui_team.c; $(DO_SHLIB_CC)
389	$(B)/baseq3/ui/ui_teamorders.o : $(Q3UIDIR)/ui_teamorders.c; $(DO_SHLIB_CC)	397	$(B)/baseq3/ui/ui_teamorders.o : $(Q3UIDIR)/ui_teamorders.c; $(DO_SHLIB_CC)
Lines 392-398 Link Here
392	$(B)/baseq3/ui/ui_video.o : $(Q3UIDIR)/ui_video.c; $(DO_SHLIB_CC)	400	$(B)/baseq3/ui/ui_video.o : $(Q3UIDIR)/ui_video.c; $(DO_SHLIB_CC)
393		401
394	# bk001205 - these wre the only SHLIB compiles in 1.17	402	# bk001205 - these wre the only SHLIB compiles in 1.17
395	@@ -1450,7 +1464,7 @@	403	@@ -1450,7 +1470,7 @@
396	# $(B)/missionpack/ui/q_math.o \	404	# $(B)/missionpack/ui/q_math.o \
397	# $(B)/missionpack/ui/q_shared.o	405	# $(B)/missionpack/ui/q_shared.o
398		406
Lines 401-407 Link Here
401	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ)	409	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ)
402		410
403	$(B)/missionpack/ui/ui_atoms.o : $(UIDIR)/ui_atoms.c; $(DO_SHLIB_CC) -DMISSIONPACK	411	$(B)/missionpack/ui/ui_atoms.o : $(UIDIR)/ui_atoms.c; $(DO_SHLIB_CC) -DMISSIONPACK
404	@@ -1613,23 +1627,8 @@	412	@@ -1613,23 +1633,8 @@
405	$(B)/q3static/unix_net.o \	413	$(B)/q3static/unix_net.o \
406	$(B)/q3static/unix_shared.o \	414	$(B)/q3static/unix_shared.o \
407	\	415	\
Lines 425-431 Link Here
425	$(B)/q3static/linux_snd.o \	433	$(B)/q3static/linux_snd.o \
426	$(B)/q3static/snd_mixa.o \	434	$(B)/q3static/snd_mixa.o \
427	$(B)/q3static/matha.o	435	$(B)/q3static/matha.o
428	@@ -1779,7 +1778,6 @@	436	@@ -1779,7 +1784,6 @@
429	$(B)/q3static/unix_net.o : $(UDIR)/unix_net.c; $(DO_CC) -DQ3_STATIC	437	$(B)/q3static/unix_net.o : $(UDIR)/unix_net.c; $(DO_CC) -DQ3_STATIC
430	$(B)/q3static/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_CC) -DQ3_STATIC	438	$(B)/q3static/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_CC) -DQ3_STATIC
431	$(B)/q3static/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) -DQ3_STATIC	439	$(B)/q3static/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) -DQ3_STATIC
Lines 433-439 Link Here
433	$(B)/q3static/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) -DQ3_STATIC	441	$(B)/q3static/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) -DQ3_STATIC
434	$(B)/q3static/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) -DQ3_STATIC	442	$(B)/q3static/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) -DQ3_STATIC
435	$(B)/q3static/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) -DQ3_STATIC	443	$(B)/q3static/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) -DQ3_STATIC
436	@@ -2020,7 +2018,7 @@	444	@@ -2020,7 +2024,7 @@
437		445
438		446
439		447
Lines 442-448 Link Here
442	$(CC) $(CFLAGS) -o $@ $(Q3SOBJ) $(GLLDFLAGS) $(LDFLAGS)	450	$(CC) $(CFLAGS) -o $@ $(Q3SOBJ) $(GLLDFLAGS) $(LDFLAGS)
443		451
444		452
445	@@ -2059,9 +2057,9 @@	453	@@ -2059,9 +2063,9 @@
446		454
447	copyfiles:	455	copyfiles:
448	-mkdirhier $(COPYDIR)	456	-mkdirhier $(COPYDIR)




diff -ruN ./code/unix/linux_common.c ../quake3-1.32b-BUILT/./code/unix/linux_common.c
--- ./code/unix/linux_common.c	Tue Aug 16 02:10:07 2005
+++ ../quake3-1.32b-BUILT/./code/unix/linux_common.c	Tue Aug 23 13:38:35 2005
@@ -33,6 +33,7 @@
 #include <unistd.h>   // AH - for size_t
 #include <string.h>
 
+
 // bk001207 - we need something under Linux, too. Mac?
 #if 1 // defined(C_ONLY) // bk010102 - dedicated?
 void Com_Memcpy (void* dest, const void* src, const size_t count) {
@@ -340,5 +341,6 @@
 		break;
 	}
 }
+
 
 #endif

Removed Link Here

(-)files/patch-code-unix-linux_glimp.c (-11 lines)
1	diff -ruN ./code/unix/linux_glimp.c ../quake3-1.32b-BUILT/./code/unix/linux_glimp.c
2	--- ./code/unix/linux_glimp.c Tue Aug 16 02:10:07 2005
3	+++ ../quake3-1.32b-BUILT/./code/unix/linux_glimp.c Mon Aug 22 22:11:16 2005
4	@@ -1774,7 +1774,5 @@
5	// bk010216 - added stubs for non-Linux UNIXes here
6	// FIXME - use NO_JOYSTICK or something else generic
7
8	-#if defined( __FreeBSD__ ) // rb010123
9	void IN_StartupJoystick( void ) {}
10	void IN_JoyMove( void ) {}
11	-#endif

Lines 1-5 Link Here

(-)files/patch-code-unix-unix_main.c (-2 / +2 lines)
1	--- code/unix/unix_main.c.orig Thu May 25 16:59:37 2006	1	--- ./code/unix/unix_main.c.orig Wed May 31 18:55:12 2006
2	+++ code/unix/unix_main.c Thu May 25 17:00:58 2006	2	+++ ./code/unix/unix_main.c Wed May 31 18:55:13 2006
3	@@ -707,12 +707,12 @@	3	@@ -707,12 +707,12 @@
4	{	4	{
5	void *libHandle;	5	void *libHandle;

Lines 1-5 Link Here

(-)files/patch-code-unix-unix_shared.c (-2 / +2 lines)
1	--- code/unix/unix_shared.c.orig Thu May 25 14:38:44 2006	1	--- ./code/unix/unix_shared.c.orig Wed May 31 18:55:12 2006
2	+++ code/unix/unix_shared.c Thu May 25 14:41:26 2006	2	+++ ./code/unix/unix_shared.c Wed May 31 18:55:13 2006
3	@@ -38,7 +38,7 @@	3	@@ -38,7 +38,7 @@
4	static char cdPath[MAX_OSPATH];	4	static char cdPath[MAX_OSPATH];

Return to bug 98296

Lines 6-13 Link Here

(-)Makefile (-9 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= quake3	8	PORTNAME= quake3
9	PORTVERSION= 1.32b	9	PORTVERSION= 1.32c
10	PORTREVISION= 5
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= http://www.proarena.com/p/ftpx/x8524/quake_3_arena/ \	11	MASTER_SITES= http://www.proarena.com/p/ftpx/x8524/quake_3_arena/ \
13	http://www.planetgargoyle.com/ \	12	http://www.planetgargoyle.com/ \
Lines 15-21 Link Here
15	http://0day.icculus.org/mirrors/quake3/ \	14	http://0day.icculus.org/mirrors/quake3/ \
16	http://www.olpainless.net/files/ \	15	http://www.olpainless.net/files/ \
17	${MASTER_SITE_IDSOFTWARE:S\|$\|source/\|}	16	${MASTER_SITE_IDSOFTWARE:S\|$\|source/\|}
18	DISTFILES= ${DISTNAME}-source${EXTRACT_SUFX}	17	DISTNAME= ${PORTNAME}-${REALVERSION}-source
19		18
20	MAINTAINER= shirshegsm@gmail.com	19	MAINTAINER= shirshegsm@gmail.com
21	COMMENT= Quake III Arena -- first person shooter (native build)	20	COMMENT= Quake III Arena -- first person shooter (native build)
Lines 24-34 Link Here
24	USE_DOS2UNIX= yes	23	USE_DOS2UNIX= yes
25	USE_GMAKE= yes	24	USE_GMAKE= yes
26	USE_GCC= 3.2+	25	USE_GCC= 3.2+
		26	WRKSRC= ${WRKDIR}/${PORTNAME}-${REALVERSION}
27	BUILD_WRKSRC= ${WRKSRC}/code/unix	27	BUILD_WRKSRC= ${WRKSRC}/code/unix
28		28
29	OPTIONS= CLIENT "Build client" on \	29	OPTIONS= CLIENT "Build client" on \
30	DEDICATED "Build dedicated server" on \	30	DEDICATED "Build dedicated server" on \
31	GAMELIBS "Build game libraries (mandatory on !i386)" off \	31	GAMELIBS "Build game libraries (when not mandatory)" off \
32	OPTIMIZED_CFLAGS "Enable compilation optimizations" on \	32	OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
33	SMP "Build SMP (threaded) client" on	33	SMP "Build SMP (threaded) client" on
34		34
Lines 36-41 Link Here
36	PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}"	36	PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}"
37		37
38	LIBDIR= ${PREFIX}/lib/${PORTNAME}	38	LIBDIR= ${PREFIX}/lib/${PORTNAME}
		39	REALVERSION= 1.32b
39		40
40	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
41		42
Lines 45-54 Link Here
45	.endif	46	.endif
46		47
47	.if ${ARCH} == "i386"	48	.if ${ARCH} == "i386"
48	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm	49	BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
49	.endif	50	.endif
50		51
51	.if !defined(WITHOUT_CLIENT) && !defined(WITHOUT_SMP)	52	.if !defined(WITHOUT_CLIENT) \|\| !defined(WITHOUT_SMP)
52	USE_GL= yes	53	USE_GL= yes
53	.endif	54	.endif
54		55
Lines 68-74 Link Here
68	PLIST_SUB+= DEDICATED="@comment "	69	PLIST_SUB+= DEDICATED="@comment "
69	.endif	70	.endif
70		71
71	.if defined(WITH_GAMELIBS) \|\| ${ARCH} != "i386"	72	.if defined(WITH_GAMELIBS) \|\| (${ARCH} != "i386" && ${ARCH} != "powerpc")
72	MAKE_ENV+= GAMELIBS=YES	73	MAKE_ENV+= GAMELIBS=YES
73	PLIST_SUB+= GAMELIBS=""	74	PLIST_SUB+= GAMELIBS=""
74	.else	75	.else
Lines 94-107 Link Here
94	@${REINPLACE_CMD} -e \	95	@${REINPLACE_CMD} -e \
95	's\|//[[:blank:]]\(Swap_Init[[:blank:]]();\)\|\1\|' \	96	's\|//[[:blank:]]\(Swap_Init[[:blank:]]();\)\|\1\|' \
96	${WRKSRC}/code/botlib/be_interface.c \	97	${WRKSRC}/code/botlib/be_interface.c \
97	${WRKSRC}/code/qcommon/common.c \
98	${WRKSRC}/code/renderer/tr_init.c	98	${WRKSRC}/code/renderer/tr_init.c
99		99
100	do-install:	100	do-install:
101	.for bin in ${Q3BIN}	101	.for bin in ${Q3BIN}
102	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${PREFIX}/bin	102	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${PREFIX}/bin
103	.endfor	103	.endfor
104	.if defined(WITH_GAMELIBS) \|\| ${ARCH} != "i386"	104	.if defined(WITH_GAMELIBS) \|\| (${ARCH} != "i386" && ${ARCH} != "powerpc")
105	.for dir in baseq3 missionpack	105	.for dir in baseq3 missionpack
106	${MKDIR} ${LIBDIR}/${dir}	106	${MKDIR} ${LIBDIR}/${dir}
107	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir}	107	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir}

Added Link Here

(-)files/patch-code-cgame-cg_weapons.c (+23 lines)
1	--- ./code/cgame/cg_weapons.c.orig Wed May 31 18:55:11 2006
2	+++ ./code/cgame/cg_weapons.c Wed May 31 19:05:20 2006
3	@@ -656,17 +656,17 @@
4	}
5
6	strcpy( path, item->world_model[0] );
7	- COM_StripExtension( path, path );
8	+ COM_StripExtension( path, path, sizeof(path) );
9	strcat( path, "_flash.md3" );
10	weaponInfo->flashModel = trap_R_RegisterModel( path );
11
12	strcpy( path, item->world_model[0] );
13	- COM_StripExtension( path, path );
14	+ COM_StripExtension( path, path, sizeof(path) );
15	strcat( path, "_barrel.md3" );
16	weaponInfo->barrelModel = trap_R_RegisterModel( path );
17
18	strcpy( path, item->world_model[0] );
19	- COM_StripExtension( path, path );
20	+ COM_StripExtension( path, path, sizeof(path) );
21	strcat( path, "_hand.md3" );
22	weaponInfo->handsModel = trap_R_RegisterModel( path );
23

Added Link Here

(-)files/patch-code-q3_ui-ui_players.c (+18 lines)
1	--- ./code/q3_ui/ui_players.c.orig Wed May 31 18:55:11 2006
2	+++ ./code/q3_ui/ui_players.c Wed May 31 19:07:49 2006
3	@@ -89,13 +89,13 @@
4
5	if ( weaponNum == WP_MACHINEGUN \|\| weaponNum == WP_GAUNTLET \|\| weaponNum == WP_BFG ) {
6	strcpy( path, item->world_model[0] );
7	- COM_StripExtension( path, path );
8	+ COM_StripExtension( path, path, sizeof(path) );
9	strcat( path, "_barrel.md3" );
10	pi->barrelModel = trap_R_RegisterModel( path );
11	}
12
13	strcpy( path, item->world_model[0] );
14	- COM_StripExtension( path, path );
15	+ COM_StripExtension( path, path, sizeof(path) );
16	strcat( path, "_flash.md3" );
17	pi->flashModel = trap_R_RegisterModel( path );
18

Lines 1-15 Link Here

(-)files/patch-code-qcommon-common.c (-5 / +14 lines)
1	--- code/qcommon/common.c.orig Mon Aug 15 23:10:07 2005	1	--- ./code/qcommon/common.c.orig Wed May 31 18:55:11 2006
2	+++ code/qcommon/common.c Wed Nov 23 10:53:29 2005	2	+++ ./code/qcommon/common.c Wed May 31 18:55:13 2006
3	@@ -24,15 +24,8 @@	3	@@ -24,15 +24,8 @@
4	#include "../game/q_shared.h"	4	#include "../game/q_shared.h"
5	#include "qcommon.h"	5	#include "qcommon.h"
6	#include <setjmp.h>	6	#include <setjmp.h>
7	-#ifdef __linux__	7	-#ifdef __linux__
8	+#include <sys/types.h>	8	-#include <netinet/in.h>
9	#include <netinet/in.h>
10	-#else	9	-#else
11	-#if defined(MACOS_X)	10	-#if defined(MACOS_X)
12	-#include <netinet/in.h>	11	+#include <sys/types.h>
		12	#include <netinet/in.h>
13	-#else	13	-#else
14	-#include <winsock.h>	14	-#include <winsock.h>
15	-#endif	15	-#endif
Lines 17-19 Link Here
17		17
18	int demo_protocols[] =	18	int demo_protocols[] =
19	{ 66, 67, 68, 0 };	19	{ 66, 67, 68, 0 };
		20	@@ -2367,7 +2360,7 @@
		21	// cvar and command buffer management
		22	Com_ParseCommandLine( commandLine );
		23
		24	-// Swap_Init ();
		25	+ Swap_Init ();
		26	Cbuf_Init ();
		27
		28	Com_InitZoneMemory();

Added Link Here

(-)files/patch-code-renderer-tr_shader.c (+29 lines)
1	--- ./code/renderer/tr_shader.c.orig Wed May 31 18:55:11 2006
2	+++ ./code/renderer/tr_shader.c Wed May 31 19:09:58 2006
3	@@ -92,7 +92,7 @@
4
5	// remap all the shaders with the given name
6	// even tho they might have different lightmaps
7	- COM_StripExtension( shaderName, strippedName );
8	+ COM_StripExtension( shaderName, strippedName, sizeof(strippedName));
9	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
10	for (sh = hashTable[hash]; sh; sh = sh->next) {
11	if (Q_stricmp(sh->name, strippedName) == 0) {
12	@@ -2351,7 +2351,7 @@
13	return tr.defaultShader;
14	}
15
16	- COM_StripExtension( name, strippedName );
17	+ COM_StripExtension( name, strippedName, sizeof(strippedName) );
18
19	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
20
21	@@ -2419,7 +2419,7 @@
22	lightmapIndex = LIGHTMAP_BY_VERTEX;
23	}
24
25	- COM_StripExtension( name, strippedName );
26	+ COM_StripExtension( name, strippedName, sizeof(strippedName) );
27
28	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
29

Added Link Here

(-)files/patch-code-server-sv_client.c (+80 lines)
1	--- code/server/sv_client.c.orig Wed May 31 23:38:47 2006
2	+++ code/server/sv_client.c Wed May 31 23:40:24 2006
3	@@ -756,28 +756,58 @@
4	int curindex;
5	int rate;
6	int blockspersnap;
7	- int idPack, missionPack;
8	+ int idPack, missionPack, unreferenced = 1;
9	char errorMessage[1024];
10	+ char pakbuf[MAX_OSPATH], *pakptr;
11	+ const char *referencedPaks;
12	+ int numRefPaks;
13
14	if (!*cl->downloadName)
15	return; // Nothing being downloaded
16
17	if (!cl->download) {
18	- // We open the file here
19	+ // Chop off filename extension.
20	+ Com_sprintf(pakbuf, sizeof(pakbuf), "%s", cl->downloadName);
21	+ pakptr = Q_strrchr(pakbuf, '.');
22
23	- Com_Printf( "clientDownload: %d : begining \"%s\"\n", cl - svs.clients, cl->downloadName );
24	+ if (pakptr) {
25	+ *pakptr = '\0';
26
27	- missionPack = FS_idPak(cl->downloadName, "missionpack");
28	- idPack = missionPack \|\| FS_idPak(cl->downloadName, "baseq3");
29	+ // Check for pk3 filename extension
30	+ if (!Q_stricmp(pakptr + 1, "pk3")) {
31	+ referencedPaks = FS_ReferencedPakNames();
32
33	- if ( !sv_allowDownload->integer \|\| idPack \|\|
34	+ // Check whether the file appears in the list of referenced
35	+ // paks to prevent downloading of arbitrary files.
36	+ Cmd_TokenizeString(referencedPaks);
37	+ numRefPaks = Cmd_Argc();
38	+
39	+ for (curindex = 0; curindex < numRefPaks; curindex++) {
40	+ if (!FS_FilenameCompare(Cmd_Argv(curindex), pakbuf)) {
41	+ unreferenced = 0;
42	+
43	+ // now that we know the file is referenced,
44	+ // check whether it's legal to download it.
45	+ missionPack = FS_idPak(pakbuf, "missionpack");
46	+ idPack = missionPack \|\| FS_idPak(pakbuf, BASEGAME);
47	+
48	+ break;
49	+ }
50	+ }
51	+ }
52	+ }
53	+
54	+ // We open the file here
55	+ if ( !sv_allowDownload->integer \|\| idPack \|\| unreferenced \|\|
56	( cl->downloadSize = FS_SV_FOpenFileRead( cl->downloadName, &cl->download ) ) <= 0 ) {
57	// cannot auto-download file
58	- if (idPack) {
59	+ if (unreferenced) {
60	+ Com_sprintf(errorMessage, sizeof(errorMessage), "File \"%s\" is not referenced and cannot be downloaded.", cl->downloadName);
61	+ } else if (idPack) {
62	Com_Printf("clientDownload: %d : \"%s\" cannot download id pk3 files\n", cl - svs.clients, cl->downloadName);
63	if (missionPack) {
64	Com_sprintf(errorMessage, sizeof(errorMessage), "Cannot autodownload Team Arena file \"%s\"\n"
65	- "The Team Arena mission pack can be found in your local game store.", cl->downloadName);
66	+ "The Team Arena mission pack can be found in your local game store.", cl->downloadName);
67	}
68	else {
69	Com_sprintf(errorMessage, sizeof(errorMessage), "Cannot autodownload id pk3 file \"%s\"", cl->downloadName);
70	@@ -808,7 +838,9 @@
71	*cl->downloadName = 0;
72	return;
73	}
74	-
75	+
76	+ Com_Printf( "clientDownload: %d : beginning \"%s\"\n", cl - svs.clients, cl->downloadName );
77	+
78	// Init
79	cl->downloadCurrentBlock = cl->downloadClientBlock = cl->downloadXmitBlock = 0;
80	cl->downloadCount = 0;

Added Link Here

(-)files/patch-code-ui-ui_players.c (+18 lines)
1	--- ./code/ui/ui_players.c.orig Wed May 31 18:55:11 2006
2	+++ ./code/ui/ui_players.c Wed May 31 19:10:27 2006
3	@@ -90,13 +90,13 @@
4
5	if ( weaponNum == WP_MACHINEGUN \|\| weaponNum == WP_GAUNTLET \|\| weaponNum == WP_BFG ) {
6	strcpy( path, item->world_model[0] );
7	- COM_StripExtension( path, path );
8	+ COM_StripExtension( path, path, sizeof(path) );
9	strcat( path, "_barrel.md3" );
10	pi->barrelModel = trap_R_RegisterModel( path );
11	}
12
13	strcpy( path, item->world_model[0] );
14	- COM_StripExtension( path, path );
15	+ COM_StripExtension( path, path, sizeof(path) );
16	strcat( path, "_flash.md3" );
17	pi->flashModel = trap_R_RegisterModel( path );
18

Removed Link Here

(-)files/patch-code-unix-linux_common.c (-18 lines)
1	diff -ruN ./code/unix/linux_common.c ../quake3-1.32b-BUILT/./code/unix/linux_common.c
2	--- ./code/unix/linux_common.c Tue Aug 16 02:10:07 2005
3	+++ ../quake3-1.32b-BUILT/./code/unix/linux_common.c Tue Aug 23 13:38:35 2005
4	@@ -33,6 +33,7 @@
5	#include <unistd.h> // AH - for size_t
6	#include <string.h>
7
8	+
9	// bk001207 - we need something under Linux, too. Mac?
10	#if 1 // defined(C_ONLY) // bk010102 - dedicated?
11	void Com_Memcpy (void* dest, const void* src, const size_t count) {
12	@@ -340,5 +341,6 @@
13	break;
14	}
15	}
16	+
17
18	#endif