Index: Makefile =================================================================== --- Makefile (Revision 472312) +++ Makefile (Arbeitskopie) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wesnoth -PORTVERSION= 1.12.6 -PORTREVISION= 11 +PORTVERSION= 1.14.3 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ @@ -20,39 +19,44 @@ libvorbisfile.so:audio/libvorbis \ libboost_thread.so:devel/boost-libs \ libpng.so:graphics/png \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig \ + libbz2.so:archivers/bzip2 \ + libcrypto.so:security/openssl -BROKEN_FreeBSD_10= fails to build with boost 1.66, see bug 224130 -BROKEN_powerpc64= fails to link: schema_validator.cpp: undefined reference to boost::match_results - LDFLAGS+= -L${LOCALBASE}/lib -lboost_system PORTSCOUT= limitw:1,even -USES= cmake cpe pkgconfig python:run shebangfix tar:bzip2 -USE_SDL= image mixer net ttf +USES= cmake cpe pkgconfig python:run shebangfix tar:bzip2 ssl readline +USE_SDL= image2 mixer2 ttf2 USE_LDCONFIG= yes USE_GNOME= cairo pango USE_XORG= ice sm x11 xext SHEBANG_FILES= data/tools/about_cfg_to_wiki \ + data/tools/addon_manager/html.py \ data/tools/campaign2wiki.py \ - data/tools/castle-cutter/mk-castle.sh \ data/tools/expand-terrain-macros.py \ data/tools/extractbindings data/tools/imgcheck \ + data/tools/hexometer.py \ data/tools/journeylifter data/tools/rmtrans/rmtrans.py \ data/tools/scoutDefault.py data/tools/terrain2wiki.py \ data/tools/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/wescamp.py data/tools/wesnoth/wmldata.py \ data/tools/wesnoth/wmlparser.py \ data/tools/wesnoth/wmlparser2.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/wmllint_gui \ - data/tools/wmlmove data/tools/wmlscope data/tools/wmlunits \ + data/tools/wmllint-1.4 \ + data/tools/wmlunits \ + data/tools/wmlscope \ data/tools/wmlvalidator \ data/tools/GUI.pyw + CPE_VENDOR= ${PORTNAME} CPE_PRODUCT= battle_for_wesnoth CMAKE_ARGS= -DMANDIR="man" -DENABLE_STRICT_COMPILATION=off @@ -60,13 +64,11 @@ PORTDOCS= * PORTDATA= * -OPTIONS_DEFINE= ANA CAMPAIGN DOCS FRIBIDI LOWMEM NLS \ - NOTIFY OPENMP RAWSOCKETS SERVER TEST TOOLS -OPTIONS_DEFAULT= CAMPAIGN FRIBIDI NOTIFY OPENMP SERVER TOOLS +OPTIONS_DEFINE= CAMPAIGN DOCS FRIBIDI NLS \ + NOTIFY SERVER TEST +OPTIONS_DEFAULT= CAMPAIGN FRIBIDI NOTIFY SERVER OPTIONS_SUB= yes -ANA_DESC= Asynchronous Network API (WIP) -ANA_CMAKE_ON= -DUSE_ANA_NETWORK=on CAMPAIGN_DESC= Campaign server CAMPAIGN_CMAKE_ON=-DENABLE_CAMPAIGN_SERVER=on DOCS_CMAKE_OFF= -DDOCDIR=none @@ -73,8 +75,6 @@ FRIBIDI_DESC= Bidirectional support FRIBIDI_LIB_DEPENDS=libfribidi.so:converters/fribidi FRIBIDI_CMAKE_OFF=-DENABLE_FRIBIDI=off -LOWMEM_DESC= Reduce memory usage (disables animations) -LOWMEM_CMAKE_ON=-DENABLE_LOW_MEM=on NLS_USES= gettext NLS_CMAKE_ON= -DLOCALEDIR=${PREFIX}/share/locale NLS_CMAKE_OFF= -DENABLE_NLS=off @@ -81,20 +81,9 @@ NOTIFY_DESC= Desktop notifications NOTIFY_LIB_DEPENDS=libdbus-1.so:devel/dbus NOTIFY_CMAKE_OFF=-DENABLE_NOTIFICATIONS=off -OPENMP_DESC= OpenMP support -# -std=gnu++11 is necessary on FreeBSD 10, whose libc++ does not have the -# `operator delete(void*, size_t)' overload from C++14. GCC 6 defaults to -# --std=gnu++14, which then breaks the build (bug 219485). -OPENMP_USE= CXXSTD=gnu++11 -OPENMP_USES= compiler:gcc-c++11-lib -OPENMP_CMAKE_ON=-DENABLE_OMP=on -RAWSOCKETS_DESC= Use raw receiving sockets in multiplayer -RAWSOCKETS_CFLAGS=-DNETWORK_USE_RAW_SOCKETS SERVER_DESC= Server SERVER_CMAKE_OFF=-DENABLE_SERVER=off TEST_CMAKE_ON= -DENABLE_TESTS=on -TOOLS_DESC= Extra tools for artists and translators -TOOLS_CMAKE_ON= -DENABLE_TOOLS=on post-install: ${FIND} ${STAGEDIR}${PREFIX}/man -type d -empty -delete Index: distinfo =================================================================== --- distinfo (Revision 472312) +++ distinfo (Arbeitskopie) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482223424 -SHA256 (wesnoth-1.12.6.tar.bz2) = a50f384cead15f68f31cfa1a311e76a12098428702cb674d3521eb169eb92e4e -SIZE (wesnoth-1.12.6.tar.bz2) = 387869758 +TIMESTAMP = 1528893082 +SHA256 (wesnoth-1.14.3.tar.bz2) = e9f17f0245a2b7f63b28d77a1cc8854355768665f5ca93ffd3e7641b0840c418 +SIZE (wesnoth-1.14.3.tar.bz2) = 450194119 Index: files/patch-src_game__initialization_lobby__data.hpp =================================================================== --- files/patch-src_game__initialization_lobby__data.hpp (nicht existent) +++ files/patch-src_game__initialization_lobby__data.hpp (Arbeitskopie) @@ -0,0 +1,10 @@ +--- src/game_initialization/lobby_data.hpp.orig 2018-06-13 12:34:17 UTC ++++ src/game_initialization/lobby_data.hpp +@@ -14,6 +14,7 @@ + + #pragma once + ++#include + #include + #include + #include Property changes on: files/patch-src_game__initialization_lobby__data.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_replay.hpp =================================================================== --- files/patch-src_replay.hpp (nicht existent) +++ files/patch-src_replay.hpp (Arbeitskopie) @@ -0,0 +1,10 @@ +--- src/replay.hpp.orig 2018-06-13 12:34:27 UTC ++++ src/replay.hpp +@@ -21,6 +21,7 @@ + + #include "map/location.hpp" + ++#include + #include + #include + #include Property changes on: files/patch-src_replay.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_tests_test__util.cpp =================================================================== --- files/patch-src_tests_test__util.cpp (Revision 472312) +++ files/patch-src_tests_test__util.cpp (nicht existent) @@ -1,11 +0,0 @@ ---- src/tests/test_util.cpp.orig 2015-06-25 23:08:11 UTC -+++ src/tests/test_util.cpp -@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE( test_count_leading - BOOST_CHECK( count_leading_ones(static_cast(0xFF)) == 8 ); - BOOST_CHECK( count_leading_ones(static_cast(0xFFFF)) == 16 ); - BOOST_CHECK( count_leading_ones(static_cast(0xFFFFFFFF)) == 32 ); -- BOOST_CHECK( count_leading_ones(static_cast(0xFFFFFFFFFFFFFFFF)) -+ BOOST_CHECK( count_leading_ones(static_cast(0xFFFFFFFFFFFFFFFFULL)) - == 64 ); - BOOST_CHECK( count_leading_ones(static_cast(0xF8)) == 5 ); - BOOST_CHECK( count_leading_ones(static_cast(54321)) == 2 ); Property changes on: files/patch-src_tests_test__util.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property