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.
testbuild with/without QUOTE_PATCH selected, looks fine.
A commit references this bug:
Date: Sat Dec 22 16:45:26 UTC 2018
New revision: 488105
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.
Submitted by: firstname.lastname@example.org
Approved by: email@example.com (maintainer)