games/wesnoth: Updated for version 1.7.11

3 files changed, 50 insertions, 25 deletions

diff --git a/games/wesnoth/README b/games/wesnoth/README
index 318317a88273..396e6e07e85b 100644
--- a/games/wesnoth/README
+++ b/games/wesnoth/README
@@ -5,13 +5,18 @@ 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. 
 
-If you want to compile the wesnothd server, you might want to add 
-the following switches to the wesnoth.Slackbuild script:
-  --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.
+If you want to compile the wesnothd server and campaign server you can 
+run the script as follows: 
 
-Wesnoth now requires boost, which is also available at SlackBuilds.org.
+SERVER=yes ./wesnoth.SlackBuild
+
+please note that the server UID and GID are not required at compile time but 
+will be required at runtime under the UID/GID specified in the buildscript. 
+You can create the user and group for the wesnoth server as follows:
+
+# groupadd -g 229 wesnoth
+# useradd -u 229 -d /dev/null -s /bin/false -g wesnoth wesnoth
+
+Wesnoth requires LUA to compile. A buildscript for lua is available
+at SlackBuilds.org
+    
diff --git a/games/wesnoth/wesnoth.SlackBuild b/games/wesnoth/wesnoth.SlackBuild
index 1282fa3cf5ad..b309ee0d2e36 100644
--- a/games/wesnoth/wesnoth.SlackBuild
+++ b/games/wesnoth/wesnoth.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SlackBuilid script for "Battle of Wesnoth". 
+# SlackBuilid script for "Battle of Wesnoth".
 
 # Copyright 2007-2009  Michiel van Wessem, Manchester, United Kingdom
 # All  rights reserved.
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wesnoth
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.7.11}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,31 +35,50 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+SERVER=${SERVER:-"no"}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""  
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 fi
 
+if [ "$SERVER" = "yes" ]; then
+  BUILDSERVER="\
+    --enable-campaign-server \
+    --enable-bandwidth-monitor \
+    --with-server-uid=${SERVER_UID:-"229"} \
+    --with-server-gid=${server_GID:-"229"} "
+elif [ "$SERVER" = "no" ]; then
+  BUILDSERVER="\
+    --disable-campaign-server \
+    --disable-bandwidth-monitor "
+fi
+
 set -e  # Exit on all errors.
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 
-cd $PRGNAM-$VERSION 
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 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 {} \;  
+  -exec chmod 644 {} \;
+
+# generate configure. While wesnoth now supports scons (yuck) and cmake. Neither
+# really works. Until the point that upstreams decide what they want to use, we're
+# going to stick with autotools.
+./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -70,20 +89,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-icondir=/usr/share/pixmaps \
   --enable-python \
   --enable-editor \
   --enable-tools \
+  --enable-server \
   --with-kde \
   --with-gnome \
+  $BUILDSERVER \
   --disable-debug \
   --build=$ARCH-slackware-linux
 
-make 
+make
 make install-strip DESTDIR=$PKG
 
-# Let's not pollute the toplevel /usr/share/icons
-mv $PKG/usr/share/icons $PKG/usr/share/pixmaps
-
 ( 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
@@ -99,4 +118,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/wesnoth/wesnoth.info b/games/wesnoth/wesnoth.info
index 9f022e290f83..c945ab10218f 100644
--- a/games/wesnoth/wesnoth.info
+++ b/games/wesnoth/wesnoth.info
@@ -1,9 +1,10 @@
 PRGNAM="wesnoth"
-VERSION="1.6.1"
+VERSION="1.7.11"
 HOMEPAGE="http://www.wesnoth.org"
-DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.6.1.tar.bz2"
-MD5SUM="6777ec9bfb44b1553a4b7dd2d12c0713"
+DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.7.11.tar.bz2"
+MD5SUM="3155761d45f692269af3b038366bc946"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="dsomero"
-
+APPROVED="Erik Hanson"