Update to bzflag-2.0.8 and unbreak this port by switching it to

use its own zlib (breaks with ours, someone should check)
from Deanna Phillips <deanna@sdf.lonestar.org>

games/bzflag/Makefile

@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.7 2006/08/02 09:36:20 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2006/09/22 03:42:56 pvalchev Exp $
-
-BROKEN=		"problems loading data files; crashes"
 
 COMMENT=	"graphical multiplayer 3-d tank war game"
-DISTNAME=	bzflag-2.0.2.20050318
+DISTNAME=	bzflag-2.0.8
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bzflag/}
 
 HOMEPAGE=	http://www.bzflag.org/
 
-# GPL
+# LGPL
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
@@ -18,12 +16,13 @@ PERMIT_DISTFILES_FTP=   Yes
 USE_GMAKE=	Yes
 USE_X11=	Yes
 
-LIB_DEPENDS=	SDL.>=4::devel/sdl
+LIB_DEPENDS=	SDL.>=4::devel/sdl curl.>=3::net/curl
 
-WANTLIB=	GL GLU ICE SM X11 Xext c m ncurses pthread stdc++ usbhid z
+WANTLIB=	GL GLU ICE SM X11 Xext c m ncurses pthread stdc++ usbhid z ssl crypto
 
-CONFIGURE_STYLE=gnu
+AUTOCONF_VERSION=2.59
-CONFIGURE_ARGS+=--disable-adns --disable-curl --enable-debug
+CONFIGURE_STYLE=gnu autoconf
+CONFIGURE_ARGS+=--disable-adns --enable-debug
 CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${LOCALBASE}/include"
 
 pre-build:

games/bzflag/distinfo

@@ -1,4 +1,4 @@
-MD5 (bzflag-2.0.2.20050318.tar.gz) = 97e8d9cae888430e997bb0d9cdca64b2
+MD5 (bzflag-2.0.8.tar.gz) = 63621e8ef5004ffef70e84dcda29312c
-RMD160 (bzflag-2.0.2.20050318.tar.gz) = 7d8932c5c13e76a9b4be4e9bda3fafa50514cfd9
+RMD160 (bzflag-2.0.8.tar.gz) = 0b8840f250dad3c781d962c631f65ff640022a24
-SHA1 (bzflag-2.0.2.20050318.tar.gz) = 70dbcf8d6714997e005e36f3708d0dcca339db87
+SHA1 (bzflag-2.0.8.tar.gz) = d59f3966757a6fee248b533ecb382f83e96bf574
-SIZE (bzflag-2.0.2.20050318.tar.gz) = 8770757
+SIZE (bzflag-2.0.8.tar.gz) = 11908327

games/bzflag/patches/patch-configure_ac

@@ -0,0 +1,28 @@
+$OpenBSD: patch-configure_ac,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- configure.ac.orig	Mon Apr 17 16:11:11 2006
++++ configure.ac	Sun Aug  6 00:55:20 2006
+@@ -125,7 +125,7 @@ AC_SUBST(AR)
+ AC_CHECK_PROG(AR, ar, ar)
+ AC_SUBST(AR_FLAGS)
+ 
+-AC_CHECK_LIB(z, compress, BUILDZLIB=no, BUILDZLIB=yes)
++AC_CHECK_LIB(z, compress, BUILDZLIB=yes, BUILDZLIB=yes)
+ AM_CONDITIONAL(BUILDZLIB, test $BUILDZLIB = yes)
+ 
+   #checking for libcurl library
+@@ -187,6 +187,7 @@ AC_CHECK_HEADERS( \
+ 	SDL/SDL.h \
+ 	X11/Xlib.h \
+ 	bstring.h \
++	arpa/nameser_compat.h \
+ 	linux/input.h \
+ 	stdint.h \
+ 	sys/param.h \
+@@ -194,6 +195,7 @@ AC_CHECK_HEADERS( \
+ 	values.h \
+ 	dsound.h \
+ )
++# nameser_compat.h used by src/c-ares
+ 
+ #Checks for types
+ #AM_CHECK_TYPES(socklen_t)

games/bzflag/patches/patch-src_3D_FontManager_cxx

@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_3D_FontManager_cxx,v 1.1 2005/08/10 05:24:10 jolan Exp $
+$OpenBSD: patch-src_3D_FontManager_cxx,v 1.2 2006/09/22 03:42:57 pvalchev Exp $
---- src/3D/FontManager.cxx.orig	Tue Feb 22 18:19:29 2005
+--- src/3D/FontManager.cxx.orig	Tue Jan  3 19:50:35 2006
-+++ src/3D/FontManager.cxx	Tue Aug  9 22:48:43 2005
++++ src/3D/FontManager.cxx	Sun Aug  6 08:00:32 2006
-@@ -280,6 +280,8 @@ void FontManager::drawString(float x, fl
+@@ -271,6 +271,8 @@ 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(); /* full reset needed for bitmap renderer? */
 +
    /*
-    * ANSI code interpretation is somewhat limited, we only accept values
+    * Colorize text based on ANSI codes embedded in it
-    * which have been defined in AnsiCodes.h
+    * Break the text every time an ANSI code

games/bzflag/patches/patch-src_bzflag_playing_cxx

@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_bzflag_playing_cxx,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/bzflag/playing.cxx.orig	Sat Aug  5 04:59:14 2006
++++ src/bzflag/playing.cxx	Sat Aug  5 04:59:28 2006
+@@ -6375,11 +6375,12 @@ static void		defaultErrorCallback(const 
+ 
+ static void		startupErrorCallback(const char* msg)
+ {
+-  controlPanel->addMessage(msg);
+-  glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+-  glClear(GL_COLOR_BUFFER_BIT);
+-  controlPanel->render(*sceneRenderer);
+-  mainWindow->getWindow()->swapBuffers();
++//   controlPanel->addMessage(msg);
++//   glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
++//   glClear(GL_COLOR_BUFFER_BIT);
++//   controlPanel->render(*sceneRenderer);
++//   mainWindow->getWindow()->swapBuffers();
++  std::cerr << msg << std::endl << std::flush;
+ }
+ 
+ 

games/bzflag/patches/patch-src_c-ares_ares_expand_name_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_c-ares_ares_expand_name_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/c-ares/ares_expand_name.c.orig	Sun Aug  6 07:59:22 2006
++++ src/c-ares/ares_expand_name.c	Sun Aug  6 07:59:35 2006
+@@ -21,7 +21,9 @@
+ #else
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
++#endif
+ #endif
+ 
+ #include <stdlib.h>

games/bzflag/patches/patch-src_c-ares_ares_expand_string_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_c-ares_ares_expand_string_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/c-ares/ares_expand_string.c.orig	Sun Aug  6 07:59:01 2006
++++ src/c-ares/ares_expand_string.c	Sun Aug  6 07:59:13 2006
+@@ -21,7 +21,9 @@
+ #else
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
++#endif
+ #endif
+ 
+ #include <string.h>

games/bzflag/patches/patch-src_c-ares_ares_gethostbyaddr_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_c-ares_ares_gethostbyaddr_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/c-ares/ares_gethostbyaddr.c.orig	Sun Aug  6 07:58:38 2006
++++ src/c-ares/ares_gethostbyaddr.c	Sun Aug  6 07:58:49 2006
+@@ -23,7 +23,9 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
++#endif
+ #endif
+ 
+ #include <stdio.h>

games/bzflag/patches/patch-src_c-ares_ares_gethostbyname_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_c-ares_ares_gethostbyname_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/c-ares/ares_gethostbyname.c.orig	Sun Aug  6 07:58:06 2006
++++ src/c-ares/ares_gethostbyname.c	Sun Aug  6 07:58:24 2006
+@@ -24,7 +24,9 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
++#endif
+ #endif
+ 
+ #include <stdio.h>

games/bzflag/patches/patch-src_c-ares_ares_init_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_c-ares_ares_init_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/c-ares/ares_init.c.orig	Sun Aug  6 07:57:42 2006
++++ src/c-ares/ares_init.c	Sun Aug  6 07:57:54 2006
+@@ -31,7 +31,9 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
++#endif
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif

games/bzflag/patches/patch-src_c-ares_ares_mkquery_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_c-ares_ares_mkquery_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/c-ares/ares_mkquery.c.orig	Sun Aug  6 07:57:19 2006
++++ src/c-ares/ares_mkquery.c	Sun Aug  6 07:57:33 2006
+@@ -21,7 +21,9 @@
+ #else
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
++#endif
+ #endif
+ 
+ #include <stdlib.h>

games/bzflag/patches/patch-src_c-ares_ares_parse_a_reply_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_c-ares_ares_parse_a_reply_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/c-ares/ares_parse_a_reply.c.orig	Sun Aug  6 08:03:03 2006
++++ src/c-ares/ares_parse_a_reply.c	Sun Aug  6 08:03:19 2006
+@@ -24,7 +24,9 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
++#endif
+ #endif
+ 
+ #include <stdlib.h>

games/bzflag/patches/patch-src_c-ares_ares_parse_ptr_reply_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_c-ares_ares_parse_ptr_reply_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/c-ares/ares_parse_ptr_reply.c.orig	Sun Aug  6 07:56:56 2006
++++ src/c-ares/ares_parse_ptr_reply.c	Sun Aug  6 07:57:10 2006
+@@ -23,7 +23,9 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
++#endif
+ #endif
+ 
+ #include <stdlib.h>

games/bzflag/patches/patch-src_c-ares_ares_process_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_c-ares_ares_process_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/c-ares/ares_process.c.orig	Sun Aug  6 07:56:27 2006
++++ src/c-ares/ares_process.c	Sun Aug  6 07:56:40 2006
+@@ -27,7 +27,9 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
++#endif
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif

games/bzflag/patches/patch-src_c-ares_ares_query_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_c-ares_ares_query_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/c-ares/ares_query.c.orig	Sun Aug  6 07:56:03 2006
++++ src/c-ares/ares_query.c	Sun Aug  6 07:56:16 2006
+@@ -21,7 +21,9 @@
+ #else
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
++#endif
+ #endif
+ 
+ #include <stdlib.h>

games/bzflag/patches/patch-src_c-ares_ares_send_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_c-ares_ares_send_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+--- src/c-ares/ares_send.c.orig	Sun Aug  6 07:55:12 2006
++++ src/c-ares/ares_send.c	Sun Aug  6 07:55:42 2006
+@@ -21,7 +21,9 @@
+ #else
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
++#endif
+ #endif
+ 
+ #include <stdlib.h>

games/bzflag/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2005/08/10 05:24:10 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.5 2006/09/22 03:42:57 pvalchev Exp $
 bin/bzadmin
 bin/bzflag
 bin/bzfs
@@ -8,10 +8,12 @@ bin/bzfs
 @man man/man6/bzfquery.6
 @man man/man6/bzfs.6
 share/bzflag/
-share/bzflag/blade.png
+share/bzflag/automatic_icon.png
+share/bzflag/blend_flash.png
 share/bzflag/blue_basetop.png
 share/bzflag/blue_basewall.png
 share/bzflag/blue_bolt.png
+share/bzflag/blue_icon.png
 share/bzflag/blue_laser.png
 share/bzflag/blue_super_bolt.png
 share/bzflag/blue_tank.png
@@ -25,6 +27,7 @@ share/bzflag/bzflag-32x32.xpm
 share/bzflag/bzflag-48x48.png
 share/bzflag/caution.png
 share/bzflag/clouds.png
+share/bzflag/dusty_flare.png
 share/bzflag/explode1.png
 share/bzflag/explode2.png
 share/bzflag/explosion.wav
@@ -84,6 +87,7 @@ share/bzflag/frog.png
 share/bzflag/green_basetop.png
 share/bzflag/green_basewall.png
 share/bzflag/green_bolt.png
+share/bzflag/green_icon.png
 share/bzflag/green_laser.png
 share/bzflag/green_super_bolt.png
 share/bzflag/green_tank.png
@@ -123,12 +127,14 @@ share/bzflag/moon.png
 share/bzflag/mountain1.png
 share/bzflag/mountain2.png
 share/bzflag/mountain3.png
+share/bzflag/observer_icon.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
+share/bzflag/purple_icon.png
 share/bzflag/purple_laser.png
 share/bzflag/purple_super_bolt.png
 share/bzflag/purple_tank.png
@@ -142,17 +148,23 @@ share/bzflag/raindrop.png
 share/bzflag/red_basetop.png
 share/bzflag/red_basewall.png
 share/bzflag/red_bolt.png
+share/bzflag/red_icon.png
 share/bzflag/red_laser.png
 share/bzflag/red_super_bolt.png
 share/bzflag/red_tank.png
 share/bzflag/ricochet.wav
 share/bzflag/rogue_bolt.png
+share/bzflag/rogue_icon.png
 share/bzflag/rogue_laser.png
 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/spree1.wav
+share/bzflag/spree2.wav
+share/bzflag/spree3.wav
+share/bzflag/spree4.wav
 share/bzflag/std_ground.png
 share/bzflag/steamroller.wav
 share/bzflag/teamgrab.wav