Update mail/mutt-devel to 1.5.12

Changelog :

The keys used are:
  !: modified feature, -: deleted feature, +: new feature
1.5.12 (2006-07-14):
  - $imap_cachedir replaced with $message_cachedir
  + Header/body caching for POP ($message_cachedir)
  + Header caching for MH folders
  ! $record now defaults to ~/sent
  ! $imap_idle now defaults to "yes" instead of "no"
  + Tab-completion for $my_* variable names and values
  + Expansion of mutt variables (except shell escape)
  + Self-defined variables with $my_* prefix
  + Pattern group support
  + $imap_cachedir
  + 'old' flag on IMAP folders
  + SASL-IR support for IMAP
  + IMAP IDLE support and $imap_idle
  + Pipeline-based IMAP communicaton
  + Full large file support
  + Attachment counting: attachments and unattachments commands,
    %Q and %X for $attach_format, %X for $index_format
  + Basque translation
  + QDBM backend for header caching
  + Irish translation

6 files changed, 20 insertions, 64 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 29ecaecd80f..6f7bd442f77 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2006/06/20 14:07:31 tonio Exp $
+# $NetBSD: Makefile,v 1.51 2006/07/15 19:34:15 tonio Exp $
 
-DISTNAME=		mutt-1.5.11
-PKGREVISION=		5
+DISTNAME=		mutt-1.5.12
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
index 620aca64460..153f68e521a 100644
--- a/mail/mutt-devel/PLIST
+++ b/mail/mutt-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/04/17 07:07:24 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/07/15 19:34:15 tonio Exp $
 bin/flea
 bin/mutt
 bin/muttbug
@@ -28,6 +28,7 @@ share/doc/mutt/applying-patches.txt
 share/doc/mutt/devel-notes.txt
 share/doc/mutt/manual.html
 share/doc/mutt/index.html
+share/doc/mutt/intro.html
 share/doc/mutt/gettingstarted.html
 share/doc/mutt/configuration.html
 share/doc/mutt/mimesupport.html
@@ -81,7 +82,9 @@ share/locale/el/LC_MESSAGES/mutt.mo
 share/locale/eo/LC_MESSAGES/mutt.mo
 share/locale/es/LC_MESSAGES/mutt.mo
 share/locale/et/LC_MESSAGES/mutt.mo
+share/locale/eu/LC_MESSAGES/mutt.mo
 share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/ga/LC_MESSAGES/mutt.mo
 share/locale/gl/LC_MESSAGES/mutt.mo
 share/locale/hu/LC_MESSAGES/mutt.mo
 share/locale/id/LC_MESSAGES/mutt.mo
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 6f05a82844a..2f48c456136 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,18 +1,13 @@
-$NetBSD: distinfo,v 1.30 2006/06/20 14:07:31 tonio Exp $
+$NetBSD: distinfo,v 1.31 2006/07/15 19:34:15 tonio Exp $
 
-SHA1 (mutt-1.5.11.tar.gz) = cc5823016fe7de6ee3a131b19a3f78796f9f53d5
-RMD160 (mutt-1.5.11.tar.gz) = 812bfa6b1c9bfb1650341f7522298699c7b214a5
-Size (mutt-1.5.11.tar.gz) = 3187375 bytes
-SHA1 (patch-1.5.11.rr.compressed.1.gz) = 0a82f2253d11655a6f743d1a2cfc82877c4ef134
-RMD160 (patch-1.5.11.rr.compressed.1.gz) = 00f3302e86ce382e274e1b1745e0082ef1f643c4
-Size (patch-1.5.11.rr.compressed.1.gz) = 10433 bytes
+SHA1 (mutt-1.5.12.tar.gz) = bb888a35f42a77de7e326c03b60854ad1cc266ea
+RMD160 (mutt-1.5.12.tar.gz) = e68d4c5b099b8148769d138a36fa8561b278969c
+Size (mutt-1.5.12.tar.gz) = 3440835 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = deab9098ad64ab77b29233a3bf3df1439f36989a
 SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
 SHA1 (patch-ad) = c427d4ef5129018f26e5a4b3ee2fa5bfb59af3b9
-SHA1 (patch-ae) = 442e3be4d0a5483e55f8e218cfbfc026e28235f5
 SHA1 (patch-ag) = 84637d95fa9aa0cf58a6e6b2c82b783efa21cf66
 SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
 SHA1 (patch-ai) = 7d9883198a22615fb1792a41fce3ee9821f48f08
