Apply patches from PR pkg/37837 to get quakeforge going on DragonFly.

Also fixes the usual gcc4 suspects. (static/extern storage class mismatch)

17 files changed, 354 insertions, 4 deletions

diff --git a/games/quakeforge/distinfo b/games/quakeforge/distinfo
index 5ea25845e1e..c012a02e908 100644
--- a/games/quakeforge/distinfo
+++ b/games/quakeforge/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/05/15 23:33:22 joerg Exp $
+$NetBSD: distinfo,v 1.6 2008/01/23 04:59:35 tnn Exp $
 
 SHA1 (quakeforge-0.5.5.tar.gz) = 3ceb229b3d777b6c5e0cb1530b4547b20737f402
 RMD160 (quakeforge-0.5.5.tar.gz) = d22b29498e950bfdf96169bafee6409fca1a8e11
@@ -9,4 +9,19 @@ SHA1 (patch-ac) = fd8daa6dc4a32418c1c31790f9b969db43746e8f
 SHA1 (patch-ad) = a6d824831a5444f92c7b3ab396ea31ef52503dea
 SHA1 (patch-ae) = aa0431df430f4fc08da32550f7fc5a156096bb43
 SHA1 (patch-af) = 15c725bc5c99f558518a1b7ebb219b8b20b19926
-SHA1 (patch-ag) = f1c14409d7cfeb33c75d9909eb78e0c501073433
+SHA1 (patch-ag) = a039a25dce8e9a625f461730c70b46c510d4aac3
+SHA1 (patch-ah) = b8da2ec1d52c89535d949445871e85872d9a135f
+SHA1 (patch-ai) = 67ef987cfa9dc50485a5a44341a7576e0e99d5c0
+SHA1 (patch-aj) = 5b28f79846fd2dff62004ff52bfc0dad33a91a67
+SHA1 (patch-ak) = e6983bd274f6945510f2624352bf3ec22610f6cc
+SHA1 (patch-al) = 86749a0e238d817944f89ef01362496cf85e3a86
+SHA1 (patch-am) = a384e268293800d67caa690d260282277cc49ba8
+SHA1 (patch-an) = 7b6c91f62a72f4379456192aa15ce8f3ffe4a8ea
+SHA1 (patch-ao) = ee771a71c83b0b11298baca223af4c5e998da4d2
+SHA1 (patch-ap) = 96a767e320124567f53e60b2c39de17d24427085
+SHA1 (patch-aq) = 7b9a23a532b84c902a54799aed336247248276f7
+SHA1 (patch-ar) = bb4fdab9879930fb73572a831718c75109e10ea4
+SHA1 (patch-as) = 770600734b9e26206fc824d1a3b6cf67b3c0d631
+SHA1 (patch-at) = 3e8bb9d7882c5428cec94d78295668e7930624e6
+SHA1 (patch-au) = 5fbe311a03bc65e39e501b38f50a9c42b298a03a
+SHA1 (patch-av) = 8ba99fa13916ab9efd881a89760307fc5863e9d5
diff --git a/games/quakeforge/patches/patch-ag b/games/quakeforge/patches/patch-ag
index fd7bc156a2b..8f258f847dd 100644
--- a/games/quakeforge/patches/patch-ag
+++ b/games/quakeforge/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2006/05/15 23:33:22 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2008/01/23 04:59:35 tnn Exp $
 
---- configure.orig	2006-05-15 22:52:47.000000000 +0000
+--- configure.orig	2004-05-02 20:53:17.000000000 +0000
 +++ configure
 @@ -4034,13 +4034,13 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
