diff -uNr --exclude=CVS ../games/wesnoth/Makefile wesnoth/Makefile
--- ../games/wesnoth/Makefile	Sat Mar 17 19:59:31 2007
+++ wesnoth/Makefile	Tue Jul  3 09:27:41 2007
@@ -2,7 +2,7 @@
 
 COMMENT=	"fantasy turn-based strategy game"
 
-DISTNAME=	wesnoth-1.2.3
+DISTNAME=	wesnoth-1.2.5
 CATEGORIES=	games x11
 
 HOMEPAGE=	http://www.wesnoth.org/
@@ -18,7 +18,7 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	X11 Xext c freetype m stdc++ pthread usbhid
+WANTLIB=	X11 Xext c freetype m stdc++ pthread usbhid z
 
 USE_LIBTOOL=	Yes
 LIB_DEPENDS=	SDL::devel/sdl \
diff -uNr --exclude=CVS ../games/wesnoth/distinfo wesnoth/distinfo
--- ../games/wesnoth/distinfo	Thu Apr  5 19:38:12 2007
+++ wesnoth/distinfo	Tue Jul  3 04:43:18 2007
@@ -1,5 +1,5 @@
-MD5 (wesnoth-1.2.3.tar.bz2) = lOBRqCvggOf2kEC0LEa6LA==
-RMD160 (wesnoth-1.2.3.tar.bz2) = bX1LO9xCa7DST8Bg5+VseN/q3H0=
-SHA1 (wesnoth-1.2.3.tar.bz2) = cHZF+/7JR3qnPREZsCFyWj7DL68=
-SHA256 (wesnoth-1.2.3.tar.bz2) = Xqyrw1S+6OXCndeLQsKO0g/mfjn6y+q2mfxKpzkUiDw=
-SIZE (wesnoth-1.2.3.tar.bz2) = 68108143
+MD5 (wesnoth-1.2.5.tar.bz2) = QOAKyXaA+2lJkZHDDxMHdA==
+RMD160 (wesnoth-1.2.5.tar.bz2) = 7q6SuAGj04hbZkeWVTf/BF2T1Kc=
+SHA1 (wesnoth-1.2.5.tar.bz2) = h+C3equjotDNo5HKHsCuAo2DncU=
+SHA256 (wesnoth-1.2.5.tar.bz2) = jhvKtxZb1er4wdLu8PzgOoyB2viFmD3A/aaJmBAOjNA=
+SIZE (wesnoth-1.2.5.tar.bz2) = 68758427
diff -uNr --exclude=CVS ../games/wesnoth/pkg/PLIST wesnoth/pkg/PLIST
--- ../games/wesnoth/pkg/PLIST	Sat Mar 17 19:59:31 2007
+++ wesnoth/pkg/PLIST	Tue Jul  3 05:12:57 2007
@@ -3,7 +3,6 @@
 bin/wesnoth
 bin/wesnoth_editor
 bin/wesnothd
-bin/wmlxgettext
 man/cs/
 man/cs/man6/
 @man man/cs/man6/wesnoth.6
@@ -48,6 +47,11 @@
 @man man/pt_BR/man6/wesnoth.6
 @man man/pt_BR/man6/wesnoth_editor.6
 @man man/pt_BR/man6/wesnothd.6
+man/ru/
+man/ru/man6/
+@man man/ru/man6/wesnoth.6
+@man man/ru/man6/wesnoth_editor.6
+@man man/ru/man6/wesnothd.6
 man/sk/
 man/sk/man6/
 @man man/sk/man6/wesnoth.6
@@ -64,6 +68,8 @@
 share/wesnoth/data/abilities.cfg
 share/wesnoth/data/about.cfg
 share/wesnoth/data/ais/
+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
@@ -187,13 +193,11 @@
 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
@@ -793,6 +797,17 @@
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/misc/time/8morning2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/misc/time/9midday2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-guardian.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter-defend-both.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter-defend-melee.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter-moving-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter-moving-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter-moving-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter-ranged-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter-ranged-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter-ranged-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter-ranged-4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter-ranged-5.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter-ranged-6.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-hunter.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-sentinel.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/naga-warden.png
@@ -1442,17 +1457,18 @@
 share/wesnoth/data/tutorial/images/portraits/lisar.png
 share/wesnoth/data/tutorial/images/units/
 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
@@ -4225,6 +4241,7 @@
 share/wesnoth/images/units/human-loyalists/general-attack-crossbow.png
 share/wesnoth/images/units/human-loyalists/general-attack-sword1.png
 share/wesnoth/images/units/human-loyalists/general-attack-sword2.png
+share/wesnoth/images/units/human-loyalists/general-defend-crossbow.png
 share/wesnoth/images/units/human-loyalists/general-defend.png
 share/wesnoth/images/units/human-loyalists/general-leading.png
 share/wesnoth/images/units/human-loyalists/general.png
@@ -4486,16 +4503,20 @@
 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
@@ -5148,14 +5169,11 @@
 share/wesnoth/images/units/undead-skeletal/deathknight.png
 share/wesnoth/images/units/undead-skeletal/draug-attack1.png
 share/wesnoth/images/units/undead-skeletal/draug-attack2.png
-share/wesnoth/images/units/undead-skeletal/draug-defend.png
-share/wesnoth/images/units/undead-skeletal/draug-die-1.png
-share/wesnoth/images/units/undead-skeletal/draug-die-2.png
+share/wesnoth/images/units/undead-skeletal/draug-defend-1.png
+share/wesnoth/images/units/undead-skeletal/draug-defend-2.png
 share/wesnoth/images/units/undead-skeletal/draug.png
 share/wesnoth/images/units/undead-skeletal/revenant-attack.png
 share/wesnoth/images/units/undead-skeletal/revenant-defend.png
-share/wesnoth/images/units/undead-skeletal/revenant-dying-2.png
-share/wesnoth/images/units/undead-skeletal/revenant-dying.png
 share/wesnoth/images/units/undead-skeletal/revenant.png
 share/wesnoth/images/units/undead-skeletal/skeleton-attack.png
 share/wesnoth/images/units/undead-skeletal/skeleton-attackb.png