-SHA1 (patch-aj) = 1b5f99a0f330c94f3ce0240e6767b575280fd788
-SHA1 (patch-al) = 9a2c61fae88c6c42534490ee19498677a355c276
+SHA1 (patch-al) = a35a9d3b73bedc92167e418eed9c6c989ad39581
diff --git a/mail/mutt-devel/patches/patch-ae b/mail/mutt-devel/patches/patch-ae
deleted file mode 100644
index 0520af00aec..00000000000
--- a/mail/mutt-devel/patches/patch-ae
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2006/06/20 14:08:05 tonio Exp $
-
---- imap/browse.c.orig	2002-02-26 10:38:56.000000000 +0000
-+++ imap/browse.c	2006-06-20 10:05:32.000000000 +0100
-@@ -452,7 +452,7 @@
- 	    if (*s == '\"')
- 	    {
- 	      s++;
--	      while (*s && *s != '\"') 
-+	      while (*s && *s != '\"' && n < sizeof (ns) - 1) 
- 	      {
- 		if (*s == '\\')
- 		  s++;
-@@ -463,12 +463,14 @@
- 		s++;
- 	    }
- 	    else
--	      while (*s && !ISSPACE (*s)) 
-+	      while (*s && !ISSPACE (*s) && n < sizeof (ns) - 1)
- 	      {
- 		ns[n++] = *s;
- 		s++;
- 	      }
- 	    ns[n] = '\0';
-+	    if (n == sizeof (ns) - 1)
-+	      dprint (1, (debugfile, "browse_get_namespace: too long: [%s]\n", ns));
- 	    /* delim? */
- 	    s = imap_next_word (s);
- 	    /* delimiter is meaningless if namespace is "". Why does
diff --git a/mail/mutt-devel/patches/patch-aj b/mail/mutt-devel/patches/patch-aj
deleted file mode 100644
index 64741a9d6ca..00000000000
--- a/mail/mutt-devel/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/10/05 20:08:32 tonio Exp $
-
---- smime.c.orig	2005-08-14 14:33:37.000000000 +0200
-+++ smime.c
-@@ -1989,7 +1989,6 @@ int smime_send_menu (HEADER *msg, int *r
- 
-     if ((p = smime_ask_for_key (_("Sign as: "), NULL, 0))) 
-     {
--      p[mutt_strlen (p)-1] = '\0';
-       mutt_str_replace (&SmimeDefaultKey, p);
- 	
-       msg->security |= SIGN;
diff --git a/mail/mutt-devel/patches/patch-al b/mail/mutt-devel/patches/patch-al
index 6a1134fac13..5dbf67455be 100644
--- a/mail/mutt-devel/patches/patch-al
+++ b/mail/mutt-devel/patches/patch-al
@@ -1,22 +1,22 @@
-$NetBSD: patch-al,v 1.3 2005/09/03 03:21:23 jlam Exp $
+$NetBSD: patch-al,v 1.4 2006/07/15 19:34:15 tonio Exp $
 
---- configure.orig	Sun Mar 13 16:36:32 2005
+--- configure.orig	2006-07-14 20:15:42.000000000 +0200
 +++ configure
-@@ -14107,6 +14107,7 @@ if test "${with_bdb+set}" = set; then
+@@ -15076,6 +15076,7 @@ if test "${with_bdb+set}" = set; then
    withval="$with_bdb"
    ac_bdb_prefix=$withval
  fi;
 +    if test x$BDB_INCLUDE_DIR = x -o test x$BDB_LIB_DIR = x -o test x$BDB_LIB = x; then
-     if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then
+     if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then
          test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
          for d in $ac_bdb_prefix; do
-@@ -14198,6 +14199,9 @@ echo "${ECHO_T}yes" >&6
-             echo "$as_me:$LINENO: result: no" >&5
+@@ -15168,6 +15169,9 @@ echo "${ECHO_T}yes" >&6
  echo "${ECHO_T}no" >&6
          fi
-+    fi
+     fi
 +    else
 +        ac_cv_dbcreate=yes
-     fi
++    fi
  
-     if test x$ac_cv_gdbmopen = xyes; then
+     if test x$ac_cv_vlopen = xyes; then
+         CPPFLAGS="$OLDCPPFLAGS"