Update to 0.7.7.

Approved by:	adamw (mentor)

12 files changed, 284 insertions, 418 deletions

diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index 4fe63e9f9aca..bae1d2f4a810 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	0.7.6
+PORTVERSION=	0.7.7
 CATEGORIES=	games
 MASTER_SITES=	http://www.wesnoth.org/files/
 .if defined(LITE)
diff --git a/games/wesnoth-devel/distinfo b/games/wesnoth-devel/distinfo
index 220608e48422..b9ad7704f648 100644
--- a/games/wesnoth-devel/distinfo
+++ b/games/wesnoth-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (wesnoth-0.7.6.tar.gz) = 9e5be4ca1420b4c4f6e3fdc2b981aaef
-SIZE (wesnoth-0.7.6.tar.gz) = 19662171
-MD5 (wesnoth-lite-0.7.6.tar.gz) = 02512f1d4620e858a0a7d6f768ef90f9
-SIZE (wesnoth-lite-0.7.6.tar.gz) = 6364278
+MD5 (wesnoth-0.7.7.tar.gz) = 4216a6ac54274589d00858d49f7609aa
+SIZE (wesnoth-0.7.7.tar.gz) = 19686247
+MD5 (wesnoth-lite-0.7.7.tar.gz) = 764120e90667b94f2fd05d867280f832
+SIZE (wesnoth-lite-0.7.7.tar.gz) = 6388120
diff --git a/games/wesnoth-devel/files/patch-src::language.hpp b/games/wesnoth-devel/files/patch-src::language.hpp
deleted file mode 100644
index 8ab1e88d877f..000000000000
--- a/games/wesnoth-devel/files/patch-src::language.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/language.hpp.orig	Mon May  3 18:35:49 2004
-+++ src/language.hpp	Wed May 12 00:50:43 2004
-@@ -19,6 +19,14 @@
- #include <string>
- #include <vector>
- 
-+#if (__FreeBSD_version < 500029)
-+#include <cwchar>
-+namespace std
-+{
-+	typedef basic_string <wchar_t> wstring;
-+}
-+#endif
-+
- //this module controls internationalization.
- 
- struct symbol_table
diff --git a/games/wesnoth-devel/files/patch-src::util.hpp b/games/wesnoth-devel/files/patch-src::util.hpp
new file mode 100644
index 000000000000..4fc9a9157150
--- /dev/null
+++ b/games/wesnoth-devel/files/patch-src::util.hpp
@@ -0,0 +1,10 @@
+--- src/util.hpp.orig	Wed May 19 14:27:36 2004
++++ src/util.hpp	Wed May 19 14:28:08 2004
+@@ -15,6 +15,7 @@
+ 
+ #include <cmath>
+ #include <map>
++#include <sstream>
+ 
+ //instead of playing with VC++'s crazy definitions of min and max,
+ //just define our own
diff --git a/games/wesnoth-devel/files/patch-src::widgets::textbox.hpp b/games/wesnoth-devel/files/patch-src::widgets::textbox.hpp
deleted file mode 100644
index 6abbf1e960b2..000000000000
--- a/games/wesnoth-devel/files/patch-src::widgets::textbox.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/widgets/textbox.hpp.orig	Mon May  3 18:35:49 2004
-+++ src/widgets/textbox.hpp	Wed May 12 00:51:03 2004
-@@ -22,6 +22,14 @@
- 
- #include "SDL.h"
- 
-+#if (__FreeBSD_version < 500029)
-+#include <cwchar>
-+namespace std
-+{
-+	typedef basic_string <wchar_t> wstring;
-+}
-+#endif
-+
- namespace gui {
- 
- class textbox : public widget
diff --git a/games/wesnoth-devel/pkg-plist b/games/wesnoth-devel/pkg-plist
index 8b2ee2b06816..9028787573ff 100644
--- a/games/wesnoth-devel/pkg-plist
+++ b/games/wesnoth-devel/pkg-plist
@@ -10,6 +10,7 @@ share/wesnoth/data/deaths.cfg
 share/wesnoth/data/game.cfg
 share/wesnoth/data/intro.cfg
 share/wesnoth/data/items.cfg
+share/wesnoth/data/maps/King_of_the_Hill
 share/wesnoth/data/maps/LiberationMap.dat
 share/wesnoth/data/maps/battleworld
 share/wesnoth/data/maps/choice
@@ -50,15 +51,18 @@ share/wesnoth/data/maps/orc-map5
 share/wesnoth/data/maps/orc-map6
 share/wesnoth/data/maps/orc-map7
 share/wesnoth/data/maps/orc-map8
+share/wesnoth/data/maps/orc-map9
 share/wesnoth/data/maps/sceptre
 share/wesnoth/data/maps/snowplains
 share/wesnoth/data/maps/swampland
 share/wesnoth/data/maps/undeadbook
+share/wesnoth/data/maps/undeadchance
 share/wesnoth/data/maps/undeadtower
 share/wesnoth/data/maps/undmap2
 share/wesnoth/data/maps/undmapbrother
 share/wesnoth/data/maps/undmapmages
 share/wesnoth/data/maps/undmapskull
+share/wesnoth/data/maps/wesbowl
 share/wesnoth/data/multiplayer.cfg
 share/wesnoth/data/names.cfg
 share/wesnoth/data/sample_translation.cfg
@@ -97,6 +101,7 @@ share/wesnoth/data/scenarios/Son_Of_The_Black_Eye.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg
+share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg
@@ -106,11 +111,13 @@ share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes.cfg
+share/wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Brother_Against_Brother.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg
+share/wesnoth/data/scenarios/Wesbowl.cfg
 share/wesnoth/data/schedules.cfg
 share/wesnoth/data/terrain.cfg
 share/wesnoth/data/themes/default.cfg
@@ -155,6 +162,7 @@ share/wesnoth/data/units/Death_Knight.cfg
 share/wesnoth/data/units/Deathmaster.cfg
 share/wesnoth/data/units/Demilich.cfg
 share/wesnoth/data/units/Dragoon.cfg
+share/wesnoth/data/units/Drakonian_Fighter.cfg
 share/wesnoth/data/units/Duelist.cfg
 share/wesnoth/data/units/Dwarvish_Berserker.cfg
 share/wesnoth/data/units/Dwarvish_Fighter.cfg
@@ -176,6 +184,7 @@ share/wesnoth/data/units/Elvish_Marksman.cfg
 share/wesnoth/data/units/Elvish_Marshal.cfg
 share/wesnoth/data/units/Elvish_Outrider.cfg
 share/wesnoth/data/units/Elvish_Ranger.cfg
+share/wesnoth/data/units/Elvish_Rider.cfg
 share/wesnoth/data/units/Elvish_Scout.cfg
 share/wesnoth/data/units/Elvish_Shaman.cfg
 share/wesnoth/data/units/Elvish_Sharpshooter.cfg
@@ -195,6 +204,7 @@ share/wesnoth/data/units/Goblin_Pillager.cfg
 share/wesnoth/data/units/Grand_Knight.cfg
 share/wesnoth/data/units/Great_Mage.cfg
 share/wesnoth/data/units/Gryphon.cfg
+share/wesnoth/data/units/Gryphon_Master.cfg
 share/wesnoth/data/units/Gryphon_Rider.cfg
 share/wesnoth/data/units/Halbardier.cfg
 share/wesnoth/data/units/Heavy_Infantry.cfg
@@ -205,7 +215,6 @@ share/wesnoth/data/units/Iron_Mauler.cfg
 share/wesnoth/data/units/Knight.cfg
 share/wesnoth/data/units/Lich.cfg
 share/wesnoth/data/units/Lieutenant.cfg
-share/wesnoth/data/units/Lizarman.cfg
 share/wesnoth/data/units/Longbowman.cfg
 share/wesnoth/data/units/Lord.cfg
 share/wesnoth/data/units/Mage.cfg
@@ -215,6 +224,7 @@ share/wesnoth/data/units/Merman.cfg
 share/wesnoth/data/units/Merman_Lord.cfg
 share/wesnoth/data/units/Naga.cfg
 share/wesnoth/data/units/Necromancer.cfg
+share/wesnoth/data/units/Necrophage.cfg
 share/wesnoth/data/units/Nightgaunt.cfg
 share/wesnoth/data/units/Ogre.cfg
 share/wesnoth/data/units/Orcish_Archer.cfg
@@ -237,6 +247,8 @@ share/wesnoth/data/units/Red_Mage.cfg
 share/wesnoth/data/units/Revenant.cfg
 share/wesnoth/data/units/Rogue.cfg
 share/wesnoth/data/units/Royal_Guard.cfg
+share/wesnoth/data/units/Saurian.cfg
+share/wesnoth/data/units/Saurian_Warrior.cfg
 share/wesnoth/data/units/Sea_Hag.cfg
 share/wesnoth/data/units/Sea_Orc.cfg
 share/wesnoth/data/units/Sea_Serpent.cfg
@@ -331,6 +343,12 @@ share/wesnoth/images/cursors/wait.png
 share/wesnoth/images/cuttlefish.png
 share/wesnoth/images/darkmissile-n.png
 share/wesnoth/images/darkmissile-ne.png
+share/wesnoth/images/drakonian-fighter-attack-close1.png
+share/wesnoth/images/drakonian-fighter-attack-close2.png
+share/wesnoth/images/drakonian-fighter-attack-fire1.png
+share/wesnoth/images/drakonian-fighter-attack-fire2.png
+share/wesnoth/images/drakonian-fighter-defend.png
+share/wesnoth/images/drakonian-fighter.png
 share/wesnoth/images/dwarf-berserker.png
 share/wesnoth/images/dwarf-fighter-attack.png
 share/wesnoth/images/dwarf-fighter-defend.png
@@ -432,6 +450,11 @@ share/wesnoth/images/elvish-ranger-attack3.png
 share/wesnoth/images/elvish-ranger-bow-defend.png
 share/wesnoth/images/elvish-ranger-defend.png
 share/wesnoth/images/elvish-ranger.png
+share/wesnoth/images/elvish-rider-attack.png
+share/wesnoth/images/elvish-rider-attack1.png
+share/wesnoth/images/elvish-rider-attack2.png
+share/wesnoth/images/elvish-rider-defend.png
+share/wesnoth/images/elvish-rider.png
 share/wesnoth/images/elvish-scout-attack.png
 share/wesnoth/images/elvish-scout-attack1.png
 share/wesnoth/images/elvish-scout-attack2.png
@@ -462,6 +485,9 @@ share/wesnoth/images/goblin-pillager-defend.png
 share/wesnoth/images/goblin-pillager.png
 share/wesnoth/images/grand-knight.png
 share/wesnoth/images/great-mage.png
+share/wesnoth/images/gryphon-master.png
+share/wesnoth/images/gryphon-rider-attack.png
+share/wesnoth/images/gryphon-rider-defend.png
 share/wesnoth/images/gryphon-rider.png
 share/wesnoth/images/gryphon-sleeping.png
 share/wesnoth/images/gryphon.png
@@ -573,11 +599,6 @@ share/wesnoth/images/konrad-young.png
 share/wesnoth/images/lightning-bolt.png
 share/wesnoth/images/lightning-n.png
 share/wesnoth/images/lightning-ne.png
-share/wesnoth/images/lizarman-attack1.png
-share/wesnoth/images/lizarman-attack2.png
-share/wesnoth/images/lizarman-attack3.png
-share/wesnoth/images/lizarman-defend.png
-share/wesnoth/images/lizarman.png
 share/wesnoth/images/mage-attack.png
 share/wesnoth/images/mage-attack1.png
 share/wesnoth/images/mage-attack2.png
@@ -592,6 +613,7 @@ share/wesnoth/images/merman-king-defend.png
 share/wesnoth/images/merman-king.png
 share/wesnoth/images/merman.png
 share/wesnoth/images/misc/axe.png
+share/wesnoth/images/misc/ball.png
 share/wesnoth/images/misc/baneblade.png
 share/wesnoth/images/misc/battleaxe.png
 share/wesnoth/images/misc/blank.png
@@ -821,6 +843,7 @@ share/wesnoth/images/orcish-warlord.png
 share/wesnoth/images/orcish-warrior-defend.png
 share/wesnoth/images/orcish-warrior-melee1.png
 share/wesnoth/images/orcish-warrior.png
+share/wesnoth/images/paladin-healing.png
 share/wesnoth/images/paladin.png
 share/wesnoth/images/partmoved-energy.png
 share/wesnoth/images/pirate-galleon.png
@@ -830,6 +853,16 @@ share/wesnoth/images/red-mage.png
 share/wesnoth/images/rogue-attack.png
 share/wesnoth/images/rogue-defend.png
 share/wesnoth/images/rogue.png
+share/wesnoth/images/saurian-attack1.png
+share/wesnoth/images/saurian-attack2.png
+share/wesnoth/images/saurian-attack3.png
+share/wesnoth/images/saurian-defend.png
+share/wesnoth/images/saurian-warrior-attack1.png
+share/wesnoth/images/saurian-warrior-attack2.png
+share/wesnoth/images/saurian-warrior-defend.png
+share/wesnoth/images/saurian-warrior-ranged.png
+share/wesnoth/images/saurian-warrior.png
+share/wesnoth/images/saurian.png
 share/wesnoth/images/scorpion-pincers-attack.png
 share/wesnoth/images/scorpion.png
 share/wesnoth/images/sea-hag-defend.png
@@ -843,101 +876,35 @@ share/wesnoth/images/sotbe/map1.png
 share/wesnoth/images/sotbe/map2.png
 share/wesnoth/images/sotbe/map3.png
 share/wesnoth/images/terrain/alpha.png
+share/wesnoth/images/terrain/alphamask.png
 share/wesnoth/images/terrain/bridge-n-s.png
 share/wesnoth/images/terrain/bridge-ne-sw.png
 share/wesnoth/images/terrain/bridge-se-nw.png
 share/wesnoth/images/terrain/bridge.png
-share/wesnoth/images/terrain/castle-e-e-e.png
-share/wesnoth/images/terrain/castle-e-e-nw.png
-share/wesnoth/images/terrain/castle-e-e-sw.png
-share/wesnoth/images/terrain/castle-e-i-e.png
-share/wesnoth/images/terrain/castle-e-i-nw.png
-share/wesnoth/images/terrain/castle-e-i-sw.png
-share/wesnoth/images/terrain/castle-n-ne-se-s.png
-share/wesnoth/images/terrain/castle-n-ne-se.png
-share/wesnoth/images/terrain/castle-n-ne.png
-share/wesnoth/images/terrain/castle-n.png
-share/wesnoth/images/terrain/castle-ne-e-ne.png
-share/wesnoth/images/terrain/castle-ne-e-se.png
-share/wesnoth/images/terrain/castle-ne-e-w.png
-share/wesnoth/images/terrain/castle-ne-i-ne.png
-share/wesnoth/images/terrain/castle-ne-i-se.png
-share/wesnoth/images/terrain/castle-ne-i-w.png
-share/wesnoth/images/terrain/castle-ne-se-s.png
-share/wesnoth/images/terrain/castle-ne-se.png
-share/wesnoth/images/terrain/castle-ne.png
-share/wesnoth/images/terrain/castle-nw-e-e.png
-share/wesnoth/images/terrain/castle-nw-e-nw.png
-share/wesnoth/images/terrain/castle-nw-e-sw.png
-share/wesnoth/images/terrain/castle-nw-i-e.png
-share/wesnoth/images/terrain/castle-nw-i-nw.png
-share/wesnoth/images/terrain/castle-nw-i-sw.png
-share/wesnoth/images/terrain/castle-nw-n.png
-share/wesnoth/images/terrain/castle-nw.png
-share/wesnoth/images/terrain/castle-ruins.png
-share/wesnoth/images/terrain/castle-s-sw-nw-n.png
-share/wesnoth/images/terrain/castle-s-sw-nw.png
-share/wesnoth/images/terrain/castle-s-sw.png
-share/wesnoth/images/terrain/castle-s.png
-share/wesnoth/images/terrain/castle-se-e-ne.png
-share/wesnoth/images/terrain/castle-se-e-se.png
-share/wesnoth/images/terrain/castle-se-e-w.png
-share/wesnoth/images/terrain/castle-se-i-ne.png
-share/wesnoth/images/terrain/castle-se-i-se.png
-share/wesnoth/images/terrain/castle-se-i-w.png
-share/wesnoth/images/terrain/castle-se-s.png
-share/wesnoth/images/terrain/castle-se.png
-share/wesnoth/images/terrain/castle-sw-e-e.png
-share/wesnoth/images/terrain/castle-sw-e-nw.png
-share/wesnoth/images/terrain/castle-sw-e-sw.png
-share/wesnoth/images/terrain/castle-sw-i-e.png
-share/wesnoth/images/terrain/castle-sw-i-nw.png
-share/wesnoth/images/terrain/castle-sw-i-sw.png
-share/wesnoth/images/terrain/castle-sw-nw-n.png
-share/wesnoth/images/terrain/castle-sw-nw.png
-share/wesnoth/images/terrain/castle-sw.png
-share/wesnoth/images/terrain/castle-w-e-ne.png
-share/wesnoth/images/terrain/castle-w-e-se.png
-share/wesnoth/images/terrain/castle-w-e-w.png
-share/wesnoth/images/terrain/castle-w-i-ne.png
-share/wesnoth/images/terrain/castle-w-i-se.png
-share/wesnoth/images/terrain/castle-w-i-w.png
-share/wesnoth/images/terrain/castle-wall-concave-e-e.png
-share/wesnoth/images/terrain/castle-wall-concave-e-nw.png
-share/wesnoth/images/terrain/castle-wall-concave-e-sw.png
-share/wesnoth/images/terrain/castle-wall-concave-ne-ne.png
-share/wesnoth/images/terrain/castle-wall-concave-ne-se.png
-share/wesnoth/images/terrain/castle-wall-concave-ne-w.png
-share/wesnoth/images/terrain/castle-wall-concave-nw-e.png
-share/wesnoth/images/terrain/castle-wall-concave-nw-nw.png
-share/wesnoth/images/terrain/castle-wall-concave-nw-sw.png
-share/wesnoth/images/terrain/castle-wall-concave-se-ne.png
-share/wesnoth/images/terrain/castle-wall-concave-se-se.png
-share/wesnoth/images/terrain/castle-wall-concave-se-w.png
-share/wesnoth/images/terrain/castle-wall-concave-sw-e.png
-share/wesnoth/images/terrain/castle-wall-concave-sw-nw.png
-share/wesnoth/images/terrain/castle-wall-concave-sw-sw.png
-share/wesnoth/images/terrain/castle-wall-concave-w-ne.png
-share/wesnoth/images/terrain/castle-wall-concave-w-se.png
-share/wesnoth/images/terrain/castle-wall-concave-w-w.png
-share/wesnoth/images/terrain/castle-wall-convex-e-e.png
-share/wesnoth/images/terrain/castle-wall-convex-e-nw.png
-share/wesnoth/images/terrain/castle-wall-convex-e-sw.png
-share/wesnoth/images/terrain/castle-wall-convex-ne-ne.png
-share/wesnoth/images/terrain/castle-wall-convex-ne-se.png
-share/wesnoth/images/terrain/castle-wall-convex-ne-w.png
-share/wesnoth/images/terrain/castle-wall-convex-nw-e.png
-share/wesnoth/images/terrain/castle-wall-convex-nw-nw.png
-share/wesnoth/images/terrain/castle-wall-convex-nw-sw.png
-share/wesnoth/images/terrain/castle-wall-convex-se-ne.png
-share/wesnoth/images/terrain/castle-wall-convex-se-se.png
-share/wesnoth/images/terrain/castle-wall-convex-se-w.png
-share/wesnoth/images/terrain/castle-wall-convex-sw-e.png
-share/wesnoth/images/terrain/castle-wall-convex-sw-nw.png
-share/wesnoth/images/terrain/castle-wall-convex-sw-sw.png
-share/wesnoth/images/terrain/castle-wall-convex-w-ne.png
-share/wesnoth/images/terrain/castle-wall-convex-w-se.png
-share/wesnoth/images/terrain/castle-wall-convex-w-w.png
+share/wesnoth/images/terrain/castle-bg-concave-e.png
+share/wesnoth/images/terrain/castle-bg-concave-ne.png
+share/wesnoth/images/terrain/castle-bg-concave-nw.png
+share/wesnoth/images/terrain/castle-bg-concave-se.png
+share/wesnoth/images/terrain/castle-bg-concave-sw.png
+share/wesnoth/images/terrain/castle-bg-concave-w.png
+share/wesnoth/images/terrain/castle-bg-convex-e.png
+share/wesnoth/images/terrain/castle-bg-convex-ne.png
+share/wesnoth/images/terrain/castle-bg-convex-nw.png
+share/wesnoth/images/terrain/castle-bg-convex-se.png
+share/wesnoth/images/terrain/castle-bg-convex-sw.png
+share/wesnoth/images/terrain/castle-bg-convex-w.png
+share/wesnoth/images/terrain/castle-fg-concave-e.png
+share/wesnoth/images/terrain/castle-fg-concave-ne.png
+share/wesnoth/images/terrain/castle-fg-concave-nw.png
+share/wesnoth/images/terrain/castle-fg-concave-se.png
+share/wesnoth/images/terrain/castle-fg-concave-sw.png
+share/wesnoth/images/terrain/castle-fg-concave-w.png
+share/wesnoth/images/terrain/castle-fg-convex-e.png
+share/wesnoth/images/terrain/castle-fg-convex-ne.png
+share/wesnoth/images/terrain/castle-fg-convex-nw.png
+share/wesnoth/images/terrain/castle-fg-convex-se.png
+share/wesnoth/images/terrain/castle-fg-convex-sw.png
+share/wesnoth/images/terrain/castle-fg-convex-w.png
 share/wesnoth/images/terrain/castle.png
 share/wesnoth/images/terrain/cave-n-ne-se-s.png
 share/wesnoth/images/terrain/cave-n-ne-se.png
@@ -1043,10 +1010,13 @@ share/wesnoth/images/terrain/hills-n-ne.png
 share/wesnoth/images/terrain/hills-n.png
 share/wesnoth/images/terrain/hills-ne.png
 share/wesnoth/images/terrain/hills-nw.png
-share/wesnoth/images/terrain/hills-s-sw.png
+share/wesnoth/images/terrain/hills-s-se.png
 share/wesnoth/images/terrain/hills-s.png
 share/wesnoth/images/terrain/hills-se.png
 share/wesnoth/images/terrain/hills-sw.png
+share/wesnoth/images/terrain/hills-variation1.png
+share/wesnoth/images/terrain/hills-variation2.png
+share/wesnoth/images/terrain/hills-variation3.png
 share/wesnoth/images/terrain/hills.png
 share/wesnoth/images/terrain/human-village.gif
 share/wesnoth/images/terrain/human-village.png
@@ -1060,78 +1030,54 @@ share/wesnoth/images/terrain/ice-se.png
 share/wesnoth/images/terrain/ice-sw.png
 share/wesnoth/images/terrain/ice.png
 share/wesnoth/images/terrain/icebridge-se-nw.png
-share/wesnoth/images/terrain/keep-inside-e-e.png
-share/wesnoth/images/terrain/keep-inside-e-nw.png
-share/wesnoth/images/terrain/keep-inside-e-sw.png
-share/wesnoth/images/terrain/keep-inside-ne-ne.png
-share/wesnoth/images/terrain/keep-inside-ne-se.png
-share/wesnoth/images/terrain/keep-inside-ne-w.png
-share/wesnoth/images/terrain/keep-inside-nw-e.png
-share/wesnoth/images/terrain/keep-inside-nw-nw.png
-share/wesnoth/images/terrain/keep-inside-nw-sw.png
-share/wesnoth/images/terrain/keep-inside-se-ne.png
-share/wesnoth/images/terrain/keep-inside-se-se.png
-share/wesnoth/images/terrain/keep-inside-se-w.png
-share/wesnoth/images/terrain/keep-inside-sw-e.png
-share/wesnoth/images/terrain/keep-inside-sw-nw.png
-share/wesnoth/images/terrain/keep-inside-sw-sw.png
-share/wesnoth/images/terrain/keep-inside-w-ne.png
-share/wesnoth/images/terrain/keep-inside-w-se.png
-share/wesnoth/images/terrain/keep-inside-w-w.png
-share/wesnoth/images/terrain/keep-wall-0-e-e.png
-share/wesnoth/images/terrain/keep-wall-0-e-nw.png
-share/wesnoth/images/terrain/keep-wall-0-e-sw.png
-share/wesnoth/images/terrain/keep-wall-0-ne-ne.png
-share/wesnoth/images/terrain/keep-wall-0-ne-se.png
-share/wesnoth/images/terrain/keep-wall-0-ne-w.png
-share/wesnoth/images/terrain/keep-wall-0-nw-e.png
-share/wesnoth/images/terrain/keep-wall-0-nw-nw.png
-share/wesnoth/images/terrain/keep-wall-0-nw-sw.png
-share/wesnoth/images/terrain/keep-wall-0-se-ne.png
-share/wesnoth/images/terrain/keep-wall-0-se-se.png
-share/wesnoth/images/terrain/keep-wall-0-se-w.png
-share/wesnoth/images/terrain/keep-wall-0-sw-e.png
-share/wesnoth/images/terrain/keep-wall-0-sw-nw.png
-share/wesnoth/images/terrain/keep-wall-0-sw-sw.png
-share/wesnoth/images/terrain/keep-wall-0-w-ne.png
-share/wesnoth/images/terrain/keep-wall-0-w-se.png
-share/wesnoth/images/terrain/keep-wall-0-w-w.png
-share/wesnoth/images/terrain/keep-wall-1-e-e.png
-share/wesnoth/images/terrain/keep-wall-1-e-nw.png
-share/wesnoth/images/terrain/keep-wall-1-e-sw.png
-share/wesnoth/images/terrain/keep-wall-1-ne-ne.png
-share/wesnoth/images/terrain/keep-wall-1-ne-se.png
-share/wesnoth/images/terrain/keep-wall-1-ne-w.png
-share/wesnoth/images/terrain/keep-wall-1-nw-e.png
-share/wesnoth/images/terrain/keep-wall-1-nw-nw.png
-share/wesnoth/images/terrain/keep-wall-1-nw-sw.png
-share/wesnoth/images/terrain/keep-wall-1-se-ne.png
-share/wesnoth/images/terrain/keep-wall-1-se-se.png
-share/wesnoth/images/terrain/keep-wall-1-se-w.png
-share/wesnoth/images/terrain/keep-wall-1-sw-e.png
-share/wesnoth/images/terrain/keep-wall-1-sw-nw.png
-share/wesnoth/images/terrain/keep-wall-1-sw-sw.png
-share/wesnoth/images/terrain/keep-wall-1-w-ne.png
-share/wesnoth/images/terrain/keep-wall-1-w-se.png
-share/wesnoth/images/terrain/keep-wall-1-w-w.png
-share/wesnoth/images/terrain/keep-wall-e-e.png
-share/wesnoth/images/terrain/keep-wall-e-nw.png
-share/wesnoth/images/terrain/keep-wall-e-sw.png
-share/wesnoth/images/terrain/keep-wall-ne-ne.png
-share/wesnoth/images/terrain/keep-wall-ne-se.png
-share/wesnoth/images/terrain/keep-wall-ne-w.png
-share/wesnoth/images/terrain/keep-wall-nw-e.png
-share/wesnoth/images/terrain/keep-wall-nw-nw.png
-share/wesnoth/images/terrain/keep-wall-nw-sw.png
-share/wesnoth/images/terrain/keep-wall-se-ne.png
-share/wesnoth/images/terrain/keep-wall-se-se.png
-share/wesnoth/images/terrain/keep-wall-se-w.png
-share/wesnoth/images/terrain/keep-wall-sw-e.png
-share/wesnoth/images/terrain/keep-wall-sw-nw.png
-share/wesnoth/images/terrain/keep-wall-sw-sw.png
-share/wesnoth/images/terrain/keep-wall-w-ne.png
-share/wesnoth/images/terrain/keep-wall-w-se.png
-share/wesnoth/images/terrain/keep-wall-w-w.png
+share/wesnoth/images/terrain/keep-bg-inside-e.png
+share/wesnoth/images/terrain/keep-bg-inside-ne.png
+share/wesnoth/images/terrain/keep-bg-inside-nw.png
+share/wesnoth/images/terrain/keep-bg-inside-se.png
+share/wesnoth/images/terrain/keep-bg-inside-sw.png
+share/wesnoth/images/terrain/keep-bg-inside-w.png
+share/wesnoth/images/terrain/keep-bg-wall-0-e.png
+share/wesnoth/images/terrain/keep-bg-wall-0-ne.png
+share/wesnoth/images/terrain/keep-bg-wall-0-nw.png
+share/wesnoth/images/terrain/keep-bg-wall-0-se.png
+share/wesnoth/images/terrain/keep-bg-wall-0-sw.png
+share/wesnoth/images/terrain/keep-bg-wall-0-w.png
+share/wesnoth/images/terrain/keep-bg-wall-1-e.png
+share/wesnoth/images/terrain/keep-bg-wall-1-ne.png
+share/wesnoth/images/terrain/keep-bg-wall-1-nw.png
+share/wesnoth/images/terrain/keep-bg-wall-1-se.png
+share/wesnoth/images/terrain/keep-bg-wall-1-sw.png
+share/wesnoth/images/terrain/keep-bg-wall-1-w.png
+share/wesnoth/images/terrain/keep-bg-wall-e.png
+share/wesnoth/images/terrain/keep-bg-wall-ne.png
+share/wesnoth/images/terrain/keep-bg-wall-nw.png
+share/wesnoth/images/terrain/keep-bg-wall-se.png
+share/wesnoth/images/terrain/keep-bg-wall-sw.png
+share/wesnoth/images/terrain/keep-bg-wall-w.png
+share/wesnoth/images/terrain/keep-fg-inside-e.png
+share/wesnoth/images/terrain/keep-fg-inside-ne.png
+share/wesnoth/images/terrain/keep-fg-inside-nw.png
+share/wesnoth/images/terrain/keep-fg-inside-se.png
+share/wesnoth/images/terrain/keep-fg-inside-sw.png
+share/wesnoth/images/terrain/keep-fg-inside-w.png
+share/wesnoth/images/terrain/keep-fg-wall-0-e.png
+share/wesnoth/images/terrain/keep-fg-wall-0-ne.png
+share/wesnoth/images/terrain/keep-fg-wall-0-nw.png
+share/wesnoth/images/terrain/keep-fg-wall-0-se.png
+share/wesnoth/images/terrain/keep-fg-wall-0-sw.png
+share/wesnoth/images/terrain/keep-fg-wall-0-w.png
+share/wesnoth/images/terrain/keep-fg-wall-1-e.png
+share/wesnoth/images/terrain/keep-fg-wall-1-ne.png
+share/wesnoth/images/terrain/keep-fg-wall-1-nw.png
+share/wesnoth/images/terrain/keep-fg-wall-1-se.png
+share/wesnoth/images/terrain/keep-fg-wall-1-sw.png
+share/wesnoth/images/terrain/keep-fg-wall-1-w.png
+share/wesnoth/images/terrain/keep-fg-wall-e.png
+share/wesnoth/images/terrain/keep-fg-wall-ne.png
+share/wesnoth/images/terrain/keep-fg-wall-nw.png
+share/wesnoth/images/terrain/keep-fg-wall-se.png
+share/wesnoth/images/terrain/keep-fg-wall-sw.png
+share/wesnoth/images/terrain/keep-fg-wall-w.png
 share/wesnoth/images/terrain/keep.png
 share/wesnoth/images/terrain/lava.png
 share/wesnoth/images/terrain/mask.png
@@ -1234,6 +1180,10 @@ share/wesnoth/images/undead-bat.png
 share/wesnoth/images/undead-blackspell.png
 share/wesnoth/images/undead-bloodbat-defend.png
 share/wesnoth/images/undead-bloodbat.png
+share/wesnoth/images/undead-boneshooter-attack.png
+share/wesnoth/images/undead-boneshooter-attack1.png
+share/wesnoth/images/undead-boneshooter-attack2.png
+share/wesnoth/images/undead-boneshooter-defend.png
 share/wesnoth/images/undead-boneshooter.png
 share/wesnoth/images/undead-chocobone.png
 share/wesnoth/images/undead-darkspirit-attack.png
@@ -1248,6 +1198,10 @@ share/wesnoth/images/undead-ghost.png
 share/wesnoth/images/undead-ghoul-attack.png
 share/wesnoth/images/undead-ghoul-defend.png
 share/wesnoth/images/undead-ghoul.png
+share/wesnoth/images/undead-initiate-attack1.png
+share/wesnoth/images/undead-initiate-attack2.png
+share/wesnoth/images/undead-initiate-defend.png
+share/wesnoth/images/undead-initiate.png
 share/wesnoth/images/undead-lich-defend.png
 share/wesnoth/images/undead-lich-melee.png
 share/wesnoth/images/undead-lich-ranged1.png
@@ -1257,6 +1211,9 @@ share/wesnoth/images/undead-necromancer-attack.png
 share/wesnoth/images/undead-necromancer-attack2.png
 share/wesnoth/images/undead-necromancer-defend.png
 share/wesnoth/images/undead-necromancer.png
+share/wesnoth/images/undead-necrophage-attack.png
+share/wesnoth/images/undead-necrophage-defend.png
+share/wesnoth/images/undead-necrophage.png
 share/wesnoth/images/undead-nightgaunt-attack.png
 share/wesnoth/images/undead-nightgaunt-attack2.png
 share/wesnoth/images/undead-nightgaunt-defend.png
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 4fe63e9f9aca..bae1d2f4a810 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	0.7.6
+PORTVERSION=	0.7.7
 CATEGORIES=	games
 MASTER_SITES=	http://www.wesnoth.org/files/
 .if defined(LITE)
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 220608e48422..b9ad7704f648 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,4 +1,4 @@
-MD5 (wesnoth-0.7.6.tar.gz) = 9e5be4ca1420b4c4f6e3fdc2b981aaef
-SIZE (wesnoth-0.7.6.tar.gz) = 19662171
-MD5 (wesnoth-lite-0.7.6.tar.gz) = 02512f1d4620e858a0a7d6f768ef90f9
-SIZE (wesnoth-lite-0.7.6.tar.gz) = 6364278
+MD5 (wesnoth-0.7.7.tar.gz) = 4216a6ac54274589d00858d49f7609aa
+SIZE (wesnoth-0.7.7.tar.gz) = 19686247
+MD5 (wesnoth-lite-0.7.7.tar.gz) = 764120e90667b94f2fd05d867280f832
+SIZE (wesnoth-lite-0.7.7.tar.gz) = 6388120
diff --git a/games/wesnoth/files/patch-src::language.hpp b/games/wesnoth/files/patch-src::language.hpp
deleted file mode 100644
index 8ab1e88d877f..000000000000
--- a/games/wesnoth/files/patch-src::language.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/language.hpp.orig	Mon May  3 18:35:49 2004
-+++ src/language.hpp	Wed May 12 00:50:43 2004
-@@ -19,6 +19,14 @@
- #include <string>
- #include <vector>
- 
-+#if (__FreeBSD_version < 500029)
-+#include <cwchar>
-+namespace std
-+{
-+	typedef basic_string <wchar_t> wstring;
-+}
-+#endif
-+
- //this module controls internationalization.
- 
- struct symbol_table
diff --git a/games/wesnoth/files/patch-src::util.hpp b/games/wesnoth/files/patch-src::util.hpp
new file mode 100644
index 000000000000..4fc9a9157150
--- /dev/null
+++ b/games/wesnoth/files/patch-src::util.hpp
@@ -0,0 +1,10 @@
+--- src/util.hpp.orig	Wed May 19 14:27:36 2004
++++ src/util.hpp	Wed May 19 14:28:08 2004
+@@ -15,6 +15,7 @@
+ 
+ #include <cmath>
+ #include <map>
++#include <sstream>
+ 
+ //instead of playing with VC++'s crazy definitions of min and max,
+ //just define our own
diff --git a/games/wesnoth/files/patch-src::widgets::textbox.hpp b/games/wesnoth/files/patch-src::widgets::textbox.hpp
deleted file mode 100644
index 6abbf1e960b2..000000000000
--- a/games/wesnoth/files/patch-src::widgets::textbox.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/widgets/textbox.hpp.orig	Mon May  3 18:35:49 2004
-+++ src/widgets/textbox.hpp	Wed May 12 00:51:03 2004
-@@ -22,6 +22,14 @@
- 
- #include "SDL.h"
- 
-+#if (__FreeBSD_version < 500029)
-+#include <cwchar>
-+namespace std
-+{
-+	typedef basic_string <wchar_t> wstring;
-+}
-+#endif
-+
- namespace gui {
- 
- class textbox : public widget
diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist
index 8b2ee2b06816..9028787573ff 100644
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist
@@ -10,6 +10,7 @@ share/wesnoth/data/deaths.cfg
 share/wesnoth/data/game.cfg
 share/wesnoth/data/intro.cfg
 share/wesnoth/data/items.cfg
+share/wesnoth/data/maps/King_of_the_Hill
 share/wesnoth/data/maps/LiberationMap.dat
 share/wesnoth/data/maps/battleworld
 share/wesnoth/data/maps/choice
@@ -50,15 +51,18 @@ share/wesnoth/data/maps/orc-map5
 share/wesnoth/data/maps/orc-map6
 share/wesnoth/data/maps/orc-map7
 share/wesnoth/data/maps/orc-map8
+share/wesnoth/data/maps/orc-map9
 share/wesnoth/data/maps/sceptre
 share/wesnoth/data/maps/snowplains
 share/wesnoth/data/maps/swampland
 share/wesnoth/data/maps/undeadbook
+share/wesnoth/data/maps/undeadchance
 share/wesnoth/data/maps/undeadtower
 share/wesnoth/data/maps/undmap2
 share/wesnoth/data/maps/undmapbrother
 share/wesnoth/data/maps/undmapmages
 share/wesnoth/data/maps/undmapskull
+share/wesnoth/data/maps/wesbowl
 share/wesnoth/data/multiplayer.cfg
 share/wesnoth/data/names.cfg
 share/wesnoth/data/sample_translation.cfg
@@ -97,6 +101,7 @@ share/wesnoth/data/scenarios/Son_Of_The_Black_Eye.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg
+share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg
@@ -106,11 +111,13 @@ share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes.cfg
+share/wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Brother_Against_Brother.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg
+share/wesnoth/data/scenarios/Wesbowl.cfg
 share/wesnoth/data/schedules.cfg
 share/wesnoth/data/terrain.cfg
 share/wesnoth/data/themes/default.cfg
@@ -155,6 +162,7 @@ share/wesnoth/data/units/Death_Knight.cfg
 share/wesnoth/data/units/Deathmaster.cfg
 share/wesnoth/data/units/Demilich.cfg
 share/wesnoth/data/units/Dragoon.cfg
+share/wesnoth/data/units/Drakonian_Fighter.cfg
 share/wesnoth/data/units/Duelist.cfg
 share/wesnoth/data/units/Dwarvish_Berserker.cfg
 share/wesnoth/data/units/Dwarvish_Fighter.cfg
@@ -176,6 +184,7 @@ share/wesnoth/data/units/Elvish_Marksman.cfg
 share/wesnoth/data/units/Elvish_Marshal.cfg
 share/wesnoth/data/units/Elvish_Outrider.cfg
 share/wesnoth/data/units/Elvish_Ranger.cfg
+share/wesnoth/data/units/Elvish_Rider.cfg
 share/wesnoth/data/units/Elvish_Scout.cfg
 share/wesnoth/data/units/Elvish_Shaman.cfg
 share/wesnoth/data/units/Elvish_Sharpshooter.cfg
@@ -195,6 +204,7 @@ share/wesnoth/data/units/Goblin_Pillager.cfg
 share/wesnoth/data/units/Grand_Knight.cfg
 share/wesnoth/data/units/Great_Mage.cfg
 share/wesnoth/data/units/Gryphon.cfg
+share/wesnoth/data/units/Gryphon_Master.cfg
 share/wesnoth/data/units/Gryphon_Rider.cfg
 share/wesnoth/data/units/Halbardier.cfg
 share/wesnoth/data/units/Heavy_Infantry.cfg
@@ -205,7 +215,6 @@ share/wesnoth/data/units/Iron_Mauler.cfg
 share/wesnoth/data/units/Knight.cfg
 share/wesnoth/data/units/Lich.cfg
 share/wesnoth/data/units/Lieutenant.cfg
-share/wesnoth/data/units/Lizarman.cfg
 share/wesnoth/data/units/Longbowman.cfg
 share/wesnoth/data/units/Lord.cfg
 share/wesnoth/data/units/Mage.cfg
@@ -215,6 +224,7 @@ share/wesnoth/data/units/Merman.cfg
 share/wesnoth/data/units/Merman_Lord.cfg
 share/wesnoth/data/units/Naga.cfg
 share/wesnoth/data/units/Necromancer.cfg
+share/wesnoth/data/units/Necrophage.cfg
 share/wesnoth/data/units/Nightgaunt.cfg
 share/wesnoth/data/units/Ogre.cfg
 share/wesnoth/data/units/Orcish_Archer.cfg
@@ -237,6 +247,8 @@ share/wesnoth/data/units/Red_Mage.cfg
 share/wesnoth/data/units/Revenant.cfg
 share/wesnoth/data/units/Rogue.cfg
 share/wesnoth/data/units/Royal_Guard.cfg
+share/wesnoth/data/units/Saurian.cfg
+share/wesnoth/data/units/Saurian_Warrior.cfg
 share/wesnoth/data/units/Sea_Hag.cfg
 share/wesnoth/data/units/Sea_Orc.cfg
 share/wesnoth/data/units/Sea_Serpent.cfg
@@ -331,6 +343,12 @@ share/wesnoth/images/cursors/wait.png
 share/wesnoth/images/cuttlefish.png
 share/wesnoth/images/darkmissile-n.png
 share/wesnoth/images/darkmissile-ne.png
+share/wesnoth/images/drakonian-fighter-attack-close1.png
+share/wesnoth/images/drakonian-fighter-attack-close2.png
+share/wesnoth/images/drakonian-fighter-attack-fire1.png
+share/wesnoth/images/drakonian-fighter-attack-fire2.png
+share/wesnoth/images/drakonian-fighter-defend.png
+share/wesnoth/images/drakonian-fighter.png
 share/wesnoth/images/dwarf-berserker.png
 share/wesnoth/images/dwarf-fighter-attack.png
 share/wesnoth/images/dwarf-fighter-defend.png
@@ -432,6 +450,11 @@ share/wesnoth/images/elvish-ranger-attack3.png
 share/wesnoth/images/elvish-ranger-bow-defend.png
 share/wesnoth/images/elvish-ranger-defend.png
 share/wesnoth/images/elvish-ranger.png
+share/wesnoth/images/elvish-rider-attack.png
+share/wesnoth/images/elvish-rider-attack1.png
+share/wesnoth/images/elvish-rider-attack2.png
+share/wesnoth/images/elvish-rider-defend.png
+share/wesnoth/images/elvish-rider.png
 share/wesnoth/images/elvish-scout-attack.png
 share/wesnoth/images/elvish-scout-attack1.png
 share/wesnoth/images/elvish-scout-attack2.png
@@ -462,6 +485,9 @@ share/wesnoth/images/goblin-pillager-defend.png
 share/wesnoth/images/goblin-pillager.png
 share/wesnoth/images/grand-knight.png
 share/wesnoth/images/great-mage.png
+share/wesnoth/images/gryphon-master.png
+share/wesnoth/images/gryphon-rider-attack.png
+share/wesnoth/images/gryphon-rider-defend.png
 share/wesnoth/images/gryphon-rider.png
 share/wesnoth/images/gryphon-sleeping.png
 share/wesnoth/images/gryphon.png
@@ -573,11 +599,6 @@ share/wesnoth/images/konrad-young.png
 share/wesnoth/images/lightning-bolt.png
 share/wesnoth/images/lightning-n.png
 share/wesnoth/images/lightning-ne.png
-share/wesnoth/images/lizarman-attack1.png
-share/wesnoth/images/lizarman-attack2.png
-share/wesnoth/images/lizarman-attack3.png
-share/wesnoth/images/lizarman-defend.png
-share/wesnoth/images/lizarman.png
 share/wesnoth/images/mage-attack.png
 share/wesnoth/images/mage-attack1.png
 share/wesnoth/images/mage-attack2.png
@@ -592,6 +613,7 @@ share/wesnoth/images/merman-king-defend.png
 share/wesnoth/images/merman-king.png
 share/wesnoth/images/merman.png
 share/wesnoth/images/misc/axe.png
+share/wesnoth/images/misc/ball.png
 share/wesnoth/images/misc/baneblade.png
 share/wesnoth/images/misc/battleaxe.png
 share/wesnoth/images/misc/blank.png
@@ -821,6 +843,7 @@ share/wesnoth/images/orcish-warlord.png
 share/wesnoth/images/orcish-warrior-defend.png
 share/wesnoth/images/orcish-warrior-melee1.png
 share/wesnoth/images/orcish-warrior.png
+share/wesnoth/images/paladin-healing.png
 share/wesnoth/images/paladin.png
 share/wesnoth/images/partmoved-energy.png
 share/wesnoth/images/pirate-galleon.png
@@ -830,6 +853,16 @@ share/wesnoth/images/red-mage.png
 share/wesnoth/images/rogue-attack.png
 share/wesnoth/images/rogue-defend.png
 share/wesnoth/images/rogue.png
+share/wesnoth/images/saurian-attack1.png
+share/wesnoth/images/saurian-attack2.png
+share/wesnoth/images/saurian-attack3.png
+share/wesnoth/images/saurian-defend.png
+share/wesnoth/images/saurian-warrior-attack1.png
+share/wesnoth/images/saurian-warrior-attack2.png
+share/wesnoth/images/saurian-warrior-defend.png
+share/wesnoth/images/saurian-warrior-ranged.png
+share/wesnoth/images/saurian-warrior.png
+share/wesnoth/images/saurian.png
 share/wesnoth/images/scorpion-pincers-attack.png
 share/wesnoth/images/scorpion.png
 share/wesnoth/images/sea-hag-defend.png
@@ -843,101 +876,35 @@ share/wesnoth/images/sotbe/map1.png
 share/wesnoth/images/sotbe/map2.png
 share/wesnoth/images/sotbe/map3.png
 share/wesnoth/images/terrain/alpha.png
+share/wesnoth/images/terrain/alphamask.png
 share/wesnoth/images/terrain/bridge-n-s.png
 share/wesnoth/images/terrain/bridge-ne-sw.png
 share/wesnoth/images/terrain/bridge-se-nw.png
 share/wesnoth/images/terrain/bridge.png
-share/wesnoth/images/terrain/castle-e-e-e.png
-share/wesnoth/images/terrain/castle-e-e-nw.png
-share/wesnoth/images/terrain/castle-e-e-sw.png
-share/wesnoth/images/terrain/castle-e-i-e.png
-share/wesnoth/images/terrain/castle-e-i-nw.png
-share/wesnoth/images/terrain/castle-e-i-sw.png
-share/wesnoth/images/terrain/castle-n-ne-se-s.png
-share/wesnoth/images/terrain/castle-n-ne-se.png
-share/wesnoth/images/terrain/castle-n-ne.png
-share/wesnoth/images/terrain/castle-n.png
-share/wesnoth/images/terrain/castle-ne-e-ne.png
-share/wesnoth/images/terrain/castle-ne-e-se.png
-share/wesnoth/images/terrain/castle-ne-e-w.png
-share/wesnoth/images/terrain/castle-ne-i-ne.png
-share/wesnoth/images/terrain/castle-ne-i-se.png
-share/wesnoth/images/terrain/castle-ne-i-w.png
-share/wesnoth/images/terrain/castle-ne-se-s.png
-share/wesnoth/images/terrain/castle-ne-se.png
-share/wesnoth/images/terrain/castle-ne.png
-share/wesnoth/images/terrain/castle-nw-e-e.png
-share/wesnoth/images/terrain/castle-nw-e-nw.png
-share/wesnoth/images/terrain/castle-nw-e-sw.png
-share/wesnoth/images/terrain/castle-nw-i-e.png
-share/wesnoth/images/terrain/castle-nw-i-nw.png
-share/wesnoth/images/terrain/castle-nw-i-sw.png
-share/wesnoth/images/terrain/castle-nw-n.png
-share/wesnoth/images/terrain/castle-nw.png
-share/wesnoth/images/terrain/castle-ruins.png
-share/wesnoth/images/terrain/castle-s-sw-nw-n.png
-share/wesnoth/images/terrain/castle-s-sw-nw.png
-share/wesnoth/images/terrain/castle-s-sw.png
-share/wesnoth/images/terrain/castle-s.png
-share/wesnoth/images/terrain/castle-se-e-ne.png
-share/wesnoth/images/terrain/castle-se-e-se.png
-share/wesnoth/images/terrain/castle-se-e-w.png
-share/wesnoth/images/terrain/castle-se-i-ne.png
-share/wesnoth/images/terrain/castle-se-i-se.png
-share/wesnoth/images/terrain/castle-se-i-w.png
-share/wesnoth/images/terrain/castle-se-s.png
-share/wesnoth/images/terrain/castle-se.png
-share/wesnoth/images/terrain/castle-sw-e-e.png
-share/wesnoth/images/terrain/castle-sw-e-nw.png
-share/wesnoth/images/terrain/castle-sw-e-sw.png
-share/wesnoth/images/terrain/castle-sw-i-e.png
-share/wesnoth/images/terrain/castle-sw-i-nw.png
-share/wesnoth/images/terrain/castle-sw-i-sw.png
-share/wesnoth/images/terrain/castle-sw-nw-n.png
-share/wesnoth/images/terrain/castle-sw-nw.png
-share/wesnoth/images/terrain/castle-sw.png
-share/wesnoth/images/terrain/castle-w-e-ne.png
-share/wesnoth/images/terrain/castle-w-e-se.png
-share/wesnoth/images/terrain/castle-w-e-w.png
-share/wesnoth/images/terrain/castle-w-i-ne.png
-share/wesnoth/images/terrain/castle-w-i-se.png
-share/wesnoth/images/terrain/castle-w-i-w.png
-share/wesnoth/images/terrain/castle-wall-concave-e-e.png
-share/wesnoth/images/terrain/castle-wall-concave-e-nw.png
-share/wesnoth/images/terrain/castle-wall-concave-e-sw.png
-share/wesnoth/images/terrain/castle-wall-concave-ne-ne.png
-share/wesnoth/images/terrain/castle-wall-concave-ne-se.png
-share/wesnoth/images/terrain/castle-wall-concave-ne-w.png
-share/wesnoth/images/terrain/castle-wall-concave-nw-e.png
-share/wesnoth/images/terrain/castle-wall-concave-nw-nw.png
-share/wesnoth/images/terrain/castle-wall-concave-nw-sw.png
-share/wesnoth/images/terrain/castle-wall-concave-se-ne.png
-share/wesnoth/images/terrain/castle-wall-concave-se-se.png
-share/wesnoth/images/terrain/castle-wall-concave-se-w.png
-share/wesnoth/images/terrain/castle-wall-concave-sw-e.png
-share/wesnoth/images/terrain/castle-wall-concave-sw-nw.png
-share/wesnoth/images/terrain/castle-wall-concave-sw-sw.png
-share/wesnoth/images/terrain/castle-wall-concave-w-ne.png
-share/wesnoth/images/terrain/castle-wall-concave-w-se.png
-share/wesnoth/images/terrain/castle-wall-concave-w-w.png
-share/wesnoth/images/terrain/castle-wall-convex-e-e.png
-share/wesnoth/images/terrain/castle-wall-convex-e-nw.png
-share/wesnoth/images/terrain/castle-wall-convex-e-sw.png
-share/wesnoth/images/terrain/castle-wall-convex-ne-ne.png
-share/wesnoth/images/terrain/castle-wall-convex-ne-se.png
-share/wesnoth/images/terrain/castle-wall-convex-ne-w.png
-share/wesnoth/images/terrain/castle-wall-convex-nw-e.png
-share/wesnoth/images/terrain/castle-wall-convex-nw-nw.png
-share/wesnoth/images/terrain/castle-wall-convex-nw-sw.png
-share/wesnoth/images/terrain/castle-wall-convex-se-ne.png
-share/wesnoth/images/terrain/castle-wall-convex-se-se.png
-share/wesnoth/images/terrain/castle-wall-convex-se-w.png
-share/wesnoth/images/terrain/castle-wall-convex-sw-e.png
-share/wesnoth/images/terrain/castle-wall-convex-sw-nw.png
-share/wesnoth/images/terrain/castle-wall-convex-sw-sw.png
-share/wesnoth/images/terrain/castle-wall-convex-w-ne.png
-share/wesnoth/images/terrain/castle-wall-convex-w-se.png
-share/wesnoth/images/terrain/castle-wall-convex-w-w.png
+share/wesnoth/images/terrain/castle-bg-concave-e.png
+share/wesnoth/images/terrain/castle-bg-concave-ne.png
+share/wesnoth/images/terrain/castle-bg-concave-nw.png
+share/wesnoth/images/terrain/castle-bg-concave-se.png
+share/wesnoth/images/terrain/castle-bg-concave-sw.png
+share/wesnoth/images/terrain/castle-bg-concave-w.png
+share/wesnoth/images/terrain/castle-bg-convex-e.png
+share/wesnoth/images/terrain/castle-bg-convex-ne.png
+share/wesnoth/images/terrain/castle-bg-convex-nw.png
+share/wesnoth/images/terrain/castle-bg-convex-se.png
+share/wesnoth/images/terrain/castle-bg-convex-sw.png
+share/wesnoth/images/terrain/castle-bg-convex-w.png
+share/wesnoth/images/terrain/castle-fg-concave-e.png
+share/wesnoth/images/terrain/castle-fg-concave-ne.png
+share/wesnoth/images/terrain/castle-fg-concave-nw.png
+share/wesnoth/images/terrain/castle-fg-concave-se.png
+share/wesnoth/images/terrain/castle-fg-concave-sw.png
+share/wesnoth/images/terrain/castle-fg-concave-w.png
+share/wesnoth/images/terrain/castle-fg-convex-e.png
+share/wesnoth/images/terrain/castle-fg-convex-ne.png
+share/wesnoth/images/terrain/castle-fg-convex-nw.png
+share/wesnoth/images/terrain/castle-fg-convex-se.png
+share/wesnoth/images/terrain/castle-fg-convex-sw.png
+share/wesnoth/images/terrain/castle-fg-convex-w.png
 share/wesnoth/images/terrain/castle.png
 share/wesnoth/images/terrain/cave-n-ne-se-s.png
 share/wesnoth/images/terrain/cave-n-ne-se.png
@@ -1043,10 +1010,13 @@ share/wesnoth/images/terrain/hills-n-ne.png
 share/wesnoth/images/terrain/hills-n.png
 share/wesnoth/images/terrain/hills-ne.png
 share/wesnoth/images/terrain/hills-nw.png
-share/wesnoth/images/terrain/hills-s-sw.png
+share/wesnoth/images/terrain/hills-s-se.png
 share/wesnoth/images/terrain/hills-s.png
 share/wesnoth/images/terrain/hills-se.png
 share/wesnoth/images/terrain/hills-sw.png
+share/wesnoth/images/terrain/hills-variation1.png
+share/wesnoth/images/terrain/hills-variation2.png
+share/wesnoth/images/terrain/hills-variation3.png
 share/wesnoth/images/terrain/hills.png
 share/wesnoth/images/terrain/human-village.gif
 share/wesnoth/images/terrain/human-village.png
@@ -1060,78 +1030,54 @@ share/wesnoth/images/terrain/ice-se.png
 share/wesnoth/images/terrain/ice-sw.png
 share/wesnoth/images/terrain/ice.png
 share/wesnoth/images/terrain/icebridge-se-nw.png
-share/wesnoth/images/terrain/keep-inside-e-e.png
-share/wesnoth/images/terrain/keep-inside-e-nw.png
-share/wesnoth/images/terrain/keep-inside-e-sw.png
-share/wesnoth/images/terrain/keep-inside-ne-ne.png
-share/wesnoth/images/terrain/keep-inside-ne-se.png
-share/wesnoth/images/terrain/keep-inside-ne-w.png
-share/wesnoth/images/terrain/keep-inside-nw-e.png
-share/wesnoth/images/terrain/keep-inside-nw-nw.png
-share/wesnoth/images/terrain/keep-inside-nw-sw.png
-share/wesnoth/images/terrain/keep-inside-se-ne.png
-share/wesnoth/images/terrain/keep-inside-se-se.png
-share/wesnoth/images/terrain/keep-inside-se-w.png
-share/wesnoth/images/terrain/keep-inside-sw-e.png
-share/wesnoth/images/terrain/keep-inside-sw-nw.png
-share/wesnoth/images/terrain/keep-inside-sw-sw.png
-share/wesnoth/images/terrain/keep-inside-w-ne.png
-share/wesnoth/images/terrain/keep-inside-w-se.png
-share/wesnoth/images/terrain/keep-inside-w-w.png
-share/wesnoth/images/terrain/keep-wall-0-e-e.png
-share/wesnoth/images/terrain/keep-wall-0-e-nw.png
-share/wesnoth/images/terrain/keep-wall-0-e-sw.png
-share/wesnoth/images/terrain/keep-wall-0-ne-ne.png
-share/wesnoth/images/terrain/keep-wall-0-ne-se.png
-share/wesnoth/images/terrain/keep-wall-0-ne-w.png
-share/wesnoth/images/terrain/keep-wall-0-nw-e.png
-share/wesnoth/images/terrain/keep-wall-0-nw-nw.png
-share/wesnoth/images/terrain/keep-wall-0-nw-sw.png
-share/wesnoth/images/terrain/keep-wall-0-se-ne.png
-share/wesnoth/images/terrain/keep-wall-0-se-se.png
-share/wesnoth/images/terrain/keep-wall-0-se-w.png
-share/wesnoth/images/terrain/keep-wall-0-sw-e.png
-share/wesnoth/images/terrain/keep-wall-0-sw-nw.png
-share/wesnoth/images/terrain/keep-wall-0-sw-sw.png
-share/wesnoth/images/terrain/keep-wall-0-w-ne.png
-share/wesnoth/images/terrain/keep-wall-0-w-se.png
-share/wesnoth/images/terrain/keep-wall-0-w-w.png
-share/wesnoth/images/terrain/keep-wall-1-e-e.png
-share/wesnoth/images/terrain/keep-wall-1-e-nw.png
-share/wesnoth/images/terrain/keep-wall-1-e-sw.png
-share/wesnoth/images/terrain/keep-wall-1-ne-ne.png
-share/wesnoth/images/terrain/keep-wall-1-ne-se.png
-share/wesnoth/images/terrain/keep-wall-1-ne-w.png
-share/wesnoth/images/terrain/keep-wall-1-nw-e.png
-share/wesnoth/images/terrain/keep-wall-1-nw-nw.png
-share/wesnoth/images/terrain/keep-wall-1-nw-sw.png
-share/wesnoth/images/terrain/keep-wall-1-se-ne.png
-share/wesnoth/images/terrain/keep-wall-1-se-se.png
-share/wesnoth/images/terrain/keep-wall-1-se-w.png
-share/wesnoth/images/terrain/keep-wall-1-sw-e.png
-share/wesnoth/images/terrain/keep-wall-1-sw-nw.png
-share/wesnoth/images/terrain/keep-wall-1-sw-sw.png
-share/wesnoth/images/terrain/keep-wall-1-w-ne.png
-share/wesnoth/images/terrain/keep-wall-1-w-se.png
-share/wesnoth/images/terrain/keep-wall-1-w-w.png
-share/wesnoth/images/terrain/keep-wall-e-e.png
-share/wesnoth/images/terrain/keep-wall-e-nw.png
-share/wesnoth/images/terrain/keep-wall-e-sw.png
-share/wesnoth/images/terrain/keep-wall-ne-ne.png
-share/wesnoth/images/terrain/keep-wall-ne-se.png
-share/wesnoth/images/terrain/keep-wall-ne-w.png
-share/wesnoth/images/terrain/keep-wall-nw-e.png
-share/wesnoth/images/terrain/keep-wall-nw-nw.png
-share/wesnoth/images/terrain/keep-wall-nw-sw.png
-share/wesnoth/images/terrain/keep-wall-se-ne.png
-share/wesnoth/images/terrain/keep-wall-se-se.png
-share/wesnoth/images/terrain/keep-wall-se-w.png
-share/wesnoth/images/terrain/keep-wall-sw-e.png
-share/wesnoth/images/terrain/keep-wall-sw-nw.png
-share/wesnoth/images/terrain/keep-wall-sw-sw.png
-share/wesnoth/images/terrain/keep-wall-w-ne.png
-share/wesnoth/images/terrain/keep-wall-w-se.png
-share/wesnoth/images/terrain/keep-wall-w-w.png
+share/wesnoth/images/terrain/keep-bg-inside-e.png
+share/wesnoth/images/terrain/keep-bg-inside-ne.png
+share/wesnoth/images/terrain/keep-bg-inside-nw.png
+share/wesnoth/images/terrain/keep-bg-inside-se.png
+share/wesnoth/images/terrain/keep-bg-inside-sw.png
+share/wesnoth/images/terrain/keep-bg-inside-w.png
+share/wesnoth/images/terrain/keep-bg-wall-0-e.png
+share/wesnoth/images/terrain/keep-bg-wall-0-ne.png
+share/wesnoth/images/terrain/keep-bg-wall-0-nw.png
+share/wesnoth/images/terrain/keep-bg-wall-0-se.png
+share/wesnoth/images/terrain/keep-bg-wall-0-sw.png
+share/wesnoth/images/terrain/keep-bg-wall-0-w.png
+share/wesnoth/images/terrain/keep-bg-wall-1-e.png
+share/wesnoth/images/terrain/keep-bg-wall-1-ne.png
+share/wesnoth/images/terrain/keep-bg-wall-1-nw.png
+share/wesnoth/images/terrain/keep-bg-wall-1-se.png
+share/wesnoth/images/terrain/keep-bg-wall-1-sw.png
+share/wesnoth/images/terrain/keep-bg-wall-1-w.png
+share/wesnoth/images/terrain/keep-bg-wall-e.png
+share/wesnoth/images/terrain/keep-bg-wall-ne.png
+share/wesnoth/images/terrain/keep-bg-wall-nw.png
+share/wesnoth/images/terrain/keep-bg-wall-se.png
+share/wesnoth/images/terrain/keep-bg-wall-sw.png
+share/wesnoth/images/terrain/keep-bg-wall-w.png
+share/wesnoth/images/terrain/keep-fg-inside-e.png
+share/wesnoth/images/terrain/keep-fg-inside-ne.png
+share/wesnoth/images/terrain/keep-fg-inside-nw.png
+share/wesnoth/images/terrain/keep-fg-inside-se.png
+share/wesnoth/images/terrain/keep-fg-inside-sw.png
+share/wesnoth/images/terrain/keep-fg-inside-w.png
+share/wesnoth/images/terrain/keep-fg-wall-0-e.png
+share/wesnoth/images/terrain/keep-fg-wall-0-ne.png
+share/wesnoth/images/terrain/keep-fg-wall-0-nw.png
+share/wesnoth/images/terrain/keep-fg-wall-0-se.png
+share/wesnoth/images/terrain/keep-fg-wall-0-sw.png
+share/wesnoth/images/terrain/keep-fg-wall-0-w.png
+share/wesnoth/images/terrain/keep-fg-wall-1-e.png
+share/wesnoth/images/terrain/keep-fg-wall-1-ne.png
+share/wesnoth/images/terrain/keep-fg-wall-1-nw.png
+share/wesnoth/images/terrain/keep-fg-wall-1-se.png
+share/wesnoth/images/terrain/keep-fg-wall-1-sw.png
+share/wesnoth/images/terrain/keep-fg-wall-1-w.png
+share/wesnoth/images/terrain/keep-fg-wall-e.png
+share/wesnoth/images/terrain/keep-fg-wall-ne.png
+share/wesnoth/images/terrain/keep-fg-wall-nw.png
+share/wesnoth/images/terrain/keep-fg-wall-se.png
+share/wesnoth/images/terrain/keep-fg-wall-sw.png
+share/wesnoth/images/terrain/keep-fg-wall-w.png
 share/wesnoth/images/terrain/keep.png
 share/wesnoth/images/terrain/lava.png
 share/wesnoth/images/terrain/mask.png
@@ -1234,6 +1180,10 @@ share/wesnoth/images/undead-bat.png
 share/wesnoth/images/undead-blackspell.png
 share/wesnoth/images/undead-bloodbat-defend.png
 share/wesnoth/images/undead-bloodbat.png
+share/wesnoth/images/undead-boneshooter-attack.png
+share/wesnoth/images/undead-boneshooter-attack1.png
+share/wesnoth/images/undead-boneshooter-attack2.png
+share/wesnoth/images/undead-boneshooter-defend.png
 share/wesnoth/images/undead-boneshooter.png
 share/wesnoth/images/undead-chocobone.png
 share/wesnoth/images/undead-darkspirit-attack.png
@@ -1248,6 +1198,10 @@ share/wesnoth/images/undead-ghost.png
 share/wesnoth/images/undead-ghoul-attack.png
 share/wesnoth/images/undead-ghoul-defend.png
 share/wesnoth/images/undead-ghoul.png
+share/wesnoth/images/undead-initiate-attack1.png
+share/wesnoth/images/undead-initiate-attack2.png
+share/wesnoth/images/undead-initiate-defend.png
+share/wesnoth/images/undead-initiate.png
 share/wesnoth/images/undead-lich-defend.png
 share/wesnoth/images/undead-lich-melee.png
 share/wesnoth/images/undead-lich-ranged1.png
@@ -1257,6 +1211,9 @@ share/wesnoth/images/undead-necromancer-attack.png
 share/wesnoth/images/undead-necromancer-attack2.png
 share/wesnoth/images/undead-necromancer-defend.png
 share/wesnoth/images/undead-necromancer.png
+share/wesnoth/images/undead-necrophage-attack.png
+share/wesnoth/images/undead-necrophage-defend.png
+share/wesnoth/images/undead-necrophage.png
 share/wesnoth/images/undead-nightgaunt-attack.png
 share/wesnoth/images/undead-nightgaunt-attack2.png
 share/wesnoth/images/undead-nightgaunt-defend.png