ports/149899: [patch] games/wesnoth-devel: update to 1.9.0

Anonymous swell.k at gmail.com
Mon Aug 23 04:50:04 UTC 2010 

>Number:         149899
>Category:       ports
>Synopsis:       [patch] games/wesnoth-devel: update to 1.9.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 23 04:50:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
CC = gcc45
CXX = g++45
LOCALBASE = /usr/pkg

I can't test network with ANA enabled because it crashes. But it appears
to be unrelated to the issue fixed in r45943.
>Description:
- sync with games/wesnoth, ports/149485 more accurately
- update
- drop system lua dependency, it's bundled now
- add ANA knob, `on' by default like configure.ac and it's -devel port, anyway
- silence warning on gcc45 about `th' (pthread_t), cf. config.log excerpt below

release notes: http://www.wesnoth.org/forum/viewtopic.php?f=5&t=31275
>How-To-Repeat:
$ wesnoth (ANA: trying to connect to server.wesnoth.org:14997)
Battle for Wesnoth v1.9.0
Started on Mon Aug 23 08:27:32 2010

Data directory: /usr/pkg/share/wesnoth
User configuration directory: /home/holo/.wesnoth1.9
User data directory: /home/holo/.wesnoth1.9
Cache directory: /home/holo/.wesnoth1.9/cache
Checking video mode: 1024x768x32...
setting mode to 1024x768x32
20100823 08:27:33 error display: could not open image 'buttons/menu-button-disabled.png'
20100823 08:27:33 error gui/draw: Image: 'buttons/menu-button-disabled.png' not found and won't be drawn.
20100823 08:27:33 error gui/draw: Image: 'buttons/menu-button-disabled.png' not found and won't be drawn.
Assertion failed: (!pthread_mutex_lock(&m)), function lock, file /usr/pkg/include/boost/thread/pthread/mutex.hpp, line 51.

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

configure:16281: checking for the flags needed to use pthreads
configure:16346: g++45 -o conftest -O2 -W -Wall -ansi -O2 -pipe -fno-strict-aliasing -DDISABLE_POOL_ALLOC -I/usr/pkg/include  -I/usr/pkg/include/dbus-1.0 -I/usr/pkg/include/dbus-1.0/include    conftest.cpp -lm   -lz -pthread -L/usr/pkg/lib -ldbus-1    >&5
conftest.cpp: In function 'int main()':
conftest.cpp:48:34: warning: 'th' is used uninitialized in this function
configure:16353: $? = 0
This flag seems to have triggered warnings
configure:16346: g++45 -o conftest -O2 -W -Wall -ansi -O2 -pipe -fno-strict-aliasing -DDISABLE_POOL_ALLOC -I/usr/pkg/include  -I/usr/pkg/include/dbus-1.0 -I/usr/pkg/include/dbus-1.0/include    conftest.cpp -lm   -lz -pthread -L/usr/pkg/lib -ldbus-1   -lpthreads >&5
conftest.cpp: In function 'int main()':
conftest.cpp:48:34: warning: 'th' is used uninitialized in this function
/usr/pkg/bin/ld: error: cannot find -lpthreads
collect2: ld returned 1 exit status
configure:16353: $? = 1
configure: failed program was:
[...]
| #include <pthread.h>
| int
| main ()
| {
| pthread_t th; pthread_join(th, 0);
|     pthread_attr_init(0); pthread_cleanup_push(0, 0);
|     pthread_create(0,0,0,0); pthread_cleanup_pop(0);
|   ;
|   return 0;
| }
configure:16346: g++45 -o conftest -O2 -W -Wall -ansi -O2 -pipe -fno-strict-aliasing -DDISABLE_POOL_ALLOC -I/usr/pkg/include  -I/usr/pkg/include/dbus-1.0 -I/usr/pkg/include/dbus-1.0/include    conftest.cpp -lm   -lz -pthread -L/usr/pkg/lib -ldbus-1   -Kthread >&5
g++45: unrecognized option '-Kthread'
conftest.cpp: In function 'int main()':
conftest.cpp:48:34: warning: 'th' is used uninitialized in this function
configure:16353: $? = 0
This flag seems to have triggered warnings
configure:16346: g++45 -o conftest -O2 -W -Wall -ansi -O2 -pipe -fno-strict-aliasing -DDISABLE_POOL_ALLOC -I/usr/pkg/include  -I/usr/pkg/include/dbus-1.0 -I/usr/pkg/include/dbus-1.0/include    conftest.cpp -lm   -lz -pthread -L/usr/pkg/lib -ldbus-1   -kthread >&5
g++45: unrecognized option '-kthread'
conftest.cpp: In function 'int main()':
conftest.cpp:48:34: warning: 'th' is used uninitialized in this function
configure:16353: $? = 0
This flag seems to have triggered warnings
configure:16346: g++45 -o conftest -O2 -W -Wall -ansi -O2 -pipe -fno-strict-aliasing -DDISABLE_POOL_ALLOC -I/usr/pkg/include  -I/usr/pkg/include/dbus-1.0 -I/usr/pkg/include/dbus-1.0/include    conftest.cpp -lm   -lz -pthread -L/usr/pkg/lib -ldbus-1   -llthread >&5
conftest.cpp: In function 'int main()':
conftest.cpp:48:34: warning: 'th' is used uninitialized in this function
/usr/pkg/bin/ld: error: cannot find -llthread
collect2: ld returned 1 exit status
configure:16353: $? = 1
configure: failed program was:
[...]
| #include <pthread.h>
| int
| main ()
| {
| pthread_t th; pthread_join(th, 0);
|     pthread_attr_init(0); pthread_cleanup_push(0, 0);
|     pthread_create(0,0,0,0); pthread_cleanup_pop(0);
|   ;
|   return 0;
| }
configure:16346: g++45 -o conftest -O2 -W -Wall -ansi -O2 -pipe -fno-strict-aliasing -DDISABLE_POOL_ALLOC -I/usr/pkg/include  -I/usr/pkg/include/dbus-1.0 -I/usr/pkg/include/dbus-1.0/include    conftest.cpp -lm   -lz -pthread -L/usr/pkg/lib -ldbus-1   -pthread >&5
conftest.cpp: In function 'int main()':
conftest.cpp:48:34: warning: 'th' is used uninitialized in this function
configure:16353: $? = 0
configure:16381: result: -pthread
>Fix:
--- a.diff begins here ---
Index: games/wesnoth-devel/Makefile
===================================================================
RCS file: /a/.cvsup/ports/games/wesnoth-devel/Makefile,v
retrieving revision 1.87
diff -u -p -r1.87 Makefile
--- games/wesnoth-devel/Makefile	11 Aug 2010 06:57:32 -0000	1.87
+++ games/wesnoth-devel/Makefile	23 Aug 2010 01:32:26 -0000
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	1.8
-PORTREVISION=	2
+PORTVERSION=	1.9.0
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}.0 \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://files.wesnoth.org/
 PKGNAMESUFFIX=	-devel
 
@@ -18,40 +17,45 @@ COMMENT=	A fantasy turn-based strategy g
 
 LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs
 
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 CONFLICTS=	wesnoth-[0-9]*
 
-USE_GCC=	4.2+
 USE_SDL=	image mixer net ttf
-USE_GNOME=	desktopfileutils gnometarget pango
+USE_GNOME=	gnometarget pango
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
 USE_BZIP2=	yes
-USE_LUA=	5.1
 USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262
 ACLOCAL_ARGS=	-Im4
 AUTOMAKE_ARGS=	--add-missing --copy
+CONFIGURE_ENV=	PKG_CONFIG="${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_GAME=	gl zh_TW
-MANLANG=	"" cs de en_GB es et fi fr hu it ja lt pl pt_BR sk \
-		sr sr at ijekavian sr at ijekavianlatin sr at latin tr zh_CN
+MANLANG=	"" cs de en_GB es et fi fr gl hu it ja lt pl pt_BR sk \
+		sr sr at ijekavian sr at ijekavianlatin sr at latin tr zh_CN zh_TW
 
 MAN6=		wesnoth.6
 
 PORTDOCS=	*
 PORTDATA=	*
 
-OPTIONS=	BWMON	 "Enable bandwidth monitoring for server" Off \
+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 \
-		NLS	 "Enable localization"		On \
 		NOTIFY	 "Enable desktop notifications"	On \
 		POOLALLOC "Use wesnoth own memory allocator" Off \
 		PYTHON	 "Enable python developer tools" On \
@@ -67,17 +71,6 @@ OPTIONS=	BWMON	 "Enable bandwidth monito
 BROKEN=		does not compile
 .endif
 
-# workaround: compress and add to plist disobedient man pages
-.for manlang in ${MANLANG_GAME}
-MAN6_${manlang:U}=	wesnoth.6
-
-.if defined(NO_MANCOMPRESS)
-PLIST_FILES+=	man/${manlang}/man6/wesnoth.6
-.else
-PLIST_FILES+=	man/${manlang}/man6/wesnoth.6.gz
-.endif
-.endfor
-
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
@@ -91,6 +84,12 @@ CONFIGURE_ARGS+=	--enable-profile
 CONFIGURE_ARGS+=	--disable-strict-compilation
 .endif
 
