Changes 2.2.6:

- fixed MBOX driver over NFS problem.
- use ISO-2022-JP for composing Japanese messages.
- yet more exceptions caught.
- S/MIME support.
- improved identity selection and address book completions.
- IMAP optimizations.

4 files changed, 15 insertions, 13 deletions

diff --git a/mail/balsa2/patches/patch-ac b/mail/balsa2/patches/patch-ac
index 0b44dfe764d..8c24f326a2f 100644
--- a/mail/balsa2/patches/patch-ac
+++ b/mail/balsa2/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2004/08/22 17:52:50 recht Exp $
+$NetBSD: patch-ac,v 1.5 2004/11/25 09:33:41 adam Exp $
 
---- sounds/Makefile.in.orig	2004-08-15 20:16:56.000000000 +0200
-+++ sounds/Makefile.in	2004-08-22 16:05:47.000000000 +0200
-@@ -213,7 +213,7 @@
+--- sounds/Makefile.in.orig	2004-11-20 20:58:54.000000000 +0000
++++ sounds/Makefile.in
+@@ -227,7 +227,7 @@ target_alias = @target_alias@
  balsa_SOUNDS = startup.wav newmail.wav
  balsasoundsdir = $(datadir)/sounds/balsa
  balsasounds_DATA = $(balsa_SOUNDS)
 -soundlistdir = $(sysconfdir)/sound/events
 +soundlistdir = ${prefix}/share/examples/balsa
- soundlist_in_files = balsa.soundlist.in email.soundlist.in
+ soundlist_in_files = balsa.soundlist.in
  soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
  EXTRA_DIST = $(balsa_SOUNDS) $(soundlist_in_files)
diff --git a/mail/balsa2/patches/patch-ae b/mail/balsa2/patches/patch-ae
index 3bef2487894..29991048c08 100644
--- a/mail/balsa2/patches/patch-ae
+++ b/mail/balsa2/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2004/07/23 15:09:57 recht Exp $
+$NetBSD: patch-ae,v 1.3 2004/11/25 09:33:41 adam Exp $
 
---- libbalsa/filter-file.c.orig	2004-05-22 20:53:17.000000000 +0200
-+++ libbalsa/filter-file.c	2004-07-23 12:01:56.000000000 +0200
+--- libbalsa/filter-file.c.orig	2004-10-30 09:35:58.000000000 +0000
++++ libbalsa/filter-file.c
 @@ -30,7 +30,7 @@
  #include "config.h"
  
@@ -10,4 +10,4 @@ $NetBSD: patch-ae,v 1.2 2004/07/23 15:09:57 recht Exp $
 +#define _XOPEN_SOURCE 600
  /* extensions  needed additonally on Solaris for strptime */
  #define __EXTENSIONS__
- #include <stdio.h>
+ #include <stdlib.h>
diff --git a/mail/balsa2/patches/patch-ai b/mail/balsa2/patches/patch-ai
index 6480be2b718..5d95ff53038 100644
--- a/mail/balsa2/patches/patch-ai
+++ b/mail/balsa2/patches/patch-ai
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.1 2004/07/23 15:09:57 recht Exp $
+$NetBSD: patch-ai,v 1.2 2004/11/25 09:33:41 adam Exp $
 
---- libbalsa/mailbox_mh.c.orig	2004-03-31 00:27:18.000000000 +0200
+--- libbalsa/mailbox_mh.c.orig	2004-10-30 09:35:58.000000000 +0000
 +++ libbalsa/mailbox_mh.c
 @@ -25,6 +25,7 @@
  #define _XOPEN_SOURCE          500
  #define _XOPEN_SOURCE_EXTENDED 1
  #define _POSIX_SOURCE          1
-+#define	_NETBSD_SOURCE         1
- #include <libgnome/gnome-i18n.h>
++#define _NETBSD_SOURCE         1
+ #include <libgnome/libgnome.h>
  
  #include <unistd.h>
diff --git a/mail/balsa2/patches/patch-aj b/mail/balsa2/patches/patch-aj
index 6a5ecc2d53f..988fd714ce1 100644
--- a/mail/balsa2/patches/patch-aj
+++ b/mail/balsa2/patches/patch-aj
@@ -1,3 +1,5 @@
+$NetBSD: patch-aj,v 1.2 2004/11/25 09:33:41 adam Exp $
+
 --- libbalsa/misc.c.orig	2004-07-23 12:48:15.000000000 +0200
 +++ libbalsa/misc.c	2004-07-23 12:51:42.000000000 +0200
 @@ -24,6 +24,7 @@