system/fish: Updated for version 3.1.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 55 insertions, 47 deletions

diff --git a/system/fish/README b/system/fish/README
index 9b00838a7e..2f0a1f4067 100644
--- a/system/fish/README
+++ b/system/fish/README
@@ -1,15 +1,18 @@
 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.
+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.
+
+Optional packages (also found at slackbuilds.org):
+  sphinx
+  libedit
 
 NOTES:
 
diff --git a/system/fish/fish.SlackBuild b/system/fish/fish.SlackBuild
index 5bf86fdc09..5e098fed36 100644
--- a/system/fish/fish.SlackBuild
+++ b/system/fish/fish.SlackBuild
@@ -1,10 +1,10 @@
 #!/bin/sh
-#
-# Slackware build script for the fish shell.
-#
-# Copyright 2019  Donald Cooley, South Haven, Indiana, USA
+
+# Slackware build script for fish
+
+# Copyright 2020 Donald Cooley, South Haven, Indiana USA
 # Copyright 2015-2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
+# Copyright 2009 Pierre Cazenave
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -13,19 +13,19 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fish
-VERSION=${VERSION:-3.0.2}
+VERSION=${VERSION:-3.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,33 +71,38 @@ 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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-# Let's not clobber the config
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+	-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/share/$PRGNAM
+mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/share/$PRGNAM
+
+# Let's not clobber the old config
 mv $PKG/etc/fish/config.fish $PKG/etc/fish/config.fish.new
 
 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
 
+mkdir -p $PKG/usr/man/man1
 mv $PKG/usr/share/$PRGNAM/man/man1/* $PKG/usr/man/man1
-rm -rf $PKG/usr/share/fish/man/
+rm -rf $PKG/usr/share/man/
 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
 
 # Remove manual pages that overwrites coreutils' man pages
 rm -f $PKG/usr/man/man1/{echo,false,pwd,test,true}.1.gz
+
 cp CHANGELOG.md CONTRIBUTING.md COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/fish/fish.info b/system/fish/fish.info
index e345c57d34..80c1720b99 100644
--- a/system/fish/fish.info
+++ b/system/fish/fish.info
@@ -1,8 +1,8 @@
 PRGNAM="fish"
-VERSION="3.0.2"
-HOMEPAGE="http://fishshell.com/"
-DOWNLOAD="https://github.com/fish-shell/fish-shell/releases/download/3.0.2/fish-3.0.2.tar.gz"
-MD5SUM="eba358c6c99e596b8633113ff1cd5994"
+VERSION="3.1.0"
+HOMEPAGE="https://fishshell.com/"
+DOWNLOAD="https://github.com/fish-shell/fish-shell/releases/download/3.1.0/fish-3.1.0.tar.gz"
+MD5SUM="8c9995a5a6d07ce05a1413ca24e16691"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="man-db"
diff --git a/system/fish/slack-desc b/system/fish/slack-desc
index 967da1a55f..5b7d97efd9 100644
--- a/system/fish/slack-desc
+++ b/system/fish/slack-desc
@@ -14,6 +14,6 @@ fish: fish includes case insensitive completions, a multiline editing
 fish: system, a new and simplified key binding system, and a large number
 fish: of command specific completions.
 fish:
-fish: Homepage: http://fishshell.com/
+fish: Homepage: https://fishshell.com/
 fish:
 fish: