Update games/wesnoth to 1.12.5.

Changes:
Version 1.12.5:
 * Campaigns:
   * Eastern Invasion:
     * Fixed scenario events not working right on easy difficulty in 'Captured'.
   * Legend of Wesmere
     * Fixed carryover bugs in scenarios 5-12.
       (units missing from carryover, units appearing twice on map...)
 * Editor:
   * Add Recent Files menu with a list of recently saved or loaded maps or
     scenarios, up to a custom limit (by default 10) that can be set in
     Advanced Preferences.
   * Fixed Player Start labels not being updated with repeat map generations
     (bug #20036)
 * Language and i18n:
   * Updated translations: British English, French, Hungarian, Japanese,
     Latvian, Polish, Portuguese, Scottish Gaelic, Spanish
   * Fixed crashes during start-up on Windows resulting from add-ons containing
     erroneous textdomain declarations (bug #23839).
 * Multiplayer:
   * Era names no longer support formatting markup in the game setup screen.
   * Made MP lobby filter option filter on eras and mods too (bug #22987).
   * Fix scenario ending to early for players that are defeated if there are
     still players fighting and victory_when_enemies_defeated=no.
   * Fix 'enemies defeated' event causing OOS error in mp scenarios.
 * Terrains:
   * Removed unit elevation from N-S hanging bridges
   * Added unit elevation to NW-SE and SW-NE stone chasm bridges
   * Added unit elevation to NW-SE and SW-NE plank bridges
   * Hanging, stone chasm, and plank bridges are now displayed in-game simply
     as "Bridge", retaining their descriptive names in the editor as per
     convention.
   * Fixed spurious "could not open image 'terrain/.png'" error messages caused
     by terrains without a minimap image (symbol_image) such as those from the
     Special category in the editor (Impassable Overlay, etc.).
 * User interface:
   * Force uniform font rendering settings across X11 and Apple OS X, avoiding
     color glitches resulting from incorrect applications of subpixel hinting
     (bug #20337).
 * WML engine:
   * Added WML menu item and event handler views to the Gamestate Inspector
     dialog.
   * Removed y offset by -1 from [message]'s scroll-to-unit logic.
 * Miscellaneous and bug fixes:
   * Default to non-strict compilation with CMake.
   * Fixed strict compilation with clang 3.5 and 3.6.
   * Fixed strict compilation with gcc 5.
   * Fixed unbound memory read in internal time formatting code with
     specially-crafted input.
   * Fixed RECRUIT_UNIT_VARIATIONS core WML macro leaking an internal temporary
     variable ($recruited_unit_random_variation).
   * Fixed unit [resistance] and [jamming_costs] not being considered for sync
     check.
   * Fixed OOS on random maps, where clients placed sides in different castles.
   * Several fixes to the handling of key combinations including
     non-alphanumeric keys (Enter, Tab, F1-F12, etc.), especially relevant for
     assigning custom hotkeys to actions in Preferences.
   * Fixed broken Oasis terrain help entry (bug #23023)
   * Fixed hang when attempting to make a screenshot from a non-existent map via
     command-line (bug #20900)
   * Fixed cases of wrong unit type used in planning moves (bug #20299)
   * Avoid crash when planning moves on planned recruits (bug #18637)

4 files changed, 15 insertions, 117 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 40543b0210c..28f7eb210c1 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.115 2015/07/23 14:56:45 adam Exp $
+# $NetBSD: Makefile,v 1.116 2015/11/21 16:13:39 leot Exp $
 
-DISTNAME=	wesnoth-1.12.4
+DISTNAME=	wesnoth-1.12.5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST
index bcb187b2526..5d12700f0d3 100644
--- a/games/wesnoth/PLIST
+++ b/games/wesnoth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2015/07/23 14:56:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.44 2015/11/21 16:13:39 leot Exp $
 bin/wesnoth
 bin/wesnothd
 man/cs/man6/wesnoth.6
@@ -56,18 +56,6 @@ man/zh_TW/man6/wesnothd.6
 ${PLIST.icons}share/applications/wesnoth.desktop
 ${PLIST.icons}share/applications/wesnoth_editor.desktop
 share/doc/wesnoth/images/README.txt
-share/doc/wesnoth/images/de/game-screen-1.9.14.jpg
-share/doc/wesnoth/images/de/main-menu-1.9.14.jpg
-share/doc/wesnoth/images/de/multiplayer-1.9.14.jpg
-share/doc/wesnoth/images/de/recruit-1.9.14.jpg
-share/doc/wesnoth/images/de/right_pane-1.9.14.jpg
-share/doc/wesnoth/images/de/top_pane-1.9.14.jpg
-share/doc/wesnoth/images/es/game-screen-1.9.14.jpg
-share/doc/wesnoth/images/es/main-menu-1.9.14.jpg
-share/doc/wesnoth/images/es/multiplayer-1.9.14.jpg
-share/doc/wesnoth/images/es/recruit-1.9.14.jpg
-share/doc/wesnoth/images/es/right_pane-1.9.14.jpg
-share/doc/wesnoth/images/es/top_pane-1.9.14.jpg
 share/doc/wesnoth/images/fr/game-screen-1.11.11.jpg
 share/doc/wesnoth/images/fr/main-menu-1.11.11.jpg
 share/doc/wesnoth/images/fr/multiplayer-1.11.11.jpg
@@ -81,18 +69,12 @@ share/doc/wesnoth/images/gl/multiplayer-1.11.9.jpg
 share/doc/wesnoth/images/gl/recruit-1.11.9.jpg
 share/doc/wesnoth/images/gl/right_pane-1.11.9.jpg
 share/doc/wesnoth/images/gl/top_pane-1.11.9.jpg
-share/doc/wesnoth/images/hu/game-screen-1.9.4.jpg
-share/doc/wesnoth/images/hu/main-menu-1.9.4.jpg
-share/doc/wesnoth/images/hu/multiplayer-1.9.4.jpg
-share/doc/wesnoth/images/hu/recruit-1.9.4.jpg
-share/doc/wesnoth/images/hu/right_pane-1.9.4.jpg
-share/doc/wesnoth/images/hu/top_pane-1.9.4.jpg
-share/doc/wesnoth/images/it/game-screen-1.9.4.jpg
-share/doc/wesnoth/images/it/main-menu-1.9.4.jpg
-share/doc/wesnoth/images/it/multiplayer-1.9.4.jpg
-share/doc/wesnoth/images/it/recruit-1.9.4.jpg
-share/doc/wesnoth/images/it/right_pane-1.9.4.jpg
-share/doc/wesnoth/images/it/top_pane-1.9.4.jpg
+share/doc/wesnoth/images/it/game-screen-1.12.4.jpg
+share/doc/wesnoth/images/it/main-menu-1.12.4.jpg
+share/doc/wesnoth/images/it/multiplayer-1.12.4.jpg
+share/doc/wesnoth/images/it/recruit-1.12.4.jpg
+share/doc/wesnoth/images/it/right_pane-1.12.4.jpg
+share/doc/wesnoth/images/it/top_pane-1.12.4.jpg
 share/doc/wesnoth/images/main-menu-1.11.9.jpg
 share/doc/wesnoth/images/multiplayer-1.11.9.jpg
 share/doc/wesnoth/images/orb-black.jpg
@@ -108,12 +90,6 @@ share/doc/wesnoth/images/pt/right_pane-1.11.19.jpg
 share/doc/wesnoth/images/pt/top_pane-1.11.19.jpg
 share/doc/wesnoth/images/recruit-1.11.9.jpg
 share/doc/wesnoth/images/right_pane-1.11.9.jpg
-share/doc/wesnoth/images/ru/game-screen-1.9.7.jpg
-share/doc/wesnoth/images/ru/main-menu-1.9.7.jpg
-share/doc/wesnoth/images/ru/multiplayer-1.9.7.jpg
-share/doc/wesnoth/images/ru/recruit-1.9.7.jpg
-share/doc/wesnoth/images/ru/right_pane-1.9.7.jpg
-share/doc/wesnoth/images/ru/top_pane-1.9.7.jpg
 share/doc/wesnoth/images/schedule-afternoon.png
 share/doc/wesnoth/images/schedule-dawn.png
 share/doc/wesnoth/images/schedule-dusk.png
@@ -121,43 +97,7 @@ share/doc/wesnoth/images/schedule-firstwatch.png
 share/doc/wesnoth/images/schedule-morning.png
 share/doc/wesnoth/images/schedule-secondwatch.png
 share/doc/wesnoth/images/schedule-underground.png
-share/doc/wesnoth/images/sr/game-screen-1.9.11.jpg
-share/doc/wesnoth/images/sr/main-menu-1.9.11.jpg
-share/doc/wesnoth/images/sr/multiplayer-1.7.10.jpg
-share/doc/wesnoth/images/sr/recruit-1.7.10.jpg
-share/doc/wesnoth/images/sr/right_pane-1.9.11.jpg
-share/doc/wesnoth/images/sr/top_pane-1.9.11.jpg
-share/doc/wesnoth/images/sr@ijekavian/game-screen-1.9.11.jpg
-share/doc/wesnoth/images/sr@ijekavian/main-menu-1.9.11.jpg
-share/doc/wesnoth/images/sr@ijekavian/multiplayer-1.7.10.jpg
-share/doc/wesnoth/images/sr@ijekavian/recruit-1.7.10.jpg
-share/doc/wesnoth/images/sr@ijekavian/right_pane-1.9.11.jpg
-share/doc/wesnoth/images/sr@ijekavian/top_pane-1.9.11.jpg
-share/doc/wesnoth/images/sr@ijekavianlatin/game-screen-1.9.11.jpg
-share/doc/wesnoth/images/sr@ijekavianlatin/main-menu-1.9.11.jpg
-share/doc/wesnoth/images/sr@ijekavianlatin/multiplayer-1.7.10.jpg
-share/doc/wesnoth/images/sr@ijekavianlatin/recruit-1.7.10.jpg
-share/doc/wesnoth/images/sr@ijekavianlatin/right_pane-1.9.11.jpg
-share/doc/wesnoth/images/sr@ijekavianlatin/top_pane-1.9.11.jpg
-share/doc/wesnoth/images/sr@latin/game-screen-1.9.11.jpg
-share/doc/wesnoth/images/sr@latin/main-menu-1.9.11.jpg
-share/doc/wesnoth/images/sr@latin/multiplayer-1.7.10.jpg
-share/doc/wesnoth/images/sr@latin/recruit-1.7.10.jpg
-share/doc/wesnoth/images/sr@latin/right_pane-1.9.11.jpg
-share/doc/wesnoth/images/sr@latin/top_pane-1.9.11.jpg
 share/doc/wesnoth/images/top_pane-1.11.9.jpg
-share/doc/wesnoth/images/tr/game-screen-1.5.7.jpg
-share/doc/wesnoth/images/tr/main-menu-1.5.11.jpg
-share/doc/wesnoth/images/tr/multiplayer-1.5.11.jpg
-share/doc/wesnoth/images/tr/recruit-1.5.7.jpg
-share/doc/wesnoth/images/tr/right_pane-1.5.7.jpg
-share/doc/wesnoth/images/tr/top_pane-1.5.7.jpg
-share/doc/wesnoth/images/zh_CN/game-screen-1.8.0.jpg
-share/doc/wesnoth/images/zh_CN/main-menu-1.8.0.jpg
-share/doc/wesnoth/images/zh_CN/multiplayer-1.8.0.jpg
-share/doc/wesnoth/images/zh_CN/recruit-1.8.0.jpg
-share/doc/wesnoth/images/zh_CN/right_pane-1.8.0.jpg
-share/doc/wesnoth/images/zh_CN/top_pane-1.8.0.jpg
 share/doc/wesnoth/manual.cs.html
 share/doc/wesnoth/manual.de.html
 share/doc/wesnoth/manual.en.html
@@ -13015,6 +12955,7 @@ share/wesnoth/fonts/COPYING
 share/wesnoth/fonts/DejaVuSans.ttf
 share/wesnoth/fonts/DroidSansFallbackFull.ttf
 share/wesnoth/fonts/DroidSansJapanese.ttf
+share/wesnoth/fonts/fonts.conf
 share/wesnoth/images/README
 share/wesnoth/images/arrows/focus/end-n.png
 share/wesnoth/images/arrows/focus/end-ne.png
@@ -16141,32 +16082,3 @@ share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-tutorial.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-units.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-utbs.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth.mo
-@pkgdir man/tl/man6
-@pkgdir man/sv/man6
-@pkgdir man/sl/man6
-@pkgdir man/ro/man6
-@pkgdir man/racv/man6
-@pkgdir man/nl/man6
-@pkgdir man/nb_NO/man6
-@pkgdir man/mr/man6
-@pkgdir man/mk/man6
-@pkgdir man/lv/man6
-@pkgdir man/la/man6
-@pkgdir man/ko/man6
-@pkgdir man/is/man6
-@pkgdir man/hr/man6
-@pkgdir man/he/man6
-@pkgdir man/gd/man6
-@pkgdir man/ga/man6
-@pkgdir man/fur_IT/man6
-@pkgdir man/eu/man6
-@pkgdir man/eo/man6
-@pkgdir man/en@shaw/man6
-@pkgdir man/el/man6
-@pkgdir man/da/man6
-@pkgdir man/ca_ES@valencia/man6
-@pkgdir man/ca/man6
-@pkgdir man/ar/man6
-@pkgdir man/ang@latin/man6
-@pkgdir man/ang/man6
-@pkgdir man/af/man6
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index ebd7589d55f..30f1753da8a 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.56 2015/11/03 20:57:06 agc Exp $
+$NetBSD: distinfo,v 1.57 2015/11/21 16:13:39 leot Exp $
 
-SHA1 (wesnoth-1.12.4.tar.bz2) = 8a9b5d32f1197ac7e64ee9695d26bfe53e9ccaf4
-RMD160 (wesnoth-1.12.4.tar.bz2) = a4f52e9b1a5b140f385b600ca794a8962dbb0087
-SHA512 (wesnoth-1.12.4.tar.bz2) = d8ea6d8c14b69318f4458d7e6dcace28979230ea13b76d07635ae9be7f2c675d4aa9822ff376a9617fe9fc1560999afdcf3165319842a5c2f0a4f87a31c170e9
-Size (wesnoth-1.12.4.tar.bz2) = 392278313 bytes
+SHA1 (wesnoth-1.12.5.tar.bz2) = 7bcfa9c5e36e139e0f93578eba717fd7af773b2a
+RMD160 (wesnoth-1.12.5.tar.bz2) = 5c615864f35b3a6627ff7a28b3e490ae7f600299
+SHA512 (wesnoth-1.12.5.tar.bz2) = 1a785c02389cd4bdc79b61f62c5bb98f01fde61c3923527195a5a8e8f8986349fcda3d40a4fb14248626ea8e79eba12b8232e39cce08bfea7fbdf3d9627d53b4
+Size (wesnoth-1.12.5.tar.bz2) = 387726941 bytes
 SHA1 (patch-CMakeLists.txt) = 1f17a95793db0d311508f1ff93f9aacedc7782f9
 SHA1 (patch-ae) = 17c9f08bbe2aeb12771fc1c3430b1cf84ee75e15
 SHA1 (patch-af) = ed3ef2d26a33b87e42e8c820c669315b81bf7938
@@ -12,4 +12,3 @@ SHA1 (patch-data_tools_addon__manager_html_py) = 5cacb24b3441916d3e8832f9d9a6e96
 SHA1 (patch-data_tools_castle-clutter_mk_all-castles_sh) = 0c05566e6cf361199031d2104608e5e78e807a9e
 SHA1 (patch-data_tools_unit__tree_helpers_py) = 79de075b33eb7d6d30a8d69635de7f48c19a8c30
 SHA1 (patch-data_tools_wesnoth_campaignserver__client_py) = b7591e23b4c049ee22e080ea20160d82dd631722
-SHA1 (patch-src_game__config__manager.cpp) = 362f017cc8cbdfcaaea4f43fa11c5af0d8b58105
diff --git a/games/wesnoth/patches/patch-src_game__config__manager.cpp b/games/wesnoth/patches/patch-src_game__config__manager.cpp
deleted file mode 100644
index c23f4329e2b..00000000000
--- a/games/wesnoth/patches/patch-src_game__config__manager.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_game__config__manager.cpp,v 1.1 2015/03/22 20:05:29 joerg Exp $
-
---- src/game_config_manager.cpp.orig	2015-03-21 22:11:07.000000000 +0000
-+++ src/game_config_manager.cpp
-@@ -68,7 +68,7 @@ bool game_config_manager::init_game_conf
- 	// Add preproc defines according to the command line arguments.
- 	game_config::scoped_preproc_define multiplayer("MULTIPLAYER",
- 		cmdline_opts_.multiplayer);
--	game_config::scoped_preproc_define test("TEST", cmdline_opts_.test);
-+	game_config::scoped_preproc_define test("TEST", bool(cmdline_opts_.test));
- 	game_config::scoped_preproc_define editor("EDITOR", jump_to_editor_);
- 	game_config::scoped_preproc_define title_screen("TITLE_SCREEN",
- 		!cmdline_opts_.multiplayer && !cmdline_opts_.test && !jump_to_editor_);