diff options
| -rw-r--r-- | games/quakeforge/Makefile | 11 | ||||
| -rw-r--r-- | games/quakeforge/PLIST | 70 | ||||
| -rw-r--r-- | games/quakeforge/distinfo | 16 | ||||
| -rw-r--r-- | games/quakeforge/patches/patch-ab | 12 | ||||
| -rw-r--r-- | games/quakeforge/patches/patch-ac | 14 | ||||
| -rw-r--r-- | games/quakeforge/patches/patch-ad | 18 | ||||
| -rw-r--r-- | games/quakeforge/patches/patch-ae | 10 | ||||
| -rw-r--r-- | games/quakeforge/patches/patch-af | 18 |
8 files changed, 95 insertions, 74 deletions
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 159f73f502b..73584c51186 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2004/04/18 03:03:59 snj Exp $ +# $NetBSD: Makefile,v 1.3 2004/08/25 20:26:17 snj Exp $ -DISTNAME= quakeforge-0.5.4 +DISTNAME= quakeforge-0.5.5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quake/} @@ -11,6 +11,7 @@ COMMENT= Improved Quake engine BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison CONFIGURE_ARGS+= --with-cpp="${CPP} %d %i %o" +CONFIGURE_ARGS+= --disable-ogg CONFIGURE_ARGS+= --disable-xmms GNU_CONFIGURE= YES USE_BUILDLINK3= YES @@ -32,6 +33,12 @@ BUILD_DEFS+= USE_INET6 CONFIGURE_ARGS+= --without-ipv6 .endif +pre-install: + ${INSTALL_PROGRAM_DIR} ${PREFIX}/include/QF/plugin + ${INSTALL_PROGRAM_DIR} ${PREFIX}/include/QF/ruamoko/gui + .include "../../devel/SDL/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/quakeforge/PLIST b/games/quakeforge/PLIST index 9934aa4165e..fdf24868dea 100644 --- a/games/quakeforge/PLIST +++ b/games/quakeforge/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/17 03:04:03 snj Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/08/25 20:26:17 snj Exp $ bin/bsp2img bin/hw-master bin/nq-glx @@ -10,12 +10,13 @@ bin/nq-x11 bin/pak bin/qfbsp bin/qfcc -bin/qfdefs bin/qflight bin/qfmodelgen +bin/qfpreqcc bin/qfprogs bin/qfvis bin/qfwavinfo +bin/qtv bin/qw-client-glx bin/qw-client-sdl bin/qw-client-sdl32 @@ -23,22 +24,8 @@ bin/qw-client-sgl bin/qw-client-x11 bin/qw-master bin/qw-server +bin/wad bin/zpak -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 @@ -55,18 +42,21 @@ 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 @@ -77,6 +67,7 @@ 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 @@ -90,13 +81,14 @@ 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/InputLine.h +include/QF/ruamoko/List.h +include/QF/ruamoko/ListNode.h include/QF/ruamoko/Object.h -include/QF/ruamoko/Point.h -include/QF/ruamoko/Rect.h -include/QF/ruamoko/Size.h +include/QF/ruamoko/Stack.h include/QF/ruamoko/cbuf.h include/QF/ruamoko/cmd.h include/QF/ruamoko/crudefile.h @@ -106,6 +98,15 @@ 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 @@ -115,9 +116,11 @@ 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 @@ -128,7 +131,6 @@ include/QF/sound.h include/QF/spritegn.h include/QF/sys.h include/QF/teamplay.h -include/QF/texture.h include/QF/tga.h include/QF/uint32.h include/QF/va.h @@ -136,6 +138,7 @@ 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.a lib/libQFcd.la @@ -147,11 +150,6 @@ lib/libQFconsole.la lib/libQFconsole.so lib/libQFconsole.so.1 lib/libQFconsole.so.1.0 -lib/libQFcsqc.a -lib/libQFcsqc.la -lib/libQFcsqc.so -lib/libQFcsqc.so.1 -lib/libQFcsqc.so.1.0 lib/libQFgamecode.a lib/libQFgamecode.la lib/libQFgamecode.so @@ -167,6 +165,11 @@ lib/libQFgib.la lib/libQFgib.so lib/libQFgib.so.1 lib/libQFgib.so.1.0 +lib/libQFimage.a +lib/libQFimage.la +lib/libQFimage.so +lib/libQFimage.so.1 +lib/libQFimage.so.1.0 lib/libQFjs.a lib/libQFjs.la lib/libQFjs.so @@ -197,6 +200,11 @@ lib/libQFrenderer_sw32.la lib/libQFrenderer_sw32.so lib/libQFrenderer_sw32.so.1 lib/libQFrenderer_sw32.so.1.0 +lib/libQFruamoko.a +lib/libQFruamoko.la +lib/libQFruamoko.so +lib/libQFruamoko.so.1 +lib/libQFruamoko.so.1.0 lib/libQFsound.a lib/libQFsound.la lib/libQFsound.so @@ -207,6 +215,9 @@ lib/libQFutil.la lib/libQFutil.so lib/libQFutil.so.1 lib/libQFutil.so.1.0 +lib/quakeforge/cd_file.a +lib/quakeforge/cd_file.la +lib/quakeforge/cd_file.so lib/quakeforge/cd_sdl.a lib/quakeforge/cd_sdl.la lib/quakeforge/cd_sdl.so @@ -233,17 +244,20 @@ lib/quakeforge/snd_render_default.la 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 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 @dirrm share/games/quakeforge/QF @dirrm share/games/quakeforge @dirrm lib/ruamoko @dirrm lib/quakeforge +@dirrm include/QF/ruamoko/gui @dirrm include/QF/ruamoko @dirrm include/QF/plugin -@dirrm include/QF/GL @dirrm include/QF diff --git a/games/quakeforge/distinfo b/games/quakeforge/distinfo index 71572612b7b..c8f861408bc 100644 --- a/games/quakeforge/distinfo +++ b/games/quakeforge/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.2 2004/07/14 00:17:58 hubertf Exp $ +$NetBSD: distinfo,v 1.3 2004/08/25 20:26:17 snj Exp $ -SHA1 (quakeforge-0.5.4.tar.gz) = 9ba39f486f4faee5e7885631ffa8c5f9c512137d -Size (quakeforge-0.5.4.tar.gz) = 2391110 bytes +SHA1 (quakeforge-0.5.5.tar.gz) = 3ceb229b3d777b6c5e0cb1530b4547b20737f402 +Size (quakeforge-0.5.5.tar.gz) = 2659432 bytes SHA1 (patch-aa) = d54d4784c5832a00382946d78929cf618696b898 -SHA1 (patch-ab) = 0f6dd69d54e634834ed5144053199a01cc1cc0fc -SHA1 (patch-ac) = 0c1a0daaa3d6af7689ec5f1af647fdf86f9cff15 -SHA1 (patch-ad) = 7112813b9ed50d76a833b36ddb39603d08a3a4c8 -SHA1 (patch-ae) = f0b977daa9698777fb2d8f5aa1f447f3d15ac81b -SHA1 (patch-af) = 0f5cbccdf99424aec33afa84ebdb6c9b597d07e8 +SHA1 (patch-ab) = f1abe7e12fd956acb18ed4c95db97e5d86eed8b5 +SHA1 (patch-ac) = fd8daa6dc4a32418c1c31790f9b969db43746e8f +SHA1 (patch-ad) = a6d824831a5444f92c7b3ab396ea31ef52503dea +SHA1 (patch-ae) = aa0431df430f4fc08da32550f7fc5a156096bb43 +SHA1 (patch-af) = 15c725bc5c99f558518a1b7ebb219b8b20b19926 diff --git a/games/quakeforge/patches/patch-ab b/games/quakeforge/patches/patch-ab index 9bdf8f278a5..f9335b26c5d 100644 --- a/games/quakeforge/patches/patch-ab +++ b/games/quakeforge/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/04/17 03:04:03 snj Exp $ +$NetBSD: patch-ab,v 1.2 2004/08/25 20:26:18 snj Exp $ ---- libs/audio/targets/Makefile.in.orig 2003-12-28 00:08:57.000000000 -0800 -+++ libs/audio/targets/Makefile.in 2003-12-28 00:09:28.000000000 -0800 -@@ -353,7 +353,7 @@ +--- 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) diff --git a/games/quakeforge/patches/patch-ac b/games/quakeforge/patches/patch-ac index f9cc4c5c747..aab11feceed 100644 --- a/games/quakeforge/patches/patch-ac +++ b/games/quakeforge/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2004/07/14 00:17:58 hubertf Exp $ +$NetBSD: patch-ac,v 1.2 2004/08/25 20:26:18 snj Exp $ ---- ruamoko/cl_menu/Makefile.am.orig 2003-06-04 22:32:10.000000000 +0200 -+++ ruamoko/cl_menu/Makefile.am -@@ -9,7 +9,7 @@ QFCC_DEP=$(top_builddir)/tools/qfcc/sour +--- 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 @@ -11,10 +11,10 @@ $NetBSD: patch-ac,v 1.1 2004/07/14 00:17:58 hubertf Exp $ if HAVE_ZLIB GZ=.gz else -@@ -44,7 +44,7 @@ menu_obj=$(addsuffix .qfo,$(basename $(m +@@ -40,7 +40,7 @@ menu_obj=$(addsuffix .qfo,$(basename $(m - menu.dat$(GZ): $(menu_obj) $(QFCC_DEP) ../lib/libgui.a ../lib/libcsqc.a ../lib/libr.a - $(QFCC) $(QCFLAGS) -p $(STRIP) -o menu.dat $(menu_obj) ../lib/libgui.a ../lib/libcsqc.a ../lib/libr.a + 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) diff --git a/games/quakeforge/patches/patch-ad b/games/quakeforge/patches/patch-ad index 50e5c61a19e..1950c0bba90 100644 --- a/games/quakeforge/patches/patch-ad +++ b/games/quakeforge/patches/patch-ad @@ -1,20 +1,20 @@ -$NetBSD: patch-ad,v 1.1 2004/07/14 00:17:58 hubertf Exp $ +$NetBSD: patch-ad,v 1.2 2004/08/25 20:26:18 snj Exp $ ---- ruamoko/cl_menu/Makefile.in.orig 2003-07-18 04:25:13.000000000 +0200 -+++ ruamoko/cl_menu/Makefile.in -@@ -332,7 +332,7 @@ QFCC_DEP = $(top_builddir)/tools/qfcc/so +--- 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_TRUE@GZ = .gz @HAVE_ZLIB_FALSE@GZ = + @HAVE_ZLIB_TRUE@GZ = .gz + menu_data = menu.dat$(GZ) +@@ -571,7 +571,7 @@ uninstall-am: uninstall-info-am uninstal -@@ -537,7 +537,7 @@ uninstall-am: uninstall-info-am uninstal - - menu.dat$(GZ): $(menu_obj) $(QFCC_DEP) ../lib/libgui.a ../lib/libcsqc.a ../lib/libr.a - $(QFCC) $(QCFLAGS) -p $(STRIP) -o menu.dat $(menu_obj) ../lib/libgui.a ../lib/libcsqc.a ../lib/libr.a + 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. diff --git a/games/quakeforge/patches/patch-ae b/games/quakeforge/patches/patch-ae index f5eb5464cd5..92afc6177b4 100644 --- a/games/quakeforge/patches/patch-ae +++ b/games/quakeforge/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.1 2004/07/14 00:17:58 hubertf Exp $ +$NetBSD: patch-ae,v 1.2 2004/08/25 20:26:18 snj Exp $ ---- ruamoko/game/Makefile.am.orig 2003-02-07 22:46:42.000000000 +0100 -+++ ruamoko/game/Makefile.am +--- 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 @@ -13,8 +13,8 @@ $NetBSD: patch-ae,v 1.1 2004/07/14 00:17:58 hubertf Exp $ else @@ -38,7 +38,7 @@ game_obj=$(addsuffix .qfo,$(basename $(g - game.dat$(GZ): $(game_obj) ../lib/libr.a - $(QFCC) $(QCFLAGS) -p $(STRIP) -o game.dat $(game_obj) ../lib/libr.a + 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) diff --git a/games/quakeforge/patches/patch-af b/games/quakeforge/patches/patch-af index 7dabccc2b34..d9cf6a7c6ad 100644 --- a/games/quakeforge/patches/patch-af +++ b/games/quakeforge/patches/patch-af @@ -1,20 +1,20 @@ -$NetBSD: patch-af,v 1.1 2004/07/14 00:17:58 hubertf Exp $ +$NetBSD: patch-af,v 1.2 2004/08/25 20:26:18 snj Exp $ ---- ruamoko/game/Makefile.in.orig 2003-07-18 04:25:14.000000000 +0200 -+++ ruamoko/game/Makefile.in -@@ -332,7 +332,7 @@ QFCC_DEP = $(top_builddir)/tools/qfcc/so +--- 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_TRUE@GZ = .gz @HAVE_ZLIB_FALSE@GZ = + @HAVE_ZLIB_TRUE@GZ = .gz + @BUILD_RUAMOKO_FALSE@data = +@@ -543,7 +543,7 @@ uninstall-am: uninstall-info-am -@@ -506,7 +506,7 @@ uninstall-am: uninstall-info-am - - game.dat$(GZ): $(game_obj) ../lib/libr.a - $(QFCC) $(QCFLAGS) -p $(STRIP) -o game.dat $(game_obj) ../lib/libr.a + 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. |