Attachment 99458 Details for Bug 138535 – file.shar

file.shar

file.shar (text/plain), 12.92 KB, created by kamikaze on 2009-09-04 17:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kamikaze

Created: 2009-09-04 17:50:02 UTC

Size: 12.92 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	ports/games/ioquake3-devel
>#	ports/games/ioquake3-devel/Makefile
>#	ports/games/ioquake3-devel/pkg-message
>#	ports/games/ioquake3-devel/pkg-descr
>#	ports/games/ioquake3-devel/files
>#	ports/games/ioquake3-devel/files/patch-code-sys-sys_unix.c
>#	ports/games/ioquake3-devel/files/patch-code-sys-sys_main.c
>#	ports/games/ioquake3-devel/files/patch-code-qcommon-vm_x86_64.c
>#	ports/games/ioquake3-devel/files/patch-code-qcommon-qcommon.h
>#	ports/games/ioquake3-devel/files/patch-code-qcommon-q_platform.h
>#	ports/games/ioquake3-devel/files/patch-code-qcommon-files.c
>#	ports/games/ioquake3-devel/files/patch-README
>#	ports/games/ioquake3-devel/files/patch-Makefile
>#
>echo c - ports/games/ioquake3-devel
>mkdir -p ports/games/ioquake3-devel > /dev/null 2>&1
>echo x - ports/games/ioquake3-devel/Makefile
>sed 's/^X//' >ports/games/ioquake3-devel/Makefile << '2ae32169a817b0a0a93abbf7fba92741'
>X# New ports collection makefile for:	ioquake3-devel
>X# Date created:				31 Aug 2009
>X# Whom:					Dominic Fandrey
>X#
>X# $FreeBSD$
>X#
>X
>XPORTNAME=	ioquake3-devel
>XDISTVERSION=	1.36_SVN${SVNREVISION}
>XDISTFILES=
>XEXTRACT_ONLY=
>X
>XMAINTAINER=	kamikaze@bsdforen.de
>XCOMMENT=	Development SVN snapshots of ioquake3
>X
>XUSE_ZIP=	no
>XPLIST=		${.CURDIR}/../ioquake3/pkg-plist
>X
>XFETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
>X
>XSVNREVISION=	1582
>XBINSUFFIX=	-devel
>X
>Xdo-fetch:
>X	@${MKDIR} ${WRKDIR}
>X	@(cd ${WRKDIR} && svn checkout -r ${SVNREVISION} \
>X		svn://svn.icculus.org/quake3/trunk ${DISTNAME})
>X
>Xdo-extract:
>X	@${DO_NADA}
>X
>X.include "${.CURDIR}/../ioquake3/Makefile"
>2ae32169a817b0a0a93abbf7fba92741
>echo x - ports/games/ioquake3-devel/pkg-message
>sed 's/^X//' >ports/games/ioquake3-devel/pkg-message << '0429fae03848f7efc77aa092bf6cadda'
>X==============================================================================
>X
>XThe input devices are now handled by SDL. Some mouse buttons will have
>Xdifferent aliases and the mouse speed needs to be readjusted.
>X
>XThe configuration files are saved to ~/.ioquake3-devel instead of ~/.ioquake3
>Xif you prefer both versions to share the configurations files create a
>Xsymlink.
>X
>X==============================================================================
>0429fae03848f7efc77aa092bf6cadda
>echo x - ports/games/ioquake3-devel/pkg-descr
>sed 's/^X//' >ports/games/ioquake3-devel/pkg-descr << 'd528b08280fbd956e88574dc714d2554'
>XThis project, icculus.org/quake3 (sometimes referred to ioquake3, or ioq3 for
>Xshort) aims to build upon id Software's Quake 3 source code release. The
>Xsource code was released on August 20, 2005 under the GPL. Since then, we have
>Xbeen cleaning up, fixing bugs, and adding features. Our permanent goal is to
>Xcreate the open source Quake 3 distribution upon which people base their games
>Xand projects. We also seek to have the perfect version of the engine for
>Xplaying Quake 3: Arena, Team Arena, and all popular mods. This distribution of
>Xthe engine has been ported to many new platforms and has had a slew of new
>Xfeatures added, along with massive bug extermination.
>X
>XWWW: http://ioquake3.org/
>d528b08280fbd956e88574dc714d2554
>echo c - ports/games/ioquake3-devel/files
>mkdir -p ports/games/ioquake3-devel/files > /dev/null 2>&1
>echo x - ports/games/ioquake3-devel/files/patch-code-sys-sys_unix.c
>sed 's/^X//' >ports/games/ioquake3-devel/files/patch-code-sys-sys_unix.c << 'a7e5b5e1f9121249b5e8d080e0b3f05c'
>X--- code/sys/sys_unix.c.orig	2009-08-30 21:54:20.000000000 +0200
>X+++ code/sys/sys_unix.c	2009-08-30 22:10:31.000000000 +0200
>X@@ -56,8 +56,12 @@
>X #ifdef MACOS_X
>X 			Q_strcat( homePath, sizeof( homePath ), "/Library/Application Support/Quake3" );
>X #else
>X+#ifdef __FreeBSD__
>X+			Q_strcat( homePath, sizeof( homePath ), HOMEPATH );
>X+#else
>X 			Q_strcat( homePath, sizeof( homePath ), "/.q3a" );
>X #endif
>X+#endif
>X 			if( mkdir( homePath, 0777 ) )
>X 			{
>X 				if( errno != EEXIST )
>a7e5b5e1f9121249b5e8d080e0b3f05c
>echo x - ports/games/ioquake3-devel/files/patch-code-sys-sys_main.c
>sed 's/^X//' >ports/games/ioquake3-devel/files/patch-code-sys-sys_main.c << 'c428aee8797322460cc86821d8e3bd7f'
>X--- code/sys/sys_main.c.orig	2009-08-30 22:32:59.000000000 +0200
>X+++ code/sys/sys_main.c	2009-08-30 23:21:12.000000000 +0200
>X@@ -49,6 +49,9 @@
>X 
>X static char binaryPath[ MAX_OSPATH ] = { 0 };
>X static char installPath[ MAX_OSPATH ] = { 0 };
>X+#ifdef __FreeBSD__
>X+static char libPath[ MAX_OSPATH ] = { 0 };
>X+#endif
>X 
>X /*
>X =================
>X@@ -93,6 +96,31 @@
>X 		return Sys_Cwd();
>X }
>X 
>X+#ifdef __FreeBSD__
>X+/*
>X+=================
>X+Sys_SetDefaultLibPath
>X+=================
>X+*/
>X+void Sys_SetDefaultLibPath(const char *path)
>X+{
>X+	Q_strncpyz(libPath, path, sizeof(libPath));
>X+}
>X+
>X+/*
>X+=================
>X+Sys_DefaultLibPath
>X+=================
>X+*/
>X+char *Sys_DefaultLibPath(void)
>X+{
>X+	if (*libPath)
>X+		return libPath;
>X+	else
>X+		return Sys_Cwd();
>X+}
>X+#endif
>X+
>X /*
>X =================
>X Sys_DefaultAppPath
>X@@ -384,6 +412,7 @@
>X #1 look down current path
>X #2 look in fs_homepath
>X #3 look in fs_basepath
>X+#4 look in fs_libpath under FreeBSD
>X =================
>X */
>X void *Sys_LoadDll( const char *name, char *fqpath ,
>X@@ -394,6 +423,9 @@
>X 	void  (*dllEntry)( intptr_t (*syscallptr)(intptr_t, ...) );
>X 	char  fname[MAX_OSPATH];
>X 	char  *basepath;
>X+	#ifdef __FreeBSD__
>X+	char  *libpath;
>X+	#endif
>X 	char  *homepath;
>X 	char  *pwdpath;
>X 	char  *gamedir;
>X@@ -405,6 +437,9 @@
>X 	// TODO: use fs_searchpaths from files.c
>X 	pwdpath = Sys_Cwd();
>X 	basepath = Cvar_VariableString( "fs_basepath" );
>X+	#ifdef __FreeBSD__
>X+	libpath = Cvar_VariableString( "fs_libpath" );
>X+	#endif
>X 	homepath = Cvar_VariableString( "fs_homepath" );
>X 	gamedir = Cvar_VariableString( "fs_game" );
>X 
>X@@ -416,6 +451,11 @@
>X 	if(!libHandle && basepath)
>X 		libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
>X 
>X+	#ifdef __FreeBSD__
>X+	if(!libHandle && libpath)
>X+		libHandle = Sys_TryLibraryLoad(libpath, gamedir, fname, fqpath);
>X+	#endif
>X+
>X 	if(!libHandle) {
>X 		Com_Printf ( "Sys_LoadDll(%s) failed to load library\n", name );
>X 		return NULL;
>X@@ -469,6 +509,16 @@
>X #	endif
>X #endif
>X 
>X+#ifdef __FreeBSD__
>X+#ifndef DEFAULT_LIBDIR
>X+#	ifdef MACOS_X
>X+#		define DEFAULT_LIBDIR Sys_StripAppBundle(Sys_BinaryPath())
>X+#	else
>X+#		define DEFAULT_LIBDIR Sys_BinaryPath()
>X+#	endif
>X+#endif
>X+#endif
>X+
>X /*
>X =================
>X Sys_SigHandler
>X@@ -540,6 +590,9 @@
>X 	Sys_ParseArgs( argc, argv );
>X 	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
>X 	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );
>X+	#ifdef __FreeBSD__
>X+	Sys_SetDefaultLibPath( DEFAULT_LIBDIR );
>X+	#endif
>X 
>X 	// Concatenate the command line for passing to Com_Init
>X 	for( i = 1; i < argc; i++ )
>c428aee8797322460cc86821d8e3bd7f
>echo x - ports/games/ioquake3-devel/files/patch-code-qcommon-vm_x86_64.c
>sed 's/^X//' >ports/games/ioquake3-devel/files/patch-code-qcommon-vm_x86_64.c << '24f936a72eb74f1d2d6a298d04a49426'
>X--- code/qcommon/vm_x86_64.c.orig	2009-08-30 20:50:41.000000000 +0200
>X+++ code/qcommon/vm_x86_64.c	2009-08-30 20:51:43.000000000 +0200
>X@@ -246,7 +246,7 @@
>X #else
>X #define JMPIARG \
>X 	emit("movq $%lu, %%rax", vm->codeBase+vm->instructionPointers[iarg]); \
>X-	emit("jmpq *%rax");
>X+	emit("jmpq *%%rax");
>X #endif
>X  
>X // integer compare and jump
>24f936a72eb74f1d2d6a298d04a49426
>echo x - ports/games/ioquake3-devel/files/patch-code-qcommon-qcommon.h
>sed 's/^X//' >ports/games/ioquake3-devel/files/patch-code-qcommon-qcommon.h << '6e8887129cbf10cf05963f1e3fdb282c'
>X--- code/qcommon/qcommon.h.orig	2009-08-30 23:12:19.000000000 +0200
>X+++ code/qcommon/qcommon.h	2009-08-30 23:26:12.000000000 +0200
>X@@ -1068,6 +1068,10 @@
>X #ifdef MACOS_X
>X char    *Sys_DefaultAppPath(void);
>X #endif
>X+#ifdef __FreeBSD__
>X+void	Sys_SetDefaultLibPath(const char *path);
>X+char	*Sys_DefaultLibPath(void);
>X+#endif
>X 
>X void  Sys_SetDefaultHomePath(const char *path);
>X char	*Sys_DefaultHomePath(void);
>6e8887129cbf10cf05963f1e3fdb282c
>echo x - ports/games/ioquake3-devel/files/patch-code-qcommon-q_platform.h
>sed 's/^X//' >ports/games/ioquake3-devel/files/patch-code-qcommon-q_platform.h << '95adf37e630535fdeaa30505192cb473'
>X--- code/qcommon/q_platform.h.orig	2009-08-30 19:30:01.000000000 +0200
>X+++ code/qcommon/q_platform.h	2009-08-30 19:28:38.000000000 +0200
>X@@ -199,6 +199,8 @@
>X 
>X #ifdef __i386__
>X #define ARCH_STRING "i386"
>X+#elif defined __amd64__
>X+#define ARCH_STRING "x86_64"
>X #elif defined __axp__
>X #define ARCH_STRING "alpha"
>X #endif
>95adf37e630535fdeaa30505192cb473
>echo x - ports/games/ioquake3-devel/files/patch-code-qcommon-files.c
>sed 's/^X//' >ports/games/ioquake3-devel/files/patch-code-qcommon-files.c << '38ebd6632f942028f93b13bfe8aadafb'
>X--- code/qcommon/files.c.orig	2009-08-30 22:58:50.000000000 +0200
>X+++ code/qcommon/files.c	2009-08-30 23:10:53.000000000 +0200
>X@@ -241,6 +241,9 @@
>X #endif
>X 
>X static	cvar_t		*fs_basepath;
>X+#ifdef __FreeBSD__
>X+static	cvar_t		*fs_libpath;
>X+#endif
>X static	cvar_t		*fs_basegame;
>X static	cvar_t		*fs_gamedirvar;
>X static	searchpath_t	*fs_searchpaths;
>X@@ -2761,6 +2764,10 @@
>X 	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
>X 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
>X 	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
>X+	#ifdef __FreeBSD__
>X+	fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
>X+	#endif
>X+	
>X 	homePath = Sys_DefaultHomePath();
>X 	if (!homePath || !homePath[0]) {
>X 		homePath = fs_basepath->string;
>38ebd6632f942028f93b13bfe8aadafb
>echo x - ports/games/ioquake3-devel/files/patch-README
>sed 's/^X//' >ports/games/ioquake3-devel/files/patch-README << '891cd52adc73e0d249a2a3063222495b'
>X--- README.orig	2009-08-30 23:34:03.000000000 +0200
>X+++ README	2009-08-31 00:05:03.000000000 +0200
>X@@ -79,6 +79,8 @@
>X   CFLAGS            - use this for custom CFLAGS
>X   V                 - set to show cc command line when building
>X   DEFAULT_BASEDIR   - extra path to search for baseq3 and such
>X+  DEFAULT_LIBDIR    - extra path to search for libraries (FreeBSD only)
>X+  HOMEPATH          - alternative home directory (FreeBSD only)
>X   BUILD_SERVER      - build the 'ioq3ded' server binary
>X   BUILD_CLIENT      - build the 'ioquake3' client binary
>X   BUILD_CLIENT_SMP  - build the 'ioquake3-smp' client binary
>891cd52adc73e0d249a2a3063222495b
>echo x - ports/games/ioquake3-devel/files/patch-Makefile
>sed 's/^X//' >ports/games/ioquake3-devel/files/patch-Makefile << 'a6bad1cd6ad7ac897f46aaeac9e96e43'
>X--- Makefile.orig	2009-09-01 23:31:56.000000000 +0200
>X+++ Makefile	2009-09-01 23:37:01.000000000 +0200
>X@@ -17,6 +17,15 @@
>X   COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
>X endif
>X 
>X+ifeq ($(COMPILE_PLATFORM),freebsd)
>X+  ifeq ($(COMPILE_ARCH),amd64)
>X+    COMPILE_ARCH=x86_64
>X+  endif
>X+  ifeq ($(COMPILE_ARCH),i386)
>X+    COMPILE_ARCH=x86
>X+  endif
>X+endif
>X+
>X ifeq ($(COMPILE_PLATFORM),mingw32)
>X   ifeq ($(COMPILE_ARCH),i386)
>X     COMPILE_ARCH=x86
>X@@ -528,15 +537,34 @@
>X 
>X ifeq ($(PLATFORM),freebsd)
>X 
>X-  ifneq (,$(findstring alpha,$(shell uname -m)))
>X-    ARCH=axp
>X-  else #default to i386
>X-    ARCH=i386
>X-  endif #alpha test
>X+  FREEBSD_ARCH = $(ARCH)
>X+  ifeq ($(ARCH),amd64)
>X+    ARCH = x86_64
>X+  endif
>X+  ifeq ($(ARCH),i386)
>X+    ARCH = x86
>X+  endif
>X+
>X+  ifeq ($(FREEBSD_ARCH),x86_64)
>X+    FREEBSD_ARCH = amd64
>X+  endif
>X+  ifeq ($(FREEBSD_ARCH),x86)
>X+    FREEBSD_ARCH = i386
>X+  endif
>X+
>X+  ifndef HOMEPATH
>X+    HOMEPATH = /.ioquake3
>X+  endif
>X 
>X+  ifndef DEFAULT_LIBDIR
>X+    DEFAULT_LIBDIR = /usr/local/lib/ioquake3
>X+  endif
>X 
>X   BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
>X-    -DUSE_ICON $(SDL_CFLAGS)
>X+    -DUSE_ICON $(SDL_CFLAGS) -DMAP_ANONYMOUS=MAP_ANON \
>X+    -DHOMEPATH=\\\"$(HOMEPATH)\\\" \
>X+    -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\" \
>X+    $(shell make -f /dev/null -VCFLAGS MACHINE_ARCH=$(FREEBSD_ARCH))
>X 
>X   ifeq ($(USE_OPENAL),1)
>X     BASE_CFLAGS += -DUSE_OPENAL
>X@@ -555,8 +583,21 @@
>X       -fomit-frame-pointer -fexpensive-optimizations
>X   else
>X   ifeq ($(ARCH),i386)
>X-    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
>X-      -march=pentium -fomit-frame-pointer -pipe -ffast-math \
>X+    ifeq ($(CROSS_COMPILING),1)
>X+      BASE_CFLAGS += -m32
>X+    endif
>X+    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \
>X+      -fomit-frame-pointer -pipe -ffast-math \
>X+      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
>X+      -funroll-loops -fstrength-reduce
>X+    HAVE_VM_COMPILED=true
>X+  else
>X+  ifeq ($(ARCH),x86_64)
>X+    ifeq ($(CROSS_COMPILING),1)
>X+      BASE_CFLAGS += -m64
>X+    endif
>X+    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \
>X+      -fomit-frame-pointer -pipe -ffast-math \
>X       -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
>X       -funroll-loops -fstrength-reduce
>X     HAVE_VM_COMPILED=true
>X@@ -564,6 +605,7 @@
>X     BASE_CFLAGS += -DNO_VM_COMPILED
>X   endif
>X   endif
>X+  endif
>X 
>X   DEBUG_CFLAGS=$(BASE_CFLAGS) -g
>X 
>a6bad1cd6ad7ac897f46aaeac9e96e43
>exit

Actions: View

Attachments on bug 138535: 99458