system/fzf: Updated for version 0.15.9.

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

3 files changed, 87 insertions, 12 deletions

diff --git a/system/fzf/README b/system/fzf/README
index 183344cb3911..d406de9de11e 100644
--- a/system/fzf/README
+++ b/system/fzf/README
@@ -1,6 +1,19 @@
 fzf - A command-line fuzzy finder written in Go
 
-Vim Users: A fzf.vim plugin is included in /usr/share/fzf/vim/.
+If you'd like to build with the tcell support (24bit colour support),
+default no:
 
-NOTE: google-go-lang is only needed at compile time - not at runtime.
+WITH_TCELL=yes ./fzf.SlackBuild
+
+Please note the caveats mentioned here:
+https://github.com/junegunn/fzf/blob/master/BUILD.md#with-tcell
+
+Vim Users: A fzf.vim plugin is installed to
+/usr/share/vim/vimfiles/plugin. If you'd rather exclude the plugin,
+or only manually enable it in your vim, you can build with:
 
+WITH_VIM=no ./fzf.SlackBuild
+
+and the plugin will be installed to /usr/share/fzf/vim/ instead.
+
+NOTE: google-go-lang is only needed at compile time - not at runtime.
diff --git a/system/fzf/fzf.SlackBuild b/system/fzf/fzf.SlackBuild
index aac2ce18deb4..2422fa2d0111 100644
--- a/system/fzf/fzf.SlackBuild
+++ b/system/fzf/fzf.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fzf
-VERSION=${VERSION:-0.15.8}
+VERSION=${VERSION:-0.15.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,6 +62,52 @@ for DEPENDENCY in go-shellwords-35d512af75e283aae4ca1fc3d44b159ed66189a4 \
   mv $DEPENDENCY gopath/src/github.com/junegunn/$DEPENDENCY_NAME
 done
 
+if [ "$WITH_TCELL" != "yes" ] ; then :
+else
+  for DEPENDENCY in tcell-d4838882df49299993d4da46347f39ec6f7eef4a ; do
+    DEPENDENCY_NAME="$(echo "$DEPENDENCY" | rev | cut -d- -f2- | rev)"
+
+    tar xf $CWD/$DEPENDENCY.tar.gz
+    mv $DEPENDENCY gopath/src/github.com/junegunn/$DEPENDENCY_NAME
+  done
+
+  mkdir gopath/src/github.com/mattn
+  (
+    cd gopath/src/github.com/mattn
+    ln -s ../junegunn/go-runewidth .
+  )
+
+  mkdir gopath/src/github.com/gdamore
+  (
+    cd gopath/src/github.com/gdamore
+    ln -s ../junegunn/tcell .
+  )
+
+  mkdir -p gopath/src/github.com/gdamore
+  for DEPENDENCY in encoding-b23993cbb6353f0e6aa98d0ee318a34728f628b9 ; do
+    DEPENDENCY_NAME="$(echo "$DEPENDENCY" | rev | cut -d- -f2- | rev)"
+
+    tar xf $CWD/$DEPENDENCY.tar.gz
+    mv $DEPENDENCY gopath/src/github.com/gdamore/$DEPENDENCY_NAME
+  done
+
+  mkdir -p gopath/src/github.com/lucasb-eyer
+  for DEPENDENCY in go-colorful-9c2852a141bf4711e4276f8f119c90d0f20a556c ; do
+    DEPENDENCY_NAME="$(echo "$DEPENDENCY" | rev | cut -d- -f2- | rev)"
+
+    tar xf $CWD/$DEPENDENCY.tar.gz
+    mv $DEPENDENCY gopath/src/github.com/lucasb-eyer/$DEPENDENCY_NAME
+  done
+
+  mkdir -p gopath/src/golang.org/x
+  for DEPENDENCY in text-b01949dc0793a9af5e4cb3fce4d42999e76e8ca1 ; do
+    DEPENDENCY_NAME="$(echo "$DEPENDENCY" | rev | cut -d- -f2- | rev)"
+
+    tar xf $CWD/$DEPENDENCY.tar.gz
+    mv $DEPENDENCY gopath/src/golang.org/x/$DEPENDENCY_NAME
+  done
+fi
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,9 +115,12 @@ 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 {} \;
 
+FZF_TAGS=tcell
+[ "$WITH_TCELL" != "yes" ] && FZF_TAGS=""
+
 (
   cd src
-  make
+  TAGS="$FZF_TAGS" make
 
   mkdir -p $PKG/usr/bin
   install -m 0755 fzf/fzf-linux_* $PKG/usr/bin/fzf
@@ -94,9 +143,6 @@ install -m 0644 shell/completion.bash $PKG/usr/share/bash-completion/completions
 mkdir -p $PKG/usr/share/zsh/site-functions/
 install -m 0644 shell/completion.zsh $PKG/usr/share/zsh/site-functions/_fzf
 
-mkdir -p $PKG/usr/share/fzf/vim/
-install -m 0644 plugin/fzf.vim $PKG/usr/share/fzf/vim/
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/go
 cp -a \
   CHANGELOG.md LICENSE README.md shell/key-bindings.zsh shell/key-bindings.bash \
@@ -109,6 +155,14 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION/go
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+WITH_VIM=${WITH_VIM:-yes}
+if [ "$WITH_VIM" != "yes" ] ; then
+  install -m 0644 plugin/fzf.vim $PKG/usr/share/fzf/vim/
+else
+  mkdir -p $PKG/usr/share/vim/vimfiles/plugin
+  install -m 0644 plugin/fzf.vim $PKG/usr/share/vim/vimfiles/plugin
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/system/fzf/fzf.info b/system/fzf/fzf.info
index ee834d7df370..866e1330afe7 100644
--- a/system/fzf/fzf.info
+++ b/system/fzf/fzf.info
@@ -1,14 +1,22 @@
 PRGNAM="fzf"
-VERSION="0.15.8"
+VERSION="0.15.9"
 HOMEPAGE="https://github.com/junegunn/fzf"
-DOWNLOAD="https://github.com/junegunn/fzf/archive/0.15.8/fzf-0.15.8.tar.gz \
+DOWNLOAD="https://github.com/junegunn/fzf/archive/0.15.9/fzf-0.15.9.tar.gz \
           https://github.com/junegunn/go-shellwords/archive/35d512af75e283aae4ca1fc3d44b159ed66189a4/go-shellwords-35d512af75e283aae4ca1fc3d44b159ed66189a4.tar.gz \
           https://github.com/junegunn/go-runewidth/archive/63c378b851290989b19ca955468386485f118c65/go-runewidth-63c378b851290989b19ca955468386485f118c65.tar.gz \
-          https://github.com/junegunn/go-isatty/archive/66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8/go-isatty-66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8.tar.gz"
-MD5SUM="ee424cb2ef54855541bab054643c9734 \
+          https://github.com/junegunn/go-isatty/archive/66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8/go-isatty-66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8.tar.gz \
+          https://github.com/junegunn/tcell/archive/d4838882df49299993d4da46347f39ec6f7eef4a/tcell-d4838882df49299993d4da46347f39ec6f7eef4a.tar.gz \
+          https://github.com/gdamore/encoding/archive/b23993cbb6353f0e6aa98d0ee318a34728f628b9/encoding-b23993cbb6353f0e6aa98d0ee318a34728f628b9.tar.gz \
+          https://github.com/lucasb-eyer/go-colorful/archive/9c2852a141bf4711e4276f8f119c90d0f20a556c/go-colorful-9c2852a141bf4711e4276f8f119c90d0f20a556c.tar.gz \
+          https://github.com/golang/text/archive/b01949dc0793a9af5e4cb3fce4d42999e76e8ca1/text-b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz"
+MD5SUM="3687b18a967cde25d82c98509fbfecdf \
         7561833225a8b1ae03a16d7d3497841e \
         daeeee47b8dc81ec02bcd2d56bf576c9 \
-        e15b95057201799f455982ce76ff7041"
+        e15b95057201799f455982ce76ff7041 \
+        65b94fc43ab8f433988d86e334816610 \
+        4c6fb2d95929b35e44788924edc56649 \
+        d318fdeeb33620ef2ba796c94abc502d \
+        e0a0791d310ddc4b8c80816830d40014"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"