Changes 2.4.8:

* QUOTA and MYRIGHTS IMAP extension support.
* IMAP compression (COMPRESS=DEFLATE) when supported by server
* making opening attachment easier by saving them in a directory
* downloadable images when using Webkit html widget
* faster opening of the compose window.
* text searching enabled in the WebKit html viewer.
* options to hide toolbars and other parts of the UI (useful on netbooks etc).
* For laptop/wifi users: not trying to reach POP3 servers while disconnected,
  and instead checking immediately on reconnection.
* infinite loop avoided.
* avoid crashes when manually verifing GPG signature.

15 files changed, 70 insertions, 160 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index cf9a2f94455..7bf6e1a2bfc 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,30 +1,30 @@
-# $NetBSD: Makefile,v 1.71 2010/06/13 22:44:52 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2010/09/07 19:12:02 adam Exp $
 
-DISTNAME=	balsa-2.3.26
-PKGREVISION=	5
+DISTNAME=	balsa-2.4.8
 CATEGORIES=	mail gnome
-MASTER_SITES=	http://balsa.gnome.org/
+MASTER_SITES=	http://pawsa.fedorapeople.org/balsa/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://balsa.gnome.org/
+HOMEPAGE=	http://pawsa.fedorapeople.org/balsa/
 COMMENT=	GNOME2 EMail client
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-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-pcre
 CONFIGURE_ARGS+=	--enable-smime
 CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ARGS+=	--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
 CONFIGURE_ARGS+=	--with-gtksourceview
 CONFIGURE_ARGS+=	--with-gtkspell
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--without-nm
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		ac_cv_lib_iconv_iconv_open=yes
 
 EGDIR=		${PREFIX}/share/examples/balsa
@@ -36,7 +36,6 @@ BUILDLINK_TRANSFORM+=		rm:-DGNOME_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=		rm:-DGNOME_VFS_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=		rm:-DGTK_DISABLE_DEPRECATED
 
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
@@ -59,5 +58,6 @@ BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.9
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtksourceview2/buildlink3.mk"
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa/PLIST b/mail/balsa/PLIST
index deb0711881b..13ed10de086 100644
--- a/mail/balsa/PLIST
+++ b/mail/balsa/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:04:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/09/07 19:12:02 adam Exp $
 bin/balsa
 bin/balsa-ab
 lib/bonobo/servers/GNOME_Balsa.server
@@ -25,6 +25,13 @@ share/balsa/hicolor/16x16/apps/balsa-signature-bad.png
 share/balsa/hicolor/16x16/apps/balsa-signature-good.png
 share/balsa/hicolor/16x16/apps/balsa-signature-notrust.png
 share/balsa/hicolor/16x16/apps/balsa-signature-unknown.png
+share/balsa/hicolor/16x16/apps/mail-inbox.png
+share/balsa/hicolor/16x16/apps/mail-outbox.png
+share/balsa/hicolor/16x16/apps/stock_book_open.png
+share/balsa/hicolor/16x16/apps/stock_book_red.png
+share/balsa/hicolor/16x16/apps/stock_contact.png
+share/balsa/hicolor/16x16/apps/stock_mail-receive.png
+share/balsa/hicolor/16x16/apps/stock_mail.png
 share/balsa/hicolor/22x22
 share/balsa/hicolor/24x24/apps/balsa-crypt-check.png
 share/balsa/hicolor/24x24/apps/balsa-encrypt.png
@@ -46,6 +53,15 @@ share/balsa/hicolor/24x24/apps/balsa-signature-good.png
 share/balsa/hicolor/24x24/apps/balsa-signature-notrust.png
 share/balsa/hicolor/24x24/apps/balsa-signature-unknown.png
 share/balsa/hicolor/24x24/apps/balsa-trash-empty.png
+share/balsa/hicolor/24x24/apps/stock_book_blue.png
+share/balsa/hicolor/24x24/apps/stock_book_green.png
+share/balsa/hicolor/24x24/apps/stock_book_open.png
+share/balsa/hicolor/24x24/apps/stock_book_red.png
+share/balsa/hicolor/24x24/apps/stock_book_yellow.png
+share/balsa/hicolor/24x24/apps/stock_contact.png
+share/balsa/hicolor/24x24/apps/stock_mail-receive.png
+share/balsa/hicolor/24x24/apps/stock_mail.png
+share/balsa/hicolor/24x24/apps/stock_view-fields.png
 share/balsa/pixmaps/attachment.png
 share/balsa/pixmaps/balsa-logo.png
 share/balsa/pixmaps/balsa-top.png
@@ -53,26 +69,6 @@ share/balsa/pixmaps/balsa-watermark.png
 share/balsa/pixmaps/balsa_icon.png
 share/balsa/pixmaps/balsa_logo.png
 share/examples/balsa/balsa.soundlist
-share/gnome/help/balsa/C/balsa.xml
-share/gnome/help/balsa/C/fdl-appendix.xml
-share/gnome/help/balsa/C/figures/address-book-ldap.png
-share/gnome/help/balsa/C/figures/address-book-modify.png
-share/gnome/help/balsa/C/figures/address-book-start.png
-share/gnome/help/balsa/C/figures/address-book-vcard.png
-share/gnome/help/balsa/C/figures/address-book.png
-share/gnome/help/balsa/C/figures/balsa_logo.png
-share/gnome/help/balsa/C/figures/druid-start.png
-share/gnome/help/balsa/C/figures/example-alias.png
-share/gnome/help/balsa/C/figures/figuresdobaaddress-book-modify.png
-share/gnome/help/balsa/C/figures/main-window-toolbar.png
-share/gnome/help/balsa/C/figures/main-window.png
-share/gnome/help/balsa/C/figures/message-window.png
-share/gnome/help/balsa/C/figures/msg-part-select.png
-share/gnome/help/balsa/C/figures/newmsg-window-attachments.png
-share/gnome/help/balsa/C/figures/newmsg-window-toolbar.png
-share/gnome/help/balsa/C/figures/newmsg-window.png
-share/gnome/help/balsa/C/figures/preferences-window.png
-share/gnome/help/balsa/C/figures/spell-check.png
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pgp-signature.png
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-mime.png
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-signature.png
@@ -88,6 +84,7 @@ 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/be/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
@@ -99,9 +96,11 @@ share/locale/en_CA/LC_MESSAGES/balsa.mo
 share/locale/en_GB/LC_MESSAGES/balsa.mo
 share/locale/es/LC_MESSAGES/balsa.mo
 share/locale/et/LC_MESSAGES/balsa.mo
+share/locale/eu/LC_MESSAGES/balsa.mo
 share/locale/fi/LC_MESSAGES/balsa.mo
 share/locale/fr/LC_MESSAGES/balsa.mo
 share/locale/ga/LC_MESSAGES/balsa.mo
+share/locale/gl/LC_MESSAGES/balsa.mo
 share/locale/he/LC_MESSAGES/balsa.mo
 share/locale/hi/LC_MESSAGES/balsa.mo
 share/locale/hr/LC_MESSAGES/balsa.mo
@@ -112,6 +111,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/mk/LC_MESSAGES/balsa.mo
 share/locale/ml/LC_MESSAGES/balsa.mo
 share/locale/ms/LC_MESSAGES/balsa.mo
 share/locale/nb/LC_MESSAGES/balsa.mo
@@ -139,7 +139,6 @@ share/locale/wa/LC_MESSAGES/balsa.mo
 share/locale/zh_CN/LC_MESSAGES/balsa.mo
 share/locale/zh_HK/LC_MESSAGES/balsa.mo
 share/locale/zh_TW/LC_MESSAGES/balsa.mo
-share/omf/balsa/balsa-C.omf
 share/pixmaps/gnome-balsa2.png
 share/sounds/balsa/newmail.wav
 share/sounds/balsa/startup.wav
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index 7f501135df8..f93b2295bfc 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,17 +1,11 @@
-$NetBSD: distinfo,v 1.14 2008/10/29 00:18:51 wiz Exp $
+$NetBSD: distinfo,v 1.15 2010/09/07 19:12:02 adam Exp $
 
-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) = 97cdeacf154eef6f6b3083ba381e2c7b05661f35
-SHA1 (patch-ah) = e9bbed1d7b837c8af071d0ebf494bf616dc1ad18
-SHA1 (patch-ai) = 44e704eefd63873900609d7c7186469b4b5214d1
-SHA1 (patch-aj) = 4d068d3aa551c11edcc2c7fdc189ebab98a69953
-SHA1 (patch-ak) = 2341a54187086e836919c6f1842619999f82c456
-SHA1 (patch-ba) = 76b51ced11626e6f36e0763ca64519cc8605c936
+SHA1 (balsa-2.4.8.tar.bz2) = 809d44a82505ca19cb202923f0683f47c8252b70
+RMD160 (balsa-2.4.8.tar.bz2) = d1723f99c4d27f722d48300863be539a5dad606a
+Size (balsa-2.4.8.tar.bz2) = 3150866 bytes
+SHA1 (patch-aa) = d3798749cadec5931e5366ed94db033cf10442df
+SHA1 (patch-ab) = eb517156e63712f7d5c7dbde7b963bae12475997
+SHA1 (patch-ac) = 0e586d99d5c53e8caa0c9aa652bf5f5d7f0e1758
+SHA1 (patch-ag) = 665610929c4a84851560ec3acb8f28d103941e35
+SHA1 (patch-ak) = abe90f5117fdcd3381c2a7061cf3ab29e9a3f025
+SHA1 (patch-ba) = 46ed4e317ef79ec58fc432c74c3e057b13ffee75
diff --git a/mail/balsa/patches/patch-aa b/mail/balsa/patches/patch-aa
index 77cd26c3e7f..51a2002ccd0 100644
--- a/mail/balsa/patches/patch-aa
+++ b/mail/balsa/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.14 2008/10/29 00:18:51 wiz Exp $
+$NetBSD: patch-aa,v 1.15 2010/09/07 19:12:03 adam Exp $
 
