Add CONFLICTS with the each others.

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

7 files changed, 195 insertions, 1 deletions

diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
new file mode 100644
index 000000000..3276b01b2
--- /dev/null
+++ b/mail/evolution-mapi/Makefile
@@ -0,0 +1,48 @@
+# New ports collection makefile for:	evolution-mapi
+# Date created:				24 Mar, 2009
+# Whom:					Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD: ports/mail/evolution-mapi/Makefile,v 1.11 2011/02/25 01:31:48 delphij Exp $
+#   $MCom: ports/mail/evolution-mapi/Makefile,v 1.23 2010/11/16 09:58:56 kwm Exp $
+#
+
+PORTNAME=	evolution-mapi
+PORTVERSION=	0.32.1
+PORTREVISION=	1
+CATEGORIES=	mail gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
+
+BUILD_DEPENDS=	${PKGFILES}:${PORTSDIR}/mail/evolution
+LIB_DEPENDS=	mapi.0:${PORTSDIR}/mail/libmapi
+RUN_DEPENDS=	${PKGFILES}:${PORTSDIR}/mail/evolution
+
+CONFLICTS=	evolution-mapi-3.[0-9]*
+
+PKGFILES=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	evolutiondataserver
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+EVO_VERSION=	2.32
+EDS_VERSION=	1.2
+PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION=${EDS_VERSION}
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/src/libexchangemapi/Makefile.in
+	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
+	    	${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/mail/evolution-mapi/distinfo b/mail/evolution-mapi/distinfo
new file mode 100644
index 000000000..bcc486d5c
--- /dev/null
+++ b/mail/evolution-mapi/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/evolution-mapi-0.32.1.tar.bz2) = 4ff34dbde1cef67615c4cbc76e259d076a315d70fb80bbf4c107e48b214b9cd8
+SIZE (gnome2/evolution-mapi-0.32.1.tar.bz2) = 560064
diff --git a/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c b/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c
new file mode 100644
index 000000000..b4123235e
--- /dev/null
+++ b/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c
@@ -0,0 +1,24 @@
+--- src/account-setup-eplugin/exchange-mapi-account-setup.c.orig	2010-03-08 04:03:24.000000000 -0500
++++ src/account-setup-eplugin/exchange-mapi-account-setup.c	2010-03-13 17:49:17.000000000 -0500
+@@ -696,3 +696,21 @@ exchange_mapi_cal_commit (EPlugin *epl, 
+ 	// Update the folder list in the plugin and ExchangeMAPIFolder
+ 	return;
+ }
++
++const char *g_module_check_init (gpointer module);
++const char *
++g_module_check_init (gpointer module) {
++	return NULL;
++}
++
++void g_module_unload (gpointer module);
++void
++g_module_unload (gpointer module) {
++	return;
++}
++
++GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin);
++GtkWidget *
++e_plugin_lib_get_configure_widget (EPlugin *plugin) {
++	return NULL;
++}
diff --git a/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c b/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c
new file mode 100644
index 000000000..5801861bd
--- /dev/null
+++ b/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c
@@ -0,0 +1,10 @@
+--- src/libexchangemapi/exchange-mapi-cal-utils.c.orig	2010-06-07 16:59:16.000000000 +0200
++++ src/libexchangemapi/exchange-mapi-cal-utils.c	2010-06-07 17:01:25.000000000 +0200
+@@ -2175,6 +2175,7 @@ populate_freebusy_data (struct Binary_r 
+ 	gchar *start = NULL, *end = NULL;
+ 	time_t start_date, end_date;
+ 	icalcomponent *icalcomp = NULL;
++	int daylight = 0;
+ 
+ 	if (!bin)
+ 		return;
diff --git a/mail/evolution-mapi/pkg-descr b/mail/evolution-mapi/pkg-descr
new file mode 100644
index 000000000..21610bb54
--- /dev/null
+++ b/mail/evolution-mapi/pkg-descr
@@ -0,0 +1 @@
+WWW:	http://www.go-evolution.org/MAPIProvider
diff --git a/mail/evolution-mapi/pkg-plist b/mail/evolution-mapi/pkg-plist
new file mode 100644
index 000000000..6e36162bb
--- /dev/null
+++ b/mail/evolution-mapi/pkg-plist
@@ -0,0 +1,107 @@
+include/evolution-data-server-%%EVO_VERSION%%/mapi/em-operation-queue.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-recur-utils.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-tz-utils.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-utils.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-connection.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-defs.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-folder.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-mail-utils.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-utils.h
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.la
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.so
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.urls
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapi.la
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapi.so
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendmapi.la
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendmapi.so
+lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-exchange-mapi.la
+lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-exchange-mapi.so
+lib/evolution/%%EVO_VERSION%%/plugins/org-gnome-exchange-mapi.eplug
+lib/libexchangemapi-1.0.la
+lib/libexchangemapi-1.0.so
+lib/libexchangemapi-1.0.so.0
+share/locale/as/LC_MESSAGES/evolution-mapi.mo
+share/locale/ast/LC_MESSAGES/evolution-mapi.mo
+share/locale/bg/LC_MESSAGES/evolution-mapi.mo
+share/locale/bn/LC_MESSAGES/evolution-mapi.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-mapi.mo
+share/locale/ca/LC_MESSAGES/evolution-mapi.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-mapi.mo
+share/locale/cs/LC_MESSAGES/evolution-mapi.mo
+share/locale/da/LC_MESSAGES/evolution-mapi.mo
+share/locale/de/LC_MESSAGES/evolution-mapi.mo
+share/locale/el/LC_MESSAGES/evolution-mapi.mo
+share/locale/en_GB/LC_MESSAGES/evolution-mapi.mo
+share/locale/en@shaw/LC_MESSAGES/evolution-mapi.mo
+share/locale/es/LC_MESSAGES/evolution-mapi.mo
+share/locale/et/LC_MESSAGES/evolution-mapi.mo
+share/locale/eu/LC_MESSAGES/evolution-mapi.mo
+share/locale/fi/LC_MESSAGES/evolution-mapi.mo
+share/locale/fr/LC_MESSAGES/evolution-mapi.mo
+share/locale/gl/LC_MESSAGES/evolution-mapi.mo
+share/locale/gu/LC_MESSAGES/evolution-mapi.mo
+share/locale/he/LC_MESSAGES/evolution-mapi.mo
+share/locale/hi/LC_MESSAGES/evolution-mapi.mo
+share/locale/hu/LC_MESSAGES/evolution-mapi.mo
+share/locale/id/LC_MESSAGES/evolution-mapi.mo
+share/locale/it/LC_MESSAGES/evolution-mapi.mo
+share/locale/ja/LC_MESSAGES/evolution-mapi.mo
+share/locale/kn/LC_MESSAGES/evolution-mapi.mo
+share/locale/ko/LC_MESSAGES/evolution-mapi.mo
+share/locale/lt/LC_MESSAGES/evolution-mapi.mo
+share/locale/lv/LC_MESSAGES/evolution-mapi.mo
+share/locale/mai/LC_MESSAGES/evolution-mapi.mo
+share/locale/ml/LC_MESSAGES/evolution-mapi.mo
+share/locale/mr/LC_MESSAGES/evolution-mapi.mo
+share/locale/ms/LC_MESSAGES/evolution-mapi.mo
+share/locale/nb/LC_MESSAGES/evolution-mapi.mo
+share/locale/nl/LC_MESSAGES/evolution-mapi.mo
+share/locale/or/LC_MESSAGES/evolution-mapi.mo
+share/locale/pa/LC_MESSAGES/evolution-mapi.mo
+share/locale/pl/LC_MESSAGES/evolution-mapi.mo
+share/locale/pt/LC_MESSAGES/evolution-mapi.mo
+share/locale/pt_BR/LC_MESSAGES/evolution-mapi.mo
+share/locale/ro/LC_MESSAGES/evolution-mapi.mo
+share/locale/ru/LC_MESSAGES/evolution-mapi.mo
+share/locale/si/LC_MESSAGES/evolution-mapi.mo
+share/locale/sk/LC_MESSAGES/evolution-mapi.mo
+share/locale/sl/LC_MESSAGES/evolution-mapi.mo
+share/locale/sr/LC_MESSAGES/evolution-mapi.mo
+share/locale/sr@latin/LC_MESSAGES/evolution-mapi.mo
+share/locale/sv/LC_MESSAGES/evolution-mapi.mo
+share/locale/ta/LC_MESSAGES/evolution-mapi.mo
+share/locale/te/LC_MESSAGES/evolution-mapi.mo
+share/locale/th/LC_MESSAGES/evolution-mapi.mo
+share/locale/tr/LC_MESSAGES/evolution-mapi.mo
+share/locale/uk/LC_MESSAGES/evolution-mapi.mo
+share/locale/vi/LC_MESSAGES/evolution-mapi.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-mapi.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-mapi.mo
+share/locale/zh_TW/LC_MESSAGES/evolution-mapi.mo
+libdata/pkgconfig/libexchangemapi-1.0.pc
+share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-mapi-to-ical
+share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-ical-to-mapi
+@dirrm share/evolution-data-server-%%EVO_VERSION%%/mapi
+@dirrm include/evolution-data-server-%%EVO_VERSION%%/mapi
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/mail/evolution-mapi3/Makefile b/mail/evolution-mapi3/Makefile
index 7b46d97fa..e3935b9cd 100644
--- a/mail/evolution-mapi3/Makefile
+++ b/mail/evolution-mapi3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-mapi3/Makefile,v 1.6 2011/03/22 07:11:04 kwm Exp $
+#   $MCom: ports/mail/evolution-mapi3/Makefile,v 1.7 2011/04/05 09:03:33 kwm Exp $
 #
 
 PORTNAME=	evolution-mapi
@@ -19,6 +19,8 @@ BUILD_DEPENDS=	evolution>=2.91.0:${PORTSDIR}/mail/evolution3
 LIB_DEPENDS=	mapi.0:${PORTSDIR}/mail/libmapi
 RUN_DEPENDS=	evolution>=2.91.0:${PORTSDIR}/mail/evolution3
 
+CONFLICTS=	evolution-mapi-2.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes