Updated mutt to 1.7.0.

1.7.0 (2016-08-18):

  ! Improved alignment when using multi-column characters with
    soft-fill (%*X) and right-justified (%>X) format strings.
  + The COLUMNS environment variable will be set to the width of the
    pager when invoking display filters.  This can be used in
    copiousoutput mailcap entries to allow their output to match the
    pager width.
  + The sidebar patch has been merged.  Please watch for airborne
    bovine.  See the documentation for all the options, or simply
    enable it with 'set sidebar_visible'.
  + $mail_check_stats and $mail_check_stats_interval control whether,
    and how often, to scan for unread, flagged, and total message
    counts when checking for new mail in mailboxes.  These statistics
    can be displayed in the sidebar and browser.
  + $trash, when set, specifies the path of the folder where mails
    marked for deletion will be moved, instead of being irremediably
    purged.
  + The <purge-message> function can be used to delete an entry and
    bypass the trash folder.
  + $folder_format has new format strings %m and %n, to display
    total and unread message counts for mailboxes.  Note that
    $mail_check_stats should be enabled to use these.
  ! When browsing IMAP, %N will now display 'N', instead of the unread
    message count.  Please use %n to display unread messages.

3 files changed, 14 insertions, 14 deletions

diff --git a/mail/mutt/patches/patch-ah b/mail/mutt/patches/patch-ah
index 8384247e205..4731c68f917 100644
--- a/mail/mutt/patches/patch-ah
+++ b/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"
  
diff --git a/mail/mutt/patches/patch-al b/mail/mutt/patches/patch-al
index 1d91948d002..df8fd164191 100644
--- a/mail/mutt/patches/patch-al
+++ b/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'
diff --git a/mail/mutt/patches/patch-ao b/mail/mutt/patches/patch-ao
index 773be154ac2..a7a39f1e038 100644
--- a/mail/mutt/patches/patch-ao
+++ b/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)