From 6b9dbe5d3d4725bd3c12146bfa11f547f8bbe47c Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Tue, 2 Mar 2021 12:15:23 -0800 Subject: [PATCH] games/bzflag: Update to 2.4.22 --- games/bzflag/Makefile | 2 +- games/bzflag/distinfo | 6 +++--- games/bzflag/files/patch-configure.ac | 11 +++++++++++ .../bzflag/files/patch-src_platform_EvdevJoystick.cxx | 11 +++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 games/bzflag/files/patch-configure.ac create mode 100644 games/bzflag/files/patch-src_platform_EvdevJoystick.cxx diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 8dc76adf72af..bf3bb45e268a 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= bzflag -PORTVERSION= 2.4.20 +PORTVERSION= 2.4.22 CATEGORIES= games MASTER_SITES= https://download.bzflag.org/bzflag/source/${PORTVERSION}/ diff --git a/games/bzflag/distinfo b/games/bzflag/distinfo index 27b528f09bb2..5f488919a1d3 100644 --- a/games/bzflag/distinfo +++ b/games/bzflag/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1589338912 -SHA256 (bzflag-2.4.20.tar.bz2) = 62c9c6175d805b4ac65d328eba8daefa56cc17931f46b42891e4fbe82aee7999 -SIZE (bzflag-2.4.20.tar.bz2) = 14032356 +TIMESTAMP = 1614561650 +SHA256 (bzflag-2.4.22.tar.bz2) = 9e64653302b657bd8b5f96fe1150a9ff80a1d53a6d7e8a35138c6b1b02006a4d +SIZE (bzflag-2.4.22.tar.bz2) = 14169079 diff --git a/games/bzflag/files/patch-configure.ac b/games/bzflag/files/patch-configure.ac new file mode 100644 index 000000000000..9deb8187bb7d --- /dev/null +++ b/games/bzflag/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2021-03-02 19:58:06 UTC ++++ configure.ac +@@ -816,7 +816,7 @@ if test x$enable_debug = xyes ; then + else + if test "$GCC" = yes ; then + case "`$CC --version 2>&1`" in +- *LLVM*|lcc*|clang*) ++ *LLVM*|lcc*|*clang*) + # Apple LLVM and MCST LCC falsely claim to be GCC + ;; + *) diff --git a/games/bzflag/files/patch-src_platform_EvdevJoystick.cxx b/games/bzflag/files/patch-src_platform_EvdevJoystick.cxx new file mode 100644 index 000000000000..a924ad920f64 --- /dev/null +++ b/games/bzflag/files/patch-src_platform_EvdevJoystick.cxx @@ -0,0 +1,11 @@ +--- src/platform/EvdevJoystick.cxx.orig 2021-03-02 20:03:56 UTC ++++ src/platform/EvdevJoystick.cxx +@@ -36,7 +36,7 @@ + + static inline int test_bit (int nr, const volatile void *addr) + { +- return 1 & (((const volatile __u32 *) addr)[nr >> 5] >> (nr & 31)); ++ return 1 & (((const volatile uint32_t *) addr)[nr >> 5] >> (nr & 31)); + } + + bool EvdevJoystick::isEvdevAvailable() -- 2.30.1