Update to 1.9.4.

PR:		ports/154101
Submitted by:	Anonymous <swell.k -at- gmail.com>
Feature safe:	yes

games/wesnoth-devel/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	1.9.3
+PORTVERSION=	1.9.4
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://files.wesnoth.org/
@@ -25,24 +25,9 @@ CONFLICTS=	wesnoth-[0-9]*
 
 USE_SDL=	image mixer net ttf
 USE_GNOME=	gnometarget pango
-USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf
-ACLOCAL_ARGS=	-Im4
-AUTOMAKE_ARGS=	--add-missing --copy
-CONFIGURE_ENV=	PKG_CONFIG="${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
-PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
-
-MANLANG=	"" cs de en_GB es et fi fr gl hu id it ja lt pl pt_BR sk \
-		sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW
+USE_CMAKE=	yes
 
 MAN6=		wesnoth.6
 
@@ -50,166 +35,145 @@ PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS=	ANA	 "Enable Asynchronous Network API (WIP)" On \
-		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 \
 		NOTIFY	 "Enable desktop notifications"	On \
 		POOLALLOC "Use wesnoth own memory allocator" Off \
-		PYTHON	 "Enable python developer tools" On \
+		PYTHON	 "Enable python developer tools" Off \
 		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>
-
-.if ${OSVERSION} < 700000
-BROKEN=		does not compile
-.endif
+.include <bsd.port.options.mk>
 
 .if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.if defined(WITH_PROFILE)
-CONFIGURE_ARGS+=	--enable-profile
+CMAKE_BUILD_TYPE=	debug
 .endif
 
 # XXX: breaks compilation because of -Werror
 .if !defined(WITH_STRICT)
-CONFIGURE_ARGS+=	--disable-strict-compilation
+CMAKE_ARGS+=	-DENABLE_STRICT_COMPILATION=off
 .endif
 
 .if defined(WITHOUT_ANA)
-CONFIGURE_ARGS+=	--disable-ana
+CMAKE_ARGS+=	-DUSE_ANA_NETWORK=off
 .else
-CONFIGURE_ARGS+=	--enable-ana
-.endif
-
-.if defined(WITHOUT_BWMON)
-CONFIGURE_ARGS+=	--disable-bandwidth-monitor
-.else
-CONFIGURE_ARGS+=	--enable-bandwidth-monitor
+CMAKE_ARGS+=	-DUSE_ANA_NETWORK=on
 .endif
 
 .if defined(WITHOUT_CAMPAIGN)
-CONFIGURE_ARGS+=	--disable-campaign-server
-PLIST_SUB+=		CAMPAIGN="@comment "
+CMAKE_ARGS+=	-DENABLE_CAMPAIGN_SERVER=off
+PLIST_SUB+=	CAMPAIGN="@comment "
 .else
-CONFIGURE_ARGS+=	--enable-campaign-server
-PLIST_SUB+=		CAMPAIGN=""
+CMAKE_ARGS+=	-DENABLE_CAMPAIGN_SERVER=on
+PLIST_SUB+=	CAMPAIGN=""
 .endif
 
 .if defined(WITHOUT_EDITOR)
-CONFIGURE_ARGS+=	--disable-editor
-PLIST_SUB+=		EDITOR="@comment "
+CMAKE_ARGS+=	-DENABLE_EDITOR=off
+PLIST_SUB+=	EDITOR="@comment "
 .else
-CONFIGURE_ARGS+=	--enable-editor
-PLIST_SUB+=		EDITOR=""
+CMAKE_ARGS+=	-DENABLE_EDITOR=on
+PLIST_SUB+=	EDITOR=""
 .endif
 
 .if defined(WITHOUT_FRIBIDI)
-CONFIGURE_ARGS+=	--without-fribidi
+CMAKE_ARGS+=	-DENABLE_FRIBIDI=off
 .else
-CONFIGURE_ARGS+=	--with-fribidi
-LIB_DEPENDS+=		fribidi.3:${PORTSDIR}/converters/fribidi
+CMAKE_ARGS+=	-DENABLE_FRIBIDI=on
+LIB_DEPENDS+=	fribidi.3:${PORTSDIR}/converters/fribidi
 .endif
 
 .if defined(WITHOUT_LOWMEM)
