balsa: Update to 2.5.7

2019-05-25
    balsa-2.5.7 - encryption, HTML email improvements; bug fixes.

2018-06-01
    balsa-2.5.6 - webkit2 external load fix; reply-to-group improvements.

2018-02-26
    balsa-2.5.5 - crypto and networking improvements; portability fixes.

2016-12-09
    balsa-2.5.3 - gtk3 branch is master now; more bugfixes and ports.

2015-05-30
    balsa-2.5.2 - a release of various bug fixes collected in gtk3 branch.

2013-04-27
    balsa-2.5.1 - next batch of improvents for your mailing pleasure!

2013-02-28
    balsa-2.5.0 - buildable against gtk3 - goes official!

13 files changed, 75 insertions, 299 deletions

diff --git a/mail/balsa/DESCR b/mail/balsa/DESCR
index 1145d85b9ee..52b68eafe7b 100644
--- a/mail/balsa/DESCR
+++ b/mail/balsa/DESCR
@@ -1,8 +1,2 @@
-  Balsa is an e-mail reader.  This client is part of the GNOME2 desktop
-environment. It supports local mailboxes, POP3 and IMAP.  It supports:
-
-	* Local mailboxes (mbox, maildir, mh)
-	* POP3
-	* IMAP
-	* MIME (in progress)
-	* many other things that I can't think of right now! :-)
+Balsa is an e-mail client for GNOME, highly configurable and incorporating
+all the features you would expect in a robust mail client.
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index d494269d13e..2170ef1974f 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,58 +1,35 @@
-# $NetBSD: Makefile,v 1.147 2019/08/11 13:21:24 wiz Exp $
+# $NetBSD: Makefile,v 1.148 2019/09/14 18:57:10 nia Exp $
 
-DISTNAME=	balsa-2.4.14
-PKGREVISION=	42
-CATEGORIES=	mail gnome
-MASTER_SITES=	http://pawsa.fedorapeople.org/balsa/
+DISTNAME=	balsa-2.5.7
+CATEGORIES=	mail
+MASTER_SITES=	https://pawsa.fedorapeople.org/balsa/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://pawsa.fedorapeople.org/balsa/
-COMMENT=	GNOME2 EMail client
+HOMEPAGE=	https://pawsa.fedorapeople.org/balsa/
+COMMENT=	Email client for GNOME
 LICENSE=	gnu-gpl-v3
 
-USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-more-warnings
-CONFIGURE_ARGS+=	--enable-pcre
-CONFIGURE_ARGS+=	--enable-smime
-CONFIGURE_ARGS+=	--enable-threads
-CONFIGURE_ARGS+=	--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
-CONFIGURE_ARGS+=	--with-gtksourceview
-CONFIGURE_ARGS+=	--with-gtkspell
-CONFIGURE_ARGS+=	--without-nm
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+=		ac_cv_lib_iconv_iconv_open=yes
-
-EGDIR=		${PREFIX}/share/examples/balsa
-CONF_FILES=	${EGDIR}/balsa.soundlist ${PKG_SYSCONFDIR}/sound/events/balsa.soundlist
+USE_TOOLS+=	gmake intltool perl pkg-config
+USE_TOOLS+=	msgfmt msgmerge xgettext
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 
 CFLAGS.SunOS+=	-D__EXTENSIONS__
 
-.include "options.mk"
+CONFIGURE_ARGS+=	--without-gnome
+CONFIGURE_ARGS+=	--with-html-widget=no
+CONFIGURE_ARGS+=	--with-gpgme
+CONFIGURE_ARGS+=	--with-libsecret
+CONFIGURE_ARGS+=	--with-gtksourceview
 
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mail/gmime24/buildlink3.mk"
-.include "../../mail/libesmtp/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
+.include "options.mk"
+.include "../../mail/gmime/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
-.include "../../www/gtkhtml314/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtksourceview2/buildlink3.mk"
-
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../security/libsecret/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/gtksourceview3/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa/PLIST b/mail/balsa/PLIST
index dd8b6908cfa..20f05d51cd7 100644
--- a/mail/balsa/PLIST
+++ b/mail/balsa/PLIST
@@ -1,13 +1,11 @@
-@comment $NetBSD: PLIST,v 1.11 2013/08/16 02:04:25 obache Exp $
+@comment $NetBSD: PLIST,v 1.12 2019/09/14 18:57:10 nia Exp $
 bin/balsa
 bin/balsa-ab
-lib/bonobo/servers/GNOME_Balsa.server
 man/man1/balsa.1
 share/applications/balsa-mailto-handler.desktop
-share/applications/balsa.desktop
-share/balsa/gtksourceview-2.0/balsa-mail-style.xml
-share/balsa/gtksourceview-2.0/balsa-mail.lang
-share/balsa/hicolor/16x16/apps/balsa-drop-down.png
+share/applications/org.desktop.Balsa.desktop
+share/balsa/gtksourceview-3.0/balsa-mail-style.xml
+share/balsa/gtksourceview-3.0/balsa-mail.lang
 share/balsa/hicolor/16x16/apps/balsa-encrypted.png
 share/balsa/hicolor/16x16/apps/balsa-mark-all.png
 share/balsa/hicolor/16x16/apps/balsa-mbox-draft.png
@@ -22,18 +20,19 @@ share/balsa/hicolor/16x16/apps/balsa-postpone.png
 share/balsa/hicolor/16x16/apps/balsa-previous-part.png
 share/balsa/hicolor/16x16/apps/balsa-previous.png
 share/balsa/hicolor/16x16/apps/balsa-reply-all.png
+share/balsa/hicolor/16x16/apps/balsa-send-queued.png
 share/balsa/hicolor/16x16/apps/balsa-signature-bad.png
 share/balsa/hicolor/16x16/apps/balsa-signature-good.png
 share/balsa/hicolor/16x16/apps/balsa-signature-notrust.png
 share/balsa/hicolor/16x16/apps/balsa-signature-unknown.png
 share/balsa/hicolor/16x16/apps/mail-inbox.png
 share/balsa/hicolor/16x16/apps/mail-outbox.png
+share/balsa/hicolor/16x16/apps/mail-queue.png
 share/balsa/hicolor/16x16/apps/stock_book_open.png
 share/balsa/hicolor/16x16/apps/stock_book_red.png
 share/balsa/hicolor/16x16/apps/stock_contact.png
 share/balsa/hicolor/16x16/apps/stock_mail-receive.png
 share/balsa/hicolor/16x16/apps/stock_mail.png
-share/balsa/hicolor/22x22
 share/balsa/hicolor/24x24/apps/balsa-crypt-check.png
 share/balsa/hicolor/24x24/apps/balsa-encrypt.png
 share/balsa/hicolor/24x24/apps/balsa-encrypted.png
@@ -48,12 +47,14 @@ share/balsa/hicolor/24x24/apps/balsa-preview.png
 share/balsa/hicolor/24x24/apps/balsa-previous-part.png
 share/balsa/hicolor/24x24/apps/balsa-previous.png
 share/balsa/hicolor/24x24/apps/balsa-reply-all.png
+share/balsa/hicolor/24x24/apps/balsa-send-queued.png
 share/balsa/hicolor/24x24/apps/balsa-sign.png
 share/balsa/hicolor/24x24/apps/balsa-signature-bad.png
 share/balsa/hicolor/24x24/apps/balsa-signature-good.png
 share/balsa/hicolor/24x24/apps/balsa-signature-notrust.png
 share/balsa/hicolor/24x24/apps/balsa-signature-unknown.png
 share/balsa/hicolor/24x24/apps/balsa-trash-empty.png
+share/balsa/hicolor/24x24/apps/mail-queue.png
 share/balsa/hicolor/24x24/apps/stock_book_blue.png
 share/balsa/hicolor/24x24/apps/stock_book_green.png
 share/balsa/hicolor/24x24/apps/stock_book_open.png
@@ -63,115 +64,23 @@ share/balsa/hicolor/24x24/apps/stock_contact.png
 share/balsa/hicolor/24x24/apps/stock_mail-receive.png
 share/balsa/hicolor/24x24/apps/stock_mail.png
 share/balsa/hicolor/24x24/apps/stock_view-fields.png
+share/balsa/hicolor/48x48/mimetypes/application-pgp-signature.png
+share/balsa/hicolor/48x48/mimetypes/application-pkcs7-mime.png
+share/balsa/hicolor/48x48/mimetypes/application-pkcs7-signature.png
+share/balsa/hicolor/48x48/mimetypes/application-x-pkcs7-signature.png
+share/balsa/hicolor/48x48/mimetypes/message-disposition-notification.png
+share/balsa/hicolor/48x48/mimetypes/message-external-body.png
+share/balsa/hicolor/48x48/mimetypes/message.png
+share/balsa/hicolor/48x48/mimetypes/multipart-alternative.png
+share/balsa/hicolor/48x48/mimetypes/multipart-encrypted.png
+share/balsa/hicolor/48x48/mimetypes/multipart-signed.png
+share/balsa/hicolor/48x48/mimetypes/multipart.png
+share/balsa/icon-theme.cache
 share/balsa/pixmaps/attachment.png
