Add PST import support, also add framework for contact maps support.

Which needs gueclue to be ported first.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18461 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 24 insertions, 14 deletions

diff --git a/mail/evolution3/Makefile b/mail/evolution3/Makefile
index f5ee470b0..f64cccf11 100644
--- a/mail/evolution3/Makefile
+++ b/mail/evolution3/Makefile
@@ -61,15 +61,13 @@ EVO_VERSION=	3.6
 PLIST_SUB=	VERSION=${EVO_VERSION} \
 		PORTVERSION=2.12
 
-
-OPTIONS_DEFINE= LDAP WEATHER CANBERRA SPAMASSASSIN
+OPTIONS_DEFINE=	LDAP WEATHER CANBERRA SPAMASSASSIN PST
 OPTIONS_DEFAULT=LDAP WEATHER CANBERRA
 CANBERRA_DESC=	Canberra theme audio plugin
 WEATHER_DESC=	Weather calendar backend
-SPAMASSASSIN_DESC= 	SpamAssassin spam filtering
-
-#		PST "Enable Outlook .pst importer" off \
-#--enable-contact-maps
+SPAMASSASSIN_DESC=	SpamAssassin spam filtering
+PST_DESC=	Outlook .pst importer
+MAPS_DESC=	Contact maps
 
 .include <bsd.port.options.mk>
 
@@ -115,15 +113,24 @@ CONFIGURE_ARGS+=--enable-canberra=no
 PLIST_SUB+=	CANBERRA="@comment "
 .endif
 
-# libpst doesn't install a .pc file, evo configure needs that
-#.if defined(WITH_PST)
-#CONFIGURE_ARGS+=	--enable-pst-import
-#BUILD_DEPENDS+=		lspst:${PORTSDIR}/mail/libpst
-#RUN_DEPENDS+=		lspst:${PORTSDIR}/mail/libpst
-#PLIST_SUB+=		PST=""
-#.else
+.if ${PORT_OPTIONS:MPST}
+CONFIGURE_ARGS+=	--enable-pst-import
+BUILD_DEPENDS+=		libpst>=0.6.58_1:${PORTSDIR}/mail/libpst
+RUN_DEPENDS+=		libpst>=0.6.58_1:${PORTSDIR}/mail/libpst
+PLIST_SUB+=		PST=""
+.else
 CONFIGURE_ARGS+=	--disable-pst-import
 PLIST_SUB+=		PST="@comment "
+.endif
+
+#.if ${PORT_OPTIONS:MMAPS}
+# needs geoclue
+#LIB_DEPENDS+=		champlain-0.12:${PORTSDIR}/graphics/libchamplain
+#CONFIGURE_ARGS+=	--enable-contact-maps
+#PLIST_SUB+=		MAPS=""
+#.else
+CONFIGURE_ARGS+=	--disable-contact-maps
+PLIST_SUB+=		MAPS="@comment "
 #.endif
 
 post-patch:
diff --git a/mail/evolution3/pkg-plist b/mail/evolution3/pkg-plist
index e249a83bc..98d4f26b9 100644
--- a/mail/evolution3/pkg-plist
+++ b/mail/evolution3/pkg-plist
@@ -604,7 +604,6 @@ lib/evolution/%%VERSION%%/modules/module-vcard-inline.so
 lib/evolution/%%VERSION%%/modules/module-web-inspector.a
 lib/evolution/%%VERSION%%/modules/module-web-inspector.la
 lib/evolution/%%VERSION%%/modules/module-web-inspector.so
-
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.so
@@ -641,6 +640,9 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.so
+%%PST%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-pst-import.a
+%%PST%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-pst-import.la
+%%PST%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-pst-import.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.so
@@ -662,6 +664,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug
+%%PST%%lib/evolution/%%VERSION%%/plugins/org-gnome-pst-import.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-templates.eplug