wesnoth: updated to 1.14.9

Version 1.14.9
 AI:
   * Fixed a rare crash in attack prediction
   * Experimental AI: fixed guardians being used for village actions
 Campaigns
   * A Tale of Two Brothers:
     * S3: modify castle illumination tip on easy mode
   * Dead Water:
     * S3: modify starting dialogue
   * Descent into Darkness:
     * Update campaign description
     * Update maps for S1 and S6
     * S4: reduce difficulty on easy and normal modes
     * S11: reduce difficulty just after Malin turns into lich
   * Eastern Invasion:
     * S9: add dialogue on victory
   * Heir to the Throne:
     * Remove 'Princess' as a direct address
     * S15, S23: Add explicit hints on EASY.
     * S15: Improve one branch of the victory dialog.
   * Legend of Wesmere:
     * S23: Landar's normal death dialogue now (properly) not used
   * Northern Rebirth:
     * Remove 'Princess' as a direct address
   * Sceptre of Fire:
     * S5: tell player that gryphon riders can now be recruited
     * S9: objectives changed to be more accurate upon moving to the volcano
   * Secrets of the Ancients:
     * Fixed number of scenarios in campaign listing
   * Son of the Black Eye:
     * S10: add dialogue on victory
   * The Rise of Wesnoth:
     * Tweaked dialogue in various scenarios
     * Fixed number of scenarios in campaign listing
     * S17a: prevent time over defeat if player chooses to defeat remaining saurians
   * The South Guard:
     * Update campaign description
     * Highlight narrator and gameplay explanations with colors
     * S1: create Sir Gerrick if player skips scenario with debug
     * S4: revise end of scenario dialogue
     * S5: add narrator warning when siding with bandits and reduce difficulty
     * S6b: create Urza Afalas if player skips S5 with debug
     * S6b: kill elves on side 1 if player got to this scenario with debug
     * S8b: fixed bug with shifted ToD schedules near campfires
   * Under the Burning Suns:
     * Various bugfixes (objectives, allied vision, unit spawns, event firing)
     * Updated various maps
     * Add additional animations to cutscenes and events
     * S2: add dehydration explanation to objectives
 Graphics
   * Own portraits for higher level bats
   * New Water Serpent and Cuttlefish portrait
   * New Wolf, Great Wolf and Direwolf portraits
   * Additional wolf/dog portrait for custom units
   * Separate Mudcrawler portrait
   * New Walking Corpse portrait for mounted variation
 Language and i18n
   * Updated translations: British English, Chinese (Traditional), Czech, Dutch,
     French, German, Italian, Japanese, Portuguese (Brazil), Russian, Spanish,
     Turkish, Ukrainian
   * Changed the :help command's output to split over multiple lines
   * Added translatable explanations of :droid, :help and :idle's arguments
 Multiplayer
   * A New Land:
     * Help menu can be accessed in any turn and doesn't pause the game
     * Bottleneck in the spider's caves removed
     * Swapped positions of Gryphon and Drake
     * Guards can't be tricked off position, leaders won't destroy buildings
     * Guards and Spiders are loyal – AI income has been adjusted accordingly
     * AI income increases gradually in lategame (very slowly)
   * 5P Wildlands:
     * fix default village_gold being too hight, disadvantaging player 5
 Packaging
   * added HighContrast icon
 WML engine
   * Fixed [music] ms_after= affecting the previous track instead of the intended one
 Miscellaneous and bug fixes
   * Update various references of mermen to merfolk or mer
   * Adjust several maps to use different castle graphics
   * OpenMP support has been removed
   * Clarify descriptions of income and upkeep in the help and in tooltips.

Version 1.14.8
 * Skipped due to need to reupload a broken 1.14.7 macOS App Store package as 1.14.8

4 files changed, 41 insertions, 26 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index bafb7894f29..d11f3f3c2f5 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.147 2019/08/22 12:23:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.148 2019/10/01 18:15:42 adam Exp $
 
-DISTNAME=	wesnoth-1.14.7
-PKGREVISION=	3
+DISTNAME=	wesnoth-1.14.9
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST
index 23864eeb569..a1dba9871ad 100644
--- a/games/wesnoth/PLIST
+++ b/games/wesnoth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.49 2019/04/25 20:09:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.50 2019/10/01 18:15:42 adam Exp $
 bin/wesnoth
 bin/wesnothd
 man/cs/man6/wesnothd.6
@@ -6,6 +6,7 @@ man/de/man6/wesnoth.6
 man/de/man6/wesnothd.6
 man/en_GB/man6/wesnoth.6
 man/en_GB/man6/wesnothd.6
+man/es/man6/wesnoth.6
 man/es/man6/wesnothd.6
 man/et/man6/wesnothd.6
 man/fi/man6/wesnothd.6
@@ -29,13 +30,22 @@ man/sr/man6/wesnothd.6
 man/sr@ijekavian/man6/wesnothd.6
 man/sr@ijekavianlatin/man6/wesnothd.6
 man/sr@latin/man6/wesnothd.6
+man/tr/man6/wesnoth.6
+man/tr/man6/wesnothd.6
 man/uk/man6/wesnothd.6
 man/vi/man6/wesnothd.6
 man/zh_CN/man6/wesnoth.6
 man/zh_CN/man6/wesnothd.6
+man/zh_TW/man6/wesnoth.6
 man/zh_TW/man6/wesnothd.6
 ${PLIST.icons}share/applications/wesnoth.desktop
 share/doc/wesnoth/html/images/README.md
+share/doc/wesnoth/html/images/de/game-screen-1.14.8+dev.jpg
+share/doc/wesnoth/html/images/de/main-menu-1.14.8+dev.jpg
+share/doc/wesnoth/html/images/de/multiplayer-1.14.8+dev.png
+share/doc/wesnoth/html/images/de/recruit-1.14.8+dev.png
+share/doc/wesnoth/html/images/de/right-pane-1.14.8+dev.png
+share/doc/wesnoth/html/images/de/top-pane-1.14.8+dev.png
 share/doc/wesnoth/html/images/fr/game-screen-1.11.11.jpg
 share/doc/wesnoth/html/images/fr/main-menu-1.11.11.jpg
 share/doc/wesnoth/html/images/fr/multiplayer-1.11.11.jpg
@@ -78,6 +88,12 @@ share/doc/wesnoth/html/images/schedule-morning.png
 share/doc/wesnoth/html/images/schedule-secondwatch.png
 share/doc/wesnoth/html/images/schedule-underground.png
 share/doc/wesnoth/html/images/top_pane-1.13.11+dev.png
+share/doc/wesnoth/html/images/tr/game-screen-1.14.7.jpg
+share/doc/wesnoth/html/images/tr/main-menu-1.14.7.jpg
+share/doc/wesnoth/html/images/tr/multiplayer-1.14.7.jpg
+share/doc/wesnoth/html/images/tr/recruit-1.14.7.jpg
+share/doc/wesnoth/html/images/tr/right_pane-1.14.7.jpg
+share/doc/wesnoth/html/images/tr/top_pane-1.14.7.jpg
 share/doc/wesnoth/html/manual.cs.html
 share/doc/wesnoth/html/manual.de.html
 share/doc/wesnoth/html/manual.en.html
@@ -100,6 +116,7 @@ share/doc/wesnoth/html/manual.sr.html
 share/doc/wesnoth/html/manual.sr@ijekavian.html
 share/doc/wesnoth/html/manual.sr@ijekavianlatin.html
 share/doc/wesnoth/html/manual.sr@latin.html
+share/doc/wesnoth/html/manual.tr.html
 share/doc/wesnoth/html/manual.uk.html
 share/doc/wesnoth/html/manual.vi.html
 share/doc/wesnoth/html/manual.zh_CN.html
@@ -2144,7 +2161,6 @@ share/wesnoth/data/campaigns/The_South_Guard/units/Mounted_General.cfg
 share/wesnoth/data/campaigns/The_South_Guard/utils/bigmap.cfg
 share/wesnoth/data/campaigns/The_South_Guard/utils/sg_deaths.cfg
 share/wesnoth/data/campaigns/The_South_Guard/utils/sg_help.cfg
-share/wesnoth/data/campaigns/The_South_Guard/utils/sg_help_NEW.cfg
 share/wesnoth/data/campaigns/The_South_Guard/utils/sg_story.cfg
 share/wesnoth/data/campaigns/The_South_Guard/utils/sg_utils.cfg
 share/wesnoth/data/campaigns/Two_Brothers/_main.cfg
