Update to 2.3.26, and enable many more features by default.

Changes:
* Balsa-2.3.26 release. Release date 2008-09-07

- composing format=flowed messages with spaces pasted in works better.
- allow to explicitly specify a GPG key id for an identity.

* Balsa-2.3.25 release. Release date 2008-06-14

- GMail compatibility.
- notification icon in GNOME panel is optional now.
- wrapping of flowed text improved.
- lots of various bug fixes.

* Balsa-2.3.24 release. Release date 2008-05-31

- Support for accessing files over gnome-vfs (smb, ssh mounts, etc.)
- maildir tree scanning fixes.
- Rudimentary support for sending text/html messages.
- UIDPLUS IMAP extension support.

* Balsa-2.3.23 release. Release date 2008-03-20

- Suppport for IMAP MULTIAPPEND extension for faster uploading of
  message batches to and from IMAP servers.
- improved scanning of mailbox trees.
- GtkSourceView2 support.

* Balsa-2.3.22 release. Release date 2007-12-23

- new address edition widget in the compose window.
- compose window displays languages available for spell checking.
- more new icons.

* Balsa-2.3.21 release. Release date 2007-12-08

- migration from GnomeUI to GtkUIManager
- Rubrica address book support.
- bugs fixed: GNOME: 481842, 488432, 496316; Redhat: 414361.

* Balsa-2.3.20 release. Release date 2007-09-07

