Date: Sun, 25 Apr 2021 14:33:06 GMT From: Lewis Cook <lcook@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 91c1be95cdb6 - 2021Q2 - devel/gh: Resolve conflict with shells/fish Message-ID: <202104251433.13PEX6dE098218@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=91c1be95cdb690669d0aaad41ba8854d8f1feb42 commit 91c1be95cdb690669d0aaad41ba8854d8f1feb42 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:31:08 +0000 devel/gh: Resolve conflict with shells/fish PR: 255384 Reported by: Bjorn Neergaard <bjorn@neersighted.com> (cherry picked from commit 36d76902abf2cb2e16da2dd31cf38e58adaf37a7) --- devel/gh/Makefile | 6 +++--- devel/gh/pkg-plist | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/gh/Makefile b/devel/gh/Makefile index 197b39c7ada7..4e2fa862f2e8 100644 --- a/devel/gh/Makefile +++ b/devel/gh/Makefile @@ -1,7 +1,7 @@ - PORTNAME= gh DISTVERSIONPREFIX= v DISTVERSION= 1.8.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= lcook@FreeBSD.org @@ -100,9 +100,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 6f0020ac96bf..b9c916c6674f 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-alias-delete.1.gz %%MANPAGES%%man/man1/gh-alias-list.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104251433.13PEX6dE098218>