Upgrade 0.55 to PL15

Remade all checksums.

Added Andreas's patch that remembers the last directory when doing a
change folder operation.

9 files changed, 165 insertions, 6 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index e7ffee47b776..34ff9bdf46dc 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.13 1996/12/25 13:58:58 obrien Exp $
+# $Id: Makefile,v 1.14 1996/12/31 15:00:05 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
 PKGNAME=	mutt-0.55
@@ -28,6 +28,11 @@ PATCHFILES=	02.externally.PATCH  \
 		08.keypad.PATCH  \
 		09.quote_regexp.PATCH  \
 		10.mark-as-new.PATCH  \
+		11.postponed.PATCH  \
+		12.postponed.PATCH  \
+		13.wait.PATCH  \
+		14.addrfwd.PATCH  \
+		15.flagmessage.PATCH  \
 		06.buffy.PATCH	# other patches need to be before this one
 
 MAINTAINER=     obrien@FreeBSD.org
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index ba0d7b25e166..a0df175efd78 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -6,5 +6,10 @@ MD5 (mutt/05.hdrloop.PATCH) = ffd10ec48d22380ffdb7bf866a0bc008
 MD5 (mutt/07.mboxhook.PATCH) = 0ba76641c96c4799d8b045ef764e045f
 MD5 (mutt/08.keypad.PATCH) = 6acbe3a2840b10026430011f5a02f3b1
 MD5 (mutt/09.quote_regexp.PATCH) = 4f277f7150f4df102dfb49b94487adc5
-MD5 (mutt/10.mark-as-new.PATCH) = 2f1a7f1011ef3d12a67989d7bab6c3f5
+MD5 (mutt/10.mark-as-new.PATCH) = 44c65559ddbf004599c1eb7ecd1d734e
+MD5 (mutt/11.postponed.PATCH) = 2f8efb09558e7b89d3d294921273905a
+MD5 (mutt/12.postponed.PATCH) = f6f0fd66216d982f1a7a0cb853607b1e
+MD5 (mutt/13.wait.PATCH) = e235ac863086d59f39b1ec3f7a75bf09
+MD5 (mutt/14.addrfwd.PATCH) = 0698dedf24a044e80515bfc1c388c27f
+MD5 (mutt/15.flagmessage.PATCH) = f94ec8f7875eae4586ee402cdc356b4a
 MD5 (mutt/06.buffy.PATCH) = 54ab33e6e82885c1866080f931401d8a
