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.

7 files changed, 33 insertions, 31 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 0188debebd2..dc077aea0e1 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.33 2004/11/14 17:02:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.34 2004/11/25 09:33:41 adam Exp $
 
-DISTNAME=		balsa-2.2.5
-CATEGORIES=		mail gnome
-MASTER_SITES=		http://balsa.gnome.org/				\
-			ftp://ftp.newton.cx/pub/balsa/
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	balsa-2.2.6
+CATEGORIES=	mail gnome
+MASTER_SITES=	http://balsa.gnome.org/				\
+		ftp://ftp.newton.cx/pub/balsa/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://balsa.gnome.org/
-COMMENT=		GNOME2 EMail client
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://balsa.gnome.org/
+COMMENT=	GNOME2 EMail client
 
 BUILD_USES_MSGFMT=	yes
 
diff --git a/mail/balsa2/PLIST b/mail/balsa2/PLIST
index bf0efc3ca4a..d7eb93c3e9e 100644
--- a/mail/balsa2/PLIST
+++ b/mail/balsa2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/07/23 15:09:57 recht Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/11/25 09:33:41 adam Exp $
 bin/balsa
 bin/balsa-ab
 lib/bonobo/servers/GNOME_Balsa.server
@@ -11,7 +11,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/examples/balsa/email.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
@@ -60,6 +59,7 @@ ${PKGLOCALEDIR}/locale/ms/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
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/balsa.mo
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index 4b2ab7a0dfc..7db1ac6f68a 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.10 2004/11/14 17:02:03 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2004/11/25 09:33:41 adam Exp $
 
-SHA1 (balsa-2.2.5.tar.bz2) = e5b7ee9f126c129065ffbc4d86d154f90836bab4
-Size (balsa-2.2.5.tar.bz2) = 2838410 bytes
+SHA1 (balsa-2.2.6.tar.bz2) = f3f9e567ccd936de2f321f31485ff04445de8318
+Size (balsa-2.2.6.tar.bz2) = 2913847 bytes
 SHA1 (patch-ab) = 47083f65d404e64ee238bc3e4f3e25008f5f82c8
-SHA1 (patch-ac) = d879e4afd6959cf5afe9fd941f51fb5ed367aa4f
-SHA1 (patch-ae) = 63ef5da19874848b221a594c6adbfadd21e7fd5f
+SHA1 (patch-ac) = 808f4546204fbc4a23007291637e4b4ca4175db1
+SHA1 (patch-ae) = fcd0ab1c062018b42469b033a98b4575ee2851f3
 SHA1 (patch-af) = 53e77f5f5df0e05f503713f7be163589c2381f07
 SHA1 (patch-ag) = dcd7fb1435b3f576645566a0eaa13e4e8a0c2998
 SHA1 (patch-ah) = ef4a5d30f933d41e7fef807378007de993dd978c
-SHA1 (patch-ai) = 1bb6629035c6bafa02fae9f27dd0e73ccced7f99
-SHA1 (patch-aj) = 25a2398654e1ec326bd5dbf4dcfe0200ccb7c696
+SHA1 (patch-ai) = dc3f9a6176639fa9a01720b934d4d7cc1c66fed3
+SHA1 (patch-aj) = 1651434e956af70e33ed9604248c5a69e25aa7a0
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 @@