Bug 233993
| Summary: | mail/mutt extra patch patches do not apply cleanly if QUOTE_PATCH is not selected | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | mjl | ||||
| Component: | Individual Port(s) | Assignee: | Kurt Jaeger <pi> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Some People | CC: | dereks, pi | ||||
| Priority: | --- | Flags: | dereks:
maintainer-feedback+
|
||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
testbuild with/without QUOTE_PATCH selected, looks fine. Committed, thanks! A commit references this bug: Author: pi Date: Sat Dec 22 16:45:26 UTC 2018 New revision: 488105 URL: https://svnweb.freebsd.org/changeset/ports/488105 Log: mail/mutt: fix extra patches if QUOTE_PATCH is not selected - remove some context from the extra-patches so that they still apply if QUOTE_PATCH is not selected. PR: 233993 Submitted by: mjl@luckie.org.nz Approved by: dereks@lifeofadishwasher.com (maintainer) Changes: head/mail/mutt/files/extra-patch-ifdef head/mail/mutt/files/extra-patch-reverse_reply |
Created attachment 200091 [details] remove patch context that prevents building I was unable to build mutt, because it failed to apply the extra-patch-ifdef file. Specifically, the patch is aborting because of the modification in /usr/ports/mail/mutt/files/extra-patch-ifdef to the PATCHES file. ===> Patching for mutt-1.11.1 ===> Applying extra patch /usr/ports/mail/mutt/files/extra-patch-aspell ===> Applying extra patch /usr/ports/mail/mutt/files/extra-patch-ifdef 1 out of 1 hunks failed--saving rejects to PATCHES.rej The issue is that I did not have QUOTE_PATCH configured, so PATCHES did not have the content that the extra-patch-ifdef and extra-patch-reverse_reply patches assumed would be there to apply against. I think the fix is to remove the patch context, like some of the other patches in mail/mutt/files. The attached patch works for me, and seems to be similar to the approach taken in revision 474718 for extra-patch-reverse_reply.