Add patch for change_folder_next option, which I stole from the patches

for mutt (non-devel).

5 files changed, 53 insertions, 3 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 95e7cad1def..f1f829b861e 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2007/12/03 16:47:25 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2007/12/06 08:51:51 cjs Exp $
 
 DISTNAME=		mutt-1.5.17
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index ac791ec35a2..a72f1822c26 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2007/12/03 16:47:25 wiz Exp $
+$NetBSD: distinfo,v 1.45 2007/12/06 08:51:51 cjs Exp $
 
 SHA1 (mutt-1.5.17.tar.gz) = 6b51745fc4baf463adde53e91efb2a6c7eec8492
 RMD160 (mutt-1.5.17.tar.gz) = e5c84a27ad25730afe64879e91bed89a021e0580
@@ -9,3 +9,6 @@ SHA1 (patch-ac) = 48cae7543eeb3980dfdea8573ea2ec2192aca091
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
 SHA1 (patch-ag) = b8daf23256cd2cfd8c60cae646eb36ec1656823f
 SHA1 (patch-al) = ac8d963286d9edee73ee00bdb8f4ffcd65c6cd5d
+SHA1 (patch-am) = f1461cc64cb06e674390db0f594fd69a6b56f391
+SHA1 (patch-an) = 3599eb33ea2ffd0120e479ca200519f0f8d10811
+SHA1 (patch-ao) = 425318a712a11ae9a715fd8a6a153bf4d5a9f3d1
diff --git a/mail/mutt-devel/patches/patch-am b/mail/mutt-devel/patches/patch-am
new file mode 100644
index 00000000000..8a7047cd2c2
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.5 2007/12/06 08:51:51 cjs Exp $
+
+--- mutt.h.orig	2007-08-29 02:44:16.000000000 +0900
++++ mutt.h	2007-12-06 17:36:02.000000000 +0900
+@@ -339,6 +339,7 @@
+   OPTBEEPNEW,
+   OPTBOUNCEDELIVERED,
+   OPTBRAILLEFRIENDLY,
++  OPTCHANGEFOLDERNEXT,
+   OPTCHECKMBOXSIZE,
+   OPTCHECKNEW,
+   OPTCOLLAPSEUNREAD,
diff --git a/mail/mutt-devel/patches/patch-an b/mail/mutt-devel/patches/patch-an
new file mode 100644
index 00000000000..6c739420ea4
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-an
@@ -0,0 +1,18 @@
+$NetBSD: patch-an,v 1.1 2007/12/06 08:51:51 cjs Exp $
+
+--- init.h.orig	2007-11-01 02:48:52.000000000 +0900
++++ init.h	2007-12-06 17:35:34.000000000 +0900
+@@ -317,6 +317,13 @@
+   ** Character set your terminal uses to display and enter textual data.
+   ** It is also the fallback for $$send_charset.
+   */
++  { "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-ao b/mail/mutt-devel/patches/patch-ao
new file mode 100644
index 00000000000..75f11a2a575
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ao
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.1 2007/12/06 08:51:52 cjs Exp $
+
+--- curs_main.c.orig	2007-12-06 17:32:01.000000000 +0900
++++ curs_main.c	2007-12-06 17:34:20.000000000 +0900
+@@ -1080,6 +1080,12 @@
+ 	}
+ 	else
+ 	{
++	if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
++	  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)