Update to bzflag-1.10.4. Changes:

* Allow variable number of team flags per team with +f bzfs option
* bots now fully handle collision check
* Notify players when reassigned to a different team on join
* Allow multiple bases per team
* Alt-Tab & resolution changes do not mess up the screen
* No shooting allowed if OO flag is lost in a building
* Unclean client disconnects are recognized earlier
* Color carried team flags according to their team
* Start of better spawn positions based on tanks
* Various texture improvements
* Add experimental quality setting for enhanced effects
* Increase moon segments for exp. quality
* Stop infinite spawn loop with complex worlds containing big pyramids
* Don't spawn in multiple locations based on multiple r-clicks
* Fix Respawning after non-shot kills
* Relax kick tolerances and soften kick messages
* Remove bad lite effects with Thief steal
* Protect against crashes due to bad shot ids
* Relax flag drop time for speed checking
* Better unresponsive player removal messages
* Let genocided players spawn again
* Many other bugfixes

3 files changed, 31 insertions, 43 deletions

diff --git a/games/bzflag/patches/patch-ac b/games/bzflag/patches/patch-ac
deleted file mode 100644
index 1226e86572f..00000000000
--- a/games/bzflag/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/12/13 10:32:53 xtraeme Exp $
-
---- src/bzadmin/Makefile.in.orig	2003-12-13 11:01:09.000000000 +0100
-+++ src/bzadmin/Makefile.in	2003-12-13 11:01:28.000000000 +0100
-@@ -128,7 +128,7 @@
- PROGRAMS =  $(bin_PROGRAMS)
- 
- 
--DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
-+DEFS = @DEFS@ -I. -I$(srcdir) -I../../include -I${BUILDLINK_DIR}/include
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
diff --git a/games/bzflag/patches/patch-ad b/games/bzflag/patches/patch-ad
index 9855c3782f6..0eeda1e6d30 100644
--- a/games/bzflag/patches/patch-ad
+++ b/games/bzflag/patches/patch-ad
@@ -1,17 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2003/12/13 10:32:53 xtraeme Exp $
+$NetBSD: patch-ad,v 1.3 2004/03/02 23:14:31 snj Exp $
 
---- configure.orig	Tue Dec  9 17:08:21 2003
-+++ configure	Thu Dec 11 00:55:53 2003
-@@ -2515,7 +2515,7 @@
- fi
- 
- 
--LDFLAGS=$X_LIBS
-+LDFLAGS="$X_LIBS $LDFLAGS"
- case $host_os in
-   solaris*)
-     GLIBS="-lresolv -laudio $GLIBS";
-@@ -2724,7 +2724,7 @@
+--- 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
diff --git a/games/bzflag/patches/patch-ae b/games/bzflag/patches/patch-ae
index 96d7643d0fa..89f2a393375 100644
--- a/games/bzflag/patches/patch-ae
+++ b/games/bzflag/patches/patch-ae
@@ -1,30 +1,40 @@
-$NetBSD: patch-ae,v 1.2 2003/12/13 10:32:53 xtraeme Exp $
+$NetBSD: patch-ae,v 1.3 2004/03/02 23:14:31 snj Exp $
 
---- src/bzflag/Makefile.in.orig	Wed Dec 10 09:09:45 2003
-+++ src/bzflag/Makefile.in	Thu Dec 11 02:09:15 2003
-@@ -168,7 +168,6 @@
+--- src/bzflag/Makefile.in.orig	2004-03-02 14:27:33.000000000 -0800
++++ src/bzflag/Makefile.in	2004-03-02 14:32:25.000000000 -0800
+@@ -241,7 +241,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@	$(RESOURCE)			\
  @MACOS_FALSE@	$(GLIBS)
- # This is required to hook in ogg/vorbis libraries
-@@ -176,7 +175,7 @@
  
+@@ -265,7 +264,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 = ../../include/config.h
- CONFIG_CLEAN_FILES = 
-@@ -207,7 +206,7 @@
- @MACOS_FALSE@../common/libCommon.a ../obstacle/libObstacle.a \
- @MACOS_FALSE@../platform/libPlatform.a ../ogl/libGLKit.a \
- @MACOS_FALSE@../scene/libSceneDB.a ../geometry/libGeometry.a \
--@MACOS_FALSE@../mediafile/libMediaFile.a ../zlib/libz.a
-+@MACOS_FALSE@../mediafile/libMediaFile.a
- CXXFLAGS = @CXXFLAGS@
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
+ CONFIG_HEADER = $(top_builddir)/include/config.h
+@@ -296,7 +295,7 @@ bzflag_LDADD = $(LDADD)
+ @MACOS_FALSE@@WIN32_TRUE@	../scene/libSceneDB.a \
+ @MACOS_FALSE@@WIN32_TRUE@	../geometry/libGeometry.a \
+ @MACOS_FALSE@@WIN32_TRUE@	../mediafile/libMediaFile.a \
+-@MACOS_FALSE@@WIN32_TRUE@	../zlib/libz.a bzflag.res
++@MACOS_FALSE@@WIN32_TRUE@	bzflag.res
+ @MACOS_FALSE@@WIN32_FALSE@bzflag_DEPENDENCIES = ../net/libNet.a \
+ @MACOS_FALSE@@WIN32_FALSE@	../common/libCommon.a \
+ @MACOS_FALSE@@WIN32_FALSE@	../obstacle/libObstacle.a \
+@@ -304,8 +303,7 @@ bzflag_LDADD = $(LDADD)
+ @MACOS_FALSE@@WIN32_FALSE@	../ogl/libGLKit.a \
+ @MACOS_FALSE@@WIN32_FALSE@	../scene/libSceneDB.a \
+ @MACOS_FALSE@@WIN32_FALSE@	../geometry/libGeometry.a \
+-@MACOS_FALSE@@WIN32_FALSE@	../mediafile/libMediaFile.a \
+-@MACOS_FALSE@@WIN32_FALSE@	../zlib/libz.a
++@MACOS_FALSE@@WIN32_FALSE@	../mediafile/libMediaFile.a
+ @MACOS_TRUE@@WIN32_TRUE@bzflag_DEPENDENCIES = ../net/libNet.a \
+ @MACOS_TRUE@@WIN32_TRUE@	../common/libCommon.a \
+ @MACOS_TRUE@@WIN32_TRUE@	../obstacle/libObstacle.a \