patch-ba:

	Change pgp_timeout so that the timeout counter is reset every
	time mail is sent.  This makes pgp_timeout much more useful;
	rather than prompting you every pgp_timeout seconds for the
	passphrase, you only get prompted if pgp_timeout seconds have
	elapsed since you last sent email.
	From Ben Elliston.

patch-bb:
	Add new boolean option - change_folder_next.  If set, the `c'
	(change-folder) command selects the next unread mailbox in the
	mailboxes list from the current folder, rather than always
	going back to the start of the mailboxes list.
	From Simon Burge, with the buffy.c::mutt_buffy() fixes from me.

Bump PKGREVISION.

(ok-ed by agc@)

4 files changed, 108 insertions, 3 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 8de2e80487c..26ce46087e4 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.109 2004/01/20 12:19:43 agc Exp $
+# $NetBSD: Makefile,v 1.110 2004/01/28 10:58:00 lukem Exp $
 
 DISTNAME=		mutt-1.4.1i
 PKGNAME=                ${DISTNAME:C/i$//}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index f7cdd2db512..7c321cdbf32 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2003/03/20 04:38:22 jschauma Exp $
+$NetBSD: distinfo,v 1.14 2004/01/28 10:58:00 lukem Exp $
 
 SHA1 (mutt-1.4.1i.tar.gz) = 34622caf9d04979d8ad01219050288561998f64b
 Size (mutt-1.4.1i.tar.gz) = 2599487 bytes
@@ -7,3 +7,5 @@ SHA1 (patch-ad) = 63abea4130832d7612a904f7954ab9c97b3b80ac
 SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
 SHA1 (patch-af) = 645b4f363ef47ac31335f15cdfc6e4c87542bcab
 SHA1 (patch-ag) = a1574bfe28b2a0ee5295a3f3529b6865f72075fa
+SHA1 (patch-ba) = 859390820f3829d64a59a2b052af79487f52459b
+SHA1 (patch-bb) = 701a9f538c3231c2b83029b02014aab9dfc71f5e
diff --git a/mail/mutt/patches/patch-ba b/mail/mutt/patches/patch-ba
new file mode 100644
index 00000000000..5e12f6a26ab
--- /dev/null
+++ b/mail/mutt/patches/patch-ba
@@ -0,0 +1,30 @@
+$NetBSD: patch-ba,v 1.1 2004/01/28 10:58:00 lukem Exp $
+
+--- pgp.c.orig	2002-01-10 02:39:28.000000000 +1100
++++ pgp.c
+@@ -55,7 +55,7 @@
+ 
+ 
+ char PgpPass[STRING];
+-static time_t PgpExptime = 0; /* when does the cached passphrase expire? */
++time_t PgpExptime = 0; /* when does the cached passphrase expire? */
+ 
+ void pgp_void_passphrase (void)
+ {
+
+--- send.c.orig	2002-01-31 09:50:59.000000000 +1100
++++ send.c
+@@ -1611,6 +1611,13 @@ full_fcc:
+     }
+   }
+ 
++#ifdef HAVE_PGP
++  {
++    /* Extend the expiry time while messages keep getting sent.  */
++    extern time_t PgpExptime;
++    PgpExptime = time (NULL) + PgpTimeout;
++  }
++#endif /* HAVE_PGP */
+ 
+   rv = 0;
+   
diff --git a/mail/mutt/patches/patch-bb b/mail/mutt/patches/patch-bb
new file mode 100644
index 00000000000..2b52c3a9971
--- /dev/null
+++ b/mail/mutt/patches/patch-bb
@@ -0,0 +1,73 @@
+$NetBSD: patch-bb,v 1.1 2004/01/28 10:58:00 lukem Exp $
+
+--- curs_main.c.orig	Thu Jan 17 07:44:25 2002
++++ curs_main.c
+@@ -989,6 +989,11 @@
+           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)
+--- init.h.orig	Thu Apr 25 23:26:37 2002
++++ init.h
+@@ -278,6 +278,13 @@
+   ** .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
+--- mutt.h.orig	Thu Feb 28 19:24:13 2002
++++ mutt.h
+@@ -315,6 +315,7 @@
+   OPTBEEP,
+   OPTBEEPNEW,
+   OPTBOUNCEDELIVERED,
++  OPTCHANGEFOLDERNEXT,
+   OPTCHECKNEW,
+   OPTCOLLAPSEUNREAD,
+   OPTCONFIRMAPPEND,
+
+
+--- buffy.c.orig	2002-03-25 22:30:23.000000000 +1100
++++ buffy.c
+@@ -440,7 +440,7 @@ void mutt_buffy (char *s, size_t slen)
+   {
+   case 0:
+ 
+-    s = '\0';
++    *s = '\0';
+     break;
+ 
+   case 1:
+@@ -449,7 +449,7 @@ void mutt_buffy (char *s, size_t slen)
+       tmp = tmp->next;
+     if (!tmp)
+     {
+-      s = '\0';
++      *s = '\0';
+       mutt_buffy_check (1); /* buffy was wrong - resync things */
+       break;
+     }
+@@ -475,7 +475,7 @@ void mutt_buffy (char *s, size_t slen)
+     }
+     if (count >= 3)
+     {
+-      s = '\0';
++      *s = '\0';
+       mutt_buffy_check (1); /* buffy was wrong - resync things */
+       break;
+     }