mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00
Code Issues Releases Activity

Update to 0.7.2

Browse Source 
PR:		209296
Submitted by:	tkato432 yahoo com
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2016-05-09 13:43:13 +00:00
parent 893889b444
commit bef73fdbfb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=414848
24 changed files with 348 additions and 591 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
games/quakeforge/Makefile
View File

@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= quakeforge
PORTVERSION= 0.5.5
PORTREVISION= 16
PORTVERSION= 0.7.2
CATEGORIES= games
MASTER_SITES= SF/quake/quake/${PORTVERSION}:sf
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf
MASTER_SITES= SF/quake/quake/${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@ -18,108 +17,106 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:graphics/png
USE_CSTD= gnu89
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USES= bison compiler:nestedfct gmake libtool tar:bzip2
USE_LDCONFIG= yes
CONFIGURE_ARGS+=--with-global-cfg=${PREFIX}/etc/quakeforge.conf \
--with-sharepath=${DATADIR} \
CONFIGURE_ENV= Z_CFLAGS=" " Z_LIBS="-lz"
CONFIGURE_ARGS= --disable-alsa \
--disable-debug \
--disable-optimize
OPTIONS_DEFINE= CLIENTS OPTIMIZED_CFLAGS SDL SERVERS SKYBOXES VORBIS \
XMMS DOCS
OPTIONS_DEFAULT= CLIENTS SERVERS DOCS
CLIENTS_DESC= Clients
SDL_DESC= SDL client
SERVERS_DESC= Dedicated servers
SKYBOXES_DESC= Install skyboxes pak
VORBIS_DESC= Ogg Vorbis support in clients
XMMS_DESC= XMMS support in clients
--disable-optimize \
--disable-static \
--enable-xdg \
--with-cpp="${CPP} %d %i %o" \
--with-global-cfg=${PREFIX}/etc/quakeforge.conf \
--with-ipv6 \
--with-sharepath=${Q1DIR}
INSTALL_TARGET= install-strip
USES= bison compiler:c11 gmake libtool localbase tar:bzip2
USE_LDCONFIG= yes
SUB_FILES= pkg-message
DATADIR= ${Q1DIR}
OPTIONS_DEFINE= CLIENTS DOCS FLAC JACK OPTIMIZED_CFLAGS SDL SERVERS \
SKYBOXES VORBIS XMMS XXF86DGA XXF86VM
OPTIONS_DEFAULT= CLIENTS SERVERS
OPTIONS_SUB= yes
.include "${.CURDIR}/../quake-data/Makefile.include"
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCLIENTS}
USE_GL= yes
USE_XORG= x11 xt
PLIST_SUB+= CLIENTS=""
.if ${PORT_OPTIONS:MSDL}
USE_SDL= sdl
CONFIGURE_ARGS+=--with-sdl=${LOCALBASE}
PLIST_SUB+= SDL=""
.else
CONFIGURE_ARGS+=--disable-sdl
PLIST_SUB+= SDL="@comment "
.endif
.if ${PORT_OPTIONS:MVORBIS}
LIB_DEPENDS+= libvorbis.so:audio/libvorbis
CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} --with-vorbis=${LOCALBASE}
PLIST_SUB+= VORBIS=""
.else
CONFIGURE_ARGS+=--disable-ogg --disable-vorbis
PLIST_SUB+= VORBIS="@comment "
.endif
.if ${PORT_OPTIONS:MXMMS}
LIB_DEPENDS+= libxmms.so:multimedia/xmms
CONFIGURE_ARGS+=--with-xmms-prefix=${LOCALBASE}
PLIST_SUB+= XMMS=""
.else
CONFIGURE_ARGS+=--disable-xmms
PLIST_SUB+= XMMS="@comment "
.endif
.else
CONFIGURE_ARGS+=--with-clients=""
PLIST_SUB+= CLIENTS="@comment "
.endif
.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
CFLAGS+= -O3 -funroll-loops -fomit-frame-pointer -fno-common \
-fexpensive-optimizations -fstrict-aliasing -ffast-math
.endif
.if ${PORT_OPTIONS:MSERVERS}
PLIST_SUB+= SERVERS=""
.else
CONFIGURE_ARGS+=--with-servers=""
PLIST_SUB+= SERVERS="@comment "
.endif
.if ${PORT_OPTIONS:MSKYBOXES}
MASTER_SITES+= http://www.quakeforge.net/files/:qf
DISTFILES+= skyboxes.pak:qf
PLIST_SUB+= SKYBOXES=""
.else
PLIST_SUB+= SKYBOXES="@comment "
.endif
CLIENTS_DESC= Clients
CLIENTS_BUILD_DEPENDS= icotool:graphics/icoutils
CLIENTS_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate \
libcurl.so:ftp/curl
CLIENTS_USES= pkgconfig
CLIENTS_USE= gl=glu xorg=xext
CLIENTS_CONFIGURE_OFF= --with-clients=""
CLIENTS_VERS= INSTALLS_ICONS=yes
FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
FLAC_CONFIGURE_ON= --with-libFLAC=${LOCALBASE}
FLAC_CONFIGURE_OFF= --disable-flac
FLAC_IMPLIES= CLIENTS
JACK_LIB_DEPENDS= libjack.so:audio/jack
JACK_CONFIGURE_OFF= --disable-jack
JACK_IMPLIES= CLIENTS
OPTIMIZED_CFLAGS_CFLAGS=\
-O3 -funroll-loops -fomit-frame-pointer -fno-common \
-fexpensive-optimizations -fstrict-aliasing -ffast-math
SDL_USE= sdl=sdl
SDL_CONFIGURE_ON= --with-sdl-prefix=${LOCALBASE}
SDL_CONFIGURE_OFF= --disable-sdl
SDL_IMPLIES= CLIENTS
SERVERS_DESC= Dedicated servers
SERVERS_USES= ncurses
SERVERS_CONFIGURE_OFF= --with-servers=""
SKYBOXES_DESC= Install skyboxes pak
SKYBOXES_MASTER_SITES= http://www.quakeforge.net/files/:qf
SKYBOXES_DISTFILES= skyboxes.pak:qf
VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis
VORBIS_CONFIGURE_ON= --with-ogg=${LOCALBASE} --with-vorbis=${LOCALBASE}
VORBIS_CONFIGURE_OFF= --disable-vorbis
VORBIS_IMPLIES= CLIENTS
XMMS_DESC= Sound support via XMMS
XMMS_LIB_DEPENDS= libxmms.so:multimedia/xmms
XMMS_CONFIGURE_ON= --enable-xmms --with-xmms-prefix=${LOCALBASE}
XMMS_IMPLIES= CLIENTS
XXF86DGA_DESC= XFree86 DGA Extension support
XXF86DGA_USE= xorg=xxf86dga
XXF86DGA_CONFIGURE_OFF= --disable-dga
XXF86DGA_IMPLIES= CLIENTS
XXF86VM_DESC= XFree86 Vidmode Extension support
XXF86VM_USE= xorg=xxf86vm
XXF86VM_CONFIGURE_OFF= --disable-vidmode
XXF86VM_IMPLIES= CLIENTS
post-patch:
@${REINPLACE_CMD} -e 's,\*gzfile,gzfile,' ${WRKSRC}/libs/util/quakeio.c
@${REINPLACE_CMD} -e 's,-no-undefined,& -L${LOCALBASE}/lib,' \
${WRKSRC}/libs/image/Makefile.in
@${REINPLACE_CMD} -e \
's|^Z_LIBS=""|| ; \
/if test/s|==|=| ; \
/for qf_t in/s|,qwaq,|,|' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e \
'/^pkgdatadir/s|@libdir@|@prefix@/libdata|' \
${WRKSRC}/pkg-config/Makefile.in
post-build-CLIENTS-on:
.for i in 16 32
@${MKDIR} ${WRKDIR}/icons/hicolor/${i}x${i}/apps
icotool -x -o ${WRKDIR}/icons/hicolor/${i}x${i}/apps/quake.png \
-w ${i} -b 8 ${WRKSRC}/doc/qf.ico
.endfor
post-install:
.if ${PORT_OPTIONS:MSKYBOXES}
${INSTALL_MAN} ${WRKSRC}/doc/man/quakeforge.1 ${STAGEDIR}${MANPREFIX}/man/man1
post-install-CLIENTS-on:
@(cd ${WRKDIR} && ${COPYTREE_SHARE} icons \
${STAGEDIR}${PREFIX}/share)
post-install-DOCS-on:
@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "config gib" \
${STAGEDIR}${DOCSDIR})
post-install-SKYBOXES-on:
@${MKDIR} ${STAGEDIR}${Q1DIR}/QF
${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/skyboxes.pak \
${STAGEDIR}${DATADIR}/QF
.endif
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in *.txt *.q1 *.q2 *.ico *.gif *.fig *.h CodingStyle
${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
.endfor
.for d in config data ideas
${CP} -a ${WRKSRC}/doc/${d} ${STAGEDIR}${DOCSDIR}
.endfor
.include "${.CURDIR}/../quake-data/Makefile.include"
.include <bsd.port.mk>

4
games/quakeforge/distinfo
View File

@ -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.7.2.tar.bz2) = 1ddc8c963b23bd648d94af48062ab0448345761defeceaef7c62be55c4a28d7a
SIZE (quakeforge/quakeforge-0.7.2.tar.bz2) = 2887823
SHA256 (quakeforge/skyboxes.pak) = 6d32738cf1b8fa19a61fab22d19a1372d388070c87182fa00ac58a908f7dae27
SIZE (quakeforge/skyboxes.pak) = 1934684

28
games/quakeforge/files/patch-configure
View File

@ -1,28 +0,0 @@
--- configure.orig Sun May 2 17:53:17 2004
+++ configure Fri Dec 29 17:54:22 2006
@@ -22733,7 +22733,7 @@
int
main ()
{
-void *(*foo)(size_t) = alloca;
+int *foo = alloca(sizeof(int));
;
return 0;
}
@@ -34649,16 +34649,6 @@
done
;;
default ) chmod +x RPM/build_rpm
- if test -n "$AR" -a "$AR" != "ar"; then
- sed -e 's/^AR="ar"$/AR="'$AR'"/' libtool > libtool.qf
- if cmp -s libtool.qf libtool; then
- echo libtool is unchanged
- rm -f libtool.qf
- else
- rm -f libtool
- mv libtool.qf libtool
- fi
- fi
;;
esac
done

11
games/quakeforge/files/patch-include-netmain.h
View File

@ -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];
};

9
games/quakeforge/files/patch-include__QF__console.h
View File

@ -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

34
games/quakeforge/files/patch-include__QF__sound.h
View File

@ -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);

15
games/quakeforge/files/patch-include__context_x11.h
View File

@ -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;

11
games/quakeforge/files/patch-libs__console__server.c
View File

@ -1,11 +0,0 @@
--- ./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 @@
#include "compat.h"
-static console_data_t con_data;
+console_data_t con_data;
static QFile *log_file;
static cvar_t *sv_logfile;

27
games/quakeforge/files/patch-libs__gib__gib_classes.c
View File

@ -1,27 +0,0 @@
--- ./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);
}
- static const char *
+ const char *
fname (const char *str)
{
if (mode == INSTANCE)

20
games/quakeforge/files/patch-libs__gib__gib_function.c
View File

@ -1,20 +0,0 @@
--- ./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";
- 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_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,

11
games/quakeforge/files/patch-libs__gib__gib_thread.c
View File

@ -1,11 +0,0 @@
--- ./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)
{
- 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);

4
games/quakeforge/files/patch-libs-audio-targets-snd_oss.c → games/quakeforge/files/patch-libs_audio_targets_snd__oss.c
View File

@ -1,6 +1,6 @@
--- libs/audio/targets/snd_oss.c.orig 2004-01-16 02:50:26 UTC
--- libs/audio/targets/snd_oss.c.orig 2013-01-23 03:10:55 UTC
+++ libs/audio/targets/snd_oss.c
@@ -132,12 +132,11 @@ try_open (int rw)
@@ -129,12 +129,11 @@ try_open (int rw)
if (snd_device->string[0])
snd_dev = snd_device->string;

30
games/quakeforge/files/patch-libs_models_gl__skin.c Normal file
View File

@ -0,0 +1,30 @@
--- libs/models/gl_skin.c.orig 2013-01-23 03:10:55 UTC
+++ libs/models/gl_skin.c
@@ -230,19 +230,20 @@ gl_Skin_SetupSkin (skin_t *skin, int cma
int changed;
glskin_t *s;
+ skin->texnum = 0;
+ skin->auxtex = 0;
+ if (!cmap) {
+ return;
+ }
// simplify cmap usage (texture offset/array index)
cmap--;
s = skins + cmap;
changed = (s->tex != skin->texels);
s->tex = skin->texels;
if (!changed) {
- skin->texnum = 0;
- skin->auxtex = 0;
- if (cmap >= 0) {
- skin->texnum = skin_textures + cmap;
- if (s->fb)
- skin->auxtex = skin_fb_textures + cmap;
- }
+ skin->texnum = skin_textures + cmap;
+ if (s->fb)
+ skin->auxtex = skin_fb_textures + cmap;
return;
}
if (s->tex)

20
games/quakeforge/files/patch-nq__source__sys_sdl.c
View File

@ -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

12
games/quakeforge/files/patch-nq__source__sys_unix.c
View File

@ -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[])
{

44
games/quakeforge/files/patch-qw__source__cl_chat.c
View File

@ -1,44 +0,0 @@
--- ./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;

20
games/quakeforge/files/patch-qw__source__cl_sys_sdl.c
View File

@ -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

20
games/quakeforge/files/patch-qw__source__cl_sys_unix.c
View File

@ -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[])

11
games/quakeforge/files/patch-qw_source_cl__http.c Normal file
View File

@ -0,0 +1,11 @@
--- qw/source/cl_http.c.orig 2013-01-23 03:10:55 UTC
+++ qw/source/cl_http.c
@@ -114,7 +114,7 @@ CL_HTTP_Update (void)
Sys_Printf ("download failed: %ld\n", response_code);
CL_FailDownload ();
}
- curl_multi_remove_handle (multi_handle, easy_handle);
+ CL_HTTP_Reset ();
}
}
}

9
games/quakeforge/files/patch-tools__qfcc__include__method.h
View File

@ -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

13
games/quakeforge/files/patch-tools_qfcc_source_diagnostic.c Normal file
View File

@ -0,0 +1,13 @@
--- tools/qfcc/source/diagnostic.c.orig 2013-01-23 03:10:55 UTC
+++ tools/qfcc/source/diagnostic.c
@@ -103,9 +103,7 @@ debug (expr_t *e, const char *fmt, ...)
return;
va_start (args, fmt);
- if (options.notices.promote) {
- _warning (e, fmt, args);
- } else {
+ {
string_t file = pr.source_file;
int line = pr.source_line;

15
games/quakeforge/files/patch-tools_qfcc_source_statements.c Normal file
View File

@ -0,0 +1,15 @@
--- tools/qfcc/source/statements.c.orig 2013-01-23 03:10:55 UTC
+++ tools/qfcc/source/statements.c
@@ -1306,8 +1306,11 @@ move_labels (sblock_t *dst, sblock_t *sr
if (!src_labels)
return;
- while (src_labels->next)
+ src_labels->dest = dst;
+ while (src_labels->next) {
src_labels = src_labels->next;
+ src_labels->dest = dst;
+ }
src_labels->next = dst->labels;
dst->labels = src->labels;
src->labels = 0;

13
games/quakeforge/files/patch-tools_qfcc_source_switch.c Normal file
View File

@ -0,0 +1,13 @@
--- tools/qfcc/source/switch.c.orig 2013-01-23 03:10:55 UTC
+++ tools/qfcc/source/switch.c
@@ -383,6 +383,10 @@ switch_expr (switch_block_t *switch_bloc
int saved_line = pr.source_line;
string_t saved_file = pr.source_file;
+ if (switch_block->test->type == ex_error) {
+ return switch_block->test;
+ }
+
pr.source_line = sw_val->line = switch_block->test->line;
pr.source_file = sw_val->file = switch_block->test->file;

371
games/quakeforge/pkg-plist
View File

@ -1,115 +1,55 @@
bin/bsp2img
%%SERVERS%%bin/hw-master
%%CLIENTS%%bin/nq-glx
%%CLIENTS%%%%SDL%%bin/nq-sdl
%%CLIENTS%%%%SDL%%bin/nq-sdl32
%%SERVERS%%bin/nq-server
%%CLIENTS%%%%SDL%%bin/nq-sgl
%%CLIENTS%%bin/nq-x11
bin/pak
bin/qfbsp
bin/qfcc
bin/qflight
bin/qflmp
bin/qfmodelgen
bin/qfpreqcc
bin/qfprogs
bin/qfspritegen
bin/qfvis
bin/qfwavinfo
%%SERVERS%%bin/qtv
%%CLIENTS%%bin/qw-client-glx
%%CLIENTS%%%%SDL%%bin/qw-client-sdl
%%CLIENTS%%%%SDL%%bin/qw-client-sdl32
%%CLIENTS%%%%SDL%%bin/qw-client-sgl
%%CLIENTS%%bin/qw-client-x11
%%SERVERS%%bin/qw-master
%%SERVERS%%bin/qw-server
bin/wad
bin/zpak
%%CLIENTS%%lib/libQFcd.a
%%CLIENTS%%lib/libQFcd.so
%%CLIENTS%%lib/libQFcd.so.1
%%CLIENTS%%lib/libQFcd.so.1.0.0
lib/libQFconsole.a
lib/libQFconsole.so
lib/libQFconsole.so.1
lib/libQFconsole.so.1.0.0
lib/libQFgamecode.a
lib/libQFgamecode.so
lib/libQFgamecode.so.1
lib/libQFgamecode.so.1.0.0
lib/libQFgamecode_builtins.a
lib/libQFgamecode_builtins.so
lib/libQFgamecode_builtins.so.1
lib/libQFgamecode_builtins.so.1.0.0
lib/libQFgib.a
lib/libQFgib.so
lib/libQFgib.so.1
lib/libQFgib.so.1.0.0
lib/libQFimage.a
lib/libQFimage.so
lib/libQFimage.so.1
lib/libQFimage.so.1.0.0
%%CLIENTS%%lib/libQFjs.a
%%CLIENTS%%lib/libQFjs.so
%%CLIENTS%%lib/libQFjs.so.1
%%CLIENTS%%lib/libQFjs.so.1.0.0
lib/libQFmodels.a
lib/libQFmodels.so
lib/libQFmodels.so.1
lib/libQFmodels.so.1.0.0
%%CLIENTS%%lib/libQFmodels_gl.a
%%CLIENTS%%lib/libQFmodels_gl.so
%%CLIENTS%%lib/libQFmodels_gl.so.1
%%CLIENTS%%lib/libQFmodels_gl.so.1.0.0
%%CLIENTS%%lib/libQFmodels_sw.a
%%CLIENTS%%lib/libQFmodels_sw.so
%%CLIENTS%%lib/libQFmodels_sw.so.1
%%CLIENTS%%lib/libQFmodels_sw.so.1.0.0
%%CLIENTS%%lib/libQFrenderer_gl.a
%%CLIENTS%%lib/libQFrenderer_gl.so
%%CLIENTS%%lib/libQFrenderer_gl.so.1
%%CLIENTS%%lib/libQFrenderer_gl.so.1.0.0
%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.a
%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so
%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so.1
%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so.1.0.0
lib/libQFruamoko.a
lib/libQFruamoko.so
lib/libQFruamoko.so.1
lib/libQFruamoko.so.1.0.0
%%CLIENTS%%lib/libQFsound.a
%%CLIENTS%%lib/libQFsound.so
%%CLIENTS%%lib/libQFsound.so.1
%%CLIENTS%%lib/libQFsound.so.1.0.0
lib/libQFutil.a
lib/libQFutil.so
lib/libQFutil.so.1
lib/libQFutil.so.1.0.0
%%CLIENTS%%lib/quakeforge/cd_file.a
%%CLIENTS%%lib/quakeforge/cd_file.so
%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.a
%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.so
%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.a
%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.so
lib/quakeforge/console_client.a
lib/quakeforge/console_client.so
lib/quakeforge/console_server.a
lib/quakeforge/console_server.so
%%CLIENTS%%lib/quakeforge/snd_output_disk.a
%%CLIENTS%%lib/quakeforge/snd_output_disk.so
%%CLIENTS%%lib/quakeforge/snd_output_oss.a
%%CLIENTS%%lib/quakeforge/snd_output_oss.so
%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.a
%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.so
%%CLIENTS%%lib/quakeforge/snd_render_default.a
%%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_draw.h
include/QF/GL/qf_explosions.h
include/QF/GL/qf_funcs_list.h
include/QF/GL/qf_iqm.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_draw.h
include/QF/GLSL/qf_funcs_list.h
include/QF/GLSL/qf_iqm.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/alloc.h
include/QF/bspfile.h
include/QF/cbuf.h
include/QF/cdaudio.h
@ -130,13 +70,21 @@ include/QF/image.h
include/QF/in_event.h
include/QF/info.h
include/QF/input.h
include/QF/iqm.h
include/QF/joystick.h
include/QF/keys.h
include/QF/link.h
include/QF/llist.h
include/QF/locs.h
include/QF/math/dual.h
include/QF/math/half.h
include/QF/math/matrix3.h
include/QF/math/matrix4.h
include/QF/math/quaternion.h
include/QF/math/vector.h
include/QF/mathlib.h
include/QF/mdfour.h
include/QF/mersenne.h
include/QF/model.h
include/QF/modelgen.h
include/QF/msg.h
@ -145,6 +93,13 @@ include/QF/pak.h
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/plugin/vid_render.h
include/QF/png.h
include/QF/pr_comp.h
include/QF/pr_debug.h
@ -161,6 +116,8 @@ include/QF/render.h
include/QF/riff.h
include/QF/ruamoko.h
include/QF/screen.h
include/QF/script.h
include/QF/set.h
include/QF/sizebuf.h
include/QF/skin.h
include/QF/sound.h
@ -173,127 +130,139 @@ include/QF/va.h
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
%%CLIENTS%%lib/libQFcd.so
%%CLIENTS%%lib/libQFcd.so.1
%%CLIENTS%%lib/libQFcd.so.1.0.0
%%SERVERS%%lib/libQFconsole.so
%%SERVERS%%lib/libQFconsole.so.1
%%SERVERS%%lib/libQFconsole.so.1.0.0
lib/libQFgib.so
lib/libQFgib.so.1
lib/libQFgib.so.1.0.0
lib/libQFimage.so
lib/libQFimage.so.1
lib/libQFimage.so.1.0.0
%%CLIENTS%%lib/libQFjs.so
%%CLIENTS%%lib/libQFjs.so.1
%%CLIENTS%%lib/libQFjs.so.1.0.0
lib/libQFmodels.so
lib/libQFmodels.so.1
lib/libQFmodels.so.1.0.0
lib/libQFruamoko.so
lib/libQFruamoko.so.1
lib/libQFruamoko.so.1.0.0
%%CLIENTS%%lib/libQFsound.so
%%CLIENTS%%lib/libQFsound.so.1
%%CLIENTS%%lib/libQFsound.so.1.0.0
lib/libQFutil.so
lib/libQFutil.so.1
lib/libQFutil.so.1.0.0
%%CLIENTS%%%%VORBIS%%lib/quakeforge/plugins/cd_file.so
%%CLIENTS%%%%SDL%%lib/quakeforge/plugins/cd_sdl.so
%%CLIENTS%%%%XMMS%%lib/quakeforge/plugins/cd_xmms.so
%%CLIENTS%%lib/quakeforge/plugins/console_client.so
%%SERVERS%%lib/quakeforge/plugins/console_server.so
%%CLIENTS%%lib/quakeforge/plugins/snd_output_oss.so
%%CLIENTS%%%%SDL%%lib/quakeforge/plugins/snd_output_sdl.so
%%CLIENTS%%lib/quakeforge/plugins/snd_render_default.so
%%CLIENTS%%%%JACK%%lib/quakeforge/plugins/snd_render_jack.so
%%CLIENTS%%lib/quakeforge/plugins/vid_render_gl.so
%%CLIENTS%%lib/quakeforge/plugins/vid_render_glsl.so
%%CLIENTS%%lib/quakeforge/plugins/vid_render_sw.so
%%CLIENTS%%lib/quakeforge/plugins/vid_render_sw32.so
libdata/pkgconfig/qfcc.pc
libdata/pkgconfig/quakeforge.pc
man/man1/pak.1.gz
man/man1/qfcc.1.gz
man/man1/qflight.1.gz
man/man1/qfvis.1.gz
man/man1/quakeforge.1.gz
man/man1/wad.1.gz
%%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
man/man1/zpak.1.gz
%%CLIENTS%%%%SDL%%share/applications/quakeforge-nq-sdl.desktop
%%CLIENTS%%share/applications/quakeforge-nq-x11.desktop
%%CLIENTS%%%%SDL%%share/applications/quakeforge-qw-sdl.desktop
%%CLIENTS%%share/applications/quakeforge-qw-x11.desktop
%%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%%%%DOCSDIR%%/config/glspeed-v1.cfg
%%PORTDOCS%%%%DOCSDIR%%/config/glspeed-v3.cfg
%%PORTDOCS%%%%DOCSDIR%%/config/swspeed.cfg
%%PORTDOCS%%%%DOCSDIR%%/gib/GIB.lyx
%%PORTDOCS%%%%DOCSDIR%%/gib/break.gib
%%PORTDOCS%%%%DOCSDIR%%/gib/continue.gib
%%PORTDOCS%%%%DOCSDIR%%/gib/curly.gib
%%PORTDOCS%%%%DOCSDIR%%/gib/examples.sh
%%PORTDOCS%%%%DOCSDIR%%/gib/for.gib
%%PORTDOCS%%%%DOCSDIR%%/gib/gib_head.eps
%%PORTDOCS%%%%DOCSDIR%%/gib/if-chain.gib
%%PORTDOCS%%%%DOCSDIR%%/gib/if-else.gib
%%PORTDOCS%%%%DOCSDIR%%/gib/if-simple.gib
%%PORTDOCS%%%%DOCSDIR%%/gib/while.gib
%%CLIENTS%%share/icons/hicolor/32x32/apps/quake.png
%%CLIENTS%%share/icons/hicolor/16x16/apps/quake.png
share/qfcc/include/Array.h
share/qfcc/include/AutoreleasePool.h
share/qfcc/include/Entity.h
share/qfcc/include/Object.h
share/qfcc/include/PropertyList.h
share/qfcc/include/Protocol.h
share/qfcc/include/Set.h
share/qfcc/include/cbuf.h
share/qfcc/include/cmd.h
share/qfcc/include/crudefile.h
share/qfcc/include/cvar.h
share/qfcc/include/debug.h
share/qfcc/include/draw.h
share/qfcc/include/entities.h
share/qfcc/include/file.h
share/qfcc/include/gib.h
share/qfcc/include/gui/Group.h
share/qfcc/include/gui/InputLine.h
share/qfcc/include/gui/Pic.h
share/qfcc/include/gui/Point.h
share/qfcc/include/gui/Rect.h
share/qfcc/include/gui/Size.h
share/qfcc/include/gui/Slider.h
share/qfcc/include/gui/Text.h
share/qfcc/include/gui/View.h
share/qfcc/include/hash.h
share/qfcc/include/infokey.h
share/qfcc/include/key.h
share/qfcc/include/math.h
share/qfcc/include/message.h
share/qfcc/include/msgbuf.h
share/qfcc/include/nq_message.h
share/qfcc/include/physics.h
share/qfcc/include/plist.h
share/qfcc/include/qfile.h
share/qfcc/include/qfs.h
share/qfcc/include/qw_message.h
share/qfcc/include/qw_physics.h
share/qfcc/include/qw_sys.h
share/qfcc/include/runtime.h
share/qfcc/include/script.h
share/qfcc/include/server.h
share/qfcc/include/sound.h
share/qfcc/include/string.h
share/qfcc/include/sv_sound.h
share/qfcc/include/system.h
share/qfcc/lib/libcsqc.a
share/qfcc/lib/libgui.a
share/qfcc/lib/libnq.a
share/qfcc/lib/libqw.a
share/qfcc/lib/libr.a
share/qfcc/lib/libscheme.a
%%Q1DIR%%/QF/menu.dat.gz
%%Q1DIR%%/QF/menu.plist
%%Q1DIR%%/QF/menu.sym.gz
%%SKYBOXES%%%%Q1DIR%%/QF/skyboxes.pak