Update to 2.4.7.

3 files changed, 17 insertions, 27 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 41a5b02608dd..25baf638275f 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	balsa
-PORTVERSION=	2.4.6
-PORTREVISION=	1
+PORTVERSION=	2.4.7
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://pawsa.fedorapeople.org/balsa/
 DISTNAME=	balsa-${PORTVERSION}
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index ebf583720d97..9e95c3e2888f 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,3 +1,3 @@
-MD5 (balsa-2.4.6.tar.bz2) = 32f597f7715058cb42aa32a623575d84
-SHA256 (balsa-2.4.6.tar.bz2) = 2a5e942eda41f6bd04e74f974152ddc656c02b062f885a0495bee86ddbb34c32
-SIZE (balsa-2.4.6.tar.bz2) = 2928089
+MD5 (balsa-2.4.7.tar.bz2) = fb9597446dfe8adcfae4a0928da336f7
+SHA256 (balsa-2.4.7.tar.bz2) = 581326a68a52f8344c900ca47d862536821bc5864c38b09cb6c333722a212952
+SIZE (balsa-2.4.7.tar.bz2) = 2926482
diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure
index bece457022fd..c18f9adcffec 100644
--- a/mail/balsa/files/patch-configure
+++ b/mail/balsa/files/patch-configure
@@ -1,15 +1,6 @@
---- configure.orig	2009-12-25 12:47:41.000000000 -0500
-+++ configure	2009-12-25 12:55:51.000000000 -0500
-@@ -15258,7 +15258,7 @@ if { as_var=$as_ac_Lib; eval "test \"\${
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgtkhtml-$i  $LIBS"
-+LIBS="-lgtkhtml-$i  $HTML_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -15752,7 +15752,7 @@ if test "${ac_cv_lib_ldap_ldap_search+se
+--- 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
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -18,7 +9,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -15817,7 +15817,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -8949,7 +8949,7 @@ cat >>confdefs.h <<\_ACEOF
  #define ENABLE_LDAP 1
  _ACEOF
  
@@ -27,7 +18,7 @@
  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;}
-@@ -18216,13 +18216,13 @@ _ACEOF
+@@ -11365,13 +11365,13 @@ _ACEOF
  else
  
  
@@ -45,7 +36,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -18236,11 +18236,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -11385,11 +11385,11 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -59,7 +50,7 @@
    ;
    return 0;
  }
-@@ -18266,12 +18266,12 @@ $as_echo "$ac_try_echo") >&5
+@@ -11415,12 +11415,12 @@ $as_echo "$ac_try_echo") >&5
  	 test "$cross_compiling" = yes ||
  	 $as_test_x conftest$ac_exeext
         }; then
@@ -74,7 +65,7 @@
  fi
  
  rm -rf conftest.dSYM
-@@ -18279,19 +18279,19 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -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
@@ -100,7 +91,7 @@
     { (exit 1); exit 1; }; }
  
  fi
-@@ -18299,18 +18299,18 @@ fi
+@@ -11448,18 +11448,18 @@ fi
  
  fi
  
@@ -127,7 +118,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -18318,7 +18318,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -11467,7 +11467,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -136,7 +127,7 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
-@@ -18351,15 +18351,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11500,15 +11500,15 @@ rm -f core conftest.err conftest.$ac_obj
  $as_echo "$ac_header_compiler" >&6; }
  
  # Is the header present?
@@ -155,7 +146,7 @@
  _ACEOF
  if { (ac_try="$ac_cpp conftest.$ac_ext"
  case "(($ac_try" in
-@@ -18393,44 +18393,44 @@ $as_echo "$ac_header_preproc" >&6; }
+@@ -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: )
@@ -225,7 +216,7 @@
     { (exit 1); exit 1; }; }
  fi
  
-@@ -18733,7 +18733,7 @@ fi
+@@ -11882,7 +11882,7 @@ fi
  
  
  cat >>confdefs.h <<\_ACEOF