-share/balsa/pixmaps/balsa-logo.png
 share/balsa/pixmaps/balsa-top.png
-share/balsa/pixmaps/balsa-watermark.png
 share/balsa/pixmaps/balsa_icon.png
 share/balsa/pixmaps/balsa_logo.png
 share/examples/balsa/balsa.soundlist
-share/gnome/help/balsa/C/balsa.xml
-share/gnome/help/balsa/C/figures/address-book-ldap.png
-share/gnome/help/balsa/C/figures/address-book-modify.png
-share/gnome/help/balsa/C/figures/address-book-vcard.png
-share/gnome/help/balsa/C/figures/address-book.png
-share/gnome/help/balsa/C/figures/balsa_logo.png
-share/gnome/help/balsa/C/figures/druid-start.png
-share/gnome/help/balsa/C/figures/example-alias.png
-share/gnome/help/balsa/C/figures/figuresdobaaddress-book-modify.png
-share/gnome/help/balsa/C/figures/main-window-toolbar.png
-share/gnome/help/balsa/C/figures/main-window.png
-share/gnome/help/balsa/C/figures/message-window.png
-share/gnome/help/balsa/C/figures/msg-part-select.png
-share/gnome/help/balsa/C/figures/newmsg-window-attachments.png
-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/gnome/help/balsa/de/balsa.xml
-share/gnome/help/balsa/de/figures/address-book-ldap.png
-share/gnome/help/balsa/de/figures/address-book-modify.png
-share/gnome/help/balsa/de/figures/address-book-vcard.png
-share/gnome/help/balsa/de/figures/address-book.png
-share/gnome/help/balsa/de/figures/balsa_logo.png
-share/gnome/help/balsa/de/figures/druid-start.png
-share/gnome/help/balsa/de/figures/example-alias.png
-share/gnome/help/balsa/de/figures/figuresdobaaddress-book-modify.png
-share/gnome/help/balsa/de/figures/main-window-toolbar.png
-share/gnome/help/balsa/de/figures/main-window.png
-share/gnome/help/balsa/de/figures/message-window.png
-share/gnome/help/balsa/de/figures/msg-part-select.png
-share/gnome/help/balsa/de/figures/newmsg-window-attachments.png
-share/gnome/help/balsa/de/figures/newmsg-window-toolbar.png
-share/gnome/help/balsa/de/figures/newmsg-window.png
-share/gnome/help/balsa/de/figures/preferences-window.png
-share/gnome/help/balsa/de/figures/spell-check.png
-share/gnome/help/balsa/es/balsa.xml
-share/gnome/help/balsa/es/figures/address-book-ldap.png
-share/gnome/help/balsa/es/figures/address-book-modify.png
-share/gnome/help/balsa/es/figures/address-book-vcard.png
-share/gnome/help/balsa/es/figures/address-book.png
-share/gnome/help/balsa/es/figures/balsa_logo.png
-share/gnome/help/balsa/es/figures/druid-start.png
-share/gnome/help/balsa/es/figures/example-alias.png
-share/gnome/help/balsa/es/figures/figuresdobaaddress-book-modify.png
-share/gnome/help/balsa/es/figures/main-window-toolbar.png
-share/gnome/help/balsa/es/figures/main-window.png
-share/gnome/help/balsa/es/figures/message-window.png
-share/gnome/help/balsa/es/figures/msg-part-select.png
-share/gnome/help/balsa/es/figures/newmsg-window-attachments.png
-share/gnome/help/balsa/es/figures/newmsg-window-toolbar.png
-share/gnome/help/balsa/es/figures/newmsg-window.png
-share/gnome/help/balsa/es/figures/preferences-window.png
-share/gnome/help/balsa/es/figures/spell-check.png
-share/gnome/help/balsa/fr/balsa.xml
-share/gnome/help/balsa/fr/figures/address-book-ldap.png
-share/gnome/help/balsa/fr/figures/address-book-modify.png
-share/gnome/help/balsa/fr/figures/address-book-vcard.png
-share/gnome/help/balsa/fr/figures/address-book.png
-share/gnome/help/balsa/fr/figures/balsa_logo.png
-share/gnome/help/balsa/fr/figures/druid-start.png
-share/gnome/help/balsa/fr/figures/example-alias.png
-share/gnome/help/balsa/fr/figures/figuresdobaaddress-book-modify.png
-share/gnome/help/balsa/fr/figures/main-window-toolbar.png
-share/gnome/help/balsa/fr/figures/main-window.png
-share/gnome/help/balsa/fr/figures/message-window.png
-share/gnome/help/balsa/fr/figures/msg-part-select.png
-share/gnome/help/balsa/fr/figures/newmsg-window-attachments.png
-share/gnome/help/balsa/fr/figures/newmsg-window-toolbar.png
-share/gnome/help/balsa/fr/figures/newmsg-window.png
-share/gnome/help/balsa/fr/figures/preferences-window.png
-share/gnome/help/balsa/fr/figures/spell-check.png
-share/gnome/help/balsa/sl/balsa.xml
-share/gnome/help/balsa/sl/figures/address-book-ldap.png
-share/gnome/help/balsa/sl/figures/address-book-modify.png
-share/gnome/help/balsa/sl/figures/address-book-vcard.png
-share/gnome/help/balsa/sl/figures/address-book.png
-share/gnome/help/balsa/sl/figures/balsa_logo.png
-share/gnome/help/balsa/sl/figures/druid-start.png
-share/gnome/help/balsa/sl/figures/example-alias.png
-share/gnome/help/balsa/sl/figures/figuresdobaaddress-book-modify.png
-share/gnome/help/balsa/sl/figures/main-window-toolbar.png
-share/gnome/help/balsa/sl/figures/main-window.png
-share/gnome/help/balsa/sl/figures/message-window.png
-share/gnome/help/balsa/sl/figures/msg-part-select.png
-share/gnome/help/balsa/sl/figures/newmsg-window-attachments.png
-share/gnome/help/balsa/sl/figures/newmsg-window-toolbar.png
-share/gnome/help/balsa/sl/figures/newmsg-window.png
-share/gnome/help/balsa/sl/figures/preferences-window.png
-share/gnome/help/balsa/sl/figures/spell-check.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pgp-signature.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-mime.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-signature.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-pkcs7-signature.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-message-disposition-notification.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-message-external-body.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-message.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-alternative.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-encrypted.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-signed.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart.png
-share/idl/Balsa.idl
 share/locale/am/LC_MESSAGES/balsa.mo
 share/locale/ar/LC_MESSAGES/balsa.mo
 share/locale/az/LC_MESSAGES/balsa.mo
