Update to 1.10.6. Changes:

* /hostban based on hostmask when adns is available - Nils McCarthy
* server option to disallow autopilot - Nils McCarthy
* Bots are smarter - Frank Thilo
* Fixed the little hop on spawn at some sites - Alfredo Tupone
* Fixed issue of players add/removing others from groups - Alfredo Tupone
* Fixed false positive filter matches involving apostrophes - Sean Morrison
* Curing ghost/duplicated/ungetable flag - Alfredo Tupone
* Fixed 0 height flag, no more flags inside buildings - Alfredo Tupone
* Observers see Masquerade tank with their true color - Alfredo Tupone
* Password file now supports callsigns with non alphanumerics  - Alfredo Tupone
* Correctly read PNG textures with multiple IDAT chunks - Daniel Remenak
* Add aggressive filtering support for all platforms - Sean Morrison
* Fixed bug that allowed empty callsigns - Frank Thilo

4 files changed, 92 insertions, 33 deletions

diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index fb9ea0ba717..bd036c019d3 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/03/02 23:14:31 snj Exp $
+# $NetBSD: Makefile,v 1.13 2004/06/07 02:29:07 snj Exp $
 
-DISTNAME=	bzflag-1.10.4.20040125
-PKGNAME=	${DISTNAME:S/.20040125//}
+DISTNAME=	bzflag-1.10.6.20040515
+PKGNAME=	${DISTNAME:S/.20040515//}
 CATEGORIES=	games x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=bzflag/}
 
diff --git a/games/bzflag/PLIST b/games/bzflag/PLIST
index 121c93d960e..5d401f84173 100644
--- a/games/bzflag/PLIST
+++ b/games/bzflag/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/02 23:14:31 snj Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/06/07 02:29:07 snj Exp $
 bin/bzadmin
 bin/bzflag
 bin/bzfrelay
@@ -44,6 +44,7 @@ share/bzflag/hunt_select.wav
 share/bzflag/hunter_tank.png
 share/bzflag/jump.wav
 share/bzflag/killteam.wav
+share/bzflag/l10n/ISO-639-2_values_8bits.txt
 share/bzflag/l10n/bzflag_cs_CZ.po
 share/bzflag/l10n/bzflag_da.po
 share/bzflag/l10n/bzflag_de.po
@@ -68,6 +69,9 @@ share/bzflag/missile.wav
 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/purple_basetop.png
diff --git a/games/bzflag/distinfo b/games/bzflag/distinfo
index 211b901b9ab..bbfee22fde4 100644
--- a/games/bzflag/distinfo
+++ b/games/bzflag/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2004/03/02 23:14:31 snj Exp $
+$NetBSD: distinfo,v 1.6 2004/06/07 02:29:07 snj Exp $
 
-SHA1 (bzflag-1.10.4.20040125.tar.gz) = 36178903ee5eab7d95c18f23c0e43d4e43cde980
-Size (bzflag-1.10.4.20040125.tar.gz) = 4070444 bytes
+SHA1 (bzflag-1.10.6.20040515.tar.gz) = 608b99791daf1236239102a50d3e6967f0d4f790
+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) = ca37994c7fa6c2d8a96ce83d264f7636ec6dca43
+SHA1 (patch-ae) = 8935c9b8b24fee942460b3186ac0797bdbaf921a
 SHA1 (patch-af) = 8957feb16144cbb38436cd1f77358d50fb93f66b
diff --git a/games/bzflag/patches/patch-ae b/games/bzflag/patches/patch-ae
index 89f2a393375..1ed4395a87b 100644
--- a/games/bzflag/patches/patch-ae
+++ b/games/bzflag/patches/patch-ae
@@ -1,16 +1,24 @@
-$NetBSD: patch-ae,v 1.3 2004/03/02 23:14:31 snj Exp $
+$NetBSD: patch-ae,v 1.4 2004/06/07 02:29:07 snj Exp $
 
---- 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 = \
+--- 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)
- 
-@@ -265,7 +264,7 @@ bzflag_SOURCES = \
+@@ -203,7 +201,7 @@ bzflag_SOURCES = \
  #	$(ALIBS)
  AM_CPPFLAGS = $(X_CFLAGS)
  
@@ -19,22 +27,69 @@ $NetBSD: patch-ae,v 1.3 2004/03/02 23:14:31 snj Exp $
  subdir = src/bzflag
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  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 \
+@@ -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@