Update to 2.5.1.

Stagify, use short options.

Submitted by:	Gustau Perez

5 files changed, 67 insertions, 258 deletions

diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure
index c18f9adcffec..92a98f1fa52b 100644
--- a/mail/balsa/files/patch-configure
+++ b/mail/balsa/files/patch-configure
@@ -1,227 +1,47 @@
---- configure.orig	2010-02-14 15:51:21.000000000 -0500
-+++ configure	2010-02-14 15:51:21.000000000 -0500
-@@ -8884,7 +8884,7 @@ if test "${ac_cv_lib_ldap_ldap_search+se
+--- configure.orig	2014-04-30 13:56:20.982115758 +0000
++++ configure	2014-04-30 13:56:44.128114528 +0000
+@@ -15038,7 +15038,7 @@
+     conftest$ac_exeext conftest.$ac_ext
+ if test $have_res_init = no ; then
+     save_LIBS=$LIBS
+-    LIBS="$LIBS -lresolv"
++    LIBS="$LIBS"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <resolv.h>
+@@ -16088,7 +16088,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lldap -llber -lresolv $LIBS"
 +LIBS="-lldap -llber $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8949,7 +8949,7 @@ cat >>confdefs.h <<\_ACEOF
- #define ENABLE_LDAP 1
- _ACEOF
- 
--              LIBS="-lldap -llber -lresolv $LIBS"
-+              LIBS="-lldap -llber $LIBS"
- else
-   { { $as_echo "$as_me:$LINENO: error: *** You enabled LDAP but ldap library is not found." >&5
- $as_echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;}
-@@ -11365,13 +11365,13 @@ _ACEOF
- else
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for new_pspell_manager in -lpspell" >&5
--$as_echo_n "checking for new_pspell_manager in -lpspell... " >&6; }
--if test "${ac_cv_lib_pspell_new_pspell_manager+set}" = set; then
-+{ $as_echo "$as_me:$LINENO: checking for new_aspell_manager in -laspell" >&5
-+$as_echo_n "checking for new_aspell_manager in -laspell... " >&6; }
-+if test "${ac_cv_lib_aspell_new_aspell_manager+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS"
-+LIBS="-laspell -lstdc++ -laspell-modules $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11385,11 +11385,11 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char new_pspell_manager ();
-+char new_aspell_manager ();
- int
- main ()
- {
--return new_pspell_manager ();
-+return new_aspell_manager ();
-   ;
-   return 0;
- }
-@@ -11415,12 +11415,12 @@ $as_echo "$ac_try_echo") >&5
- 	 test "$cross_compiling" = yes ||
- 	 $as_test_x conftest$ac_exeext
-        }; then
--  ac_cv_lib_pspell_new_pspell_manager=yes
-+  ac_cv_lib_aspell_new_aspell_manager=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_lib_pspell_new_pspell_manager=no
-+	ac_cv_lib_aspell_new_aspell_manager=no
- fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
- rm -rf conftest.dSYM
-@@ -11428,19 +11428,19 @@ rm -f core conftest.err conftest.$ac_obj
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pspell_new_pspell_manager" >&5
--$as_echo "$ac_cv_lib_pspell_new_pspell_manager" >&6; }
--if test "x$ac_cv_lib_pspell_new_pspell_manager" = x""yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_manager" >&5
-+$as_echo "$ac_cv_lib_aspell_new_aspell_manager" >&6; }
-+if test "x$ac_cv_lib_aspell_new_aspell_manager" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPSPELL 1
- _ACEOF
+@@ -16122,7 +16122,7 @@
  
--  LIBS="-lpspell $LIBS"
-+  LIBS="-laspell $LIBS"
+ $as_echo "#define ENABLE_LDAP 1" >>confdefs.h
  
+-              LIBS="-lldap -llber -lresolv $LIBS"
++              LIBS="-lldap -llber $LIBS"
  else
