7 files changed, 110 insertions, 0 deletions
diff --git a/mail/mutt-devel/patches/patch-aa b/mail/mutt-devel/patches/patch-aa
new file mode 100644
index 00000000000..504355f7d57
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.5 2004/07/21 22:37:10 jlam Exp $
+
+--- send.c.orig	Sun Feb  1 12:10:58 2004
++++ send.c
+@@ -1689,6 +1689,13 @@ full_fcc:
+     }
+   }
+ 
++#ifdef CRYPT_BACKEND_CLASSIC_PGP
++  {
++    /* Extend the PGP expiry time while messages are being sent. */
++    extern time_t PgpExptime;
++    PgpExptime = time (NULL) + PgpTimeout;
++  }
++#endif
+ 
+   rv = 0;
+   
diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab
new file mode 100644
index 00000000000..b779de32964
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.4 2004/07/21 22:37:10 jlam Exp $
+
+--- Makefile.in.orig	Wed Jul 21 17:56:30 2004
++++ Makefile.in
+@@ -113,11 +113,11 @@ EXTRA_PROGRAMS = mutt_dotlock pgpring ma
+ 
+ SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+ 
+-bin_SCRIPTS = muttbug flea
++bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ 
+ BUILT_SOURCES = keymap_defs.h patchlist.c
+ 
+-bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
++bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
+ mutt_SOURCES = $(BUILT_SOURCES) 	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c         crypt.c cryptglue.c 	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c 	edit.c enter.c flags.c init.c filter.c from.c getdomain.c 	handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c 	main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c 	postpone.c query.c recvattach.c recvcmd.c 	rfc822.c rfc1524.c rfc2047.c rfc2231.c 	score.c send.c sendlib.c signal.c sort.c 	status.c system.c thread.c charset.c history.c lib.c 	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c 	url.c ascii.c mutt_idna.c
+ 
+ 
diff --git a/mail/mutt-devel/patches/patch-ac b/mail/mutt-devel/patches/patch-ac
new file mode 100644
index 00000000000..8de0b48a4c4
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ac
@@ -0,0 +1,16 @@
+$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-ag b/mail/mutt-devel/patches/patch-ag
new file mode 100644
index 00000000000..33eea7e0c1e
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2004/07/21 22:37:10 jlam Exp $
+
+--- doc/Makefile.in.orig	Sat Dec  7 09:15:01 2002
++++ doc/Makefile.in
+@@ -79,7 +79,7 @@ install: all instdoc
+ 	./instdoc $(srcdir)/dotlock.man \
+ 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+ 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
+-	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
++	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
+ 	for f in $(srcdir_DOCFILES) ; do \
+ 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
diff --git a/mail/mutt-devel/patches/patch-ah b/mail/mutt-devel/patches/patch-ah
new file mode 100644
index 00000000000..ea0e144b4c4
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ah
@@ -0,0 +1,18 @@
+$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
new file mode 100644
index 00000000000..976232127d0
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2004/07/21 22:37:10 jlam Exp $
+
+--- mutt.h.orig	Sun Feb  1 12:15:17 2004
++++ mutt.h
+@@ -328,6 +328,7 @@ enum
+   OPTBEEP,
+   OPTBEEPNEW,
+   OPTBOUNCEDELIVERED,
++  OPTCHANGEFOLDERNEXT,
+   OPTCHECKNEW,
+   OPTCOLLAPSEUNREAD,
+   OPTCONFIRMAPPEND,
diff --git a/mail/mutt-devel/patches/patch-al b/mail/mutt-devel/patches/patch-al
new file mode 100644
index 00000000000..3073ec127ad
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1 2004/07/21 22:37:10 jlam Exp $
+
+--- configure.orig	Sun Feb  1 13:22:06 2004
++++ configure
+@@ -7842,9 +7842,8 @@ EOF
+ 
+ fi
+ 
+-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl"
+-
+ if test "$BUILD_INCLUDED_LIBINTL" = "yes"; then
++  CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl"
+   cat >> confdefs.h <<\EOF
+ #define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ EOF