Update to 2.1.0

3 files changed, 87 insertions, 80 deletions

diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index fa6c0b8c9ffb..3c7ab6f301b4 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gmime
-PORTVERSION=	2.0.11
+PORTVERSION=	2.1.0
 CATEGORIES=	mail
 MASTER_SITES=	http://spruce.sourceforge.net/gmime/sources/
 
@@ -17,17 +17,17 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 CONFLICTS=	gmime-0.*
 
-USE_X_PREFIX=	YES
-GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_GNOME=	glib20
-USE_LIBTOOL=	YES
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-INSTALLS_SHLIB=		YES
+INSTALLS_SHLIB=		yes
 
 pre-configure:
 .if exists(${X11BASE}/lib/libgmime.so)
diff --git a/mail/gmime2/distinfo b/mail/gmime2/distinfo
index 69aa709c2229..855077def98e 100644
--- a/mail/gmime2/distinfo
+++ b/mail/gmime2/distinfo
@@ -1 +1 @@
-MD5 (gmime-2.0.11.tar.gz) = d89ecfcd5e0e36ed51f54108cd252b5c
+MD5 (gmime-2.1.0.tar.gz) = dba1e7c39b3a7274c485aa81069b5edf
diff --git a/mail/gmime2/pkg-plist b/mail/gmime2/pkg-plist
index 9bcd973bd1b6..ccf0b19ffabd 100644
--- a/mail/gmime2/pkg-plist
+++ b/mail/gmime2/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 bin/gmime-config
 bin/uudecode
 bin/uuencode
@@ -12,14 +11,17 @@ include/gmime-2.0/gmime/gmime-filter-basic.h
 include/gmime-2.0/gmime/gmime-filter-best.h
 include/gmime-2.0/gmime/gmime-filter-charset.h
 include/gmime-2.0/gmime/gmime-filter-crlf.h
+include/gmime-2.0/gmime/gmime-filter-enriched.h
 include/gmime-2.0/gmime/gmime-filter-from.h
 include/gmime-2.0/gmime/gmime-filter-html.h
 include/gmime-2.0/gmime/gmime-filter-md5.h
 include/gmime-2.0/gmime/gmime-filter-strip.h
+include/gmime-2.0/gmime/gmime-filter-windows.h
 include/gmime-2.0/gmime/gmime-filter-yenc.h
 include/gmime-2.0/gmime/gmime-filter.h
 include/gmime-2.0/gmime/gmime-gpg-context.h
 include/gmime-2.0/gmime/gmime-header.h
+include/gmime-2.0/gmime/gmime-host-utils.h
 include/gmime-2.0/gmime/gmime-iconv-utils.h
 include/gmime-2.0/gmime/gmime-iconv.h
 include/gmime-2.0/gmime/gmime-message-part.h
@@ -32,6 +34,7 @@ include/gmime-2.0/gmime/gmime-object.h
 include/gmime-2.0/gmime/gmime-param.h
 include/gmime-2.0/gmime/gmime-parser.h
 include/gmime-2.0/gmime/gmime-part.h
+include/gmime-2.0/gmime/gmime-session-simple.h
 include/gmime-2.0/gmime/gmime-session.h
 include/gmime-2.0/gmime/gmime-stream-buffer.h
 include/gmime-2.0/gmime/gmime-stream-cat.h
@@ -50,80 +53,84 @@ include/gmime-2.0/gmime/md5-utils.h
 lib/gmimeConf.sh
 lib/libgmime-2.0.a
 lib/libgmime-2.0.so
-lib/libgmime-2.0.so.2
+lib/libgmime-2.0.so.3
 lib/pkgconfig/gmime-2.0.pc
