3 files changed, 31 insertions, 27 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 5eb01b6ca7dd..095fbcc4eecb 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTVERSION=	1.2.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.wesnoth.org/files/
@@ -16,7 +15,7 @@ MASTER_SITE_SUBDIR=	wesnoth
 MAINTAINER=	philip@FreeBSD.org
 COMMENT=	A fantasy turn-based strategy game
 
-USE_GCC=	3.4
+USE_GCC=	3.4+
 USE_SDL=	image mixer net
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index cd9466e35af4..f9b40a28a9b3 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,3 +1,3 @@
-MD5 (wesnoth-1.2.3.tar.bz2) = 94e051a82be080e7f69040b42c46ba2c
-SHA256 (wesnoth-1.2.3.tar.bz2) = 5eacabc354bee8e5c29dd78b42c28ed20fe67e39facbeab699fc4aa73914883c
-SIZE (wesnoth-1.2.3.tar.bz2) = 68108143
+MD5 (wesnoth-1.2.4.tar.bz2) = e24c9adb2fa6cc25759a0a1baf0585e8
+SHA256 (wesnoth-1.2.4.tar.bz2) = f87e0716f93da56b4c918a0150e865ed310848d7dc4f893e7fe6bd378f616163
+SIZE (wesnoth-1.2.4.tar.bz2) = 68604047
diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist
index 9a61dd016a9d..bfa11432a6e7 100644
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist
@@ -378,6 +378,8 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/COPYING.txt
 %%DATADIR%%/data/abilities.cfg
 %%DATADIR%%/data/about.cfg
+%%DATADIR%%/data/ais/parse.py
+%%DATADIR%%/data/ais/safe.py
 %%DATADIR%%/data/ais/sample.py
 %%DATADIR%%/data/amla.cfg
 %%DATADIR%%/data/animation-utils.cfg
@@ -496,13 +498,11 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/cockatrice-defend.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/cockatrice.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-defend.png
-%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-1.png
-%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-2.png
-%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-3.png
-%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-4.png
-%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-5.png
-%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee-6.png
-%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged.png
+%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged1.png
+%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged2.png
+%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged3.png
+%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee1.png
+%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee2.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elder-mage.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elvish-high-lord-attack-sword-1.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/elvish-high-lord-attack-sword-2.png
@@ -1697,17 +1697,18 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 %%DATADIR%%/data/tutorial/images/portraits/konrad.png
 %%DATADIR%%/data/tutorial/images/portraits/lisar.png
 %%DATADIR%%/data/tutorial/images/units/elder-mage-defend.png
-%%DATADIR%%/data/tutorial/images/units/elder-mage-melee-1.png
-%%DATADIR%%/data/tutorial/images/units/elder-mage-melee-2.png
-%%DATADIR%%/data/tutorial/images/units/elder-mage-melee-3.png
-%%DATADIR%%/data/tutorial/images/units/elder-mage-melee-4.png
-%%DATADIR%%/data/tutorial/images/units/elder-mage-melee-5.png
-%%DATADIR%%/data/tutorial/images/units/elder-mage-melee-6.png
-%%DATADIR%%/data/tutorial/images/units/elder-mage-ranged.png
 %%DATADIR%%/data/tutorial/images/units/elder-mage.png
-%%DATADIR%%/data/tutorial/images/units/human-junior-princess-attack.png
-%%DATADIR%%/data/tutorial/images/units/human-junior-princess-defend.png
-%%DATADIR%%/data/tutorial/images/units/human-junior-princess.png
+%%DATADIR%%/data/tutorial/images/units/elder-mage-ranged1.png
+%%DATADIR%%/data/tutorial/images/units/elder-mage-ranged2.png
+%%DATADIR%%/data/tutorial/images/units/elder-mage-ranged3.png
+%%DATADIR%%/data/tutorial/images/units/human-princess-defend.png
+%%DATADIR%%/data/tutorial/images/units/elder-mage-melee1.png
+%%DATADIR%%/data/tutorial/images/units/elder-mage-melee2.png
+%%DATADIR%%/data/tutorial/images/units/human-princess-attack-1.png
+%%DATADIR%%/data/tutorial/images/units/human-princess-attack-2.png
+%%DATADIR%%/data/tutorial/images/units/human-princess-attack-3.png
+%%DATADIR%%/data/tutorial/images/units/human-princess-attack-4.png
+%%DATADIR%%/data/tutorial/images/units/human-princess.png
 %%DATADIR%%/data/tutorial/images/units/konrad-fighter-attack-1.png
 %%DATADIR%%/data/tutorial/images/units/konrad-fighter-attack-2.png
 %%DATADIR%%/data/tutorial/images/units/konrad-fighter-defend.png
@@ -4706,16 +4707,20 @@ 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-melee1.png
-%%DATADIR%%/images/units/human-magi/white-cleric+female-attack-melee2.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-mace-1.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-mace-2.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-mace-3.png
+%%DATADIR%%/images/units/human-magi/white-cleric+female-mace-4.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.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-mace-1.png
+%%DATADIR%%/images/units/human-magi/white-cleric-mace-2.png
+%%DATADIR%%/images/units/human-magi/white-cleric-mace-3.png
+%%DATADIR%%/images/units/human-magi/white-cleric-mace-4.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