Attachment #249342 for bug #277698




PORTNAME=	fzf
DISTVERSION=	0.48.1
PORTREVISION=	3
CATEGORIES=	textproc
MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
DISTFILES=	go.mod:gomod

GO_MODULE=	github.com/junegunn/fzf
GO_BUILDFLAGS=	-ldflags="-X main.revision=${COMMIT_ID} -s -w"

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=		TMUX
OPTIONS_DEFAULT=	TMUX

TMUX_DESC=	Install fzf-tmux (depends on BASH)


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

Lines 1-5 Link Here

(-)b/textproc/fzf/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1690816707	1	TIMESTAMP = 1710947984
2	SHA256 (go/textproc_fzf/junegunn-fzf-0.42.0_GH0/go.mod) = 2261585fafcd4f08e955e096fd1d82312055830822a0bb3462a51779f379cde1	2	SHA256 (go/textproc_fzf/junegunn-fzf-0.48.1_GH0/go.mod) = 754ec773bda0c028c11b7f796807a569e46856994d89ddd87cb0a25bab335574
3	SIZE (go/textproc_fzf/junegunn-fzf-0.42.0_GH0/go.mod) = 540	3	SIZE (go/textproc_fzf/junegunn-fzf-0.48.1_GH0/go.mod) = 496
4	SHA256 (go/textproc_fzf/junegunn-fzf-0.42.0_GH0/junegunn-fzf-0.42.0_GH0.tar.gz) = 743c1bfc7851b0796ab73c6da7db09d915c2b54c0dd3e8611308985af8ed3df2	4	SHA256 (go/textproc_fzf/junegunn-fzf-0.48.1_GH0/junegunn-fzf-0.48.1_GH0.tar.gz) = c8dbb545d651808ef4e1f51edba177fa918ea56ac53376c690dc6f2dd0156a71
5	SIZE (go/textproc_fzf/junegunn-fzf-0.42.0_GH0/junegunn-fzf-0.42.0_GH0.tar.gz) = 239469	5	SIZE (go/textproc_fzf/junegunn-fzf-0.48.1_GH0/junegunn-fzf-0.48.1_GH0.tar.gz) = 262833

Removed Link Here

(-)a/textproc/fzf/files/patch-shell_completion.bash (-11 lines)
1	--- shell/completion.bash.orig 2023-07-31 17:35:49.551906000 +0200
2	+++ shell/completion.bash 2023-07-31 17:35:58.560554000 +0200
3	@@ -271,7 +271,7 @@
4
5	_fzf_proc_completion() {
6	_fzf_complete -m --header-lines=1 --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <(
7	- command ps -eo user,pid,ppid,start,time,command 2> /dev/null \|\|
8	+ command ps -uef 2> /dev/null \|\|
9	command ps -eo user,pid,ppid,time,args # For BusyBox
10	)
11	}

Removed Link Here

(-)a/textproc/fzf/files/patch-shell_completion.zsh (-11 lines)
1	--- shell/completion.zsh.orig 2023-07-31 17:25:48.004185000 +0200
2	+++ shell/completion.zsh 2023-07-31 17:34:23.011756000 +0200
3	@@ -252,7 +252,7 @@
4
5	_fzf_complete_kill() {
6	_fzf_complete -m --header-lines=1 --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <(
7	- command ps -eo user,pid,ppid,start,time,command 2> /dev/null \|\|
8	+ command ps -uef 2> /dev/null \|\|
9	command ps -eo user,pid,ppid,time,args # For BusyBox
10	)
11	}

Removed Link Here

(-)a/textproc/fzf/files/pkg-message.in (-10 lines)
1	[
2	{ type: install
3	message: <<EOM
4	Various shell key bindings and completion files have been installed
5	to %%EXAMPLESDIR%%/shell.
6
7	To use these include them in your shell configuration.
8	EOM
9	}
10	]




[
{ 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
}
]

Return to bug 277698

Lines 1-6 Link Here

(-)b/textproc/fzf/Makefile (-11 / +3 lines)
1	PORTNAME= fzf	1	PORTNAME= fzf
2	DISTVERSION= 0.42.0	2	DISTVERSION= 0.48.1
3	PORTREVISION= 3
4	CATEGORIES= textproc	3	CATEGORIES= textproc
5	MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod	4	MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
6	DISTFILES= go.mod:gomod	5	DISTFILES= go.mod:gomod
Lines 21-35 GH_PROJECT= fzf Link Here
21	GO_MODULE= github.com/junegunn/fzf	20	GO_MODULE= github.com/junegunn/fzf
22	GO_BUILDFLAGS= -ldflags="-X main.revision=${COMMIT_ID} -s -w"	21	GO_BUILDFLAGS= -ldflags="-X main.revision=${COMMIT_ID} -s -w"
23		22
24	COMMIT_ID= 2023012	23	COMMIT_ID= d579e33
25		24
26	SUB_FILES= pkg-message
27	PLIST_FILES= bin/fzf share/man/man1/fzf.1.gz	25	PLIST_FILES= bin/fzf share/man/man1/fzf.1.gz
28	PORTEXAMPLES= shell/completion.bash shell/completion.zsh \
29	shell/key-bindings.bash shell/key-bindings.fish \
30	shell/key-bindings.zsh
31		26
32	OPTIONS_DEFINE= EXAMPLES TMUX	27	OPTIONS_DEFINE= TMUX
33	OPTIONS_DEFAULT= TMUX	28	OPTIONS_DEFAULT= TMUX
34		29
35	TMUX_DESC= Install fzf-tmux (depends on BASH)	30	TMUX_DESC= Install fzf-tmux (depends on BASH)
Lines 39-47 TMUX_PLIST_FILES= bin/fzf-tmux share/man/man1/fzf-tmux.1.gz Link Here
39		34
40	post-install:	35	post-install:
41	${INSTALL_MAN} ${WRKSRC}/man/man1/fzf.1 ${STAGEDIR}${PREFIX}/share/man/man1	36	${INSTALL_MAN} ${WRKSRC}/man/man1/fzf.1 ${STAGEDIR}${PREFIX}/share/man/man1
42	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
43	(cd ${WRKSRC} && \
44	${COPYTREE_SHARE} shell ${STAGEDIR}${EXAMPLESDIR})
45		37
46	post-install-TMUX-on:	38	post-install-TMUX-on:
47	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}-tmux ${STAGEDIR}${PREFIX}/bin	39	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}-tmux ${STAGEDIR}${PREFIX}/bin

Added Link Here

(-)b/textproc/fzf/pkg-message (-1 / +24 lines)
0	-	1	[
		2	{ type: install
		3	message: <<EOM
		4	Shell integration scripts are now embedded in the fzf binary. This simplifies
		5	the distribution, and the users are less likely to have problems caused by using
		6	incompatible scripts and binaries.
		7
		8	bash
		9
		10	# Set up fzf key bindings and fuzzy completion
		11	eval "$(fzf --bash)"
		12
		13	zsh
		14
		15	# Set up fzf key bindings and fuzzy completion
		16	eval "$(fzf --zsh)"
		17
		18	fish
		19
		20	# Set up fzf key bindings
		21	fzf --fish \| source
		22	EOM
		23	}
		24	]