Readd some more lost patches

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

7 files changed, 104 insertions, 24 deletions

diff --git a/databases/evolution-data-server3/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c b/databases/evolution-data-server3/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
index afb4aac52..34ad35881 100644
--- a/databases/evolution-data-server3/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
+++ b/databases/evolution-data-server3/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
@@ -1,5 +1,5 @@
---- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig	2013-05-06 19:20:48.000000000 +0000
-+++ calendar/libedata-cal/e-cal-backend-intervaltree.c	2013-05-06 19:20:57.000000000 +0000
+--- ./calendar/libedata-cal/e-cal-backend-intervaltree.c.orig	2011-01-18 17:09:50.000000000 +0000
++++ ./calendar/libedata-cal/e-cal-backend-intervaltree.c	2011-01-18 17:09:59.000000000 +0000
 @@ -26,7 +26,7 @@
  
  #include <stdio.h>
diff --git a/databases/evolution-data-server3/files/patch-camel_Makefile.in b/databases/evolution-data-server3/files/patch-camel_Makefile.in
new file mode 100644
index 000000000..77c7dabec
--- /dev/null
+++ b/databases/evolution-data-server3/files/patch-camel_Makefile.in
@@ -0,0 +1,11 @@
+--- camel/Makefile.orig.in	2013-03-27 22:04:35.870715032 +0000
++++ camel/Makefile.in	2013-03-27 22:04:44.242711496 +0000
+@@ -2693,7 +2693,7 @@
+ 	 cp $< $@
+ 
+ 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,$$ $< > $@
+ 
+ camel-enumtypes.h: camel-enumtypes.h.template $(ENUM_TYPES)
+ 	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template camel-enumtypes.h.template $(ENUM_TYPES)) > $@
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_camel-sasl-gssapi.c b/databases/evolution-data-server3/files/patch-camel_camel-sasl-gssapi.c
new file mode 100644
index 000000000..853a2f278
--- /dev/null
+++ b/databases/evolution-data-server3/files/patch-camel_camel-sasl-gssapi.c
@@ -0,0 +1,11 @@
+--- camel/camel-sasl-gssapi.c.orig	2012-05-20 12:44:42.000000000 +0200
++++ camel/camel-sasl-gssapi.c	2012-05-20 12:45:21.000000000 +0200
+@@ -66,7 +66,7 @@
+ #endif /* HAVE_MIT_KRB5 */
+ 
+ #ifdef HAVE_HEIMDAL_KRB5
+-#include <gssapi.h>
++#include <gssapi/gssapi.h>
+ #else
+ #ifdef HAVE_SUN_KRB5
+ #include <gssapi/gssapi.h>
diff --git a/databases/evolution-data-server3/files/patch-configure b/databases/evolution-data-server3/files/patch-configure
new file mode 100644
index 000000000..82e7be156
--- /dev/null
+++ b/databases/evolution-data-server3/files/patch-configure
@@ -0,0 +1,25 @@
+--- configure.orig	2012-05-14 06:21:51.000000000 +0200
++++ configure	2012-05-20 12:56:44.000000000 +0200
+@@ -16716,6 +16716,14 @@
+ 	DL_LIB=''
+ 	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
+ 	;;
++*freebsd*)
++	os_win32=no
++	NO_UNDEFINED=''
++	SOCKET_LIBS=''
++	DL_LIB=''
++	SOFTOKN3_LIB='-lsoftokn3'
++	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
++	;;
+ *)
+ 	os_win32='no'
+ 	NO_UNDEFINED=''
+@@ -19295,6 +19303,7 @@
+ 			#include <com_err.h>
+ 			#endif
+ 
++#include <sys/types.h>
+ "
+ if test "x$ac_cv_header_com_err_h" = xyes; then :
+ 
diff --git a/databases/evolution-data-server3/files/patch-docs_reference_camel_Makefile b/databases/evolution-data-server3/files/patch-docs_reference_camel_Makefile
new file mode 100644
index 000000000..6d63d41e1
--- /dev/null
+++ b/databases/evolution-data-server3/files/patch-docs_reference_camel_Makefile
@@ -0,0 +1,11 @@
+--- docs/reference/camel/Makefile.in.orig	2011-09-15 22:17:02.000000000 +0200
++++ docs/reference/camel/Makefile.in	2011-09-15 22:18:09.000000000 +0200
+@@ -159,7 +159,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@
+ GTKDOC_REBASE = @GTKDOC_REBASE@
+ HAVE_JW = @HAVE_JW@
+ HAVE_VALA = @HAVE_VALA@
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(datadir)/doc
+ ICONV_LIBS = @ICONV_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
diff --git a/databases/evolution-data-server3/pkg-plist b/databases/evolution-data-server3/pkg-plist
index c09ec23c5..1da0d4322 100644
--- a/databases/evolution-data-server3/pkg-plist
+++ b/databases/evolution-data-server3/pkg-plist
@@ -980,28 +980,6 @@ share/pixmaps/evolution-data-server/category_strategies_16.png
 share/pixmaps/evolution-data-server/category_suppliers_16.png
 share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrm share/pixmaps/evolution-data-server
