Add, and train to look for evolution in the right place.

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

16 files changed, 548 insertions, 0 deletions

diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
new file mode 100644
index 000000000..bffb82aee
--- /dev/null
+++ b/mail/evolution-exchange/Makefile
@@ -0,0 +1,62 @@
+# New ports collection makefile for:   ximian-connector
+# Date created:        30 May 2004
+# Whom:                kiesel
+#
+# $FreeBSD: ports/mail/ximian-connector/Makefile,v 1.13 2005/04/11 23:41:11 adamw Exp $
+#
+
+PORTNAME=	ximian
+PORTVERSION=	2.2.2
+CATEGORIES=	mail gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/2.2
+PKGNAMESUFFIX=	-connector
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
+MAINTAINER=	kiesel@schlund.de
+COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
+
+BUILD_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
+RUN_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_LIBTOOL_VER=15
+USE_GMAKE=	yes
+USE_OPENLDAP=	yes
+USE_GNOME=	gnomeprefix intlhack gnomehack gnometarget
+USE_REINPLACE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
+		--with-static-ldap=no
+
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+EVO_VERSION=	2.4
+PLIST_SUB=	VERSION="2.2" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2"
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \
+	exists(/usr/lib/libkrb5.so)
+CONFIGURE_ARGS+=	--with-krb5=/usr
+.else
+LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
+.if defined(HEIMDAL_HOME)
+CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
+.else
+CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
+.endif
+.endif
+
+.if ${ARCH} == "amd64"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC"
+.endif
+
+# XXX - remove this reinplacement at the next update
+post-patch:
+	@${REINPLACE_CMD} -e "/^EVOLUTION_API_VERSION=/s/2.2/${EVO_VERSION}/; \
+		s|evolution-shell-2.2|evolution-shell-2.4|g" \
+		${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
new file mode 100644
index 000000000..e80523bf6
--- /dev/null
+++ b/mail/evolution-exchange/distinfo
@@ -0,0 +1,2 @@
+MD5 (ximian-connector-2.2.2.tar.bz2) = 2cee47bdf6030d30a5ac82e5028b58ed
+SIZE (ximian-connector-2.2.2.tar.bz2) = 1367526
diff --git a/mail/evolution-exchange/files/patch-calendar_e-cal-backend-exchange.c b/mail/evolution-exchange/files/patch-calendar_e-cal-backend-exchange.c
new file mode 100644
index 000000000..466d30410
--- /dev/null
+++ b/mail/evolution-exchange/files/patch-calendar_e-cal-backend-exchange.c
@@ -0,0 +1,19 @@
+--- calendar/e-cal-backend-exchange.c.orig	Sat Mar 19 14:24:33 2005
++++ calendar/e-cal-backend-exchange.c	Sat Mar 19 14:25:06 2005
+@@ -1432,6 +1432,7 @@
+ 	e_cal_component_get_uid (comp, &uid);
+ 	e_cal_component_get_attachment_list (comp, &attach_list);
+ 	for (l = attach_list; l ; l = l->next){
++		char *mime_type;
+ 		if (!strncmp ((char *)l->data, "file://", 7)) {
+ 			fname = (char *)(l->data) + strlen ("file://");
+ 			filename = g_strrstr (fname, "/") + 1;
+@@ -1461,7 +1462,7 @@
+ 		camel_data_wrapper_construct_from_stream (wrapper, stream);
+ 		camel_object_unref (stream);
+ 
+-		char *mime_type = gnome_vfs_get_mime_type (dest_url + strlen ("file://"));
++		mime_type = gnome_vfs_get_mime_type (dest_url + strlen ("file://"));
+ 		type = camel_content_type_decode (mime_type);
+ 		camel_data_wrapper_set_mime_type_field (wrapper, type);
+ 		camel_content_type_unref (type);
diff --git a/mail/evolution-exchange/files/patch-configure b/mail/evolution-exchange/files/patch-configure
new file mode 100644
index 000000000..43668716a
--- /dev/null
+++ b/mail/evolution-exchange/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig	Fri Aug 20 15:26:49 2004
++++ configure	Fri Aug 20 15:27:21 2004
+@@ -23754,8 +23754,8 @@
+ 				# libldap might depend on OpenSSL... We need to pull
+ 				# in the dependency libs explicitly here since we're
+ 				# not using libtool for the configure test.
+-				if test -f $with_openldap/lib/libldap.la; then
+-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
++				if test -f $with_openldap/lib/libldap.so; then
++					LDAP_LIBS="`. $with_openldap/lib/libldap.so; echo $dependency_libs` $LDAP_LIBS"
+ 				fi
+ 			else
+ 				LDAP_LIBS="-llber $LDAP_LIBS"
+@@ -24006,7 +24006,7 @@
+ 
+ 
+ mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+-heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
++heimlibs="-lkrb5 -lcrypt -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+ echo "$as_me:$LINENO: checking for Kerberos 5" >&5
+ echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
+ if test "${ac_cv_lib_kerberos5+set}" = set; then
diff --git a/mail/evolution-exchange/files/patch-lib::e2k-autoconfig.c b/mail/evolution-exchange/files/patch-lib::e2k-autoconfig.c
new file mode 100644
index 000000000..7576f7123
--- /dev/null
+++ b/mail/evolution-exchange/files/patch-lib::e2k-autoconfig.c
@@ -0,0 +1,13 @@
+--- lib/e2k-autoconfig.c.orig	Tue May 11 11:15:58 2004
++++ lib/e2k-autoconfig.c	Thu Jun 17 14:02:58 2004
+@@ -31,6 +31,10 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
+ #include <resolv.h>
diff --git a/mail/evolution-exchange/files/patch-storage_e-folder-exchange.c b/mail/evolution-exchange/files/patch-storage_e-folder-exchange.c
new file mode 100644
index 000000000..7436ca9fe
--- /dev/null
+++ b/mail/evolution-exchange/files/patch-storage_e-folder-exchange.c
@@ -0,0 +1,16 @@
+--- storage/e-folder-exchange.c.orig	Tue Jan 25 21:31:32 2005
++++ storage/e-folder-exchange.c	Tue Jan 25 21:31:52 2005
+@@ -689,11 +689,12 @@
+ void
+ e_folder_exchange_unsubscribe (EFolder *folder)
+ {
++	E2kContext *ctx;
+ 	g_return_if_fail (E_IS_FOLDER_EXCHANGE (folder));
+ 
+ 	/* FIXME : This is a hack as of now. The free_folder in mail-stub
+ 	gets called when we are in offline and the context is NULL then. */
+-	E2kContext *ctx = E_FOLDER_EXCHANGE_CONTEXT (folder);
++	ctx = E_FOLDER_EXCHANGE_CONTEXT (folder);
+ 	if (ctx) {
+ 		e2k_context_unsubscribe (E_FOLDER_EXCHANGE_CONTEXT (folder),
+ 					 E_FOLDER_EXCHANGE_URI (folder));
diff --git a/mail/evolution-exchange/pkg-descr b/mail/evolution-exchange/pkg-descr
new file mode 100644
index 000000000..c89d7aba8
--- /dev/null
+++ b/mail/evolution-exchange/pkg-descr
@@ -0,0 +1,13 @@
+Ximian Connector is a plugin for Evolution that adds Exchange client
+capabilities to Evolution.
+
+With the Evolution Connector installed, Evolution functions as an
+Exchange client, enabling users to become full participants in company-wide
+group scheduling and other collaborative tasks. Linux, Solaris and FreeBSD
+users can access public folders, Global Address Lists, email, calendar,
+task lists, and group scheduling information.
+
+WWW: http://www.novell.com/products/connector/
+
+- Alex Kiesel
+kiesel@schlund.de
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
new file mode 100644
index 000000000..a5872eab9
--- /dev/null
+++ b/mail/evolution-exchange/pkg-plist
@@ -0,0 +1,127 @@
+bin/ximian-connector-setup-%%VERSION%%
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls
+lib/evolution/%%EVO_VERSION%%/libexchange.a
+lib/evolution/%%EVO_VERSION%%/libexchange.so
+lib/evolution/%%EVO_VERSION%%/libexchange.so.0
+libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server
+libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
+%%DOCSDIR%%/E2kContext.html
+%%DOCSDIR%%/E2kGlobalCatalog.html
+%%DOCSDIR%%/E2kSecurityDescriptor.html
+%%DOCSDIR%%/E2kSid.html
+%%DOCSDIR%%/E2kUserDialog.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+%%DOCSDIR%%/ximian-connector-E2kAutoconfig.html
+%%DOCSDIR%%/ximian-connector-E2kContext-(private).html
+%%DOCSDIR%%/ximian-connector-E2kOperation-(private).html
+%%DOCSDIR%%/ximian-connector-E2kOperation.html
+%%DOCSDIR%%/ximian-connector-E2kProperties.html
+%%DOCSDIR%%/ximian-connector-E2kRestriction-(vaporware).html
+%%DOCSDIR%%/ximian-connector-E2kResult-(private).html
+%%DOCSDIR%%/ximian-connector-MAPI.html
+%%DOCSDIR%%/ximian-connector-autoconfig.html
+%%DOCSDIR%%/ximian-connector-bug-private.html
+%%DOCSDIR%%/ximian-connector-bug-xml.html
+%%DOCSDIR%%/ximian-connector-calendar.html
+%%DOCSDIR%%/ximian-connector-delegation.html
+%%DOCSDIR%%/ximian-connector-e2k-action.html
+%%DOCSDIR%%/ximian-connector-e2k-encoding-utils.html
+%%DOCSDIR%%/ximian-connector-e2k-freebusy.html
+%%DOCSDIR%%/ximian-connector-e2k-http-utils.html
+%%DOCSDIR%%/ximian-connector-e2k-kerberos.html
+%%DOCSDIR%%/ximian-connector-e2k-restriction.html
+%%DOCSDIR%%/ximian-connector-e2k-result.html
+%%DOCSDIR%%/ximian-connector-e2k-rule.html
+%%DOCSDIR%%/ximian-connector-e2k-uri.html
+%%DOCSDIR%%/ximian-connector-e2k-utils.html
+%%DOCSDIR%%/ximian-connector-e2k-xml-utils.html
+%%DOCSDIR%%/ximian-connector-favorites.html
+%%DOCSDIR%%/ximian-connector-fba.html
+%%DOCSDIR%%/ximian-connector-freebusy.html
+%%DOCSDIR%%/ximian-connector-mail-threading.html
+%%DOCSDIR%%/ximian-connector-mail.html
+%%DOCSDIR%%/ximian-connector-ntlm.html
+%%DOCSDIR%%/ximian-connector-oof.html
+%%DOCSDIR%%/ximian-connector-other-users.html
+%%DOCSDIR%%/ximian-connector-permissions.html
+%%DOCSDIR%%/ximian-connector-test-utils.html
+%%DOCSDIR%%/ximian-connector-xntlm-des.html
+%%DOCSDIR%%/ximian-connector-xntlm-md4.html
+%%DOCSDIR%%/ximian-connector-xntlm.html
+%%DOCSDIR%%/ximian-connector.devhelp
+%%DOCSDIR%%/ximian-connnector-booking.html
+share/gnome/ximian-connector/%%VERSION%%/etspec/e-storage-set-view.etspec
+share/gnome/ximian-connector/%%VERSION%%/glade/e-folder-creation-dialog.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/e-foreign-folder-dialog.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-autoconfig-wizard.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-change-password.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-delegates.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-folder-tree.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-oof.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-passwd-expiry.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-permissions-dialog.glade
+share/gnome/ximian-connector/%%VERSION%%/images/connector-mini.png
+share/gnome/ximian-connector/%%VERSION%%/images/connector.png
+share/gnome/ximian-connector/%%VERSION%%/images/exchange-delegates-48.png
+share/gnome/ximian-connector/%%VERSION%%/images/exchange-oof-48.png
+share/gnome/ximian-connector/%%VERSION%%/ui/ximian-connector.xml
+share/locale/ar/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/bn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/gu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/no/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/pa/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/rw/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/xh/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+@dirrm share/gnome/ximian-connector/%%VERSION%%/ui
+@dirrm share/gnome/ximian-connector/%%VERSION%%/images
+@dirrm share/gnome/ximian-connector/%%VERSION%%/glade
+@dirrm share/gnome/ximian-connector/%%VERSION%%/etspec
+@dirrm share/gnome/ximian-connector/%%VERSION%%
+@dirrm share/gnome/ximian-connector
+@dirrm %%DOCSDIR%%
diff --git a/mail/ximian-connector/Makefile b/mail/ximian-connector/Makefile
new file mode 100644
index 000000000..bffb82aee
--- /dev/null
+++ b/mail/ximian-connector/Makefile
@@ -0,0 +1,62 @@
+# New ports collection makefile for:   ximian-connector
+# Date created:        30 May 2004
+# Whom:                kiesel
+#
+# $FreeBSD: ports/mail/ximian-connector/Makefile,v 1.13 2005/04/11 23:41:11 adamw Exp $
+#
+
+PORTNAME=	ximian
+PORTVERSION=	2.2.2
+CATEGORIES=	mail gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/2.2
+PKGNAMESUFFIX=	-connector
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
+MAINTAINER=	kiesel@schlund.de
+COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
+
+BUILD_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
+RUN_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_LIBTOOL_VER=15
+USE_GMAKE=	yes
+USE_OPENLDAP=	yes
+USE_GNOME=	gnomeprefix intlhack gnomehack gnometarget
+USE_REINPLACE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
+		--with-static-ldap=no
+
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+EVO_VERSION=	2.4
+PLIST_SUB=	VERSION="2.2" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2"
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \
+	exists(/usr/lib/libkrb5.so)
+CONFIGURE_ARGS+=	--with-krb5=/usr
+.else
+LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
+.if defined(HEIMDAL_HOME)
+CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
+.else
+CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
+.endif
+.endif
+
+.if ${ARCH} == "amd64"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC"
+.endif
+
+# XXX - remove this reinplacement at the next update
+post-patch:
+	@${REINPLACE_CMD} -e "/^EVOLUTION_API_VERSION=/s/2.2/${EVO_VERSION}/; \
+		s|evolution-shell-2.2|evolution-shell-2.4|g" \
+		${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/mail/ximian-connector/distinfo b/mail/ximian-connector/distinfo
new file mode 100644
index 000000000..e80523bf6
--- /dev/null
+++ b/mail/ximian-connector/distinfo
@@ -0,0 +1,2 @@
+MD5 (ximian-connector-2.2.2.tar.bz2) = 2cee47bdf6030d30a5ac82e5028b58ed
+SIZE (ximian-connector-2.2.2.tar.bz2) = 1367526
diff --git a/mail/ximian-connector/files/patch-calendar_e-cal-backend-exchange.c b/mail/ximian-connector/files/patch-calendar_e-cal-backend-exchange.c
new file mode 100644
index 000000000..466d30410
--- /dev/null
+++ b/mail/ximian-connector/files/patch-calendar_e-cal-backend-exchange.c
@@ -0,0 +1,19 @@
+--- calendar/e-cal-backend-exchange.c.orig	Sat Mar 19 14:24:33 2005
++++ calendar/e-cal-backend-exchange.c	Sat Mar 19 14:25:06 2005
+@@ -1432,6 +1432,7 @@
+ 	e_cal_component_get_uid (comp, &uid);
+ 	e_cal_component_get_attachment_list (comp, &attach_list);
+ 	for (l = attach_list; l ; l = l->next){
++		char *mime_type;
+ 		if (!strncmp ((char *)l->data, "file://", 7)) {
+ 			fname = (char *)(l->data) + strlen ("file://");
+ 			filename = g_strrstr (fname, "/") + 1;
+@@ -1461,7 +1462,7 @@
+ 		camel_data_wrapper_construct_from_stream (wrapper, stream);
+ 		camel_object_unref (stream);
+ 
+-		char *mime_type = gnome_vfs_get_mime_type (dest_url + strlen ("file://"));
++		mime_type = gnome_vfs_get_mime_type (dest_url + strlen ("file://"));
+ 		type = camel_content_type_decode (mime_type);
+ 		camel_data_wrapper_set_mime_type_field (wrapper, type);
+ 		camel_content_type_unref (type);
diff --git a/mail/ximian-connector/files/patch-configure b/mail/ximian-connector/files/patch-configure
new file mode 100644
index 000000000..43668716a
--- /dev/null
+++ b/mail/ximian-connector/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig	Fri Aug 20 15:26:49 2004
++++ configure	Fri Aug 20 15:27:21 2004
+@@ -23754,8 +23754,8 @@
+ 				# libldap might depend on OpenSSL... We need to pull
+ 				# in the dependency libs explicitly here since we're
+ 				# not using libtool for the configure test.
+-				if test -f $with_openldap/lib/libldap.la; then
+-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
++				if test -f $with_openldap/lib/libldap.so; then
++					LDAP_LIBS="`. $with_openldap/lib/libldap.so; echo $dependency_libs` $LDAP_LIBS"
+ 				fi
+ 			else
+ 				LDAP_LIBS="-llber $LDAP_LIBS"
+@@ -24006,7 +24006,7 @@
+ 
+ 
+ mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+-heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
++heimlibs="-lkrb5 -lcrypt -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+ echo "$as_me:$LINENO: checking for Kerberos 5" >&5
+ echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
+ if test "${ac_cv_lib_kerberos5+set}" = set; then
diff --git a/mail/ximian-connector/files/patch-lib::e2k-autoconfig.c b/mail/ximian-connector/files/patch-lib::e2k-autoconfig.c
new file mode 100644
index 000000000..7576f7123
--- /dev/null
+++ b/mail/ximian-connector/files/patch-lib::e2k-autoconfig.c
@@ -0,0 +1,13 @@
+--- lib/e2k-autoconfig.c.orig	Tue May 11 11:15:58 2004
++++ lib/e2k-autoconfig.c	Thu Jun 17 14:02:58 2004
+@@ -31,6 +31,10 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
+ #include <resolv.h>
diff --git a/mail/ximian-connector/files/patch-storage_e-folder-exchange.c b/mail/ximian-connector/files/patch-storage_e-folder-exchange.c
new file mode 100644
index 000000000..7436ca9fe
--- /dev/null
+++ b/mail/ximian-connector/files/patch-storage_e-folder-exchange.c
@@ -0,0 +1,16 @@
+--- storage/e-folder-exchange.c.orig	Tue Jan 25 21:31:32 2005
++++ storage/e-folder-exchange.c	Tue Jan 25 21:31:52 2005
+@@ -689,11 +689,12 @@
+ void
+ e_folder_exchange_unsubscribe (EFolder *folder)
+ {
++	E2kContext *ctx;
+ 	g_return_if_fail (E_IS_FOLDER_EXCHANGE (folder));
+ 
+ 	/* FIXME : This is a hack as of now. The free_folder in mail-stub
+ 	gets called when we are in offline and the context is NULL then. */
+-	E2kContext *ctx = E_FOLDER_EXCHANGE_CONTEXT (folder);
++	ctx = E_FOLDER_EXCHANGE_CONTEXT (folder);
+ 	if (ctx) {
+ 		e2k_context_unsubscribe (E_FOLDER_EXCHANGE_CONTEXT (folder),
+ 					 E_FOLDER_EXCHANGE_URI (folder));
diff --git a/mail/ximian-connector/pkg-descr b/mail/ximian-connector/pkg-descr
new file mode 100644
index 000000000..c89d7aba8
--- /dev/null
+++ b/mail/ximian-connector/pkg-descr
@@ -0,0 +1,13 @@
+Ximian Connector is a plugin for Evolution that adds Exchange client
+capabilities to Evolution.
+
+With the Evolution Connector installed, Evolution functions as an
+Exchange client, enabling users to become full participants in company-wide
+group scheduling and other collaborative tasks. Linux, Solaris and FreeBSD
+users can access public folders, Global Address Lists, email, calendar,
+task lists, and group scheduling information.
+
+WWW: http://www.novell.com/products/connector/
+
+- Alex Kiesel
+kiesel@schlund.de
diff --git a/mail/ximian-connector/pkg-plist b/mail/ximian-connector/pkg-plist
new file mode 100644
index 000000000..a5872eab9
--- /dev/null
+++ b/mail/ximian-connector/pkg-plist
@@ -0,0 +1,127 @@
+bin/ximian-connector-setup-%%VERSION%%
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls
+lib/evolution/%%EVO_VERSION%%/libexchange.a
+lib/evolution/%%EVO_VERSION%%/libexchange.so
+lib/evolution/%%EVO_VERSION%%/libexchange.so.0
+libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server
+libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
+%%DOCSDIR%%/E2kContext.html
+%%DOCSDIR%%/E2kGlobalCatalog.html
+%%DOCSDIR%%/E2kSecurityDescriptor.html
+%%DOCSDIR%%/E2kSid.html
+%%DOCSDIR%%/E2kUserDialog.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+%%DOCSDIR%%/ximian-connector-E2kAutoconfig.html
+%%DOCSDIR%%/ximian-connector-E2kContext-(private).html
+%%DOCSDIR%%/ximian-connector-E2kOperation-(private).html
+%%DOCSDIR%%/ximian-connector-E2kOperation.html
+%%DOCSDIR%%/ximian-connector-E2kProperties.html
+%%DOCSDIR%%/ximian-connector-E2kRestriction-(vaporware).html
+%%DOCSDIR%%/ximian-connector-E2kResult-(private).html
+%%DOCSDIR%%/ximian-connector-MAPI.html
+%%DOCSDIR%%/ximian-connector-autoconfig.html
+%%DOCSDIR%%/ximian-connector-bug-private.html
+%%DOCSDIR%%/ximian-connector-bug-xml.html
+%%DOCSDIR%%/ximian-connector-calendar.html
+%%DOCSDIR%%/ximian-connector-delegation.html
+%%DOCSDIR%%/ximian-connector-e2k-action.html
+%%DOCSDIR%%/ximian-connector-e2k-encoding-utils.html
+%%DOCSDIR%%/ximian-connector-e2k-freebusy.html
+%%DOCSDIR%%/ximian-connector-e2k-http-utils.html
+%%DOCSDIR%%/ximian-connector-e2k-kerberos.html
+%%DOCSDIR%%/ximian-connector-e2k-restriction.html
+%%DOCSDIR%%/ximian-connector-e2k-result.html
+%%DOCSDIR%%/ximian-connector-e2k-rule.html
+%%DOCSDIR%%/ximian-connector-e2k-uri.html
+%%DOCSDIR%%/ximian-connector-e2k-utils.html
+%%DOCSDIR%%/ximian-connector-e2k-xml-utils.html
+%%DOCSDIR%%/ximian-connector-favorites.html
+%%DOCSDIR%%/ximian-connector-fba.html
+%%DOCSDIR%%/ximian-connector-freebusy.html
+%%DOCSDIR%%/ximian-connector-mail-threading.html
+%%DOCSDIR%%/ximian-connector-mail.html
+%%DOCSDIR%%/ximian-connector-ntlm.html
+%%DOCSDIR%%/ximian-connector-oof.html
+%%DOCSDIR%%/ximian-connector-other-users.html
+%%DOCSDIR%%/ximian-connector-permissions.html
+%%DOCSDIR%%/ximian-connector-test-utils.html
+%%DOCSDIR%%/ximian-connector-xntlm-des.html
+%%DOCSDIR%%/ximian-connector-xntlm-md4.html
+%%DOCSDIR%%/ximian-connector-xntlm.html
+%%DOCSDIR%%/ximian-connector.devhelp
+%%DOCSDIR%%/ximian-connnector-booking.html
+share/gnome/ximian-connector/%%VERSION%%/etspec/e-storage-set-view.etspec
+share/gnome/ximian-connector/%%VERSION%%/glade/e-folder-creation-dialog.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/e-foreign-folder-dialog.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-autoconfig-wizard.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-change-password.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-delegates.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-folder-tree.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-oof.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-passwd-expiry.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-permissions-dialog.glade
+share/gnome/ximian-connector/%%VERSION%%/images/connector-mini.png
+share/gnome/ximian-connector/%%VERSION%%/images/connector.png
+share/gnome/ximian-connector/%%VERSION%%/images/exchange-delegates-48.png
+share/gnome/ximian-connector/%%VERSION%%/images/exchange-oof-48.png
+share/gnome/ximian-connector/%%VERSION%%/ui/ximian-connector.xml
+share/locale/ar/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/bn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/gu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/no/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/pa/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/rw/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/xh/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
+@dirrm share/gnome/ximian-connector/%%VERSION%%/ui
+@dirrm share/gnome/ximian-connector/%%VERSION%%/images
+@dirrm share/gnome/ximian-connector/%%VERSION%%/glade
+@dirrm share/gnome/ximian-connector/%%VERSION%%/etspec
+@dirrm share/gnome/ximian-connector/%%VERSION%%
+@dirrm share/gnome/ximian-connector
+@dirrm %%DOCSDIR%%