From owner-svn-ports-all@freebsd.org Tue Aug 4 08:21:28 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AC8D73B4E69; Tue, 4 Aug 2020 08:21:28 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BLSQJ44hBz43hR; Tue, 4 Aug 2020 08:21:28 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 709F422783; Tue, 4 Aug 2020 08:21:28 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0748LSZS080096; Tue, 4 Aug 2020 08:21:28 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0748LRKJ080092; Tue, 4 Aug 2020 08:21:27 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202008040821.0748LRKJ080092@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Tue, 4 Aug 2020 08:21:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544144 - in head/textproc/fzf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/textproc/fzf: . files X-SVN-Commit-Revision: 544144 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Aug 2020 08:21:28 -0000 Author: lwhsu Date: Tue Aug 4 08:21:27 2020 New Revision: 544144 URL: https://svnweb.freebsd.org/changeset/ports/544144 Log: Update to 0.22.0 PR: 248447 Submitted by: Sascha Holzleiter (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 Tue Aug 4 08:19:49 2020 (r544143) +++ head/textproc/fzf/Makefile Tue Aug 4 08:21:27 2020 (r544144) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fzf -PORTVERSION= 0.21.1 +PORTVERSION= 0.22.0 CATEGORIES= textproc MAINTAINER= sascha@root-login.org Modified: head/textproc/fzf/distinfo ============================================================================== --- head/textproc/fzf/distinfo Tue Aug 4 08:19:49 2020 (r544143) +++ head/textproc/fzf/distinfo Tue Aug 4 08:21:27 2020 (r544144) @@ -1,6 +1,6 @@ -TIMESTAMP = 1590431990 -SHA256 (junegunn-fzf-0.21.1_GH0.tar.gz) = 47adf138f17c45d390af81958bdff6f92157d41e2c4cb13773df078b905cdaf4 -SIZE (junegunn-fzf-0.21.1_GH0.tar.gz) = 163978 +TIMESTAMP = 1596448053 +SHA256 (junegunn-fzf-0.22.0_GH0.tar.gz) = 3090748bb656333ed98490fe62133760e5da40ba4cd429a8142b4a0b69d05586 +SIZE (junegunn-fzf-0.22.0_GH0.tar.gz) = 168483 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 Modified: head/textproc/fzf/files/patch-shell_completion.bash ============================================================================== --- head/textproc/fzf/files/patch-shell_completion.bash Tue Aug 4 08:19:49 2020 (r544143) +++ head/textproc/fzf/files/patch-shell_completion.bash Tue Aug 4 08:21:27 2020 (r544144) @@ -1,11 +1,11 @@ ---- shell/completion.bash.orig 2020-05-25 18:52:57 UTC +--- shell/completion.bash.orig 2020-08-03 09:46:24 UTC +++ shell/completion.bash -@@ -252,7 +252,7 @@ _fzf_complete_kill() { - [ -n "${COMP_WORDS[COMP_CWORD]}" ] && return 1 +@@ -262,7 +262,7 @@ _fzf_complete_kill() { - 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' + _fzf_proc_completion() { + _fzf_complete -m --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <( +- command ps -ef | sed 1d ++ command ps -uef | sed 1d + ) + } Modified: head/textproc/fzf/files/patch-shell_completion.zsh ============================================================================== --- head/textproc/fzf/files/patch-shell_completion.zsh Tue Aug 4 08:19:49 2020 (r544143) +++ head/textproc/fzf/files/patch-shell_completion.zsh Tue Aug 4 08:21:27 2020 (r544144) @@ -1,11 +1,11 @@ ---- shell/completion.zsh.orig 2020-05-25 18:53:01 UTC +--- shell/completion.zsh.orig 2020-08-03 09:46:30 UTC +++ shell/completion.zsh -@@ -276,7 +276,7 @@ fzf-completion() { - tail=${LBUFFER:$(( ${#LBUFFER} - ${#trigger} ))} - # Kill completion (do not require trigger sequence) - if [ $cmd = kill -a ${LBUFFER[-1]} = ' ' ]; then -- 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 +@@ -252,7 +252,7 @@ _fzf_complete_unalias() { + + _fzf_complete_kill() { + _fzf_complete -m --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <( +- command ps -ef | sed 1d ++ command ps -uef | sed 1d + ) + } +