Update to 0.9.1.

6 files changed, 25 insertions, 55 deletions

diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index fa351086027e..abd731c7b905 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libvmime
-PORTVERSION=	0.9.0
-PORTREVISION=	7
+PORTVERSION=	0.9.1
 CATEGORIES=	mail
 MASTER_SITES=	SF/vmime/vmime/0.9
 
diff --git a/mail/libvmime/distinfo b/mail/libvmime/distinfo
index fff7bb31c6e9..ca6f52d965c2 100644
--- a/mail/libvmime/distinfo
+++ b/mail/libvmime/distinfo
@@ -1,3 +1,2 @@
-MD5 (libvmime-0.9.0.tar.bz2) = 23feb9cff7ba3961c0693926e21448cf
-SHA256 (libvmime-0.9.0.tar.bz2) = 941aa406e7a287e7981ac49f5665663d2d5feed0dd55a5459a311bf806b64363
-SIZE (libvmime-0.9.0.tar.bz2) = 501168
+SHA256 (libvmime-0.9.1.tar.bz2) = 3b66cb76d9bc7da80ef1f271cc29d3a183b5ff8b560ef60e85ff006bffb4d1ae
+SIZE (libvmime-0.9.1.tar.bz2) = 522546
diff --git a/mail/libvmime/files/patch-configure b/mail/libvmime/files/patch-configure
index 3135a5c57a20..ffe4d9c06dbf 100644
--- a/mail/libvmime/files/patch-configure
+++ b/mail/libvmime/files/patch-configure
@@ -1,6 +1,6 @@
---- ./configure.orig	2008-10-19 05:36:19.000000000 -0700
-+++ ./configure	2009-08-19 16:22:34.333460257 -0700
-@@ -3486,13 +3486,13 @@
+--- ./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
@@ -16,7 +16,7 @@
    else
      CFLAGS=
    fi
-@@ -4135,13 +4135,13 @@
+@@ -4657,13 +4657,13 @@
    CXXFLAGS=$ac_save_CXXFLAGS
  elif test $ac_cv_prog_cxx_g = yes; then
    if test "$GXX" = yes; then
@@ -32,37 +32,28 @@
    else
      CXXFLAGS=
    fi
-@@ -7156,13 +7156,13 @@
-   FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
-   if test "x$ac_cv_f77_compiler_gnu" = xyes; then
--    FFLAGS="-g -O2"
-+    FFLAGS="-g"
+@@ -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
-     FFLAGS="-g"
+     CFLAGS="-g"
    fi
  else
-   if test "x$ac_cv_f77_compiler_gnu" = xyes; then
--    FFLAGS="-O2"
-+    FFLAGS=""
+   if test "$GCC" = yes; then
+-    CFLAGS="-O2"
++    CFLAGS=""
    else
-     FFLAGS=
+     CFLAGS=
    fi
-@@ -30797,7 +30797,7 @@
-   else
-     LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
-     LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
--    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
-+    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --modversion`
- 
- 
-       ac_save_CFLAGS="$CFLAGS"
-@@ -32278,7 +32278,7 @@
+@@ -21047,7 +21047,7 @@
  else
  	# -O2
  	OLD_CXXFLAGS="$CXXFLAGS"
 -	CXXFLAGS="$CXXFLAGS -O2"
 +	CXXFLAGS="$CXXFLAGS"
- 	{ echo "$as_me:$LINENO: checking whether cc accepts -O2" >&5
- echo $ECHO_N "checking whether cc accepts -O2... $ECHO_C" >&6; }
- 	cat >conftest.$ac_ext <<_ACEOF
+ 	{ $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__platforms__posix__posixFile.cpp b/mail/libvmime/files/patch-src__platforms__posix__posixFile.cpp
deleted file mode 100644
index a2761a826c28..000000000000
--- a/mail/libvmime/files/patch-src__platforms__posix__posixFile.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/platforms/posix/posixFile.cpp.orig	2008-10-12 02:42:23.000000000 -0700
-+++ ./src/platforms/posix/posixFile.cpp	2009-12-08 09:48:30.536227969 -0800
-@@ -166,7 +166,7 @@
- 	if ((c = ::read(m_fd, data, count)) == -1)
- 		posixFileSystemFactory::reportError(m_path, errno);
- 
--	if (c == 0)
-+	if (c == 0 && count != 0)
- 		m_eof = true;
- 
- 	return static_cast <size_type>(c);
diff --git a/mail/libvmime/files/patch-src__utility__stringUtils.cpp b/mail/libvmime/files/patch-src__utility__stringUtils.cpp
deleted file mode 100644
index c423178e521d..000000000000
--- a/mail/libvmime/files/patch-src__utility__stringUtils.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/utility/stringUtils.cpp.orig	2008-10-12 02:11:24.000000000 -0700
-+++ ./src/utility/stringUtils.cpp	2009-12-08 09:48:30.547226336 -0800
-@@ -142,7 +142,7 @@
- 	{
- 		if (parserHelpers::isAscii(*i))
- 		{
--			if (*i != '=' || *(i + 1) != '?') // To avoid bad behaviour...
-+			if (*i != '=' || ((i + 1) != end && *(i + 1) != '?')) // To avoid bad behaviour...
- 				++count;
- 		}
- 	}
diff --git a/mail/libvmime/pkg-plist b/mail/libvmime/pkg-plist
index e0f8275e5c56..aa055fd5a7bc 100644
--- a/mail/libvmime/pkg-plist
+++ b/mail/libvmime/pkg-plist
@@ -49,10 +49,13 @@ include/vmime/net/folder.hpp
 include/vmime/net/imap/IMAPConnection.hpp
 include/vmime/net/imap/IMAPFolder.hpp
 include/vmime/net/imap/IMAPMessage.hpp
+include/vmime/net/imap/IMAPMessagePartContentHandler.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/maildir/maildirFolder.hpp