From 3afe0aa044ea670d97a483270272d4f65dd06f7c Mon Sep 17 00:00:00 2001
From: Donald Cooley
Date: Fri, 17 Feb 2017 12:06:46 +0000
Subject: system/dash: Updated for version 0.5.9.1.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 system/dash/dash.SlackBuild | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'system/dash/dash.SlackBuild')

diff --git a/system/dash/dash.SlackBuild b/system/dash/dash.SlackBuild
index f0c362a7d5..61c42279a9 100644
--- a/system/dash/dash.SlackBuild
+++ b/system/dash/dash.SlackBuild
@@ -3,17 +3,16 @@
 # Slackware build script for dash
 
 # Written by Vincent Batts, http://hashbangbash.com/
+# Copyright 2017 Donald Cooley South Haven, Indiana USA
 
 PRGNAM=dash
-VERSION=${VERSION:-0.5.8}
-_PATCH_VERS=${PATCH_VERS:-git_d7582e6}
+VERSION=${VERSION:-0.5.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-USE_GIT_PATCH=${USE_GIT_PATCH:-no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -24,8 +23,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"
@@ -47,13 +46,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-# add fixes from upstream devel, if requested
-if [ "$USE_GIT_PATCH" = "yes" ] && \
-   [ -f $CWD/patches/dash-${VERSION}-${_PATCH_VERS}.diff ]; then
-  patch -p1 < $CWD/patches/dash-${VERSION}-${_PATCH_VERS}.diff
-  VERSION="${VERSION}.${_PATCH_VERS}"
-fi
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -78,14 +70,16 @@ make install DESTDIR=$PKG
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin ; ln -s /bin/dash dash )
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 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 ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING ChangeLog \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-- 
cgit v1.2.3