Update glib20 to 2.15.1, and break out the GIO FAM backend into a separate

port (gio-fam-backend).

This requires a bit of trickery in bsd.gnome.mk to
avoid a dependency loop, so a new _glib20 component was added that should
only be required by FAM providers.  To that end, add gamin, and make gamin
depend on _glib20.

Update gvfs to 0.1.1, and add a new gvfs component to bsd.gnome.mk.

gio-standalone is no longer needed as this code is now part of glib.


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

4 files changed, 74 insertions, 0 deletions

diff --git a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
new file mode 100644
index 000000000..0f6a9e25e
--- /dev/null
+++ b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
@@ -0,0 +1,27 @@
+--- gio/fam/Makefile.in.orig	2008-01-07 19:40:38.000000000 -0500
++++ gio/fam/Makefile.in	2008-01-07 19:41:53.000000000 -0500
+@@ -59,9 +59,8 @@ am__installdirs = "$(DESTDIR)$(giomodule
+ giomoduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(giomodule_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
+-	$(top_builddir)/gobject/libgobject-2.0.la \
+-	$(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
++libgiofam_la_DEPENDENCIES =  \
++	$(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ am__objects_1 =
+ am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
+@@ -321,9 +320,9 @@ libgiofam_la_CFLAGS = \
+ 
+ libgiofam_la_LDFLAGS = $(module_flags)
+ libgiofam_la_LIBADD = \
+-		$(top_builddir)/gio/libgio-2.0.la \
+-		$(top_builddir)/gobject/libgobject-2.0.la \
+-		$(top_builddir)/glib/libglib-2.0.la \
++		-lgio-2.0 \
++		-lgobject-2.0 \
++		-lglib-2.0 \
+ 		$(GLIB_LIBS) \
+ 		$(FAM_LIBS) \
+ 		$(NULL)
diff --git a/devel/gio-fam-backend/files/patch-glib_gio_fam_fam-helper.c b/devel/gio-fam-backend/files/patch-glib_gio_fam_fam-helper.c
new file mode 100644
index 000000000..b419ffa1c
--- /dev/null
+++ b/devel/gio-fam-backend/files/patch-glib_gio_fam_fam-helper.c
@@ -0,0 +1,11 @@
+--- glib/gio/fam/fam-helper.c.orig	2008-01-09 01:32:59.000000000 -0500
++++ glib/gio/fam/fam-helper.c	2008-01-09 01:33:15.000000000 -0500
+@@ -82,7 +82,7 @@ fam_do_iter_unlocked (void)
+     cancelled = sub->cancelled;
+     if (ev.code == FAMAcknowledge && cancelled)
+       {
+-	g_free (sub);
++	_fam_sub_free (sub);
+ 	continue;
+       }
+     
diff --git a/devel/gio-fam-backend/files/patch-glib_gio_fam_gfamdirectorymonitor.c b/devel/gio-fam-backend/files/patch-glib_gio_fam_gfamdirectorymonitor.c
new file mode 100644
index 000000000..f45e1e4f0
--- /dev/null
+++ b/devel/gio-fam-backend/files/patch-glib_gio_fam_gfamdirectorymonitor.c
@@ -0,0 +1,18 @@
+--- glib/gio/fam/gfamdirectorymonitor.c.orig	2008-01-09 01:33:43.000000000 -0500
++++ glib/gio/fam/gfamdirectorymonitor.c	2008-01-09 01:33:53.000000000 -0500
+@@ -50,7 +50,6 @@ g_fam_directory_monitor_finalize (GObjec
+     if (!_fam_sub_cancel (sub))
+       g_warning ("Unexpected error cancelling fam monitor");
+ 
+-    _fam_sub_free (sub);
+     fam_monitor->sub = NULL;
+   }
+ 
+@@ -134,7 +133,6 @@ g_fam_directory_monitor_cancel (GFileMon
+     if (!_fam_sub_cancel (sub))
+       g_warning ("Unexpected error cancelling fam monitor");
+ 
+-    _fam_sub_free (sub);
+     fam_monitor->sub = NULL;
+   }
+ 
diff --git a/devel/gio-fam-backend/files/patch-glib_gio_fam_gfamfilemonitor.c b/devel/gio-fam-backend/files/patch-glib_gio_fam_gfamfilemonitor.c
new file mode 100644
index 000000000..3dff41f52
--- /dev/null
+++ b/devel/gio-fam-backend/files/patch-glib_gio_fam_gfamfilemonitor.c
@@ -0,0 +1,18 @@
+--- glib/gio/fam/gfamfilemonitor.c.orig	2008-01-09 01:34:15.000000000 -0500
++++ glib/gio/fam/gfamfilemonitor.c	2008-01-09 01:34:19.000000000 -0500
+@@ -49,7 +49,6 @@ g_fam_file_monitor_finalize (GObject *ob
+   if (sub) {
+     if (!_fam_sub_cancel (sub))
+       g_warning ("Unexpected error cancelling fam monitor");
+-    _fam_sub_free (sub);
+     fam_monitor->sub = NULL;
+   }
+ 
+@@ -132,7 +131,6 @@ g_fam_file_monitor_cancel (GFileMonitor*
+   if (sub) {
+     if (!_fam_sub_cancel (sub))
+       g_warning ("Unexpected error cancelling fam monitor");
+-    _fam_sub_free (sub);
+     fam_monitor->sub = NULL;
+   }
+