Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
games/quakeforge/DESCR
+6
View File
@@ -0,0 +1,6 @@
QuakeForge is a 3D graphics game engine based on id Software's legendary
Quake and QuakeWorld game engine. Its purpose? To improve the state of
the game by improving the engine and making it accessible to as many
people as possible.
It uses SDL, straight Xlib, or OpenGL.
games/quakeforge/MESSAGE
+8
View File
@@ -0,0 +1,8 @@
===========================================================================
$NetBSD: MESSAGE,v 1.1.1.1 2004/04/17 03:04:03 snj Exp $
To use QuakeForge, you must have a set of data files. One possible source
is pkgsrc/games/quakedata/. Once you have obtained a set of data files,
place the id1 directory in ~/.quakeforge/.
===========================================================================
games/quakeforge/Makefile
+61
View File
@@ -0,0 +1,61 @@
# $NetBSD: Makefile,v 1.30 2013/03/28 21:25:51 joerg Exp $
DISTNAME= quakeforge-0.5.5
PKGREVISION= 13
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quake/}
MAINTAINER= snj@NetBSD.org
HOMEPAGE= http://www.quakeforge.net/
COMMENT= Improved Quake engine
CONFIGURE_ARGS+= --with-cpp="${CPP} %d %i %o"
CONFIGURE_ARGS+= --disable-ogg
CONFIGURE_ARGS+= --disable-xmms
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
USE_TOOLS+= bison gmake
USE_LIBTOOL= YES
SUBST_CLASSES+= dsp
SUBST_STAGE.dsp= post-patch
SUBST_MESSAGE.dsp= Adjusting sound device path.
SUBST_FILES.dsp= libs/audio/targets/snd_oss.c
SUBST_SED.dsp= -e "s|/dev/dsp|${DEVOSSAUDIO}|"
REPLACE_PYTHON+= tools/qfcc/source/qfpreqcc
PKG_OPTIONS_VAR= PKG_OPTIONS.quakeforge
PKG_SUPPORTED_OPTIONS= inet6
PKG_SUGGESTED_OPTIONS= inet6
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Minet6)
CONFIGURE_ARGS+= --with-ipv6
.else
CONFIGURE_ARGS+= --without-ipv6
.endif
PLIST_VARS+= sunaudio linux
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
PLIST.sunaudio= yes
.endif
.if ${OPSYS} == "Linux"
PLIST.linux= yes
.endif
INSTALLATION_DIRS= include/QF/GL include/QF/plugin include/QF/ruamoko/gui
.include "../../lang/python/application.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../x11/xf86vidmodeproto/buildlink3.mk"
.include "../../x11/xf86dgaproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
games/quakeforge/PLIST
+197
View File
@@ -0,0 +1,197 @@
@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:56:55 joerg Exp $
bin/bsp2img
bin/hw-master
${PLIST.linux}bin/nq-fbdev
bin/nq-glx
bin/nq-sdl
bin/nq-sdl32
bin/nq-server
bin/nq-sgl
bin/nq-x11
bin/pak
bin/qfbsp
bin/qfcc
bin/qflight
bin/qfmodelgen
bin/qfpreqcc
bin/qfprogs
bin/qfvis
bin/qfwavinfo
bin/qtv
${PLIST.linux}/bin/qw-client-fbdev
bin/qw-client-glx
bin/qw-client-sdl
bin/qw-client-sdl32
bin/qw-client-sgl
bin/qw-client-x11
bin/qw-master
bin/qw-server
bin/wad
bin/zpak
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/bspfile.h
include/QF/cbuf.h
include/QF/cdaudio.h
include/QF/checksum.h
include/QF/clip_hull.h
include/QF/cmd.h
include/QF/console.h
include/QF/crc.h
include/QF/csqc.h
include/QF/cvar.h
include/QF/draw.h
include/QF/dstring.h
include/QF/gib.h
include/QF/hash.h
include/QF/hl.h
include/QF/idparse.h
include/QF/image.h
include/QF/in_event.h
include/QF/info.h
include/QF/input.h
include/QF/joystick.h
include/QF/keys.h
include/QF/link.h
include/QF/llist.h
include/QF/locs.h
include/QF/mathlib.h
include/QF/mdfour.h
include/QF/model.h
include/QF/modelgen.h
include/QF/msg.h
include/QF/object.h
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/png.h
include/QF/pr_comp.h
include/QF/pr_debug.h
include/QF/pr_obj.h
include/QF/progs.h
include/QF/qargs.h
include/QF/qdefs.h
include/QF/qendian.h
include/QF/qfplist.h
include/QF/qtypes.h
include/QF/quakefs.h
include/QF/quakeio.h
include/QF/render.h
include/QF/riff.h
include/QF/ruamoko.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/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
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/screen.h
include/QF/sizebuf.h
include/QF/skin.h
include/QF/sound.h
include/QF/spritegn.h
include/QF/sys.h
include/QF/teamplay.h
include/QF/tga.h
include/QF/uint32.h
include/QF/va.h
include/QF/ver_check.h
include/QF/vid.h
include/QF/view.h
include/QF/wad.h
include/QF/wadfile.h
include/QF/zone.h
lib/libQFcd.la
lib/libQFconsole.la
lib/libQFgamecode.la
lib/libQFgamecode_builtins.la
lib/libQFgib.la
lib/libQFimage.la
lib/libQFjs.la
lib/libQFmodels.la
lib/libQFmodels_gl.la
lib/libQFmodels_sw.la
lib/libQFrenderer_gl.la
lib/libQFrenderer_sw.la
lib/libQFrenderer_sw32.la
lib/libQFruamoko.la
lib/libQFsound.la
lib/libQFutil.la
lib/quakeforge/cd_file.la
${PLIST.linux}lib/quakeforge/cd_linux.la
lib/quakeforge/cd_sdl.la
lib/quakeforge/console_client.la
lib/quakeforge/console_server.la
lib/quakeforge/snd_output_disk.la
lib/quakeforge/snd_output_oss.la
lib/quakeforge/snd_output_sdl.la
${PLIST.sunaudio}lib/quakeforge/snd_output_sun.la
lib/quakeforge/snd_render_default.la
lib/ruamoko/libcsqc.a
lib/ruamoko/libgui.a
lib/ruamoko/libnq.a
lib/ruamoko/libqw.a
lib/ruamoko/libr.a
man/man1/pak.1
man/man1/qfcc.1
man/man1/qflight.1
man/man1/qfvis.1
man/man1/wad.1
share/games/quakeforge/QF/menu.dat.gz
games/quakeforge/distinfo
+33
View File
@@ -0,0 +1,33 @@
$NetBSD: distinfo,v 1.10 2013/06/23 19:54:42 dholland Exp $
SHA1 (quakeforge-0.5.5.tar.gz) = 3ceb229b3d777b6c5e0cb1530b4547b20737f402
RMD160 (quakeforge-0.5.5.tar.gz) = d22b29498e950bfdf96169bafee6409fca1a8e11
Size (quakeforge-0.5.5.tar.gz) = 2659432 bytes
SHA1 (patch-aa) = d54d4784c5832a00382946d78929cf618696b898
SHA1 (patch-ab) = f1abe7e12fd956acb18ed4c95db97e5d86eed8b5
SHA1 (patch-ac) = fd8daa6dc4a32418c1c31790f9b969db43746e8f
SHA1 (patch-ad) = a6d824831a5444f92c7b3ab396ea31ef52503dea
SHA1 (patch-ae) = aa0431df430f4fc08da32550f7fc5a156096bb43
SHA1 (patch-af) = 15c725bc5c99f558518a1b7ebb219b8b20b19926
SHA1 (patch-ag) = a039a25dce8e9a625f461730c70b46c510d4aac3
SHA1 (patch-ah) = b8da2ec1d52c89535d949445871e85872d9a135f
SHA1 (patch-ai) = 67ef987cfa9dc50485a5a44341a7576e0e99d5c0
SHA1 (patch-aj) = 5b28f79846fd2dff62004ff52bfc0dad33a91a67
SHA1 (patch-ak) = e6983bd274f6945510f2624352bf3ec22610f6cc
SHA1 (patch-al) = 7efe85d428efa0dfd0ccf3bf9255deb7970dc5ee
SHA1 (patch-am) = 3c68f6bac84a0f25a50d5f9062795b75649cbe8a
SHA1 (patch-an) = 07a0e85e59d44a7f2421b225822e97068ad80062
SHA1 (patch-ao) = ee771a71c83b0b11298baca223af4c5e998da4d2
SHA1 (patch-ap) = 96a767e320124567f53e60b2c39de17d24427085
SHA1 (patch-aq) = 7b9a23a532b84c902a54799aed336247248276f7
SHA1 (patch-ar) = bb4fdab9879930fb73572a831718c75109e10ea4
SHA1 (patch-as) = 4e82270282d1d5a3fb7b0b95768bf53754f569e8
SHA1 (patch-at) = 3e8bb9d7882c5428cec94d78295668e7930624e6
SHA1 (patch-au) = 5fbe311a03bc65e39e501b38f50a9c42b298a03a
SHA1 (patch-av) = 8ba99fa13916ab9efd881a89760307fc5863e9d5
SHA1 (patch-aw) = d02d3a0cfbb47ad2f73e3ee523aed2964a8fcbae
SHA1 (patch-include_QF_llist.h) = 34b69e99ca69d4564d7100b0e3bcd8d8a024ec94
SHA1 (patch-include_QF_mathlib.h) = d867387c23ebfc2542711af655cb27cb3dab261d
SHA1 (patch-include_r__dynamic.h) = e37cd1d4e242db48793c29c2b78aa78eb14d138d
SHA1 (patch-include_r__local.h) = 7bb3b46ea3835489a20609739bd7a8dc79b36c96
SHA1 (patch-libs_util_llist.c) = d41fdac88ac1c9dbccd1bffd512f7e34ae381860
games/quakeforge/patches/patch-aa
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-aa,v 1.1.1.1 2004/04/17 03:04:03 snj Exp $
--- libs/util/plugin.c.orig 2003-12-27 23:56:05.000000000 -0800
+++ libs/util/plugin.c 2003-12-27 23:59:08.000000000 -0800
@@ -121,7 +121,7 @@
{
void *dlhand;
#ifndef _WIN32
-# ifdef __OpenBSD__
+# if defined(__OpenBSD__) || defined(__NetBSD__)
int flags = RTLD_LAZY;
# else
int flags = RTLD_NOW;
games/quakeforge/patches/patch-ab
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-ab,v 1.2 2004/08/25 20:26:18 snj Exp $
--- libs/audio/targets/Makefile.in.orig 2004-05-02 13:51:44.000000000 -0700
+++ libs/audio/targets/Makefile.in 2004-08-24 15:18:35.000000000 -0700
@@ -444,7 +444,7 @@ snd_output_alsa0_9_la_LDADD =
snd_output_alsa0_9_la_CFLAGS = $(ALSA_CFLAGS)
snd_output_alsa0_9_la_SOURCES = snd_alsa_0_9.c
snd_output_oss_la_LDFLAGS = $(plugin_ldflags)
-snd_output_oss_la_LDADD = $(OSS_LIBS)
+snd_output_oss_la_LDADD = $(OSS_LIBS) $(LIBOSSAUDIO)
snd_output_oss_la_CFLAGS = $(OSS_CFLAGS)
snd_output_oss_la_SOURCES = snd_oss.c
snd_output_sgi_la_LDFLAGS = $(plugin_ldflags)
games/quakeforge/patches/patch-ac
+22
View File
@@ -0,0 +1,22 @@
$NetBSD: patch-ac,v 1.2 2004/08/25 20:26:18 snj Exp $
--- ruamoko/cl_menu/Makefile.am.orig 2004-02-13 21:02:25.000000000 -0800
+++ ruamoko/cl_menu/Makefile.am 2004-08-24 15:21:15.000000000 -0700
@@ -7,7 +7,7 @@ QFCC_DEP=$(top_builddir)/tools/qfcc/sour
QFCC=$(QFCC_DEP)
QCFLAGS=-qq -g -Werror
QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include -I$(top_builddir)/include -I$(top_srcdir)/include
-GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
+XGZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
if HAVE_ZLIB
GZ=.gz
else
@@ -40,7 +40,7 @@ menu_obj=$(addsuffix .qfo,$(basename $(m
menu.dat$(GZ): $(menu_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a ../gui/libgui.a
$(QFCC) $(QCFLAGS) -p $(STRIP) -o menu.dat $(menu_obj) ../gui/libgui.a ../lib/libcsqc.a ../lib/libr.a
- $(GZIP)
+ $(XGZIP)
EXTRA_DIST= $(menu_src) \
Frame.h HUD.h \
games/quakeforge/patches/patch-ad
+22
View File
@@ -0,0 +1,22 @@
$NetBSD: patch-ad,v 1.2 2004/08/25 20:26:18 snj Exp $
--- ruamoko/cl_menu/Makefile.in.orig 2004-05-02 13:52:34.000000000 -0700
+++ ruamoko/cl_menu/Makefile.in 2004-08-24 15:22:17.000000000 -0700
@@ -361,7 +361,7 @@ QFCC_DEP = $(top_builddir)/tools/qfcc/so
QFCC = $(QFCC_DEP)
QCFLAGS = -qq -g -Werror
QCPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include -I$(top_builddir)/include -I$(top_srcdir)/include
-GZIP = if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
+XGZIP = if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
@HAVE_ZLIB_FALSE@GZ =
@HAVE_ZLIB_TRUE@GZ = .gz
menu_data = menu.dat$(GZ)
@@ -571,7 +571,7 @@ uninstall-am: uninstall-info-am uninstal
menu.dat$(GZ): $(menu_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a ../gui/libgui.a
$(QFCC) $(QCFLAGS) -p $(STRIP) -o menu.dat $(menu_obj) ../gui/libgui.a ../lib/libcsqc.a ../lib/libr.a
- $(GZIP)
+ $(XGZIP)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
games/quakeforge/patches/patch-ae
+22
View File
@@ -0,0 +1,22 @@
$NetBSD: patch-ae,v 1.2 2004/08/25 20:26:18 snj Exp $
--- ruamoko/game/Makefile.am.orig 2004-02-02 22:00:16.000000000 -0800
+++ ruamoko/game/Makefile.am 2004-08-24 15:25:10.000000000 -0700
@@ -9,7 +9,7 @@ QFCC_DEP=$(top_builddir)/tools/qfcc/sour
QFCC=$(QFCC_DEP)
QCFLAGS=-qq -g -Werror
QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include
-GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
+XGZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
if HAVE_ZLIB
GZ=.gz
else
@@ -38,7 +38,7 @@ game_obj=$(addsuffix .qfo,$(basename $(g
game.dat$(GZ): $(game_obj) ../lib/libr.a ../lib/libqw.a
$(QFCC) $(QCFLAGS) -p $(STRIP) -o game.dat $(game_obj) ../lib/libqw.a ../lib/libr.a
- $(GZIP)
+ $(XGZIP)
EXTRA_DIST= $(game_src) Axe.h GameEntity.h tempent.h Weapon.h World.h
CLEANFILES= *.dat *.sym *.gz *.qfo
games/quakeforge/patches/patch-af
+22
View File
@@ -0,0 +1,22 @@
$NetBSD: patch-af,v 1.2 2004/08/25 20:26:18 snj Exp $
--- ruamoko/game/Makefile.in.orig 2004-05-02 13:52:35.000000000 -0700
+++ ruamoko/game/Makefile.in 2004-08-24 15:26:06.000000000 -0700
@@ -362,7 +362,7 @@ QFCC_DEP = $(top_builddir)/tools/qfcc/so
QFCC = $(QFCC_DEP)
QCFLAGS = -qq -g -Werror
QCPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include
-GZIP = if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
+XGZIP = if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
@HAVE_ZLIB_FALSE@GZ =
@HAVE_ZLIB_TRUE@GZ = .gz
@BUILD_RUAMOKO_FALSE@data =
@@ -543,7 +543,7 @@ uninstall-am: uninstall-info-am
game.dat$(GZ): $(game_obj) ../lib/libr.a ../lib/libqw.a
$(QFCC) $(QCFLAGS) -p $(STRIP) -o game.dat $(game_obj) ../lib/libqw.a ../lib/libr.a
- $(GZIP)
+ $(XGZIP)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
games/quakeforge/patches/patch-ag
+118
View File
@@ -0,0 +1,118 @@
$NetBSD: patch-ag,v 1.2 2008/01/23 04:59:35 tnn Exp $
--- configure.orig 2004-05-02 20:53:17.000000000 +0000
+++ configure
@@ -4034,13 +4034,13 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
# Not sure whether the presence of OpenBSD here was a mistake.
# Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+ lt_cv_deplibs_check_method='file_magic (DragonFly|FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
@@ -7704,7 +7704,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -8282,7 +8282,7 @@ kfreebsd*-gnu)
dynamic_linker='GNU ld.so'
;;
-freebsd*)
+freebsd* | dragonfly*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in
@@ -10653,7 +10653,7 @@ if test -z "$aix_libpath"; then aix_libp
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu| dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
@@ -11360,7 +11360,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -11974,7 +11974,7 @@ kfreebsd*-gnu)
dynamic_linker='GNU ld.so'
;;
-freebsd*)
+freebsd* | dragonfly*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in
@@ -14537,7 +14537,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
@@ -15115,7 +15115,7 @@ kfreebsd*-gnu)
dynamic_linker='GNU ld.so'
;;
-freebsd*)
+freebsd* | dragonfly*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in
@@ -16883,7 +16883,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
@@ -17461,7 +17461,7 @@ kfreebsd*-gnu)
dynamic_linker='GNU ld.so'
;;
-freebsd*)
+freebsd* | dragonfly*)
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
games/quakeforge/patches/patch-ah
+51
View File
@@ -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);
games/quakeforge/patches/patch-ai
+19
View File
@@ -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;
games/quakeforge/patches/patch-aj
+13
View File
@@ -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;
games/quakeforge/patches/patch-ak
+13
View File
@@ -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;
games/quakeforge/patches/patch-al
+109
View File
@@ -0,0 +1,109 @@
$NetBSD: patch-al,v 1.2 2013/03/28 21:25:52 joerg Exp $
--- libs/gib/gib_classes.c.orig 2003-11-29 02:01:31.000000000 +0000
+++ libs/gib/gib_classes.c
@@ -184,26 +184,32 @@ Object_Class_New_f (gib_object_t *obj, g
return 0;
}
+struct child_data {
+ const char **reply;
+ unsigned i;
+};
+
+static qboolean
+iterator (void *data_, gib_class_t *class, void *unused)
+{
+ struct child_data *data = data_;
+ data->reply[data->i++] = class->name;
+ return false;
+}
+
static int
Object_Class_Children_f (gib_object_t *obj, gib_method_t *method, void *data,
gib_object_t *sender, gib_message_t mesg)
{
- const char **reply;
+ struct child_data cb_data;
unsigned int size;
- unsigned int i = 0;
-
- static qboolean
- iterator (gib_class_t *class, void *unused)
- {
- reply[i++] = class->name;
- return false;
- }
-
+
size = llist_size (obj->class->children);
if (size) {
- reply = malloc (sizeof (char *) * size);
- llist_iterate (obj->class->children, LLIST_ICAST (iterator));
- GIB_Reply (obj, mesg, size, reply);
+ cb_data.reply = malloc (sizeof (char *) * size);
+ cb_data.i = 0;
+ llist_iterate (obj->class->children, iterator, &cb_data);
+ GIB_Reply (obj, mesg, size, cb_data.reply);
} else
GIB_Reply (obj, mesg, 0, NULL);
return 0;
@@ -600,6 +606,12 @@ Scrobj_Method_f (gib_object_t *obj, gib_
return 0;
}
+static void
+mtabfree (void *mtab, void *unused)
+{
+ free (mtab);
+}
+
void
GIB_Classes_Build_Scripted (const char *name, const char *parentname,
gib_tree_t *tree, gib_script_t *script)
@@ -610,21 +622,6 @@ GIB_Classes_Build_Scripted (const char *
gib_classdesc_t desc;
enum {CLASS, INSTANCE} mode = INSTANCE;
- static void
- mtabfree (void *mtab, void *unused)
- {
- free (mtab);
- }
-
- static const char *
- fname (const char *str)
- {
- if (mode == INSTANCE)
- return va ("__%s_%s__", name, str);
- else
- return va ("%s::%s", name, str);
- }
-
methods = llist_new (mtabfree, NULL, NULL);
cmethods = llist_new (mtabfree, NULL, NULL);
@@ -640,6 +637,7 @@ GIB_Classes_Build_Scripted (const char *
if (!strcmp (line->children->str,
"function")) {
gib_tree_t *cur, *last;
+ char *fname;
gib_methodtab_t *new = malloc (sizeof
(gib_methodtab_t));
Scrobj_method_t *data = malloc (sizeof
@@ -648,9 +646,13 @@ GIB_Classes_Build_Scripted (const char *
line->children->next->next;
last->next; last =
last->next);
+
+ if (mode == INSTANCE)
+ fname = va("__%s_%s__", name, line->children->next->str);
+ else
+ fname = va("%s::%s", name, line->children->next->str);
data->func = GIB_Function_Define
- (fname
- (line->children->next->str),
+ (fname,
last->str,
last->children,
script, NULL);
games/quakeforge/patches/patch-am
+164
View File
@@ -0,0 +1,164 @@
$NetBSD: patch-am,v 1.2 2013/03/28 21:25:52 joerg Exp $
--- libs/gib/gib_function.c.orig 2004-04-09 18:18:19.000000000 +0000
+++ libs/gib/gib_function.c
@@ -160,79 +160,108 @@ GIB_Function_Find (const char *name)
return (gib_function_t *) Hash_Find (gib_functions, name);
}
+struct prepare_args_data {
+ gib_var_t *var;
+ hashtab_t **zero;
+ unsigned int i, ind;
+ unsigned int argc;
+ const char **args;
+ cbuf_t *cbuf;
+};
+
+static qboolean
+prepare_args_iterate (void *data_, void *arg_, llist_node_t *node)
+{
+ char *arg = arg_;
+ struct prepare_args_data *data = data_;
+ data->var = GIB_Var_Get_Complex (&GIB_DATA(data->cbuf)->locals, data->zero,
+ arg, &data->ind, true);
+ if (!data->var->array[0].value)
+ data->var->array[0].value = dstring_newstr ();
+ dstring_copystr (data->var->array[0].value, data->args[data->i]);
+ data->i++;
+ return data->i < data->argc;
+}
+
static void
GIB_Function_Prepare_Args (cbuf_t * cbuf, const char **args, unsigned int
argc, llist_t *arglist)
{
static hashtab_t *zero = 0;
- unsigned int i, ind;
- gib_var_t *var;
+ struct prepare_args_data data;
static char argss[] = "args";
- static qboolean
- iterate (char *arg, llist_node_t *node)
- {
- var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
- arg, &ind, true);
- if (!var->array[0].value)
- var->array[0].value = dstring_newstr ();
- dstring_copystr (var->array[0].value, args[i]);
- i++;
- return i < argc;
- }
+ data.cbuf = cbuf;
+ data.argc = argc;
+ data.args = args;
+ data.i = 1;
+ data.zero = &zero;
+ llist_iterate (arglist, prepare_args_iterate, &data);
- i = 1; llist_iterate (arglist, LLIST_ICAST (iterate));
-
- var =
+ data.var =
GIB_Var_Get_Complex (&GIB_DATA (cbuf)->locals, &zero, argss,
- &ind, true);
- var->array = realloc (var->array, sizeof (struct gib_varray_s) * argc);
- memset (var->array + 1, 0, (argc - 1) * sizeof (struct gib_varray_s));
- var->size = argc;
- for (i = 0; i < argc; i++) {
- if (var->array[i].value)
- dstring_clearstr (var->array[i].value);
+ &data.ind, true);
+ data.var->array = realloc (data.var->array, sizeof (struct gib_varray_s) * argc);
+ memset (data.var->array + 1, 0, (argc - 1) * sizeof (struct gib_varray_s));
+ data.var->size = argc;
+ for (data.i = 0; data.i < argc; data.i++) {
+ if (data.var->array[data.i].value)
+ dstring_clearstr (data.var->array[data.i].value);
else
- var->array[i].value = dstring_newstr ();
- dstring_appendstr (var->array[i].value, args[i]);
+ data.var->array[data.i].value = dstring_newstr ();
+ dstring_appendstr (data.var->array[data.i].value, args[data.i]);
}
}
+struct prepare_args_d_data {
+ gib_var_t *var;
+ unsigned i, ind, argc;
+ hashtab_t **zero;
+ dstring_t **args;
+ cbuf_t *cbuf;
+};
+
+static qboolean
+iterate (void *data_, void *arg_, llist_node_t *node)
+{
+ char *arg = arg_;
+ struct prepare_args_d_data *data = data_;
+ data->var = GIB_Var_Get_Complex (&GIB_DATA(data->cbuf)->locals, data->zero,
+ arg, &data->ind, true);
+ if (!data->var->array[0].value)
+ data->var->array[0].value = dstring_newstr ();
+ dstring_copystr (data->var->array[0].value, data->args[data->i]->str);
+ data->i++;
+ return data->i < data->argc;
+}
+
static void
GIB_Function_Prepare_Args_D (cbuf_t * cbuf, dstring_t **args, unsigned int
argc, llist_t *arglist)
{
+ struct prepare_args_d_data data;
static hashtab_t *zero = 0;
- unsigned int i, ind;
- gib_var_t *var;
static char argss[] = "args";
- static qboolean
- iterate (char *arg, llist_node_t *node)
- {
- var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
- arg, &ind, true);
- if (!var->array[0].value)
- var->array[0].value = dstring_newstr ();
- dstring_copystr (var->array[0].value, args[i]->str);
- i++;
- return i < argc;
- }
-
- i = 1; llist_iterate (arglist, LLIST_ICAST (iterate));
-
- var =
+ data.cbuf = cbuf;
+ data.argc = argc;
+ data.args = args;
+ data.zero = &zero;
+ data.i = 1;
+ llist_iterate (arglist, iterate, &data);
+
+ data.var =
GIB_Var_Get_Complex (&GIB_DATA (cbuf)->locals, &zero, argss,
- &ind, true);
- var->array = realloc (var->array, sizeof (struct gib_varray_s) * argc);
- memset (var->array + 1, 0, (argc - 1) * sizeof (struct gib_varray_s));
- var->size = argc;
- for (i = 0; i < argc; i++) {
- if (var->array[i].value)
- dstring_clearstr (var->array[i].value);
+ &data.ind, true);
+ data.var->array = realloc (data.var->array, sizeof (struct gib_varray_s) * argc);
+ memset (data.var->array + 1, 0, (argc - 1) * sizeof (struct gib_varray_s));
+ data.var->size = argc;
+ for (data.i = 0; data.i < argc; data.i++) {
+ if (data.var->array[data.i].value)
+ dstring_clearstr (data.var->array[data.i].value);
else
- var->array[i].value = dstring_newstr ();
- dstring_appendstr (var->array[i].value, args[i]->str);
+ data.var->array[data.i].value = dstring_newstr ();
+ dstring_appendstr (data.var->array[data.i].value, args[data.i]->str);
}
}
games/quakeforge/patches/patch-an
+35
View File
@@ -0,0 +1,35 @@
$NetBSD: patch-an,v 1.2 2013/03/28 21:25:52 joerg Exp $
--- libs/gib/gib_thread.c.orig 2003-09-11 06:03:10.000000000 +0000
+++ libs/gib/gib_thread.c
@@ -86,19 +86,21 @@ GIB_Thread_Count (void)
return llist_size (gib_threads);
}
+static qboolean
+thread_exec_iterator (void *dummy, cbuf_t *cbuf, llist_node_t *node)
+{
+ if (GIB_DATA(cbuf)->program)
+ Cbuf_Execute_Stack (cbuf);
+ else
+ Cbuf_DeleteStack ((cbuf_t *) llist_remove (node));
+ return true;
+}
+
void
GIB_Thread_Execute (void)
{
- static qboolean iterator (cbuf_t *cbuf, llist_node_t *node)
- {
- if (GIB_DATA(cbuf)->program)
- Cbuf_Execute_Stack (cbuf);
- else
- Cbuf_DeleteStack ((cbuf_t *) llist_remove (node));
- return true;
- }
- llist_iterate (gib_threads, LLIST_ICAST (iterator));
+ llist_iterate (gib_threads, thread_exec_iterator, NULL);
}
void
games/quakeforge/patches/patch-ao
+13
View File
@@ -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
games/quakeforge/patches/patch-ap
+15
View File
@@ -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
games/quakeforge/patches/patch-aq
+22
View File
@@ -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
games/quakeforge/patches/patch-ar
+14
View File
@@ -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[])
{
games/quakeforge/patches/patch-as
+187
View File
@@ -0,0 +1,187 @@
$NetBSD: patch-as,v 1.2 2013/03/28 21:25:52 joerg Exp $
--- qw/source/cl_chat.c.orig 2003-07-18 06:27:26.000000000 +0000
+++ qw/source/cl_chat.c
@@ -63,16 +63,35 @@ CL_Ignore_Compare (const void *ele, cons
return *(int *)cmp == ((ignore_t *) ele)->uid;
}
+static qboolean
+ignore_sanity_iterator (void *dummy, void *ig_, llist_node_t *node)
+{
+ ignore_t *ig = ig_;
+ if (cl.players[ig->slot].userid != ig->uid) // We got out of sync somehow
+ llist_remove (node);
+ return true;
+}
+
static void
CL_Ignore_Sanity_Check (void)
{
- static 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);
- return true;
- }
- llist_iterate (ignore_list, LLIST_ICAST (iterator));
+ llist_iterate (ignore_list, ignore_sanity_iterator, NULL);
+}
+
+static qboolean
+live_iterator (void *dummy, void *ig_, llist_node_t *node)
+{
+ ignore_t *ig = ig_;
+ Sys_Printf ("%5i - %s\n", ig->uid, Info_ValueForKey (cl.players[ig->slot].userinfo, "name"));
+ return true;
+}
+
+static qboolean
+dead_iterator (void *dummy, void *ig_, llist_node_t *node)
+{
+ ignore_t *ig = ig_;
+ Sys_Printf ("%s\n", ig->lastname);
+ return true;
}
static void
@@ -80,27 +99,17 @@ CL_Ignore_f (void)
{
CL_Ignore_Sanity_Check ();
if (Cmd_Argc () == 1) {
- static 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)
- {
- Sys_Printf ("%s\n", ig->lastname);
- return true;
- }
Sys_Printf (
"Users ignored by user id\n"
"------------------------\n"
);
- llist_iterate (ignore_list, LLIST_ICAST (live_iterator));
+ llist_iterate (ignore_list, live_iterator, NULL);
Sys_Printf (
"\n"
"Users ignored by name (not currently connected)\n"
"-----------------------------------------------\n"
);
- llist_iterate (dead_ignore_list, LLIST_ICAST (dead_iterator));
+ llist_iterate (dead_ignore_list, dead_iterator, NULL);
} else if (Cmd_Argc () == 2) {
int i, uid = atoi (Cmd_Argv (1));
@@ -139,27 +148,39 @@ CL_Unignore_f (void)
}
}
-qboolean
-CL_Chat_Allow_Message (const char *str)
+struct allow_msg_data {
+ const char *str;
+ qboolean allowed;
+ dstring_t *test;
+};
+
+static qboolean
+allow_msg_data_iterator (void *data_, void *ig_, llist_node_t *node)
{
- dstring_t *test = dstring_newstr ();
- qboolean allowed = true;
+ struct allow_msg_data *data = data_;
+ ignore_t *ig = ig_;
- static 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);
- return true;
- }
- dsprintf (test, "%s: ", Info_ValueForKey (cl.players[ig->slot].userinfo, "name"));
- if (!strncmp (test->str, str, sizeof (test->str))) {
- return allowed = false;
- } else
- return true;
+ if (cl.players[ig->slot].userid != ig->uid) { // We got out of sync somehow
+ llist_remove (node);
+ return true;
}
+ dsprintf (data->test, "%s: ", Info_ValueForKey (cl.players[ig->slot].userinfo, "name"));
+ if (!strncmp (data->test->str, data->str, sizeof (*data->test->str))) {
+ return data->allowed = false;
+ } else
+ return true;
+}
- llist_iterate (ignore_list, LLIST_ICAST (iterator));
- return allowed;
+qboolean
+CL_Chat_Allow_Message (const char *str)
+{
+ struct allow_msg_data data;
+ data.allowed = true;
+ data.str = str;
+ data.test = dstring_newstr ();
+
+ llist_iterate (ignore_list, allow_msg_data_iterator, &data);
+ return data.allowed;
}
void
@@ -178,25 +199,36 @@ CL_Chat_User_Disconnected (int uid)
}
}
+struct check_name_data {
+ ignore_t *found;
+ const char *name;
+};
+
+static qboolean
+check_name_iterator (void *data_, void *ig_, llist_node_t *node)
+{
+ struct check_name_data *data = data_;
+ ignore_t *ig = ig_;
+ if (!strcmp (ig->lastname, data->name)) {
+ data->found = ig;
+ return false;
+ } else
+ return true;
+}
+
void
CL_Chat_Check_Name (const char *name, int slot)
{
- ignore_t *found = 0;
-
- static qboolean iterator (ignore_t *ig, llist_node_t *node)
- {
- if (!strcmp (ig->lastname, name)) {
- found = ig;
- return false;
- } else
- return true;
- }
- llist_iterate (dead_ignore_list, LLIST_ICAST (iterator));
- if (found) {
- found->slot = slot;
- found->uid = cl.players[slot].userid;
- llist_append (ignore_list, llist_remove (llist_getnode (dead_ignore_list, found)));
- Sys_Printf ("User %i (%s) is using an ignored name. Now ignoring by user id...\n", found->uid, found->lastname);
+ struct check_name_data data;
+ data.found = 0;
+ data.name = name;
+
+ llist_iterate (dead_ignore_list, check_name_iterator, &data);
+ if (data.found) {
+ data.found->slot = slot;
+ data.found->uid = cl.players[slot].userid;
+ llist_append (ignore_list, llist_remove (llist_getnode (dead_ignore_list, data.found)));
+ Sys_Printf ("User %i (%s) is using an ignored name. Now ignoring by user id...\n", data.found->uid, data.found->lastname);
}
}
games/quakeforge/patches/patch-at
+22
View File
@@ -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
games/quakeforge/patches/patch-au
+14
View File
@@ -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[])
{
games/quakeforge/patches/patch-av
+12
View File
@@ -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
games/quakeforge/patches/patch-aw
+12
View File
@@ -0,0 +1,12 @@
$NetBSD: patch-aw,v 1.1 2008/01/23 05:30:59 tnn Exp $
--- libs/net/nc/net_udp6.c.orig 2004-04-13 01:38:08.000000000 +0200
+++ libs/net/nc/net_udp6.c
@@ -123,6 +123,7 @@ static __attribute__ ((unused)) const ch
netadr_t net_from;
netadr_t net_local_adr;
+netadr_t net_loopback_adr;
int net_socket;
static sizebuf_t _net_message_message;
games/quakeforge/patches/patch-include_QF_llist.h
+22
View File
@@ -0,0 +1,22 @@
$NetBSD: patch-include_QF_llist.h,v 1.1 2013/03/28 21:25:52 joerg Exp $
--- include/QF/llist.h.orig 2013-03-28 15:10:12.000000000 +0000
+++ include/QF/llist.h
@@ -44,7 +44,7 @@ typedef struct llist_s {
void *userdata;
} llist_t;
-typedef qboolean (*llist_iterator_t)(void *element, llist_node_t *node);
+typedef qboolean (*llist_iterator_t)(void *data, void *element, llist_node_t *node);
#define LLIST_ICAST(x) (llist_iterator_t)(x)
#define LLIST_DATA(node, type) ((type *)((node)->data))
@@ -59,7 +59,7 @@ llist_node_t *llist_insertafter (llist_n
llist_node_t *llist_insertbefore (llist_node_t *ref, void *element);
void *llist_remove (llist_node_t *ref);
unsigned int llist_size (llist_t *llist);
-void llist_iterate (llist_t *list, llist_iterator_t iterate);
+void llist_iterate (llist_t *list, llist_iterator_t iterate, void *data);
void *llist_find (llist_t *list, void *comparison);
llist_node_t *llist_findnode (llist_t *list, void *comparison);
void *llist_createarray (llist_t *list, size_t esize);
games/quakeforge/patches/patch-include_QF_mathlib.h
+44
View File
@@ -0,0 +1,44 @@
$NetBSD: patch-include_QF_mathlib.h,v 1.3 2013/06/23 19:54:42 dholland Exp $
--- include/QF/mathlib.h.orig 2013-03-28 15:01:01.000000000 +0000
+++ include/QF/mathlib.h
@@ -255,11 +255,12 @@ void QuatMult (const quat_t v1, const qu
(PlaneDist (point, plane) - (plane)->dist)
extern mplane_t * const frustum;
-extern inline qboolean R_CullBox (const vec3_t mins, const vec3_t maxs);
-extern inline qboolean R_CullSphere (const vec3_t origin, const float radius);
-extern inline float VectorNormalize (vec3_t v); // returns vector length
#ifndef IMPLEMENT_R_Cull
+#if defined(__clang__) || !defined(__GNUC__) || defined(__GNC_STDC_INLINE__)
+inline
+#else
extern inline
+#endif
#endif
qboolean
R_CullBox (const vec3_t mins, const vec3_t maxs)
@@ -273,7 +274,11 @@ R_CullBox (const vec3_t mins, const vec3
}
#ifndef IMPLEMENT_R_Cull
+#if defined(__clang__) || !defined(__GNUC__) || defined(__GNC_STDC_INLINE__)
+inline
+#else
extern inline
+#endif
#endif
qboolean
R_CullSphere (const vec3_t origin, const float radius)
@@ -291,7 +296,11 @@ R_CullSphere (const vec3_t origin, const
}
#ifndef IMPLEMENT_VectorNormalize
+#if defined(__clang__) || !defined(__GNUC__) || defined(__GNC_STDC_INLINE__)
+inline
+#else
extern inline
+#endif
#endif
float
VectorNormalize (vec3_t v)
games/quakeforge/patches/patch-include_r__dynamic.h
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-include_r__dynamic.h,v 1.1 2013/03/28 21:25:52 joerg Exp $
--- include/r_dynamic.h.orig 2013-03-28 15:51:46.000000000 +0000
+++ include/r_dynamic.h
@@ -79,7 +79,7 @@ void R_Particles_Init_Cvars (void);
void R_InitBubble (void);
void R_InitParticles (void);
-inline void R_ClearParticles (void);
+void R_ClearParticles (void);
void R_DrawParticles (void);
struct cvar_s;
void R_MaxParticlesCheck (struct cvar_s *r_particles,
games/quakeforge/patches/patch-include_r__local.h
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-include_r__local.h,v 1.1 2013/03/28 21:25:52 joerg Exp $
--- include/r_local.h.orig 2013-03-28 15:51:51.000000000 +0000
+++ include/r_local.h
@@ -255,7 +255,7 @@ qboolean R_AliasCheckBBox (void);
void R_DrawParticles (void);
void R_InitParticles (void);
-inline void R_ClearParticles (void);
+void R_ClearParticles (void);
void R_ReadPointFile_f (void);
void R_InitSprites (void);
void R_SurfacePatch (void);
games/quakeforge/patches/patch-libs_util_llist.c
+22
View File
@@ -0,0 +1,22 @@
$NetBSD: patch-libs_util_llist.c,v 1.1 2013/03/28 21:25:52 joerg Exp $
--- libs/util/llist.c.orig 2013-03-28 15:10:33.000000000 +0000
+++ libs/util/llist.c
@@ -215,7 +215,7 @@ llist_size (llist_t *llist)
}
void
-llist_iterate (llist_t *list, llist_iterator_t iterate)
+llist_iterate (llist_t *list, llist_iterator_t iterate, void *data)
{
llist_node_t *node;
@@ -223,7 +223,7 @@ llist_iterate (llist_t *list, llist_iter
return;
for (node = list->start; node; node = list->iter) {
list->iter = node->next;
- if (!iterate (node->data, node))
+ if (!iterate (data, node->data, node))
break;
}
list->iter = 0;