wesnoth: 1.4.1 -> 1.4.2

4 files changed, 67 insertions, 26 deletions

diff --git a/wesnoth/.footprint b/wesnoth/.footprint
index 3479fd6e6..1dd763a14 100644
--- a/wesnoth/.footprint
+++ b/wesnoth/.footprint
@@ -1674,6 +1674,16 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/ima
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dread-lich.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-attack.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-defend.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-ne-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-ne-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-ne-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-ne-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-ne-5.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-se-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-se-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-se-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-se-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat-se-5.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dreadbat.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/skeletonrider-attack1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/skeletonrider-attack2.png
@@ -2171,6 +2181,7 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/items/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/items/straw-bale1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/items/straw-bale2.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/maps/
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/maps/mainmenu.jpg
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/maps/mainmenu.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/maps/wesnoth-httt.jpg
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/maps/wesnoth.png
@@ -4603,8 +4614,23 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/shyde-healing8.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/shyde-healing9.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/shyde.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-defend-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-defend-2.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-defend.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-magic-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-magic-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-magic-3.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-magic.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-10.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-5.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-6.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-7.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-8.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-9.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress-melee.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sorceress.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/elves-wood/sylph-defend.png
@@ -5277,6 +5303,7 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/human-outlaws/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-attack1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-attack2.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-attack3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-attack4.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-defend-1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-defend-2.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-outlaws/ranger-sword.png
@@ -5985,6 +6012,10 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/banebow-bow-attack-4.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/banebow-bow-defend.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/banebow-bow.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-attack-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-attack-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-attack-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-attack-4.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-attack.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-defend-1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-defend-2.png
@@ -5995,6 +6026,10 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bow-attack-4.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bow-defend.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bow.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-attack-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-attack-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-attack-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-attack-4.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-attack.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-defend-1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-defend-2.png
diff --git a/wesnoth/.md5sum b/wesnoth/.md5sum
index 7c44afc66..d91f6d710 100644
--- a/wesnoth/.md5sum
+++ b/wesnoth/.md5sum
@@ -1 +1 @@
-a357fcba2f2055ce112f25941a681374  wesnoth-1.4.1.tar.bz2
+b494b7600f4058796e8c91a46c4dbbf1  wesnoth-1.4.2.tar.bz2
diff --git a/wesnoth/Pkgfile b/wesnoth/Pkgfile
index acfda957a..c4d6fff61 100644
--- a/wesnoth/Pkgfile
+++ b/wesnoth/Pkgfile
@@ -5,24 +5,25 @@
 # Depends on: xorg-libx11 sdl_image sdl_mixer sdl_net freetype boost
 
 name=wesnoth
