From fb33028f669e04aacdc400cb35b5891582f7bf70 Mon Sep 17 00:00:00 2001
From: Herby Gillot <herby.gillot@gmail.com>
Date: Tue, 7 Apr 2026 22:22:23 -0400
Subject: [PATCH] wesnoth: update to 1.18.7

---
 games/wesnoth/Portfile               | 23 +++++++++++++----------
 games/wesnoth/files/frameworks.patch | 24 ------------------------
 2 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100644 games/wesnoth/files/frameworks.patch

diff --git a/games/wesnoth/Portfile b/games/wesnoth/Portfile
index bb70b2484ee..d3da9fdf7d4 100644
--- a/games/wesnoth/Portfile
+++ b/games/wesnoth/Portfile
@@ -2,16 +2,16 @@
 
 PortSystem              1.0
 PortGroup               github 1.0
+PortGroup               boost 1.0
 PortGroup               cmake 1.1
 PortGroup               app 1.0
+PortGroup               openssl 1.0
 
-github.setup            wesnoth wesnoth 1.16.12
-# Change github.tarball_from to 'releases' or 'archive' next update
-github.tarball_from     tarball
+github.setup            wesnoth wesnoth 1.18.7
 revision                0
-checksums               rmd160  8cb290ae1451d4dea2665baae6e99999d0e7cba0 \
-                        sha256  1ebb0ec3f7d90ec1edf61710253a05ff5b04d7068a1d48d29b0e6318c946b966 \
-                        size    476686555
+checksums               rmd160  9535ea64d70b9c5e2ced16e085b191313ac05fb1 \
+                        sha256  d6b50cfdf4388954a1c3da66a61abacdc7643a17aa78a16196e16e720a661fc2 \
+                        size    467312032
 
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              games
@@ -33,8 +33,7 @@ long_description        Battle for Wesnoth is a fantasy turn-based strategy \
 
 depends_build-append    path:bin/pkg-config:pkgconfig
 
-depends_lib-append      port:boost \
-                        port:bzip2 \
+depends_lib-append      port:bzip2 \
                         path:lib/pkgconfig/cairo.pc:cairo \
                         port:expat \
                         port:fontconfig \
@@ -48,20 +47,24 @@ depends_lib-append      port:boost \
                         port:libogg \
                         path:lib/pkgconfig/pixman-1.pc:libpixman \
                         port:libpng \
-                        port:readline \
                         port:libsdl2 \
                         port:libsdl2_image \
                         port:libsdl2_mixer \
                         port:libsdl2_net \
                         port:libsdl2_ttf \
                         port:libvorbis \
+                        port:lua54 \
                         path:lib/pkgconfig/pango.pc:pango \
                         port:pcre \
+                        port:readline \
                         port:zlib
 
 compiler.cxx_standard   2017
 
-patchfiles-append       frameworks.patch
+cmake.build_type        Release
+
+configure.args-append   -DENABLE_SYSTEM_LUA=ON
+
 patchfiles-append       patch-wesnoth-apple-notifications.diff
 patchfiles-append       patch-wesnoth-sdl-main.diff
 
diff --git a/games/wesnoth/files/frameworks.patch b/games/wesnoth/files/frameworks.patch
deleted file mode 100644
index e34c590aa4e..00000000000
--- a/games/wesnoth/files/frameworks.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Use the required frameworks.
-https://github.com/wesnoth/wesnoth/pull/6758
---- CMakeLists.txt.orig	2022-05-29 10:04:52.000000000 -0500
-+++ CMakeLists.txt	2022-06-08 14:43:54.000000000 -0500
-@@ -66,6 +66,8 @@
- find_package(OpenSSL 1.0 REQUIRED)
- 
- if(APPLE)
-+	find_library(APPKIT_LIBRARY AppKit REQUIRED)
-+	find_library(FOUNDATION_LIBRARY Foundation REQUIRED)
- 	find_library(IOKIT_LIBRARY IOKit REQUIRED)
- 	find_library(SECURITY_LIBRARY Security REQUIRED)
- endif()
---- src/CMakeLists.txt.orig	2022-05-29 10:04:52.000000000 -0500
-+++ src/CMakeLists.txt	2022-06-08 14:44:36.000000000 -0500
-@@ -45,7 +45,7 @@
- elseif(MINGW)
- 	set(common-external-libs ${common-external-libs} wsock32 ws2_32 shlwapi winmm)
- elseif(APPLE)
--	set(common-external-libs ${common-external-libs} ${IOKIT_LIBRARY} ${SECURITY_LIBRARY})
-+	set(common-external-libs ${common-external-libs} ${APPKIT_LIBRARY} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY} ${SECURITY_LIBRARY})
- endif()
- 
- set(game-external-libs