mail/libvmime: Update to v0.9.2

  - Update from snapshot to release 0.9.2
  - Work around missing install-strip target
  - Update pkg-plist
  - re-roll patch
  - Fix compile error in posixSocket

PR:		216999

5 files changed, 35 insertions, 10 deletions

diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index 9e450cfba2a9..ff43b9e00c20 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	libvmime
-PORTVERSION=	0.9.2.s20140721
-PORTREVISION=	3
+PORTVERSION=	0.9.2
+DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
 MAINTAINER=	ports@FreeBSD.org
@@ -18,7 +18,6 @@ LIB_DEPENDS=	libgnutls.so:security/gnutls \
 USE_GITHUB=	yes
 GH_ACCOUNT=	kisli
 GH_PROJECT=	vmime
-GH_TAGNAME=	03a0e36
 
 USES=		cmake:outsource compiler:c++11-lib iconv pkgconfig
 USE_LDCONFIG=	yes
@@ -28,8 +27,13 @@ CMAKE_ARGS=	-DLIB_SUFFIX:STRING="" \
 		-DVMIME_SHARED_PTR_USE_BOOST:BOOL=NO \
 		-DVMIME_SHARED_PTR_USE_CXX:BOOL=YES
 
+INSTALL_TARGET=	install
+
 post-patch:
 	@${REINPLACE_CMD} 's,$${VMIME_INSTALL_LIBDIR}/pkgconfig,${PREFIX}/libdata/pkgconfig,' \
 		${WRKSRC}/CMakeLists.txt
 
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libvmime.so.1.0.0
+
 .include <bsd.port.mk>
diff --git a/mail/libvmime/distinfo b/mail/libvmime/distinfo
index 7502b774a913..1f4ce8cd7320 100644
--- a/mail/libvmime/distinfo
+++ b/mail/libvmime/distinfo
@@ -1,2 +1,3 @@
-SHA256 (kisli-vmime-0.9.2.s20140721-03a0e36_GH0.tar.gz) = 92afe8da9c9af3fc3cac46c4a2c5008ce3d3cedc392c381f21fd514fb1dddc49
-SIZE (kisli-vmime-0.9.2.s20140721-03a0e36_GH0.tar.gz) = 527227
+TIMESTAMP = 1486813232
+SHA256 (kisli-vmime-v0.9.2_GH0.tar.gz) = 9874bf911a7dbc257297ab00f7541875da221ee8251a4218cc65abff6e362399
+SIZE (kisli-vmime-v0.9.2_GH0.tar.gz) = 528830
diff --git a/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp b/mail/libvmime/files/patch-src_vmime_platforms_posix_posixHandler.cpp
index a58c51e535a8..da1f750bc113 100644
--- a/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp
+++ b/mail/libvmime/files/patch-src_vmime_platforms_posix_posixHandler.cpp
@@ -1,5 +1,5 @@
---- 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
+--- src/vmime/platforms/posix/posixHandler.cpp.orig	2017-01-03 20:00:08 UTC
++++ src/vmime/platforms/posix/posixHandler.cpp
 @@ -41,6 +41,7 @@
  #include <errno.h>
  
@@ -8,7 +8,7 @@
  #include <sys/stat.h>
  
  #if VMIME_HAVE_SYSCALL
-@@ -238,7 +239,9 @@
+@@ -240,7 +241,9 @@ unsigned int posixHandler::getThreadId()
  #elif VMIME_HAVE_SYSCALL && VMIME_HAVE_SYSCALL_GETTID
  	return static_cast <unsigned int>(::syscall(SYS_gettid));
  #else
diff --git a/mail/libvmime/files/patch-src_vmime_platforms_posix_posixSocket.cpp b/mail/libvmime/files/patch-src_vmime_platforms_posix_posixSocket.cpp
new file mode 100644
index 000000000000..a0c041f5ed3f
--- /dev/null
+++ b/mail/libvmime/files/patch-src_vmime_platforms_posix_posixSocket.cpp
@@ -0,0 +1,11 @@
+--- src/vmime/platforms/posix/posixSocket.cpp.orig	2017-01-03 20:00:08 UTC
++++ src/vmime/platforms/posix/posixSocket.cpp
+@@ -873,7 +873,7 @@ void posixSocket::throwSocketError(const
+ 
+ 		char errbuf[512];
+ 
+-	#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE
++	#if 1
+ 
+ 		// XSI-compliant strerror_r()
+ 		strerror_r(err, errbuf, sizeof(errbuf));
diff --git a/mail/libvmime/pkg-plist b/mail/libvmime/pkg-plist
index 1df99e3ef8c1..8327afad7840 100644
--- a/mail/libvmime/pkg-plist
+++ b/mail/libvmime/pkg-plist
@@ -163,10 +163,17 @@ include/vmime/security/authenticator.hpp
 include/vmime/security/cert/X509Certificate.hpp
 include/vmime/security/cert/certificate.hpp
 include/vmime/security/cert/certificateChain.hpp
+include/vmime/security/cert/certificateException.hpp
+include/vmime/security/cert/certificateExpiredException.hpp
+include/vmime/security/cert/certificateIssuerVerificationException.hpp
+include/vmime/security/cert/certificateNotTrustedException.hpp
+include/vmime/security/cert/certificateNotYetValidException.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/cert/serverIdentityException.hpp
+include/vmime/security/cert/unsupportedCertificateTypeException.hpp
 include/vmime/security/defaultAuthenticator.hpp
 include/vmime/security/digest/md5/md5MessageDigest.hpp
 include/vmime/security/digest/messageDigest.hpp
@@ -178,6 +185,8 @@ include/vmime/security/sasl/SASLMechanism.hpp
 include/vmime/security/sasl/SASLMechanismFactory.hpp
 include/vmime/security/sasl/SASLSession.hpp
 include/vmime/security/sasl/SASLSocket.hpp
+include/vmime/security/sasl/XOAuth2SASLAuthenticator.hpp
+include/vmime/security/sasl/XOAuth2SASLMechanism.hpp
 include/vmime/security/sasl/builtinSASLMechanism.hpp
 include/vmime/security/sasl/defaultSASLAuthenticator.hpp
 include/vmime/streamContentHandler.hpp
@@ -230,6 +239,6 @@ include/vmime/word.hpp
 include/vmime/wordEncoder.hpp
 lib/libvmime.a
 lib/libvmime.so
-lib/libvmime.so.0
-lib/libvmime.so.0.0.0
+lib/libvmime.so.1
+lib/libvmime.so.1.0.0
 libdata/pkgconfig/vmime.pc