2 files changed, 29 insertions, 36 deletions
diff --git a/games/wesnoth/wesnoth.SlackBuild b/games/wesnoth/wesnoth.SlackBuild
index 9c8ab03f75..a6e7c4d180 100644
--- a/games/wesnoth/wesnoth.SlackBuild
+++ b/games/wesnoth/wesnoth.SlackBuild
@@ -3,7 +3,7 @@
 # SlackBuild script for "Battle of Wesnoth".
 
 # Copyright 2007-2010  Michiel van Wessem, Manchester, United Kingdom
-# Copyright 2010-2013 Willy Sudiarto Raharjo, Jogja, Indonesia (willysr@slackware-id.org)
+# Copyright 2010-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All  rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wesnoth
-VERSION=${VERSION:-1.10.7}
+VERSION=${VERSION:-1.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,56 +60,49 @@ else
 fi
 
 if [ "$SERVER" = "yes" ]; then
-  BUILDSERVER="\
-    -DENABLE_CAMPAIGN_SERVER=yes \
-    -DSERVER_UID=229 \
-    -DSERVER_GID=229 "
+    OPT_SERVER="enable-server enable-campaign-server with-server-uid=229 with-server-gid=229"
 fi
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
+rm -rf $TMP/$PRGNAM-$VERSION.0
 cd $TMP
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION.0
 
 # This patch should be enabled when you used GCC 4.7.0 or above
 patch -p0 < $CWD/terrain_translation.patch
 
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-
-# Fix build problem on future GCC 4.8.0
-sed -i 's/-Werror//' CMakeLists.txt
-
-cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMANDIR=/usr/man \
- -DENABLE_TOOLS=On \
- $BUILDSERVER \
-.
-
-make
-make install DESTDIR=$PKG
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+scons \
+ CXXFLAGS="$SLKCFLAGS" \
+ CFLAGS="$SLKCFLAGS" \
+ prefix=/usr \
+ libdir=/usr/lib${LIBDIRSUFFIX} \
+ datadir=/usr/share/wesnoth \
+ docdir=/usr/doc/$PRGNAM-$VERSION \
+ mandir=/usr/man \
+ build=release \
+ icondir=/usr/share/icons \
+ desktopdir=/usr/share/applications \
+ $OPT_SERVER \
+ all
+
+scons install destdir=$PKG
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING INSTALL RELEASE_NOTES changelog copyright \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING INSTALL RELEASE_NOTES changelog copyright $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir $PKG/install
diff --git a/games/wesnoth/wesnoth.info b/games/wesnoth/wesnoth.info
index 39c1bd5380..0037daa5d3 100644
--- a/games/wesnoth/wesnoth.info
+++ b/games/wesnoth/wesnoth.info
@@ -1,10 +1,10 @@
 PRGNAM="wesnoth"
-VERSION="1.10.7"
+VERSION="1.12"
 HOMEPAGE="http://www.wesnoth.org"
-DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.10.7.tar.bz2"
-MD5SUM="3f460a494530d32aa5d5d0f19c95efbd"
+DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.12.tar.bz2"
+MD5SUM="1fa1a43cb7f6f1664c36d7e4c1eedc01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua"
+REQUIRES="scons"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"