3 files changed, 82 insertions, 87 deletions

diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index af3d36909efd..ccbe682efb0b 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gmime
-PORTVERSION=	2.1.4
+PORTVERSION=	2.1.5
 CATEGORIES=	mail
 MASTER_SITES=	http://spruce.sourceforge.net/gmime/sources/v2.1/
 
@@ -27,13 +27,4 @@ INSTALLS_SHLIB=		yes
 
 LATEST_LINK=	gmime2
 
-pre-configure:
-.if exists(${X11BASE}/lib/libgmime.so)
-	@${ECHO} ""
-	@${ECHO} "You have gmime-1.x installed"
-	@${ECHO} "Please deinstall gmime-1.x before installing this port"
-	@${ECHO} ""
-	@${FALSE}
-.endif
-
 .include <bsd.port.mk>
diff --git a/mail/gmime2/distinfo b/mail/gmime2/distinfo
index 8ba85a5104e7..a76cf77f2d6c 100644
--- a/mail/gmime2/distinfo
+++ b/mail/gmime2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gmime-2.1.4.tar.gz) = 76702884ae44480599cb0e365e643859
-SIZE (gmime-2.1.4.tar.gz) = 749784
+MD5 (gmime-2.1.5.tar.gz) = 137c03e24401317c67feb647eb446eab
+SIZE (gmime-2.1.5.tar.gz) = 763206
diff --git a/mail/gmime2/pkg-plist b/mail/gmime2/pkg-plist
index 862fa181af15..720db16c0912 100644
--- a/mail/gmime2/pkg-plist
+++ b/mail/gmime2/pkg-plist
@@ -13,6 +13,7 @@ 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-gzip.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
@@ -54,81 +55,84 @@ lib/libgmime-2.0.a
 lib/libgmime-2.0.so
 lib/libgmime-2.0.so.3
 libdata/pkgconfig/gmime-2.0.pc
-share/gtk-doc/html/gmime-2.1/c2426.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 share/gtk-doc/html/gmime-2.1
+share/gtk-doc/html/gmime/CipherContexts.html
+share/gtk-doc/html/gmime/DataWrappers.html
+share/gtk-doc/html/gmime/Filters.html
+share/gtk-doc/html/gmime/Headers.html
+share/gtk-doc/html/gmime/InternetAddresses.html
+share/gtk-doc/html/gmime/MimeParts.html
+share/gtk-doc/html/gmime/Parsers.html
+share/gtk-doc/html/gmime/Sessions.html
+share/gtk-doc/html/gmime/Streams.html
+share/gtk-doc/html/gmime/ch01.html
+share/gtk-doc/html/gmime/classes.html
+share/gtk-doc/html/gmime/core.html
+share/gtk-doc/html/gmime/fundamentals.html
+share/gtk-doc/html/gmime/gmime-building.html
+share/gtk-doc/html/gmime/gmime-changes-2-0.html
+share/gtk-doc/html/gmime/gmime-compiling.html
+share/gtk-doc/html/gmime/gmime-data-wrappers.html
+share/gtk-doc/html/gmime/gmime-filters.html
+share/gtk-doc/html/gmime/gmime-gmime-charset.html
+share/gtk-doc/html/gmime/gmime-gmime-cipher-context.html
+share/gtk-doc/html/gmime/gmime-gmime-content-type.html
+share/gtk-doc/html/gmime/gmime-gmime-data-wrapper.html
+share/gtk-doc/html/gmime/gmime-gmime-disposition.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-basic.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-best.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-charset.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-crlf.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-enriched.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-from.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-gzip.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-html.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-md5.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-strip.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-windows.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-yenc.html
+share/gtk-doc/html/gmime/gmime-gmime-filter.html
+share/gtk-doc/html/gmime/gmime-gmime-gpg-context.html
+share/gtk-doc/html/gmime/gmime-gmime-header.html
+share/gtk-doc/html/gmime/gmime-gmime-host-utils.html
+share/gtk-doc/html/gmime/gmime-gmime-iconv-utils.html
+share/gtk-doc/html/gmime/gmime-gmime-iconv.html
+share/gtk-doc/html/gmime/gmime-gmime-message-part.html
+share/gtk-doc/html/gmime/gmime-gmime-message-partial.html
+share/gtk-doc/html/gmime/gmime-gmime-message.html
+share/gtk-doc/html/gmime/gmime-gmime-multipart-encrypted.html
+share/gtk-doc/html/gmime/gmime-gmime-multipart-signed.html
+share/gtk-doc/html/gmime/gmime-gmime-multipart.html
+share/gtk-doc/html/gmime/gmime-gmime-object.html
+share/gtk-doc/html/gmime/gmime-gmime-param.html
+share/gtk-doc/html/gmime/gmime-gmime-parser.html
+share/gtk-doc/html/gmime/gmime-gmime-part.html
+share/gtk-doc/html/gmime/gmime-gmime-session-simple.html
+share/gtk-doc/html/gmime/gmime-gmime-session.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-buffer.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-cat.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-file.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-filter.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-fs.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-mem.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-mmap.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-null.html
+share/gtk-doc/html/gmime/gmime-gmime-stream.html
+share/gtk-doc/html/gmime/gmime-gmime-utils.html
+share/gtk-doc/html/gmime/gmime-gmime.html
+share/gtk-doc/html/gmime/gmime-internet-address.html
+share/gtk-doc/html/gmime/gmime-question-index.html
+share/gtk-doc/html/gmime/gmime-resources.html
+share/gtk-doc/html/gmime/gmime-streams.html
+share/gtk-doc/html/gmime/gmime.devhelp
+share/gtk-doc/html/gmime/gmime.html
+share/gtk-doc/html/gmime/home.png
+share/gtk-doc/html/gmime/index.html
+share/gtk-doc/html/gmime/index.sgml
+share/gtk-doc/html/gmime/left.png
+share/gtk-doc/html/gmime/right.png
+share/gtk-doc/html/gmime/style.css
+share/gtk-doc/html/gmime/up.png
+@dirrm share/gtk-doc/html/gmime
 @unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
 @unexec rmdir %D/share/gtk-doc 2>/dev/null || true
 @dirrm include/gmime-2.0/gmime