Attachment #114086 for bug #155716

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




# Makefile for defining variables used by other Quake3 related ports.

# Set variables.

Q3PKGNAMEPREFIX?=quake3-
Q3DIR?=		${PREFIX}/share/quake3

# Add them to the environment.

MAKE_ENV+=	Q3DIR="${Q3DIR}"
PLIST_SUB+=	Q3DIR="${Q3DIR:S/${PREFIX}\///}"
SUB_LIST+=	Q3DIR="${Q3DIR}"

# Add the dependency.

Lines 17-23 Link Here

(-)ioquake3-devel/Makefile (-1 / +1 lines)
17	PLIST?= ${.CURDIR}/../ioquake3/pkg-plist	17	PLIST?= ${.CURDIR}/../ioquake3/pkg-plist
18	PATCHDIR?= ${WRKDIR}/freebsd-patchset/	18	PATCHDIR?= ${WRKDIR}/freebsd-patchset/
19		19
20	SVNREVISION?= 1897	20	SVNREVISION?= 1936
21	BINSUFFIX?= -devel	21	BINSUFFIX?= -devel
22		22
23	.include "${.CURDIR}/../ioquake3/Makefile"	23	.include "${.CURDIR}/../ioquake3/Makefile"

Lines 1-2 Link Here

(-)ioquake3-devel/distinfo (-2 / +2 lines)
1	SHA256 (ioquake3-devel-1.36_SVN1897.zip) = 1f85ffdbc3798c26760281e7387796014dae82c4141095fe6e9bab4c014a6f43	1	SHA256 (ioquake3-devel-1.36_SVN1936.zip) = ed07048e9716d21b0ecea4b5366d4d78030bdfd175245f46260d67726bdc05b9
2	SIZE (ioquake3-devel-1.36_SVN1897.zip) = 4933919	2	SIZE (ioquake3-devel-1.36_SVN1936.zip) = 4947849




#

PORTNAME=	urbanterror
PORTVERSION=	4.1.1
CATEGORIES=	games
MASTER_SITES=	ftp://ftp.snt.utwente.nl/pub/games/urbanterror/full_install/linux_or_mac/
#		http://www.urbanterror.info/downloads/software/urt/${DISTNAME}${EXTRACT_SUFX}?download=direct\\\#
		http://mrsentry.net/release/ \
		http://www.iourt.com/urt${PORTVERSION:S/.//}/
