Import gmime20-2.2.25 as mail/gmime20.

based on mail/gmime before updated to incompatible 2.6, with patches for new
glib2 borrowed by mail/gmime24.

approved by wiz@ dureing freeze.

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)

11 files changed, 296 insertions, 0 deletions

diff --git a/mail/gmime20/DESCR b/mail/gmime20/DESCR
new file mode 100644
index 00000000000..adedb88cec9
--- /dev/null
+++ b/mail/gmime20/DESCR
@@ -0,0 +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)
diff --git a/mail/gmime20/Makefile b/mail/gmime20/Makefile
new file mode 100644
index 00000000000..1e2490e764f
--- /dev/null
+++ b/mail/gmime20/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1 2013/09/21 13:21:29 obache Exp $
+#
+
+DISTNAME=	gmime-2.2.25
+PKGNAME=	${DISTNAME:S/gmime/gmime20/}
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gmime/2.2/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://spruce.sourceforge.net/gmime/
+COMMENT=	Library for the creation and parsing of MIME messages
+LICENSE=	gnu-lgpl-v2.1
+
+USE_PKGLOCALEDIR=	yes
+USE_LIBTOOL=		yes
+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
+TEST_TARGET=		check
+
+.include "options.mk"
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/gmime20/PLIST b/mail/gmime20/PLIST
new file mode 100644
index 00000000000..6fa5d8dae39
--- /dev/null
+++ b/mail/gmime20/PLIST
@@ -0,0 +1,131 @@
+@comment $NetBSD: PLIST,v 1.1 2013/09/21 13:21:29 obache 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
diff --git a/mail/gmime20/buildlink3.mk b/mail/gmime20/buildlink3.mk
new file mode 100644
index 00000000000..8fa13a68492
--- /dev/null
+++ b/mail/gmime20/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/09/21 13:21:29 obache Exp $
+
+BUILDLINK_TREE+=	gmime20
+
+.if !defined(GMIME20_BUILDLINK3_MK)
+GMIME20_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gmime20+=	gmime20>=2.1.7
+BUILDLINK_PKGSRCDIR.gmime20?=	../../mail/gmime
+
+.include "../../devel/glib2/buildlink3.mk"
+.endif # GMIME20_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gmime20
diff --git a/mail/gmime20/distinfo b/mail/gmime20/distinfo
new file mode 100644
index 00000000000..7e16898e11e
--- /dev/null
+++ b/mail/gmime20/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1 2013/09/21 13:21:29 obache 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) = c43140d5b845cffbf1c13da694be0b67be619f5e
+SHA1 (patch-gmime_Makefile.in) = bb9dbd2f4d48bb27e27cbd655123d4c2913c857d
+SHA1 (patch-tests_Makefile.in) = 700fa331c66c0bcc41c78d0cf3ccf6260b04e868
+SHA1 (patch-util_Makefile.in) = e0fdfc5b8fb5d47dfc367acf3350b58522de3160
diff --git a/mail/gmime20/options.mk b/mail/gmime20/options.mk
new file mode 100644
index 00000000000..1caadcec63a
--- /dev/null
+++ b/mail/gmime20/options.mk
@@ -0,0 +1,11 @@
+# $NetBSD: options.mk,v 1.1 2013/09/21 13:21:29 obache Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gmime20
+PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
diff --git a/mail/gmime20/patches/patch-aa b/mail/gmime20/patches/patch-aa
new file mode 100644
index 00000000000..48709c045f1
--- /dev/null
+++ b/mail/gmime20/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2013/09/21 13:21:29 obache 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))
+ 
+ 
+ /**
diff --git a/mail/gmime20/patches/patch-ab b/mail/gmime20/patches/patch-ab
new file mode 100644
index 00000000000..e49791293f4
--- /dev/null
+++ b/mail/gmime20/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2013/09/21 13:21:29 obache Exp $
+
+* prevent to install /uuencode/uudecode tools to avoid conflicts
+
+--- Makefile.in.orig	2010-01-30 17:58:38.000000000 +0000
++++ Makefile.in
+@@ -275,7 +275,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = util gmime src $(am__append_1) tests docs $(am__append_2) .
++SUBDIRS = util gmime $(am__append_1) tests docs $(am__append_2) .
+ bin_SCRIPTS = gmime-config
+ CLEANFILES = gmimeConf.sh
+ DISTCLEANFILES = iconv-detect.h
diff --git a/mail/gmime20/patches/patch-gmime_Makefile.in b/mail/gmime20/patches/patch-gmime_Makefile.in
new file mode 100644
index 00000000000..da5262ab425
--- /dev/null
+++ b/mail/gmime20/patches/patch-gmime_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-gmime_Makefile.in,v 1.1 2013/09/21 13:21:29 obache Exp $
+
+Avoid compilation error caused by use of GStaticMutex which was
+deprecated in GLib 2.32 - needed for a successful compile with
+GLib 2.36.
+
+--- gmime/Makefile.in.orig	2010-01-30 17:58:38.000000000 +0000
++++ gmime/Makefile.in
+@@ -317,7 +317,6 @@ INCLUDES = \
+ 	-I$(top_srcdir)/util		\
+ 	$(VERSION_FLAGS) 		\
+ 	-DG_LOG_DOMAIN=\"gmime\"	\
+-	-DG_DISABLE_DEPRECATED		\
+ 	$(GMIME_CFLAGS)			\
+ 	$(GLIB_CFLAGS)
+ 
diff --git a/mail/gmime20/patches/patch-tests_Makefile.in b/mail/gmime20/patches/patch-tests_Makefile.in
new file mode 100644
index 00000000000..12d73ec28fa
--- /dev/null
+++ b/mail/gmime20/patches/patch-tests_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_Makefile.in,v 1.1 2013/09/21 13:21:29 obache Exp $
+
+Avoid compilation error caused by use of GStaticMutex which was
+deprecated in GLib 2.32 - needed for a successful compile with
+GLib 2.36.
+
+--- tests/Makefile.in.orig	2010-01-30 17:58:38.000000000 +0000
++++ tests/Makefile.in
+@@ -324,7 +324,6 @@ INCLUDES = \
+ 	-I$(top_srcdir)/util		\
+ 	$(VERSION_FLAGS) 		\
+ 	-DG_LOG_DOMAIN=\"gmime-tests\"	\
+-	-DG_DISABLE_DEPRECATED		\
+ 	$(GMIME_CFLAGS)			\
+ 	$(GLIB_CFLAGS)
+ 
diff --git a/mail/gmime20/patches/patch-util_Makefile.in b/mail/gmime20/patches/patch-util_Makefile.in
new file mode 100644
index 00000000000..8c3109338be
--- /dev/null
+++ b/mail/gmime20/patches/patch-util_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-util_Makefile.in,v 1.1 2013/09/21 13:21:29 obache Exp $
+
+Avoid compilation error caused by use of GStaticMutex which was
+deprecated in GLib 2.32 - needed for a successful compile with
+GLib 2.36.
+
+--- util/Makefile.in.orig	2010-01-30 17:58:38.000000000 +0000
++++ util/Makefile.in
+@@ -253,7 +253,6 @@ noinst_LTLIBRARIES = libutil.la
+ INCLUDES = -I$(top_srcdir) 		\
+ 	$(VERSION_FLAGS) 		\
+ 	-DG_LOG_DOMAIN=\"util\"		\
+-	-DG_DISABLE_DEPRECATED		\
+ 	$(GMIME_CFLAGS)			\
+ 	$(GLIB_CFLAGS)
+