Date: Sun, 25 Apr 2021 14:27:23 GMT From: Lewis Cook <lcook@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 36d76902abf2 - main - devel/gh: Resolve conflict with shells/fish Message-ID: <202104251427.13PERNTL085417@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=36d76902abf2cb2e16da2dd31cf38e58adaf37a7 commit 36d76902abf2cb2e16da2dd31cf38e58adaf37a7 Author: Lewis Cook <lcook@FreeBSD.org> AuthorDate: 2021-04-25 14:25:01 +0000 Commit: Lewis Cook <lcook@FreeBSD.org> CommitDate: 2021-04-25 14:25:01 +0000 devel/gh: Resolve conflict with shells/fish PR: 255384 Reported by: Bjorn Neergaard <bjorn@neersighted.com> MFH: 2021Q2 --- devel/gh/Makefile | 5 +++-- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104251427.13PERNTL085417>