Bug 257666 - shells/fish: Update to 3.3.1
Summary: shells/fish: Update to 3.3.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: Li-Wen Hsu
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-08-06 23:45 UTC by Ben Nied
Modified: 2021-08-10 06:42 UTC (History)
1 user (show)

See Also:
asomers: maintainer-feedback+


Attachments
Proposed Patch (3.65 KB, patch)
2021-08-06 23:45 UTC, Ben Nied
no flags Details | Diff
Proposed Patch rev. 2 (4.36 KB, patch)
2021-08-07 03:42 UTC, Ben Nied
no flags Details | Diff
Proposed Patch rev. 3 (4.36 KB, patch)
2021-08-09 17:05 UTC, Ben Nied
no flags Details | Diff
Proposed Patchposed Patch rev. 5 (5.25 KB, patch)
2021-08-09 17:08 UTC, Ben Nied
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Ben Nied 2021-08-06 23:45:53 UTC
Created attachment 227000 [details]
Proposed Patch

Patch to upgrade fish to 3.3.1

Tested locally successfully.
Comment 1 Ben Nied 2021-08-07 03:42:31 UTC
Created attachment 227001 [details]
Proposed Patch rev. 2
Comment 2 Ben Nied 2021-08-07 05:13:14 UTC
Tested on:

- FreeBSD 13 aarch64
- FreeBSD 13 amd64
- FreeBSD 12 aarch64
- FreeBSD 12 amd64
Comment 3 Alan Somers freebsd_committer freebsd_triage 2021-08-07 13:29:34 UTC
LGTM
Comment 4 Li-Wen Hsu freebsd_committer freebsd_triage 2021-08-09 08:17:32 UTC
poudriere reports some files not in pkg-plist:

====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: %%DATADIR%%/man/man1/fish-interactive.1.gz
Error: Orphaned: %%DATADIR%%/man/man1/fish-language.1.gz
Error: Orphaned: %%DATADIR%%/man/man1/prompt_login.1.gz
===> Checking for items in pkg-plist which are not in STAGEDIR
===> Error: Plist issues found.


Also, should these manual page files be installed to %{PREFIX}/man/man1 ?
Comment 5 Ben Nied 2021-08-09 17:05:46 UTC
Created attachment 227053 [details]
Proposed Patch rev. 3
Comment 6 Ben Nied 2021-08-09 17:08:28 UTC
Created attachment 227054 [details]
Proposed Patchposed Patch rev. 5

TIL about poudriere. Thanks lwhsu@FreeBSD.org for the pointer! (and for pointing out the missing manpages!)

This patch should address those.

I'm putting those manpages where the other manpages in the build are currently going, but I'm happy to move those somewhere else, if desired.
Comment 7 commit-hook freebsd_committer freebsd_triage 2021-08-10 06:42:39 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=da06c6145e86a82f64f487ae359b08ad54bb4856

commit da06c6145e86a82f64f487ae359b08ad54bb4856
Author:     Ben Nied <spacewreckage@gmail.com>
AuthorDate: 2021-08-10 06:39:09 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-08-10 06:41:40 +0000

    shells/fish: Update to 3.3.1

    PR:             257666
    Approved by:    asomers (maintainer)

 shells/fish/Makefile  |  2 +-
 shells/fish/distinfo  |  6 +++---
 shells/fish/pkg-plist | 25 ++++++++++++++-----------
 3 files changed, 18 insertions(+), 15 deletions(-)