Update mail/mutt-devel to 1.5.19

User destdir mode instead of user-destdir: this make sure the package is
correctly created when mutt_dotlock is needed.

Mostly bugfixes in changelog, among them:
- Only install mutt_dotlock(1) if binary is installed.
- Allow for mail addresses longer than 256 characters.
- Make multipart decoding a little more forgiving.
- Make $move default to no instead of ask-no.
- Show more information about problematic SMIME signatures under gpgme.
- Improve gpgme SMIME uid display.
- Support displaying application/pgp-keys with GPGME.
- Verify hostname in (Open)SSL certificate validation.
- Make text/enriched handler multibyte aware.
- translation updates.

UPDATING:
+ support for SSL certificate chains
+ <what-key> function works in pager, too
+ support for tokyocabinet (qdbm successor)
! $move now defaults to "no" instead of "ask-no"
+ $imap_pipeline_depth controls the number of commands that mutt can issue
  to an IMAP server before it must collect the responses
+ $ssl_client_cert available with gnutls as well as openssl
+ 'mime_lookup application/octet-stream' added to system Muttrc

9 files changed, 41 insertions, 61 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 9b87a67fb9b..e2afc711039 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2008/11/29 21:31:58 joerg Exp $
+# $NetBSD: Makefile,v 1.71 2009/01/26 22:35:02 tonio Exp $
 
-DISTNAME=		mutt-1.5.18
-PKGREVISION=		2
+DISTNAME=		mutt-1.5.19
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -14,7 +13,7 @@ HOMEPAGE=		http://www.mutt.org/
 COMMENT=		Text-based MIME mail client with PGP & S/MIME support
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
+PKG_DESTDIR_SUPPORT=	destdir # avoid user-destdir to handle mutt_dotlock
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
index 00a704af001..72e48591917 100644
--- a/mail/mutt-devel/PLIST
+++ b/mail/mutt-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:03 jlam Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/01/26 22:35:02 tonio Exp $
 bin/flea
 bin/mutt
 bin/muttbug
@@ -8,14 +8,13 @@ bin/pgpring
 ${PLIST.smime}bin/smime_keys
 man/man1/flea.1
 man/man1/mutt.1
-man/man1/mutt_dotlock.1
+${PLIST.dotlock}man/man1/mutt_dotlock.1
 man/man1/muttbug.1
 man/man5/mutt-mbox.5
 man/man5/mutt-mmdf.5
 man/man5/muttrc.5
 share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog
-share/doc/mutt/ChangeLog.old
 share/doc/mutt/GPL
 share/doc/mutt/INSTALL
 share/doc/mutt/NEWS
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index b815297baf0..10c0570fe5f 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,21 +1,14 @@
-$NetBSD: distinfo,v 1.52 2008/11/29 21:31:59 joerg Exp $
+$NetBSD: distinfo,v 1.53 2009/01/26 22:35:02 tonio Exp $
 
-SHA1 (mutt-1.5.18.tar.gz) = a835a1933297494f2c6c68b9a334cc1d71a95e5a
-RMD160 (mutt-1.5.18.tar.gz) = 1c8595f66eb9aa94c01a6020be20a75c0c8d2d14
-Size (mutt-1.5.18.tar.gz) = 3602632 bytes
-SHA1 (patch-1.5.14.dgc.xlabel_ext.9) = a5e3a6542d16c3a4fbd833986655bdc5c7896e5e
-RMD160 (patch-1.5.14.dgc.xlabel_ext.9) = 137d89ca5d9001efb8bea79ea523487b22145384
-Size (patch-1.5.14.dgc.xlabel_ext.9) = 12881 bytes
-SHA1 (patch-1.5.18.rr.compressed.1.gz) = ee71611faf30348f685ed4c18a4406b8c34f91e7
-RMD160 (patch-1.5.18.rr.compressed.1.gz) = 555f9d285b8f7706d44789204d3ed184d9590b32
-Size (patch-1.5.18.rr.compressed.1.gz) = 10577 bytes
+SHA1 (mutt-1.5.19.tar.gz) = 96e4cc1e1419ba816fcc19d77255978e62c20793
+RMD160 (mutt-1.5.19.tar.gz) = dcb8d027593bfccd62eb7aba338007bce3c7e22e
+Size (mutt-1.5.19.tar.gz) = 3558746 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = afc1b743c9299d0aa817dff3a0e580bbb3b9302a
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
-SHA1 (patch-ae) = bea9a46e431ef9582c96b94556e56295ad92c8ed
-SHA1 (patch-ag) = b27327f0da19f8f3aad8d11505d7e6eabe9febd8
+SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6
 SHA1 (patch-al) = ac8d963286d9edee73ee00bdb8f4ffcd65c6cd5d
 SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
-SHA1 (patch-an) = dcd89d76cab32bed582a3f9c40e979508fdffa06
-SHA1 (patch-ao) = 9119cc582edab5ad59fc5531467e6bc5ea7c968b
-SHA1 (patch-ap) = 3da973ee9e8e3787b286aaf7097c7f18a6afe28c
+SHA1 (patch-an) = 96eb3aeea3f567b4835eac5d799355f62ad5a455
+SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
+SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index 185f5d88ff4..78c27ba7f7f 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.32 2008/05/25 14:30:42 joerg Exp $
+# $NetBSD: options.mk,v 1.33 2009/01/26 22:35:02 tonio Exp $
 
 # Global and legacy options
 
@@ -6,9 +6,10 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
 PKG_OPTIONS_REQUIRED_GROUPS=	display
 PKG_OPTIONS_GROUP.display=	slang ncurses ncursesw curses
 PKG_SUPPORTED_OPTIONS=	debug gpgme idn ssl smime sasl
-PKG_SUPPORTED_OPTIONS+=	mutt-hcache mutt-smtp mutt-xlabel
+PKG_SUPPORTED_OPTIONS+=	mutt-hcache mutt-smtp
 # Comment the following line out on updates.
-PKG_SUPPORTED_OPTIONS+=	mutt-compressed-mbox
+#PKG_SUPPORTED_OPTIONS+=	mutt-compressed-mbox
+#PKG_SUPPORTED_OPTIONS+=	mutt-xlabel
 PKG_SUGGESTED_OPTIONS=	ssl smime curses
 
 .include "../../mk/bsd.options.mk"
diff --git a/mail/mutt-devel/patches/patch-ae b/mail/mutt-devel/patches/patch-ae
deleted file mode 100644
index cccf7826723..00000000000
--- a/mail/mutt-devel/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.12 2008/11/19 12:06:41 wiz Exp $
-
---- mbyte.c.orig	2008-05-10 07:47:57.000000000 +0000
-+++ mbyte.c
-@@ -496,6 +496,7 @@ int mutt_filter_unprintable (char **s)
-     {
-       k = 1;
-       wc = replacement_char();
-+      memset (&mbstate1, 0, sizeof (mbstate1));
-     }
-     if (!IsWPrint (wc))
-       wc = '?';
diff --git a/mail/mutt-devel/patches/patch-ag b/mail/mutt-devel/patches/patch-ag
index 971c8167c87..6e0a95cb106 100644
--- a/mail/mutt-devel/patches/patch-ag
+++ b/mail/mutt-devel/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2008/05/18 08:26:31 tonio Exp $
+$NetBSD: patch-ag,v 1.8 2009/01/26 22:35:03 tonio Exp $
 
---- doc/Makefile.in.orig	Sun Apr 20 05:08:50 2008
+--- doc/Makefile.in.orig	2009-01-05 20:24:14.000000000 +0100
 +++ doc/Makefile.in
-@@ -491,7 +491,7 @@ uninstall-am: uninstall-info-am uninstal
+@@ -492,7 +492,7 @@ uninstall-am: uninstall-local
  
  all: makedoc-all
  
@@ -11,8 +11,8 @@ $NetBSD: patch-ag,v 1.7 2008/05/18 08:26:31 tonio Exp $
  
  install-data-local: makedoc-all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -503,8 +503,8 @@ install-data-local: makedoc-all instdoc
- 	./instdoc $(srcdir)/dotlock.man \
+@@ -504,8 +504,8 @@ install-data-local: makedoc-all instdoc
+ 	test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
  		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
  	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
 -	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
