games/wesnoth: Updated for version 1.4

4 files changed, 35 insertions, 24 deletions

diff --git a/games/wesnoth/README b/games/wesnoth/README
index 72426f898bcb..4895387ea974 100644
--- a/games/wesnoth/README
+++ b/games/wesnoth/README
@@ -5,10 +5,14 @@ fighters from races such as elves, dwarves, orcs, trolls, and more.
 It is a turn-based strategy game on a hexgrid with several challenging 
 single-player campaigns and different kind of multi-player matches. 
 
+Please note that Wesnoth now need boost to compile. A SlackBuild script for 
+boost is available at SlackBuilds.org
+
 If you want to compile the wesnothd server, you might want to add 
 the following switches to the wesnoth.Slackbuild script:
---with-server-uid=user
---with-server-gid=group
-
+  --enable-server
+  --enable-campaign-server
+  --with-server-uid=user
+  --with-server-gid=group
 and replace 'user' and 'group' with the UID and GID under which you want 
 the server to run.
diff --git a/games/wesnoth/slack-desc b/games/wesnoth/slack-desc
index 2d9310e789d0..9d403dea85a0 100644
--- a/games/wesnoth/slack-desc
+++ b/games/wesnoth/slack-desc
@@ -1,12 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
 wesnoth: Wesnoth (The Battle for Wesnoth)
 wesnoth:
-wesnoth: The Battle for Wesnoth is a turn-based strategy game set in a fantasy
-wesnoth: environment, where players can build an army of different kinds of 
-wesnoth: fighters from races such as elves, dwarves, orcs, trolls, and more. 
-wesnoth: It is a turn-based strategy game on a hexgrid with single-player 
-wesnoth: campaigns and multi-player matches.
+wesnoth: The Battle for Wesnoth is a turn-based strategy game set in a
+wesnoth: fantasy environment, where players can build an army of different
+wesnoth: kinds of fighters from races such as elves, dwarves, orcs, trolls,
+wesnoth: and more.  It is a turn-based strategy game on a hexgrid with 
+wesnoth: single-player campaigns and multi-player matches.
 wesnoth:
 wesnoth: Homepage: http://www.wesnoth.org
 wesnoth:
-
-
+wesnoth:
diff --git a/games/wesnoth/wesnoth.SlackBuild b/games/wesnoth/wesnoth.SlackBuild
index f5bcdc00731f..afb0c91bf5b7 100644
--- a/games/wesnoth/wesnoth.SlackBuild
+++ b/games/wesnoth/wesnoth.SlackBuild
@@ -6,10 +6,11 @@
 # Modified by the SlackBuilds.org project
 
 NAME=wesnoth
-VERSION=1.2.4
+VERSION=1.4
+ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-ARCH=${ARCH:-i486}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$NAME
@@ -28,20 +29,23 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$NAME-$VERSION
 cd $TMP || exit 1
-tar -xjvf $CWD/$NAME-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$NAME-$VERSION.tar.bz2 || exit 1
 cd $NAME-$VERSION || exit 1
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;  
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
   ./configure --prefix=/usr \
   --localstatedir=/var \
   --sysconfdir=/etc \
+  --docdir=/usr/doc/$NAME-$VERSION \
   --mandir=/usr/man \
   --enable-python \
-  --enable-server \
-  --enable-campaign-server \
   --enable-editor \
   --enable-tools \
   --disable-debug \
@@ -54,18 +58,14 @@ CXXFLAGS="$SLKCFLAGS" \
 make || exit 1
 make install-strip DESTDIR=$PKG || exit 1
 
-if [ -d $PKG/usr/man ]; then
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
-fi
 
 mkdir -p $PKG/usr/doc/$NAME-$VERSION
 cp -a $DOCFILES $PKG/usr/doc/$NAME-$VERSION
 cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
-sed -i 's#Icon=wesnoth-icon.png#Icon=/usr/share/icons/wesnoth-icon.png#' \
-  $PKG/usr/share/applications/$NAME.desktop
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/wesnoth/wesnoth.info b/games/wesnoth/wesnoth.info
index 5d2e356d666a..2cdae1c99856 100644
--- a/games/wesnoth/wesnoth.info
+++ b/games/wesnoth/wesnoth.info
@@ -1,8 +1,8 @@
 PRGNAM="wesnoth"
-VERSION="1.2.4"
+VERSION="1.4"
 HOMEPAGE="http://www.wesnoth.org"
-DOWNLOAD="http://dl.sourceforge.net/sourceforge/wesnoth/wesnoth-1.2.4.tar.bz2"
-MD5SUM="e24c9adb2fa6cc25759a0a1baf0585e8"
+DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.4.tar.bz2"
+MD5SUM="a2e8e4b32292f16842453e4c836429b2"  
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="elohim"
+APPROVED="David Somero"