---- configure.orig	2008-09-05 18:19:20.000000000 +0000
+--- configure.orig	2010-08-21 20:53:36.000000000 +0000
 +++ configure
-@@ -8452,7 +8452,7 @@ if test "${ac_cv_lib_esmtp_smtp_start_se
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16317,7 +16317,7 @@ if test "${ac_cv_lib_esmtp_smtp_start_se
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lesmtp -lpthread $LIBS"
@@ -11,8 +11,8 @@ $NetBSD: patch-aa,v 1.14 2008/10/29 00:18:51 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8521,7 +8521,7 @@ if test "${ac_cv_lib_esmtp_smtp_option_r
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16390,7 +16390,7 @@ if test "${ac_cv_lib_esmtp_smtp_option_r
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lesmtp -lpthread $LIBS"
@@ -20,8 +20,8 @@ $NetBSD: patch-aa,v 1.14 2008/10/29 00:18:51 wiz Exp $
  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
+@@ -16473,7 +16473,7 @@ if test "${ac_cv_lib_esmtp_smtp_starttls
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lesmtp -lpthread $LIBS"
diff --git a/mail/balsa/patches/patch-ab b/mail/balsa/patches/patch-ab
index 5612fd19ed2..cfcd6451e03 100644
--- a/mail/balsa/patches/patch-ab
+++ b/mail/balsa/patches/patch-ab
@@ -1,14 +1,12 @@
-$NetBSD: patch-ab,v 1.9 2007/09/20 20:50:51 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2010/09/07 19:12:03 adam Exp $
 
---- src/threads.h.orig	2003-01-25 23:04:31.000000000 +1000
+--- src/threads.h.orig	2009-08-30 09:03:26.000000000 +0000
 +++ src/threads.h
-@@ -21,6 +21,9 @@
- 
- #ifndef __THREADS_H__
+@@ -23,6 +23,7 @@
  #define __THREADS_H__
-+
+ 
+ #include <unistd.h>
 +#include <pthread.h>
-+
+ 
  /* FIXME: mailbox_lock is really an internal libbalsa mutex. */
  extern pthread_mutex_t mailbox_lock;
- 
diff --git a/mail/balsa/patches/patch-ac b/mail/balsa/patches/patch-ac
index 7469641c8eb..83f5f48fbbe 100644
--- a/mail/balsa/patches/patch-ac
+++ b/mail/balsa/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2007/09/20 20:50:51 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2010/09/07 19:12:03 adam Exp $
 
---- sounds/Makefile.in.orig	2004-11-20 20:58:54.000000000 +0000
+--- sounds/Makefile.in.orig	2010-08-21 20:53:37.000000000 +0000
 +++ sounds/Makefile.in
-@@ -227,7 +227,7 @@ target_alias = @target_alias@
+@@ -261,7 +261,7 @@ top_srcdir = @top_srcdir@
  balsa_SOUNDS = startup.wav newmail.wav
  balsasoundsdir = $(datadir)/sounds/balsa
  balsasounds_DATA = $(balsa_SOUNDS)
diff --git a/mail/balsa/patches/patch-ad b/mail/balsa/patches/patch-ad
deleted file mode 100644
index 02243188ec6..00000000000
--- a/mail/balsa/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$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-ae b/mail/balsa/patches/patch-ae
deleted file mode 100644
index 9c06eb23625..00000000000
--- a/mail/balsa/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/09/20 20:50:52 wiz Exp $
-
---- libbalsa/filter-file.c.orig	2004-10-30 09:35:58.000000000 +0000
-+++ libbalsa/filter-file.c
-@@ -30,7 +30,7 @@
- #include "config.h"
- 
- /* define _XOPEN_SOURCE to make strptime visible */
--#define _XOPEN_SOURCE
-+#define _XOPEN_SOURCE 600
- /* extensions  needed additonally on Solaris for strptime */
- #define __EXTENSIONS__
- #include <stdlib.h>
diff --git a/mail/balsa/patches/patch-af b/mail/balsa/patches/patch-af
deleted file mode 100644
index 2908c5718f4..00000000000
--- a/mail/balsa/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/09/20 20:50:52 wiz Exp $
-
---- src/filter-edit-callbacks.c.orig	2003-07-25 20:01:17.000000000 +0200
-+++ src/filter-edit-callbacks.c	2003-07-25 20:01:30.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- #include "config.h"
- 
--#define _XOPEN_SOURCE /* glibc2 needs this */
-+#define _XOPEN_SOURCE 600 /* glibc2 needs this */
- /* yellow dog has crappy libc and needs pthread.h to be included here */
- #ifdef BALSA_USE_THREADS
- #  include <pthread.h>
diff --git a/mail/balsa/patches/patch-ag b/mail/balsa/patches/patch-ag
index 1f7b783f857..7017ca2ccf3 100644
--- a/mail/balsa/patches/patch-ag
+++ b/mail/balsa/patches/patch-ag
@@ -1,18 +1,12 @@
-$NetBSD: patch-ag,v 1.3 2008/10/29 00:18:51 wiz Exp $
+$NetBSD: patch-ag,v 1.4 2010/09/07 19:12:03 adam Exp $
 
