Update to 2.30.1

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

6 files changed, 22 insertions, 19 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index dea4f4ecf..3ba868f63 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.192 2010/03/14 17:58:55 marcus Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.193 2010/03/31 11:16:27 kwm Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	2.30.0
+PORTVERSION=	2.30.1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index cc593a660..cd82fa631 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-2.30.0.tar.bz2) = a30de9370a9d388da1f9cc723126941c
-SHA256 (gnome2/evolution-data-server-2.30.0.tar.bz2) = 89330c0ff21904d95de4d78ed84621dbbfa776091d705737ae8d829c7706cd04
-SIZE (gnome2/evolution-data-server-2.30.0.tar.bz2) = 4609548
+MD5 (gnome2/evolution-data-server-2.30.1.tar.bz2) = f177441d6fd4ef8c9a92d5706d290f10
+SHA256 (gnome2/evolution-data-server-2.30.1.tar.bz2) = b2ebeac36931fbee6fb747ee535a61243dd99fa15bc472ca239f2b01cc88795e
+SIZE (gnome2/evolution-data-server-2.30.1.tar.bz2) = 4636784
diff --git a/databases/evolution-data-server/files/patch-camel_camel-sasl-gssapi.c b/databases/evolution-data-server/files/patch-camel_camel-sasl-gssapi.c
deleted file mode 100644
index 486d37560..000000000
--- a/databases/evolution-data-server/files/patch-camel_camel-sasl-gssapi.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- camel/camel-sasl-gssapi.c.orig	2010-01-28 23:26:56.000000000 +0000
-+++ camel/camel-sasl-gssapi.c	2010-01-28 23:32:28.000000000 +0000
-@@ -31,7 +31,7 @@
- #include <string.h>
- #include <sys/socket.h>
- #include <sys/types.h>
--#include <krb5/krb5.h>
-+#include <krb5.h>
- #ifdef HAVE_ET_COM_ERR_H
- #include <et/com_err.h>
- #else
diff --git a/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in b/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in
new file mode 100644
index 000000000..0e1321d75
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in
@@ -0,0 +1,13 @@
+Our gperf (2.7.2) doesn't understand --output-file.
+
+--- camel/providers/imapx/Makefile.in.orig	2010-04-26 14:33:56.000000000 +0200
++++ camel/providers/imapx/Makefile.in	2010-04-26 14:35:10.000000000 +0200
+@@ -914,7 +914,7 @@ uninstall-am: uninstall-camel_providerDA
+ 
+ 
+ camel-imapx-tokenise.h: camel-imapx-tokens.txt
+-	@GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@
++	@GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< > $@
+ 
+ -include $(top_srcdir)/git.mk
+ 
diff --git a/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt b/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt
index e45a1c944..8ce6381e9 100644
--- a/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt
+++ b/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt
@@ -1,8 +1,8 @@
---- camel/providers/imapx/camel-imapx-tokens.txt.orig	2010-03-08 16:38:04.000000000 +0900
-+++ camel/providers/imapx/camel-imapx-tokens.txt	2010-03-08 16:38:11.000000000 +0900
+--- camel/providers/imapx/camel-imapx-tokens.txt.orig	2010-04-26 14:25:22.000000000 +0200
++++ camel/providers/imapx/camel-imapx-tokens.txt	2010-04-26 14:25:32.000000000 +0200
 @@ -1,5 +1,3 @@
 -/* This contains all of the keywords we care about.  These
 -   can be converted to an id very efficiently */
  struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
+ struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
  %%
- ALERT,          IMAPX_ALERT
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 70f37c654..8d112f6ad 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -727,6 +727,7 @@ share/locale/bn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/bs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/cy/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo