Attachment #122197 for bug #165332




# New ports collection makefile for:	wesnoth
# Date created:			7 September 2008
# Whom:				Philip Paeps <philip@FreeBSD.org>
#
# $FreeBSD: ports/games/wesnoth/Makefile,v 1.100 2012/02/18 10:18:21 mva Exp $
#

PORTNAME=	wesnoth
PORTVERSION=	1.10
PORTREVISION=	1
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
		http://files.wesnoth.org/

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

EXTRACT_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-fonts/junicode:extract
LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs

LICENSE=	GPLv2 GPLv3
LICENSE_COMB=	dual
LICENSE_FILE=	${WRKSRC}/COPYING

CONFLICTS=	wesnoth-[0-9]*

USE_SDL=	image mixer net ttf
USE_GNOME=	pango desktopfileutils
USE_GMAKE=	yes
MAKE_JOBS_SAFE=	yes
USE_BZIP2=	yes
USE_CMAKE=	yes
USE_AUTOTOOLS=	aclocal autoheader automake autoconf
ACLOCAL_ARGS=	-Im4
AUTOMAKE_ARGS=	--add-missing --copy
CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}"
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

MAN6=		wesnoth.6

PORTDOCS=	*
PORTDATA=	*

OPTIONS=	ANA	 "Enable Asynchronous Network API (WIP)" On \
		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 \
		OPENMP	 "Enable OpenMP support"	Off \
		POOLALLOC "Use wesnoth own memory allocator" Off \
		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.options.mk>

.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)
CMAKE_ARGS+=	-DENABLE_STRICT_COMPILATION=off
.endif

.if defined(WITHOUT_ANA)
CMAKE_ARGS+=	-DUSE_ANA_NETWORK=off
.else
CMAKE_ARGS+=	-DUSE_ANA_NETWORK=on
.endif

.if defined(WITHOUT_CAMPAIGN)
CMAKE_ARGS+=	-DENABLE_CAMPAIGN_SERVER=off
PLIST_SUB+=	CAMPAIGN="@comment "
.else
CONFIGURE_ARGS+=	--enable-campaign-server
PLIST_SUB+=		CAMPAIGN=""
.endif

.if defined(WITHOUT_EDITOR)
CONFIGURE_ARGS+=	--disable-editor
PLIST_SUB+=		EDITOR="@comment "
.else
CMAKE_ARGS+=	-DENABLE_CAMPAIGN_SERVER=on
PLIST_SUB+=	CAMPAIGN=""
.endif

.if defined(WITHOUT_FRIBIDI)
CMAKE_ARGS+=	-DENABLE_FRIBIDI=off
.else
CMAKE_ARGS+=	-DENABLE_FRIBIDI=on
LIB_DEPENDS+=	fribidi.3:${PORTSDIR}/converters/fribidi
.endif

.if defined(WITHOUT_LOWMEM)
CMAKE_ARGS+=	-DENABLE_LOW_MEM=off
.else
CMAKE_ARGS+=	-DENABLE_LOW_MEM=off
.endif

.if defined(WITHOUT_NOTIFY)
CMAKE_ARGS+=	-DENABLE_NOTIFICATIONS=off
.else
CMAKE_ARGS+=	-DENABLE_NOTIFICATIONS=on
LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
.endif

.if defined(WITHOUT_NLS)
CMAKE_ARGS+=	-DENABLE_NLS=off
PLIST_SUB+=	NLS="@comment "
.else
CMAKE_ARGS+=	-DENABLE_NLS=on -DLOCALEDIR=${PREFIX}/share/locale
USE_GETTEXT=	yes
MANLANG=	"" cs de en_GB et fr gl hu id lt pl sk \
		zh_CN zh_TW
_MANPAGES+=	${PREFIX}/man/es/man6/wesnothd.6 \
		${PREFIX}/man/fi/man6/wesnothd.6 \
		${PREFIX}/man/it/man6/wesnothd.6 \
		${PREFIX}/man/ja/man6/wesnothd.6 \
		${PREFIX}/man/pt_BR/man6/wesnothd.6 \
		${PREFIX}/man/sr/man6/wesnothd.6 \
		${PREFIX}/man/sr@ijekavian/man6/wesnothd.6 \
		${PREFIX}/man/sr@ijekavianlatin/man6/wesnothd.6 \
		${PREFIX}/man/sr@latin/man6/wesnothd.6 \
		${PREFIX}/man/tr/man6/wesnothd.6
PLIST_SUB+=	NLS=""
.endif

.if defined(WITHOUT_OPENMP)
CMAKE_ARGS+=	-DENABLE_OMP=off
.else
CMAKE_ARGS+=	-DENABLE_OMP=on
.endif

.if defined(WITHOUT_POOLALLOC)
CMAKE_ARGS+=	-DENABLE_POOL_ALLOC=off
.else
CMAKE_ARGS+=	-DENABLE_POOL_ALLOC=on
.endif

.if defined(WITHOUT_PYTHON)
PLIST_SUB+=	PYTHON="@comment "
PLIST_SUB+=		PYTHON="@comment "
.else
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)
CFLAGS+=	-DNETWORK_USE_RAW_SOCKETS
.else
CONFIGURE_ARGS+=	--enable-raw-sockets
.endif

.if defined(WITHOUT_SERVER)
CMAKE_ARGS+=	-DENABLE_SERVER=off
PLIST_SUB+=	SERVER="@comment "
.else
CMAKE_ARGS+=	-DENABLE_SERVER=on
MAN6+=		wesnothd.6
PLIST_SUB+=	SERVER=""
.endif

.if defined(WITHOUT_TESTS)
CMAKE_ARGS+=	-DENABLE_TESTS=off
PLIST_SUB+=	TESTS="@comment "
.else
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
.endif

.if defined(WITHOUT_TOOLS)
CMAKE_ARGS+=	-DENABLE_TOOLS=off
PLIST_SUB+=	TOOLS="@comment "
.else
CMAKE_ARGS+=	-DENABLE_TOOLS=on
PLIST_SUB+=	TOOLS=""
.endif

