4 files changed, 53 insertions, 45 deletions
diff --git a/games/pioneer/README b/games/pioneer/README
index 104a41ee2c..dfa126ae20 100644
--- a/games/pioneer/README
+++ b/games/pioneer/README
@@ -8,4 +8,20 @@ hand at piracy, make your fortune trading between systems, or do missions for
 the various factions fighting for power, freedom or self-determination.
 
 OpenGL core profile version 3.1 or newer is a runtime dependency, to determine
-what version of OpenGL is installed use: glxinfo | grep "core profile version"
+what version of OpenGL is installed use:
+
+  glxinfo | grep "core profile version"
+
+Pioneer's game data is by default installed in /usr/share/games and will take
+up around 400M of hard drive space. This SlackBuild allows choosing an alternate
+game data directory to install in, to do this use:
+
+  DATADIR=/path/to/data ./pioneer.SlackBuild
+
+For example to install the data to /opt/pioneer use:
+
+  DATADIR=/opt ./pioneer.SlackBuild
+
+To build with debugging support use:
+
+  DEBUG="yes" ./pioneer.SlackBuild
diff --git a/games/pioneer/pioneer.SlackBuild b/games/pioneer/pioneer.SlackBuild
index 97881b45fe..4af1bf35a2 100644
--- a/games/pioneer/pioneer.SlackBuild
+++ b/games/pioneer/pioneer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Pioneer
 
-# Copyright 2015 Hunter Sezen California, USA
+# Copyright 2015-2016 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pioneer
-VERSION=${VERSION:-20151214}
+VERSION=${VERSION:-20160814}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,71 +69,63 @@ 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 {} \;
 
+DATADIR=${DATADIR:-/usr/share/games}
+
+if [ "${DEBUG:-no}" = "yes" ]; then
+  debug="--enable-debug \
+         --with-no-optimise \
+         --with-fno-inline"
+  SLKCFLAGS=$(echo $SLKCFLAGS | sed 's/-O2/-O0/')
+else
+  debug="--with-strip"
+fi
+
 # Generate the configure file
 ./bootstrap
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+PIONEER_DATA_DIR="$DATADIR/$PRGNAM" \
 ./configure \
-  --prefix=/opt/$PRGNAM-$VERSION \
-  --bindir=/opt/$PRGNAM-$VERSION \
-  --with-strip \
+  --prefix=/usr \
+  --bindir=/usr/games \
+  $debug \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-# Write launcher scripts to the user's path
-mkdir -p $PKG/usr/games
-cd $PKG/usr/games
-cat > modelcompiler <<EOF
-#! /bin/sh
-cd /opt/$PRGNAM-$VERSION
-./modelcompiler
-EOF
-cat > pioneer <<EOF
-#! /bin/sh
-cd /opt/$PRGNAM-$VERSION
-./pioneer
-EOF
-find . -perm 644 -exec chmod 755 {} \;
-cd -
-
 # Write a desktop file
 mkdir -p $PKG/usr/share/applications
 cat > $PKG/usr/share/applications/$PRGNAM.desktop <<EOF
 [Desktop Entry]
 Name=$(echo "${PRGNAM^}")
 Exec=$PRGNAM
-Icon=badge-full
+Icon=$PRGNAM
 Type=Application
 Comment=$(echo "${PRGNAM^}") (space adventure game)
 Categories=Game;AdventureGame;
 EOF
 
-# Add data files to package
-mv ${PKG}data $PKG/opt/$PRGNAM-$VERSION/data
-cp -a data/listdata* $PKG/opt/$PRGNAM-$VERSION/data
-
 # Add missing icons to package
-for size in $(find /usr/share/icons/hicolor -type d -mindepth 1 -maxdepth 1 -exec basename {} \;); do
-    if ls application-icon/pngs/*${size}* 1>/dev/null 2>/dev/null; then
-	mkdir -p $PKG/usr/share/icons/hicolor/${size}/apps
-	cp -a application-icon/pngs/*${size}*.png $PKG/usr/share/icons/hicolor/${size}/apps
-    elif [ "$size" = "scalable" ]; then
-	mkdir -p $PKG/usr/share/icons/hicolor/${size}/apps
-	cp -a application-icon/*.svg $PKG/usr/share/icons/hicolor/${size}/apps
-    fi
+for pngicon in application-icon/pngs/*.png ; do
+  if [ -f $pngicon ]; then
+    size=$(basename "${pngicon##*-}" .png)
+    install -D -m644 $pngicon $PKG/usr/share/icons/hicolor/$size/apps/$PRGNAM.png
+  fi
 done
+install -D -m644 application-icon/badge-full.svg $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
 
 # Remove empty .gitignore files
-find $PKG/opt/$PRGNAM-$VERSION/data -name ".gitignore" -exec rm -f {} \;
+find $PKG -name ".gitignore" -exec rm -f {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -aR licenses *.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a licenses *.txt README.md $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-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/pioneer/pioneer.info b/games/pioneer/pioneer.info
index 65a24b56d0..e6ddd0d83b 100644
--- a/games/pioneer/pioneer.info
+++ b/games/pioneer/pioneer.info
@@ -1,8 +1,8 @@
 PRGNAM="pioneer"
-VERSION="20151214"
+VERSION="20160814"
 HOMEPAGE="http://pioneerspacesim.net/"
-DOWNLOAD="https://github.com/pioneerspacesim/pioneer/archive/20151214.tar.gz"
-MD5SUM="59a12be6e2f8e4ae0d2ff7e7ebe02603"
+DOWNLOAD="https://github.com/pioneerspacesim/pioneer/archive/20160814/pioneer-20160814.tar.gz"
+MD5SUM="5625a7a24bc85830880853cc84372b76"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2_image assimp"
diff --git a/games/pioneer/slack-desc b/games/pioneer/slack-desc
index 1ce95d7b91..969b801fcc 100644
--- a/games/pioneer/slack-desc
+++ b/games/pioneer/slack-desc
@@ -13,7 +13,7 @@ pioneer: turn of the 31st century. The game is open-ended, and you are free to
 pioneer: explore the millions of star systems in the game. You can land on
 pioneer: planets, slingshot past gas giants, and burn yourself to a crisp
 pioneer: flying between binary star systems.
-pioneer: 
+pioneer:
 pioneer: Homepage: http://pioneerspacesim.net/
 pioneer:
-pioneer:
-\ No newline at end of file
+pioneer: