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.

6 files changed, 40 insertions, 97 deletions

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);