-CONFIGURE_ARGS+=	--disable-lowmem
+CMAKE_ARGS+=	-DENABLE_LOW_MEM=off
 .else
-CONFIGURE_ARGS+=	--enable-lowmem
+CMAKE_ARGS+=	-DENABLE_LOW_MEM=off
 .endif
 
 .if defined(WITHOUT_NOTIFY)
-CONFIGURE_ARGS+=	--disable-notifications
+CMAKE_ARGS+=	-DENABLE_NOTIFICATIONS=off
 .else
-CONFIGURE_ARGS+=	--enable-notifications --enable-dbus
-LIB_DEPENDS+=		dbus-1.3:${PORTSDIR}/devel/dbus
+CMAKE_ARGS+=	-DENABLE_NOTIFICATIONS=on
+LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 .endif
 
 .if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
+CMAKE_ARGS+=	-DENABLE_NLS=off
+PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=		yes
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=		NLS=""
+CMAKE_ARGS+=	-DENABLE_NLS=on -DLOCALEDIR=${PREFIX}/share/locale
+USE_GETTEXT=	yes
+MANLANG=	"" cs de en_GB et fi fr gl hu id it ja lt pl pt_BR sk \
+		sr sr@ijekavian sr@ijekavianlatin sr@latin zh_CN zh_TW
+_MANPAGES+=	${PREFIX}/man/es/man6/wesnothd.6 \
+		${PREFIX}/man/tr/man6/wesnothd.6
+PLIST_SUB+=	NLS=""
 .endif
 
 .if defined(WITHOUT_POOLALLOC)
-CONFIGURE_ARGS+=	--disable-pool-alloc
+CMAKE_ARGS+=	-DENABLE_POOL_ALLOC=off
 .else
-CONFIGURE_ARGS+=	--enable-pool-alloc
+CMAKE_ARGS+=	-DENABLE_POOL_ALLOC=on
 .endif
 
 .if defined(WITHOUT_PYTHON)
