From 90af090ca15daf449f6e06086c7363f19b48af1d Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Wed, 16 Mar 2005 12:34:49 +0000
Subject: Added a workaround for systems that don't have ECANCELED. Approved by
 wiz.

---
 mail/gmime/distinfo         |  3 ++-
 mail/gmime/patches/patch-ab | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 mail/gmime/patches/patch-ab

diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo
index d01ca70a16e..57b26ae1e8a 100644
--- a/mail/gmime/distinfo
+++ b/mail/gmime/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:22 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/03/16 12:34:49 rillig Exp $
 
 SHA1 (gmime-2.1.9.tar.gz) = a42bdea2a51f87dbc6697de52d946ed3f256b26c
 RMD160 (gmime-2.1.9.tar.gz) = 430dae14274b17c4a44fe95c954d8e2f24198a2d
 Size (gmime-2.1.9.tar.gz) = 784545 bytes
 SHA1 (patch-aa) = e838216d593ff2003d436afb68477dc5701c34f4
+SHA1 (patch-ab) = 00ff7c6045f045db3e08f93827937cbadf717fc7
diff --git a/mail/gmime/patches/patch-ab b/mail/gmime/patches/patch-ab
new file mode 100644
index 00000000000..0d7dc3d40e9
--- /dev/null
+++ b/mail/gmime/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1 2005/03/16 12:34:49 rillig Exp $
+
+Needed for NetBSD-1.6.2 and NetBSD-2.0. ECANCELED is used when the user
+cancels the password query, so EAUTH seemed to be the most appropriate
+to me.
+
+--- gmime/gmime-gpg-context.c.orig	Tue Jul  6 15:09:18 2004
++++ gmime/gmime-gpg-context.c	Wed Mar 16 01:33:23 2005
+@@ -56,6 +56,10 @@
+ 
+ #define _(x) x
+ 
++#if !defined(ECANCELED) && defined(EAUTH)
++# define ECANCELED EAUTH
++#endif
++
+ static void g_mime_gpg_context_class_init (GMimeGpgContextClass *klass);
+ static void g_mime_gpg_context_init (GMimeGpgContext *ctx, GMimeGpgContextClass *klass);
+ static void g_mime_gpg_context_finalize (GObject *object);
-- 
cgit v1.2.3