Index: mail/claws-mail/Makefile
===================================================================
--- mail/claws-mail/Makefile
+++ mail/claws-mail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	claws-mail
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news ipv6
 
 COMMENT=	Lightweight and featureful GTK+ based e-mail and news client
@@ -22,7 +22,7 @@
 RUN_DEPENDS=	mime-support>0:misc/mime-support
 
 USES=		autoreconf gettext-tools compiler:c++11-lang cpe desktop-file-utils gettext gnome pathfix \
-		python:3.6 shebangfix ssl
+		python:2.7+ shebangfix ssl
 USE_XORG=	ice sm
 USE_GNOME=	cairo gtk20 librsvg2
 SHEBANG_FILES=	tools/*.pl tools/*.py tools/tb2claws-mail
Index: mail/claws-mail/files/patch-configure.ac
===================================================================
--- mail/claws-mail/files/patch-configure.ac
+++ mail/claws-mail/files/patch-configure.ac
@@ -1,20 +1,57 @@
---- configure.ac.orig	2019-01-08 23:08:21 UTC
+--- configure.ac.orig	2018-12-13 12:55:20 UTC
 +++ configure.ac
 @@ -1268,7 +1268,7 @@ fi
  
  dnl 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)
++	AC_PATH_PROG(PYTHON_CONFIG, python"$PYTHON_VERSION"-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], [
- 		_save_libs="$LIBS"
- 		if test x"$platform_win32" = xno; then
- 			# libpython.so
--			PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so"
+@@ -1301,9 +1301,42 @@ AM_PATH_PYTHON([2.5], [
+ 				[AC_MSG_FAILURE([cross-compiling not supported])])
+ 		fi
+ 		if test x"$found_libpython_so" != x"yes"; then
+-			AC_MSG_RESULT(no)
+-			AC_MSG_WARN(Could not find Python shared libary: ${PYTHON_SHARED_LIB}. Maybe you need to install development packages for Python.)
+-			HAVE_PYTHON=no
 +			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(
++			AC_MSG_CHECKING([whether to dlopen $PYTHON_SHARED_LIB works])
++			AC_RUN_IFELSE(
++                                [AC_LANG_PROGRAM(
++                                        [#include <dlfcn.h>
++                                         #define PYTHON_SO_FILE "${PYTHON_SHARED_LIB}"
++                                        ],
++                                        [if (!dlopen(PYTHON_SO_FILE, RTLD_NOW | RTLD_GLOBAL)) return 1; return 0;])
++                                ],
++                                [found_libpythonm_so="yes"],
++                                [found_libpythonm_so="no"],
++                                [AC_MSG_FAILURE([cross-compiling not supported])])
++			if test x"$found_libpythonm_so" != x"yes"; then
++	                        PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}dm.so"
++	                        AC_MSG_CHECKING([whether to dlopen $PYTHON_SHARED_LIB works])
++        	                AC_RUN_IFELSE(
++                	                [AC_LANG_PROGRAM(
++                                                [#include <dlfcn.h>
++                                                 #define PYTHON_SO_FILE "${PYTHON_SHARED_LIB}"
++                                                ],
++                                                [if (!dlopen(PYTHON_SO_FILE, RTLD_NOW | RTLD_GLOBAL)) return 1; return 0;])
++                                        ],
++                                        [found_libpythondm_so="yes"],
++                                        [found_libpythondm_so="no"],
++                                        [AC_MSG_FAILURE([cross-compiling not supported])])
++				if x"$found_libpythondm_so" != x"yes"; then
++					AC_MSG_RESULT(no)
++					AC_MSG_WARN(Could not find Python shared libary: ${PYTHON_SHARED_LIB}. Maybe you need to install development packages for Python.)
++					HAVE_PYTHON=no
++				else
++					AC_MSG_RESULT(yes)
++				fi
++			else
++				AC_MSG_RESULT(yes)
++			fi
++		
+ 		else
+ 			AC_MSG_RESULT(yes)
+ 		fi