svn commit: r464809 - in head/textproc/fzf: . files

[Danilo G. Baio]

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 <sascha at root-login.org> (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 at 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