Update to 2.9.3.

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

4 files changed, 119 insertions, 70 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 863a3933f..caa0598ac 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.121 2006/10/18 09:12:17 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.122 2006/11/07 14:58:42 ahze Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.9.2
+PORTVERSION=	2.9.3
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 7cc2d7f06..2ad4be9d1 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.9.2.tar.bz2) = d6e24a907faed31cc809455e5b0eef47
-SHA256 (gnome2/evolution-2.9.2.tar.bz2) = 5fab2763456309afc5b57fbb894326fb56b04708087ec4de0288d1ab86669b7e
-SIZE (gnome2/evolution-2.9.2.tar.bz2) = 12878052
+MD5 (gnome2/evolution-2.9.3.tar.bz2) = 03c29ef09dbd1b04623f736cbd8e14a7
+SHA256 (gnome2/evolution-2.9.3.tar.bz2) = 6d52efba0c30198b69c9acc2d233c7d0b22200f2bf25b732455c8391ed8dc86d
+SIZE (gnome2/evolution-2.9.3.tar.bz2) = 13008062
diff --git a/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
deleted file mode 100644
index 4d8e131a6..000000000
--- a/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/groupwise-features/proxy-login.c.orig	Fri Jul 29 18:55:40 2005
-+++ plugins/groupwise-features/proxy-login.c	Fri Jul 29 18:55:58 2005
-@@ -236,7 +236,6 @@ proxy_login_get_cnc (EAccount *account)
- {
- 	EGwConnection *cnc;
- 	CamelURL *url;
--	url = camel_url_new (account->source->url, NULL);
- 	char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL;
- 	const char *use_ssl, *soap_port;
- 
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 7010f3234..3b1bd4a57 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -406,11 +406,12 @@ libexec/evolution/%%VERSION%%/evolution-addressbook-clean
 libexec/evolution/%%VERSION%%/evolution-addressbook-export
 libexec/evolution/%%VERSION%%/evolution-alarm-notify
 libexec/evolution/%%VERSION%%/killev
-share/gnome/applications/evolution-%%VERSION%%.desktop
+share/gnome/applications/evolution.desktop
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/evolution/%%VERSION%%/addresstypes.xml
 share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/default/de/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/es/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/default/fi/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/default/fr/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/default/ja/mail/local/Inbox
@@ -498,6 +499,7 @@ share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade
 share/gnome/evolution/%%VERSION%%/glade/task-page.glade
 share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf
 share/gnome/evolution/%%VERSION%%/help/quickref/de/quickref.pdf
+share/gnome/evolution/%%VERSION%%/help/quickref/es/quickref.pdf
 share/gnome/evolution/%%VERSION%%/images/about-box.png
 share/gnome/evolution/%%VERSION%%/images/bcg.png
 share/gnome/evolution/%%VERSION%%/images/evolution-contacts-mini.png
@@ -558,54 +560,104 @@ share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-address-%%VERSION%%.conduit
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit
-share/gnome/help/evolution-%%VERSION%%/C/evolution-%%VERSION%%.xml
-share/gnome/help/evolution-%%VERSION%%/C/figures/Screenshot-Free-Busy.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/calendar.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/config-cal.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/config-mail.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contact-editor.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contact.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contacts_mainwindow_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_account_info_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_contacteditor_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_email_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_gwreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_identity_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_imapreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mail_callout_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_maildirreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mboxreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mereceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mhreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_newmess_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_popreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup2_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_rule_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_send_setup_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_timezone_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_usereceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-delegation.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-identity.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive-options.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/filter-new-fig.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-1.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-2.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-3.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-4.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-5.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-6.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-7.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-druid-pic.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-inbox.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-threaded.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail_mainwindow_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mainwindow-pic.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/newmsg.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/replymsg.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/schedule.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/C/evolution.xml
+share/gnome/help/evolution/C/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/C/figures/calendar.png
+share/gnome/help/evolution/C/figures/config-cal.png
+share/gnome/help/evolution/C/figures/contact-editor.png
+share/gnome/help/evolution/C/figures/contact.png
+share/gnome/help/evolution/C/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/C/figures/evo_account_info_a.png
+share/gnome/help/evolution/C/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/C/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/C/figures/evo_email_a.png
+share/gnome/help/evolution/C/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/C/figures/evo_identity_a.png
+share/gnome/help/evolution/C/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/C/figures/evo_mail_callout_a.gif
+share/gnome/help/evolution/C/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/C/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/C/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/C/figures/evo_mereceive_a.png
+share/gnome/help/evolution/C/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/C/figures/evo_newmess_a.png
+share/gnome/help/evolution/C/figures/evo_popreceive_a.png
+share/gnome/help/evolution/C/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/C/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/C/figures/evo_rule_a.png
+share/gnome/help/evolution/C/figures/evo_send_setup_a.png
+share/gnome/help/evolution/C/figures/evo_timezone_a.png
+share/gnome/help/evolution/C/figures/evo_usereceive_a.png
+share/gnome/help/evolution/C/figures/exchange-delegation.png
+share/gnome/help/evolution/C/figures/exchange-identity.png
+share/gnome/help/evolution/C/figures/exchange-receive-options.png
+share/gnome/help/evolution/C/figures/exchange-receive.png
+share/gnome/help/evolution/C/figures/filter-new-fig.png
+share/gnome/help/evolution/C/figures/full-1.png
+share/gnome/help/evolution/C/figures/full-2.png
+share/gnome/help/evolution/C/figures/full-3.png
+share/gnome/help/evolution/C/figures/full-4.png
+share/gnome/help/evolution/C/figures/full-5.png
+share/gnome/help/evolution/C/figures/full-6.png
+share/gnome/help/evolution/C/figures/full-7.png
+share/gnome/help/evolution/C/figures/mail-druid-pic.png
+share/gnome/help/evolution/C/figures/mail-inbox.png
+share/gnome/help/evolution/C/figures/mail-threaded.png
+share/gnome/help/evolution/C/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/C/figures/mainwindow-pic.png
+share/gnome/help/evolution/C/figures/newmsg.png
+share/gnome/help/evolution/C/figures/replymsg.png
+share/gnome/help/evolution/C/figures/schedule.png
+share/gnome/help/evolution/C/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/es/evolution.xml
+share/gnome/help/evolution/es/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/es/figures/calendar.png
+share/gnome/help/evolution/es/figures/config-cal.png
+share/gnome/help/evolution/es/figures/contact-editor.png
+share/gnome/help/evolution/es/figures/contact.png
+share/gnome/help/evolution/es/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/es/figures/evo_account_info_a.png
+share/gnome/help/evolution/es/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/es/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/es/figures/evo_email_a.png
+share/gnome/help/evolution/es/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/es/figures/evo_identity_a.png
+share/gnome/help/evolution/es/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/es/figures/evo_mail_callout_a.gif
+share/gnome/help/evolution/es/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/es/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/es/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/es/figures/evo_mereceive_a.png
+share/gnome/help/evolution/es/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/es/figures/evo_newmess_a.png
+share/gnome/help/evolution/es/figures/evo_popreceive_a.png
+share/gnome/help/evolution/es/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/es/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/es/figures/evo_rule_a.png
+share/gnome/help/evolution/es/figures/evo_send_setup_a.png
+share/gnome/help/evolution/es/figures/evo_timezone_a.png
+share/gnome/help/evolution/es/figures/evo_usereceive_a.png
+share/gnome/help/evolution/es/figures/exchange-delegation.png
+share/gnome/help/evolution/es/figures/exchange-identity.png
+share/gnome/help/evolution/es/figures/exchange-receive-options.png
+share/gnome/help/evolution/es/figures/exchange-receive.png
+share/gnome/help/evolution/es/figures/filter-new-fig.png
+share/gnome/help/evolution/es/figures/full-1.png
+share/gnome/help/evolution/es/figures/full-2.png
+share/gnome/help/evolution/es/figures/full-3.png
+share/gnome/help/evolution/es/figures/full-4.png
+share/gnome/help/evolution/es/figures/full-5.png
+share/gnome/help/evolution/es/figures/full-6.png
+share/gnome/help/evolution/es/figures/full-7.png
+share/gnome/help/evolution/es/figures/mail-druid-pic.png
+share/gnome/help/evolution/es/figures/mail-inbox.png
+share/gnome/help/evolution/es/figures/mail-threaded.png
+share/gnome/help/evolution/es/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/es/figures/mainwindow-pic.png
+share/gnome/help/evolution/es/figures/newmsg.png
+share/gnome/help/evolution/es/figures/replymsg.png
+share/gnome/help/evolution/es/figures/schedule.png
+share/gnome/help/evolution/es/figures/vfolder-createrule-fig.png
 share/gnome/idl/evolution-%%VERSION%%/Composer.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Component.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Composer.idl
@@ -614,9 +666,10 @@ share/gnome/idl/evolution-%%VERSION%%/Evolution-Mail.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Shell.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution.idl
 share/gnome/idl/evolution-%%VERSION%%/evolution-calendar.idl
-share/gnome/mime-info/evolution-%%VERSION%%.keys
-share/gnome/mime-info/evolution-%%VERSION%%.mime
-share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf
+share/gnome/mime-info/evolution.keys
+share/gnome/mime-info/evolution.mime
+share/gnome/omf/evolution/evolution-C.omf
+share/gnome/omf/evolution/evolution-es.omf
 share/gnome/pixmaps/evolution-%%VERSION%%.png
 share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -694,9 +747,11 @@ share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/omf/evolution
 @dirrm share/gnome/idl/evolution-%%VERSION%%
-@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures
-@dirrm share/gnome/help/evolution-%%VERSION%%/C
-@dirrm share/gnome/help/evolution-%%VERSION%%
+@dirrm share/gnome/help/evolution/es/figures
+@dirrm share/gnome/help/evolution/es
+@dirrm share/gnome/help/evolution/C/figures
+@dirrm share/gnome/help/evolution/C
+@dirrm share/gnome/help/evolution
 @dirrm share/gnome/evolution/%%VERSION%%/weather
 @dirrm share/gnome/evolution/%%VERSION%%/views/tasks
 @dirrm share/gnome/evolution/%%VERSION%%/views/memos
@@ -706,6 +761,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/evolution/%%VERSION%%/views
 @dirrm share/gnome/evolution/%%VERSION%%/ui
 @dirrm share/gnome/evolution/%%VERSION%%/images
+@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/es
 @dirrm share/gnome/evolution/%%VERSION%%/help/quickref/de
 @dirrm share/gnome/evolution/%%VERSION%%/help/quickref/C
 @dirrm share/gnome/evolution/%%VERSION%%/help/quickref
@@ -738,6 +794,9 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/evolution/%%VERSION%%/default/fi/mail/local
 @dirrm share/gnome/evolution/%%VERSION%%/default/fi/mail
 @dirrm share/gnome/evolution/%%VERSION%%/default/fi
+@dirrm share/gnome/evolution/%%VERSION%%/default/es/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/es/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/es
 @dirrm share/gnome/evolution/%%VERSION%%/default/de/mail/local
 @dirrm share/gnome/evolution/%%VERSION%%/default/de/mail
 @dirrm share/gnome/evolution/%%VERSION%%/default/de