diff options
-rw-r--r-- | devel/gio-fam-backend/Makefile | 4 | ||||
-rw-r--r-- | devel/gio-fam-backend/distinfo | 6 | ||||
-rw-r--r-- | devel/gio-fam-backend/files/patch-fam | 46 | ||||
-rw-r--r-- | devel/glib20/Makefile | 4 | ||||
-rw-r--r-- | devel/glib20/distinfo | 6 | ||||
-rw-r--r-- | devel/glib20/files/patch-ae | 19 | ||||
-rw-r--r-- | devel/glib20/files/patch-gio_glocalfile.c | 11 |
7 files changed, 62 insertions, 34 deletions
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index eff6f844a..d6d09576c 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.6 2008/02/25 20:12:25 kwm Exp $ +# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.7 2008/03/10 19:06:33 marcus Exp $ # PORTNAME= gio-fam-backend -PORTVERSION= 2.16.0 +PORTVERSION= 2.16.1 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 75847db4a..8ccc88c9f 100644 --- a/devel/gio-fam-backend/distinfo +++ b/devel/gio-fam-backend/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/glib-2.16.1.tar.bz2) = 9852daf0605f827bfd7199ffe4f5b22d +SHA256 (gnome2/glib-2.16.1.tar.bz2) = f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695 +SIZE (gnome2/glib-2.16.1.tar.bz2) = 4529604 diff --git a/devel/gio-fam-backend/files/patch-fam b/devel/gio-fam-backend/files/patch-fam index ebd87f218..0760f88fe 100644 --- a/devel/gio-fam-backend/files/patch-fam +++ b/devel/gio-fam-backend/files/patch-fam @@ -1,24 +1,3 @@ ---- 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 @@ @@ -51,3 +30,28 @@ if (G_OBJECT_CLASS (g_fam_file_monitor_parent_class)->finalize) (*G_OBJECT_CLASS (g_fam_file_monitor_parent_class)->finalize) (object); } +--- gio/fam/fam-helper.c.orig 2008-03-10 20:31:58.000000000 -0400 ++++ gio/fam/fam-helper.c 2008-03-10 23:06:32.000000000 -0400 +@@ -181,6 +181,22 @@ _fam_sub_startup (void) + return TRUE; + } + ++void ++_fam_sub_shutdown (void) ++{ ++ G_LOCK (fam_connection); ++ ++ if (fam_connection != NULL) { ++ FAMClose (fam_connection); ++ g_free (fam_connection); ++ g_source_remove (fam_watch_id); ++ fam_watch_id = 0; ++ fam_connection = NULL; ++ } ++ ++ G_UNLOCK (fam_connection); ++} ++ + fam_sub* + _fam_sub_add (const gchar* pathname, + gboolean directory, diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 05918c233..6daea0ab1 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.113 2008/02/25 20:09:57 kwm Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.114 2008/03/10 19:06:33 marcus Exp $ # PORTNAME= glib -PORTVERSION= 2.16.0 +PORTVERSION= 2.16.1 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 75847db4a..8ccc88c9f 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/glib-2.16.1.tar.bz2) = 9852daf0605f827bfd7199ffe4f5b22d +SHA256 (gnome2/glib-2.16.1.tar.bz2) = f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695 +SIZE (gnome2/glib-2.16.1.tar.bz2) = 4529604 diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 46738f939..30c4a2497 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,6 +1,19 @@ ---- configure.orig Sun Jan 29 13:06:22 2006 -+++ configure Sun Jan 29 13:06:48 2006 -@@ -34462,6 +34461,8 @@ +--- configure.orig 2008-03-10 22:55:52.000000000 -0400 ++++ configure 2008-03-10 22:58:48.000000000 -0400 +@@ -32748,6 +32748,12 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif ++#ifdef HAVE_SYS_MOUNT_H ++#include <sys/mount.h> ++#endif + int + main () + { +@@ -39139,6 +39145,8 @@ fi ;; esac fi diff --git a/devel/glib20/files/patch-gio_glocalfile.c b/devel/glib20/files/patch-gio_glocalfile.c new file mode 100644 index 000000000..9cf00d383 --- /dev/null +++ b/devel/glib20/files/patch-gio_glocalfile.c @@ -0,0 +1,11 @@ +--- gio/glocalfile.c.orig 2008-03-10 23:04:57.000000000 -0400 ++++ gio/glocalfile.c 2008-03-10 23:05:23.000000000 -0400 +@@ -1001,7 +1001,7 @@ g_local_file_query_filesystem_info (GFil + #endif + } + #ifdef USE_STATFS +-#if defined(HAVE_STRUCT_STATFS_FS_TYPENAME) ++#if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) + fstype = g_strdup(statfs_buffer.f_fstypename); + #else + fstype = get_fs_type (statfs_buffer.f_type); |