Update to 2.4.1, and remove all C99ism patches.

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

8 files changed, 5 insertions, 127 deletions

diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 51075fd8d..1e99122b9 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.37 2005/08/24 00:23:24 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.38 2005/09/05 17:52:40 kwm Exp $
 #
 
 PORTNAME=	evolution-exchange
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/2.4
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 6fbcb23c6..686bd4e61 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,2 +1 @@
-MD5 (gnome2/evolution-exchange-2.4.0.tar.bz2) = 0120610242240a563ef164a668a14b19
-SIZE (gnome2/evolution-exchange-2.4.0.tar.bz2) = 1108584
+MD5 (gnome2/evolution-exchange-2.4.1.tar.bz2) = be61e4e8cfc64650c214525c5a615ed6SIZE (gnome2/evolution-exchange-2.4.1.tar.bz2) = 1106956
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
deleted file mode 100644
index a760c4c7c..000000000
--- a/mail/evolution-exchange/files/patch-addressbook_e-book-backend-gal.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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-calendar_e-cal-backend-exchange.c b/mail/evolution-exchange/files/patch-calendar_e-cal-backend-exchange.c
deleted file mode 100644
index 105002aae..000000000
--- a/mail/evolution-exchange/files/patch-calendar_e-cal-backend-exchange.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- calendar/e-cal-backend-exchange.c.orig	Thu Jul 21 10:54:25 2005
-+++ calendar/e-cal-backend-exchange.c	Fri Jul 29 23:06:07 2005
-@@ -363,10 +363,10 @@ open_calendar (ECalBackendSync *backend,
- static ECalBackendSyncStatus
- remove_calendar (ECalBackendSync *backend, EDataCal *cal)
- {
--	d(printf("ecbe_remove_calendar(%p, %p)\n", backend, cal));
- 	ECalBackendExchange *cbex = E_CAL_BACKEND_EXCHANGE (backend);
- 	ExchangeAccountFolderResult result;
- 	const char *uri;
-+	d(printf("ecbe_remove_calendar(%p, %p)\n", backend, cal));
- 
- 	/* FIXME: Deleting calendar/tasks from respective views */
- 	uri = e_folder_exchange_get_internal_uri (cbex->folder);
-@@ -1437,6 +1437,7 @@ build_msg ( ECalBackendExchange *cbex, E
- 	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;
-@@ -1465,7 +1466,7 @@ build_msg ( ECalBackendExchange *cbex, E
- 		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-camel_camel-exchange-store.c b/mail/evolution-exchange/files/patch-camel_camel-exchange-store.c
deleted file mode 100644
index 5771f503a..000000000
--- a/mail/evolution-exchange/files/patch-camel_camel-exchange-store.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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
deleted file mode 100644
index feec4bf8c..000000000
--- a/mail/evolution-exchange/files/patch-mail_mail-stub-exchange.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- mail/mail-stub-exchange.c.orig	Mon Aug  8 22:00:52 2005
-+++ mail/mail-stub-exchange.c	Mon Aug  8 22:01:11 2005
-@@ -2587,11 +2587,11 @@ 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, *pub_name;
-+	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/files/patch-storage_exchange-config-listener.c b/mail/evolution-exchange/files/patch-storage_exchange-config-listener.c
deleted file mode 100644
index 1660af686..000000000
--- a/mail/evolution-exchange/files/patch-storage_exchange-config-listener.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- storage/exchange-config-listener.c.orig	Tue Aug 23 20:19:24 2005
-+++ storage/exchange-config-listener.c	Tue Aug 23 20:19:37 2005
-@@ -253,9 +253,10 @@ migrate_account_esource (EAccount *accou
- void
- exchange_config_listener_migrate_esources (ExchangeConfigListener *config_listener)
- {
-+	EAccount *account;
- 	g_return_if_fail (config_listener != NULL);
- 
--	EAccount *account = config_listener->priv->configured_account;
-+	account = config_listener->priv->configured_account;
- 
- 	migrate_account_esource (account, EXCHANGE_CALENDAR_FOLDER);
- 	migrate_account_esource (account, EXCHANGE_TASKS_FOLDER);
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index e6c305c0d..df90567ac 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -86,6 +86,8 @@ share/locale/en_CA/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/et/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/fa/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/gl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo