Import of pkgsrc-2016Q3

mail/mutt/patches/patch-af

@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.6 2015/09/03 14:49:02 wiz Exp $
+$NetBSD: patch-af,v 1.7 2016/04/09 08:47:36 tron Exp $
 
 1.) On some systems, curses.h defines TRUE and FALSE, so conditionalise
     them here to avoid compiler complaints about duplicate definitions.
 
---- lib.h.orig	2014-03-12 16:03:45.000000000 +0000
-+++ lib.h	2014-12-19 20:41:07.000000000 +0000
+--- lib.h.orig	2016-04-02 19:12:22.000000000 +0100
++++ lib.h	2016-04-09 09:34:25.000000000 +0100
 @@ -54,8 +54,12 @@
  #  define N_(a) a
  # endif
@@ -18,5 +18,5 @@ $NetBSD: patch-af,v 1.6 2015/09/03 14:49:02 wiz Exp $
 +#  define FALSE 0
 +# endif
  
- # define HUGE_STRING	5120
+ # define HUGE_STRING     8192
  # define LONG_STRING     1024

mail/mutt/patches/patch-ah

@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.6 2015/09/03 14:49:02 wiz Exp $
+$NetBSD: patch-ah,v 1.7 2016/08/21 11:39:31 wiz Exp $
 
 mutt_curses.h refers to event_t from mutt,h, and SHORT_STRING from lib.h,
 so include those headers here.
 
---- mutt_curses.h.orig	2008-11-11 21:55:47.000000000 +0200
+--- mutt_curses.h.orig	2016-08-11 01:47:00.000000000 +0000
 +++ mutt_curses.h
 @@ -52,6 +52,9 @@
  # include <curses.h>
@@ -12,6 +12,6 @@ so include those headers here.
 +#include "lib.h" /* for SHORT_STRING */
 +#include "mutt.h" /* for event_t */
 +
- #define M_ENTER_C '\n'
- #define M_ENTER_S "\n"
+ #define MUTT_ENTER_C '\n'
+ #define MUTT_ENTER_S "\n"
  

mail/mutt/patches/patch-al

@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.9 2015/09/03 14:49:02 wiz Exp $
+$NetBSD: patch-al,v 1.10 2016/08/21 11:39:31 wiz Exp $
 
---- configure.orig	2010-08-25 16:31:47.000000000 +0000
+--- configure.orig	2016-08-18 01:56:27.000000000 +0000
 +++ configure
-@@ -7836,7 +7836,7 @@ fi
+@@ -8355,7 +8355,7 @@ fi
  
          old_LIBS="$LIBS"
          LIBS="$LIBS $MUTTLIBS"
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.9 2015/09/03 14:49:02 wiz Exp $
  do
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_func declaration" >&5
-@@ -8856,7 +8856,7 @@ fi
+@@ -9412,7 +9412,7 @@ fi
  
  if test x$mutt_cv_setgid = xyes; then
          DOTLOCK_GROUP='mail'

mail/mutt/patches/patch-ao

@@ -1,11 +1,11 @@
-$NetBSD: patch-ao,v 1.1 2015/09/03 14:49:02 wiz Exp $
+$NetBSD: patch-ao,v 1.2 2016/08/21 11:39:31 wiz Exp $
 
 Add change_folder_next option.
 
---- curs_main.c.orig	2007-12-06 17:32:01.000000000 +0900
-+++ curs_main.c	2007-12-06 17:34:20.000000000 +0900
-@@ -1080,6 +1080,11 @@
- 	}
+--- curs_main.c.orig	2016-08-11 01:47:00.000000000 +0000
++++ curs_main.c
+@@ -1206,6 +1206,11 @@ int mutt_index_menu (void)
+ #endif
  	else
  	{
 +	  if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
@@ -15,4 +15,4 @@ Add change_folder_next option.
 +	  }
  	  mutt_buffy (buf, sizeof (buf));
  
- 	  if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
+           if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)