From 27519732027eee78fc6516fb01b53a40d232c29a Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 14 Dec 2016 22:37:51 +0000
Subject: [PATCH] bzflag: bump to 2.4.8.

BTW, upstream removed lib/bzflag/hiddenAdmin.so in 2.4.6.
---
 .../{bzflag-2.4.4.recipe => bzflag-2.4.8.recipe}   |  7 +++----
 ...bzflag-2.4.4.patchset => bzflag-2.4.8.patchset} | 14 +++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)
 rename games-action/bzflag/{bzflag-2.4.4.recipe => bzflag-2.4.8.recipe} (95%)
 rename games-action/bzflag/patches/{bzflag-2.4.4.patchset => bzflag-2.4.8.patchset} (91%)

diff --git a/games-action/bzflag/bzflag-2.4.4.recipe b/games-action/bzflag/bzflag-2.4.8.recipe
similarity index 95%
rename from games-action/bzflag/bzflag-2.4.4.recipe
rename to games-action/bzflag/bzflag-2.4.8.recipe
index 03ed4f10e..3efe6f0e2 100644
--- a/games-action/bzflag/bzflag-2.4.4.recipe
+++ b/games-action/bzflag/bzflag-2.4.8.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="1993-2016 Tim Riker"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="https://download.bzflag.org/bzflag/source/$portVersion/bzflag-$portVersion.tar.bz2"
-CHECKSUM_SHA256="5842941e53440d2e88c955ddb594964fc5145912f61100832d224c1a017e2ecb"
+CHECKSUM_SHA256="43ca4d1775dac4180feb67cc4450b5db82aab9a63e460ac769c8f40d22e03122"
 PATCHES="bzflag-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -40,7 +40,6 @@ PROVIDES="
 	lib:fairCTF$secondaryArchSuffix
 	lib:fastmap$secondaryArchSuffix
 	lib:flagStay$secondaryArchSuffix
-	lib:hiddenAdmin$secondaryArchSuffix
 	lib:keepaway$secondaryArchSuffix
 	lib:killall$secondaryArchSuffix
 	lib:koth$secondaryArchSuffix
@@ -94,7 +93,7 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	libtoolize --force --copy --install
-	aclocal
+	aclocal -I m4
 	autoconf
 	automake --add-missing
 	runConfigure --omit-dirs "binDir libDir" ./configure \
@@ -113,5 +112,5 @@ INSTALL()
 
 TEST()
 {
-	make check || true
+	make check
 }
diff --git a/games-action/bzflag/patches/bzflag-2.4.4.patchset b/games-action/bzflag/patches/bzflag-2.4.8.patchset
similarity index 91%
rename from games-action/bzflag/patches/bzflag-2.4.4.patchset
rename to games-action/bzflag/patches/bzflag-2.4.8.patchset
index facd865d2..0a2cf7b8d 100644
--- a/games-action/bzflag/patches/bzflag-2.4.4.patchset
+++ b/games-action/bzflag/patches/bzflag-2.4.8.patchset
@@ -43,10 +43,10 @@ Subject: More Haiku fixes for 2.4.4
 * Haiku also has libmedia, libgame and libbe.
 
 diff --git a/configure.ac b/configure.ac
-index b8fed02..2d431fd 100644
+index da2e183..817ed6c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -307,7 +307,7 @@ fi
+@@ -319,7 +319,7 @@ fi
  
  
  dnl detect a usable system regular expression library
@@ -55,7 +55,7 @@ index b8fed02..2d431fd 100644
  [AC_CHECK_LIB(regex, regcomp, LIBREGEX="-lregex",
      [AC_CHECK_LIB(compat, regcomp, LIBREGEX="-lcompat", AC_MSG_ERROR([working regex library was not found]))]
  )]
-@@ -347,7 +347,7 @@ AC_SUBST(LIBRT)
+@@ -359,7 +359,7 @@ AC_SUBST(LIBRT)
  AC_CHECK_LIB(m, sqrtf)
  
  # for BeOS - old network stack don't have those libs ( move it in the case switch ?)
@@ -64,7 +64,7 @@ index b8fed02..2d431fd 100644
  AC_CHECK_LIB([socket], [gethostent], [], AC_CHECK_LIB([bind], [gethostent]))
  
  # see if pthreads are in libc_r (as on FreeBSD) or libpthread
-@@ -542,7 +542,7 @@ case $host_os in
+@@ -538,7 +538,7 @@ case $host_os in
      irix*)
  	GLIBS="-lXsgivc -lX11 -laudio $GLIBS"
  	;;
@@ -73,10 +73,10 @@ index b8fed02..2d431fd 100644
  	GLIBS=" -lmedia -lgame $GLIBS"
  	LIBS="-lbe"
  	;;
-@@ -557,7 +557,7 @@ esac
+@@ -549,7 +549,7 @@ esac
+ 
+ # avoid using X11 in BeOS and Mac OS X
  case $host_os in
-     macos|darwin*)
- 	;;
 -    beos*)
 +    beos*|haiku*)
  	;;