[pkgsrc/trunk]: pkgsrc/mail/neomutt Add a couple more patches to work around ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/24c42a8cc9d4
branches:  trunk
changeset: 364587:24c42a8cc9d4
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Jun 30 11:07:26 2017 +0000

description:
Add a couple more patches to work around upstream breakage after they
ran include-what-you-use.  Package now builds on SunOS and with sasl.

diffstat:

 mail/neomutt/distinfo                   |   4 +++-
 mail/neomutt/patches/patch-mutt__sasl.h |  18 ++++++++++++++++++
 mail/neomutt/patches/patch-resize.c     |  14 ++++++++++++++
 3 files changed, 35 insertions(+), 1 deletions(-)

diffs (55 lines):

diff -r bc09de86b19f -r 24c42a8cc9d4 mail/neomutt/distinfo
--- a/mail/neomutt/distinfo     Fri Jun 30 10:58:18 2017 +0000
+++ b/mail/neomutt/distinfo     Fri Jun 30 11:07:26 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2017/06/30 10:58:18 wiz Exp $
+$NetBSD: distinfo,v 1.24 2017/06/30 11:07:26 jperkin Exp $
 
 SHA1 (neomutt-20170609.tar.gz) = fd0e07e95c4a5dc6b21df02ea1c0355acf1fcc17
 RMD160 (neomutt-20170609.tar.gz) = 3b2b696bd48e6a0b846c20b6621fe92dd996d6b3
@@ -6,3 +6,5 @@
 Size (neomutt-20170609.tar.gz) = 2637349 bytes
 SHA1 (patch-configure.ac) = e11fc46e1baad716022954e08556c213544201f5
 SHA1 (patch-m4_gssapi.m4) = 9198e221e8dbed2633fcd45a53167cd19547ad65
+SHA1 (patch-mutt__sasl.h) = e41ebdd0e2f64811da61ef4530dd44d67bc836f2
+SHA1 (patch-resize.c) = d8cf215e23b20ba46361b1edd3fbcc316abb1516
diff -r bc09de86b19f -r 24c42a8cc9d4 mail/neomutt/patches/patch-mutt__sasl.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/neomutt/patches/patch-mutt__sasl.h   Fri Jun 30 11:07:26 2017 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-mutt__sasl.h,v 1.1 2017/06/30 11:07:26 jperkin Exp $
+
+Handle include-what-you-use breakage.
+
+--- mutt_sasl.h.orig   2017-06-09 10:52:07.000000000 +0000
++++ mutt_sasl.h
+@@ -23,9 +23,11 @@
+ #include <stddef.h>
+ #include <sasl/sasl.h>
+ 
++#ifdef HOW_ON_EARTH_IS_THIS_SUPPOSED_TO_WORK_AT_ALL
+ typedef struct sasl_conn sasl_conn_t;
+ typedef struct sasl_interact  sasl_interact_t;
+ typedef unsigned sasl_ssf_t;
++#endif
+ struct Connection;
+ 
+ int mutt_sasl_client_new(struct Connection *conn, sasl_conn_t **saslconn);
diff -r bc09de86b19f -r 24c42a8cc9d4 mail/neomutt/patches/patch-resize.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/neomutt/patches/patch-resize.c       Fri Jun 30 11:07:26 2017 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-resize.c,v 1.1 2017/06/30 11:07:26 jperkin Exp $
+
+Handle include-what-you-use breakage.
+
+--- resize.c.orig      2017-06-09 10:52:07.000000000 +0000
++++ resize.c
+@@ -19,6 +19,7 @@
+ #include <fcntl.h>
+ #include <stdbool.h>
+ #include <stdlib.h>
++#include <termios.h>
+ #include <unistd.h>
+ #include "lib.h"
+ #include "mutt_curses.h"