Update mail/mutt-devel to 1.15.16

This release is largely a bug-fix release, but it does contain a couple of
small new features (next-unread-mailbox, $message_cache_clean).

The "change_folder_next" patches are gone, since a similar feature was added,
and it is now possible to use
bind index , next-unread-mailbox
to use , to cycle mailboxes with new mail

8 files changed, 12 insertions, 108 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 690d81a19bf..58e56704434 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2007/05/27 17:39:47 tonio Exp $
+# $NetBSD: Makefile,v 1.60 2007/06/10 20:01:34 tonio Exp $
 
-DISTNAME=		mutt-1.5.15
-PKGREVISION=		1
+DISTNAME=		mutt-1.5.16
 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/distinfo b/mail/mutt-devel/distinfo
index b43d186a5c1..e419b5d6fc8 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,18 +1,10 @@
-$NetBSD: distinfo,v 1.40 2007/05/27 17:39:47 tonio Exp $
+$NetBSD: distinfo,v 1.41 2007/06/10 20:01:34 tonio Exp $
 
-SHA1 (mutt-1.5.15.tar.gz) = 1adabf6e07e099bb664c83e3c0100bbbdfec7a9a
-RMD160 (mutt-1.5.15.tar.gz) = 0cc084d2fcdabc0bc41632fcff90703c206de3db
-Size (mutt-1.5.15.tar.gz) = 3517899 bytes
-SHA1 (patch-1.5.14.rr.compressed.1.gz) = 118471717402ef11a670bd9bcf8d5729887b9206
-RMD160 (patch-1.5.14.rr.compressed.1.gz) = b7ea187d53979fabe87a1fdff3bab8ebefaa64ba
-Size (patch-1.5.14.rr.compressed.1.gz) = 10289 bytes
+SHA1 (mutt-1.5.16.tar.gz) = 4aaa82bdc75d5e12acc72df4f61fbbf87fd64fc1
+RMD160 (mutt-1.5.16.tar.gz) = 3b345599aa62a956b9c881994ffd74156a5bf808
+Size (mutt-1.5.16.tar.gz) = 3534894 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = 4f9e8cbcec719263998d61fcc9a707548d804477
-SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
-SHA1 (patch-ae) = 012cc88016c9de1677ca3430342763c419725c0f
 SHA1 (patch-ag) = b8daf23256cd2cfd8c60cae646eb36ec1656823f
-SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
-SHA1 (patch-ai) = 9cbd895520d94d11655c57c01d3e8b4150f0e9bb
-SHA1 (patch-al) = d4dae28192d7a3b3fad316d9f31ab69106eac9c2
-SHA1 (patch-am) = e481e4f76da79e71ed94090cb049f51f91d9a2b5
+SHA1 (patch-al) = 63472a3764a3b5ea41252e16d7966dd1af16b880
diff --git a/mail/mutt-devel/patches/patch-ac b/mail/mutt-devel/patches/patch-ac
deleted file mode 100644
index 8de0b48a4c4..00000000000
--- a/mail/mutt-devel/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/07/21 22:37:10 jlam Exp $
-
---- curs_main.c.orig	Wed Nov  5 04:41:31 2003
-+++ curs_main.c
-@@ -1048,6 +1048,11 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
-           cp = _("Open mailbox");
- 
- 	buf[0] = '\0';
-+	if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
-+	{
-+	  strfcpy (buf, Context->path, sizeof (buf));
-+	  mutt_pretty_mailbox (buf);
-+	}
- 	mutt_buffy (buf, sizeof (buf));
- 
- 	if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
diff --git a/mail/mutt-devel/patches/patch-ae b/mail/mutt-devel/patches/patch-ae
deleted file mode 100644
index 9bed964d58c..00000000000
--- a/mail/mutt-devel/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.10 2007/04/21 18:27:21 tonio Exp $
-
-http://dev.mutt.org/hg/mutt/rev/9f6afccedd2f
-
---- imap/imap.c.orig	2007-04-06 21:52:53.000000000 +0200
-+++ imap/imap.c
-@@ -757,9 +757,6 @@ int imap_open_mailbox (CONTEXT* ctx)
-   return 0;
- 
-  fail:
--#ifdef USE_HCACHE
--  mutt_hcache_close (idata->hcache);
--#endif
-   if (idata->state == IMAP_SELECTED)
-     idata->state = IMAP_AUTHENTICATED;
-  fail_noidata:
-@@ -1324,6 +1321,7 @@ int imap_close_mailbox (CONTEXT* ctx)
- 
- #ifdef USE_HCACHE
-   mutt_hcache_close (idata->hcache);
-+  idata->hcache = NULL;
- #endif
-   mutt_bcache_close (&idata->bcache);
- 
diff --git a/mail/mutt-devel/patches/patch-ah b/mail/mutt-devel/patches/patch-ah
deleted file mode 100644
index ea0e144b4c4..00000000000
--- a/mail/mutt-devel/patches/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/07/21 22:37:10 jlam Exp $
-
---- init.h.orig	Sun Feb  1 12:15:17 2004
-+++ init.h
-@@ -280,6 +280,13 @@ struct option_t MuttVars[] = {
-   ** .pp
-   ** Character set your terminal uses to display and enter textual data.
-   */
-+  { "change_folder_next", DT_BOOL, R_NONE, OPTCHANGEFOLDERNEXT, 0 },
-+  /*
-+  ** .pp
-+  ** When this variable is set, the change-folder command will start at the
-+  ** next folder after the current folder in your mailbox list instead of
-+  ** starting at the first folder.
-+  */
-   { "check_new",	DT_BOOL, R_NONE, OPTCHECKNEW, 1 },
-   /*
-   ** .pp
diff --git a/mail/mutt-devel/patches/patch-ai b/mail/mutt-devel/patches/patch-ai
deleted file mode 100644
index bd976a7d2ad..00000000000
--- a/mail/mutt-devel/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2007/04/21 18:27:21 tonio Exp $
-
---- mutt.h.orig	2007-04-02 20:04:35.000000000 +0200
-+++ mutt.h
-@@ -338,6 +338,7 @@ enum
-   OPTBEEP,
-   OPTBEEPNEW,
-   OPTBOUNCEDELIVERED,
-+  OPTCHANGEFOLDERNEXT,
-   OPTBRAILLEFRIENDLY,
-   OPTCHECKMBOXSIZE,
-   OPTCHECKNEW,
diff --git a/mail/mutt-devel/patches/patch-al b/mail/mutt-devel/patches/patch-al
index 6dcc242d836..dfc0a03dc63 100644
--- a/mail/mutt-devel/patches/patch-al
+++ b/mail/mutt-devel/patches/patch-al
@@ -1,16 +1,16 @@
-$NetBSD: patch-al,v 1.6 2007/04/21 18:27:21 tonio Exp $
+$NetBSD: patch-al,v 1.7 2007/06/10 20:01:35 tonio Exp $
 
---- configure.orig	2007-04-06 09:17:16.000000000 +0200
+--- configure.orig	2007-06-10 04:43:29.000000000 +0200
 +++ configure
-@@ -17924,6 +17924,7 @@ if test "${with_bdb+set}" = set; then
+@@ -17531,6 +17531,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 -a $use_qdbm != yes; then
+     if test x$ac_bdb_prefix != xno && test x$ac_cv_gdbmopen != xyes && test $use_qdbm != yes; 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
-@@ -18032,6 +18033,9 @@ echo "${ECHO_T}yes" >&6; }
+@@ -17638,6 +17639,9 @@ echo "${ECHO_T}yes" >&6; }
  echo "${ECHO_T}no" >&6; }
          fi
      fi
diff --git a/mail/mutt-devel/patches/patch-am b/mail/mutt-devel/patches/patch-am
deleted file mode 100644
index 4c0b0aee93a..00000000000
--- a/mail/mutt-devel/patches/patch-am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-am,v 1.3 2007/05/27 17:39:48 tonio Exp $
-
-Use signed arithmetic in mutt_gecos_name to avoid an overflow.
-From http://dev.mutt.org/hg/mutt/rev/47d08903b79b
-Fix CVE-2007-2683
-
---- muttlib.c.orig	2007-04-03 19:52:56.000000000 +0200
-+++ muttlib.c
-@@ -540,7 +540,7 @@ char *mutt_gecos_name (char *dest, size_
-     if (dest[idx] == '&')
-     {
-       memmove (&dest[idx + pwnl], &dest[idx + 1],
--	       MAX(destlen - idx - pwnl - 1, 0));
-+	       MAX((ssize_t)(destlen - idx - pwnl - 1), 0));
-       memcpy (&dest[idx], pw->pw_name, MIN(destlen - idx - 1, pwnl));
-       dest[idx] = toupper ((unsigned char) dest[idx]);
-     }