Index: head/mail/claws-mail/Makefile
===================================================================
--- head/mail/claws-mail/Makefile	(revision 516588)
+++ head/mail/claws-mail/Makefile	(revision 516589)
@@ -1,83 +1,83 @@
 # Created by: Simon 'corecode' Schubert <corecode@corecode.ath.cx>
 # $FreeBSD$
 
 PORTNAME=	claws-mail
 PORTREVISION=	0
 CATEGORIES=	mail news
 
 COMMENT=	Lightweight and featureful GTK+ based e-mail and news client
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libetpan.so:mail/libetpan \
 		libfreetype.so:print/freetype2 \
 		libsasl2.so:security/cyrus-sasl2 \
 		libgnutls.so:security/gnutls \
 		libgcrypt.so:security/libgcrypt \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		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 \
+USES=		autoreconf gettext-tools compiler:c++11-lang cpe desktop-file-utils gettext gnome pathfix pkgconfig \
 		python:3.6 shebangfix ssl
 USE_XORG=	ice sm
 USE_GNOME=	cairo gtk20 librsvg2
 SHEBANG_FILES=	tools/*.pl tools/*.py tools/tb2claws-mail
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	COMPFACE DEBUG DOCS ENCHANT IPV6 LDAP \
 		NLS STARTUP THEMES
 OPTIONS_DEFAULT=COMPFACE ENCHANT STARTUP THEMES
 OPTIONS_SUB=	yes
 
 COMPFACE_DESC=		X-Face support
 COMPFACE_CONFIGURE_ENABLE=	compface
 COMPFACE_LIB_DEPENDS=	libcompface.so:mail/faces
 
 DEBUG_CONFIGURE_ON=	--enable-maintainer-mode
 
 ENCHANT_DESC=		Spell checking support
 ENCHANT_CONFIGURE_ENABLE=	enchant
 ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LDAP_CONFIGURE_ENABLE=	ldap
 LDAP_USE=		openldap=yes
 
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=		gettext-tools
 
 STARTUP_DESC=		Startup notification support
 STARTUP_CONFIGURE_ENABLE=	startup-notification
 STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 
 THEMES_DESC=		Additional themes
 THEMES_RUN_DEPENDS=	claws-mail-themes>0:x11-themes/claws-mail-themes
 
 .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 \
 		${STAGEDIR}${DATADIR})
 
 post-install-DOCS-on:
 	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS README TODO ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/tools/README ${STAGEDIR}${DOCSDIR}/README.tools
 
 .include <bsd.port.mk>
Index: head/mail/claws-mail/files/patch-configure.ac
===================================================================
--- head/mail/claws-mail/files/patch-configure.ac	(revision 516588)
+++ head/mail/claws-mail/files/patch-configure.ac	(revision 516589)
@@ -1,20 +1,53 @@
---- configure.ac.orig	2019-01-08 23:08:21 UTC
+--- configure.ac.orig	2019-03-07 05:44:37 UTC
 +++ configure.ac
-@@ -1268,7 +1268,7 @@ fi
- 
+@@ -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
  dnl Python *********************************************************************
+ missing_python=""
  AM_PATH_PYTHON([2.5], [
 -	AC_PATH_PROG(PYTHON_CONFIG, python$PYTHON_VERSION-config)
 +	AC_PATH_PROG(PYTHON_CONFIG, python"$PYTHON_VERSION"m-config)
  	if test x"$PYTHON_CONFIG" = x"" ; then
  		AC_PATH_PROG(PYTHON_CONFIG, python-config)
  	fi
-@@ -1286,7 +1286,7 @@ AM_PATH_PYTHON([2.5], [
+@@ -1320,7 +1346,7 @@ AM_PATH_PYTHON([2.5], [
  		_save_libs="$LIBS"
  		if test x"$platform_win32" = xno; then
  			# libpython.so
 -			PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so"
 +			PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}m.so"
  			AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl"])
  			AC_MSG_CHECKING([whether to dlopen $PYTHON_SHARED_LIB works])
  			AC_RUN_IFELSE(