diff options
| author | Lewis Cook <lcook@FreeBSD.org> | 2021-04-25 14:25:01 +0000 |
|---|---|---|
| committer | Lewis Cook <lcook@FreeBSD.org> | 2021-04-25 14:25:01 +0000 |
| commit | 36d76902abf2cb2e16da2dd31cf38e58adaf37a7 (patch) | |
| tree | 9f501e40a149472722391dd7433fdf7d402c820f | |
| parent | a131fc63e9274f63a98f98245405949a93d1b3fb (diff) | |
| download | ports-36d76902abf2cb2e16da2dd31cf38e58adaf37a7.tar.gz ports-36d76902abf2cb2e16da2dd31cf38e58adaf37a7.zip | |
devel/gh: Resolve conflict with shells/fish
PR: 255384
Reported by: Bjorn Neergaard <bjorn@neersighted.com>
MFH: 2021Q2
| -rw-r--r-- | devel/gh/Makefile | 5 | ||||
| -rw-r--r-- | devel/gh/pkg-plist | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/devel/gh/Makefile b/devel/gh/Makefile index 07f0e43d30a5..09b48bd0e428 100644 --- a/devel/gh/Makefile +++ b/devel/gh/Makefile @@ -1,6 +1,7 @@ PORTNAME= gh DISTVERSIONPREFIX= v DISTVERSION= 1.9.2 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= lcook@FreeBSD.org @@ -101,9 +102,9 @@ post-install-COMPLETIONS-on: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${GO_WRKSRC}/bash \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME} - @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions + @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d ${INSTALL_DATA} ${GO_WRKSRC}/fish \ - ${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish + ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/${PORTNAME}.fish @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${GO_WRKSRC}/zsh \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME} diff --git a/devel/gh/pkg-plist b/devel/gh/pkg-plist index b4ab8f8d46e8..efde94f09f24 100644 --- a/devel/gh/pkg-plist +++ b/devel/gh/pkg-plist @@ -1,5 +1,5 @@ %%COMPLETIONS%%etc/bash_completion.d/gh -%%COMPLETIONS%%share/fish/completions/gh.fish +%%COMPLETIONS%%share/fish/vendor_completions.d/gh.fish %%COMPLETIONS%%share/zsh/site-functions/_gh %%MANPAGES%%man/man1/gh-actions.1.gz %%MANPAGES%%man/man1/gh-alias-delete.1.gz |