From b555701e78966f83fae9deccec322d23d5d4e1de Mon Sep 17 00:00:00 2001 From: blymn Date: Thu, 2 Jun 2005 14:24:04 +0000 Subject: Updated to version 2.0.2 of bzflag: * many many bug fixes * network protocol version updated * new game modes added --- games/bzflag/MESSAGE | 11 +++++ games/bzflag/Makefile | 15 ++++--- games/bzflag/PLIST | 80 ++++++++++++++++++++++++++++++------ games/bzflag/distinfo | 17 +++----- games/bzflag/patches/patch-aa | 13 ------ games/bzflag/patches/patch-ab | 22 ---------- games/bzflag/patches/patch-ad | 25 ++++++------ games/bzflag/patches/patch-ae | 95 ------------------------------------------- games/bzflag/patches/patch-af | 11 ----- games/bzflag/patches/patch-ag | 24 ----------- games/bzflag/patches/patch-ah | 42 ------------------- games/bzflag/patches/patch-an | 14 +++++++ 12 files changed, 119 insertions(+), 250 deletions(-) create mode 100644 games/bzflag/MESSAGE delete mode 100644 games/bzflag/patches/patch-aa delete mode 100644 games/bzflag/patches/patch-ab delete mode 100644 games/bzflag/patches/patch-ae delete mode 100644 games/bzflag/patches/patch-af delete mode 100644 games/bzflag/patches/patch-ag delete mode 100644 games/bzflag/patches/patch-ah create mode 100644 games/bzflag/patches/patch-an (limited to 'games/bzflag') diff --git a/games/bzflag/MESSAGE b/games/bzflag/MESSAGE new file mode 100644 index 00000000000..08eaae8c024 --- /dev/null +++ b/games/bzflag/MESSAGE @@ -0,0 +1,11 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2005/06/02 14:24:04 blymn Exp $ + +If your system does not have hardware-accelerated OpenGL, you +may wish to consider adding this line: + + set useBitmapFontRenderer 1 + +to your configuration file (~/.bzf/2.0/config.cfg), to improve +your framerate considerably. +=========================================================================== diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index ae60974506b..4d32ce7174b 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:49 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/02 14:24:04 blymn Exp $ -DISTNAME= bzflag-1.10.6.20040515 -PKGNAME= ${DISTNAME:S/.20040515//} -PKGREVISION= 2 +DISTNAME= bzflag-2.0.2.20050318 +PKGNAME= ${DISTNAME:S/.20050318//} +PKGREVISION= 0 CATEGORIES= games x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bzflag/} -MAINTAINER= blymn@baea.com.au +MAINTAINER= dtremenak@users.sourceforge.net HOMEPAGE= http://www.bzflag.org/ COMMENT= OpenGL tank game @@ -15,6 +15,8 @@ USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_NCURSES= # resize_term() USE_PERL5= build +USE_X11= yes +CPPFLAGS+= -I/usr/pkg/include -I${X11BASE}/include .include "../../mk/bsd.prefs.mk" @@ -30,10 +32,11 @@ CONFIGURE_ARGS+= --with-ncurses .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../www/curl/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.include "../../devel/SDL/buildlink3.mk" -.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/bzflag/PLIST b/games/bzflag/PLIST index 5d401f84173..3c48ded780f 100644 --- a/games/bzflag/PLIST +++ b/games/bzflag/PLIST @@ -1,14 +1,13 @@ -@comment $NetBSD: PLIST,v 1.5 2004/06/07 02:29:07 snj Exp $ +@comment $NetBSD: PLIST,v 1.6 2005/06/02 14:24:04 blymn Exp $ bin/bzadmin bin/bzflag -bin/bzfrelay bin/bzfs +man/man5/bzw.5 man/man6/bzadmin.6 man/man6/bzflag.6 -man/man6/bzfls.6 man/man6/bzfquery.6 -man/man6/bzfrelay.6 man/man6/bzfs.6 +share/bzflag/blade.png share/bzflag/blue_basetop.png share/bzflag/blue_basewall.png share/bzflag/blue_bolt.png @@ -16,33 +15,81 @@ share/bzflag/blue_laser.png share/bzflag/blue_super_bolt.png share/bzflag/blue_tank.png share/bzflag/boom.wav +share/bzflag/bounce.wav share/bzflag/boxwall.png +share/bzflag/bubble.png share/bzflag/burrow.wav +share/bzflag/bzflag-256x256.png +share/bzflag/bzflag-32x32.xpm +share/bzflag/bzflag-48x48.png share/bzflag/caution.png share/bzflag/clouds.png share/bzflag/explode1.png +share/bzflag/explode2.png share/bzflag/explosion.wav share/bzflag/fire.wav -share/bzflag/fixedbr.png -share/bzflag/fixedmr.png share/bzflag/flag.png share/bzflag/flag_alert.wav share/bzflag/flag_drop.wav share/bzflag/flag_grab.wav share/bzflag/flag_lost.wav share/bzflag/flag_won.wav +share/bzflag/flap.wav +share/bzflag/fonts/LuxiMono_12.fmt +share/bzflag/fonts/LuxiMono_12.png +share/bzflag/fonts/LuxiMono_16.fmt +share/bzflag/fonts/LuxiMono_16.png +share/bzflag/fonts/LuxiMono_32.fmt +share/bzflag/fonts/LuxiMono_32.png +share/bzflag/fonts/LuxiMono_6.fmt +share/bzflag/fonts/LuxiMono_6.png +share/bzflag/fonts/LuxiMono_8.fmt +share/bzflag/fonts/LuxiMono_8.png +share/bzflag/fonts/ProFont_12.fmt +share/bzflag/fonts/ProFont_12.png +share/bzflag/fonts/ProFont_16.fmt +share/bzflag/fonts/ProFont_16.png +share/bzflag/fonts/ProFont_6.fmt +share/bzflag/fonts/ProFont_6.png +share/bzflag/fonts/ProFont_8.fmt +share/bzflag/fonts/ProFont_8.png +share/bzflag/fonts/TogaSansBold_12.fmt +share/bzflag/fonts/TogaSansBold_12.png +share/bzflag/fonts/TogaSansBold_16.fmt +share/bzflag/fonts/TogaSansBold_16.png +share/bzflag/fonts/TogaSansBold_32.fmt +share/bzflag/fonts/TogaSansBold_32.png +share/bzflag/fonts/TogaSansBold_6.fmt +share/bzflag/fonts/TogaSansBold_6.png +share/bzflag/fonts/TogaSansBold_8.fmt +share/bzflag/fonts/TogaSansBold_8.png +share/bzflag/fonts/TogaSerifBold_12.fmt +share/bzflag/fonts/TogaSerifBold_12.png +share/bzflag/fonts/TogaSerifBold_16.fmt +share/bzflag/fonts/TogaSerifBold_16.png +share/bzflag/fonts/TogaSerifBold_32.fmt +share/bzflag/fonts/TogaSerifBold_32.png +share/bzflag/fonts/VeraMonoBold_12.fmt +share/bzflag/fonts/VeraMonoBold_12.png +share/bzflag/fonts/VeraMonoBold_16.fmt +share/bzflag/fonts/VeraMonoBold_16.png +share/bzflag/fonts/VeraMonoBold_6.fmt +share/bzflag/fonts/VeraMonoBold_6.png +share/bzflag/fonts/VeraMonoBold_8.fmt +share/bzflag/fonts/VeraMonoBold_8.png +share/bzflag/fonts/readme +share/bzflag/frog.png share/bzflag/green_basetop.png share/bzflag/green_basewall.png share/bzflag/green_bolt.png share/bzflag/green_laser.png share/bzflag/green_super_bolt.png share/bzflag/green_tank.png -share/bzflag/helvbi.png -share/bzflag/helvbr.png share/bzflag/hunt.wav share/bzflag/hunt_select.wav share/bzflag/hunter_tank.png share/bzflag/jump.wav +share/bzflag/jumpjets.png share/bzflag/killteam.wav share/bzflag/l10n/ISO-639-2_values_8bits.txt share/bzflag/l10n/bzflag_cs_CZ.po @@ -54,6 +101,7 @@ share/bzflag/l10n/bzflag_es.po share/bzflag/l10n/bzflag_fr.po share/bzflag/l10n/bzflag_it.po share/bzflag/l10n/bzflag_kg.po +share/bzflag/l10n/bzflag_lt.po share/bzflag/l10n/bzflag_nl.po share/bzflag/l10n/bzflag_pt.po share/bzflag/l10n/bzflag_sv.po @@ -62,18 +110,19 @@ share/bzflag/land.wav share/bzflag/laser.wav share/bzflag/lock.wav share/bzflag/menu_arrow.png +share/bzflag/mesh.png +share/bzflag/message_admin.wav share/bzflag/message_private.wav share/bzflag/message_team.wav share/bzflag/missile.png share/bzflag/missile.wav +share/bzflag/moon.png share/bzflag/mountain1.png share/bzflag/mountain2.png share/bzflag/mountain3.png -share/bzflag/mountain4.png -share/bzflag/mountain5.png -share/bzflag/mountain6.png share/bzflag/phantom.wav share/bzflag/pop.wav +share/bzflag/puddle.png share/bzflag/purple_basetop.png share/bzflag/purple_basewall.png share/bzflag/purple_bolt.png @@ -85,6 +134,8 @@ share/bzflag/rabbit_bolt.png share/bzflag/rabbit_laser.png share/bzflag/rabbit_super_bolt.png share/bzflag/rabbit_tank.png +share/bzflag/radar.png +share/bzflag/raindrop.png share/bzflag/red_basetop.png share/bzflag/red_basewall.png share/bzflag/red_bolt.png @@ -98,16 +149,19 @@ share/bzflag/rogue_super_bolt.png share/bzflag/rogue_tank.png share/bzflag/roof.png share/bzflag/shock.wav +share/bzflag/snowflake.png share/bzflag/std_ground.png share/bzflag/steamroller.wav share/bzflag/teamgrab.wav +share/bzflag/telelink.png share/bzflag/teleport.wav +share/bzflag/tetrawall.png share/bzflag/thief.png share/bzflag/thief.wav -share/bzflag/timesbi.png -share/bzflag/timesbr.png share/bzflag/title.png share/bzflag/wall.png +share/bzflag/water.png share/bzflag/zone_ground.png @dirrm share/bzflag/l10n +@dirrm share/bzflag/fonts @dirrm share/bzflag diff --git a/games/bzflag/distinfo b/games/bzflag/distinfo index 227117ce05e..8c9fa7c477b 100644 --- a/games/bzflag/distinfo +++ b/games/bzflag/distinfo @@ -1,12 +1,7 @@ -$NetBSD: distinfo,v 1.8 2005/03/16 12:41:51 rillig Exp $ +$NetBSD: distinfo,v 1.9 2005/06/02 14:24:04 blymn Exp $ -SHA1 (bzflag-1.10.6.20040515.tar.gz) = 608b99791daf1236239102a50d3e6967f0d4f790 -RMD160 (bzflag-1.10.6.20040515.tar.gz) = cacbd25a093a1f52e1a6654d94cff831ef79554a -Size (bzflag-1.10.6.20040515.tar.gz) = 4183614 bytes -SHA1 (patch-aa) = 05df40eb0fbb7dbab583434f25709cb815469393 -SHA1 (patch-ab) = 4c5cf621c5f66768b61669087373e74233d179ab -SHA1 (patch-ad) = c7d9cc323c60477beab3e2826db1f89b1f9fa1b4 -SHA1 (patch-ae) = 8935c9b8b24fee942460b3186ac0797bdbaf921a -SHA1 (patch-af) = 8957feb16144cbb38436cd1f77358d50fb93f66b -SHA1 (patch-ag) = 432decad5019e6d7901670702970cd1c063e0613 -SHA1 (patch-ah) = d0fcedef298246ca7e020f43494755124c5e4f37 +SHA1 (bzflag-2.0.2.20050318.tar.gz) = 70dbcf8d6714997e005e36f3708d0dcca339db87 +RMD160 (bzflag-2.0.2.20050318.tar.gz) = 7d8932c5c13e76a9b4be4e9bda3fafa50514cfd9 +Size (bzflag-2.0.2.20050318.tar.gz) = 8770757 bytes +SHA1 (patch-ad) = 75e49c8e78e421f5b495a49a13ac2cdc51ef85e1 +SHA1 (patch-an) = 56922300cf35435e153545c71d8edd080850a5bc diff --git a/games/bzflag/patches/patch-aa b/games/bzflag/patches/patch-aa deleted file mode 100644 index ea1798715a1..00000000000 --- a/games/bzflag/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2003/12/13 10:32:53 xtraeme Exp $ - ---- include/common.h.orig 2003-12-13 10:38:57.000000000 +0100 -+++ include/common.h 2003-12-13 10:41:43.000000000 +0100 -@@ -45,7 +45,7 @@ - #endif - - // Might we be BSDish? sys/param.h has BSD defined if so --#if (defined(__unix__) || defined(unix) || defined(__APPLE__)) && !defined(USG) -+#if defined(__APPLE__) || !defined(USG) - #include - #endif - diff --git a/games/bzflag/patches/patch-ab b/games/bzflag/patches/patch-ab deleted file mode 100644 index 9c1b39d9772..00000000000 --- a/games/bzflag/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2003/12/13 10:32:53 xtraeme Exp $ - ---- include/network.h.orig 2003-12-13 10:57:47.000000000 +0100 -+++ include/network.h 2003-12-13 10:58:05.000000000 +0100 -@@ -46,7 +46,7 @@ - #include - #include - #include --#if defined(_old_linux_) || (!defined(__linux__) && !defined(sun) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(macintosh) && !defined(__BEOS__)) -+#if defined(_old_linux_) || (!defined(__linux__) && !defined(sun) && !defined(BSD) && !defined(__APPLE__) && !defined(macintosh) && !defined(__BEOS__)) - #include - #endif - -@@ -72,7 +72,7 @@ - #define SSOType void* - #endif - --#if defined(__FreeBSD__) || defined(sun) -+#if defined(BSD) || defined(sun) - #define AddrLen socklen_t - #endif - diff --git a/games/bzflag/patches/patch-ad b/games/bzflag/patches/patch-ad index 0eeda1e6d30..02796466c76 100644 --- a/games/bzflag/patches/patch-ad +++ b/games/bzflag/patches/patch-ad @@ -1,13 +1,12 @@ -$NetBSD: patch-ad,v 1.3 2004/03/02 23:14:31 snj Exp $ - ---- configure.orig 2004-01-24 17:15:57.000000000 -0800 -+++ configure 2004-03-02 14:23:06.000000000 -0800 -@@ -6065,7 +6065,7 @@ fi - - # avoid using X11 in BeOS - if test $host_os != beos; then -- CPPFLAGS= -+ CPPFLAGS="$X_CFLAGS $CPPFLAGS" - if test x$no_x = x; then - GLIBS="$X_PRE_LIBS -lX11 $EXTRA_LIBS $GLIBS" - fi +$NetBSD: patch-ad,v 1.4 2005/06/02 14:24:04 blymn Exp $ +--- configure.orig Tue Jan 18 17:13:36 2005 ++++ configure Tue Jan 18 17:16:43 2005 +@@ -63,7 +63,7 @@ + prefix=NONE + program_prefix=NONE + program_suffix=NONE +-program_transform_name=s,x,x, ++program_transform_name= + silent= + site= + srcdir= diff --git a/games/bzflag/patches/patch-ae b/games/bzflag/patches/patch-ae deleted file mode 100644 index 1ed4395a87b..00000000000 --- a/games/bzflag/patches/patch-ae +++ /dev/null @@ -1,95 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2004/06/07 02:29:07 snj Exp $ - ---- src/bzflag/Makefile.in.orig 2004-06-03 17:38:21.000000000 -0700 -+++ src/bzflag/Makefile.in 2004-06-03 17:41:42.000000000 -0700 -@@ -179,7 +179,6 @@ bzflag_SOURCES = \ - @MACOS_TRUE@ ../scene/libSceneDB.a \ - @MACOS_TRUE@ ../geometry/libGeometry.a \ - @MACOS_TRUE@ ../mediafile/libMediaFile.a \ --@MACOS_TRUE@ ../zlib/libz.a \ - @MACOS_TRUE@ $(REGEX) \ - @MACOS_TRUE@ $(RESOURCE) \ - @MACOS_TRUE@ $(GLIBS) -@@ -193,7 +192,6 @@ bzflag_SOURCES = \ - @MACOS_FALSE@ ../scene/libSceneDB.a \ - @MACOS_FALSE@ ../geometry/libGeometry.a \ - @MACOS_FALSE@ ../mediafile/libMediaFile.a \ --@MACOS_FALSE@ ../zlib/libz.a \ - @MACOS_FALSE@ $(REGEX) \ - @MACOS_FALSE@ $(RESOURCE) \ - @MACOS_FALSE@ $(GLIBS) -@@ -203,7 +201,7 @@ bzflag_SOURCES = \ - # $(ALIBS) - AM_CPPFLAGS = $(X_CFLAGS) - --bzflag_LDFLAGS = ../date/buildDate.o -+bzflag_LDFLAGS = ../date/buildDate.o -lz ${LIBOSSAUDIO} - subdir = src/bzflag - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/include/config.h -@@ -235,7 +233,6 @@ bzflag_LDADD = $(LDADD) - @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_TRUE@ ../scene/libSceneDB.a \ - @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_TRUE@ ../geometry/libGeometry.a \ - @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_TRUE@ ../mediafile/libMediaFile.a \ --@BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_TRUE@ ../zlib/libz.a \ - @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_TRUE@ bzflag.res - @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@bzflag_DEPENDENCIES = \ - @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@ ../net/libNet.a \ -@@ -246,7 +243,6 @@ bzflag_LDADD = $(LDADD) - @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@ ../scene/libSceneDB.a \ - @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@ ../geometry/libGeometry.a \ - @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@ ../mediafile/libMediaFile.a \ --@BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@ ../zlib/libz.a - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@bzflag_DEPENDENCIES = \ - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@ ../net/libNet.a \ - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@ ../common/libCommon.a \ -@@ -257,7 +253,6 @@ bzflag_LDADD = $(LDADD) - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@ ../scene/libSceneDB.a \ - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@ ../geometry/libGeometry.a \ - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@ ../mediafile/libMediaFile.a \ --@BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@ ../zlib/libz.a \ - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@ bzflag.res - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@bzflag_DEPENDENCIES = \ - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@ ../net/libNet.a \ -@@ -268,8 +263,7 @@ bzflag_LDADD = $(LDADD) - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@ ../ogl/libGLKit.a \ - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@ ../scene/libSceneDB.a \ - @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@ ../geometry/libGeometry.a \ --@BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@ ../mediafile/libMediaFile.a \ --@BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@ ../zlib/libz.a -+@BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@ ../mediafile/libMediaFile.a - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@bzflag_DEPENDENCIES = \ - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@ ../net/libNet.a \ - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@ ../common/libCommon.a \ -@@ -279,7 +273,6 @@ bzflag_LDADD = $(LDADD) - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@ ../scene/libSceneDB.a \ - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@ ../geometry/libGeometry.a \ - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@ ../mediafile/libMediaFile.a \ --@BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@ ../zlib/libz.a \ - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@ ../regex/libregex.a \ - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@ bzflag.res - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@bzflag_DEPENDENCIES = \ -@@ -291,7 +284,6 @@ bzflag_LDADD = $(LDADD) - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@ ../scene/libSceneDB.a \ - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@ ../geometry/libGeometry.a \ - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@ ../mediafile/libMediaFile.a \ --@BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@ ../zlib/libz.a \ - @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@ ../regex/libregex.a - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@bzflag_DEPENDENCIES = \ - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@ ../net/libNet.a \ -@@ -303,7 +295,6 @@ bzflag_LDADD = $(LDADD) - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@ ../scene/libSceneDB.a \ - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@ ../geometry/libGeometry.a \ - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@ ../mediafile/libMediaFile.a \ --@BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@ ../zlib/libz.a \ - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@ ../regex/libregex.a \ - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@ bzflag.res - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@bzflag_DEPENDENCIES = \ -@@ -316,7 +307,6 @@ bzflag_LDADD = $(LDADD) - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@ ../scene/libSceneDB.a \ - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@ ../geometry/libGeometry.a \ - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@ ../mediafile/libMediaFile.a \ --@BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@ ../zlib/libz.a \ - @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@ ../regex/libregex.a - - DEFS = @DEFS@ diff --git a/games/bzflag/patches/patch-af b/games/bzflag/patches/patch-af deleted file mode 100644 index 12a8579afc2..00000000000 --- a/games/bzflag/patches/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-af,v 1.3 2003/12/31 03:10:39 xtraeme Exp $ - ---- src/bzadmin/StdBothUI.cxx.orig Tue Dec 9 08:38:14 2003 -+++ src/bzadmin/StdBothUI.cxx Wed Dec 31 02:55:48 2003 -@@ -20,6 +20,7 @@ - #include - #include - #else -+#include - #include - #endif diff --git a/games/bzflag/patches/patch-ag b/games/bzflag/patches/patch-ag deleted file mode 100644 index 673573e06b8..00000000000 --- a/games/bzflag/patches/patch-ag +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2005/03/16 12:41:51 rillig Exp $ - -tolower is a macro on NetBSD-1.6.2. - ---- include/TextUtils.h.orig Wed May 12 22:10:51 2004 -+++ include/TextUtils.h Tue Mar 15 23:59:22 2005 -@@ -43,7 +43,7 @@ public: - - /** returns a string converted to lowercase - */ -- inline static std::string tolower(const std::string& s) -+ inline static std::string bz_tolower(const std::string& s) - { - std::string trans = s; - -@@ -55,7 +55,7 @@ public: - - /** returns a string converted to uppercase - */ -- inline static std::string toupper(const std::string& s) -+ inline static std::string bz_toupper(const std::string& s) - { - std::string trans = s; - std::transform (trans.begin(), trans.end(), // source diff --git a/games/bzflag/patches/patch-ah b/games/bzflag/patches/patch-ah deleted file mode 100644 index fed3500e74d..00000000000 --- a/games/bzflag/patches/patch-ah +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2005/03/16 12:41:51 rillig Exp $ - -tolower is a macro on NetBSD-1.6.2. - ---- src/bzfs/VotingArbiter.cxx.orig Tue Mar 23 07:36:31 2004 -+++ src/bzfs/VotingArbiter.cxx Wed Mar 16 00:08:15 2005 -@@ -173,7 +173,7 @@ bool VotingArbiter::hasSuffrage(std::str - } - - // has this player already voted? -- if (_votingBooth->hasVoted(string_util::tolower(player))) { -+ if (_votingBooth->hasVoted(string_util::bz_tolower(player))) { - return false; - } - -@@ -196,7 +196,7 @@ bool VotingArbiter::voteYes(std::string - return false; - } - -- return (_votingBooth->vote(string_util::tolower(player), "yes")); -+ return (_votingBooth->vote(string_util::bz_tolower(player), "yes")); - } - - bool VotingArbiter::voteNo(std::string player) -@@ -210,7 +210,7 @@ bool VotingArbiter::voteNo(std::string p - return false; - } - -- return (_votingBooth->vote(string_util::tolower(player), "no")); -+ return (_votingBooth->vote(string_util::bz_tolower(player), "no")); - } - - unsigned long int VotingArbiter::getYesCount(void) const -@@ -314,7 +314,7 @@ bool VotingArbiter::retractVote(std::str - if (_votingBooth == NULL) { - return false; - } -- return _votingBooth->retractVote(string_util::tolower(player)); -+ return _votingBooth->retractVote(string_util::bz_tolower(player)); - } - - diff --git a/games/bzflag/patches/patch-an b/games/bzflag/patches/patch-an new file mode 100644 index 00000000000..aa8525268d6 --- /dev/null +++ b/games/bzflag/patches/patch-an @@ -0,0 +1,14 @@ +$NetBSD: patch-an,v 1.1 2005/06/02 14:24:04 blymn Exp $ + +--- src/3D/FontManager.cxx.orig 2005-04-27 00:36:15.000000000 -0700 ++++ src/3D/FontManager.cxx +@@ -280,6 +280,9 @@ void FontManager::drawString(float x, fl + // negatives are invalid, we use them to signal "no change" + GLfloat color[3] = {-1.0f, -1.0f, -1.0f}; + ++ OpenGLGState::resetState(); // FIXME for bitmap renderer, full reset needed? ++ ++ + /* + * ANSI code interpretation is somewhat limited, we only accept values + * which have been defined in AnsiCodes.h -- cgit v1.2.3