Update to 2.3.3.1.

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

6 files changed, 59 insertions, 11 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index b55d99793..b9160dbdd 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.3.3
+PORTVERSION=	2.3.3.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
@@ -114,8 +114,6 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|gal-2.4|gal-2.6|g" \
 		${WRKSRC}/evolution-shell.pc.in \
 		${WRKSRC}/evolution-plugin.pc.in
-	@${REINPLACE_CMD} -e 's|plugins/mono/Makefile||g' \
-		${WRKSRC}/configure
 
 post-install:
 	@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 7e94356d9..90f54c3df 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-2.3.3.tar.bz2) = c6e9e6d08d273afba8501fe0f42fb9d5
-SIZE (gnome2/evolution-2.3.3.tar.bz2) = 10539090
+MD5 (gnome2/evolution-2.3.3.1.tar.bz2) = 226a753dd5efd636e90d4072888f9b20
+SIZE (gnome2/evolution-2.3.3.1.tar.bz2) = 14626400
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 5051d0125..f37bb61ef 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Wed Jun  8 18:17:36 2005
-+++ configure	Wed Jun  8 18:18:04 2005
-@@ -25553,6 +25553,7 @@
+--- configure.orig	Wed Jun 15 20:26:15 2005
++++ configure	Wed Jun 15 20:26:33 2005
+@@ -24869,6 +24869,7 @@
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -8,7 +8,7 @@
  
  
  int
-@@ -27123,7 +27124,7 @@
+@@ -26345,7 +26346,7 @@
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -17,7 +17,7 @@
  	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
  echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
  if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -28293,10 +28294,10 @@
+@@ -27517,10 +27518,10 @@
  Example: --with-nspr-libs=/usr/lib" >&2;}
     { (exit 1); exit 1; }; }
         				else
@@ -30,7 +30,7 @@
  			fi
  
  			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
-@@ -32154,7 +32155,7 @@
+@@ -31450,7 +31451,7 @@
  idldir="$datadir/idl/evolution-$BASE_VERSION"
  
  
@@ -39,3 +39,12 @@
  
  
  evolutionuidir="$privdatadir/ui"
+@@ -31514,7 +31515,7 @@
+   enable_plugins=all
+ fi;
+ 
+-plugins_base="calendar-file calendar-http calendar-weather itip-formatter plugin-manager exchange-account-setup default-source addressbook-file startup-wizard print-message mark-all-read groupwise-features mono"
++plugins_base="calendar-file calendar-http calendar-weather itip-formatter plugin-manager exchange-account-setup default-source addressbook-file startup-wizard print-message mark-all-read groupwise-features"
+ 
+ plugins_standard="bbdb subject-thread save-attachments prefer-plain save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify"
+ 
diff --git a/mail/evolution/files/patch-calendar_gui_dialogs_meeting-page.c b/mail/evolution/files/patch-calendar_gui_dialogs_meeting-page.c
new file mode 100644
index 000000000..c1d3e524a
--- /dev/null
+++ b/mail/evolution/files/patch-calendar_gui_dialogs_meeting-page.c
@@ -0,0 +1,12 @@
+--- 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-composer_e-msg-composer.c b/mail/evolution/files/patch-composer_e-msg-composer.c
new file mode 100644
index 000000000..2ea90f672
--- /dev/null
+++ b/mail/evolution/files/patch-composer_e-msg-composer.c
@@ -0,0 +1,11 @@
+--- 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_print-message_print-message.c b/mail/evolution/files/patch-plugins_print-message_print-message.c
new file mode 100644
index 000000000..ab20f4345
--- /dev/null
+++ b/mail/evolution/files/patch-plugins_print-message_print-message.c
@@ -0,0 +1,18 @@
+--- plugins/print-message/print-message.c.orig	Wed Jun 15 19:36:52 2005
++++ plugins/print-message/print-message.c	Wed Jun 15 19:37:09 2005
+@@ -74,13 +74,14 @@ org_gnome_print_message (EPlugin *ep, EM
+ 
+        	EMsgComposer *composer = (EMsgComposer *)t->target.widget;
+ 	struct _print_data *data;
++	GtkDialog *dialog;
+ 	
+ 	data = g_malloc0(sizeof(*data));
+ 	data->config = e_print_load_config ();
+ 	data->preview = 0;
+ 	
+ 	data->msg = e_msg_composer_get_message (composer, 1);
+-	GtkDialog *dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), GNOME_PRINT_DIALOG_COPIES, data->config);
++	dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), GNOME_PRINT_DIALOG_COPIES, data->config);
+ 	 gtk_dialog_set_default_response(dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT);
+ 	e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer);
+ 	g_signal_connect(dialog, "response", G_CALLBACK(print_response), data);