diff --git a/games-action/bzflag/bzflag-2.4.18.recipe b/games-action/bzflag/bzflag-2.4.22.recipe similarity index 93% rename from games-action/bzflag/bzflag-2.4.18.recipe rename to games-action/bzflag/bzflag-2.4.22.recipe index 4bcc5352c..956778bca 100644 --- a/games-action/bzflag/bzflag-2.4.18.recipe +++ b/games-action/bzflag/bzflag-2.4.22.recipe @@ -5,11 +5,11 @@ 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="https://www.bzflag.org/" -COPYRIGHT="1993-2018 Tim Riker" +COPYRIGHT="1993-2021 Tim Riker" LICENSE="GNU LGPL v2.1" -REVISION="3" +REVISION="1" SOURCE_URI="https://download.bzflag.org/bzflag/source/$portVersion/bzflag-$portVersion.tar.bz2" -CHECKSUM_SHA256="9d0d512f3a09a207ab399a8dc4807224564cdc7a9346b702fec80d5b7918bfbe" +CHECKSUM_SHA256="9e64653302b657bd8b5f96fe1150a9ff80a1d53a6d7e8a35138c6b1b02006a4d" PATCHES="bzflag-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" diff --git a/games-action/bzflag/patches/bzflag-2.4.18.patchset b/games-action/bzflag/patches/bzflag-2.4.22.patchset similarity index 58% rename from games-action/bzflag/patches/bzflag-2.4.18.patchset rename to games-action/bzflag/patches/bzflag-2.4.22.patchset index 105c1056e..fe06499d1 100644 --- a/games-action/bzflag/patches/bzflag-2.4.18.patchset +++ b/games-action/bzflag/patches/bzflag-2.4.22.patchset @@ -1,24 +1,83 @@ -From 289cb0c75b8bfba99da30c7ee680cf0270ccab1f Mon Sep 17 00:00:00 2001 +From 6b8d3751ad90f51336bf867485d98affe9bdd158 Mon Sep 17 00:00:00 2001 +From: fbrosson +Date: Sun, 3 Jul 2016 21:49:57 +0000 +Subject: Haiku fixes for BZFlag 2.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 48b45d6..d14c165 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -320,7 +320,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]))] + )] +@@ -362,6 +362,7 @@ 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([socket], [gethostent], [], AC_CHECK_LIB([bind], [gethostent])) ++AC_CHECK_LIB([network], [gethostent], [], AC_CHECK_LIB([bind], [gethostent])) + + # see if pthreads are in libc_r (as on FreeBSD) or libpthread + AC_CHECK_LIB([c_r], [pthread_create], LIBPTHREAD="-lc_r", +@@ -538,7 +539,7 @@ case $host_os in + irix*) + GLIBS="-lXsgivc -lX11 -laudio $GLIBS" + ;; +- beos) ++ beos|haiku*) + GLIBS=" -lmedia -lgame $GLIBS" + LIBS="-lbe" + ;; +@@ -552,7 +553,7 @@ esac + + # avoid using X11 in BeOS and Mac OS X + case $host_os in +- beos*) ++ beos*|haiku*) + ;; + darwin*) + ;; +@@ -906,7 +907,7 @@ BZ_CONFIGURE_STAGE([services], [8 of 9]) + # need to consolidate them to here. + + case $host_os in +- beos*) ++ beos*|haiku*) + beos=true + ;; + darwin*) +-- +2.30.2 + + +From f4c981a1a49598f25f0f33af0163f80af985bd5d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 9 Jun 2015 15:21:49 +0200 -Subject: Haiku fixes. - +Subject: more Haiku fixes diff --git a/include/network.h b/include/network.h -index 243e4ae..5aeb749 100644 +index 4ef4c77..c512cc1 100644 --- a/include/network.h +++ b/include/network.h -@@ -57,7 +57,7 @@ - # include - #endif +@@ -100,7 +100,7 @@ using CNCTType = sockaddr const; // only appears used in bzadmin + # endif + + // BeOS net_server has closesocket(), which _must_ be used in place of close() +-# if defined(__BEOS__) && (IPPROTO_TCP != 6) ++# if defined(__BEOS__) ||defined(__HAIKU__) && (IPPROTO_TCP != 6) + # define close(__x) closesocket(__x) + # 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 diff --git a/src/common/TimeKeeper.cxx b/src/common/TimeKeeper.cxx -index b491191..54136b7 100644 +index e0c30a7..014671e 100644 --- a/src/common/TimeKeeper.cxx +++ b/src/common/TimeKeeper.cxx @@ -20,7 +20,7 @@ @@ -31,57 +90,5 @@ index b491191..54136b7 100644 #endif #if !defined(_WIN32) -- -2.14.2 - - -From 26d765ed4527c3d1c832f12cf7e8d1ec4f90d0ac Mon Sep 17 00:00:00 2001 -From: fbrosson -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 bfcccb4..0487a23 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -337,7 +337,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]))] - )] -@@ -377,7 +377,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 -@@ -556,7 +556,7 @@ case $host_os in - irix*) - GLIBS="-lXsgivc -lX11 -laudio $GLIBS" - ;; -- beos) -+ beos|haiku*) - GLIBS=" -lmedia -lgame $GLIBS" - LIBS="-lbe" - ;; -@@ -567,7 +567,7 @@ esac - - # avoid using X11 in BeOS and Mac OS X - case $host_os in -- beos*) -+ beos*|haiku*) - ;; - darwin*) - ;; --- -2.14.2 +2.30.2