- 
--            { { $as_echo "$as_me:$LINENO: error: *** Neither aspell >=0.50 (recommended) nor pspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&5
--$as_echo "$as_me: error: *** Neither aspell >=0.50 (recommended) nor pspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&2;}
-+            { { $as_echo "$as_me:$LINENO: error: *** Neither aspell >=0.50 (recommended) nor aspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&5
-+$as_echo "$as_me: error: *** Neither aspell >=0.50 (recommended) nor aspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
-@@ -11448,18 +11448,18 @@ fi
- 
- fi
- 
--    if test "${ac_cv_header_pspell_pspell_h+set}" = set; then
--  { $as_echo "$as_me:$LINENO: checking for pspell/pspell.h" >&5
--$as_echo_n "checking for pspell/pspell.h... " >&6; }
--if test "${ac_cv_header_pspell_pspell_h+set}" = set; then
-+    if test "${ac_cv_header_aspell_aspell_h+set}" = set; then
-+  { $as_echo "$as_me:$LINENO: checking for aspell/aspell.h" >&5
-+$as_echo_n "checking for aspell/aspell.h... " >&6; }
-+if test "${ac_cv_header_aspell_aspell_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
+   as_fn_error $? "*** You enabled LDAP but ldap library is not found." "$LINENO" 5
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pspell_pspell_h" >&5
--$as_echo "$ac_cv_header_pspell_pspell_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_aspell_h" >&5
-+$as_echo "$ac_cv_header_aspell_aspell_h" >&6; }
- else
-   # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking pspell/pspell.h usability" >&5
--$as_echo_n "checking pspell/pspell.h usability... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking aspell/aspell.h usability" >&5
-+$as_echo_n "checking aspell/aspell.h usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11467,7 +11467,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <pspell/pspell.h>
-+#include <aspell/aspell.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
-@@ -11500,15 +11500,15 @@ rm -f core conftest.err conftest.$ac_obj
- $as_echo "$ac_header_compiler" >&6; }
+@@ -18071,8 +18071,6 @@
  
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking pspell/pspell.h presence" >&5
--$as_echo_n "checking pspell/pspell.h presence... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking aspell/aspell.h presence" >&5
-+$as_echo_n "checking aspell/aspell.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <pspell/pspell.h>
-+#include <aspell/aspell.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- case "(($ac_try" in
-@@ -11542,44 +11542,44 @@ $as_echo "$ac_header_preproc" >&6; }
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: pspell/pspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: pspell/pspell.h: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: aspell/aspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: aspell/aspell.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: pspell/pspell.h: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: pspell/pspell.h:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: pspell/pspell.h: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: pspell/pspell.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: pspell/pspell.h: proceeding with the preprocessor's result" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: pspell/pspell.h: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: aspell/aspell.h: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: aspell/aspell.h:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: aspell/aspell.h: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: aspell/aspell.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: aspell/aspell.h: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: aspell/aspell.h: in the future, the compiler will take precedence" >&2;}
  
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for pspell/pspell.h" >&5
--$as_echo_n "checking for pspell/pspell.h... " >&6; }
--if test "${ac_cv_header_pspell_pspell_h+set}" = set; then
-+{ $as_echo "$as_me:$LINENO: checking for aspell/aspell.h" >&5
-+$as_echo_n "checking for aspell/aspell.h... " >&6; }
-+if test "${ac_cv_header_aspell_aspell_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
--  ac_cv_header_pspell_pspell_h=$ac_header_preproc
-+  ac_cv_header_aspell_aspell_h=$ac_header_preproc
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pspell_pspell_h" >&5
--$as_echo "$ac_cv_header_pspell_pspell_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_aspell_h" >&5
-+$as_echo "$ac_cv_header_aspell_aspell_h" >&6; }
  
- fi
--if test "x$ac_cv_header_pspell_pspell_h" = x""yes; then
-+if test "x$ac_cv_header_aspell_aspell_h" = x""yes; then
-   :
- else
--  { { $as_echo "$as_me:$LINENO: error: ** aspell/pspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&5
--$as_echo "$as_me: error: ** aspell/pspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: ** aspell/aspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&5
-+$as_echo "$as_me: error: ** aspell/aspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&2;}
-    { (exit 1); exit 1; }; }
+-$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+-
+ ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include <time.h>
+ "
+ if test "x$ac_cv_have_decl_localtime_r" = xyes; then :
+@@ -18339,7 +18337,7 @@
+   INSTALL_MIME_ICONS_FALSE=
  fi
  
-@@ -11882,7 +11882,7 @@ fi
+-HICOLOR_ICON_DIR=`$PKG_CONFIG --variable=prefix gtk+-3.0`/share/icons/hicolor
++HICOLOR_ICON_DIR=/usr/local/share/icons/hicolor
  
  
- cat >>confdefs.h <<\_ACEOF
--#define _XOPEN_SOURCE 500
-+/*#define _XOPEN_SOURCE 500*/
- _ACEOF
  
- { $as_echo "$as_me:$LINENO: checking whether localtime_r is declared" >&5
diff --git a/mail/balsa/files/patch-libbalsa_information.c b/mail/balsa/files/patch-libbalsa_information.c
deleted file mode 100644
index 7d37e182935f..000000000000
--- a/mail/balsa/files/patch-libbalsa_information.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbalsa/information.c.orig	2011-08-16 13:30:24.000000000 +0200
-+++ libbalsa/information.c	2011-08-16 13:30:48.000000000 +0200
-@@ -122,7 +122,7 @@ libbalsa_information_varg(GtkWindow *par
-         g_free(msg);
- 
-         note =
--            notify_notification_new("Balsa", escaped->str, icon_str, NULL);
-+            notify_notification_new("Balsa", escaped->str, icon_str);
-         g_string_free(escaped, TRUE);
- 
-         notify_notification_set_timeout(note, 7000);    /* 7 seconds */
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_mh.c b/mail/balsa/files/patch-libbalsa_mailbox_mh.c
index 36cd3b677d57..2caca699b920 100644
--- a/mail/balsa/files/patch-libbalsa_mailbox_mh.c
+++ b/mail/balsa/files/patch-libbalsa_mailbox_mh.c
@@ -1,5 +1,5 @@
---- libbalsa/mailbox_mh.c.orig	Wed May 16 13:49:05 2007
-+++ libbalsa/mailbox_mh.c	Thu May 31 01:09:09 2007
+--- libbalsa/mailbox_mh.c.orig	2013-03-04 19:36:37.000000000 +0000
++++ libbalsa/mailbox_mh.c	2014-04-30 13:49:32.084143219 +0000
 @@ -27,6 +27,8 @@
  /* to compile this on BSD/Darwin */
  #undef _POSIX_SOURCE
@@ -18,7 +18,7 @@
  };
  
  #define REAL_FLAGS(flags) (flags & LIBBALSA_MESSAGE_FLAGS_REAL)
-@@ -260,7 +262,7 @@ libbalsa_mailbox_mh_load_config(LibBalsa
+@@ -261,7 +263,7 @@
  
  #define MH_BASENAME(msg_info) \
      g_strdup_printf((msg_info->orig_flags & LIBBALSA_MESSAGE_FLAG_DELETED) ? \
@@ -27,7 +27,7 @@
  
  static GMimeStream *
  libbalsa_mailbox_mh_get_message_stream(LibBalsaMailbox * mailbox,
-@@ -335,7 +337,7 @@ static gint
+@@ -336,7 +338,7 @@
  lbm_mh_compare_fileno(const struct message_info ** a,
  		      const struct message_info ** b)
  {
@@ -36,7 +36,7 @@
  }
  
  static void
-@@ -352,7 +354,7 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
+@@ -353,7 +355,7 @@
  
      while ((filename = g_dir_read_name(dir)) != NULL) {
  	LibBalsaMessageFlag delete_flag = 0;
@@ -45,12 +45,12 @@
  
  	if (filename[0] == ',') {
  	    filename++;
-@@ -361,22 +363,22 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
+@@ -362,22 +364,22 @@
  	if (lbm_mh_check_filename(filename) == FALSE)
  	    continue;
  
--	if (sscanf(filename, "%d", &fileno) != 1)
-+	if (sscanf(filename, "%d", &mh_fileno) != 1)
+-	if (sscanf(filename, "%10d", &fileno) != 1)
++	if (sscanf(filename, "%10d", &mh_fileno) != 1)
              break;     /* FIXME report error? */
 -	if (fileno > mh->last_fileno)
 -	    mh->last_fileno = fileno;
@@ -74,7 +74,7 @@
  	    }
  	    msg_info->orig_flags = delete_flag;
  	}
-@@ -394,17 +396,17 @@ static const gchar *LibBalsaMailboxMhRep
+@@ -395,17 +397,17 @@
  static const gchar *LibBalsaMailboxMhRecent = "recent:";
  
  static void
@@ -96,7 +96,7 @@
  	return;
      }
  
-@@ -433,7 +435,7 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
+@@ -434,7 +436,7 @@
  
      for (seq = sequences; *seq; seq++) {
  	guint end = 0;
@@ -105,12 +105,12 @@
  
  	if (!**seq)
  	    continue;
-@@ -444,11 +446,11 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
- 	    if (sscanf(line, "%d", &end) != 1)
+@@ -445,11 +447,11 @@
+ 	    if (sscanf(line, "%10d", &end) != 1)
                  break; /* FIXME report error? */
  	}
--	if (sscanf(*seq, "%d", &fileno) != 1)
-+	if (sscanf(*seq, "%d", &mh_fileno) != 1)
+-	if (sscanf(*seq, "%10d", &fileno) != 1)
++	if (sscanf(*seq, "%10d", &mh_fileno) != 1)
              break;     /* FIXME report error? */
  	do
 -	    lbm_mh_set_flag(mh, fileno, flag);
@@ -120,7 +120,7 @@
      }
  
      g_strfreev(sequences);
-@@ -580,7 +582,7 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
+@@ -581,7 +583,7 @@
  	    sequences = g_strsplit(p, " ", 0);
  	    for (seq = sequences; *seq; seq++) {
  		guint end = 0;
@@ -129,12 +129,12 @@
  
  		if (!**seq)
  		    continue;
-@@ -591,15 +593,15 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
- 		    if (sscanf(p, "%d", &end) != 1)
+@@ -592,15 +594,15 @@
+ 		    if (sscanf(p, "%10d", &end) != 1)
                          break; /* FIXME report error? */
  		}
--		if (sscanf(*seq, "%d", &fileno) != 1)
-+		if (sscanf(*seq, "%d", &mh_fileno) != 1)
+-		if (sscanf(*seq, "%10d", &fileno) != 1)
++		if (sscanf(*seq, "%10d", &mh_fileno) != 1)
                      break; /* FIXME report error? */
  		do {
 -		    p = g_strdup_printf("%s/%d", path, fileno);
@@ -148,7 +148,7 @@
  	    }
  	    g_strfreev(sequences);
  	    break;
-@@ -686,7 +688,7 @@ libbalsa_mailbox_mh_check(LibBalsaMailbo
+@@ -687,7 +689,7 @@
  	else {
  	    g_ptr_array_remove(mh->msgno_2_msg_info, msg_info);
  	    g_hash_table_remove(mh->messages_info, 
@@ -157,7 +157,7 @@
  	    libbalsa_mailbox_local_msgno_removed(mailbox, msgno);
  	    if (renumber > msgno)
  		/* First message that needs renumbering. */
-@@ -763,11 +765,11 @@ lbm_mh_flag_line(struct message_info *ms
+@@ -764,11 +766,11 @@
      if (!(msg_info->local_info.flags & flag))
  	return;
  
@@ -172,7 +172,7 @@
  }
  
  static gboolean
-@@ -849,7 +851,7 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox
+@@ -850,7 +852,7 @@
  	    /* free old information */
  	    g_ptr_array_remove(mh->msgno_2_msg_info, msg_info);
  	    g_hash_table_remove(mh->messages_info, 
@@ -181,7 +181,7 @@
  	    libbalsa_mailbox_local_msgno_removed(mailbox, msgno);
  	} else {
  	    lbm_mh_flag_line(msg_info, LIBBALSA_MESSAGE_FLAG_NEW, &unseen);
-@@ -1038,7 +1040,7 @@ libbalsa_mailbox_mh_fetch_message_struct
+@@ -1039,7 +1041,7 @@
   * we'll just add new lines and let the next sync merge them with any
   * existing lines. */
  static void
@@ -190,7 +190,7 @@
  			LibBalsaMessageFlag flags)
  {
      FILE *fp;
-@@ -1049,13 +1051,13 @@ lbm_mh_update_sequences(LibBalsaMailboxM
+@@ -1050,13 +1052,13 @@
  	return;
  
      if (flags & LIBBALSA_MESSAGE_FLAG_NEW)
@@ -208,7 +208,7 @@
      fclose(fp);
  }
  
-@@ -1072,7 +1074,7 @@ libbalsa_mailbox_mh_add_message(LibBalsa
+@@ -1073,7 +1075,7 @@
      int fd;
      GMimeStream *out_stream;
      GMimeFilter *crlffilter;
@@ -217,7 +217,7 @@
      int retries;
      GMimeStream *in_stream;
  
-@@ -1115,14 +1117,14 @@ libbalsa_mailbox_mh_add_message(LibBalsa
+@@ -1116,14 +1118,14 @@
      libbalsa_mime_stream_shared_unlock(stream);
      g_object_unref(in_stream);
  
@@ -234,7 +234,7 @@
  	rename_status = libbalsa_safe_rename(tmp, new_filename);
  	g_free(new_filename);
  	if (rename_status != -1)
-@@ -1145,9 +1147,9 @@ libbalsa_mailbox_mh_add_message(LibBalsa
+@@ -1146,9 +1148,9 @@
                      "Too high activity?");
  	return FALSE;
      }
diff --git a/mail/balsa/files/patch-src_main-window.c b/mail/balsa/files/patch-src_main-window.c
deleted file mode 100644
index b376b7260ddc..000000000000
--- a/mail/balsa/files/patch-src_main-window.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main-window.c.orig	2011-08-16 13:32:27.000000000 +0200
-+++ src/main-window.c	2011-08-16 13:33:10.000000000 +0200
-@@ -3406,7 +3406,7 @@ bw_display_new_mail_notification(int num
-         } else {
-             num_total = num_new;
-             balsa_app.main_window->new_mail_note =
--                notify_notification_new("Balsa", NULL, NULL, NULL);
-+                notify_notification_new("Balsa", NULL, NULL);
-             g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window->
-                                                new_mail_note),
-                                       (gpointer) & balsa_app.main_window->
diff --git a/mail/balsa/files/patch-src_main-window.h b/mail/balsa/files/patch-src_main-window.h
new file mode 100644
index 000000000000..c46acf3aa41b
--- /dev/null
+++ b/mail/balsa/files/patch-src_main-window.h
@@ -0,0 +1,11 @@
+--- src/main-window.h.orig	2014-04-30 17:56:08.057123807 +0000
++++ src/main-window.h	2014-04-30 17:56:29.581127225 +0000
+@@ -28,6 +28,8 @@
+ #include <libnotify/notify.h>
+ #endif
+ 
++#include <glib.h>
++
+ #if GLIB_CHECK_VERSION(2, 32, 0)
+ #include <gio/gio.h>
+ #elif defined(HAVE_LIBNM_GLIB)