From owner-svn-ports-all@freebsd.org Sat Mar 17 12:15:32 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3A15F62E2E; Sat, 17 Mar 2018 12:15:32 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 76B2F78E65; Sat, 17 Mar 2018 12:15:32 +0000 (UTC) (envelope-from dbaio@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 71AEE12421; Sat, 17 Mar 2018 12:15:32 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2HCFWkX007691; Sat, 17 Mar 2018 12:15:32 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2HCFWBC007688; Sat, 17 Mar 2018 12:15:32 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201803171215.w2HCFWBC007688@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Sat, 17 Mar 2018 12:15:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464809 - in head/textproc/fzf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: in head/textproc/fzf: . files X-SVN-Commit-Revision: 464809 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.25 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: Sat, 17 Mar 2018 12:15:33 -0000 Author: dbaio Date: Sat Mar 17 12:15:31 2018 New Revision: 464809 URL: https://svnweb.freebsd.org/changeset/ports/464809 Log: textproc/fzf: Fix patches The patches for this port got mangled in the last update. This patch corrects that so the completion for kill(1) works again if one is using the example shell completion files. PR: 226654 Submitted by: Sascha Holzleiter (maintainer) Modified: head/textproc/fzf/Makefile 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 Sat Mar 17 12:14:35 2018 (r464808) +++ head/textproc/fzf/Makefile Sat Mar 17 12:15:31 2018 (r464809) @@ -3,6 +3,7 @@ PORTNAME= fzf PORTVERSION= 0.17.3 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= sascha@root-login.org Modified: head/textproc/fzf/files/patch-shell_completion.bash ============================================================================== --- head/textproc/fzf/files/patch-shell_completion.bash Sat Mar 17 12:14:35 2018 (r464808) +++ head/textproc/fzf/files/patch-shell_completion.bash Sat Mar 17 12:15:31 2018 (r464809) @@ -1,12 +1,11 @@ --- shell/completion.bash.orig 2017-12-03 14:55:24 UTC +++ shell/completion.bash -@@ -219,7 +219,8 @@ _fzf_complete_kill() { +@@ -219,7 +219,7 @@ _fzf_complete_kill() { 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_DEFAU -+LT_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' ' ') printf '\e[5n' if [ -n "$selected" ]; then Modified: head/textproc/fzf/files/patch-shell_completion.zsh ============================================================================== --- head/textproc/fzf/files/patch-shell_completion.zsh Sat Mar 17 12:14:35 2018 (r464808) +++ head/textproc/fzf/files/patch-shell_completion.zsh Sat Mar 17 12:15:31 2018 (r464809) @@ -1,13 +1,11 @@ --- shell/completion.zsh.orig 2017-12-03 14:55:24 UTC +++ shell/completion.zsh -@@ -163,7 +163,9 @@ fzf-completion() { +@@ -163,7 +163,7 @@ fzf-completion() { # 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_DEFA -+ULT_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' ' ') if [ -n "$matches" ]; then LBUFFER="$LBUFFER$matches" fi