Bug 250243
| Summary: | shells/switchBashZsh: update to 1.1 | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | bourne.identity <bourne.identity> | ||||||||||||||||||
| Component: | Individual Port(s) | Assignee: | freebsd-ports-bugs (Nobody) <ports-bugs> | ||||||||||||||||||
| Status: | Closed FIXED | ||||||||||||||||||||
| Severity: | Affects Only Me | CC: | fernape | ||||||||||||||||||
| Priority: | --- | Keywords: | needs-qa | ||||||||||||||||||
| Version: | Latest | ||||||||||||||||||||
| Hardware: | Any | ||||||||||||||||||||
| OS: | Any | ||||||||||||||||||||
| URL: | https://github.com/bourne-again/switchBashZsh/releases/tag/1.1 | ||||||||||||||||||||
| Attachments: |
|
||||||||||||||||||||
The update primarily changes the license from GPL to BSD. ^Triage: Simplifying title ^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field. ^Triage: Please set the maintainer-approval attachment flag (to +) on patches for ports you maintain to signify approval. -- Attachment -> Details -> maintainer-approval [+] Q/A: patch did not apply cleanly. Would you mind checking it? The patch tries to set LICENSE to this: +LICENSE= BSD2CLAUSE But that is already in the repo and hence, it fails. See https://svnweb.freebsd.org/ports/head/shells/switchBashZsh/Makefile?revision=550135&view=markup Thanks! Hi Fernando, We have a problem here. The patch was generated by `svn diff`, and the patch at my end produces the change GPL -> BSD. As a further complication, I think the actual LICENSE file previously in use was actually GPL (almost certainly owing to my mistake). Can you manually correct things at your end ? Or else, send over a new patch file to me generated by `svn diff` (or something else) at your end ? Thank you for taking this up, Manish Jain I am uploading the current Makefile, distinfo and pkg-descr files at my end to help resolve the conflict. Created attachment 219509 [details]
current distinfo for switchBashZsh
Created attachment 219510 [details]
current Makefile for switchBashZsh
Created attachment 219511 [details]
current pkg-descr for switchBashZsh
Created attachment 219512 [details]
current distinfo for switchBashZsh
Created attachment 219513 [details]
current Makefile for switchBashZsh
Created attachment 219514 [details]
current pkg-descr for switchBashZsh
(In reply to bourne.identity@hotmail.com from comment #3) Maybe you should update your repo first? Just do that and attach a new patch. We should be fine :-) Hi Fernando, I am sorry for the trouble caused by my previous oversight. I did `svn up` and then regenerated the diff, which I am uploading as REVISED diff. If this solves the issue, please do let me know. And thanks again for helping me out, Manish Jain Created attachment 219521 [details]
REVISED diff
A commit references this bug: Author: fernape Date: Tue Nov 10 15:58:18 UTC 2020 New revision: 554840 URL: https://svnweb.freebsd.org/changeset/ports/554840 Log: shells/switchBashZsh: update to 1.1 ChangeLog: https://github.com/bourne-again/switchBashZsh/releases/tag/1.1 PR: 250243 Submitted by: bourne.identity@hotmail.com (maintainer) Changes: head/shells/switchBashZsh/Makefile head/shells/switchBashZsh/distinfo head/shells/switchBashZsh/pkg-descr (In reply to bourne.identity@hotmail.com from comment #12) Manish, no worries! and thanks for the update. Next time, though, you can just mark the other attachments as obsolete so the PR remains clean :-) Committed, Thanks! Thanks so much, Fernando ! |
Created attachment 218639 [details] svn diff for switchBashZsh v1.0 -> v1.1 shells/switchBashZsh update to version 1.1 svn diff for switchBashZsh v1.0 -> v1.1 is attached. Thank you, Manish Jain