Update to 2.1.9. While here, convert to options.mk for the ipv6 option.

2004-10-01  Jeffrey Stedfast  <fejj@ximian.com>

	* README: Updated

	* configure.in: Bumped version to 2.1.9

2004-09-29  Jeffrey Stedfast  <fejj@ximian.com>

	* gmime/gmime-parser.c (parser_step_headers): Save the entire raw
	part header as well.
	(parser_init): Init the rawbuf (will be used for holding the raw
	part header).
	(parser_close): Free the rawbuf.
	(parser_construct_leaf_part): Set the raw header on the mime part.
	(parser_construct_multipart): Set the raw header on the multipart.
	(parser_construct_message): Don't use g_mime_message_set_mime_part
	or we'll end up clearing the raw header that we worked so hard to
	preserve.
	(parser_scan_message_part): Same.
	(parser_scan_multipart_face): Change comparison to >= so that we
	actually get rid of the last crlf sequence like we meant to.
	(parser_fill): Get rid of the atleast check (it isn't really
	needed and can cause breakage).

	* gmime/gmime-message.c (message_get_headers): Modified to only
	write part headers if the toplevel mime part contains the raw
	header.
	(message_write_to_stream): Same.
	(g_mime_message_set_mime_part): Clear the raw message headers
	since it obviously won't contain the raw message headers.
	(message_add_header): If any message headers change, clear the raw
	header from the toplebel mime part.
	(message_set_header): Same.

	* gmime/gmime-header.c (g_mime_header_set_raw): New function to
	set the raw part header (to be used in place of our own folding if
	available).
	(g_mime_header_has_raw): New function to check if the raw header
	is available.

2004-09-28  Peter Bloomfield  <PeterBloomfield@bellsouth.net>

	* gmime/gmime-multipart-signed.c (sign_prepare): Must treat
	multipart/signed and multipart/encrypetd parts as opaque
	(e.g. don't even attempt to change their encodings).

2004-09-13  Jeffrey Stedfast  <fejj@novell.com>

	* gmime/gmime-message.c (write_addrspec): New folding callback to
	use on addrspec headers.
	(g_mime_message_init): Register write_addrspec for all address
	headers.

	* gmime/gmime-utils.c (header_fold): Fixed the logic a bit for
	structured headers such that we don't break long tokens.

2004-08-22  Jeffrey Stedfast  <fejj@ximian.com>

	* README: Updated.

	* configure.in: Bumped the version to 2.1.8

	* gmime/gmime.h.in: #include <gmime/gmime-session-simple.h> for
	ia64 build fix on Debian (required because of the way gtk-doc's
	scan program works).

	* gmime/gmime-filter-enriched.c (enriched_to_html): Don't replace
	<nofill> with <pre>. Also, replace lone '\n's with a space as
	suggested by rfc1896.

2004-08-08  Jeffrey Stedfast  <fejj@ximian.com>

	* gmime/gmime-multipart-encrypted.c
	(g_mime_multipart_encrypted_encrypt): Don't set encrypted.asc as
	the filename anymore.

	* gmime/gmime-multipart-signed.c (g_mime_multipart_signed_sign):
	Added a hack for Balsa so it can support S/MIME. Also don't set
	the filename to signature.asc. Balsa maintainers don't want this
	*shrug*.
	(g_mime_multipart_signed_verify): Same. These changes really
	require a design change to CipherContext but that'll have to wait.

2004-08-04  Jeffrey Stedfast  <fejj@ximian.com>

	* configure.in: Changed the iconv-detect logic to not error-out on
	fail. The code can properly handle the case where iconv-detect.h
	doesn't exist, so let it do that instead.

2004-07-30  Jeffrey Stedfast  <fejj@novell.com>

	* gmime/gmime-utils.c (rfc2047_encode_get_rfc822_words): Don't use
	g_unichar_isspace() here, we only want to break 'words' on ascii
	lwsp.

2004-07-16  Jeffrey Stedfast  <fejj@ximian.com>

	* gmime/gmime.c (g_mime_init): Make intialisation ref-counted.
	(g_mime_shutdown): Updated.

2004-07-06  Jeffrey Stedfast  <fejj@ximian.com>

	* gmime/gmime-utils.c (rfc2047_encode_get_rfc822_words): Break
	apart long words so that they we don't generate encoded-word
	tokens that are >75 chars. Fixes bug #145497.

4 files changed, 21 insertions, 13 deletions

diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index e45d89fe5bf..c15a07981cc 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/11/04 12:12:31 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/11/14 16:48:55 jmmv Exp $
 #
 
-DISTNAME=	gmime-2.1.7
-PKGREVISION=	1
+DISTNAME=	gmime-2.1.9
 CATEGORIES=	mail
 MASTER_SITES=	http://spruce.sourceforge.net/gmime/sources/v2.1/
 
@@ -20,11 +19,7 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 PKGCONFIG_OVERRIDE+=	gmime-2.0.pc.in
 
 .include "../../mk/bsd.prefs.mk"
-
-.if !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-BUILD_DEFS+=		USE_INET6
+.include "options.mk"
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/mail/gmime/PLIST b/mail/gmime/PLIST
index 4e661dc4ba3..c3ef14b1eea 100644
--- a/mail/gmime/PLIST
+++ b/mail/gmime/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/11/14 16:48:55 jmmv Exp $
 bin/gmime-config
 bin/uudecode
 bin/uuencode
@@ -125,7 +125,6 @@ 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/gmon.out
 share/doc/gmime/home.png
 share/doc/gmime/index.html
 share/doc/gmime/index.sgml
diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo
index 306890b16f4..99525de781b 100644
--- a/mail/gmime/distinfo
+++ b/mail/gmime/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/07/23 15:08:56 recht Exp $
+$NetBSD: distinfo,v 1.4 2004/11/14 16:48:55 jmmv Exp $
 
-SHA1 (gmime-2.1.7.tar.gz) = 127cf10f119eaab4d94f6331a5b50ffd63ffe8ed
-Size (gmime-2.1.7.tar.gz) = 783247 bytes
+SHA1 (gmime-2.1.9.tar.gz) = a42bdea2a51f87dbc6697de52d946ed3f256b26c
+Size (gmime-2.1.9.tar.gz) = 784545 bytes
 SHA1 (patch-aa) = e838216d593ff2003d436afb68477dc5701c34f4
diff --git a/mail/gmime/options.mk b/mail/gmime/options.mk
new file mode 100644
index 00000000000..3c9a7acf2fb
--- /dev/null
+++ b/mail/gmime/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2004/11/14 16:48:55 jmmv Exp $
+
+.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	ipv6
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gmime
+PKG_SUPPORTED_OPTIONS=	ipv6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mipv6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif