diff options
author | leot <leot@pkgsrc.org> | 2018-02-15 15:05:55 +0000 |
---|---|---|
committer | leot <leot@pkgsrc.org> | 2018-02-15 15:05:55 +0000 |
commit | 42910bcfe5599c7afbd534c05d7ec80eb7f4eb80 (patch) | |
tree | b03adca019b14516ac74e971c6693315d399f38b /sysutils | |
parent | f4c9c24da7b90cf46762d93593c8601e846950d6 (diff) | |
download | pkgsrc-42910bcfe5599c7afbd534c05d7ec80eb7f4eb80.tar.gz |
fzf: Use `do-install' to install only needed files
lang/go/go-package.mk install several files that are not needed for packages
that just install a program. Define `do-install' target to avoid that.
While here also install fzf-tmux in bin/, man pages under ${PKGMANDIR}
accordingly and shell completions/bindings and vim plugin under
share/fzf. Update MESSAGE to reflect this change.
PKGREVISION++
Discussed with <maya>.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/fzf/MESSAGE | 14 | ||||
-rw-r--r-- | sysutils/fzf/Makefile | 20 | ||||
-rw-r--r-- | sysutils/fzf/PLIST | 90 |
3 files changed, 35 insertions, 89 deletions
diff --git a/sysutils/fzf/MESSAGE b/sysutils/fzf/MESSAGE index 2575708cfe0..072f75a1bd3 100644 --- a/sysutils/fzf/MESSAGE +++ b/sysutils/fzf/MESSAGE @@ -1,8 +1,12 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2017/11/03 09:25:27 maya Exp $ -fzf comes with bindings for bash, zsh and fish in - PREFIX/gopkg/src/github.com/junegunn/fzf/shell/ +$NetBSD: MESSAGE,v 1.3 2018/02/15 15:05:55 leot Exp $ + +fzf comes with completions and bindings for bash, zsh and fish in: + + ${PREFIX}/share/fzf/shell + +And vim bindings in: + + ${PREFIX}/share/fzf/plugin -And vim bindings in - PREFIX/gopkg/src/github.com/junegunn/fzf/plugin/fzf.vim =========================================================================== diff --git a/sysutils/fzf/Makefile b/sysutils/fzf/Makefile index 8b6f523f7b2..8571aad0ad6 100644 --- a/sysutils/fzf/Makefile +++ b/sysutils/fzf/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2017/12/30 04:52:35 maya Exp $ +# $NetBSD: Makefile,v 1.5 2018/02/15 15:05:55 leot Exp $ DISTNAME= fzf-0.17.3 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GITHUB:=junegunn/} @@ -15,10 +16,21 @@ GO_DIST_BASE= ${DISTNAME} GO_SRCPATH= github.com/junegunn/fzf REPLACE_BASH+= bin/fzf-tmux -REPLACE_BASH+= install -REPLACE_BASH+= uninstall -CHECK_INTERPRETER_SKIP+= gopkg/src/github.com/junegunn/fzf/src/update_assets.rb +FZF_SHELL_FILES+= completion.bash completion.zsh +FZF_SHELL_FILES+= key-bindings.bash key-bindings.fish key-bindings.zsh + +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 share/fzf/plugin share/fzf/shell + +do-install: + ${INSTALL_PROGRAM} ${WRKDIR}/bin/fzf ${DESTDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bin/fzf-tmux ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/man1/fzf.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/man/man1/fzf-tmux.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/plugin/fzf.vim ${DESTDIR}${PREFIX}/share/fzf/plugin +.for f in ${FZF_SHELL_FILES} + ${INSTALL_DATA} ${WRKSRC}/shell/${f} ${DESTDIR}${PREFIX}/share/fzf/shell +.endfor .include "../../devel/go-isatty/buildlink3.mk" .include "../../devel/go-shellwords/buildlink3.mk" diff --git a/sysutils/fzf/PLIST b/sysutils/fzf/PLIST index 3bd0e40bb0c..3e205c0816f 100644 --- a/sysutils/fzf/PLIST +++ b/sysutils/fzf/PLIST @@ -1,81 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2017/10/24 06:57:50 maya Exp $ +@comment $NetBSD: PLIST,v 1.2 2018/02/15 15:05:55 leot Exp $ bin/fzf -gopkg/pkg/${GO_PLATFORM}/github.com/junegunn/fzf/src.a -gopkg/pkg/${GO_PLATFORM}/github.com/junegunn/fzf/src/algo.a -gopkg/pkg/${GO_PLATFORM}/github.com/junegunn/fzf/src/tui.a -gopkg/pkg/${GO_PLATFORM}/github.com/junegunn/fzf/src/util.a -gopkg/src/github.com/junegunn/fzf/BUILD.md -gopkg/src/github.com/junegunn/fzf/CHANGELOG.md -gopkg/src/github.com/junegunn/fzf/LICENSE -gopkg/src/github.com/junegunn/fzf/Makefile -gopkg/src/github.com/junegunn/fzf/README-VIM.md -gopkg/src/github.com/junegunn/fzf/README.md -gopkg/src/github.com/junegunn/fzf/bin/fzf-tmux -gopkg/src/github.com/junegunn/fzf/doc/fzf.txt -gopkg/src/github.com/junegunn/fzf/glide.lock -gopkg/src/github.com/junegunn/fzf/glide.yaml -gopkg/src/github.com/junegunn/fzf/install -gopkg/src/github.com/junegunn/fzf/main.go -gopkg/src/github.com/junegunn/fzf/man/man1/fzf-tmux.1 -gopkg/src/github.com/junegunn/fzf/man/man1/fzf.1 -gopkg/src/github.com/junegunn/fzf/plugin/fzf.vim -gopkg/src/github.com/junegunn/fzf/shell/completion.bash -gopkg/src/github.com/junegunn/fzf/shell/completion.zsh -gopkg/src/github.com/junegunn/fzf/shell/key-bindings.bash -gopkg/src/github.com/junegunn/fzf/shell/key-bindings.fish -gopkg/src/github.com/junegunn/fzf/shell/key-bindings.zsh -gopkg/src/github.com/junegunn/fzf/src/LICENSE -gopkg/src/github.com/junegunn/fzf/src/algo/algo.go -gopkg/src/github.com/junegunn/fzf/src/algo/algo_test.go -gopkg/src/github.com/junegunn/fzf/src/algo/normalize.go -gopkg/src/github.com/junegunn/fzf/src/ansi.go -gopkg/src/github.com/junegunn/fzf/src/ansi_test.go -gopkg/src/github.com/junegunn/fzf/src/cache.go -gopkg/src/github.com/junegunn/fzf/src/cache_test.go -gopkg/src/github.com/junegunn/fzf/src/chunklist.go -gopkg/src/github.com/junegunn/fzf/src/chunklist_test.go -gopkg/src/github.com/junegunn/fzf/src/constants.go -gopkg/src/github.com/junegunn/fzf/src/core.go -gopkg/src/github.com/junegunn/fzf/src/history.go -gopkg/src/github.com/junegunn/fzf/src/history_test.go -gopkg/src/github.com/junegunn/fzf/src/item.go -gopkg/src/github.com/junegunn/fzf/src/item_test.go -gopkg/src/github.com/junegunn/fzf/src/matcher.go -gopkg/src/github.com/junegunn/fzf/src/merger.go -gopkg/src/github.com/junegunn/fzf/src/merger_test.go -gopkg/src/github.com/junegunn/fzf/src/options.go -gopkg/src/github.com/junegunn/fzf/src/options_test.go -gopkg/src/github.com/junegunn/fzf/src/pattern.go -gopkg/src/github.com/junegunn/fzf/src/pattern_test.go -gopkg/src/github.com/junegunn/fzf/src/reader.go -gopkg/src/github.com/junegunn/fzf/src/reader_test.go -gopkg/src/github.com/junegunn/fzf/src/result.go -gopkg/src/github.com/junegunn/fzf/src/result_others.go -gopkg/src/github.com/junegunn/fzf/src/result_test.go -gopkg/src/github.com/junegunn/fzf/src/result_x86.go -gopkg/src/github.com/junegunn/fzf/src/terminal.go -gopkg/src/github.com/junegunn/fzf/src/terminal_test.go -gopkg/src/github.com/junegunn/fzf/src/terminal_unix.go -gopkg/src/github.com/junegunn/fzf/src/terminal_windows.go -gopkg/src/github.com/junegunn/fzf/src/tokenizer.go -gopkg/src/github.com/junegunn/fzf/src/tokenizer_test.go -gopkg/src/github.com/junegunn/fzf/src/tui/dummy.go -gopkg/src/github.com/junegunn/fzf/src/tui/light.go -gopkg/src/github.com/junegunn/fzf/src/tui/tcell.go -gopkg/src/github.com/junegunn/fzf/src/tui/tui.go -gopkg/src/github.com/junegunn/fzf/src/tui/tui_test.go -gopkg/src/github.com/junegunn/fzf/src/update_assets.rb -gopkg/src/github.com/junegunn/fzf/src/util/atomicbool.go -gopkg/src/github.com/junegunn/fzf/src/util/atomicbool_test.go -gopkg/src/github.com/junegunn/fzf/src/util/chars.go -gopkg/src/github.com/junegunn/fzf/src/util/chars_test.go -gopkg/src/github.com/junegunn/fzf/src/util/eventbox.go -gopkg/src/github.com/junegunn/fzf/src/util/eventbox_test.go -gopkg/src/github.com/junegunn/fzf/src/util/slab.go -gopkg/src/github.com/junegunn/fzf/src/util/util.go -gopkg/src/github.com/junegunn/fzf/src/util/util_test.go -gopkg/src/github.com/junegunn/fzf/src/util/util_unix.go -gopkg/src/github.com/junegunn/fzf/src/util/util_windows.go -gopkg/src/github.com/junegunn/fzf/test/fzf.vader -gopkg/src/github.com/junegunn/fzf/test/test_go.rb -gopkg/src/github.com/junegunn/fzf/uninstall +bin/fzf-tmux +man/man1/fzf-tmux.1 +man/man1/fzf.1 +share/fzf/plugin/fzf.vim +share/fzf/shell/completion.bash +share/fzf/shell/completion.zsh +share/fzf/shell/key-bindings.bash +share/fzf/shell/key-bindings.fish +share/fzf/shell/key-bindings.zsh |