update to 2.30.2

This switches to the gnome-2.30 release branch.

(It crashes more often than the old version for me. Any help welcome.)

32 files changed, 42 insertions, 541 deletions

diff --git a/mail/evolution/patches/patch-ab b/mail/evolution/patches/patch-ab
index da035dc30bb..afc23caebb5 100644
--- a/mail/evolution/patches/patch-ab
+++ b/mail/evolution/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.10 2008/04/15 18:42:53 drochner Exp $
+$NetBSD: patch-ab,v 1.11 2010/07/13 12:24:34 drochner Exp $
 
---- ./mail/em-migrate.c.orig	2007-12-15 16:58:56.000000000 +0100
-+++ ./mail/em-migrate.c
-@@ -1493,7 +1493,7 @@ cp (const char *src, const char *dest, g
+--- mail/e-mail-migrate.c.orig	2010-04-26 13:13:17.000000000 +0000
++++ mail/e-mail-migrate.c
+@@ -1427,7 +1427,7 @@ cp (const gchar *src, const gchar *dest,
  	ut.actime = st.st_atime;
  	ut.modtime = st.st_mtime;
  	utime (dest, &ut);
 -	chmod (dest, st.st_mode);
 +	chmod (dest, st.st_mode | S_IWUSR);
  
- 	return 0;
+ 	return TRUE;
  
diff --git a/mail/evolution/patches/patch-ac b/mail/evolution/patches/patch-ac
new file mode 100644
index 00000000000..559458951c4
--- /dev/null
+++ b/mail/evolution/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.22 2010/07/13 12:24:34 drochner Exp $
+
+--- data/Makefile.in.orig	2010-07-13 10:34:48.000000000 +0000
++++ data/Makefile.in
+@@ -425,7 +425,7 @@ SUBDIRS = icons
+ desktopdir = $(datadir)/applications
+ desktop_in_files = evolution.desktop.in evolution-settings.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+-autostartdir = $(sysconfdir)/xdg/autostart
++autostartdir = $(datadir)/gnome/autostart
+ autostart_in_files = evolution-alarm-notify.desktop.in
+ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+ mimedir = $(datadir)/mime-info
diff --git a/mail/evolution/patches/patch-ca b/mail/evolution/patches/patch-ca
deleted file mode 100644
index d9f27344828..00000000000
--- a/mail/evolution/patches/patch-ca
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ca,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/addressbook-file/addressbook-file.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/addressbook-file/addressbook-file.c	2010-02-19 10:00:39.000000000 +0000
-@@ -25,6 +25,14 @@
- #include <libedataserver/e-source.h>
- #include <string.h>
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
- 
- GtkWidget *
diff --git a/mail/evolution/patches/patch-cb b/mail/evolution/patches/patch-cb
deleted file mode 100644
index b6088b902b1..00000000000
--- a/mail/evolution/patches/patch-cb
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-cb,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/audio-inline/audio-inline.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/audio-inline/audio-inline.c	2010-02-19 10:05:00.000000000 +0000
-@@ -38,6 +38,14 @@
- 
- #define d(x)
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- void org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t);
- 
- static volatile gint org_gnome_audio_class_id_counter = 0;
diff --git a/mail/evolution/patches/patch-cc b/mail/evolution/patches/patch-cc
deleted file mode 100644
index de968d4e922..00000000000
--- a/mail/evolution/patches/patch-cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-cc,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/backup-restore/backup-restore.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/backup-restore/backup-restore.c	2010-02-19 10:05:59.000000000 +0000
-@@ -51,6 +51,14 @@
- 	BR_START = 1<<1
- }br_flags;
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- static void
- backup (const gchar *filename, gboolean restart)
- {
diff --git a/mail/evolution/patches/patch-cd b/mail/evolution/patches/patch-cd
deleted file mode 100644
index f6159dbbc69..00000000000
--- a/mail/evolution/patches/patch-cd
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-cd,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/calendar-file/calendar-file.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/calendar-file/calendar-file.c	2010-02-19 10:06:46.000000000 +0000
-@@ -27,6 +27,14 @@
- #include <glib/gi18n.h>
- #include <string.h>
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- static void
- location_changed (GtkFileChooserButton *widget, ESource *source)
- {
diff --git a/mail/evolution/patches/patch-ce b/mail/evolution/patches/patch-ce
deleted file mode 100644
index 9adecff5cff..00000000000
--- a/mail/evolution/patches/patch-ce
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ce,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/calendar-http/calendar-http.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/calendar-http/calendar-http.c	2010-02-19 10:07:24.000000000 +0000
-@@ -33,6 +33,14 @@
- GtkWidget * e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *data);
- GtkWidget *e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data);
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- /* replaces all '@' with '%40' in str; returns newly allocated string */
- static gchar *
- replace_at_sign (const gchar *str)
diff --git a/mail/evolution/patches/patch-cf b/mail/evolution/patches/patch-cf
deleted file mode 100644
index a896b8038d0..00000000000
--- a/mail/evolution/patches/patch-cf
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cf,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/copy-tool/copy-tool.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/copy-tool/copy-tool.c	2010-02-19 10:08:30.000000000 +0000
-@@ -40,6 +40,13 @@
- #include "camel/camel-url.h"
- 
- void org_gnome_copy_tool_copy_address(gpointer ep, EMPopupTargetURI *t);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- void
- org_gnome_copy_tool_copy_address(gpointer ep, EMPopupTargetURI *t)
diff --git a/mail/evolution/patches/patch-cg b/mail/evolution/patches/patch-cg
deleted file mode 100644
index 2e881f38677..00000000000
--- a/mail/evolution/patches/patch-cg
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cg,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/default-mailer/default-mailer.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/default-mailer/default-mailer.c	2010-02-19 10:09:06.000000000 +0000
-@@ -36,6 +36,13 @@
- #define EVOLUTION_MAILTO_COMMAND "evolution --component=mail %s"
- 
- void org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- static gboolean
- evolution_is_default_mailer (const gchar *mailto_command)
diff --git a/mail/evolution/patches/patch-ch b/mail/evolution/patches/patch-ch
deleted file mode 100644
index 8678410d528..00000000000
--- a/mail/evolution/patches/patch-ch
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ch,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/default-source/default-source.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/default-source/default-source.c	2010-02-19 10:09:52.000000000 +0000
-@@ -30,9 +30,18 @@
- #include <libedataserver/e-source.h>
- #include <glib/gi18n.h>
- #include <string.h>
-+
- GtkWidget* org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data);
- void commit_default_calendar (EPlugin *epl, EConfigTarget *target);
- void commit_default_book (EPlugin *epl, EConfigTarget *target);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- void
- commit_default_calendar (EPlugin *epl, EConfigTarget *target)
- {
diff --git a/mail/evolution/patches/patch-ci b/mail/evolution/patches/patch-ci
deleted file mode 100644
index 391d2b26053..00000000000
--- a/mail/evolution/patches/patch-ci
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ci,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/external-editor/external-editor.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/external-editor/external-editor.c	2010-02-19 10:10:23.000000000 +0000
-@@ -66,6 +66,14 @@
- /* used to track when the external editor is active */
- static GThread *editor_thread;
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- void
- ee_editor_command_changed (GtkWidget *textbox)
- {
diff --git a/mail/evolution/patches/patch-cj b/mail/evolution/patches/patch-cj
deleted file mode 100644
index 2be6b56aea5..00000000000
--- a/mail/evolution/patches/patch-cj
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cj,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/face/face.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/face/face.c	2010-02-19 10:10:39.000000000 +0000
-@@ -36,6 +36,13 @@
- 
- gboolean	e_plugin_ui_init		(GtkUIManager *ui_manager,
- 						 EMsgComposer *composer);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- static void
- action_face_cb (GtkAction *action,
diff --git a/mail/evolution/patches/patch-ck b/mail/evolution/patches/patch-ck
deleted file mode 100644
index a9d71fb6e9b..00000000000
--- a/mail/evolution/patches/patch-ck
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ck,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/folder-unsubscribe/folder-unsubscribe.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/folder-unsubscribe/folder-unsubscribe.c	2010-02-19 10:11:06.000000000 +0000
-@@ -46,6 +46,14 @@
- 	gchar *uri;
- };
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- static gchar *
- folder_unsubscribe_desc (struct _folder_unsub_t *msg)
- {
diff --git a/mail/evolution/patches/patch-cl b/mail/evolution/patches/patch-cl
deleted file mode 100644
index cbc5ec8d9a4..00000000000
--- a/mail/evolution/patches/patch-cl
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cl,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/groupwise-features/addressbook-groupwise.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/groupwise-features/addressbook-groupwise.c	2010-02-19 10:14:02.000000000 +0000
-@@ -28,6 +28,13 @@
- 
- void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target);
- GtkWidget *e_book_groupwise_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- void
- commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
diff --git a/mail/evolution/patches/patch-cm b/mail/evolution/patches/patch-cm
deleted file mode 100644
index 641df841804..00000000000
--- a/mail/evolution/patches/patch-cm
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cm,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/imap-features/imap-headers.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/imap-features/imap-headers.c	2010-02-19 10:20:02.000000000 +0000
-@@ -64,6 +64,13 @@
- void imap_headers_abort (EPlugin *efp, EConfigHookItemFactoryData *data);
- void imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data);
- GtkWidget * org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- void
- imap_headers_abort (EPlugin *efp, EConfigHookItemFactoryData *data)
diff --git a/mail/evolution/patches/patch-cn b/mail/evolution/patches/patch-cn
deleted file mode 100644
index 65d36cbcdda..00000000000
--- a/mail/evolution/patches/patch-cn
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cn,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/ipod-sync/ipod-sync.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/ipod-sync/ipod-sync.c	2010-02-19 10:20:31.000000000 +0000
-@@ -53,6 +53,13 @@
- void org_gnome_sync_tasks (EPlugin *ep, ECalPopupTargetSource *target);
- void org_gnome_sync_memos (EPlugin *ep, ECalPopupTargetSource *target);
- void org_gnome_sync_addressbook (EPlugin *ep, EABPopupTargetSource *target);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- static void
- display_error_message (GtkWidget *parent, const gchar *message)
diff --git a/mail/evolution/patches/patch-co b/mail/evolution/patches/patch-co
deleted file mode 100644
index 4af0899e4e2..00000000000
--- a/mail/evolution/patches/patch-co
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-co,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/itip-formatter/itip-formatter.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/itip-formatter/itip-formatter.c	2010-02-19 10:21:46.000000000 +0000
-@@ -142,6 +142,7 @@
- void format_itip (EPlugin *ep, EMFormatHookTarget *target);
- GtkWidget *itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
- static void itip_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
- 
- typedef struct {
- 	struct _itip_puri *puri;
-@@ -157,6 +158,12 @@
- 
- static gboolean check_is_instance (icalcomponent *icalcomp);
- 
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- static icalproperty *
- find_attendee (icalcomponent *ical_comp, const gchar *address)
- {
diff --git a/mail/evolution/patches/patch-cp b/mail/evolution/patches/patch-cp
deleted file mode 100644
index ba5704a90c0..00000000000
--- a/mail/evolution/patches/patch-cp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-cp,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/mail-account-disable/mail-account-disable.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/mail-account-disable/mail-account-disable.c	2010-02-19 10:22:12.000000000 +0000
-@@ -46,6 +46,14 @@
- 	{ E_POPUP_ITEM, (gchar *) "40.emc.04", (gchar *) N_("Proxy _Logout"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }
- };
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- static void
- popup_free (EPopup *ep, GSList *items, gpointer data)
- {
diff --git a/mail/evolution/patches/patch-cq b/mail/evolution/patches/patch-cq
deleted file mode 100644
index 21c85c47bd8..00000000000
--- a/mail/evolution/patches/patch-cq
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-cq,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/mailing-list-actions/mailing-list-actions.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/mailing-list-actions/mailing-list-actions.c	2010-02-19 10:22:42.000000000 +0000
-@@ -87,6 +87,14 @@
- 	gchar * uri;
- } emla_action_data;
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- void emla_list_action (EPlugin *item, EMMenuTargetSelect* sel, EmlaAction action)
- {
- 	emla_action_data *data;
diff --git a/mail/evolution/patches/patch-cr b/mail/evolution/patches/patch-cr
deleted file mode 100644
index a715e60634d..00000000000
--- a/mail/evolution/patches/patch-cr
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cr,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/mark-all-read/mark-all-read.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/mark-all-read/mark-all-read.c	2010-02-19 10:23:03.000000000 +0000
-@@ -44,6 +44,13 @@
- void org_gnome_mark_all_read (EPlugin *ep, EMPopupTargetFolder *target);
- static void mar_got_folder (gchar *uri, CamelFolder *folder, gpointer data);
- static void mar_all_sub_folders (CamelStore *store, CamelFolderInfo *fi, CamelException *ex);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- static void
- button_clicked_cb (GtkButton *button,
diff --git a/mail/evolution/patches/patch-cs b/mail/evolution/patches/patch-cs
deleted file mode 100644
index 09aaf9a3f36..00000000000
--- a/mail/evolution/patches/patch-cs
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cs,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/mono/mono-plugin.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/mono/mono-plugin.c	2010-02-19 10:23:31.000000000 +0000
-@@ -49,6 +49,13 @@
- #define epm ((EPluginMono *)ep)
- 
- gpointer  load_plugin_type_register_function (gpointer a, gpointer b);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- static gchar *
- get_xml_prop(xmlNodePtr node, const gchar *id)
diff --git a/mail/evolution/patches/patch-ct b/mail/evolution/patches/patch-ct
deleted file mode 100644
index ab4a93189e7..00000000000
--- a/mail/evolution/patches/patch-ct
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ct,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/profiler/profiler.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/profiler/profiler.c	2010-02-19 10:23:59.000000000 +0000
-@@ -32,6 +32,14 @@
- #include <glib.h>
- #include <e-util/e-profile-event.h>
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- void
- org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t)
- {
diff --git a/mail/evolution/patches/patch-cu b/mail/evolution/patches/patch-cu
deleted file mode 100644
index 2b4641d0169..00000000000
--- a/mail/evolution/patches/patch-cu
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cu,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/python/python-plugin-loader.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/python/python-plugin-loader.c	2010-02-19 10:29:40.000000000 +0000
-@@ -42,6 +42,13 @@
- #define epp ((EPluginPython *)ep)
- 
- gpointer  load_plugin_type_register_function (gpointer a, gpointer b);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- static gchar *
- get_xml_prop(xmlNodePtr node, const gchar *id)
diff --git a/mail/evolution/patches/patch-cv b/mail/evolution/patches/patch-cv
deleted file mode 100644
index 2b6dd6b0ab6..00000000000
--- a/mail/evolution/patches/patch-cv
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cv,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/save-calendar/save-calendar.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/save-calendar/save-calendar.c	2010-02-19 10:24:36.000000000 +0000
-@@ -49,6 +49,13 @@
- void org_gnome_save_calendar (EPlugin *ep, ECalPopupTargetSource *target);
- void org_gnome_save_tasks (EPlugin *ep, ECalPopupTargetSource *target);
- void org_gnome_save_memos (EPlugin *ep, ECalPopupTargetSource *target);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- static void
- extra_widget_foreach_hide (GtkWidget *widget, gpointer data)
diff --git a/mail/evolution/patches/patch-cw b/mail/evolution/patches/patch-cw
deleted file mode 100644
index a326ba9f066..00000000000
--- a/mail/evolution/patches/patch-cw
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cw,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/select-one-source/select-one-source.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/select-one-source/select-one-source.c	2010-02-19 10:24:55.000000000 +0000
-@@ -31,6 +31,13 @@
- #include <calendar/gui/e-cal-popup.h>
- 
- void org_gnome_select_one_source (EPlugin *ep, ECalPopupTargetSource *target);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- void
- org_gnome_select_one_source (EPlugin *ep, ECalPopupTargetSource *target)
diff --git a/mail/evolution/patches/patch-cx b/mail/evolution/patches/patch-cx
deleted file mode 100644
index 86d2b06df78..00000000000
--- a/mail/evolution/patches/patch-cx
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-cx,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/startup-wizard/startup-wizard.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/startup-wizard/startup-wizard.c	2010-02-19 10:25:21.000000000 +0000
-@@ -34,6 +34,7 @@
- #include "mail/em-account-editor.h"
- #include "calendar/gui/calendar-config.h"
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
- void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target);
- GtkWidget *startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
- gboolean startup_wizard_check (EPlugin *ep, EConfigHookPageCheckData *check_data);
-@@ -46,6 +47,12 @@
- static GtkWidget *import_dialog, *import_progress, *import_label;
- static GSList *import_iterator, *import_importers;
- 
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- G_GNUC_NORETURN static void
- startup_wizard_delete (void) {
- 	gtk_main_quit ();
diff --git a/mail/evolution/patches/patch-cy b/mail/evolution/patches/patch-cy
deleted file mode 100644
index 58817dbdd27..00000000000
--- a/mail/evolution/patches/patch-cy
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cy,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/subject-thread/subject-thread.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/subject-thread/subject-thread.c	2010-02-19 10:25:38.000000000 +0000
-@@ -36,6 +36,13 @@
- #define GCONF_KEY "/apps/evolution/mail/display/thread_subject"
- 
- GtkWidget *org_gnome_subject_thread_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- static void
- toggled_cb (GtkWidget *widget, EConfig *config)
diff --git a/mail/evolution/patches/patch-cz b/mail/evolution/patches/patch-cz
deleted file mode 100644
index e208572c8d1..00000000000
--- a/mail/evolution/patches/patch-cz
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-cz,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/templates/templates.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/templates/templates.c	2010-02-19 10:26:03.000000000 +0000
-@@ -102,6 +102,14 @@
- static gboolean clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath
- 					*path, GtkTreeIter *iter, UIData *ui);
- 
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
-+
- static void
- selection_changed (GtkTreeSelection *selection, UIData *ui)
- {
diff --git a/mail/evolution/patches/patch-da b/mail/evolution/patches/patch-da
deleted file mode 100644
index 4665f7e4f05..00000000000
--- a/mail/evolution/patches/patch-da
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-da,v 1.2 2010/02/19 22:52:21 roy Exp $
-
---- plugins/vcard-inline/vcard-inline.c	2010-02-19 08:21:55.000000000 +0000
-+++ plugins/vcard-inline/vcard-inline.c	2010-02-19 10:26:24.000000000 +0000
-@@ -53,6 +53,13 @@
- 
- /* Forward Declarations */
- void org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target);
-+gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
-+
-+gint
-+e_plugin_lib_enable (EPluginLib *ep, gint enable)
-+{
-+	return 0;
-+}
- 
- static void
- org_gnome_vcard_inline_pobject_free (EMFormatHTMLPObject *object)
diff --git a/mail/evolution/patches/patch-ya b/mail/evolution/patches/patch-ya
index 9d552673315..1b967e38b79 100644
--- a/mail/evolution/patches/patch-ya
+++ b/mail/evolution/patches/patch-ya
@@ -1,13 +1,15 @@
-$NetBSD: patch-ya,v 1.2 2009/10/24 12:57:56 drochner Exp $
+$NetBSD: patch-ya,v 1.3 2010/07/13 12:24:34 drochner Exp $
 
---- calendar/gui/e-cal-model.h.orig	2009-10-18 01:08:48.000000000 +0200
+--- calendar/gui/e-cal-model.h.orig	2010-04-26 13:13:16.000000000 +0000
 +++ calendar/gui/e-cal-model.h
-@@ -118,7 +118,7 @@ typedef struct {
- 						     ETableModel *source_model, gint row);
+@@ -152,8 +152,8 @@ struct _ECalModelClass {
  
  	/* Signals */
--	void (* time_range_changed) (ECalModel *model, time_t start, time_t end);
-+	void (* time_range_changed) (ECalModel *model, gint64 start, gint64 end);
- 	void (* row_appended) (ECalModel *model);
- 	void (* comps_deleted) (ECalModel *model, gpointer list);
- 	void (* cal_view_progress) (ECalModel *model, const gchar *message, gint progress, ECalSourceType type);
+ 	void		(*time_range_changed)	(ECalModel *model,
+-						 time_t start,
+-						 time_t end);
++						 gint64 start,
++						 gint64 end);
+ 	void		(*row_appended)		(ECalModel *model);
+ 	void		(*comps_deleted)	(ECalModel *model,
+ 						 gpointer list);
diff --git a/mail/evolution/patches/patch-yc b/mail/evolution/patches/patch-yc
index f6ceb86646a..ce1199842a6 100644
--- a/mail/evolution/patches/patch-yc
+++ b/mail/evolution/patches/patch-yc
@@ -1,11 +1,11 @@
-$NetBSD: patch-yc,v 1.2 2009/10/24 12:57:56 drochner Exp $
+$NetBSD: patch-yc,v 1.3 2010/07/13 12:24:34 drochner Exp $
 
---- e-util/e-marshal.list.orig	2009-10-23 12:08:30.000000000 +0200
+--- e-util/e-marshal.list.orig	2010-03-18 14:13:59.000000000 +0000
 +++ e-util/e-marshal.list
-@@ -41,7 +41,7 @@ NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,U
+@@ -37,7 +37,7 @@ NONE:INT,POINTER,INT,OBJECT
+ NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT
  NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT
  NONE:INT,POINTER,INT,OBJECT,UINT
- NONE:INT,STRING
 -NONE:LONG,LONG
 +NONE:INT64,INT64
  NONE:OBJECT,BOOLEAN
diff --git a/mail/evolution/patches/patch-ye b/mail/evolution/patches/patch-ye
index cd19c6574db..c7daf52e1e6 100644
--- a/mail/evolution/patches/patch-ye
+++ b/mail/evolution/patches/patch-ye
@@ -1,15 +1,17 @@
-$NetBSD: patch-ye,v 1.1 2009/01/25 17:07:36 drochner Exp $
+$NetBSD: patch-ye,v 1.2 2010/07/13 12:24:34 drochner Exp $
 
---- calendar/gui/e-week-view.c.orig	2009-01-25 16:40:31.000000000 +0100
+--- calendar/gui/e-week-view.c.orig	2010-04-26 13:13:16.000000000 +0000
 +++ calendar/gui/e-week-view.c
-@@ -231,12 +231,13 @@ e_week_view_class_init (EWeekViewClass *
- }
+@@ -357,13 +357,14 @@ week_view_model_rows_inserted_cb (EWeekV
  
  static void
--time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpointer user_data)
-+time_range_changed_cb (ECalModel *model, gint64 st64, gint64 et64, gpointer user_data)
+ week_view_time_range_changed_cb (EWeekView *week_view,
+-                                 time_t start_time,
+-                                 time_t end_time,
++                                 gint64 st64,
++                                 gint64 et64,
+                                  ECalModel *model)
  {
- 	EWeekView *week_view = E_WEEK_VIEW (user_data);
  	GDate date, base_date;
  	gint day_offset, weekday, week_start_offset;
  	gboolean update_adjustment_value = FALSE;