Update to 2.30.0.

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

3 files changed, 13 insertions, 21 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 59828fc91..5a6d25a8e 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.211 2011/09/17 08:48:37 kwm Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.212 2011/09/18 17:46:05 kwm Exp $
 #
 # !! DON'T FORGET ABOUT devel/gio-fam-backend !!
 
 PORTNAME=	glib
-PORTVERSION=	2.29.92
+PORTVERSION=	2.30.0
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -48,9 +48,9 @@ CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
 		--disable-dtrace \
 		--with-pcre=system \
 		--disable-fam
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lintl" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 OPTIONS=	COLLATION_FIX "fix string collation" off
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 4a1ced3e7..3f4393354 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.29.92.tar.xz) = 1f68d7990d03a52cf81284f039de94b041c3f5eb3d53663166b31e477557e8b1
-SIZE (gnome2/glib-2.29.92.tar.xz) = 5712428
+SHA256 (gnome2/glib-2.30.0.tar.xz) = d64c00b43409eabb89aad78501fcb1a992b002b314a4414a9bd069585cb7cdc1
+SIZE (gnome2/glib-2.30.0.tar.xz) = 5744640
diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c
index 92e69bdb6..e36111599 100644
--- a/devel/glib20/files/patch-gio_gunixmounts.c
+++ b/devel/glib20/files/patch-gio_gunixmounts.c
@@ -1,5 +1,5 @@
---- gio/gunixmounts.c.orig	2011-09-05 05:34:35.000000000 +0200
-+++ gio/gunixmounts.c	2011-09-15 17:39:22.000000000 +0200
+--- gio/gunixmounts.c.orig	2011-09-21 21:17:06.000000000 +0200
++++ gio/gunixmounts.c	2011-10-04 15:07:08.000000000 +0200
 @@ -153,6 +153,9 @@ struct _GUnixMountMonitor {
  
    GFileMonitor *fstab_monitor;
@@ -58,15 +58,7 @@
      "/var",
      "/var/crash",
      "/var/local",
-@@ -1033,6 +1047,7 @@ _g_get_unix_mount_points (void)
-   
- #ifdef HAVE_SYS_SYSCTL_H
- #if defined(HAVE_SYSCTLBYNAME)
-+  size_t len = sizeof(usermnt);
-   sysctlbyname ("vfs.usermount", &usermnt, &len, NULL, 0);
- #elif defined(CTL_VFS) && defined(VFS_USERMOUNT)
-   {
-@@ -1108,6 +1123,10 @@ get_mounts_timestamp (void)
+@@ -1111,6 +1125,10 @@ get_mounts_timestamp (void)
        if (stat (monitor_file, &buf) == 0)
  	return (guint64)buf.st_mtime;
      }
@@ -77,7 +69,7 @@
    return 0;
  }
  
-@@ -1250,6 +1269,13 @@ g_unix_mount_monitor_finalize (GObject *
+@@ -1253,6 +1271,13 @@ g_unix_mount_monitor_finalize (GObject *
        g_object_unref (monitor->mtab_monitor);
      }
  
@@ -91,7 +83,7 @@
    the_mount_monitor = NULL;
  
    G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
-@@ -1330,6 +1356,51 @@ mtab_file_changed (GFileMonitor      *mo
+@@ -1333,6 +1358,51 @@ mtab_file_changed (GFileMonitor      *mo
    g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
  }
  
@@ -143,7 +135,7 @@
  static void
  g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
  {
-@@ -1352,6 +1423,12 @@ g_unix_mount_monitor_init (GUnixMountMon
+@@ -1355,6 +1425,12 @@ g_unix_mount_monitor_init (GUnixMountMon
        
        g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
      }