Update to 2.23.5.

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

3 files changed, 25 insertions, 23 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 729b3846e..c7a73fa45 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.148 2008/06/06 21:38:46 marcus Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.149 2008/06/16 19:35:56 marcus Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	2.23.4
+PORTVERSION=	2.23.5
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,7 +17,8 @@ COMMENT=	The data backends for the Evolution integrated mail/PIM suite
 
 LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		nss3.1:${PORTSDIR}/security/nss \
-		tasn1.3:${PORTSDIR}/security/libtasn1
+		tasn1.3:${PORTSDIR}/security/libtasn1 \
+		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -38,7 +39,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_C
 
 PLIST_SUB=	VERSION="2.24" EVO_VERSION="1.2"
 
-OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
+#OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
 
 .include <bsd.port.pre.mk>
 
@@ -55,12 +56,12 @@ CONFIGURE_ARGS+=        --with-krb5=/usr
 KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
 .endif
 
-.if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS+=	--enable-imap4=yes
-PLIST_SUB+=		IMAP4=""
-.else
+#.if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING)
+#CONFIGURE_ARGS+=	--enable-imap4=yes
+#PLIST_SUB+=		IMAP4=""
+#.else
 PLIST_SUB+=		IMAP4="@comment "
-.endif
+#.endif
 
 EDS_BDB_MSG=	"!!!WARNING!!!: Berkeley Database version is ${BDB_VER}.  If this is an upgrade, you may experience problems if you or any other Evolution-data-server users were previously using BDB_VER 41."
 
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 1b911e8d0..c2ae25f59 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-2.23.4.tar.bz2) = 2b86e018c8483e5cc2077303ca8e57a7
-SHA256 (gnome2/evolution-data-server-2.23.4.tar.bz2) = 8f9084a5d2cd9998bea251f843ed13c8d48ff7494fae17ec8f65356c4973bbca
-SIZE (gnome2/evolution-data-server-2.23.4.tar.bz2) = 7650255
+MD5 (gnome2/evolution-data-server-2.23.5.tar.bz2) = 73847cb2caac32e45499bbe3b88353c2
+SHA256 (gnome2/evolution-data-server-2.23.5.tar.bz2) = d02438330b2ee91e10d45c07d7952d81e64bc20d405b0c1c8166b94e71eef2bb
+SIZE (gnome2/evolution-data-server-2.23.5.tar.bz2) = 7671857
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 73293b813..e87c62004 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -1,4 +1,3 @@
-include/evolution-data-server-%%VERSION%%/camel/broken-date-parser.h
 include/evolution-data-server-%%VERSION%%/camel/camel-address.h
 include/evolution-data-server-%%VERSION%%/camel/camel-arg.h
 include/evolution-data-server-%%VERSION%%/camel/camel-block-file.h
@@ -7,6 +6,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-charset-map.h
 include/evolution-data-server-%%VERSION%%/camel/camel-cipher-context.h
 include/evolution-data-server-%%VERSION%%/camel/camel-data-cache.h
 include/evolution-data-server-%%VERSION%%/camel/camel-data-wrapper.h
+include/evolution-data-server-%%VERSION%%/camel/camel-db.h
 include/evolution-data-server-%%VERSION%%/camel/camel-debug.h
 include/evolution-data-server-%%VERSION%%/camel/camel-digest-folder.h
 include/evolution-data-server-%%VERSION%%/camel/camel-digest-store.h
@@ -48,6 +48,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-html.h
 include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-index.h
 include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-linewrap.h
 include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-pgp.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-progress.h
 include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-save.h
 include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-tohtml.h
 include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-windows.h
@@ -177,6 +178,7 @@ include/evolution-data-server-%%VERSION%%/libebook/e-contact.h
 include/evolution-data-server-%%VERSION%%/libebook/e-destination.h
 include/evolution-data-server-%%VERSION%%/libebook/e-name-western.h
 include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h
+include/evolution-data-server-%%VERSION%%/libecal/e-cal-check-timezones.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-component.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-recur.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-time-util.h
@@ -332,6 +334,9 @@ lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.urls
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.a
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgoogle.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgoogle.la
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgoogle.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.a
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.so
@@ -365,11 +370,11 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so
 lib/libcamel-%%EVO_VERSION%%.a
 lib/libcamel-%%EVO_VERSION%%.la
 lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.12
+lib/libcamel-%%EVO_VERSION%%.so.13
 lib/libcamel-provider-%%EVO_VERSION%%.a
 lib/libcamel-provider-%%EVO_VERSION%%.la
 lib/libcamel-provider-%%EVO_VERSION%%.so
-lib/libcamel-provider-%%EVO_VERSION%%.so.12
+lib/libcamel-provider-%%EVO_VERSION%%.so.13
 lib/libebackend-%%EVO_VERSION%%.a
 lib/libebackend-%%EVO_VERSION%%.la
 lib/libebackend-%%EVO_VERSION%%.so
@@ -377,15 +382,15 @@ lib/libebackend-%%EVO_VERSION%%.so.0
 lib/libebook-%%EVO_VERSION%%.a
 lib/libebook-%%EVO_VERSION%%.la
 lib/libebook-%%EVO_VERSION%%.so
-lib/libebook-%%EVO_VERSION%%.so.9
+lib/libebook-%%EVO_VERSION%%.so.10
 lib/libecal-%%EVO_VERSION%%.a
 lib/libecal-%%EVO_VERSION%%.la
 lib/libecal-%%EVO_VERSION%%.so
-lib/libecal-%%EVO_VERSION%%.so.7
+lib/libecal-%%EVO_VERSION%%.so.9
 lib/libedata-book-%%EVO_VERSION%%.a
 lib/libedata-book-%%EVO_VERSION%%.la
 lib/libedata-book-%%EVO_VERSION%%.so
-lib/libedata-book-%%EVO_VERSION%%.so.2
+lib/libedata-book-%%EVO_VERSION%%.so.6
 lib/libedata-cal-%%EVO_VERSION%%.a
 lib/libedata-cal-%%EVO_VERSION%%.la
 lib/libedata-cal-%%EVO_VERSION%%.so
@@ -397,7 +402,7 @@ lib/libedataserver-%%EVO_VERSION%%.so.11
 lib/libedataserverui-%%EVO_VERSION%%.a
 lib/libedataserverui-%%EVO_VERSION%%.la
 lib/libedataserverui-%%EVO_VERSION%%.so
-lib/libedataserverui-%%EVO_VERSION%%.so.8
+lib/libedataserverui-%%EVO_VERSION%%.so.9
 lib/libegroupwise-%%EVO_VERSION%%.a
 lib/libegroupwise-%%EVO_VERSION%%.la
 lib/libegroupwise-%%EVO_VERSION%%.so
@@ -630,15 +635,11 @@ share/doc/libedataserver/index.html
 share/doc/libedataserver/index.sgml
 share/doc/libedataserver/ix01.html
 share/doc/libedataserver/left.png
-share/doc/libedataserver/libedataserver-EFileCache.html
 share/doc/libedataserver/libedataserver-EFlag.html
 share/doc/libedataserver/libedataserver-EProxy.html
 share/doc/libedataserver/libedataserver-ESExp.html
 share/doc/libedataserver/libedataserver-Version-Information.html
 share/doc/libedataserver/libedataserver-e-categories.html
-share/doc/libedataserver/libedataserver-e-data-server-module.html
-share/doc/libedataserver/libedataserver-e-db3-utils.html
-share/doc/libedataserver/libedataserver-e-dbhash.html
 share/doc/libedataserver/libedataserver-e-iconv.html
 share/doc/libedataserver/libedataserver-e-memory.html
 share/doc/libedataserver/libedataserver-e-msgport.html