update to balsa-2.2.0

* Balsa-2.2.0 release. Release date 2004-07-06

- fix 143322, 143263, 145701.
- GPGME updates.
- GSSAPI IMAP authentication.
- more build fixes.

* Balsa-2.1.91 release. Release date 2004-07-06

- multiple build fixes.
- few crashes fixed.

* Balsa-2.1.90 release. Release date 2004-07-03

- mailbox scanning improvements.
- Edit/Find UI more user-friendly.
- message filtering fixes.
- reset TLS status of broken IMAP sessions.

* Balsa-2.1.3 release. Release date 2004-05-22

- GPGME fixes.
- Reduce memory usage of local mailbox drivers.
- numerous i18n fixes.
- more careful error checking.
- user configuration of TLS, APOP settings to work around broken servers.

* Balsa-2.1.2 release. Release date 2004-04-05

- POP3 with TLS and PIPELINING.
- mbox driver performance improvements.
- numerous other performance improvements.
- filters reenabled.
- memory leaks plugged.

* Balsa-2.1.1 release. Release date 2004-02-29

Numerous fixes, most prominent are:
- reduce memory usage of mbox driver.
- major cleanup of local and remote drivers.
- searching re-enabled again.
- SSL/TLS re-enabled again.
- Use bonobo to bring up already running instances.

* Balsa-2.1.0 release. Release date 2004-01-11

- entirely new backend and message index.

10 files changed, 87 insertions, 44 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index a3178650583..feb015a39f8 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2004/04/14 16:15:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2004/07/23 15:09:57 recht Exp $
 
-DISTNAME=		balsa-2.0.17
+DISTNAME=		balsa-2.2.0
 CATEGORIES=		mail gnome
 MASTER_SITES=		http://balsa.gnome.org/				\
 			ftp://ftp.newton.cx/pub/balsa/
@@ -14,13 +14,15 @@ BUILD_USES_MSGFMT=	yes
 
 USE_DIRS+=		gnome2-1.5
 USE_PERL5=		build
+USE_X11=		yes
 USE_PKGINSTALL=		yes
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+USE_GNU_TOOLS+=		make
 
-CONFIGURE_ARGS+=	--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
+CONFIGURE_ARGS=		--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
 CONFIGURE_ARGS+=	--disable-more-warnings
 CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--enable-pcre
@@ -41,19 +43,23 @@ CONFIGURE_ARGS+=        --with-ldap
 .endif
 BUILD_DEFS+=	USE_OPENLDAP
 
-.include "../../security/gpgme/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libtool/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../mail/gmime/buildlink3.mk"
+.include "../../mail/libesmtp/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../security/gpgme/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../www/gtkhtml3/buildlink3.mk"
-.include "../../mail/libesmtp/buildlink3.mk"
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa2/PLIST b/mail/balsa2/PLIST
index 6da795bbcc4..bf0efc3ca4a 100644
--- a/mail/balsa2/PLIST
+++ b/mail/balsa2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/31 12:37:00 recht Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/07/23 15:09:57 recht Exp $
 bin/balsa
 bin/balsa-ab
 lib/bonobo/servers/GNOME_Balsa.server
@@ -90,13 +90,9 @@ share/sounds/balsa/startup.wav
 @dirrm share/gnome/help/balsa/C/figures
 @dirrm share/gnome/help/balsa/C
 @dirrm share/gnome/help/balsa
-@comment in gnome-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/examples/balsa
 @dirrm share/balsa/pixmaps
 @dirrm share/balsa
 @comment in xdg-dirs: @dirrm share/applications
-@comment in scrollkeeper: @dirrm libdata/scrollkeeper/db/index
-@comment in scrollkeeper: @dirrm libdata/scrollkeeper/db/TOC
-@comment in scrollkeeper: @dirrm libdata/scrollkeeper/db
 @comment in libbonobo: @dirrm lib/bonobo/servers
-@comment in xdg-dirs: @dirrm etc/sound/events
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index 7e3a96ef232..dc56358b3db 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.6 2004/03/31 12:37:00 recht Exp $
+$NetBSD: distinfo,v 1.7 2004/07/23 15:09:57 recht Exp $
 
-SHA1 (balsa-2.0.17.tar.bz2) = a32e49b4822076fb7a129f66b89055e1d2266e9b
-Size (balsa-2.0.17.tar.bz2) = 2970206 bytes
-SHA1 (patch-aa) = d8f2a984098d636d4705b29d164edbfb16857a96
+SHA1 (balsa-2.2.0.tar.bz2) = da7181ac4a19cfc649d4c3226d693ca07c2df6e2
+Size (balsa-2.2.0.tar.bz2) = 2745675 bytes
 SHA1 (patch-ab) = 47083f65d404e64ee238bc3e4f3e25008f5f82c8
-SHA1 (patch-ac) = 546e3804a8a760b0d7a54c3e7a02cab85930a91e
-SHA1 (patch-ae) = dc0bb9dbc5c1392c0dcc3a515d44d40fe26d93e3
+SHA1 (patch-ac) = 2479ee81784a76338860e5848ddcf4b4ae8449d5
+SHA1 (patch-ae) = 63ef5da19874848b221a594c6adbfadd21e7fd5f
 SHA1 (patch-af) = 53e77f5f5df0e05f503713f7be163589c2381f07
+SHA1 (patch-ag) = dcd7fb1435b3f576645566a0eaa13e4e8a0c2998
+SHA1 (patch-ah) = ef4a5d30f933d41e7fef807378007de993dd978c
+SHA1 (patch-ai) = 1bb6629035c6bafa02fae9f27dd0e73ccced7f99
+SHA1 (patch-aj) = 25a2398654e1ec326bd5dbf4dcfe0200ccb7c696
diff --git a/mail/balsa2/patches/patch-aa b/mail/balsa2/patches/patch-aa
deleted file mode 100644
index d937f81453a..00000000000
--- a/mail/balsa2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/03/31 12:37:00 recht Exp $
-
---- libmutt/configure.orig	2004-03-29 00:00:08.000000000 +0200
-+++ libmutt/configure	2004-03-31 14:07:35.000000000 +0200
-@@ -10512,7 +10512,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/patches/patch-ac b/mail/balsa2/patches/patch-ac
index a2d2abfd370..73a4303e55d 100644
--- a/mail/balsa2/patches/patch-ac
+++ b/mail/balsa2/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2004/03/31 12:37:00 recht Exp $
+$NetBSD: patch-ac,v 1.3 2004/07/23 15:09:57 recht Exp $
 
---- sounds/Makefile.in.orig	2004-03-29 00:10:46.000000000 +0200
-+++ sounds/Makefile.in	2004-03-31 14:08:17.000000000 +0200
-@@ -133,7 +133,7 @@
+--- sounds/Makefile.in.orig	2004-07-10 08:39:57.000000000 +0200
++++ sounds/Makefile.in	2004-07-23 12:08:11.000000000 +0200
+@@ -215,7 +215,7 @@
+ EXTRA_DIST = $(balsa_SOUNDS) $(balsa_SOUNDLISTS)
  balsasoundsdir = $(datadir)/sounds/balsa
  balsasounds_DATA = $(balsa_SOUNDS)
- 
 -soundlistdir = $(sysconfdir)/sound/events
 +soundlistdir = ${prefix}/share/examples/balsa
  soundlist_DATA = $(balsa_SOUNDLISTS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
+ all: all-am
+ 
diff --git a/mail/balsa2/patches/patch-ae b/mail/balsa2/patches/patch-ae
index 6472afacc9b..3bef2487894 100644
--- a/mail/balsa2/patches/patch-ae
+++ b/mail/balsa2/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2003/07/25 18:25:46 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2004/07/23 15:09:57 recht Exp $
 
---- libbalsa/filter-file.c.orig	2003-07-25 19:39:19.000000000 +0200
-+++ libbalsa/filter-file.c	2003-07-25 19:39:41.000000000 +0200
-@@ -34,7 +34,7 @@
+--- libbalsa/filter-file.c.orig	2004-05-22 20:53:17.000000000 +0200
++++ libbalsa/filter-file.c	2004-07-23 12:01:56.000000000 +0200
+@@ -30,7 +30,7 @@
  #include "config.h"
  
  /* define _XOPEN_SOURCE to make strptime visible */
diff --git a/mail/balsa2/patches/patch-ag b/mail/balsa2/patches/patch-ag
new file mode 100644
index 00000000000..b958aba7454
--- /dev/null
+++ b/mail/balsa2/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.1 2004/07/23 15:09:57 recht Exp $
+
+--- libbalsa/imap/imap-handle.c.orig	2004-07-08 22:40:45.000000000 +0200
++++ libbalsa/imap/imap-handle.c	2004-07-23 12:41:46.000000000 +0200
+@@ -20,8 +20,12 @@
+ 
+ #define _POSIX_SOURCE 1
+ #define _BSD_SOURCE   1
++#define _NETBSD_SOURCE 1
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#ifdef __NetBSD__
++#include <netinet/in.h>
++#endif
+ #include <netdb.h>
+ #include <glib.h>
+ #include <glib-object.h>
diff --git a/mail/balsa2/patches/patch-ah b/mail/balsa2/patches/patch-ah
new file mode 100644
index 00000000000..d95c135ade4
--- /dev/null
+++ b/mail/balsa2/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2004/07/23 15:09:57 recht Exp $
+
+--- libbalsa/imap/imap-search.c.orig	2004-03-14 09:14:48.000000000 +0100
++++ libbalsa/imap/imap-search.c
+@@ -18,6 +18,7 @@
+  */
+ 
+ #define _POSIX_SOURCE 1
++#define	_NETBSD_SOURCE         1
+ #include <string.h>
+ #include <time.h>
+ 
diff --git a/mail/balsa2/patches/patch-ai b/mail/balsa2/patches/patch-ai
new file mode 100644
index 00000000000..6480be2b718
--- /dev/null
+++ b/mail/balsa2/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2004/07/23 15:09:57 recht Exp $
+
+--- libbalsa/mailbox_mh.c.orig	2004-03-31 00:27:18.000000000 +0200
++++ libbalsa/mailbox_mh.c
+@@ -25,6 +25,7 @@
+ #define _XOPEN_SOURCE          500
+ #define _XOPEN_SOURCE_EXTENDED 1
+ #define _POSIX_SOURCE          1
++#define	_NETBSD_SOURCE         1
+ #include <libgnome/gnome-i18n.h>
+ 
+ #include <unistd.h>
diff --git a/mail/balsa2/patches/patch-aj b/mail/balsa2/patches/patch-aj
new file mode 100644
index 00000000000..6a5ecc2d53f
--- /dev/null
+++ b/mail/balsa2/patches/patch-aj
@@ -0,0 +1,10 @@
+--- libbalsa/misc.c.orig	2004-07-23 12:48:15.000000000 +0200
++++ libbalsa/misc.c	2004-07-23 12:51:42.000000000 +0200
+@@ -24,6 +24,7 @@
+ 
+ #define _SVID_SOURCE           1
+ #define _XOPEN_SOURCE          500
++#define _NETBSD_SOURCE         1
+ #include <stdio.h>
+ #include <sys/utsname.h>
+ #include <ctype.h>