Update to 1.5.94. I thought I could remove the gnomespell dependency, but

it looks like we're stuck with it.


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

5 files changed, 4 insertions, 57 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 0fdba85f2..46915671b 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.5.93
+PORTVERSION=	1.5.94
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.5
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 67d4e86d9..e747b807d 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-1.5.93.tar.bz2) = a01dc293bca189461f6cbd61b0a5a0ee
-SIZE (gnome2/evolution-1.5.93.tar.bz2) = 12839720
+MD5 (gnome2/evolution-1.5.94.tar.bz2) = ce59d18b6e40f67077b95fbdec8f12c4
+SIZE (gnome2/evolution-1.5.94.tar.bz2) = 13051025
diff --git a/mail/evolution/files/patch-mail_message-list.c b/mail/evolution/files/patch-mail_message-list.c
deleted file mode 100644
index a61c287c5..000000000
--- a/mail/evolution/files/patch-mail_message-list.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- mail/message-list.c.orig	Sat Jun  5 20:05:13 2004
-+++ mail/message-list.c	Sat Jun  5 20:08:01 2004
-@@ -2129,6 +2129,7 @@
- 	ETreeModel *etm = ml->model;
- 	ETreePath *top;
- 	char *saveuid = NULL;
-+	GPtrArray *selected;
- 
- #ifdef TIMEIT
- 	struct timeval start, end;
-@@ -2156,7 +2157,7 @@
- #ifndef BROKEN_ETREE
- 	if (top == NULL || changes == NULL) {
- #else
--		GPtrArray *selected = message_list_get_selected(ml);
-+		selected = message_list_get_selected(ml);
- #endif
- 		e_tree_memory_freeze(E_TREE_MEMORY(etm));
- 		clear_tree (ml);
-@@ -2455,6 +2456,7 @@
- 	ETreePath node;
- 	char *saveuid = NULL;
- 	int i;
-+	GPtrArray *selected;
- 
- #ifdef TIMEIT
- 	struct timeval start, end;
-@@ -2472,7 +2474,7 @@
- 		build_flat_diff(ml, changes);
- 	} else {
- #else
--		GPtrArray *selected = message_list_get_selected(ml);
-+		selected = message_list_get_selected(ml);
- #endif
- 		e_tree_memory_freeze(E_TREE_MEMORY(etm));
- 		clear_tree (ml);
diff --git a/mail/evolution/files/patch-smime_gui_cert-trust-dialog.c b/mail/evolution/files/patch-smime_gui_cert-trust-dialog.c
deleted file mode 100644
index 08c755759..000000000
--- a/mail/evolution/files/patch-smime_gui_cert-trust-dialog.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- smime/gui/cert-trust-dialog.c.orig	Sat Jun  5 15:59:24 2004
-+++ smime/gui/cert-trust-dialog.c	Sat Jun  5 16:00:01 2004
-@@ -79,11 +79,13 @@
- 		CERT_ChangeCertTrust (CERT_GetDefaultCertDB(), icert, &trust);
- 		break;
- 	case GTK_RESPONSE_ACCEPT: {
-+		GtkWidget *dialog;
-+		CERTCertificate *icert;
- 		g_signal_stop_emission_by_name(w, "response");
- 
- 		/* just *what on earth* was chris thinking here!?!?!  copied from certificate-manager.c */
--		GtkWidget *dialog = ca_trust_dialog_show (data->cacert, FALSE);
--		CERTCertificate *icert = e_cert_get_internal_cert (data->cacert);
-+		dialog = ca_trust_dialog_show (data->cacert, FALSE);
-+		icert = e_cert_get_internal_cert (data->cacert);
- 
- 		ca_trust_dialog_set_trust (dialog,
- 					   e_cert_trust_has_trusted_ca (icert->trust, TRUE,  FALSE, FALSE),
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 0d41c7233..4d270f0d5 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -488,6 +488,7 @@ share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/nn/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/no/LC_MESSAGES/evolution-%%VERSION%%.mo