+.if defined(WITHOUT_ANA)
+CONFIGURE_ARGS+=	--disable-ana
+.else
+CONFIGURE_ARGS+=	--enable-ana
+.endif
+
 .if defined(WITHOUT_BWMON)
 CONFIGURE_ARGS+=	--disable-bandwidth-monitor
 .else
@@ -198,26 +197,20 @@ CONFIGURE_ARGS+=	--enable-tools
 PLIST_SUB+=		TOOLS=""
 .endif
 
-.if (defined(WITH_CAMPAIGN) || defined(WITH_SERVER) || defined(WITH_TOOLS)) && defined(WITHOUT_NLS)
-BROKEN=		you need NLS support for `campaignd' or `wesnothd' or tools to link against gettext
+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=	--docdir=${WRKDIR}/docs
 .endif
 
-.if defined(NOPORTDOCS) || defined(NOPORTDATA)
-BROKEN=		NOPORT(DOCS|DATA) is not supported
+.if defined(NOPORTDATA)
+IGNORE=		game data is required, undefine NOPORTDATA
 .endif
 
-post-patch:
+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:	.SILENT
-	-update-desktop-database
-
-.if !defined(NO_MANCOMPRESS)
-.	for manlang in ${MANLANG_GAME}
-		${GZIP_CMD} ${PREFIX}/man/${manlang}/man6/wesnoth.6
-.	endfor
-.endif
+post-install:
+	-update-desktop-database ${PREFIX}/share/applications
 
 .include <bsd.port.post.mk>
Index: games/wesnoth-devel/distinfo
===================================================================
RCS file: /a/.cvsup/ports/games/wesnoth-devel/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- games/wesnoth-devel/distinfo	2 May 2010 11:02:20 -0000	1.55
+++ games/wesnoth-devel/distinfo	23 Aug 2010 00:45:21 -0000
@@ -1,3 +1,3 @@
-MD5 (wesnoth-1.8.tar.bz2) = 07e4b97512e307c54dcfd86659a61e41
-SHA256 (wesnoth-1.8.tar.bz2) = f4defab05ccc50abf4e029b58026e9b062bd3c58c8fff2aaa23b4f3e62cf929b
-SIZE (wesnoth-1.8.tar.bz2) = 287912025
+MD5 (wesnoth-1.9.0.tar.bz2) = c4e7ba80c6212cb58c3ff96d10f417ae
+SHA256 (wesnoth-1.9.0.tar.bz2) = 5f0058930e190150b86bb5ca5bab3013569ba622009f80455e76e2ad7f0cd64d
+SIZE (wesnoth-1.9.0.tar.bz2) = 318761871
Index: games/wesnoth-devel/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/games/wesnoth-devel/pkg-plist,v
retrieving revision 1.61
diff -u -p -r1.61 pkg-plist
--- games/wesnoth-devel/pkg-plist	2 May 2010 11:02:20 -0000	1.61
+++ games/wesnoth-devel/pkg-plist	23 Aug 2010 02:58:50 -0000
@@ -34,12 +34,11 @@ bin/wesnoth
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/wmltools.pyo
 share/applications/wesnoth.desktop
 %%EDITOR%%share/applications/wesnoth_editor.desktop
-share/pixmaps/wesnoth-icon.png
-%%EDITOR%%share/pixmaps/wesnoth_editor-icon.png
 %%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-httt.mo
@@ -63,6 +62,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -86,6 +86,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -109,6 +110,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -132,6 +134,7 @@ share/pixmaps/wesnoth-icon.png
 %%NLS%%share/locale/ca_ES at valencia/LC_MESSAGES/wesnoth-aoi.mo
 %%NLS%%share/locale/ca_ES at valencia/LC_MESSAGES/wesnoth-did.mo
 %%NLS%%share/locale/ca_ES at valencia/LC_MESSAGES/wesnoth-dm.mo
+%%NLS%%share/locale/ca_ES at valencia/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/ca_ES at valencia/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/ca_ES at valencia/LC_MESSAGES/wesnoth-ei.mo
 %%NLS%%share/locale/ca_ES at valencia/LC_MESSAGES/wesnoth-httt.mo
@@ -155,6 +158,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -178,6 +182,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -201,6 +206,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -224,6 +230,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -247,6 +254,7 @@ share/pixmaps/wesnoth-icon.png
 %%NLS%%share/locale/en at shaw/LC_MESSAGES/wesnoth-aoi.mo
 %%NLS%%share/locale/en at shaw/LC_MESSAGES/wesnoth-did.mo
 %%NLS%%share/locale/en at shaw/LC_MESSAGES/wesnoth-dm.mo
+%%NLS%%share/locale/en at shaw/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/en at shaw/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/en at shaw/LC_MESSAGES/wesnoth-ei.mo
 %%NLS%%share/locale/en at shaw/LC_MESSAGES/wesnoth-httt.mo
@@ -270,6 +278,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -293,6 +302,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -316,6 +326,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -339,6 +350,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -362,6 +374,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -385,6 +398,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -408,6 +422,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -431,6 +446,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -454,6 +470,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -477,6 +494,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -500,6 +518,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -523,6 +542,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -546,6 +566,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -569,6 +590,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -592,6 +614,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -615,6 +638,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -638,6 +662,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -661,6 +686,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -684,6 +710,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -707,6 +734,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -730,6 +758,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -753,6 +782,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -776,6 +806,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -799,6 +830,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -822,6 +854,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -845,6 +878,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -868,6 +902,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -891,6 +926,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -914,6 +950,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -937,6 +974,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -960,6 +998,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -983,6 +1022,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -1006,6 +1046,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -1029,6 +1070,7 @@ share/pixmaps/wesnoth-icon.png
 %%NLS%%share/locale/sr at ijekavian/LC_MESSAGES/wesnoth-aoi.mo
 %%NLS%%share/locale/sr at ijekavian/LC_MESSAGES/wesnoth-did.mo
 %%NLS%%share/locale/sr at ijekavian/LC_MESSAGES/wesnoth-dm.mo
+%%NLS%%share/locale/sr at ijekavian/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/sr at ijekavian/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/sr at ijekavian/LC_MESSAGES/wesnoth-ei.mo
 %%NLS%%share/locale/sr at ijekavian/LC_MESSAGES/wesnoth-httt.mo
@@ -1052,6 +1094,7 @@ share/pixmaps/wesnoth-icon.png
 %%NLS%%share/locale/sr at ijekavianlatin/LC_MESSAGES/wesnoth-aoi.mo
 %%NLS%%share/locale/sr at ijekavianlatin/LC_MESSAGES/wesnoth-did.mo
 %%NLS%%share/locale/sr at ijekavianlatin/LC_MESSAGES/wesnoth-dm.mo
+%%NLS%%share/locale/sr at ijekavianlatin/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/sr at ijekavianlatin/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/sr at ijekavianlatin/LC_MESSAGES/wesnoth-ei.mo
 %%NLS%%share/locale/sr at ijekavianlatin/LC_MESSAGES/wesnoth-httt.mo
@@ -1075,6 +1118,7 @@ share/pixmaps/wesnoth-icon.png
 %%NLS%%share/locale/sr at latin/LC_MESSAGES/wesnoth-aoi.mo
 %%NLS%%share/locale/sr at latin/LC_MESSAGES/wesnoth-did.mo
 %%NLS%%share/locale/sr at latin/LC_MESSAGES/wesnoth-dm.mo
+%%NLS%%share/locale/sr at latin/LC_MESSAGES/wesnoth-dw.mo
 %%NLS%%share/locale/sr at latin/LC_MESSAGES/wesnoth-editor.mo
 %%NLS%%share/locale/sr at latin/LC_MESSAGES/wesnoth-ei.mo
 %%NLS%%share/locale/sr at latin/LC_MESSAGES/wesnoth-httt.mo
@@ -1098,6 +1142,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -1121,6 +1166,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -1144,6 +1190,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -1167,6 +1214,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -1190,6 +1238,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -1213,6 +1262,7 @@ share/pixmaps/wesnoth-icon.png
 %%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-httt.mo
@@ -1232,6 +1282,8 @@ share/pixmaps/wesnoth-icon.png
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-units.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
+%%EDITOR%%share/pixmaps/wesnoth_editor-icon.png
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/wesnoth
 @dirrmtry man/af/man6
 @dirrmtry man/af
@@ -1358,6 +1410,6 @@ share/pixmaps/wesnoth-icon.png
 %%NLS%%@dirrmtry share/locale/sr at latin
 %%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/tl
+ at exec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
+ at unexec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
 %%SERVER%%@unexec rmdir /var/run/wesnothd 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/run/wesnothd' to remove it." | fmt