@@ -3078,8 +3094,11 @@ share/wesnoth/data/core/images/halo/undead/idle-flash-6.png
 share/wesnoth/data/core/images/halo/undead/idle-flash-7.png
 share/wesnoth/data/core/images/halo/undead/idle-flash-8.png
 share/wesnoth/data/core/images/halo/undead/idle-flash-9.png
+share/wesnoth/data/core/images/help/combat1.png
 share/wesnoth/data/core/images/help/hp-bars.png
 share/wesnoth/data/core/images/help/hpxp.png
+share/wesnoth/data/core/images/help/income-upkeep1.png
+share/wesnoth/data/core/images/help/income-upkeep2.png
 share/wesnoth/data/core/images/help/l10n/cs/hpxp.png
 share/wesnoth/data/core/images/help/l10n/cs/recruit.png
 share/wesnoth/data/core/images/help/l10n/cs/tooltip.png
@@ -3485,15 +3504,20 @@ share/wesnoth/data/core/images/portraits/merfolk/netcaster.png
 share/wesnoth/data/core/images/portraits/merfolk/priestess.png
 share/wesnoth/data/core/images/portraits/merfolk/spearman.png
 share/wesnoth/data/core/images/portraits/merfolk/triton.png
+share/wesnoth/data/core/images/portraits/monsters/bat-dread.png
+share/wesnoth/data/core/images/portraits/monsters/bat-red.png
 share/wesnoth/data/core/images/portraits/monsters/bat.png
+share/wesnoth/data/core/images/portraits/monsters/cuttlefish.png
 share/wesnoth/data/core/images/portraits/monsters/deep-tentacle.png
 share/wesnoth/data/core/images/portraits/monsters/giant-mudcrawler.png
 share/wesnoth/data/core/images/portraits/monsters/giant-rat.png
 share/wesnoth/data/core/images/portraits/monsters/giant-spider.png
 share/wesnoth/data/core/images/portraits/monsters/gryphon.png
+share/wesnoth/data/core/images/portraits/monsters/mudcrawler.png
 share/wesnoth/data/core/images/portraits/monsters/ogre.png
 share/wesnoth/data/core/images/portraits/monsters/scorpion.png
 share/wesnoth/data/core/images/portraits/monsters/sea-serpent.png
+share/wesnoth/data/core/images/portraits/monsters/water-serpent.png
 share/wesnoth/data/core/images/portraits/monsters/yeti.png
 share/wesnoth/data/core/images/portraits/monsters/young-ogre.png
 share/wesnoth/data/core/images/portraits/nagas/fighter.png
@@ -3548,11 +3572,16 @@ share/wesnoth/data/core/images/portraits/undead/zombie-drake.png
 share/wesnoth/data/core/images/portraits/undead/zombie-dwarf.png
 share/wesnoth/data/core/images/portraits/undead/zombie-goblin.png
 share/wesnoth/data/core/images/portraits/undead/zombie-gryphon.png
+share/wesnoth/data/core/images/portraits/undead/zombie-rider.png
 share/wesnoth/data/core/images/portraits/undead/zombie-saurian.png
 share/wesnoth/data/core/images/portraits/undead/zombie-swimmer.png
 share/wesnoth/data/core/images/portraits/undead/zombie-troll.png
 share/wesnoth/data/core/images/portraits/undead/zombie-wolf.png
 share/wesnoth/data/core/images/portraits/undead/zombie-wose.png
+share/wesnoth/data/core/images/portraits/wolves/wolf-chewing.png
+share/wesnoth/data/core/images/portraits/wolves/wolf-dark.png
+share/wesnoth/data/core/images/portraits/wolves/wolf-great.png
+share/wesnoth/data/core/images/portraits/wolves/wolf-red.png
 share/wesnoth/data/core/images/portraits/woses/ancient-wose.png
 share/wesnoth/data/core/images/portraits/woses/wose.png
 share/wesnoth/data/core/images/projectiles/bolas-n.png
@@ -14342,6 +14371,7 @@ share/wesnoth/data/multiplayer/scenarios/ANL_utils/ANL_auto_working.cfg
 share/wesnoth/data/multiplayer/scenarios/ANL_utils/ANL_general_macros.cfg
 share/wesnoth/data/multiplayer/scenarios/ANL_utils/ANL_help.cfg
 share/wesnoth/data/multiplayer/scenarios/ANL_utils/ANL_leader_options.cfg
+share/wesnoth/data/multiplayer/scenarios/ANL_utils/ANL_objectives.cfg
 share/wesnoth/data/multiplayer/scenarios/ANL_utils/ANL_research_options.cfg
 share/wesnoth/data/multiplayer/scenarios/ANL_utils/ANL_special_macros.cfg
 share/wesnoth/data/multiplayer/scenarios/ANL_utils/ANL_worker_options.cfg
@@ -14370,6 +14400,7 @@ share/wesnoth/data/test/maps/move_skip_sighted.map
 share/wesnoth/data/test/maps/pathfind_1.cfg
 share/wesnoth/data/test/maps/sighted_events.map
 share/wesnoth/data/test/maps/test_grunt_tod_damage.map
+share/wesnoth/data/test/maps/test_movetype.map
 share/wesnoth/data/test/multiplayer/_main.cfg
 share/wesnoth/data/test/multiplayer/macros/mp_unit_test_macros.cfg
 share/wesnoth/data/test/multiplayer/scenarios/test1.cfg
@@ -14417,6 +14448,7 @@ share/wesnoth/data/test/scenarios/test_max_menu_items.cfg
 share/wesnoth/data/test/scenarios/test_menu_items.cfg
 share/wesnoth/data/test/scenarios/test_move.cfg
 share/wesnoth/data/test/scenarios/test_move_unit.cfg
+share/wesnoth/data/test/scenarios/test_movetype.cfg
 share/wesnoth/data/test/scenarios/test_relative_dir.cfg
 share/wesnoth/data/test/scenarios/test_require.cfg
 share/wesnoth/data/test/scenarios/test_return.cfg
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 57c59d5039a..fe89109f400 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.64 2019/09/02 17:50:33 nia Exp $
+$NetBSD: distinfo,v 1.65 2019/10/01 18:15:42 adam Exp $
 
-SHA1 (wesnoth-1.14.7.tar.bz2) = 057465f29c760c6dd42ef7b0d99c34e0e8f30c85
-RMD160 (wesnoth-1.14.7.tar.bz2) = e5d72e299d9b29e2269add5184f04a5383783ac7
-SHA512 (wesnoth-1.14.7.tar.bz2) = 0b30817a664ae0792e64392b864c4677eabb6ccbacf3306a42e2f9a6d7bf6d9305c53b050168457073395ed87b19acf064f167d15ef2895b408ebe81061e0fe1
-Size (wesnoth-1.14.7.tar.bz2) = 452705178 bytes
+SHA1 (wesnoth-1.14.9.tar.bz2) = 55537bcf273f1ae3c4cc54e400b926a092effe00
+RMD160 (wesnoth-1.14.9.tar.bz2) = e14ac5b6ef2592b124348f9b607f9598f338a68d
+SHA512 (wesnoth-1.14.9.tar.bz2) = b6165aa8522ab975411db1aa28893f2b534d2f6e00448869900ef235f9354ec70883cee2fef67b61ba8ad2334ea825a039fd5beca5156cc6e264e27d69dfb656
+Size (wesnoth-1.14.9.tar.bz2) = 456358983 bytes
 SHA1 (patch-CMakeLists.txt) = 5c580a7b9719d769507c2c0ec3580d6cf523e7f0
 SHA1 (patch-src_CMakeLists.txt) = 5839663ab11a9fdc31e89b74ce2708a251155d9f
-SHA1 (patch-src_server_server__base.cpp) = 4114c52d8920d96c4e2babbde0491ab559f357a2
 SHA1 (patch-src_wesnoth.cpp) = 73fa69b47de231c5ce16f66a52b449d5242ffe67
diff --git a/games/wesnoth/patches/patch-src_server_server__base.cpp b/games/wesnoth/patches/patch-src_server_server__base.cpp
deleted file mode 100644
index 68d20bde13e..00000000000
--- a/games/wesnoth/patches/patch-src_server_server__base.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_server_server__base.cpp,v 1.1 2019/09/02 17:50:33 nia Exp $
-
-Remove redundant std::ref causing problems with Boost 1.70
-
---- src/server/server_base.cpp.orig	2019-04-12 01:05:54.000000000 +0000
-+++ src/server/server_base.cpp
-@@ -65,7 +65,7 @@ void server_base::start_server()
- 
- void server_base::serve()
- {
--	socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(std::ref(io_service_));
-+	socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(io_service_);
- 	acceptor_.async_accept(*socket, std::bind(&server_base::accept_connection, this, _1, socket));
- }
-