update to neomutt-20170428

mail/neomutt/Makefile

@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2017/03/07 09:12:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2017/05/25 17:06:26 sthen Exp $
 
 COMMENT=	tty-based e-mail client, Mutt with patches
 
-V=		20170306
-DISTNAME=	neomutt-$V
+GH_ACCOUNT=	neomutt
+GH_PROJECT=	neomutt
+GH_TAGNAME=	neomutt-20170428
+DISTNAME=	${GH_TAGNAME}
 
 CATEGORIES=	mail
 HOMEPAGE=	http://www.neomutt.org/
@@ -16,8 +18,6 @@ PERMIT_PACKAGE_CDROM=	Yes
 # uses pledge()
 WANTLIB+=	c crypto iconv idn intl ncursesw ssl z
 
-MASTER_SITES=	https://github.com/neomutt/neomutt/releases/download/neomutt-$V/
-
 LIB_DEPENDS+=	devel/gettext \
 		devel/libidn
 BUILD_DEPENDS+=	textproc/docbook-xsl \
@@ -29,7 +29,11 @@ FLAVOR?=
 FLAVOR_COMMA=	${FLAVOR_EXT:S/-/,/g}
 SUBST_VARS=	FLAVOR_COMMA
 
-CONFIGURE_STYLE= gnu
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.15
+CONFIGURE_STYLE= autoconf
+BUILD_DEPENDS+=	${MODGNU_AUTOCONF_DEPENDS} \
+		${MODGNU_AUTOMAKE_DEPENDS}
 
 CONFIGURE_ARGS+= --enable-compressed \
 		--enable-external_dotlock \
@@ -83,6 +87,10 @@ CONFIGURE_ARGS+= --with-kyotocabinet \
 		--without-qdbm
 .endif
 
+post-patch:
+	cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+	    AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf --install
+
 post-install:
 	@mv -f ${PREFIX}/share/doc/mutt/samples/* ${PREFIX}/share/examples/mutt
 	@perl -pi -e "s,/usr/bin/gpg,${LOCALBASE}/bin/gpg," \

mail/neomutt/distinfo

@@ -1,2 +1,2 @@
-SHA256 (neomutt-20170306.tar.gz) = bIpapOKM19zSPz6JqZFtgRWQH+nVYb+zmPVgUDnX+Ic=
-SIZE (neomutt-20170306.tar.gz) = 4645116
+SHA256 (neomutt-20170428.tar.gz) = xhAMavsSC26ygQ6ayuZRL8SFHr1/5xHFvECz7inA0wY=
+SIZE (neomutt-20170428.tar.gz) = 2733684

mail/neomutt/patches/patch-main_c

@@ -1,10 +1,11 @@
-$OpenBSD: patch-main_c,v 1.3 2017/01/28 21:30:00 sthen Exp $
+$OpenBSD: patch-main_c,v 1.4 2017/05/25 17:06:26 sthen Exp $
 
 Pledge
 
---- main.c.orig	Sat Jan 28 12:46:45 2017
-+++ main.c	Sat Jan 28 21:25:26 2017
-@@ -400,6 +400,30 @@ int main (int argc, char **argv, char **environ)
+Index: main.c
+--- main.c.orig
++++ main.c
+@@ -395,6 +395,30 @@ int main(int argc, char **argv, char **environ)
        }
    }
  

mail/neomutt/patches/patch-mutt_sasl_c

@@ -1,14 +1,25 @@
-$OpenBSD: patch-mutt_sasl_c,v 1.1.1.1 2016/10/18 10:47:15 sthen Exp $
+$OpenBSD: patch-mutt_sasl_c,v 1.2 2017/05/25 17:06:26 sthen Exp $
 
 Pledge
 
---- mutt_sasl.c.orig	Fri Aug 26 23:53:14 2016
-+++ mutt_sasl.c	Thu Sep  1 18:11:34 2016
-@@ -86,7 +86,6 @@ static sasl_callback_t mutt_sasl_callbacks[5];
+Index: mutt_sasl.c
+--- mutt_sasl.c.orig
++++ mutt_sasl.c
+@@ -28,6 +28,8 @@
+ #include "account.h"
+ #include "mutt_socket.h"
  
- static sasl_secret_t *secret_ptr = NULL;
++int mutt_sasl_start (void);
++
+ static int getnameinfo_err(int ret)
+ {
+   int err;
+@@ -123,7 +125,7 @@ static int mutt_sasl_cb_log(void *context, int priorit
  
--static int mutt_sasl_start (void);
+ /* mutt_sasl_start: called before doing a SASL exchange - initialises library
+  *   (if necessary). */
+-static int mutt_sasl_start(void)
++int mutt_sasl_start(void)
+ {
+   static unsigned char sasl_init = 0;
  
- /* callbacks */
- static int mutt_sasl_cb_log (void* context, int priority, const char* message);

mail/neomutt/patches/patch-mutt_sasl_h

@@ -1,14 +0,0 @@
-$OpenBSD: patch-mutt_sasl_h,v 1.1.1.1 2016/10/18 10:47:15 sthen Exp $
-
-Pledge
-
---- mutt_sasl.h.orig	Sun Jan 17 05:20:10 2016
-+++ mutt_sasl.h	Sun Jan 17 05:19:32 2016
-@@ -25,6 +25,7 @@
- 
- #include "mutt_socket.h"
- 
-+int mutt_sasl_start (void);
- int mutt_sasl_client_new (CONNECTION*, sasl_conn_t**);
- sasl_callback_t* mutt_sasl_get_callbacks (ACCOUNT*);
- int mutt_sasl_interact (sasl_interact_t*);

mail/neomutt/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2016/11/29 00:35:33 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2017/05/25 17:06:26 sthen Exp $
 @conflict mutt-*
 @bin bin/mutt
 @bin bin/mutt_dotlock
@@ -122,9 +122,7 @@ share/examples/mutt/pgp5.rc
 share/examples/mutt/pgp6.rc
 share/examples/mutt/sample.mailcap
 share/examples/mutt/sample.muttrc
-share/examples/mutt/sample.muttrc-sidebar
 share/examples/mutt/sample.muttrc-tlr
-share/examples/mutt/sample.vimrc-sidebar
 share/examples/mutt/smime.rc
 share/examples/mutt/smime_keys_test.pl
 share/locale/bg/LC_MESSAGES/mutt.mo