3 files changed, 48 insertions, 25 deletions
diff --git a/games/widelands/README b/games/widelands/README
index 4c8fcc3f6e..c57c96549f 100644
--- a/games/widelands/README
+++ b/games/widelands/README
@@ -1,3 +1,5 @@
 Widelands is a strategy game based on Settlers II.
 
-Requires SDL_gfx, boost, and scons. Available at SlackBuilds.org.
+Requires SDL_gfx, p7zip and scons. If you want integration
+with the GGZ Gaming Zone you will also need ggz-base-libs.
+All available at SlackBuilds.org.
diff --git a/games/widelands/widelands.SlackBuild b/games/widelands/widelands.SlackBuild
index 534ce3bb60..e39f25eb7d 100644
--- a/games/widelands/widelands.SlackBuild
+++ b/games/widelands/widelands.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for widelands
 
-# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=widelands
-VERSION=build-12
+SRCNAM=Widelands
+SRCVER=Build14
+
+PRGNAM=$(echo $SRCNAM | tr [:upper:] [:lower:])
+VERSION=$(echo $SRCVER | tr [:upper:] [:lower:])
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,12 +36,17 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PKGVER=${VERSION/-/}
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  # we need to deviate from the standard cflags here, as -O2 results
+  # in a segfault
+  SLKCFLAGS="-O0 -fPIC"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -47,30 +55,41 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2
+7z x $CWD/$SRCNAM-$SRCVER-src.7z
 cd $PRGNAM
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-scons install_prefix="/usr" bindir="bin" extra_compile_flags="$(echo $SLKCFLAGS)"
+scons \
+  install_prefix="/usr" \
+  bindir="bin" \
+  datadir="share/games/widelands" \
+  localedir="share/locale" \
+  enable_ggz=${GGZ:-no} \
+  extra_compile_flags="$(echo $SLKCFLAGS)"
+
+scons \
+  install_prefix="$PKG/usr" \
+  bindir="bin" \
+  datadir="share/games/widelands" \
+  localedir="share/locale" \
+  enable_ggz=${GGZ:-no} \
+  extra_compile_flags="$(echo $SLKCFLAGS)" \
+  install
 
-# install_prefix is being ignored currently so everything gets installed in the
-# source directory. However as this might change in future versions, let's be careful here
-scons install_prefix="$TMP/$PRGNAM" bindir="bin" extra_compile_flags="$(echo $SLKCFLAGS)" install
+mkdir -p $PKG/usr/share/applications
+install -m 0644 $CWD/widelands.desktop $PKG/usr/share/applications/widelands.desktop
 
-install -D -s -m 0755 bin/widelands $PKG/usr/bin/widelands
-mv share* $PKG/usr/
-rm -rf $PKG/usr/share/games/widelands/doc*
-install -D -m 0644 $CWD/widelands.desktop $PKG/usr/share/applications/widelands.desktop
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
-cp -a ChangeLog COPYING CREDITS \
-  $PKG/usr/doc/$PRGNAM-$PKGVER
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/games/widelands/doc $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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-$PKGVER-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/widelands/widelands.info b/games/widelands/widelands.info
index 4bd4d046bf..1603a5f34e 100644
--- a/games/widelands/widelands.info
+++ b/games/widelands/widelands.info
@@ -1,8 +1,10 @@
 PRGNAM="widelands"
-VERSION="build12"
+VERSION="build14"
 HOMEPAGE="http://www.widelands.org"
-DOWNLOAD="http://downloads.sourceforge.net/widelands/widelands-build-12-source.tar.bz2"
-MD5SUM="1b551106e0f613f63abd7e6bdc9cebf6"
-MAINTAINER="ppr:kut"
+DOWNLOAD="http://downloads.sourceforge.net/widelands/Widelands-Build14-src.7z"
+MD5SUM="06d63783b82b68af7af26198bc0a5afa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"