Reset evolution-data-server back to 2.30.

Update evolution-data-server3 to 2.31.5.


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

6 files changed, 83 insertions, 0 deletions

diff --git a/databases/evolution-data-server3/files/patch-camel_camel-block-file.h b/databases/evolution-data-server3/files/patch-camel_camel-block-file.h
new file mode 100644
index 000000000..bb155e24a
--- /dev/null
+++ b/databases/evolution-data-server3/files/patch-camel_camel-block-file.h
@@ -0,0 +1,10 @@
+--- camel/camel-block-file.h.orig	Tue May 15 01:48:42 2007
++++ camel/camel-block-file.h	Tue May 15 01:49:00 2007
+@@ -21,6 +21,7 @@
+ #ifndef _CAMEL_BLOCK_FILE_H
+ #define _CAMEL_BLOCK_FILE_H
+ 
++#include <sys/types.h>
+ #include <camel/camel-object.h>
+ #include <glib.h>
+ #include <libedataserver/e-msgport.h>
diff --git a/databases/evolution-data-server3/files/patch-camel_camel-net-utils.c b/databases/evolution-data-server3/files/patch-camel_camel-net-utils.c
new file mode 100644
index 000000000..17bddca39
--- /dev/null
+++ b/databases/evolution-data-server3/files/patch-camel_camel-net-utils.c
@@ -0,0 +1,24 @@
+--- camel/camel-net-utils.c.orig	Tue Dec 21 13:38:52 2004
++++ camel/camel-net-utils.c	Tue Dec 21 13:40:34 2004
+@@ -143,12 +143,21 @@
+ 	case EAI_SERVICE:
+ 		return NO_DATA;
+ 		break;
++#ifdef EAI_ADDRFAMILY
+ 	case EAI_ADDRFAMILY:
+ 		return NO_ADDRESS;
+ 		break;
++#endif
++#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
+ 	case EAI_NODATA:
+ 		return NO_DATA;
+ 		break;
++#endif
++#ifdef EAI_NOFAMILY
++	case EAI_NOFAMILY:
++		return NO_ADDRESS;
++		break;
++#endif
+ 	case EAI_MEMORY:
+ 		return ENOMEM;
+ 		break;
diff --git a/databases/evolution-data-server3/files/patch-camel_providers_imapx_Makefile.in b/databases/evolution-data-server3/files/patch-camel_providers_imapx_Makefile.in
new file mode 100644
index 000000000..0e1321d75
--- /dev/null
+++ b/databases/evolution-data-server3/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-server3/files/patch-camel_providers_imapx_camel-imapx-tokens.txt b/databases/evolution-data-server3/files/patch-camel_providers_imapx_camel-imapx-tokens.txt
new file mode 100644
index 000000000..8ce6381e9
--- /dev/null
+++ b/databases/evolution-data-server3/files/patch-camel_providers_imapx_camel-imapx-tokens.txt
@@ -0,0 +1,8 @@
+--- 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);
+ %%
diff --git a/databases/evolution-data-server3/files/patch-configure b/databases/evolution-data-server3/files/patch-configure
new file mode 100644
index 000000000..527384093
--- /dev/null
+++ b/databases/evolution-data-server3/files/patch-configure
@@ -0,0 +1,17 @@
+--- configure.orig	2009-12-25 20:21:00.000000000 +0100
++++ configure	2009-12-25 20:21:01.000000000 +0100
+@@ -15968,6 +15968,14 @@
+ _ACEOF
+ 
+ 	;;
++*freebsd*)
++	os_win32=no
++	NO_UNDEFINED=''
++	SOCKET_LIBS=''
++	DL_LIB=''
++	SOFTOKN3_LIB='-lsoftokn3'
++	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
++	;;
+ *)
+ 	os_win32=no
+ 	NO_UNDEFINED=''
diff --git a/databases/evolution-data-server3/files/patch-docs_reference_camel_Makefile.in b/databases/evolution-data-server3/files/patch-docs_reference_camel_Makefile.in
new file mode 100644
index 000000000..69da393ce
--- /dev/null
+++ b/databases/evolution-data-server3/files/patch-docs_reference_camel_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/reference/camel/Makefile.in.orig	2009-07-27 22:42:25.000000000 +0200
++++ docs/reference/camel/Makefile.in	2009-07-27 22:42:50.000000000 +0200
+@@ -137,7 +137,7 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LI
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HAVE_JW = @HAVE_JW@
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(datadir)/doc
+ ICONV_LIBS = @ICONV_LIBS@
+ IDL_INCLUDES = @IDL_INCLUDES@
+ INSTALL = @INSTALL@