@@ -184,7 +93,6 @@ share/locale/dz/LC_MESSAGES/balsa.mo
 share/locale/el/LC_MESSAGES/balsa.mo
 share/locale/en_CA/LC_MESSAGES/balsa.mo
 share/locale/en_GB/LC_MESSAGES/balsa.mo
-share/locale/eo/LC_MESSAGES/balsa.mo
 share/locale/es/LC_MESSAGES/balsa.mo
 share/locale/et/LC_MESSAGES/balsa.mo
 share/locale/eu/LC_MESSAGES/balsa.mo
@@ -230,11 +138,7 @@ share/locale/wa/LC_MESSAGES/balsa.mo
 share/locale/zh_CN/LC_MESSAGES/balsa.mo
 share/locale/zh_HK/LC_MESSAGES/balsa.mo
 share/locale/zh_TW/LC_MESSAGES/balsa.mo
-share/omf/balsa/balsa-C.omf
-share/omf/balsa/balsa-de.omf
-share/omf/balsa/balsa-es.omf
-share/omf/balsa/balsa-fr.omf
-share/omf/balsa/balsa-sl.omf
+share/metainfo/balsa.appdata.xml
 share/pixmaps/gnome-balsa2.png
 share/sounds/balsa/newmail.wav
 share/sounds/balsa/startup.wav
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index e2071d885d3..1b6ec83175b 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.20 2017/05/15 13:04:03 jperkin Exp $
+$NetBSD: distinfo,v 1.21 2019/09/14 18:57:10 nia Exp $
 
-SHA1 (balsa-2.4.14.tar.bz2) = 7541b10cd268d06d7e4c483c3e4659db901d4581
-RMD160 (balsa-2.4.14.tar.bz2) = 809c0a455097d08a0c2214f000adb2e6497b5380
-SHA512 (balsa-2.4.14.tar.bz2) = e33b8a59b70861827f063a4336d2055169d719707e774d50443e6dc6884d99c23a36c42e1acfd99485bfe864e710dd0f635adc76697a911339cf8b6870a64c3d
-Size (balsa-2.4.14.tar.bz2) = 4092848 bytes
-SHA1 (patch-aa) = 2c5e6d7621ad4ce66f6bcd355c1fcf7af1a42539
-SHA1 (patch-ab) = abfb66c9cb552e291f48dc9fe38608df2de5c7d3
-SHA1 (patch-ac) = 061f956f7980ed0694e007be39e209f07f3ed2b7
-SHA1 (patch-ag) = ca5a38d07e8b9c4c229776072ae5b442c6b921b6
-SHA1 (patch-ak) = abe90f5117fdcd3381c2a7061cf3ab29e9a3f025
-SHA1 (patch-ba) = 2410b1e5e19c131a9417fbdcc82b62e67e8db5a8
-SHA1 (patch-libbalsa_misc.c) = ac237e4600607c8f0cc5491bef9192004da41885
+SHA1 (balsa-2.5.7.tar.bz2) = d0b1fb03643d566a4d59117d18558bac1d7e967e
+RMD160 (balsa-2.5.7.tar.bz2) = 8177440988de8ca00e45499d9558d8778e6a0901
+SHA512 (balsa-2.5.7.tar.bz2) = dbcda781cabdc9fa79f50d04999ac94a1016371ede7ffd087d18c8e389ccaf0d92a38bebb55eddcf46428eeff438e0e799597dab51a1a7d20dc91f842d4731e4
+Size (balsa-2.5.7.tar.bz2) = 4498216 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 6b692b21fdd..eee7601d292 100644
--- a/mail/balsa/options.mk
+++ b/mail/balsa/options.mk
@@ -1,9 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2013/08/16 09:20:40 obache Exp $
-#
+# $NetBSD: options.mk,v 1.4 2019/09/14 18:57:10 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.balsa
-PKG_SUPPORTED_OPTIONS=	canberra compface ldap sqlite ssl
-PKG_SUGGESTED_OPTIONS=	compface ldap sqlite ssl
+PKG_SUPPORTED_OPTIONS=	compface ldap sqlite
 
 .include "../../mk/bsd.options.mk"
 
@@ -21,8 +19,3 @@ CONFIGURE_ARGS+=	--with-ldap
 CONFIGURE_ARGS+=	--with-sqlite
 .  include "../../databases/sqlite3/buildlink3.mk"
 .endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
-.  include "../../security/openssl/buildlink3.mk"
-.endif
diff --git a/mail/balsa/patches/patch-aa b/mail/balsa/patches/patch-aa
deleted file mode 100644
index 05d01be1f78..00000000000
--- a/mail/balsa/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.16 2013/08/16 02:04:25 obache Exp $
-
---- configure.orig	2013-02-14 20:01:52.000000000 +0000
-+++ configure
-@@ -15413,7 +15413,7 @@ if ${ac_cv_lib_esmtp_smtp_start_session+
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lesmtp -lpthread $LIBS"
-+LIBS="-lesmtp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -15455,7 +15455,7 @@ if ${ac_cv_lib_esmtp_smtp_option_require
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lesmtp -lpthread $LIBS"
-+LIBS="-lesmtp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -15502,7 +15502,7 @@ if ${ac_cv_lib_esmtp_smtp_starttls_set_p
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lesmtp -lpthread $LIBS"
-+LIBS="-lesmtp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/mail/balsa/patches/patch-ab b/mail/balsa/patches/patch-ab
deleted file mode 100644
index 2c18587d295..00000000000
--- a/mail/balsa/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2013/08/16 02:04:25 obache Exp $
-
---- src/threads.h.orig	2011-09-20 18:42:48.000000000 +0000
-+++ src/threads.h
-@@ -23,6 +23,7 @@
- #define __THREADS_H__
- 
- #include <unistd.h>
-+#include <pthread.h>
- 
- /*  allocated in main.c */
- extern pthread_mutex_t checking_mail_lock;
diff --git a/mail/balsa/patches/patch-ag b/mail/balsa/patches/patch-ag
deleted file mode 100644
index a18d65b559f..00000000000
--- a/mail/balsa/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2017/05/15 13:04:03 jperkin Exp $
-
---- libbalsa/imap/imap-handle.c.orig	2012-10-29 22:33:31.000000000 +0000
-+++ libbalsa/imap/imap-handle.c
-@@ -16,11 +16,15 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
-  * 02111-1307, USA.
-  */
--#include "config.h"
- 
- #define _POSIX_C_SOURCE 199506L
--#define _XOPEN_SOURCE 500
-+#ifndef __sun
-+#define _XOPEN_SOURCE 520
-+#endif
- #define _BSD_SOURCE     1
-+#define _NETBSD_SOURCE
-+
-+#include "config.h"
- 
- #include <sys/types.h>
- #include <sys/socket.h>
diff --git a/mail/balsa/patches/patch-ak b/mail/balsa/patches/patch-ak
deleted file mode 100644
index ec21e5fb08f..00000000000
--- a/mail/balsa/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2010/09/07 19:12:03 adam Exp $
-
---- libbalsa/misc.h.orig	2010-03-04 17:16:23.000000000 +0000
-+++ libbalsa/misc.h
-@@ -36,6 +36,7 @@
- #endif
- 
- #if !USE_GREGEX
-+#  include <pcre.h>
- #  ifdef HAVE_PCRE
- #    include <pcreposix.h>
- #  else
diff --git a/mail/balsa/patches/patch-ba b/mail/balsa/patches/patch-ba
deleted file mode 100644
index 5cdc7573fe7..00000000000
--- a/mail/balsa/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.5 2013/08/16 02:04:25 obache Exp $
-
---- libbalsa/address-book-ldap.c.orig	2012-10-29 22:33:31.000000000 +0000
-+++ libbalsa/address-book-ldap.c
-@@ -814,7 +814,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);
diff --git a/mail/balsa/patches/patch-libbalsa_misc.c b/mail/balsa/patches/patch-libbalsa_misc.c
deleted file mode 100644
index 784c2ace081..00000000000
--- a/mail/balsa/patches/patch-libbalsa_misc.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-libbalsa_misc.c,v 1.1 2017/05/15 13:04:03 jperkin Exp $
-
-Need fcntl for flock.
-
---- libbalsa/misc.c.orig	2012-10-29 22:33:31.000000000 +0000
-+++ libbalsa/misc.c
-@@ -31,6 +31,7 @@
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
-+#include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/mail/balsa/patches/patch-ac b/mail/balsa/patches/patch-sounds_Makefile.in
index 116e2b41763..ebf6b338f9e 100644
--- a/mail/balsa/patches/patch-ac
+++ b/mail/balsa/patches/patch-sounds_Makefile.in
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.5 2013/08/16 02:04:25 obache Exp $
+$NetBSD: patch-sounds_Makefile.in,v 1.1 2019/09/14 18:57:10 nia Exp $
 
---- sounds/Makefile.in.orig	2013-02-14 20:01:55.000000000 +0000
+Install configuration file to examples.
+
+--- sounds/Makefile.in.orig	2019-09-14 18:40:39.609951201 +0000
 +++ sounds/Makefile.in
-@@ -303,7 +303,7 @@ top_srcdir = @top_srcdir@
+@@ -351,7 +351,7 @@ top_srcdir = @top_srcdir@
  balsa_SOUNDS = startup.wav newmail.wav
  balsasoundsdir = $(datadir)/sounds/balsa
  balsasounds_DATA = $(balsa_SOUNDS)
 -soundlistdir = $(sysconfdir)/sound/events
-+soundlistdir = ${prefix}/share/examples/balsa
++soundlistdir = $(datadir)/examples/balsa
  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/balsa/patches/patch-src_sendmsg-window.c b/mail/balsa/patches/patch-src_sendmsg-window.c
new file mode 100644
index 00000000000..128a90e9f76
--- /dev/null
+++ b/mail/balsa/patches/patch-src_sendmsg-window.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_sendmsg-window.c,v 1.1 2019/09/14 18:57:10 nia Exp $
+
+Support enchant2.
+
+--- src/sendmsg-window.c.orig	2019-05-25 15:01:14.000000000 +0000
++++ src/sendmsg-window.c
+@@ -68,7 +68,7 @@
+ #include "geometry-manager.h"
+ 
+ #if !HAVE_GSPELL && !HAVE_GTKSPELL_3_0_3
+-#include <enchant/enchant.h>
++#include <enchant.h>
+ #endif                          /* HAVE_GTKSPELL_3_0_3 */
+ #if HAVE_GTKSPELL
+ #include "gtkspell/gtkspell.h"