Update to 1.2.2

  http://svn.gna.org/viewcvs/wesnoth/tags/1.2.2/changelog?rev=15962&view=download

While here, move to LOCALBASE instead of X11BASE.  It should be happier here.

6 files changed, 260 insertions, 130 deletions

diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index 442687dd6148..0f79f5158dcb 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.wesnoth.org/files/
@@ -21,7 +21,7 @@ USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-libiconv-prefix=${LOCALBASE} \
diff --git a/games/wesnoth-devel/distinfo b/games/wesnoth-devel/distinfo
index b55286cbc42b..1efc914a235e 100644
--- a/games/wesnoth-devel/distinfo
+++ b/games/wesnoth-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (wesnoth-1.2.1.tar.gz) = 685deee0f92807eddb2b448c8997cd01
-SHA256 (wesnoth-1.2.1.tar.gz) = e86fb8b9c49fdb5c50df9c1bb38201747253bc19fdbbb64329e14ec2abe0b191
-SIZE (wesnoth-1.2.1.tar.gz) = 74936071
+MD5 (wesnoth-1.2.2.tar.bz2) = f7cc14661edabeeae36a6e9dc5472015
+SHA256 (wesnoth-1.2.2.tar.bz2) = f5cb7ca3fa2419cc7003be32201c6773c34e42e9089ac60ffc52b86765d795e6
+SIZE (wesnoth-1.2.2.tar.bz2) = 67855997
diff --git a/games/wesnoth-devel/pkg-plist b/games/wesnoth-devel/pkg-plist
index 22355d248955..00578d83c40d 100644
--- a/games/wesnoth-devel/pkg-plist
+++ b/games/wesnoth-devel/pkg-plist
@@ -1576,6 +1576,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/maps/multiplayer/4p_Blue_Water_Province
 %%DATADIR%%/data/maps/multiplayer/4p_Castle_Hopping_Isle
 %%DATADIR%%/data/maps/multiplayer/4p_Clash
+%%DATADIR%%/data/maps/multiplayer/4p_Hamlets
 %%DATADIR%%/data/maps/multiplayer/4p_Isars_Cross
 %%DATADIR%%/data/maps/multiplayer/4p_King_of_the_Hill
 %%DATADIR%%/data/maps/multiplayer/4p_Lagoon
@@ -1588,6 +1589,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/maps/multiplayer/6p_Amohsad_Caldera
 %%DATADIR%%/data/maps/multiplayer/6p_Crusaders_Field
 %%DATADIR%%/data/maps/multiplayer/6p_Hexcake
+%%DATADIR%%/data/maps/multiplayer/6p_The_Manzivan_Traps
 %%DATADIR%%/data/maps/multiplayer/6p_Waterloo_Sunset
 %%DATADIR%%/data/maps/multiplayer/8p_Morituri
 %%DATADIR%%/data/maps/multiplayer/9p_Merkwuerdigliebe
@@ -1612,6 +1614,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/scenarios/multiplayer/4p_Blue_Water_Province.cfg
 %%DATADIR%%/data/scenarios/multiplayer/4p_Castle_Hopping_Isle.cfg
 %%DATADIR%%/data/scenarios/multiplayer/4p_Clash.cfg
+%%DATADIR%%/data/scenarios/multiplayer/4p_Hamlets.cfg
 %%DATADIR%%/data/scenarios/multiplayer/4p_Isars_Cross.cfg
 %%DATADIR%%/data/scenarios/multiplayer/4p_King_of_the_Hill.cfg
 %%DATADIR%%/data/scenarios/multiplayer/4p_Lagoon.cfg
@@ -1624,6 +1627,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/scenarios/multiplayer/6p_Amohsad_Caldera.cfg
 %%DATADIR%%/data/scenarios/multiplayer/6p_Crusaders_Field.cfg
 %%DATADIR%%/data/scenarios/multiplayer/6p_Hexcake.cfg
+%%DATADIR%%/data/scenarios/multiplayer/6p_The_Manzivan_Traps.cfg
 %%DATADIR%%/data/scenarios/multiplayer/6p_Waterloo_Sunset.cfg
 %%DATADIR%%/data/scenarios/multiplayer/8p_Morituri.cfg
 %%DATADIR%%/data/scenarios/multiplayer/9p_Merkwuerdigliebe.cfg
@@ -1896,9 +1900,12 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/fonts/DejaVuSans.ttf
 %%DATADIR%%/fonts/FreeSans.ttf
 %%DATADIR%%/images/attacks/axe.png
+%%DATADIR%%/images/attacks/axe-deathblade.png
+%%DATADIR%%/images/attacks/axe-undead.png
 %%DATADIR%%/images/attacks/ballista.png
 %%DATADIR%%/images/attacks/baneblade.png
 %%DATADIR%%/images/attacks/battleaxe.png
+%%DATADIR%%/images/attacks/battleaxe-undead.png
 %%DATADIR%%/images/attacks/beak.png
 %%DATADIR%%/images/attacks/blank.png
 %%DATADIR%%/images/attacks/bow-elven-magic.png
@@ -1915,6 +1922,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/attacks/club.png
 %%DATADIR%%/images/attacks/crossbow-human.png
 %%DATADIR%%/images/attacks/crossbow-orcish.png
+%%DATADIR%%/images/attacks/crossbow-undead.png
 %%DATADIR%%/images/attacks/crush-wose.png
 %%DATADIR%%/images/attacks/curse.png
 %%DATADIR%%/images/attacks/dagger-human.png
