Changes 2.4.18:

GMime 2.4 has had a number of API changes since GMime 2.2. To start, ALL public
APIs that used to use off_t in GMime 2.2 now use gint64 so that the API and ABI
do not change based on whether or not large file support is enabled.

In addition, all of the functions marked as deprecated in 2.0 and 2.2 were
removed (usually they had equivalent functionality in a parent class).

Many functions have also been renamed for better clarity and/or consistency.
For convenience, GMime 2.4 source packages include a shell-script to aid in
porting applications using GMime 2.2 (should work for most GMime 2.0
applications as well) to the 2.4 API. You can find this script under the
tools/ directory, named `gmime-port-2-2-to-2-4.sh'.

This script won't fix everything, but it should help quite a bit.

6 files changed, 170 insertions, 188 deletions

diff --git a/mail/gmime/DESCR b/mail/gmime/DESCR
index 9238064afd0..69b83606d65 100644
--- a/mail/gmime/DESCR
+++ b/mail/gmime/DESCR
@@ -1,29 +1,24 @@
-GMime is a set of utilities for parsing and creating messages using
-the Multipurpose Internet Mail Extension (MIME) as defined by the
-following RFCs:
-
- * 0822: Standard for the Format of Arpa Internet Text Messages
- * 1521: MIME (Multipurpose Internet Mail Extensions) Part One:
-         Mechanisms for Specifying and Describing the Format of
-         Internet Message Bodies
- * 1847: Security Multiparts for MIME: Multipart/Signed and
-         Multipart/Encrypted
- * 1864: The Content-MD5 Header Field (Obsoletes rfc1544)
- * 2015: MIME Security with Pretty Good Privacy (PGP)
- * 2045: Multipurpose Internet Mail Extensions (MIME) Part One:
-         Format of Internet Message Bodies
- * 2046: Multipurpose Internet Mail Extensions (MIME) Part Two:
-         Media Types
- * 2047: Multipurpose Internet Mail Extensions (MIME) Part Three:
-         Message Header Extensions for Non-ASCII Text
- * 2048: Multipurpose Internet Mail Extensions (MIME) Part Four:
-         Registration Procedures
- * 2049: Multipurpose Internet Mail Extensions (MIME) Part Five:
-         Conformance Criteria and Examples
- * 2183: Communicating Presentation Information in Internet Messages:
-         The Content-Disposition Header Field
- * 2184: MIME Parameter Value and Encoded Word Extensions: Character
-         Sets, Languages, and Continuations
- * 2231: MIME Parameter Value and Encoded Word Extensions: Character
-         Sets, Languages, and Continuations (Obsoletes rfc2184)
- * 3156: MIME Security with OpenPGP (Updates rfc2015)
+GMime is a set of utilities for parsing and creating messages using the
+Multipurpose Internet Mail Extension (MIME) as defined by the following RFCs:
+* 0822: Standard for the Format of Arpa Internet Text Messages
+* 1521: MIME (Multipurpose Internet Mail Extensions) Part One: Mechanisms for
+        Specifying and Describing the Format of Internet Message Bodies
+* 1847: Security Multiparts for MIME: Multipart/Signed and Multipart/Encrypted
+* 1864: The Content-MD5 Header Field (Obsoletes rfc1544)
+* 2015: MIME Security with Pretty Good Privacy (PGP)
+* 2045: Multipurpose Internet Mail Extensions (MIME) Part One:
+        Format of Internet Message Bodies
+* 2046: Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types
+* 2047: Multipurpose Internet Mail Extensions (MIME) Part Three:
+        Message Header Extensions for Non-ASCII Text
+* 2048: Multipurpose Internet Mail Extensions (MIME) Part Four:
+        Registration Procedures
+* 2049: Multipurpose Internet Mail Extensions (MIME) Part Five:
+        Conformance Criteria and Examples
+* 2183: Communicating Presentation Information in Internet Messages:
+        The Content-Disposition Header Field
+* 2184: MIME Parameter Value and Encoded Word Extensions: Character
+        Sets, Languages, and Continuations
+* 2231: MIME Parameter Value and Encoded Word Extensions: Character
+        Sets, Languages, and Continuations (Obsoletes rfc2184)
+* 3156: MIME Security with OpenPGP (Updates rfc2015)
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 11fcb9d3404..073e0aa3c57 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2010/02/11 15:44:29 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.26 2010/09/07 19:04:15 adam Exp $
 
-DISTNAME=	gmime-2.2.25
-PKGREVISION=	1
+DISTNAME=	gmime-2.4.18
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gmime/2.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gmime/2.4/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://spruce.sourceforge.net/gmime/
@@ -21,7 +20,7 @@ USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--disable-mono
-PKGCONFIG_OVERRIDE+=	gmime-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gmime-2.4.pc.in
 TEST_TARGET=		check
 
 .include "options.mk"
diff --git a/mail/gmime/PLIST b/mail/gmime/PLIST
index cb811712efd..0799e7d2d20 100644
--- a/mail/gmime/PLIST
+++ b/mail/gmime/PLIST
@@ -1,133 +1,137 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:04:34 joerg Exp $
-bin/gmime-config
+@comment $NetBSD: PLIST,v 1.10 2010/09/07 19:04:15 adam Exp $
 bin/uudecode
 bin/uuencode
-include/gmime-2.0/gmime/gmime-charset.h
-include/gmime-2.0/gmime/gmime-cipher-context.h
-include/gmime-2.0/gmime/gmime-content-type.h
-include/gmime-2.0/gmime/gmime-data-wrapper.h
-include/gmime-2.0/gmime/gmime-disposition.h
-include/gmime-2.0/gmime/gmime-error.h
-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-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
-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-iconv-utils.h
-include/gmime-2.0/gmime/gmime-iconv.h
-include/gmime-2.0/gmime/gmime-message-part.h
-include/gmime-2.0/gmime/gmime-message-partial.h
-include/gmime-2.0/gmime/gmime-message.h
-include/gmime-2.0/gmime/gmime-multipart-encrypted.h
-include/gmime-2.0/gmime/gmime-multipart-signed.h
-include/gmime-2.0/gmime/gmime-multipart.h
-include/gmime-2.0/gmime/gmime-object.h
-include/gmime-2.0/gmime/gmime-param.h
-include/gmime-2.0/gmime/gmime-parse-utils.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
-include/gmime-2.0/gmime/gmime-stream-file.h
-include/gmime-2.0/gmime/gmime-stream-filter.h
-include/gmime-2.0/gmime/gmime-stream-fs.h
-include/gmime-2.0/gmime/gmime-stream-mem.h
-include/gmime-2.0/gmime/gmime-stream-mmap.h
-include/gmime-2.0/gmime/gmime-stream-null.h
-include/gmime-2.0/gmime/gmime-stream.h
-include/gmime-2.0/gmime/gmime-utils.h
-include/gmime-2.0/gmime/gmime.h
-include/gmime-2.0/gmime/internet-address.h
-lib/gmimeConf.sh
-lib/libgmime-2.0.la
-lib/pkgconfig/gmime-2.0.pc
-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-changes-2-2.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-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.devhelp2
-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
+include/gmime-2.4/gmime/gmime-charset.h
+include/gmime-2.4/gmime/gmime-cipher-context.h
+include/gmime-2.4/gmime/gmime-content-type.h
+include/gmime-2.4/gmime/gmime-data-wrapper.h
+include/gmime-2.4/gmime/gmime-disposition.h
+include/gmime-2.4/gmime/gmime-encodings.h
+include/gmime-2.4/gmime/gmime-error.h
+include/gmime-2.4/gmime/gmime-filter-basic.h
+include/gmime-2.4/gmime/gmime-filter-best.h
+include/gmime-2.4/gmime/gmime-filter-charset.h
+include/gmime-2.4/gmime/gmime-filter-crlf.h
+include/gmime-2.4/gmime/gmime-filter-enriched.h
+include/gmime-2.4/gmime/gmime-filter-from.h
+include/gmime-2.4/gmime/gmime-filter-gzip.h
+include/gmime-2.4/gmime/gmime-filter-html.h
+include/gmime-2.4/gmime/gmime-filter-md5.h
+include/gmime-2.4/gmime/gmime-filter-strip.h
+include/gmime-2.4/gmime/gmime-filter-windows.h
+include/gmime-2.4/gmime/gmime-filter-yenc.h
+include/gmime-2.4/gmime/gmime-filter.h
+include/gmime-2.4/gmime/gmime-gpg-context.h
+include/gmime-2.4/gmime/gmime-header.h
+include/gmime-2.4/gmime/gmime-iconv-utils.h
+include/gmime-2.4/gmime/gmime-iconv.h
+include/gmime-2.4/gmime/gmime-message-part.h
+include/gmime-2.4/gmime/gmime-message-partial.h
+include/gmime-2.4/gmime/gmime-message.h
+include/gmime-2.4/gmime/gmime-multipart-encrypted.h
+include/gmime-2.4/gmime/gmime-multipart-signed.h
+include/gmime-2.4/gmime/gmime-multipart.h
+include/gmime-2.4/gmime/gmime-object.h
+include/gmime-2.4/gmime/gmime-param.h
+include/gmime-2.4/gmime/gmime-parse-utils.h
+include/gmime-2.4/gmime/gmime-parser.h
+include/gmime-2.4/gmime/gmime-part.h
+include/gmime-2.4/gmime/gmime-session-simple.h
+include/gmime-2.4/gmime/gmime-session.h
+include/gmime-2.4/gmime/gmime-stream-buffer.h
+include/gmime-2.4/gmime/gmime-stream-cat.h
+include/gmime-2.4/gmime/gmime-stream-file.h
+include/gmime-2.4/gmime/gmime-stream-filter.h
+include/gmime-2.4/gmime/gmime-stream-fs.h
+include/gmime-2.4/gmime/gmime-stream-mem.h
+include/gmime-2.4/gmime/gmime-stream-mmap.h
+include/gmime-2.4/gmime/gmime-stream-null.h
+include/gmime-2.4/gmime/gmime-stream.h
+include/gmime-2.4/gmime/gmime-utils.h
+include/gmime-2.4/gmime/gmime.h
+include/gmime-2.4/gmime/internet-address.h
+lib/libgmime-2.4.la
+lib/pkgconfig/gmime-2.4.pc
+share/gtk-doc/html/gmime-2.4/CipherContexts.html
+share/gtk-doc/html/gmime-2.4/DataWrappers.html
+share/gtk-doc/html/gmime-2.4/Filters.html
+share/gtk-doc/html/gmime-2.4/GMimeCipherContext.html
+share/gtk-doc/html/gmime-2.4/GMimeContentDisposition.html
+share/gtk-doc/html/gmime-2.4/GMimeContentType.html
+share/gtk-doc/html/gmime-2.4/GMimeDataWrapper.html
+share/gtk-doc/html/gmime-2.4/GMimeFilter.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterBasic.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterBest.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterCRLF.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterCharset.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterEnriched.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterFrom.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterGZip.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterHTML.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterMd5.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterStrip.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterWindows.html
+share/gtk-doc/html/gmime-2.4/GMimeFilterYenc.html
+share/gtk-doc/html/gmime-2.4/GMimeGpgContext.html
+share/gtk-doc/html/gmime-2.4/GMimeMessage.html
+share/gtk-doc/html/gmime-2.4/GMimeMessagePart.html
+share/gtk-doc/html/gmime-2.4/GMimeMessagePartial.html
+share/gtk-doc/html/gmime-2.4/GMimeMultipart.html
+share/gtk-doc/html/gmime-2.4/GMimeObject.html
+share/gtk-doc/html/gmime-2.4/GMimeParser.html
+share/gtk-doc/html/gmime-2.4/GMimePart.html
+share/gtk-doc/html/gmime-2.4/GMimeSession.html
+share/gtk-doc/html/gmime-2.4/GMimeSessionSimple.html
+share/gtk-doc/html/gmime-2.4/GMimeStream.html
+share/gtk-doc/html/gmime-2.4/GMimeStreamBuffer.html
+share/gtk-doc/html/gmime-2.4/GMimeStreamCat.html
+share/gtk-doc/html/gmime-2.4/GMimeStreamFile.html
+share/gtk-doc/html/gmime-2.4/GMimeStreamFilter.html
+share/gtk-doc/html/gmime-2.4/GMimeStreamFs.html
+share/gtk-doc/html/gmime-2.4/GMimeStreamMem.html
+share/gtk-doc/html/gmime-2.4/GMimeStreamMmap.html
+share/gtk-doc/html/gmime-2.4/GMimeStreamNull.html
+share/gtk-doc/html/gmime-2.4/Headers.html
+share/gtk-doc/html/gmime-2.4/InternetAddress.html
+share/gtk-doc/html/gmime-2.4/InternetAddressGroup.html
+share/gtk-doc/html/gmime-2.4/InternetAddressList.html
+share/gtk-doc/html/gmime-2.4/InternetAddressMailbox.html
+share/gtk-doc/html/gmime-2.4/InternetAddresses.html
+share/gtk-doc/html/gmime-2.4/MimeParts.html
+share/gtk-doc/html/gmime-2.4/Parsers.html
+share/gtk-doc/html/gmime-2.4/Sessions.html
+share/gtk-doc/html/gmime-2.4/Streams.html
+share/gtk-doc/html/gmime-2.4/ch01.html
+share/gtk-doc/html/gmime-2.4/classes.html
+share/gtk-doc/html/gmime-2.4/core.html
+share/gtk-doc/html/gmime-2.4/fundamentals.html
+share/gtk-doc/html/gmime-2.4/gmime-2.4.devhelp
+share/gtk-doc/html/gmime-2.4/gmime-2.4.devhelp2
+share/gtk-doc/html/gmime-2.4/gmime-GMimeHeader.html
+share/gtk-doc/html/gmime-2.4/gmime-GMimeMultpartEncrypted.html
+share/gtk-doc/html/gmime-2.4/gmime-GMimeMultpartSigned.html
+share/gtk-doc/html/gmime-2.4/gmime-GMimeParam.html
+share/gtk-doc/html/gmime-2.4/gmime-building.html
+share/gtk-doc/html/gmime-2.4/gmime-changes-2-0.html
+share/gtk-doc/html/gmime-2.4/gmime-changes-2-2.html
+share/gtk-doc/html/gmime-2.4/gmime-changes-2-4.html
+share/gtk-doc/html/gmime-2.4/gmime-compiling.html
+share/gtk-doc/html/gmime-2.4/gmime-data-wrappers.html
+share/gtk-doc/html/gmime-2.4/gmime-filters.html
+share/gtk-doc/html/gmime-2.4/gmime-gmime-charset.html
+share/gtk-doc/html/gmime-2.4/gmime-gmime-encodings.html
+share/gtk-doc/html/gmime-2.4/gmime-gmime-iconv-utils.html
+share/gtk-doc/html/gmime-2.4/gmime-gmime-iconv.html
+share/gtk-doc/html/gmime-2.4/gmime-gmime-utils.html
+share/gtk-doc/html/gmime-2.4/gmime-gmime.html
+share/gtk-doc/html/gmime-2.4/gmime-question-index.html
+share/gtk-doc/html/gmime-2.4/gmime-resources.html
+share/gtk-doc/html/gmime-2.4/gmime-streams.html
+share/gtk-doc/html/gmime-2.4/gmime.html
+share/gtk-doc/html/gmime-2.4/home.png
+share/gtk-doc/html/gmime-2.4/index.html
+share/gtk-doc/html/gmime-2.4/index.sgml
+share/gtk-doc/html/gmime-2.4/left.png
+share/gtk-doc/html/gmime-2.4/right.png
+share/gtk-doc/html/gmime-2.4/style.css
+share/gtk-doc/html/gmime-2.4/up.png
diff --git a/mail/gmime/buildlink3.mk b/mail/gmime/buildlink3.mk
index ecd3f729527..da2738ee381 100644
--- a/mail/gmime/buildlink3.mk
+++ b/mail/gmime/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/09/07 19:04:15 adam Exp $
 
 BUILDLINK_TREE+=	gmime
 
 .if !defined(GMIME_BUILDLINK3_MK)
 GMIME_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.7
+BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.4.0
 BUILDLINK_PKGSRCDIR.gmime?=	../../mail/gmime
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo
index b86033be03f..7071e6be958 100644
--- a/mail/gmime/distinfo
+++ b/mail/gmime/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2010/02/11 15:44:29 wiz Exp $
+$NetBSD: distinfo,v 1.21 2010/09/07 19:04:15 adam Exp $
 
-SHA1 (gmime-2.2.25.tar.gz) = 4087d72ca61af2fd8823cb47de7d6fdfbd3c7168
-RMD160 (gmime-2.2.25.tar.gz) = 29f111fc428d55263d53e795e2bcc7cdfd62ca2e
-Size (gmime-2.2.25.tar.gz) = 1038414 bytes
+SHA1 (gmime-2.4.18.tar.bz2) = 34e036dbada47f72b87d8b78a7c2d6ebca46ed50
+RMD160 (gmime-2.4.18.tar.bz2) = 9fc483364296f5de99df2f3654877a8af0556524
+Size (gmime-2.4.18.tar.bz2) = 858174 bytes
 SHA1 (patch-aa) = ac810bb85a8cfebf2588862a2f8f220bbaa26277
diff --git a/mail/gmime/patches/patch-aa b/mail/gmime/patches/patch-aa
deleted file mode 100644
index dfedbe5f0a3..00000000000
--- a/mail/gmime/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2010/02/11 15:44:29 wiz Exp $
-
-Fix for http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0409
-from Fedora.
-
---- gmime/gmime-utils.h.orig	2009-08-12 22:42:55.000000000 +0000
-+++ gmime/gmime-utils.h
-@@ -106,7 +106,7 @@ struct _GMimeReferences {
-  * Returns the number of output bytes needed to uuencode an input
-  * buffer of size @x.
-  **/
--#define GMIME_UUENCODE_LEN(x)      ((size_t) (((((x) + 2) / 45) * 62) + 62))
-+#define GMIME_UUENCODE_LEN(x)      ((size_t) (((((x) + 2) / 45) * 62) + 64))
- 
- 
- /**