BZFlag: bump to 2.4.4, add x86{,_64}, enable ncurses for bzadmin. (#664)

* Bump to 2.4.4, add x86{,_64}, add patches to configure.ac. * Drop --disable-{ares,curl,zlib}-build configure options as they are no longer available in 2.4.4. Add --enable-robots. * Move the 33 libs to a lib/bzflag/ sub-directory. * Enable ncurses support for bzadmin.
2026-04-23 12:10:06 +02:00 · 2016-07-04 21:50:27 +00:00
parent 47e7d4e072
commit 725127a91d
3 changed files with 130 additions and 47 deletions
--- a/games-action/bzflag/bzflag-2.4.4.recipe
+++ b/games-action/bzflag/bzflag-2.4.4.recipe
@@ -4,27 +4,37 @@ originates from \"Battle Zone Capture The Flag\". It runs on Windows, Mac OSX, \
 Linux, BSD, and other platforms. It was one of the most popular games ever on \
 Silicon Graphics machines and continues to be developed and improved to this \
 day."
-HOMEPAGE="http://www.bzflag.org/"
-COPYRIGHT="1993-2010 Tim Riker"
+HOMEPAGE="http://bzflag.org/"
+COPYRIGHT="1993-2016 Tim Riker"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="http://downloads.sourceforge.net/project/bzflag/bzflag%20source/$portVersion/bzflag-$portVersion.tar.bz2"
-CHECKSUM_SHA256="4f7bc52284cc4b39fc352855e555b2b064c1de6a18f7474e249073070762c811"
+SOURCE_URI="https://download.bzflag.org/bzflag/source/$portVersion/bzflag-$portVersion.tar.bz2"
+CHECKSUM_SHA256="5842941e53440d2e88c955ddb594964fc5145912f61100832d224c1a017e2ecb"
 PATCHES="bzflag-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+
+if [ "$targetArchitecture" != x86_gcc2 ]; then
+	commandSuffix=$secondaryArchSuffix
+	commandBinDir=$binDir
+else
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi

 PROVIDES="
 	bzflag$secondaryArchSuffix = $portVersion
-	cmd:bzadmin$secondaryArchSuffix
-	cmd:bzfs$secondaryArchSuffix
+	cmd:bzadmin$commandSuffix
+	cmd:bzfs$commandSuffix
+	lib:CustomZoneSample$secondaryArchSuffix
 	lib:HoldTheFlag$secondaryArchSuffix
 	lib:Phoenix$secondaryArchSuffix
 	lib:SAMPLE_PLUGIN$secondaryArchSuffix
 	lib:TimeLimit$secondaryArchSuffix
 	lib:airspawn$secondaryArchSuffix
 	lib:autoFlagReset$secondaryArchSuffix
+	lib:bzfscron$secondaryArchSuffix
 	lib:chathistory$secondaryArchSuffix
 	lib:customflagsample$secondaryArchSuffix
 	lib:fairCTF$secondaryArchSuffix
@@ -43,7 +53,9 @@ PROVIDES="
 	lib:regFlag$secondaryArchSuffix
 	lib:RogueGenocide$secondaryArchSuffix
 	lib:serverControl$secondaryArchSuffix
+	lib:serverSidePlayerSample$secondaryArchSuffix
 	lib:shockwaveDeath$secondaryArchSuffix
+	lib:superUser$secondaryArchSuffix
 	lib:teamflagreset$secondaryArchSuffix
 	lib:thiefControl$secondaryArchSuffix
 	lib:timedctf$secondaryArchSuffix
@@ -54,6 +66,7 @@ REQUIRES="
 	lib:libcares$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -61,20 +74,33 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcares$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix
 	devel:libcurl$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
 	cmd:autoconf
+	cmd:automake
+	cmd:autoheader
 	cmd:gawk
-	cmd:gcc$secondaryArchSuffix
+	cmd:g++$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"

 BUILD()
 {
-	export LDFLAGS=-lnetwork
-	runConfigure ./configure --disable-ares-build --disable-curl-build --disable-zlib-build
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake --add-missing
+	runConfigure --omit-dirs "binDir libDir" ./configure \
+		--bindir=$commandBinDir \
+		--libdir=$libDir/bzflag \
+		--enable-robots
 	make $jobArgs
 }

@@ -82,5 +108,10 @@ INSTALL()
 {
 	make install

-	rm $libDir/*.la
+	rm $libDir/bzflag/*.la
+}
+
+TEST()
+{
+	make check || true
 }
--- a/games-action/bzflag/patches/bzflag-2.4.2.patchset
+++ b/games-action/bzflag/patches/bzflag-2.4.2.patchset
@@ -1,35 +0,0 @@
-From d206a22e8a8764c209aa086bdd6a6ff2d5647f39 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@gmail.com>
-Date: Tue, 9 Jun 2015 15:21:49 +0200
-Subject: Haiku fixes.
-
-
-diff --git a/include/network.h b/include/network.h
-index 5282d85..b098d8b 100644
--- a/include/network.h
-+++ b/include/network.h
-@@ -64,7 +64,7 @@
- #  define AddrLen		unsigned int
- /* setsockopt incorrectly prototypes the 4th arg without const. */
- #  define SSOType		void*
-#elif defined(BSD) || defined(sun) || defined(__GLIBC__)
-+#elif defined(BSD) || defined(sun) || defined(__GLIBC__) || defined(__HAIKU__)
- #  define AddrLen		socklen_t
- #elif defined (__APPLE__)
- #  include <AvailabilityMacros.h>
-diff --git a/src/common/TimeKeeper.cxx b/src/common/TimeKeeper.cxx
-index a31c868..32caec3 100644
--- a/src/common/TimeKeeper.cxx
-+++ b/src/common/TimeKeeper.cxx
-@@ -20,7 +20,7 @@
- #ifdef HAVE_UNISTD_H
- #  include <unistd.h>
- #endif
-#ifdef __BEOS__
-+#if defined(__BEOS__)||defined(__HAIKU__)
- #  include <OS.h>
- #endif
- #if !defined(_WIN32)
-- 
-2.2.2
-
--- a/games-action/bzflag/patches/bzflag-2.4.4.patchset
+++ b/games-action/bzflag/patches/bzflag-2.4.4.patchset
@@ -0,0 +1,87 @@
+From d206a22e8a8764c209aa086bdd6a6ff2d5647f39 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Tue, 9 Jun 2015 15:21:49 +0200
+Subject: Haiku fixes.
+
+
+diff --git a/include/network.h b/include/network.h
+index ab0ebd1..94520a5 100644
+--- a/include/network.h
+++ b/include/network.h
+@@ -57,7 +57,7 @@
+ #  include <bstring.h>
+ #endif
+ 
+-#if defined(BSD) || defined(__sun__) || defined(__GLIBC__)
+#if defined(BSD) || defined(__sun__) || defined(__GLIBC__) || defined(__HAIKU__)
+ #  define AddrLen		socklen_t
+ #elif defined (__APPLE__)
+ #  include <AvailabilityMacros.h>
+diff --git a/src/common/TimeKeeper.cxx b/src/common/TimeKeeper.cxx
+index 3765a87..72f272a 100644
+--- a/src/common/TimeKeeper.cxx
+++ b/src/common/TimeKeeper.cxx
+@@ -20,7 +20,7 @@
+ #ifdef HAVE_UNISTD_H
+ #  include <unistd.h>
+ #endif
+-#ifdef __BEOS__
+#if defined(__BEOS__)||defined(__HAIKU__)
+ #  include <OS.h>
+ #endif
+ #if !defined(_WIN32)
+-- 
+2.2.2
+
+
+From e685ea9bc14785c6f476e4dcdc7b4fcfbdeb1748 Mon Sep 17 00:00:00 2001
+From: fbrosson <fbrosson@localhost>
+Date: Sun, 3 Jul 2016 21:49:57 +0000
+Subject: More Haiku fixes for 2.4.4
+
+* Look for regcomp in libroot instead of libc.
+* Haiku also has libmedia, libgame and libbe.
+
+diff --git a/configure.ac b/configure.ac
+index b8fed02..2d431fd 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -307,7 +307,7 @@ fi
+ 
+ 
+ dnl detect a usable system regular expression library
+-AC_CHECK_LIB(c, regcomp, LIBREGEX="-lc",
+AC_CHECK_LIB(root, regcomp, LIBREGEX="-lroot",
+ [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)
+ AC_CHECK_LIB(m, sqrtf)
+ 
+ # for BeOS - old network stack don't have those libs ( move it in the case switch ?)
+-AC_CHECK_LIB([socket], [socket])
+AC_CHECK_LIB([network], [socket])
+ 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
+     irix*)
+ 	GLIBS="-lXsgivc -lX11 -laudio $GLIBS"
+ 	;;
+-    beos)
+    beos|haiku*)
+ 	GLIBS=" -lmedia -lgame $GLIBS"
+ 	LIBS="-lbe"
+ 	;;
+@@ -557,7 +557,7 @@ esac
+ case $host_os in
+     macos|darwin*)
+ 	;;
+-    beos*)
+    beos*|haiku*)
+ 	;;
+     *)
+ 	CONF_CPPFLAGS="$CONF_CPPFLAGS $X_CFLAGS"
+-- 
+2.9.0
+