-share/gtk-doc/html/gmime-2.0/c1978.html
-share/gtk-doc/html/gmime-2.0/ciphercontexts.html
-share/gtk-doc/html/gmime-2.0/classes.html
-share/gtk-doc/html/gmime-2.0/core.html
-share/gtk-doc/html/gmime-2.0/datawrappers.html
-share/gtk-doc/html/gmime-2.0/filters.html
-share/gtk-doc/html/gmime-2.0/fundamentals.html
-share/gtk-doc/html/gmime-2.0/gmime-building.html
-share/gtk-doc/html/gmime-2.0/gmime-changes-2-0.html
-share/gtk-doc/html/gmime-2.0/gmime-compiling.html
-share/gtk-doc/html/gmime-2.0/gmime-data-wrappers.html
-share/gtk-doc/html/gmime-2.0/gmime-filters.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-charset.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-cipher-context.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-content-type.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-data-wrapper.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-disposition.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-filter-basic.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-filter-best.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-filter-charset.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-filter-crlf.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-filter-from.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-filter-html.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-filter-md5.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-filter-strip.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-filter-yenc.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-filter.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-gpg-context.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-header.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-iconv-utils.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-iconv.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-message-part.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-message-partial.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-message.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-multipart-encrypted.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-multipart-signed.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-multipart.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-object.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-param.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-parser.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-part.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-session.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-stream-buffer.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-stream-cat.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-stream-file.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-stream-filter.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-stream-fs.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-stream-mem.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-stream-mmap.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-stream-null.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-stream.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime-utils.html
-share/gtk-doc/html/gmime-2.0/gmime-gmime.html
-share/gtk-doc/html/gmime-2.0/gmime-internet-address.html
-share/gtk-doc/html/gmime-2.0/gmime-question-index.html
-share/gtk-doc/html/gmime-2.0/gmime-resources.html
-share/gtk-doc/html/gmime-2.0/gmime-streams.html
-share/gtk-doc/html/gmime-2.0/gmime.html
-share/gtk-doc/html/gmime-2.0/headers.html
-share/gtk-doc/html/gmime-2.0/home.png
-share/gtk-doc/html/gmime-2.0/index.html
-share/gtk-doc/html/gmime-2.0/index.sgml
-share/gtk-doc/html/gmime-2.0/internetaddresses.html
-share/gtk-doc/html/gmime-2.0/left.png
-share/gtk-doc/html/gmime-2.0/mimeparts.html
-share/gtk-doc/html/gmime-2.0/parsers.html
-share/gtk-doc/html/gmime-2.0/right.png
-share/gtk-doc/html/gmime-2.0/sessions.html
-share/gtk-doc/html/gmime-2.0/streams.html
-share/gtk-doc/html/gmime-2.0/up.png
+share/gtk-doc/html/gmime-2.1/c2355.html
+share/gtk-doc/html/gmime-2.1/ciphercontexts.html
+share/gtk-doc/html/gmime-2.1/classes.html
+share/gtk-doc/html/gmime-2.1/core.html
+share/gtk-doc/html/gmime-2.1/datawrappers.html
+share/gtk-doc/html/gmime-2.1/filters.html
+share/gtk-doc/html/gmime-2.1/fundamentals.html
+share/gtk-doc/html/gmime-2.1/gmime-building.html
+share/gtk-doc/html/gmime-2.1/gmime-changes-2-0.html
+share/gtk-doc/html/gmime-2.1/gmime-compiling.html
+share/gtk-doc/html/gmime-2.1/gmime-data-wrappers.html
+share/gtk-doc/html/gmime-2.1/gmime-filters.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-charset.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-cipher-context.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-content-type.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-data-wrapper.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-disposition.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter-basic.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter-best.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter-charset.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter-crlf.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter-enriched.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter-from.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter-html.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter-md5.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter-strip.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter-windows.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter-yenc.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-filter.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-gpg-context.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-header.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-host-utils.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-iconv-utils.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-iconv.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-message-part.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-message-partial.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-message.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-multipart-encrypted.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-multipart-signed.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-multipart.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-object.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-param.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-parser.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-part.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-session-simple.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-session.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-stream-buffer.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-stream-cat.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-stream-file.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-stream-filter.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-stream-fs.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-stream-mem.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-stream-mmap.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-stream-null.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-stream.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime-utils.html
+share/gtk-doc/html/gmime-2.1/gmime-gmime.html
+share/gtk-doc/html/gmime-2.1/gmime-internet-address.html
+share/gtk-doc/html/gmime-2.1/gmime-question-index.html
+share/gtk-doc/html/gmime-2.1/gmime-resources.html
+share/gtk-doc/html/gmime-2.1/gmime-streams.html
+share/gtk-doc/html/gmime-2.1/gmime.html
+share/gtk-doc/html/gmime-2.1/headers.html
+share/gtk-doc/html/gmime-2.1/home.png
+share/gtk-doc/html/gmime-2.1/index.html
+share/gtk-doc/html/gmime-2.1/index.sgml
+share/gtk-doc/html/gmime-2.1/internetaddresses.html
+share/gtk-doc/html/gmime-2.1/left.png
+share/gtk-doc/html/gmime-2.1/mimeparts.html
+share/gtk-doc/html/gmime-2.1/parsers.html
+share/gtk-doc/html/gmime-2.1/right.png
+share/gtk-doc/html/gmime-2.1/sessions.html
+share/gtk-doc/html/gmime-2.1/streams.html
+share/gtk-doc/html/gmime-2.1/up.png
 @dirrm include/gmime-2.0/gmime
 @dirrm include/gmime-2.0
-@dirrm share/gtk-doc/html/gmime-2.0
+@dirrm share/gtk-doc/html/gmime-2.1
 @unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
 @unexec rmdir %D/share/gtk-doc 2>/dev/null || true