@@ -1940,6 +1948,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/attacks/fist.png
 %%DATADIR%%/images/attacks/frenzy.png
 %%DATADIR%%/images/attacks/gaze.png
+%%DATADIR%%/images/attacks/glaive.png
 %%DATADIR%%/images/attacks/greatsword-human.png
 %%DATADIR%%/images/attacks/greatsword-orcish.png
 %%DATADIR%%/images/attacks/halberd.png
@@ -1958,6 +1967,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/attacks/morning-star.png
 %%DATADIR%%/images/attacks/mud-glob.png
 %%DATADIR%%/images/attacks/net.png
+%%DATADIR%%/images/attacks/pick-axe.png
 %%DATADIR%%/images/attacks/pike.png
 %%DATADIR%%/images/attacks/pincers.png
 %%DATADIR%%/images/attacks/pitchfork.png
@@ -1969,6 +1979,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/attacks/sling.png
 %%DATADIR%%/images/attacks/spear-orcish.png
 %%DATADIR%%/images/attacks/spear.png
+%%DATADIR%%/images/attacks/staff-elven.png
 %%DATADIR%%/images/attacks/staff-magic.png
 %%DATADIR%%/images/attacks/staff-necromantic.png
 %%DATADIR%%/images/attacks/staff-plague.png
@@ -2113,6 +2124,11 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/halo/elven/druid-healing6.png
 %%DATADIR%%/images/halo/elven/druid-healing7.png
 %%DATADIR%%/images/halo/elven/druid-healing8.png
+%%DATADIR%%/images/halo/elven/elven-shield-halo-100pct.png
+%%DATADIR%%/images/halo/elven/elven-shield-halo-20pct.png
+%%DATADIR%%/images/halo/elven/elven-shield-halo-40pct.png
+%%DATADIR%%/images/halo/elven/elven-shield-halo-60pct.png
+%%DATADIR%%/images/halo/elven/elven-shield-halo-80pct.png
 %%DATADIR%%/images/halo/elven/faerie-fire-halo1.png
 %%DATADIR%%/images/halo/elven/faerie-fire-halo2.png
 %%DATADIR%%/images/halo/elven/faerie-fire-halo3.png
@@ -2143,6 +2159,17 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/halo/elven/shyde-stationary-halo4.png
 %%DATADIR%%/images/halo/elven/shyde-stationary-halo5.png
 %%DATADIR%%/images/halo/elven/shyde-stationary-halo6.png
+%%DATADIR%%/images/halo/holy/halo1.png
+%%DATADIR%%/images/halo/holy/halo2.png
+%%DATADIR%%/images/halo/holy/halo3.png
+%%DATADIR%%/images/halo/holy/halo4.png
+%%DATADIR%%/images/halo/holy/halo5.png
+%%DATADIR%%/images/halo/holy/halo6.png
+%%DATADIR%%/images/halo/holy/white-cleric-aura.png
+%%DATADIR%%/images/halo/holy/white-mage-halo1.png
+%%DATADIR%%/images/halo/holy/white-mage-halo2.png
+%%DATADIR%%/images/halo/holy/white-mage-halo3.png
+%%DATADIR%%/images/halo/holy/white-mage-halo4.png
 %%DATADIR%%/images/halo/lighthouse-aura.png
 %%DATADIR%%/images/halo/lightning-bolt-1-1.png
 %%DATADIR%%/images/halo/lightning-bolt-1-2.png
@@ -4141,6 +4168,8 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/elves-wood/hero-defend.png
 %%DATADIR%%/images/units/elves-wood/hero-melee-1.png
 %%DATADIR%%/images/units/elves-wood/hero-melee-2.png
+%%DATADIR%%/images/units/elves-wood/hero-melee-3.png
+%%DATADIR%%/images/units/elves-wood/hero-melee-4.png
 %%DATADIR%%/images/units/elves-wood/hero.png
 %%DATADIR%%/images/units/elves-wood/marksman+female-bow-attack1.png
 %%DATADIR%%/images/units/elves-wood/marksman+female-bow-attack2.png
@@ -4570,42 +4599,34 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-loyalists/swordsman-attack-3.png
 %%DATADIR%%/images/units/human-loyalists/swordsman-defend.png
 %%DATADIR%%/images/units/human-loyalists/swordsman.png
+%%DATADIR%%/images/units/human-magi/arch-mage+female-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/arch-mage+female-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/arch-mage+female-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/arch-mage+female-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/arch-mage+female-defend.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-die-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-die-2.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-fireball-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-fireball-2.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-fireball-3.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-staff-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-staff-2.png
 %%DATADIR%%/images/units/human-magi/arch-mage+female.png
+%%DATADIR%%/images/units/human-magi/arch-mage-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/arch-mage-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/arch-mage-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/arch-mage-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/arch-mage-defend.png
-%%DATADIR%%/images/units/human-magi/arch-mage-die-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage-die-2.png
-%%DATADIR%%/images/units/human-magi/arch-mage-fireball-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage-fireball-2.png
-%%DATADIR%%/images/units/human-magi/arch-mage-fireball-3.png
-%%DATADIR%%/images/units/human-magi/arch-mage-staff-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage-staff-2.png
 %%DATADIR%%/images/units/human-magi/arch-mage.png