-version=1.4.1
+version=1.4.2
 release=1
 source=(http://dl.sourceforge.net/sourceforge/wesnoth/wesnoth-$version.tar.bz2)
 
 build() {
 	cd wesnoth-$version
+	rm po/*/*.po
 
-		if pkginfo -i |grep '^kdebase ' > /dev/null; then
-			local configure='--with-kde'
-		fi
+	sed -i \
+		-e 's/USE_NLS=yes/USE_NLS=no/' \
+		-e 's/ENABLE_NLS 1/ENABLE_NLS 0/' configure
 
-		if pkginfo -i |grep '^kdebase3 ' > /dev/null; then
-			local configure='--with-kde'
-		fi
+	if pkginfo -i |grep '^kdebase ' > /dev/null; then
+		local configure='--with-kde'
+	fi
 
-		if pkginfo -i |grep '^gnome ' > /dev/null; then
-			local configure='--with-gnome'
-		fi
+	if pkginfo -i |grep '^gnome ' > /dev/null; then
+		local configure='--with-gnome'
+	fi
 
 	./configure \
 		--prefix=/usr \
diff --git a/wesnoth/pre-install b/wesnoth/pre-install
index bee82a9ff..32bc34693 100644
--- a/wesnoth/pre-install
+++ b/wesnoth/pre-install
@@ -2,35 +2,40 @@
 
 . /etc/pkgmk.conf
 . Pkgfile
+OLD_VERSION='1.4.1'
 
 [ -z "$PKGMK_WORK_DIR" ] && PKGMK_WORK_DIR="$PWD/work"
 [ -z "$PKGMK_SOURCE_DIR" ] && PKGMK_SOURCE_DIR="$PWD"
 
-if [ -e "$PKGMK_SOURCE_DIR/wesnoth-1.4.1.tar.bz2" ]; then
+if [ -e "$PKGMK_SOURCE_DIR/wesnoth-$version.tar.bz2" ]; then
 	echo 'you have the lateist source file'
 	exit 0
 fi
 
-if [ -n "`pkginfo -i | grep 'xdelta '`" ]; then
-	if [ -e "$PKGMK_SOURCE_DIR/wesnoth-1.4.tar.bz2" ]; then
+if [ -n "`pkginfo -i | egrep '^xdelta '`" ]; then
+	if [ -e "$PKGMK_SOURCE_DIR/wesnoth-$OLD_VERSION.tar.bz2" ]; then
 
-		mkdir -p $PKGMK_WORK_DIR
-		cd $PKGMK_WORK_DIR
+		if [ ! -e "$PKGMK_WORK_DIR" ]; then
+			mkdir -p "$PKGMK_WORK_DIR"
+		fi
+		cd "$PKGMK_WORK_DIR"
 
-		[ ! -e "$PKGMK_SOURCE_DIR/wesnoth-1.4.tar-wesnoth-1.4.1.tar.xdelta" ] && wget http://optusnet.dl.sourceforge.net/sourceforge/wesnoth/wesnoth-1.4.tar-wesnoth-1.4.1.tar.xdelta -O $PKGMK_SOURCE_DIR/ 
+		if [ ! -e "$PKGMK_SOURCE_DIR/wesnoth-$OLD_VERSION.tar-wesnoth-$version.tar.xdelta" ]; then
+			wget http://optusnet.dl.sourceforge.net/sourceforge/wesnoth/wesnoth-$OLD_VERSION.tar-wesnoth-$version.tar.xdelta --directory-prefix=$PKGMK_SOURCE_DIR
+		fi
 
-		cp $PKGMK_SOURCE_DIR/wesnoth-1.4.tar.bz2 .
-		cp $PKGMK_SOURCE_DIR/wesnoth-1.4.tar-wesnoth-1.4.1.tar.xdelta .
-		bzip2 -d wesnoth-1.4.tar.bz2
+		cp $PKGMK_SOURCE_DIR/wesnoth-$OLD_VERSION.tar.bz2 .
+		cp $PKGMK_SOURCE_DIR/wesnoth-$OLD_VERSION.tar-wesnoth-$version.tar.xdelta .
+		bzip2 -d wesnoth-$OLD_VERSION.tar.bz2
 		echo 'patching, this may take some time'
-		xdelta patch wesnoth-1.4.tar-wesnoth-1.4.1.tar.xdelta
-		rm wesnoth-1.4.tar
-		mv wesnoth-1.4.tar-wesnoth-1.4.1.tar.xdelta $PKGMK_SOURCE_DIR/
+		xdelta patch wesnoth-$OLD_VERSION.tar-wesnoth-$version.tar.xdelta
+		rm wesnoth-$OLD_VERSION.tar
+		mv wesnoth-$OLD_VERSION.tar-wesnoth-$version.tar.xdelta $PKGMK_SOURCE_DIR/
 		echo 'recompressing patched source'
-		bzip2 -9 wesnoth-1.4.1.tar
-		mv wesnoth-1.4.1.tar.bz2 $PKGMK_SOURCE_DIR/
+		bzip2 -9 wesnoth-$version.tar
+		mv wesnoth-$version.tar.bz2 $PKGMK_SOURCE_DIR/
 	else
-		echo "wesnoth-1.4.tar.bz2 not found proceed to run Pkgfile."
+		echo "wesnoth-$OLD_VERSION.tar.bz2 not found proceed to run Pkgfile."
 		exit 0
 	fi
 else