balsa: Update to 2.6.0

* Balsa-2.6.0 release. Release date 2020-04-11

This release switches to gmime3 library for MIME processing.

4 files changed, 315 insertions, 18 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index cf2f78fddba..7ac1ec35d36 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.154 2020/04/12 08:28:55 adam Exp $
+# $NetBSD: Makefile,v 1.155 2020/04/22 05:01:51 nia Exp $
 
-DISTNAME=	balsa-2.5.9
-PKGREVISION=	4
+DISTNAME=	balsa-2.6.0
 CATEGORIES=	mail
 MASTER_SITES=	https://pawsa.fedorapeople.org/balsa/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,20 +15,28 @@ USE_TOOLS+=	msgfmt msgmerge xgettext
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
+TOOL_DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+TOOL_DEPENDS+=	itstool-[0-9]*:../../textproc/itstool
+TOOL_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
+
 CFLAGS.SunOS+=	-D__EXTENSIONS__
 
 CONFIGURE_ARGS+=	--without-gnome
+CONFIGURE_ARGS+=	--with-canberra
 CONFIGURE_ARGS+=	--with-html-widget=no
-CONFIGURE_ARGS+=	--with-gpgme
 CONFIGURE_ARGS+=	--with-libsecret
 CONFIGURE_ARGS+=	--with-gtksourceview
+CONFIGURE_ARGS+=	--with-sqlite
 
 .include "options.mk"
-.include "../../mail/gmime/buildlink3.mk"
+.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../mail/gmime3/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../security/libsecret/buildlink3.mk"
 .include "../../textproc/enchant2/buildlink3.mk"
+.include "../../time/libical/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/gtksourceview3/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/mail/balsa/PLIST b/mail/balsa/PLIST
index 20f05d51cd7..86d1fc94dbb 100644
--- a/mail/balsa/PLIST
+++ b/mail/balsa/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2019/09/14 18:57:10 nia Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/04/22 05:01:51 nia Exp $
 bin/balsa
 bin/balsa-ab
 man/man1/balsa.1
@@ -81,6 +81,301 @@ share/balsa/pixmaps/balsa-top.png
 share/balsa/pixmaps/balsa_icon.png
 share/balsa/pixmaps/balsa_logo.png
 share/examples/balsa/balsa.soundlist
+share/help/C/balsa/ab-conf.page
+share/help/C/balsa/authors.page
+share/help/C/balsa/balsa.entities
+share/help/C/balsa/common-tasks.page
+share/help/C/balsa/figures/address-book-ldap.png
+share/help/C/balsa/figures/address-book-modify.png
+share/help/C/balsa/figures/address-book-vcard.png
+share/help/C/balsa/figures/address-book.png
+share/help/C/balsa/figures/balsa_logo.png
+share/help/C/balsa/figures/druid-start.png
+share/help/C/balsa/figures/example-alias.png
+share/help/C/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/C/balsa/figures/main-window-toolbar.png
+share/help/C/balsa/figures/main-window.png
+share/help/C/balsa/figures/message-window.png
+share/help/C/balsa/figures/msg-part-select.png
+share/help/C/balsa/figures/newmsg-window-attachments.png
+share/help/C/balsa/figures/newmsg-window-toolbar.png
+share/help/C/balsa/figures/newmsg-window.png
+share/help/C/balsa/figures/preferences-window.png
+share/help/C/balsa/figures/spell-check.png
+share/help/C/balsa/folder-config.page
+share/help/C/balsa/getting-started.page
+share/help/C/balsa/glossary.page
+share/help/C/balsa/identities.page
+share/help/C/balsa/index.page
+share/help/C/balsa/introduction.page
+share/help/C/balsa/its-not-working.page
+share/help/C/balsa/mbox-formats.page
+share/help/C/balsa/preferences-address-books.page
+share/help/C/balsa/preferences-display-options.page
+share/help/C/balsa/preferences-mail-options.page
+share/help/C/balsa/preferences-miscellaneous.page
+share/help/C/balsa/preferences-spelling.page
+share/help/C/balsa/preferences-startup.page
+share/help/C/balsa/preferences.page
+share/help/C/balsa/toolbar-prefs.page
+share/help/C/balsa/win-composer.page
+share/help/C/balsa/win-filters.page
+share/help/C/balsa/win-main.page
+share/help/C/balsa/win-message.page
+share/help/C/balsa/win-run-filters.page
+share/help/C/balsa/win-search.page
+share/help/cs/balsa/ab-conf.page
+share/help/cs/balsa/authors.page
+share/help/cs/balsa/common-tasks.page
+share/help/cs/balsa/figures/address-book-ldap.png
+share/help/cs/balsa/figures/address-book-modify.png
+share/help/cs/balsa/figures/address-book-vcard.png
+share/help/cs/balsa/figures/address-book.png
+share/help/cs/balsa/figures/balsa_logo.png
+share/help/cs/balsa/figures/druid-start.png
+share/help/cs/balsa/figures/example-alias.png
+share/help/cs/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/cs/balsa/figures/main-window-toolbar.png
+share/help/cs/balsa/figures/main-window.png
+share/help/cs/balsa/figures/message-window.png
+share/help/cs/balsa/figures/msg-part-select.png
+share/help/cs/balsa/figures/newmsg-window-attachments.png
+share/help/cs/balsa/figures/newmsg-window-toolbar.png
+share/help/cs/balsa/figures/newmsg-window.png
+share/help/cs/balsa/figures/preferences-window.png
+share/help/cs/balsa/figures/spell-check.png
+share/help/cs/balsa/folder-config.page
+share/help/cs/balsa/getting-started.page
+share/help/cs/balsa/glossary.page
+share/help/cs/balsa/identities.page
+share/help/cs/balsa/index.page
+share/help/cs/balsa/introduction.page
+share/help/cs/balsa/its-not-working.page
+share/help/cs/balsa/mbox-formats.page
+share/help/cs/balsa/preferences-address-books.page
+share/help/cs/balsa/preferences-display-options.page
+share/help/cs/balsa/preferences-mail-options.page
+share/help/cs/balsa/preferences-miscellaneous.page
+share/help/cs/balsa/preferences-spelling.page
+share/help/cs/balsa/preferences-startup.page
+share/help/cs/balsa/preferences.page
+share/help/cs/balsa/toolbar-prefs.page
+share/help/cs/balsa/win-composer.page
+share/help/cs/balsa/win-filters.page
+share/help/cs/balsa/win-main.page
+share/help/cs/balsa/win-message.page
+share/help/cs/balsa/win-run-filters.page
+share/help/cs/balsa/win-search.page
+share/help/de/balsa/ab-conf.page
+share/help/de/balsa/authors.page
+share/help/de/balsa/common-tasks.page
+share/help/de/balsa/figures/address-book-ldap.png
+share/help/de/balsa/figures/address-book-modify.png
+share/help/de/balsa/figures/address-book-vcard.png
+share/help/de/balsa/figures/address-book.png
+share/help/de/balsa/figures/balsa_logo.png
+share/help/de/balsa/figures/druid-start.png
+share/help/de/balsa/figures/example-alias.png
+share/help/de/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/de/balsa/figures/main-window-toolbar.png
+share/help/de/balsa/figures/main-window.png
+share/help/de/balsa/figures/message-window.png
+share/help/de/balsa/figures/msg-part-select.png
+share/help/de/balsa/figures/newmsg-window-attachments.png
+share/help/de/balsa/figures/newmsg-window-toolbar.png
+share/help/de/balsa/figures/newmsg-window.png
+share/help/de/balsa/figures/preferences-window.png
+share/help/de/balsa/figures/spell-check.png
+share/help/de/balsa/folder-config.page
+share/help/de/balsa/getting-started.page
+share/help/de/balsa/glossary.page
+share/help/de/balsa/identities.page
+share/help/de/balsa/index.page
+share/help/de/balsa/introduction.page
+share/help/de/balsa/its-not-working.page
+share/help/de/balsa/mbox-formats.page
+share/help/de/balsa/preferences-address-books.page
+share/help/de/balsa/preferences-display-options.page
+share/help/de/balsa/preferences-mail-options.page
+share/help/de/balsa/preferences-miscellaneous.page
+share/help/de/balsa/preferences-spelling.page
+share/help/de/balsa/preferences-startup.page
+share/help/de/balsa/preferences.page
+share/help/de/balsa/toolbar-prefs.page
+share/help/de/balsa/win-composer.page
+share/help/de/balsa/win-filters.page
+share/help/de/balsa/win-main.page
+share/help/de/balsa/win-message.page
+share/help/de/balsa/win-run-filters.page
+share/help/de/balsa/win-search.page
+share/help/el/balsa/ab-conf.page
+share/help/el/balsa/authors.page
+share/help/el/balsa/common-tasks.page
+share/help/el/balsa/figures/address-book-ldap.png
+share/help/el/balsa/figures/address-book-modify.png
+share/help/el/balsa/figures/address-book-vcard.png
+share/help/el/balsa/figures/address-book.png
+share/help/el/balsa/figures/balsa_logo.png
+share/help/el/balsa/figures/druid-start.png
+share/help/el/balsa/figures/example-alias.png
+share/help/el/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/el/balsa/figures/main-window-toolbar.png
+share/help/el/balsa/figures/main-window.png
+share/help/el/balsa/figures/message-window.png
+share/help/el/balsa/figures/msg-part-select.png
+share/help/el/balsa/figures/newmsg-window-attachments.png
+share/help/el/balsa/figures/newmsg-window-toolbar.png
+share/help/el/balsa/figures/newmsg-window.png
+share/help/el/balsa/figures/preferences-window.png
+share/help/el/balsa/figures/spell-check.png
+share/help/el/balsa/folder-config.page
+share/help/el/balsa/getting-started.page
+share/help/el/balsa/glossary.page
+share/help/el/balsa/identities.page
+share/help/el/balsa/index.page
+share/help/el/balsa/introduction.page
+share/help/el/balsa/its-not-working.page
+share/help/el/balsa/mbox-formats.page
+share/help/el/balsa/preferences-address-books.page
+share/help/el/balsa/preferences-display-options.page
+share/help/el/balsa/preferences-mail-options.page
+share/help/el/balsa/preferences-miscellaneous.page
+share/help/el/balsa/preferences-spelling.page
+share/help/el/balsa/preferences-startup.page
+share/help/el/balsa/preferences.page
+share/help/el/balsa/toolbar-prefs.page
+share/help/el/balsa/win-composer.page
+share/help/el/balsa/win-filters.page
+share/help/el/balsa/win-main.page
+share/help/el/balsa/win-message.page
+share/help/el/balsa/win-run-filters.page
+share/help/el/balsa/win-search.page
+share/help/es/balsa/ab-conf.page
+share/help/es/balsa/authors.page
+share/help/es/balsa/common-tasks.page
+share/help/es/balsa/figures/address-book-ldap.png
+share/help/es/balsa/figures/address-book-modify.png
+share/help/es/balsa/figures/address-book-vcard.png
+share/help/es/balsa/figures/address-book.png
+share/help/es/balsa/figures/balsa_logo.png
+share/help/es/balsa/figures/druid-start.png
+share/help/es/balsa/figures/example-alias.png
+share/help/es/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/es/balsa/figures/main-window-toolbar.png
+share/help/es/balsa/figures/main-window.png
+share/help/es/balsa/figures/message-window.png
+share/help/es/balsa/figures/msg-part-select.png
+share/help/es/balsa/figures/newmsg-window-attachments.png
+share/help/es/balsa/figures/newmsg-window-toolbar.png
+share/help/es/balsa/figures/newmsg-window.png
+share/help/es/balsa/figures/preferences-window.png
+share/help/es/balsa/figures/spell-check.png
+share/help/es/balsa/folder-config.page
+share/help/es/balsa/getting-started.page
+share/help/es/balsa/glossary.page
+share/help/es/balsa/identities.page
+share/help/es/balsa/index.page
+share/help/es/balsa/introduction.page
+share/help/es/balsa/its-not-working.page
+share/help/es/balsa/mbox-formats.page
+share/help/es/balsa/preferences-address-books.page
+share/help/es/balsa/preferences-display-options.page
+share/help/es/balsa/preferences-mail-options.page
+share/help/es/balsa/preferences-miscellaneous.page
+share/help/es/balsa/preferences-spelling.page
+share/help/es/balsa/preferences-startup.page
+share/help/es/balsa/preferences.page
+share/help/es/balsa/toolbar-prefs.page
+share/help/es/balsa/win-composer.page
+share/help/es/balsa/win-filters.page
+share/help/es/balsa/win-main.page
+share/help/es/balsa/win-message.page
+share/help/es/balsa/win-run-filters.page
+share/help/es/balsa/win-search.page
+share/help/fr/balsa/ab-conf.page
+share/help/fr/balsa/authors.page
+share/help/fr/balsa/common-tasks.page
+share/help/fr/balsa/figures/address-book-ldap.png
+share/help/fr/balsa/figures/address-book-modify.png
+share/help/fr/balsa/figures/address-book-vcard.png
+share/help/fr/balsa/figures/address-book.png
+share/help/fr/balsa/figures/balsa_logo.png
+share/help/fr/balsa/figures/druid-start.png
+share/help/fr/balsa/figures/example-alias.png
+share/help/fr/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/fr/balsa/figures/main-window-toolbar.png
+share/help/fr/balsa/figures/main-window.png
+share/help/fr/balsa/figures/message-window.png
+share/help/fr/balsa/figures/msg-part-select.png
+share/help/fr/balsa/figures/newmsg-window-attachments.png
+share/help/fr/balsa/figures/newmsg-window-toolbar.png
+share/help/fr/balsa/figures/newmsg-window.png
+share/help/fr/balsa/figures/preferences-window.png
+share/help/fr/balsa/figures/spell-check.png
+share/help/fr/balsa/folder-config.page
+share/help/fr/balsa/getting-started.page
+share/help/fr/balsa/glossary.page
+share/help/fr/balsa/identities.page
+share/help/fr/balsa/index.page
+share/help/fr/balsa/introduction.page
+share/help/fr/balsa/its-not-working.page
+share/help/fr/balsa/mbox-formats.page
+share/help/fr/balsa/preferences-address-books.page
+share/help/fr/balsa/preferences-display-options.page
+share/help/fr/balsa/preferences-mail-options.page
+share/help/fr/balsa/preferences-miscellaneous.page
+share/help/fr/balsa/preferences-spelling.page
+share/help/fr/balsa/preferences-startup.page
+share/help/fr/balsa/preferences.page
+share/help/fr/balsa/toolbar-prefs.page
+share/help/fr/balsa/win-composer.page
+share/help/fr/balsa/win-filters.page
+share/help/fr/balsa/win-main.page
+share/help/fr/balsa/win-message.page
+share/help/fr/balsa/win-run-filters.page
+share/help/fr/balsa/win-search.page
+share/help/sl/balsa/ab-conf.page
+share/help/sl/balsa/authors.page
+share/help/sl/balsa/common-tasks.page
+share/help/sl/balsa/figures/address-book-ldap.png
+share/help/sl/balsa/figures/address-book-modify.png
+share/help/sl/balsa/figures/address-book-vcard.png
+share/help/sl/balsa/figures/address-book.png
+share/help/sl/balsa/figures/balsa_logo.png
+share/help/sl/balsa/figures/druid-start.png
+share/help/sl/balsa/figures/example-alias.png
+share/help/sl/balsa/figures/figuresdobaaddress-book-modify.png
+share/help/sl/balsa/figures/main-window-toolbar.png
+share/help/sl/balsa/figures/main-window.png
+share/help/sl/balsa/figures/message-window.png
+share/help/sl/balsa/figures/msg-part-select.png
+share/help/sl/balsa/figures/newmsg-window-attachments.png
+share/help/sl/balsa/figures/newmsg-window-toolbar.png
+share/help/sl/balsa/figures/newmsg-window.png
+share/help/sl/balsa/figures/preferences-window.png
+share/help/sl/balsa/figures/spell-check.png
+share/help/sl/balsa/folder-config.page
+share/help/sl/balsa/getting-started.page
+share/help/sl/balsa/glossary.page
+share/help/sl/balsa/identities.page
+share/help/sl/balsa/index.page
+share/help/sl/balsa/introduction.page
+share/help/sl/balsa/its-not-working.page
+share/help/sl/balsa/mbox-formats.page
+share/help/sl/balsa/preferences-address-books.page
+share/help/sl/balsa/preferences-display-options.page
+share/help/sl/balsa/preferences-mail-options.page
+share/help/sl/balsa/preferences-miscellaneous.page
+share/help/sl/balsa/preferences-spelling.page
+share/help/sl/balsa/preferences-startup.page
+share/help/sl/balsa/preferences.page
+share/help/sl/balsa/toolbar-prefs.page
+share/help/sl/balsa/win-composer.page
+share/help/sl/balsa/win-filters.page
+share/help/sl/balsa/win-main.page
+share/help/sl/balsa/win-message.page
+share/help/sl/balsa/win-run-filters.page
+share/help/sl/balsa/win-search.page
 share/locale/am/LC_MESSAGES/balsa.mo
 share/locale/ar/LC_MESSAGES/balsa.mo
 share/locale/az/LC_MESSAGES/balsa.mo
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index 2ec5914f299..6a1e6692b6a 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2019/11/01 17:24:44 nia Exp $
+$NetBSD: distinfo,v 1.23 2020/04/22 05:01:51 nia Exp $
 
-SHA1 (balsa-2.5.9.tar.bz2) = af75aeb9ac6eb671ac2331bce2ae93d3947d40ab
-RMD160 (balsa-2.5.9.tar.bz2) = f6305e2ce733bc0fccbaeabc58c4569186b92285
-SHA512 (balsa-2.5.9.tar.bz2) = a5653053c181b0ed564221e6af2722b5734ac1b7377df06ff5164dd1f1adc415ccdcb14d59a1d62dcc1325f178fbadae1f844ca0e61a08a65449d5b691a391c7
-Size (balsa-2.5.9.tar.bz2) = 4508717 bytes
+SHA1 (balsa-2.6.0.tar.bz2) = 9cb5083f9e7156fccc76d0ea98457046cc9f756c
+RMD160 (balsa-2.6.0.tar.bz2) = 354b65111965aa35bf72a96f5cc58618a3541576
+SHA512 (balsa-2.6.0.tar.bz2) = 1f6eb71d4291c5c4adfede5f9c387350808a9e2dd457019d7b532fe08ed4a09fc6083b6cb95b5bfdd9a2bfc6b6acb31517a679cf8e0e0bacd1c3f19bfca070a8
+Size (balsa-2.6.0.tar.bz2) = 4518346 bytes
 SHA1 (patch-sounds_Makefile.in) = 5c131b93f1431bb0c6f62a44cd6dbad4e5c5edc2
 SHA1 (patch-src_sendmsg-window.c) = 1ac652d2366f952f115d1e4546a034b0dd4bcf0e
diff --git a/mail/balsa/options.mk b/mail/balsa/options.mk
index eee7601d292..95f1633b061 100644
--- a/mail/balsa/options.mk
+++ b/mail/balsa/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2019/09/14 18:57:10 nia Exp $
+# $NetBSD: options.mk,v 1.5 2020/04/22 05:01:51 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.balsa
-PKG_SUPPORTED_OPTIONS=	compface ldap sqlite
+PKG_SUPPORTED_OPTIONS=	compface ldap
 
 .include "../../mk/bsd.options.mk"
 
@@ -14,8 +14,3 @@ CONFIGURE_ARGS+=	--with-compface
 CONFIGURE_ARGS+=	--with-ldap
 .  include "../../databases/openldap-client/buildlink3.mk"
 .endif
-
-.if !empty(PKG_OPTIONS:Msqlite)
-CONFIGURE_ARGS+=	--with-sqlite
-.  include "../../databases/sqlite3/buildlink3.mk"
-.endif