From owner-dev-commits-ports-all@freebsd.org Sun Apr 25 14:33:06 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D88BD6246CE; Sun, 25 Apr 2021 14:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSr9G5nWRz3RKv; Sun, 25 Apr 2021 14:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B96AD1600B; Sun, 25 Apr 2021 14:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PEX6Z9098219; Sun, 25 Apr 2021 14:33:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PEX6dE098218; Sun, 25 Apr 2021 14:33:06 GMT (envelope-from git) Date: Sun, 25 Apr 2021 14:33:06 GMT Message-Id: <202104251433.13PEX6dE098218@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Lewis Cook Subject: git: 91c1be95cdb6 - 2021Q2 - devel/gh: Resolve conflict with shells/fish MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lcook X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 91c1be95cdb690669d0aaad41ba8854d8f1feb42 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 14:33:06 -0000 The branch 2021Q2 has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=91c1be95cdb690669d0aaad41ba8854d8f1feb42 commit 91c1be95cdb690669d0aaad41ba8854d8f1feb42 Author: Lewis Cook AuthorDate: 2021-04-25 14:25:01 +0000 Commit: Lewis Cook CommitDate: 2021-04-25 14:31:08 +0000 devel/gh: Resolve conflict with shells/fish PR: 255384 Reported by: Bjorn Neergaard (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