git: 54a2c18c0acb - main - games/wesnoth: update to 1.18.4 release (+)

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=54a2c18c0acb8d6ca488a50ff018685a4100d4e4

commit 54a2c18c0acb8d6ca488a50ff018685a4100d4e4
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2025-03-24 21:07:58 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2025-03-24 22:16:38 +0000

    games/wesnoth: update to 1.18.4 release (+)
    
    Changelog:      https://github.com/wesnoth/wesnoth/blob/1.18/changelog.md#version-1184
    PR:             285212 (based on)
---
 games/wesnoth/Makefile                       | 12 ++----------
 games/wesnoth/distinfo                       | 10 +++-------
 games/wesnoth/files/patch-src_filesystem.hpp | 10 ++++++++++
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 153e65997b04..3c0c234da4bf 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,16 +1,12 @@
 PORTNAME=	wesnoth
-PORTVERSION=	1.18.3
-PORTREVISION=	4
+PORTVERSION=	1.18.4
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
 		http://files.wesnoth.org/ \
 		http://ports.toco-domains.de/
 
-PATCH_SITES+=	https://github.com/wesnoth/wesnoth/commit/
-PATCHFILES+=	e8271cd1387e05eca3342da3584a64adb1aae7d8.patch:-p1
-PATCHFILES+=	37ee134d7a17f509982f6ba4fda60a6b1e9acc72.patch:-p1
-
+#PATCH_SITES+=	https://github.com/wesnoth/wesnoth/commit/
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Fantasy turn-based strategy game
@@ -127,10 +123,6 @@ SERVER_DESC=	Server
 SERVER_CMAKE_OFF=-DENABLE_SERVER=off
 TEST_CMAKE_ON=	-DENABLE_TESTS=on
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,def = NULL,def = 0," \
-		${WRKSRC}/src/utils/config_filters.hpp
-
 #post-install:
 #	${FIND} ${STAGEDIR}${PREFIX}/man -type d -empty -delete
 
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 52948d862923..6418b57ed02c 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1739483659
-SHA256 (wesnoth-1.18.3.tar.bz2) = d2d07aae5fd8d09509b8137034e4648cc5c356188a5dbd785831511728d1eb7e
-SIZE (wesnoth-1.18.3.tar.bz2) = 461694247
-SHA256 (e8271cd1387e05eca3342da3584a64adb1aae7d8.patch) = 08c5451a24e0c7f6782f079f82d0a54e2068371a67b50e55dc5f11c6240a7e35
-SIZE (e8271cd1387e05eca3342da3584a64adb1aae7d8.patch) = 6873
-SHA256 (37ee134d7a17f509982f6ba4fda60a6b1e9acc72.patch) = f3603444fdf386698f1ebb6e2a15d1453fc1b35273a48836eb99135aac7b0696
-SIZE (37ee134d7a17f509982f6ba4fda60a6b1e9acc72.patch) = 10222
+TIMESTAMP = 1741648592
+SHA256 (wesnoth-1.18.4.tar.bz2) = 2b95351729fcf1384d521d540aa0adfc80a9be2991aa4791f3b090678e4364ae
+SIZE (wesnoth-1.18.4.tar.bz2) = 461847477
diff --git a/games/wesnoth/files/patch-src_filesystem.hpp b/games/wesnoth/files/patch-src_filesystem.hpp
new file mode 100644
index 000000000000..570850ac9575
--- /dev/null
+++ b/games/wesnoth/files/patch-src_filesystem.hpp
@@ -0,0 +1,10 @@
+--- src/filesystem.hpp.orig	2025-02-17 21:50:08 UTC
++++ src/filesystem.hpp
+@@ -21,6 +21,7 @@
+ #pragma once
+ 
+ #include <ctime>
++#include <cstdint>
+ #include <fstream>
+ #include <iosfwd>
+ #include <memory>