Sunday, April 05, 2020

UPDATE sysutils/fzf

Update fzf from 0.20.0 to 0.21.1.

The patches from the previous port has been upstreamed.

In addition the fzf.vim plugin is now installed too, along with its documentation. I was considering making vim files a subpackage, but seeing how bash, zsh and fish shell plugins are installed as part of the port, installing vim files the same way seems right.

I also added a note about github.com/junegunn/fzf.vim, which is a separate thing building on the fzf.vim file now installed by this port. So with this patch, if you want to use github.com/junegunn/fzf.vim in vim, it will just work with no additional configuration needed.


Patch:

Only in fzf: CVS
diff -u -I CVS -r fzf/Makefile ../mystuff/sysutils/fzf/Makefile
--- fzf/Makefile Sat Jan 18 12:51:13 2020
+++ ../mystuff/sysutils/fzf/Makefile Sun Apr 5 10:32:14 2020
@@ -2,7 +2,7 @@

COMMENT = command-line fuzzy finder

-DISTNAME = fzf-0.20.0
+DISTNAME = fzf-0.21.1

CATEGORIES = sysutils

@@ -14,7 +14,7 @@
# uses pledge()
WANTLIB += c pthread

-MASTER_SITES = https://theunixzoo.co.uk/distfiles/
+MASTER_SITES = https://deftly.net/dist/

MODULES = lang/go
MODGO_TYPE = bin
@@ -33,6 +33,9 @@
ZSH_SITE = ${PREFIX}/share/zsh/site-functions
FISH_SITE = ${PREFIX}/share/fish/functions
BASH_SITE = ${PREFIX}/share/fzf/bash
+VIMFILES = ${PREFIX}/share/vim/vimfiles
+VIM_PLUGIN = ${VIMFILES}/plugin
+VIM_DOC = ${VIMFILES}/doc
SUBST_VARS += BASH_SITE FISH_SITE

do-install:
@@ -51,5 +54,10 @@
${INSTALL_DATA_DIR} ${BASH_SITE}
${INSTALL_DATA} ${WRKSRC}/shell/key-bindings.bash ${BASH_SITE}
${INSTALL_DATA} ${WRKSRC}/shell/completion.bash ${BASH_SITE}
+
+ ${INSTALL_DATA_DIR} ${VIM_PLUGIN}
+ ${INSTALL_DATA_DIR} ${VIM_DOC}
+ ${INSTALL_DATA} ${WRKSRC}/plugin/fzf.vim ${VIM_PLUGIN}/fzf.vim
+ ${INSTALL_DATA} ${WRKSRC}/doc/fzf.txt ${VIM_DOC}/fzf.txt

.include <bsd.port.mk>
diff -u -I CVS -r fzf/distinfo ../mystuff/sysutils/fzf/distinfo
--- fzf/distinfo Sat Jan 18 12:51:13 2020
+++ ../mystuff/sysutils/fzf/distinfo Sun Apr 5 10:33:24 2020
@@ -1,2 +1,2 @@
-SHA256 (fzf-0.20.0.tar.gz) = S8ymcqwjIMqpDpEg9Rkj/aHbmlMltgXQOXu+58A8s0o=
-SIZE (fzf-0.20.0.tar.gz) = 2319334
+SHA256 (fzf-0.21.1.tar.gz) = fiUVWVnr+d4pMs6YD8oCGExrujlnVTLkrPBBG2O7n9I=
+SIZE (fzf-0.21.1.tar.gz) = 2512770
Only in fzf: patches
Only in fzf/pkg: CVS
diff -u -I CVS -r fzf/pkg/PLIST ../mystuff/sysutils/fzf/pkg/PLIST
--- fzf/pkg/PLIST Sat Jan 18 12:51:13 2020
+++ ../mystuff/sysutils/fzf/pkg/PLIST Fri Apr 3 21:26:51 2020
@@ -11,6 +11,12 @@
share/fzf/bash/
share/fzf/bash/completion.bash
share/fzf/bash/key-bindings.bash
+share/vim/
+share/vim/vimfiles/
+share/vim/vimfiles/doc/
+share/vim/vimfiles/doc/fzf.txt
+share/vim/vimfiles/plugin/
+share/vim/vimfiles/plugin/fzf.vim
share/zsh/
share/zsh/site-functions/
share/zsh/site-functions/_fzf_completion
diff -u -I CVS -r fzf/pkg/README ../mystuff/sysutils/fzf/pkg/README
--- fzf/pkg/README Sat Jan 18 12:51:13 2020
+++ ../mystuff/sysutils/fzf/pkg/README Sat Apr 4 13:14:06 2020
@@ -44,3 +44,11 @@
```

There is no **<tab> completion support for fish.
+
+VIM Integration
+===============
+
+The fzf.vim plugin and documentation is installed in $VIMRUNTIME, and will
+be picked up automatically if vim is installed. It should be noted that
+https://github.com/junegunn/fzf.vim is not the same files, but is built on
+top of the files installed by this port.

No comments:

Post a Comment