summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>1997-01-19 02:12:12 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>1997-01-19 02:12:12 +0000
commita518e9a59f1c88ddcb92707383db3a4b1f3c513f (patch)
tree872e16944692b3009e602a1185d2398efff015a1 /mail
parent(1) This is a classic example of a "trivial fix" blowing up on one's face (diff)
Upgrade to 0.57 PL 4.
(note that 0.58 is out, but I want to lets the bugs shake out of it first).
Notes
Notes: svn path=/head/; revision=5382
Diffstat (limited to 'mail')
-rw-r--r--mail/mutt-devel/Makefile23
-rw-r--r--mail/mutt-devel/files/patch-016
-rw-r--r--mail/mutt-devel/files/patch-022
-rw-r--r--mail/mutt-devel/files/patch-034
-rw-r--r--mail/mutt-devel/files/patch-0443
-rw-r--r--mail/mutt/Makefile23
-rw-r--r--mail/mutt/files/patch-016
-rw-r--r--mail/mutt/files/patch-022
-rw-r--r--mail/mutt/files/patch-034
-rw-r--r--mail/mutt/files/patch-0443
-rw-r--r--mail/mutt14/Makefile23
-rw-r--r--mail/mutt14/files/patch-016
-rw-r--r--mail/mutt14/files/patch-022
-rw-r--r--mail/mutt14/files/patch-034
-rw-r--r--mail/mutt14/files/patch-0443
15 files changed, 36 insertions, 198 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 34ff9bdf46dc..7f23c96ef4ba 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -4,10 +4,10 @@
# Date created: Thur July 25, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
-# $Id: Makefile,v 1.14 1996/12/31 15:00:05 obrien Exp $
+# $Id: Makefile,v 1.15 1997/01/01 21:42:40 obrien Exp $
-DISTNAME= ${PKGNAME}-export
-PKGNAME= mutt-0.55
+DISTNAME= ${PKGNAME}e
+PKGNAME= mutt-0.57
CATEGORIES= mail
MASTER_SITES= ftp://cs.hmc.edu/pub/me/mutt/ \
ftp://ftp.ibp.fr/pub/unix/mail/mutt/ \
@@ -20,20 +20,9 @@ PATCH_SITES= http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/ \
ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/
-PATCHFILES= 02.externally.PATCH \
- 03.ispell.PATCH \
- 04.savename.PATCH \
- 05.hdrloop.PATCH \
- 07.mboxhook.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
+PATCHFILES= 02.statusontop.PATCH \
+ 03.consistency.PATCH \
+ 04.keypad.PATCH \
MAINTAINER= obrien@FreeBSD.org
diff --git a/mail/mutt-devel/files/patch-01 b/mail/mutt-devel/files/patch-01
index aac301ee7563..a2dd61b4f42b 100644
--- a/mail/mutt-devel/files/patch-01
+++ b/mail/mutt-devel/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.in.orig Wed Dec 18 14:06:39 1996
-+++ Makefile.in Tue Dec 31 05:41:59 1996
-@@ -45,10 +45,13 @@
+--- Makefile.in.orig Fri Jan 10 12:40:23 1997
++++ Makefile.in Mon Jan 13 01:32:39 1997
+@@ -46,10 +46,13 @@
TAINTED= curs_main.c handler.c hdrline.c init.c keymap.c main.c parse.c \
send.c sendlib.c
diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02
index aa477d0f9d09..31f55d48b015 100644
--- a/mail/mutt-devel/files/patch-02
+++ b/mail/mutt-devel/files/patch-02
@@ -1,5 +1,5 @@
--- doc/makefile.orig Thu Oct 3 16:40:44 1996
-+++ doc/makefile Tue Dec 31 05:40:21 1996
++++ doc/makefile Mon Jan 13 01:29:09 1997
@@ -1,10 +1,16 @@
+fbsd: manual.latin1 manual.html
+
diff --git a/mail/mutt-devel/files/patch-03 b/mail/mutt-devel/files/patch-03
index 773ae7177e83..34b13ba8d836 100644
--- a/mail/mutt-devel/files/patch-03
+++ b/mail/mutt-devel/files/patch-03
@@ -1,5 +1,5 @@
---- doc/manual.sgml.orig Tue Dec 31 05:31:53 1996
-+++ doc/manual.sgml Tue Dec 31 05:38:24 1996
+--- doc/manual.sgml.orig Fri Jan 10 15:34:34 1997
++++ doc/manual.sgml Mon Jan 13 01:30:28 1997
@@ -1,4 +1,7 @@
-<!doctype linuxdoc system>
+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
diff --git a/mail/mutt-devel/files/patch-04 b/mail/mutt-devel/files/patch-04
deleted file mode 100644
index b4cd0305430e..000000000000
--- a/mail/mutt-devel/files/patch-04
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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 34ff9bdf46dc..7f23c96ef4ba 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -4,10 +4,10 @@
# Date created: Thur July 25, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
-# $Id: Makefile,v 1.14 1996/12/31 15:00:05 obrien Exp $
+# $Id: Makefile,v 1.15 1997/01/01 21:42:40 obrien Exp $
-DISTNAME= ${PKGNAME}-export
-PKGNAME= mutt-0.55
+DISTNAME= ${PKGNAME}e
+PKGNAME= mutt-0.57
CATEGORIES= mail
MASTER_SITES= ftp://cs.hmc.edu/pub/me/mutt/ \
ftp://ftp.ibp.fr/pub/unix/mail/mutt/ \
@@ -20,20 +20,9 @@ PATCH_SITES= http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/ \
ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/
-PATCHFILES= 02.externally.PATCH \
- 03.ispell.PATCH \
- 04.savename.PATCH \
- 05.hdrloop.PATCH \
- 07.mboxhook.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
+PATCHFILES= 02.statusontop.PATCH \
+ 03.consistency.PATCH \
+ 04.keypad.PATCH \
MAINTAINER= obrien@FreeBSD.org
diff --git a/mail/mutt/files/patch-01 b/mail/mutt/files/patch-01
index aac301ee7563..a2dd61b4f42b 100644
--- a/mail/mutt/files/patch-01
+++ b/mail/mutt/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.in.orig Wed Dec 18 14:06:39 1996
-+++ Makefile.in Tue Dec 31 05:41:59 1996
-@@ -45,10 +45,13 @@
+--- Makefile.in.orig Fri Jan 10 12:40:23 1997
++++ Makefile.in Mon Jan 13 01:32:39 1997
+@@ -46,10 +46,13 @@
TAINTED= curs_main.c handler.c hdrline.c init.c keymap.c main.c parse.c \
send.c sendlib.c
diff --git a/mail/mutt/files/patch-02 b/mail/mutt/files/patch-02
index aa477d0f9d09..31f55d48b015 100644
--- a/mail/mutt/files/patch-02
+++ b/mail/mutt/files/patch-02
@@ -1,5 +1,5 @@
--- doc/makefile.orig Thu Oct 3 16:40:44 1996
-+++ doc/makefile Tue Dec 31 05:40:21 1996
++++ doc/makefile Mon Jan 13 01:29:09 1997
@@ -1,10 +1,16 @@
+fbsd: manual.latin1 manual.html
+
diff --git a/mail/mutt/files/patch-03 b/mail/mutt/files/patch-03
index 773ae7177e83..34b13ba8d836 100644
--- a/mail/mutt/files/patch-03
+++ b/mail/mutt/files/patch-03
@@ -1,5 +1,5 @@
---- doc/manual.sgml.orig Tue Dec 31 05:31:53 1996
-+++ doc/manual.sgml Tue Dec 31 05:38:24 1996
+--- doc/manual.sgml.orig Fri Jan 10 15:34:34 1997
++++ doc/manual.sgml Mon Jan 13 01:30:28 1997
@@ -1,4 +1,7 @@
-<!doctype linuxdoc system>
+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
diff --git a/mail/mutt/files/patch-04 b/mail/mutt/files/patch-04
deleted file mode 100644
index b4cd0305430e..000000000000
--- a/mail/mutt/files/patch-04
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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 34ff9bdf46dc..7f23c96ef4ba 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -4,10 +4,10 @@
# Date created: Thur July 25, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
-# $Id: Makefile,v 1.14 1996/12/31 15:00:05 obrien Exp $
+# $Id: Makefile,v 1.15 1997/01/01 21:42:40 obrien Exp $
-DISTNAME= ${PKGNAME}-export
-PKGNAME= mutt-0.55
+DISTNAME= ${PKGNAME}e
+PKGNAME= mutt-0.57
CATEGORIES= mail
MASTER_SITES= ftp://cs.hmc.edu/pub/me/mutt/ \
ftp://ftp.ibp.fr/pub/unix/mail/mutt/ \
@@ -20,20 +20,9 @@ PATCH_SITES= http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/ \
ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/
-PATCHFILES= 02.externally.PATCH \
- 03.ispell.PATCH \
- 04.savename.PATCH \
- 05.hdrloop.PATCH \
- 07.mboxhook.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
+PATCHFILES= 02.statusontop.PATCH \
+ 03.consistency.PATCH \
+ 04.keypad.PATCH \
MAINTAINER= obrien@FreeBSD.org
diff --git a/mail/mutt14/files/patch-01 b/mail/mutt14/files/patch-01
index aac301ee7563..a2dd61b4f42b 100644
--- a/mail/mutt14/files/patch-01
+++ b/mail/mutt14/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.in.orig Wed Dec 18 14:06:39 1996
-+++ Makefile.in Tue Dec 31 05:41:59 1996
-@@ -45,10 +45,13 @@
+--- Makefile.in.orig Fri Jan 10 12:40:23 1997
++++ Makefile.in Mon Jan 13 01:32:39 1997
+@@ -46,10 +46,13 @@
TAINTED= curs_main.c handler.c hdrline.c init.c keymap.c main.c parse.c \
send.c sendlib.c
diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-02
index aa477d0f9d09..31f55d48b015 100644
--- a/mail/mutt14/files/patch-02
+++ b/mail/mutt14/files/patch-02
@@ -1,5 +1,5 @@
--- doc/makefile.orig Thu Oct 3 16:40:44 1996
-+++ doc/makefile Tue Dec 31 05:40:21 1996
++++ doc/makefile Mon Jan 13 01:29:09 1997
@@ -1,10 +1,16 @@
+fbsd: manual.latin1 manual.html
+
diff --git a/mail/mutt14/files/patch-03 b/mail/mutt14/files/patch-03
index 773ae7177e83..34b13ba8d836 100644
--- a/mail/mutt14/files/patch-03
+++ b/mail/mutt14/files/patch-03
@@ -1,5 +1,5 @@
---- doc/manual.sgml.orig Tue Dec 31 05:31:53 1996
-+++ doc/manual.sgml Tue Dec 31 05:38:24 1996
+--- doc/manual.sgml.orig Fri Jan 10 15:34:34 1997
++++ doc/manual.sgml Mon Jan 13 01:30:28 1997
@@ -1,4 +1,7 @@
-<!doctype linuxdoc system>
+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
diff --git a/mail/mutt14/files/patch-04 b/mail/mutt14/files/patch-04
deleted file mode 100644
index b4cd0305430e..000000000000
--- a/mail/mutt14/files/patch-04
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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))
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 11:14:23 +0000