5 files changed, 22 insertions, 21 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 0a6c066bbf50..f21bd45f791a 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	balsa2
-PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTVERSION=	2.0.8
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
 DISTNAME=	balsa-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A mail reader for the GNOME 2 desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
 LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2 \
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index 41e310551428..03b3d0dca96f 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1 +1 @@
-MD5 (balsa-2.0.6.tar.bz2) = ce676c067bc69bd1b6d8541ecbc8da60
+MD5 (balsa-2.0.8.tar.bz2) = 2fc00f02373d2038f37e0a57a85fc4e8
diff --git a/mail/balsa2/files/patch-configure b/mail/balsa2/files/patch-configure
index aecdd0a07803..4c689393583c 100644
--- a/mail/balsa2/files/patch-configure
+++ b/mail/balsa2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed Jan 29 09:09:43 2003
-+++ configure	Wed Jan 29 16:49:18 2003
-@@ -8600,13 +8600,13 @@
+--- configure.orig	Sun Feb 16 10:45:05 2003
++++ configure	Wed Feb 19 03:52:18 2003
+@@ -8294,13 +8294,13 @@
  
  if test x$enable_deprecated_pspell = xyes ; then
  
@@ -18,7 +18,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
-@@ -8617,7 +8617,7 @@
+@@ -8311,7 +8311,7 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -27,7 +27,7 @@
  #ifdef F77_DUMMY_MAIN
  #  ifdef __cplusplus
       extern "C"
-@@ -8627,7 +8627,7 @@
+@@ -8321,7 +8321,7 @@
  int
  main ()
  {
@@ -36,7 +36,7 @@
    ;
    return 0;
  }
-@@ -8644,18 +8644,18 @@
+@@ -8338,18 +8338,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -60,7 +60,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPSPELL 1
  _ACEOF
-@@ -11237,7 +11237,7 @@
+@@ -10931,7 +10931,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -69,7 +69,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
-@@ -11292,7 +11292,7 @@
+@@ -10986,7 +10986,7 @@
  #define ENABLE_LDAP 1
  _ACEOF
  
@@ -78,12 +78,3 @@
  else
    { { echo "$as_me:$LINENO: error: *** You enabled LDAP but ldap library is not found." >&5
  echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;}
-@@ -11819,7 +11819,7 @@
- echo $ECHO_N "checking whether to build SSL support... $ECHO_C" >&6
- if test "x$with_ssl" != xno  ; then
- # openssl >=0.9.7 is pkg-config compatible.
--   if pkg-config openssl >&/dev/null; then
-+   if pkg-config openssl >/dev/null 2>&1; then
-       LIBS="$LIBS `pkg-config --libs openssl`"
-       CPPFLAGS="`pkg-config --cflags-only-I openssl` $CPPFLAGS"
-       echo "$as_me:$LINENO: result: yes" >&5
diff --git a/mail/balsa2/files/patch-libmutt_configure b/mail/balsa2/files/patch-libmutt_configure
new file mode 100644
index 000000000000..273e87a18e0d
--- /dev/null
+++ b/mail/balsa2/files/patch-libmutt_configure
@@ -0,0 +1,11 @@
+--- libmutt/configure.orig	Wed Feb 19 03:57:44 2003
++++ libmutt/configure	Wed Feb 19 03:58:16 2003
+@@ -9873,7 +9873,7 @@
+ echo "$as_me: error: SSL support is only for IMAP, but IMAP is not enabled" >&2;}
+    { (exit 1); exit 1; }; }
+ 	  fi
+-          if pkg-config openssl >& /dev/null; then
++          if pkg-config openssl >/dev/null 2>&1; then
+ 	     echo here
+              LDFLAGS="$LIBS `pkg-config --libs openssl`"
+              CPPFLAGS="`pkg-config --cflags-only-I openssl` $CPPFLAGS"
diff --git a/mail/balsa2/pkg-comment b/mail/balsa2/pkg-comment
deleted file mode 100644
index 221b9ce360f6..000000000000
--- a/mail/balsa2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mail reader for the GNOME 2.0 desktop