Update to 2.15.2.

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

5 files changed, 5 insertions, 52 deletions

diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 7085534a2..c0759ae3c 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$
+#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.1 2008/01/09 19:55:22 marcus Exp $
 #
 
 PORTNAME=	gio-fam-backend
-PORTVERSION=	2.15.1
+PORTVERSION=	2.15.2
 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 7215bcdad..bd1d74a79 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.15.1.tar.bz2) = b3a2ca18e618927d03d39000f2155958
-SHA256 (gnome2/glib-2.15.1.tar.bz2) = 1e380efc1f7906a74672e5088777aea524234c063947cf9c7eab67206ea29c9c
-SIZE (gnome2/glib-2.15.1.tar.bz2) = 4238577
+MD5 (gnome2/glib-2.15.2.tar.bz2) = 633243dd337464a61336146ab862a646
+SHA256 (gnome2/glib-2.15.2.tar.bz2) = bccca292a11ea2710f897d709c1afb49316a5bccc693e0dd8bcc2286d9296608
+SIZE (gnome2/glib-2.15.2.tar.bz2) = 4291168
diff --git a/devel/gio-fam-backend/files/patch-gio_fam_fam-helper.c b/devel/gio-fam-backend/files/patch-gio_fam_fam-helper.c
deleted file mode 100644
index 05e273a6e..000000000
--- a/devel/gio-fam-backend/files/patch-gio_fam_fam-helper.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gio/fam/fam-helper.c.orig	2008-01-10 19:33:27.000000000 +0100
-+++ gio/fam/fam-helper.c	2008-01-10 19:31:55.000000000 +0100
-@@ -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-gio_fam_gfamdirectorymonitor.c b/devel/gio-fam-backend/files/patch-gio_fam_gfamdirectorymonitor.c
deleted file mode 100644
index 683f964f6..000000000
--- a/devel/gio-fam-backend/files/patch-gio_fam_gfamdirectorymonitor.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- gio/fam/gfamdirectorymonitor.c.orig	2008-01-07 15:15:54.000000000 +0100
-+++ gio/fam/gfamdirectorymonitor.c	2008-01-10 19:38:08.000000000 +0100
-@@ -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-gio_fam_gfamfilemonitor.c b/devel/gio-fam-backend/files/patch-gio_fam_gfamfilemonitor.c
deleted file mode 100644
index ba0951dd2..000000000
--- a/devel/gio-fam-backend/files/patch-gio_fam_gfamfilemonitor.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- gio/fam/gfamfilemonitor.c.orig	2008-01-09 01:34:15.000000000 -0500
-+++ 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;
-   }
-