+%%DATADIR%%/images/units/human-magi/great-mage+female-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/great-mage+female-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/great-mage+female-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/great-mage+female-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/great-mage+female-defend.png
-%%DATADIR%%/images/units/human-magi/great-mage+female-fireball-1.png
-%%DATADIR%%/images/units/human-magi/great-mage+female-fireball-2.png
-%%DATADIR%%/images/units/human-magi/great-mage+female-fireball-3.png
-%%DATADIR%%/images/units/human-magi/great-mage+female-staff-1.png
-%%DATADIR%%/images/units/human-magi/great-mage+female-staff-2.png
 %%DATADIR%%/images/units/human-magi/great-mage+female.png
+%%DATADIR%%/images/units/human-magi/great-mage-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/great-mage-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/great-mage-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/great-mage-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/great-mage-defend.png
-%%DATADIR%%/images/units/human-magi/great-mage-fireball-1.png
-%%DATADIR%%/images/units/human-magi/great-mage-fireball-2.png
-%%DATADIR%%/images/units/human-magi/great-mage-fireball-3.png
-%%DATADIR%%/images/units/human-magi/great-mage-staff-1.png
-%%DATADIR%%/images/units/human-magi/great-mage-staff-2.png
 %%DATADIR%%/images/units/human-magi/great-mage.png
 %%DATADIR%%/images/units/human-magi/mage+female-attack-magic1.png
 %%DATADIR%%/images/units/human-magi/mage+female-attack-magic2.png
-%%DATADIR%%/images/units/human-magi/mage+female-attack-staff-1.png
-%%DATADIR%%/images/units/human-magi/mage+female-attack-staff-2.png
+%%DATADIR%%/images/units/human-magi/mage+female-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/mage+female-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/mage+female-defend.png
 %%DATADIR%%/images/units/human-magi/mage+female-die-1.png
 %%DATADIR%%/images/units/human-magi/mage+female-die-2.png
@@ -4622,6 +4643,8 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-magi/mage-die-3.png
 %%DATADIR%%/images/units/human-magi/mage-die-4.png
 %%DATADIR%%/images/units/human-magi/mage.png
+%%DATADIR%%/images/units/human-magi/red-mage+female-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/red-mage+female-attack-magic2.png
 %%DATADIR%%/images/units/human-magi/red-mage+female-attack-staff1.png
 %%DATADIR%%/images/units/human-magi/red-mage+female-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/red-mage+female-defend.png
@@ -4629,10 +4652,9 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-magi/red-mage+female-die-2.png
 %%DATADIR%%/images/units/human-magi/red-mage+female-die-3.png
 %%DATADIR%%/images/units/human-magi/red-mage+female-die-4.png
-%%DATADIR%%/images/units/human-magi/red-mage+female-fireball-1.png
-%%DATADIR%%/images/units/human-magi/red-mage+female-fireball-2.png
-%%DATADIR%%/images/units/human-magi/red-mage+female-fireball-3.png
 %%DATADIR%%/images/units/human-magi/red-mage+female.png
+%%DATADIR%%/images/units/human-magi/red-mage-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/red-mage-attack-magic2.png
 %%DATADIR%%/images/units/human-magi/red-mage-attack-staff1.png
 %%DATADIR%%/images/units/human-magi/red-mage-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/red-mage-defend.png
@@ -4640,12 +4662,11 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-magi/red-mage-die-2.png
 %%DATADIR%%/images/units/human-magi/red-mage-die-3.png
 %%DATADIR%%/images/units/human-magi/red-mage-die-4.png
-%%DATADIR%%/images/units/human-magi/red-mage-fireball-1.png
-%%DATADIR%%/images/units/human-magi/red-mage-fireball-2.png
-%%DATADIR%%/images/units/human-magi/red-mage-fireball-3.png
 %%DATADIR%%/images/units/human-magi/red-mage.png
 %%DATADIR%%/images/units/human-magi/silver-mage+female-attack-magic1.png
-%%DATADIR%%/images/units/human-magi/silver-mage+female-attack-melee.png
+%%DATADIR%%/images/units/human-magi/silver-mage+female-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/silver-mage+female-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/silver-mage+female-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/silver-mage+female-defend.png
 %%DATADIR%%/images/units/human-magi/silver-mage+female-teleport1.png
 %%DATADIR%%/images/units/human-magi/silver-mage+female-teleport10.png
@@ -4659,7 +4680,9 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-magi/silver-mage+female-teleport9.png
 %%DATADIR%%/images/units/human-magi/silver-mage+female.png
 %%DATADIR%%/images/units/human-magi/silver-mage-attack-magic1.png
-%%DATADIR%%/images/units/human-magi/silver-mage-attack-melee.png
+%%DATADIR%%/images/units/human-magi/silver-mage-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/silver-mage-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/silver-mage-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/silver-mage-defend.png
 %%DATADIR%%/images/units/human-magi/silver-mage-teleport1.png
 %%DATADIR%%/images/units/human-magi/silver-mage-teleport10.png
@@ -4672,47 +4695,43 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-magi/silver-mage-teleport8.png
 %%DATADIR%%/images/units/human-magi/silver-mage-teleport9.png
 %%DATADIR%%/images/units/human-magi/silver-mage.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-attack-melee.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-attack-melee1.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-attack-melee2.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-magic-1.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-magic-2.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-magic-3.png
 %%DATADIR%%/images/units/human-magi/white-cleric+female-defend.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic1.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic2.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic3.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic4.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic5.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic6.png
 %%DATADIR%%/images/units/human-magi/white-cleric+female.png
