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.

6 files changed, 25 insertions, 31 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 6a72904412d..df3b350f257 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.181 2016/07/09 06:38:30 wiz Exp $
+# $NetBSD: Makefile,v 1.182 2016/08/21 11:39:31 wiz Exp $
 
-DISTNAME=		mutt-1.6.2
-PKGREVISION=		1
+DISTNAME=		mutt-1.7.0
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/
 
diff --git a/mail/mutt/Makefile.common b/mail/mutt/Makefile.common
index 761208efe51..9f07821733a 100644
--- a/mail/mutt/Makefile.common
+++ b/mail/mutt/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2016/02/25 15:00:51 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.3 2016/08/21 11:39:31 wiz Exp $
 #
 # used by mail/mutt/Makefile
-# used by mail/mutt-kz/Makefile
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index a8e8c604242..c029c854290 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.45 2016/07/07 07:23:57 tron Exp $
+$NetBSD: distinfo,v 1.46 2016/08/21 11:39:31 wiz Exp $
 
-SHA1 (mutt-1.6.2.tar.gz) = 67910ea4025a7f5ac8808e34bd55519200e08bcf
-RMD160 (mutt-1.6.2.tar.gz) = a5ff12a3bd3658302b799699ceac0d071eb452a3
-SHA512 (mutt-1.6.2.tar.gz) = c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916
-Size (mutt-1.6.2.tar.gz) = 3956745 bytes
-SHA1 (patch-1.6.0.rr.compressed.gz) = 9a672673dd0bd4a2c1624627a8be3c558af2a5d8
-RMD160 (patch-1.6.0.rr.compressed.gz) = f648b17a84b48c3e8529f45df48ff8bce908dc08
-SHA512 (patch-1.6.0.rr.compressed.gz) = 2b37b84cb930bcc3809910c400298e798d293d7c351b58b59b44d76f48263af1c068a282c6a3baa7de8f42a23c0a86a4dabb11919be892356eff5bf303b199d9
-Size (patch-1.6.0.rr.compressed.gz) = 9977 bytes
+SHA1 (mutt-1.7.0.tar.gz) = 0d9c0ae7d4725e2216ea0c1271ae19ab8bcf653b
+RMD160 (mutt-1.7.0.tar.gz) = f508f0332d2dfcaa398c3b68889ac619781b1651
+SHA512 (mutt-1.7.0.tar.gz) = 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612
+Size (mutt-1.7.0.tar.gz) = 4019567 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681
 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
@@ -15,10 +11,10 @@ SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344
 SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6
 SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61
 SHA1 (patch-ag) = b7902d2412538f15bc25b123ca742c03a3dd3a12
-SHA1 (patch-ah) = dfe747c30a44bb309cccaca1bd5174fccc3c2bed
-SHA1 (patch-al) = 49542905cde263b8d4c79f71cce3759024c804a3
+SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a
+SHA1 (patch-al) = fb7e089c9703d13821165659f88fe78204d38a47
 SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
 SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
-SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
+SHA1 (patch-ao) = 7c8f18ccb3dc6a6f40daf55b53e52b4722f60efd
 SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
 SHA1 (patch-aq) = e363d8929ced9731a31af1137b111d3476a3d05d
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)