Updated mutt to 1.8.0.

1.8.0 (2017-02-24):

  - $locale has been removed.  Mutt now respects the LC_TIME setting
    instead.  See also $attribution_locale.
  + $attribution_locale can be used to override the date formatting in
    attribution strings.  When unset, Mutt will use the locale
    environment, but note the default value of $date_format has a
    leading '!' which says to use the C-locale.
  ! Message-id and mail-followup-to headers are now preserved for recalled
    messages.
  + <unsidebar_whitelist> added to complement <sidebar_whitelist>.
  ! The pager position is reset to the top when toggling header-weed.
  ! IMAP messages moved to $trash via server-side copy are marked as read.
  + <root-message> jumps to the root message of a thread.
  ! Piped text attachments are charset converted.
  + Added %F to $attach_format, to show the content-disposition filename.
    %d will fall back to %F which will fall back to %f.
  + <rename-attachment> allows an attachment name to be changed, without
    modifying the underlying file's name.
  ! Mutt will look for the user's muttrc additionally in
    $XDG_CONFIG_HOME/mutt/.
  + Compressed mbox and mmdf files are now supported via open-hook,
    close-hook, and append-hook.  See contrib/sample.muttrc-compress
    for suggested settings.  Note this is a compile-time option:
    --enable-compressed.
  + When $flag_safe is set, flagged messages cannot be deleted.
  + The '@' pattern modifier can be used to limit matches to known aliases.
  + <mark-message> creates a hotkey binding to a specific message.  The hotkey
    prefix is specified via $mark_macro_prefix.
  + <setenv> and <unsetenv> can be used to add/remove environment variables
    passed to children.
  ! Mutt will now use the built-in OpenSSL SSL_set_verify() callback
    to verify certificates.  This allows better support for verifying
    chains, including alternative chain support.
  + $uncollapse_new controls whether a thread will be uncollapsed when a new
    message arrives.
  ! $to_chars and $status_chars now accept multibyte characters.
  + <subjectrx> allows replacing matching subjects with something else.
    This can be used to declutter subject lines in the index.
  + <edit-label> can be used to add, change, or delete a message's X-Label.
  ! Pattern expressions with ~y support label tab completion.
  + The header cache now also supports Kyoto Cabinet and LMDB as
    backend databases.
    [not yet supported in pkgsrc]

4 files changed, 11 insertions, 40 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 3eaeff41ac8..f7c3fd14fd0 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.185 2017/01/04 16:13:20 roy Exp $
+# $NetBSD: Makefile,v 1.186 2017/02/24 23:31:24 wiz Exp $
 
-DISTNAME=		mutt-1.7.2
-PKGREVISION=		1
+DISTNAME=		mutt-1.8.0
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/
 
diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST
index 7135ddd290d..6ed657c6158 100644
--- a/mail/mutt/PLIST
+++ b/mail/mutt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2016/10/13 17:53:36 tron Exp $
+@comment $NetBSD: PLIST,v 1.20 2017/02/24 23:31:24 wiz Exp $
 bin/flea
 bin/mutt
 bin/mutt_dotlock
@@ -79,6 +79,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-compress
 share/examples/mutt/sample.muttrc-sidebar
 share/examples/mutt/sample.muttrc-tlr
 share/examples/mutt/sample.vimrc-sidebar
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 50fe7d77666..2a28ee341fd 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.53 2016/12/05 18:19:47 tron Exp $
+$NetBSD: distinfo,v 1.54 2017/02/24 23:31:24 wiz Exp $
 
-SHA1 (mutt-1.7.2.tar.gz) = 39be2b552b99ed16f263487017c68cdbc1c7b384
-RMD160 (mutt-1.7.2.tar.gz) = 85ce9a9dde6daefbfdc70b61f243433b0e304c14
-SHA512 (mutt-1.7.2.tar.gz) = 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
-Size (mutt-1.7.2.tar.gz) = 4025880 bytes
-SHA1 (patch-1.7.1.rr.compressed.gz) = 76c494867b9cde2b51331a2a8c908fbc5dd8865d
-RMD160 (patch-1.7.1.rr.compressed.gz) = f55e742717b74485ca6601c7f89aea4d8327bbfc
-SHA512 (patch-1.7.1.rr.compressed.gz) = 6cf6b8e48f25aabe4c9f895143afd972e42ea7cfd995dfd247510ef4673928bf27c20a9a312735a79f98200638e746865ab9559c1b81901d025ed657b29ef19a
-Size (patch-1.7.1.rr.compressed.gz) = 9985 bytes
+SHA1 (mutt-1.8.0.tar.gz) = faddcf7b8044eb7f1887d61f5ffcc086fb2122ef
+RMD160 (mutt-1.8.0.tar.gz) = c3c4f716d100aff840c96c734208b24766430d24
+SHA512 (mutt-1.8.0.tar.gz) = 20120baa1d6c528281ba02faf8f19a3cbe3fce5bb5907a3513d3ec98592cd63db2b5f02884002c45dc18a4947d5cf2ac30e2ca4e059ad7a37ca0b22734e3bf1d
+Size (mutt-1.8.0.tar.gz) = 4116223 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681
 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk
index d2da583748d..749f47c1bce 100644
--- a/mail/mutt/options.mk
+++ b/mail/mutt/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.26 2017/01/04 16:13:20 roy Exp $
+# $NetBSD: options.mk,v 1.27 2017/02/24 23:31:24 wiz Exp $
 
 # Global and legacy options
 
@@ -6,11 +6,9 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
 PKG_OPTIONS_REQUIRED_GROUPS=	display
 PKG_OPTIONS_GROUP.display=	curses wide-curses slang
 PKG_SUPPORTED_OPTIONS=	debug gpgme idn ssl smime sasl
+# TODO: add kyoto cabinet and lmdb backend options for header cache
 PKG_SUPPORTED_OPTIONS+=	mutt-hcache tokyocabinet mutt-smtp
-PKG_SUPPORTED_OPTIONS+=	mutt-compressed-mbox
 PKG_SUGGESTED_OPTIONS=	curses gpgme mutt-hcache mutt-smtp smime ssl
-# patch does not apply
-#PKG_SUGGESTED_OPTIONS+=	mutt-compressed-mbox
 PKG_OPTIONS_LEGACY_OPTS+=	ncurses:curses ncursesw:wide-curses
 
 .include "../../mk/bsd.options.mk"
@@ -96,29 +94,6 @@ CONFIGURE_ARGS+=	--disable-hcache
 .endif
 
 ###
-### Compressed mail boxes
-###
-PLIST_VARS+=		compressed_mbox
-.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)	\
-	|| make(distinfo) || make(mps) || make(makepatchsum)
-PLIST.compressed_mbox=	yes
-PATCH_SITES+=		http://mutt.org.ua/download/${PKGNAME_NOREV}/
-PATCHFILES+=		patch-${PKGVERSION_NOREV}.rr.compressed.gz
-PATCH_DIST_STRIP=	-p1
-CONFIGURE_ARGS+=	--enable-compressed
-SUBST_CLASSES+=		compress
-SUBST_MESSAGE.compress=	Patch Makefile.in to avoid autoreconf for compress
-SUBST_STAGE.compress=	post-patch
-SUBST_FILES.compress=	Makefile.in
-SUBST_SED.compress=	-e 's,^mutt_SOURCES = ,mutt_SOURCES = compress.c ,'
-SUBST_SED.compress+=	-e 's,^EXTRA_DIST = ,EXTRA_DIST = compress.h ,'
-SUBST_SED.compress+=	-e 's,^mutt_OBJECTS = ,mutt_OBJECTS = compress.o ,'
-# add xsltproc to be able to regenerate the documentation
-BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-.endif
-
-###
 ### Internal SMTP relay support
 ###
 .if !empty(PKG_OPTIONS:Mmutt-smtp)