Update to 2.16.0.

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

6 files changed, 63 insertions, 24 deletions

diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 534b9129f..eff6f844a 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.5 2008/02/11 23:21:05 kwm Exp $
+#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.6 2008/02/25 20:12:25 kwm Exp $
 #
 
 PORTNAME=	gio-fam-backend
-PORTVERSION=	2.15.6
+PORTVERSION=	2.16.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo
index 8294b73fc..75847db4a 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.15.6.tar.bz2) = 62b1a3c1fa52b8d91b4535e4a4ab3057
-SHA256 (gnome2/glib-2.15.6.tar.bz2) = 90e5e5d555479456f13f0ef8bb3518816994785fccb18fc2e65d432f8dd34272
-SIZE (gnome2/glib-2.15.6.tar.bz2) = 4479445
+MD5 (gnome2/glib-2.16.0.tar.bz2) = 9b1e503956265050bc0bfd9feb2cc2d2
+SHA256 (gnome2/glib-2.16.0.tar.bz2) = 30efbfafa932ad731881d1039928024e5e94455371d7d10029e05be6bf720aaf
+SIZE (gnome2/glib-2.16.0.tar.bz2) = 4524000
diff --git a/devel/gio-fam-backend/files/patch-fam b/devel/gio-fam-backend/files/patch-fam
new file mode 100644
index 000000000..ebd87f218
--- /dev/null
+++ b/devel/gio-fam-backend/files/patch-fam
@@ -0,0 +1,53 @@
+--- gio/fam/fam-helper.c.orig	2008-03-10 13:50:08.000000000 -0400
++++ gio/fam/fam-helper.c	2008-03-10 13:50:29.000000000 -0400
+@@ -181,6 +185,18 @@ _fam_sub_startup (void)
+   return TRUE;
+ }
+ 
++void
++_fam_sub_shutdown (void)
++{
++  if (fam_connection != NULL) {
++    FAMClose (fam_connection);
++    g_free (fam_connection);
++    g_source_remove (fam_watch_id);
++    fam_watch_id = 0;
++    fam_connection = NULL;
++  }
++}
++
+ fam_sub*
+ _fam_sub_add (const gchar* pathname,
+ 	      gboolean directory,
+--- gio/fam/fam-helper.h.orig	2008-03-10 13:50:12.000000000 -0400
++++ gio/fam/fam-helper.h	2008-03-10 13:50:29.000000000 -0400
+@@ -28,6 +28,7 @@
+ typedef struct _fam_sub fam_sub;
+ 
+ gboolean  _fam_sub_startup (void);
++void      _fam_sub_shutdown (void);
+ fam_sub*  _fam_sub_add     (const gchar* pathname,
+ 			    gboolean     directory,
+ 			    gpointer     user_data);
+--- gio/fam/gfamdirectorymonitor.c.orig	2008-03-10 13:50:21.000000000 -0400
++++ gio/fam/gfamdirectorymonitor.c	2008-03-10 13:50:29.000000000 -0400
+@@ -53,6 +53,8 @@ g_fam_directory_monitor_finalize (GObjec
+     fam_monitor->sub = NULL;
+   }
+ 
++  _fam_sub_shutdown ();
++
+   if (G_OBJECT_CLASS (g_fam_directory_monitor_parent_class)->finalize)
+     (*G_OBJECT_CLASS (g_fam_directory_monitor_parent_class)->finalize) (object);
+ }
+--- gio/fam/gfamfilemonitor.c.orig	2008-03-10 13:50:18.000000000 -0400
++++ gio/fam/gfamfilemonitor.c	2008-03-10 13:50:29.000000000 -0400
+@@ -52,6 +52,8 @@ g_fam_file_monitor_finalize (GObject *ob
+     fam_monitor->sub = NULL;
+   }
+ 
++  _fam_sub_shutdown ();
++
+   if (G_OBJECT_CLASS (g_fam_file_monitor_parent_class)->finalize)
+     (*G_OBJECT_CLASS (g_fam_file_monitor_parent_class)->finalize) (object);
+ }
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index b769e48fc..05918c233 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.112 2008/02/11 23:18:34 kwm Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.113 2008/02/25 20:09:57 kwm Exp $
 #
 
 PORTNAME=	glib
-PORTVERSION=	2.15.6
+PORTVERSION=	2.16.0
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 8294b73fc..75847db4a 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.15.6.tar.bz2) = 62b1a3c1fa52b8d91b4535e4a4ab3057
-SHA256 (gnome2/glib-2.15.6.tar.bz2) = 90e5e5d555479456f13f0ef8bb3518816994785fccb18fc2e65d432f8dd34272
-SIZE (gnome2/glib-2.15.6.tar.bz2) = 4479445
+MD5 (gnome2/glib-2.16.0.tar.bz2) = 9b1e503956265050bc0bfd9feb2cc2d2
+SHA256 (gnome2/glib-2.16.0.tar.bz2) = 30efbfafa932ad731881d1039928024e5e94455371d7d10029e05be6bf720aaf
+SIZE (gnome2/glib-2.16.0.tar.bz2) = 4524000
diff --git a/devel/glib20/files/patch-gio_glocalfile.c b/devel/glib20/files/patch-gio_glocalfile.c
deleted file mode 100644
index 5a3a86600..000000000
--- a/devel/glib20/files/patch-gio_glocalfile.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- gio/glocalfile.c.orig	2007-12-22 15:19:11.000000000 -0500
-+++ gio/glocalfile.c	2007-12-22 15:29:09.000000000 -0500
-@@ -849,7 +849,11 @@ g_local_file_query_filesystem_info (GFil
- #endif
-     }
- #ifdef USE_STATFS
-+#ifndef __FreeBSD__
-   fstype = get_fs_type (statfs_buffer.f_type);
-+#else
-+  fstype = statfs_buffer.f_fstypename;
-+#endif
-   if (fstype &&
-       g_file_attribute_matcher_matches (attribute_matcher,
- 					G_FILE_ATTRIBUTE_FILESYSTEM_TYPE))