Date: Mon, 5 Aug 2024 02:35:34 GMT From: Larry Rosenman <ler@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 37f26d4beaad - main - textproc/fzf: update to 0.54.3 Message-ID: <202408050235.4752ZYIQ005767@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ler: URL: https://cgit.FreeBSD.org/ports/commit/?id=37f26d4beaad6bce695af3d9ca206b7d51859137 commit 37f26d4beaad6bce695af3d9ca206b7d51859137 Author: Larry Rosenman <ler@FreeBSD.org> AuthorDate: 2024-08-05 02:34:00 +0000 Commit: Larry Rosenman <ler@FreeBSD.org> CommitDate: 2024-08-05 02:34:00 +0000 textproc/fzf: update to 0.54.3 PR: 277698 Approved by: Maintainer Timeout (>3 months) Reported by: Andrew Fyfe <andrew@neptune-one.net> --- textproc/fzf/Makefile | 28 +++--------- textproc/fzf/distinfo | 10 ++--- textproc/fzf/files/patch-shell_completion.bash | 11 ----- textproc/fzf/files/patch-shell_completion.zsh | 11 ----- textproc/fzf/files/pkg-message.in | 10 ----- textproc/fzf/pkg-message | 62 ++++++++++++++++++++++++++ 6 files changed, 72 insertions(+), 60 deletions(-) diff --git a/textproc/fzf/Makefile b/textproc/fzf/Makefile index 3e362b3a0e26..b1fcd4642143 100644 --- a/textproc/fzf/Makefile +++ b/textproc/fzf/Makefile @@ -1,6 +1,7 @@ PORTNAME= fzf -DISTVERSION= 0.42.0 -PORTREVISION= 8 +#PORTREVISION= 1 +DISTVERSION= 0.54.3 +DISTVERSIONPREFIX= v CATEGORIES= textproc MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod DISTFILES= go.mod:gomod @@ -19,32 +20,13 @@ GH_ACCOUNT= junegunn GH_PROJECT= fzf GO_MODULE= github.com/junegunn/fzf -GO_BUILDFLAGS= -ldflags="-X main.revision=${COMMIT_ID} -s -w" +GO_BUILDFLAGS= -ldflags="-X main.version=${DISTVERSION} -X main.revision=${COMMIT_ID} -s -w" -COMMIT_ID= 2023012 +COMMIT_ID= af4917d -SUB_FILES= pkg-message PLIST_FILES= bin/fzf share/man/man1/fzf.1.gz -PORTEXAMPLES= shell/completion.bash shell/completion.zsh \ - shell/key-bindings.bash shell/key-bindings.fish \ - shell/key-bindings.zsh - -OPTIONS_DEFINE= EXAMPLES TMUX -OPTIONS_DEFAULT= TMUX - -TMUX_DESC= Install fzf-tmux (depends on BASH) - -TMUX_RUN_DEPENDS= bash:shells/bash -TMUX_PLIST_FILES= bin/fzf-tmux share/man/man1/fzf-tmux.1.gz post-install: ${INSTALL_MAN} ${WRKSRC}/man/man1/fzf.1 ${STAGEDIR}${PREFIX}/share/man/man1 - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC} && \ - ${COPYTREE_SHARE} shell ${STAGEDIR}${EXAMPLESDIR}) - -post-install-TMUX-on: - ${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}-tmux ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/man1/fzf-tmux.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.mk> diff --git a/textproc/fzf/distinfo b/textproc/fzf/distinfo index 28a0ef1d9f20..47bc61bb56a4 100644 --- a/textproc/fzf/distinfo +++ b/textproc/fzf/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1690816707 -SHA256 (go/textproc_fzf/junegunn-fzf-0.42.0_GH0/go.mod) = 2261585fafcd4f08e955e096fd1d82312055830822a0bb3462a51779f379cde1 -SIZE (go/textproc_fzf/junegunn-fzf-0.42.0_GH0/go.mod) = 540 -SHA256 (go/textproc_fzf/junegunn-fzf-0.42.0_GH0/junegunn-fzf-0.42.0_GH0.tar.gz) = 743c1bfc7851b0796ab73c6da7db09d915c2b54c0dd3e8611308985af8ed3df2 -SIZE (go/textproc_fzf/junegunn-fzf-0.42.0_GH0/junegunn-fzf-0.42.0_GH0.tar.gz) = 239469 +TIMESTAMP = 1722595655 +SHA256 (go/textproc_fzf/junegunn-fzf-v0.54.3_GH0/go.mod) = 1c46fd5ef317a4c3c5691a433ad9a2c903c4dae980ff996cb5ee243564ecf166 +SIZE (go/textproc_fzf/junegunn-fzf-v0.54.3_GH0/go.mod) = 496 +SHA256 (go/textproc_fzf/junegunn-fzf-v0.54.3_GH0/junegunn-fzf-v0.54.3_GH0.tar.gz) = 6413f3916f8058b396820f9078b1336d94c72cbae39c593b1d16b83fcc4fdf74 +SIZE (go/textproc_fzf/junegunn-fzf-v0.54.3_GH0/junegunn-fzf-v0.54.3_GH0.tar.gz) = 292944 diff --git a/textproc/fzf/files/patch-shell_completion.bash b/textproc/fzf/files/patch-shell_completion.bash deleted file mode 100644 index 50ab25d5db55..000000000000 --- a/textproc/fzf/files/patch-shell_completion.bash +++ /dev/null @@ -1,11 +0,0 @@ ---- shell/completion.bash.orig 2023-07-31 17:35:49.551906000 +0200 -+++ shell/completion.bash 2023-07-31 17:35:58.560554000 +0200 -@@ -271,7 +271,7 @@ - - _fzf_proc_completion() { - _fzf_complete -m --header-lines=1 --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <( -- command ps -eo user,pid,ppid,start,time,command 2> /dev/null || -+ command ps -uef 2> /dev/null || - command ps -eo user,pid,ppid,time,args # For BusyBox - ) - } diff --git a/textproc/fzf/files/patch-shell_completion.zsh b/textproc/fzf/files/patch-shell_completion.zsh deleted file mode 100644 index ab6587338513..000000000000 --- a/textproc/fzf/files/patch-shell_completion.zsh +++ /dev/null @@ -1,11 +0,0 @@ ---- shell/completion.zsh.orig 2023-07-31 17:25:48.004185000 +0200 -+++ shell/completion.zsh 2023-07-31 17:34:23.011756000 +0200 -@@ -252,7 +252,7 @@ - - _fzf_complete_kill() { - _fzf_complete -m --header-lines=1 --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <( -- command ps -eo user,pid,ppid,start,time,command 2> /dev/null || -+ command ps -uef 2> /dev/null || - command ps -eo user,pid,ppid,time,args # For BusyBox - ) - } diff --git a/textproc/fzf/files/pkg-message.in b/textproc/fzf/files/pkg-message.in deleted file mode 100644 index 8d59872650f1..000000000000 --- a/textproc/fzf/files/pkg-message.in +++ /dev/null @@ -1,10 +0,0 @@ -[ -{ type: install - message: <<EOM -Various shell key bindings and completion files have been installed -to %%EXAMPLESDIR%%/shell. - -To use these include them in your shell configuration. -EOM -} -] diff --git a/textproc/fzf/pkg-message b/textproc/fzf/pkg-message new file mode 100644 index 000000000000..1bd813ea53d2 --- /dev/null +++ b/textproc/fzf/pkg-message @@ -0,0 +1,62 @@ +[ +{ type: install + message: <<EOM +Various shell key bindings and completion files are embedded in fzf, to use +these include them in your shell configuration. + + bash + + # Set up fzf key bindings and fuzzy completion + eval "$(fzf --bash)" + + zsh + + # Set up fzf key bindings and fuzzy completion + eval "$(fzf --zsh)" + + fish + + # Set up fzf key bindings + fzf --fish | source +EOM +} +{ type: upgrade + maximum_version: "0.48.0" + message: <<EOM +Shell integration scripts are now embedded in the fzf binary. This simplifies +the distribution, and the users are less likely to have problems caused by using +incompatible scripts and binaries. + + bash + + # Set up fzf key bindings and fuzzy completion + eval "$(fzf --bash)" + + zsh + + # Set up fzf key bindings and fuzzy completion + eval "$(fzf --zsh)" + + fish + + # Set up fzf key bindings + fzf --fish | source +EOM +} +{ type: upgrade + maximum_version: "0.53.0" + message: <<EOM +The --tmux option has been added to replace the fzf-tmux script. + + # --tmux [center|top|bottom|left|right][,SIZE[%]][,SIZE[%]] + # Center, 100% width and 70% height + fzf --tmux 100%,70% --border horizontal --padding 1,2 + + # Left, 30% width + fzf --tmux left,30% + + # Bottom, 50% height + fzf --tmux bottom,50% +EOM +} +]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408050235.4752ZYIQ005767>