Update balsa to 1.4.3. Changes include:

    - number of bugs fixed (52168, 102472, 102470, 105605, 106508).
    - some build fixes (e.g against openssl-0.9.7)
    - fix crash on concurrent access to local mailboxes.
    - spell checking fixes.
    - numerous message filtering fixes.
    - incremental search fixes.
    - several filter-related bugs fixed.
    - filters UI adapted to HIG guidelines.
    - build fixes for different architectures.

5 files changed, 126 insertions, 141 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 36a3e95a5dd..67d925c1824 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.30 2003/04/04 03:53:54 jschauma Exp $
+# $NetBSD: Makefile,v 1.31 2003/04/26 03:09:30 rh Exp $
 #
 
-DISTNAME=	balsa-1.4.0
-PKGREVISION=	4
-CATEGORIES=	mail gnome
-MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
-		ftp://ftp.newton.cx/pub/balsa/
+DISTNAME=		balsa-1.4.3
+CATEGORIES=		mail gnome
+MASTER_SITES=		http://www.theochem.kth.se/~pawsa/balsa/ \
+			ftp://ftp.newton.cx/pub/balsa/
+EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://www.balsa.net/
-COMMENT=	GNOME EMail client
+MAINTAINER=		rh@netbsd.org
+HOMEPAGE=		http://www.balsa.net/
+COMMENT=		GNOME EMail client
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
@@ -18,17 +18,24 @@ USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CONFIGURE_ARGS+=	--disable-more-warnings \
-			--enable-pcre
 
+CONFIGURE_DIRS=		${WRKSRC}
+CONFIGURE_DIRS+=	${WRKSRC}/libmutt
+
+CONFIGURE_ARGS+=	--no-recursion
+CONFIGURE_ARGS+=	--disable-more-warnings
+CONFIGURE_ARGS+=	--enable-pcre
 CONFIGURE_ARGS+=        --with-ssl=${BUILDLINK_PREFIX.openssl}
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/libtool/buildlink2.mk"
 .include "../../devel/libproplist/buildlink2.mk"
 .include "../../devel/pcre/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
 .include "../../mail/libesmtp/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../print/gnome-print/buildlink2.mk"
 .include "../../textproc/aspell/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../sysutils/gnome-vfs/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa/PLIST b/mail/balsa/PLIST
index 233886b593f..e16b97e63f3 100644
--- a/mail/balsa/PLIST
+++ b/mail/balsa/PLIST
@@ -1,47 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/21 02:23:53 mjl Exp $
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/balsa.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/balsa.mo
+@comment $NetBSD: PLIST,v 1.5 2003/04/26 03:09:30 rh Exp $
 bin/balsa
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
 man/man1/balsa.1
-share/gnome/apps/Internet/balsa.desktop
-share/gnome/help/balsa/C/g1866.html
-share/gnome/help/balsa/C/g1958.html
+share/applications/balsa.desktop
 share/gnome/help/balsa/C/images/address-book-ldap.png
 share/gnome/help/balsa/C/images/address-book-modify.png
 share/gnome/help/balsa/C/images/address-book-start.png
@@ -73,45 +35,44 @@ share/gnome/help/balsa/C/stylesheet-images/up.gif
 share/gnome/help/balsa/C/stylesheet-images/warning.gif
 share/gnome/help/balsa/C/t1.html
 share/gnome/help/balsa/C/topic.dat
-share/gnome/help/balsa/C/x1016.html
-share/gnome/help/balsa/C/x1043.html
-share/gnome/help/balsa/C/x1069.html
-share/gnome/help/balsa/C/x1108.html
-share/gnome/help/balsa/C/x1134.html
-share/gnome/help/balsa/C/x1233.html
-share/gnome/help/balsa/C/x1259.html
-share/gnome/help/balsa/C/x1346.html
-share/gnome/help/balsa/C/x1372.html
-share/gnome/help/balsa/C/x1385.html
-share/gnome/help/balsa/C/x1411.html
-share/gnome/help/balsa/C/x1428.html
-share/gnome/help/balsa/C/x1454.html
-share/gnome/help/balsa/C/x1464.html
-share/gnome/help/balsa/C/x1490.html
-share/gnome/help/balsa/C/x1511.html
-share/gnome/help/balsa/C/x1537.html
-share/gnome/help/balsa/C/x1555.html
-share/gnome/help/balsa/C/x1558.html
-share/gnome/help/balsa/C/x1581.html
-share/gnome/help/balsa/C/x1584.html
-share/gnome/help/balsa/C/x1630.html
-share/gnome/help/balsa/C/x1653.html
-share/gnome/help/balsa/C/x1656.html
-share/gnome/help/balsa/C/x1722.html
-share/gnome/help/balsa/C/x1740.html
-share/gnome/help/balsa/C/x1745.html
-share/gnome/help/balsa/C/x1803.html
-share/gnome/help/balsa/C/x1832.html
-share/gnome/help/balsa/C/x1895.html
-share/gnome/help/balsa/C/x475.html
-share/gnome/help/balsa/C/x501.html
 share/gnome/help/balsa/C/x51.html
 share/gnome/help/balsa/C/x81.html
-share/gnome/help/balsa/C/x957.html
-share/gnome/help/balsa/C/x960.html
-share/gnome/help/balsa/C/x983.html
-share/gnome/help/balsa/C/x986.html
-share/gnome/help/balsa/C/x990.html
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/balsa.mo
 share/pixmaps/balsa/attachment.png
 share/pixmaps/balsa/balsa-logo.png
 share/pixmaps/balsa/balsa-top.png
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index 1c96512f43f..10385555e69 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2003/01/16 01:18:39 salo Exp $
+$NetBSD: distinfo,v 1.9 2003/04/26 03:09:30 rh Exp $
 
-SHA1 (balsa-1.4.0.tar.gz) = 4bdcb46ba8ba662a54235e9374e94b874c8abf65
-Size (balsa-1.4.0.tar.gz) = 3324059 bytes
-SHA1 (patch-aa) = 9f264274e5aa1dca38e0fb3dbd0d2a967cbf41a7
+SHA1 (balsa-1.4.3.tar.bz2) = a874958d040008126eeae5f5539f9a7decb1cceb
+Size (balsa-1.4.3.tar.bz2) = 2385240 bytes
+SHA1 (patch-aa) = 72e40582aa6e160927ccbce626b34f945701d7a7
+SHA1 (patch-ab) = ea6b4cca691557c0db1ecbcad29e75d59c0460ae
 SHA1 (patch-ba) = bafbce2ce3bb2f690e2975c4c072835519310533
diff --git a/mail/balsa/patches/patch-aa b/mail/balsa/patches/patch-aa
index a9de9bba771..7d6ac058475 100644
--- a/mail/balsa/patches/patch-aa
+++ b/mail/balsa/patches/patch-aa
@@ -1,57 +1,60 @@
-$NetBSD: patch-aa,v 1.10 2003/01/16 01:18:40 salo Exp $
+$NetBSD: patch-aa,v 1.11 2003/04/26 03:09:31 rh Exp $
 
---- configure.orig	Mon Aug 19 20:05:07 2002
-+++ configure	Thu Jan 16 01:58:21 2003
-@@ -6881,24 +6881,24 @@
- 	
- 
- 
--echo $ac_n "checking for new_pspell_manager in -lpspell""... $ac_c" 1>&6
--echo "configure:6886: checking for new_pspell_manager in -lpspell" >&5
--ac_lib_var=`echo pspell'_'new_pspell_manager | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for new_aspell_speller in -lpspell""... $ac_c" 1>&6
-+echo "configure:6886: checking for new_aspell_speller in -lpspell" >&5
-+ac_lib_var=`echo pspell'_'new_aspell_speller | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+--- configure.orig	2003-03-25 07:14:15.000000000 +1000
++++ configure
+@@ -9287,7 +9287,7 @@ if test "${ac_cv_lib_pspell_new_pspell_m
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS"
 +LIBS="-lpspell -lstdc++ $LIBS -lm"
- cat > conftest.$ac_ext <<EOF
- #line 6894 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -9302,11 +9302,11 @@ extern "C"
+ #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();
- 
- int main() {
--new_pspell_manager()
-+new_aspell_speller()
- ; return 0; }
- EOF
- if { (eval echo configure:6905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -6922,7 +6922,7 @@
- #define $ac_tr_lib 1
- EOF
+    builtin and then its argument prototype would still apply.  */
+-char new_pspell_manager ();
++char new_aspell_speller ();
+ int
+ main ()
+ {
+-new_pspell_manager ();
++new_aspell_speller ();
+   ;
+   return 0;
+ }
+@@ -9340,7 +9340,7 @@ if test $ac_cv_lib_pspell_new_pspell_man
+ #define HAVE_LIBPSPELL 1
+ _ACEOF
  
 -  LIBS="-lpspell $LIBS"
-+  LIBS="-lpspell -lm $LIBS"
++  LIBS="-lpspell $LIBS -lm"
  
  else
-   echo "$ac_t""no" 1>&6
-@@ -10111,10 +10111,10 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char iconv_open();
-+char libiconv_open();
  
- int main() {
--iconv_open()
-+libiconv_open()
- ; return 0; }
- EOF
- if { (eval echo configure:10121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -14275,11 +14275,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char iconv_open ();
++char libiconv_open ();
+ int
+ main ()
+ {
+-iconv_open ();
++libiconv_open ();
+   ;
+   return 0;
+ }
+@@ -14478,8 +14478,7 @@ fi;
+ echo "$as_me:$LINENO: checking whether to build SSL support" >&5
+ 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/balsa/patches/patch-ab b/mail/balsa/patches/patch-ab
new file mode 100644
index 00000000000..96f9c0fbfe4
--- /dev/null
+++ b/mail/balsa/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7 2003/04/26 03:09:31 rh Exp $
+
+--- libmutt/configure.orig	2003-04-26 12:23:33.000000000 +1000
++++ libmutt/configure
+@@ -10514,7 +10514,7 @@ if test "${with_ssl+set}" = set; then
+ 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"