update to 2.0.17

changes:
- build on GNOME-2.6
- fix some GPGME interaction problems.
- yet another set of minor fixes.

5 files changed, 32 insertions, 19 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 2df45696b19..7b1b2f7c725 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2004/03/26 02:27:43 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2004/03/31 12:37:00 recht Exp $
 
-DISTNAME=		balsa-2.0.16
-PKGREVISION=		5
+DISTNAME=		balsa-2.0.17
 CATEGORIES=		mail gnome
 MASTER_SITES=		http://balsa.gnome.org/				\
 			ftp://ftp.newton.cx/pub/balsa/
@@ -12,7 +11,7 @@ HOMEPAGE=		http://balsa.gnome.org/
 COMMENT=		GNOME2 EMail client
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
+DEPENDS+=		gnome-dirs>=1.5:../../misc/gnome-dirs
 
 USE_PERL5=		build
 USE_PKGINSTALL=		yes
diff --git a/mail/balsa2/PLIST b/mail/balsa2/PLIST
index 38fc75d0184..6da795bbcc4 100644
--- a/mail/balsa2/PLIST
+++ b/mail/balsa2/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/26 03:31:31 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/31 12:37:00 recht Exp $
 bin/balsa
 bin/balsa-ab
+lib/bonobo/servers/GNOME_Balsa.server
 man/man1/balsa.1
 share/applications/balsa.desktop
 share/balsa/pixmaps/attachment.png
@@ -29,6 +30,7 @@ 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/idl/Balsa.idl
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/balsa.mo
@@ -37,6 +39,7 @@ ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/balsa.mo
@@ -45,6 +48,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/balsa.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/balsa.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/balsa.mo
@@ -73,16 +77,26 @@ ${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_TW/LC_MESSAGES/balsa.mo
-share/idl/Balsa.idl
 share/omf/balsa/balsa-C.omf
 share/pixmaps/gnome-balsa2.png
 share/sounds/balsa/newmail.wav
 share/sounds/balsa/startup.wav
 @dirrm share/sounds/balsa
+@comment in xdg-dirs: @dirrm share/sounds
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/balsa
+@comment in scrollkeeper: @dirrm share/omf
+@comment in ORBit2: @dirrm share/idl
 @dirrm share/gnome/help/balsa/C/figures
 @dirrm share/gnome/help/balsa/C
 @dirrm share/gnome/help/balsa
+@comment in gnome-dirs: @dirrm share/gnome/help
 @dirrm share/examples/balsa
 @dirrm share/balsa/pixmaps
 @dirrm share/balsa
+@comment in xdg-dirs: @dirrm share/applications
+@comment in scrollkeeper: @dirrm libdata/scrollkeeper/db/index
+@comment in scrollkeeper: @dirrm libdata/scrollkeeper/db/TOC
+@comment in scrollkeeper: @dirrm libdata/scrollkeeper/db
+@comment in libbonobo: @dirrm lib/bonobo/servers
+@comment in xdg-dirs: @dirrm etc/sound/events
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index 79bc0c698c3..7e3a96ef232 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2004/01/26 03:31:31 rh Exp $
+$NetBSD: distinfo,v 1.6 2004/03/31 12:37:00 recht Exp $
 
-SHA1 (balsa-2.0.16.tar.bz2) = 3c51778dfcb62a221441807c5ad38db379f6ae44
-Size (balsa-2.0.16.tar.bz2) = 2850071 bytes
-SHA1 (patch-aa) = 115368550ab0be9be35cafdab5e354139b8c5634
+SHA1 (balsa-2.0.17.tar.bz2) = a32e49b4822076fb7a129f66b89055e1d2266e9b
+Size (balsa-2.0.17.tar.bz2) = 2970206 bytes
+SHA1 (patch-aa) = d8f2a984098d636d4705b29d164edbfb16857a96
 SHA1 (patch-ab) = 47083f65d404e64ee238bc3e4f3e25008f5f82c8
-SHA1 (patch-ac) = 8a6eb00c8969040bec4aac63075563fcc586754d
+SHA1 (patch-ac) = 546e3804a8a760b0d7a54c3e7a02cab85930a91e
 SHA1 (patch-ae) = dc0bb9dbc5c1392c0dcc3a515d44d40fe26d93e3
 SHA1 (patch-af) = 53e77f5f5df0e05f503713f7be163589c2381f07
diff --git a/mail/balsa2/patches/patch-aa b/mail/balsa2/patches/patch-aa
index 29a3e6c17af..d937f81453a 100644
--- a/mail/balsa2/patches/patch-aa
+++ b/mail/balsa2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/27 00:42:58 rh Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/31 12:37:00 recht Exp $
 
---- libmutt/configure.orig	2003-03-22 19:26:17.000000000 +1000
-+++ libmutt/configure
-@@ -9873,7 +9873,7 @@ if test "${with_ssl+set}" = set; then
+--- libmutt/configure.orig	2004-03-29 00:00:08.000000000 +0200
++++ libmutt/configure	2004-03-31 14:07:35.000000000 +0200
+@@ -10512,7 +10512,7 @@
  echo "$as_me: error: SSL support is only for IMAP, but IMAP is not enabled" >&2;}
     { (exit 1); exit 1; }; }
  	  fi
diff --git a/mail/balsa2/patches/patch-ac b/mail/balsa2/patches/patch-ac
index 7bfd6faac5e..a2d2abfd370 100644
--- a/mail/balsa2/patches/patch-ac
+++ b/mail/balsa2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/04/27 00:42:58 rh Exp $
+$NetBSD: patch-ac,v 1.2 2004/03/31 12:37:00 recht Exp $
 
---- sounds/Makefile.in.orig	2003-03-22 19:45:30.000000000 +1000
-+++ sounds/Makefile.in
-@@ -126,7 +126,7 @@ EXTRA_DIST = $(balsa_SOUNDS) $(balsa_SOU
+--- sounds/Makefile.in.orig	2004-03-29 00:10:46.000000000 +0200
++++ sounds/Makefile.in	2004-03-31 14:08:17.000000000 +0200
+@@ -133,7 +133,7 @@
  balsasoundsdir = $(datadir)/sounds/balsa
  balsasounds_DATA = $(balsa_SOUNDS)