- Update to 1.8.3

PR: ports/147335 Submitted by: Paul Shepel <tacid@tacid.kiev.ua> Approved by: maintainer timeout (philip; 14 days)
svn path=/head/; revision=257987
2024-11-24 00:45:52 +00:00 · 2010-07-20 10:57:07 +00:00 · 2010-07-20 10:57:07 +00:00 · b8b6461900 · 2021-03-31 03:12:20 +00:00
commit b8b6461900
parent e75b9cd568
10 changed files with 386 additions and 8815 deletions
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@ -6,17 +6,20 @@
 #

 PORTNAME=	wesnoth
-PORTVERSION=	1.6.5
-PORTREVISION=	4
+PORTVERSION=	1.8.3
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-1.6/${PORTNAME}-${PORTVERSION} \
-		http://www.wesnoth.org/files/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
+		http://files.wesnoth.org/

 MAINTAINER=	philip@FreeBSD.org
 COMMENT=	A fantasy turn-based strategy game

 LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs

+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 CONFLICTS=	wesnoth-devel-[0-9]*

 USE_SDL=	image mixer net ttf
@ -25,51 +28,69 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
 USE_BZIP2=	yes
+USE_LUA=	5.1
 USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262
 ACLOCAL_ARGS=	-Im4
 AUTOMAKE_ARGS=	--add-missing --copy
+CONFIGURE_ENV=	PKG_CONFIG=${LOCALBASE}/bin/pkg-config \
+		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--localstatedir=/var \
+		--with-boost=${LOCALBASE} \
 		--with-icondir=${PREFIX}/share/pixmaps \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-localedir=${PREFIX}/share/locale

-MANLANG_GAME=	gl sk
-MANLANG=	"" cs de en_GB es et fi fr hu it lt pl sr sr@latin sv tr \
-		zh_CN zh_TW
+MANLANG=	"" cs de en_GB es et fi fr gl hu it ja lt pl pt_BR sk \
+		sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW

 MAN6=		wesnoth.6

-OPTIONS=	CAMPAIGN "Enable campaign server"	On \
+PORTDOCS=	*
+PORTDATA=	*
+
+OPTIONS=	BWMON	 "Enable bandwidth monitoring for server" Off \
+		CAMPAIGN "Enable campaign server"	On \
 		EDITOR	 "Enable map editor"		On \
 		FRIBIDI	 "Enable bidirectional support"	On \
+		LOWMEM	 "Reduce memory usage (disables animations)" Off \
 		NLS	 "Enable localization"		On \
+		NOTIFY	 "Enable desktop notifications"	On \
+		POOLALLOC "Use wesnoth own memory allocator" Off \
+		PYTHON	 "Enable python developer tools" On \
+		RAWSOCKETS "Use raw receiving sockets in multiplayer" Off \
 		SERVER	 "Enable server"		On \
+		TESTS	 "Enable unit tests"		Off \
+		TINYGUI	 "Enable tiny gui (down to 320x200)" Off \
 		TOOLS	 "Enable extra tools for artists and translators" On

 .include <bsd.port.pre.mk>

-# workaround: compress and add to plist disobedient man pages
-.for manlang in ${MANLANG_GAME}
-MAN6_${manlang:U}=	wesnoth.6
-
-.if defined(NO_MANCOMPRESS)
-PLIST_FILES+=	man/${manlang}/man6/wesnoth.6
-.else
-PLIST_FILES+=	man/${manlang}/man6/wesnoth.6.gz
+.if ${OSVERSION} < 700000
+BROKEN=		does not compile
 .endif
-.endfor

 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif

+.if defined(WITH_PROFILE)
+CONFIGURE_ARGS+=	--enable-profile
+.endif
+
 # XXX: breaks compilation because of -Werror
 .if !defined(WITH_STRICT)
 CONFIGURE_ARGS+=	--disable-strict-compilation
 .endif

+.if defined(WITHOUT_BWMON)
+CONFIGURE_ARGS+=	--disable-bandwidth-monitor
+.else
+CONFIGURE_ARGS+=	--enable-bandwidth-monitor
+.endif
+
 .if defined(WITHOUT_CAMPAIGN)