-@dirrm share/doc/libedataserverui
-@dirrm share/doc/libedataserver
-@dirrm share/doc/libedata-cal
-@dirrm share/doc/libedata-book
-@dirrm share/doc/libecal
-@dirrm share/doc/libebook
-@dirrm share/doc/libebackend
-@dirrm share/doc/camel
-@dirrm lib/evolution-data-server/registry-modules
-@dirrm lib/evolution-data-server/camel-providers
-@dirrm lib/evolution-data-server/calendar-backends
-@dirrm lib/evolution-data-server/addressbook-backends
-@dirrm lib/evolution-data-server
-@dirrm include/evolution-data-server-%%VERSION%%/libedataserverui
-@dirrm include/evolution-data-server-%%VERSION%%/libedataserver
-@dirrm include/evolution-data-server-%%VERSION%%/libedata-cal
-@dirrm include/evolution-data-server-%%VERSION%%/libedata-book
-@dirrm include/evolution-data-server-%%VERSION%%/libecal
-@dirrm include/evolution-data-server-%%VERSION%%/libebook
-@dirrm include/evolution-data-server-%%VERSION%%/libebackend
-@dirrm include/evolution-data-server-%%VERSION%%/camel
-@dirrm include/evolution-data-server-%%VERSION%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -1039,5 +1017,25 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrm %%DATADIR%%-%%VERSION%%/rw-sources
 @dirrm %%DATADIR%%-%%VERSION%%/ro-sources
 @dirrm %%DATADIR%%-%%VERSION%%
+@dirrm share/doc/libedataserverui
+@dirrm share/doc/libedataserver
+@dirrm share/doc/libedata-cal
+@dirrm share/doc/libedata-book
+@dirrm share/doc/libecal
+@dirrm share/doc/libebook
+@dirrm share/doc/libebackend
+@dirrm share/doc/camel
 @dirrm lib/evolution-data-server/registry-modules
+@dirrm lib/evolution-data-server/camel-providers
+@dirrm lib/evolution-data-server/calendar-backends
+@dirrm lib/evolution-data-server/addressbook-backends
 @dirrm lib/evolution-data-server
+@dirrm include/evolution-data-server-%%VERSION%%/libedataserverui
+@dirrm include/evolution-data-server-%%VERSION%%/libedataserver
+@dirrm include/evolution-data-server-%%VERSION%%/libedata-cal
+@dirrm include/evolution-data-server-%%VERSION%%/libedata-book
+@dirrm include/evolution-data-server-%%VERSION%%/libecal
+@dirrm include/evolution-data-server-%%VERSION%%/libebook
+@dirrm include/evolution-data-server-%%VERSION%%/libebackend
+@dirrm include/evolution-data-server-%%VERSION%%/camel
+@dirrm include/evolution-data-server-%%VERSION%%