update to 2.1.6

From the ChangeLog it looks like there were only bugfixes and a few
minor API changes.

5 files changed, 97 insertions, 92 deletions

diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 494ec3b0df0..53e321463ac 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/08 13:39:29 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/04 23:10:50 recht Exp $
 #
 
-DISTNAME=	gmime-2.1.3
+DISTNAME=	gmime-2.1.6
 CATEGORIES=	mail
 MASTER_SITES=	http://spruce.sourceforge.net/gmime/sources/v2.1/
 
@@ -15,7 +15,7 @@ USE_LIBTOOL=		yes
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 PKGCONFIG_OVERRIDE+=	gmime-2.0.pc.in
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/gmime/PLIST b/mail/gmime/PLIST
index 5d4857fee81..b89fa14a1d5 100644
--- a/mail/gmime/PLIST
+++ b/mail/gmime/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/08 13:39:31 recht Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/07/04 23:10:50 recht Exp $
 bin/gmime-config
 bin/uudecode
 bin/uuencode
@@ -14,6 +14,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
@@ -55,82 +56,86 @@ lib/libgmime-2.0.a
 lib/libgmime-2.0.la
 lib/libgmime-2.0.so
 lib/libgmime-2.0.so.3
-lib/libgmime-2.0.so.3.3
+lib/libgmime-2.0.so.3.6
 lib/pkgconfig/gmime-2.0.pc
-share/doc/html/gmime-2.1/c2399.html
-share/doc/html/gmime-2.1/ciphercontexts.html
-share/doc/html/gmime-2.1/classes.html
-share/doc/html/gmime-2.1/core.html
-share/doc/html/gmime-2.1/datawrappers.html
-share/doc/html/gmime-2.1/filters.html
-share/doc/html/gmime-2.1/fundamentals.html
-share/doc/html/gmime-2.1/gmime-building.html
-share/doc/html/gmime-2.1/gmime-changes-2-0.html
-share/doc/html/gmime-2.1/gmime-compiling.html
-share/doc/html/gmime-2.1/gmime-data-wrappers.html
-share/doc/html/gmime-2.1/gmime-filters.html
-share/doc/html/gmime-2.1/gmime-gmime-charset.html
-share/doc/html/gmime-2.1/gmime-gmime-cipher-context.html
-share/doc/html/gmime-2.1/gmime-gmime-content-type.html
-share/doc/html/gmime-2.1/gmime-gmime-data-wrapper.html
-share/doc/html/gmime-2.1/gmime-gmime-disposition.html
-share/doc/html/gmime-2.1/gmime-gmime-filter-basic.html
-share/doc/html/gmime-2.1/gmime-gmime-filter-best.html
-share/doc/html/gmime-2.1/gmime-gmime-filter-charset.html
-share/doc/html/gmime-2.1/gmime-gmime-filter-crlf.html
-share/doc/html/gmime-2.1/gmime-gmime-filter-enriched.html
-share/doc/html/gmime-2.1/gmime-gmime-filter-from.html
-share/doc/html/gmime-2.1/gmime-gmime-filter-html.html
-share/doc/html/gmime-2.1/gmime-gmime-filter-md5.html
-share/doc/html/gmime-2.1/gmime-gmime-filter-strip.html
-share/doc/html/gmime-2.1/gmime-gmime-filter-windows.html
-share/doc/html/gmime-2.1/gmime-gmime-filter-yenc.html
-share/doc/html/gmime-2.1/gmime-gmime-filter.html
-share/doc/html/gmime-2.1/gmime-gmime-gpg-context.html
-share/doc/html/gmime-2.1/gmime-gmime-header.html
-share/doc/html/gmime-2.1/gmime-gmime-host-utils.html
-share/doc/html/gmime-2.1/gmime-gmime-iconv-utils.html
-share/doc/html/gmime-2.1/gmime-gmime-iconv.html
-share/doc/html/gmime-2.1/gmime-gmime-message-part.html
-share/doc/html/gmime-2.1/gmime-gmime-message-partial.html
-share/doc/html/gmime-2.1/gmime-gmime-message.html
-share/doc/html/gmime-2.1/gmime-gmime-multipart-encrypted.html
-share/doc/html/gmime-2.1/gmime-gmime-multipart-signed.html
-share/doc/html/gmime-2.1/gmime-gmime-multipart.html
-share/doc/html/gmime-2.1/gmime-gmime-object.html
-share/doc/html/gmime-2.1/gmime-gmime-param.html
-share/doc/html/gmime-2.1/gmime-gmime-parser.html
-share/doc/html/gmime-2.1/gmime-gmime-part.html
-share/doc/html/gmime-2.1/gmime-gmime-session-simple.html
-share/doc/html/gmime-2.1/gmime-gmime-session.html
-share/doc/html/gmime-2.1/gmime-gmime-stream-buffer.html
-share/doc/html/gmime-2.1/gmime-gmime-stream-cat.html
-share/doc/html/gmime-2.1/gmime-gmime-stream-file.html
-share/doc/html/gmime-2.1/gmime-gmime-stream-filter.html
-share/doc/html/gmime-2.1/gmime-gmime-stream-fs.html
-share/doc/html/gmime-2.1/gmime-gmime-stream-mem.html
-share/doc/html/gmime-2.1/gmime-gmime-stream-mmap.html
-share/doc/html/gmime-2.1/gmime-gmime-stream-null.html
-share/doc/html/gmime-2.1/gmime-gmime-stream.html
-share/doc/html/gmime-2.1/gmime-gmime-utils.html
-share/doc/html/gmime-2.1/gmime-gmime.html
-share/doc/html/gmime-2.1/gmime-internet-address.html
-share/doc/html/gmime-2.1/gmime-question-index.html
-share/doc/html/gmime-2.1/gmime-resources.html
-share/doc/html/gmime-2.1/gmime-streams.html
-share/doc/html/gmime-2.1/gmime.html
-share/doc/html/gmime-2.1/headers.html
-share/doc/html/gmime-2.1/home.png
-share/doc/html/gmime-2.1/index.html
-share/doc/html/gmime-2.1/index.sgml
-share/doc/html/gmime-2.1/internetaddresses.html
-share/doc/html/gmime-2.1/left.png
-share/doc/html/gmime-2.1/mimeparts.html
-share/doc/html/gmime-2.1/parsers.html
-share/doc/html/gmime-2.1/right.png
-share/doc/html/gmime-2.1/sessions.html
-share/doc/html/gmime-2.1/streams.html
-share/doc/html/gmime-2.1/up.png
-@dirrm share/doc/html/gmime-2.1
+share/doc/gmime/CipherContexts.html
+share/doc/gmime/DataWrappers.html
+share/doc/gmime/Filters.html
+share/doc/gmime/Headers.html
+share/doc/gmime/InternetAddresses.html
+share/doc/gmime/MimeParts.html
+share/doc/gmime/Parsers.html
+share/doc/gmime/Sessions.html
+share/doc/gmime/Streams.html
+share/doc/gmime/ch01.html
+share/doc/gmime/classes.html
+share/doc/gmime/core.html
+share/doc/gmime/fundamentals.html
+share/doc/gmime/gmime-building.html
+share/doc/gmime/gmime-changes-2-0.html
+share/doc/gmime/gmime-changes-2-2.html
+share/doc/gmime/gmime-compiling.html
+share/doc/gmime/gmime-data-wrappers.html
+share/doc/gmime/gmime-filters.html
+share/doc/gmime/gmime-gmime-charset.html
+share/doc/gmime/gmime-gmime-cipher-context.html
+share/doc/gmime/gmime-gmime-content-type.html
+share/doc/gmime/gmime-gmime-data-wrapper.html
+share/doc/gmime/gmime-gmime-disposition.html
+share/doc/gmime/gmime-gmime-filter-basic.html
+share/doc/gmime/gmime-gmime-filter-best.html
+share/doc/gmime/gmime-gmime-filter-charset.html
+share/doc/gmime/gmime-gmime-filter-crlf.html
+share/doc/gmime/gmime-gmime-filter-enriched.html
+share/doc/gmime/gmime-gmime-filter-from.html
+share/doc/gmime/gmime-gmime-filter-gzip.html
+share/doc/gmime/gmime-gmime-filter-html.html
+share/doc/gmime/gmime-gmime-filter-md5.html
+share/doc/gmime/gmime-gmime-filter-strip.html
+share/doc/gmime/gmime-gmime-filter-windows.html
+share/doc/gmime/gmime-gmime-filter-yenc.html
+share/doc/gmime/gmime-gmime-filter.html
+share/doc/gmime/gmime-gmime-gpg-context.html
+share/doc/gmime/gmime-gmime-header.html
+share/doc/gmime/gmime-gmime-host-utils.html
+share/doc/gmime/gmime-gmime-iconv-utils.html
+share/doc/gmime/gmime-gmime-iconv.html
+share/doc/gmime/gmime-gmime-message-part.html
+share/doc/gmime/gmime-gmime-message-partial.html
+share/doc/gmime/gmime-gmime-message.html
+share/doc/gmime/gmime-gmime-multipart-encrypted.html
+share/doc/gmime/gmime-gmime-multipart-signed.html
+share/doc/gmime/gmime-gmime-multipart.html
+share/doc/gmime/gmime-gmime-object.html
+share/doc/gmime/gmime-gmime-param.html
+share/doc/gmime/gmime-gmime-parser.html
+share/doc/gmime/gmime-gmime-part.html
+share/doc/gmime/gmime-gmime-session-simple.html
+share/doc/gmime/gmime-gmime-session.html
+share/doc/gmime/gmime-gmime-stream-buffer.html
+share/doc/gmime/gmime-gmime-stream-cat.html
+share/doc/gmime/gmime-gmime-stream-file.html
+share/doc/gmime/gmime-gmime-stream-filter.html
+share/doc/gmime/gmime-gmime-stream-fs.html
+share/doc/gmime/gmime-gmime-stream-mem.html
+share/doc/gmime/gmime-gmime-stream-mmap.html
+share/doc/gmime/gmime-gmime-stream-null.html
+share/doc/gmime/gmime-gmime-stream.html
+share/doc/gmime/gmime-gmime-utils.html
+share/doc/gmime/gmime-gmime.html
+share/doc/gmime/gmime-internet-address.html
+share/doc/gmime/gmime-question-index.html
+share/doc/gmime/gmime-resources.html
+share/doc/gmime/gmime-streams.html
+share/doc/gmime/gmime.devhelp
+share/doc/gmime/gmime.html
+share/doc/gmime/home.png
+share/doc/gmime/index.html
+share/doc/gmime/index.sgml
+share/doc/gmime/left.png
+share/doc/gmime/right.png
+share/doc/gmime/style.css
+share/doc/gmime/up.png
+@dirrm share/doc/gmime
 @dirrm include/gmime-2.0/gmime
 @dirrm include/gmime-2.0
diff --git a/mail/gmime/buildlink3.mk b/mail/gmime/buildlink3.mk
index 99608c777ea..e9585a7ae6a 100644
--- a/mail/gmime/buildlink3.mk
+++ b/mail/gmime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/04/08 13:39:32 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/07/04 23:10:50 recht Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GMIME_BUILDLINK3_MK:=	${GMIME_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngmime}
 BUILDLINK_PACKAGES+=	gmime
 
 .if !empty(GMIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gmime+=	gmime>=2.1.3
+BUILDLINK_DEPENDS.gmime+=	gmime>=2.1.6
 BUILDLINK_PKGSRCDIR.gmime?=	../../mail/gmime.work
 .endif	# GMIME_BUILDLINK3_MK
 
diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo
index 4aad5e02ff2..7a74145edcb 100644
--- a/mail/gmime/distinfo
+++ b/mail/gmime/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/08 13:39:31 recht Exp $
+$NetBSD: distinfo,v 1.2 2004/07/04 23:10:50 recht Exp $
 
-SHA1 (gmime-2.1.3.tar.gz) = 398b51b80339bb01919a18f8e12cb46d725bf497
-Size (gmime-2.1.3.tar.gz) = 746430 bytes
-SHA1 (patch-aa) = fd7a28802026c8d40801298827f84d8e0e884135
+SHA1 (gmime-2.1.6.tar.gz) = df04c7f3ba141bba0203af800b90df9707cf419b
+Size (gmime-2.1.6.tar.gz) = 781395 bytes
+SHA1 (patch-aa) = e838216d593ff2003d436afb68477dc5701c34f4
diff --git a/mail/gmime/patches/patch-aa b/mail/gmime/patches/patch-aa
index 96b7cc3e66d..9fdfdb6385d 100644
--- a/mail/gmime/patches/patch-aa
+++ b/mail/gmime/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/08 13:39:32 recht Exp $
+$NetBSD: patch-aa,v 1.2 2004/07/04 23:10:50 recht Exp $
 
---- docs/reference/Makefile.in.orig	2004-04-08 15:32:41.000000000 +0200
-+++ docs/reference/Makefile.in
-@@ -83,7 +83,7 @@ HAVE_GTK_DOC = @HAVE_GTK_DOC@
- HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@
- HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@
+--- docs/reference/Makefile.in.orig	2004-06-07 00:35:30.000000000 +0200
++++ docs/reference/Makefile.in	2004-07-05 00:57:12.000000000 +0200
+@@ -87,7 +87,7 @@
+ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
+ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
  
 -HTML_DIR = $(datadir)/gtk-doc/html
 +HTML_DIR = @HTML_DIR@