diff --git a/mail/mutt-devel/files/patch-04 b/mail/mutt-devel/files/patch-04
new file mode 100644
index 000000000000..b4cd0305430e
--- /dev/null
+++ b/mail/mutt-devel/files/patch-04
@@ -0,0 +1,43 @@
+--- curs_main.c.orig	Sat Dec 21 04:08:13 1996
++++ curs_main.c	Sat Dec 28 04:10:54 1996
+@@ -55,6 +55,8 @@
+ 
+ /* The folder the user last saved to.  Used by ci_save_message() */
+ static char LastFolder[_POSIX_PATH_MAX] = "";
++/* Last selected directory */
++static char LastDir[_POSIX_PATH_MAX] = "";
+ 
+ /*
+  * force_subj is used to force printing of the subject in threading mode
+@@ -341,9 +343,13 @@
+   if (i == '?')
+   {    
+     *redraw = REDRAW_FULL;
+-    folder_select (Maildir, buffer);
++    if (!LastDir[0])
++      strfcpy (LastDir, Maildir, sizeof (LastDir));
++    folder_select (LastDir, buffer);
+     if (!buffer[0])
+       return (-1);
++    strfcpy (LastDir, buffer, sizeof (LastDir));
++    *(strrchr (LastDir, '/')) = 0;
+   }
+   else if (!CI_is_return (i))
+   {
+@@ -1190,10 +1196,14 @@
+       else
+       {
+ 	refresh ();
+-	folder_select (Maildir, buffer);
++	if (!LastDir[0])
++	  strfcpy (LastDir, Maildir, sizeof (LastDir));
++	folder_select (LastDir, buffer);
+ 	redraw = REDRAW_FULL;
+ 	if (!buffer[0])
+ 	  break;
++	strfcpy (LastDir, buffer, sizeof (LastDir));
++	*(strrchr (LastDir, '/')) = 0;
+       }
+       mutt_expand_path (buffer, sizeof (buffer));
+       if (!mutt_is_valid_mailbox (buffer))
+
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index e7ffee47b776..34ff9bdf46dc 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.13 1996/12/25 13:58:58 obrien Exp $
+# $Id: Makefile,v 1.14 1996/12/31 15:00:05 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
 PKGNAME=	mutt-0.55
@@ -28,6 +28,11 @@ PATCHFILES=	02.externally.PATCH  \
 		08.keypad.PATCH  \
 		09.quote_regexp.PATCH  \
 		10.mark-as-new.PATCH  \
+		11.postponed.PATCH  \
+		12.postponed.PATCH  \
+		13.wait.PATCH  \
+		14.addrfwd.PATCH  \
+		15.flagmessage.PATCH  \
 		06.buffy.PATCH	# other patches need to be before this one
 
 MAINTAINER=     obrien@FreeBSD.org
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index ba0d7b25e166..a0df175efd78 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -6,5 +6,10 @@ MD5 (mutt/05.hdrloop.PATCH) = ffd10ec48d22380ffdb7bf866a0bc008
 MD5 (mutt/07.mboxhook.PATCH) = 0ba76641c96c4799d8b045ef764e045f
 MD5 (mutt/08.keypad.PATCH) = 6acbe3a2840b10026430011f5a02f3b1
 MD5 (mutt/09.quote_regexp.PATCH) = 4f277f7150f4df102dfb49b94487adc5
-MD5 (mutt/10.mark-as-new.PATCH) = 2f1a7f1011ef3d12a67989d7bab6c3f5
+MD5 (mutt/10.mark-as-new.PATCH) = 44c65559ddbf004599c1eb7ecd1d734e
+MD5 (mutt/11.postponed.PATCH) = 2f8efb09558e7b89d3d294921273905a
+MD5 (mutt/12.postponed.PATCH) = f6f0fd66216d982f1a7a0cb853607b1e
+MD5 (mutt/13.wait.PATCH) = e235ac863086d59f39b1ec3f7a75bf09
+MD5 (mutt/14.addrfwd.PATCH) = 0698dedf24a044e80515bfc1c388c27f
+MD5 (mutt/15.flagmessage.PATCH) = f94ec8f7875eae4586ee402cdc356b4a
 MD5 (mutt/06.buffy.PATCH) = 54ab33e6e82885c1866080f931401d8a
diff --git a/mail/mutt/files/patch-04 b/mail/mutt/files/patch-04
new file mode 100644
index 000000000000..b4cd0305430e
--- /dev/null
+++ b/mail/mutt/files/patch-04
@@ -0,0 +1,43 @@
+--- curs_main.c.orig	Sat Dec 21 04:08:13 1996
++++ curs_main.c	Sat Dec 28 04:10:54 1996
+@@ -55,6 +55,8 @@
+ 
+ /* The folder the user last saved to.  Used by ci_save_message() */
+ static char LastFolder[_POSIX_PATH_MAX] = "";
++/* Last selected directory */
++static char LastDir[_POSIX_PATH_MAX] = "";
+ 
+ /*
+  * force_subj is used to force printing of the subject in threading mode
+@@ -341,9 +343,13 @@
+   if (i == '?')
+   {    
+     *redraw = REDRAW_FULL;
+-    folder_select (Maildir, buffer);
++    if (!LastDir[0])
++      strfcpy (LastDir, Maildir, sizeof (LastDir));
++    folder_select (LastDir, buffer);
+     if (!buffer[0])
+       return (-1);
++    strfcpy (LastDir, buffer, sizeof (LastDir));
++    *(strrchr (LastDir, '/')) = 0;
+   }
+   else if (!CI_is_return (i))
+   {
+@@ -1190,10 +1196,14 @@
+       else
+       {
+ 	refresh ();
+-	folder_select (Maildir, buffer);
++	if (!LastDir[0])
++	  strfcpy (LastDir, Maildir, sizeof (LastDir));
++	folder_select (LastDir, buffer);
+ 	redraw = REDRAW_FULL;
+ 	if (!buffer[0])
+ 	  break;
++	strfcpy (LastDir, buffer, sizeof (LastDir));
++	*(strrchr (LastDir, '/')) = 0;
+       }
+       mutt_expand_path (buffer, sizeof (buffer));
+       if (!mutt_is_valid_mailbox (buffer))
+
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index e7ffee47b776..34ff9bdf46dc 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.13 1996/12/25 13:58:58 obrien Exp $
+# $Id: Makefile,v 1.14 1996/12/31 15:00:05 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
 PKGNAME=	mutt-0.55
@@ -28,6 +28,11 @@ PATCHFILES=	02.externally.PATCH  \
 		08.keypad.PATCH  \
 		09.quote_regexp.PATCH  \
 		10.mark-as-new.PATCH  \
+		11.postponed.PATCH  \
+		12.postponed.PATCH  \
+		13.wait.PATCH  \
+		14.addrfwd.PATCH  \
+		15.flagmessage.PATCH  \
 		06.buffy.PATCH	# other patches need to be before this one
 
 MAINTAINER=     obrien@FreeBSD.org
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index ba0d7b25e166..a0df175efd78 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -6,5 +6,10 @@ MD5 (mutt/05.hdrloop.PATCH) = ffd10ec48d22380ffdb7bf866a0bc008
 MD5 (mutt/07.mboxhook.PATCH) = 0ba76641c96c4799d8b045ef764e045f
 MD5 (mutt/08.keypad.PATCH) = 6acbe3a2840b10026430011f5a02f3b1
 MD5 (mutt/09.quote_regexp.PATCH) = 4f277f7150f4df102dfb49b94487adc5
-MD5 (mutt/10.mark-as-new.PATCH) = 2f1a7f1011ef3d12a67989d7bab6c3f5
+MD5 (mutt/10.mark-as-new.PATCH) = 44c65559ddbf004599c1eb7ecd1d734e
+MD5 (mutt/11.postponed.PATCH) = 2f8efb09558e7b89d3d294921273905a
+MD5 (mutt/12.postponed.PATCH) = f6f0fd66216d982f1a7a0cb853607b1e
+MD5 (mutt/13.wait.PATCH) = e235ac863086d59f39b1ec3f7a75bf09
+MD5 (mutt/14.addrfwd.PATCH) = 0698dedf24a044e80515bfc1c388c27f
+MD5 (mutt/15.flagmessage.PATCH) = f94ec8f7875eae4586ee402cdc356b4a
 MD5 (mutt/06.buffy.PATCH) = 54ab33e6e82885c1866080f931401d8a
diff --git a/mail/mutt14/files/patch-04 b/mail/mutt14/files/patch-04
new file mode 100644
index 000000000000..b4cd0305430e
--- /dev/null
+++ b/mail/mutt14/files/patch-04
@@ -0,0 +1,43 @@
+--- curs_main.c.orig	Sat Dec 21 04:08:13 1996
++++ curs_main.c	Sat Dec 28 04:10:54 1996
+@@ -55,6 +55,8 @@
+ 
+ /* The folder the user last saved to.  Used by ci_save_message() */
+ static char LastFolder[_POSIX_PATH_MAX] = "";
++/* Last selected directory */
++static char LastDir[_POSIX_PATH_MAX] = "";
+ 
+ /*
+  * force_subj is used to force printing of the subject in threading mode
+@@ -341,9 +343,13 @@
+   if (i == '?')
+   {    
+     *redraw = REDRAW_FULL;
+-    folder_select (Maildir, buffer);
++    if (!LastDir[0])
++      strfcpy (LastDir, Maildir, sizeof (LastDir));
++    folder_select (LastDir, buffer);
+     if (!buffer[0])
+       return (-1);
++    strfcpy (LastDir, buffer, sizeof (LastDir));
++    *(strrchr (LastDir, '/')) = 0;
+   }
+   else if (!CI_is_return (i))
+   {
+@@ -1190,10 +1196,14 @@
+       else
+       {
+ 	refresh ();
+-	folder_select (Maildir, buffer);
++	if (!LastDir[0])
++	  strfcpy (LastDir, Maildir, sizeof (LastDir));
++	folder_select (LastDir, buffer);
+ 	redraw = REDRAW_FULL;
+ 	if (!buffer[0])
+ 	  break;
++	strfcpy (LastDir, buffer, sizeof (LastDir));
++	*(strrchr (LastDir, '/')) = 0;
+       }
+       mutt_expand_path (buffer, sizeof (buffer));
+       if (!mutt_is_valid_mailbox (buffer))
+