Update to 2.1.6.

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

4 files changed, 66 insertions, 15 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 89fed9457..b203302e5 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.1.5
+PORTVERSION=	2.1.6
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.1
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index afcee0649..7037fd98e 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-2.1.5.tar.bz2) = 66cac9d9a156660484408da4e6ec3d04
-SIZE (gnome2/evolution-2.1.5.tar.bz2) = 14000234
+MD5 (gnome2/evolution-2.1.6.tar.bz2) = 94f0e9d4486c86107033cd9cf24ef7e4
+SIZE (gnome2/evolution-2.1.6.tar.bz2) = 13367541
diff --git a/mail/evolution/files/patch-mail_em-account-editor.c b/mail/evolution/files/patch-mail_em-account-editor.c
deleted file mode 100644
index 64ce7f583..000000000
--- a/mail/evolution/files/patch-mail_em-account-editor.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- mail/em-account-editor.c.orig	Tue Dec 21 23:20:28 2004
-+++ mail/em-account-editor.c	Tue Dec 21 23:22:33 2004
-@@ -188,6 +188,7 @@
- } EMAccountEditorPrivate;
- 
- static GtkWidget *emae_setup_authtype(EMAccountEditor *emae, EMAccountEditorService *service);
-+static void emae_authtype_changed(GtkComboBox *dropdown, EMAccountEditorService *service);
- 
- static GtkVBoxClass *emae_parent;
- 
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index bb551d65f..96a91c32d 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -26,7 +26,6 @@ include/evolution-%%VERSION%%/e-util/e-list-iterator.h
 include/evolution-%%VERSION%%/e-util/e-list.h
 include/evolution-%%VERSION%%/e-util/e-menu.h
 include/evolution-%%VERSION%%/e-util/e-mktemp.h
-include/evolution-%%VERSION%%/e-util/e-passwords.h
 include/evolution-%%VERSION%%/e-util/e-plugin.h
 include/evolution-%%VERSION%%/e-util/e-popup.h
 include/evolution-%%VERSION%%/e-util/e-print.h
@@ -82,15 +81,33 @@ lib/evolution/%%VERSION%%/components/libevolution-mail.so
 lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-ldif-importer.so
 lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-vcard-importer.so
 lib/evolution/%%VERSION%%/evolution-calendar-importers/libevolution-calendar-importers.so
+lib/evolution/%%VERSION%%/libeabutil.a
+lib/evolution/%%VERSION%%/libeabutil.so
+lib/evolution/%%VERSION%%/libeabutil.so.0
 lib/evolution/%%VERSION%%/libeconduit.a
 lib/evolution/%%VERSION%%/libeconduit.so
 lib/evolution/%%VERSION%%/libeconduit.so.0
+lib/evolution/%%VERSION%%/libecontacteditor.a
+lib/evolution/%%VERSION%%/libecontacteditor.so
+lib/evolution/%%VERSION%%/libecontacteditor.so.0
+lib/evolution/%%VERSION%%/libecontactlisteditor.a
+lib/evolution/%%VERSION%%/libecontactlisteditor.so
+lib/evolution/%%VERSION%%/libecontactlisteditor.so.0
+lib/evolution/%%VERSION%%/libefilterbar.a
+lib/evolution/%%VERSION%%/libefilterbar.so
+lib/evolution/%%VERSION%%/libefilterbar.so.0
 lib/evolution/%%VERSION%%/libemiscwidgets.a
 lib/evolution/%%VERSION%%/libemiscwidgets.so
 lib/evolution/%%VERSION%%/libemiscwidgets.so.0
 lib/evolution/%%VERSION%%/libeshell.a
 lib/evolution/%%VERSION%%/libeshell.so
 lib/evolution/%%VERSION%%/libeshell.so.0
+lib/evolution/%%VERSION%%/libessmime.a
+lib/evolution/%%VERSION%%/libessmime.so
+lib/evolution/%%VERSION%%/libessmime.so.0
+lib/evolution/%%VERSION%%/libetimezonedialog.a
+lib/evolution/%%VERSION%%/libetimezonedialog.so
+lib/evolution/%%VERSION%%/libetimezonedialog.so.0
 lib/evolution/%%VERSION%%/libeutil.a
 lib/evolution/%%VERSION%%/libeutil.so
 lib/evolution/%%VERSION%%/libeutil.so.0
@@ -109,39 +126,78 @@ lib/evolution/%%VERSION%%/libevolution-importer.so.0
 lib/evolution/%%VERSION%%/libevolution-mail-importers.a
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0
+lib/evolution/%%VERSION%%/libevolution-smime.a
+lib/evolution/%%VERSION%%/libevolution-smime.so
+lib/evolution/%%VERSION%%/libevolution-smime.so.0
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.a
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0
+lib/evolution/%%VERSION%%/libfilter.a
+lib/evolution/%%VERSION%%/libfilter.so
+lib/evolution/%%VERSION%%/libfilter.so.0
+lib/evolution/%%VERSION%%/libmenus.a
+lib/evolution/%%VERSION%%/libmenus.so
+lib/evolution/%%VERSION%%/libmenus.so.0
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-groupwise.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-compose-send-options.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-account-settings.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-folder-unsubscribe.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-attachments.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-send-options.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-shared-folder.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-status-track.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-groupwise.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-account-setup.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-mail-folder-unsubscribe.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-mark-calendar-offline.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-new-mail-notify.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-save-attachments.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-save-attachments.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-send-options.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-shared-folder.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-status-track.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer_%%VERSION%%.server
@@ -162,6 +218,7 @@ share/gnome/applications/evolution-%%VERSION%%.desktop
 @exec 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/ja/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/default/nl/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/default/pt/mail/local/Inbox
@@ -174,6 +231,7 @@ share/gnome/evolution/%%VERSION%%/errors/calendar-errors.xml
 share/gnome/evolution/%%VERSION%%/errors/e-system-errors.xml
 share/gnome/evolution/%%VERSION%%/errors/filter-errors.xml
 share/gnome/evolution/%%VERSION%%/errors/org-gnome-itip-formatter-errors.xml
+share/gnome/evolution/%%VERSION%%/errors/org-gnome-mailing-list-actions-errors.xml
 share/gnome/evolution/%%VERSION%%/errors/org-gnome-shared-folder-errors.xml
 share/gnome/evolution/%%VERSION%%/errors/mail-composer-errors.xml
 share/gnome/evolution/%%VERSION%%/errors/mail-errors.xml
@@ -295,7 +353,7 @@ share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_receive_setup_a.png
 share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_rule_a.png
 share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_send_setup_a.png
 share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_timezone_a.png
-share/gnome/help/evolution-2.2/C/figures/evo_usereceive_a.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_usereceive_a.png
 share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-delegation.png
 share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-identity.png
 share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-receive-options.png
@@ -421,6 +479,9 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail/local
 @dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail
 @dirrm share/gnome/evolution/%%VERSION%%/default/ja
+@dirrm share/gnome/evolution/%%VERSION%%/default/de/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/de/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/de
 @dirrm share/gnome/evolution/%%VERSION%%/default/C/mail/local
 @dirrm share/gnome/evolution/%%VERSION%%/default/C/mail
 @dirrm share/gnome/evolution/%%VERSION%%/default/C