From 7b609fd347020d3231c202a8bb6dde4fa9d62281 Mon Sep 17 00:00:00 2001
From: jolan <jolan@openbsd.org>
Date: Sun, 25 Jul 2010 17:14:35 +0000
Subject: [PATCH] update to bzflag-2.0.16; from brad

---
 games/bzflag/Makefile                         |  9 +--
 games/bzflag/distinfo                         | 10 +--
 games/bzflag/patches/patch-configure_ac       | 14 ++--
 .../patches/patch-src_bzflag_playing_cxx      |  8 +-
 games/bzflag/pkg/PLIST                        | 79 +++++++++----------
 5 files changed, 55 insertions(+), 65 deletions(-)

diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index a8e2c6b4a49..fc8abdbcb9e 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,14 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2009/12/22 16:28:00 ajacoutot Exp $
-
-# crashes the X server in some configurations on macppc
-NOT_FOR_ARCHS=	powerpc
+# $OpenBSD: Makefile,v 1.20 2010/07/25 17:14:35 jolan Exp $
 
 COMMENT=	graphical multiplayer 3D tank war game
 
-DISTNAME=	bzflag-2.0.12
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	bzflag-2.0.16
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bzflag/}
+EXTRACT_SUFX=	.tar.bz2
 
 HOMEPAGE=	http://www.bzflag.org/
 
diff --git a/games/bzflag/distinfo b/games/bzflag/distinfo
index f945552a34e..9bc652675da 100644
--- a/games/bzflag/distinfo
+++ b/games/bzflag/distinfo
@@ -1,5 +1,5 @@
-MD5 (bzflag-2.0.12.tar.gz) = gb9GHk4hHlCxoqf10NZkDw==
-RMD160 (bzflag-2.0.12.tar.gz) = urFxIz08VuzGvOGQkZb2g0TCUwg=
-SHA1 (bzflag-2.0.12.tar.gz) = PvFznL3YuIjck+/kJWCk/fwqIXQ=
-SHA256 (bzflag-2.0.12.tar.gz) = 6dSYuG1IhtB9XHOA67FZAeAu8chQ5gzLskg/OX5vEBM=
-SIZE (bzflag-2.0.12.tar.gz) = 12071712
+MD5 (bzflag-2.0.16.tar.bz2) = FhuXO+5YbUPr/0aV37jDWQ==
+RMD160 (bzflag-2.0.16.tar.bz2) = kVZkIYO5szxlCXN82OQPStYSplc=
+SHA1 (bzflag-2.0.16.tar.bz2) = COOoOfsOSRnJJE3YhsUFnAduE0k=
+SHA256 (bzflag-2.0.16.tar.bz2) = /m+guJ5/lQlQERsRjuhTTNVJF9LH+SFcHzIV7OOKYI8=
+SIZE (bzflag-2.0.16.tar.bz2) = 11495082
diff --git a/games/bzflag/patches/patch-configure_ac b/games/bzflag/patches/patch-configure_ac
index 03bed136ef8..2d9728bfba3 100644
--- a/games/bzflag/patches/patch-configure_ac
+++ b/games/bzflag/patches/patch-configure_ac
@@ -1,8 +1,8 @@
-$OpenBSD: patch-configure_ac,v 1.4 2009/09/02 08:52:22 sthen Exp $
---- configure.ac.orig	Wed Jun 25 14:00:55 2008
-+++ configure.ac	Wed Apr 29 03:19:29 2009
-@@ -236,7 +236,7 @@ fi
- AC_MSG_RESULT([$ac_ff_effect_directional]) 
+$OpenBSD: patch-configure_ac,v 1.5 2010/07/25 17:14:35 jolan Exp $
+--- configure.ac.orig	Thu Apr  1 01:31:35 2010
++++ configure.ac	Fri Apr  9 21:23:26 2010
+@@ -230,7 +230,7 @@ fi
+ AC_MSG_RESULT([$ac_ff_effect_directional])
  
  case $host_os in
 -     linux*|kfreebsd*|freebsd*|netbsd*|dragonfly*) linux=true;;
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2009/09/02 08:52:22 sthen Exp $
       *) linux=false;;
  esac
  AM_CONDITIONAL(LINUX, $linux)
-@@ -690,7 +690,7 @@ esac
+@@ -685,7 +685,7 @@ esac
  if test x$enable_debug = xyes ; then
     FLAGS="$FLAGS -O0"
     case $host_os in
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2009/09/02 08:52:22 sthen Exp $
  	FLAGS="$FLAGS -Werror -Wshadow"
  	if test x$enable_profiling = xyes ; then
  	  FLAGS="$FLAGS -pg"
-@@ -708,7 +708,7 @@ if test x$enable_debug = xyes ; then
+@@ -703,7 +703,7 @@ if test x$enable_debug = xyes ; then
      AC_DEFINE(DEBUG, 1, [Debugging enabled])
  else
      case $host_os in
diff --git a/games/bzflag/patches/patch-src_bzflag_playing_cxx b/games/bzflag/patches/patch-src_bzflag_playing_cxx
index 917c9569154..a48912e90e3 100644
--- a/games/bzflag/patches/patch-src_bzflag_playing_cxx
+++ b/games/bzflag/patches/patch-src_bzflag_playing_cxx
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_bzflag_playing_cxx,v 1.2 2009/09/02 08:52:22 sthen Exp $
---- src/bzflag/playing.cxx.orig	Tue Jun 24 18:10:21 2008
-+++ src/bzflag/playing.cxx	Thu Apr  9 01:04:26 2009
-@@ -6433,11 +6433,12 @@ static void		defaultErrorCallback(const char* msg)
+$OpenBSD: patch-src_bzflag_playing_cxx,v 1.3 2010/07/25 17:14:35 jolan Exp $
+--- src/bzflag/playing.cxx.orig	Wed Mar 31 23:21:08 2010
++++ src/bzflag/playing.cxx	Fri Apr  9 21:23:21 2010
+@@ -6648,11 +6648,12 @@ static void		defaultErrorCallback(const char* msg)
  
  static void		startupErrorCallback(const char* msg)
  {
diff --git a/games/bzflag/pkg/PLIST b/games/bzflag/pkg/PLIST
index 10f05c29758..d1d77a6478a 100644
--- a/games/bzflag/pkg/PLIST
+++ b/games/bzflag/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2009/12/22 16:28:00 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.9 2010/07/25 17:14:35 jolan Exp $
 @bin bin/bzadmin
 @bin bin/bzflag
 @bin bin/bzfs
@@ -41,48 +41,41 @@ share/bzflag/flag_lost.wav
 share/bzflag/flag_won.wav
 share/bzflag/flap.wav
 share/bzflag/fonts/
-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/DejaVu.License
+share/bzflag/fonts/DejaVuSansCondensedBold_12.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_12.png
+share/bzflag/fonts/DejaVuSansCondensedBold_16.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_16.png
+share/bzflag/fonts/DejaVuSansCondensedBold_24.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_24.png
+share/bzflag/fonts/DejaVuSansCondensedBold_32.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_32.png
+share/bzflag/fonts/DejaVuSansCondensedBold_6.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_6.png
+share/bzflag/fonts/DejaVuSansCondensedBold_8.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_8.png
+share/bzflag/fonts/DejaVuSansMonoBold_12.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_12.png
+share/bzflag/fonts/DejaVuSansMonoBold_16.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_16.png
+share/bzflag/fonts/DejaVuSansMonoBold_24.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_24.png
+share/bzflag/fonts/DejaVuSansMonoBold_6.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_6.png
+share/bzflag/fonts/DejaVuSansMonoBold_8.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_8.png
+share/bzflag/fonts/DejaVuSerifBold_12.fmt
+share/bzflag/fonts/DejaVuSerifBold_12.png
+share/bzflag/fonts/DejaVuSerifBold_16.fmt
+share/bzflag/fonts/DejaVuSerifBold_16.png
+share/bzflag/fonts/DejaVuSerifBold_24.fmt
+share/bzflag/fonts/DejaVuSerifBold_24.png
+share/bzflag/fonts/DejaVuSerifBold_32.fmt
+share/bzflag/fonts/DejaVuSerifBold_32.png
+share/bzflag/fonts/DejaVuSerifBold_6.fmt
+share/bzflag/fonts/DejaVuSerifBold_6.png
+share/bzflag/fonts/DejaVuSerifBold_8.fmt
+share/bzflag/fonts/DejaVuSerifBold_8.png
 share/bzflag/fonts/readme
 share/bzflag/frog.png
 share/bzflag/green_basetop.png