@@ -99,3 +99,20 @@ $NetBSD: patch-ag,v 1.1 2006/05/15 23:33:22 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
+@@ -22733,7 +22733,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ int
+ main ()
+ {
+-void *(*foo)(size_t) = alloca;
++void *foo = alloca(sizeof(void));
+   ;
+   return 0;
+ }
+@@ -32305,6 +32305,7 @@ fi
+ 
+ if test "x$BUILD_SW" = xyes; then
+ 	VID_REND_NOINST_TARGETS="$VID_REND_NOINST_TARGETS libQFrenderer_sw.la"
++	VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw.la"
+ 	VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw.la"
+ fi
+ if test "x$BUILD_SW32" = xyes; then
diff --git a/games/quakeforge/patches/patch-ah b/games/quakeforge/patches/patch-ah
new file mode 100644
index 00000000000..4d85f8b5bb5
--- /dev/null
+++ b/games/quakeforge/patches/patch-ah
@@ -0,0 +1,51 @@
+$NetBSD: patch-ah,v 1.1 2008/01/23 04:59:35 tnn Exp $
+
+--- include/QF/sound.h.orig	2004-01-21 02:52:07.000000000 +0000
++++ include/QF/sound.h
+@@ -112,31 +112,31 @@ struct channel_s *S_AllocChannel (void);
+ // number of times S_Update() is called per second.
+ //
+ 
+-extern qboolean 		fakedma;
++// extern qboolean 		fakedma;
+ extern int 			fakedma_updates;
+ extern unsigned paintedtime;
+-extern unsigned soundtime;
+-extern vec3_t listener_origin;
+-extern vec3_t listener_forward;
+-extern vec3_t listener_right;
+-extern vec3_t listener_up;
+-extern vec_t sound_nominal_clip_dist;
++// extern unsigned soundtime;
++// extern vec3_t listener_origin;
++// extern vec3_t listener_forward;
++// extern vec3_t listener_right;
++// extern vec3_t listener_up;
++// extern vec_t sound_nominal_clip_dist;
+ 
+ extern	struct cvar_s *snd_loadas8bit;
+-extern	struct cvar_s *bgmvolume;
++// extern	struct cvar_s *bgmvolume;
+ extern	struct cvar_s *volume;
+ 
+-extern	struct cvar_s *snd_mixahead;
+-extern	struct cvar_s	*snd_device;
+-extern	struct cvar_s	*snd_rate;
+-extern	struct cvar_s	*snd_bits;
+-extern	struct cvar_s	*snd_stereo;
++// extern	struct cvar_s *snd_mixahead;
++// extern	struct cvar_s	*snd_device;
++// extern	struct cvar_s	*snd_rate;
++// extern	struct cvar_s	*snd_bits;
++// extern	struct cvar_s	*snd_stereo;
+ extern	struct cvar_s	*snd_interp;
+ extern	struct cvar_s *snd_stereo_phase_separation;
+ 
+-extern qboolean	snd_initialized;
++// extern qboolean	snd_initialized;
+ 
+-extern int		snd_blocked;
++// extern int		snd_blocked;
+ 
+ void S_LocalSound (const char *s);
+ 
diff --git a/games/quakeforge/patches/patch-ai b/games/quakeforge/patches/patch-ai
new file mode 100644
index 00000000000..73a7e71d7af
--- /dev/null
+++ b/games/quakeforge/patches/patch-ai
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.1 2008/01/23 04:59:36 tnn Exp $
+
+--- include/context_x11.h.orig	2004-03-21 05:39:59.000000000 +0000
++++ include/context_x11.h
+@@ -51,12 +51,12 @@ extern Visual	*x_vis;
+ extern Window	x_root;
+ extern Window	x_win;
+ extern XVisualInfo *x_visinfo;
+-extern vec3_t	x_gamma;
++// extern vec3_t	x_gamma;
+ extern int		x_screen;
+ extern int		x_shmeventtype;
+ extern Time		x_time;
+ extern Time		x_mouse_time;
+-extern qboolean doShm;
++// extern qboolean doShm;
+ extern qboolean oktodraw;
+ extern qboolean x_have_focus;
+ 
diff --git a/games/quakeforge/patches/patch-aj b/games/quakeforge/patches/patch-aj
new file mode 100644
index 00000000000..bd5ee587692
--- /dev/null
+++ b/games/quakeforge/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2008/01/23 04:59:36 tnn Exp $
+
+--- libs/console/client.c.orig	2004-03-02 03:55:17.000000000 +0000
++++ libs/console/client.c
+@@ -84,7 +84,7 @@ static float       con_cursorspeed = 4;
+ 
+ static cvar_t *con_notifytime;				// seconds
+ static cvar_t *con_alpha;
+-static cvar_t *con_size;
++/* static */ cvar_t *con_size;
+ static cvar_t *con_speed;
+ static cvar_t *cl_chatmode;
+ 
diff --git a/games/quakeforge/patches/patch-ak b/games/quakeforge/patches/patch-ak
new file mode 100644
index 00000000000..82b8dbd43b9
--- /dev/null
+++ b/games/quakeforge/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2008/01/23 04:59:36 tnn Exp $
+
+--- libs/console/server.c.orig	2004-01-27 05:23:36.000000000 +0000
++++ libs/console/server.c
+@@ -70,7 +70,7 @@ static __attribute__ ((unused)) const ch
+ 
+ #include "compat.h"
+ 
+-static console_data_t con_data;
++/* static */ console_data_t con_data;
+ 
+ static QFile  *log_file;
+ static cvar_t *sv_logfile;
diff --git a/games/quakeforge/patches/patch-al b/games/quakeforge/patches/patch-al
new file mode 100644
index 00000000000..242d7869854
--- /dev/null
+++ b/games/quakeforge/patches/patch-al
@@ -0,0 +1,29 @@
+$NetBSD: patch-al,v 1.1 2008/01/23 04:59:36 tnn Exp $
+
+--- libs/gib/gib_classes.c.orig	2003-11-29 02:01:31.000000000 +0000
++++ libs/gib/gib_classes.c
+@@ -192,7 +192,7 @@ Object_Class_Children_f (gib_object_t *o
+ 	unsigned int size;
+ 	unsigned int i = 0;
+ 	
+-	static qboolean
++	qboolean
+ 	iterator (gib_class_t *class, void *unused)
+ 	{
+ 		reply[i++] = class->name;
+@@ -610,13 +610,13 @@ GIB_Classes_Build_Scripted (const char *
+ 	gib_classdesc_t desc;
+ 	enum {CLASS, INSTANCE} mode = INSTANCE;
+ 	
+-	static void
++	void
+ 	mtabfree (void *mtab, void *unused)
+ 	{
+ 		free (mtab);
+ 	}
+ 
+-	static const char *
++	const char *
+ 	fname (const char *str)
+ 	{
+ 		if (mode == INSTANCE)
diff --git a/games/quakeforge/patches/patch-am b/games/quakeforge/patches/patch-am
new file mode 100644
index 00000000000..f3b49500259
--- /dev/null
+++ b/games/quakeforge/patches/patch-am
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.1 2008/01/23 04:59:36 tnn Exp $
+
+--- libs/gib/gib_function.c.orig	2004-04-09 18:18:19.000000000 +0000
++++ libs/gib/gib_function.c
+@@ -169,7 +169,7 @@ GIB_Function_Prepare_Args (cbuf_t * cbuf
+ 	gib_var_t  *var;
+ 	static char argss[] = "args";
+ 
+-	static qboolean 
++	qboolean 
+ 	iterate (char *arg, llist_node_t *node)
+ 	{	
+ 		var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
+@@ -207,7 +207,7 @@ GIB_Function_Prepare_Args_D (cbuf_t * cb
+ 	gib_var_t  *var;
+ 	static char argss[] = "args";
+ 
+-	static qboolean 
++	qboolean 
+ 	iterate (char *arg, llist_node_t *node)
+ 	{	
+ 		var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
diff --git a/games/quakeforge/patches/patch-an b/games/quakeforge/patches/patch-an
new file mode 100644
index 00000000000..6e2ac61377d
--- /dev/null
+++ b/games/quakeforge/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2008/01/23 04:59:36 tnn Exp $
+
+--- libs/gib/gib_thread.c.orig	2003-09-11 06:03:10.000000000 +0000
++++ libs/gib/gib_thread.c
+@@ -89,7 +89,7 @@ GIB_Thread_Count (void)
+ void
+ GIB_Thread_Execute (void)
+ {
+-	static qboolean iterator (cbuf_t *cbuf, llist_node_t *node)
++	qboolean iterator (cbuf_t *cbuf, llist_node_t *node)
+ 	{
+ 		if (GIB_DATA(cbuf)->program)
+ 			Cbuf_Execute_Stack (cbuf);
diff --git a/games/quakeforge/patches/patch-ao b/games/quakeforge/patches/patch-ao
new file mode 100644
index 00000000000..4607e4dec87
--- /dev/null
+++ b/games/quakeforge/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2008/01/23 04:59:37 tnn Exp $
+
+--- libs/video/renderer/Makefile.in.orig	2004-05-02 20:52:09.000000000 +0000
++++ libs/video/renderer/Makefile.in
+@@ -409,7 +409,7 @@ libQFrenderer_gl_la_LDFLAGS = -version-i
+ libQFrenderer_gl_la_LIBADD = gl/libgl.la
+ libQFrenderer_gl_la_SOURCES = $(common_sources)
+ libQFrenderer_gl_la_DEPENDENCIES = gl/libgl.la
+-libQFrenderer_sw_la_LDFLAGS = @STATIC@
++libQFrenderer_sw_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
+ libQFrenderer_sw_la_LIBADD = sw/libsw.la
+ libQFrenderer_sw_la_SOURCES = $(common_sources)
+ libQFrenderer_sw_la_DEPENDENCIES = sw/libsw.la
diff --git a/games/quakeforge/patches/patch-ap b/games/quakeforge/patches/patch-ap
new file mode 100644
index 00000000000..c2f6417f0ef
--- /dev/null
+++ b/games/quakeforge/patches/patch-ap
@@ -0,0 +1,15 @@
+$NetBSD: patch-ap,v 1.1 2008/01/23 04:59:37 tnn Exp $
+
+--- libs/video/renderer/sw/Makefile.in.orig	2004-05-02 20:52:12.000000000 +0000
++++ libs/video/renderer/sw/Makefile.in
+@@ -403,8 +403,8 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
+ vid_libs = @vid_libs@
+ AUTOMAKE_OPTIONS = foreign
+-AM_CFLAGS = @PREFER_NON_PIC@
+-AM_CCASFLAGS = @PREFER_NON_PIC@
++AM_CFLAGS = -fPIC
++AM_CCASFLAGS = -fPIC
+ INCLUDES = -I$(top_srcdir)/include
+ @ASM_ARCH_FALSE@asm = 
+ @ASM_ARCH_TRUE@asm = libasm.la
diff --git a/games/quakeforge/patches/patch-aq b/games/quakeforge/patches/patch-aq
new file mode 100644
index 00000000000..ceb7323c95c
--- /dev/null
+++ b/games/quakeforge/patches/patch-aq
@@ -0,0 +1,22 @@
+$NetBSD: patch-aq,v 1.1 2008/01/23 04:59:37 tnn Exp $
+
+--- nq/source/sys_sdl.c.orig	2004-01-20 03:47:26.000000000 +0000
++++ nq/source/sys_sdl.c
+@@ -63,6 +63,7 @@ static __attribute__ ((unused)) const ch
+ #include "QF/console.h"
+ #include "QF/qargs.h"
+ #include "QF/sys.h"
++#include "QF/progs.h"
+ 
+ #include "client.h"
+ #include "compat.h"
+@@ -107,6 +108,9 @@ shutdown (void)
+ #endif
+ }
+ 
++extern void Key_Progs_Init (progs_t *pr);
++void (*x)() = Key_Progs_Init;
++
+ #ifndef SDL_main
+ # define SDL_main main
+ #endif
diff --git a/games/quakeforge/patches/patch-ar b/games/quakeforge/patches/patch-ar
new file mode 100644
index 00000000000..e4d5c562c1d
--- /dev/null
+++ b/games/quakeforge/patches/patch-ar
@@ -0,0 +1,14 @@
+$NetBSD: patch-ar,v 1.1 2008/01/23 04:59:37 tnn Exp $
+
+--- nq/source/sys_unix.c.orig	2003-01-15 15:31:28.000000000 +0000
++++ nq/source/sys_unix.c
+@@ -69,6 +69,9 @@ shutdown (void)
+ 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
+ }
+ 
++extern void Key_Progs_Init (progs_t *pr);
++void (*x)() = Key_Progs_Init;
++
+ int
+ main (int c, const char *v[])
+ {
diff --git a/games/quakeforge/patches/patch-as b/games/quakeforge/patches/patch-as
new file mode 100644
index 00000000000..95c9e942bfb
--- /dev/null
+++ b/games/quakeforge/patches/patch-as
@@ -0,0 +1,46 @@
+$NetBSD: patch-as,v 1.1 2008/01/23 04:59:37 tnn Exp $
+
+--- qw/source/cl_chat.c.orig	2003-07-18 06:27:26.000000000 +0000
++++ qw/source/cl_chat.c
+@@ -66,7 +66,7 @@ CL_Ignore_Compare (const void *ele, cons
+ static void
+ CL_Ignore_Sanity_Check (void)
+ {
+-	static qboolean iterator (ignore_t *ig, llist_node_t *node)
++	qboolean iterator (ignore_t *ig, llist_node_t *node)
+ 	{
+ 		if (cl.players[ig->slot].userid != ig->uid) // We got out of sync somehow
+ 			llist_remove (node);
+@@ -80,12 +80,12 @@ CL_Ignore_f (void)
+ {
+ 	CL_Ignore_Sanity_Check ();
+ 	if (Cmd_Argc () == 1) {
+-		static qboolean live_iterator (ignore_t *ig, llist_node_t *node)
++		qboolean live_iterator (ignore_t *ig, llist_node_t *node)
+ 		{
+ 			Sys_Printf ("%5i - %s\n", ig->uid, Info_ValueForKey (cl.players[ig->slot].userinfo, "name"));
+ 			return true;
+ 		}
+-		static qboolean dead_iterator (ignore_t *ig, llist_node_t *node)
++		qboolean dead_iterator (ignore_t *ig, llist_node_t *node)
+ 		{
+ 			Sys_Printf ("%s\n", ig->lastname);
+ 			return true;
+@@ -145,7 +145,7 @@ CL_Chat_Allow_Message (const char *str)
+ 	dstring_t *test = dstring_newstr ();
+ 	qboolean allowed = true;
+ 
+-	static qboolean iterator (ignore_t *ig, llist_node_t *node)
++	qboolean iterator (ignore_t *ig, llist_node_t *node)
+ 	{
+ 		if (cl.players[ig->slot].userid != ig->uid) { // We got out of sync somehow
+ 			llist_remove (node);
+@@ -183,7 +183,7 @@ CL_Chat_Check_Name (const char *name, in
+ {
+ 	ignore_t *found = 0;
+ 
+-	static qboolean iterator (ignore_t *ig, llist_node_t *node)
++	qboolean iterator (ignore_t *ig, llist_node_t *node)
+ 	{
+ 		if (!strcmp (ig->lastname, name)) {
+ 			found = ig;
diff --git a/games/quakeforge/patches/patch-at b/games/quakeforge/patches/patch-at
new file mode 100644
index 00000000000..ea476c03b6f
--- /dev/null
+++ b/games/quakeforge/patches/patch-at
@@ -0,0 +1,22 @@
+$NetBSD: patch-at,v 1.1 2008/01/23 04:59:37 tnn Exp $
+
+--- qw/source/cl_sys_sdl.c.orig	2004-01-20 03:47:27.000000000 +0000
++++ qw/source/cl_sys_sdl.c
+@@ -63,6 +63,7 @@ static __attribute__ ((unused)) const ch
+ #include "QF/console.h"
+ #include "QF/qargs.h"
+ #include "QF/sys.h"
++#include "QF/progs.h"
+ 
+ #include "client.h"
+ #include "compat.h"
+@@ -108,6 +109,9 @@ shutdown (void)
+ #endif
+ }
+ 
++extern void Key_Progs_Init (progs_t *pr);
++void (*x)() = Key_Progs_Init;
++
+ #ifndef SDL_main
+ # define SDL_main main
+ #endif
diff --git a/games/quakeforge/patches/patch-au b/games/quakeforge/patches/patch-au
new file mode 100644
index 00000000000..d3bee1dacb2
--- /dev/null
+++ b/games/quakeforge/patches/patch-au
@@ -0,0 +1,14 @@
+$NetBSD: patch-au,v 1.1 2008/01/23 04:59:38 tnn Exp $
+
+--- qw/source/cl_sys_unix.c.orig	2003-02-11 22:48:57.000000000 +0000
++++ qw/source/cl_sys_unix.c
+@@ -73,6 +73,9 @@ shutdown (void)
+ 
+ int         skipframes;
+ 
++extern void Key_Progs_Init ();
++void (*x)() = Key_Progs_Init;
++
+ int
+ main (int c, const char *v[])
+ {
diff --git a/games/quakeforge/patches/patch-av b/games/quakeforge/patches/patch-av
new file mode 100644
index 00000000000..d216cb3df19
--- /dev/null
+++ b/games/quakeforge/patches/patch-av
@@ -0,0 +1,12 @@
+$NetBSD: patch-av,v 1.1 2008/01/23 04:59:38 tnn Exp $
+
+--- tools/qfcc/include/method.h.orig	2004-02-04 04:49:46.000000000 +0000
++++ tools/qfcc/include/method.h
+@@ -99,6 +99,6 @@ void clear_selectors (void);
+ 
+ struct expr_s *method_check_params (method_t *method, struct expr_s *args);
+ 
+-extern struct hashtab_s *known_methods;
++// extern struct hashtab_s *known_methods;
+ 
+ #endif//__method_h