- Replace security/gnutls with security/gnutls3 and update to 3.2.15

- Bump PORTREVISION on all ports that depend on security/gnutls and
  adjust all ports that depend on security/gnutls3
- Update mail/anubis to version 4.2 which supports gnutls 3.x
- Update mail/libvmime to a development snapshot (recommended by upstream
  developers)

PR:		191274
Exp-run by:	antoine
Approved by:	portmgr (antoine)

9 files changed, 131 insertions, 131 deletions

diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index f0a8aaab4376..8b0f4807c848 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -2,38 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	libvmime
-PORTVERSION=	0.9.1
-PORTREVISION=	8
+PORTVERSION=	0.9.2.s20140721
 CATEGORIES=	mail
-MASTER_SITES=	SF/vmime/vmime/0.9
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	All-in-one Internet mail library
 
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
-LIB_DEPENDS+=	libgsasl.so:${PORTSDIR}/security/gsasl
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		iconv gmake pkgconfig tar:bzip2 libtool
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-CFLAGS+=	-I${LOCALBASE}/include -D_GLIBCXX__PTHREADS
-CXXFLAGS+=	${CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
+		libgsasl.so:${PORTSDIR}/security/gsasl
 
-.ifndef	DEBUG
-CONFIGURE_ARGS+=--disable-debug
-.endif
+USE_GITHUB=	yes
+GH_ACCOUNT=	kisli
+GH_PROJECT=	vmime
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	03a0e36
 
-CONFIGURE_ENV+=	EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config" libgnutls_config_args="gnutls"
-
-DOCSDIR=	${PREFIX}/share/doc/vmime
+USES=		cmake:outsource compiler:c++11-lib iconv pkgconfig
+USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
+CMAKE_ARGS=	-DLIB_SUFFIX:STRING="" \
+		-DVMIME_BUILD_SAMPLES:BOOL=NO \
+		-DVMIME_SHARED_PTR_USE_BOOST:BOOL=NO \
+		-DVMIME_SHARED_PTR_USE_CXX:BOOL=YES
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
+post-patch:
+	@${REINPLACE_CMD} 's,$${VMIME_INSTALL_LIBDIR}/pkgconfig,${PREFIX}/libdata/pkgconfig,' \
+		${WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/libvmime/distinfo b/mail/libvmime/distinfo
index ca6f52d965c2..81b9e4fcf4ab 100644
--- a/mail/libvmime/distinfo
+++ b/mail/libvmime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvmime-0.9.1.tar.bz2) = 3b66cb76d9bc7da80ef1f271cc29d3a183b5ff8b560ef60e85ff006bffb4d1ae
-SIZE (libvmime-0.9.1.tar.bz2) = 522546
+SHA256 (libvmime-0.9.2.s20140721.tar.gz) = 42e759982bfcc00c9348eba681840788e584cdca344d9342edb1a3f1690a23a0
+SIZE (libvmime-0.9.2.s20140721.tar.gz) = 527233
diff --git a/mail/libvmime/files/patch-cmake__FindIconv.cmake b/mail/libvmime/files/patch-cmake__FindIconv.cmake
new file mode 100644
index 000000000000..280eb3ae293e
--- /dev/null
+++ b/mail/libvmime/files/patch-cmake__FindIconv.cmake
@@ -0,0 +1,11 @@
+--- cmake/FindIconv.cmake.orig	2014-06-30 22:48:42.000000000 +0200
++++ cmake/FindIconv.cmake	2014-07-22 12:50:55.000000000 +0200
+@@ -18,7 +18,7 @@
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ 	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c HINTS "/opt/local/lib")
+ ELSE()
+-	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
++	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv c libiconv libiconv-2)
+ ENDIF()
+ 
+ IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
diff --git a/mail/libvmime/files/patch-configure b/mail/libvmime/files/patch-configure
deleted file mode 100644
index ffe4d9c06dbf..000000000000
--- a/mail/libvmime/files/patch-configure
+++ /dev/null
@@ -1,59 +0,0 @@
---- ./configure.orig	2010-11-16 04:56:00.000000000 -0800
-+++ ./configure	2011-05-03 11:24:44.023730993 -0700
-@@ -4120,13 +4120,13 @@
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
-+    CFLAGS="-g"
-   else
-     CFLAGS="-g"
-   fi
- else
-   if test "$GCC" = yes; then
--    CFLAGS="-O2"
-+    CFLAGS=""
-   else
-     CFLAGS=
-   fi
-@@ -4657,13 +4657,13 @@
-   CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
-   if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
-+    CXXFLAGS="-g"
-   else
-     CXXFLAGS="-g"
-   fi
- else
-   if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
-+    CXXFLAGS=""
-   else
-     CXXFLAGS=
-   fi
-@@ -15610,13 +15610,13 @@
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
-+    CFLAGS="-g"
-   else
-     CFLAGS="-g"
-   fi
- else
-   if test "$GCC" = yes; then
--    CFLAGS="-O2"
-+    CFLAGS=""
-   else
-     CFLAGS=
-   fi
-@@ -21047,7 +21047,7 @@
- else
- 	# -O2
- 	OLD_CXXFLAGS="$CXXFLAGS"
--	CXXFLAGS="$CXXFLAGS -O2"
-+	CXXFLAGS="$CXXFLAGS"
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc accepts -O2" >&5
- $as_echo_n "checking whether cc accepts -O2... " >&6; }
- 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/mail/libvmime/files/patch-src__mailboxField.cpp b/mail/libvmime/files/patch-src__mailboxField.cpp
deleted file mode 100644
index 94d559aa5447..000000000000
--- a/mail/libvmime/files/patch-src__mailboxField.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mailboxField.cpp.orig	2009-09-06 05:10:27.000000000 -0700
-+++ ./src/mailboxField.cpp	2012-03-08 10:49:05.687243933 -0800
-@@ -51,7 +51,7 @@
- 	// Here, we cannot simply call "m_mailbox.parse()" because it
- 	// may have more than one address specified (even if this field
- 	// should contain only one). We are never too much careful...
--	ref <address> parsedAddress = address::parseNext(buffer, position, end, newPosition);
-+	ref <address> parsedAddress = mailbox::parseNext(buffer, position, end, newPosition);
- 
- 	if (parsedAddress)
- 	{
diff --git a/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp b/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp
new file mode 100644
index 000000000000..a58c51e535a8
--- /dev/null
+++ b/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp
@@ -0,0 +1,21 @@
+--- src/vmime/platforms/posix/posixHandler.cpp.orig	2014-07-22 15:24:26.000000000 +0200
++++ src/vmime/platforms/posix/posixHandler.cpp	2014-07-22 15:59:33.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include <errno.h>
+ 
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <sys/stat.h>
+ 
+ #if VMIME_HAVE_SYSCALL
+@@ -238,7 +239,9 @@
+ #elif VMIME_HAVE_SYSCALL && VMIME_HAVE_SYSCALL_GETTID
+ 	return static_cast <unsigned int>(::syscall(SYS_gettid));
+ #else
+-	#error We have no implementation of getThreadId() for this platform!
++	long id;
++	::syscall(SYS_thr_self, &id);
++	return static_cast <unsigned int>(id);
+ #endif
+ }
+ 
diff --git a/mail/libvmime/files/patch-vmime__base.hpp b/mail/libvmime/files/patch-vmime__base.hpp
deleted file mode 100644
index eae3e285d0d3..000000000000
--- a/mail/libvmime/files/patch-vmime__base.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./vmime/base.hpp.orig	2010-02-06 10:12:57.000000000 -0800
-+++ ./vmime/base.hpp	2013-09-05 17:05:39.233608129 -0700
-@@ -252,7 +252,7 @@
- 	template <class X, class Y>
- 	ref <X> dynamicCast(ref <Y> y)
- 	{
--		return y.dynamicCast <X>();
-+		return y. template dynamicCast <X>();
- 	}
- 
- } // vmime
diff --git a/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp b/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp
deleted file mode 100644
index b91cb20864e0..000000000000
--- a/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./vmime/utility/smartPtrInt.hpp.orig	2009-09-06 05:10:27.000000000 -0700
-+++ ./vmime/utility/smartPtrInt.hpp	2013-09-12 11:22:28.695743913 -0700
-@@ -28,6 +28,8 @@
- #include "vmime/config.hpp"
- #include "vmime/utility/smartPtr.hpp"
- 
-+#include <pthread.h>
-+
- 
- namespace vmime {
- namespace utility {
diff --git a/mail/libvmime/pkg-plist b/mail/libvmime/pkg-plist
index 4944f6db116f..c3c4475f41da 100644
--- a/mail/libvmime/pkg-plist
+++ b/mail/libvmime/pkg-plist
@@ -8,6 +8,11 @@ include/vmime/bodyPart.hpp
 include/vmime/bodyPartAttachment.hpp
 include/vmime/charset.hpp
 include/vmime/charsetConverter.hpp
+include/vmime/charsetConverterOptions.hpp
+include/vmime/charsetConverter_iconv.hpp
+include/vmime/charsetConverter_icu.hpp
+include/vmime/charsetConverter_idna.hpp
+include/vmime/charsetConverter_win.hpp
 include/vmime/component.hpp
 include/vmime/config.hpp
 include/vmime/constants.hpp
@@ -15,14 +20,21 @@ include/vmime/contentDisposition.hpp
 include/vmime/contentDispositionField.hpp
 include/vmime/contentHandler.hpp
 include/vmime/contentTypeField.hpp
+include/vmime/context.hpp
 include/vmime/dateTime.hpp
 include/vmime/defaultAttachment.hpp
 include/vmime/disposition.hpp
+include/vmime/emailAddress.hpp
 include/vmime/emptyContentHandler.hpp
 include/vmime/encoding.hpp
 include/vmime/exception.hpp
+include/vmime/export-shared.hpp
+include/vmime/export-static.hpp
+include/vmime/export.hpp
 include/vmime/fileAttachment.hpp
+include/vmime/fileContentHandler.hpp
 include/vmime/generatedMessageAttachment.hpp
+include/vmime/generationContext.hpp
 include/vmime/header.hpp
 include/vmime/headerField.hpp
 include/vmime/headerFieldFactory.hpp
@@ -44,68 +56,104 @@ include/vmime/messageId.hpp
 include/vmime/messageIdSequence.hpp
 include/vmime/messageParser.hpp
 include/vmime/misc/importanceHelper.hpp
+include/vmime/net/defaultTimeoutHandler.hpp
 include/vmime/net/events.hpp
+include/vmime/net/fetchAttributes.hpp
 include/vmime/net/folder.hpp
+include/vmime/net/folderAttributes.hpp
+include/vmime/net/folderStatus.hpp
+include/vmime/net/imap/IMAPCommand.hpp
 include/vmime/net/imap/IMAPConnection.hpp
 include/vmime/net/imap/IMAPFolder.hpp
+include/vmime/net/imap/IMAPFolderStatus.hpp
 include/vmime/net/imap/IMAPMessage.hpp
+include/vmime/net/imap/IMAPMessagePart.hpp
 include/vmime/net/imap/IMAPMessagePartContentHandler.hpp
+include/vmime/net/imap/IMAPMessageStructure.hpp
 include/vmime/net/imap/IMAPParser.hpp
-include/vmime/net/imap/IMAPPart.hpp
 include/vmime/net/imap/IMAPSStore.hpp
 include/vmime/net/imap/IMAPServiceInfos.hpp
 include/vmime/net/imap/IMAPStore.hpp
-include/vmime/net/imap/IMAPStructure.hpp
 include/vmime/net/imap/IMAPTag.hpp
 include/vmime/net/imap/IMAPUtils.hpp
+include/vmime/net/imap/imap.hpp
+include/vmime/net/maildir/maildir.hpp
 include/vmime/net/maildir/maildirFolder.hpp
+include/vmime/net/maildir/maildirFolderStatus.hpp
 include/vmime/net/maildir/maildirFormat.hpp
 include/vmime/net/maildir/maildirMessage.hpp
+include/vmime/net/maildir/maildirMessagePart.hpp
+include/vmime/net/maildir/maildirMessageStructure.hpp
 include/vmime/net/maildir/maildirServiceInfos.hpp
 include/vmime/net/maildir/maildirStore.hpp
 include/vmime/net/maildir/maildirUtils.hpp
 include/vmime/net/maildir/format/courierMaildirFormat.hpp
 include/vmime/net/maildir/format/kmailMaildirFormat.hpp
 include/vmime/net/message.hpp
+include/vmime/net/messageSet.hpp
+include/vmime/net/pop3/POP3Command.hpp
+include/vmime/net/pop3/POP3Connection.hpp
 include/vmime/net/pop3/POP3Folder.hpp
+include/vmime/net/pop3/POP3FolderStatus.hpp
 include/vmime/net/pop3/POP3Message.hpp
+include/vmime/net/pop3/POP3Response.hpp
 include/vmime/net/pop3/POP3SStore.hpp
 include/vmime/net/pop3/POP3ServiceInfos.hpp
 include/vmime/net/pop3/POP3Store.hpp
 include/vmime/net/pop3/POP3Utils.hpp
+include/vmime/net/pop3/pop3.hpp
+include/vmime/net/sendmail/sendmail.hpp
 include/vmime/net/sendmail/sendmailServiceInfos.hpp
 include/vmime/net/sendmail/sendmailTransport.hpp
 include/vmime/net/service.hpp
 include/vmime/net/serviceFactory.hpp
 include/vmime/net/serviceInfos.hpp
 include/vmime/net/session.hpp
+include/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp
+include/vmime/net/smtp/SMTPCommand.hpp
+include/vmime/net/smtp/SMTPCommandSet.hpp
+include/vmime/net/smtp/SMTPConnection.hpp
+include/vmime/net/smtp/SMTPExceptions.hpp
 include/vmime/net/smtp/SMTPResponse.hpp
 include/vmime/net/smtp/SMTPSTransport.hpp
 include/vmime/net/smtp/SMTPServiceInfos.hpp
 include/vmime/net/smtp/SMTPTransport.hpp
+include/vmime/net/smtp/smtp.hpp
 include/vmime/net/socket.hpp
 include/vmime/net/store.hpp
 include/vmime/net/timeoutHandler.hpp
+include/vmime/net/tls/TLSProperties.hpp
 include/vmime/net/tls/TLSSession.hpp
 include/vmime/net/tls/TLSSocket.hpp
 include/vmime/net/tls/TLSSecuredConnectionInfos.hpp
+include/vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp
+include/vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp
+include/vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp
+include/vmime/net/tls/openssl/OpenSSLInitializer.hpp
+include/vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp
+include/vmime/net/tls/openssl/TLSSession_OpenSSL.hpp
+include/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp
+include/vmime/net/tracer.hpp
 include/vmime/net/transport.hpp
 include/vmime/net/connectionInfos.hpp
 include/vmime/net/defaultConnectionInfos.hpp
 include/vmime/net/securedConnectionInfos.hpp
 include/vmime/object.hpp
-include/vmime/options.hpp
 include/vmime/parameter.hpp
 include/vmime/parameterizedHeaderField.hpp
 include/vmime/parsedMessageAttachment.hpp
 include/vmime/parserHelpers.hpp
+include/vmime/parsingContext.hpp
 include/vmime/path.hpp
 include/vmime/plainTextPart.hpp
 include/vmime/platform.hpp
 include/vmime/platforms/posix/posixChildProcess.hpp
+include/vmime/platforms/posix/posixCriticalSection.hpp
 include/vmime/platforms/posix/posixFile.hpp
 include/vmime/platforms/posix/posixHandler.hpp
 include/vmime/platforms/posix/posixSocket.hpp
+include/vmime/platforms/windows/windowsCodepages.hpp
+include/vmime/platforms/windows/windowsCriticalSection.hpp
 include/vmime/platforms/windows/windowsFile.hpp
 include/vmime/platforms/windows/windowsHandler.hpp
 include/vmime/platforms/windows/windowsSocket.hpp
@@ -117,6 +165,8 @@ include/vmime/security/cert/certificate.hpp
 include/vmime/security/cert/certificateChain.hpp
 include/vmime/security/cert/certificateVerifier.hpp
 include/vmime/security/cert/defaultCertificateVerifier.hpp
+include/vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp
+include/vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp
 include/vmime/security/defaultAuthenticator.hpp
 include/vmime/security/digest/md5/md5MessageDigest.hpp
 include/vmime/security/digest/messageDigest.hpp
@@ -140,8 +190,8 @@ include/vmime/utility/encoder/binaryEncoder.hpp
 include/vmime/utility/encoder/encoder.hpp
 include/vmime/utility/encoder/sevenBitEncoder.hpp
 include/vmime/utility/encoder/b64Encoder.hpp
-include/vmime/utility/encoder/defaultEncoder.hpp
 include/vmime/utility/encoder/encoderFactory.hpp
+include/vmime/utility/encoder/noopEncoder.hpp
 include/vmime/utility/encoder/uuEncoder.hpp
 include/vmime/utility/encoder/qpEncoder.hpp
 include/vmime/utility/encoder/eightBitEncoder.hpp
@@ -149,14 +199,30 @@ include/vmime/utility/childProcess.hpp
 include/vmime/utility/datetimeUtils.hpp
 include/vmime/utility/file.hpp
 include/vmime/utility/filteredStream.hpp
+include/vmime/utility/inputStream.hpp
+include/vmime/utility/inputStreamAdapter.hpp
+include/vmime/utility/inputStreamByteBufferAdapter.hpp
+include/vmime/utility/inputStreamPointerAdapter.hpp
+include/vmime/utility/inputStreamSocketAdapter.hpp
+include/vmime/utility/inputStreamStringAdapter.hpp
+include/vmime/utility/inputStreamStringProxyAdapter.hpp
+include/vmime/utility/outputStream.hpp
+include/vmime/utility/outputStreamAdapter.hpp
+include/vmime/utility/outputStreamByteArrayAdapter.hpp
+include/vmime/utility/outputStreamSocketAdapter.hpp
+include/vmime/utility/outputStreamStringAdapter.hpp
+include/vmime/utility/parserInputStreamAdapter.hpp
 include/vmime/utility/path.hpp
 include/vmime/utility/progressListener.hpp
 include/vmime/utility/random.hpp
-include/vmime/utility/smartPtr.hpp
-include/vmime/utility/smartPtrInt.hpp
+include/vmime/utility/seekableInputStream.hpp
+include/vmime/utility/seekableInputStreamRegionAdapter.hpp
 include/vmime/utility/stream.hpp
+include/vmime/utility/streamUtils.hpp
 include/vmime/utility/stringProxy.hpp
 include/vmime/utility/stringUtils.hpp
+include/vmime/utility/sync/autoLock.hpp
+include/vmime/utility/sync/criticalSection.hpp
 include/vmime/utility/url.hpp
 include/vmime/utility/urlUtils.hpp
 include/vmime/vmime.hpp
@@ -167,24 +233,22 @@ lib/libvmime.so
 lib/libvmime.so.0
 lib/libvmime.so.0.0.0
 libdata/pkgconfig/vmime.pc
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-@dirrm %%DOCSDIR%%
+@dirrm include/vmime/utility/sync
 @dirrm include/vmime/utility/encoder
 @dirrm include/vmime/utility
 @dirrm include/vmime/security/sasl
 @dirrm include/vmime/security/digest/sha1
 @dirrm include/vmime/security/digest/md5
 @dirrm include/vmime/security/digest
+@dirrm include/vmime/security/cert/openssl
+@dirrm include/vmime/security/cert/gnutls
 @dirrm include/vmime/security/cert
 @dirrm include/vmime/security
 @dirrm include/vmime/platforms/windows
 @dirrm include/vmime/platforms/posix
 @dirrm include/vmime/platforms
+@dirrm include/vmime/net/tls/openssl
+@dirrm include/vmime/net/tls/gnutls
 @dirrm include/vmime/net/tls
 @dirrm include/vmime/net/smtp
 @dirrm include/vmime/net/sendmail