.if defined(NOPORTDOCS)
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:
	${INSTALL_DATA} $$(${MAKE} -V WRKSRC \
		-C ${PORTSDIR}/x11-fonts/junicode)/fonts/Junicode-Regular.ttf \
		${DATADIR}/fonts
	-update-desktop-database ${PREFIX}/share/applications

.include <bsd.port.mk>




***************
*** 6,12 ****
  #
  
  PORTNAME=	wesnoth
- PORTVERSION=	1.9.7
  CATEGORIES=	games
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
  		http://files.wesnoth.org/
--- 6,12 ----
  #
  
  PORTNAME=	wesnoth
+ PORTVERSION=	1.9.9
  CATEGORIES=	games
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
  		http://files.wesnoth.org/
***************
*** 15,24 ****
  MAINTAINER=	philip@FreeBSD.org
  COMMENT=	A fantasy turn-based strategy game
  
  LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs
- RUN_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-fonts/junicode:extract
- 
- BROKEN=		incomplete plist
  
  LICENSE=	GPLv2 GPLv3
  LICENSE_COMB=	dual
--- 15,22 ----
  MAINTAINER=	philip@FreeBSD.org
  COMMENT=	A fantasy turn-based strategy game
  
+ EXTRACT_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-fonts/junicode:extract
  LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs
  
  LICENSE=	GPLv2 GPLv3
  LICENSE_COMB=	dual
***************
*** 27,33 ****
  CONFLICTS=	wesnoth-[0-9]*
  
  USE_SDL=	image mixer net ttf
- USE_GNOME=	pango
  MAKE_JOBS_SAFE=	yes
  USE_BZIP2=	yes
  USE_CMAKE=	yes
--- 25,31 ----
  CONFLICTS=	wesnoth-[0-9]*
  
  USE_SDL=	image mixer net ttf
+ USE_GNOME=	pango desktopfileutils
  MAKE_JOBS_SAFE=	yes
  USE_BZIP2=	yes
  USE_CMAKE=	yes
***************
*** 97,105 ****
  .else
  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
--- 95,111 ----
  .else
  CMAKE_ARGS+=	-DENABLE_NLS=on -DLOCALEDIR=${PREFIX}/share/locale
  USE_GETTEXT=	yes
+ MANLANG=	"" cs de en_GB et fr gl hu id lt pl sk \
+ 		zh_CN zh_TW
  _MANPAGES+=	${PREFIX}/man/es/man6/wesnothd.6 \
+ 		${PREFIX}/man/fi/man6/wesnothd.6 \
+ 		${PREFIX}/man/it/man6/wesnothd.6 \
+ 		${PREFIX}/man/ja/man6/wesnothd.6 \
+ 		${PREFIX}/man/pt_BR/man6/wesnothd.6 \
+ 		${PREFIX}/man/sr/man6/wesnothd.6 \
+ 		${PREFIX}/man/sr@ijekavian/man6/wesnothd.6 \
+ 		${PREFIX}/man/sr@ijekavianlatin/man6/wesnothd.6 \
+ 		${PREFIX}/man/sr@latin/man6/wesnothd.6 \
  		${PREFIX}/man/tr/man6/wesnothd.6
  PLIST_SUB+=	NLS=""
  .endif

Lines 1-2 Link Here

(-)wesnoth.new/distinfo (-2 / +2 lines)
1	SHA256 (wesnoth-1.8.6.tar.bz2) = 4fe603fa984ac76a384dc94ba28bd99fe2d1adf02ddf1706f2fa1b82b40f8081	1	SHA256 (wesnoth-1.10.tar.bz2) = 4ba12b1e43761650579d563d4384c5e06674b0bff75cef2cb0abb439ecdc8ece
2	SIZE (wesnoth-1.8.6.tar.bz2) = 302226547	2	SIZE (wesnoth-1.10.tar.bz2) = 339946658




--- 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_GAME "Enable compilation of the game" ON)
 option(ENABLE_CAMPAIGN_SERVER "Enable compilation of campaign server")
 option(ENABLE_SERVER "Enable compilation of server" 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)
@@ -154,6 +153,7 @@ add_definitions(-DLOCALEDIR=\\\"${LOCALE
 if(LOCALEDIR MATCHES "^/")
 	add_definitions(-DHAS_RELATIVE_LOCALEDIR=0)
 	set(LOCALE_INSTALL ${LOCALEDIR})
+	set(LOCALEDIR "translations")
 else(LOCALEDIR MATCHES "^/")
 	add_definitions(-DHAS_RELATIVE_LOCALEDIR=1)
 	set(LOCALE_INSTALL ${DATADIR}/${LOCALEDIR})
@@ -213,10 +213,14 @@ if(ENABLE_TESTS)
 	find_package( Boost 1.35 REQUIRED COMPONENTS unit_test_framework )
 endif(ENABLE_TESTS)
 if(ENABLE_GAME)
-	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()
 




--- 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 \




--- 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]),

Line 0 Link Here

(-)wesnoth.new/files/patch-doc-CMakeLists.txt (+7 lines)
	1	--- doc/CMakeLists.txt~
	2	+++ doc/CMakeLists.txt
	3	@@ -1,2 +1,4 @@
	4	add_subdirectory(man)
	5	+if(NOT DOCDIR STREQUAL "none")
	6	add_subdirectory(manual)
	7	+endif(NOT DOCDIR STREQUAL "none")

Lines 1-11 Link Here

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




--- 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




--- 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."




--- 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)
 




--- 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 \
@@ -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                                                                #




--- 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,11 +20,11 @@ target_link_libraries( ana-static ${Boos
 
 set(CMAKE_INSTALL_PREFIX /usr/local)
 
-if(NOT MSVC)
+if(FALSE)
 	set(CMAKE_INSTALL_PREFIX /usr/local)
 	install(TARGETS ana LIBRARY DESTINATION lib)
 	install(TARGETS ana-static ARCHIVE DESTINATION lib)
-endif(NOT MSVC)
+endif(FALSE)
 
 set(ana_headers
 	../api/ana.hpp
@@ -35,6 +35,6 @@ set(ana_headers
 	../api/binary_streams.hpp
 )
 
-if(NOT MSVC)
+if(FALSE)
 	install(FILES ${ana_headers} DESTINATION include/ana)
-endif(NOT MSVC)
+endif(FALSE)

Lines 1-10 Link Here

(-)wesnoth.new/files/patch-src-tests-main.cpp (-10 lines)
1	--- src/tests/main.cpp~
2	+++ src/tests/main.cpp
3	@@ -15,6 +15,7 @@
4	#define GETTEXT_DOMAIN "wesnoth-test"
5
6
7	+#define BOOST_TEST_DYN_LINK
8	#define BOOST_TEST_MODULE wesnoth unit tests master suite
9	#include <boost/test/unit_test.hpp>
10	#include <boost/test/unit_test_monitor.hpp>




%%TOOLS%%bin/cutter
%%TOOLS%%bin/exploder
bin/wesnoth
%%PYTHON%%%%TOOLS%%bin/wesnoth_addon_manager
%%TESTS%%bin/wesnoth_test
%%SERVER%%bin/wesnothd
%%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

%%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/wmltools.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/wmltools.pyo
share/applications/wesnoth.desktop
share/applications/wesnoth_editor.desktop
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-anl.mo
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-units.mo
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-utbs.mo
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-anl.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-dm.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-lib.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-low.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-multiplayer.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-nr.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-sof.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-sotbe.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-tb.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-test.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-thot.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-trow.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-tsg.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-tutorial.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-units.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-utbs.mo
%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-anl.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-dm.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-lib.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-low.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-multiplayer.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-nr.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-sof.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-sotbe.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-tb.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-test.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-thot.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-trow.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-tsg.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-tutorial.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-units.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-utbs.mo
%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth.mo
%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-anl.mo
%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/da/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/da/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/da/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/de/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/de/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/de/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/el/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/el/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/el/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/es/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/es/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/es/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/et/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/et/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/et/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-dm.mo
%%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

%%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
%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/he/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/he/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/he/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/id/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/id/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/id/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/is/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/is/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/is/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/it/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/it/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/it/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/la/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/la/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/la/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-dm.mo
%%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

%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-utbs.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth.mo
share/pixmaps/wesnoth-icon.png
share/pixmaps/wesnoth_editor-icon.png
%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/wesnoth
@dirrmtry man/af/man6
@dirrmtry man/af
@dirrmtry man/ang/man6
@dirrmtry man/ang
@dirrmtry man/ang@latin/man6
@dirrmtry man/ang@latin
@dirrmtry man/ar/man6
@dirrmtry man/ar
@dirrmtry man/bg/man6

@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

@dirrmtry man/zh_TW/man6
@dirrmtry man/zh_TW
@dirrmtry share/applications
%%NLS%%@dirrmtry share/locale/ang/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ang
%%NLS%%@dirrmtry share/locale/ang@latin/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ang@latin
%%NLS%%@dirrmtry share/locale/ca_ES@valencia/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ca_ES@valencia
%%NLS%%@dirrmtry share/locale/en@shaw/LC_MESSAGES




***************
*** 2,7 ****
  %%TOOLS%%bin/cutter
  %%TOOLS%%bin/exploder
  bin/wesnoth
  %%PYTHON%%%%TOOLS%%bin/wesnoth_addon_manager
  %%TESTS%%bin/wesnoth_test
  %%SERVER%%bin/wesnothd--- 2,9 ----
  %%TOOLS%%bin/cutter
  %%TOOLS%%bin/exploder
  bin/wesnoth
+ bin/schema_generator
+ bin/schema_validator
  %%PYTHON%%%%TOOLS%%bin/wesnoth_addon_manager
  %%TESTS%%bin/wesnoth_test
  %%SERVER%%bin/wesnothd

Return to bug 165332

Lines 1-204 Link Here

(-)wesnoth.new/Makefile (-107 / +81 lines)
1	# New ports collection makefile for: wesnoth	1	# New ports collection makefile for: wesnoth
2	# Date created: 22 December 2003	2	# Date created: 7 September 2008
3	# Whom: Mezz <mezz7@cox.net>	3	# Whom: Philip Paeps <philip@FreeBSD.org>
4	#	4	#
5	# $FreeBSD: ports/games/wesnoth/Makefile,v 1.94 2012/02/18 10:18:21 mva Exp $	5	# $FreeBSD: ports/games/wesnoth/Makefile,v 1.100 2012/02/18 10:18:21 mva Exp $
6	#	6	#
7		7
8	PORTNAME= wesnoth	8	PORTNAME= wesnoth
9	PORTVERSION= 1.8.6	9	PORTVERSION= 1.10
10	PORTREVISION= 1
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
13	http://files.wesnoth.org/	12	http://files.wesnoth.org/
14		13
15	MAINTAINER= philip@FreeBSD.org	14	MAINTAINER= philip@FreeBSD.org
16	COMMENT= A fantasy turn-based strategy game	15	COMMENT= A fantasy turn-based strategy game
17		16
		17	EXTRACT_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-fonts/junicode:extract
18	LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs	18	LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs
19		19
20	LICENSE= GPLv2 GPLv3	20	LICENSE= GPLv2 GPLv3
21	LICENSE_COMB= dual	21	LICENSE_COMB= dual
22	LICENSE_FILE= ${WRKSRC}/COPYING	22	LICENSE_FILE= ${WRKSRC}/COPYING
23		23
24	CONFLICTS= wesnoth-devel-[0-9]*	24	CONFLICTS= wesnoth-[0-9]*
25		25
26	USE_SDL= image mixer net ttf	26	USE_SDL= image mixer net ttf
27	USE_GNOME= pango	27	USE_GNOME= pango desktopfileutils
28	USE_GMAKE= yes
29	MAKE_JOBS_SAFE= yes	28	MAKE_JOBS_SAFE= yes
30	USE_BZIP2= yes	29	USE_BZIP2= yes
31	USE_LUA= 5.1	30	USE_CMAKE= yes
32	USE_AUTOTOOLS= aclocal autoheader automake autoconf
33	ACLOCAL_ARGS= -Im4
34	AUTOMAKE_ARGS= --add-missing --copy
35	CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}"
36	CONFIGURE_ARGS= --localstatedir=/var \
37	--with-boost=${LOCALBASE} \
38	--with-icondir=${PREFIX}/share/pixmaps \
39	--with-libiconv-prefix=${LOCALBASE} \
40	--with-libintl-prefix=${LOCALBASE} \
41	--with-localedir=${PREFIX}/share/locale
42	PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config
43
44	MANLANG= "" cs de en_GB es et fi fr gl hu id it ja lt pl pt_BR sk \
45	sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW
46		31
47	MAN6= wesnoth.6	32	MAN6= wesnoth.6
48		33
49	PORTDOCS= *	34	PORTDOCS= *
50	PORTDATA= *	35	PORTDATA= *
51		36
52	OPTIONS= BWMON "Enable bandwidth monitoring for server" Off \	37	OPTIONS= ANA "Enable Asynchronous Network API (WIP)" On \
53	CAMPAIGN "Enable campaign server" On \	38	CAMPAIGN "Enable campaign server" On \
54	EDITOR "Enable map editor" On \
55	FRIBIDI "Enable bidirectional support" On \	39	FRIBIDI "Enable bidirectional support" On \
56	LOWMEM "Reduce memory usage (disables animations)" Off \	40	LOWMEM "Reduce memory usage (disables animations)" Off \
57	NOTIFY "Enable desktop notifications" On \	41	NOTIFY "Enable desktop notifications" On \
		42	OPENMP "Enable OpenMP support" Off \
58	POOLALLOC "Use wesnoth own memory allocator" Off \	43	POOLALLOC "Use wesnoth own memory allocator" Off \
59	PYTHON "Enable python developer tools" On \	44	PYTHON "Enable python developer tools" Off \
60	RAWSOCKETS "Use raw receiving sockets in multiplayer" Off \	45	RAWSOCKETS "Use raw receiving sockets in multiplayer" Off \
61	SERVER "Enable server" On \	46	SERVER "Enable server" On \
62	TESTS "Enable unit tests" Off \	47	TESTS "Enable unit tests" Off \
63	TINYGUI "Enable tiny gui (down to 320x200)" Off \
64	TOOLS "Enable extra tools for artists and translators" On	48	TOOLS "Enable extra tools for artists and translators" On
65		49
66	.include <bsd.port.pre.mk>	50	.include <bsd.port.options.mk>
67
68	.if defined(WITH_DEBUG)
69	CONFIGURE_ARGS+= --enable-debug
70	.endif
71
72	.if defined(WITH_PROFILE)
73	CONFIGURE_ARGS+= --enable-profile
74	.endif
75		51
76	# XXX: breaks compilation because of -Werror	52	# XXX: breaks compilation because of -Werror
77	.if !defined(WITH_STRICT)	53	.if !defined(WITH_STRICT)
78	CONFIGURE_ARGS+= --disable-strict-compilation	54	CMAKE_ARGS+= -DENABLE_STRICT_COMPILATION=off
79	.endif	55	.endif
80		56
81	.if defined(WITHOUT_BWMON)	57	.if defined(WITHOUT_ANA)
82	CONFIGURE_ARGS+= --disable-bandwidth-monitor	58	CMAKE_ARGS+= -DUSE_ANA_NETWORK=off
83	.else	59	.else
84	CONFIGURE_ARGS+= --enable-bandwidth-monitor	60	CMAKE_ARGS+= -DUSE_ANA_NETWORK=on
85	.endif	61	.endif
86		62
87	.if defined(WITHOUT_CAMPAIGN)	63	.if defined(WITHOUT_CAMPAIGN)
88	CONFIGURE_ARGS+= --disable-campaign-server	64	CMAKE_ARGS+= -DENABLE_CAMPAIGN_SERVER=off
89	PLIST_SUB+= CAMPAIGN="@comment "	65	PLIST_SUB+= CAMPAIGN="@comment "
90	.else
91	CONFIGURE_ARGS+= --enable-campaign-server
92	PLIST_SUB+= CAMPAIGN=""
93	.endif
94
95	.if defined(WITHOUT_EDITOR)
96	CONFIGURE_ARGS+= --disable-editor
97	PLIST_SUB+= EDITOR="@comment "
98	.else	66	.else
99	CONFIGURE_ARGS+= --enable-editor	67	CMAKE_ARGS+= -DENABLE_CAMPAIGN_SERVER=on
100	PLIST_SUB+= EDITOR=""	68	PLIST_SUB+= CAMPAIGN=""
101	.endif	69	.endif
102		70
103	.if defined(WITHOUT_FRIBIDI)	71	.if defined(WITHOUT_FRIBIDI)
104	CONFIGURE_ARGS+= --without-fribidi	72	CMAKE_ARGS+= -DENABLE_FRIBIDI=off
105	.else	73	.else
106	CONFIGURE_ARGS+= --with-fribidi	74	CMAKE_ARGS+= -DENABLE_FRIBIDI=on
107	LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi	75	LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi
108	.endif	76	.endif
109		77
110	.if defined(WITHOUT_LOWMEM)	78	.if defined(WITHOUT_LOWMEM)
111	CONFIGURE_ARGS+= --disable-lowmem	79	CMAKE_ARGS+= -DENABLE_LOW_MEM=off
112	.else	80	.else
113	CONFIGURE_ARGS+= --enable-lowmem	81	CMAKE_ARGS+= -DENABLE_LOW_MEM=off
114	.endif	82	.endif
115		83
116	.if defined(WITHOUT_NOTIFY)	84	.if defined(WITHOUT_NOTIFY)
117	CONFIGURE_ARGS+= --disable-notifications	85	CMAKE_ARGS+= -DENABLE_NOTIFICATIONS=off
118	.else	86	.else
119	CONFIGURE_ARGS+= --enable-notifications --enable-dbus	87	CMAKE_ARGS+= -DENABLE_NOTIFICATIONS=on
120	LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus	88	LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
121	.endif	89	.endif
122		90
123	.if defined(WITHOUT_NLS)	91	.if defined(WITHOUT_NLS)
124	CONFIGURE_ARGS+= --disable-nls	92	CMAKE_ARGS+= -DENABLE_NLS=off
125	PLIST_SUB+= NLS="@comment "	93	PLIST_SUB+= NLS="@comment "
126	.else	94	.else
127	USE_GETTEXT= yes	95	CMAKE_ARGS+= -DENABLE_NLS=on -DLOCALEDIR=${PREFIX}/share/locale
128	CONFIGURE_ARGS+= --enable-nls	96	USE_GETTEXT= yes
129	PLIST_SUB+= NLS=""	97	MANLANG= "" cs de en_GB et fr gl hu id lt pl sk \
		98	zh_CN zh_TW
		99	_MANPAGES+= ${PREFIX}/man/es/man6/wesnothd.6 \
		100	${PREFIX}/man/fi/man6/wesnothd.6 \
		101	${PREFIX}/man/it/man6/wesnothd.6 \
		102	${PREFIX}/man/ja/man6/wesnothd.6 \
		103	${PREFIX}/man/pt_BR/man6/wesnothd.6 \
		104	${PREFIX}/man/sr/man6/wesnothd.6 \
		105	${PREFIX}/man/sr@ijekavian/man6/wesnothd.6 \
		106	${PREFIX}/man/sr@ijekavianlatin/man6/wesnothd.6 \
		107	${PREFIX}/man/sr@latin/man6/wesnothd.6 \
		108	${PREFIX}/man/tr/man6/wesnothd.6
		109	PLIST_SUB+= NLS=""
		110	.endif
		111
		112	.if defined(WITHOUT_OPENMP)
		113	CMAKE_ARGS+= -DENABLE_OMP=off
		114	.else
		115	CMAKE_ARGS+= -DENABLE_OMP=on
130	.endif	116	.endif
131		117
132	.if defined(WITHOUT_POOLALLOC)	118	.if defined(WITHOUT_POOLALLOC)
133	CONFIGURE_ARGS+= --disable-pool-alloc	119	CMAKE_ARGS+= -DENABLE_POOL_ALLOC=off
134	.else	120	.else
135	CONFIGURE_ARGS+= --enable-pool-alloc	121	CMAKE_ARGS+= -DENABLE_POOL_ALLOC=on
136	.endif	122	.endif
137		123
138	.if defined(WITHOUT_PYTHON)	124	.if defined(WITHOUT_PYTHON)
139	CONFIGURE_ARGS+= --disable-python-install	125	PLIST_SUB+= PYTHON="@comment "
140	PLIST_SUB+= PYTHON="@comment "
141	.else	126	.else
142	USE_PYTHON= yes	127	BROKEN= cmake build doesn\'t support installing python tools
143	CONFIGURE_ENV+= PYTHON_PREFIX=${PREFIX} \	128	USE_PYTHON= yes
144	PYTHON_VERSION=${PYTHON_VERSION:S/python//}	129	CONFIGURE_ENV+= PYTHON_PREFIX=${PREFIX} \
145	CONFIGURE_ARGS+= --enable-python-install	130	PYTHON_VERSION=${PYTHON_VERSION:S/python//}
146	PLIST_SUB+= PYTHON=""	131	CONFIGURE_ARGS+=--enable-python-install
147	.include "${PORTSDIR}/Mk/bsd.python.mk"	132	PLIST_SUB+= PYTHON=""
148	.endif	133	.endif
149		134
150	.if defined(WITHOUT_RAWSOCKETS)	135	.if !defined(WITHOUT_RAWSOCKETS)
151	CONFIGURE_ARGS+= --disable-raw-sockets	136	CFLAGS+= -DNETWORK_USE_RAW_SOCKETS
152	.else
153	CONFIGURE_ARGS+= --enable-raw-sockets
154	.endif	137	.endif
155		138
156	.if defined(WITHOUT_SERVER)	139	.if defined(WITHOUT_SERVER)
157	CONFIGURE_ARGS+= --disable-server	140	CMAKE_ARGS+= -DENABLE_SERVER=off
158	PLIST_SUB+= SERVER="@comment "	141	PLIST_SUB+= SERVER="@comment "
159	.else	142	.else
160	CONFIGURE_ARGS+= --enable-server	143	CMAKE_ARGS+= -DENABLE_SERVER=on
161	MAN6+= wesnothd.6	144	MAN6+= wesnothd.6
162	PLIST_SUB+= SERVER=""	145	PLIST_SUB+= SERVER=""
163	.endif	146	.endif
164		147
165	.if defined(WITHOUT_TESTS)	148	.if defined(WITHOUT_TESTS)
166	CONFIGURE_ARGS+= --disable-tests	149	CMAKE_ARGS+= -DENABLE_TESTS=off
167	PLIST_SUB+= TESTS="@comment "	150	PLIST_SUB+= TESTS="@comment "
168	.else	151	.else
169	CONFIGURE_ARGS+= --enable-tests	152	CMAKE_ARGS+= -DENABLE_TESTS=on
170	PLIST_SUB+= TESTS=""	153	PLIST_SUB+= TESTS=""
171	.endif
172
173	.if defined(WITHOUT_TINYGUI)
174	CONFIGURE_ARGS+= --disable-tinygui
175	.else
176	BUILD_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
177	CONFIGURE_ARGS+= --enable-tinygui
178	.endif	154	.endif
179		155
180	.if defined(WITHOUT_TOOLS)	156	.if defined(WITHOUT_TOOLS)
181	CONFIGURE_ARGS+= --disable-tools	157	CMAKE_ARGS+= -DENABLE_TOOLS=off
182	PLIST_SUB+= TOOLS="@comment "	158	PLIST_SUB+= TOOLS="@comment "
183	.else	159	.else
184	CONFIGURE_ARGS+= --enable-tools	160	CMAKE_ARGS+= -DENABLE_TOOLS=on
185	PLIST_SUB+= TOOLS=""	161	PLIST_SUB+= TOOLS=""
186	.endif	162	.endif
187		163
188	.if defined(NOPORTDOCS)	164	.if defined(NOPORTDOCS)
189	CONFIGURE_ARGS+= --without-docs	165	CMAKE_ARGS+= -DDOCDIR=none
190	.endif	166	.endif
191		167
192	.if defined(NOPORTDATA)	168	.if defined(NOPORTDATA)
193	IGNORE= game data is required, undefine NOPORTDATA	169	IGNORE= game data is required, undefine NOPORTDATA
194	.endif	170	.endif
195		171
196	post-patch: .SILENT
197	${REINPLACE_CMD} -e 's\|png_voidp_NULL\|NULL\|g' \
198	-e 's\|png_error_ptr_NULL\|NULL\|g' \
199	${WRKSRC}/src/tools/exploder_utils.cpp
200
201	post-install:	172	post-install:
		173	${INSTALL_DATA} $$(${MAKE} -V WRKSRC \
		174	-C ${PORTSDIR}/x11-fonts/junicode)/fonts/Junicode-Regular.ttf \
		175	${DATADIR}/fonts
202	-update-desktop-database ${PREFIX}/share/applications	176	-update-desktop-database ${PREFIX}/share/applications
203		177
204	.include <bsd.port.post.mk>	178	.include <bsd.port.mk>

Lines 1-84 Link Here

(-)wesnoth.new/Makefile.rej (-84 lines)
1	***************
2	* 6,12 **
3	#
4
5	PORTNAME= wesnoth
6	- PORTVERSION= 1.9.7
7	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
9	http://files.wesnoth.org/
10	--- 6,12 ----
11	#
12
13	PORTNAME= wesnoth
14	+ PORTVERSION= 1.9.9
15	CATEGORIES= games
16	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
17	http://files.wesnoth.org/
18	***************
19	* 15,24 **
20	MAINTAINER= philip@FreeBSD.org
21	COMMENT= A fantasy turn-based strategy game
22
23	LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs
24	- RUN_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-fonts/junicode:extract
25	-
26	- BROKEN= incomplete plist
27
28	LICENSE= GPLv2 GPLv3
29	LICENSE_COMB= dual
30	--- 15,22 ----
31	MAINTAINER= philip@FreeBSD.org
32	COMMENT= A fantasy turn-based strategy game
33
34	+ EXTRACT_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-fonts/junicode:extract
35	LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs
36
37	LICENSE= GPLv2 GPLv3
38	LICENSE_COMB= dual
39	***************
40	* 27,33 **
41	CONFLICTS= wesnoth-[0-9]*
42
43	USE_SDL= image mixer net ttf
44	- USE_GNOME= pango
45	MAKE_JOBS_SAFE= yes
46	USE_BZIP2= yes
47	USE_CMAKE= yes
48	--- 25,31 ----
49	CONFLICTS= wesnoth-[0-9]*
50
51	USE_SDL= image mixer net ttf
52	+ USE_GNOME= pango desktopfileutils
53	MAKE_JOBS_SAFE= yes
54	USE_BZIP2= yes
55	USE_CMAKE= yes
56	***************
57	* 97,105 **
58	.else
59	CMAKE_ARGS+= -DENABLE_NLS=on -DLOCALEDIR=${PREFIX}/share/locale
60	USE_GETTEXT= yes
61	- MANLANG= "" cs de en_GB et fi fr gl hu id it ja lt pl pt_BR sk \
62	- sr sr@ijekavian sr@ijekavianlatin sr@latin zh_CN zh_TW
63	_MANPAGES+= ${PREFIX}/man/es/man6/wesnothd.6 \
64	${PREFIX}/man/tr/man6/wesnothd.6
65	PLIST_SUB+= NLS=""
66	.endif
67	--- 95,111 ----
68	.else
69	CMAKE_ARGS+= -DENABLE_NLS=on -DLOCALEDIR=${PREFIX}/share/locale
70	USE_GETTEXT= yes
71	+ MANLANG= "" cs de en_GB et fr gl hu id lt pl sk \
72	+ zh_CN zh_TW
73	_MANPAGES+= ${PREFIX}/man/es/man6/wesnothd.6 \
74	+ ${PREFIX}/man/fi/man6/wesnothd.6 \
75	+ ${PREFIX}/man/it/man6/wesnothd.6 \
76	+ ${PREFIX}/man/ja/man6/wesnothd.6 \
77	+ ${PREFIX}/man/pt_BR/man6/wesnothd.6 \
78	+ ${PREFIX}/man/sr/man6/wesnothd.6 \
79	+ ${PREFIX}/man/sr@ijekavian/man6/wesnothd.6 \
80	+ ${PREFIX}/man/sr@ijekavianlatin/man6/wesnothd.6 \
81	+ ${PREFIX}/man/sr@latin/man6/wesnothd.6 \
82	${PREFIX}/man/tr/man6/wesnothd.6
83	PLIST_SUB+= NLS=""
84	.endif

Line 0 Link Here

(-)wesnoth.new/files/patch-CMakeLists.txt (+74 lines)
		1	--- CMakeLists.txt~
		2	+++ CMakeLists.txt
		3	@@ -21,11 +21,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR
		4	find_package(SDL 1.2.7 REQUIRED)
		5	find_package(Boost 1.35 REQUIRED COMPONENTS iostreams regex)
		6
		7	-# no, gettext executables are not required when NLS is deactivated
		8	+if(ENABLE_NLS)
		9	find_package(Gettext)
		10	-# yes, libintl is required even when NLS is deactivated (this is to compile
		11	-# src/gettext.cpp since it includes libintl.h)
		12	find_package(Libintl REQUIRED)
		13	+endif(ENABLE_NLS)
		14
		15	find_package(X11)
		16
		17	@@ -68,7 +67,7 @@ option(ENABLE_GAME "Enable compilation o
		18	option(ENABLE_GAME "Enable compilation of the game" ON)
		19	option(ENABLE_CAMPAIGN_SERVER "Enable compilation of campaign server")
		20	option(ENABLE_SERVER "Enable compilation of server" ON)
		21	-option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers")
		22	+option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers" OFF)
		23	option(ENABLE_TESTS "Build unit tests")
		24	option(ENABLE_NLS "Enable building of translations" ON)
		25	option(ENABLE_POOL_ALLOC "Enable custom pool malloc" OFF)
		26	@@ -114,18 +113,18 @@ if(CMAKE_COMPILER_IS_GNUCXX)
		27	endif(ENABLE_STRICT_COMPILATION)
		28
		29	# Strict compilation for C files is disabled until somebody wants to clean them.
		30	- set(CMAKE_C_FLAGS "-O2 -W -Wall -ansi $ENV{CFLAGS}"
		31	+ set(CMAKE_C_FLAGS "-W -Wall -ansi $ENV{CFLAGS}"
		32	CACHE STRING "Flags used by the C compiler during normal builds." FORCE)
		33	- set(CMAKE_C_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -ansi $ENV{CFLAGS}"
		34	+ set(CMAKE_C_FLAGS_DEBUG "-DDEBUG -W -Wall -ansi $ENV{CFLAGS}"
		35	CACHE STRING "Flags used by the C compiler during debug builds." FORCE)
		36	- set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -W -Wall -ansi $ENV{CFLAGS} -Wno-unused"
		37	+ set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -W -Wall -ansi $ENV{CFLAGS} -Wno-unused"
		38	CACHE STRING "Flags used by the C compiler during release builds." FORCE)
		39
		40	- set(CMAKE_CXX_FLAGS "-O2 -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
		41	+ set(CMAKE_CXX_FLAGS "-W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
		42	CACHE STRING "Flags used by the CXX compiler during normal builds." FORCE)
		43	- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
		44	+ set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
		45	CACHE STRING "Flags used by the CXX compiler during debug builds." FORCE)
		46	- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS} -Wno-unused"
		47	+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS} -Wno-unused"
		48	CACHE STRING "Flags used by the CXX compiler during release builds." FORCE)
		49
		50	endif(NOT CONFIGURED)
		51	@@ -154,6 +153,7 @@ add_definitions(-DLOCALEDIR=\\\"${LOCALE
		52	if(LOCALEDIR MATCHES "^/")
		53	add_definitions(-DHAS_RELATIVE_LOCALEDIR=0)
		54	set(LOCALE_INSTALL ${LOCALEDIR})
		55	+ set(LOCALEDIR "translations")
		56	else(LOCALEDIR MATCHES "^/")
		57	add_definitions(-DHAS_RELATIVE_LOCALEDIR=1)
		58	set(LOCALE_INSTALL ${DATADIR}/${LOCALEDIR})
		59	@@ -213,10 +213,14 @@ if(ENABLE_TESTS)
		60	find_package( Boost 1.35 REQUIRED COMPONENTS unit_test_framework )
		61	endif(ENABLE_TESTS)
		62	if(ENABLE_GAME)
		63	- find_package( FriBiDi )
		64	+ pkg_check_modules( FRIBIDI fribidi>=0.19.0 )
65	if(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
66	add_definitions(-DHAVE_FRIBIDI)
67	elseif(ENABLE_FRIBIDI AND NOT FRIBIDI_LIBRARIES)
68	+ pkg_check_modules( FRIBIDI fribidi )
69	+ if(FRIBIDI_LIBRARIES)
70	+ add_definitions(-DOLD_FRIBIDI)
71	+ endif(FRIBIDI_LIBRARIES)
72	message("Could not find FriBiDi. Disabling FriBiDi support.")
73	endif()
74

Lines 1-18 Link Here

(-)wesnoth.new/files/patch-Makefile.am (-18 lines)
1	--- Makefile.am~
2	+++ Makefile.am
3	@@ -73,6 +73,7 @@ if INSTALLDATA
4	echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
5	$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
6	done
7	+if INSTALLDOCS
8	@echo "Replicate doc directory skeleton under target doc subdirectory"
9	@echo "Then copy all corresponding files."
10	test -z "$(docdir)" \|\| $(mkdir_p) "$(DESTDIR)$(docdir)"
11	@@ -84,6 +85,7 @@ if INSTALLDATA
12	echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
13	$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; cd ..; \
14	done
15	+endif
16	if TINYGUI
17	@echo "Shrink installed images by a factor of two."
18	(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 \

Lines 1-14 Link Here

(-)wesnoth.new/files/patch-configure.ac (-14 lines)
1	--- configure.ac~
2	+++ configure.ac
3	@@ -213,6 +213,11 @@ esac
4	AC_SUBST([FULLLOCALEDIR])
5	AC_SUBST([HAS_RELATIVE_LOCALEDIR])
6
7	+AC_ARG_WITH([docs],
8	+ AS_HELP_STRING([--without-docs], [don't install wesnoth manual]),
9	+ [docs=$withval],
10	+ [docs=yes])
11	+AM_CONDITIONAL([INSTALLDOCS], [test x$docs = xyes])
12
13	AC_ARG_ENABLE([game],
14	AS_HELP_STRING([--disable-game], [disable compilation of game]),

Lines 1-15 Link Here

(-)wesnoth.new/files/patch-m4-zlib.m4 (-15 lines)
1	--- m4/zlib.m4~
2	+++ m4/zlib.m4
3	@@ -16,11 +16,9 @@ fi
4	AC_MSG_CHECKING([for zlib location])
5	if test x"$zlib_prefix" = x ; then
6	zlib_header_found="no"
7	- for dir in /usr/local /usr ; do
8	+ for dir in /usr ; do
9	if test -f "$dir/include/zlib.h" ; then
10	zlib_header_found="yes"
11	- ZLIB_CFLAGS="-I$dir/include"
12	- ZLIB_LDFLAGS="-L$dir/lib"
13	break
14	fi
15	done

Line 0 Link Here

(-)wesnoth.new/files/patch-po-CMakeLists.txt (+24 lines)
	1	--- po/CMakeLists.txt~
	2	+++ po/CMakeLists.txt
	3	@@ -273,9 +273,6 @@ if(ENABLE_NLS)
	4	COMMENT "mo-update [${DOMAIN}-${LINGUA}]: Creating mo file."
	5	)
	6
	7	- install(FILES ${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
	8	- DESTINATION ${LOCALE_INSTALL}/${LINGUA}/LC_MESSAGES)
	9	-
	10	set(mo-update-SRC ${mo-update-SRC}
	11	${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
	12	)
	13	@@ -285,6 +282,11 @@ if(ENABLE_NLS)
	14
	15	endforeach(DOMAIN ${DOMAINS})
	16
	17	+ foreach(DOMAIN ${NORMAL_DOMAINS})
	18	+ install(FILES ${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
	19	+ DESTINATION ${LOCALE_INSTALL}/${LINGUA}/LC_MESSAGES)
	20	+ endforeach(DOMAIN ${NORMAL_DOMAINS})
	21	+
	22	if(ENABLE_POT_UPDATE_TARGET)
	23	add_custom_target(mo-update-${LINGUA}
	24	COMMENT "mo-update ${LINGUA}: Done."

Line 0 Link Here

(-)wesnoth.new/files/patch-src-CMakeLists.txt (+22 lines)
	1	--- src/CMakeLists.txt~
	2	+++ src/CMakeLists.txt
	3	@@ -123,7 +123,7 @@ set(tools-external-libs
	4	)
	5
	6	if(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
	7	- include_directories( ${FRIBIDI_INCLUDE_DIR} )
	8	+ include_directories( ${FRIBIDI_INCLUDE_DIRS} )
	9	set(game-external-libs ${game-external-libs} ${FRIBIDI_LIBRARIES})
	10	endif(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
	11
	12	@@ -826,7 +833,9 @@ if(ENABLE_TESTS)
	13	boost_unit_test_framework
	14	)
	15	set_target_properties(test
	16	- PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}test${BINARY_SUFFIX}
	17	+ PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}wesnoth_test${BINARY_SUFFIX}
	18	)
	19	+
	20	+ install(TARGETS test DESTINATION ${BINDIR})
	21	endif(ENABLE_TESTS)
	22

Lines 1-31 Link Here

(-)wesnoth.new/files/patch-src-Makefile.am (-31 lines)
1	--- src/Makefile.am~
2	+++ src/Makefile.am
3	@@ -16,7 +16,7 @@ bin_PROGRAMS += campaignd
4	endif
5
6	if TESTS
7	-bin_PROGRAMS += test
8	+bin_PROGRAMS += wesnoth_test
9	endif
10
11	CLEANFILES = revision.hpp
12	@@ -342,7 +342,7 @@ cutter_DEPENDENCIES=libwesnoth-core.a
13	# Unit tests #
14	#############################################################################
15
16	-test_SOURCES = \
17	+wesnoth_test_SOURCES = \
18	tests/main.cpp \
19	tests/utils/fake_display.cpp \
20	tests/utils/fake_event_source.cpp \
21	@@ -362,8 +362,8 @@ test_SOURCES = \
22	tests/gui/test_save_dialog.cpp \
23	$(wesnoth_source)
24
25	-test_LDADD = $(INTERNALLIBS) $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS)
26	-test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
27	+wesnoth_test_LDADD = $(INTERNALLIBS) $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS)
28	+wesnoth_test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
29
30	#############################################################################
31	# Headers #

Line 0 Link Here

(-)wesnoth.new/files/patch-src-ana-src-CMakeLists.txt (+34 lines)
	1	--- src/ana/src/CMakeLists.txt~
	2	+++ src/ana/src/CMakeLists.txt
	3	@@ -4,7 +4,7 @@ include_directories(../api)
	4
	5	find_package(Boost 1.35 REQUIRED COMPONENTS thread system)
	6
	7	-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3")
	8	+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
	9
	10	set(common_srcs asio_listener.cpp asio_sender.cpp asio_timers.cpp)
	11
	12	@@ -20,11 +20,11 @@ target_link_libraries( ana-static ${Boos
	13
	14	set(CMAKE_INSTALL_PREFIX /usr/local)
	15
	16	-if(NOT MSVC)
	17	+if(FALSE)
	18	set(CMAKE_INSTALL_PREFIX /usr/local)
	19	install(TARGETS ana LIBRARY DESTINATION lib)
	20	install(TARGETS ana-static ARCHIVE DESTINATION lib)
	21	-endif(NOT MSVC)
	22	+endif(FALSE)
	23
	24	set(ana_headers
	25	../api/ana.hpp
	26	@@ -35,6 +35,6 @@ set(ana_headers
	27	../api/binary_streams.hpp
	28	)
	29
	30	-if(NOT MSVC)
	31	+if(FALSE)
	32	install(FILES ${ana_headers} DESTINATION include/ana)
	33	-endif(NOT MSVC)
	34	+endif(FALSE)

Lines 1-16 Link Here

(-)wesnoth.new/pkg-plist.rej (-16 lines)
1	***************
2	* 2,7 **
3	%%TOOLS%%bin/cutter
4	%%TOOLS%%bin/exploder
5	bin/wesnoth
6	%%PYTHON%%%%TOOLS%%bin/wesnoth_addon_manager
7	%%TESTS%%bin/wesnoth_test
8	%%SERVER%%bin/wesnothd--- 2,9 ----
9	%%TOOLS%%bin/cutter
10	%%TOOLS%%bin/exploder
11	bin/wesnoth
12	+ bin/schema_generator
13	+ bin/schema_validator
14	%%PYTHON%%%%TOOLS%%bin/wesnoth_addon_manager
15	%%TESTS%%bin/wesnoth_test
16	%%SERVER%%bin/wesnothd