Update to 1.7.1 and enable dynamic BDB support.

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

7 files changed, 178 insertions, 0 deletions

diff --git a/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
new file mode 100644
index 000000000..b39a8fe3c
--- /dev/null
+++ b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
@@ -0,0 +1,53 @@
+--- libedataserver/e-msgport.c.orig	Sat Dec 10 07:31:28 2005
++++ libedataserver/e-msgport.c	Mon Dec 19 02:19:10 2005
+@@ -1069,9 +1069,18 @@ thread_dispatch(void *din)
+ void e_thread_put(EThread *e, EMsg *msg)
+ {
+ 	pthread_t id;
++	pthread_attr_t attr;
+ 	EMsg *dmsg = NULL;
+ 
+ 	pthread_mutex_lock(&e->mutex);
++	pthread_attr_init(&attr);
++	/* Give us a 1 MB thread stacksize on 32-bit architectures, and
++	 * a 2 MB thread stacksize on 64-bit architectures. */
++	if (sizeof (void *) == 8) {
++		pthread_attr_setstacksize(&attr, 0x200000);
++	} else {
++		pthread_attr_setstacksize(&attr, 0x100000);
++	}
+ 
+ 	/* the caller forgot to tell us what to do, well, we can't do anything can we */
+ 	if (e->received == NULL) {
+@@ -1110,13 +1119,14 @@ void e_thread_put(EThread *e, EMsg *msg)
+ 		e_msgport_put(e->server_port, msg);
+ 		if (e->waiting == 0
+ 		    && g_list_length(e->id_list) < e->queue_limit
+-		    && pthread_create(&id, NULL, thread_dispatch, e) == 0) {
++		    && pthread_create(&id, &attr, thread_dispatch, e) == 0) {
+ 			struct _thread_info *info = g_malloc0(sizeof(*info));
+ 			t(printf("created NEW thread %" G_GUINT64_FORMAT "\n", e_util_pthread_id(id)));
+ 			info->id = id;
+ 			info->busy = TRUE;
+ 			e->id_list = g_list_append(e->id_list, info);
+ 		}
++		pthread_attr_destroy(&attr);
+ 		pthread_mutex_unlock(&e->mutex);
+ 		return;
+ 	}
+@@ -1125,13 +1135,14 @@ void e_thread_put(EThread *e, EMsg *msg)
+ 	if (!e->have_thread) {
+ 		int err;
+ 
+-		if ((err = pthread_create(&e->id, NULL, thread_dispatch, e)) != 0) {
++		if ((err = pthread_create(&e->id, &attr, thread_dispatch, e)) != 0) {
+ 			g_warning("Could not create dispatcher thread, message queued?: %s", strerror(err));
+ 		} else {
+ 			e->have_thread = TRUE;
+ 		}
+ 	}
+ 
++	pthread_attr_destroy(&attr);
+ 	pthread_mutex_unlock(&e->mutex);
+ 
+ 	if (dmsg) {
diff --git a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
new file mode 100644
index 000000000..51f468867
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
@@ -0,0 +1,13 @@
+--- addressbook/backends/ldap/e-book-backend-ldap.c.orig	Fri Sep  9 16:06:37 2005
++++ addressbook/backends/ldap/e-book-backend-ldap.c	Fri Sep  9 16:08:21 2005
+@@ -301,8 +301,8 @@ struct prop_info {
+ 
+ 	/* misc fields */
+ 	STRING_PROP    (E_CONTACT_HOMEPAGE_URL,  "labeledURI"),
+-	/* map nickname to displayName */
+-	STRING_PROP    (E_CONTACT_NICKNAME,    "displayName"),
++	/* map nickname to nickname */
++	STRING_PROP    (E_CONTACT_NICKNAME,    "nickname"),
+ 	E_STRING_PROP  (E_CONTACT_SPOUSE,      "spouseName"), 
+ 	E_STRING_PROP  (E_CONTACT_NOTE,        "note"), 
+ 	E_COMPLEX_PROP (E_CONTACT_ANNIVERSARY, "anniversary", anniversary_populate, anniversary_ber, anniversary_compare), 
diff --git a/databases/evolution-data-server/files/patch-calendar_libical_configure b/databases/evolution-data-server/files/patch-calendar_libical_configure
new file mode 100644
index 000000000..19028e5d4
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-calendar_libical_configure
@@ -0,0 +1,11 @@
+--- calendar/libical/configure.orig	Sun Dec 26 16:54:57 2004
++++ calendar/libical/configure	Sun Dec 26 16:55:23 2004
+@@ -19736,7 +19736,7 @@
+ 
+ 
+ 
+-if test "x$USE_MAINTAINER_MODE" == xyes; then
++if test "x$USE_MAINTAINER_MODE" = xyes; then
+ 	DEV="yes"
+ 	echo "$as_me:$LINENO: result: Setting up for development: -Wall, flex, bison" >&5
+ echo "${ECHO_T}Setting up for development: -Wall, flex, bison" >&6
diff --git a/databases/evolution-data-server/files/patch-camel_camel-net-utils.c b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c
new file mode 100644
index 000000000..17bddca39
--- /dev/null
+++ b/databases/evolution-data-server/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-server/files/patch-camel_camel-object.c b/databases/evolution-data-server/files/patch-camel_camel-object.c
new file mode 100644
index 000000000..03e011165
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_camel-object.c
@@ -0,0 +1,22 @@
+--- camel/camel-object.c.orig	Sun Feb 19 17:04:42 2006
++++ camel/camel-object.c	Sun Feb 19 17:06:06 2006
+@@ -454,7 +454,7 @@ cobject_state_read(CamelObject *obj, FIL
+ 		}
+ 		
+ 		/* we batch up the properties and set them in one go */
+-		if (!(argv = g_try_malloc (sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0]))))
++		if (!(argv = g_try_malloc ((guint32) (sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0])))))
+ 			return -1;
+ 		
+ 		argv->argc = 0;
+@@ -534,8 +534,8 @@ cobject_state_write(CamelObject *obj, FI
+ 
+ 	count = g_slist_length(props);
+ 
+-	arggetv = g_malloc0(sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0]));
+-	argv = g_malloc0(sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0]));
++	arggetv = g_malloc0((guint32) (sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0])));
++	argv = g_malloc0((guint32) (sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0])));
+ 	l = props;
+ 	i = 0;
+ 	while (l) {
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
new file mode 100644
index 000000000..91d8b09b9
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-configure
@@ -0,0 +1,44 @@
+--- configure.orig	Sun Dec 25 01:57:35 2005
++++ configure	Sun Dec 25 01:58:23 2005
+@@ -23542,6 +23542,14 @@
+     SOFTOKN3_LIB=''
+     LIBEXECDIR_IN_SERVER_FILE='../../../libexec'
+     ;;
++*freebsd*)
++    os_win32=no
++    NO_UNDEFINED=''
++    SOCKET_LIBS=''
++    DL_LIB=''
++    SOFTOKN3_LIB='-lsoftokn3'
++    LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
++    ;;
+ *)  os_win32=no
+     NO_UNDEFINED=''
+     SOCKET_LIBS=''
+@@ -27317,7 +27325,7 @@
+ 		#include <sys/socket.h>
+ 		#include <netinet/in.h>
+ 		#include <netdb.h>
+-
++		#include <stdio.h>
+ 
+ int
+ main ()
+@@ -27565,7 +27573,7 @@
+ 	LDFLAGS_save="$LDFLAGS"
+ 
+ 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+-	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
++	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
+ 	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
+ echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
+ if test "${ac_cv_lib_kerberos5+set}" = set; then
+@@ -31483,7 +31491,7 @@
+ imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION"
+ 
+ 
+-serverdir="$libdir/bonobo/servers"
++serverdir="$prefix/libdata/bonobo/servers"
+ 
+ 
+ extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions
diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c
new file mode 100644
index 000000000..62532da02
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c
@@ -0,0 +1,11 @@
+--- libedataserverui/e-source-option-menu.c.orig	Tue Nov 23 13:50:14 2004
++++ libedataserverui/e-source-option-menu.c	Tue Nov 23 13:50:33 2004
+@@ -24,6 +24,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/types.h>
++
+ #include <gtk/gtkmenu.h>
+ #include <gtk/gtkmenuitem.h>
+