From e8b25fc7eb3f94863cb185930e76511c4c3f5562 Mon Sep 17 00:00:00 2001
From: "Edinaldo P. Silva" <edps.mundognu@gmail.com>
Date: Wed, 9 Nov 2016 10:49:44 +0000
Subject: system/fish: Updated for version 2.4.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 system/fish/README          | 32 +++++++++++++++++++++++---------
 system/fish/fish.SlackBuild | 14 +++++++-------
 system/fish/fish.info       |  8 ++++----
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/system/fish/README b/system/fish/README
index c41173e57c..9b00838a7e 100644
--- a/system/fish/README
+++ b/system/fish/README
@@ -1,17 +1,31 @@
-fish (Friendly Interactive SHell) is a user friendly command line shell
-for UNIX-like operating systems.
+fish (Friendly Interactive Shell)
+
+fish is a user friendly command line shell for UNIX-like systems.
+fish includes case insensitive completions, a multiline editing
+system, a new and simplified key binding system, and a large number
+of command specific completions.
+
+This package will potentially conflict with the /usr/games/fish
+binary from the y/bsdgames package.  In a stock installation with
+default PATH ordering, /usr/bin should be checked before /usr/games,
+so it shouldn't be an issue, but we thought it was worth noting
+just in case.
+
+NOTES:
 
 This SlackBuild automatically adds fish to /etc/shells.
 
 To use fish as your login shell, run this command:
 
-$ chsh -s /usr/bin/fish
+ $ chsh -s /usr/bin/fish
+
+To remove it from the /etc/shells (in case of fish removal), run:
 
-To remove fish from the /etc/shells, in case of fish removal, please run:
+ $ su -c "sed -ri '\|^/usr/bin/fish$|d' /etc/shells"
 
-$ su -c "sed -ri '\|^/usr/bin/fish$|d' /etc/shells"
+To use fish_update_completions see README.Slackware from man-db
+SlackBuild or typically (as normal user or root):
 
-This package will potentially conflict with the /usr/games/fish binary
-from the y/bsdgames package.  In a stock installation with default PATH
-ordering, /usr/bin should be checked before /usr/games, so it shouldn't
-be an issue, but we thought it was worth noting just in case.
+ $ fish
+ $ source /etc/profile.d/man-db.sh
+ $ fish_update_completions
diff --git a/system/fish/fish.SlackBuild b/system/fish/fish.SlackBuild
index 7f3eee778f..15226a6e46 100644
--- a/system/fish/fish.SlackBuild
+++ b/system/fish/fish.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for the fish shell.
 
 # Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
-# Copyright 2015, Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2016, Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fish
-VERSION=${VERSION:-2.3.1}
+VERSION=${VERSION:-2.4.0}
 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
@@ -41,8 +41,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"
@@ -81,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make
+make V=1
 make install DESTDIR=$PKG
 
 # Let's not clobber the config
@@ -97,7 +97,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 # Remove manual pages that overwrites coreutils' man pages
 rm -f $PKG/usr/man/man1/{echo,false,pwd,test,true}.1.gz
-cp -a CONTRIBUTING.md COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md CONTRIBUTING.md COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/fish/fish.info b/system/fish/fish.info
index e5ff61b393..392365c51b 100644
--- a/system/fish/fish.info
+++ b/system/fish/fish.info
@@ -1,10 +1,10 @@
 PRGNAM="fish"
-VERSION="2.3.1"
+VERSION="2.4.0"
 HOMEPAGE="http://fishshell.com/"
-DOWNLOAD="http://fishshell.com/files/2.3.1/fish-2.3.1.tar.gz"
-MD5SUM="2d13852a5c8e9e5bca00502b93e046a4"
+DOWNLOAD="http://fishshell.com/files/2.4.0/fish-2.4.0.tar.gz"
+MD5SUM="0167eb7c252505451c62f88a2deeffb5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="man-db"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
-- 
cgit v1.2.3-65-gdbad