[Bug 233993] mail/mutt extra patch patches do not apply cleanly if QUOTE_PATCH is not selected

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=233993

            Bug ID: 233993
           Summary: mail/mutt extra patch patches do not apply cleanly if
                    QUOTE_PATCH is not selected
           Product: Ports & Packages
           Version: Latest
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Some People
          Priority: ---
         Component: Individual Port(s)
          Assignee: ports-bugs at FreeBSD.org
          Reporter: mjl at luckie.org.nz
                CC: dereks at lifeofadishwasher.com
             Flags: maintainer-feedback?(dereks at lifeofadishwasher.com)
                CC: dereks at lifeofadishwasher.com

Created attachment 200091
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=200091&action=edit
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.

-- 
You are receiving this mail because:
You are the assignee for the bug.