-%%DATADIR%%/images/units/human-magi/white-cleric-attack-melee.png
+%%DATADIR%%/images/units/human-magi/white-cleric-attack-melee1.png
+%%DATADIR%%/images/units/human-magi/white-cleric-attack-melee2.png
 %%DATADIR%%/images/units/human-magi/white-cleric-defend.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic1.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic2.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic3.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic4.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic5.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic6.png
+%%DATADIR%%/images/units/human-magi/white-cleric-magic-1.png
+%%DATADIR%%/images/units/human-magi/white-cleric-magic-2.png
+%%DATADIR%%/images/units/human-magi/white-cleric-magic-3.png
 %%DATADIR%%/images/units/human-magi/white-cleric.png
 %%DATADIR%%/images/units/human-magi/white-mage+female-defend.png
 %%DATADIR%%/images/units/human-magi/white-mage+female-die-1.png
 %%DATADIR%%/images/units/human-magi/white-mage+female-die-2.png
 %%DATADIR%%/images/units/human-magi/white-mage+female-die-3.png
 %%DATADIR%%/images/units/human-magi/white-mage+female-die-4.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic1.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic2.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic3.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic4.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic5.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic6.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-magic-1.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-magic-2.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-magic-3.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-1.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-2.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-3.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-4.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-5.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-6.png
 %%DATADIR%%/images/units/human-magi/white-mage+female.png
 %%DATADIR%%/images/units/human-magi/white-mage-defend.png
 %%DATADIR%%/images/units/human-magi/white-mage-die-1.png
 %%DATADIR%%/images/units/human-magi/white-mage-die-2.png
 %%DATADIR%%/images/units/human-magi/white-mage-die-3.png
 %%DATADIR%%/images/units/human-magi/white-mage-die-4.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic1.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic2.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic3.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic4.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic5.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic6.png
+%%DATADIR%%/images/units/human-magi/white-mage-magic-1.png
+%%DATADIR%%/images/units/human-magi/white-mage-magic-2.png
+%%DATADIR%%/images/units/human-magi/white-mage-magic-3.png
 %%DATADIR%%/images/units/human-magi/white-mage-melee-1.png
 %%DATADIR%%/images/units/human-magi/white-mage-melee-2.png
 %%DATADIR%%/images/units/human-magi/white-mage-melee-3.png
@@ -4798,6 +4817,13 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-outlaws/thief+female-defend-3-1.png
 %%DATADIR%%/images/units/human-outlaws/thief+female-defend-3-2.png
 %%DATADIR%%/images/units/human-outlaws/thief+female-defend.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-1.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-2.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-3.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-4.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-5.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-6.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-7.png
 %%DATADIR%%/images/units/human-outlaws/thief+female.png
 %%DATADIR%%/images/units/human-outlaws/thief-attack.png
 %%DATADIR%%/images/units/human-outlaws/thief-defend-1-1.png
@@ -4807,6 +4833,13 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-outlaws/thief-defend-3-1.png
 %%DATADIR%%/images/units/human-outlaws/thief-defend-3-2.png
 %%DATADIR%%/images/units/human-outlaws/thief-defend.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-1.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-2.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-3.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-4.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-5.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-6.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-7.png
 %%DATADIR%%/images/units/human-outlaws/thief.png
 %%DATADIR%%/images/units/human-outlaws/thug-attack.png
 %%DATADIR%%/images/units/human-outlaws/thug-defend.png
@@ -5365,6 +5398,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/undead/ghoul-defend.png
 %%DATADIR%%/images/units/undead/ghoul-die-1.png
 %%DATADIR%%/images/units/undead/ghoul-die-2.png
+%%DATADIR%%/images/units/undead/ghoul-die-3.png
 %%DATADIR%%/images/units/undead/ghoul-die-4.png
 %%DATADIR%%/images/units/undead/ghoul-die-5.png
 %%DATADIR%%/images/units/undead/ghoul-die-6.png
@@ -5489,6 +5523,21 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/woses/wose-ancient-attack-1.png
 %%DATADIR%%/images/units/woses/wose-ancient-attack-2.png
 %%DATADIR%%/images/units/woses/wose-ancient-defend.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-1.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-2.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-3.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-4.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-5.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-6.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-7.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-8.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-9.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-10.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-11.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-12.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-13.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-14.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-15.png
 %%DATADIR%%/images/units/woses/wose-ancient.png
 %%DATADIR%%/images/units/woses/wose-attack-1.png
 %%DATADIR%%/images/units/woses/wose-attack-2.png
@@ -5520,6 +5569,21 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/woses/wose-elder-attack-1.png
 %%DATADIR%%/images/units/woses/wose-elder-attack-2.png
 %%DATADIR%%/images/units/woses/wose-elder-defend.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-1.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-2.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-3.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-4.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-5.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-6.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-7.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-8.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-9.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-10.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-11.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-12.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-13.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-14.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-15.png
 %%DATADIR%%/images/units/woses/wose-elder.png
 %%DATADIR%%/images/units/woses/wose.png
 %%DATADIR%%/images/wesnoth-icon.png
@@ -5855,6 +5919,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 @dirrm %%DATADIR%%/images/cursors-bw
 @dirrm %%DATADIR%%/images/editor
 @dirrm %%DATADIR%%/images/halo/elven
