Update to 1.2.1.

   http://svn.gna.org/viewcvs/wesnoth/tags/1.2.1/changelog?rev=15241&view=markup

3 files changed, 67 insertions, 29 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 345b9eb54bd4..442687dd6148 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	1.2
+PORTVERSION=	1.2.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.wesnoth.org/files/
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index f5d311f392a8..b55286cbc42b 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,3 +1,3 @@
-MD5 (wesnoth-1.2.tar.gz) = 722a459282abe6d04dbe228d031c088e
-SHA256 (wesnoth-1.2.tar.gz) = 220705b4b79ddd73061099f30413c6d1872cb30681a26379709a58ace6c91ec1
-SIZE (wesnoth-1.2.tar.gz) = 74823113
+MD5 (wesnoth-1.2.1.tar.gz) = 685deee0f92807eddb2b448c8997cd01
+SHA256 (wesnoth-1.2.1.tar.gz) = e86fb8b9c49fdb5c50df9c1bb38201747253bc19fdbbb64329e14ec2abe0b191
+SIZE (wesnoth-1.2.1.tar.gz) = 74936071
diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist
index 4e54a8a012a0..22355d248955 100644
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist
@@ -522,8 +522,6 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-defend.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-leading.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess.png
-%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-1.png
-%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-2.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-queen.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/konrad-commander-attack-1.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/konrad-commander-attack-2.png
@@ -4151,6 +4149,9 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/elves-wood/marksman+female-bow-defend.png
 %%DATADIR%%/images/units/elves-wood/marksman+female-bow.png
 %%DATADIR%%/images/units/elves-wood/marksman+female-defend.png
+%%DATADIR%%/images/units/elves-wood/marksman+female-die-1.png
+%%DATADIR%%/images/units/elves-wood/marksman+female-die-2.png
+%%DATADIR%%/images/units/elves-wood/marksman+female-die-3.png
 %%DATADIR%%/images/units/elves-wood/marksman+female-melee-1.png
 %%DATADIR%%/images/units/elves-wood/marksman+female-melee-2.png
 %%DATADIR%%/images/units/elves-wood/marksman+female.png
@@ -4161,10 +4162,11 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/elves-wood/marksman-bow-defend.png
 %%DATADIR%%/images/units/elves-wood/marksman-bow.png
 %%DATADIR%%/images/units/elves-wood/marksman-defend.png
-%%DATADIR%%/images/units/elves-wood/marksman-die1.png
-%%DATADIR%%/images/units/elves-wood/marksman-die2.png
-%%DATADIR%%/images/units/elves-wood/marksman-die3.png
-%%DATADIR%%/images/units/elves-wood/marksman-die4.png
+%%DATADIR%%/images/units/elves-wood/marksman-die-1.png
+%%DATADIR%%/images/units/elves-wood/marksman-die-2.png
+%%DATADIR%%/images/units/elves-wood/marksman-die-3.png
+%%DATADIR%%/images/units/elves-wood/marksman-die-4.png
+%%DATADIR%%/images/units/elves-wood/marksman-die-5.png
 %%DATADIR%%/images/units/elves-wood/marksman-melee-1.png
 %%DATADIR%%/images/units/elves-wood/marksman-melee-2.png
 %%DATADIR%%/images/units/elves-wood/marksman.png
@@ -5050,6 +5052,16 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/orcs/assassin-attack1.png
 %%DATADIR%%/images/units/orcs/assassin-attack2.png
 %%DATADIR%%/images/units/orcs/assassin-defend.png
+%%DATADIR%%/images/units/orcs/assassin-die-1.png
+%%DATADIR%%/images/units/orcs/assassin-die-2.png
+%%DATADIR%%/images/units/orcs/assassin-die-3.png
+%%DATADIR%%/images/units/orcs/assassin-die-4.png
+%%DATADIR%%/images/units/orcs/assassin-die-5.png
+%%DATADIR%%/images/units/orcs/assassin-die-6.png
+%%DATADIR%%/images/units/orcs/assassin-die-7.png
+%%DATADIR%%/images/units/orcs/assassin-die-8.png
+%%DATADIR%%/images/units/orcs/assassin-die-9.png
+%%DATADIR%%/images/units/orcs/assassin-die-10.png
 %%DATADIR%%/images/units/orcs/assassin-ranged1.png
 %%DATADIR%%/images/units/orcs/assassin-ranged2.png
 %%DATADIR%%/images/units/orcs/assassin.png
@@ -5060,6 +5072,14 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/orcs/grunt-attack-w5.png
 %%DATADIR%%/images/units/orcs/grunt-attack.png
 %%DATADIR%%/images/units/orcs/grunt-defend.png
+%%DATADIR%%/images/units/orcs/grunt-die-1.png
+%%DATADIR%%/images/units/orcs/grunt-die-2.png
+%%DATADIR%%/images/units/orcs/grunt-die-3.png
+%%DATADIR%%/images/units/orcs/grunt-die-4.png
+%%DATADIR%%/images/units/orcs/grunt-die-5.png
+%%DATADIR%%/images/units/orcs/grunt-die-6.png
+%%DATADIR%%/images/units/orcs/grunt-die-7.png
+%%DATADIR%%/images/units/orcs/grunt-die-8.png
 %%DATADIR%%/images/units/orcs/grunt.png
 %%DATADIR%%/images/units/orcs/leader-attack.png
 %%DATADIR%%/images/units/orcs/leader-defend.png
@@ -5110,7 +5130,6 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/orcs/warrior-attack-w4.png
 %%DATADIR%%/images/units/orcs/warrior-attack-w5.png
 %%DATADIR%%/images/units/orcs/warrior-defend.png
-%%DATADIR%%/images/units/orcs/warrior-melee1.png
 %%DATADIR%%/images/units/orcs/warrior.png
 %%DATADIR%%/images/units/orcs/xbowman-attack.png
 %%DATADIR%%/images/units/orcs/xbowman-defend.png
@@ -5344,6 +5363,12 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/undead/ghoul-attack-1.png
 %%DATADIR%%/images/units/undead/ghoul-attack-2.png
 %%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-4.png
+%%DATADIR%%/images/units/undead/ghoul-die-5.png
+%%DATADIR%%/images/units/undead/ghoul-die-6.png
+%%DATADIR%%/images/units/undead/ghoul-die-7.png
 %%DATADIR%%/images/units/undead/ghoul.png
 %%DATADIR%%/images/units/undead/necrophage-attack.png
 %%DATADIR%%/images/units/undead/necrophage-defend.png
@@ -5426,47 +5451,36 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/undead/zombie-attack-n.png
 %%DATADIR%%/images/units/undead/zombie-attack-s.png
 %%DATADIR%%/images/units/undead/zombie-attack.png
-%%DATADIR%%/images/units/undead/zombie-die-1.png
-%%DATADIR%%/images/units/undead/zombie-die-2.png
-%%DATADIR%%/images/units/undead/zombie-die-3.png
+%%DATADIR%%/images/units/undead/zombie-defend.png
 %%DATADIR%%/images/units/undead/zombie-drake-attack-n.png
 %%DATADIR%%/images/units/undead/zombie-drake-attack-s.png
 %%DATADIR%%/images/units/undead/zombie-drake-attack.png
-%%DATADIR%%/images/units/undead/zombie-drake-die-1.png
-%%DATADIR%%/images/units/undead/zombie-drake-die-2.png
-%%DATADIR%%/images/units/undead/zombie-drake-die-3.png
+%%DATADIR%%/images/units/undead/zombie-drake-defend.png
 %%DATADIR%%/images/units/undead/zombie-drake.png
 %%DATADIR%%/images/units/undead/zombie-mounted-attack-n.png
 %%DATADIR%%/images/units/undead/zombie-mounted-attack-s.png
 %%DATADIR%%/images/units/undead/zombie-mounted-attack.png
-%%DATADIR%%/images/units/undead/zombie-mounted-die-1.png
-%%DATADIR%%/images/units/undead/zombie-mounted-die-2.png
-%%DATADIR%%/images/units/undead/zombie-mounted-die-3.png
+%%DATADIR%%/images/units/undead/zombie-mounted-defend.png
 %%DATADIR%%/images/units/undead/zombie-mounted.png
 %%DATADIR%%/images/units/undead/zombie-saurian-attack-n.png
 %%DATADIR%%/images/units/undead/zombie-saurian-attack-s.png
 %%DATADIR%%/images/units/undead/zombie-saurian-attack.png
-%%DATADIR%%/images/units/undead/zombie-saurian-die-1.png
-%%DATADIR%%/images/units/undead/zombie-saurian-die-2.png
-%%DATADIR%%/images/units/undead/zombie-saurian-die-3.png
+%%DATADIR%%/images/units/undead/zombie-saurian-defend.png
 %%DATADIR%%/images/units/undead/zombie-saurian.png
 %%DATADIR%%/images/units/undead/zombie-swimmer-attack-n.png
 %%DATADIR%%/images/units/undead/zombie-swimmer-attack-s.png
 %%DATADIR%%/images/units/undead/zombie-swimmer-attack.png
-%%DATADIR%%/images/units/undead/zombie-swimmer-die-1.png
-%%DATADIR%%/images/units/undead/zombie-swimmer-die-2.png
-%%DATADIR%%/images/units/undead/zombie-swimmer-die-3.png
+%%DATADIR%%/images/units/undead/zombie-swimmer-defend.png
 %%DATADIR%%/images/units/undead/zombie-swimmer.png
 %%DATADIR%%/images/units/undead/zombie-troll-attack-n.png
 %%DATADIR%%/images/units/undead/zombie-troll-attack-s.png
 %%DATADIR%%/images/units/undead/zombie-troll-attack.png
-%%DATADIR%%/images/units/undead/zombie-troll-die-1.png
-%%DATADIR%%/images/units/undead/zombie-troll-die-2.png
-%%DATADIR%%/images/units/undead/zombie-troll-die-3.png
+%%DATADIR%%/images/units/undead/zombie-troll-defend.png
 %%DATADIR%%/images/units/undead/zombie-troll.png
 %%DATADIR%%/images/units/undead/zombie-wose-attack-n.png
 %%DATADIR%%/images/units/undead/zombie-wose-attack-s.png
 %%DATADIR%%/images/units/undead/zombie-wose-attack.png
+%%DATADIR%%/images/units/undead/zombie-wose-defend.png
 %%DATADIR%%/images/units/undead/zombie-wose-die-1.png
 %%DATADIR%%/images/units/undead/zombie-wose-die-2.png
 %%DATADIR%%/images/units/undead/zombie-wose-die-3.png
@@ -5479,6 +5493,30 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/images/units/woses/wose-attack-1.png
 %%DATADIR%%/images/units/woses/wose-attack-2.png
 %%DATADIR%%/images/units/woses/wose-defend.png
+%%DATADIR%%/images/units/woses/wose-die-decay-1.png
+%%DATADIR%%/images/units/woses/wose-die-decay-2.png
+%%DATADIR%%/images/units/woses/wose-die-decay-3.png
+%%DATADIR%%/images/units/woses/wose-die-decay-4.png
+%%DATADIR%%/images/units/woses/wose-die-decay-5.png
+%%DATADIR%%/images/units/woses/wose-die-decay-6.png
+%%DATADIR%%/images/units/woses/wose-die-decay-7.png
+%%DATADIR%%/images/units/woses/wose-die-decay-8.png
+%%DATADIR%%/images/units/woses/wose-die-decay-9.png
+%%DATADIR%%/images/units/woses/wose-die-fall-1.png
+%%DATADIR%%/images/units/woses/wose-die-fall-2.png
+%%DATADIR%%/images/units/woses/wose-die-fall-3.png
+%%DATADIR%%/images/units/woses/wose-die-fall-4.png
+%%DATADIR%%/images/units/woses/wose-die-fall-5.png
+%%DATADIR%%/images/units/woses/wose-die-fall-6.png
+%%DATADIR%%/images/units/woses/wose-die-fall-7.png
+%%DATADIR%%/images/units/woses/wose-die-fall-8.png
+%%DATADIR%%/images/units/woses/wose-die-fall-9.png
+%%DATADIR%%/images/units/woses/wose-die-fall-10.png
+%%DATADIR%%/images/units/woses/wose-die-fall-11.png
+%%DATADIR%%/images/units/woses/wose-die-fall-12.png
+%%DATADIR%%/images/units/woses/wose-die-fall-13.png
+%%DATADIR%%/images/units/woses/wose-die-fall-14.png
+%%DATADIR%%/images/units/woses/wose-die-fall-15.png
 %%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