mail/libetpan:

- Update to version 1.5, development moved to github
- Convert to USES=libtool, don't install la file
- Install striped version of library
- Allow to compile with OpenSSL from base
- Update homepage address
- Bump affected deskutils/cairo-dock-plugins

mail/claws-mail:
- Update to version 3.10.0
- Convert to USES=libtool tar:bzip2 [1]
- Don't install static plugin files [1]
- Replace GMAKE with MAKE_CMD [1]

Release notes: http://claws-mail.org/news.php

mail/claws-mail-clamd:
- Don't show pkg-message in post-install, staging takes care of that

Submitted by:	tijl via private mail [1]

9 files changed, 50 insertions, 41 deletions

diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index 54e886a11f07..e8da65f81b3d 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -10,12 +10,5 @@ RUN_DEPENDS=	clamd:${PORTSDIR}/security/clamav
 
 CLAWS_PLUGINS_BUILD=	clamd
 
-post-install:
-	@${ECHO}
-	@${ECHO_CMD} "********************************************************************************"
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} "********************************************************************************"
-	@${ECHO}
-
 .include "../claws-mail/Makefile.claws"
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 43ef94718f91..336bfcd8b9d5 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pdf_viewer
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	PDF and PostScript viewer plugin for Claws Mail
 
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index f187c7d62356..579726bd705f 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -1,18 +1,17 @@
 # $FreeBSD$
 
-PORTVERSION=	3.9.3
+PORTVERSION=	3.10.0
 CATEGORIES?=	mail
-MASTER_SITES=	SF/sylpheed-claws/Claws%20Mail/${PORTVERSION}
+MASTER_SITES=	SF/claws-mail/Claws%20Mail/${PORTVERSION}
 
 MAINTAINER=	pawel@FreeBSD.org
 
 LICENSE=	GPLv3
 
-USE_BZIP2=	yes
-USES+=		gmake iconv pkgconfig
+USES+=		gmake iconv libtool pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} --disable-dbus
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static
 
 CLAWS_PLUGINS=	acpi_notifier \
 		address_keeper \
@@ -61,19 +60,17 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 
 .  for p in ${CLAWS_PLUGINS_BUILD}
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S|--disable-${p}-plugin||}
-PLIST_FILES+=	lib/claws-mail/plugins/${p}.a  \
-		lib/claws-mail/plugins/${p}.la \
-		lib/claws-mail/plugins/${p}.so
+PLIST_FILES+=	lib/claws-mail/plugins/${p}.so
 .  endfor
 
 do-build:
 .  for p in ${CLAWS_PLUGINS_BUILD}
-	cd ${WRKSRC}/src/plugins/${p} && ${GMAKE}
+	cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD}
 .  endfor
 
 do-install:
 .  for p in ${CLAWS_PLUGINS_BUILD}
-	cd ${WRKSRC}/src/plugins/${p} && ${GMAKE} install DESTDIR="${STAGEDIR}"
+	cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD} install DESTDIR="${STAGEDIR}"
 .  endfor
 
 .endif
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 3d47ce8904fd..cfc39e12599a 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (claws-mail-3.9.3.tar.bz2) = 53aacceab45af6c3ee1f0668956a6e3328d21ac4efcfc0aa8dfd7d7552a62372
-SIZE (claws-mail-3.9.3.tar.bz2) = 9463943
+SHA256 (claws-mail-3.10.0.tar.xz) = 04c0d4781daf5be6113016d7ec0e7caf2e8f73afb7227c8e3aa96696e27fc968
+SIZE (claws-mail-3.10.0.tar.xz) = 6668012
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index c43818d22bcd..8aba137215e4 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -24,6 +24,7 @@ include/claws-mail/addrselect.h
 include/claws-mail/advsearch.h
 include/claws-mail/alertpanel.h
 include/claws-mail/autofaces.h
+include/claws-mail/avatars.h
 include/claws-mail/browseldap.h
 include/claws-mail/claws-features.h
 include/claws-mail/codeconv.h
@@ -69,6 +70,7 @@ include/claws-mail/edittags.h
 include/claws-mail/editvcard.h
 include/claws-mail/enriched.h
 include/claws-mail/etpan/etpan-errors.h
+include/claws-mail/etpan/etpan-ssl.h
 include/claws-mail/etpan/etpan-thread-manager-types.h
 include/claws-mail/etpan/etpan-thread-manager.h
 include/claws-mail/etpan/imap-thread.h
@@ -171,6 +173,7 @@ include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-x11-listener.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/gtkhotkey.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/tomboykeybinder.h
 include/claws-mail/plugins/claws-mail/ical.h
+include/claws-mail/plugins/pgpcore/autocompletion.h
 include/claws-mail/plugins/pgpcore/passphrase.h
 include/claws-mail/plugins/pgpcore/pgp_utils.h
 include/claws-mail/plugins/pgpcore/pgp_viewer.h
@@ -239,11 +242,13 @@ 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/libravatar.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/appdata/claws-mail.appdata.xml
 share/applications/claws-mail.desktop
 %%DATADIR%%/OOo2claws-mail.pl
 %%DATADIR%%/acroread2claws-mail.pl
@@ -305,6 +310,7 @@ share/icons/hicolor/64x64/apps/claws-mail.png
 %%NLS%%share/locale/cs/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/de/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/claws-mail.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/es/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/claws-mail.mo
@@ -334,6 +340,7 @@ share/icons/hicolor/64x64/apps/claws-mail.png
 %%MANUAL%%@dirrm %%DOCSDIR%%/manual
 @dirrmtry %%DOCSDIR%%
 @dirrmtry %%DATADIR%%
+@dirrmtry share/appdata
 @dirrmtry lib/claws-mail/plugins
 @dirrmtry lib/claws-mail
 @dirrm include/claws-mail/plugins/vcalendar
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index da9bea209632..5f865624049b 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	libetpan
-PORTVERSION=	1.1
-PORTREVISION=	5
+PORTVERSION=	1.5
 CATEGORIES=	mail ipv6
-MASTER_SITES=	SF
 
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Mail framework for C language
@@ -16,9 +14,14 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 
-USE_AUTOTOOLS=	libtool autoconf
-AUTOTOOLSFILES=	aclocal.m4
-USES=		gmake iconv
+USE_GITHUB=	yes
+GH_ACCOUNT=	dinhviethoa
+GH_COMMIT=	34bab37
+
+USE_AUTOTOOLS=	aclocal autoconf autoheader automake libtoolize
+AUTOMAKE_ARGS=	--add-missing --foreign --force --copy
+USES=		gmake iconv libtool
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -35,15 +38,7 @@ GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
-OPENSSL_CONFIGURE_ON=	--without-gnutls
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|2.61|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4
+OPENSSL_CONFIGURE_ON=	--with-openssl="${OPENSSLBASE}"
+OPENSSL_USE=		OPENSSL=yes
 
 .include <bsd.port.mk>
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
index 6f0c33bb0b9c..fa7da3df5961 100644
--- a/mail/libetpan/distinfo
+++ b/mail/libetpan/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libetpan-1.1.tar.gz) = ce3ac567d0f07e5b2d1fdb0045042a8295ec477cd933de1a391fd48139c1f75e
-SIZE (libetpan-1.1.tar.gz) = 1657767
+SHA256 (libetpan-1.5.tar.gz) = da1472e65a3b3126a767576b7e01875c74b30aebb47cb6591b310a14ec61e1e4
+SIZE (libetpan-1.5.tar.gz) = 6139839
diff --git a/mail/libetpan/pkg-descr b/mail/libetpan/pkg-descr
index 578bf74c4477..9d35142dbc2d 100644
--- a/mail/libetpan/pkg-descr
+++ b/mail/libetpan/pkg-descr
@@ -3,4 +3,4 @@ middleware for different kinds of mail access. When using the drivers
 interface, the interface is the same for all kinds of mail access, remote
 and local mailboxes.
 
-WWW: http://www.etpan.org/libetpan/
+WWW: http://www.etpan.org/libetpan.html
diff --git a/mail/libetpan/pkg-plist b/mail/libetpan/pkg-plist
index 61a00e5ecc9d..71dc5da2cdf6 100644
--- a/mail/libetpan/pkg-plist
+++ b/mail/libetpan/pkg-plist
@@ -8,11 +8,14 @@ include/libetpan/carray.h
 include/libetpan/charconv.h
 include/libetpan/chash.h
 include/libetpan/clist.h
+include/libetpan/condstore.h
+include/libetpan/condstore_types.h
 include/libetpan/data_message_driver.h
 include/libetpan/dbdriver.h
 include/libetpan/dbdriver_message.h
 include/libetpan/dbdriver_types.h
 include/libetpan/dbstorage.h
+include/libetpan/enable.h
 include/libetpan/feeddriver.h
 include/libetpan/feeddriver_message.h
 include/libetpan/feeddriver_types.h
@@ -47,10 +50,16 @@ include/libetpan/maildriver_types_helper.h
 include/libetpan/mailengine.h
 include/libetpan/mailfolder.h
 include/libetpan/mailimap.h
+include/libetpan/mailimap_compress.h
 include/libetpan/mailimap_extension.h
 include/libetpan/mailimap_extension_types.h
 include/libetpan/mailimap_helper.h
+include/libetpan/mailimap_id.h
+include/libetpan/mailimap_id_types.h
+include/libetpan/mailimap_oauth2.h
 include/libetpan/mailimap_socket.h
+include/libetpan/mailimap_sort.h
+include/libetpan/mailimap_sort_types.h
 include/libetpan/mailimap_ssl.h
 include/libetpan/mailimap_types.h
 include/libetpan/mailimap_types_helper.h
@@ -88,12 +97,15 @@ include/libetpan/mailprivacy_types.h
 include/libetpan/mailsem.h
 include/libetpan/mailsmtp.h
 include/libetpan/mailsmtp_helper.h
+include/libetpan/mailsmtp_oauth2.h
 include/libetpan/mailsmtp_socket.h
 include/libetpan/mailsmtp_ssl.h
 include/libetpan/mailsmtp_types.h
 include/libetpan/mailstorage.h
 include/libetpan/mailstorage_types.h
 include/libetpan/mailstream.h
+include/libetpan/mailstream_cfstream.h
+include/libetpan/mailstream_compress.h
 include/libetpan/mailstream_helper.h
 include/libetpan/mailstream_low.h
 include/libetpan/mailstream_socket.h
@@ -139,15 +151,20 @@ include/libetpan/pop3driver_cached_message.h
 include/libetpan/pop3driver_message.h
 include/libetpan/pop3driver_types.h
 include/libetpan/pop3storage.h
+include/libetpan/qresync.h
+include/libetpan/qresync_types.h
 include/libetpan/quota.h
 include/libetpan/quota_parser.h
 include/libetpan/quota_sender.h
 include/libetpan/quota_types.h
 include/libetpan/uidplus.h
 include/libetpan/uidplus_types.h
+include/libetpan/xgmlabels.h
+include/libetpan/xgmmsgid.h
+include/libetpan/xgmthrid.h
 include/libetpan/xlist.h
 lib/libetpan.a
-lib/libetpan.la
 lib/libetpan.so
-lib/libetpan.so.16
+lib/libetpan.so.17
+lib/libetpan.so.17.1.0
 @dirrm include/libetpan