+@dirrm %%DATADIR%%/images/halo/holy
 @dirrm %%DATADIR%%/images/halo
 @dirrm %%DATADIR%%/images/help
 @dirrm %%DATADIR%%/images/icons
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 442687dd6148..0f79f5158dcb 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.wesnoth.org/files/
@@ -21,7 +21,7 @@ USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-libiconv-prefix=${LOCALBASE} \
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index b55286cbc42b..1efc914a235e 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,3 +1,3 @@
-MD5 (wesnoth-1.2.1.tar.gz) = 685deee0f92807eddb2b448c8997cd01
-SHA256 (wesnoth-1.2.1.tar.gz) = e86fb8b9c49fdb5c50df9c1bb38201747253bc19fdbbb64329e14ec2abe0b191
-SIZE (wesnoth-1.2.1.tar.gz) = 74936071
+MD5 (wesnoth-1.2.2.tar.bz2) = f7cc14661edabeeae36a6e9dc5472015
+SHA256 (wesnoth-1.2.2.tar.bz2) = f5cb7ca3fa2419cc7003be32201c6773c34e42e9089ac60ffc52b86765d795e6
+SIZE (wesnoth-1.2.2.tar.bz2) = 67855997
diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist
index 22355d248955..00578d83c40d 100644
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist
@@ -1576,6 +1576,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/maps/multiplayer/4p_Blue_Water_Province
 %%DATADIR%%/data/maps/multiplayer/4p_Castle_Hopping_Isle
 %%DATADIR%%/data/maps/multiplayer/4p_Clash
+%%DATADIR%%/data/maps/multiplayer/4p_Hamlets
 %%DATADIR%%/data/maps/multiplayer/4p_Isars_Cross
 %%DATADIR%%/data/maps/multiplayer/4p_King_of_the_Hill
 %%DATADIR%%/data/maps/multiplayer/4p_Lagoon
@@ -1588,6 +1589,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/maps/multiplayer/6p_Amohsad_Caldera
 %%DATADIR%%/data/maps/multiplayer/6p_Crusaders_Field
 %%DATADIR%%/data/maps/multiplayer/6p_Hexcake
+%%DATADIR%%/data/maps/multiplayer/6p_The_Manzivan_Traps
 %%DATADIR%%/data/maps/multiplayer/6p_Waterloo_Sunset
 %%DATADIR%%/data/maps/multiplayer/8p_Morituri
 %%DATADIR%%/data/maps/multiplayer/9p_Merkwuerdigliebe
@@ -1612,6 +1614,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/scenarios/multiplayer/4p_Blue_Water_Province.cfg
 %%DATADIR%%/data/scenarios/multiplayer/4p_Castle_Hopping_Isle.cfg
 %%DATADIR%%/data/scenarios/multiplayer/4p_Clash.cfg
+%%DATADIR%%/data/scenarios/multiplayer/4p_Hamlets.cfg
 %%DATADIR%%/data/scenarios/multiplayer/4p_Isars_Cross.cfg
 %%DATADIR%%/data/scenarios/multiplayer/4p_King_of_the_Hill.cfg
 %%DATADIR%%/data/scenarios/multiplayer/4p_Lagoon.cfg
@@ -1624,6 +1627,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/scenarios/multiplayer/6p_Amohsad_Caldera.cfg
 %%DATADIR%%/data/scenarios/multiplayer/6p_Crusaders_Field.cfg
 %%DATADIR%%/data/scenarios/multiplayer/6p_Hexcake.cfg
+%%DATADIR%%/data/scenarios/multiplayer/6p_The_Manzivan_Traps.cfg
 %%DATADIR%%/data/scenarios/multiplayer/6p_Waterloo_Sunset.cfg
 %%DATADIR%%/data/scenarios/multiplayer/8p_Morituri.cfg
 %%DATADIR%%/data/scenarios/multiplayer/9p_Merkwuerdigliebe.cfg
@@ -1896,9 +1900,12 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/fonts/DejaVuSans.ttf
 %%DATADIR%%/fonts/FreeSans.ttf
 %%DATADIR%%/images/attacks/axe.png
+%%DATADIR%%/images/attacks/axe-deathblade.png
+%%DATADIR%%/images/attacks/axe-undead.png
 %%DATADIR%%/images/attacks/ballista.png
 %%DATADIR%%/images/attacks/baneblade.png
 %%DATADIR%%/images/attacks/battleaxe.png
+%%DATADIR%%/images/attacks/battleaxe-undead.png
 %%DATADIR%%/images/attacks/beak.png
 %%DATADIR%%/images/attacks/blank.png
 %%DATADIR%%/images/attacks/bow-elven-magic.png
@@ -1915,6 +1922,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/attacks/club.png
 %%DATADIR%%/images/attacks/crossbow-human.png
 %%DATADIR%%/images/attacks/crossbow-orcish.png
+%%DATADIR%%/images/attacks/crossbow-undead.png
 %%DATADIR%%/images/attacks/crush-wose.png
 %%DATADIR%%/images/attacks/curse.png
 %%DATADIR%%/images/attacks/dagger-human.png
@@ -1940,6 +1948,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/attacks/fist.png
 %%DATADIR%%/images/attacks/frenzy.png
 %%DATADIR%%/images/attacks/gaze.png
+%%DATADIR%%/images/attacks/glaive.png
 %%DATADIR%%/images/attacks/greatsword-human.png
 %%DATADIR%%/images/attacks/greatsword-orcish.png
 %%DATADIR%%/images/attacks/halberd.png
@@ -1958,6 +1967,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/attacks/morning-star.png
 %%DATADIR%%/images/attacks/mud-glob.png
 %%DATADIR%%/images/attacks/net.png
+%%DATADIR%%/images/attacks/pick-axe.png
 %%DATADIR%%/images/attacks/pike.png
 %%DATADIR%%/images/attacks/pincers.png
 %%DATADIR%%/images/attacks/pitchfork.png
