3 files changed, 27 insertions, 37 deletions
diff --git a/games/supertux/supertux-gcc4.2.patch b/games/supertux/supertux-gcc4.2.patch
deleted file mode 100644
index 5168cc0bf1..0000000000
--- a/games/supertux/supertux-gcc4.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur supertux-0.1.3.orig/src/menu.h supertux-0.1.3/src/menu.h
---- supertux-0.1.3.orig/src/menu.h	2005-06-21 23:16:07.000000000 +0200
-+++ supertux-0.1.3/src/menu.h	2008-08-16 01:48:12.000000000 +0200
-@@ -207,7 +207,7 @@
- 
-   bool isToggled(int id);
- 
--  void Menu::get_controlfield_key_into_input(MenuItem *item);
-+  void get_controlfield_key_into_input(MenuItem *item);
- 
-   void draw   ();
-   void draw_item(int index, int menu_width, int menu_height);
diff --git a/games/supertux/supertux.SlackBuild b/games/supertux/supertux.SlackBuild
index 19386fd63c..72e00c5c77 100644
--- a/games/supertux/supertux.SlackBuild
+++ b/games/supertux/supertux.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for supertux
 
-# Copyright 2006-2011  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2011,2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=supertux
-VERSION=0.1.3
+VERSION=${VERSION:-0.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,12 +42,16 @@ OUTPUT=${OUTPUT:-/tmp}
 
 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
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -65,31 +69,29 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# gcc4 compile patch
-patch -p1 < $CWD/supertux-gcc4.2.patch
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --with-x \
-  --program-prefix="" \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DINSTALL_SUBDIR_BIN=bin \
+    -DINSTALL_SUBDIR_SHARE=share/$PRGNAM \
+    -DINSTALL_SUBDIR_DOC=doc/$PRGNAM-$VERSION \
+    -DLIB_SUBDIR=lib${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 # Fix path to icon in .desktop file
 sed -i s%'Icon=supertux.png'%'Icon=supertux'%g \
-  $PKG/usr/share/applications/supertux.desktop
+  $PKG/usr/share/applications/supertux2.desktop
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL LEVELDESIGN \
-  NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION/
+# Docs are already installed by the build system
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/supertux/supertux.info b/games/supertux/supertux.info
index d16ac8d4e1..299d644b04 100644
--- a/games/supertux/supertux.info
+++ b/games/supertux/supertux.info
@@ -1,10 +1,10 @@
 PRGNAM="supertux"
-VERSION="0.1.3"
-HOMEPAGE="http://sourceforge.net/projects/supertux.berlios/"
-DOWNLOAD="http://sourceforge.net/projects/supertux.berlios/files/supertux-0.1.3.tar.bz2"
-MD5SUM="f2fc288459f33d5cd8f645fbca737a63"
+VERSION="0.4.0"
+HOMEPAGE="https://github.com/SuperTux/supertux"
+DOWNLOAD="https://github.com/SuperTux/supertux/releases/download/v0.4.0/supertux-0.4.0.tar.bz2"
+MD5SUM="8acc3aa1077f0da95c99fdd5f4925088"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="SDL2_image OpenAL physfs"
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"