Update to 2.10.2.

7 files changed, 111 insertions, 32 deletions

diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index c639c86b8985..a5db3a565337 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	evolution-exchange
-PORTVERSION=	2.10.1
-PORTREVISION=	1
+PORTVERSION=	2.10.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 0aa2ad94a661..f4d66839b0c8 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.10.1.tar.bz2) = 3457a46a0450737d83f1c74e97c89b8f
-SHA256 (gnome2/evolution-exchange-2.10.1.tar.bz2) = 4bad1d2d625f1bc3302b0f8e3a27d8e25323bfc55c34c8fe7e112d067ebb4584
-SIZE (gnome2/evolution-exchange-2.10.1.tar.bz2) = 1046653
+MD5 (gnome2/evolution-exchange-2.10.2.tar.bz2) = a8b5fc44e23e5158c732547df434ed77
+SHA256 (gnome2/evolution-exchange-2.10.2.tar.bz2) = a0c3e4a48b0f249e329b695758f83e0c477076b9c2963c9fb750f9edf8bc7aa3
+SIZE (gnome2/evolution-exchange-2.10.2.tar.bz2) = 1046818
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9f20c4b3073d..6a842312da46 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.10.1
-PORTREVISION=	1
+PORTVERSION=	2.10.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index afa9d9d78901..62e4d1b99fc9 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.10.1.tar.bz2) = 16051c6cbb617cb04665e402566e0976
-SHA256 (gnome2/evolution-2.10.1.tar.bz2) = d396190136e6322c2ae820993467bf41a8e188f9597ccf00e3411560280b5cda
-SIZE (gnome2/evolution-2.10.1.tar.bz2) = 15689020
+MD5 (gnome2/evolution-2.10.2.tar.bz2) = 4b495be7f5e146ce7b5807134586336e
+SHA256 (gnome2/evolution-2.10.2.tar.bz2) = 8d5aae3090f40605151010a359ffa61987b9abe3b30fffd77256dba0a9f8c9b0
+SIZE (gnome2/evolution-2.10.2.tar.bz2) = 22143502
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index dddc3d63572e..9adc9c36e145 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -16,14 +16,6 @@
  *)  os_win32=no
      NO_UNDEFINED=''
      SOEXT='.so'
-@@ -24979,6 +24988,7 @@ int main (int argc, char **argv)
- {
-         iconv_t cd;
-         cd = iconv_open ("UTF-8", "ISO-8859-1");
-+        return (0);
- }
- 
- _ACEOF
 @@ -26594,6 +26604,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  		#include <sys/socket.h>
  		#include <netinet/in.h>
diff --git a/mail/evolution/files/patch-mail_em-utils.h b/mail/evolution/files/patch-mail_em-utils.h
deleted file mode 100644
index b3e7b9ffbe25..000000000000
--- a/mail/evolution/files/patch-mail_em-utils.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- mail/em-utils.h.orig	Tue Aug  3 16:59:46 2004
-+++ mail/em-utils.h	Tue Aug  3 17:00:04 2004
-@@ -23,6 +23,7 @@
- #ifndef __EM_UTILS_H__
- #define __EM_UTILS_H__
- 
-+#include <sys/types.h>
- #include <glib.h>
- 
- #ifdef __cplusplus
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 0fa8d02c1fe4..52ea7a5be788 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -416,7 +416,6 @@ libexec/evolution/%%VERSION%%/evolution-addressbook-export
 libexec/evolution/%%VERSION%%/evolution-alarm-notify
 libexec/evolution/%%VERSION%%/killev
 share/gnome/applications/evolution.desktop
-@exec %%LOCALBASE%%/bin/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
@@ -497,8 +496,8 @@ share/gnome/evolution/%%VERSION%%/glade/junk-settings.glade
 share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-config.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-dialogs.glade
-share/gnome/evolution/%%VERSION%%/glade/memo-page.glade
 share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade
+share/gnome/evolution/%%VERSION%%/glade/memo-page.glade
 share/gnome/evolution/%%VERSION%%/glade/properties.glade
 share/gnome/evolution/%%VERSION%%/glade/proxy-add-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/proxy-listing.glade
@@ -950,6 +949,101 @@ share/gnome/help/evolution/fr/figures/sub-others-folder.png
 share/gnome/help/evolution/fr/figures/sub-pub-fold.png
 share/gnome/help/evolution/fr/figures/ver_view_a.png
 share/gnome/help/evolution/fr/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/ru/evolution.xml
