Attachment 249342 Details for Bug 277698 – update textproc/fzf to 0.48.1

[patch] update textproc/fzf to 0.48.1

0001-textproc-fzf-update-to-0.48.1.patch (text/plain), 5.90 KB, created by Andrew Fyfe on 2024-03-20 15:28:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Fyfe

Created: 2024-03-20 15:28:13 UTC

Size: 5.90 KB

patch

obsolete

>From aa82d895b7d875f0913590d499e32b6759f8ba22 Mon Sep 17 00:00:00 2001
>From: Andrew Fyfe <andrew@fyfe.gb.net>
>Date: Thu, 14 Mar 2024 15:05:07 +0000
>Subject: [PATCH] textproc/fzf: update to 0.48.1
>
>Example shell completion files have been removed, as they are now
>embedded in the fzf binary.
>
>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
>---
> textproc/fzf/Makefile                         | 14 +++--------
> textproc/fzf/distinfo                         | 10 ++++----
> .../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                      | 24 +++++++++++++++++++
> 6 files changed, 32 insertions(+), 48 deletions(-)
> delete mode 100644 textproc/fzf/files/patch-shell_completion.bash
> delete mode 100644 textproc/fzf/files/patch-shell_completion.zsh
> delete mode 100644 textproc/fzf/files/pkg-message.in
> create mode 100644 textproc/fzf/pkg-message
>
>diff --git a/textproc/fzf/Makefile b/textproc/fzf/Makefile
>index bf0cc5f..32d7153 100644
>--- a/textproc/fzf/Makefile
>+++ b/textproc/fzf/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	fzf
>-DISTVERSION=	0.42.0
>-PORTREVISION=	3
>+DISTVERSION=	0.48.1
> CATEGORIES=	textproc
> MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
> DISTFILES=	go.mod:gomod
>@@ -21,15 +20,11 @@ GH_PROJECT=	fzf
> GO_MODULE=	github.com/junegunn/fzf
> GO_BUILDFLAGS=	-ldflags="-X main.revision=${COMMIT_ID} -s -w"
> 
>-COMMIT_ID=	2023012
>+COMMIT_ID=	d579e33
> 
>-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_DEFINE=		TMUX
> OPTIONS_DEFAULT=	TMUX
> 
> TMUX_DESC=	Install fzf-tmux (depends on BASH)
>@@ -39,9 +34,6 @@ 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
>diff --git a/textproc/fzf/distinfo b/textproc/fzf/distinfo
>index 28a0ef1..465d77a 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 = 1710947984
>+SHA256 (go/textproc_fzf/junegunn-fzf-0.48.1_GH0/go.mod) = 754ec773bda0c028c11b7f796807a569e46856994d89ddd87cb0a25bab335574
>+SIZE (go/textproc_fzf/junegunn-fzf-0.48.1_GH0/go.mod) = 496
>+SHA256 (go/textproc_fzf/junegunn-fzf-0.48.1_GH0/junegunn-fzf-0.48.1_GH0.tar.gz) = c8dbb545d651808ef4e1f51edba177fa918ea56ac53376c690dc6f2dd0156a71
>+SIZE (go/textproc_fzf/junegunn-fzf-0.48.1_GH0/junegunn-fzf-0.48.1_GH0.tar.gz) = 262833
>diff --git a/textproc/fzf/files/patch-shell_completion.bash b/textproc/fzf/files/patch-shell_completion.bash
>deleted file mode 100644
>index 50ab25d..0000000
>--- 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 ab65873..0000000
>--- 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 8d59872..0000000
>--- 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 0000000..6ce368a
>--- /dev/null
>+++ b/textproc/fzf/pkg-message
>@@ -0,0 +1,24 @@
>+[
>+{ type: install
>+  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
>+}
>+]
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 277698: 249165 | 249342 | 250093 | 251001 | 251002