Update to 2.4.1, and remove the C99ism patches.

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

12 files changed, 5 insertions, 184 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index ea3ac1c48..9e24c8c8d 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.73 2005/08/23 22:18:40 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.74 2005/09/05 17:37:32 kwm Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 44beb710f..e98cf955b 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-2.4.0.tar.bz2) = c6b38b9a6ba920be5a859e9ed368508d
-SIZE (gnome2/evolution-2.4.0.tar.bz2) = 11478244
+MD5 (gnome2/evolution-2.4.1.tar.bz2) = 13235405e08d14a54129e3a65548f58e
+SIZE (gnome2/evolution-2.4.1.tar.bz2) = 11543481
diff --git a/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-text.c b/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-text.c
deleted file mode 100644
index 4006abeb3..000000000
--- a/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-text.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- a11y/e-table/gal-a11y-e-cell-text.c.orig	Wed Jul 13 02:57:57 2005
-+++ a11y/e-table/gal-a11y-e-cell-text.c	Wed Jul 13 02:58:28 2005
-@@ -152,11 +152,12 @@ ect_get_character_at_offset (AtkText *te
- 	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
- 	gunichar ret_val;
- 	gchar *at_offset;
-+	gchar *full_text;
- 
- 	if (!ect_check (text))
- 		return -1;
- 
--	gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
-+	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
- 	at_offset = g_utf8_offset_to_pointer (full_text, offset);
- 	ret_val = g_utf8_get_char_validated (at_offset, -1);
- 	g_free (full_text);
-@@ -236,11 +237,12 @@ ect_get_character_count (AtkText *text)
- {
- 	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
- 	gint ret_val;
-+	gchar *full_text;
- 
- 	if (!ect_check (text))
- 		return -1;
- 
--	gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
-+	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
- 
- 	ret_val = g_utf8_strlen (full_text, -1);
- 	g_free (full_text);
diff --git a/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-vbox.c b/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-vbox.c
deleted file mode 100644
index 852d561b6..000000000
--- a/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-vbox.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- a11y/e-table/gal-a11y-e-cell-vbox.c.orig	Wed Jul 13 02:59:24 2005
-+++ a11y/e-table/gal-a11y-e-cell-vbox.c	Wed Jul 13 03:00:36 2005
-@@ -35,8 +35,9 @@ static AtkComponentIface *component_pare
- static gint
- ecv_get_n_children (AtkObject *a11y)
- {
-+	GalA11yECellVbox *gaev;
- 	g_return_val_if_fail (GAL_A11Y_IS_E_CELL_VBOX (a11y), 0);
--	GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y);
-+	gaev = GAL_A11Y_E_CELL_VBOX (a11y);
- 	return (gaev->a11y_subcell_count);
- }
- 
-@@ -68,9 +69,10 @@ ecv_ref_child (AtkObject *a11y, gint i)
- 	if (i < gaev->a11y_subcell_count) {
- 		if (gaev->a11y_subcells[i] == NULL) {
- 			gint model_col, row;
-+			ECellView *subcell_view;
- 			row = gaec->row;
- 			model_col = ecvv->model_cols[i];
--			ECellView *subcell_view = ecvv->subcell_views[i];
-+			subcell_view = ecvv->subcell_views[i];
- 			ret = gal_a11y_e_cell_registry_get_object (NULL,
- 				gaec->item,
- 				subcell_view,
-@@ -204,14 +206,17 @@ AtkObject *gal_a11y_e_cell_vbox_new	(ETa
- 					 int         row)
- {
- 	AtkObject *a11y;
-+	GalA11yECell *gaec;
-+	GalA11yECellVbox *gaev;
-+	ECellVboxView *ecvv;
- 
- 	a11y = g_object_new (gal_a11y_e_cell_vbox_get_type (), NULL);
- 	
- 	gal_a11y_e_cell_construct (a11y, item, cell_view, parent, model_col, view_col, row);
- 
--	GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y);
--	GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y);
--	ECellVboxView *ecvv = (ECellVboxView *) (gaec->cell_view);
-+	gaec = GAL_A11Y_E_CELL (a11y);
-+	gaev = GAL_A11Y_E_CELL_VBOX (a11y);
-+	ecvv = (ECellVboxView *) (gaec->cell_view);
- 	gaev->a11y_subcell_count = ecvv->subcell_view_count; 
- 	gaev->a11y_subcells = g_malloc0 (sizeof(AtkObject *)*gaev->a11y_subcell_count);
- 	return a11y;
diff --git a/mail/evolution/files/patch-addressbook_gui_contact-editor_e-contact-editor.c b/mail/evolution/files/patch-addressbook_gui_contact-editor_e-contact-editor.c
deleted file mode 100644
index 00e3e7507..000000000
--- a/mail/evolution/files/patch-addressbook_gui_contact-editor_e-contact-editor.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- addressbook/gui/contact-editor/e-contact-editor.c.orig	Tue Aug 23 14:46:51 2005
-+++ addressbook/gui/contact-editor/e-contact-editor.c	Tue Aug 23 14:47:29 2005
-@@ -581,10 +581,12 @@ sensitize_ok (EContactEditor *ce)
- 	gboolean   allow_save;
- 	GtkWidget *entry_fullname;
- 	GtkWidget *entry_file_as;
-+	const char *name_entry_string;
-+	const char *file_as_entry_string;
- 	entry_fullname = glade_xml_get_widget (ce->gui, "entry-fullname" );
- 	entry_file_as = glade_xml_get_widget (ce->gui, "entry-file-as");
--	const char *name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname));
--	const char *file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as));
-+	name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname));
-+	file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as));
- 
- 	allow_save = ce->target_editable && ce->changed ? TRUE : FALSE;
- 
diff --git a/mail/evolution/files/patch-calendar_gui_dialogs_comp-editor.c b/mail/evolution/files/patch-calendar_gui_dialogs_comp-editor.c
deleted file mode 100644
index d27506b24..000000000
--- a/mail/evolution/files/patch-calendar_gui_dialogs_comp-editor.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- calendar/gui/dialogs/comp-editor.c.orig	Tue Aug 23 16:06:26 2005
-+++ calendar/gui/dialogs/comp-editor.c	Tue Aug 23 16:06:46 2005
-@@ -2027,7 +2027,7 @@ set_attachment_list (CompEditor *editor,
- 		CamelDataWrapper *wrapper;
- 		CamelStream *stream;
- 		struct stat statbuf;
--		char *mime_type, *file_name;		
-+		char *mime_type, *file_name, *ptr;		
- 
- 		attach_filename = (char *) p->data;
- 		/* should we assert if g_str_has_prefix (attach_filename, "file://")) 
-@@ -2079,7 +2079,7 @@ set_attachment_list (CompEditor *editor,
- 	
- 		camel_mime_part_set_disposition (part, "attachment");
- 
--		char *ptr = strstr (attach_filename, comp_uid);
-+		ptr = strstr (attach_filename, comp_uid);
- 		if (ptr) {
- 			ptr += strlen(comp_uid);
- 			if (*ptr++ == '-')
diff --git a/mail/evolution/files/patch-calendar_gui_dialogs_meeting-page.c b/mail/evolution/files/patch-calendar_gui_dialogs_meeting-page.c
deleted file mode 100644
index c1d3e524a..000000000
--- a/mail/evolution/files/patch-calendar_gui_dialogs_meeting-page.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- calendar/gui/dialogs/meeting-page.c.orig	Wed Jun 15 16:34:21 2005
-+++ calendar/gui/dialogs/meeting-page.c	Wed Jun 15 16:34:35 2005
-@@ -933,8 +933,8 @@ meeting_page_construct (MeetingPage *mpa
- 	for (it = e_list_get_iterator((EList *)priv->accounts);
- 	     e_iterator_is_valid(it);
- 	     e_iterator_next(it)) {
--		a = (EAccount *)e_iterator_get(it);
- 		char *full;
-+		a = (EAccount *)e_iterator_get(it);
- 		
- 		full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
- 
diff --git a/mail/evolution/files/patch-calendar_gui_gnome-cal.c b/mail/evolution/files/patch-calendar_gui_gnome-cal.c
deleted file mode 100644
index 1187e3ed9..000000000
--- a/mail/evolution/files/patch-calendar_gui_gnome-cal.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- calendar/gui/gnome-cal.c.orig	Wed Jul 13 03:25:16 2005
-+++ calendar/gui/gnome-cal.c	Wed Jul 13 03:25:38 2005
-@@ -3409,8 +3409,9 @@ gnome_calendar_edit_appointment (GnomeCa
- 		return;
- 	
- 	for (l = gcal->priv->clients_list[E_CAL_SOURCE_TYPE_EVENT]; l != NULL; l = l->next) {
-+		ESource *client_src;
- 		client = l->data;
--		ESource *client_src = e_cal_get_source (client);
-+		client_src = e_cal_get_source (client);
- 
- 		if (!strcmp (src_uid, e_source_peek_uid (client_src)))
- 			break;
diff --git a/mail/evolution/files/patch-composer_e-msg-composer.c b/mail/evolution/files/patch-composer_e-msg-composer.c
deleted file mode 100644
index 2ea90f672..000000000
--- a/mail/evolution/files/patch-composer_e-msg-composer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- composer/e-msg-composer.c.orig	Wed Jun 15 18:14:55 2005
-+++ composer/e-msg-composer.c	Wed Jun 15 18:15:04 2005
-@@ -3367,7 +3367,7 @@ create_composer (int visible_mask)
- 	GList *icon_list;
- 	BonoboControlFrame *control_frame;
- 	GtkWidget *html_widget = NULL;
--	gpointer servant;;
-+	gpointer servant;
- 	BonoboObject *impl;	
- 	
- 	composer = g_object_new (E_TYPE_MSG_COMPOSER, "win_name", _("Compose a message"), NULL);
diff --git a/mail/evolution/files/patch-plugins_groupwise-features_proxy.c b/mail/evolution/files/patch-plugins_groupwise-features_proxy.c
deleted file mode 100644
index e7ce2132c..000000000
--- a/mail/evolution/files/patch-plugins_groupwise-features_proxy.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins/groupwise-features/proxy.c.orig	Fri Jul 29 18:53:05 2005
-+++ plugins/groupwise-features/proxy.c	Fri Jul 29 18:53:27 2005
-@@ -671,8 +671,8 @@ org_gnome_proxy (EPlugin *epl, EConfigHo
- 		prd = g_object_get_data ((GObject *) account, "prd");
- 
- 		if (prd) {
--			priv = prd->priv;
- 			int pag_num;
-+			priv = prd->priv;
- 			if (priv) {
- 			pag_num = gtk_notebook_page_num ( (GtkNotebook *)(data->parent), (GtkWidget *) priv->tab_dialog);
- 			gtk_notebook_remove_page ( (GtkNotebook *)(data->parent), pag_num); 
diff --git a/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c b/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c
deleted file mode 100644
index f2389bd04..000000000
--- a/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- widgets/misc/e-multi-config-dialog.c.orig	Tue Nov 23 15:53:34 2004
-+++ widgets/misc/e-multi-config-dialog.c	Tue Nov 23 15:54:02 2004
-@@ -396,6 +396,7 @@
- {
- 	EMultiConfigDialogPrivate *priv;
- 	AtkObject *a11y;
-+	AtkObject *a11yPage;
- 	gint page_no;
- 
- 	g_return_if_fail (E_IS_MULTI_CONFIG_DIALOG (dialog));
-@@ -418,7 +419,7 @@
- 				  NULL);
- 
- 	a11y = gtk_widget_get_accessible (GTK_WIDGET(priv->notebook));
--	AtkObject *a11yPage = atk_object_ref_accessible_child (a11y, page_no);
-+	a11yPage = atk_object_ref_accessible_child (a11y, page_no);
- 	if (a11yPage != NULL) {
- 		if (atk_object_get_role (a11yPage) == ATK_ROLE_PAGE_TAB)
- 			atk_object_set_name (a11yPage, title);
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index f0ad728b6..c25dda375 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -583,6 +583,7 @@ share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo