5 files changed, 12 insertions, 34 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index b52359e4b864..92614503cb27 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	1.10.1
-PORTREVISION=	2
+PORTVERSION=	1.10.2
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index a3a656f2c3ec..86b452f8067e 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-1.10.1.tar.bz2) = 1175bf76756009975f684116e76638c3
-SHA256 (gnome2/evolution-data-server-1.10.1.tar.bz2) = 289a541974fb37ed3e2392b19fd3e83429bfecd6873db52d4598ad4db5d1e905
-SIZE (gnome2/evolution-data-server-1.10.1.tar.bz2) = 7120388
+MD5 (gnome2/evolution-data-server-1.10.2.tar.bz2) = 790dfc97a917dff8384dcb7cad42f87f
+SHA256 (gnome2/evolution-data-server-1.10.2.tar.bz2) = dc9772f92818c1846127df32524caaa4c266460af5bbd0e2254d0dba4fa36432
+SIZE (gnome2/evolution-data-server-1.10.2.tar.bz2) = 7122238
diff --git a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltimezone.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltimezone.c
deleted file mode 100644
index cf14e5df65c7..000000000000
--- a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltimezone.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: calendar/libical/src/libical/icaltimezone.c
-===================================================================
---- calendar/libical/src/libical/icaltimezone.c	(révision 593)
-+++ calendar/libical/src/libical/icaltimezone.c	(copie de travail)
-@@ -1433,7 +1433,7 @@
- 	
- 	z_offset = get_offset(zone);
- 
--	if (z_offset == offset && !strcmp(tzname, zone->tznames))
-+	if (z_offset == offset && zone->tznames && !strcmp(tzname, zone->tznames))
- 	    return zone;
-     }
-     
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index 3609d850e3b4..f62645e708e2 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -15,14 +15,6 @@
  *)  os_win32=no
      NO_UNDEFINED=''
      SOCKET_LIBS=''
-@@ -25364,6 +25372,7 @@ int main (int argc, char **argv)
- {
- 	iconv_t cd;
- 	cd = iconv_open ("UTF-8", "ISO-8859-1");
-+	return (0);
- }
- 
- _ACEOF
 @@ -28749,7 +28758,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  		#include <sys/socket.h>
  		#include <netinet/in.h>
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 24eba2ad71dc..63069d805d71 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -176,8 +176,8 @@ include/evolution-data-server-%%VERSION%%/libecal/e-cal-view-listener.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-view.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal.h
 include/evolution-data-server-%%VERSION%%/libedata-book/Evolution-DataServer-Addressbook.h
-include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-db-cache.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-cache.h
+include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-db-cache.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-factory.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sexp.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-summary.h
@@ -408,6 +408,7 @@ share/doc/libebook/EBookListener.html
 share/doc/libebook/EBookView.html
 share/doc/libebook/EBookViewListener.html
 share/doc/libebook/EContact.html
+share/doc/libebook/EDestination.html
 share/doc/libebook/EVCard.html
 share/doc/libebook/ch01.html
 share/doc/libebook/home.png
@@ -417,7 +418,6 @@ share/doc/libebook/ix01.html
 share/doc/libebook/left.png
 share/doc/libebook/libebook-EAddressWestern.html
 share/doc/libebook/libebook-ENameWestern.html
-share/doc/libebook/EDestination.html
 share/doc/libebook/libebook-e-book-query.html
 share/doc/libebook/libebook-e-book-types.html
 share/doc/libebook/libebook.devhelp
@@ -426,8 +426,8 @@ share/doc/libebook/right.png
 share/doc/libebook/style.css
 share/doc/libebook/up.png
 share/doc/libecal/ECal.html
-share/doc/libecal/ECalListener.html
 share/doc/libecal/ECalComponent.html
+share/doc/libecal/ECalListener.html
 share/doc/libecal/ECalView.html
 share/doc/libecal/ECalViewListener.html
 share/doc/libecal/ch01.html
@@ -488,11 +488,6 @@ share/doc/libedata-cal/libedata-cal.devhelp2
 share/doc/libedata-cal/right.png
 share/doc/libedata-cal/style.css
 share/doc/libedata-cal/up.png
-share/doc/libedataserver/ch01.html
-share/doc/libedataserver/home.png
-share/doc/libedataserver/index.html
-share/doc/libedataserver/index.sgml
-share/doc/libedataserver/left.png
 share/doc/libedataserver/EAccount.html
 share/doc/libedataserver/EAccountList.html
 share/doc/libedataserver/EComponentListener.html
@@ -503,7 +498,12 @@ share/doc/libedataserver/EListIterator.html
 share/doc/libedataserver/ESource.html
 share/doc/libedataserver/ESourceGroup.html
 share/doc/libedataserver/ESourceList.html
+share/doc/libedataserver/ch01.html
+share/doc/libedataserver/home.png
+share/doc/libedataserver/index.html
+share/doc/libedataserver/index.sgml
 share/doc/libedataserver/ix01.html
+share/doc/libedataserver/left.png
 share/doc/libedataserver/libedataserver-ESExp.html
 share/doc/libedataserver/libedataserver-e-categories.html
 share/doc/libedataserver/libedataserver-e-data-server-module.html