Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Apr 2020 11:25:48 +0000 (UTC)
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r532938 - in head/mail/claws-mail: . files
Message-ID:  <202004251125.03PBPmbo011901@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arrowd
Date: Sat Apr 25 11:25:47 2020
New Revision: 532938
URL: https://svnweb.freebsd.org/changeset/ports/532938

Log:
  mail/claws-mail: Update to 3.17.5.
  
  PR:		245464
  Submitted by:	Chris Hutchinson <portmaster@bsdforge.com>

Deleted:
  head/mail/claws-mail/files/patch-configure
  head/mail/claws-mail/files/patch-src_plugins_python_accounttype.c
  head/mail/claws-mail/files/patch-src_plugins_python_composewindowtype.c
  head/mail/claws-mail/files/patch-src_plugins_python_folderpropertiestype.c
  head/mail/claws-mail/files/patch-src_plugins_python_foldertype.c
  head/mail/claws-mail/files/patch-src_plugins_python_mailboxtype.c
  head/mail/claws-mail/files/patch-src_plugins_python_messageinfotype.c
Modified:
  head/mail/claws-mail/Makefile
  head/mail/claws-mail/Makefile.claws
  head/mail/claws-mail/distinfo
  head/mail/claws-mail/files/patch-configure.ac
  head/mail/claws-mail/pkg-plist

Modified: head/mail/claws-mail/Makefile
==============================================================================
--- head/mail/claws-mail/Makefile	Sat Apr 25 10:26:19 2020	(r532937)
+++ head/mail/claws-mail/Makefile	Sat Apr 25 11:25:47 2020	(r532938)
@@ -21,8 +21,8 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		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 \
-		python:3.6 shebangfix ssl xorg
+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
 SHEBANG_FILES=	tools/*.pl tools/*.py tools/tb2claws-mail
@@ -60,20 +60,20 @@ THEMES_RUN_DEPENDS=	claws-mail-themes>0:x11-themes/cla
 
 .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:

Modified: head/mail/claws-mail/Makefile.claws
==============================================================================
--- head/mail/claws-mail/Makefile.claws	Sat Apr 25 10:26:19 2020	(r532937)
+++ head/mail/claws-mail/Makefile.claws	Sat Apr 25 11:25:47 2020	(r532938)
@@ -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 @@ CLAWS_PLUGINS=	acpi_notifier \
 		bogofilter \
 		bsfilter \
 		clamd \
+		dillo \
 		fancy \
 		fetchinfo \
 		gdata \
 		libravatar \
+		litehtml_viewer \
 		mailmbox \
 		managesieve \
 		newmail \

Modified: head/mail/claws-mail/distinfo
==============================================================================
--- head/mail/claws-mail/distinfo	Sat Apr 25 10:26:19 2020	(r532937)
+++ head/mail/claws-mail/distinfo	Sat Apr 25 11:25:47 2020	(r532938)
@@ -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

Modified: head/mail/claws-mail/files/patch-configure.ac
==============================================================================
--- head/mail/claws-mail/files/patch-configure.ac	Sat Apr 25 10:26:19 2020	(r532937)
+++ head/mail/claws-mail/files/patch-configure.ac	Sat Apr 25 11:25:47 2020	(r532938)
@@ -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

Modified: head/mail/claws-mail/pkg-plist
==============================================================================
--- head/mail/claws-mail/pkg-plist	Sat Apr 25 10:26:19 2020	(r532937)
+++ head/mail/claws-mail/pkg-plist	Sat Apr 25 11:25:47 2020	(r532938)
@@ -229,36 +229,42 @@ include/claws-mail/uri_opener.h
 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
 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
 %%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004251125.03PBPmbo011901>