PKGNAMESUFFIX=	-data
DISTNAME=	UrbanTerror${PORTVERSION:S/.//g}

MAINTAINER=	kamikaze@bsdforen.de
COMMENT=	Standalone realism based mod originally for Quake III Arena

USE_ZIP=	yes
NO_BUILD=	yes
NO_PACKAGE=	Package will be 1GB; set FORCE_PACKAGE if you really want it
WRKSRC=		${WRKDIR}/UrbanTerror

DATADIR=	${Q3DIR}

.include "../quake3-data/Makefile.include"

Q3DIR!=		cd ${PORTSDIR}/games/quake3-data && ${MAKE} -V Q3DIR

post-extract:
	@cd ${WRKSRC}/q3ut4 && ${MV} readme${PORTVERSION:S/.//:C/\..*//}.txt ..

do-install:
	${MKDIR} ${DATADIR}/q3ut4
	${CP} -r ${WRKSRC}/q3ut4/* ${DATADIR}/q3ut4
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/readme${PORTVERSION:S/.//:C/\..*//}.txt \
		${DOCSDIR}/readme${PORTVERSION:S/.//g}.txt
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)urbanterror-data/distinfo (-3 / +2 lines)
1	MD5 (UrbanTerror_41_FULL.zip) = 1370306ea236f65f595e7ca70765e469	1	SHA256 (UrbanTerror411.zip) = 32d578c556975db2b09735d8be49b575cc0bfc4d379ca57d9981c656115a6f47
2	SHA256 (UrbanTerror_41_FULL.zip) = 5706957783d0e4e77fcc4bbbc2df83aefc0f9a6388f6a63b60947e84f9ed265f	2	SIZE (UrbanTerror411.zip) = 1074190065
3	SIZE (UrbanTerror_41_FULL.zip) = 754307397

Lines 1-4 Link Here

(-)urbanterror-data/pkg-plist (-1 / +3 lines)
1	%%PORTDOCS%%%%DOCSDIR%%/readme41.txt	1	%%PORTDOCS%%%%DOCSDIR%%/readme411.txt
2	%%DATADIR%%/q3ut4/QIIIA Game Source (SDK) License.doc	2	%%DATADIR%%/q3ut4/QIIIA Game Source (SDK) License.doc
3	%%DATADIR%%/q3ut4/Urban Terror on the Web.url	3	%%DATADIR%%/q3ut4/Urban Terror on the Web.url
4	%%DATADIR%%/q3ut4/autoexec.cfg	4	%%DATADIR%%/q3ut4/autoexec.cfg
Lines 8-15 Link Here
8	%%DATADIR%%/q3ut4/q3ut.ico	8	%%DATADIR%%/q3ut4/q3ut.ico
9	%%DATADIR%%/q3ut4/screenshots/shot0000.jpg	9	%%DATADIR%%/q3ut4/screenshots/shot0000.jpg
10	%%DATADIR%%/q3ut4/server.cfg	10	%%DATADIR%%/q3ut4/server.cfg
		11	%%DATADIR%%/q3ut4/ut4_commune.pk3
11	%%DATADIR%%/q3ut4/zpak000.pk3	12	%%DATADIR%%/q3ut4/zpak000.pk3
12	%%DATADIR%%/q3ut4/zpak000_assets.pk3	13	%%DATADIR%%/q3ut4/zpak000_assets.pk3
		14	%%DATADIR%%/q3ut4/zpak001_assets.pk3
13	@dirrm %%DATADIR%%/q3ut4/screenshots	15	@dirrm %%DATADIR%%/q3ut4/screenshots
14	@dirrm %%DATADIR%%/q3ut4/demos	16	@dirrm %%DATADIR%%/q3ut4/demos
15	@dirrm %%DATADIR%%/q3ut4	17	@dirrm %%DATADIR%%/q3ut4




#

PORTNAME=	iourbanterror
PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
DISTVERSION=	1.36_SVN${SVNREVISION}+${GAMEVERSION}
PORTREVISION=	0
PORTEPOCH=	1
CATEGORIES=	games
DISTNAME=	ioquake3-devel-1.36_SVN${SVNREVISION}

# The docs belong to ioquake3
NOPORTDOCS=	yes

GAMEVERSION=	4.1.1
Q3TOTALCONV=	yes
Q3DIR=		${PREFIX}/share/quake3
Q3ICON=		${PREFIX}/share/quake3/q3ut4/q3ut.ico

Lines 1-2 Link Here

(-)iourbanterror/distinfo (-2 / +2 lines)
1	SHA256 (ioquake3-devel-1.36_SVN1897.zip) = 1f85ffdbc3798c26760281e7387796014dae82c4141095fe6e9bab4c014a6f43	1	SHA256 (ioquake3-devel-1.36_SVN1936.zip) = ed07048e9716d21b0ecea4b5366d4d78030bdfd175245f46260d67726bdc05b9
2	SIZE (ioquake3-devel-1.36_SVN1897.zip) = 4933919	2	SIZE (ioquake3-devel-1.36_SVN1936.zip) = 4947849

Lines 5-11 Link Here

(-)iourbanterror/pkg-message (-2 / +2 lines)
5	UrbanTerror project is switching to a closed source licensing model:	5	UrbanTerror project is switching to a closed source licensing model:
6	http://www.urbanterror.info/news/texts/285/	6	http://www.urbanterror.info/news/texts/285/
7		7
8	Should the game have trouble meeting com_maxfps, com_busywait 1 to restore the	8	Should the game have trouble meeting com_maxfps, set com_busywait 1 to restore
9	old behaviour.	9	the old behaviour.
10		10
11	==============================================================================	11	==============================================================================

Lines 6-16 Link Here

(-)openarena/Makefile (-4 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= openarena	8	PORTNAME= openarena
9	PORTVERSION= 0.8.5	9	PORTVERSION= ${GAMEVERSION}.s${SVNREVISION}
10	DISTVERSION= 1.36_SVN1788+${PORTVERSION}	10	DISTVERSION= 1.36_SVN${SVNREVISION}+${GAMEVERSION}
11	PORTREVISION= 1	11	PORTREVISION= 0
		12	PORTEPOCH= 1
12	MASTER_SITES= http://files.poulsander.com/~poul19/public_files/oa/dev081/	13	MASTER_SITES= http://files.poulsander.com/~poul19/public_files/oa/dev081/
13	DISTNAME= ${PORTNAME}-engine-source-0.8.x-18	14	DISTNAME= ${PORTNAME}-engine-source-0.8.x-20
14		15
15	MAINTAINER= kamikaze@bsdforen.de	16	MAINTAINER= kamikaze@bsdforen.de
16	COMMENT= Quake3 total conversion based on the ioquake3 engine	17	COMMENT= Quake3 total conversion based on the ioquake3 engine
Lines 22-27 Link Here
22	# OpenArena doc is too messy to bother	23	# OpenArena doc is too messy to bother
23	NOPORTDOCS= yes	24	NOPORTDOCS= yes
24		25
		26	GAMEVERSION= 0.8.5
		27	SVNREVISION= 1910
25	Q3TOTALCONV= yes	28	Q3TOTALCONV= yes
26	Q3CLIENT= openarena	29	Q3CLIENT= openarena
27	Q3SERVER= oa_ded	30	Q3SERVER= oa_ded

Lines 1-2 Link Here

(-)openarena/distinfo (-2 / +2 lines)
1	SHA256 (openarena-engine-source-0.8.x-18.tar.bz2) = 77180d70af00134b3cfbc51a3c1371f99665e2f073b2ec5fdbf08f6c93ae1c24	1	SHA256 (openarena-engine-source-0.8.x-20.tar.bz2) = 0017ef8d15c2b5f028b0118765059420e0dec7b4100e483b659295efff75afa6
2	SIZE (openarena-engine-source-0.8.x-18.tar.bz2) = 7211834	2	SIZE (openarena-engine-source-0.8.x-20.tar.bz2) = 7413615




--- 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
@@ -36,7 +36,25 @@
 
 /* need this on NX enabled systems (i386 with PAE kernel or
  * noexec32=on x86_64) */
-#ifdef __linux__
+//     Rambetter's note: I'm adding the test for __FreeBSD__ in addition to the [already
+// existing] test for __linux__.  Here is why.  I own a 32 bit FreeBSD 8.0 server with
+// a PAE kernel.  Without VM_X86_MMAP, ioq3ded segfaults shortly after starting
+// (this should come as no surprise).  With VM_X86_MMAP, ioq3ded runs very smoothly.
+// So, at a very minimum, we need to set VM_X86_MMAP for FreeBSD PAE kernels.
+//     Now, I also happen to own a 32 bit FreeBSD 7.1 server with just the standard kernel
+// (non-PAE).  I have run ioq3ded successfully on it with and without VM_X86_MMAP for many
+// months.  So, in the case of non-PAE FreeBSD, we can go either way - use VM_X86_MMAP or
+// not use it.  The absolute safest fix to this problem is to only set VM_X86_MMAP on
+// PAE FreeBSD kernels (in addition to Linux); however, I don't know of a way to detect
+// the PAE kernel easily.  Therefore, since using VM_X86_MMAP won't break anything on
+// non-PAE kernels [apparently], we'll just use it all the time on FreeBSD 32 bit.
+//     Now, you may ask the question: Why not change the entire test for just __unix__?
+// Unfortunately I cannot say anything about this because I don't have access to every
+// other system that has __unix__ defined, so I cannot possibly test all those cases to
+// make sure things work.  We'll just leave it with __linux__ and __FreeBSD__ to be safe.
+// If someone with a different flavor of UNIX running a PAE kernel has this problem too,
+// they can report the bug and we will adjust the line below accordingly.
+#if defined(__linux__) || defined(__FreeBSD__)
 #define VM_X86_MMAP
 #endif
 




--- code/qcommon/files.c.orig	2011-03-10 02:01:27.599036000 +0100
+++ code/qcommon/files.c	2011-03-19 22:40:42.000000000 +0100
@@ -250,6 +250,7 @@
 #endif
 
 static	cvar_t		*fs_basepath;

 static	cvar_t		*fs_basegame;
 static	cvar_t		*fs_gamedirvar;
 static	searchpath_t	*fs_searchpaths;
@@ -2956,6 +2957,7 @@
 	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT|CVAR_PROTECTED );
 	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
+	fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
+	
 	homePath = Sys_DefaultHomePath();
 	if (!homePath || !homePath[0]) {
 		homePath = fs_basepath->string;
@@ -2975,6 +2977,11 @@
 	if (fs_apppath->string[0])
 		FS_AddGameDirectory(fs_apppath->string, gameName);
 	#endif
+
+	// Search default library location if given
+	if (fs_libpath->string[0]) {
+		FS_AddGameDirectory ( fs_libpath->string, gameName );
+	}
 	
 	// NOTE: same filtering below for mods and basegame
 	if (fs_homepath->string[0] && Q_stricmp(fs_homepath->string,fs_basepath->string)) {
--- code/qcommon/qcommon.h.orig	2011-03-10 02:01:27.599036000 +0100
+++ code/qcommon/qcommon.h	2011-03-19 22:40:42.000000000 +0100
@@ -1104,6 +1104,9 @@
 char    *Sys_DefaultAppPath(void);
 #endif
 

 void  Sys_SetDefaultHomePath(const char *path);
 char	*Sys_DefaultHomePath(void);
 const char	*Sys_TempPath(void);
--- code/sys/sys_main.c.orig	2011-02-23 17:17:09.009063000 +0100
+++ code/sys/sys_main.c	2011-03-19 22:40:42.000000000 +0100
@@ -49,6 +49,7 @@
 
 static char binaryPath[ MAX_OSPATH ] = { 0 };

 Sys_DefaultAppPath
 =================
 */
@@ -490,6 +514,14 @@
 Used to load a development dll instead of a virtual machine
 #1 look in fs_homepath
 #2 look in fs_basepath
+#3 look in fs_libpath
 =================
 */
 void *Sys_LoadDll( const char *name, char *fqpath ,
@@ -445,6 +470,7 @@
 	void  (*dllEntry)( intptr_t (*syscallptr)(intptr_t, ...) );
 	char  fname[MAX_OSPATH];
 	char  *basepath;
+	char  *libpath;
 	char  *homepath;
 	char  *gamedir;
 
@@ -454,6 +480,7 @@
 
 	// TODO: use fs_searchpaths from files.c
 	basepath = Cvar_VariableString( "fs_basepath" );
+	libpath = Cvar_VariableString( "fs_libpath" );
 	homepath = Cvar_VariableString( "fs_homepath" );
 	gamedir = Cvar_VariableString( "fs_game" );
 
@@ -462,6 +489,9 @@
 	if(!libHandle && basepath)
 		libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
 
+	if(!libHandle && libpath)
+		libHandle = Sys_TryLibraryLoad(libpath, gamedir, fname, fqpath);
+
 	if(!libHandle) {
 		Com_Printf ( "Sys_LoadDll(%s) failed to load library\n", name );
 		return NULL;
@@ -515,6 +545,14 @@
 #	endif
 #endif
 

 /*
 =================
 Sys_SigHandler
@@ -564,6 +596,7 @@
 	Sys_ParseArgs( argc, argv );
 	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
 	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );

Lines 1-6 Link Here

(-)openarena/pkg-message (-2 / +2 lines)
1	==============================================================================	1	==============================================================================
2		2
3	Should the game freeze when entering a match, try to change the value of	3	Should the game have trouble meeting com_maxfps, which would result in less
4	com_zoneMegs (e.g. to 48).	4	effective strafe jumping, set com_busywait 1 to restore the old behaviour.
5		5
6	==============================================================================	6	==============================================================================

Lines 6-12 Link Here

(-)openarena-oax/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= oax	8	PORTNAME= oax
9	PORTVERSION= B47	9	PORTVERSION= B48
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= http://files.poulsander.com/~poul19/public_files/eliminationSource/	11	MASTER_SITES= http://files.poulsander.com/~poul19/public_files/eliminationSource/
12	DISTNAME= ${PORTNAME}${PORTVERSION}	12	DISTNAME= ${PORTNAME}${PORTVERSION}

Lines 1-2 Link Here

(-)openarena-oax/distinfo (-2 / +2 lines)
1	SHA256 (oaxB47.zip) = 16f4a199621162a09107d043b8edfc9cda70fa432c9351aaa8fd055e94048952	1	SHA256 (oaxB48.zip) = 26564e53625adad46513b3ddc6f906d3c74fe22b3222516a135351928a57602f
2	SIZE (oaxB47.zip) = 468070	2	SIZE (oaxB48.zip) = 469333

Return to bug 155716

Lines 1-14 Link Here

(-)quake3-data/Makefile.include (-3 / +3 lines)
1	# Makefile for defining variables used by other Doom related ports.	1	# Makefile for defining variables used by other Quake3 related ports.
2		2
3	# Set variables.	3	# Set variables.
4		4
5	Q3PKGNAMEPREFIX?=quake3-	5	Q3PKGNAMEPREFIX?=quake3-
6	Q3DIR?= ${LOCALBASE}/share/quake3	6	Q3DIR?= ${PREFIX}/share/quake3
7		7
8	# Add them to the environment.	8	# Add them to the environment.
9		9
10	MAKE_ENV+= Q3DIR="${Q3DIR}"	10	MAKE_ENV+= Q3DIR="${Q3DIR}"
11	PLIST_SUB+= Q3DIR="${Q3DIR:S/${LOCALBASE}\///}"	11	PLIST_SUB+= Q3DIR="${Q3DIR:S/${PREFIX}\///}"
12	SUB_LIST+= Q3DIR="${Q3DIR}"	12	SUB_LIST+= Q3DIR="${Q3DIR}"
13		13
14	# Add the dependency.	14	# Add the dependency.

Lines 6-43 Link Here

(-)urbanterror-data/Makefile (-13 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= urbanterror	8	PORTNAME= urbanterror
9	PORTVERSION= 4.1	9	PORTVERSION= 4.1.1
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= ftp://ftp.snt.utwente.nl/pub/games/urbanterror/ \	11	MASTER_SITES= ftp://ftp.snt.utwente.nl/pub/games/urbanterror/full_install/linux_or_mac/
12	http://mirror.kickassctf.com/ \	12	# http://www.urbanterror.info/downloads/software/urt/${DISTNAME}${EXTRACT_SUFX}?download=direct\\\#
13	http://mrsentry.net/release/ \
14	http://www.iourt.com/urt${PORTVERSION:S/.//}/
15	PKGNAMESUFFIX= -data	13	PKGNAMESUFFIX= -data
16	DISTNAME= UrbanTerror_${PORTVERSION:S/.//}_FULL	14	DISTNAME= UrbanTerror${PORTVERSION:S/.//g}
17		15
18	MAINTAINER= kamikaze@bsdforen.de	16	MAINTAINER= kamikaze@bsdforen.de
19	COMMENT= Standalone realism based mod originally for Quake III Arena	17	COMMENT= Standalone realism based mod originally for Quake III Arena
20		18
21	USE_ZIP= yes	19	USE_ZIP= yes
22	NO_BUILD= yes	20	NO_BUILD= yes
23	NO_PACKAGE= Package will be 715MB; set FORCE_PACKAGE if you really want it	21	NO_PACKAGE= Package will be 1GB; set FORCE_PACKAGE if you really want it
24	WRKSRC= ${WRKDIR}/UrbanTerror	22	WRKSRC= ${WRKDIR}/UrbanTerror
25		23
26	DATADIR= ${Q3DIR}	24	DATADIR= ${Q3DIR}
27		25
28	.include <bsd.port.pre.mk>	26	.include "../quake3-data/Makefile.include"
29
30	Q3DIR!= cd ${PORTSDIR}/games/quake3-data && ${MAKE} -V Q3DIR
31		27
32	post-extract:	28	post-extract:
33	@cd ${WRKSRC}/q3ut4 && ${MV} readme${PORTVERSION:S/.//}.txt ..	29	@cd ${WRKSRC}/q3ut4 && ${MV} readme${PORTVERSION:S/.//:C/\..*//}.txt ..
34		30
35	do-install:	31	do-install:
36	${MKDIR} ${DATADIR}/q3ut4	32	${MKDIR} ${DATADIR}/q3ut4
37	${CP} -r ${WRKSRC}/q3ut4/* ${DATADIR}/q3ut4	33	${CP} -r ${WRKSRC}/q3ut4/* ${DATADIR}/q3ut4
38	.if !defined(NOPORTDOCS)	34	.if !defined(NOPORTDOCS)
39	${MKDIR} ${DOCSDIR}	35	${MKDIR} ${DOCSDIR}
40	${INSTALL_DATA} ${WRKSRC}/readme${PORTVERSION:S/.//}.txt ${DOCSDIR}	36	${INSTALL_DATA} ${WRKSRC}/readme${PORTVERSION:S/.//:C/\..*//}.txt \
		37	${DOCSDIR}/readme${PORTVERSION:S/.//g}.txt
41	.endif	38	.endif
42		39
43	.include <bsd.port.post.mk>	40	.include <bsd.port.mk>

Lines 6-14 Link Here

(-)iourbanterror/Makefile (-3 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= iourbanterror	8	PORTNAME= iourbanterror
9	PORTVERSION= 4.1	9	PORTVERSION= ${GAMEVERSION}.s${SVNREVISION}
10	DISTVERSION= 1.36_SVN${SVNREVISION}+${PORTVERSION}	10	DISTVERSION= 1.36_SVN${SVNREVISION}+${GAMEVERSION}
11	PORTREVISION= 1	11	PORTREVISION= 0
12	PORTEPOCH= 1	12	PORTEPOCH= 1
13	CATEGORIES= games	13	CATEGORIES= games
14	DISTNAME= ioquake3-devel-1.36_SVN${SVNREVISION}	14	DISTNAME= ioquake3-devel-1.36_SVN${SVNREVISION}
Lines 23-28 Link Here
23	# The docs belong to ioquake3	23	# The docs belong to ioquake3
24	NOPORTDOCS= yes	24	NOPORTDOCS= yes
25		25
		26	GAMEVERSION= 4.1.1
26	Q3TOTALCONV= yes	27	Q3TOTALCONV= yes
27	Q3DIR= ${PREFIX}/share/quake3	28	Q3DIR= ${PREFIX}/share/quake3
28	Q3ICON= ${PREFIX}/share/quake3/q3ut4/q3ut.ico	29	Q3ICON= ${PREFIX}/share/quake3/q3ut4/q3ut.ico

Lines 1-29 Link Here

(-)openarena/files/patch-code-qcommon-vm_x86.c (-29 lines)
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
3	@@ -36,7 +36,25 @@
4
5	/* need this on NX enabled systems (i386 with PAE kernel or
6	* noexec32=on x86_64) */
7	-#ifdef __linux__
8	+// Rambetter's note: I'm adding the test for __FreeBSD__ in addition to the [already
9	+// existing] test for __linux__. Here is why. I own a 32 bit FreeBSD 8.0 server with
10	+// a PAE kernel. Without VM_X86_MMAP, ioq3ded segfaults shortly after starting
11	+// (this should come as no surprise). With VM_X86_MMAP, ioq3ded runs very smoothly.
12	+// So, at a very minimum, we need to set VM_X86_MMAP for FreeBSD PAE kernels.
13	+// Now, I also happen to own a 32 bit FreeBSD 7.1 server with just the standard kernel
14	+// (non-PAE). I have run ioq3ded successfully on it with and without VM_X86_MMAP for many
15	+// months. So, in the case of non-PAE FreeBSD, we can go either way - use VM_X86_MMAP or
16	+// not use it. The absolute safest fix to this problem is to only set VM_X86_MMAP on
17	+// PAE FreeBSD kernels (in addition to Linux); however, I don't know of a way to detect
18	+// the PAE kernel easily. Therefore, since using VM_X86_MMAP won't break anything on
19	+// non-PAE kernels [apparently], we'll just use it all the time on FreeBSD 32 bit.
20	+// Now, you may ask the question: Why not change the entire test for just __unix__?
21	+// Unfortunately I cannot say anything about this because I don't have access to every
22	+// other system that has __unix__ defined, so I cannot possibly test all those cases to
23	+// make sure things work. We'll just leave it with __linux__ and __FreeBSD__ to be safe.
24	+// If someone with a different flavor of UNIX running a PAE kernel has this problem too,
25	+// they can report the bug and we will adjust the line below accordingly.
26	+#if defined(__linux__) \|\| defined(__FreeBSD__)
27	#define VM_X86_MMAP
28	#endif
29

Lines 1-6 Link Here

(-)openarena/files/patch-feature-DEFAULT_LIBDIR (-47 / +24 lines)
1	--- code/qcommon/files.c.orig 2009-11-09 23:41:42.205886000 +0100	1	--- code/qcommon/files.c.orig 2011-03-10 02:01:27.599036000 +0100
2	+++ code/qcommon/files.c 2010-02-16 15:26:18.000000000 +0100	2	+++ code/qcommon/files.c 2011-03-19 22:40:42.000000000 +0100
3	@@ -242,6 +242,7 @@	3	@@ -250,6 +250,7 @@
4	#endif	4	#endif
5		5
6	static cvar_t *fs_basepath;	6	static cvar_t *fs_basepath;
Lines 8-25 Link Here
8	static cvar_t *fs_basegame;	8	static cvar_t *fs_basegame;
9	static cvar_t *fs_gamedirvar;	9	static cvar_t *fs_gamedirvar;
10	static searchpath_t *fs_searchpaths;	10	static searchpath_t *fs_searchpaths;
11	@@ -2807,6 +2808,8 @@	11	@@ -2956,6 +2957,7 @@
12	fs_debug = Cvar_Get( "fs_debug", "0", 0 );	12	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
13	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );	13	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT\|CVAR_PROTECTED );
14	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );	14	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
15	+ fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );	15	+ fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
16	+
17	homePath = Sys_DefaultHomePath();	16	homePath = Sys_DefaultHomePath();
18	if (!homePath \|\| !homePath[0]) {	17	if (!homePath \|\| !homePath[0]) {
19	homePath = fs_basepath->string;	18	homePath = fs_basepath->string;
20	--- code/qcommon/qcommon.h.orig 2010-02-15 17:20:33.680787000 +0100	19	@@ -2975,6 +2977,11 @@
21	+++ code/qcommon/qcommon.h 2010-02-16 15:26:18.000000000 +0100	20	if (fs_apppath->string[0])
22	@@ -1085,6 +1085,9 @@	21	FS_AddGameDirectory(fs_apppath->string, gameName);
		22	#endif
		23	+
		24	+ // Search default library location if given
		25	+ if (fs_libpath->string[0]) {
		26	+ FS_AddGameDirectory ( fs_libpath->string, gameName );
		27	+ }
		28
		29	// NOTE: same filtering below for mods and basegame
		30	if (fs_homepath->string[0] && Q_stricmp(fs_homepath->string,fs_basepath->string)) {
		31	--- code/qcommon/qcommon.h.orig 2011-03-10 02:01:27.599036000 +0100
		32	+++ code/qcommon/qcommon.h 2011-03-19 22:40:42.000000000 +0100
		33	@@ -1104,6 +1104,9 @@
23	char *Sys_DefaultAppPath(void);	34	char *Sys_DefaultAppPath(void);
24	#endif	35	#endif
25		36
Lines 29-36 Link Here
29	void Sys_SetDefaultHomePath(const char *path);	40	void Sys_SetDefaultHomePath(const char *path);
30	char *Sys_DefaultHomePath(void);	41	char *Sys_DefaultHomePath(void);
31	const char *Sys_TempPath(void);	42	const char *Sys_TempPath(void);
32	--- code/sys/sys_main.c.orig 2010-02-15 17:20:33.680787000 +0100	43	--- code/sys/sys_main.c.orig 2011-02-23 17:17:09.009063000 +0100
33	+++ code/sys/sys_main.c 2010-02-16 15:26:18.000000000 +0100	44	+++ code/sys/sys_main.c 2011-03-19 22:40:42.000000000 +0100
34	@@ -49,6 +49,7 @@	45	@@ -49,6 +49,7 @@
35		46
36	static char binaryPath[ MAX_OSPATH ] = { 0 };	47	static char binaryPath[ MAX_OSPATH ] = { 0 };
Lines 69-109 Link Here
69	Sys_DefaultAppPath	80	Sys_DefaultAppPath
70	=================	81	=================
71	*/	82	*/
72	@@ -435,6 +459,7 @@	83	@@ -490,6 +514,14 @@
73	Used to load a development dll instead of a virtual machine
74	#1 look in fs_homepath
75	#2 look in fs_basepath
76	+#3 look in fs_libpath
77	=================
78	*/
79	void Sys_LoadDll( const char name, char *fqpath ,
80	@@ -445,6 +470,7 @@
81	void (dllEntry)( intptr_t (syscallptr)(intptr_t, ...) );
82	char fname[MAX_OSPATH];
83	char *basepath;
84	+ char *libpath;
85	char *homepath;
86	char *gamedir;
87
88	@@ -454,6 +480,7 @@
89
90	// TODO: use fs_searchpaths from files.c
91	basepath = Cvar_VariableString( "fs_basepath" );
92	+ libpath = Cvar_VariableString( "fs_libpath" );
93	homepath = Cvar_VariableString( "fs_homepath" );
94	gamedir = Cvar_VariableString( "fs_game" );
95
96	@@ -462,6 +489,9 @@
97	if(!libHandle && basepath)
98	libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
99
100	+ if(!libHandle && libpath)
101	+ libHandle = Sys_TryLibraryLoad(libpath, gamedir, fname, fqpath);
102	+
103	if(!libHandle) {
104	Com_Printf ( "Sys_LoadDll(%s) failed to load library\n", name );
105	return NULL;
106	@@ -515,6 +545,14 @@
107	# endif	84	# endif
108	#endif	85	#endif
109		86
Lines 118-124 Link Here
118	/*	95	/*
119	=================	96	=================
120	Sys_SigHandler	97	Sys_SigHandler
121	@@ -589,6 +627,7 @@	98	@@ -564,6 +596,7 @@
122	Sys_ParseArgs( argc, argv );	99	Sys_ParseArgs( argc, argv );
123	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );	100	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
124	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );	101	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );