diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index bfbf570b119a..0c831f717705 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,93 +1,93 @@ PORTNAME= wesnoth -PORTVERSION= 1.16.9 +PORTVERSION= 1.16.10 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ http://files.wesnoth.org/ \ http://ports.toco-domains.de/ MAINTAINER= fluffy@FreeBSD.org COMMENT= Fantasy turn-based strategy game WWW= https://www.wesnoth.org/ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 \ libvorbisfile.so:audio/libvorbis \ libboost_thread.so:devel/boost-libs \ libpng.so:graphics/png \ libfontconfig.so:x11-fonts/fontconfig \ libicudata.so:devel/icu \ libharfbuzz.so:print/harfbuzz -LDFLAGS+= -L${LOCALBASE}/lib -lboost_system - -PORTSCOUT= limitw:1,even - -USES= cmake compiler:c++17-lang cpe gnome pkgconfig \ +USES= cmake compiler:c++17-lang cpe desktop-file-utils gnome pkgconfig \ python:run readline shebangfix ssl sdl tar:bzip2 xorg USE_SDL= image2 mixer2 ttf2 -USE_LDCONFIG= yes USE_GNOME= cairo pango USE_XORG= ice sm x11 xext + +LDFLAGS+= -L${LOCALBASE}/lib -lboost_system + +PORTSCOUT= limitw:1,even + SHEBANG_FILES= data/tools/about_cfg_to_wiki \ data/tools/addon_manager/html.py \ data/tools/expand-terrain-macros.py \ data/tools/extractbindings data/tools/imgcheck \ data/tools/GUI.pyw \ data/tools/hexometer.py \ data/tools/steam-changelog \ data/tools/trackviewer.pyw \ data/tools/terrain2wiki.py \ data/tools/tmx_trackplacer \ data/tools/unit_tree/TeamColorizer \ data/tools/unit_tree/helpers.py \ data/tools/unit_tree/overview.py \ data/tools/unit_tree/update-wmlunits \ data/tools/wesnoth/campaignserver_client.py \ data/tools/wesnoth/trackplacer3/datatypes.py \ data/tools/wesnoth/version.py \ data/tools/wesnoth/wescamp.py data/tools/wesnoth/wmldata.py \ data/tools/wesnoth/wmlparser.py \ data/tools/wesnoth/wmlparser3.py \ data/tools/wesnoth_addon_manager data/tools/wmlflip \ data/tools/wmlindent data/tools/wmllint \ data/tools/wmllint-1.4 \ data/tools/wmlunits \ data/tools/wmlscope \ data/tools/wmlxgettext CPE_VENDOR= ${PORTNAME} CPE_PRODUCT= battle_for_wesnoth CMAKE_ARGS= -DMANDIR="man" -DENABLE_STRICT_COMPILATION=off PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= CAMPAIGN DOCS FRIBIDI NLS \ NOTIFY SERVER TEST OPTIONS_DEFAULT= CAMPAIGN FRIBIDI NOTIFY SERVER OPTIONS_SUB= yes CAMPAIGN_DESC= Campaign server CAMPAIGN_CMAKE_ON=-DENABLE_CAMPAIGN_SERVER=on DOCS_CMAKE_OFF= -DDOCDIR=none FRIBIDI_DESC= Bidirectional support FRIBIDI_LIB_DEPENDS=libfribidi.so:converters/fribidi FRIBIDI_CMAKE_OFF=-DENABLE_FRIBIDI=off NLS_USES= gettext NLS_CMAKE_ON= -DLOCALEDIR=${PREFIX}/share/locale NLS_CMAKE_OFF= -DENABLE_NLS=off NOTIFY_DESC= Desktop notifications NOTIFY_LIB_DEPENDS=libdbus-1.so:devel/dbus NOTIFY_CMAKE_OFF=-DENABLE_NOTIFICATIONS=off SERVER_DESC= Server SERVER_CMAKE_OFF=-DENABLE_SERVER=off TEST_CMAKE_ON= -DENABLE_TESTS=on post-install: ${FIND} ${STAGEDIR}${PREFIX}/man -type d -empty -delete .include diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo index 59e9d0236ec7..14fe12a9e6b8 100644 --- a/games/wesnoth/distinfo +++ b/games/wesnoth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681753961 -SHA256 (wesnoth-1.16.9.tar.bz2) = 3ded6938fb24100b9884ab5a902711f6c7a25cef65aafddb3e3b8a15b7652386 -SIZE (wesnoth-1.16.9.tar.bz2) = 476167874 +TIMESTAMP = 1695160694 +SHA256 (wesnoth-1.16.10.tar.bz2) = a60521b1ee1c2ddc7dfde89a038b893a4b43337085bd1478f4bc92dab7da7fc7 +SIZE (wesnoth-1.16.10.tar.bz2) = 476195873 diff --git a/games/wesnoth/files/patch-boost-1.83 b/games/wesnoth/files/patch-boost-1.83 new file mode 100644 index 000000000000..b3161206616e --- /dev/null +++ b/games/wesnoth/files/patch-boost-1.83 @@ -0,0 +1,26 @@ +From 136e651d69fc91fa7a4154f8a4a7e977cc46eca4 Mon Sep 17 00:00:00 2001 +From: Pentarctagon +Date: Thu, 17 Aug 2023 23:19:21 -0500 +Subject: [PATCH] Compile fix for boost 1.83. + +Fixes #7849 +--- + src/gettext.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git src/gettext.cpp src/gettext.cpp +index 9888dede35ad..fa9b17ba85b2 100644 +--- src/gettext.cpp ++++ src/gettext.cpp +@@ -169,7 +169,11 @@ namespace + return msg; + } + ++#if BOOST_VERSION < 108300 + const char* get(int domain_id, const char* ctx, const char* sid, int n) const override ++#else ++ const char* get(int domain_id, const char* ctx, const char* sid, bl::count_type n) const override ++#endif + { + auto& base = get_base(); + const char* msg = base.get(domain_id, ctx, sid, n);