1 files changed, 15 insertions, 10 deletions
diff --git a/games/exult/exult.SlackBuild b/games/exult/exult.SlackBuild
index 0d316d97deb..f89cdc91a60 100644
--- a/games/exult/exult.SlackBuild
+++ b/games/exult/exult.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for exult
 
-# Copyright 2016 Hunter Sezen California, USA
+# Copyright 2016, 2018 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=exult
-VERSION=${VERSION:-1.5.0_svn}
+VERSION=${VERSION:-2018.02.01_c3d7afb}
 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"
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -69,7 +69,7 @@ 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 {} \;
 
-./autogen.sh
+autoreconf -fi
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -80,12 +80,18 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
 if [ -f $CWD/${PRGNAM}_audio.zip ]; then
   unzip $CWD/${PRGNAM}_audio.zip -d $PKG/usr/share/$PRGNAM
   chown -R root:root $PKG/usr/share/$PRGNAM
   find $PKG/usr/share/$PRGNAM \
    \( -type f -exec chmod 644 {} \; \) -o \
    \( -type d -exec chmod 755 {} \; \)
+
+  mv $PKG/usr/share/$PRGNAM/README_audiopack.txt \
+    $PKG/usr/share/$PRGNAM/readme_*.txt \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 fi
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -94,9 +100,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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 AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README* TODO.xml $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/share/$PRGNAM -type f -iname 'readme*.txt' -exec mv -t $PKG/usr/doc/$PRGNAM-$VERSION {} \+
+cp -a AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README* TODO.xml \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install