- at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
Index: games/wesnoth-devel/files/patch-m4-boost.m4
===================================================================
RCS file: games/wesnoth-devel/files/patch-m4-boost.m4
diff -N games/wesnoth-devel/files/patch-m4-boost.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ games/wesnoth-devel/files/patch-m4-boost.m4	23 Aug 2010 03:12:39 -0000
@@ -0,0 +1,11 @@
+--- 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
Index: games/wesnoth-devel/files/patch-m4-zlib.m4
===================================================================
RCS file: games/wesnoth-devel/files/patch-m4-zlib.m4
diff -N games/wesnoth-devel/files/patch-m4-zlib.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ games/wesnoth-devel/files/patch-m4-zlib.m4	20 Jul 2010 10:57:07 -0000
@@ -0,0 +1,15 @@
+--- m4/zlib.m4~
++++ m4/zlib.m4
+@@ -16,11 +16,9 @@ fi
+ AC_MSG_CHECKING([for zlib location])
+ if test x"$zlib_prefix" = x ; then
+   zlib_header_found="no"
+-  for dir in /usr/local /usr ; do
++  for dir in /usr ; do
+   if test -f "$dir/include/zlib.h" ; then
+     zlib_header_found="yes"
+-    ZLIB_CFLAGS="-I$dir/include"
+-    ZLIB_LDFLAGS="-L$dir/lib"
+     break
+   fi
+   done
Index: games/wesnoth-devel/files/patch-src-Makefile.am
===================================================================
RCS file: /a/.cvsup/ports/games/wesnoth-devel/files/patch-src-Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src-Makefile.am
--- games/wesnoth-devel/files/patch-src-Makefile.am	2 Sep 2009 07:54:38 -0000	1.1
+++ games/wesnoth-devel/files/patch-src-Makefile.am	23 Aug 2010 01:05:34 -0000
@@ -18,14 +18,21 @@
  	tests/main.cpp \
  	tests/utils/fake_display.cpp \
  	tests/utils/fake_event_source.cpp \
-@@ -362,8 +362,8 @@ test_SOURCES =  \
+@@ -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)
--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
+-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
  
  #############################################################################
- #    Headers                                                                #
Index: games/wesnoth-devel/files/patch-src-gettext.cpp
===================================================================
RCS file: games/wesnoth-devel/files/patch-src-gettext.cpp
diff -N games/wesnoth-devel/files/patch-src-gettext.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ games/wesnoth-devel/files/patch-src-gettext.cpp	23 Jul 2010 12:44:38 -0000
@@ -0,0 +1,15 @@
+--- src/gettext.cpp~
++++ src/gettext.cpp
+@@ -18,6 +18,12 @@
+ 
+ #include <cstring>
+ 
++#ifndef ENABLE_NLS
++char *textdomain (const char *domainname) {
++  return "dummy";
++}
++#endif
++
+ char const *egettext(char const *msgid)
+ {
+ 	return msgid[0] == '\0' ? msgid : gettext(msgid);
Index: games/wesnoth-devel/files/patch-src-gettext.hpp
===================================================================
RCS file: games/wesnoth-devel/files/patch-src-gettext.hpp
diff -N games/wesnoth-devel/files/patch-src-gettext.hpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ games/wesnoth-devel/files/patch-src-gettext.hpp	10 Aug 2010 01:34:17 -0000
@@ -0,0 +1,25 @@
+--- src/gettext.hpp~
++++ src/gettext.hpp
+@@ -35,7 +35,21 @@
+ 
+ // gettext-related declarations
+ 
+-#include <libintl.h>
++#include "wesconfig.h"
++
++#ifdef ENABLE_NLS
++# include <libintl.h>
++#else
++# define bind_textdomain_codeset(Domain, Codeset) "C"
++# define bindtextdomain(Domain, Directory) "/nonexistent"
++# define gettext(String) gettext_noop(String)
++# define ngettext(Singular, Plural, Number) gettext_noop(Number == 1 ? Singular : Plural)
++# define dgettext(Domain, String) gettext_noop(String)
++# define dngettext(Domain, Singular, Plural, Number) gettext_noop(Number == 1 ? Singular : Plural)
++# define dcgettext(Domain, String, Category) gettext_noop(String)
++# define dcngettext(Domain, Singular, Plural, Number, Category) gettext_noop(Number == 1 ? Singular : Plural)
++char *textdomain (const char *domainname);
++#endif
+ 
+ const char* egettext(const char*);
+ const char* sgettext(const char*);
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list