+CONFIGURE_ARGS+=	--disable-campaign-server
 PLIST_SUB+=		CAMPAIGN="@comment "
 .else
 CONFIGURE_ARGS+=	--enable-campaign-server
@ -77,27 +98,68 @@ PLIST_SUB+=		CAMPAIGN=""
 .endif

 .if defined(WITHOUT_EDITOR)
-PLIST_SUB+=		EDITOR="@comment "
 CONFIGURE_ARGS+=	--disable-editor
+PLIST_SUB+=		EDITOR="@comment "
 .else
+CONFIGURE_ARGS+=	--enable-editor
 PLIST_SUB+=		EDITOR=""
 .endif

 .if defined(WITHOUT_FRIBIDI)
 CONFIGURE_ARGS+=	--without-fribidi
 .else
+CONFIGURE_ARGS+=	--with-fribidi
 LIB_DEPENDS+=		fribidi.3:${PORTSDIR}/converters/fribidi
 .endif

+.if defined(WITHOUT_LOWMEM)
+CONFIGURE_ARGS+=	--disable-lowmem
+.else
+CONFIGURE_ARGS+=	--enable-lowmem
+.endif
+
+.if defined(WITHOUT_NOTIFY)
+CONFIGURE_ARGS+=	--disable-notifications
+.else
+CONFIGURE_ARGS+=	--enable-notifications --enable-dbus
+LIB_DEPENDS+=		dbus-1.3:${PORTSDIR}/devel/dbus
+.endif
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .else
 USE_GETTEXT=		yes
+CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=		NLS=""
 .endif

+.if defined(WITHOUT_POOLALLOC)
+CONFIGURE_ARGS+=	--disable-pool-alloc
+.else
+CONFIGURE_ARGS+=	--enable-pool-alloc
+.endif
+
+.if defined(WITHOUT_PYTHON)
+CONFIGURE_ARGS+=	--disable-python-install
+PLIST_SUB+=		PYTHON="@comment "
+.else
+USE_PYTHON=		yes
+CONFIGURE_ENV+=		PYTHON_PREFIX=${PREFIX} \
+			PYTHON_VERSION=${PYTHON_VERSION:S/python//}
+CONFIGURE_ARGS+=	--enable-python-install
+PLIST_SUB+=		PYTHON=""
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+.endif
+
+.if defined(WITHOUT_RAWSOCKETS)
+CONFIGURE_ARGS+=	--disable-raw-sockets
+.else
+CONFIGURE_ARGS+=	--enable-raw-sockets
+.endif
+
 .if defined(WITHOUT_SERVER)
+CONFIGURE_ARGS+=	--disable-server
 PLIST_SUB+=		SERVER="@comment "
 .else
 CONFIGURE_ARGS+=	--enable-server
@ -105,19 +167,42 @@ MAN6+=			wesnothd.6
 PLIST_SUB+=		SERVER=""
 .endif

+.if defined(WITHOUT_TESTS)
+CONFIGURE_ARGS+=	--disable-tests
+PLIST_SUB+=		TESTS="@comment "
+.else
+CONFIGURE_ARGS+=	--enable-tests
+PLIST_SUB+=		TESTS=""
+.endif
+
+.if defined(WITHOUT_TINYGUI)
+CONFIGURE_ARGS+=	--disable-tinygui
+.else
+BUILD_DEPENDS+=		convert:${PORTSDIR}/graphics/ImageMagick
+CONFIGURE_ARGS+=	--enable-tinygui
+.endif
+
 .if defined(WITHOUT_TOOLS)
+CONFIGURE_ARGS+=	--disable-tools
 PLIST_SUB+=		TOOLS="@comment "
 .else
 CONFIGURE_ARGS+=	--enable-tools
 PLIST_SUB+=		TOOLS=""
 .endif

+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=	--docdir=${WRKDIR}/docs
+.endif
+
 .if (defined(WITH_CAMPAIGN) || defined(WITH_SERVER) || defined(WITH_TOOLS)) && defined(WITHOUT_NLS)
 BROKEN=		you need NLS support for `campaignd' or `wesnothd' or tools to link against gettext
 .endif

-post-patch:
-	${REINPLACE_CMD} -e 's|libpng12|libpng14|g' ${WRKSRC}/configure
+.if defined(NOPORTDATA)
+IGNORE=		game data is required, undefine NOPORTDATA
+.endif
+
+post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's|png_voidp_NULL|NULL|g' \
 		-e 's|png_error_ptr_NULL|NULL|g' \
 		${WRKSRC}/src/tools/exploder_utils.cpp
@ -125,10 +210,4 @@ post-patch:
 post-install:	.SILENT
 	-update-desktop-database

-.if !defined(NO_MANCOMPRESS)
-.	for manlang in ${MANLANG_GAME}
-		${GZIP_CMD} ${PREFIX}/man/${manlang}/man6/wesnoth.6
-.	endfor
-.endif
-
 .include <bsd.port.post.mk>
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@ -1,3 +1,3 @@
-MD5 (wesnoth-1.6.5.tar.bz2) = 493826bbd9ba355930765a7e8fe3749a
-SHA256 (wesnoth-1.6.5.tar.bz2) = 7ef047ae364278a5bf9bdc69228f77d825f793f1c4d9adae8b47f0882e7f30d7
-SIZE (wesnoth-1.6.5.tar.bz2) = 230239169
+MD5 (wesnoth-1.8.3.tar.bz2) = 62ba3a4938d3e722797cfbe9450d3e36
+SHA256 (wesnoth-1.8.3.tar.bz2) = 985d40ff04cf95bb6f8abb3353ec955c3286a6f9edb1bd29b6f26f8b12280928
+SIZE (wesnoth-1.8.3.tar.bz2) = 298923248
--- a/games/wesnoth/files/patch-Makefile.am
+++ b/games/wesnoth/files/patch-Makefile.am
@ -1,11 +0,0 @@
--- Makefile.am~
-+++ Makefile.am
-@@ -5,7 +5,7 @@ pkgdatadir=$(datadir)/@DATADIR@
- bin_SCRIPTS =
- 
- # Ignore junk -- object files, editor backup files, wmllint backup files.
-findfilterflags=! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o -name "*bak" -o -name 'Makefile' -o -name '*Makefile' -o -type d -o -wholename "data/test/*" \)
-+findfilterflags=! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o -name "*bak" -o -name 'Makefile' -o -name '*Makefile' -o -type d -o -path "data/test/*" \)
- 
- # List all datafiles, ignoring junk
- finddata=(cd $(top_srcdir) && find data fonts icons images sounds $(findfilterflags) -print )
--- a/games/wesnoth/files/patch-configure.ac
+++ b/games/wesnoth/files/patch-configure.ac
@ -9,48 +9,15 @@
 test_build=yes
 if test $svn_in_version = 0 
 then
-Index: configure.ac
-===================================================================
--- configure.ac	(revision 36766)
-+++ configure.ac	(revision 37394)
-@@ -416,21 +416,27 @@
- 
- # fribidi-config
- 
-AC_PATH_PROGS([FRIBIDI_CONFIG], [fribidi-config], [none])
-
-if test "x$FRIBIDI_CONFIG" = "xnone"; then
-    fribidifound=no
-    AC_MSG_WARN([*** FRIBIDI not found.])
-else
-    fribidifound=yes
-    FRIBIDI_CFLAGS=`$FRIBIDI_CONFIG --cflags`
-    FRIBIDI_LIBS=`$FRIBIDI_CONFIG --libs`
-+if test "x$fribidi" != "xno"; then
-+	PKG_CHECK_MODULES([FRIBIDI2], [fribidi >= 0.19.0],
-+		[
-+			fribidifound=yes
-+		],
-+		[
-+			AC_MSG_RESULT(no)
-+			PKG_CHECK_MODULES([FRIBIDI], [fribidi],
-+				[
-+					fribidifound=yes
-+					oldfribidi=yes
-+				],
-+				[
-+					fribidifound=no
-+					AC_MSG_RESULT(no)
-+				])
-+		])
-+	AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes])
-+	AM_CONDITIONAL([OLD_FRIBIDI], [test "x$oldfribidi" = xyes])
+@@ -428,9 +428,9 @@ if test "x$fribidi" != "xno"; then
+ 					AC_MSG_RESULT(no)
+ 				])
+ 		])
+-	AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes])
+-	AM_CONDITIONAL([OLD_FRIBIDI], [test "x$oldfribidi" = xyes])
 fi
+AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes])
+AM_CONDITIONAL([OLD_FRIBIDI], [test "x$oldfribidi" = xyes])
 
-AC_SUBST([FRIBIDI_CFLAGS])
-AC_SUBST([FRIBIDI_LIBS])
-AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes -a "x$fribidi" = xyes ])
-
 # python
 AC_PATH_PROG(PYTHON, python, none)
- AC_SUBST(pkgpythondir)
--- a/games/wesnoth/files/patch-m4-zlib.m4
+++ b/games/wesnoth/files/patch-m4-zlib.m4
@ -0,0 +1,15 @@
+--- m4/zlib.m4~
+++ m4/zlib.m4
+@@ -16,11 +16,9 @@ fi
+ AC_MSG_CHECKING([for zlib location])
+ if test x"$zlib_prefix" = x ; then
+   zlib_header_found="no"
+-  for dir in /usr/local /usr ; do
+  for dir in /usr ; do
+   if test -f "$dir/include/zlib.h" ; then
+     zlib_header_found="yes"
+-    ZLIB_CFLAGS="-I$dir/include"
+-    ZLIB_LDFLAGS="-L$dir/lib"
+     break
+   fi
+   done
--- a/games/wesnoth/files/patch-multiplayer_connect.cpp
+++ b/games/wesnoth/files/patch-multiplayer_connect.cpp
@ -1,11 +0,0 @@
--- src/multiplayer_connect.cpp.orig	2008-09-07 18:16:37.000000000 -0700
-+++ src/multiplayer_connect.cpp	2008-09-07 18:17:40.000000000 -0700
-@@ -642,7 +642,7 @@
- 	res["current_player"] = id_.empty() ? current_player_ : id_;
- 
- 	if (id_.empty()) {
-		char const *description;
-+		char const *description = NULL;
- 		switch(controller_) {
- 		case CNTR_NETWORK:
- 			description = N_("(Vacant slot)");
--- a/games/wesnoth/files/patch-src-Makefile.am
+++ b/games/wesnoth/files/patch-src-Makefile.am
@ -1,34 +1,31 @@
 --- src/Makefile.am~
 +++ src/Makefile.am
-@@ -400,7 +400,7 @@ game_config.o: revision.hpp 
- REVISION = $(shell LC_ALL=C svnversion -n $(topdir) 2>/dev/null)
- .PRECIOUS: revision.hpp
- revision.hpp: FORCE
-	if [ "$(REVISION)" == "" ] || [ "$(REVISION)" == "exported" ]; then echo '' >/tmp/westemp$$$$; \
-+	if [ "$(REVISION)" = "" ] || [ "$(REVISION)" = "exported" ]; then echo '' >/tmp/westemp$$$$; \
- 	else echo '#define REVISION    "$(REVISION)"' >/tmp/westemp$$$$; fi;\
- 	if cmp -s revision.hpp /tmp/westemp$$$$ 2>/dev/null; then :; else cp /tmp/westemp$$$$ revision.hpp; fi; \
- 	if [ -e /tmp/westemp$$$$ ]; then rm /tmp/westemp$$$$; fi
-Index: src/Makefile.am
-===================================================================
--- src/Makefile.am	(revision 37393)
-+++ src/Makefile.am	(revision 37394)
-@@ -485,10 +485,16 @@
- 	-DLOCALEDIR=\"$(LOCALEDIR)\" -DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR)
- 
- if FRIBIDI
-    AM_CXXFLAGS += -DHAVE_FRIBIDI @FRIBIDI_CFLAGS@
-    AM_CFLAGS += -DHAVE_FRIBIDI @FRIBIDI_CFLAGS@
-+if OLD_FRIBIDI
-+    CXXFLAGS += -DOLD_FRIBIDI @FRIBIDI_CFLAGS@
-+    CFLAGS += -DOLD_FRIBIDI @FRIBIDI_CFLAGS@
-     THELIBS += @FRIBIDI_LIBS@
-+else
-+    CXXFLAGS += -DHAVE_FRIBIDI @FRIBIDI2_CFLAGS@
-+    CFLAGS += -DHAVE_FRIBIDI @FRIBIDI2_CFLAGS@
-+    THELIBS += @FRIBIDI2_LIBS@
+@@ -16,7 +16,7 @@ bin_PROGRAMS += campaignd
 endif
-+endif
 
- if X11
-     CXXFLAGS += -D_X11 @X_CFLAGS@
+ if TESTS
+-bin_PROGRAMS += test
+bin_PROGRAMS += wesnoth_test
+ endif
+ 
+ CLEANFILES = revision.hpp
+@@ -342,7 +342,7 @@ cutter_DEPENDENCIES=libwesnoth-core.a
+ #    Unit tests                                                             #
+ #############################################################################
+ 
+-test_SOURCES =  \
+wesnoth_test_SOURCES =  \
+ 	tests/main.cpp \
+ 	tests/utils/fake_display.cpp \
+ 	tests/utils/fake_event_source.cpp \
+@@ -362,8 +362,8 @@ test_SOURCES =  \
+ 	tests/gui/test_save_dialog.cpp \
+ 	$(wesnoth_source)
+ 
+-test_LDADD = $(INTERNALLIBS) $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS)
+-test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
+wesnoth_test_LDADD = $(INTERNALLIBS) $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS)
+wesnoth_test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
+ 
+ #############################################################################
+ #    Headers                                                                #
--- a/games/wesnoth/files/patch-src-font.cpp
+++ b/games/wesnoth/files/patch-src-font.cpp
@ -1,44 +0,0 @@
-Index: src/font.cpp
-===================================================================
--- src/font.cpp	(revision 36766)
-+++ src/font.cpp	(revision 37394)
-@@ -50,10 +50,7 @@
- #define ERR_FT LOG_STREAM(err, log_font)
- 
- #ifdef	HAVE_FRIBIDI
-#include <fribidi/fribidi.h>
-
-#else
-
-+#include <fribidi.h>
- #endif
- 
- namespace {
-@@ -467,16 +464,25 @@
- void text_surface::bidi_cvt()
- {
- 	char		*c_str = const_cast<char *>(str_.c_str());	// fribidi forgot const...
-	int		len = str_.length();
-+	FriBidiStrIndex	len = str_.length();
- 	FriBidiChar	*bidi_logical = new FriBidiChar[len + 2];
- 	FriBidiChar	*bidi_visual = new FriBidiChar[len + 2];
- 	char		*utf8str = new char[4*len + 1];	//assume worst case here (all 4 Byte characters)
- 	FriBidiCharType	base_dir = FRIBIDI_TYPE_ON;
-	int n;
-+	FriBidiStrIndex n;
- 
-+
-+#ifdef	OLD_FRIBIDI
- 	n = fribidi_utf8_to_unicode (c_str, len, bidi_logical);
-+#else
-+	n = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8, c_str, len, bidi_logical);
-+#endif
- 	fribidi_log2vis(bidi_logical, n, &base_dir, bidi_visual, NULL, NULL, NULL);
-+#ifdef	OLD_FRIBIDI
- 	fribidi_unicode_to_utf8 (bidi_visual, n, utf8str);
-+#else
-+	fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, bidi_visual, n, utf8str);
-+#endif
- 	is_rtl_ = base_dir == FRIBIDI_TYPE_RTL;
- 	str_ = std::string(utf8str);
- 	delete[] bidi_logical;
--- a/games/wesnoth/files/patch-window_builder.cpp
+++ b/games/wesnoth/files/patch-window_builder.cpp
@ -1,13 +0,0 @@
--- src/gui/widgets/window_builder.cpp.orig	2008-11-02 17:31:45.000000000 +0100
-+++ src/gui/widgets/window_builder.cpp	2008-11-02 17:32:43.000000000 +0100
-@@ -199,6 +199,10 @@
- 		std::cerr << cfg;
- 		assert(false);
- 	}
-+
-+	// Appease the compiler on FreeBSD
-+	// Unreachable
-+	return NULL;
- }
- 
- } // namespace
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist