From 2bd2ef034e4bffea3a621c892a6b23a7882a85e8 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 17 Jun 2009 19:51:25 +0000 Subject: [PATCH] Disable exchange plugin for now. It does not work and induces some other issues in evolution. --- mail/evolution/Makefile | 4 ++-- ...patch-plugins_exchange-operations_Makefile_in | 5 ++++- mail/evolution/pkg/PFRAG.shared-main | 4 ++-- mail/evolution/pkg/PLIST-main | 16 ++++++++-------- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 6c96dd94738..613a0a527f2 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.79 2009/06/15 06:27:10 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.80 2009/06/17 19:51:25 ajacoutot Exp $ COMMENT-main= integrated email and PIM software for GNOME COMMENT-plugins= additionnal plugins for evolution @@ -8,7 +8,7 @@ COMMENT-plugins= additionnal plugins for evolution GNOME_PROJECT= evolution GNOME_VERSION= 2.24.5 -PKGNAME-main= ${DISTNAME}p14 +PKGNAME-main= ${DISTNAME}p15 PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}p8 CATEGORIES= mail diff --git a/mail/evolution/patches/patch-plugins_exchange-operations_Makefile_in b/mail/evolution/patches/patch-plugins_exchange-operations_Makefile_in index 47346ed156f..76c9f563c89 100644 --- a/mail/evolution/patches/patch-plugins_exchange-operations_Makefile_in +++ b/mail/evolution/patches/patch-plugins_exchange-operations_Makefile_in @@ -1,4 +1,7 @@ -$OpenBSD: patch-plugins_exchange-operations_Makefile_in,v 1.1 2009/06/15 06:27:10 ajacoutot Exp $ +$OpenBSD: patch-plugins_exchange-operations_Makefile_in,v 1.2 2009/06/17 19:51:25 ajacoutot Exp $ + +XXX does not work, we get "Cannot load specified object". + --- plugins/exchange-operations/Makefile.in.orig Wed Feb 25 14:37:00 2009 +++ plugins/exchange-operations/Makefile.in Sun Jun 14 23:24:32 2009 @@ -470,6 +470,7 @@ liborg_gnome_exchange_operations_la_LIBADD = \ diff --git a/mail/evolution/pkg/PFRAG.shared-main b/mail/evolution/pkg/PFRAG.shared-main index b92010c6a1c..df40390215f 100644 --- a/mail/evolution/pkg/PFRAG.shared-main +++ b/mail/evolution/pkg/PFRAG.shared-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared-main,v 1.1 2009/03/22 16:00:29 ajacoutot Exp $ +@comment $OpenBSD: PFRAG.shared-main,v 1.2 2009/06/17 19:51:25 ajacoutot Exp $ lib/evolution/${R}/components/libevolution-addressbook.so lib/evolution/${R}/components/libevolution-calendar.so lib/evolution/${R}/components/libevolution-mail.so @@ -35,7 +35,7 @@ lib/evolution/${R}/plugins/liborg-gnome-evolution-caldav.so lib/evolution/${R}/plugins/liborg-gnome-evolution-google.so lib/evolution/${R}/plugins/liborg-gnome-evolution-startup-wizard.so lib/evolution/${R}/plugins/liborg-gnome-evolution-webdav.so -lib/evolution/${R}/plugins/liborg-gnome-exchange-operations.so +@comment lib/evolution/${R}/plugins/liborg-gnome-exchange-operations.so lib/evolution/${R}/plugins/liborg-gnome-groupwise-features.so lib/evolution/${R}/plugins/liborg-gnome-gw-account-setup.so lib/evolution/${R}/plugins/liborg-gnome-imap-features.so diff --git a/mail/evolution/pkg/PLIST-main b/mail/evolution/pkg/PLIST-main index 9c60373c710..f56f0ab7180 100644 --- a/mail/evolution/pkg/PLIST-main +++ b/mail/evolution/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.3 2009/06/15 06:27:10 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.4 2009/06/17 19:51:25 ajacoutot Exp $ @pkgpath mail/evolution %%SHARED%% @bin bin/evolution @@ -309,8 +309,8 @@ lib/evolution/${R}/plugins/liborg-gnome-evolution-startup-wizard.a lib/evolution/${R}/plugins/liborg-gnome-evolution-startup-wizard.la lib/evolution/${R}/plugins/liborg-gnome-evolution-webdav.a lib/evolution/${R}/plugins/liborg-gnome-evolution-webdav.la -lib/evolution/${R}/plugins/liborg-gnome-exchange-operations.a -lib/evolution/${R}/plugins/liborg-gnome-exchange-operations.la +@comment lib/evolution/${R}/plugins/liborg-gnome-exchange-operations.a +@comment lib/evolution/${R}/plugins/liborg-gnome-exchange-operations.la lib/evolution/${R}/plugins/liborg-gnome-groupwise-features.a lib/evolution/${R}/plugins/liborg-gnome-groupwise-features.la lib/evolution/${R}/plugins/liborg-gnome-gw-account-setup.a @@ -338,10 +338,10 @@ lib/evolution/${R}/plugins/org-gnome-evolution-caldav.eplug lib/evolution/${R}/plugins/org-gnome-evolution-google.eplug lib/evolution/${R}/plugins/org-gnome-evolution-startup-wizard.eplug lib/evolution/${R}/plugins/org-gnome-evolution-webdav.eplug -lib/evolution/${R}/plugins/org-gnome-exchange-ab-subscription.xml -lib/evolution/${R}/plugins/org-gnome-exchange-cal-subscription.xml -lib/evolution/${R}/plugins/org-gnome-exchange-operations.eplug -lib/evolution/${R}/plugins/org-gnome-exchange-tasks-subscription.xml +@comment lib/evolution/${R}/plugins/org-gnome-exchange-ab-subscription.xml +@comment lib/evolution/${R}/plugins/org-gnome-exchange-cal-subscription.xml +@comment lib/evolution/${R}/plugins/org-gnome-exchange-operations.eplug +@comment lib/evolution/${R}/plugins/org-gnome-exchange-tasks-subscription.xml lib/evolution/${R}/plugins/org-gnome-folder-permissions.xml lib/evolution/${R}/plugins/org-gnome-folder-subscription.xml lib/evolution/${R}/plugins/org-gnome-groupwise-features.eplug @@ -457,7 +457,7 @@ share/evolution/${R}/errors/e-system.error share/evolution/${R}/errors/filter.error share/evolution/${R}/errors/mail-composer.error share/evolution/${R}/errors/mail.error -share/evolution/${R}/errors/org-gnome-exchange-operations.error +@comment share/evolution/${R}/errors/org-gnome-exchange-operations.error share/evolution/${R}/errors/org-gnome-itip-formatter.error share/evolution/${R}/errors/org-gnome-mail-retract-errors.xml share/evolution/${R}/errors/org-gnome-proxy-errors.xml