4 files changed, 19 insertions, 24 deletions

diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index a82bbb05bf37..1bf45b9427b6 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libvmime
-PORTVERSION=	0.8.1
-PORTREVISION=	7
+PORTVERSION=	0.9.0
 CATEGORIES=	mail
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	vmime
diff --git a/mail/libvmime/distinfo b/mail/libvmime/distinfo
index 1bbdaa14ba5a..fff7bb31c6e9 100644
--- a/mail/libvmime/distinfo
+++ b/mail/libvmime/distinfo
@@ -1,3 +1,3 @@
-MD5 (libvmime-0.8.1.tar.bz2) = 6f13f85e2e54d0a819e61454ab84bc94
-SHA256 (libvmime-0.8.1.tar.bz2) = 88422ddd52eed4cc043b9b5380bde0e75eac2ee286078420dd4b97c2088b23fc
-SIZE (libvmime-0.8.1.tar.bz2) = 478197
+MD5 (libvmime-0.9.0.tar.bz2) = 23feb9cff7ba3961c0693926e21448cf
+SHA256 (libvmime-0.9.0.tar.bz2) = 941aa406e7a287e7981ac49f5665663d2d5feed0dd55a5459a311bf806b64363
+SIZE (libvmime-0.9.0.tar.bz2) = 501168
diff --git a/mail/libvmime/files/patch-src__net__tls__TLSSession.cpp b/mail/libvmime/files/patch-src__net__tls__TLSSession.cpp
deleted file mode 100644
index 67657e1d37a7..000000000000
--- a/mail/libvmime/files/patch-src__net__tls__TLSSession.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/net/tls/TLSSession.cpp.orig	2006-02-05 02:22:59.000000000 -0800
-+++ ./src/net/tls/TLSSession.cpp	2008-03-05 14:56:02.985397985 -0800
-@@ -300,7 +300,6 @@
- 	ERROR(GNUTLS_E_ASN1_TYPE_ANY_ERROR)
- 	ERROR(GNUTLS_E_ASN1_SYNTAX_ERROR)
- 	ERROR(GNUTLS_E_ASN1_DER_OVERFLOW)
--	ERROR(GNUTLS_E_OPENPGP_TRUSTDB_VERSION_UNSUPPORTED)
- 	ERROR(GNUTLS_E_OPENPGP_UID_REVOKED)
- 	ERROR(GNUTLS_E_CERTIFICATE_ERROR)
- 	//ERROR(GNUTLS_E_X509_CERTIFICATE_ERROR)
diff --git a/mail/libvmime/pkg-plist b/mail/libvmime/pkg-plist
index 647b2354aa93..e0f8275e5c56 100644
--- a/mail/libvmime/pkg-plist
+++ b/mail/libvmime/pkg-plist
@@ -19,15 +19,6 @@ include/vmime/dateTime.hpp
 include/vmime/defaultAttachment.hpp
 include/vmime/disposition.hpp
 include/vmime/emptyContentHandler.hpp
-include/vmime/encoder.hpp
-include/vmime/encoder7bit.hpp
-include/vmime/encoder8bit.hpp
-include/vmime/encoderB64.hpp
-include/vmime/encoderBinary.hpp
-include/vmime/encoderDefault.hpp
-include/vmime/encoderFactory.hpp
-include/vmime/encoderQP.hpp
-include/vmime/encoderUUE.hpp
 include/vmime/encoding.hpp
 include/vmime/exception.hpp
 include/vmime/fileAttachment.hpp
@@ -65,10 +56,13 @@ include/vmime/net/imap/IMAPStore.hpp
 include/vmime/net/imap/IMAPTag.hpp
 include/vmime/net/imap/IMAPUtils.hpp
 include/vmime/net/maildir/maildirFolder.hpp
+include/vmime/net/maildir/maildirFormat.hpp
 include/vmime/net/maildir/maildirMessage.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/pop3/POP3Folder.hpp
 include/vmime/net/pop3/POP3Message.hpp
@@ -139,6 +133,15 @@ include/vmime/text.hpp
 include/vmime/textPart.hpp
 include/vmime/textPartFactory.hpp
 include/vmime/types.hpp
+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/uuEncoder.hpp
+include/vmime/utility/encoder/qpEncoder.hpp
+include/vmime/utility/encoder/eightBitEncoder.hpp
 include/vmime/utility/childProcess.hpp
 include/vmime/utility/datetimeUtils.hpp
 include/vmime/utility/file.hpp
@@ -147,6 +150,7 @@ 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/stream.hpp
 include/vmime/utility/stringProxy.hpp
 include/vmime/utility/stringUtils.hpp
@@ -167,6 +171,7 @@ libdata/pkgconfig/vmime.pc
 %%DOCSDIR%%/NEWS
 %%DOCSDIR%%/README
 @dirrm %%DOCSDIR%%
+@dirrm include/vmime/utility/encoder
 @dirrm include/vmime/utility
 @dirrm include/vmime/security/sasl
 @dirrm include/vmime/security/digest/sha1
@@ -181,6 +186,7 @@ libdata/pkgconfig/vmime.pc
 @dirrm include/vmime/net/smtp
 @dirrm include/vmime/net/sendmail
 @dirrm include/vmime/net/pop3
+@dirrm include/vmime/net/maildir/format
 @dirrm include/vmime/net/maildir
 @dirrm include/vmime/net/imap
 @dirrm include/vmime/net