@@ -1969,6 +1979,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/attacks/sling.png
 %%DATADIR%%/images/attacks/spear-orcish.png
 %%DATADIR%%/images/attacks/spear.png
+%%DATADIR%%/images/attacks/staff-elven.png
 %%DATADIR%%/images/attacks/staff-magic.png
 %%DATADIR%%/images/attacks/staff-necromantic.png
 %%DATADIR%%/images/attacks/staff-plague.png
@@ -2113,6 +2124,11 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/halo/elven/druid-healing6.png
 %%DATADIR%%/images/halo/elven/druid-healing7.png
 %%DATADIR%%/images/halo/elven/druid-healing8.png
+%%DATADIR%%/images/halo/elven/elven-shield-halo-100pct.png
+%%DATADIR%%/images/halo/elven/elven-shield-halo-20pct.png
+%%DATADIR%%/images/halo/elven/elven-shield-halo-40pct.png
+%%DATADIR%%/images/halo/elven/elven-shield-halo-60pct.png
+%%DATADIR%%/images/halo/elven/elven-shield-halo-80pct.png
 %%DATADIR%%/images/halo/elven/faerie-fire-halo1.png
 %%DATADIR%%/images/halo/elven/faerie-fire-halo2.png
 %%DATADIR%%/images/halo/elven/faerie-fire-halo3.png
@@ -2143,6 +2159,17 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/halo/elven/shyde-stationary-halo4.png
 %%DATADIR%%/images/halo/elven/shyde-stationary-halo5.png
 %%DATADIR%%/images/halo/elven/shyde-stationary-halo6.png
+%%DATADIR%%/images/halo/holy/halo1.png
+%%DATADIR%%/images/halo/holy/halo2.png
+%%DATADIR%%/images/halo/holy/halo3.png
+%%DATADIR%%/images/halo/holy/halo4.png
+%%DATADIR%%/images/halo/holy/halo5.png
+%%DATADIR%%/images/halo/holy/halo6.png
+%%DATADIR%%/images/halo/holy/white-cleric-aura.png
+%%DATADIR%%/images/halo/holy/white-mage-halo1.png
+%%DATADIR%%/images/halo/holy/white-mage-halo2.png
+%%DATADIR%%/images/halo/holy/white-mage-halo3.png
+%%DATADIR%%/images/halo/holy/white-mage-halo4.png
 %%DATADIR%%/images/halo/lighthouse-aura.png
 %%DATADIR%%/images/halo/lightning-bolt-1-1.png
 %%DATADIR%%/images/halo/lightning-bolt-1-2.png
@@ -4141,6 +4168,8 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/elves-wood/hero-defend.png
 %%DATADIR%%/images/units/elves-wood/hero-melee-1.png
 %%DATADIR%%/images/units/elves-wood/hero-melee-2.png
+%%DATADIR%%/images/units/elves-wood/hero-melee-3.png
+%%DATADIR%%/images/units/elves-wood/hero-melee-4.png
 %%DATADIR%%/images/units/elves-wood/hero.png
 %%DATADIR%%/images/units/elves-wood/marksman+female-bow-attack1.png
 %%DATADIR%%/images/units/elves-wood/marksman+female-bow-attack2.png
@@ -4570,42 +4599,34 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-loyalists/swordsman-attack-3.png
 %%DATADIR%%/images/units/human-loyalists/swordsman-defend.png
 %%DATADIR%%/images/units/human-loyalists/swordsman.png
+%%DATADIR%%/images/units/human-magi/arch-mage+female-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/arch-mage+female-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/arch-mage+female-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/arch-mage+female-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/arch-mage+female-defend.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-die-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-die-2.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-fireball-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-fireball-2.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-fireball-3.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-staff-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage+female-staff-2.png
 %%DATADIR%%/images/units/human-magi/arch-mage+female.png
+%%DATADIR%%/images/units/human-magi/arch-mage-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/arch-mage-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/arch-mage-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/arch-mage-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/arch-mage-defend.png
-%%DATADIR%%/images/units/human-magi/arch-mage-die-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage-die-2.png
-%%DATADIR%%/images/units/human-magi/arch-mage-fireball-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage-fireball-2.png
-%%DATADIR%%/images/units/human-magi/arch-mage-fireball-3.png
-%%DATADIR%%/images/units/human-magi/arch-mage-staff-1.png
-%%DATADIR%%/images/units/human-magi/arch-mage-staff-2.png
 %%DATADIR%%/images/units/human-magi/arch-mage.png
+%%DATADIR%%/images/units/human-magi/great-mage+female-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/great-mage+female-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/great-mage+female-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/great-mage+female-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/great-mage+female-defend.png
-%%DATADIR%%/images/units/human-magi/great-mage+female-fireball-1.png
-%%DATADIR%%/images/units/human-magi/great-mage+female-fireball-2.png
-%%DATADIR%%/images/units/human-magi/great-mage+female-fireball-3.png
-%%DATADIR%%/images/units/human-magi/great-mage+female-staff-1.png
-%%DATADIR%%/images/units/human-magi/great-mage+female-staff-2.png
 %%DATADIR%%/images/units/human-magi/great-mage+female.png
