Move gnome3 ports into the place of the gnome2 locations.

Update to new port rules, remove conflicts, latest_link, enable stage support.

gnome-games was skipped because I got a update for that.
gnome-keyring 2 vs 3, needs to be looked at.
zenity 2 vs 3, and libgnomekbd 2 vs 3

Use new lib_depend syntax in bsd.gnome.mk.

Possible lots of broken links.


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

9 files changed, 45 insertions, 70 deletions

diff --git a/databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c b/databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
index 573eb5312..34ad35881 100644
--- a/databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
+++ b/databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
@@ -1,5 +1,5 @@
---- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig	2010-09-19 18:17:35.000000000 +0000
-+++ calendar/libedata-cal/e-cal-backend-intervaltree.c	2010-09-19 18:17:44.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-server/files/patch-camel_Makefile.in b/databases/evolution-data-server/files/patch-camel_Makefile.in
new file mode 100644
index 000000000..77c7dabec
--- /dev/null
+++ b/databases/evolution-data-server/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-server/files/patch-camel_camel-block-file.h b/databases/evolution-data-server/files/patch-camel_camel-block-file.h
deleted file mode 100644
index bb155e24a..000000000
--- a/databases/evolution-data-server/files/patch-camel_camel-block-file.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-sasl-gssapi.c b/databases/evolution-data-server/files/patch-camel_camel-sasl-gssapi.c
new file mode 100644
index 000000000..853a2f278
--- /dev/null
+++ b/databases/evolution-data-server/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-server/files/patch-camel_providers_imapx_Makefile.in b/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in
deleted file mode 100644
index 0e1321d75..000000000
--- a/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 8ce6381e9..000000000
--- a/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index 8eef3904d..82e7be156 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -1,8 +1,8 @@
---- configure.orig	2010-11-14 22:59:14.000000000 -0800
-+++ configure	2012-06-12 08:40:11.000000000 -0700
-@@ -14174,6 +14174,14 @@
- $as_echo "#define _WIN32_WINNT 0x501" >>confdefs.h
- 
+--- 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
@@ -15,27 +15,11 @@
  *)
  	os_win32='no'
  	NO_UNDEFINED=''
-@@ -16195,9 +16203,8 @@
- fi
- 
- 
--	ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "	#if HAVE_ET_COM_ERR_H
--			#include <com_err.h>
--			#endif
-+	ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "	#include <stdio.h>
-+			#include <stdarg.h>
+@@ -19295,6 +19303,7 @@
+ 			#include <com_err.h>
+ 			#endif
  
++#include <sys/types.h>
  "
- if test "x$ac_cv_header_et_com_err_h" = x""yes; then :
-@@ -16207,9 +16214,8 @@
- fi
+ if test "x$ac_cv_header_com_err_h" = xyes; then :
  
- 
--	ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "	#if HAVE_COM_ERR_H
--			#include <com_err.h>
--			#endif
-+	ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "	#include <stdio.h>
-+			#include <stdarg.h>
- 
- "
- if test "x$ac_cv_header_com_err_h" = x""yes; then :
diff --git a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile
new file mode 100644
index 000000000..6d63d41e1
--- /dev/null
+++ b/databases/evolution-data-server/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-server/files/patch-docs_reference_camel_Makefile.in b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
deleted file mode 100644
index 69da393ce..000000000
--- a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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@