Update the maildir header cache [1]

Fix maildir-mtime patch for -current [1]
Add a bugfix for the NNTP-patch [2]

Submitted by:	maintainer [1], Vsevolod Volkov <vvv at lucky.net> [2]

5 files changed, 45 insertions, 8 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 0f9dd2509ea8..a9215374b9fd 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -84,7 +84,7 @@
 
 PORTNAME=	mutt-devel
 PORTVERSION=	1.5.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -231,6 +231,10 @@ pre-configure::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime
 .endif
 .endif
+.if defined(WITH_MUTT_NNTP)
+pre-configure::
+	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nntp.c
+.endif
 
 .if ! defined(WITHOUT_MUTT_PGP_PATCH)
 SGML_NEEDED=	yes
diff --git a/mail/mutt-devel/files/extra-patch-maildir-header-cache b/mail/mutt-devel/files/extra-patch-maildir-header-cache
index 23b9bfb0e68b..170d52e44c10 100644
--- a/mail/mutt-devel/files/extra-patch-maildir-header-cache
+++ b/mail/mutt-devel/files/extra-patch-maildir-header-cache
@@ -802,7 +802,7 @@ diff -Nru a/init.h b/init.h
 +  ** files when the header cache is in use.  This incurs one stat(2)
 +  ** per message every time the folder is opened.
 +  */
-+  { "maildir_cache_page_size", DT_NUM, R_NONE, UL &MaildirCachePageSize, 2048 },
++  { "maildir_cache_page_size", DT_NUM, R_NONE, UL &MaildirCachePageSize, 16384 },
 +  /*
 +  ** .pp
 +  ** Change the maildir header cache database page size.  Too large
@@ -1021,4 +1021,4 @@ diff -Nru a/protos.h b/protos.h
 --- PATCHES.orig    Tue Nov  6 19:59:33 2001
 +++ PATCHES     Tue Nov  6 19:59:42 2001
 @@ -1,0 +1 @@
-+maildir-header-cache.18
++maildir-header-cache.19
diff --git a/mail/mutt-devel/files/extra-patch-maildir-mtime b/mail/mutt-devel/files/extra-patch-maildir-mtime
index f79de977e2f9..f93fd5f87d59 100644
--- a/mail/mutt-devel/files/extra-patch-maildir-mtime
+++ b/mail/mutt-devel/files/extra-patch-maildir-mtime
@@ -11,7 +11,7 @@
 @@ -304,4 +305,6 @@ folder_format_str (char *dest, size_t de
  static void add_folder (MUTTMENU *m, struct browser_state *state,
 -			const char *name, const struct stat *s, int new)
-+			const char *name, const struct stat *s, BUFFY *mbuf)
++			const char *name, struct stat *s, BUFFY *mbuf)
  {
 +  int new = (mbuf) ? mbuf->new : 0;
 +
diff --git a/mail/mutt-devel/files/extra-patch-maildir-mtime-nntp b/mail/mutt-devel/files/extra-patch-maildir-mtime-nntp
index f52456b313ae..3f7c00659da3 100644
--- a/mail/mutt-devel/files/extra-patch-maildir-mtime-nntp
+++ b/mail/mutt-devel/files/extra-patch-maildir-mtime-nntp
@@ -2,8 +2,8 @@
 +++ PATCHES Feb 2004 13:19:42 -0000
 @@ -0,0 +1 @@
 +patch-1.5.6.dw.maildir-mtime.1
---- browser.c.orig	Wed Jun 23 12:55:45 2004
-+++ browser.c	Wed Jun 23 13:00:45 2004
+--- browser.c.orig	Mon Aug  2 18:54:46 2004
++++ browser.c	Mon Aug  2 19:00:01 2004
 @@ -30,6 +30,7 @@
  #ifdef USE_NNTP
  #include "nntp.h"
@@ -12,11 +12,13 @@
  
  #include <stdlib.h>
  #include <dirent.h>
-@@ -424,8 +425,10 @@
+@@ -423,9 +424,11 @@
+ #endif /* USE_NNTP */
  
  static void add_folder (MUTTMENU *m, struct browser_state *state,
- 			const char *name, const struct stat *s,
+-			const char *name, const struct stat *s,
 -			void *data, int new)
++			const char *name, struct stat *s,
 +			void *data, BUFFY *mbuf)
  {
 +  int new = (mbuf) ? mbuf->new : 0;
diff --git a/mail/mutt-devel/files/extra-patch-nntp.c b/mail/mutt-devel/files/extra-patch-nntp.c
new file mode 100644
index 000000000000..007938754dce
--- /dev/null
+++ b/mail/mutt-devel/files/extra-patch-nntp.c
@@ -0,0 +1,31 @@
+--- nntp.c.orig	Mon Aug  2 15:11:21 2004
++++ nntp.c	Mon Aug  2 15:12:31 2004
+@@ -1064,13 +1064,12 @@
+ {
+   char buf[LONG_STRING];
+   CONNECTION* conn;
+-  CONNECTION* tmp;
+ 
+   conn = mutt_socket_head ();
+ 
+   while (conn)
+   {
+-    tmp = conn;
++    CONNECTION *next = conn->next;
+ 
+     if (conn->account.type == M_ACCT_TYPE_NNTP)
+     {
+@@ -1079,11 +1078,10 @@
+       mutt_socket_readln (buf, sizeof (buf), conn);
+       mutt_clear_error ();
+       mutt_socket_close (conn);
+-
+-      mutt_socket_free (tmp);
++      mutt_socket_free (conn);
+     }
+ 
+-    conn = conn->next;
++    conn = next;
+   }
+ }
+