games/nuvie: Updated for version 2018.01.13_1fa4044.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 18 insertions, 25 deletions

diff --git a/games/nuvie/doinst.sh b/games/nuvie/doinst.sh
index c04144bca4..41d461d4d2 100644
--- a/games/nuvie/doinst.sh
+++ b/games/nuvie/doinst.sh
@@ -21,15 +21,4 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms usr/share/nuvie/nuvie.cfg.new
+config usr/share/nuvie/nuvie.cfg.new
diff --git a/games/nuvie/nuvie.SlackBuild b/games/nuvie/nuvie.SlackBuild
index 79af657479..5faed72922 100644
--- a/games/nuvie/nuvie.SlackBuild
+++ b/games/nuvie/nuvie.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for nuvie
 
-# 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=nuvie
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-2018.01.13_1fa4044}
 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,13 +54,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,17 +69,21 @@ 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
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --bindir=/usr/games \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
 # Copy missing data files
-cp -aR data/{images,maps,scripts} $PKG/usr/share/$PRGNAM
+for i in images maps scripts; do
+  cp -a data/$i $PKG/usr/share/$PRGNAM
+done
 
 # Install nuvie.cfg
 install -Dm0644 $PRGNAM.cfg.sample $PKG/usr/share/$PRGNAM/$PRGNAM.cfg.new
@@ -89,7 +93,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING README TODO $PRGNAM.cfg.sample $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README $PRGNAM.cfg.sample $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/nuvie/nuvie.info b/games/nuvie/nuvie.info
index 09c5da4f02..308de1e5aa 100644
--- a/games/nuvie/nuvie.info
+++ b/games/nuvie/nuvie.info
@@ -1,10 +1,10 @@
 PRGNAM="nuvie"
-VERSION="0.5"
+VERSION="2018.01.13_1fa4044"
 HOMEPAGE="http://nuvie.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/nuvie/Nuvie/0.5/nuvie-0.5.tgz"
-MD5SUM="49a7829c576d5203de38b3bc224c2009"
+DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/nuvie-2018.01.13_1fa4044.tar.xz"
+MD5SUM="2a090b161cfb4a046416aab41abba29c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Hunter Sezen"
-EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
+EMAIL="ovariegata@yahoo.com"