ports/165056: games/quakeforge: update to 0.6.2

Barbara barbara.xxx1975 at libero.it
Sun Feb 12 20:20:11 UTC 2012


>Number:         165056
>Category:       ports
>Synopsis:       games/quakeforge: update to 0.6.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 12 20:20:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Barbara
>Release:        RELENG_9
>Organization:
>Environment:
FreeBSD satanasso.local.net 9.0-STABLE FreeBSD 9.0-STABLE #0: Sun Jan 29 04:35:57 CET 2012     root at satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO  i386

>Description:
Update quakeforge to the last version.
This PR supersedes the one I've committed about a month ago (ports/163979) because in the meanwhile a new version has been released.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2011-03-14 17:47:46.000000000 +0100
+++ Makefile	2012-02-12 20:20:59.000000000 +0100
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	quakeforge
-PORTVERSION=	0.5.5
-PORTREVISION=	11
+PORTVERSION=	0.6.2
 CATEGORIES=	games
 MASTER_SITES=	SF/quake/quake/${PORTVERSION}:sf
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sf
@@ -32,6 +31,7 @@
 		--disable-optimize
 
 OPTIONS=	CLIENTS "Build clients" on \
+		JACK "Enable Jack support in clients" off \
 		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
 		SDL "Build SDL client" off \
 		SERVERS "Build dedicated servers" on \
@@ -39,7 +39,7 @@
 		VORBIS "Enable Ogg Vorbis support in clients" off \
 		XMMS "Enable XMMS support in clients" off
 
-MAN1=		pak.1 qfcc.1 qflight.1 qfvis.1 wad.1
+MAN1=		pak.1 qfcc.1 qflight.1 qfvis.1 wad.1 zpak.1
 SUB_FILES=	pkg-message
 
 DATADIR=	${Q1DIR}
@@ -53,9 +53,17 @@
 USE_XORG=	x11 xt
 PLIST_SUB+=	CLIENTS=""
 
+.if defined(WITH_JACK)
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+PLIST_SUB+=	JACK=""
+.else
+CONFIGURE_ARGS+=--disable-jack
+PLIST_SUB+=	JACK="@comment "
+.endif
+
 .if defined(WITH_SDL)
 USE_SDL=	sdl
-CONFIGURE_ARGS+=--with-sdl=${LOCALBASE}
+CONFIGURE_ARGS+=--with-sdl-prefix=${LOCALBASE}
 PLIST_SUB+=	SDL=""
 .else
 CONFIGURE_ARGS+=--disable-sdl
@@ -67,16 +75,15 @@
 CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} --with-vorbis=${LOCALBASE}
 PLIST_SUB+=	VORBIS=""
 .else
-CONFIGURE_ARGS+=--disable-ogg --disable-vorbis
+CONFIGURE_ARGS+=--disable-vorbis
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 .if defined(WITH_XMMS)
 LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
-CONFIGURE_ARGS+=--with-xmms-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=--enable-xmms --with-xmms-prefix=${LOCALBASE}
 PLIST_SUB+=	XMMS=""
 .else
-CONFIGURE_ARGS+=--disable-xmms
 PLIST_SUB+=	XMMS="@comment "
 .endif
 
@@ -114,10 +121,7 @@
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.   for f in *.txt *.q1 *.q2 *.ico *.gif *.fig *.h CodingStyle
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
-.   endfor
-.   for d in config data ideas
+.   for d in config
 	${CP} -R ${WRKSRC}/doc/${d} ${DOCSDIR}
 .   endfor
 .endif
--- distinfo.orig	2011-07-03 16:24:50.000000000 +0200
+++ distinfo	2012-02-12 20:35:30.000000000 +0100
@@ -1,4 +1,4 @@
-SHA256 (quakeforge/quakeforge-0.5.5.tar.bz2) = 9ff29340f571fc26d19992a32f58e767e1b811248688f383083bc2ccb263ec6a
-SIZE (quakeforge/quakeforge-0.5.5.tar.bz2) = 1954072
+SHA256 (quakeforge/quakeforge-0.6.2.tar.bz2) = ab4b82ced4bf87da38fb2929fafb7fa03ee5ae3e482a206403413b0bca2ae92a
+SIZE (quakeforge/quakeforge-0.6.2.tar.bz2) = 2598544
 SHA256 (quakeforge/skyboxes.pak) = 6d32738cf1b8fa19a61fab22d19a1372d388070c87182fa00ac58a908f7dae27
 SIZE (quakeforge/skyboxes.pak) = 1934684
--- pkg-plist.orig	2006-12-29 22:12:41.000000000 +0100
+++ pkg-plist	2012-02-12 19:01:57.000000000 +0100
@@ -1,128 +1,60 @@
 bin/bsp2img
 %%SERVERS%%bin/hw-master
+%%CLIENTS%%bin/nq-glslx
 %%CLIENTS%%bin/nq-glx
 %%CLIENTS%%%%SDL%%bin/nq-sdl
 %%CLIENTS%%%%SDL%%bin/nq-sdl32
 %%SERVERS%%bin/nq-server
 %%CLIENTS%%%%SDL%%bin/nq-sgl
+%%CLIENTS%%%%SDL%%bin/nq-sglsl
 %%CLIENTS%%bin/nq-x11
 bin/pak
 bin/qfbsp
 bin/qfcc
 bin/qflight
+bin/qflmp
 bin/qfmodelgen
+bin/qfpc
 bin/qfpreqcc
 bin/qfprogs
 bin/qfvis
 bin/qfwavinfo
 %%SERVERS%%bin/qtv
+%%CLIENTS%%bin/qw-client-glslx
 %%CLIENTS%%bin/qw-client-glx
 %%CLIENTS%%%%SDL%%bin/qw-client-sdl
 %%CLIENTS%%%%SDL%%bin/qw-client-sdl32
 %%CLIENTS%%%%SDL%%bin/qw-client-sgl
+%%CLIENTS%%%%SDL%%bin/qw-client-sglsl
 %%CLIENTS%%bin/qw-client-x11
 %%SERVERS%%bin/qw-master
 %%SERVERS%%bin/qw-server
 bin/wad
 bin/zpak
-%%CLIENTS%%lib/libQFcd.a
-%%CLIENTS%%lib/libQFcd.la
-%%CLIENTS%%lib/libQFcd.so
-%%CLIENTS%%lib/libQFcd.so.1
-lib/libQFconsole.a
-lib/libQFconsole.la
-lib/libQFconsole.so
-lib/libQFconsole.so.1
-lib/libQFgamecode.a
-lib/libQFgamecode.la
-lib/libQFgamecode.so
-lib/libQFgamecode.so.1
-lib/libQFgamecode_builtins.a
-lib/libQFgamecode_builtins.la
-lib/libQFgamecode_builtins.so
-lib/libQFgamecode_builtins.so.1
-lib/libQFgib.a
-lib/libQFgib.la
-lib/libQFgib.so
-lib/libQFgib.so.1
-lib/libQFimage.a
-lib/libQFimage.la
-lib/libQFimage.so
-lib/libQFimage.so.1
-%%CLIENTS%%lib/libQFjs.a
-%%CLIENTS%%lib/libQFjs.la
-%%CLIENTS%%lib/libQFjs.so
-%%CLIENTS%%lib/libQFjs.so.1
-lib/libQFmodels.a
-lib/libQFmodels.la
-lib/libQFmodels.so
-lib/libQFmodels.so.1
-%%CLIENTS%%lib/libQFmodels_gl.a
-%%CLIENTS%%lib/libQFmodels_gl.la
-%%CLIENTS%%lib/libQFmodels_gl.so
-%%CLIENTS%%lib/libQFmodels_gl.so.1
-%%CLIENTS%%lib/libQFmodels_sw.a
-%%CLIENTS%%lib/libQFmodels_sw.la
-%%CLIENTS%%lib/libQFmodels_sw.so
-%%CLIENTS%%lib/libQFmodels_sw.so.1
-%%CLIENTS%%lib/libQFrenderer_gl.a
-%%CLIENTS%%lib/libQFrenderer_gl.la
-%%CLIENTS%%lib/libQFrenderer_gl.so
-%%CLIENTS%%lib/libQFrenderer_gl.so.1
-%%CLIENTS%%lib/libQFrenderer_sw.a
-%%CLIENTS%%lib/libQFrenderer_sw.la
-%%CLIENTS%%lib/libQFrenderer_sw.so
-%%CLIENTS%%lib/libQFrenderer_sw.so.1
-%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.a
-%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.la
-%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so
-%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so.1
-lib/libQFruamoko.a
-lib/libQFruamoko.la
-lib/libQFruamoko.so
-lib/libQFruamoko.so.1
-%%CLIENTS%%lib/libQFsound.a
-%%CLIENTS%%lib/libQFsound.la
-%%CLIENTS%%lib/libQFsound.so
-%%CLIENTS%%lib/libQFsound.so.1
-lib/libQFutil.a
-lib/libQFutil.la
-lib/libQFutil.so
-lib/libQFutil.so.1
-%%CLIENTS%%lib/quakeforge/cd_file.a
-%%CLIENTS%%lib/quakeforge/cd_file.la
-%%CLIENTS%%lib/quakeforge/cd_file.so
-%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.a
-%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.la
-%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.so
-%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.a
-%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.la
-%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.so
-lib/quakeforge/console_client.a
-lib/quakeforge/console_client.la
-lib/quakeforge/console_client.so
-lib/quakeforge/console_server.a
-lib/quakeforge/console_server.la
-lib/quakeforge/console_server.so
-%%CLIENTS%%lib/quakeforge/snd_output_disk.a
-%%CLIENTS%%lib/quakeforge/snd_output_disk.la
-%%CLIENTS%%lib/quakeforge/snd_output_disk.so
-%%CLIENTS%%lib/quakeforge/snd_output_oss.a
-%%CLIENTS%%lib/quakeforge/snd_output_oss.la
-%%CLIENTS%%lib/quakeforge/snd_output_oss.so
-%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.a
-%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.la
-%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.so
-%%CLIENTS%%lib/quakeforge/snd_render_default.a
-%%CLIENTS%%lib/quakeforge/snd_render_default.la
-%%CLIENTS%%lib/quakeforge/snd_render_default.so
-lib/ruamoko/libcsqc.a
-lib/ruamoko/libgui.a
-lib/ruamoko/libnq.a
-lib/ruamoko/libqw.a
-lib/ruamoko/libr.a
-%%DATADIR%%/QF/menu.dat.gz
-%%SKYBOXES%%%%DATADIR%%/QF/skyboxes.pak
+include/QF/GL/ati.h
+include/QF/GL/defines.h
+include/QF/GL/extensions.h
+include/QF/GL/funcs.h
+include/QF/GL/qf_explosions.h
+include/QF/GL/qf_funcs_list.h
+include/QF/GL/qf_lightmap.h
+include/QF/GL/qf_rlight.h
+include/QF/GL/qf_rmain.h
+include/QF/GL/qf_rsurf.h
+include/QF/GL/qf_sky.h
+include/QF/GL/qf_textures.h
+include/QF/GL/qf_vid.h
+include/QF/GL/types.h
+include/QF/GLSL/defines.h
+include/QF/GLSL/funcs.h
+include/QF/GLSL/qf_alias.h
+include/QF/GLSL/qf_bsp.h
+include/QF/GLSL/qf_funcs_list.h
+include/QF/GLSL/qf_lightmap.h
+include/QF/GLSL/qf_particles.h
+include/QF/GLSL/qf_textures.h
+include/QF/GLSL/qf_vid.h
+include/QF/GLSL/types.h
 include/QF/bspfile.h
 include/QF/cbuf.h
 include/QF/cdaudio.h
@@ -158,6 +90,12 @@
 include/QF/pakfile.h
 include/QF/pcx.h
 include/QF/plugin.h
+include/QF/plugin/cd.h
+include/QF/plugin/console.h
+include/QF/plugin/general.h
+include/QF/plugin/input.h
+include/QF/plugin/snd_output.h
+include/QF/plugin/snd_render.h
 include/QF/png.h
 include/QF/pr_comp.h
 include/QF/pr_debug.h
@@ -174,6 +112,7 @@
 include/QF/riff.h
 include/QF/ruamoko.h
 include/QF/screen.h
+include/QF/script.h
 include/QF/sizebuf.h
 include/QF/skin.h
 include/QF/sound.h
@@ -186,136 +125,186 @@
 include/QF/ver_check.h
 include/QF/vid.h
 include/QF/view.h
+include/QF/vrect.h
 include/QF/wad.h
 include/QF/wadfile.h
+include/QF/winding.h
 include/QF/zone.h
-include/QF/GL/ati.h
-include/QF/GL/defines.h
-include/QF/GL/extensions.h
-include/QF/GL/funcs.h
-include/QF/GL/qf_explosions.h
-include/QF/GL/qf_funcs_list.h
-include/QF/GL/qf_lightmap.h
-include/QF/GL/qf_noisetextures.h
-include/QF/GL/qf_rlight.h
-include/QF/GL/qf_rmain.h
-include/QF/GL/qf_rsurf.h
-include/QF/GL/qf_screen.h
-include/QF/GL/qf_sky.h
-include/QF/GL/qf_textures.h
-include/QF/GL/qf_vid.h
-include/QF/GL/types.h
-include/QF/plugin/cd.h
-include/QF/plugin/console.h
-include/QF/plugin/general.h
-include/QF/plugin/input.h
-include/QF/plugin/snd_output.h
-include/QF/plugin/snd_render.h
-include/QF/ruamoko/Array.h
-include/QF/ruamoko/AutoreleasePool.h
-include/QF/ruamoko/Entity.h
-include/QF/ruamoko/List.h
-include/QF/ruamoko/ListNode.h
-include/QF/ruamoko/Object.h
-include/QF/ruamoko/Stack.h
-include/QF/ruamoko/cbuf.h
-include/QF/ruamoko/cmd.h
-include/QF/ruamoko/crudefile.h
-include/QF/ruamoko/cvar.h
-include/QF/ruamoko/debug.h
-include/QF/ruamoko/draw.h
-include/QF/ruamoko/entities.h
-include/QF/ruamoko/file.h
-include/QF/ruamoko/gib.h
-include/QF/ruamoko/hash.h
-include/QF/ruamoko/infokey.h
-include/QF/ruamoko/key.h
-include/QF/ruamoko/math.h
-include/QF/ruamoko/message.h
-include/QF/ruamoko/nq_message.h
-include/QF/ruamoko/physics.h
-include/QF/ruamoko/plist.h
-include/QF/ruamoko/qfile.h
-include/QF/ruamoko/qfs.h
-include/QF/ruamoko/qw_message.h
-include/QF/ruamoko/qw_physics.h
-include/QF/ruamoko/qw_sys.h
-include/QF/ruamoko/server.h
-include/QF/ruamoko/sound.h
-include/QF/ruamoko/string.h
-include/QF/ruamoko/system.h
-include/QF/ruamoko/gui/Group.h
-include/QF/ruamoko/gui/InputLine.h
-include/QF/ruamoko/gui/Pic.h
-include/QF/ruamoko/gui/Point.h
-include/QF/ruamoko/gui/Rect.h
-include/QF/ruamoko/gui/Size.h
-include/QF/ruamoko/gui/Slider.h
-include/QF/ruamoko/gui/Text.h
-include/QF/ruamoko/gui/View.h
-%%PORTDOCS%%%%DOCSDIR%%/3dfx.txt
-%%PORTDOCS%%%%DOCSDIR%%/CodingStyle
-%%PORTDOCS%%%%DOCSDIR%%/glqnotes.txt
-%%PORTDOCS%%%%DOCSDIR%%/net_DoS_protection.txt
-%%PORTDOCS%%%%DOCSDIR%%/progdefs.q1
-%%PORTDOCS%%%%DOCSDIR%%/progdefs.q2
-%%PORTDOCS%%%%DOCSDIR%%/qe3.ico
-%%PORTDOCS%%%%DOCSDIR%%/qf-client-3dfx-cvar.txt
-%%PORTDOCS%%%%DOCSDIR%%/qf-client-glx-cvar.txt
-%%PORTDOCS%%%%DOCSDIR%%/qf-client-sdl-cvar.txt
-%%PORTDOCS%%%%DOCSDIR%%/qf-client-sgl-cvar.txt
-%%PORTDOCS%%%%DOCSDIR%%/qf-client-svga-cvar.txt
-%%PORTDOCS%%%%DOCSDIR%%/qf-client-x11-cmd.txt
-%%PORTDOCS%%%%DOCSDIR%%/qf-client-x11-cvar.txt
-%%PORTDOCS%%%%DOCSDIR%%/qf-server-cmd.txt
-%%PORTDOCS%%%%DOCSDIR%%/qf-server-cvar.txt
-%%PORTDOCS%%%%DOCSDIR%%/quake.gif
-%%PORTDOCS%%%%DOCSDIR%%/quake.ico
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/skybox.fig
-%%PORTDOCS%%%%DOCSDIR%%/template.h
-%%PORTDOCS%%%%DOCSDIR%%/timestamps.txt
-%%PORTDOCS%%%%DOCSDIR%%/wqreadme.txt
-%%PORTDOCS%%%%DOCSDIR%%/config/glspeed-v1.cfg
-%%PORTDOCS%%%%DOCSDIR%%/config/glspeed-v3.cfg
-%%PORTDOCS%%%%DOCSDIR%%/config/swspeed.cfg
+%%CLIENTS%%lib/libQFcd.a
+%%CLIENTS%%lib/libQFcd.la
+%%CLIENTS%%lib/libQFcd.so
+%%CLIENTS%%lib/libQFcd.so.1
+lib/libQFconsole.a
+lib/libQFconsole.la
+lib/libQFconsole.so
+lib/libQFconsole.so.1
+lib/libQFgamecode.a
+lib/libQFgamecode.la
+lib/libQFgamecode.so
+lib/libQFgamecode.so.1
+lib/libQFgib.a
+lib/libQFgib.la
+lib/libQFgib.so
+lib/libQFgib.so.1
+lib/libQFimage.a
+lib/libQFimage.la
+lib/libQFimage.so
+lib/libQFimage.so.1
+%%CLIENTS%%lib/libQFjs.a
+%%CLIENTS%%lib/libQFjs.la
+%%CLIENTS%%lib/libQFjs.so
+%%CLIENTS%%lib/libQFjs.so.1
+lib/libQFmodels.a
+lib/libQFmodels.la
+lib/libQFmodels.so
+lib/libQFmodels.so.1
+%%CLIENTS%%lib/libQFmodels_gl.a
+%%CLIENTS%%lib/libQFmodels_gl.la
+%%CLIENTS%%lib/libQFmodels_gl.so
+%%CLIENTS%%lib/libQFmodels_gl.so.1
+%%CLIENTS%%lib/libQFmodels_glsl.a
+%%CLIENTS%%lib/libQFmodels_glsl.la
+%%CLIENTS%%lib/libQFmodels_glsl.so
+%%CLIENTS%%lib/libQFmodels_glsl.so.1
+%%CLIENTS%%lib/libQFmodels_sw.a
+%%CLIENTS%%lib/libQFmodels_sw.la
+%%CLIENTS%%lib/libQFmodels_sw.so
+%%CLIENTS%%lib/libQFmodels_sw.so.1
+%%CLIENTS%%lib/libQFrenderer_gl.a
+%%CLIENTS%%lib/libQFrenderer_gl.la
+%%CLIENTS%%lib/libQFrenderer_gl.so
+%%CLIENTS%%lib/libQFrenderer_gl.so.1
+%%CLIENTS%%lib/libQFrenderer_glsl.a
+%%CLIENTS%%lib/libQFrenderer_glsl.la
+%%CLIENTS%%lib/libQFrenderer_glsl.so
+%%CLIENTS%%lib/libQFrenderer_glsl.so.1
+%%CLIENTS%%lib/libQFrenderer_sw.a
+%%CLIENTS%%lib/libQFrenderer_sw.la
+%%CLIENTS%%lib/libQFrenderer_sw.so
+%%CLIENTS%%lib/libQFrenderer_sw.so.1
+%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.a
+%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.la
+%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so
+%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so.1
+lib/libQFruamoko.a
+lib/libQFruamoko.la
+lib/libQFruamoko.so
+lib/libQFruamoko.so.1
+%%CLIENTS%%lib/libQFsound.a
+%%CLIENTS%%lib/libQFsound.la
+%%CLIENTS%%lib/libQFsound.so
+%%CLIENTS%%lib/libQFsound.so.1
+lib/libQFutil.a
+lib/libQFutil.la
+lib/libQFutil.so
+lib/libQFutil.so.1
+lib/qfcc/include/Array.h
+lib/qfcc/include/AutoreleasePool.h
+lib/qfcc/include/Entity.h
+lib/qfcc/include/Object.h
+lib/qfcc/include/PropertyList.h
+lib/qfcc/include/Protocol.h
+lib/qfcc/include/cbuf.h
+lib/qfcc/include/cmd.h
+lib/qfcc/include/crudefile.h
+lib/qfcc/include/cvar.h
+lib/qfcc/include/debug.h
+lib/qfcc/include/draw.h
+lib/qfcc/include/entities.h
+lib/qfcc/include/file.h
+lib/qfcc/include/gib.h
+lib/qfcc/include/gui/Group.h
+lib/qfcc/include/gui/InputLine.h
+lib/qfcc/include/gui/Pic.h
+lib/qfcc/include/gui/Point.h
+lib/qfcc/include/gui/Rect.h
+lib/qfcc/include/gui/Size.h
+lib/qfcc/include/gui/Slider.h
+lib/qfcc/include/gui/Text.h
+lib/qfcc/include/gui/View.h
+lib/qfcc/include/hash.h
+lib/qfcc/include/infokey.h
+lib/qfcc/include/key.h
+lib/qfcc/include/math.h
+lib/qfcc/include/message.h
+lib/qfcc/include/msgbuf.h
+lib/qfcc/include/nq_message.h
+lib/qfcc/include/physics.h
+lib/qfcc/include/plist.h
+lib/qfcc/include/qfile.h
+lib/qfcc/include/qfs.h
+lib/qfcc/include/qw_message.h
+lib/qfcc/include/qw_physics.h
+lib/qfcc/include/qw_sys.h
+lib/qfcc/include/runtime.h
+lib/qfcc/include/script.h
+lib/qfcc/include/server.h
+lib/qfcc/include/sound.h
+lib/qfcc/include/string.h
+lib/qfcc/include/sv_sound.h
+lib/qfcc/include/system.h
+lib/qfcc/lib/libcsqc.a
+lib/qfcc/lib/libgui.a
+lib/qfcc/lib/libnq.a
+lib/qfcc/lib/libqw.a
+lib/qfcc/lib/libr.a
+lib/qfcc/lib/libscheme.a
+%%CLIENTS%%lib/quakeforge/plugins/cd_file.a
+%%CLIENTS%%lib/quakeforge/plugins/cd_file.la
+%%CLIENTS%%lib/quakeforge/plugins/cd_file.so
+%%CLIENTS%%%%SDL%%lib/quakeforge/plugins/cd_sdl.a
+%%CLIENTS%%%%SDL%%lib/quakeforge/plugins/cd_sdl.la
+%%CLIENTS%%%%SDL%%lib/quakeforge/plugins/cd_sdl.so
+%%CLIENTS%%%%XMMS%%lib/quakeforge/plugins/cd_xmms.a
+%%CLIENTS%%%%XMMS%%lib/quakeforge/plugins/cd_xmms.la
+%%CLIENTS%%%%XMMS%%lib/quakeforge/plugins/cd_xmms.so
+%%CLIENTS%%lib/quakeforge/plugins/console_client.a
+%%CLIENTS%%lib/quakeforge/plugins/console_client.la
+%%CLIENTS%%lib/quakeforge/plugins/console_client.so
+%%SERVERS%%lib/quakeforge/plugins/console_server.a
+%%SERVERS%%lib/quakeforge/plugins/console_server.la
+%%SERVERS%%lib/quakeforge/plugins/console_server.so
+%%CLIENTS%%lib/quakeforge/plugins/snd_output_disk.a
+%%CLIENTS%%lib/quakeforge/plugins/snd_output_disk.la
+%%CLIENTS%%lib/quakeforge/plugins/snd_output_disk.so
+%%CLIENTS%%lib/quakeforge/plugins/snd_output_oss.a
+%%CLIENTS%%lib/quakeforge/plugins/snd_output_oss.la
+%%CLIENTS%%lib/quakeforge/plugins/snd_output_oss.so
+%%CLIENTS%%%%SDL%%lib/quakeforge/plugins/snd_output_sdl.a
+%%CLIENTS%%%%SDL%%lib/quakeforge/plugins/snd_output_sdl.la
+%%CLIENTS%%%%SDL%%lib/quakeforge/plugins/snd_output_sdl.so
+%%CLIENTS%%lib/quakeforge/plugins/snd_render_default.a
+%%CLIENTS%%lib/quakeforge/plugins/snd_render_default.la
+%%CLIENTS%%lib/quakeforge/plugins/snd_render_default.so
+%%CLIENTS%%%%JACK%%lib/quakeforge/plugins/snd_render_jack.a
+%%CLIENTS%%%%JACK%%lib/quakeforge/plugins/snd_render_jack.la
+%%CLIENTS%%%%JACK%%lib/quakeforge/plugins/snd_render_jack.so
+libdata/pkgconfig/qfcc.pc
+libdata/pkgconfig/quakeforge.pc
+%%DATADIR%%/QF/menu.dat.gz
+%%DATADIR%%/QF/menu.plist
+%%DATADIR%%/QF/menu.sym.gz
+%%SKYBOXES%%%%DATADIR%%/QF/skyboxes.pak
 %%PORTDOCS%%%%DOCSDIR%%/config/gib/adjustvolume.gib
 %%PORTDOCS%%%%DOCSDIR%%/config/gib/infobot.gib
 %%PORTDOCS%%%%DOCSDIR%%/config/gib/ln.gib
 %%PORTDOCS%%%%DOCSDIR%%/config/gib/qfadmin.gib
 %%PORTDOCS%%%%DOCSDIR%%/config/gib/sshot.gib
 %%PORTDOCS%%%%DOCSDIR%%/config/gib/zoom.gib
-%%PORTDOCS%%%%DOCSDIR%%/data/comexp.txt
-%%PORTDOCS%%%%DOCSDIR%%/data/help.txt
-%%PORTDOCS%%%%DOCSDIR%%/data/licinfo.txt
-%%PORTDOCS%%%%DOCSDIR%%/data/manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/data/order.txt
-%%PORTDOCS%%%%DOCSDIR%%/data/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/data/rlicnse.txt
-%%PORTDOCS%%%%DOCSDIR%%/data/slicnse.txt
-%%PORTDOCS%%%%DOCSDIR%%/data/techinfo.txt
-%%PORTDOCS%%%%DOCSDIR%%/data/docs/install
-%%PORTDOCS%%%%DOCSDIR%%/data/docs/install.q2mission
-%%PORTDOCS%%%%DOCSDIR%%/data/docs/install.quake
-%%PORTDOCS%%%%DOCSDIR%%/data/docs/install.quake2
-%%PORTDOCS%%%%DOCSDIR%%/data/docs/readme
-%%PORTDOCS%%%%DOCSDIR%%/data/docs/readme.glquake
-%%PORTDOCS%%%%DOCSDIR%%/data/docs/readme.squake
-%%PORTDOCS%%%%DOCSDIR%%/data/docs/readme.x11
-%%PORTDOCS%%%%DOCSDIR%%/ideas/quakedownload.txt
-%%PORTDOCS%%%%DOCSDIR%%/ideas/rhamph.txt
-%%PORTDOCS%%%%DOCSDIR%%/ideas/serverlist.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ideas
+%%PORTDOCS%%%%DOCSDIR%%/config/glspeed-v1.cfg
+%%PORTDOCS%%%%DOCSDIR%%/config/glspeed-v3.cfg
+%%PORTDOCS%%%%DOCSDIR%%/config/swspeed.cfg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/config/gib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/config
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/data/docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/data
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm include/QF/GL
+ at dirrm %%DATADIR%%/QF
+ at dirrm lib/quakeforge/plugins
+ at dirrm lib/quakeforge
+ at dirrm lib/qfcc/lib
+ at dirrm lib/qfcc/include/gui
+ at dirrm lib/qfcc/include
+ at dirrm lib/qfcc
 @dirrm include/QF/plugin
- at dirrm include/QF/ruamoko/gui
- at dirrm include/QF/ruamoko
+ at dirrm include/QF/GLSL
+ at dirrm include/QF/GL
 @dirrm include/QF
- at dirrm lib/ruamoko
- at dirrm lib/quakeforge
- at dirrm %%DATADIR%%/QF
--- files/patch-configure.orig	2006-12-29 22:12:42.000000000 +0100
+++ files/patch-configure	2012-02-12 16:07:52.000000000 +0100
@@ -1,6 +1,6 @@
---- configure.orig	Sun May  2 17:53:17 2004
-+++ configure	Fri Dec 29 17:54:22 2006
-@@ -22733,7 +22733,7 @@
+--- configure.orig	2012-02-08 14:17:33.000000000 +0100
++++ configure	2012-02-12 16:07:29.000000000 +0100
+@@ -13903,7 +13903,7 @@
  int
  main ()
  {
@@ -9,7 +9,7 @@
    ;
    return 0;
  }
-@@ -32304,7 +32304,7 @@
+@@ -21217,7 +21217,7 @@
  
  
  if test "x$BUILD_SW" = xyes; then
--- files/patch-include-netmain.h.orig	2004-01-25 21:39:30.000000000 +0100
+++ files/patch-include-netmain.h	2012-02-12 15:37:46.000000000 +0100
@@ -1,11 +0,0 @@
---- include/netmain.h.orig	Wed Feb 12 22:08:55 2003
-+++ include/netmain.h	Thu Jan 22 17:33:55 2004
-@@ -34,7 +34,8 @@
- 
- struct qsockaddr
- {
--	short qsa_family;
-+	unsigned char dummy;
-+	unsigned char qsa_family;
- 	unsigned char qsa_data[14];
- };
--- files/patch-include__QF__console.h.orig	2006-12-17 20:24:20.000000000 +0100
+++ files/patch-include__QF__console.h	2012-02-12 15:37:46.000000000 +0100
@@ -1,9 +0,0 @@
---- ./include/QF/console.h.orig	Fri Jul 25 19:21:42 2003
-+++ ./include/QF/console.h	Sun Dec 17 15:59:27 2006
-@@ -141,6 +141,4 @@
- void Menu_Enter (void);
- void Menu_Leave (void);
- 
--extern struct cvar_s *con_size;
--
- #endif // __console_h
--- files/patch-include__QF__sound.h.orig	2006-12-17 20:24:20.000000000 +0100
+++ files/patch-include__QF__sound.h	2012-02-12 15:37:46.000000000 +0100
@@ -1,34 +0,0 @@
---- ./include/QF/sound.h.orig	Tue Jan 20 23:52:07 2004
-+++ ./include/QF/sound.h	Sun Dec 17 15:50:06 2006
-@@ -112,31 +112,14 @@
- // number of times S_Update() is called per second.
- //
- 
--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	struct cvar_s *snd_loadas8bit;
--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_interp;
- extern	struct cvar_s *snd_stereo_phase_separation;
--
--extern qboolean	snd_initialized;
--
--extern int		snd_blocked;
- 
- void S_LocalSound (const char *s);
- 
--- files/patch-include__context_x11.h.orig	2006-12-17 20:24:20.000000000 +0100
+++ files/patch-include__context_x11.h	2012-02-12 15:37:46.000000000 +0100
@@ -1,15 +0,0 @@
---- ./include/context_x11.h.orig	Sun Mar 21 02:39:59 2004
-+++ ./include/context_x11.h	Sun Dec 17 16:04:17 2006
-@@ -51,12 +51,10 @@
- extern Window	x_root;
- extern Window	x_win;
- extern XVisualInfo *x_visinfo;
--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 oktodraw;
- extern qboolean x_have_focus;
- 
--- files/patch-libs__console__server.c.orig	2006-12-17 20:24:20.000000000 +0100
+++ files/patch-libs__console__server.c	2012-02-12 15:37:46.000000000 +0100
@@ -1,11 +1,11 @@
---- ./libs/console/server.c.orig	Tue Jan 27 02:23:36 2004
-+++ ./libs/console/server.c	Sun Dec 17 15:53:42 2006
-@@ -70,7 +70,7 @@
- 
+--- libs/console/server.c.orig	2012-01-07 01:59:05.000000000 +0100
++++ libs/console/server.c	2012-01-09 19:04:37.000000000 +0100
+@@ -75,7 +75,7 @@
  #include "compat.h"
+ #include "sv_console.h"
  
--static console_data_t con_data;
-+console_data_t con_data;
+-static console_data_t sv_con_data;
++console_data_t sv_con_data;
  
  static QFile  *log_file;
  static cvar_t *sv_logfile;
--- files/patch-libs__gib__gib_classes.c.orig	2006-12-17 20:24:20.000000000 +0100
+++ files/patch-libs__gib__gib_classes.c	2012-02-12 15:37:46.000000000 +0100
@@ -1,27 +1,29 @@
---- ./libs/gib/gib_classes.c.orig	Fri Nov 28 23:01:31 2003
-+++ ./libs/gib/gib_classes.c	Sun Dec 17 15:56:41 2006
-@@ -192,7 +192,7 @@
- 	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_classdesc_t desc;
- 	enum {CLASS, INSTANCE} mode = INSTANCE;
- 	
--	static void
-+	void
- 	mtabfree (void *mtab, void *unused)
- 	{
- 		free (mtab);
- 	}
+--- libs/gib/gib_classes.c.orig	2012-01-07 01:59:05.000000000 +0100
++++ libs/gib/gib_classes.c	2012-01-09 19:09:04.000000000 +0100
+@@ -187,7 +187,7 @@
+ static const char **g_occ_reply;
+ static unsigned int g_occ_i = 0;
  
--	static const char *
-+	const char *
- 	fname (const char *str)
- 	{
- 		if (mode == INSTANCE)
+-static qboolean occ_iterator (gib_class_t *class, void *unused)
++qboolean occ_iterator (gib_class_t *class, void *unused)
+ {
+ 	g_occ_reply[g_occ_i++] = class->name;
+ 	return false;
+@@ -602,7 +602,7 @@
+ 	return 0;
+ }
+ 
+-static void gcbs_mtabfree (void *mtab, void *unused)
++void gcbs_mtabfree (void *mtab, void *unused)
+ {
+ 	free (mtab);
+ }
+@@ -610,7 +610,7 @@
+ static enum {CLASS, INSTANCE} g_gcbs_mode;
+ static const char *g_gcbs_name;
+ 
+-static const char *gcbs_fname (const char *str)
++const char *gcbs_fname (const char *str)
+ {
+ 	if (g_gcbs_mode == INSTANCE)
+ 		return va ("__%s_%s__", g_gcbs_name, str);
--- files/patch-libs__gib__gib_function.c.orig	2006-12-17 20:24:20.000000000 +0100
+++ files/patch-libs__gib__gib_function.c	2012-02-12 15:37:46.000000000 +0100
@@ -1,20 +1,20 @@
---- ./libs/gib/gib_function.c.orig	Fri Apr  9 15:18:19 2004
-+++ ./libs/gib/gib_function.c	Sun Dec 17 15:57:10 2006
-@@ -169,7 +169,7 @@
- 	gib_var_t  *var;
- 	static char argss[] = "args";
+--- libs/gib/gib_function.c.orig	2012-01-07 01:59:05.000000000 +0100
++++ libs/gib/gib_function.c	2012-01-09 19:19:37.000000000 +0100
+@@ -166,7 +166,7 @@
+ static hashtab_t *g_fpa_zero = 0;
+ static unsigned int g_fpa_i, g_fpa_ind;
+ 
+-static qboolean fpa_iterate (char *arg, llist_node_t *node)
++qboolean fpa_iterate (char *arg, llist_node_t *node)
+ {
+ 	gib_var_t *var = GIB_Var_Get_Complex (&GIB_DATA(g_fpa_cbuf)->locals, &g_fpa_zero,
+ 		arg, &g_fpa_ind, true);
+@@ -213,7 +213,7 @@
+ static hashtab_t *g_fpad_zero = 0;
+ static unsigned int g_fpad_i, g_fpad_ind;
  
--	static qboolean 
-+	qboolean 
- 	iterate (char *arg, llist_node_t *node)
- 	{	
- 		var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
-@@ -207,7 +207,7 @@
+-static qboolean fpad_iterate (char *arg, llist_node_t *node)
++qboolean fpad_iterate (char *arg, llist_node_t *node)
+ {
  	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,
--- files/patch-libs__gib__gib_thread.c.orig	2006-12-17 20:24:20.000000000 +0100
+++ files/patch-libs__gib__gib_thread.c	2012-02-12 15:37:46.000000000 +0100
@@ -1,11 +1,11 @@
---- ./libs/gib/gib_thread.c.orig	Thu Sep 11 03:03:10 2003
-+++ ./libs/gib/gib_thread.c	Sun Dec 17 15:57:31 2006
-@@ -89,7 +89,7 @@
- void
- GIB_Thread_Execute (void)
+--- libs/gib/gib_thread.c.orig	2012-01-07 01:59:05.000000000 +0100
++++ libs/gib/gib_thread.c	2012-01-09 19:22:35.000000000 +0100
+@@ -86,7 +86,7 @@
+ 	return llist_size (gib_threads);
+ }
+ 
+-static qboolean te_iterator (cbuf_t *cbuf, llist_node_t *node)
++qboolean te_iterator (cbuf_t *cbuf, llist_node_t *node)
  {
--	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);
+ 	if (GIB_DATA(cbuf)->program)
+ 		Cbuf_Execute_Stack (cbuf);
--- files/patch-libs__video__renderer__Makefile.in.orig	2006-12-29 22:12:42.000000000 +0100
+++ files/patch-libs__video__renderer__Makefile.in	2012-02-12 16:15:30.000000000 +0100
@@ -1,11 +1,11 @@
---- ./libs/video/renderer/Makefile.in.orig	Sun May  2 17:52:09 2004
-+++ ./libs/video/renderer/Makefile.in	Fri Dec 29 17:41:47 2006
-@@ -409,7 +409,7 @@
- libQFrenderer_gl_la_LIBADD = gl/libgl.la
- libQFrenderer_gl_la_SOURCES = $(common_sources)
- libQFrenderer_gl_la_DEPENDENCIES = gl/libgl.la
+--- libs/video/renderer/Makefile.in.orig	2012-02-08 14:17:27.000000000 +0100
++++ libs/video/renderer/Makefile.in	2012-02-12 16:15:08.000000000 +0100
+@@ -503,7 +503,7 @@
+ libQFrenderer_glsl_la_LIBADD = glsl/libglsl.la
+ libQFrenderer_glsl_la_DEPENDENCIES = glsl/libglsl.la
+ libQFrenderer_glsl_la_SOURCES = $(common_sources)
 -libQFrenderer_sw_la_LDFLAGS = @STATIC@
-+libQFrenderer_sw_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
++libQFrenderer_sw_la_LDFLAGS = $(lib_ldflags)
  libQFrenderer_sw_la_LIBADD = sw/libsw.la
- libQFrenderer_sw_la_SOURCES = $(common_sources)
  libQFrenderer_sw_la_DEPENDENCIES = sw/libsw.la
+ libQFrenderer_sw_la_SOURCES = $(common_sources)
--- files/patch-libs__video__renderer__sw__Makefile.in.orig	2007-01-20 18:22:27.000000000 +0100
+++ files/patch-libs__video__renderer__sw__Makefile.in	2012-02-12 16:17:55.000000000 +0100
@@ -1,13 +1,11 @@
---- ./libs/video/renderer/sw/Makefile.in.orig	Sun May  2 17:52:12 2004
-+++ ./libs/video/renderer/sw/Makefile.in	Sat Jan 20 12:17:37 2007
-@@ -403,8 +403,8 @@
- target_vendor = @target_vendor@
+--- libs/video/renderer/sw/Makefile.in.orig	2012-02-08 14:17:28.000000000 +0100
++++ libs/video/renderer/sw/Makefile.in	2012-02-12 16:17:31.000000000 +0100
+@@ -413,7 +413,7 @@
+ userpath = @userpath@
  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 at asm = 
  @ASM_ARCH_TRUE at asm = libasm.la
--- files/patch-nq__source__sys_sdl.c.orig	2006-12-30 21:10:16.000000000 +0100
+++ files/patch-nq__source__sys_sdl.c	2012-02-12 15:37:46.000000000 +0100
@@ -1,20 +0,0 @@
---- nq/source/sys_sdl.c.orig	Tue Jan 20 00:47:26 2004
-+++ nq/source/sys_sdl.c	Sat Dec 30 16:44:41 2006
-@@ -63,6 +63,7 @@
- #include "QF/console.h"
- #include "QF/qargs.h"
- #include "QF/sys.h"
-+#include "QF/progs.h"
- 
- #include "client.h"
- #include "compat.h"
-@@ -106,6 +107,9 @@
- 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
- #endif
- }
-+
-+extern void Key_Progs_Init (progs_t *pr);
-+void (*x)() = Key_Progs_Init;
- 
- #ifndef SDL_main
- # define SDL_main main
--- files/patch-nq__source__sys_unix.c.orig	2006-12-17 20:24:20.000000000 +0100
+++ files/patch-nq__source__sys_unix.c	2012-02-12 15:37:46.000000000 +0100
@@ -1,12 +0,0 @@
---- ./nq/source/sys_unix.c.orig	Wed Jan 15 12:31:28 2003
-+++ ./nq/source/sys_unix.c	Sun Dec 17 15:50:06 2006
-@@ -69,6 +69,9 @@
- 	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[])
- {
--- files/patch-pkg_config__Makefile.in.orig	2012-02-12 15:37:46.000000000 +0100
+++ files/patch-pkg_config__Makefile.in	2012-02-12 16:21:04.000000000 +0100
@@ -0,0 +1,11 @@
+--- pkg-config/Makefile.in.orig	2012-02-08 14:17:28.000000000 +0100
++++ pkg-config/Makefile.in	2012-02-12 16:20:49.000000000 +0100
+@@ -104,7 +104,7 @@
+ am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+ DATA = $(pkgdata_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-pkgdatadir = @libdir@/pkgconfig
++pkgdatadir = @prefix@/libdata/pkgconfig
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+ ALSA_LIBS = @ALSA_LIBS@
--- files/patch-qw__source__Makefile.in.orig	1970-01-01 01:00:00.000000000 +0100
+++ files/patch-qw__source__Makefile.in	2012-02-12 18:22:38.000000000 +0100
@@ -0,0 +1,11 @@
+--- qw/source/Makefile.in.orig	2012-02-08 14:17:29.000000000 +0100
++++ qw/source/Makefile.in	2012-02-12 18:22:00.000000000 +0100
+@@ -597,7 +597,7 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+ # Stuff that is common to both client and server
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/qw/include @LIBCURL_CPPFLAGS@
++INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/qw/include @LIBCURL_CPPFLAGS@ @LIBCURL_CFLAGS@
+ AM_CFLAGS = @PTHREAD_CFLAGS@
+ bin_PROGRAMS = @QW_TARGETS@
+ noinst_LIBRARIES = @qw_libs@
--- files/patch-qw__source__cl_chat.c.orig	2006-12-17 20:24:20.000000000 +0100
+++ files/patch-qw__source__cl_chat.c	2012-02-12 15:37:46.000000000 +0100
@@ -1,44 +1,55 @@
---- ./qw/source/cl_chat.c.orig	Fri Jul 18 03:27:26 2003
-+++ ./qw/source/cl_chat.c	Sun Dec 17 16:05:14 2006
-@@ -66,7 +66,7 @@
- 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_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 @@
- 	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 @@
- {
- 	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;
+--- qw/source/cl_chat.c.orig	2012-01-07 01:59:05.000000000 +0100
++++ qw/source/cl_chat.c	2012-01-09 19:41:47.000000000 +0100
+@@ -57,13 +57,13 @@
+ 	free (ig);
+ }
+ 
+-static qboolean
++qboolean
+ CL_Ignore_Compare (const void *ele, const void *cmp, void *unused)
+ {
+ 	return *(int *)cmp == ((ignore_t *) ele)->uid;
+ }
+ 
+-static qboolean
++qboolean
+ isc_iterator (ignore_t *ig, llist_node_t *node)
+ {
+ 	if (cl.players[ig->slot].userid != ig->uid) // We got out of sync somehow
+@@ -77,13 +77,13 @@
+ 	llist_iterate (ignore_list, LLIST_ICAST (isc_iterator));
+ }
+ 
+-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;
+@@ -150,9 +150,9 @@
+ */
+ static const char *g_cam_str;
+ static dstring_t *g_cam_test;
+-static qboolean g_cam_allowed;
++qboolean g_cam_allowed;
+ 
+-static qboolean cam_iterator (ignore_t *ig, llist_node_t *node)
++qboolean cam_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);
+@@ -195,7 +195,7 @@
+ static const char *g_ccn_name;
+ static ignore_t *g_ccn_found;
+ 
+-static qboolean ccn_iterator (ignore_t *ig, llist_node_t *node)
++qboolean ccn_iterator (ignore_t *ig, llist_node_t *node)
+ {
+ 	if (!strcmp (ig->lastname, g_ccn_name)) {
+ 		g_ccn_found = ig;
--- files/patch-qw__source__cl_sys_sdl.c.orig	2006-12-30 21:10:16.000000000 +0100
+++ files/patch-qw__source__cl_sys_sdl.c	2012-02-12 15:37:46.000000000 +0100
@@ -1,20 +0,0 @@
---- qw/source/cl_sys_sdl.c.orig	Tue Jan 20 00:47:27 2004
-+++ qw/source/cl_sys_sdl.c	Sat Dec 30 16:44:37 2006
-@@ -63,6 +63,7 @@
- #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 @@
- 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
- #endif
- }
-+
-+extern void Key_Progs_Init (progs_t *pr);
-+void (*x)() = Key_Progs_Init;
- 
- #ifndef SDL_main
- # define SDL_main main
--- files/patch-qw__source__cl_sys_unix.c.orig	2006-12-30 21:10:16.000000000 +0100
+++ files/patch-qw__source__cl_sys_unix.c	2012-02-12 15:37:46.000000000 +0100
@@ -1,20 +0,0 @@
---- qw/source/cl_sys_unix.c.orig	Tue Feb 11 19:48:57 2003
-+++ qw/source/cl_sys_unix.c	Sat Dec 30 16:44:33 2006
-@@ -56,6 +56,7 @@
- #include "QF/console.h"
- #include "QF/qargs.h"
- #include "QF/sys.h"
-+#include "QF/progs.h"
- 
- #include "host.h"
- #include "netchan.h"
-@@ -72,6 +73,9 @@
- }
- 
- int         skipframes;
-+
-+extern void Key_Progs_Init (progs_t *pr);
-+void (*x)() = Key_Progs_Init;
- 
- int
- main (int c, const char *v[])
--- files/patch-tools__qfcc__include__method.h.orig	2006-12-17 20:24:20.000000000 +0100
+++ files/patch-tools__qfcc__include__method.h	2012-02-12 15:37:46.000000000 +0100
@@ -1,9 +0,0 @@
---- ./tools/qfcc/include/method.h.orig	Wed Feb  4 01:49:46 2004
-+++ ./tools/qfcc/include/method.h	Sun Dec 17 16:07:08 2006
-@@ -99,6 +99,4 @@
- 
- struct expr_s *method_check_params (method_t *method, struct expr_s *args);
- 
--extern struct hashtab_s *known_methods;
--
- #endif//__method_h


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list