Update to 2.23.1.

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

9 files changed, 171 insertions, 0 deletions

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..b7266a514
--- /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	2007-12-14 15:23:50.000000000 +0100
++++ addressbook/backends/ldap/e-book-backend-ldap.c	2007-12-21 11:29:01.000000000 +0100
+@@ -358,8 +358,8 @@
+ 
+ 	/* 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_src_libical_icaltz-util.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
new file mode 100644
index 000000000..766abb542
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
@@ -0,0 +1,18 @@
+--- calendar/libical/src/libical/icaltz-util.c.orig	2007-08-24 02:48:28.000000000 -0400
++++ calendar/libical/src/libical/icaltz-util.c	2007-08-27 16:23:59.000000000 -0400
+@@ -23,6 +23,15 @@
+ #include <string.h>
+ #if defined(sun) && defined(__SVR4)
+ #include <sys/byteorder.h>
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
++#define __BYTE_ORDER            _BYTE_ORDER
++#define __LITTLE_ENDIAN         _LITTLE_ENDIAN
++#define __BIG_ENDIAN            _BIG_ENDIAN
++
++#define bswap_16                bswap16
++#define bswap_32                bswap32
++#define bswap_64                bswap64
+ #else
+ #include <byteswap.h>
+ #include <endian.h>
diff --git a/databases/evolution-data-server/files/patch-camel_camel-block-file.h b/databases/evolution-data-server/files/patch-camel_camel-block-file.h
new file mode 100644
index 000000000..bb155e24a
--- /dev/null
+++ b/databases/evolution-data-server/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-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_providers_imap4_camel-imap4-specials.c b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c
new file mode 100644
index 000000000..e00b57db0
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c
@@ -0,0 +1,10 @@
+--- camel/providers/imap4/camel-imap4-specials.c.orig	Thu May 17 18:11:10 2007
++++ camel/providers/imap4/camel-imap4-specials.c	Thu May 17 18:11:17 2007
+@@ -22,6 +22,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <glib.h>
+ #include <string.h>
+ 
+ #include "camel-imap4-specials.h"
diff --git a/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c
new file mode 100644
index 000000000..55db1a65d
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c
@@ -0,0 +1,19 @@
+--- camel/providers/imap4/camel-imap4-summary.c.orig	Mon May  7 01:01:31 2007
++++ camel/providers/imap4/camel-imap4-summary.c	Mon May  7 01:05:32 2007
+@@ -1148,6 +1148,7 @@ static CamelIMAP4Command *
+ imap4_summary_fetch_flags (CamelFolderSummary *summary)
+ {
+ 	CamelFolder *folder = summary->folder;
++	CamelIMAP4Summary *imap4_summary = (CamelIMAP4Summary *) summary;
+ 	struct imap4_fetch_all_t *fetch;
+ 	CamelMessageInfo *info[2];
+ 	CamelIMAP4Engine *engine;
+@@ -1479,7 +1480,7 @@ camel_imap4_summary_flush_updates (Camel
+ 		}
+ 	} else {
+ 		/* need to fetch new envelopes */
+-		first = scount + 1;
++		seqid = scount + 1;
+ 	}
+ 	
+ 	if (seqid != 0 && seqid <= imap4_summary->exists) {
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
new file mode 100644
index 000000000..1ef8d776b
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-configure
@@ -0,0 +1,44 @@
+--- configure.orig	Mon Jun 18 23:55:48 2007
++++ configure	Mon Jun 18 23:56:20 2007
+@@ -24562,6 +24562,14 @@ case "$host" in
+     # AC_CACHE_VAL(have_addrinfo, [have_addrinfo=yes])
+     # AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations])
+     ;;
++*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=''
+@@ -28651,7 +28659,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 		#include <sys/socket.h>
+ 		#include <netinet/in.h>
+ 		#include <netdb.h>
+-
++		#include <stdio.h>
+ 
+ int
+ main ()
+@@ -28982,7 +28990,7 @@ if test "x${with_krb5}" != "xno"; then
+ 	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"
+ 	sunlibs="-lkrb5 -lgss"
+ 	{ echo "$as_me:$LINENO: checking for Kerberos 5" >&5
+ echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; }
+@@ -33825,7 +33833,7 @@ idldir='${datadir}'/idl/evolution-data-s
+ imagesdir='${datadir}'/pixmaps/evolution-data-server
+ 
+ 
+-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-docs_reference_camel_Makefile.in b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
new file mode 100644
index 000000000..f5b6fa273
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
@@ -0,0 +1,22 @@
+--- docs/reference/camel/Makefile.in.orig	2007-12-21 11:30:30.000000000 +0100
++++ docs/reference/camel/Makefile.in	2007-12-21 11:55:58.000000000 +0100
+@@ -123,7 +123,7 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HAVE_JW = @HAVE_JW@
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+ ICONV_CFLAGS = @ICONV_CFLAGS@
+ ICONV_LIBS = @ICONV_LIBS@
+ IDL_INCLUDES = @IDL_INCLUDES@
+@@ -690,8 +690,8 @@
+ 	  done; \
+ 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+ 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+-	  which gtkdoc-rebase >/dev/null && \
+-	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
++#	  which gtkdoc-rebase >/dev/null && \
++#	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+ 	fi
+ 
+ uninstall-local:
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>
+