Update balsa to 2.4.12.

* Balsa-2.4.12 release. Release date 2012-10-29

- fix long-line POP3 bug.
- fix bugs 684124,

* Balsa-2.4.11 release. Release date 2012-04-21

- GPGME fixes.
- building GPG with gmime-2.6.0

* Balsa-2.4.10 release. Release date 2011-06-13

- preserve identity order.
- trivial gtkhtml-3.15 support.
- improve interaction with unique.
- bugs fixed #636801, #636805, #647695.

* Balsa-2.4.9 release. Release date 2010-11-19

- compile against new GTK, libnotify libs.

7 files changed, 135 insertions, 45 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 2acc59f6917..3fd784377dd 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.102 2013/06/06 12:54:40 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2013/08/16 02:04:25 obache Exp $
 
-DISTNAME=	balsa-2.4.8
-PKGREVISION=	28
+DISTNAME=	balsa-2.4.14
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://pawsa.fedorapeople.org/balsa/
 EXTRACT_SUFX=	.tar.bz2
@@ -31,10 +30,6 @@ CONF_FILES=	${EGDIR}/balsa.soundlist ${PKG_SYSCONFDIR}/sound/events/balsa.soundl
 
 .include "options.mk"
 
-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"
@@ -45,11 +40,10 @@ BUILDLINK_TRANSFORM+=		rm:-DGTK_DISABLE_DEPRECATED
 .include "../../mail/gmime24/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/libnotify/buildlink3.mk"
+.include "../../sysutils/libnotify07/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../www/gtkhtml314/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/balsa/PLIST b/mail/balsa/PLIST
index 13ed10de086..dd8b6908cfa 100644
--- a/mail/balsa/PLIST
+++ b/mail/balsa/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.10 2010/09/07 19:12:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/08/16 02:04:25 obache Exp $
 bin/balsa
 bin/balsa-ab
 lib/bonobo/servers/GNOME_Balsa.server
 man/man1/balsa.1
+share/applications/balsa-mailto-handler.desktop
 share/applications/balsa.desktop
 share/balsa/gtksourceview-2.0/balsa-mail-style.xml
 share/balsa/gtksourceview-2.0/balsa-mail.lang
@@ -69,6 +70,96 @@ 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/figures/address-book-ldap.png
+share/gnome/help/balsa/C/figures/address-book-modify.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/gnome/help/balsa/de/balsa.xml
+share/gnome/help/balsa/de/figures/address-book-ldap.png
+share/gnome/help/balsa/de/figures/address-book-modify.png
+share/gnome/help/balsa/de/figures/address-book-vcard.png
+share/gnome/help/balsa/de/figures/address-book.png
+share/gnome/help/balsa/de/figures/balsa_logo.png
+share/gnome/help/balsa/de/figures/druid-start.png
+share/gnome/help/balsa/de/figures/example-alias.png
+share/gnome/help/balsa/de/figures/figuresdobaaddress-book-modify.png
+share/gnome/help/balsa/de/figures/main-window-toolbar.png
+share/gnome/help/balsa/de/figures/main-window.png
+share/gnome/help/balsa/de/figures/message-window.png
+share/gnome/help/balsa/de/figures/msg-part-select.png
+share/gnome/help/balsa/de/figures/newmsg-window-attachments.png
+share/gnome/help/balsa/de/figures/newmsg-window-toolbar.png
+share/gnome/help/balsa/de/figures/newmsg-window.png
+share/gnome/help/balsa/de/figures/preferences-window.png
+share/gnome/help/balsa/de/figures/spell-check.png
+share/gnome/help/balsa/es/balsa.xml
+share/gnome/help/balsa/es/figures/address-book-ldap.png
+share/gnome/help/balsa/es/figures/address-book-modify.png
+share/gnome/help/balsa/es/figures/address-book-vcard.png
+share/gnome/help/balsa/es/figures/address-book.png
+share/gnome/help/balsa/es/figures/balsa_logo.png
+share/gnome/help/balsa/es/figures/druid-start.png
+share/gnome/help/balsa/es/figures/example-alias.png
+share/gnome/help/balsa/es/figures/figuresdobaaddress-book-modify.png
+share/gnome/help/balsa/es/figures/main-window-toolbar.png
+share/gnome/help/balsa/es/figures/main-window.png
+share/gnome/help/balsa/es/figures/message-window.png
+share/gnome/help/balsa/es/figures/msg-part-select.png
+share/gnome/help/balsa/es/figures/newmsg-window-attachments.png
+share/gnome/help/balsa/es/figures/newmsg-window-toolbar.png
+share/gnome/help/balsa/es/figures/newmsg-window.png
+share/gnome/help/balsa/es/figures/preferences-window.png
+share/gnome/help/balsa/es/figures/spell-check.png
+share/gnome/help/balsa/fr/balsa.xml
+share/gnome/help/balsa/fr/figures/address-book-ldap.png
+share/gnome/help/balsa/fr/figures/address-book-modify.png
+share/gnome/help/balsa/fr/figures/address-book-vcard.png
+share/gnome/help/balsa/fr/figures/address-book.png
+share/gnome/help/balsa/fr/figures/balsa_logo.png
+share/gnome/help/balsa/fr/figures/druid-start.png
+share/gnome/help/balsa/fr/figures/example-alias.png
+share/gnome/help/balsa/fr/figures/figuresdobaaddress-book-modify.png
+share/gnome/help/balsa/fr/figures/main-window-toolbar.png
+share/gnome/help/balsa/fr/figures/main-window.png
+share/gnome/help/balsa/fr/figures/message-window.png
+share/gnome/help/balsa/fr/figures/msg-part-select.png
+share/gnome/help/balsa/fr/figures/newmsg-window-attachments.png
+share/gnome/help/balsa/fr/figures/newmsg-window-toolbar.png
+share/gnome/help/balsa/fr/figures/newmsg-window.png
+share/gnome/help/balsa/fr/figures/preferences-window.png
+share/gnome/help/balsa/fr/figures/spell-check.png
+share/gnome/help/balsa/sl/balsa.xml
+share/gnome/help/balsa/sl/figures/address-book-ldap.png
+share/gnome/help/balsa/sl/figures/address-book-modify.png
+share/gnome/help/balsa/sl/figures/address-book-vcard.png
+share/gnome/help/balsa/sl/figures/address-book.png
+share/gnome/help/balsa/sl/figures/balsa_logo.png
+share/gnome/help/balsa/sl/figures/druid-start.png
+share/gnome/help/balsa/sl/figures/example-alias.png
+share/gnome/help/balsa/sl/figures/figuresdobaaddress-book-modify.png
+share/gnome/help/balsa/sl/figures/main-window-toolbar.png
+share/gnome/help/balsa/sl/figures/main-window.png
+share/gnome/help/balsa/sl/figures/message-window.png
+share/gnome/help/balsa/sl/figures/msg-part-select.png
+share/gnome/help/balsa/sl/figures/newmsg-window-attachments.png
+share/gnome/help/balsa/sl/figures/newmsg-window-toolbar.png
+share/gnome/help/balsa/sl/figures/newmsg-window.png
+share/gnome/help/balsa/sl/figures/preferences-window.png
+share/gnome/help/balsa/sl/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
@@ -84,7 +175,6 @@ 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
@@ -94,6 +184,7 @@ 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
+share/locale/eo/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
@@ -130,7 +221,7 @@ share/locale/sk/LC_MESSAGES/balsa.mo
 share/locale/sl/LC_MESSAGES/balsa.mo
 share/locale/sq/LC_MESSAGES/balsa.mo
 share/locale/sr/LC_MESSAGES/balsa.mo
-share/locale/sr@Latn/LC_MESSAGES/balsa.mo
+share/locale/sr@latin/LC_MESSAGES/balsa.mo
 share/locale/sv/LC_MESSAGES/balsa.mo
 share/locale/tr/LC_MESSAGES/balsa.mo
 share/locale/uk/LC_MESSAGES/balsa.mo
@@ -139,6 +230,11 @@ 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/omf/balsa/balsa-de.omf
+share/omf/balsa/balsa-es.omf
+share/omf/balsa/balsa-fr.omf
+share/omf/balsa/balsa-sl.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 7d3ce910aa9..c055cd1ab52 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.17 2012/12/25 21:07:13 joerg Exp $
+$NetBSD: distinfo,v 1.18 2013/08/16 02:04:25 obache Exp $
 
-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 (balsa-2.4.14.tar.bz2) = 7541b10cd268d06d7e4c483c3e4659db901d4581
+RMD160 (balsa-2.4.14.tar.bz2) = 809c0a455097d08a0c2214f000adb2e6497b5380
+Size (balsa-2.4.14.tar.bz2) = 4092848 bytes
+SHA1 (patch-aa) = 2c5e6d7621ad4ce66f6bcd355c1fcf7af1a42539
+SHA1 (patch-ab) = abfb66c9cb552e291f48dc9fe38608df2de5c7d3
+SHA1 (patch-ac) = 061f956f7980ed0694e007be39e209f07f3ed2b7
 SHA1 (patch-ag) = f9cc4534c5dd496b5dd7565794e4273fdeed2b5d
 SHA1 (patch-ak) = abe90f5117fdcd3381c2a7061cf3ab29e9a3f025
-SHA1 (patch-ba) = 46ed4e317ef79ec58fc432c74c3e057b13ffee75
+SHA1 (patch-ba) = 2410b1e5e19c131a9417fbdcc82b62e67e8db5a8
diff --git a/mail/balsa/patches/patch-aa b/mail/balsa/patches/patch-aa
index 51a2002ccd0..05d01be1f78 100644
--- a/mail/balsa/patches/patch-aa
+++ b/mail/balsa/patches/patch-aa
@@ -1,31 +1,31 @@
-$NetBSD: patch-aa,v 1.15 2010/09/07 19:12:03 adam Exp $
+$NetBSD: patch-aa,v 1.16 2013/08/16 02:04:25 obache Exp $
 
---- configure.orig	2010-08-21 20:53:36.000000000 +0000
+--- configure.orig	2013-02-14 20:01:52.000000000 +0000
 +++ configure
-@@ -16317,7 +16317,7 @@ if test "${ac_cv_lib_esmtp_smtp_start_se
+@@ -15413,7 +15413,7 @@ if ${ac_cv_lib_esmtp_smtp_start_session+
    $as_echo_n "(cached) " >&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
-@@ -16390,7 +16390,7 @@ if test "${ac_cv_lib_esmtp_smtp_option_r
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -15455,7 +15455,7 @@ if ${ac_cv_lib_esmtp_smtp_option_require
    $as_echo_n "(cached) " >&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
-@@ -16473,7 +16473,7 @@ if test "${ac_cv_lib_esmtp_smtp_starttls
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -15502,7 +15502,7 @@ if ${ac_cv_lib_esmtp_smtp_starttls_set_p
    $as_echo_n "(cached) " >&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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
diff --git a/mail/balsa/patches/patch-ab b/mail/balsa/patches/patch-ab
index cfcd6451e03..2c18587d295 100644
--- a/mail/balsa/patches/patch-ab
+++ b/mail/balsa/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.10 2010/09/07 19:12:03 adam Exp $
+$NetBSD: patch-ab,v 1.11 2013/08/16 02:04:25 obache Exp $
 
---- src/threads.h.orig	2009-08-30 09:03:26.000000000 +0000
+--- src/threads.h.orig	2011-09-20 18:42:48.000000000 +0000
 +++ src/threads.h
 @@ -23,6 +23,7 @@
  #define __THREADS_H__
@@ -8,5 +8,5 @@ $NetBSD: patch-ab,v 1.10 2010/09/07 19:12:03 adam Exp $
  #include <unistd.h>
 +#include <pthread.h>
  
- /* FIXME: mailbox_lock is really an internal libbalsa mutex. */
- extern pthread_mutex_t mailbox_lock;
+ /*  allocated in main.c */
+ extern pthread_mutex_t checking_mail_lock;
diff --git a/mail/balsa/patches/patch-ac b/mail/balsa/patches/patch-ac
index 83f5f48fbbe..116e2b41763 100644
--- a/mail/balsa/patches/patch-ac
+++ b/mail/balsa/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2010/09/07 19:12:03 adam Exp $
+$NetBSD: patch-ac,v 1.5 2013/08/16 02:04:25 obache Exp $
 
---- sounds/Makefile.in.orig	2010-08-21 20:53:37.000000000 +0000
+--- sounds/Makefile.in.orig	2013-02-14 20:01:55.000000000 +0000
 +++ sounds/Makefile.in
-@@ -261,7 +261,7 @@ top_srcdir = @top_srcdir@
+@@ -303,7 +303,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-ba b/mail/balsa/patches/patch-ba
index 3cdce1834e2..5cdc7573fe7 100644
--- a/mail/balsa/patches/patch-ba
+++ b/mail/balsa/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.4 2010/09/07 19:12:03 adam Exp $
+$NetBSD: patch-ba,v 1.5 2013/08/16 02:04:25 obache Exp $
 
---- libbalsa/address-book-ldap.c.orig	2009-05-23 07:02:12.000000000 +0000
+--- libbalsa/address-book-ldap.c.orig	2012-10-29 22:33:31.000000000 +0000
 +++ libbalsa/address-book-ldap.c
-@@ -815,7 +815,7 @@ libbalsa_address_book_ldap_modify_addres
+@@ -814,7 +814,7 @@ libbalsa_address_book_ldap_modify_addres
  	    }
              /* fall through */
          default: