Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1498820846247310"
MIME-Version: 1.0
Date: Fri, 30 Jun 2017 11:07:26 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/mail/neomutt
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20170630110726.86148FAE8@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1498820846247310
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Fri Jun 30 11:07:26 UTC 2017

Modified Files:
	pkgsrc/mail/neomutt: distinfo
Added Files:
	pkgsrc/mail/neomutt/patches: patch-mutt__sasl.h patch-resize.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/neomutt/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/neomutt/patches/patch-mutt__sasl.h \
    pkgsrc/mail/neomutt/patches/patch-resize.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1498820846247310
Content-Disposition: inline
Content-Length: 2325
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/neomutt/distinfo
diff -u pkgsrc/mail/neomutt/distinfo:1.23 pkgsrc/mail/neomutt/distinfo:1.24
--- pkgsrc/mail/neomutt/distinfo:1.23	Fri Jun 30 10:58:18 2017
+++ pkgsrc/mail/neomutt/distinfo	Fri Jun 30 11:07:26 2017
@@ -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 @@ SHA512 (neomutt-20170609.tar.gz) = e5ced
 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

Added files:

Index: pkgsrc/mail/neomutt/patches/patch-mutt__sasl.h
diff -u /dev/null pkgsrc/mail/neomutt/patches/patch-mutt__sasl.h:1.1
--- /dev/null	Fri Jun 30 11:07:26 2017
+++ pkgsrc/mail/neomutt/patches/patch-mutt__sasl.h	Fri Jun 30 11:07:26 2017
@@ -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);
Index: pkgsrc/mail/neomutt/patches/patch-resize.c
diff -u /dev/null pkgsrc/mail/neomutt/patches/patch-resize.c:1.1
--- /dev/null	Fri Jun 30 11:07:26 2017
+++ pkgsrc/mail/neomutt/patches/patch-resize.c	Fri Jun 30 11:07:26 2017
@@ -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"


--_----------=_1498820846247310--