Update to 2.3.25.

3 files changed, 17 insertions, 13 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index c6f96c99976b..d1403cbdd63a 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	balsa
-PORTVERSION=	2.3.23
-PORTREVISION=	3
+PORTVERSION=	2.3.25
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/
 DISTNAME=	balsa-${PORTVERSION}
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index 8655de74844e..9012691c07a4 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,3 +1,3 @@
-MD5 (balsa-2.3.23.tar.bz2) = 90873cf2c1edb98531356177b105989a
-SHA256 (balsa-2.3.23.tar.bz2) = 08ca1f6e413f817ed19836bfa9136eb082cb7f5ef690327db2686428878639aa
-SIZE (balsa-2.3.23.tar.bz2) = 2707416
+MD5 (balsa-2.3.25.tar.bz2) = 4885dcc60ca36b19a9a247c8f12d9af4
+SHA256 (balsa-2.3.25.tar.bz2) = 0e7839f4a25f53f9b35da7286b4a885dda88a4e81b3867089e805e6139ed78a5
+SIZE (balsa-2.3.25.tar.bz2) = 2721137
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c
index 5d2e19a2417f..9d865279b4c7 100644
--- a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c
+++ b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c
@@ -1,5 +1,5 @@
---- libbalsa/mailbox_maildir.c.orig	Sun May  6 13:57:53 2007
-+++ libbalsa/mailbox_maildir.c	Thu May 31 01:06:37 2007
+--- libbalsa/mailbox_maildir.c.orig	2008-04-13 06:16:40.000000000 -0400
++++ libbalsa/mailbox_maildir.c	2008-07-04 16:27:21.000000000 -0400
 @@ -25,6 +25,8 @@
  #define _XOPEN_SOURCE          500
  #define _XOPEN_SOURCE_EXTENDED 1
@@ -18,7 +18,7 @@
  };
  #define REAL_FLAGS(flags) ((flags) & LIBBALSA_MESSAGE_FLAGS_REAL)
  #define FLAGS_REALLY_DIFFER(orig_flags, flags) \
-@@ -174,7 +176,7 @@ libbalsa_mailbox_maildir_class_init(LibB
+@@ -175,7 +177,7 @@ libbalsa_mailbox_maildir_class_init(LibB
      libbalsa_mailbox_local_class->check_files  = lbm_maildir_check_files;
      libbalsa_mailbox_local_class->set_path     = lbm_maildir_set_path;
      libbalsa_mailbox_local_class->remove_files = lbm_maildir_remove_files;
@@ -27,7 +27,7 @@
      libbalsa_mailbox_local_class->get_info     = lbm_maildir_get_info;
  }
  
-@@ -389,7 +391,7 @@ static LibBalsaMessageFlag parse_filenam
+@@ -390,7 +392,7 @@ static LibBalsaMessageFlag parse_filenam
  }
  
  static void lbm_maildir_parse(LibBalsaMailboxMaildir * mdir,
@@ -36,7 +36,7 @@
  {
      gchar *path;
      GDir *dir;
-@@ -442,12 +444,12 @@ static void lbm_maildir_parse(LibBalsaMa
+@@ -443,12 +445,12 @@ static void lbm_maildir_parse(LibBalsaMa
  	    msg_info->key=key;
  	    msg_info->filename=g_strdup(filename);
  	    msg_info->local_info.flags = msg_info->orig_flags = flags;
@@ -52,7 +52,7 @@
      }
      g_dir_close(dir);
  }
-@@ -455,16 +457,16 @@ static void lbm_maildir_parse(LibBalsaMa
+@@ -456,21 +458,21 @@ static void lbm_maildir_parse(LibBalsaMa
  static void
  lbm_maildir_parse_subdirs(LibBalsaMailboxMaildir * mdir)
  {
@@ -67,13 +67,18 @@
      }
  
 -    lbm_maildir_parse(mdir, "cur", &fileno);
--    lbm_maildir_parse(mdir, "new", &fileno);
 +    lbm_maildir_parse(mdir, "cur", &md_fileno);
+     /* We parse "new" after "cur", so that any recent messages will have
+      * higher msgnos than any current messages. That ensures that the
+      * message tree saved by LibBalsaMailboxLocal is still valid, and
+      * that the new messages will be inserted correctly into the tree by
+      * libbalsa_mailbox_local_add_messages. */
+-    lbm_maildir_parse(mdir, "new", &fileno);
 +    lbm_maildir_parse(mdir, "new", &md_fileno);
  }
  
  static gboolean
-@@ -864,7 +866,7 @@ lbm_maildir_fileno(LibBalsaMailboxLocal 
+@@ -871,7 +873,7 @@ lbm_maildir_fileno(LibBalsaMailboxLocal 
      msg_info =
          message_info_from_msgno((LibBalsaMailboxMaildir *) local, msgno);