---- libbalsa/imap/imap-handle.c.orig	2008-09-07 18:20:03.000000000 +0000
+--- libbalsa/imap/imap-handle.c.orig	2010-08-13 19:15:36.000000000 +0000
 +++ libbalsa/imap/imap-handle.c
-@@ -20,9 +20,13 @@
- 
+@@ -21,6 +21,7 @@
  #define _POSIX_C_SOURCE 199506L
  #define _XOPEN_SOURCE 500
-+#define _NETBSD_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/balsa/patches/patch-ah b/mail/balsa/patches/patch-ah
deleted file mode 100644
index dd8ad9f7377..00000000000
--- a/mail/balsa/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2008/10/29 00:18:51 wiz Exp $
-
---- 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
- #define _XOPEN_SOURCE 500
-+#define _NETBSD_SOURCE 1
- 
- #include <string.h>
- #include <time.h>
diff --git a/mail/balsa/patches/patch-ai b/mail/balsa/patches/patch-ai
deleted file mode 100644
index e974e948ac6..00000000000
--- a/mail/balsa/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2007/09/20 20:50:53 wiz Exp $
-
---- libbalsa/mailbox_mh.c.orig	2005-05-22 23:11:29.000000000 +0200
-+++ libbalsa/mailbox_mh.c
-@@ -26,6 +26,7 @@
- #define _XOPEN_SOURCE_EXTENDED 1
- /* to compile this on BSD/Darwin */
- #undef _POSIX_SOURCE
-+#define _NETBSD_SOURCE 1
- 
- #include <unistd.h>
- #include <fcntl.h>
diff --git a/mail/balsa/patches/patch-aj b/mail/balsa/patches/patch-aj
deleted file mode 100644
index 215cea9ff38..00000000000
--- a/mail/balsa/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2007/09/20 20:50:54 wiz Exp $
-
---- libbalsa/misc.c.orig	2005-06-22 21:01:51.000000000 +0200
-+++ libbalsa/misc.c
-@@ -24,6 +24,7 @@
- 
- #define _SVID_SOURCE           1
- #define _XOPEN_SOURCE          500
-+#define _NETBSD_SOURCE 1
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
diff --git a/mail/balsa/patches/patch-ak b/mail/balsa/patches/patch-ak
index 1b969f1f1e9..ec21e5fb08f 100644
--- a/mail/balsa/patches/patch-ak
+++ b/mail/balsa/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2008/10/29 00:18:51 wiz Exp $
+$NetBSD: patch-ak,v 1.3 2010/09/07 19:12:03 adam Exp $
 
---- libbalsa/misc.h.orig	2008-08-21 17:23:44.000000000 +0000
+--- libbalsa/misc.h.orig	2010-03-04 17:16:23.000000000 +0000
 +++ libbalsa/misc.h
-@@ -32,6 +32,7 @@
+@@ -36,6 +36,7 @@
  #endif
  
  #if !USE_GREGEX
diff --git a/mail/balsa/patches/patch-ba b/mail/balsa/patches/patch-ba
index 1e1dcbf03da..3cdce1834e2 100644
--- a/mail/balsa/patches/patch-ba
+++ b/mail/balsa/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.3 2007/09/20 20:50:55 wiz Exp $
+$NetBSD: patch-ba,v 1.4 2010/09/07 19:12:03 adam Exp $
 
---- ./libbalsa/address-book-ldap.c.orig	2005-08-25 23:29:45.000000000 +0200
-+++ ./libbalsa/address-book-ldap.c
-@@ -732,7 +731,7 @@ libbalsa_address_book_ldap_modify_addres
+--- libbalsa/address-book-ldap.c.orig	2009-05-23 07:02:12.000000000 +0000
++++ libbalsa/address-book-ldap.c
+@@ -815,7 +815,7 @@ libbalsa_address_book_ldap_modify_addres
  	    }
              /* fall through */
          default: