Date: Thu, 28 May 2020 07:50:26 +0000 (UTC) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536747 - in head/textproc/fzf: . files Message-ID: <202005280750.04S7oQTU056096@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olgeni Date: Thu May 28 07:50:25 2020 New Revision: 536747 URL: https://svnweb.freebsd.org/changeset/ports/536747 Log: Update textproc/fzf to version 0.21.1. PR: 246739 Submitted by: olgeni Approved by: maintainer Modified: head/textproc/fzf/Makefile head/textproc/fzf/distinfo head/textproc/fzf/files/patch-shell_completion.bash head/textproc/fzf/files/patch-shell_completion.zsh Modified: head/textproc/fzf/Makefile ============================================================================== --- head/textproc/fzf/Makefile Thu May 28 07:49:23 2020 (r536746) +++ head/textproc/fzf/Makefile Thu May 28 07:50:25 2020 (r536747) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fzf -PORTVERSION= 0.19.0 +PORTVERSION= 0.21.1 CATEGORIES= textproc MAINTAINER= sascha@root-login.org @@ -16,17 +16,19 @@ USES= compiler go:modules USE_GITHUB= yes GH_ACCOUNT= junegunn GH_TUPLE= \ - gdamore:encoding:b23993cbb635:gdamore_encoding/vendor/github.com/gdamore/encoding \ - gdamore:tcell:0a0db94084df:gdamore_tcell/vendor/github.com/gdamore/tcell \ - golang:crypto:558b6879de74:golang_crypto/vendor/golang.org/x/crypto \ - golang:sys:a5b02f93d862:golang_sys/vendor/golang.org/x/sys \ - golang:text:4ee4af566555:golang_text/vendor/golang.org/x/text \ - lucasb-eyer:go-colorful:c900de9dbbc7:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \ - mattn:go-isatty:66b8e73f3f5c:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ - mattn:go-runewidth:14207d285c6c:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ - mattn:go-shellwords:v1.0.3:mattn_go_shellwords/vendor/github.com/mattn/go-shellwords + gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \ + gdamore:tcell:v1.3.0:gdamore_tcell/vendor/github.com/gdamore/tcell \ + golang:crypto:69ecbb4d6d5d:golang_crypto/vendor/golang.org/x/crypto \ + golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \ + golang:sys:d101bd2416d5:golang_sys/vendor/golang.org/x/sys \ + golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \ + lucasb-eyer:go-colorful:v1.0.3:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \ + mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ + mattn:go-runewidth:v0.0.8:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ + mattn:go-shellwords:v1.0.9:mattn_go_shellwords/vendor/github.com/mattn/go-shellwords \ + saracen:walker:324a081bae7e:saracen_walker/vendor/github.com/saracen/walker -GO_BUILDFLAGS= -ldflags="-X main.revision=9a41fd5 -w" +GO_BUILDFLAGS= -ldflags="-X main.revision=334a4fa -w" SUB_FILES= pkg-message PLIST_FILES= bin/fzf man/man1/fzf.1.gz Modified: head/textproc/fzf/distinfo ============================================================================== --- head/textproc/fzf/distinfo Thu May 28 07:49:23 2020 (r536746) +++ head/textproc/fzf/distinfo Thu May 28 07:50:25 2020 (r536747) @@ -1,21 +1,25 @@ -TIMESTAMP = 1574036251 -SHA256 (junegunn-fzf-0.19.0_GH0.tar.gz) = 4d7ee0b621287e64ed450d187e5022d906aa378c5390d8c7c1f843417d2f3422 -SIZE (junegunn-fzf-0.19.0_GH0.tar.gz) = 149048 -SHA256 (gdamore-encoding-b23993cbb635_GH0.tar.gz) = 3c607d322b9f585567dd4b6b19a0179a8277de94d44f98b4b42629632c035923 -SIZE (gdamore-encoding-b23993cbb635_GH0.tar.gz) = 10635 -SHA256 (gdamore-tcell-0a0db94084df_GH0.tar.gz) = aef7f6b6e365413fcb508841fdca726e8bcb9ba4a3dca1216740624dd2e64550 -SIZE (gdamore-tcell-0a0db94084df_GH0.tar.gz) = 165736 -SHA256 (golang-crypto-558b6879de74_GH0.tar.gz) = 2169ec6c23ffcd9b11a64ed6a78cb19256dc0e9d5446b17136630b49581f9cdc -SIZE (golang-crypto-558b6879de74_GH0.tar.gz) = 1429171 -SHA256 (golang-sys-a5b02f93d862_GH0.tar.gz) = ab70881e104cf4dea3f5a25dab603bd304f9f0bc86e712a6c956135101066ae8 -SIZE (golang-sys-a5b02f93d862_GH0.tar.gz) = 1416332 -SHA256 (golang-text-4ee4af566555_GH0.tar.gz) = 24f5bc9e763b312fe49b8e2e3c5d9050d62c109775c891271215ccc3ad5d1b3a -SIZE (golang-text-4ee4af566555_GH0.tar.gz) = 4551209 -SHA256 (lucasb-eyer-go-colorful-c900de9dbbc7_GH0.tar.gz) = e5419312b5dd19e39d539194a2a274e0139455717b89c38c58ec2581351f43f9 -SIZE (lucasb-eyer-go-colorful-c900de9dbbc7_GH0.tar.gz) = 57048 -SHA256 (mattn-go-isatty-66b8e73f3f5c_GH0.tar.gz) = a3c56549e8d9a470f187dcd4f1a4ddbc29ee59a7b590db936adf1b5542947091 -SIZE (mattn-go-isatty-66b8e73f3f5c_GH0.tar.gz) = 1965 -SHA256 (mattn-go-runewidth-14207d285c6c_GH0.tar.gz) = dd6f2250301d0fc17807e5015620ba8d9f1dfa464d2861104b2cfcba2dd604b9 -SIZE (mattn-go-runewidth-14207d285c6c_GH0.tar.gz) = 22373 -SHA256 (mattn-go-shellwords-v1.0.3_GH0.tar.gz) = 0491bfd86ce88ffb750442f76a44dd2ad40354fca4cc161c6fc4c33b99366b8b -SIZE (mattn-go-shellwords-v1.0.3_GH0.tar.gz) = 3276 +TIMESTAMP = 1590431990 +SHA256 (junegunn-fzf-0.21.1_GH0.tar.gz) = 47adf138f17c45d390af81958bdff6f92157d41e2c4cb13773df078b905cdaf4 +SIZE (junegunn-fzf-0.21.1_GH0.tar.gz) = 163978 +SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013 +SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886 +SHA256 (gdamore-tcell-v1.3.0_GH0.tar.gz) = 5e4d2206a459109fdd98fb1d29f2da2340b69a021b115db9049917444a0c1097 +SIZE (gdamore-tcell-v1.3.0_GH0.tar.gz) = 148627 +SHA256 (golang-crypto-69ecbb4d6d5d_GH0.tar.gz) = 006815c146fa85ab4b28f862748df3d7866f51688d5803d015c8a397019de0f9 +SIZE (golang-crypto-69ecbb4d6d5d_GH0.tar.gz) = 1719992 +SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce4c1a9ca9edae6c3f1bedc0b15911c62681371ad9ed7738e182ba70393 +SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956 +SHA256 (golang-sys-d101bd2416d5_GH0.tar.gz) = c1de80d233d3df630ed34bf80cbb3f186199e7b5218726abe0234520c8eddb8b +SIZE (golang-sys-d101bd2416d5_GH0.tar.gz) = 1537146 +SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22 +SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069 +SHA256 (lucasb-eyer-go-colorful-v1.0.3_GH0.tar.gz) = 40c8c7e03a4eeaaabd44273e9b6a992933f554f17225aadd0b225ffc67e1e7db +SIZE (lucasb-eyer-go-colorful-v1.0.3_GH0.tar.gz) = 430208 +SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c +SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548 +SHA256 (mattn-go-runewidth-v0.0.8_GH0.tar.gz) = 7b1ae2393fe4b0ddc64b94aabf1d825c969aebe09f167751a009d5ed6836850e +SIZE (mattn-go-runewidth-v0.0.8_GH0.tar.gz) = 16500 +SHA256 (mattn-go-shellwords-v1.0.9_GH0.tar.gz) = 44e952c3d221b255705aa8da26a672b988dcfb813717c9056505cab2955f3729 +SIZE (mattn-go-shellwords-v1.0.9_GH0.tar.gz) = 5335 +SHA256 (saracen-walker-324a081bae7e_GH0.tar.gz) = 3c766bf4518fb11ca7cf15d48572ea777c202eb673cc20f196d05e325b238eba +SIZE (saracen-walker-324a081bae7e_GH0.tar.gz) = 11214 Modified: head/textproc/fzf/files/patch-shell_completion.bash ============================================================================== --- head/textproc/fzf/files/patch-shell_completion.bash Thu May 28 07:49:23 2020 (r536746) +++ head/textproc/fzf/files/patch-shell_completion.bash Thu May 28 07:50:25 2020 (r536747) @@ -1,11 +1,11 @@ ---- shell/completion.bash.orig 2017-12-03 14:55:24 UTC +--- shell/completion.bash.orig 2020-05-25 18:52:57 UTC +++ shell/completion.bash -@@ -219,7 +219,7 @@ _fzf_complete_kill() { +@@ -252,7 +252,7 @@ _fzf_complete_kill() { + [ -n "${COMP_WORDS[COMP_CWORD]}" ] && return 1 - local selected fzf - fzf="$(__fzfcmd_complete)" -- selected=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" $fzf -m | awk '{print $2}' | tr '\n' ' ') -+ selected=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" $fzf -m | awk '{print $2}' | tr '\n' ' ') + local selected +- selected=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS --preview 'echo {}' --preview-window down:3:wrap" __fzf_comprun "kill" -m | awk '{print $2}' | tr '\n' ' ') ++ selected=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS --preview 'echo {}' --preview-window down:3:wrap" __fzf_comprun "kill" -m | awk '{print $2}' | tr '\n' ' ') + selected=${selected% } printf '\e[5n' - if [ -n "$selected" ]; then Modified: head/textproc/fzf/files/patch-shell_completion.zsh ============================================================================== --- head/textproc/fzf/files/patch-shell_completion.zsh Thu May 28 07:49:23 2020 (r536746) +++ head/textproc/fzf/files/patch-shell_completion.zsh Thu May 28 07:50:25 2020 (r536747) @@ -1,11 +1,11 @@ ---- shell/completion.zsh.orig 2017-12-03 14:55:24 UTC +--- shell/completion.zsh.orig 2020-05-25 18:53:01 UTC +++ shell/completion.zsh -@@ -163,7 +163,7 @@ fzf-completion() { +@@ -276,7 +276,7 @@ fzf-completion() { + tail=${LBUFFER:$(( ${#LBUFFER} - ${#trigger} ))} # Kill completion (do not require trigger sequence) if [ $cmd = kill -a ${LBUFFER[-1]} = ' ' ]; then - fzf="$(__fzfcmd_complete)" -- matches=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${=fzf} -m | awk '{print $2}' | tr '\n' ' ') -+ matches=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${=fzf} -m | awk '{print $2}' | tr '\n' ' ') +- matches=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS --preview 'echo {}' --preview-window down:3:wrap" __fzf_comprun "$cmd" -m | awk '{print $2}' | tr '\n' ' ') ++ matches=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS --preview 'echo {}' --preview-window down:3:wrap" __fzf_comprun "$cmd" -m | awk '{print $2}' | tr '\n' ' ') if [ -n "$matches" ]; then LBUFFER="$LBUFFER$matches" fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005280750.04S7oQTU056096>