Index: claws-mail/Makefile
===================================================================
--- claws-mail/Makefile	(revision 530933)
+++ claws-mail/Makefile	(working copy)
@@ -21,7 +21,7 @@
 		libnettle.so:security/nettle
 RUN_DEPENDS=	mime-support>0:misc/mime-support
 
-USES=		autoreconf gettext-tools compiler:c++11-lang cpe desktop-file-utils gettext gnome pathfix pkgconfig \
+USES=		autoreconf compiler:c++11-lang cpe desktop-file-utils gettext gettext-tools gnome pathfix pkgconfig \
 		python:3.6 shebangfix ssl xorg
 USE_XORG=	ice sm
 USE_GNOME=	cairo gtk20 librsvg2
@@ -60,20 +60,20 @@
 
 .include "Makefile.claws"
 
-post-patch:
-	@${REINPLACE_CMD} 's|-dirty||' ${WRKSRC}/version
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/tools && \
-		${INSTALL_SCRIPT} OOo2claws-mail.pl acroread2claws-mail.pl \
-		calypso_convert.pl convert_mbox.pl eud2gc.py filter_conv.pl \
-		filter_conv_new.pl fix_date.sh gif2xface.pl google_msgid.pl \
-		google_search.pl kmail-mailbox2claws-mail.pl kmail2claws-mail.pl \
-		kmail2claws-mail_v2.pl multiwebsearch.conf multiwebsearch.pl \
-		nautilus2claws-mail.sh outlook2claws-mail.pl tb2claws-mail \
-		tbird2claws.py textviewer.pl textviewer.sh \
-		thunderbird-filters-convertor.pl uudec uuooffice vcard2xml.py \
+		${INSTALL_SCRIPT} acroread2claws-mail.pl ca-certificates.crt \
+		calypso_convert.pl claws-mail-compose-insert-files.pl \
+		cm-reparent.pl convert_mbox.pl csv2addressbook.pl ddg_search.pl \
+		eud2gc.py filter_conv.pl filter_conv_new.pl fix_date.sh \
+		gif2xface.pl google_msgid.pl kmail-mailbox2claws-mail.pl \
+		kmail2claws-mail.pl kmail2claws-mail_v2.pl mairix.sh \
+		mew2claws-mail.pl multiwebsearch.conf multiwebsearch.pl \
+		nautilus2claws-mail.sh outlook2claws-mail.pl popfile-link.sh \
+		tb2claws-mail tbird2claws.py textviewer.pl textviewer.sh \
+		thunderbird-filters-convertor.pl update-po uudec uuooffice \
+		vcard2xml.py \
 		${STAGEDIR}${DATADIR})
 
 post-install-DOCS-on:
Index: claws-mail/Makefile.claws
===================================================================
--- claws-mail/Makefile.claws	(revision 530933)
+++ claws-mail/Makefile.claws	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTVERSION=	3.17.4
+PORTVERSION=	3.17.5
 CATEGORIES?=	mail
 MASTER_SITES=	http://www.claws-mail.org/download.php?file=releases/
 
@@ -21,10 +21,12 @@
 		bogofilter \
 		bsfilter \
 		clamd \
+		dillo \
 		fancy \
 		fetchinfo \
 		gdata \
 		libravatar \
+		litehtml_viewer \
 		mailmbox \
 		managesieve \
 		newmail \
Index: claws-mail/distinfo
===================================================================
--- claws-mail/distinfo	(revision 530933)
+++ claws-mail/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564729842
-SHA256 (claws-mail-3.17.4.tar.xz) = 590ed1131e51b3a627e75c3b256068f5176a498628e1c8f3315b9bc09482ae02
-SIZE (claws-mail-3.17.4.tar.xz) = 6280252
+TIMESTAMP = 1586379298
+SHA256 (claws-mail-3.17.5.tar.xz) = daced25bfc2ab5b3f9ac2762b091ca3aede50da23e694d338dff1f066bab59be
+SIZE (claws-mail-3.17.5.tar.xz) = 6290944
Index: claws-mail/files/patch-configure
===================================================================
--- claws-mail/files/patch-configure	(revision 530933)
+++ claws-mail/files/patch-configure	(nonexistent)
@@ -1,20 +0,0 @@
---- configure.orig	2016-11-12 20:55:45 UTC
-+++ configure
-@@ -21147,7 +21147,7 @@ $as_echo "#define HAVE_LIBSOUP_GNOME 1" 
- fi
- 
- 
--
-+OLDLIBS=$LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_read_new in -larchive" >&5
- $as_echo_n "checking for archive_read_new in -larchive... " >&6; }
- if ${ac_cv_lib_archive_archive_read_new+:} false; then :
-@@ -21192,7 +21192,7 @@ else
-   HAVE_ARCHIVE=no
- 
- fi
--
-+LIBS=$OLDLIBS
- 
- 
- pkg_failed=no
Index: claws-mail/files/patch-configure.ac
===================================================================
--- claws-mail/files/patch-configure.ac	(revision 530933)
+++ claws-mail/files/patch-configure.ac	(working copy)
@@ -1,39 +1,6 @@
---- configure.ac.orig	2019-03-07 05:44:37 UTC
-+++ configure.ac
-@@ -920,6 +920,32 @@ if test x"$enable_libetpan" = xyes; then
- 	    AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
- 	    AC_MSG_RESULT([$libetpan_result])
- 	  fi
-+	   LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
-+	   LIBETPAN_LIBS="`$libetpanconfig --libs`"
-+	   LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
-+	else
-+	  libetpanconfig="pkg-config libetpan"
-+	  CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`"
-+	  AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
-+	  if test "x$libetpan_result" = "xyes"; then
-+	    AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
-+	    LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`"
-+	    AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
-+	    AC_MSG_RESULT([$libetpan_result])
-+	  fi
-+	   LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
-+	   LIBETPAN_LIBS="`$libetpanconfig --libs`"
-+	   LIBETPAN_VERSION=`$libetpanconfig --modversion | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
-+	fi
-+	if test "x$libetpan_result" = "xyes"; then
-+	   if test "$LIBETPAN_VERSION" -lt "57"; then
-+		AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
-+		AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
-+                AC_MSG_ERROR([libetpan 0.57 not found])
-+	   fi
-+	   AC_SUBST(LIBETPAN_FLAGS)
-+	   AC_SUBST(LIBETPAN_LIBS)
-+	   AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
- 	fi
- 	if test "x$libetpan_result" = "xyes"; then
- 	   LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
-@@ -1301,7 +1327,7 @@ fi
+--- configure.ac.orig	2020-04-08 14:26:12.215936000 -0700
++++ configure.ac	2020-04-08 14:30:01.861284000 -0700
+@@ -1325,7 +1325,7 @@
  dnl Python *********************************************************************
  missing_python=""
  AM_PATH_PYTHON([2.5], [
@@ -42,7 +9,7 @@
  	if test x"$PYTHON_CONFIG" = x"" ; then
  		AC_PATH_PROG(PYTHON_CONFIG, python-config)
  	fi
-@@ -1320,7 +1346,7 @@ AM_PATH_PYTHON([2.5], [
+@@ -1344,7 +1344,7 @@
  		_save_libs="$LIBS"
  		if test x"$platform_win32" = xno; then
  			# libpython.so
Index: claws-mail/files/patch-src_plugins_python_accounttype.c
===================================================================
--- claws-mail/files/patch-src_plugins_python_accounttype.c	(revision 530933)
+++ claws-mail/files/patch-src_plugins_python_accounttype.c	(nonexistent)
@@ -1,22 +0,0 @@
---- src/plugins/python/accounttype.c.orig	2018-09-10 13:00:33 UTC
-+++ src/plugins/python/accounttype.c
-@@ -24,6 +24,10 @@
- 
- #include <structmember.h>
- 
-+#if PY_MAJOR_VERSION == 3
-+typedef int (*cmpfunc)(PyObject *, PyObject *);
-+#endif
-+
- typedef struct {
-     PyObject_HEAD
-     PrefsAccount *account;
-@@ -38,7 +42,7 @@ static int Account_init(clawsmail_Accoun
- 
- static void Account_dealloc(clawsmail_AccountObject* self)
- {
--  self->ob_type->tp_free((PyObject*)self);
-+  Py_TYPE(self)->tp_free((PyObject*)self);
- }
- 
- static int Account_compare(clawsmail_AccountObject *obj1, clawsmail_AccountObject *obj2)
Index: claws-mail/files/patch-src_plugins_python_composewindowtype.c
===================================================================
--- claws-mail/files/patch-src_plugins_python_composewindowtype.c	(revision 530933)
+++ claws-mail/files/patch-src_plugins_python_composewindowtype.c	(nonexistent)
@@ -1,20 +0,0 @@
---- src/plugins/python/composewindowtype.c.orig	2019-01-09 18:38:06 UTC
-+++ src/plugins/python/composewindowtype.c
-@@ -54,7 +54,7 @@ static void ComposeWindow_dealloc(clawsm
-   Py_XDECREF(self->text);
-   Py_XDECREF(self->replyinfo);
-   Py_XDECREF(self->fwdinfo);
--  self->ob_type->tp_free((PyObject*)self);
-+  Py_TYPE(self)->tp_free((PyObject*)self);
- }
- 
- static void flush_gtk_queue(void)
-@@ -345,7 +345,7 @@ static PyObject* ComposeWindow_set_heade
-     headerfield = PyTuple_GetItem(element, 0);
-     headercontent = PyTuple_GetItem(element, 1);
-     if(!headerfield || !headercontent
--        || !PyObject_TypeCheck(headerfield, &PyString_Type) || !PyObject_TypeCheck(headercontent, &PyString_Type)) {
-+        || !PyObject_TypeCheck(headerfield, &PyBytes_Type) || !PyObject_TypeCheck(headercontent, &PyBytes_Type)) {
-       PyErr_SetString(PyExc_LookupError, "Argument to set_header_list() must be a list of tuples with two strings");
-       return NULL;
-     }
Index: claws-mail/files/patch-src_plugins_python_folderpropertiestype.c
===================================================================
--- claws-mail/files/patch-src_plugins_python_folderpropertiestype.c	(revision 530933)
+++ claws-mail/files/patch-src_plugins_python_folderpropertiestype.c	(nonexistent)
@@ -1,11 +0,0 @@
---- src/plugins/python/folderpropertiestype.c.orig	2019-01-09 18:47:36 UTC
-+++ src/plugins/python/folderpropertiestype.c
-@@ -38,7 +38,7 @@ static int FolderProperties_init(clawsma
- 
- static void FolderProperties_dealloc(clawsmail_FolderPropertiesObject* self)
- {
--  self->ob_type->tp_free((PyObject*)self);
-+  Py_TYPE(self)->tp_free((PyObject*)self);
- }
- 
- static PyObject* get_default_account(clawsmail_FolderPropertiesObject *self, void *closure)
Index: claws-mail/files/patch-src_plugins_python_foldertype.c
===================================================================
--- claws-mail/files/patch-src_plugins_python_foldertype.c	(revision 530933)
+++ claws-mail/files/patch-src_plugins_python_foldertype.c	(nonexistent)
@@ -1,11 +0,0 @@
---- src/plugins/python/foldertype.c.orig	2019-01-09 18:47:36 UTC
-+++ src/plugins/python/foldertype.c
-@@ -40,7 +40,7 @@ typedef struct {
- static void Folder_dealloc(clawsmail_FolderObject* self)
- {
-   Py_XDECREF(self->properties);
--  self->ob_type->tp_free((PyObject*)self);
-+  Py_TYPE(self)->tp_free((PyObject*)self);
- }
- 
- static int Folder_init(clawsmail_FolderObject *self, PyObject *args, PyObject *kwds)
Index: claws-mail/files/patch-src_plugins_python_mailboxtype.c
===================================================================
--- claws-mail/files/patch-src_plugins_python_mailboxtype.c	(revision 530933)
+++ claws-mail/files/patch-src_plugins_python_mailboxtype.c	(nonexistent)
@@ -1,11 +0,0 @@
---- src/plugins/python/mailboxtype.c.orig	2019-01-09 18:47:36 UTC
-+++ src/plugins/python/mailboxtype.c
-@@ -41,7 +41,7 @@ static int Mailbox_init(clawsmail_Mailbo
- static void Mailbox_dealloc(clawsmail_MailboxObject* self)
- {
-   self->folder = NULL;
--  self->ob_type->tp_free((PyObject*)self);
-+  Py_TYPE(self)->tp_free((PyObject*)self);
- }
- 
- static PyObject* Mailbox_str(clawsmail_MailboxObject *self)
Index: claws-mail/files/patch-src_plugins_python_messageinfotype.c
===================================================================
--- claws-mail/files/patch-src_plugins_python_messageinfotype.c	(revision 530933)
+++ claws-mail/files/patch-src_plugins_python_messageinfotype.c	(nonexistent)
@@ -1,11 +0,0 @@
---- src/plugins/python/messageinfotype.c.orig	2019-01-09 18:47:36 UTC
-+++ src/plugins/python/messageinfotype.c
-@@ -43,7 +43,7 @@ typedef struct {
- 
- static void MessageInfo_dealloc(clawsmail_MessageInfoObject* self)
- {
--  self->ob_type->tp_free((PyObject*)self);
-+  Py_TYPE(self)->tp_free((PyObject*)self);
- }
- 
- static int MessageInfo_init(clawsmail_MessageInfoObject *self, PyObject *args, PyObject *kwds)
Index: claws-mail/pkg-plist
===================================================================
--- claws-mail/pkg-plist	(revision 530933)
+++ claws-mail/pkg-plist	(working copy)
@@ -229,7 +229,6 @@
 include/claws-mail/vcard.h
 include/claws-mail/viewtypes.h
 include/claws-mail/wizard.h
-lib/claws-mail/plugins/dillo.so
 lib/claws-mail/plugins/pgpinline.deps
 lib/claws-mail/plugins/pgpmime.deps
 lib/claws-mail/plugins/smime.deps
@@ -236,10 +235,14 @@
 libdata/pkgconfig/claws-mail.pc
 man/man1/claws-mail.1.gz
 share/applications/claws-mail.desktop
-%%DATADIR%%/OOo2claws-mail.pl
 %%DATADIR%%/acroread2claws-mail.pl
+%%DATADIR%%/ca-certificates.crt
 %%DATADIR%%/calypso_convert.pl
+%%DATADIR%%/claws-mail-compose-insert-files.pl
+%%DATADIR%%/cm-reparent.pl
 %%DATADIR%%/convert_mbox.pl
+%%DATADIR%%/csv2addressbook.pl
+%%DATADIR%%/ddg_search.pl
 %%DATADIR%%/eud2gc.py
 %%DATADIR%%/filter_conv.pl
 %%DATADIR%%/filter_conv_new.pl
@@ -246,19 +249,22 @@
 %%DATADIR%%/fix_date.sh
 %%DATADIR%%/gif2xface.pl
 %%DATADIR%%/google_msgid.pl
-%%DATADIR%%/google_search.pl
 %%DATADIR%%/kmail-mailbox2claws-mail.pl
 %%DATADIR%%/kmail2claws-mail.pl
 %%DATADIR%%/kmail2claws-mail_v2.pl
+%%DATADIR%%/mairix.sh
+%%DATADIR%%/mew2claws-mail.pl
 %%DATADIR%%/multiwebsearch.conf
 %%DATADIR%%/multiwebsearch.pl
 %%DATADIR%%/nautilus2claws-mail.sh
 %%DATADIR%%/outlook2claws-mail.pl
+%%DATADIR%%/popfile-link.sh
 %%DATADIR%%/tb2claws-mail
 %%DATADIR%%/tbird2claws.py
 %%DATADIR%%/textviewer.pl
 %%DATADIR%%/textviewer.sh
 %%DATADIR%%/thunderbird-filters-convertor.pl
+%%DATADIR%%/update-po
 %%DATADIR%%/uudec
 %%DATADIR%%/uuooffice
 %%DATADIR%%/vcard2xml.py