Update to 2.3.5.

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

6 files changed, 139 insertions, 4 deletions

diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index eb49e3133..4c6630319 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.32 2005/07/02 04:53:04 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.33 2005/07/03 23:04:56 kwm Exp $
 #
 
 PORTNAME=	evolution-exchange
-PORTVERSION=	2.3.4
+PORTVERSION=	2.3.5
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/2.3
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index a152540f9..dbd823450 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-exchange-2.3.4.tar.bz2) = 120c4facdaf6a057715943e589c7f50d
-SIZE (gnome2/evolution-exchange-2.3.4.tar.bz2) = 960517
+MD5 (gnome2/evolution-exchange-2.3.5.tar.bz2) = c482766dd37172d59bca602fd1d02a2d
+SIZE (gnome2/evolution-exchange-2.3.5.tar.bz2) = 1046058
diff --git a/mail/evolution-exchange/files/patch-addressbook_e-book-backend-gal.c b/mail/evolution-exchange/files/patch-addressbook_e-book-backend-gal.c
new file mode 100644
index 000000000..a760c4c7c
--- /dev/null
+++ b/mail/evolution-exchange/files/patch-addressbook_e-book-backend-gal.c
@@ -0,0 +1,19 @@
+--- addressbook/e-book-backend-gal.c.orig	Wed Jul 13 18:41:36 2005
++++ addressbook/e-book-backend-gal.c	Wed Jul 13 18:41:59 2005
+@@ -423,12 +423,13 @@ get_contact_handler (LDAPOp *op, LDAPMes
+ 	   the op after either */
+ 	msg_type = ldap_msgtype (res);
+ 	if (msg_type == LDAP_RES_SEARCH_ENTRY) {
++		LDAPMessage *e;
++		EContact *contact;
++		char *vcard;
+ 		g_mutex_lock (bl->priv->ldap_lock);
+-		LDAPMessage *e = ldap_first_entry(bl->priv->ldap, res);
++		e = ldap_first_entry(bl->priv->ldap, res);
+ 		g_mutex_unlock (bl->priv->ldap_lock);
+ 
+-		EContact *contact;
+-		char *vcard;
+ 
+ 		if (!e) {
+ 			g_warning ("uh, this shouldn't happen");
diff --git a/mail/evolution-exchange/files/patch-camel_camel-exchange-store.c b/mail/evolution-exchange/files/patch-camel_camel-exchange-store.c
new file mode 100644
index 000000000..5771f503a
--- /dev/null
+++ b/mail/evolution-exchange/files/patch-camel_camel-exchange-store.c
@@ -0,0 +1,44 @@
+--- camel/camel-exchange-store.c.orig	Wed Jul 13 17:44:20 2005
++++ camel/camel-exchange-store.c	Wed Jul 13 17:45:09 2005
+@@ -398,9 +398,9 @@ exchange_get_folder (CamelStore *store, 
+ static gboolean
+ exchange_folder_subscribed (CamelStore *store, const char *folder_name)
+ {
+-	d(printf ("is subscribed folder : %s\n", folder_name));
+ 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (store);
+ 	guint32 is_subscribed;
++	d(printf ("is subscribed folder : %s\n", folder_name));
+ 	
+ 	if (((CamelOfflineStore *) store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
+ 		return;
+@@ -421,8 +421,8 @@ static void
+ exchange_subscribe_folder (CamelStore *store, const char *folder_name,
+ 				CamelException *ex)
+ {
+-	d(printf ("subscribe folder : %s\n", folder_name));
+ 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (store);
++	d(printf ("subscribe folder : %s\n", folder_name));
+ 	
+ 	if (((CamelOfflineStore *) store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
+ 		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot subscribe folder in offline mode."));
+@@ -438,8 +438,8 @@ static void
+ exchange_unsubscribe_folder (CamelStore *store, const char *folder_name,
+ 				CamelException *ex)
+ {
+-	d(printf ("unsubscribe folder : %s\n", folder_name));
+ 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (store);
++	d(printf ("unsubscribe folder : %s\n", folder_name));
+ 	
+ 	if (((CamelOfflineStore *) store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
+ 		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot unsubscribe folder in offline mode."));
+@@ -475,9 +475,9 @@ static CamelFolderInfo *
+ make_folder_info (CamelExchangeStore *exch, char *name, char *uri,
+ 		  int unread_count, int flags)
+ {
+-	d(printf ("make folder info : %s flags : %d\n", name, flags));
+ 	CamelFolderInfo *info;
+ 	const char *path;
++	d(printf ("make folder info : %s flags : %d\n", name, flags));
+ 
+ 	path = strstr (uri, "://");
+ 	if (!path)
diff --git a/mail/evolution-exchange/files/patch-mail_mail-stub-exchange.c b/mail/evolution-exchange/files/patch-mail_mail-stub-exchange.c
new file mode 100644
index 000000000..2ffc75d7a
--- /dev/null
+++ b/mail/evolution-exchange/files/patch-mail_mail-stub-exchange.c
@@ -0,0 +1,16 @@
+--- mail/mail-stub-exchange.c.orig	Wed Jul 13 17:45:44 2005
++++ mail/mail-stub-exchange.c	Wed Jul 13 17:46:22 2005
+@@ -2508,12 +2508,12 @@ subscribe_folder (MailStub *stub, const 
+ static void
+ unsubscribe_folder (MailStub *stub, const char *folder_name)
+ {
+-	d(printf ("unsubscribe folder : %s\n", folder_name));
+ 	MailStubExchange *mse = MAIL_STUB_EXCHANGE (stub);
+ 	ExchangeAccountFolderResult result;
+ 	EFolder *folder;
+ 	char *path;
+ 	const char *folder_type, *physical_uri;
++	d(printf ("unsubscribe folder : %s\n", folder_name));
+ 
+ 	path = g_build_filename ("/", folder_name, NULL);
+ 	folder = exchange_account_get_folder (mse->account, path);
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 26bb3aaf0..829742c84 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -3,6 +3,62 @@ lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so
 lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls
 libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server
 libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
+%%OLDDOCSDIR%%/E2kContext.html
+%%OLDDOCSDIR%%/E2kGlobalCatalog.html
+%%OLDDOCSDIR%%/E2kSecurityDescriptor.html
+%%OLDDOCSDIR%%/ch01.html
+%%OLDDOCSDIR%%/ch02.html
+%%OLDDOCSDIR%%/ch03.html
+%%OLDDOCSDIR%%/ch04.html
+%%OLDDOCSDIR%%/ch05.html
+%%OLDDOCSDIR%%/ch06.html
+%%OLDDOCSDIR%%/home.png
+%%OLDDOCSDIR%%/index.html
+%%OLDDOCSDIR%%/index.sgml
+%%OLDDOCSDIR%%/left.png
+%%OLDDOCSDIR%%/right.png
+%%OLDDOCSDIR%%/up.png
+%%OLDDOCSDIR%%/ximian-connector-E2kAutoconfig.html
+%%OLDDOCSDIR%%/ximian-connector-E2kContext-(private).html
+%%OLDDOCSDIR%%/ximian-connector-E2kOperation-(private).html
+%%OLDDOCSDIR%%/ximian-connector-E2kOperation.html
+%%OLDDOCSDIR%%/ximian-connector-E2kProperties.html
+%%OLDDOCSDIR%%/ximian-connector-E2kRestriction-(vaporware).html
+%%OLDDOCSDIR%%/ximian-connector-E2kResult-(private).html
+%%OLDDOCSDIR%%/ximian-connector-E2kSid.html
+%%OLDDOCSDIR%%/ximian-connector-E2kUserDialog.html
+%%OLDDOCSDIR%%/ximian-connector-MAPI.html
+%%OLDDOCSDIR%%/ximian-connector-autoconfig.html
+%%OLDDOCSDIR%%/ximian-connector-bug-private.html
+%%OLDDOCSDIR%%/ximian-connector-bug-xml.html
+%%OLDDOCSDIR%%/ximian-connector-calendar.html
+%%OLDDOCSDIR%%/ximian-connector-delegation.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-action.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-encoding-utils.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-freebusy.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-http-utils.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-kerberos.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-restriction.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-result.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-rule.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-uri.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-utils.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-xml-utils.html
+%%OLDDOCSDIR%%/ximian-connector-favorites.html
+%%OLDDOCSDIR%%/ximian-connector-fba.html
+%%OLDDOCSDIR%%/ximian-connector-freebusy.html
+%%OLDDOCSDIR%%/ximian-connector-mail-threading.html
+%%OLDDOCSDIR%%/ximian-connector-mail.html
+%%OLDDOCSDIR%%/ximian-connector-ntlm.html
+%%OLDDOCSDIR%%/ximian-connector-oof.html
+%%OLDDOCSDIR%%/ximian-connector-other-users.html
+%%OLDDOCSDIR%%/ximian-connector-permissions.html
+%%OLDDOCSDIR%%/ximian-connector-test-utils.html
+%%OLDDOCSDIR%%/ximian-connector-xntlm-des.html
+%%OLDDOCSDIR%%/ximian-connector-xntlm-md4.html
+%%OLDDOCSDIR%%/ximian-connector-xntlm.html
+%%OLDDOCSDIR%%/ximian-connector.devhelp
+%%OLDDOCSDIR%%/ximian-connnector-booking.html
 share/gnome/evolution-exchange/%%VERSION%%/etspec/e-storage-set-view.etspec
 share/gnome/evolution-exchange/%%VERSION%%/glade/e-folder-creation-dialog.glade
 share/gnome/evolution-exchange/%%VERSION%%/glade/e-foreign-folder-dialog.glade