Update to 1.2.4:

Version 1.2.4:
 * campaigns:
   * Heir to the Throne
     * updated images for Delfador
   * Tutorial
     * merged all unit images used in the tutorial from httt
 * graphics:
   * fixed a missing frame for the white mage
   * improved the mage of light melee animation and changed its melee attack to
     "morning star"
   * improved the look of the main menu and tips of the day boxes in the
     title screen
   * tiles with overlays are also properly shown if compiled with
     --enable-tinygui (bug #8720 patch #697)
 * language and i18n:
   * updated manual: French
   * updated translations: Bulgarian, Danish, Dutch, Esperanto, French, German,
     Greek, Italian, Portuguese (Brazil), Serbian, Slovak, Spanish, Swedish
   * updated DejaVuSans font to version 2.16
 * multiplayer maps:
   * revised maps: Blitz, Wilderlands
 * WML:
   * fixed the fire dragon die sound in TROW
   * fixed many agression->aggression typos
   * fixed [special_filter] not working properly (#8212)
 * Python AI:
   * backported safe AI from 1.3, so you can no longer use import, builtin
     statements, or access to internal variables in AI scripts
   * fixed bugs where movement maps weren't updated after recruiting (bug #8802)
     and where some unit type properties where always false (like regenerate or
     heals)
 * misc:
   * observer can save a replay of the game again
   * fixed beginning-of-scenario saves containing scenario WML (bug #8698)
   * fixed autosaves not getting deleted for last campaign scenario and
     multiplayer (bug #8762)
   * fixed reload from mp savegame problem (bug #8796)
   * used valgrind to find some memory problems fixes bug #8715, bug #8756 and
     bug #8839
   * fixed Ethiliel not showing up in the scenario "Vengeance" of TSG
   * with a move attack action if the moveto event moves the defender Wesnoth
     would crash (part 1 of bug #8882)

3 files changed, 36 insertions, 28 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index c5390764831..6b3860ff825 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2007/04/08 17:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2007/04/18 23:25:51 wiz Exp $
 
-DISTNAME=	wesnoth-1.2.3
+DISTNAME=	wesnoth-1.2.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST
index cfb643f4b40..b3e15c372e5 100644
--- a/games/wesnoth/PLIST
+++ b/games/wesnoth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2007/04/08 17:59:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2007/04/18 23:25:51 wiz Exp $
 bin/wesnoth
 bin/wmlxgettext
 man/cs/man6/wesnoth.6
@@ -10,11 +10,14 @@ man/ja/man6/wesnoth.6
 man/man6/wesnoth.6
 man/nl/man6/wesnoth.6
 man/pt_BR/man6/wesnoth.6
+man/ru/man6/wesnoth.6
 man/sk/man6/wesnoth.6
 man/sv/man6/wesnoth.6
 share/wesnoth/data/COPYING.txt
 share/wesnoth/data/abilities.cfg
 share/wesnoth/data/about.cfg
+share/wesnoth/data/ais/parse.py
+share/wesnoth/data/ais/safe.py
 share/wesnoth/data/ais/sample.py
 share/wesnoth/data/amla.cfg
 share/wesnoth/data/animation-utils.cfg
@@ -133,13 +136,11 @@ share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/cockatrice-attack13
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/cockatrice-defend.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/cockatrice.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-defend.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-1.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-2.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-3.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-4.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-5.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-6.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee1.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee2.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged1.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged2.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged3.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elder-mage.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elvish-high-lord-attack-sword-1.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/elvish-high-lord-attack-sword-2.png
@@ -1334,17 +1335,18 @@ share/wesnoth/data/tutorial/images/portraits/delfador.png
 share/wesnoth/data/tutorial/images/portraits/konrad.png
 share/wesnoth/data/tutorial/images/portraits/lisar.png
 share/wesnoth/data/tutorial/images/units/elder-mage-defend.png
-share/wesnoth/data/tutorial/images/units/elder-mage-melee-1.png
-share/wesnoth/data/tutorial/images/units/elder-mage-melee-2.png
-share/wesnoth/data/tutorial/images/units/elder-mage-melee-3.png
-share/wesnoth/data/tutorial/images/units/elder-mage-melee-4.png
-share/wesnoth/data/tutorial/images/units/elder-mage-melee-5.png
-share/wesnoth/data/tutorial/images/units/elder-mage-melee-6.png
-share/wesnoth/data/tutorial/images/units/elder-mage-ranged.png
+share/wesnoth/data/tutorial/images/units/elder-mage-melee1.png
+share/wesnoth/data/tutorial/images/units/elder-mage-melee2.png
+share/wesnoth/data/tutorial/images/units/elder-mage-ranged1.png
+share/wesnoth/data/tutorial/images/units/elder-mage-ranged2.png
+share/wesnoth/data/tutorial/images/units/elder-mage-ranged3.png
 share/wesnoth/data/tutorial/images/units/elder-mage.png
-share/wesnoth/data/tutorial/images/units/human-junior-princess-attack.png
-share/wesnoth/data/tutorial/images/units/human-junior-princess-defend.png
-share/wesnoth/data/tutorial/images/units/human-junior-princess.png
+share/wesnoth/data/tutorial/images/units/human-princess-attack-1.png
+share/wesnoth/data/tutorial/images/units/human-princess-attack-2.png
+share/wesnoth/data/tutorial/images/units/human-princess-attack-3.png
+share/wesnoth/data/tutorial/images/units/human-princess-attack-4.png
+share/wesnoth/data/tutorial/images/units/human-princess-defend.png
+share/wesnoth/data/tutorial/images/units/human-princess.png
 share/wesnoth/data/tutorial/images/units/konrad-fighter-attack-1.png
 share/wesnoth/data/tutorial/images/units/konrad-fighter-attack-2.png
 share/wesnoth/data/tutorial/images/units/konrad-fighter-defend.png
@@ -4343,16 +4345,20 @@ share/wesnoth/images/units/human-magi/silver-mage-teleport7.png
 share/wesnoth/images/units/human-magi/silver-mage-teleport8.png
 share/wesnoth/images/units/human-magi/silver-mage-teleport9.png
 share/wesnoth/images/units/human-magi/silver-mage.png
-share/wesnoth/images/units/human-magi/white-cleric+female-attack-melee1.png
-share/wesnoth/images/units/human-magi/white-cleric+female-attack-melee2.png
 share/wesnoth/images/units/human-magi/white-cleric+female-defend.png
+share/wesnoth/images/units/human-magi/white-cleric+female-mace-1.png
+share/wesnoth/images/units/human-magi/white-cleric+female-mace-2.png
+share/wesnoth/images/units/human-magi/white-cleric+female-mace-3.png
+share/wesnoth/images/units/human-magi/white-cleric+female-mace-4.png
 share/wesnoth/images/units/human-magi/white-cleric+female-magic-1.png
 share/wesnoth/images/units/human-magi/white-cleric+female-magic-2.png
 share/wesnoth/images/units/human-magi/white-cleric+female-magic-3.png
 share/wesnoth/images/units/human-magi/white-cleric+female.png
-share/wesnoth/images/units/human-magi/white-cleric-attack-melee1.png
-share/wesnoth/images/units/human-magi/white-cleric-attack-melee2.png
 share/wesnoth/images/units/human-magi/white-cleric-defend.png
+share/wesnoth/images/units/human-magi/white-cleric-mace-1.png
+share/wesnoth/images/units/human-magi/white-cleric-mace-2.png
+share/wesnoth/images/units/human-magi/white-cleric-mace-3.png
+share/wesnoth/images/units/human-magi/white-cleric-mace-4.png
 share/wesnoth/images/units/human-magi/white-cleric-magic-1.png
 share/wesnoth/images/units/human-magi/white-cleric-magic-2.png
 share/wesnoth/images/units/human-magi/white-cleric-magic-3.png
@@ -6060,6 +6066,8 @@ share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth.mo
 @unexec ${RMDIR} %D/man/sv 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/man/sk/man6 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/man/sk 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/man/ru/man6 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/man/ru 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/man/pt_BR/man6 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/man/pt_BR 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/man/nl/man6 2>/dev/null || ${TRUE}
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 1925b8e3471..08948e52aaf 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2007/04/08 17:59:40 wiz Exp $
+$NetBSD: distinfo,v 1.23 2007/04/18 23:25:51 wiz Exp $
 
-SHA1 (wesnoth-1.2.3.tar.bz2) = 707645fbfec9477aa73d1119b021725a3ec32faf
-RMD160 (wesnoth-1.2.3.tar.bz2) = 6d7d4b3bdc426bb0d24fc060e7e56c78dfeadc7d
-Size (wesnoth-1.2.3.tar.bz2) = 68108143 bytes
+SHA1 (wesnoth-1.2.4.tar.bz2) = 46eb0b875084657d200d46e0cac198079236d21f
+RMD160 (wesnoth-1.2.4.tar.bz2) = a5164efb8918e1f9d06dc868af1a86d294cb82bb
+Size (wesnoth-1.2.4.tar.bz2) = 68604047 bytes
 SHA1 (patch-aa) = 81e6dfe9c61209f66e3807ec0608be26ade344d0
 SHA1 (patch-ab) = ec6b1090fc18e6c60b6fc7b32894506a72f1f10b