diff --git a/mail/mutt-devel/patches/patch-an b/mail/mutt-devel/patches/patch-an
index ef555b600e3..4a78b9e5bfb 100644
--- a/mail/mutt-devel/patches/patch-an
+++ b/mail/mutt-devel/patches/patch-an
@@ -1,12 +1,12 @@
-$NetBSD: patch-an,v 1.2 2008/05/18 08:26:31 tonio Exp $
+$NetBSD: patch-an,v 1.3 2009/01/26 22:35:03 tonio Exp $
 
 Add change_folder_next option.
 
---- init.h.orig	2007-11-01 02:48:52.000000000 +0900
-+++ init.h	2007-12-06 17:35:34.000000000 +0900
-@@ -317,6 +317,13 @@
-   ** Character set your terminal uses to display and enter textual data.
-   ** It is also the fallback for $$send_charset.
+--- init.h.orig	2009-01-05 20:20:53.000000000 +0100
++++ init.h
+@@ -341,6 +341,13 @@ struct option_t MuttVars[] = {
+   ** \fBNote:\fP It should only be set in case Mutt isn't abled to determine the
+   ** character set used correctly.
    */
 +  { "change_folder_next", DT_BOOL, R_NONE, OPTCHANGEFOLDERNEXT, 0 },
 +  /*
diff --git a/mail/mutt-devel/patches/patch-ao b/mail/mutt-devel/patches/patch-ao
index dab9b0cebc8..2d0b8af4fae 100644
--- a/mail/mutt-devel/patches/patch-ao
+++ b/mail/mutt-devel/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.3 2008/06/02 16:42:34 sketch Exp $
+$NetBSD: patch-ao,v 1.4 2009/01/26 22:35:03 tonio Exp $
 
 Add change_folder_next option.
 
@@ -11,7 +11,7 @@ Add change_folder_next option.
 +	  if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
 +	  {
 +	    strfcpy (buf, Context->path, sizeof (buf));
-+	    mutt_pretty_mailbox (buf);
++	    mutt_pretty_mailbox (buf, sizeof (buf));
 +	  }
  	  mutt_buffy (buf, sizeof (buf));
  
diff --git a/mail/mutt-devel/patches/patch-ap b/mail/mutt-devel/patches/patch-ap
index b209908ad52..127b52238eb 100644
--- a/mail/mutt-devel/patches/patch-ap
+++ b/mail/mutt-devel/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1 2008/11/29 21:31:59 joerg Exp $
+$NetBSD: patch-ap,v 1.2 2009/01/26 22:35:03 tonio Exp $
 
---- doc/Muttrc.orig	2008-11-29 22:13:21.000000000 +0100
+--- doc/Muttrc.orig	2009-01-06 01:36:17.000000000 +0100
 +++ doc/Muttrc
-@@ -18,7 +18,7 @@ macro index,pager,attach,compose \cb "\
+@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
  "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1
@@ -11,7 +11,7 @@ $NetBSD: patch-ap,v 1.1 2008/11/29 21:31:59 joerg Exp $
  
  # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
-@@ -719,11 +719,11 @@ attachments   -I message/external-body
+@@ -750,11 +750,11 @@ attachments   -I message/external-body
  # filtered message is read from the standard output.
  # 
  # 
@@ -24,13 +24,13 @@ $NetBSD: patch-ap,v 1.1 2008/11/29 21:31:59 joerg Exp $
 +# Default: "@PREFIX@/bin/mutt_dotlock"
  # 
  # 
- # Contains the path of the mutt_dotlock (8) binary to be used by
-@@ -4306,7 +4306,7 @@ attachments   -I message/external-body
+ # Contains the path of the mutt_dotlock(8) binary to be used by
+@@ -4472,7 +4472,7 @@ attachments   -I message/external-body
+ # 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 server. Example:
+ # 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"
  # 
--# tunnel="ssh -q mailhost.net /usr/local/libexec/imapd"
-+# tunnel="ssh -q mailhost.net @PREFIX@/libexec/imapd"
- # 
- # NOTE: For this example to work you must be able to log in to the remote
+ # Note: For this example to work you must be able to log in to the remote
  # machine without having to enter a password.