+share/gnome/help/evolution/ru/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/ru/figures/account_editor_a.png
+share/gnome/help/evolution/ru/figures/calendar.png
+share/gnome/help/evolution/ru/figures/categories_a.png
+share/gnome/help/evolution/ru/figures/collap_head_a.png
+share/gnome/help/evolution/ru/figures/config-cal.png
+share/gnome/help/evolution/ru/figures/config-mail.png
+share/gnome/help/evolution/ru/figures/contact-editor.png
+share/gnome/help/evolution/ru/figures/contact.png
+share/gnome/help/evolution/ru/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/ru/figures/delgt-add.png
+share/gnome/help/evolution/ru/figures/evo_account_editor_a.png
+share/gnome/help/evolution/ru/figures/evo_account_info_a.png
+share/gnome/help/evolution/ru/figures/evo_add_rule_a.png
+share/gnome/help/evolution/ru/figures/evo_adv_search_a.png
+share/gnome/help/evolution/ru/figures/evo_allday_a.png
+share/gnome/help/evolution/ru/figures/evo_cal_a.png
+share/gnome/help/evolution/ru/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/ru/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/ru/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/ru/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/ru/figures/evo_edit_search.png
+share/gnome/help/evolution/ru/figures/evo_email_a.png
+share/gnome/help/evolution/ru/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/ru/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/ru/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/ru/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/ru/figures/evo_identity_a.png
+share/gnome/help/evolution/ru/figures/evo_identityedit_a.png
+share/gnome/help/evolution/ru/figures/evo_imapheader_a.png
+share/gnome/help/evolution/ru/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/ru/figures/evo_import_asst_a.png
+share/gnome/help/evolution/ru/figures/evo_mail_a.png
+share/gnome/help/evolution/ru/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/ru/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/ru/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/ru/figures/evo_memo_a.png
+share/gnome/help/evolution/ru/figures/evo_mereceive_a.png
+share/gnome/help/evolution/ru/figures/evo_message_filters_a.png
+share/gnome/help/evolution/ru/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/ru/figures/evo_newmess_a.png
+share/gnome/help/evolution/ru/figures/evo_popreceive_a.png
+share/gnome/help/evolution/ru/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/ru/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/ru/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/ru/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/ru/figures/evo_rule_a.png
+share/gnome/help/evolution/ru/figures/evo_select_add_folder.png
+share/gnome/help/evolution/ru/figures/evo_select_folder.png
+share/gnome/help/evolution/ru/figures/evo_send_option_a.png
+share/gnome/help/evolution/ru/figures/evo_send_setup_a.png
+share/gnome/help/evolution/ru/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/ru/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/ru/figures/evo_timezone_a.png
+share/gnome/help/evolution/ru/figures/evo_usereceive_a.png
+share/gnome/help/evolution/ru/figures/exchange-delegation.png
+share/gnome/help/evolution/ru/figures/exchange-identity.png
+share/gnome/help/evolution/ru/figures/exchange-receive-options.png
+share/gnome/help/evolution/ru/figures/exchange-receive.png
+share/gnome/help/evolution/ru/figures/exchg-identity.png
+share/gnome/help/evolution/ru/figures/exchng-identity.png
+share/gnome/help/evolution/ru/figures/exchng-rec-mail.png
+share/gnome/help/evolution/ru/figures/exchng-rec-mails.png
+share/gnome/help/evolution/ru/figures/exchng-rec-option.png
+share/gnome/help/evolution/ru/figures/exchng-rec-options.png
+share/gnome/help/evolution/ru/figures/exchng-settings.png
+share/gnome/help/evolution/ru/figures/filter-new-fig.png
+share/gnome/help/evolution/ru/figures/free_busy.png
+share/gnome/help/evolution/ru/figures/full-1.png
+share/gnome/help/evolution/ru/figures/full-2.png
+share/gnome/help/evolution/ru/figures/full-3.png
+share/gnome/help/evolution/ru/figures/full-4.png
+share/gnome/help/evolution/ru/figures/full-5.png
+share/gnome/help/evolution/ru/figures/full-6.png
+share/gnome/help/evolution/ru/figures/full-7.png
+share/gnome/help/evolution/ru/figures/mail-druid-pic.png
+share/gnome/help/evolution/ru/figures/mail-inbox.png
+share/gnome/help/evolution/ru/figures/mail-threaded.png
+share/gnome/help/evolution/ru/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/ru/figures/mailer_preferences.png
+share/gnome/help/evolution/ru/figures/mainwindow-pic.png
+share/gnome/help/evolution/ru/figures/minus.png
+share/gnome/help/evolution/ru/figures/newmsg.png
+share/gnome/help/evolution/ru/figures/plus.png
+share/gnome/help/evolution/ru/figures/proxy-cal.png
+share/gnome/help/evolution/ru/figures/proxy-login.png
+share/gnome/help/evolution/ru/figures/quick_add_a.png
+share/gnome/help/evolution/ru/figures/replymsg.png
+share/gnome/help/evolution/ru/figures/schedule.png
+share/gnome/help/evolution/ru/figures/stock_search.png
+share/gnome/help/evolution/ru/figures/sub-others-folder.png
+share/gnome/help/evolution/ru/figures/sub-pub-fold.png
+share/gnome/help/evolution/ru/figures/ver_view_a.png
+share/gnome/help/evolution/ru/figures/vfolder-createrule-fig.png
 share/gnome/help/evolution/sv/evolution.xml
 share/gnome/help/evolution/sv/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution/sv/figures/account_editor_a.png
@@ -1057,8 +1151,9 @@ share/gnome/mime-info/evolution.keys
 share/gnome/mime-info/evolution.mime
 share/gnome/omf/evolution/evolution-C.omf
 share/gnome/omf/evolution/evolution-en_GB.omf
-share/gnome/omf/evolution/evolution-fr.omf
 share/gnome/omf/evolution/evolution-es.omf
+share/gnome/omf/evolution/evolution-fr.omf
+share/gnome/omf/evolution/evolution-ru.omf
 share/gnome/omf/evolution/evolution-sv.omf
 share/icons/hicolor/16x16/apps/evolution.png
 share/icons/hicolor/22x22/apps/evolution.png
@@ -1114,6 +1209,7 @@ share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ne/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/nn/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/or/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/pa/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -1143,6 +1239,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/idl/evolution-%%VERSION%%
 @dirrm share/gnome/help/evolution/sv/figures
 @dirrm share/gnome/help/evolution/sv
+@dirrm share/gnome/help/evolution/ru/figures
+@dirrm share/gnome/help/evolution/ru
 @dirrm share/gnome/help/evolution/fr/figures
 @dirrm share/gnome/help/evolution/fr
 @dirrm share/gnome/help/evolution/es/figures
@@ -1229,7 +1327,6 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm include/evolution-%%VERSION%%/addressbook/gui
 @dirrm include/evolution-%%VERSION%%/addressbook
 @dirrm include/evolution-%%VERSION%%
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -1238,6 +1335,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrmtry share/locale/te
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES