Update to 0.8.11.

8 files changed, 268 insertions, 210 deletions

diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index b872566f35d5..81ecd959b01e 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	0.8.10
-PORTREVISION=	1
+PORTVERSION=	0.8.11
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.wesnoth.org/files/
diff --git a/games/wesnoth-devel/distinfo b/games/wesnoth-devel/distinfo
index bae41976f2f8..74e08a0bc5bc 100644
--- a/games/wesnoth-devel/distinfo
+++ b/games/wesnoth-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (wesnoth-0.8.10.tar.gz) = 0fbda4c35f0a6cf9f18df453a7f83f7c
-SIZE (wesnoth-0.8.10.tar.gz) = 36687797
-MD5 (wesnoth-lite-0.8.10.tar.gz) = cb1ee68e19958a0a38e9a5a0af31161a
-SIZE (wesnoth-lite-0.8.10.tar.gz) = 20886365
+MD5 (wesnoth-0.8.11.tar.gz) = 929c65818cc2fb47227929f253fb1f8c
+SIZE (wesnoth-0.8.11.tar.gz) = 33034379
+MD5 (wesnoth-lite-0.8.11.tar.gz) = fc6691a607fc99b8771fe462e7547ac0
+SIZE (wesnoth-lite-0.8.11.tar.gz) = 17239199
diff --git a/games/wesnoth-devel/files/patch-src::game.cpp b/games/wesnoth-devel/files/patch-src::game.cpp
deleted file mode 100644
index d9ef6b95584f..000000000000
--- a/games/wesnoth-devel/files/patch-src::game.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/game.cpp.orig	Mon Feb  7 20:32:47 2005
-+++ src/game.cpp	Mon Feb  7 20:32:56 2005
-@@ -1,4 +1,4 @@
--/* $Id: game.cpp,v 1.188 2005/02/06 10:40:12 isaaccp Exp $ */
-+/* $Id: game.cpp,v 1.189 2005/02/06 21:31:27 silene Exp $ */
- /*
-    Copyright (C) 2003 by David White <davidnwhite@optusnet.com.au>
-    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
-@@ -1514,7 +1514,8 @@
- 	// initialized to have get_intl_dir() to work.  Note: this
- 	// setlocale() but this does not take GUI language setting
- 	// into account.
--	setlocale (LC_ALL, "");
-+	setlocale(LC_ALL, "C");
-+	setlocale(LC_MESSAGES, "");
- 	const std::string& intl_dir = get_intl_dir();
- 	bindtextdomain (PACKAGE, intl_dir.c_str());
- 	bind_textdomain_codeset (PACKAGE, "UTF-8");
diff --git a/games/wesnoth-devel/pkg-plist b/games/wesnoth-devel/pkg-plist
index cc257fd1e1c4..014230e0faab 100644
--- a/games/wesnoth-devel/pkg-plist
+++ b/games/wesnoth-devel/pkg-plist
@@ -53,6 +53,14 @@ share/locale/el_GR/LC_MESSAGES/wesnoth-sotbe.mo
 share/locale/el_GR/LC_MESSAGES/wesnoth-tdh.mo
 share/locale/el_GR/LC_MESSAGES/wesnoth-trow.mo
 share/locale/el_GR/LC_MESSAGES/wesnoth.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-editor.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-ei.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-httt.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-lib.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-sotbe.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-tdh.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-trow.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth.mo
 share/locale/es/LC_MESSAGES/wesnoth-editor.mo
 share/locale/es/LC_MESSAGES/wesnoth-ei.mo
 share/locale/es/LC_MESSAGES/wesnoth-httt.mo
@@ -326,7 +334,6 @@ share/wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg
-share/wesnoth/data/scenarios/Heir_To_The_Throne/High_King_at_Sea.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg
@@ -677,15 +684,19 @@ share/wesnoth/data/utils.cfg
 share/wesnoth/fonts/Bepa-Roman.ttf
 share/wesnoth/fonts/FreeSans.ttf
 share/wesnoth/fonts/Vera.ttf
-share/wesnoth/images/arch-mage+female-attack.png
-share/wesnoth/images/arch-mage+female-attack1.png
-share/wesnoth/images/arch-mage+female-attack2.png
 share/wesnoth/images/arch-mage+female-defend.png
+share/wesnoth/images/arch-mage+female-fireball-1.png
+share/wesnoth/images/arch-mage+female-fireball-2.png
+share/wesnoth/images/arch-mage+female-fireball-3.png
+share/wesnoth/images/arch-mage+female-staff-1.png
+share/wesnoth/images/arch-mage+female-staff-2.png
 share/wesnoth/images/arch-mage+female.png
-share/wesnoth/images/arch-mage-attack.png
-share/wesnoth/images/arch-mage-attack1.png
-share/wesnoth/images/arch-mage-attack2.png
 share/wesnoth/images/arch-mage-defend.png
+share/wesnoth/images/arch-mage-fireball-1.png
+share/wesnoth/images/arch-mage-fireball-2.png
+share/wesnoth/images/arch-mage-fireball-3.png
+share/wesnoth/images/arch-mage-staff-1.png
+share/wesnoth/images/arch-mage-staff-2.png
 share/wesnoth/images/arch-mage.png
 share/wesnoth/images/assassin+female-attack.png
 share/wesnoth/images/assassin+female-attack2.png
@@ -700,6 +711,7 @@ share/wesnoth/images/assassin-throwknife1.png
 share/wesnoth/images/assassin-throwknife2.png
 share/wesnoth/images/assassin.png
 share/wesnoth/images/attacks/axe.png
+share/wesnoth/images/attacks/ballista.png
 share/wesnoth/images/attacks/baneblade.png
 share/wesnoth/images/attacks/battleaxe.png
 share/wesnoth/images/attacks/beak.png
@@ -745,6 +757,7 @@ share/wesnoth/images/attacks/pistol.png
 share/wesnoth/images/attacks/pitchfork.png
 share/wesnoth/images/attacks/rapier.png
 share/wesnoth/images/attacks/short-sword.png
+share/wesnoth/images/attacks/slam.png
 share/wesnoth/images/attacks/sling.png
 share/wesnoth/images/attacks/spear.png
 share/wesnoth/images/attacks/staff.png
@@ -867,17 +880,12 @@ share/wesnoth/images/drake-fighter-defend.png
 share/wesnoth/images/drake-fighter-flying.png
 share/wesnoth/images/drake-fighter.png
 share/wesnoth/images/drake-fire-attack-close.png
-share/wesnoth/images/drake-fire-attack-close1.png
-share/wesnoth/images/drake-fire-attack-close2.png
 share/wesnoth/images/drake-fire-attack-ranged.png
 share/wesnoth/images/drake-fire-defend.png
 share/wesnoth/images/drake-fire-flying.png
 share/wesnoth/images/drake-fire.png
-share/wesnoth/images/drake-flameheart-attack-close0.png
 share/wesnoth/images/drake-flameheart-attack-close1.png
 share/wesnoth/images/drake-flameheart-attack-close2.png
-share/wesnoth/images/drake-flameheart-attack-close3.png
-share/wesnoth/images/drake-flameheart-attack-close4.png
 share/wesnoth/images/drake-flameheart-attack-ranged.png
 share/wesnoth/images/drake-flameheart-defend.png
 share/wesnoth/images/drake-flameheart-flying.png
@@ -1258,15 +1266,19 @@ share/wesnoth/images/grand-knight-attack-sword.png
 share/wesnoth/images/grand-knight-defend.png
 share/wesnoth/images/grand-knight-moving.png
 share/wesnoth/images/grand-knight.png
-share/wesnoth/images/great-mage+female-attack.png
-share/wesnoth/images/great-mage+female-attack1.png
-share/wesnoth/images/great-mage+female-attack2.png
 share/wesnoth/images/great-mage+female-defend.png
+share/wesnoth/images/great-mage+female-fireball-1.png
+share/wesnoth/images/great-mage+female-fireball-2.png
+share/wesnoth/images/great-mage+female-fireball-3.png
+share/wesnoth/images/great-mage+female-staff-1.png
+share/wesnoth/images/great-mage+female-staff-2.png
 share/wesnoth/images/great-mage+female.png
-share/wesnoth/images/great-mage-attack.png
-share/wesnoth/images/great-mage-attack1.png
-share/wesnoth/images/great-mage-attack2.png
 share/wesnoth/images/great-mage-defend.png
+share/wesnoth/images/great-mage-fireball-1.png
+share/wesnoth/images/great-mage-fireball-2.png
+share/wesnoth/images/great-mage-fireball-3.png
+share/wesnoth/images/great-mage-staff-1.png
+share/wesnoth/images/great-mage-staff-2.png
 share/wesnoth/images/great-mage.png
 share/wesnoth/images/great-troll-attack.png
 share/wesnoth/images/great-troll-defend.png
@@ -1292,26 +1304,28 @@ share/wesnoth/images/halo/elder-mage-halo3.png
 share/wesnoth/images/halo/elder-mage-halo4.png
 share/wesnoth/images/halo/elder-mage-halo5.png
 share/wesnoth/images/halo/elder-mage-halo6.png
-share/wesnoth/images/halo/fireball-big1.png
-share/wesnoth/images/halo/fireball-big2.png
-share/wesnoth/images/halo/fireball-big3.png
-share/wesnoth/images/halo/fireball-big4.png
-share/wesnoth/images/halo/fireball-big5.png
-share/wesnoth/images/halo/fireball-big6.png
-share/wesnoth/images/halo/fireball-big7.png
-share/wesnoth/images/halo/fireball-halo.png
+share/wesnoth/images/halo/fireball-big-halo1.png
+share/wesnoth/images/halo/fireball-big-halo2.png
+share/wesnoth/images/halo/fireball-big-halo3.png
+share/wesnoth/images/halo/fireball-big-halo4.png
+share/wesnoth/images/halo/fireball-big-halo5.png
+share/wesnoth/images/halo/fireball-big-halo6.png
+share/wesnoth/images/halo/fireball-big-halo7.png
+share/wesnoth/images/halo/fireball-big-halo8.png
 share/wesnoth/images/halo/fireball-halo1.png
 share/wesnoth/images/halo/fireball-halo2.png
 share/wesnoth/images/halo/fireball-halo3.png
 share/wesnoth/images/halo/fireball-halo4.png
+share/wesnoth/images/halo/fireball-halo5.png
+share/wesnoth/images/halo/fireball-halo6.png
 share/wesnoth/images/halo/fireball-halo7.png
-share/wesnoth/images/halo/fireball1.png
-share/wesnoth/images/halo/fireball2.png
-share/wesnoth/images/halo/fireball3.png
-share/wesnoth/images/halo/fireball4.png
-share/wesnoth/images/halo/fireball5.png
-share/wesnoth/images/halo/fireball6.png
-share/wesnoth/images/halo/fireball7.png
+share/wesnoth/images/halo/fireball-halo8.png
+share/wesnoth/images/halo/fireball-preparation-1.png
+share/wesnoth/images/halo/fireball-preparation-2.png
+share/wesnoth/images/halo/fireball-preparation-3.png
+share/wesnoth/images/halo/fireball-preparation-4.png
+share/wesnoth/images/halo/fireball-preparation-5.png
+share/wesnoth/images/halo/fireball-preparation-6.png
 share/wesnoth/images/halo/ice-halo1.png
 share/wesnoth/images/halo/ice-halo2.png
 share/wesnoth/images/halo/ice-halo3.png
@@ -1319,32 +1333,28 @@ share/wesnoth/images/halo/ice-halo4.png
 share/wesnoth/images/halo/ice-halo5.png
 share/wesnoth/images/halo/lighthouse-aura.png
 share/wesnoth/images/halo/mage-halo1.png
-share/wesnoth/images/halo/mage-halo10.png
-share/wesnoth/images/halo/mage-halo11.png
-share/wesnoth/images/halo/mage-halo12.png
-share/wesnoth/images/halo/mage-halo13.png
+share/wesnoth/images/halo/mage-halo2-big.png
 share/wesnoth/images/halo/mage-halo2.png
+share/wesnoth/images/halo/mage-halo3-big.png
 share/wesnoth/images/halo/mage-halo3.png
+share/wesnoth/images/halo/mage-halo4-big.png
 share/wesnoth/images/halo/mage-halo4.png
+share/wesnoth/images/halo/mage-halo5-big.png
 share/wesnoth/images/halo/mage-halo5.png
-share/wesnoth/images/halo/mage-halo6.png
-share/wesnoth/images/halo/mage-halo7.png
-share/wesnoth/images/halo/mage-halo8.png
-share/wesnoth/images/halo/mage-halo9.png
+share/wesnoth/images/halo/mage-halo6-big.png
+share/wesnoth/images/halo/mage-preparation-halo1.png
+share/wesnoth/images/halo/mage-preparation-halo2.png
+share/wesnoth/images/halo/mage-preparation-halo3.png
+share/wesnoth/images/halo/mage-preparation-halo4.png
+share/wesnoth/images/halo/mage-preparation-halo5.png
+share/wesnoth/images/halo/mage-preparation-halo6.png
+share/wesnoth/images/halo/mage-preparation-halo7.png
 share/wesnoth/images/halo/mermaid-siren-naia-touch-halo.png
-share/wesnoth/images/halo/silver-mage-halo1.png
-share/wesnoth/images/halo/silver-mage-halo10.png
-share/wesnoth/images/halo/silver-mage-halo11.png
-share/wesnoth/images/halo/silver-mage-halo12.png
-share/wesnoth/images/halo/silver-mage-halo2.png
-share/wesnoth/images/halo/silver-mage-halo3.png
-share/wesnoth/images/halo/silver-mage-halo4.png
-share/wesnoth/images/halo/silver-mage-halo5.png
-share/wesnoth/images/halo/silver-mage-halo6.png
-share/wesnoth/images/halo/silver-mage-halo7.png
-share/wesnoth/images/halo/silver-mage-halo8.png
-share/wesnoth/images/halo/silver-mage-halo9.png
 share/wesnoth/images/halo/white-cleric-aura.png
+share/wesnoth/images/halo/white-mage-halo1.png
+share/wesnoth/images/halo/white-mage-halo2.png
+share/wesnoth/images/halo/white-mage-halo3.png
+share/wesnoth/images/halo/white-mage-halo4.png
 share/wesnoth/images/help/closed_section.png
 share/wesnoth/images/help/open_section.png
 share/wesnoth/images/help/recruit.png
@@ -1539,16 +1549,16 @@ share/wesnoth/images/konrad-young.png
 share/wesnoth/images/lancer-attack.png
 share/wesnoth/images/lancer-defend.png
 share/wesnoth/images/lancer.png
-share/wesnoth/images/mage+female-attack.png
-share/wesnoth/images/mage+female-attack1.png
-share/wesnoth/images/mage+female-attack2.png
-share/wesnoth/images/mage+female-attack3.png
+share/wesnoth/images/mage+female-attack-magic1.png
+share/wesnoth/images/mage+female-attack-magic2.png
+share/wesnoth/images/mage+female-attack-staff-1.png
+share/wesnoth/images/mage+female-attack-staff-2.png
 share/wesnoth/images/mage+female-defend.png
 share/wesnoth/images/mage+female.png
-share/wesnoth/images/mage-attack.png
-share/wesnoth/images/mage-attack1.png
-share/wesnoth/images/mage-attack2.png
-share/wesnoth/images/mage-attack3.png
+share/wesnoth/images/mage-attack-magic1.png
+share/wesnoth/images/mage-attack-magic2.png
+share/wesnoth/images/mage-attack-staff1.png
+share/wesnoth/images/mage-attack-staff2.png
 share/wesnoth/images/mage-defend.png
 share/wesnoth/images/mage.png
 share/wesnoth/images/maps/wesnoth.png
@@ -1961,6 +1971,12 @@ share/wesnoth/images/projectiles/dagger-ne.png
 share/wesnoth/images/projectiles/darkmissile-n.png
 share/wesnoth/images/projectiles/darkmissile-ne.png
 share/wesnoth/images/projectiles/entangle.png
+share/wesnoth/images/projectiles/fireball-big-n.png
+share/wesnoth/images/projectiles/fireball-big-nw.png
+share/wesnoth/images/projectiles/fireball-huge-n.png
+share/wesnoth/images/projectiles/fireball-huge-nw.png
+share/wesnoth/images/projectiles/fireball-n.png
+share/wesnoth/images/projectiles/fireball-nw.png
 share/wesnoth/images/projectiles/fireball.png
 share/wesnoth/images/projectiles/gaze.png
 share/wesnoth/images/projectiles/hatchet-n.png
@@ -1992,13 +2008,19 @@ share/wesnoth/images/projectiles/web.png
 share/wesnoth/images/projectiles/whitemissile-n.png
 share/wesnoth/images/projectiles/whitemissile-ne.png
 share/wesnoth/images/random-enemy.png
-share/wesnoth/images/red-mage+female-attack-melee.png
-share/wesnoth/images/red-mage+female-attack-ranged.png
+share/wesnoth/images/red-mage+female-attack-staff1.png
+share/wesnoth/images/red-mage+female-attack-staff2.png
 share/wesnoth/images/red-mage+female-defend.png
+share/wesnoth/images/red-mage+female-fireball-1.png
+share/wesnoth/images/red-mage+female-fireball-2.png
+share/wesnoth/images/red-mage+female-fireball-3.png
 share/wesnoth/images/red-mage+female.png
-share/wesnoth/images/red-mage-attack-melee.png
-share/wesnoth/images/red-mage-attack-ranged.png
+share/wesnoth/images/red-mage-attack-staff1.png
+share/wesnoth/images/red-mage-attack-staff2.png
 share/wesnoth/images/red-mage-defend.png
+share/wesnoth/images/red-mage-fireball-1.png
+share/wesnoth/images/red-mage-fireball-2.png
+share/wesnoth/images/red-mage-fireball-3.png
 share/wesnoth/images/red-mage.png
 share/wesnoth/images/rogue+female-attack.png
 share/wesnoth/images/rogue+female-defend.png
@@ -2059,17 +2081,23 @@ share/wesnoth/images/sea-orc.png
 share/wesnoth/images/seaserpent-attack.png
 share/wesnoth/images/seaserpent-defend.png
 share/wesnoth/images/seaserpent.png
-share/wesnoth/images/silver-mage+female-attack1.png
-share/wesnoth/images/silver-mage+female-attack2.png
-share/wesnoth/images/silver-mage+female-attack3.png
+share/wesnoth/images/silver-mage+female-attack-magic1.png
+share/wesnoth/images/silver-mage+female-attack-melee.png
 share/wesnoth/images/silver-mage+female-defend.png
-share/wesnoth/images/silver-mage+female-melee.png
+share/wesnoth/images/silver-mage+female-teleport1.png
+share/wesnoth/images/silver-mage+female-teleport10.png
+share/wesnoth/images/silver-mage+female-teleport2.png
+share/wesnoth/images/silver-mage+female-teleport3.png
+share/wesnoth/images/silver-mage+female-teleport4.png
+share/wesnoth/images/silver-mage+female-teleport5.png
+share/wesnoth/images/silver-mage+female-teleport6.png
+share/wesnoth/images/silver-mage+female-teleport7.png
+share/wesnoth/images/silver-mage+female-teleport8.png
+share/wesnoth/images/silver-mage+female-teleport9.png
 share/wesnoth/images/silver-mage+female.png
-share/wesnoth/images/silver-mage-attack1.png
-share/wesnoth/images/silver-mage-attack2.png
-share/wesnoth/images/silver-mage-attack3.png
+share/wesnoth/images/silver-mage-attack-magic1.png
+share/wesnoth/images/silver-mage-attack-melee.png
 share/wesnoth/images/silver-mage-defend.png
-share/wesnoth/images/silver-mage-melee.png
 share/wesnoth/images/silver-mage-teleport1.png
 share/wesnoth/images/silver-mage-teleport10.png
 share/wesnoth/images/silver-mage-teleport2.png
@@ -2927,21 +2955,41 @@ share/wesnoth/images/warrior-king-defend.png
 share/wesnoth/images/warrior-king-leading.png
 share/wesnoth/images/warrior-king.png
 share/wesnoth/images/wesnoth-icon.png
-share/wesnoth/images/white-cleric+female-attack.png
-share/wesnoth/images/white-cleric+female-attack1.png
+share/wesnoth/images/white-cleric+female-attack-melee.png
 share/wesnoth/images/white-cleric+female-defend.png
+share/wesnoth/images/white-cleric+female-magic1.png
+share/wesnoth/images/white-cleric+female-magic2.png
+share/wesnoth/images/white-cleric+female-magic3.png
+share/wesnoth/images/white-cleric+female-magic4.png
+share/wesnoth/images/white-cleric+female-magic5.png
+share/wesnoth/images/white-cleric+female-magic6.png
 share/wesnoth/images/white-cleric+female.png
-share/wesnoth/images/white-cleric-attack.png
-share/wesnoth/images/white-cleric-attack1.png
+share/wesnoth/images/white-cleric-attack-melee.png
 share/wesnoth/images/white-cleric-defend.png
+share/wesnoth/images/white-cleric-magic1.png
+share/wesnoth/images/white-cleric-magic2.png
+share/wesnoth/images/white-cleric-magic3.png
+share/wesnoth/images/white-cleric-magic4.png
+share/wesnoth/images/white-cleric-magic5.png
+share/wesnoth/images/white-cleric-magic6.png
 share/wesnoth/images/white-cleric.png
-share/wesnoth/images/white-mage+female-attack.png
-share/wesnoth/images/white-mage+female-attack1.png
+share/wesnoth/images/white-mage+female-attack-melee.png
 share/wesnoth/images/white-mage+female-defend.png
+share/wesnoth/images/white-mage+female-magic1.png
+share/wesnoth/images/white-mage+female-magic2.png
+share/wesnoth/images/white-mage+female-magic3.png
+share/wesnoth/images/white-mage+female-magic4.png
+share/wesnoth/images/white-mage+female-magic5.png
+share/wesnoth/images/white-mage+female-magic6.png
 share/wesnoth/images/white-mage+female.png
-share/wesnoth/images/white-mage-attack.png
-share/wesnoth/images/white-mage-attack1.png
+share/wesnoth/images/white-mage-attack-melee.png
 share/wesnoth/images/white-mage-defend.png
+share/wesnoth/images/white-mage-magic1.png
+share/wesnoth/images/white-mage-magic2.png
+share/wesnoth/images/white-mage-magic3.png
+share/wesnoth/images/white-mage-magic4.png
+share/wesnoth/images/white-mage-magic5.png
+share/wesnoth/images/white-mage-magic6.png
 share/wesnoth/images/white-mage.png
 share/wesnoth/images/wolf-rider-attack.png
 share/wesnoth/images/wolf-rider-defend.png
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index b872566f35d5..81ecd959b01e 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	0.8.10
-PORTREVISION=	1
+PORTVERSION=	0.8.11
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.wesnoth.org/files/
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index bae41976f2f8..74e08a0bc5bc 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,4 +1,4 @@
-MD5 (wesnoth-0.8.10.tar.gz) = 0fbda4c35f0a6cf9f18df453a7f83f7c
-SIZE (wesnoth-0.8.10.tar.gz) = 36687797
-MD5 (wesnoth-lite-0.8.10.tar.gz) = cb1ee68e19958a0a38e9a5a0af31161a
-SIZE (wesnoth-lite-0.8.10.tar.gz) = 20886365
+MD5 (wesnoth-0.8.11.tar.gz) = 929c65818cc2fb47227929f253fb1f8c
+SIZE (wesnoth-0.8.11.tar.gz) = 33034379
+MD5 (wesnoth-lite-0.8.11.tar.gz) = fc6691a607fc99b8771fe462e7547ac0
+SIZE (wesnoth-lite-0.8.11.tar.gz) = 17239199
diff --git a/games/wesnoth/files/patch-src::game.cpp b/games/wesnoth/files/patch-src::game.cpp
deleted file mode 100644
index d9ef6b95584f..000000000000
--- a/games/wesnoth/files/patch-src::game.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/game.cpp.orig	Mon Feb  7 20:32:47 2005
-+++ src/game.cpp	Mon Feb  7 20:32:56 2005
-@@ -1,4 +1,4 @@
--/* $Id: game.cpp,v 1.188 2005/02/06 10:40:12 isaaccp Exp $ */
-+/* $Id: game.cpp,v 1.189 2005/02/06 21:31:27 silene Exp $ */
- /*
-    Copyright (C) 2003 by David White <davidnwhite@optusnet.com.au>
-    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
-@@ -1514,7 +1514,8 @@
- 	// initialized to have get_intl_dir() to work.  Note: this
- 	// setlocale() but this does not take GUI language setting
- 	// into account.
--	setlocale (LC_ALL, "");
-+	setlocale(LC_ALL, "C");
-+	setlocale(LC_MESSAGES, "");
- 	const std::string& intl_dir = get_intl_dir();
- 	bindtextdomain (PACKAGE, intl_dir.c_str());
- 	bind_textdomain_codeset (PACKAGE, "UTF-8");
diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist
index cc257fd1e1c4..014230e0faab 100644
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist
@@ -53,6 +53,14 @@ share/locale/el_GR/LC_MESSAGES/wesnoth-sotbe.mo
 share/locale/el_GR/LC_MESSAGES/wesnoth-tdh.mo
 share/locale/el_GR/LC_MESSAGES/wesnoth-trow.mo
 share/locale/el_GR/LC_MESSAGES/wesnoth.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-editor.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-ei.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-httt.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-lib.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-sotbe.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-tdh.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth-trow.mo
+share/locale/en_GB/LC_MESSAGES/wesnoth.mo
 share/locale/es/LC_MESSAGES/wesnoth-editor.mo
 share/locale/es/LC_MESSAGES/wesnoth-ei.mo
 share/locale/es/LC_MESSAGES/wesnoth-httt.mo
@@ -326,7 +334,6 @@ share/wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg
-share/wesnoth/data/scenarios/Heir_To_The_Throne/High_King_at_Sea.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg
@@ -677,15 +684,19 @@ share/wesnoth/data/utils.cfg
 share/wesnoth/fonts/Bepa-Roman.ttf
 share/wesnoth/fonts/FreeSans.ttf
 share/wesnoth/fonts/Vera.ttf
-share/wesnoth/images/arch-mage+female-attack.png
-share/wesnoth/images/arch-mage+female-attack1.png
-share/wesnoth/images/arch-mage+female-attack2.png
 share/wesnoth/images/arch-mage+female-defend.png
+share/wesnoth/images/arch-mage+female-fireball-1.png
+share/wesnoth/images/arch-mage+female-fireball-2.png
+share/wesnoth/images/arch-mage+female-fireball-3.png
+share/wesnoth/images/arch-mage+female-staff-1.png
+share/wesnoth/images/arch-mage+female-staff-2.png
 share/wesnoth/images/arch-mage+female.png
-share/wesnoth/images/arch-mage-attack.png
-share/wesnoth/images/arch-mage-attack1.png
-share/wesnoth/images/arch-mage-attack2.png
 share/wesnoth/images/arch-mage-defend.png
+share/wesnoth/images/arch-mage-fireball-1.png
+share/wesnoth/images/arch-mage-fireball-2.png
+share/wesnoth/images/arch-mage-fireball-3.png
+share/wesnoth/images/arch-mage-staff-1.png
+share/wesnoth/images/arch-mage-staff-2.png
 share/wesnoth/images/arch-mage.png
 share/wesnoth/images/assassin+female-attack.png
 share/wesnoth/images/assassin+female-attack2.png
@@ -700,6 +711,7 @@ share/wesnoth/images/assassin-throwknife1.png
 share/wesnoth/images/assassin-throwknife2.png
 share/wesnoth/images/assassin.png
 share/wesnoth/images/attacks/axe.png
+share/wesnoth/images/attacks/ballista.png
 share/wesnoth/images/attacks/baneblade.png
 share/wesnoth/images/attacks/battleaxe.png
 share/wesnoth/images/attacks/beak.png
@@ -745,6 +757,7 @@ share/wesnoth/images/attacks/pistol.png
 share/wesnoth/images/attacks/pitchfork.png
 share/wesnoth/images/attacks/rapier.png
 share/wesnoth/images/attacks/short-sword.png
+share/wesnoth/images/attacks/slam.png
 share/wesnoth/images/attacks/sling.png
 share/wesnoth/images/attacks/spear.png
 share/wesnoth/images/attacks/staff.png
@@ -867,17 +880,12 @@ share/wesnoth/images/drake-fighter-defend.png
 share/wesnoth/images/drake-fighter-flying.png
 share/wesnoth/images/drake-fighter.png
 share/wesnoth/images/drake-fire-attack-close.png
-share/wesnoth/images/drake-fire-attack-close1.png
-share/wesnoth/images/drake-fire-attack-close2.png
 share/wesnoth/images/drake-fire-attack-ranged.png
 share/wesnoth/images/drake-fire-defend.png
 share/wesnoth/images/drake-fire-flying.png
 share/wesnoth/images/drake-fire.png
-share/wesnoth/images/drake-flameheart-attack-close0.png
 share/wesnoth/images/drake-flameheart-attack-close1.png
 share/wesnoth/images/drake-flameheart-attack-close2.png
-share/wesnoth/images/drake-flameheart-attack-close3.png
-share/wesnoth/images/drake-flameheart-attack-close4.png
 share/wesnoth/images/drake-flameheart-attack-ranged.png
 share/wesnoth/images/drake-flameheart-defend.png
 share/wesnoth/images/drake-flameheart-flying.png
@@ -1258,15 +1266,19 @@ share/wesnoth/images/grand-knight-attack-sword.png
 share/wesnoth/images/grand-knight-defend.png
 share/wesnoth/images/grand-knight-moving.png
 share/wesnoth/images/grand-knight.png
-share/wesnoth/images/great-mage+female-attack.png
-share/wesnoth/images/great-mage+female-attack1.png
-share/wesnoth/images/great-mage+female-attack2.png
 share/wesnoth/images/great-mage+female-defend.png
+share/wesnoth/images/great-mage+female-fireball-1.png
+share/wesnoth/images/great-mage+female-fireball-2.png
+share/wesnoth/images/great-mage+female-fireball-3.png
+share/wesnoth/images/great-mage+female-staff-1.png
+share/wesnoth/images/great-mage+female-staff-2.png
 share/wesnoth/images/great-mage+female.png
-share/wesnoth/images/great-mage-attack.png
-share/wesnoth/images/great-mage-attack1.png
-share/wesnoth/images/great-mage-attack2.png
 share/wesnoth/images/great-mage-defend.png
+share/wesnoth/images/great-mage-fireball-1.png
+share/wesnoth/images/great-mage-fireball-2.png
+share/wesnoth/images/great-mage-fireball-3.png
+share/wesnoth/images/great-mage-staff-1.png
+share/wesnoth/images/great-mage-staff-2.png
 share/wesnoth/images/great-mage.png
 share/wesnoth/images/great-troll-attack.png
 share/wesnoth/images/great-troll-defend.png
@@ -1292,26 +1304,28 @@ share/wesnoth/images/halo/elder-mage-halo3.png
 share/wesnoth/images/halo/elder-mage-halo4.png
 share/wesnoth/images/halo/elder-mage-halo5.png
 share/wesnoth/images/halo/elder-mage-halo6.png
-share/wesnoth/images/halo/fireball-big1.png
-share/wesnoth/images/halo/fireball-big2.png
-share/wesnoth/images/halo/fireball-big3.png
-share/wesnoth/images/halo/fireball-big4.png
-share/wesnoth/images/halo/fireball-big5.png
-share/wesnoth/images/halo/fireball-big6.png
-share/wesnoth/images/halo/fireball-big7.png
-share/wesnoth/images/halo/fireball-halo.png
+share/wesnoth/images/halo/fireball-big-halo1.png
+share/wesnoth/images/halo/fireball-big-halo2.png
+share/wesnoth/images/halo/fireball-big-halo3.png
+share/wesnoth/images/halo/fireball-big-halo4.png
+share/wesnoth/images/halo/fireball-big-halo5.png
+share/wesnoth/images/halo/fireball-big-halo6.png
+share/wesnoth/images/halo/fireball-big-halo7.png
+share/wesnoth/images/halo/fireball-big-halo8.png
 share/wesnoth/images/halo/fireball-halo1.png
 share/wesnoth/images/halo/fireball-halo2.png
 share/wesnoth/images/halo/fireball-halo3.png
 share/wesnoth/images/halo/fireball-halo4.png
+share/wesnoth/images/halo/fireball-halo5.png
+share/wesnoth/images/halo/fireball-halo6.png
 share/wesnoth/images/halo/fireball-halo7.png
-share/wesnoth/images/halo/fireball1.png
-share/wesnoth/images/halo/fireball2.png
-share/wesnoth/images/halo/fireball3.png
-share/wesnoth/images/halo/fireball4.png
-share/wesnoth/images/halo/fireball5.png
-share/wesnoth/images/halo/fireball6.png
-share/wesnoth/images/halo/fireball7.png
+share/wesnoth/images/halo/fireball-halo8.png
+share/wesnoth/images/halo/fireball-preparation-1.png
+share/wesnoth/images/halo/fireball-preparation-2.png
+share/wesnoth/images/halo/fireball-preparation-3.png
+share/wesnoth/images/halo/fireball-preparation-4.png
+share/wesnoth/images/halo/fireball-preparation-5.png
+share/wesnoth/images/halo/fireball-preparation-6.png
 share/wesnoth/images/halo/ice-halo1.png
 share/wesnoth/images/halo/ice-halo2.png
 share/wesnoth/images/halo/ice-halo3.png
@@ -1319,32 +1333,28 @@ share/wesnoth/images/halo/ice-halo4.png
 share/wesnoth/images/halo/ice-halo5.png
 share/wesnoth/images/halo/lighthouse-aura.png
 share/wesnoth/images/halo/mage-halo1.png
-share/wesnoth/images/halo/mage-halo10.png
-share/wesnoth/images/halo/mage-halo11.png
-share/wesnoth/images/halo/mage-halo12.png
-share/wesnoth/images/halo/mage-halo13.png
+share/wesnoth/images/halo/mage-halo2-big.png
 share/wesnoth/images/halo/mage-halo2.png
+share/wesnoth/images/halo/mage-halo3-big.png
 share/wesnoth/images/halo/mage-halo3.png
+share/wesnoth/images/halo/mage-halo4-big.png
 share/wesnoth/images/halo/mage-halo4.png
+share/wesnoth/images/halo/mage-halo5-big.png
 share/wesnoth/images/halo/mage-halo5.png
-share/wesnoth/images/halo/mage-halo6.png
-share/wesnoth/images/halo/mage-halo7.png
-share/wesnoth/images/halo/mage-halo8.png
-share/wesnoth/images/halo/mage-halo9.png
+share/wesnoth/images/halo/mage-halo6-big.png
+share/wesnoth/images/halo/mage-preparation-halo1.png
+share/wesnoth/images/halo/mage-preparation-halo2.png
+share/wesnoth/images/halo/mage-preparation-halo3.png
+share/wesnoth/images/halo/mage-preparation-halo4.png
+share/wesnoth/images/halo/mage-preparation-halo5.png
+share/wesnoth/images/halo/mage-preparation-halo6.png
+share/wesnoth/images/halo/mage-preparation-halo7.png
 share/wesnoth/images/halo/mermaid-siren-naia-touch-halo.png
-share/wesnoth/images/halo/silver-mage-halo1.png
-share/wesnoth/images/halo/silver-mage-halo10.png
-share/wesnoth/images/halo/silver-mage-halo11.png
-share/wesnoth/images/halo/silver-mage-halo12.png
-share/wesnoth/images/halo/silver-mage-halo2.png
-share/wesnoth/images/halo/silver-mage-halo3.png
-share/wesnoth/images/halo/silver-mage-halo4.png
-share/wesnoth/images/halo/silver-mage-halo5.png
-share/wesnoth/images/halo/silver-mage-halo6.png
-share/wesnoth/images/halo/silver-mage-halo7.png
-share/wesnoth/images/halo/silver-mage-halo8.png
-share/wesnoth/images/halo/silver-mage-halo9.png
 share/wesnoth/images/halo/white-cleric-aura.png
+share/wesnoth/images/halo/white-mage-halo1.png
+share/wesnoth/images/halo/white-mage-halo2.png
+share/wesnoth/images/halo/white-mage-halo3.png
+share/wesnoth/images/halo/white-mage-halo4.png
 share/wesnoth/images/help/closed_section.png
 share/wesnoth/images/help/open_section.png
 share/wesnoth/images/help/recruit.png
@@ -1539,16 +1549,16 @@ share/wesnoth/images/konrad-young.png
 share/wesnoth/images/lancer-attack.png
 share/wesnoth/images/lancer-defend.png
 share/wesnoth/images/lancer.png
-share/wesnoth/images/mage+female-attack.png
-share/wesnoth/images/mage+female-attack1.png
-share/wesnoth/images/mage+female-attack2.png
-share/wesnoth/images/mage+female-attack3.png
+share/wesnoth/images/mage+female-attack-magic1.png
+share/wesnoth/images/mage+female-attack-magic2.png
+share/wesnoth/images/mage+female-attack-staff-1.png
+share/wesnoth/images/mage+female-attack-staff-2.png
 share/wesnoth/images/mage+female-defend.png
 share/wesnoth/images/mage+female.png
-share/wesnoth/images/mage-attack.png
-share/wesnoth/images/mage-attack1.png
-share/wesnoth/images/mage-attack2.png
-share/wesnoth/images/mage-attack3.png
+share/wesnoth/images/mage-attack-magic1.png
+share/wesnoth/images/mage-attack-magic2.png
+share/wesnoth/images/mage-attack-staff1.png
+share/wesnoth/images/mage-attack-staff2.png
 share/wesnoth/images/mage-defend.png
 share/wesnoth/images/mage.png
 share/wesnoth/images/maps/wesnoth.png
@@ -1961,6 +1971,12 @@ share/wesnoth/images/projectiles/dagger-ne.png
 share/wesnoth/images/projectiles/darkmissile-n.png
 share/wesnoth/images/projectiles/darkmissile-ne.png
 share/wesnoth/images/projectiles/entangle.png
+share/wesnoth/images/projectiles/fireball-big-n.png
+share/wesnoth/images/projectiles/fireball-big-nw.png
+share/wesnoth/images/projectiles/fireball-huge-n.png
+share/wesnoth/images/projectiles/fireball-huge-nw.png
+share/wesnoth/images/projectiles/fireball-n.png
+share/wesnoth/images/projectiles/fireball-nw.png
 share/wesnoth/images/projectiles/fireball.png
 share/wesnoth/images/projectiles/gaze.png
 share/wesnoth/images/projectiles/hatchet-n.png
@@ -1992,13 +2008,19 @@ share/wesnoth/images/projectiles/web.png
 share/wesnoth/images/projectiles/whitemissile-n.png
 share/wesnoth/images/projectiles/whitemissile-ne.png
 share/wesnoth/images/random-enemy.png
-share/wesnoth/images/red-mage+female-attack-melee.png
-share/wesnoth/images/red-mage+female-attack-ranged.png
+share/wesnoth/images/red-mage+female-attack-staff1.png
+share/wesnoth/images/red-mage+female-attack-staff2.png
 share/wesnoth/images/red-mage+female-defend.png
+share/wesnoth/images/red-mage+female-fireball-1.png
+share/wesnoth/images/red-mage+female-fireball-2.png
+share/wesnoth/images/red-mage+female-fireball-3.png
 share/wesnoth/images/red-mage+female.png
-share/wesnoth/images/red-mage-attack-melee.png
-share/wesnoth/images/red-mage-attack-ranged.png
+share/wesnoth/images/red-mage-attack-staff1.png
+share/wesnoth/images/red-mage-attack-staff2.png
 share/wesnoth/images/red-mage-defend.png
+share/wesnoth/images/red-mage-fireball-1.png
+share/wesnoth/images/red-mage-fireball-2.png
+share/wesnoth/images/red-mage-fireball-3.png
 share/wesnoth/images/red-mage.png
 share/wesnoth/images/rogue+female-attack.png
 share/wesnoth/images/rogue+female-defend.png
@@ -2059,17 +2081,23 @@ share/wesnoth/images/sea-orc.png
 share/wesnoth/images/seaserpent-attack.png
 share/wesnoth/images/seaserpent-defend.png
 share/wesnoth/images/seaserpent.png
-share/wesnoth/images/silver-mage+female-attack1.png
-share/wesnoth/images/silver-mage+female-attack2.png
-share/wesnoth/images/silver-mage+female-attack3.png
+share/wesnoth/images/silver-mage+female-attack-magic1.png
+share/wesnoth/images/silver-mage+female-attack-melee.png
 share/wesnoth/images/silver-mage+female-defend.png
-share/wesnoth/images/silver-mage+female-melee.png
+share/wesnoth/images/silver-mage+female-teleport1.png
+share/wesnoth/images/silver-mage+female-teleport10.png
+share/wesnoth/images/silver-mage+female-teleport2.png
+share/wesnoth/images/silver-mage+female-teleport3.png
+share/wesnoth/images/silver-mage+female-teleport4.png
+share/wesnoth/images/silver-mage+female-teleport5.png
+share/wesnoth/images/silver-mage+female-teleport6.png
+share/wesnoth/images/silver-mage+female-teleport7.png
+share/wesnoth/images/silver-mage+female-teleport8.png
+share/wesnoth/images/silver-mage+female-teleport9.png
 share/wesnoth/images/silver-mage+female.png
-share/wesnoth/images/silver-mage-attack1.png
-share/wesnoth/images/silver-mage-attack2.png
-share/wesnoth/images/silver-mage-attack3.png
+share/wesnoth/images/silver-mage-attack-magic1.png
+share/wesnoth/images/silver-mage-attack-melee.png
 share/wesnoth/images/silver-mage-defend.png
-share/wesnoth/images/silver-mage-melee.png
 share/wesnoth/images/silver-mage-teleport1.png
 share/wesnoth/images/silver-mage-teleport10.png
 share/wesnoth/images/silver-mage-teleport2.png
@@ -2927,21 +2955,41 @@ share/wesnoth/images/warrior-king-defend.png
 share/wesnoth/images/warrior-king-leading.png
 share/wesnoth/images/warrior-king.png
 share/wesnoth/images/wesnoth-icon.png
-share/wesnoth/images/white-cleric+female-attack.png
-share/wesnoth/images/white-cleric+female-attack1.png
+share/wesnoth/images/white-cleric+female-attack-melee.png
 share/wesnoth/images/white-cleric+female-defend.png
+share/wesnoth/images/white-cleric+female-magic1.png
+share/wesnoth/images/white-cleric+female-magic2.png
+share/wesnoth/images/white-cleric+female-magic3.png
+share/wesnoth/images/white-cleric+female-magic4.png
+share/wesnoth/images/white-cleric+female-magic5.png
+share/wesnoth/images/white-cleric+female-magic6.png
 share/wesnoth/images/white-cleric+female.png
-share/wesnoth/images/white-cleric-attack.png
-share/wesnoth/images/white-cleric-attack1.png
+share/wesnoth/images/white-cleric-attack-melee.png
 share/wesnoth/images/white-cleric-defend.png
+share/wesnoth/images/white-cleric-magic1.png
+share/wesnoth/images/white-cleric-magic2.png
+share/wesnoth/images/white-cleric-magic3.png
+share/wesnoth/images/white-cleric-magic4.png
+share/wesnoth/images/white-cleric-magic5.png
+share/wesnoth/images/white-cleric-magic6.png
 share/wesnoth/images/white-cleric.png
-share/wesnoth/images/white-mage+female-attack.png
-share/wesnoth/images/white-mage+female-attack1.png
+share/wesnoth/images/white-mage+female-attack-melee.png
 share/wesnoth/images/white-mage+female-defend.png
+share/wesnoth/images/white-mage+female-magic1.png
+share/wesnoth/images/white-mage+female-magic2.png
+share/wesnoth/images/white-mage+female-magic3.png
+share/wesnoth/images/white-mage+female-magic4.png
+share/wesnoth/images/white-mage+female-magic5.png
+share/wesnoth/images/white-mage+female-magic6.png
 share/wesnoth/images/white-mage+female.png
-share/wesnoth/images/white-mage-attack.png
-share/wesnoth/images/white-mage-attack1.png
+share/wesnoth/images/white-mage-attack-melee.png
 share/wesnoth/images/white-mage-defend.png
+share/wesnoth/images/white-mage-magic1.png
+share/wesnoth/images/white-mage-magic2.png
+share/wesnoth/images/white-mage-magic3.png
+share/wesnoth/images/white-mage-magic4.png
+share/wesnoth/images/white-mage-magic5.png
+share/wesnoth/images/white-mage-magic6.png
 share/wesnoth/images/white-mage.png
 share/wesnoth/images/wolf-rider-attack.png
 share/wesnoth/images/wolf-rider-defend.png