CVS commit: pkgsrc/mail/mutt

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tron
Date:           Sun Dec  1 00:02:34 UTC 2019

Modified Files:
        pkgsrc/mail/mutt: Makefile PLIST distinfo
Added Files:
        pkgsrc/mail/mutt/patches: patch-doc-Muttrc
Removed Files:
        pkgsrc/mail/mutt/patches: patch-ap

Log Message:
mutt: Update to version 1.13.0

Changes since version 1.12.2:
! <half-up> and <half-down> in the pager are now symmetric.
! $ssl_force_tls is now set by default.
! Configure option --with-regex is renamed to --with-bundled-regex.
  Most modern OS should be fine using their own regex library.  The
  rename is to clarify the intention of the option.
! Configure option --disable-doc now only disables the manual generation.
  Other parts of the doc directory (man pages, Muttrc file) are generated.
! $user_agent is now unset by default.
! unattachments now has a '*' parameter to remove all attachment counting.
+ Autocrypt support.  Enabled via configure option --enable-autocrypt.
  Please see the manual for details on how to enable and use this properly.
+ Byte size displays can be customized via new variables $size_show_bytes,
  $size_show_mb, $size_show_fractions, $size_units_on_left.
+ $ssl_use_tlsv1_3, default set, allows TLS1.3 connections if supported
  by the server.
! format=flowed space stuffing works again, and is performed after every
  edit, not just the first time.
+ $browser_sticky_cursor, default set, attempts to keep the cursor on the
  same mailbox when performing operations in the browser.
! <display-filename> in the browser menu shows the full path for local and
  IMAP mailboxes.
! $sidebar_folder_indent and $sidebar_short_path are now based on previous
  entries in the sidebar, allowing them to work on mailboxes outside $folder.
! Sidebar entries are now prefixed with mailbox shortcuts '~' and '='.  This
  uses the same code as other parts of mutt, for more consistent display.
+ <browse-mailboxes> allows direct access to the mailboxes list from the
  index and pager, without having to use a macro.  This improves
  $browser_sticky_cursor initial selection of the current mailbox.
! <pipe-message> with $pipe_decode set will update MIME headers to decoded
  text/plain values.
+ $send_multipart_alternative and $send_multipart_alternative_filter allow
  the generation of a multipart/alternative when composing a message.  See
  their documentation in the manual for more details.  Also see
  contrib/markdown2html for a sample filter.
+ In the compose menu <view-alt>, <view-alt-text>, <view-alt-mailcap> allow
  previewing the output of the $send_multipart_alternative_filter.
! $write_bcc now defaults unset.  It no longer affects the Fcc copy, which
  will always include the Bcc header.
+ When $count_alternatives is set, Mutt will recurse inside
  multipart/alternatives while performing attachment searching and counting.
  This affects %X in the index and ~X pattern matching.


To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 pkgsrc/mail/mutt/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/mail/mutt/PLIST
cvs rdiff -u -r1.75 -r1.76 pkgsrc/mail/mutt/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/mail/mutt/patches/patch-ap
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/mutt/patches/patch-doc-Muttrc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/mutt/Makefile
diff -u pkgsrc/mail/mutt/Makefile:1.215 pkgsrc/mail/mutt/Makefile:1.216
--- pkgsrc/mail/mutt/Makefile:1.215     Sat Nov  2 16:25:23 2019
+++ pkgsrc/mail/mutt/Makefile   Sun Dec  1 00:02:34 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.215 2019/11/02 16:25:23 rillig Exp $
+# $NetBSD: Makefile,v 1.216 2019/12/01 00:02:34 tron Exp $
 
-DISTNAME=              mutt-1.12.2
+DISTNAME=              mutt-1.13.0
 CATEGORIES=            mail
 MASTER_SITES=          ftp://ftp.mutt.org/pub/mutt/
 
@@ -28,6 +28,8 @@ CONFIGURE_ARGS+=      --enable-imap
 CONFIGURE_ARGS.SunOS+= --disable-filemonitor
 INFO_FILES=            yes
 
+REPLACE_PYTHON+=       contrib/markdown2html
+
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
 # Force sendmail to /usr/sbin to avoid postfix's
 # ${LOCALBASE}/sbin/sendmail.  Should be enabled on all platforms which
@@ -67,5 +69,6 @@ INSTALL_MAKE_FLAGS=   ${MAKE_FLAGS} syscon
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/libxslt/xsltproc-nonet.mk"
+.include "../../lang/python/application.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/mutt/PLIST
diff -u pkgsrc/mail/mutt/PLIST:1.26 pkgsrc/mail/mutt/PLIST:1.27
--- pkgsrc/mail/mutt/PLIST:1.26 Sun May 26 08:43:14 2019
+++ pkgsrc/mail/mutt/PLIST      Sun Dec  1 00:02:34 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2019/05/26 08:43:14 tron Exp $
+@comment $NetBSD: PLIST,v 1.27 2019/12/01 00:02:34 tron Exp $
 bin/flea
 bin/mutt
 bin/mutt_dotlock
@@ -69,6 +69,7 @@ share/examples/mutt/iconv/iconv.solaris-
 share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
 share/examples/mutt/iconv/iconv.solaris-2.6.rc
 share/examples/mutt/iconv/iconv.solaris-2.7.rc
+share/examples/mutt/markdown2html
 share/examples/mutt/mime.types
 share/examples/mutt/mime.types.dist
 share/examples/mutt/mutt_xtitle

Index: pkgsrc/mail/mutt/distinfo
diff -u pkgsrc/mail/mutt/distinfo:1.75 pkgsrc/mail/mutt/distinfo:1.76
--- pkgsrc/mail/mutt/distinfo:1.75      Sat Sep 21 22:32:41 2019
+++ pkgsrc/mail/mutt/distinfo   Sun Dec  1 00:02:34 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.75 2019/09/21 22:32:41 tron Exp $
+$NetBSD: distinfo,v 1.76 2019/12/01 00:02:34 tron Exp $
 
-SHA1 (mutt-1.12.2.tar.gz) = 1a83d47d0996c52c35e494c5beaa56316860e291
-RMD160 (mutt-1.12.2.tar.gz) = ea10b7699a5cbd49dfd3d62efd05d2cbad2c7a21
-SHA512 (mutt-1.12.2.tar.gz) = a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd
-Size (mutt-1.12.2.tar.gz) = 4675774 bytes
+SHA1 (mutt-1.13.0.tar.gz) = 1714769ba8a657568f8a2208648b36fa964f7acf
+RMD160 (mutt-1.13.0.tar.gz) = 8f3b233a9bcd9fb97a12728022f1bb7b85775b29
+SHA512 (mutt-1.13.0.tar.gz) = 76dc0a0cce4293851fb4caa0018538f112bac0f02a1faa2a8ec62bbf078b130d2907709423b3eda5217d24886e58a1e7a184a094701c9bdb989e93b9dac123fa
+Size (mutt-1.13.0.tar.gz) = 4889693 bytes
 SHA1 (patch-aa) = ffa6fc8af174b3caf3286f24ea6330b4a27d91a1
 SHA1 (patch-ab) = 3d094b6bdb2b2ffac8ce6a1d3a306714c9f01835
 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
@@ -12,4 +12,4 @@ SHA1 (patch-af) = fd9eb93b580ce4f2115c3d
 SHA1 (patch-ag) = ccf9d69c4fc1017c3a906e86dd8c60f6c8c87683
 SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a
 SHA1 (patch-al) = 0cb26ce9f89c1f0651eb46117f62ae6275bfaf97
-SHA1 (patch-ap) = b26c1cbc107831d075edf7ced54d34f10552b666
+SHA1 (patch-doc-Muttrc) = 4c76d20a957f21891083386b558a6f9adff15473

Added files:

Index: pkgsrc/mail/mutt/patches/patch-doc-Muttrc
diff -u /dev/null pkgsrc/mail/mutt/patches/patch-doc-Muttrc:1.1
--- /dev/null   Sun Dec  1 00:02:34 2019
+++ pkgsrc/mail/mutt/patches/patch-doc-Muttrc   Sun Dec  1 00:02:34 2019
@@ -0,0 +1,38 @@
+$NetBSD: patch-doc-Muttrc,v 1.1 2019/12/01 00:02:34 tron Exp $
+
+Rewrite hard coded pathnames configuration file documentation
+
+--- doc/Muttrc.orig    2019-11-30 18:14:44.000000000 +0000
++++ doc/Muttrc 2019-11-30 23:50:15.102043333 +0000
+@@ -23,7 +23,7 @@
+ "call urlview to extract URLs out of a message"
+ 
+ # Show documentation when pressing F1
+-macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
++macro generic,pager <F1> "<shell-escape> less @DOCDIR@/manual.txt<Enter>" "show Mutt documentation"
+ 
+ # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
+ # note: these macros have been subsumed by the <browse-mailboxes> function.
+@@ -1183,11 +1183,11 @@
+ # filtered message is read from the standard output.
+ # 
+ # 
+-# set dotlock_program="/usr/local/bin/mutt_dotlock"
++# set dotlock_program="@PREFIX@/bin/mutt_dotlock"
+ #
+ # Name: dotlock_program
+ # Type: path
+-# Default: "/usr/local/bin/mutt_dotlock"
++# Default: "@PREFIX@/bin/mutt_dotlock"
+ # 
+ # 
+ # Contains the path of the mutt_dotlock(8) binary to be used by
+@@ -5923,7 +5923,7 @@
+ # Setting this variable will cause mutt to open a pipe to a command
+ # instead of a raw socket. You may be able to use this to set up
+ # preauthenticated connections to your IMAP/POP3/SMTP server. Example:
+-# set tunnel="ssh -q mailhost.net /usr/local/libexec/imapd"
++# set tunnel="ssh -q mailhost.net @PREFIX@/libexec/imapd"
+ # 
+ # Note: For this example to work you must be able to log in to the remote
+ # machine without having to enter a password.