update to 2.3.10

Major changes with respect to 2.2.6 include:
require GTK+ >= 2.4.0
new address completion widget.
new themeable icon scheme.
new composer attachment handling widget.
migrate from GnomeFileEntry to GtkFileChooser.
IMAP IDLE support.

9 files changed, 116 insertions, 111 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 0f54062af1e..abb404e541f 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2006/02/05 23:09:53 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2006/02/08 18:25:24 drochner Exp $
 
-DISTNAME=	balsa-2.2.6
-PKGREVISION=	5
+DISTNAME=	balsa-2.3.10
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://balsa.gnome.org/				\
 		ftp://ftp.newton.cx/pub/balsa/
@@ -57,7 +56,7 @@ BUILDLINK_DEPENDS.gmime+=	gmime>=2.1.9
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/gtkhtml36/buildlink3.mk"
+.include "../../www/gtkhtml38/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/mail/balsa2/PLIST b/mail/balsa2/PLIST
index d7eb93c3e9e..4f325d90e5d 100644
--- a/mail/balsa2/PLIST
+++ b/mail/balsa2/PLIST
@@ -1,9 +1,48 @@
-@comment $NetBSD: PLIST,v 1.6 2004/11/25 09:33:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/02/08 18:25:24 drochner Exp $
 bin/balsa
 bin/balsa-ab
 lib/bonobo/servers/GNOME_Balsa.server
 man/man1/balsa.1
 share/applications/balsa.desktop
+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
+share/balsa/hicolor/16x16/apps/balsa-mbox-sent.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-tray-empty.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-tray-full.png
+share/balsa/hicolor/16x16/apps/balsa-next-flagged.png
+share/balsa/hicolor/16x16/apps/balsa-next-part.png
+share/balsa/hicolor/16x16/apps/balsa-next-unread.png
+share/balsa/hicolor/16x16/apps/balsa-next.png
+share/balsa/hicolor/16x16/apps/balsa-postpone.png
+share/balsa/hicolor/16x16/apps/balsa-previous-part.png
+share/balsa/hicolor/16x16/apps/balsa-previous.png
+share/balsa/hicolor/16x16/apps/balsa-reply-all.png
+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/22x22
+share/balsa/hicolor/24x24/apps/balsa-crypt-check.png
+share/balsa/hicolor/24x24/apps/balsa-encrypt.png
+share/balsa/hicolor/24x24/apps/balsa-encrypted.png
+share/balsa/hicolor/24x24/apps/balsa-mark-all.png
+share/balsa/hicolor/24x24/apps/balsa-marked-new.png
+share/balsa/hicolor/24x24/apps/balsa-next-flagged.png
+share/balsa/hicolor/24x24/apps/balsa-next-part.png
+share/balsa/hicolor/24x24/apps/balsa-next-unread.png
+share/balsa/hicolor/24x24/apps/balsa-next.png
+share/balsa/hicolor/24x24/apps/balsa-postpone.png
+share/balsa/hicolor/24x24/apps/balsa-preview.png
+share/balsa/hicolor/24x24/apps/balsa-previous-part.png
+share/balsa/hicolor/24x24/apps/balsa-previous.png
+share/balsa/hicolor/24x24/apps/balsa-reply-all.png
+share/balsa/hicolor/24x24/apps/balsa-sign.png
+share/balsa/hicolor/24x24/apps/balsa-signature-bad.png
+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/pixmaps/attachment.png
 share/balsa/pixmaps/balsa-logo.png
 share/balsa/pixmaps/balsa-top.png
@@ -24,11 +63,24 @@ 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
+share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-pkcs7-signature.png
+share/icons/hicolor/48x48/mimetypes/gnome-mime-message-disposition-notification.png
+share/icons/hicolor/48x48/mimetypes/gnome-mime-message-external-body.png
+share/icons/hicolor/48x48/mimetypes/gnome-mime-message.png
+share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-alternative.png
+share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-encrypted.png
+share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-signed.png
+share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart.png
 share/idl/Balsa.idl
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/balsa.mo
@@ -56,6 +108,8 @@ ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/ne/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
@@ -65,6 +119,7 @@ ${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/rw/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/balsa.mo
@@ -76,6 +131,7 @@ ${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_HK/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/balsa.mo
 share/omf/balsa/balsa-C.omf
 share/pixmaps/gnome-balsa2.png
@@ -87,12 +143,19 @@ share/sounds/balsa/startup.wav
 @dirrm share/omf/balsa
 @comment in scrollkeeper: @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
 @dirrm share/gnome/help/balsa/C/figures
 @dirrm share/gnome/help/balsa/C
 @dirrm share/gnome/help/balsa
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/examples/balsa
 @dirrm share/balsa/pixmaps
+@dirrm share/balsa/hicolor/24x24/apps
+@dirrm share/balsa/hicolor/24x24
+@dirrm share/balsa/hicolor/16x16/apps
+@dirrm share/balsa/hicolor/16x16
+@dirrm share/balsa/hicolor
 @dirrm share/balsa
 @comment in xdg-dirs: @dirrm share/applications
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index a18eeb4a3cd..94c5b07028b 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.13 2005/06/26 18:45:43 jmmv Exp $
+$NetBSD: distinfo,v 1.14 2006/02/08 18:25:24 drochner Exp $
 
-SHA1 (balsa-2.2.6.tar.bz2) = f3f9e567ccd936de2f321f31485ff04445de8318
-RMD160 (balsa-2.2.6.tar.bz2) = 88bf8e9a404729d600f0cbddf16ab972c96eb343
-Size (balsa-2.2.6.tar.bz2) = 2913847 bytes
-SHA1 (patch-aa) = 7d6ed19d7dbf0fb604e05840edb600a9ed7e564b
+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-ab) = 47083f65d404e64ee238bc3e4f3e25008f5f82c8
 SHA1 (patch-ac) = 808f4546204fbc4a23007291637e4b4ca4175db1
 SHA1 (patch-ae) = fcd0ab1c062018b42469b033a98b4575ee2851f3
 SHA1 (patch-af) = 53e77f5f5df0e05f503713f7be163589c2381f07
-SHA1 (patch-ag) = dcd7fb1435b3f576645566a0eaa13e4e8a0c2998
-SHA1 (patch-ah) = ef4a5d30f933d41e7fef807378007de993dd978c
-SHA1 (patch-ai) = dc3f9a6176639fa9a01720b934d4d7cc1c66fed3
-SHA1 (patch-aj) = 1651434e956af70e33ed9604248c5a69e25aa7a0
+SHA1 (patch-ag) = 47036c9108405f25e862ea6402220a70bd0a0cc9
+SHA1 (patch-ah) = 9a17ea3c3f302acf4380c7868ab8c769d9acfc39
+SHA1 (patch-ai) = 44e704eefd63873900609d7c7186469b4b5214d1
+SHA1 (patch-aj) = 4d068d3aa551c11edcc2c7fdc189ebab98a69953
+SHA1 (patch-ba) = 76b51ced11626e6f36e0763ca64519cc8605c936
diff --git a/mail/balsa2/patches/patch-aa b/mail/balsa2/patches/patch-aa
deleted file mode 100644
index 61ddb6dd5e3..00000000000
--- a/mail/balsa2/patches/patch-aa
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/06/26 18:45:44 jmmv Exp $
-
---- configure.orig	2004-11-20 21:58:50.000000000 +0100
-+++ configure
-@@ -20726,7 +20726,7 @@ echo "$as_me:$LINENO: result: $use_gtkht
- echo "${ECHO_T}$use_gtkhtml" >&6
- 
- if test x"$use_gtkhtml" = xyes ; then
--    if $PKG_CONFIG --exists libgtkhtml-3.1 ; then
-+    if $PKG_CONFIG --exists libgtkhtml-3.6 ; then
- 
-   succeeded=no
- 
-@@ -20782,14 +20782,14 @@ fi
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-         echo "$as_me:$LINENO: checking for
--	libgtkhtml-3.1
-+	libgtkhtml-3.6
- 	" >&5
- echo $ECHO_N "checking for
--	libgtkhtml-3.1
-+	libgtkhtml-3.6
- 	... $ECHO_C" >&6
- 
-         if $PKG_CONFIG --exists "
--	libgtkhtml-3.1
-+	libgtkhtml-3.6
- 	" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-@@ -20798,7 +20798,7 @@ echo "${ECHO_T}yes" >&6
-             echo "$as_me:$LINENO: checking HTML_CFLAGS" >&5
- echo $ECHO_N "checking HTML_CFLAGS... $ECHO_C" >&6
-             HTML_CFLAGS=`$PKG_CONFIG --cflags "
--	libgtkhtml-3.1
-+	libgtkhtml-3.6
- 	"`
-             echo "$as_me:$LINENO: result: $HTML_CFLAGS" >&5
- echo "${ECHO_T}$HTML_CFLAGS" >&6
-@@ -20806,7 +20806,7 @@ echo "${ECHO_T}$HTML_CFLAGS" >&6
-             echo "$as_me:$LINENO: checking HTML_LIBS" >&5
- echo $ECHO_N "checking HTML_LIBS... $ECHO_C" >&6
-             HTML_LIBS=`$PKG_CONFIG --libs "
--	libgtkhtml-3.1
-+	libgtkhtml-3.6
- 	"`
-             echo "$as_me:$LINENO: result: $HTML_LIBS" >&5
- echo "${ECHO_T}$HTML_LIBS" >&6
-@@ -20816,7 +20816,7 @@ echo "${ECHO_T}$HTML_LIBS" >&6
-             ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
-             HTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
--	libgtkhtml-3.1
-+	libgtkhtml-3.6
- 	"`
-             echo $HTML_PKG_ERRORS
-         fi
-@@ -20833,10 +20833,10 @@ echo "${ECHO_T}$HTML_LIBS" >&6
-      :
-   else
-      { { echo "$as_me:$LINENO: error: Library requirements (
--	libgtkhtml-3.1
-+	libgtkhtml-3.6
- 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
- echo "$as_me: error: Library requirements (
--	libgtkhtml-3.1
-+	libgtkhtml-3.6
- 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
diff --git a/mail/balsa2/patches/patch-ag b/mail/balsa2/patches/patch-ag
index b958aba7454..674adfedc74 100644
--- a/mail/balsa2/patches/patch-ag
+++ b/mail/balsa2/patches/patch-ag
@@ -1,12 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2004/07/23 15:09:57 recht Exp $
+$NetBSD: patch-ag,v 1.2 2006/02/08 18:25:24 drochner 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 @@
+--- libbalsa/imap/imap-handle.c.orig	2005-06-11 10:23:54.000000000 +0200
++++ libbalsa/imap/imap-handle.c
+@@ -20,9 +20,13 @@
  
- #define _POSIX_SOURCE 1
- #define _BSD_SOURCE   1
+ #define _POSIX_C_SOURCE 199506L
+ #define _XOPEN_SOURCE 500
 +#define _NETBSD_SOURCE 1
+ 
  #include <sys/types.h>
  #include <sys/socket.h>
 +#ifdef __NetBSD__
diff --git a/mail/balsa2/patches/patch-ah b/mail/balsa2/patches/patch-ah
index d95c135ade4..87b6e887311 100644
--- a/mail/balsa2/patches/patch-ah
+++ b/mail/balsa2/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.1 2004/07/23 15:09:57 recht Exp $
+$NetBSD: patch-ah,v 1.2 2006/02/08 18:25:24 drochner Exp $
 
---- libbalsa/imap/imap-search.c.orig	2004-03-14 09:14:48.000000000 +0100
+--- libbalsa/imap/imap-search.c.orig	2005-06-22 22:08:59.000000000 +0200
 +++ libbalsa/imap/imap-search.c
-@@ -18,6 +18,7 @@
-  */
+@@ -19,6 +19,7 @@
+ 
+ #define _POSIX_C_SOURCE 199506L
+ #define _XOPEN_SOURCE 500
++#define _NETBSD_SOURCE 1
  
- #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
index 5d95ff53038..43fdb34459b 100644
--- a/mail/balsa2/patches/patch-ai
+++ b/mail/balsa2/patches/patch-ai
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.2 2004/11/25 09:33:41 adam Exp $
+$NetBSD: patch-ai,v 1.3 2006/02/08 18:25:24 drochner Exp $
 
---- libbalsa/mailbox_mh.c.orig	2004-10-30 09:35:58.000000000 +0000
+--- libbalsa/mailbox_mh.c.orig	2005-05-22 23:11:29.000000000 +0200
 +++ libbalsa/mailbox_mh.c
-@@ -25,6 +25,7 @@
- #define _XOPEN_SOURCE          500
+@@ -26,6 +26,7 @@
  #define _XOPEN_SOURCE_EXTENDED 1
- #define _POSIX_SOURCE          1
-+#define _NETBSD_SOURCE         1
- #include <libgnome/libgnome.h>
+ /* to compile this on BSD/Darwin */
+ #undef _POSIX_SOURCE
++#define _NETBSD_SOURCE 1
  
  #include <unistd.h>
+ #include <fcntl.h>
diff --git a/mail/balsa2/patches/patch-aj b/mail/balsa2/patches/patch-aj
index 988fd714ce1..062bd6ef0d6 100644
--- a/mail/balsa2/patches/patch-aj
+++ b/mail/balsa2/patches/patch-aj
@@ -1,12 +1,12 @@
-$NetBSD: patch-aj,v 1.2 2004/11/25 09:33:41 adam Exp $
+$NetBSD: patch-aj,v 1.3 2006/02/08 18:25:24 drochner Exp $
 
---- libbalsa/misc.c.orig	2004-07-23 12:48:15.000000000 +0200
-+++ libbalsa/misc.c	2004-07-23 12:51:42.000000000 +0200
+--- 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 <stdio.h>
- #include <sys/utsname.h>
++#define _NETBSD_SOURCE 1
  #include <ctype.h>
+ #include <dirent.h>
+ #include <errno.h>
diff --git a/mail/balsa2/patches/patch-ba b/mail/balsa2/patches/patch-ba
new file mode 100644
index 00000000000..47d2fca0385
--- /dev/null
+++ b/mail/balsa2/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2006/02/08 18:25:24 drochner 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
+ 	    }
+             /* fall through */
+         default:
+-            fprintf(stderr, "ldap_modify for dn=\2%s\" failed[0x%x]: %s\n",
++            fprintf(stderr, "ldap_modify for dn=\"%s\" failed[0x%x]: %s\n",
+                     dn, rc, ldap_err2string(rc));
+         }
+     } while(cnt++<1);