Update to 3.9.2 bugfix release

5 files changed, 14 insertions, 62 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index be2dfb47e96c..d8470b007075 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	claws-mail
-PORTREVISION=	1
 CATEGORIES=	mail news ipv6
 
 COMMENT=	Lightweight and very featureful GTK+ based e-mail and news client
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index 9414f3b37f88..a4afab537bb9 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTVERSION=	3.9.1
+PORTVERSION=	3.9.2
 CATEGORIES?=	mail
 MASTER_SITES=	SF/sylpheed-claws/Claws%20Mail/${PORTVERSION}
 
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 17c816b45ae9..70d548870dc4 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (claws-mail-3.9.1.tar.bz2) = 376e535aac746dccbd8871c6f3ff6ced3010b5f7c048f4e3d18e66dfb5622910
-SIZE (claws-mail-3.9.1.tar.bz2) = 9367489
+SHA256 (claws-mail-3.9.2.tar.bz2) = e396cb67e8ecdae926dfcd59da4b3f26a633aabc0f4f00b1f24cb207f3ff2330
+SIZE (claws-mail-3.9.2.tar.bz2) = 9413758
diff --git a/mail/claws-mail/files/patch-configure b/mail/claws-mail/files/patch-configure
index c044e2123597..14b6e09d4d54 100644
--- a/mail/claws-mail/files/patch-configure
+++ b/mail/claws-mail/files/patch-configure
@@ -1,48 +1,11 @@
---- configure.orig	2013-05-10 16:42:16.000000000 +0200
-+++ configure	2013-05-10 16:44:12.000000000 +0200
-@@ -20468,45 +20468,6 @@
- if test $pkg_failed = yes; then
-    	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4" 2>&1`
--        else
--	        LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$LIBSOUP_PKG_ERRORS" >&5
--
--	as_fn_error $? "Package requirements (libsoup-2.4) were not met:
--
--$LIBSOUP_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables LIBSOUP_CFLAGS
--and LIBSOUP_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details." "$LINENO" 5
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables LIBSOUP_CFLAGS
--and LIBSOUP_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details" "$LINENO" 5; }
- else
- 	LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS
- 	LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS
+--- configure.orig	2013-06-12 17:09:02.000000000 +0200
++++ configure	2013-06-12 17:10:54.000000000 +0200
+@@ -21627,7 +21627,7 @@
+ 		# libpython.so
+ 		PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so"
+ 		_save_libs="$LIBS"
+-		LIBS="-ldl"
++		LIBS="$lt_cv_dlopen_libs"
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to dlopen $PYTHON_SHARED_LIB works" >&5
+ $as_echo_n "checking whether to dlopen $PYTHON_SHARED_LIB works... " >&6; }
+ 		if test "$cross_compiling" = yes; then :
diff --git a/mail/claws-mail/files/patch-src-news.c b/mail/claws-mail/files/patch-src-news.c
deleted file mode 100644
index 277c33cc3189..000000000000
--- a/mail/claws-mail/files/patch-src-news.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/news.c.orig	2013-06-02 14:53:22.000000000 +0200
-+++ src/news.c	2013-06-02 14:51:55.000000000 +0200
-@@ -56,6 +56,7 @@
- #include "remotefolder.h"
- #include "alertpanel.h"
- #include "inc.h"
-+#include "account.h"
- #ifdef USE_GNUTLS
- #  include "ssl.h"
- #endif