-CONFIGURE_ARGS+=	--disable-python-install
-PLIST_SUB+=		PYTHON="@comment "
+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"
+BROKEN=		cmake build doesn\'t support installing python tools
+USE_PYTHON=	yes
+CONFIGURE_ENV+=	PYTHON_PREFIX=${PREFIX} \
+		PYTHON_VERSION=${PYTHON_VERSION:S/python//}
+CONFIGURE_ARGS+=--enable-python-install
+PLIST_SUB+=	PYTHON=""
 .endif
 
-.if defined(WITHOUT_RAWSOCKETS)
-CONFIGURE_ARGS+=	--disable-raw-sockets
-.else
-CONFIGURE_ARGS+=	--enable-raw-sockets
+.if !defined(WITHOUT_RAWSOCKETS)
+CFLAGS+=	-DNETWORK_USE_RAW_SOCKETS
 .endif
 
 .if defined(WITHOUT_SERVER)
-CONFIGURE_ARGS+=	--disable-server
-PLIST_SUB+=		SERVER="@comment "
+CMAKE_ARGS+=	-DENABLE_SERVER=off
+PLIST_SUB+=	SERVER="@comment "
 .else
-CONFIGURE_ARGS+=	--enable-server
-MAN6+=			wesnothd.6
-PLIST_SUB+=		SERVER=""
+CMAKE_ARGS+=	-DENABLE_SERVER=on
+MAN6+=		wesnothd.6
+PLIST_SUB+=	SERVER=""
 .endif
 
 .if defined(WITHOUT_TESTS)
-CONFIGURE_ARGS+=	--disable-tests
-PLIST_SUB+=		TESTS="@comment "
+CMAKE_ARGS+=	-DENABLE_TESTS=off
+PLIST_SUB+=	TESTS="@comment "
 .else
-CONFIGURE_ARGS+=	--enable-tests
-PLIST_SUB+=		TESTS=""
+CMAKE_ARGS+=	-DENABLE_TESTS=on
+PLIST_SUB+=	TESTS=""
 .endif
 
-.if defined(WITHOUT_TINYGUI)
-CONFIGURE_ARGS+=	--disable-tinygui
-.else
-BUILD_DEPENDS+=		convert:${PORTSDIR}/graphics/ImageMagick
-CONFIGURE_ARGS+=	--enable-tinygui
+.if !defined(WITHOUT_TINYGUI)
+CMAKE_ARGS+=	-DGUI=tiny
+BUILD_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 .if defined(WITHOUT_TOOLS)
-CONFIGURE_ARGS+=	--disable-tools
-PLIST_SUB+=		TOOLS="@comment "
+CMAKE_ARGS+=	-DENABLE_TOOLS=off
+PLIST_SUB+=	TOOLS="@comment "
 .else
-CONFIGURE_ARGS+=	--enable-tools
-PLIST_SUB+=		TOOLS=""
+CMAKE_ARGS+=	-DENABLE_TOOLS=on
+PLIST_SUB+=	TOOLS=""
 .endif
 
 .if defined(NOPORTDOCS)
-CONFIGURE_ARGS+=	--without-docs
+CMAKE_ARGS+=	-DDOCDIR=none
 .endif
 
 .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
-
 post-install:
 	-update-desktop-database ${PREFIX}/share/applications
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

games/wesnoth-devel/distinfo

@@ -1,2 +1,2 @@
-SHA256 (wesnoth-1.9.3.tar.bz2) = 1c804b20cc20636ce2ca216d6b304c1c76ff8f8430a0eb85e44029da3aa46bdf
-SIZE (wesnoth-1.9.3.tar.bz2) = 332594366
+SHA256 (wesnoth-1.9.4.tar.bz2) = 8644fc2efe071c91a306ca91419ccd11221c6930a1889d356c3a31501765e8d0
+SIZE (wesnoth-1.9.4.tar.bz2) = 334376625

games/wesnoth-devel/files/patch-CMakeLists.txt

@@ -0,0 +1,82 @@
+--- CMakeLists.txt~
++++ CMakeLists.txt
+@@ -21,11 +21,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR
+ find_package(SDL 1.2.7 REQUIRED)
+ find_package(Boost 1.35 REQUIRED COMPONENTS iostreams regex)
+ 
+-# no, gettext executables are not required when NLS is deactivated
++if(ENABLE_NLS)
+ find_package(Gettext)
+-# yes, libintl is *required* even when NLS is deactivated (this is to compile
+-# src/gettext.cpp since it includes libintl.h)
+ find_package(Libintl REQUIRED)
++endif(ENABLE_NLS)
+ 
+ find_package(X11)
+ 
+@@ -68,7 +67,7 @@ option(ENABLE_GAME "Enable compilation o
+ option(ENABLE_CAMPAIGN_SERVER "Enable compilation of campaign server")
+ option(ENABLE_SERVER "Enable compilation of server" ON)
+ option(ENABLE_EDITOR "Enable compilation of the new map editor into the game executable" ON)
+-option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers")
++option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers" OFF)
+ option(ENABLE_TESTS "Build unit tests")
+ option(ENABLE_NLS "Enable building of translations" ON)
+ option(ENABLE_POOL_ALLOC "Enable custom pool malloc" OFF)
+@@ -114,18 +113,18 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ 		endif(ENABLE_STRICT_COMPILATION)
+ 
+ 		# Strict compilation for C files is disabled until somebody wants to clean them.
+-		set(CMAKE_C_FLAGS "-O2 -W -Wall -ansi $ENV{CFLAGS}" 
++		set(CMAKE_C_FLAGS "-W -Wall -ansi $ENV{CFLAGS}" 
+ 				CACHE STRING "Flags used by the C compiler during normal builds." FORCE)
+-		set(CMAKE_C_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -ansi $ENV{CFLAGS}"
++		set(CMAKE_C_FLAGS_DEBUG "-DDEBUG -W -Wall -ansi $ENV{CFLAGS}"
+ 				CACHE STRING "Flags used by the C compiler during debug builds." FORCE)
+-		set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -W -Wall -ansi $ENV{CFLAGS} -Wno-unused"
++		set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -W -Wall -ansi $ENV{CFLAGS} -Wno-unused"
+ 				CACHE STRING "Flags used by the C compiler during release builds." FORCE)
+ 
+-		set(CMAKE_CXX_FLAGS "-O2 -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
++		set(CMAKE_CXX_FLAGS "-W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
+ 				CACHE STRING "Flags used by the CXX compiler during normal builds." FORCE)
+-		set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
++		set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
+ 				CACHE STRING "Flags used by the CXX compiler during debug builds." FORCE)
+-		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS} -Wno-unused"
++		set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS} -Wno-unused"
+ 				CACHE STRING "Flags used by the CXX compiler during release builds." FORCE)
+ 
+ 	endif(NOT CONFIGURED)
+@@ -151,9 +150,15 @@ if(X11_FOUND)
+ 	add_definitions(-D_X11)
+ endif(X11_FOUND)
+ 
++if(IS_ABSOLUTE ${LOCALEDIR})
++	set(LOCALE_INSTALL ${LOCALEDIR})
++	add_definitions(-DLOCALEDIR=\\\"${LOCALE_INSTALL}\\\")
++	set(LOCALEDIR "translations")
++else(IS_ABSOLUTE ${LOCALEDIR})
+ add_definitions(-DHAS_RELATIVE_LOCALEDIR=1)
+ add_definitions(-DLOCALEDIR=\\\"${LOCALEDIR}\\\")
+ set(LOCALE_INSTALL ${DATADIR}/${LOCALEDIR})
++endif(IS_ABSOLUTE ${LOCALEDIR})
+ 
+ add_definitions(-DFIFODIR=\\\"${FIFO_DIR}\\\")
+ 
+@@ -201,10 +206,14 @@ if(ENABLE_GAME)
+ 		pkg_check_modules( FONTCONFIG REQUIRED fontconfig>=2.4.1 )
+ 	endif(NOT MSVC)
+ 
+-	find_package( FriBiDi )
++	pkg_check_modules( FRIBIDI fribidi>=0.19.0 )
+ 	if(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
+ 		add_definitions(-DHAVE_FRIBIDI)
+ 	elseif(ENABLE_FRIBIDI AND NOT FRIBIDI_LIBRARIES)
++		pkg_check_modules( FRIBIDI fribidi )
++		if(FRIBIDI_LIBRARIES)
++			add_definitions(-DOLD_FRIBIDI)
++		endif(FRIBIDI_LIBRARIES)
+ 		message("Could not find FriBiDi. Disabling FriBiDi support.")
+ 	endif()
+ 

games/wesnoth-devel/files/patch-Makefile.am

@@ -1,18 +0,0 @@
---- Makefile.am~
-+++ Makefile.am
-@@ -73,6 +73,7 @@ if INSTALLDATA
- 	  echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
- 	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
- 	done
-+if INSTALLDOCS
- 	@echo "Replicate doc directory skeleton under target doc subdirectory"
- 	@echo "Then copy all corresponding files."
- 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
-@@ -84,6 +85,7 @@ if INSTALLDATA
- 	  echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
- 	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; cd ..; \
- 	done
-+endif
- if TINYGUI
- 	@echo "Shrink installed images by a factor of two."
- 	(cd $(top_srcdir) && find data/core/images data/campaigns images  \( $(findfilterflags) -a -name '*.png' -and -not -name 'bar-energy-tinygui.png' -print \) ) | while read p; do \

games/wesnoth-devel/files/patch-configure.ac

@@ -1,14 +0,0 @@
---- configure.ac~
-+++ configure.ac
-@@ -213,6 +213,11 @@ esac
- AC_SUBST([FULLLOCALEDIR])
- AC_SUBST([HAS_RELATIVE_LOCALEDIR])
- 
-+AC_ARG_WITH([docs],
-+	         AS_HELP_STRING([--without-docs], [don't install wesnoth manual]),
-+	      [docs=$withval],
-+	      [docs=yes])
-+AM_CONDITIONAL([INSTALLDOCS], [test x$docs = xyes])
- 
- AC_ARG_ENABLE([game],
-               AS_HELP_STRING([--disable-game], [disable compilation of game]),

games/wesnoth-devel/files/patch-doc-CMakeLists.txt

@@ -0,0 +1,7 @@
+--- doc/CMakeLists.txt~
++++ doc/CMakeLists.txt
+@@ -1,2 +1,4 @@
+ add_subdirectory(man)
++if(NOT DOCDIR STREQUAL "none")
+ add_subdirectory(manual)
++endif(NOT DOCDIR STREQUAL "none")

games/wesnoth-devel/files/patch-m4-boost.m4

@@ -1,11 +0,0 @@
---- m4/boost.m4~	2010-05-27 11:37:13.000000000 +0400
-+++ m4/boost.m4	2010-08-23 07:12:17.014432212 +0400
-@@ -729,7 +729,7 @@ AC_CACHE_CHECK([for the flags needed to 
-   esac
-   # Generate the test file.
-   AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <pthread.h>],
--    [pthread_t th; pthread_join(th, 0);
-+    [pthread_t th=NULL; pthread_join(th, 0);
-     pthread_attr_init(0); pthread_cleanup_push(0, 0);
-     pthread_create(0,0,0,0); pthread_cleanup_pop(0);])])
-   for boost_pthread_flag in '' $boost_pthread_flags; do

games/wesnoth-devel/files/patch-m4-zlib.m4

@@ -1,15 +0,0 @@
---- 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

games/wesnoth-devel/files/patch-po-CMakeLists.txt

@@ -0,0 +1,24 @@
+--- po/CMakeLists.txt~
++++ po/CMakeLists.txt
+@@ -273,9 +273,6 @@ if(ENABLE_NLS)
+ 				COMMENT "mo-update [${DOMAIN}-${LINGUA}]: Creating mo file."
+ 			)
+ 
+-			install(FILES ${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
+-					DESTINATION ${LOCALE_INSTALL}/${LINGUA}/LC_MESSAGES)
+-
+ 			set(mo-update-SRC ${mo-update-SRC} 
+ 				${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
+ 			)
+@@ -285,6 +282,11 @@ if(ENABLE_NLS)
+ 
+ 		endforeach(DOMAIN ${DOMAINS})
+ 
++		foreach(DOMAIN ${NORMAL_DOMAINS})
++			install(FILES ${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
++					DESTINATION ${LOCALE_INSTALL}/${LINGUA}/LC_MESSAGES)
++		endforeach(DOMAIN ${NORMAL_DOMAINS})
++
+ 		if(ENABLE_POT_UPDATE_TARGET)
+ 			add_custom_target(mo-update-${LINGUA}
+ 				COMMENT "mo-update ${LINGUA}: Done."

games/wesnoth-devel/files/patch-src-CMakeLists.txt

@@ -0,0 +1,22 @@
+--- src/CMakeLists.txt~
++++ src/CMakeLists.txt
+@@ -123,7 +123,7 @@ set(tools-external-libs
+ )
+ 
+ if(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
+-	include_directories( ${FRIBIDI_INCLUDE_DIR} )
++	include_directories( ${FRIBIDI_INCLUDE_DIRS} )
+ 	set(game-external-libs ${game-external-libs} ${FRIBIDI_LIBRARIES})
+ endif(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
+ 
+@@ -826,7 +833,9 @@ if(ENABLE_TESTS)
+ 		boost_unit_test_framework
+ 	)
+ 	set_target_properties(test
+-		PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}test${BINARY_SUFFIX}
++		PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}wesnoth_test${BINARY_SUFFIX}
+ 	)
++
++	install(TARGETS test DESTINATION ${BINDIR})
+ endif(ENABLE_TESTS)
+ 

games/wesnoth-devel/files/patch-src-Makefile.am

@@ -1,38 +0,0 @@
---- src/Makefile.am~
-+++ src/Makefile.am
-@@ -16,7 +16,7 @@ bin_PROGRAMS += campaignd
- endif
- 
- 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 \
-@@ -450,12 +450,12 @@ test_SOURCES =  \
- 	tests/gui/test_save_dialog.cpp \
- 	$(wesnoth_source)
- 
--test_LDADD = $(INTERNALLIBS) $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS) lua/liblua.a
--test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a lua/liblua.a
-+wesnoth_test_LDADD = $(INTERNALLIBS) $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS) lua/liblua.a
-+wesnoth_test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a lua/liblua.a
- if ANA
--test_LDADD += $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS) -lana
--test_DEPENDENCIES += libana.a
--test_SOURCES += network_worker.cpp
-+wesnoth_test_LDADD += $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS) -lana
-+wesnoth_test_DEPENDENCIES += libana.a
-+wesnoth_test_SOURCES += network_worker.cpp
- endif
- 
- #############################################################################

games/wesnoth-devel/files/patch-src-ana-src-CMakeLists.txt

@@ -0,0 +1,32 @@
+--- src/ana/src/CMakeLists.txt~
++++ src/ana/src/CMakeLists.txt
+@@ -4,7 +4,7 @@ include_directories( ../api )
+ 
+ find_package( Boost 1.35 REQUIRED COMPONENTS thread system)
+ 
+-set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3" )
++set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" )
+ 
+ set ( common_srcs asio_listener.cpp asio_sender.cpp asio_timers.cpp )
+ 
+@@ -20,19 +20,9 @@ target_link_libraries( ana-static ${Boos
+ 
+ set ( CMAKE_INSTALL_PREFIX /usr/local )
+ 
+-IF(NOT MSVC)
+-       set ( CMAKE_INSTALL_PREFIX /usr/local )
+-       install ( TARGETS ana LIBRARY DESTINATION lib )
+-       install ( TARGETS ana-static ARCHIVE DESTINATION lib )
+-ENDIF(NOT MSVC)
+-
+ set ( ana_headers ../api/ana.hpp
+                   ../api/common.hpp
+                   ../api/timers.hpp
+                   ../api/buffers.hpp
+                   ../api/predicates.hpp
+                   ../api/binary_streams.hpp )
+-
+-IF(NOT MSVC)
+-       install ( FILES  ${ana_headers} DESTINATION include/ana )
+-ENDIF(NOT MSVC)
+\ No newline at end of file

games/wesnoth-devel/files/patch-src-tests-main.cpp

@@ -1,10 +0,0 @@
---- src/tests/main.cpp~
-+++ src/tests/main.cpp
-@@ -15,6 +15,7 @@
- #define GETTEXT_DOMAIN "wesnoth-test"
- 
- 
-+#define BOOST_TEST_DYN_LINK
- #define BOOST_TEST_MODULE wesnoth unit tests master suite
- #include <boost/test/unit_test.hpp>
- #include <boost/test/unit_test_monitor.hpp>

games/wesnoth-devel/pkg-plist

@@ -2,12 +2,12 @@
 %%TOOLS%%bin/cutter
 %%TOOLS%%bin/exploder
 bin/wesnoth
-%%TOOLS%%bin/wesnoth_addon_manager
+%%PYTHON%%%%TOOLS%%bin/wesnoth_addon_manager
 %%TESTS%%bin/wesnoth_test
 %%SERVER%%bin/wesnothd
-%%TOOLS%%bin/wmlindent
-%%TOOLS%%bin/wmllint
-%%TOOLS%%bin/wmlscope
+%%PYTHON%%%%TOOLS%%bin/wmlindent
+%%PYTHON%%%%TOOLS%%bin/wmllint
+%%PYTHON%%%%TOOLS%%bin/wmlscope
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/__init__.pyo
@@ -41,6 +41,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-lib.mo
@@ -65,6 +66,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-lib.mo
@@ -89,6 +91,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-lib.mo
@@ -113,6 +116,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-lib.mo
@@ -137,6 +141,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-lib.mo
@@ -161,6 +166,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-lib.mo
@@ -185,6 +191,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/da/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/da/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/da/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/da/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/da/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/da/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/da/LC_MESSAGES/wesnoth-lib.mo
@@ -209,6 +216,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/de/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/de/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/de/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/de/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/de/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/de/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/de/LC_MESSAGES/wesnoth-lib.mo
@@ -233,6 +241,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/el/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/el/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/el/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/el/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/el/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/el/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/el/LC_MESSAGES/wesnoth-lib.mo
@@ -257,6 +266,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-lib.mo
@@ -281,6 +291,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-lib.mo
@@ -305,6 +316,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-lib.mo
@@ -329,6 +341,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/es/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/es/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/es/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/es/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/es/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/es/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/es/LC_MESSAGES/wesnoth-lib.mo
@@ -353,6 +366,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/et/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/et/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/et/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/et/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/et/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/et/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/et/LC_MESSAGES/wesnoth-lib.mo
@@ -377,6 +391,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-lib.mo
@@ -401,6 +416,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-lib.mo
@@ -425,6 +441,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-lib.mo
@@ -449,6 +466,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-lib.mo
@@ -466,6 +484,31 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-units.mo
 %%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-utbs.mo
 %%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-anl.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-aoi.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-did.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-dm.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-dw.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-editor.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-help.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-httt.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-l.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-lib.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-low.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-multiplayer.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-nr.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-sof.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-sotbe.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-tb.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-test.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-thot.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-trow.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-tsg.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-tutorial.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-units.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-utbs.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-anl.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-aoi.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-did.mo
@@ -473,6 +516,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-lib.mo
@@ -497,6 +541,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/he/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/he/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/he/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/he/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/he/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/he/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/he/LC_MESSAGES/wesnoth-lib.mo
@@ -521,6 +566,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-lib.mo
@@ -545,6 +591,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-lib.mo
@@ -569,6 +616,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/id/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/id/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/id/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/id/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/id/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/id/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/id/LC_MESSAGES/wesnoth-lib.mo
@@ -593,6 +641,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/is/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/is/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/is/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/is/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/is/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/is/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/is/LC_MESSAGES/wesnoth-lib.mo
@@ -617,6 +666,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/it/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/it/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/it/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/it/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/it/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/it/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/it/LC_MESSAGES/wesnoth-lib.mo
@@ -641,6 +691,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-lib.mo
@@ -665,6 +716,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-lib.mo
@@ -689,6 +741,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/la/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/la/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/la/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/la/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/la/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/la/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/la/LC_MESSAGES/wesnoth-lib.mo
@@ -713,6 +766,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-lib.mo
@@ -737,6 +791,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-lib.mo
@@ -761,6 +816,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-lib.mo
@@ -785,6 +841,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-lib.mo
@@ -809,6 +866,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-lib.mo
@@ -833,6 +891,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-lib.mo
@@ -857,6 +916,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-lib.mo
@@ -881,6 +941,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-lib.mo
@@ -905,6 +966,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-lib.mo
@@ -929,6 +991,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-lib.mo
@@ -953,6 +1016,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-lib.mo
@@ -977,6 +1041,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-lib.mo
@@ -1001,6 +1066,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-lib.mo
@@ -1025,6 +1091,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-lib.mo
@@ -1049,6 +1116,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-lib.mo
@@ -1073,6 +1141,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-lib.mo
@@ -1097,6 +1166,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-lib.mo
@@ -1121,6 +1191,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-lib.mo
@@ -1145,6 +1216,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-lib.mo
@@ -1169,6 +1241,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-lib.mo
@@ -1193,6 +1266,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-lib.mo
@@ -1217,6 +1291,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-lib.mo
@@ -1241,6 +1316,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-lib.mo
@@ -1265,6 +1341,7 @@ share/applications/wesnoth.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-ei.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-help.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-lib.mo
@@ -1321,6 +1398,8 @@ share/pixmaps/wesnoth-icon.png
 @dirrmtry man/fr
 @dirrmtry man/fur_IT/man6
 @dirrmtry man/fur_IT
+@dirrmtry man/ga/man6
+@dirrmtry man/ga
 @dirrmtry man/gl/man6
 @dirrmtry man/gl
 @dirrmtry man/he/man6