Attachment #101811 for bug #141453

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




USE_GMAKE=	yes

OPTIONS=	CLIENT "Build client" on \
		GAMELIBS "Build game libraries (when not mandatory)" off \
		DEDICATED "Build dedicated server" on \
		SMP "Build SMP (threaded) client" on \
		VORBIS "Enable Ogg Vorbis support" on

MAKE_ARGS+=	DEFAULT_BASEDIR="${Q3DIR}" \
		DEFAULT_LIBDIR="${LIBDIR}" \
		HOMEPATH="/.${PORTNAME}" \
		ARCH="${ARCH}"
PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}" \
		ARCH="${ARCH}" \
		BINSUFFIX="${BINSUFFIX}"
ALL_TARGET=	release
MAKE_JOBS_SAFE=	yes

LIBDIR=		${PREFIX}/lib/${PORTNAME}
BUILDDIR=	${WRKSRC}/build/release-${OPSYS:L}-${ARCH}
LINUX_ARCH=	${ARCH:C/amd64/x86_64/:C/i386/x86/}
BINSUFFIX?=

ONLY_FOR_ARCHS=	amd64 i386

# Make sure TARGET and CFLAGS fit together for cross-compiling.
MACHINE_ARCH=	${ARCH}
.include <bsd.cpu.mk>


PLIST_SUB+=	GAMELIBS="@comment "
.endif

# Note that SMP is only supported on OS-X, hence the option has been removed.
.if defined(WITH_SMP)
MAKE_ARGS+=	BUILD_CLIENT_SMP=1
PLIST_SUB+=	SMP=""


do-install:
.for bin in ${Q3BIN}
	${INSTALL_PROGRAM} ${BUILDDIR}/${bin}.${ARCH} \
		${PREFIX}/bin/${bin}${BINSUFFIX}
.endfor
.if defined(WITH_GAMELIBS)




--- Makefile.orig	2009-04-22 20:54:48.000000000 +0200
+++ Makefile	2009-12-08 11:38:10.000000000 +0100
@@ -521,15 +521,22 @@
   COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
 endif
 
+ifeq ($(COMPILE_PLATFORM),freebsd)
+  ifeq ($(COMPILE_ARCH),amd64)
+    COMPILE_ARCH=x86_64
+  endif
+  ifeq ($(COMPILE_ARCH),i386)
+    COMPILE_ARCH=x86
+  endif
+endif
+
 ifeq ($(COMPILE_PLATFORM),mingw32)
   ifeq ($(COMPILE_ARCH),i386)
     COMPILE_ARCH=x86
@@ -521,15 +530,35 @@
 
 ifeq ($(PLATFORM),freebsd)
 

-  else #default to i386
-    ARCH=i386
-  endif #alpha test
-
-
-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+  endif
+  ifeq ($(ARCH),i386)
+    ARCH = x86
+  endif
+
+  ifeq ($(FREEBSD_ARCH),x86_64)
+    FREEBSD_ARCH = amd64
+  endif
+  ifeq ($(FREEBSD_ARCH),x86)
+    FREEBSD_ARCH = i386
+  endif
 
+  ifndef HOMEPATH
+    HOMEPATH = /.ioquake3
+  endif
+
+  ifndef DEFAULT_LIBDIR
+    DEFAULT_LIBDIR = /usr/local/lib/ioquake3
+  endif
 
   BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-    -DUSE_ICON $(shell sdl-config --cflags)
+   ifndef HOMEPATH
+     HOMEPATH = /.ioquake3
+   endif
+ 
+   ifndef DEFAULT_LIBDIR
+     DEFAULT_LIBDIR = /usr/local/lib/ioquake3
+   endif
+ 
+   BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \
+     -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+     -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON \
+     -DHOMEPATH=\\\"$(HOMEPATH)\\\" \
+     -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\"
+   CLIENT_CFLAGS = $(SDL_CFLAGS)
+   SERVER_CFLAGS = 
+   HAVE_VM_COMPILED = true
 
   ifeq ($(USE_OPENAL),1)
     BASE_CFLAGS += -DUSE_OPENAL
@@ -542,24 +549,6 @@
     BASE_CFLAGS += -DUSE_CODEC_VORBIS
   endif
 
-  ifeq ($(ARCH),axp)
-    BASE_CFLAGS += -DNO_VM_COMPILED
-    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
-      -fomit-frame-pointer -fexpensive-optimizations
-  else
-  ifeq ($(ARCH),i386)
-    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
-      -march=pentium -fomit-frame-pointer -pipe -ffast-math \
-      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-      -funroll-loops -fstrength-reduce
-    HAVE_VM_COMPILED=true
-  else
-    BASE_CFLAGS += -DNO_VM_COMPILED
-  endif
-  endif
-
-  DEBUG_CFLAGS=$(BASE_CFLAGS) -g
-
   SHLIBEXT=so
   SHLIBCFLAGS=-fPIC
   SHLIBLDFLAGS=-shared $(LDFLAGS)
@@ -582,6 +571,27 @@
     CLIENT_LIBS += -lvorbisfile -lvorbis -logg
   endif
 
+  ifeq ($(ARCH),i386)
+    ifeq ($(CROSS_COMPILING),1)
+      BASE_CFLAGS += -m32
+    endif
+  endif
+  ifeq ($(ARCH),amd64)
+      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+      -funroll-loops -fstrength-reduce
+    HAVE_VM_COMPILED=true
+  else
+  ifeq ($(ARCH),x86_64)
+    ifeq ($(CROSS_COMPILING),1)
+      BASE_CFLAGS += -m64
+    endif
+  endif
+
+  ifeq ($(BUILD_CLIENT),1)
+    BASE_CFLAGS += $(CLIENT_CFLAGS)
+  endif
+
+  RELEASE_CFLAGS = $(BASE_CFLAGS) -DNDEBUG -O3 -fomit-frame-pointer \
+    -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+    -funroll-loops -fstrength-reduce
+
+  DEBUG_CFLAGS = $(BASE_CFLAGS) -g
+
 else # ifeq freebsd
 
 #############################################################################
@@ -1442,6 +1452,9 @@
   ifeq ($(ARCH),x86_64)
     Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
   endif
+  ifeq ($(ARCH),amd64)
+    Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
+  endif
   ifeq ($(ARCH),ppc)
     Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
   endif
@@ -1591,6 +1604,9 @@
   ifeq ($(ARCH),x86_64)
     Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
   endif
+  ifeq ($(ARCH),amd64)
+    Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
+  endif
   ifeq ($(ARCH),ppc)
     Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o
   endif




--- code/qcommon/files.c.orig	2009-12-08 11:07:08.000000000 +0100
+++ code/qcommon/files.c	2009-12-08 11:08:41.000000000 +0100
@@ -241,6 +241,7 @@
 #endif
 
 static	cvar_t		*fs_basepath;
+#ifdef __FreeBSD__
+static	cvar_t		*fs_libpath;
+#endif
 static	cvar_t		*fs_basegame;
 static	cvar_t		*fs_gamedirvar;
 static	searchpath_t	*fs_searchpaths;
@@ -2761,6 +2762,7 @@
 	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
 	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
+	#ifdef __FreeBSD__
+	fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
+	#endif
+	
 	homePath = Sys_DefaultHomePath();
 	if (!homePath || !homePath[0]) {
 		homePath = fs_basepath->string;

Lines 5-11 Link Here

(-)ports/games/ioquake3/files/patch-code-qcommon-q_platform.h (-1 / +1 lines)
5	#ifdef __i386__	5	#ifdef __i386__
6	#define ARCH_STRING "i386"	6	#define ARCH_STRING "i386"
7	+#elif defined __amd64__	7	+#elif defined __amd64__
8	+#define ARCH_STRING "x86_64"	8	+#define ARCH_STRING "amd64"
9	#elif defined __axp__	9	#elif defined __axp__
10	#define ARCH_STRING "alpha"	10	#define ARCH_STRING "alpha"
11	#endif	11	#endif




--- code/qcommon/qcommon.h.orig	2009-12-08 11:09:48.000000000 +0100
+++ code/qcommon/qcommon.h	2009-12-08 11:10:43.000000000 +0100
@@ -1069,6 +1069,9 @@
 #ifdef MACOS_X
 char    *Sys_DefaultAppPath(void);
 #endif
 
+void	Sys_SetDefaultLibPath(const char *path);
+char	*Sys_DefaultLibPath(void);
+
 
 void  Sys_SetDefaultHomePath(const char *path);
 char	*Sys_DefaultHomePath(void);
 const char *Sys_Dirname( char *path );




--- code/sys/sys_main.c.orig	2009-03-02 23:26:36.000000000 +0100
+++ code/sys/sys_main.c	2009-12-08 11:31:12.000000000 +0100
@@ -49,6 +49,7 @@
 
 static char binaryPath[ MAX_OSPATH ] = { 0 };
 static char installPath[ MAX_OSPATH ] = { 0 };
+#ifdef __FreeBSD__
+static char libPath[ MAX_OSPATH ] = { 0 };
+#endif
 
 /*
 =================
@@ -95,6 +96,30 @@
 		return Sys_Cwd();
 }
 
 /*
 =================
+=================
+Sys_SetDefaultLibPath
+=================
+*/

+	else
+		return Sys_Cwd();
+}
+#endif
+
+
+/*
+=================
 Sys_DefaultAppPath
 =================
 */
@@ -384,6 +409,7 @@
 #1 look down current path
 #2 look in fs_homepath
 #3 look in fs_basepath
+#4 look in fs_libpath
 =================
 */
 void *Sys_LoadDll( const char *name, char *fqpath ,
@@ -394,6 +420,7 @@
 	void  (*dllEntry)( intptr_t (*syscallptr)(intptr_t, ...) );
 	char  fname[MAX_OSPATH];
 	char  *basepath;
+	#ifdef __FreeBSD__
+	char  *libpath;
+	#endif
 	char  *homepath;
 	char  *pwdpath;
 	char  *gamedir;
@@ -405,6 +432,7 @@
 	// TODO: use fs_searchpaths from files.c
 	pwdpath = Sys_Cwd();
 	basepath = Cvar_VariableString( "fs_basepath" );
+	#ifdef __FreeBSD__
+	libpath = Cvar_VariableString( "fs_libpath" );
+	#endif
 	homepath = Cvar_VariableString( "fs_homepath" );
 	gamedir = Cvar_VariableString( "fs_game" );
 
@@ -413,6 +441,9 @@
 	if(!libHandle && homepath)
 		libHandle = Sys_TryLibraryLoad(homepath, gamedir, fname, fqpath);
 
+	#ifdef __FreeBSD__
+	if(!libHandle && libpath)
+		libHandle = Sys_TryLibraryLoad(libpath, gamedir, fname, fqpath);
+	#endif
+
 	if(!libHandle && basepath)
 		libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
 
@@ -469,6 +500,10 @@
 #	endif
 #endif
 
+#ifdef __FreeBSD__
+#ifndef DEFAULT_LIBDIR
+#	define DEFAULT_LIBDIR DEFAULT_BASEDIR
+#		define DEFAULT_LIBDIR Sys_StripAppBundle(Sys_BinaryPath())
+#	else
+#		define DEFAULT_LIBDIR Sys_BinaryPath()
+#	endif
+#endif
+#endif
+
 /*
 =================
 Sys_SigHandler
@@ -540,6 +575,7 @@
 	Sys_ParseArgs( argc, argv );
 	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
 	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );
+	#ifdef __FreeBSD__
+	Sys_SetDefaultLibPath( DEFAULT_LIBDIR );
+	#endif
 
 	// Concatenate the command line for passing to Com_Init
 	for( i = 1; i < argc; i++ )




--- code/sys/sys_unix.c.orig	2008-11-11 00:55:22.000000000 +0100
+++ code/sys/sys_unix.c	2009-12-08 10:54:22.000000000 +0100
@@ -53,7 +53,9 @@
 		if( ( p = getenv( "HOME" ) ) != NULL )
 		{
 			Q_strncpyz( homePath, p, sizeof( homePath ) );
-#ifdef MACOS_X
+#ifdef HOMEPATH
+			Q_strcat( homePath, sizeof( homePath ), HOMEPATH );
+#elif defined MACOS_X
 			Q_strcat( homePath, sizeof( homePath ), "/Library/Application Support/Quake3" );
 #else
+#ifdef __FreeBSD__
+			Q_strcat( homePath, sizeof( homePath ), HOMEPATH );
+#else
 			Q_strcat( homePath, sizeof( homePath ), "/.q3a" );
 #endif
+#endif
 			if( mkdir( homePath, 0777 ) )
 			{
 				if( errno != EEXIST )

Lines 8-11 Link Here

(-)ports/games/ioquake3/pkg-message (+3 lines)
8	overwrite them. But you can safely copy the original directory to the new one	8	overwrite them. But you can safely copy the original directory to the new one
9	for the first time.	9	for the first time.
10		10
		11	Should you encounter freezes when playing a demo or single player game,
		12	rebuild without client libraries.
		13
11	==============================================================================	14	==============================================================================

Lines 18-24 Link Here

(-)ports/games/ioquake3-devel/Makefile (-1 / +1 lines)
18	PLIST= ${.CURDIR}/../ioquake3/pkg-plist	18	PLIST= ${.CURDIR}/../ioquake3/pkg-plist
19	PATCHDIR= ${WRKDIR}/freebsd-patchset/	19	PATCHDIR= ${WRKDIR}/freebsd-patchset/
20		20
21	SVNREVISION= 1583	21	SVNREVISION= 1754
22	BINSUFFIX= -devel	22	BINSUFFIX= -devel
23		23
24	.include "${.CURDIR}/../ioquake3/Makefile"	24	.include "${.CURDIR}/../ioquake3/Makefile"

Lines 1-3 Link Here

(-)ports/games/ioquake3-devel/distinfo (-3 / +3 lines)
1	MD5 (ioquake3-devel-1.36_SVN1583.zip) = 5a59062ce5779fe1985c40ece41c2722	1	MD5 (ioquake3-devel-1.36_SVN1754.zip) = 163fe62d8540244a9eda8af66ae62fb2
2	SHA256 (ioquake3-devel-1.36_SVN1583.zip) = 353f5bddbaed46323d4078e6907fcd602c771bd41fe641fc5b3ae67a187c1a88	2	SHA256 (ioquake3-devel-1.36_SVN1754.zip) = f743e4454bb445fd58188107ee0c36eb4ee3be0f9dce9667bec7516bec59136f
3	SIZE (ioquake3-devel-1.36_SVN1583.zip) = 5057370	3	SIZE (ioquake3-devel-1.36_SVN1754.zip) = 5017181

Lines 1-11 Link Here

(-)ports/games/ioquake3-devel/pkg-descr (-9 / +3 lines)
1	This project, icculus.org/quake3 (sometimes referred to ioquake3, or ioq3 for	1	This port creates development snapshots of icculus.org/quake3. The project is
2	short) aims to build upon id Software's Quake 3 source code release. The	2	known to seldomly produce releases. Due to the conservative development goals
3	source code was released on August 20, 2005 under the GPL. Since then, we have	3	of the project, development snapshots are generally considered reliable.
4	been cleaning up, fixing bugs, and adding features. Our permanent goal is to
5	create the open source Quake 3 distribution upon which people base their games
6	and projects. We also seek to have the perfect version of the engine for
7	playing Quake 3: Arena, Team Arena, and all popular mods. This distribution of
8	the engine has been ported to many new platforms and has had a slew of new
9	features added, along with massive bug extermination.
10		4
11	WWW: http://ioquake3.org/	5	WWW: http://ioquake3.org/

Lines 1-10 Link Here

(-)ports/games/ioquake3-devel/pkg-message (-6 / +2 lines)
1	==============================================================================	1	==============================================================================
2		2
3	The input devices are now handled by SDL. Some mouse buttons will have	3	Should you encounter freezes when playing a demo or single player game,
4	different aliases and the mouse speed needs to be readjusted.	4	rebuild without client libraries.
5
6	The configuration files are saved to ~/.ioquake3-devel instead of ~/.ioquake3
7	if you prefer both versions to share the configurations files create a
8	symlink.
9		5
10	==============================================================================	6	==============================================================================

Return to bug 141453

Lines 21-49 Link Here

(-)ports/games/ioquake3/Makefile (-8 / +7 lines)
21	USE_GMAKE= yes	21	USE_GMAKE= yes
22		22
23	OPTIONS= CLIENT "Build client" on \	23	OPTIONS= CLIENT "Build client" on \
24	GAMELIBS "Build game libraries (when not mandatory)" on \	24	GAMELIBS "Build game libraries (when not mandatory)" off \
25	DEDICATED "Build dedicated server" on \	25	DEDICATED "Build dedicated server" on \
26	SMP "Build SMP (threaded) client" on \
27	VORBIS "Enable Ogg Vorbis support" on	26	VORBIS "Enable Ogg Vorbis support" on
28		27
29	MAKE_ARGS+= DEFAULT_BASEDIR="${Q3DIR}" \	28	MAKE_ARGS+= DEFAULT_BASEDIR="${Q3DIR}" \
30	DEFAULT_LIBDIR="${LIBDIR}" \	29	DEFAULT_LIBDIR="${LIBDIR}" \
31	HOMEPATH="/.${PORTNAME}" \	30	HOMEPATH="/.${PORTNAME}" \
32	ARCH="${LINUX_ARCH}"	31	ARCH="${ARCH}"
33	PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" \	32	PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" \
34	ARCH="${LINUX_ARCH}" \	33	ARCH="${ARCH}" \
35	BINSUFFIX="${BINSUFFIX}"	34	BINSUFFIX="${BINSUFFIX}"
36	ALL_TARGET= release	35	ALL_TARGET= release
37	MAKE_JOBS_SAFE= yes	36	MAKE_JOBS_SAFE= yes
38		37
39	LIBDIR= ${PREFIX}/lib/${PORTNAME}	38	LIBDIR= ${PREFIX}/lib/${PORTNAME}
40	BUILDDIR= ${WRKSRC}/build/release-${OPSYS:L}-${LINUX_ARCH}	39	BUILDDIR= ${WRKSRC}/build/release-${OPSYS:L}-${ARCH}
41	LINUX_ARCH= ${ARCH:C/amd64/x86_64/:C/i386/x86/}
42	BINSUFFIX?=	40	BINSUFFIX?=
43		41
44	ONLY_FOR_ARCHS= amd64 i386	42	ONLY_FOR_ARCHS= amd64 i386
45		43
46	# Make sure TARGET and CFLAGS fit together.	44	# Make sure TARGET and CFLAGS fit together for cross-compiling.
47	MACHINE_ARCH= ${ARCH}	45	MACHINE_ARCH= ${ARCH}
48	.include <bsd.cpu.mk>	46	.include <bsd.cpu.mk>
49		47
Lines 90-95 Link Here
90	PLIST_SUB+= GAMELIBS="@comment "	88	PLIST_SUB+= GAMELIBS="@comment "
91	.endif	89	.endif
92		90
		91	# Note that SMP is only supported on OS-X, hence the option has been removed.
93	.if defined(WITH_SMP)	92	.if defined(WITH_SMP)
94	MAKE_ARGS+= BUILD_CLIENT_SMP=1	93	MAKE_ARGS+= BUILD_CLIENT_SMP=1
95	PLIST_SUB+= SMP=""	94	PLIST_SUB+= SMP=""
Lines 100-106 Link Here
100		99
101	do-install:	100	do-install:
102	.for bin in ${Q3BIN}	101	.for bin in ${Q3BIN}
103	${INSTALL_PROGRAM} ${BUILDDIR}/${bin}.${LINUX_ARCH} \	102	${INSTALL_PROGRAM} ${BUILDDIR}/${bin}.${ARCH} \
104	${PREFIX}/bin/${bin}${BINSUFFIX}	103	${PREFIX}/bin/${bin}${BINSUFFIX}
105	.endfor	104	.endfor
106	.if defined(WITH_GAMELIBS)	105	.if defined(WITH_GAMELIBS)

Lines 1-22 Link Here

(-)ports/games/ioquake3/files/patch-Makefile (-70 / +83 lines)
1	--- Makefile.orig 2009-08-30 19:33:49.000000000 +0200	1	--- Makefile.orig 2009-04-22 20:54:48.000000000 +0200
2	+++ Makefile 2009-09-01 23:28:34.000000000 +0200	2	+++ Makefile 2009-12-08 11:38:10.000000000 +0100
3	@@ -17,6 +17,15 @@	3	@@ -521,15 +521,22 @@
4	COMPILE_ARCH=$(shell uname -p \| sed -e s/i.86/i386/)
5	endif
6
7	+ifeq ($(COMPILE_PLATFORM),freebsd)
8	+ ifeq ($(COMPILE_ARCH),amd64)
9	+ COMPILE_ARCH=x86_64
10	+ endif
11	+ ifeq ($(COMPILE_ARCH),i386)
12	+ COMPILE_ARCH=x86
13	+ endif
14	+endif
15	+
16	ifeq ($(COMPILE_PLATFORM),mingw32)
17	ifeq ($(COMPILE_ARCH),i386)
18	COMPILE_ARCH=x86
19	@@ -521,15 +530,35 @@
20		4
21	ifeq ($(PLATFORM),freebsd)	5	ifeq ($(PLATFORM),freebsd)
22		6
Lines 25-94 Link Here
25	- else #default to i386	9	- else #default to i386
26	- ARCH=i386	10	- ARCH=i386
27	- endif #alpha test	11	- endif #alpha test
28	+ FREEBSD_ARCH = $(ARCH)	12	-
29	+ ifeq ($(ARCH),amd64)	13	-
30	+ ARCH = x86_64	14	- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
31	+ endif
32	+ ifeq ($(ARCH),i386)
33	+ ARCH = x86
34	+ endif
35	+
36	+ ifeq ($(FREEBSD_ARCH),x86_64)
37	+ FREEBSD_ARCH = amd64
38	+ endif
39	+ ifeq ($(FREEBSD_ARCH),x86)
40	+ FREEBSD_ARCH = i386
41	+ endif
42
43	+ ifndef HOMEPATH
44	+ HOMEPATH = /.ioquake3
45	+ endif
46	+
47	+ ifndef DEFAULT_LIBDIR
48	+ DEFAULT_LIBDIR = /usr/local/lib/ioquake3
49	+ endif
50
51	BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
52	- -DUSE_ICON $(shell sdl-config --cflags)	15	- -DUSE_ICON $(shell sdl-config --cflags)
53	+ -DUSE_ICON $(shell sdl-config --cflags) -DMAP_ANONYMOUS=MAP_ANON \	16	+ ifndef HOMEPATH
54	+ -DHOMEPATH=\\\"$(HOMEPATH)\\\" \	17	+ HOMEPATH = /.ioquake3
55	+ -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\" \	18	+ endif
56	+ $(shell make -f /dev/null -VCFLAGS MACHINE_ARCH=$(FREEBSD_ARCH))	19	+
57	+	20	+ ifndef DEFAULT_LIBDIR
		21	+ DEFAULT_LIBDIR = /usr/local/lib/ioquake3
		22	+ endif
		23	+
		24	+ BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \
		25	+ -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
		26	+ -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON \
		27	+ -DHOMEPATH=\\\"$(HOMEPATH)\\\" \
		28	+ -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\"
		29	+ CLIENT_CFLAGS = $(SDL_CFLAGS)
		30	+ SERVER_CFLAGS =
		31	+ HAVE_VM_COMPILED = true
58		32
59	ifeq ($(USE_OPENAL),1)	33	ifeq ($(USE_OPENAL),1)
60	BASE_CFLAGS += -DUSE_OPENAL	34	BASE_CFLAGS += -DUSE_OPENAL
61	@@ -547,9 +576,22 @@	35	@@ -542,24 +549,6 @@
62	RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \	36	BASE_CFLAGS += -DUSE_CODEC_VORBIS
63	-fomit-frame-pointer -fexpensive-optimizations	37	endif
64	else	38
		39	- ifeq ($(ARCH),axp)
		40	- BASE_CFLAGS += -DNO_VM_COMPILED
		41	- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
		42	- -fomit-frame-pointer -fexpensive-optimizations
		43	- else
65	- ifeq ($(ARCH),i386)	44	- ifeq ($(ARCH),i386)
66	- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \	45	- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
67	- -march=pentium -fomit-frame-pointer -pipe -ffast-math \	46	- -march=pentium -fomit-frame-pointer -pipe -ffast-math \
68	+ ifeq ($(ARCH),x86)	47	- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
		48	- -funroll-loops -fstrength-reduce
		49	- HAVE_VM_COMPILED=true
		50	- else
		51	- BASE_CFLAGS += -DNO_VM_COMPILED
		52	- endif
		53	- endif
		54	-
		55	- DEBUG_CFLAGS=$(BASE_CFLAGS) -g
		56	-
		57	SHLIBEXT=so
		58	SHLIBCFLAGS=-fPIC
		59	SHLIBLDFLAGS=-shared $(LDFLAGS)
		60	@@ -582,6 +571,27 @@
		61	CLIENT_LIBS += -lvorbisfile -lvorbis -logg
		62	endif
		63
		64	+ ifeq ($(ARCH),i386)
69	+ ifeq ($(CROSS_COMPILING),1)	65	+ ifeq ($(CROSS_COMPILING),1)
70	+ BASE_CFLAGS += -m32	66	+ BASE_CFLAGS += -m32
71	+ endif	67	+ endif
72	+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \	68	+ endif
73	+ -fomit-frame-pointer -pipe -ffast-math \	69	+ ifeq ($(ARCH),amd64)
74	+ -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
75	+ -funroll-loops -fstrength-reduce
76	+ HAVE_VM_COMPILED=true
77	+ else
78	+ ifeq ($(ARCH),x86_64)
79	+ ifeq ($(CROSS_COMPILING),1)	70	+ ifeq ($(CROSS_COMPILING),1)
80	+ BASE_CFLAGS += -m64	71	+ BASE_CFLAGS += -m64
81	+ endif	72	+ endif
82	+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \	73	+ endif
83	+ -fomit-frame-pointer -pipe -ffast-math \	74	+
84	-falign-loops=2 -falign-jumps=2 -falign-functions=2 \	75	+ ifeq ($(BUILD_CLIENT),1)
85	-funroll-loops -fstrength-reduce	76	+ BASE_CFLAGS += $(CLIENT_CFLAGS)
86	HAVE_VM_COMPILED=true	77	+ endif
87	@@ -557,6 +599,7 @@	78	+
88	BASE_CFLAGS += -DNO_VM_COMPILED	79	+ RELEASE_CFLAGS = $(BASE_CFLAGS) -DNDEBUG -O3 -fomit-frame-pointer \
		80	+ -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
		81	+ -funroll-loops -fstrength-reduce
		82	+
		83	+ DEBUG_CFLAGS = $(BASE_CFLAGS) -g
		84	+
		85	else # ifeq freebsd
		86
		87	#############################################################################
		88	@@ -1442,6 +1452,9 @@
		89	ifeq ($(ARCH),x86_64)
		90	Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
		91	endif
		92	+ ifeq ($(ARCH),amd64)
		93	+ Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
		94	+ endif
		95	ifeq ($(ARCH),ppc)
		96	Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
89	endif	97	endif
		98	@@ -1591,6 +1604,9 @@
		99	ifeq ($(ARCH),x86_64)
		100	Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
90	endif	101	endif
		102	+ ifeq ($(ARCH),amd64)
		103	+ Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
91	+ endif	104	+ endif
92		105	ifeq ($(ARCH),ppc)
93	DEBUG_CFLAGS=$(BASE_CFLAGS) -g	106	Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o
94		107	endif

Lines 1-23 Link Here

(-)ports/games/ioquake3/files/patch-code-qcommon-files.c (-9 / +4 lines)
1	--- code/qcommon/files.c.orig 2009-08-30 22:58:50.000000000 +0200	1	--- code/qcommon/files.c.orig 2009-12-08 11:07:08.000000000 +0100
2	+++ code/qcommon/files.c 2009-08-30 23:10:53.000000000 +0200	2	+++ code/qcommon/files.c 2009-12-08 11:08:41.000000000 +0100
3	@@ -241,6 +241,9 @@	3	@@ -241,6 +241,7 @@
4	#endif	4	#endif
5		5
6	static cvar_t *fs_basepath;	6	static cvar_t *fs_basepath;
7	+#ifdef __FreeBSD__
8	+static cvar_t *fs_libpath;	7	+static cvar_t *fs_libpath;
9	+#endif
10	static cvar_t *fs_basegame;	8	static cvar_t *fs_basegame;
11	static cvar_t *fs_gamedirvar;	9	static cvar_t *fs_gamedirvar;
12	static searchpath_t *fs_searchpaths;	10	static searchpath_t *fs_searchpaths;
13	@@ -2761,6 +2764,10 @@	11	@@ -2761,6 +2762,7 @@
14	fs_debug = Cvar_Get( "fs_debug", "0", 0 );	12	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
15	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );	13	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
16	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );	14	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
17	+ #ifdef __FreeBSD__
18	+ fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );	15	+ fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
19	+ #endif
20	+
21	homePath = Sys_DefaultHomePath();	16	homePath = Sys_DefaultHomePath();
22	if (!homePath \|\| !homePath[0]) {	17	if (!homePath \|\| !homePath[0]) {
23	homePath = fs_basepath->string;	18	homePath = fs_basepath->string;

Lines 1-13 Link Here

(-)ports/games/ioquake3/files/patch-code-qcommon-qcommon.h (-7 / +6 lines)
1	--- code/qcommon/qcommon.h.orig 2009-08-30 23:12:19.000000000 +0200	1	--- code/qcommon/qcommon.h.orig 2009-12-08 11:09:48.000000000 +0100
2	+++ code/qcommon/qcommon.h 2009-08-30 23:26:12.000000000 +0200	2	+++ code/qcommon/qcommon.h 2009-12-08 11:10:43.000000000 +0100
3	@@ -1068,6 +1068,10 @@	3	@@ -1069,6 +1069,9 @@
4	#ifdef MACOS_X
5	char *Sys_DefaultAppPath(void);	4	char *Sys_DefaultAppPath(void);
6	#endif	5	#endif
7	+#ifdef __FreeBSD__	6
8	+void Sys_SetDefaultLibPath(const char *path);	7	+void Sys_SetDefaultLibPath(const char *path);
9	+char *Sys_DefaultLibPath(void);	8	+char *Sys_DefaultLibPath(void);
10	+#endif	9	+
11
12	void Sys_SetDefaultHomePath(const char *path);	10	void Sys_SetDefaultHomePath(const char *path);
13	char *Sys_DefaultHomePath(void);	11	char *Sys_DefaultHomePath(void);
		12	const char Sys_Dirname( char path );

Lines 1-22 Link Here

(-)ports/games/ioquake3/files/patch-code-sys-sys_main.c (-41 / +24 lines)
1	--- code/sys/sys_main.c.orig 2009-08-30 22:32:59.000000000 +0200	1	--- code/sys/sys_main.c.orig 2009-03-02 23:26:36.000000000 +0100
2	+++ code/sys/sys_main.c 2009-08-30 23:21:12.000000000 +0200	2	+++ code/sys/sys_main.c 2009-12-08 11:31:12.000000000 +0100
3	@@ -49,6 +49,9 @@	3	@@ -49,6 +49,7 @@
4		4
5	static char binaryPath[ MAX_OSPATH ] = { 0 };	5	static char binaryPath[ MAX_OSPATH ] = { 0 };
6	static char installPath[ MAX_OSPATH ] = { 0 };	6	static char installPath[ MAX_OSPATH ] = { 0 };
7	+#ifdef __FreeBSD__
8	+static char libPath[ MAX_OSPATH ] = { 0 };	7	+static char libPath[ MAX_OSPATH ] = { 0 };
9	+#endif
10		8
11	/*	9	/*
12	=================	10	=================
13	@@ -93,6 +96,31 @@	11	@@ -95,6 +96,30 @@
14	return Sys_Cwd();
15	}
16		12
17	+#ifdef __FreeBSD__	13	/*
18	+/*	14	=================
19	+=================
20	+Sys_SetDefaultLibPath	15	+Sys_SetDefaultLibPath
21	+=================	16	+=================
22	+*/	17	+*/
Lines 37-111 Link Here
37	+ else	32	+ else
38	+ return Sys_Cwd();	33	+ return Sys_Cwd();
39	+}	34	+}
40	+#endif
41	+	35	+
42	/*	36	+
43	=================	37	+/*
		38	+=================
44	Sys_DefaultAppPath	39	Sys_DefaultAppPath
45	@@ -384,6 +412,7 @@	40	=================
		41	*/
		42	@@ -384,6 +409,7 @@
46	#1 look down current path	43	#1 look down current path
47	#2 look in fs_homepath	44	#2 look in fs_homepath
48	#3 look in fs_basepath	45	#3 look in fs_basepath
49	+#4 look in fs_libpath under FreeBSD	46	+#4 look in fs_libpath
50	=================	47	=================
51	*/	48	*/
52	void Sys_LoadDll( const char name, char *fqpath ,	49	void Sys_LoadDll( const char name, char *fqpath ,
53	@@ -394,6 +423,9 @@	50	@@ -394,6 +420,7 @@
54	void (dllEntry)( intptr_t (syscallptr)(intptr_t, ...) );	51	void (dllEntry)( intptr_t (syscallptr)(intptr_t, ...) );
55	char fname[MAX_OSPATH];	52	char fname[MAX_OSPATH];
56	char *basepath;	53	char *basepath;
57	+ #ifdef __FreeBSD__
58	+ char *libpath;	54	+ char *libpath;
59	+ #endif
60	char *homepath;	55	char *homepath;
61	char *pwdpath;	56	char *pwdpath;
62	char *gamedir;	57	char *gamedir;
63	@@ -405,6 +437,9 @@	58	@@ -405,6 +432,7 @@
64	// TODO: use fs_searchpaths from files.c	59	// TODO: use fs_searchpaths from files.c
65	pwdpath = Sys_Cwd();	60	pwdpath = Sys_Cwd();
66	basepath = Cvar_VariableString( "fs_basepath" );	61	basepath = Cvar_VariableString( "fs_basepath" );
67	+ #ifdef __FreeBSD__
68	+ libpath = Cvar_VariableString( "fs_libpath" );	62	+ libpath = Cvar_VariableString( "fs_libpath" );
69	+ #endif
70	homepath = Cvar_VariableString( "fs_homepath" );	63	homepath = Cvar_VariableString( "fs_homepath" );
71	gamedir = Cvar_VariableString( "fs_game" );	64	gamedir = Cvar_VariableString( "fs_game" );
72		65
73	@@ -416,6 +451,11 @@	66	@@ -413,6 +441,9 @@
74	if(!libHandle && basepath)	67	if(!libHandle && homepath)
75	libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);	68	libHandle = Sys_TryLibraryLoad(homepath, gamedir, fname, fqpath);
76		69
77	+ #ifdef __FreeBSD__
78	+ if(!libHandle && libpath)	70	+ if(!libHandle && libpath)
79	+ libHandle = Sys_TryLibraryLoad(libpath, gamedir, fname, fqpath);	71	+ libHandle = Sys_TryLibraryLoad(libpath, gamedir, fname, fqpath);
80	+ #endif
81	+	72	+
82	if(!libHandle) {	73	if(!libHandle && basepath)
83	Com_Printf ( "Sys_LoadDll(%s) failed to load library\n", name );	74	libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
84	return NULL;	75
85	@@ -469,6 +509,16 @@	76	@@ -469,6 +500,10 @@
86	# endif	77	# endif
87	#endif	78	#endif
88		79
89	+#ifdef __FreeBSD__
90	+#ifndef DEFAULT_LIBDIR	80	+#ifndef DEFAULT_LIBDIR
91	+# ifdef MACOS_X	81	+# define DEFAULT_LIBDIR DEFAULT_BASEDIR
92	+# define DEFAULT_LIBDIR Sys_StripAppBundle(Sys_BinaryPath())
93	+# else
94	+# define DEFAULT_LIBDIR Sys_BinaryPath()
95	+# endif
96	+#endif
97	+#endif	82	+#endif
98	+	83	+
99	/*	84	/*
100	=================	85	=================
101	Sys_SigHandler	86	Sys_SigHandler
102	@@ -540,6 +590,9 @@	87	@@ -540,6 +575,7 @@
103	Sys_ParseArgs( argc, argv );	88	Sys_ParseArgs( argc, argv );
104	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );	89	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
105	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );	90	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );
106	+ #ifdef __FreeBSD__
107	+ Sys_SetDefaultLibPath( DEFAULT_LIBDIR );	91	+ Sys_SetDefaultLibPath( DEFAULT_LIBDIR );
108	+ #endif
109		92
110	// Concatenate the command line for passing to Com_Init	93	// Concatenate the command line for passing to Com_Init
111	for( i = 1; i < argc; i++ )	94	for( i = 1; i < argc; i++ )

Lines 1-15 Link Here

(-)ports/games/ioquake3/files/patch-code-sys-sys_unix.c (-12 / +10 lines)
1	--- code/sys/sys_unix.c.orig 2009-08-30 21:54:20.000000000 +0200	1	--- code/sys/sys_unix.c.orig 2008-11-11 00:55:22.000000000 +0100
2	+++ code/sys/sys_unix.c 2009-08-30 22:10:31.000000000 +0200	2	+++ code/sys/sys_unix.c 2009-12-08 10:54:22.000000000 +0100
3	@@ -56,8 +56,12 @@	3	@@ -53,7 +53,9 @@
4	#ifdef MACOS_X	4	if( ( p = getenv( "HOME" ) ) != NULL )
		5	{
		6	Q_strncpyz( homePath, p, sizeof( homePath ) );
		7	-#ifdef MACOS_X
		8	+#ifdef HOMEPATH
		9	+ Q_strcat( homePath, sizeof( homePath ), HOMEPATH );
		10	+#elif defined MACOS_X
5	Q_strcat( homePath, sizeof( homePath ), "/Library/Application Support/Quake3" );	11	Q_strcat( homePath, sizeof( homePath ), "/Library/Application Support/Quake3" );
6	#else	12	#else
7	+#ifdef __FreeBSD__
8	+ Q_strcat( homePath, sizeof( homePath ), HOMEPATH );
9	+#else
10	Q_strcat( homePath, sizeof( homePath ), "/.q3a" );	13	Q_strcat( homePath, sizeof( homePath ), "/.q3a" );
11	#endif
12	+#endif
13	if( mkdir( homePath, 0777 ) )
14	{
15	if( errno != EEXIST )