Bug 255384 - devel/gh: conflicts with shells/fish
Summary: devel/gh: conflicts with shells/fish
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-04-25 06:11 UTC by Bjorn Neergaard
Modified: 2021-04-25 15:37 UTC (History)
2 users (show)

See Also:
lcook: merge-quarterly+


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Bjorn Neergaard 2021-04-25 06:11:19 UTC
The two ports conflict on /usr/local/share/fish/completions/gh.fish. I am not sure which file should win here, but currently the fish completion included by devel/gh precludes using the utility with shells/fish.
Comment 1 Lewis Cook freebsd_committer freebsd_triage 2021-04-25 14:18:17 UTC
Moin moin

Thankfully, we won't need to CONFLICTS_INSTALL anything here.  Instead, we can install the generated fish shell completions provided by devel/gh to ${PREFIX}/share/fish/vendor_completions.d, oppose to over-riding ones provided upstream. 

Anything residing under vendor_completions.d take precedence too. I will get to fixing this shortly.  Thanks!
Comment 2 commit-hook freebsd_committer 2021-04-25 14:28:25 UTC
A commit in branch main references this bug:

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(-)
Comment 3 commit-hook freebsd_committer 2021-04-25 14:33:27 UTC
A commit in branch 2021Q2 references this bug:

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(-)
Comment 4 Lewis Cook freebsd_committer freebsd_triage 2021-04-25 14:35:31 UTC
Okay, that appears to have fixed the issue.  If you find anything else please let me know.  Otherwise, thank you for the report!