- fix buffer overflow (#474366).
- avoid sending messages twice under certain conditions.

* Balsa-2.3.19 release. Release date 2007-08-25

- more build fixes.

* Balsa-2.3.18 release. Release date 2007-08-22

- reflow improvements.
- Build problems against steaming-hot GNOME fixed.
- Make BINARY and ESEARCH IMAP extensions usage more robust.

* Balsa-2.3.17 release. Release date 2007-07-04

- check validity of server APOP challenge.
- add ability to store VCARD signatures.
- use ESEARCH IMAP extension if available.
- message wrapping fixes.
- and an usual bunch of bugfixes.

* Balsa-2.3.16 release. Release date 2007-05-27

- fix message threading regression.
- reorganize "Identity" dialog.
- code cleanup.

* Balsa-2.3.15 release. Release date 2007-05-01

- Use GtkPrint infrastructure if available.
- handle LDAP referrals.
- nicer citation marks.
- initial libnotify support.
- IMAP BINARY support.

* Balsa-2.3.14 release. Release date 2006-12-12

- deferred population of the mailbox index.
- client-side IMAP sorting.
- be compatible with recent gtk2 releases.
- mailbox tabs reorderable with d&d.
- enhanced mailto: URL handling.

* Balsa-2.3.13 release. Release date 2006-06-26

- many small fixes
- nicer icons.

* Balsa-2.3.12 release. Release date 2006-03-04

- do not reference freed memory in mbox driver.

* Balsa-2.3.11 release. Release date 2006-02-28

- assure messages are properly signed after identity change.
- Ctrl-N goes over unread messages in all mailboxes.
- Redone Preference Manager.
- support better slow LDAP servers.
- use better real estate when displaying message counts.
- fixed bugs: 330085, 330093, 332980.

9 files changed, 87 insertions, 52 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 5e405bb5c7d..35e17a3a65c 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2008/07/13 13:15:29 tonnerre Exp $
+# $NetBSD: Makefile,v 1.63 2008/10/29 00:18:51 wiz Exp $
 
-DISTNAME=	balsa-2.3.10
-PKGREVISION=	14
+DISTNAME=	balsa-2.3.26
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://balsa.gnome.org/
 EXTRACT_SUFX=	.tar.bz2
@@ -20,8 +19,11 @@ USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 
 CONFIGURE_ARGS+=	--with-gpgme=${BUILDLINK_PREFIX.gpgme:Q}/bin/gpgme-config
 CONFIGURE_ARGS+=	--disable-more-warnings
-CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--enable-pcre
+CONFIGURE_ARGS+=	--enable-smime
+CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ARGS+=	--with-gtksourceview
+CONFIGURE_ARGS+=	--with-gtkspell
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ENV+=		ac_cv_lib_iconv_iconv_open=yes
 
@@ -34,7 +36,6 @@ BUILDLINK_TRANSFORM+=		rm:-DGNOME_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=		rm:-DGNOME_VFS_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=		rm:-DGTK_DISABLE_DEPRECATED
 
-BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.9
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -44,17 +45,19 @@ BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.9
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.9
 .include "../../mail/gmime/buildlink3.mk"
 .include "../../mail/libesmtp/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../textproc/aspell/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/gtkhtml38/buildlink3.mk"
+.include "../../www/gtkhtml314/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtksourceview2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa/PLIST b/mail/balsa/PLIST
index 55c5d27d526..cdc90351892 100644
--- a/mail/balsa/PLIST
+++ b/mail/balsa/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.7 2007/09/20 20:50:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/10/29 00:18:51 wiz Exp $
 bin/balsa
 bin/balsa-ab
 lib/bonobo/servers/GNOME_Balsa.server
 man/man1/balsa.1
 share/applications/balsa.desktop
+share/balsa/gtksourceview-2.0/balsa-mail-style.xml
+share/balsa/gtksourceview-2.0/balsa-mail.lang
+share/balsa/hicolor/16x16/apps/balsa-drop-down.png
 share/balsa/hicolor/16x16/apps/balsa-encrypted.png
 share/balsa/hicolor/16x16/apps/balsa-mark-all.png
 share/balsa/hicolor/16x16/apps/balsa-mbox-draft.png
@@ -83,12 +86,14 @@ share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-signed.png
 share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart.png
 share/idl/Balsa.idl
 share/locale/am/LC_MESSAGES/balsa.mo
+share/locale/ar/LC_MESSAGES/balsa.mo
 share/locale/az/LC_MESSAGES/balsa.mo
 share/locale/bg/LC_MESSAGES/balsa.mo
 share/locale/ca/LC_MESSAGES/balsa.mo
 share/locale/cs/LC_MESSAGES/balsa.mo
 share/locale/da/LC_MESSAGES/balsa.mo
 share/locale/de/LC_MESSAGES/balsa.mo
+share/locale/dz/LC_MESSAGES/balsa.mo
 share/locale/el/LC_MESSAGES/balsa.mo
 share/locale/en_CA/LC_MESSAGES/balsa.mo
 share/locale/en_GB/LC_MESSAGES/balsa.mo
@@ -101,6 +106,7 @@ share/locale/he/LC_MESSAGES/balsa.mo
 share/locale/hi/LC_MESSAGES/balsa.mo
 share/locale/hr/LC_MESSAGES/balsa.mo
 share/locale/hu/LC_MESSAGES/balsa.mo
+share/locale/id/LC_MESSAGES/balsa.mo
 share/locale/it/LC_MESSAGES/balsa.mo
 share/locale/ja/LC_MESSAGES/balsa.mo
 share/locale/ko/LC_MESSAGES/balsa.mo
@@ -112,7 +118,7 @@ share/locale/nb/LC_MESSAGES/balsa.mo
 share/locale/ne/LC_MESSAGES/balsa.mo
 share/locale/nl/LC_MESSAGES/balsa.mo
 share/locale/nn/LC_MESSAGES/balsa.mo
-share/locale/no/LC_MESSAGES/balsa.mo
+share/locale/oc/LC_MESSAGES/balsa.mo
 share/locale/pa/LC_MESSAGES/balsa.mo
 share/locale/pl/LC_MESSAGES/balsa.mo
 share/locale/pt/LC_MESSAGES/balsa.mo
@@ -141,7 +147,7 @@ share/sounds/balsa/startup.wav
 @comment in xdg-dirs: @dirrm share/sounds
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/balsa
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @comment in ORBit2: @dirrm share/idl
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/mimetypes
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
@@ -156,6 +162,7 @@ share/sounds/balsa/startup.wav
 @dirrm share/balsa/hicolor/16x16/apps
 @dirrm share/balsa/hicolor/16x16
 @dirrm share/balsa/hicolor
+@dirrm share/balsa/gtksourceview-2.0
 @dirrm share/balsa
 @comment in xdg-dirs: @dirrm share/applications
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index 59623a0a167..7f501135df8 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.13 2008/07/13 13:15:29 tonnerre Exp $
+$NetBSD: distinfo,v 1.14 2008/10/29 00:18:51 wiz Exp $
 
-SHA1 (balsa-2.3.10.tar.bz2) = 74315661721a7b222403988b2af8fbc690c1ddc4
-RMD160 (balsa-2.3.10.tar.bz2) = 2fba2b3ae62e0fa3c3d8092f559f8ab7a488c22c
-Size (balsa-2.3.10.tar.bz2) = 3273478 bytes
-SHA1 (patch-aa) = 4093290f39ee76d1a02a80c84ecf8d38ddadd3d7
+SHA1 (balsa-2.3.26.tar.bz2) = 08fd06a3e93b155a0bca727f8a2bff3589bc36df
+RMD160 (balsa-2.3.26.tar.bz2) = 81b2c70a0932d035afd0853f223c9076041b2def
+Size (balsa-2.3.26.tar.bz2) = 2726954 bytes
+SHA1 (patch-aa) = 187a143e34bdce539109a21687c4271ffa81eaa6
 SHA1 (patch-ab) = 47083f65d404e64ee238bc3e4f3e25008f5f82c8
 SHA1 (patch-ac) = 808f4546204fbc4a23007291637e4b4ca4175db1
+SHA1 (patch-ad) = 496cd01810dd0e4328907dd3f433c6921dd33e03
 SHA1 (patch-ae) = fcd0ab1c062018b42469b033a98b4575ee2851f3
 SHA1 (patch-af) = 53e77f5f5df0e05f503713f7be163589c2381f07
-SHA1 (patch-ag) = af887dee466e2b0904522e0896cc13bf58fb9d2c
-SHA1 (patch-ah) = 9a17ea3c3f302acf4380c7868ab8c769d9acfc39
+SHA1 (patch-ag) = 97cdeacf154eef6f6b3083ba381e2c7b05661f35
+SHA1 (patch-ah) = e9bbed1d7b837c8af071d0ebf494bf616dc1ad18
 SHA1 (patch-ai) = 44e704eefd63873900609d7c7186469b4b5214d1
 SHA1 (patch-aj) = 4d068d3aa551c11edcc2c7fdc189ebab98a69953
-SHA1 (patch-ak) = a5a5a31d49c1d79610c4ea73557039b2a1b8076d
+SHA1 (patch-ak) = 2341a54187086e836919c6f1842619999f82c456
 SHA1 (patch-ba) = 76b51ced11626e6f36e0763ca64519cc8605c936
diff --git a/mail/balsa/options.mk b/mail/balsa/options.mk
index aab7d45426f..d970c8118b8 100644
--- a/mail/balsa/options.mk
+++ b/mail/balsa/options.mk
@@ -1,16 +1,27 @@
-# $NetBSD: options.mk,v 1.1 2007/09/20 20:50:50 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2008/10/29 00:18:51 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.balsa
-PKG_SUPPORTED_OPTIONS=	ldap ssl
+PKG_SUPPORTED_OPTIONS=	compface ldap sqlite ssl
+PKG_SUGGESTED_OPTIONS=	compface ldap sqlite ssl
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mcompface)
+CONFIGURE_ARGS+=	--with-compface
+.  include "../../graphics/compface/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mldap)
 CONFIGURE_ARGS+=	--with-ldap
 .  include "../../databases/openldap-client/buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Msqlite)
+CONFIGURE_ARGS+=	--with-sqlite
+.  include "../../databases/sqlite3/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mssl)
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 .  include "../../security/openssl/buildlink3.mk"
diff --git a/mail/balsa/patches/patch-aa b/mail/balsa/patches/patch-aa
index 4031c243dca..77cd26c3e7f 100644
--- a/mail/balsa/patches/patch-aa
+++ b/mail/balsa/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2007/09/20 20:50:51 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2008/10/29 00:18:51 wiz Exp $
 
---- configure.orig	2006-02-11 13:51:23.000000000 +0000
+--- configure.orig	2008-09-05 18:19:20.000000000 +0000
 +++ configure
-@@ -23041,7 +23041,7 @@ if test "${ac_cv_lib_esmtp_smtp_start_se
+@@ -8452,7 +8452,7 @@ if test "${ac_cv_lib_esmtp_smtp_start_se
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,12 +11,21 @@ $NetBSD: patch-aa,v 1.13 2007/09/20 20:50:51 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23100,7 +23100,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_esmtp_smtp_start_session" >&5
- echo "${ECHO_T}$ac_cv_lib_esmtp_smtp_start_session" >&6
- if test $ac_cv_lib_esmtp_smtp_start_session = yes; then
--  LIBS="$LIBS -lesmtp -lpthread"
-+  LIBS="$LIBS -lesmtp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+@@ -8521,7 +8521,7 @@ if test "${ac_cv_lib_esmtp_smtp_option_r
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   { { echo "$as_me:$LINENO: error: *** You enabled ESMTP but esmtp library is not found." >&5
- echo "$as_me: error: *** You enabled ESMTP but esmtp library is not found." >&2;}
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lesmtp -lpthread $LIBS"
++LIBS="-lesmtp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8600,7 +8600,7 @@ if test "${ac_cv_lib_esmtp_smtp_starttls
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lesmtp -lpthread $LIBS"
++LIBS="-lesmtp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/mail/balsa/patches/patch-ad b/mail/balsa/patches/patch-ad
new file mode 100644
index 00000000000..02243188ec6
--- /dev/null
+++ b/mail/balsa/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2008/10/29 00:18:51 wiz Exp $
+
+--- src/print-gtk.c.orig	2007-10-13 19:33:49.000000000 +0000
++++ src/print-gtk.c
+@@ -377,7 +377,7 @@ get_default_user_units(void)
+      */
+     gchar *e = _("default:mm");
+   
+-#ifdef HAVE_LANGINFO
++#if defined(HAVE_LANGINFO) && defined(_NL_MEASUREMENT_MEASUREMENT)
+     gchar *imperial = NULL;
+   
+     imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
diff --git a/mail/balsa/patches/patch-ag b/mail/balsa/patches/patch-ag
index f8d42dbdc47..1f7b783f857 100644
--- a/mail/balsa/patches/patch-ag
+++ b/mail/balsa/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2008/07/13 13:15:29 tonnerre Exp $
+$NetBSD: patch-ag,v 1.3 2008/10/29 00:18:51 wiz Exp $
 
---- libbalsa/imap/imap-handle.c.orig	2005-12-03 14:18:37.000000000 +0100
+--- libbalsa/imap/imap-handle.c.orig	2008-09-07 18:20:03.000000000 +0000
 +++ libbalsa/imap/imap-handle.c
 @@ -20,9 +20,13 @@
  
@@ -16,12 +16,3 @@ $NetBSD: patch-ag,v 1.2 2008/07/13 13:15:29 tonnerre Exp $
  #include <netdb.h>
  #include <glib.h>
  #include <glib-object.h>
-@@ -2992,7 +2996,7 @@ ir_fetch_seq(ImapMboxHandle *h, unsigned
-   if(seqno<1 || seqno > h->exists) return IMR_PROTOCOL;
-   if(sio_getc(h->sio) != '(') return IMR_PROTOCOL;
-   do {
--    for(i=0; (c = sio_getc(h->sio)) != -1; i++) {
-+    for(i=0; ((c = sio_getc(h->sio)) != -1) && (i < LONG_STRING - 1); i++) {
-       c = toupper(c);
-       if( !( (c >='A' && c<='Z') || (c >='0' && c<='9') || c == '.') ) break;
-       atom[i] = c;
diff --git a/mail/balsa/patches/patch-ah b/mail/balsa/patches/patch-ah
index 4151f0c9079..dd8ad9f7377 100644
--- a/mail/balsa/patches/patch-ah
+++ b/mail/balsa/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2007/09/20 20:50:53 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2008/10/29 00:18:51 wiz Exp $
 
---- libbalsa/imap/imap-search.c.orig	2005-06-22 22:08:59.000000000 +0200
-+++ libbalsa/imap/imap-search.c
+--- libbalsa/imap/imap_search.c.orig	2008-03-24 21:59:01.000000000 +0000
++++ libbalsa/imap/imap_search.c
 @@ -19,6 +19,7 @@
  
  #define _POSIX_C_SOURCE 199506L
diff --git a/mail/balsa/patches/patch-ak b/mail/balsa/patches/patch-ak
index 27689d4370e..1b969f1f1e9 100644
--- a/mail/balsa/patches/patch-ak
+++ b/mail/balsa/patches/patch-ak
@@ -1,12 +1,12 @@
-$NetBSD: patch-ak,v 1.1 2007/09/20 20:50:54 wiz Exp $
+$NetBSD: patch-ak,v 1.2 2008/10/29 00:18:51 wiz Exp $
 
---- libbalsa/misc.h.orig	2006-02-11 13:54:44.000000000 +0000
+--- libbalsa/misc.h.orig	2008-08-21 17:23:44.000000000 +0000
 +++ libbalsa/misc.h
 @@ -32,6 +32,7 @@
  #endif
  
- #ifdef HAVE_PCRE
+ #if !USE_GREGEX
 +#  include <pcre.h>
- #  include <pcreposix.h>
- #else
- #  include <sys/types.h>
+ #  ifdef HAVE_PCRE
+ #    include <pcreposix.h>
+ #  else