Update to gmime-2.6.10. Changes unknown, but old version doesn't build

against newer glib2 anyway.

4 files changed, 155 insertions, 145 deletions

diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index d01b2729705..f8f4f726126 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2012/10/08 12:19:12 asau Exp $
+# $NetBSD: Makefile,v 1.34 2013/07/13 19:23:36 joerg Exp $
 #
 
-DISTNAME=	gmime-2.2.25
-PKGREVISION=	6
+DISTNAME=	gmime-2.6.15
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gmime/2.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gmime/2.6/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://spruce.sourceforge.net/gmime/
@@ -17,11 +17,14 @@ 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.6.pc.in
 TEST_TARGET=		check
 
+BUILDLINK_DEPMETHOD.libgpg-error=	build
+
 .include "options.mk"
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/libgpg-error/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/gmime/PLIST b/mail/gmime/PLIST
index 4dc91dd64cb..1b30dc72a3a 100644
--- a/mail/gmime/PLIST
+++ b/mail/gmime/PLIST
@@ -1,131 +1,141 @@
-@comment $NetBSD: PLIST,v 1.12 2010/09/08 12:07:18 drochner Exp $
-bin/gmime-config
-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
+@comment $NetBSD: PLIST,v 1.13 2013/07/13 19:23:36 joerg Exp $
+include/gmime-2.6/gmime/gmime-certificate.h
+include/gmime-2.6/gmime/gmime-charset.h
+include/gmime-2.6/gmime/gmime-content-type.h
+include/gmime-2.6/gmime/gmime-crypto-context.h
+include/gmime-2.6/gmime/gmime-data-wrapper.h
+include/gmime-2.6/gmime/gmime-disposition.h
+include/gmime-2.6/gmime/gmime-encodings.h
+include/gmime-2.6/gmime/gmime-error.h
+include/gmime-2.6/gmime/gmime-filter-basic.h
+include/gmime-2.6/gmime/gmime-filter-best.h
+include/gmime-2.6/gmime/gmime-filter-charset.h
+include/gmime-2.6/gmime/gmime-filter-crlf.h
+include/gmime-2.6/gmime/gmime-filter-enriched.h
+include/gmime-2.6/gmime/gmime-filter-from.h
+include/gmime-2.6/gmime/gmime-filter-gzip.h
+include/gmime-2.6/gmime/gmime-filter-html.h
+include/gmime-2.6/gmime/gmime-filter-md5.h
+include/gmime-2.6/gmime/gmime-filter-strip.h
+include/gmime-2.6/gmime/gmime-filter-windows.h
+include/gmime-2.6/gmime/gmime-filter-yenc.h
+include/gmime-2.6/gmime/gmime-filter.h
+include/gmime-2.6/gmime/gmime-gpg-context.h
+include/gmime-2.6/gmime/gmime-header.h
+include/gmime-2.6/gmime/gmime-iconv-utils.h
+include/gmime-2.6/gmime/gmime-iconv.h
+include/gmime-2.6/gmime/gmime-message-part.h
+include/gmime-2.6/gmime/gmime-message-partial.h
+include/gmime-2.6/gmime/gmime-message.h
+include/gmime-2.6/gmime/gmime-multipart-encrypted.h
+include/gmime-2.6/gmime/gmime-multipart-signed.h
+include/gmime-2.6/gmime/gmime-multipart.h
+include/gmime-2.6/gmime/gmime-object.h
+include/gmime-2.6/gmime/gmime-param.h
+include/gmime-2.6/gmime/gmime-parser.h
+include/gmime-2.6/gmime/gmime-part-iter.h
+include/gmime-2.6/gmime/gmime-part.h
+include/gmime-2.6/gmime/gmime-pkcs7-context.h
+include/gmime-2.6/gmime/gmime-signature.h
+include/gmime-2.6/gmime/gmime-stream-buffer.h
+include/gmime-2.6/gmime/gmime-stream-cat.h
+include/gmime-2.6/gmime/gmime-stream-file.h
+include/gmime-2.6/gmime/gmime-stream-filter.h
+include/gmime-2.6/gmime/gmime-stream-fs.h
+include/gmime-2.6/gmime/gmime-stream-gio.h
+include/gmime-2.6/gmime/gmime-stream-mem.h
+include/gmime-2.6/gmime/gmime-stream-mmap.h
+include/gmime-2.6/gmime/gmime-stream-null.h
+include/gmime-2.6/gmime/gmime-stream-pipe.h
+include/gmime-2.6/gmime/gmime-stream.h
+include/gmime-2.6/gmime/gmime-utils.h
+include/gmime-2.6/gmime/gmime-version.h
+include/gmime-2.6/gmime/gmime.h
+include/gmime-2.6/gmime/internet-address.h
+lib/libgmime-2.6.la
+lib/pkgconfig/gmime-2.6.pc
+share/gtk-doc/html/gmime-2.6/CryptoContexts.html
+share/gtk-doc/html/gmime-2.6/DataWrappers.html
+share/gtk-doc/html/gmime-2.6/Filters.html
+share/gtk-doc/html/gmime-2.6/GMimeCertificate.html
+share/gtk-doc/html/gmime-2.6/GMimeContentDisposition.html
+share/gtk-doc/html/gmime-2.6/GMimeContentType.html
+share/gtk-doc/html/gmime-2.6/GMimeCryptoContext.html
+share/gtk-doc/html/gmime-2.6/GMimeDataWrapper.html
+share/gtk-doc/html/gmime-2.6/GMimeFilter.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterBasic.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterBest.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterCRLF.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterCharset.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterEnriched.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterFrom.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterGZip.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterHTML.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterMd5.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterStrip.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterWindows.html
+share/gtk-doc/html/gmime-2.6/GMimeFilterYenc.html
+share/gtk-doc/html/gmime-2.6/GMimeGpgContext.html
+share/gtk-doc/html/gmime-2.6/GMimeMessage.html
+share/gtk-doc/html/gmime-2.6/GMimeMessagePart.html
+share/gtk-doc/html/gmime-2.6/GMimeMessagePartial.html
+share/gtk-doc/html/gmime-2.6/GMimeMultipart.html
+share/gtk-doc/html/gmime-2.6/GMimeMultipartEncrypted.html
+share/gtk-doc/html/gmime-2.6/GMimeMultipartSigned.html
+share/gtk-doc/html/gmime-2.6/GMimeObject.html
+share/gtk-doc/html/gmime-2.6/GMimeParser.html
+share/gtk-doc/html/gmime-2.6/GMimePart.html
+share/gtk-doc/html/gmime-2.6/GMimePkcs7Context.html
+share/gtk-doc/html/gmime-2.6/GMimeSignature.html
+share/gtk-doc/html/gmime-2.6/GMimeStream.html
+share/gtk-doc/html/gmime-2.6/GMimeStreamBuffer.html
+share/gtk-doc/html/gmime-2.6/GMimeStreamCat.html
+share/gtk-doc/html/gmime-2.6/GMimeStreamFile.html
+share/gtk-doc/html/gmime-2.6/GMimeStreamFilter.html
+share/gtk-doc/html/gmime-2.6/GMimeStreamFs.html
+share/gtk-doc/html/gmime-2.6/GMimeStreamMem.html
+share/gtk-doc/html/gmime-2.6/GMimeStreamMmap.html
+share/gtk-doc/html/gmime-2.6/GMimeStreamNull.html
+share/gtk-doc/html/gmime-2.6/GMimeStreamPipe.html
+share/gtk-doc/html/gmime-2.6/Headers.html
+share/gtk-doc/html/gmime-2.6/InternetAddress.html
+share/gtk-doc/html/gmime-2.6/InternetAddressGroup.html
+share/gtk-doc/html/gmime-2.6/InternetAddressList.html
+share/gtk-doc/html/gmime-2.6/InternetAddressMailbox.html
+share/gtk-doc/html/gmime-2.6/InternetAddresses.html
+share/gtk-doc/html/gmime-2.6/MimeParts.html
+share/gtk-doc/html/gmime-2.6/Parsers.html
+share/gtk-doc/html/gmime-2.6/Streams.html
+share/gtk-doc/html/gmime-2.6/ch01.html
+share/gtk-doc/html/gmime-2.6/classes.html
+share/gtk-doc/html/gmime-2.6/core.html
+share/gtk-doc/html/gmime-2.6/fundamentals.html
+share/gtk-doc/html/gmime-2.6/gmime-2.6.devhelp2
+share/gtk-doc/html/gmime-2.6/gmime-GMimeHeader.html
+share/gtk-doc/html/gmime-2.6/gmime-GMimeParam.html
+share/gtk-doc/html/gmime-2.6/gmime-GMimePartIter.html
+share/gtk-doc/html/gmime-2.6/gmime-building.html
+share/gtk-doc/html/gmime-2.6/gmime-changes-2-0.html
+share/gtk-doc/html/gmime-2.6/gmime-changes-2-2.html
+share/gtk-doc/html/gmime-2.6/gmime-changes-2-4.html
+share/gtk-doc/html/gmime-2.6/gmime-changes-2-6.html
+share/gtk-doc/html/gmime-2.6/gmime-compiling.html
+share/gtk-doc/html/gmime-2.6/gmime-data-wrappers.html
+share/gtk-doc/html/gmime-2.6/gmime-filters.html
+share/gtk-doc/html/gmime-2.6/gmime-gmime-charset.html
+share/gtk-doc/html/gmime-2.6/gmime-gmime-encodings.html
+share/gtk-doc/html/gmime-2.6/gmime-gmime-iconv-utils.html
+share/gtk-doc/html/gmime-2.6/gmime-gmime-iconv.html
+share/gtk-doc/html/gmime-2.6/gmime-gmime-utils.html
+share/gtk-doc/html/gmime-2.6/gmime-gmime.html
+share/gtk-doc/html/gmime-2.6/gmime-question-index.html
+share/gtk-doc/html/gmime-2.6/gmime-resources.html
+share/gtk-doc/html/gmime-2.6/gmime-streams.html
+share/gtk-doc/html/gmime-2.6/gmime.html
+share/gtk-doc/html/gmime-2.6/home.png
+share/gtk-doc/html/gmime-2.6/index.html
+share/gtk-doc/html/gmime-2.6/index.sgml
+share/gtk-doc/html/gmime-2.6/left.png
+share/gtk-doc/html/gmime-2.6/right.png
+share/gtk-doc/html/gmime-2.6/style.css
+share/gtk-doc/html/gmime-2.6/up.png
diff --git a/mail/gmime/buildlink3.mk b/mail/gmime/buildlink3.mk
index e5f64080dba..86c79b0a702 100644
--- a/mail/gmime/buildlink3.mk
+++ b/mail/gmime/buildlink3.mk
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.19 2012/09/15 10:05:27 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2013/07/13 19:23:36 joerg Exp $
 
 BUILDLINK_TREE+=	gmime
 
 .if !defined(GMIME_BUILDLINK3_MK)
 GMIME_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.7
-BUILDLINK_ABI_DEPENDS.gmime+=	gmime>=2.2.25nb6
+BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.6.15
 BUILDLINK_PKGSRCDIR.gmime?=	../../mail/gmime
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo
index 1a66e4319f6..7ba2043d52b 100644
--- a/mail/gmime/distinfo
+++ b/mail/gmime/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.23 2010/09/08 12:07:18 drochner Exp $
+$NetBSD: distinfo,v 1.24 2013/07/13 19:23:37 joerg 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 (patch-aa) = ac810bb85a8cfebf2588862a2f8f220bbaa26277
-SHA1 (patch-ab) = 2da0ca82f2edae35db5d40fdf7705768df7530d3
+SHA1 (gmime-2.6.15.tar.xz) = df28c330b8273e77d86a6b254c3f9f72a19aaddd
+RMD160 (gmime-2.6.15.tar.xz) = 8b89f9bc5b7257def00b2690301f57adc1d3f150
+Size (gmime-2.6.15.tar.xz) = 731880 bytes