From dd0891e2746a1a51e2b325441f458735de204436 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 9 Jan 2012 18:26:31 +0000
Subject: [PATCH] Add a patch from upstream to allow building with
 libpst->=0.6.54.

---
 mail/evolution/Makefile                        |  6 ++++--
 .../patch-plugins_pst-import_pst-importer_c    | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 mail/evolution/patches/patch-plugins_pst-import_pst-importer_c

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 08d22f3db79..f7b4d4828eb 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.153 2012/01/09 14:31:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.154 2012/01/09 18:26:31 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -11,6 +11,8 @@ GNOME_VERSION=		3.2.3
 PKGNAME-main=		${DISTNAME}
 PKGNAME-plugins=	evolution-plugins-${GNOME_VERSION}
 
+REVISION-plugins=	0
+
 # Only get the first x.y which is needed in the PLIST.
 # NOTE: when major version changes, increment EVO_VERSION accordingly 
 # and bump:
@@ -108,7 +110,7 @@ LIB_DEPENDS-main=	${LIB_DEPENDS} \
 
 LIB_DEPENDS-plugins=	${LIB_DEPENDS} \
 			mail/evolution,-main=${GNOME_VERSION} \
-			converters/libpst \
+			converters/libpst>=0.6.54 \
 			multimedia/gstreamer-0.10/core
 # needed for the audio-inline plugin
 RUN_DEPENDS-plugins=	${MODGCONF2_RUN_DEPENDS} \
diff --git a/mail/evolution/patches/patch-plugins_pst-import_pst-importer_c b/mail/evolution/patches/patch-plugins_pst-import_pst-importer_c
new file mode 100644
index 00000000000..2f07eff1edd
--- /dev/null
+++ b/mail/evolution/patches/patch-plugins_pst-import_pst-importer_c
@@ -0,0 +1,18 @@
+$OpenBSD: patch-plugins_pst-import_pst-importer_c,v 1.1 2012/01/09 18:26:31 ajacoutot Exp $
+
+From f15c6e4e8fcfce0b5d12871db6a48840dc34c38b Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Mon, 09 Jan 2012 17:17:54 +0000
+Subject: Bug #667346 - Fix build with libpst 0.6.54 and require this version
+
+--- plugins/pst-import/pst-importer.c.orig	Mon Jan  9 18:42:15 2012
++++ plugins/pst-import/pst-importer.c	Mon Jan  9 18:42:28 2012
+@@ -2194,7 +2194,7 @@ pst_init (pst_file *pst,
+ 	DEBUG_REGISTER_CLOSE ();
+ #endif
+ 
+-	if (pst_open (pst, filename) < 0) {
++	if (pst_open (pst, filename, NULL) < 0) {
+ 		pst_error_msg ("Error opening PST file %s", filename);
+ 		return -1;
+ 	}