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]

4 files changed, 33 insertions, 21 deletions

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