View | Details | Raw Unified | Return to bug 228984
Collapse All | Expand All

(-)Makefile (-29 / +18 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	wesnoth
3
PORTNAME=	wesnoth
4
PORTVERSION=	1.12.6
4
PORTVERSION=	1.14.3
5
PORTREVISION=	11
6
PORTEPOCH=	1
5
PORTEPOCH=	1
7
CATEGORIES=	games
6
CATEGORIES=	games
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
Lines 20-58 Link Here
20
		libvorbisfile.so:audio/libvorbis \
19
		libvorbisfile.so:audio/libvorbis \
21
		libboost_thread.so:devel/boost-libs \
20
		libboost_thread.so:devel/boost-libs \
22
		libpng.so:graphics/png \
21
		libpng.so:graphics/png \
23
		libfontconfig.so:x11-fonts/fontconfig
22
		libfontconfig.so:x11-fonts/fontconfig \
23
		libbz2.so:archivers/bzip2 \
24
    libcrypto.so:security/openssl
24
25
25
BROKEN_FreeBSD_10=	fails to build with boost 1.66, see bug 224130
26
BROKEN_powerpc64=	fails to link: schema_validator.cpp: undefined reference to boost::match_results
27
28
LDFLAGS+=	-L${LOCALBASE}/lib -lboost_system
26
LDFLAGS+=	-L${LOCALBASE}/lib -lboost_system
29
27
30
PORTSCOUT=	limitw:1,even
28
PORTSCOUT=	limitw:1,even
31
29
32
USES=		cmake cpe pkgconfig python:run shebangfix tar:bzip2
30
USES=		cmake cpe pkgconfig python:run shebangfix tar:bzip2 ssl readline
33
USE_SDL=	image mixer net ttf
31
USE_SDL=	image2 mixer2 ttf2
34
USE_LDCONFIG=	yes
32
USE_LDCONFIG=	yes
35
USE_GNOME=	cairo pango
33
USE_GNOME=	cairo pango
36
USE_XORG=	ice sm x11 xext
34
USE_XORG=	ice sm x11 xext
37
SHEBANG_FILES=	data/tools/about_cfg_to_wiki \
35
SHEBANG_FILES=	data/tools/about_cfg_to_wiki \
36
		data/tools/addon_manager/html.py \
38
		data/tools/campaign2wiki.py \
37
		data/tools/campaign2wiki.py \
39
		data/tools/castle-cutter/mk-castle.sh \
40
		data/tools/expand-terrain-macros.py \
38
		data/tools/expand-terrain-macros.py \
41
		data/tools/extractbindings data/tools/imgcheck \
39
		data/tools/extractbindings data/tools/imgcheck \
40
		data/tools/hexometer.py \
42
		data/tools/journeylifter data/tools/rmtrans/rmtrans.py \
41
		data/tools/journeylifter data/tools/rmtrans/rmtrans.py \
43
		data/tools/scoutDefault.py data/tools/terrain2wiki.py \
42
		data/tools/scoutDefault.py data/tools/terrain2wiki.py \
44
		data/tools/trackplacer data/tools/unit_tree/TeamColorizer \
43
		data/tools/trackplacer data/tools/unit_tree/TeamColorizer \
44
		data/tools/unit_tree/helpers.py \
45
		data/tools/unit_tree/overview.py \
45
		data/tools/unit_tree/overview.py \
46
		data/tools/unit_tree/update-wmlunits \
46
		data/tools/unit_tree/update-wmlunits \
47
		data/tools/wesnoth/campaignserver_client.py \
47
		data/tools/wesnoth/wescamp.py data/tools/wesnoth/wmldata.py \
48
		data/tools/wesnoth/wescamp.py data/tools/wesnoth/wmldata.py \
48
		data/tools/wesnoth/wmlparser.py \
49
		data/tools/wesnoth/wmlparser.py \
49
		data/tools/wesnoth/wmlparser2.py \
50
		data/tools/wesnoth/wmlparser2.py \
51
		data/tools/wesnoth/wmlparser3.py \
50
		data/tools/wesnoth_addon_manager data/tools/wmlflip \
52
		data/tools/wesnoth_addon_manager data/tools/wmlflip \
51
		data/tools/wmlindent data/tools/wmllint \
53
		data/tools/wmlindent data/tools/wmllint \
52
		data/tools/wmllint-1.4 data/tools/wmllint_gui \
54
		data/tools/wmllint-1.4 \
53
		data/tools/wmlmove data/tools/wmlscope data/tools/wmlunits \
55
		data/tools/wmlunits \
56
		data/tools/wmlscope \
54
		data/tools/wmlvalidator \
57
		data/tools/wmlvalidator \
55
		data/tools/GUI.pyw
58
		data/tools/GUI.pyw
59
56
CPE_VENDOR=	${PORTNAME}
60
CPE_VENDOR=	${PORTNAME}
57
CPE_PRODUCT=	battle_for_wesnoth
61
CPE_PRODUCT=	battle_for_wesnoth
58
CMAKE_ARGS=	-DMANDIR="man" -DENABLE_STRICT_COMPILATION=off
62
CMAKE_ARGS=	-DMANDIR="man" -DENABLE_STRICT_COMPILATION=off
Lines 60-72 Link Here
60
PORTDOCS=	*
64
PORTDOCS=	*
61
PORTDATA=	*
65
PORTDATA=	*
62
66
63
OPTIONS_DEFINE=	ANA CAMPAIGN DOCS FRIBIDI LOWMEM NLS \
67
OPTIONS_DEFINE=	CAMPAIGN DOCS FRIBIDI NLS \
64
		NOTIFY OPENMP RAWSOCKETS SERVER TEST TOOLS
68
		NOTIFY SERVER TEST
65
OPTIONS_DEFAULT=	CAMPAIGN FRIBIDI NOTIFY OPENMP SERVER TOOLS
69
OPTIONS_DEFAULT=	CAMPAIGN FRIBIDI NOTIFY SERVER
66
OPTIONS_SUB=	yes
70
OPTIONS_SUB=	yes
67
71
68
ANA_DESC=	Asynchronous Network API (WIP)
69
ANA_CMAKE_ON=	-DUSE_ANA_NETWORK=on
70
CAMPAIGN_DESC=	Campaign server
72
CAMPAIGN_DESC=	Campaign server
71
CAMPAIGN_CMAKE_ON=-DENABLE_CAMPAIGN_SERVER=on
73
CAMPAIGN_CMAKE_ON=-DENABLE_CAMPAIGN_SERVER=on
72
DOCS_CMAKE_OFF=	-DDOCDIR=none
74
DOCS_CMAKE_OFF=	-DDOCDIR=none
Lines 73-80 Link Here
73
FRIBIDI_DESC=	Bidirectional support
75
FRIBIDI_DESC=	Bidirectional support
74
FRIBIDI_LIB_DEPENDS=libfribidi.so:converters/fribidi
76
FRIBIDI_LIB_DEPENDS=libfribidi.so:converters/fribidi
75
FRIBIDI_CMAKE_OFF=-DENABLE_FRIBIDI=off
77
FRIBIDI_CMAKE_OFF=-DENABLE_FRIBIDI=off
76
LOWMEM_DESC=	Reduce memory usage (disables animations)
77
LOWMEM_CMAKE_ON=-DENABLE_LOW_MEM=on
78
NLS_USES=	gettext
78
NLS_USES=	gettext
79
NLS_CMAKE_ON=	-DLOCALEDIR=${PREFIX}/share/locale
79
NLS_CMAKE_ON=	-DLOCALEDIR=${PREFIX}/share/locale
80
NLS_CMAKE_OFF=	-DENABLE_NLS=off
80
NLS_CMAKE_OFF=	-DENABLE_NLS=off
Lines 81-100 Link Here
81
NOTIFY_DESC=	Desktop notifications
81
NOTIFY_DESC=	Desktop notifications
82
NOTIFY_LIB_DEPENDS=libdbus-1.so:devel/dbus
82
NOTIFY_LIB_DEPENDS=libdbus-1.so:devel/dbus
83
NOTIFY_CMAKE_OFF=-DENABLE_NOTIFICATIONS=off
83
NOTIFY_CMAKE_OFF=-DENABLE_NOTIFICATIONS=off
84
OPENMP_DESC=	OpenMP support
85
# -std=gnu++11 is necessary on FreeBSD 10, whose libc++ does not have the
86
# `operator delete(void*, size_t)' overload from C++14. GCC 6 defaults to
87
# --std=gnu++14, which then breaks the build (bug 219485).
88
OPENMP_USE=	CXXSTD=gnu++11
89
OPENMP_USES=	compiler:gcc-c++11-lib
90
OPENMP_CMAKE_ON=-DENABLE_OMP=on
91
RAWSOCKETS_DESC=	Use raw receiving sockets in multiplayer
92
RAWSOCKETS_CFLAGS=-DNETWORK_USE_RAW_SOCKETS
93
SERVER_DESC=	Server
84
SERVER_DESC=	Server
94
SERVER_CMAKE_OFF=-DENABLE_SERVER=off
85
SERVER_CMAKE_OFF=-DENABLE_SERVER=off
95
TEST_CMAKE_ON=	-DENABLE_TESTS=on
86
TEST_CMAKE_ON=	-DENABLE_TESTS=on
96
TOOLS_DESC=	Extra tools for artists and translators
97
TOOLS_CMAKE_ON=	-DENABLE_TOOLS=on
98
87
99
post-install:
88
post-install:
100
	${FIND} ${STAGEDIR}${PREFIX}/man -type d -empty -delete
89
	${FIND} ${STAGEDIR}${PREFIX}/man -type d -empty -delete
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1482223424
1
TIMESTAMP = 1528893082
2
SHA256 (wesnoth-1.12.6.tar.bz2) = a50f384cead15f68f31cfa1a311e76a12098428702cb674d3521eb169eb92e4e
2
SHA256 (wesnoth-1.14.3.tar.bz2) = e9f17f0245a2b7f63b28d77a1cc8854355768665f5ca93ffd3e7641b0840c418
3
SIZE (wesnoth-1.12.6.tar.bz2) = 387869758
3
SIZE (wesnoth-1.14.3.tar.bz2) = 450194119
(-)files/patch-src_game__initialization_lobby__data.hpp (+10 lines)
Line 0 Link Here
1
--- src/game_initialization/lobby_data.hpp.orig	2018-06-13 12:34:17 UTC
2
+++ src/game_initialization/lobby_data.hpp
3
@@ -14,6 +14,7 @@
4
 
5
 #pragma once
6
 
7
+#include <time.h>
8
 #include <set>
9
 #include <deque>
10
 #include <functional>
(-)files/patch-src_replay.hpp (+10 lines)
Line 0 Link Here
1
--- src/replay.hpp.orig	2018-06-13 12:34:27 UTC
2
+++ src/replay.hpp
3
@@ -21,6 +21,7 @@
4
 
5
 #include "map/location.hpp"
6
 
7
+#include <time.h>
8
 #include <deque>
9
 #include <iterator>
10
 #include <map>
(-)files/patch-src_tests_test__util.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/tests/test_util.cpp.orig	2015-06-25 23:08:11 UTC
2
+++ src/tests/test_util.cpp
3
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE( test_count_leading
4
 	BOOST_CHECK( count_leading_ones(static_cast<boost::uint8_t>(0xFF)) == 8 );
5
 	BOOST_CHECK( count_leading_ones(static_cast<boost::uint16_t>(0xFFFF)) == 16 );
6
 	BOOST_CHECK( count_leading_ones(static_cast<boost::uint32_t>(0xFFFFFFFF)) == 32 );
7
-	BOOST_CHECK( count_leading_ones(static_cast<boost::uint64_t>(0xFFFFFFFFFFFFFFFF))
8
+	BOOST_CHECK( count_leading_ones(static_cast<boost::uint64_t>(0xFFFFFFFFFFFFFFFFULL))
9
 		== 64 );
10
 	BOOST_CHECK( count_leading_ones(static_cast<boost::uint8_t>(0xF8)) == 5 );
11
 	BOOST_CHECK( count_leading_ones(static_cast<boost::uint16_t>(54321)) == 2 );

Return to bug 228984