pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/mutt Repeat after me:
details: https://anonhg.NetBSD.org/pkgsrc/rev/d82f2348da88
branches: trunk
changeset: 467513:d82f2348da88
user: tron <tron%pkgsrc.org@localhost>
date: Mon Feb 02 07:21:24 2004 +0000
description:
Repeat after me:
I will not patch multiple files with one patch file.
I will not patch multiple files with one patch file.
I will not patch multiple files with one patch file.
[...]
diffstat:
mail/mutt/Makefile | 4 +-
mail/mutt/distinfo | 9 +++-
mail/mutt/patches/patch-ac | 14 ++++++++
mail/mutt/patches/patch-ah | 16 ++++++++++
mail/mutt/patches/patch-ai | 10 ++++++
mail/mutt/patches/patch-aj | 29 ++++++++++++++++++
mail/mutt/patches/patch-ak | 30 ++++++++++++++++++
mail/mutt/patches/patch-ba | 30 ------------------
mail/mutt/patches/patch-bb | 73 ----------------------------------------------
9 files changed, 107 insertions(+), 108 deletions(-)
diffs (266 lines):
diff -r 4fad57fd3861 -r d82f2348da88 mail/mutt/Makefile
--- a/mail/mutt/Makefile Mon Feb 02 07:05:33 2004 +0000
+++ b/mail/mutt/Makefile Mon Feb 02 07:21:24 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.110 2004/01/28 10:58:00 lukem Exp $
+# $NetBSD: Makefile,v 1.111 2004/02/02 07:21:24 tron Exp $
DISTNAME= mutt-1.4.1i
PKGNAME= ${DISTNAME:C/i$//}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= mail
MASTER_SITES= ftp://ftp.mutt.org/mutt/ \
ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
diff -r 4fad57fd3861 -r d82f2348da88 mail/mutt/distinfo
--- a/mail/mutt/distinfo Mon Feb 02 07:05:33 2004 +0000
+++ b/mail/mutt/distinfo Mon Feb 02 07:21:24 2004 +0000
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.16 2004/02/02 07:05:33 tron Exp $
+$NetBSD: distinfo,v 1.17 2004/02/02 07:21:24 tron Exp $
SHA1 (mutt-1.4.1i.tar.gz) = 34622caf9d04979d8ad01219050288561998f64b
Size (mutt-1.4.1i.tar.gz) = 2599487 bytes
SHA1 (patch-aa) = 057c11486bb855e321853a106992c8792b75b812
SHA1 (patch-ab) = e0d3c5b90c94a501436aa037f5538c4ab12b04bc
+SHA1 (patch-ac) = acfece3438c1cadc43247c590045699be7212ede
SHA1 (patch-ad) = 63abea4130832d7612a904f7954ab9c97b3b80ac
SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
SHA1 (patch-af) = 645b4f363ef47ac31335f15cdfc6e4c87542bcab
SHA1 (patch-ag) = a1574bfe28b2a0ee5295a3f3529b6865f72075fa
-SHA1 (patch-ba) = 859390820f3829d64a59a2b052af79487f52459b
-SHA1 (patch-bb) = 701a9f538c3231c2b83029b02014aab9dfc71f5e
+SHA1 (patch-ah) = 04549728683b4250a26f6d6c7a212b8d505014d2
+SHA1 (patch-ai) = 317b736d6b9a896e1ee185cce37a1c2184c02cde
+SHA1 (patch-aj) = a0ee2bc9a7b9e743e313101899de3d991a9d2cad
+SHA1 (patch-ak) = 689305356812d04bd3b490c436ed898a4b308136
diff -r 4fad57fd3861 -r d82f2348da88 mail/mutt/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt/patches/patch-ac Mon Feb 02 07:21:24 2004 +0000
@@ -0,0 +1,14 @@
+--- curs_main.c.orig Wed Jan 16 21:44:25 2002
++++ curs_main.c Mon Feb 2 08:17:26 2004
+@@ -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)
diff -r 4fad57fd3861 -r d82f2348da88 mail/mutt/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt/patches/patch-ah Mon Feb 02 07:21:24 2004 +0000
@@ -0,0 +1,16 @@
+--- init.h.orig Wed Jul 24 10:41:29 2002
++++ init.h Mon Feb 2 08:17:26 2004
+@@ -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
diff -r 4fad57fd3861 -r d82f2348da88 mail/mutt/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt/patches/patch-ai Mon Feb 02 07:21:24 2004 +0000
@@ -0,0 +1,10 @@
+--- mutt.h.orig Wed Jul 24 11:46:58 2002
++++ mutt.h Mon Feb 2 08:17:26 2004
+@@ -322,6 +322,7 @@
+ OPTBEEP,
+ OPTBEEPNEW,
+ OPTBOUNCEDELIVERED,
++ OPTCHANGEFOLDERNEXT,
+ OPTCHECKNEW,
+ OPTCOLLAPSEUNREAD,
+ OPTCONFIRMAPPEND,
diff -r 4fad57fd3861 -r d82f2348da88 mail/mutt/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt/patches/patch-aj Mon Feb 02 07:21:24 2004 +0000
@@ -0,0 +1,29 @@
+--- buffy.c.orig Mon Mar 25 12:30:23 2002
++++ buffy.c Mon Feb 2 08:17:26 2004
+@@ -440,7 +440,7 @@
+ {
+ case 0:
+
+- s = '\0';
++ *s = '\0';
+ break;
+
+ case 1:
+@@ -449,7 +449,7 @@
+ tmp = tmp->next;
+ if (!tmp)
+ {
+- s = '\0';
++ *s = '\0';
+ mutt_buffy_check (1); /* buffy was wrong - resync things */
+ break;
+ }
+@@ -475,7 +475,7 @@
+ }
+ if (count >= 3)
+ {
+- s = '\0';
++ *s = '\0';
+ mutt_buffy_check (1); /* buffy was wrong - resync things */
+ break;
+ }
diff -r 4fad57fd3861 -r d82f2348da88 mail/mutt/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt/patches/patch-ak Mon Feb 02 07:21:24 2004 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ak,v 1.5 2004/02/02 07:21:24 tron Exp $
+
+--- pgp.c.orig Wed Jan 9 16:39:28 2002
++++ pgp.c Sun Feb 1 23:32:50 2004
+@@ -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)
+ {
+@@ -737,14 +737,14 @@
+
+ if (pgp_copy_checksig (pgperr, s->fpout) >= 0)
+ badsig = 0;
+-
+- safe_fclose (&pgperr);
+
+ if ((rv = mutt_wait_filter (thepid)))
+ badsig = -1;
+
+ dprint (1, (debugfile, "pgp_verify_one: mutt_wait_filter returned %d.\n", rv));
+ }
++
++ safe_fclose (&pgperr);
+
+ state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
+
diff -r 4fad57fd3861 -r d82f2348da88 mail/mutt/patches/patch-ba
--- a/mail/mutt/patches/patch-ba Mon Feb 02 07:05:33 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2004/02/01 22:37:19 tron Exp $
-
---- pgp.c.orig Wed Jan 9 16:39:28 2002
-+++ pgp.c Sun Feb 1 23:32:50 2004
-@@ -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)
- {
-@@ -737,14 +737,14 @@
-
- if (pgp_copy_checksig (pgperr, s->fpout) >= 0)
- badsig = 0;
--
-- safe_fclose (&pgperr);
-
- if ((rv = mutt_wait_filter (thepid)))
- badsig = -1;
-
- dprint (1, (debugfile, "pgp_verify_one: mutt_wait_filter returned %d.\n", rv));
- }
-+
-+ safe_fclose (&pgperr);
-
- state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
-
diff -r 4fad57fd3861 -r d82f2348da88 mail/mutt/patches/patch-bb
--- a/mail/mutt/patches/patch-bb Mon Feb 02 07:05:33 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-$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;
- }
Home |
Main Index |
Thread Index |
Old Index