From 8eced2b0fca480eebd8b49b46d27581f33e25781 Mon Sep 17 00:00:00 2001
From: trustbyte <trustbyte@yahoo.com>
Date: Sat, 28 Mar 2026 09:35:06 +0100
Subject: [PATCH] bzflag: update to 2.4.30

---
 games/bzflag/Portfile                      | 24 +++++++++++++++------
 games/bzflag/files/dynamic_lookup-11.patch | 25 ----------------------
 2 files changed, 17 insertions(+), 32 deletions(-)
 delete mode 100644 games/bzflag/files/dynamic_lookup-11.patch

diff --git a/games/bzflag/Portfile b/games/bzflag/Portfile
index db31cf7e740..fa49c962433 100644
--- a/games/bzflag/Portfile
+++ b/games/bzflag/Portfile
@@ -4,8 +4,8 @@ PortSystem          1.0
 PortGroup           app 1.0
 
 name                bzflag
-version             2.4.26
-revision            2
+version             2.4.30
+revision            0
 categories          games
 maintainers         {allejo.io:me @allejo} openmaintainer
 license             {LGPL-2.1 MPL-2}
@@ -18,9 +18,9 @@ homepage            https://www.bzflag.org/
 master_sites        https://download.bzflag.org/bzflag/source/${version}/
 use_bzip2           yes
 
-checksums           rmd160  2aa5256083f20845b8bfddb3f7c3db7991324682 \
-                    sha256  01830405ff26ad1dc595a7e0695c824c2786e678868d9ff822aeb14ac7481014 \
-                    size    14107130
+checksums           rmd160  74e2cc066be9e3e7fd3b00395809986263a615ae \
+                    sha256  bb78b750e7bce7aa7c11bd35906bb08a49acc7c50bf29629af380eecd153894d \
+                    size    14131760
 
 depends_build       port:pkgconfig
 depends_lib         port:c-ares \
@@ -30,10 +30,20 @@ depends_lib         port:c-ares \
                     port:ncurses \
                     port:zlib
 
-patchfiles          dynamic_lookup-11.patch
-
 compiler.cxx_standard 2011
 
+post-extract {
+    set configure_file [file join ${worksrcpath} configure]
+    set f [open $configure_file r]
+    set contents [read $f]
+    close $f
+    # Remove ccache from CC and CXX assignments
+    set contents [string map {{CC="ccache } {CC="} {CXX="ccache } {CXX="}} $contents]
+    set f [open $configure_file w]
+    puts -nonewline $f $contents
+    close $f
+}
+
 configure.args      --libdir=${prefix}/lib/${name} \
                     --disable-sdltest
 
diff --git a/games/bzflag/files/dynamic_lookup-11.patch b/games/bzflag/files/dynamic_lookup-11.patch
deleted file mode 100644
index a95d2ab2480..00000000000
--- a/games/bzflag/files/dynamic_lookup-11.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Recognize macOS 11 and later, remove inaccurate comment, and simplify.
-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
---- configure.orig	2018-10-18 21:40:08.000000000 +1100
-+++ configure	2021-08-30 07:56:20.000000000 +1000
-@@ -10658,16 +10658,11 @@
-       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
-     darwin1.*)
-       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
--    darwin*) # darwin 5.x on
--      # if running on 10.5 or later, the deployment target defaults
--      # to the OS version, if on x86, and 10.4, the deployment
--      # target defaults to 10.4. Don't you love it?
--      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
--	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
--	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
--	10.[012][,.]*)
-+    darwin*)
-+      case $MACOSX_DEPLOYMENT_TARGET,$host in
-+	10.[012],*|,*powerpc*-darwin[5-8]*)
- 	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
--	10.*)
-+	*)
- 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-       esac
-     ;;