+%%DATADIR%%/images/units/human-magi/great-mage-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/great-mage-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/great-mage-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/great-mage-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/great-mage-defend.png
-%%DATADIR%%/images/units/human-magi/great-mage-fireball-1.png
-%%DATADIR%%/images/units/human-magi/great-mage-fireball-2.png
-%%DATADIR%%/images/units/human-magi/great-mage-fireball-3.png
-%%DATADIR%%/images/units/human-magi/great-mage-staff-1.png
-%%DATADIR%%/images/units/human-magi/great-mage-staff-2.png
 %%DATADIR%%/images/units/human-magi/great-mage.png
 %%DATADIR%%/images/units/human-magi/mage+female-attack-magic1.png
 %%DATADIR%%/images/units/human-magi/mage+female-attack-magic2.png
-%%DATADIR%%/images/units/human-magi/mage+female-attack-staff-1.png
-%%DATADIR%%/images/units/human-magi/mage+female-attack-staff-2.png
+%%DATADIR%%/images/units/human-magi/mage+female-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/mage+female-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/mage+female-defend.png
 %%DATADIR%%/images/units/human-magi/mage+female-die-1.png
 %%DATADIR%%/images/units/human-magi/mage+female-die-2.png
@@ -4622,6 +4643,8 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-magi/mage-die-3.png
 %%DATADIR%%/images/units/human-magi/mage-die-4.png
 %%DATADIR%%/images/units/human-magi/mage.png
+%%DATADIR%%/images/units/human-magi/red-mage+female-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/red-mage+female-attack-magic2.png
 %%DATADIR%%/images/units/human-magi/red-mage+female-attack-staff1.png
 %%DATADIR%%/images/units/human-magi/red-mage+female-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/red-mage+female-defend.png
@@ -4629,10 +4652,9 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-magi/red-mage+female-die-2.png
 %%DATADIR%%/images/units/human-magi/red-mage+female-die-3.png
 %%DATADIR%%/images/units/human-magi/red-mage+female-die-4.png
-%%DATADIR%%/images/units/human-magi/red-mage+female-fireball-1.png
-%%DATADIR%%/images/units/human-magi/red-mage+female-fireball-2.png
-%%DATADIR%%/images/units/human-magi/red-mage+female-fireball-3.png
 %%DATADIR%%/images/units/human-magi/red-mage+female.png
+%%DATADIR%%/images/units/human-magi/red-mage-attack-magic1.png
+%%DATADIR%%/images/units/human-magi/red-mage-attack-magic2.png
 %%DATADIR%%/images/units/human-magi/red-mage-attack-staff1.png
 %%DATADIR%%/images/units/human-magi/red-mage-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/red-mage-defend.png
@@ -4640,12 +4662,11 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-magi/red-mage-die-2.png
 %%DATADIR%%/images/units/human-magi/red-mage-die-3.png
 %%DATADIR%%/images/units/human-magi/red-mage-die-4.png
-%%DATADIR%%/images/units/human-magi/red-mage-fireball-1.png
-%%DATADIR%%/images/units/human-magi/red-mage-fireball-2.png
-%%DATADIR%%/images/units/human-magi/red-mage-fireball-3.png
 %%DATADIR%%/images/units/human-magi/red-mage.png
 %%DATADIR%%/images/units/human-magi/silver-mage+female-attack-magic1.png
-%%DATADIR%%/images/units/human-magi/silver-mage+female-attack-melee.png
+%%DATADIR%%/images/units/human-magi/silver-mage+female-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/silver-mage+female-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/silver-mage+female-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/silver-mage+female-defend.png
 %%DATADIR%%/images/units/human-magi/silver-mage+female-teleport1.png
 %%DATADIR%%/images/units/human-magi/silver-mage+female-teleport10.png
@@ -4659,7 +4680,9 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-magi/silver-mage+female-teleport9.png
 %%DATADIR%%/images/units/human-magi/silver-mage+female.png
 %%DATADIR%%/images/units/human-magi/silver-mage-attack-magic1.png
-%%DATADIR%%/images/units/human-magi/silver-mage-attack-melee.png
+%%DATADIR%%/images/units/human-magi/silver-mage-attack-magic2.png
+%%DATADIR%%/images/units/human-magi/silver-mage-attack-staff1.png
+%%DATADIR%%/images/units/human-magi/silver-mage-attack-staff2.png
 %%DATADIR%%/images/units/human-magi/silver-mage-defend.png
 %%DATADIR%%/images/units/human-magi/silver-mage-teleport1.png
 %%DATADIR%%/images/units/human-magi/silver-mage-teleport10.png
@@ -4672,47 +4695,43 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-magi/silver-mage-teleport8.png
 %%DATADIR%%/images/units/human-magi/silver-mage-teleport9.png
 %%DATADIR%%/images/units/human-magi/silver-mage.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-attack-melee.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-attack-melee1.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-attack-melee2.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-magic-1.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-magic-2.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-magic-3.png
 %%DATADIR%%/images/units/human-magi/white-cleric+female-defend.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic1.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic2.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic3.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic4.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic5.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-magic6.png
 %%DATADIR%%/images/units/human-magi/white-cleric+female.png
-%%DATADIR%%/images/units/human-magi/white-cleric-attack-melee.png
+%%DATADIR%%/images/units/human-magi/white-cleric-attack-melee1.png
+%%DATADIR%%/images/units/human-magi/white-cleric-attack-melee2.png
 %%DATADIR%%/images/units/human-magi/white-cleric-defend.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic1.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic2.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic3.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic4.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic5.png
-%%DATADIR%%/images/units/human-magi/white-cleric-magic6.png
+%%DATADIR%%/images/units/human-magi/white-cleric-magic-1.png
+%%DATADIR%%/images/units/human-magi/white-cleric-magic-2.png
+%%DATADIR%%/images/units/human-magi/white-cleric-magic-3.png
 %%DATADIR%%/images/units/human-magi/white-cleric.png
 %%DATADIR%%/images/units/human-magi/white-mage+female-defend.png
 %%DATADIR%%/images/units/human-magi/white-mage+female-die-1.png
 %%DATADIR%%/images/units/human-magi/white-mage+female-die-2.png
 %%DATADIR%%/images/units/human-magi/white-mage+female-die-3.png
 %%DATADIR%%/images/units/human-magi/white-mage+female-die-4.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic1.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic2.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic3.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic4.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic5.png
-%%DATADIR%%/images/units/human-magi/white-mage+female-magic6.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-magic-1.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-magic-2.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-magic-3.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-1.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-2.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-3.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-4.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-5.png
+%%DATADIR%%/images/units/human-magi/white-mage+female-melee-6.png
 %%DATADIR%%/images/units/human-magi/white-mage+female.png
 %%DATADIR%%/images/units/human-magi/white-mage-defend.png
 %%DATADIR%%/images/units/human-magi/white-mage-die-1.png
 %%DATADIR%%/images/units/human-magi/white-mage-die-2.png
 %%DATADIR%%/images/units/human-magi/white-mage-die-3.png
 %%DATADIR%%/images/units/human-magi/white-mage-die-4.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic1.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic2.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic3.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic4.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic5.png
-%%DATADIR%%/images/units/human-magi/white-mage-magic6.png
+%%DATADIR%%/images/units/human-magi/white-mage-magic-1.png
+%%DATADIR%%/images/units/human-magi/white-mage-magic-2.png
+%%DATADIR%%/images/units/human-magi/white-mage-magic-3.png
 %%DATADIR%%/images/units/human-magi/white-mage-melee-1.png
 %%DATADIR%%/images/units/human-magi/white-mage-melee-2.png
 %%DATADIR%%/images/units/human-magi/white-mage-melee-3.png
@@ -4798,6 +4817,13 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-outlaws/thief+female-defend-3-1.png
 %%DATADIR%%/images/units/human-outlaws/thief+female-defend-3-2.png
 %%DATADIR%%/images/units/human-outlaws/thief+female-defend.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-1.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-2.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-3.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-4.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-5.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-6.png
+%%DATADIR%%/images/units/human-outlaws/thief+female-die-7.png
 %%DATADIR%%/images/units/human-outlaws/thief+female.png
 %%DATADIR%%/images/units/human-outlaws/thief-attack.png
 %%DATADIR%%/images/units/human-outlaws/thief-defend-1-1.png
@@ -4807,6 +4833,13 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/human-outlaws/thief-defend-3-1.png
 %%DATADIR%%/images/units/human-outlaws/thief-defend-3-2.png
 %%DATADIR%%/images/units/human-outlaws/thief-defend.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-1.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-2.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-3.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-4.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-5.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-6.png
+%%DATADIR%%/images/units/human-outlaws/thief-die-7.png
 %%DATADIR%%/images/units/human-outlaws/thief.png
 %%DATADIR%%/images/units/human-outlaws/thug-attack.png
 %%DATADIR%%/images/units/human-outlaws/thug-defend.png
@@ -5365,6 +5398,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/undead/ghoul-defend.png
 %%DATADIR%%/images/units/undead/ghoul-die-1.png
 %%DATADIR%%/images/units/undead/ghoul-die-2.png
+%%DATADIR%%/images/units/undead/ghoul-die-3.png
 %%DATADIR%%/images/units/undead/ghoul-die-4.png
 %%DATADIR%%/images/units/undead/ghoul-die-5.png
 %%DATADIR%%/images/units/undead/ghoul-die-6.png
@@ -5489,6 +5523,21 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/woses/wose-ancient-attack-1.png
 %%DATADIR%%/images/units/woses/wose-ancient-attack-2.png
 %%DATADIR%%/images/units/woses/wose-ancient-defend.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-1.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-2.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-3.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-4.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-5.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-6.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-7.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-8.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-9.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-10.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-11.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-12.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-13.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-14.png
+%%DATADIR%%/images/units/woses/wose-ancient-die-fall-15.png
 %%DATADIR%%/images/units/woses/wose-ancient.png
 %%DATADIR%%/images/units/woses/wose-attack-1.png
 %%DATADIR%%/images/units/woses/wose-attack-2.png
@@ -5520,6 +5569,21 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/woses/wose-elder-attack-1.png
 %%DATADIR%%/images/units/woses/wose-elder-attack-2.png
 %%DATADIR%%/images/units/woses/wose-elder-defend.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-1.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-2.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-3.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-4.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-5.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-6.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-7.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-8.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-9.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-10.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-11.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-12.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-13.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-14.png
+%%DATADIR%%/images/units/woses/wose-elder-die-fall-15.png
 %%DATADIR%%/images/units/woses/wose-elder.png
 %%DATADIR%%/images/units/woses/wose.png
 %%DATADIR%%/images/wesnoth-icon.png
@@ -5855,6 +5919,7 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 @dirrm %%DATADIR%%/images/cursors-bw
 @dirrm %%DATADIR%%/images/editor
 @dirrm %%DATADIR%%/images/halo/elven
+@dirrm %%DATADIR%%/images/halo/holy
 @dirrm %%DATADIR%%/images/halo
 @dirrm %%DATADIR%%/images/help
 @dirrm %%DATADIR%%/images/icons