4 files changed, 25 insertions, 22 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index b8edcf0a20c6..b72dea0fb903 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	balsa2
-PORTVERSION=	2.0.9
+PORTVERSION=	2.0.10
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
@@ -46,6 +46,11 @@ CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		balsa.1
 
+.if defined(WITH_GPG)
+LIB_DEPENDS+=	gpgme.9:${PORTSDIR}/security/gpgme
+CONFIGURE_ARGS+=	--enable-gpgme
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' \
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index 3c42c165c7c4..cfcee9d38cb3 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1 +1 @@
-MD5 (balsa-2.0.9.tar.bz2) = f8fc07818ee1d854d77b806d315ba0e2
+MD5 (balsa-2.0.10.tar.bz2) = c4e5325df8b9ddbf62778094568a6814
diff --git a/mail/balsa2/files/patch-configure b/mail/balsa2/files/patch-configure
index 4c689393583c..e9fad9bed9a6 100644
--- a/mail/balsa2/files/patch-configure
+++ b/mail/balsa2/files/patch-configure
@@ -1,8 +1,8 @@
---- configure.orig	Sun Feb 16 10:45:05 2003
-+++ configure	Wed Feb 19 03:52:18 2003
-@@ -8294,13 +8294,13 @@
+--- configure.orig	Mon Mar 24 23:43:20 2003
++++ configure	Wed Mar 26 17:00:43 2003
+@@ -9004,13 +9004,13 @@
+ else
  
- if test x$enable_deprecated_pspell = xyes ; then
  
 -echo "$as_me:$LINENO: checking for new_pspell_manager in -lpspell" >&5
 -echo $ECHO_N "checking for new_pspell_manager in -lpspell... $ECHO_C" >&6
@@ -17,17 +17,13 @@
 +LIBS="-lpspell -lstdc++ $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
- #include "confdefs.h"
-@@ -8311,7 +8311,7 @@
+ /* confdefs.h.  */
+@@ -9025,11 +9025,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 -char new_pspell_manager ();
 +char new_aspell_speller ();
- #ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
-@@ -8321,7 +8321,7 @@
  int
  main ()
  {
@@ -36,17 +32,18 @@
    ;
    return 0;
  }
-@@ -8338,18 +8338,18 @@
+@@ -9046,19 +9046,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  ac_cv_lib_pspell_new_pspell_manager=yes
-+  ac_cv_lib_pspell_new_aspell_speller=yes
++   ac_cv_lib_pspell_new_aspell_speller=yes
  else
    echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -ac_cv_lib_pspell_new_pspell_manager=no
-+ac_cv_lib_pspell_new_aspell_speller=no
++ ac_cv_lib_pspell_new_aspell_speller=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
@@ -54,13 +51,13 @@
 -echo "$as_me:$LINENO: result: $ac_cv_lib_pspell_new_pspell_manager" >&5
 -echo "${ECHO_T}$ac_cv_lib_pspell_new_pspell_manager" >&6
 -if test $ac_cv_lib_pspell_new_pspell_manager = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_pspell_new_aspell_speller" >&5
-+echo "${ECHO_T}$ac_cv_lib_pspell_new_aspell_speller" >&6
-+if test $ac_cv_lib_pspell_new_aspell_speller = yes; then
++ echo "$as_me:$LINENO: result: $ac_cv_lib_pspell_new_aspell_speller" >&5
++ echo "${ECHO_T}$ac_cv_lib_pspell_new_aspell_speller" >&6
++ if test $ac_cv_lib_pspell_new_aspell_speller = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPSPELL 1
  _ACEOF
-@@ -10931,7 +10931,7 @@
+@@ -10491,7 +10491,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -68,8 +65,8 @@
 +LIBS="-lldap -llber $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
- #include "confdefs.h"
-@@ -10986,7 +10986,7 @@
+ /* confdefs.h.  */
+@@ -10545,7 +10545,7 @@
  #define ENABLE_LDAP 1
  _ACEOF
  
diff --git a/mail/balsa2/pkg-plist b/mail/balsa2/pkg-plist
index b3c70b4997e8..9bf208b5060a 100644
--- a/mail/balsa2/pkg-plist
+++ b/mail/balsa2/pkg-plist
@@ -54,6 +54,7 @@ share/locale/ja/LC_MESSAGES/balsa.mo
 share/locale/ko/LC_MESSAGES/balsa.mo
 share/locale/lt/LC_MESSAGES/balsa.mo
 share/locale/lv/LC_MESSAGES/balsa.mo
+share/locale/ml/LC_MESSAGES/balsa.mo
 share/locale/ms/LC_MESSAGES/balsa.mo
 share/locale/nl/LC_MESSAGES/balsa.mo
 share/locale/nn/LC_MESSAGES/balsa.mo