author: Koop Mast <kwm@FreeBSD.org> 2013-03-08 10:51:34 +0000
committer: Koop Mast <kwm@FreeBSD.org> 2013-03-08 10:51:34 +0000
commit: 7887c684adab042fed1bfcba2e91589ecd17c4a8 (patch)
tree: 961839899dce7f75292a08c079f548973bdbd40d /devel/glib20
parent: 85544f2c01be814e0af1ebee1076012e7ed60bb0 (diff)
26 files changed, 377 insertions, 269 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 540d9c1dbc5c..103dd28d82b6 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,59 +1,65 @@
-# New ports collection makefile for:   glib13
-# Date Created:			28 July 1998
-# Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
-#
+# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.209 2011/06/11 19:51:14 mezz Exp $
-#
+#   $MCom: ports/devel/glib20/Makefile,v 1.229 2012/12/09 20:42:55 kwm Exp $
 # !! DON'T FORGET ABOUT devel/gio-fam-backend !!
 
 PORTNAME=	glib
-PORTVERSION=	2.28.8
-PORTREVISION?=	5
+PORTVERSION=	2.34.3
+PORTREVISION?=	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/}/ \
-		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
-		http://www.ameth.org/gimp/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Some useful routines of C programming (current stable version)
 
-LATEST_LINK=	glib20
+LICENSE=	LGPL20
 
+LATEST_LINK=	glib20
 USE_XZ=		yes
-LICENSE=	LGPL20
-LICENSE_FILE=	${WRKSRC}/COPYING
+PORTSCOUT=	limitw:1,even
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre \
+		ffi:${PORTSDIR}/devel/libffi
 
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig ltverhack
+USE_PKGCONFIG=	build
+USE_GNOME=	gnomehack ltverhack
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_PYTHON=	yes
+USE_PYTHON=	2.5+
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
 		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-man --without-xml-catalog \
-		--disable-dtrace \
 		--with-pcre=system \
 		--disable-fam
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
-OPTIONS=	COLLATION_FIX "fix string collation" off
+OPTIONS_DEFINE=	COLLATION_FIX DEBUG
+COLLATION_FIX_DESC=	fix string collation
 
 .include <bsd.port.pre.mk>
 
+# doesn't build yet
+#.if (${OSVERSION} < 800000) \
+#	|| (${OSVERSION} >= 800000 && ${OSVERSION} < 802000)
+#	|| (${OSVERSION} >= 900000 && ${OSVERSION} < 900021)
+CONFIGURE_ARGS+=--disable-dtrace
+#.else
+#CONFIGURE_ARGS+=--enable-dtrace
+#.endif
+
+.if ${ARCH} == powerpc64
+EXTRA_PATCHES=	${FILESDIR}/extra-arch-powerpc64
+.endif
+
 # Let glib use asm code for implementing atomic ops on i386 and amd64.
 .if ${ARCH} == "i386"
 GLIB_ARCH=	i486
@@ -64,7 +70,7 @@ GLIB_ARCH=	${ARCH}
 .endif
 CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL}
 
-.if defined(WITH_COLLATION_FIX)
+.if ${PORT_OPTIONS:MCOLLATION_FIX}
 LIB_DEPENDS+=	icui18n:${PORTSDIR}/devel/icu
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
 		${FILESDIR}/extra-patch-glib_gunicollate.c
@@ -72,8 +78,11 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
 #CONFIGURE_ENV+=	CFLAGS="-D__STDC_ISO_10646__"
 .endif
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug=yes
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-debug=yes \
+			--disable-silent-rules
+.else
+CONFIGURE_ARGS+=	--disable-modular-tests
 .endif
 
 post-patch:
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 93d831f49734..57207bc60785 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.28.8.tar.xz) = 4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353
-SIZE (gnome2/glib-2.28.8.tar.xz) = 5223564
+SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7
+SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872
diff --git a/devel/glib20/files/extra-arch-powerpc64 b/devel/glib20/files/extra-arch-powerpc64
new file mode 100644
index 000000000000..d774ebd6b7b1
--- /dev/null
+++ b/devel/glib20/files/extra-arch-powerpc64
@@ -0,0 +1,23 @@
+
+--- gio/glib-compile-schemas.c.orig	2010-11-24 21:32:15.000000000 +0100
++++ gio/glib-compile-schemas.c	2010-11-24 21:33:42.000000000 +0100
+@@ -1458,7 +1458,7 @@
+ }
+ /* Text {{{2 */
+ static void
+-text (GMarkupParseContext  *context,
++XXXtext (GMarkupParseContext  *context,
+       const gchar          *text,
+       gsize                 text_len,
+       gpointer              user_data,
+@@ -1590,7 +1590,7 @@
+ parse_gschema_files (gchar    **files,
+                      gboolean   strict)
+ {
+-  GMarkupParser parser = { start_element, end_element, text };
++  GMarkupParser parser = { start_element, end_element, XXXtext };
+   ParseState state = { 0, };
+   const gchar *filename;
+   GError *error = NULL;
+
+
diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in
index 01f856f74c03..04e45460c4c8 100644
--- a/devel/glib20/files/extra-patch-glib_Makefile.in
+++ b/devel/glib20/files/extra-patch-glib_Makefile.in
@@ -1,11 +1,11 @@
---- glib/Makefile.in.orig	2009-05-31 13:14:18.000000000 +0200
-+++ glib/Makefile.in	2009-05-31 13:15:08.000000000 +0200
-@@ -272,7 +272,7 @@
+--- glib/Makefile.in.orig	2012-09-27 15:07:28.000000000 +0000
++++ glib/Makefile.in	2012-09-27 15:08:02.000000000 +0000
+@@ -415,7 +415,7 @@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
  LD = @LD@
 -LDFLAGS = @LDFLAGS@
 +LDFLAGS = @LDFLAGS@ -licui18n
- LIBASYNCNS_LIBADD = @LIBASYNCNS_LIBADD@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
+ LIBELF_CFLAGS = @LIBELF_CFLAGS@
+ LIBELF_LIBS = @LIBELF_LIBS@
+ LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c
index e2edc6938273..e2493d133990 100644
--- a/devel/glib20/files/extra-patch-glib_gunicollate.c
+++ b/devel/glib20/files/extra-patch-glib_gunicollate.c
@@ -1,5 +1,5 @@
---- glib/gunicollate.c.orig
-+++ glib/gunicollate.c
+--- glib/gunicollate.c.orig	2012-03-12 00:42:42.000000000 +0000
++++ glib/gunicollate.c	2012-09-27 15:11:08.000000000 +0000
 @@ -26,6 +26,10 @@
  #include <wchar.h>
  #endif
@@ -11,12 +11,7 @@
  #ifdef HAVE_CARBON
  #include <CoreServices/CoreServices.h>
  #endif
-@@ -36,10 +40,53 @@
- #include "gstring.h"
- #include "gstrfuncs.h"
- #include "gtestutils.h"
-+#include "gthread.h"
- #ifndef __STDC_ISO_10646__
+@@ -41,6 +45,48 @@
  #include "gconvert.h"
  #endif
  
@@ -34,7 +29,7 @@
 +
 +      icu_collator = ucol_open(NULL, &error);
 +      if (icu_collator == NULL)
-+	g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error));
++      g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error));
 +
 +      icu_collator_initialized = TRUE;
 +    }
@@ -54,10 +49,10 @@
 +      result = g_new(UChar, *result_len);
 +      u_strFromUTF8(result, *result_len, NULL, str, len, &error);
 +      if (error > U_ZERO_ERROR)
-+	{
-+	  g_free(result);
-+	  result = NULL;
-+	}
++      {
++        g_free(result);
++        result = NULL;
++      }
 +    }
 +
 +  return result;
@@ -65,7 +60,7 @@
  
  #ifdef _MSC_VER
  /* Workaround for bug in MSVCR80.DLL */
-@@ -127,6 +174,28 @@
+@@ -128,6 +174,28 @@
    g_return_val_if_fail (str1 != NULL, 0);
    g_return_val_if_fail (str2 != NULL, 0);
  
@@ -94,7 +89,7 @@
    str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
    str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
  
-@@ -419,6 +488,26 @@
+@@ -420,6 +488,26 @@
  
    g_return_val_if_fail (str != NULL, NULL);
  
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index c3e6c139b0e8..9c9caf0ab20c 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig	2011-06-06 01:24:53.000000000 +0200
-+++ configure	2012-12-12 11:23:28.000000000 +0100
-@@ -583,6 +583,9 @@
+--- configure.orig	2013-02-14 19:12:15.000000000 +0000
++++ configure	2013-02-14 19:13:51.000000000 +0000
+@@ -603,6 +603,9 @@
  #ifdef HAVE_SYS_TYPES_H
  # include <sys/types.h>
  #endif
@@ -10,7 +10,7 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
-@@ -5194,7 +5197,7 @@
+@@ -5602,7 +5605,7 @@
  fi
  
  GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,21 +19,25 @@
  
  
   if test "x$with_runtime_libdir" != "x"; then
-@@ -23077,7 +23080,7 @@
+@@ -23647,7 +23650,7 @@
  fi
  done
  
--for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
-+for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+-for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid
++for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -28271,7 +28274,7 @@
- fi
- 
- 
--if test "x${enable_Bsymbolic}" == "xyes"; then
-+if test "x${enable_Bsymbolic}" = "xyes"; then
-   GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
- fi
- 
+@@ -27108,10 +27111,10 @@
+ #  b) FreeBSD doesn't do this either.
+ #
+ case $host in
+-  *-*-freebsd*|*-*-linux*)
++  *-*-linux*)
+     G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`"
+     ;;
+-  *-*-openbsd*)
++  *-*-freebsd*|*-*-openbsd*)
+     LDFLAGS="$LDFLAGS -pthread"
+     ;;
+   *)
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
deleted file mode 100644
index 289bc3381903..000000000000
--- a/devel/glib20/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2010-08-08 12:14:27.000000000 +0200
-+++ Makefile.in	2010-08-08 12:15:40.000000000 +0200
-@@ -418,7 +418,7 @@
- 	gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
- TEST_PROGS = 
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
- DIST_SUBDIRS = $(SUBDIRS) build
- bin_SCRIPTS = glib-gettextize
- AM_CPPFLAGS = \
diff --git a/devel/glib20/files/patch-gio_fam_Makefile.in b/devel/glib20/files/patch-gio_fam_Makefile.in
new file mode 100644
index 000000000000..033ff3f5dcda
--- /dev/null
+++ b/devel/glib20/files/patch-gio_fam_Makefile.in
@@ -0,0 +1,35 @@
+--- gio/fam/Makefile.in.orig	2012-03-07 21:07:42.000000000 +0100
++++ gio/fam/Makefile.in	2012-03-07 21:08:30.000000000 +0100
+@@ -87,9 +87,7 @@
+ am__installdirs = "$(DESTDIR)$(giomoduledir)"
+ 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__objects_1 =
+ am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
+@@ -402,9 +400,9 @@
+ 
+ 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)
+@@ -843,7 +841,7 @@
+ 
+ install-data-hook:
+ 	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
+-		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
++		gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
+ 	fi
+ 
+ uninstall-local:
diff --git a/devel/glib20/files/patch-gio_gdesktopappinfo.c b/devel/glib20/files/patch-gio_gdesktopappinfo.c
deleted file mode 100644
index 73283b44dbab..000000000000
--- a/devel/glib20/files/patch-gio_gdesktopappinfo.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- gio/gdesktopappinfo.c.orig	2011-09-25 11:41:14.000000000 -0400
-+++ gio/gdesktopappinfo.c	2011-09-25 11:41:18.000000000 -0400
-@@ -1515,18 +1515,29 @@ update_mimeapps_list (const char  *deskt
-            */
-           if (!explicit_default)
-             {
--              system_list = get_all_desktop_entries_for_mime_type (content_type, (const char **) list, FALSE, NULL);
-+              char *user_default;
-+              /* The system default can be in the list, don't exclude it */
-+              system_list = get_all_desktop_entries_for_mime_type (content_type, NULL, FALSE, &user_default);
- 
--              if (system_list != NULL)
-+              string = NULL;
-+              if (user_default != NULL)
-+                {
-+                  /* There is an existing default set in a lower priority defaults file, re-use it */
-+                  string = user_default;
-+                }
-+              else if (system_list != NULL)
-                 {
-                   string = system_list->data;
--
-+                }
-+              if (string)
-+                {
-                   g_key_file_set_string (key_file,
-                                          DEFAULT_APPLICATIONS_GROUP,
-                                          content_types[k],
-                                          string);
-                 }
- 
-+              g_free (user_default);
-               g_list_free_full (system_list, g_free);
-             }
-         }
diff --git a/devel/glib20/files/patch-gio_glib-compile-schemas.c b/devel/glib20/files/patch-gio_glib-compile-schemas.c
new file mode 100644
index 000000000000..e92fac5baff8
--- /dev/null
+++ b/devel/glib20/files/patch-gio_glib-compile-schemas.c
@@ -0,0 +1,16 @@
+--- gio/glib-compile-schemas.c.orig	2012-06-14 16:39:22.000000000 +0200
++++ gio/glib-compile-schemas.c	2012-06-14 16:39:55.000000000 +0200
+@@ -1204,11 +1204,13 @@
+       return;
+     }
+ 
++#if 0
+   if (path && (g_str_has_prefix (path, "/apps/") ||
+                g_str_has_prefix (path, "/desktop/") ||
+                g_str_has_prefix (path, "/system/")))
+     g_printerr ("warning: Schema '%s' has path '%s'.  Paths starting with "
+                 "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
++#endif
+ 
+   state->schema_state = schema_state_new (path, gettext_domain,
+                                           extends, extends_name, list_of);
diff --git a/devel/glib20/files/patch-gio_gunixcredentialsmessage.c b/devel/glib20/files/patch-gio_gunixcredentialsmessage.c
deleted file mode 100644
index b81a6e282aa8..000000000000
--- a/devel/glib20/files/patch-gio_gunixcredentialsmessage.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- gio/gunixcredentialsmessage.c.orig	2011-09-25 11:42:09.000000000 -0400
-+++ gio/gunixcredentialsmessage.c	2011-09-25 11:42:22.000000000 -0400
-@@ -162,11 +162,11 @@ g_unix_credentials_message_deserialize (
-       {
-         goto out;
-       }
--    if (size < CMSG_LEN (sizeof *cred))
-+    if (size < sizeof *cred)
-       {
-         g_warning ("Expected a struct cmsgcred (%" G_GSIZE_FORMAT " bytes) but "
-                    "got %" G_GSIZE_FORMAT " bytes of data",
--                   CMSG_LEN (sizeof *cred),
-+                   sizeof *cred,
-                    size);
-         goto out;
-       }
diff --git a/devel/glib20/files/patch-gio_gunixmount.c b/devel/glib20/files/patch-gio_gunixmount.c
index b9bfe143ed0c..e0b3caa374e2 100644
--- a/devel/glib20/files/patch-gio_gunixmount.c
+++ b/devel/glib20/files/patch-gio_gunixmount.c
@@ -1,6 +1,6 @@
---- gio/gunixmount.c.orig	2007-12-23 15:53:50.000000000 -0500
-+++ gio/gunixmount.c	2007-12-23 15:52:52.000000000 -0500
-@@ -372,12 +372,18 @@ g_unix_mount_eject (GMount             *
+--- gio/gunixmount.c.orig	2011-08-31 19:47:35.000000000 +0200
++++ gio/gunixmount.c	2011-09-15 17:50:24.000000000 +0200
+@@ -449,12 +449,18 @@ g_unix_mount_eject (GMount             *
                      gpointer             user_data)
  {
    GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
@@ -17,5 +17,5 @@
 +  argv[2] = unix_mount->device_path;
 +#endif
  
-   return eject_unmount_do (mount, cancellable, callback, user_data, argv);
+   eject_unmount_do (mount, cancellable, callback, user_data, argv);
  }
diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c
index f99358ddf2ec..608bd95a3072 100644
--- a/devel/glib20/files/patch-gio_gunixmounts.c
+++ b/devel/glib20/files/patch-gio_gunixmounts.c
@@ -1,16 +1,16 @@
---- gio/gunixmounts.c.orig	2011-06-05 19:18:49.000000000 -0400
-+++ gio/gunixmounts.c	2011-11-09 04:20:49.000000000 -0500
-@@ -135,6 +135,9 @@ struct _GUnixMountMonitor {
- 
+--- gio/gunixmounts.c.orig	2012-05-02 22:02:54.000000000 -0500
++++ gio/gunixmounts.c	2012-05-02 22:15:35.000000000 -0500
+@@ -155,6 +155,9 @@
    GFileMonitor *fstab_monitor;
    GFileMonitor *mtab_monitor;
-+
+ 
 +  guint mount_poller_source;
 +  GList *mount_poller_mounts;
++
+   GSource *proc_mounts_watch_source;
  };
  
- struct _GUnixMountMonitorClass {
-@@ -146,6 +149,8 @@ static GUnixMountMonitor *the_mount_moni
+@@ -167,6 +170,8 @@
  static GList *_g_get_unix_mounts (void);
  static GList *_g_get_unix_mount_points (void);
  
@@ -19,15 +19,15 @@
  G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
  
  #define MOUNT_POLL_INTERVAL 4000
-@@ -172,6 +177,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
+@@ -193,6 +198,7 @@
  #endif
  
- #if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
+ #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
 +#include <sys/param.h>
  #include <sys/ucred.h>
  #include <sys/mount.h>
  #include <fstab.h>
-@@ -222,20 +228,28 @@ g_unix_is_mount_path_system_internal (co
+@@ -243,22 +249,29 @@
      "/",              /* we already have "Filesystem root" in Nautilus */ 
      "/bin",
      "/boot",
@@ -39,6 +39,8 @@
      "/lib",
      "/lib64",
 +    "/libexec",
+     "/live/cow",
+     "/live/image",
      "/media",
      "/mnt",
      "/opt",
@@ -48,15 +50,14 @@
      "/srv",
      "/tmp",
      "/usr",
-+    "/usr/X11R6",
      "/usr/local",
 +    "/usr/obj",
 +    "/usr/ports",
 +    "/usr/src",
      "/var",
-     "/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */
-     "/var/tmp",       /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */
-@@ -271,6 +285,7 @@ guess_system_internal (const char *mount
+     "/var/crash",
+     "/var/local",
+@@ -299,6 +312,7 @@
      "devfs",
      "devpts",
      "ecryptfs",
@@ -64,7 +65,7 @@
      "kernfs",
      "linprocfs",
      "proc",
-@@ -1056,6 +1071,10 @@ get_mounts_timestamp (void)
+@@ -1122,6 +1136,10 @@
        if (stat (monitor_file, &buf) == 0)
  	return (guint64)buf.st_mtime;
      }
@@ -75,7 +76,7 @@
    return 0;
  }
  
-@@ -1198,6 +1217,13 @@ g_unix_mount_monitor_finalize (GObject *
+@@ -1267,6 +1285,13 @@
        g_object_unref (monitor->mtab_monitor);
      }
  
@@ -89,11 +90,10 @@
    the_mount_monitor = NULL;
  
    G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
-@@ -1278,6 +1304,51 @@ mtab_file_changed (GFileMonitor      *mo
-   g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
+@@ -1348,6 +1373,52 @@
  }
  
-+static gboolean
+ static gboolean
 +mount_change_poller (gpointer user_data)
 +{
 +  GUnixMountMonitor *mount_monitor;
@@ -115,15 +115,15 @@
 +      for (i = 0; i < g_list_length (current_mounts); i++)
 +        {
 +          GUnixMountEntry *m1;
-+	  GUnixMountEntry *m2;
++         GUnixMountEntry *m2;
 +
-+	  m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
-+	  m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
++         m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
++         m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
 +          if (! has_changed && g_unix_mount_compare (m1, m2) != 0)
 +            has_changed = TRUE;
 +
-+	  g_unix_mount_free (m2);
-+	}
++         g_unix_mount_free (m2);
++       }
 +    }
 +
 +  g_list_free (mount_monitor->mount_poller_mounts);
@@ -138,12 +138,14 @@
 +  return TRUE;
 +}
 +
- static void
- g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
- {
-@@ -1300,6 +1371,12 @@ g_unix_mount_monitor_init (GUnixMountMon
-       
-       g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
++
++static gboolean
+ proc_mounts_changed (GIOChannel   *channel,
+                      GIOCondition  cond,
+                      gpointer      user_data)
+@@ -1412,6 +1483,12 @@
+           g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
+         }
      }
 +  else
 +    {
diff --git a/devel/glib20/files/patch-gio_libasyncns_asyncns.c b/devel/glib20/files/patch-gio_libasyncns_asyncns.c
deleted file mode 100644
index 966dd27a689b..000000000000
--- a/devel/glib20/files/patch-gio_libasyncns_asyncns.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gio/libasyncns/asyncns.c.orig	2009-05-05 15:25:10.000000000 -0400
-+++ gio/libasyncns/asyncns.c	2009-05-05 15:25:51.000000000 -0400
-@@ -35,6 +35,8 @@
- #include <errno.h>
- #include <sys/wait.h>
- #include <sys/types.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- #include <pwd.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
diff --git a/devel/glib20/files/patch-gio_tests_include.c b/devel/glib20/files/patch-gio_tests_include.c
new file mode 100644
index 000000000000..165c97b386e5
--- /dev/null
+++ b/devel/glib20/files/patch-gio_tests_include.c
@@ -0,0 +1,10 @@
+--- glib/tests/include.c.orig	2012-03-06 12:11:39.000000000 +0100
++++ glib/tests/include.c	2012-03-06 12:13:17.000000000 +0100
+@@ -3,6 +3,7 @@
+ #define _POSIX_C_SOURCE 0
+ #undef _GNU_SOURCE
+ #undef _XOPEN_SOURCE
++#include <sys/types.h>
+ #include <pthread.h>
+ #include <glib.h>
+ 
diff --git a/devel/glib20/files/patch-glib-2.0.pc.in b/devel/glib20/files/patch-glib-2.0.pc.in
index f714b6f6eb02..9bd74ad4394e 100644
--- a/devel/glib20/files/patch-glib-2.0.pc.in
+++ b/devel/glib20/files/patch-glib-2.0.pc.in
@@ -1,8 +1,8 @@
---- glib-2.0.pc.in.orig	2011-01-06 07:29:30.000000000 +0000
-+++ glib-2.0.pc.in	2011-01-06 07:29:41.000000000 +0000
-@@ -12,4 +12,4 @@
- Version: @VERSION@
+--- glib-2.0.pc.in.orig	2012-01-16 04:12:06.000000000 +0100
++++ glib-2.0.pc.in	2012-03-06 12:30:11.000000000 +0100
+@@ -13,4 +13,4 @@
+ Requires.private: @PCRE_REQUIRES@
  Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
- Libs.private: @ICONV_LIBS@
+ Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
 -Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
 +Cflags: -I${includedir}/glib-2.0 @GLIB_EXTRA_CFLAGS@
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index d58efb723f81..30d6f1be8f8e 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -1,30 +1,30 @@
---- glib/Makefile.in.orig	2010-08-08 12:46:01.000000000 +0200
-+++ glib/Makefile.in	2010-08-08 12:46:01.000000000 +0200
-@@ -529,7 +529,7 @@ BUILT_SOURCES = glibconfig-stamp $(am__a
+--- glib/Makefile.in.orig	2012-09-24 01:59:13.000000000 +0000
++++ glib/Makefile.in	2012-09-24 02:02:07.000000000 +0000
+@@ -585,7 +585,7 @@
  #
  DISTCLEANFILES = glibconfig-stamp glibconfig.h
- CLEANFILES = $(am__append_2)
+ CLEANFILES = libglib-gdb.py glib-public-headers.txt $(am__append_6)
 -configexecincludedir = $(libdir)/glib-2.0/include
 +configexecincludedir = $(includedir)/glib-2.0
  nodist_configexecinclude_HEADERS = glibconfig.h
  @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
  @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
-@@ -1530,7 +1530,7 @@ info: info-recursive
- 
+@@ -1617,7 +1617,7 @@
  info-am:
  
--install-data-am: install-data-local install-dist_gdbSCRIPTS \
-+install-data-am: install-data-local \
- 	install-glibincludeHEADERS install-glibsubincludeHEADERS \
- 	install-tapsetDATA
+ install-data-am: install-data-local install-deprecatedincludeHEADERS \
+-	install-dist_gdbSCRIPTS install-glibincludeHEADERS \
++	install-glibincludeHEADERS \
+ 	install-glibsubincludeHEADERS install-tapsetDATA
  	@$(NORMAL_INSTALL)
-@@ -1786,9 +1786,7 @@ distclean-local:
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -1906,9 +1906,7 @@
  libglib-gdb.py: libglib-gdb.py.in
- 	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
+ 	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
  
 -install-data-hook: libglib-gdb.py
 -	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
--	$(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+-	$(INSTALL) $(builddir)/libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
 +install-data-hook:
  @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
  @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-glib_deprecated_gthread.h b/devel/glib20/files/patch-glib_deprecated_gthread.h
new file mode 100644
index 000000000000..889976f1fca9
--- /dev/null
+++ b/devel/glib20/files/patch-glib_deprecated_gthread.h
@@ -0,0 +1,10 @@
+--- ./glib/deprecated/gthread.h.orig	2012-05-27 17:07:04.000000000 +0200
++++ ./glib/deprecated/gthread.h	2012-05-27 17:07:19.000000000 +0200
+@@ -120,6 +120,7 @@
+                                 gpointer          user_data);
+ 
+ #ifndef G_OS_WIN32
++#include <sys/types.h>
+ #include <pthread.h>
+ #endif
+ 
diff --git a/devel/glib20/files/patch-glib_fix_hidden b/devel/glib20/files/patch-glib_fix_hidden
index c26942a39fb1..813c49808fc2 100644
--- a/devel/glib20/files/patch-glib_fix_hidden
+++ b/devel/glib20/files/patch-glib_fix_hidden
@@ -1,14 +1,3 @@
---- glib/gatomic-gcc.c.orig	2011-06-06 01:18:49.000000000 +0200
-+++ glib/gatomic-gcc.c	2011-12-07 00:24:48.000000000 +0100
-@@ -22,6 +22,8 @@
- 
- #include "gatomic.h"
- 
-+#include "gthreadprivate.h"
-+
- gint
- g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- 			       gint           val)
 --- glib/gmem.c.orig	2011-02-10 00:31:42.000000000 +0100
 +++ glib/gmem.c	2011-12-07 00:21:38.000000000 +0100
 @@ -39,6 +39,7 @@
diff --git a/devel/glib20/files/patch-glib_gregex.c b/devel/glib20/files/patch-glib_gregex.c
deleted file mode 100644
index ef7f0a87b9ff..000000000000
--- a/devel/glib20/files/patch-glib_gregex.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- glib/gregex.c.orig	2007-09-09 18:35:32.000000000 -0400
-+++ glib/gregex.c	2007-09-09 18:36:05.000000000 -0400
-@@ -164,8 +164,10 @@ match_error (gint errcode)
-     case PCRE_ERROR_DFA_RECURSE:
-     case PCRE_ERROR_RECURSIONLIMIT:
-       return _("recursion limit reached");
-+#ifdef PCRE_ERROR_NULLWSLIMIT
-     case PCRE_ERROR_NULLWSLIMIT:
-       return _("workspace limit for empty substrings reached");
-+#endif
-     case PCRE_ERROR_BADNEWLINE:
-       return _("invalid combination of newline flags");
-     default:
diff --git a/devel/glib20/files/patch-glib_gthread-posix.c b/devel/glib20/files/patch-glib_gthread-posix.c
new file mode 100644
index 000000000000..f19007f8c636
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gthread-posix.c
@@ -0,0 +1,20 @@
+--- glib/gthread-posix.c.orig	2012-11-10 03:24:06.000000000 +0000
++++ glib/gthread-posix.c	2012-11-12 18:06:36.000000000 +0000
+@@ -89,7 +89,7 @@
+   if G_UNLIKELY (mutex == NULL)
+     g_thread_abort (errno, "malloc");
+ 
+-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
++#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__)
+   {
+     pthread_mutexattr_t attr;
+     pthread_mutexattr_init (&attr);
+@@ -101,7 +101,7 @@
+   if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0)
+     g_thread_abort (status, "pthread_mutex_init");
+ 
+-#ifdef PTHREAD_ADAPTIVE_MUTEX_NP
++#if defined(PTHREAD_ADAPTIVE_MUTEX_NP) && !defined(__FreeBSD__)
+   pthread_mutexattr_destroy (&attr);
+ #endif
+ 
diff --git a/devel/glib20/files/patch-glib_tests_gdatetime.c b/devel/glib20/files/patch-glib_tests_gdatetime.c
new file mode 100644
index 000000000000..8a8774254f95
--- /dev/null
+++ b/devel/glib20/files/patch-glib_tests_gdatetime.c
@@ -0,0 +1,20 @@
+--- glib/tests/gdatetime.c.orig	2012-08-17 00:06:25.000000000 +0000
++++ glib/tests/gdatetime.c	2012-10-23 12:38:55.000000000 +0000
+@@ -1230,7 +1230,7 @@
+   gint64 u;
+   gint i1, i2;
+ 
+-  tz = g_time_zone_new ("Canada/Eastern");
++  tz = g_time_zone_new ("America/Montreal");
+   dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0);
+   u = g_date_time_to_unix (dt);
+ 
+@@ -1259,7 +1259,7 @@
+   gint64 u, u2;
+   gint i1, i2;
+ 
+-  tz = g_time_zone_new ("Canada/Eastern");
++  tz = g_time_zone_new ("America/Montreal");
+   dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0);
+   u = g_date_time_to_unix (dt);
+   u2 = u;
diff --git a/devel/glib20/files/patch-glib_tests_utils.c b/devel/glib20/files/patch-glib_tests_utils.c
new file mode 100644
index 000000000000..0f7544cc4bff
--- /dev/null
+++ b/devel/glib20/files/patch-glib_tests_utils.c
@@ -0,0 +1,11 @@
+--- glib/tests/utils.c.orig	2012-09-24 02:19:54.000000000 +0000
++++ glib/tests/utils.c	2012-09-24 02:20:48.000000000 +0000
+@@ -416,7 +416,7 @@
+ 
+   xdg = (gchar *)g_getenv ("XDG_CONFIG_DIRS");
+   if (!xdg)
+-    xdg = "/etc/xdg";
++    xdg = "/usr/local/etc/xdg:/etc/xdg";
+ 
+   dirs = g_get_system_config_dirs ();
+ 
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in
index 12a20215a0bb..f99ec4a97002 100644
--- a/devel/glib20/files/patch-gobject_Makefile.in
+++ b/devel/glib20/files/patch-gobject_Makefile.in
@@ -1,6 +1,6 @@
---- gobject/Makefile.in.orig	2010-06-08 09:19:51.000000000 +0200
-+++ gobject/Makefile.in	2010-06-08 09:20:41.000000000 +0200
-@@ -1236,7 +1236,7 @@ info: info-recursive
+--- gobject/Makefile.in.orig	2012-05-03 11:42:11.000000000 +0200
++++ gobject/Makefile.in	2012-05-03 11:42:51.000000000 +0200
+@@ -1381,7 +1381,7 @@
  
  info-am:
  
@@ -9,13 +9,13 @@
  	install-libgobjectincludeHEADERS install-tapsetDATA
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1460,9 +1460,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
+@@ -1649,9 +1649,7 @@
  uninstall-gdb:
  	-rm -r $(DESTDIR)$(datadir)/gdb
  
 -install-data-hook: libgobject-gdb.py
 -	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
--	$(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+-	$(INSTALL) $(builddir)/libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
 +install-data-hook:
  @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
  @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c
deleted file mode 100644
index 47c5ab8f1591..000000000000
--- a/devel/glib20/files/patch-gthread_gthread-posix.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- gthread/gthread-posix.c.orig	Mon Nov  1 13:47:12 2004
-+++ gthread/gthread-posix.c	Wed Mar  9 14:21:20 2005
-@@ -125,7 +129,8 @@
- g_thread_impl_init(void)
- {
- #ifdef _SC_THREAD_STACK_MIN
--  g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0);
-+  g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN),
-+    g_thread_min_stack_size);
- #endif /* _SC_THREAD_STACK_MIN */
- #ifdef HAVE_PRIORITIES
- # ifdef G_THREADS_IMPL_POSIX
-@@ -176,7 +181,7 @@
-   result = pthread_mutex_trylock ((pthread_mutex_t *) mutex);
- 
- #ifdef G_THREADS_IMPL_POSIX
--  if (result == EBUSY)
-+  if ((result == EBUSY) || (result == EDEADLK))
-     return FALSE;
- #else /* G_THREADS_IMPL_DCE */
-   if (result == 0)
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index e3b7ff0f2eaa..fe7f895a6c81 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,15 +1,19 @@
 bin/gdbus
+bin/gdbus-codegen
 bin/gio-querymodules
+bin/glib-compile-resources
 bin/glib-compile-schemas
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
 bin/gobject-query
+bin/gresource
 bin/gsettings
 bin/gtester
 bin/gtester-report
-etc/bash_completion.d/gdbus-bash-completion.sh
-etc/bash_completion.d/gsettings-bash-completion.sh
+share/bash-completion/completions/gdbus
+share/bash-completion/completions/gsettings
+share/bash-completion/completions/gresource
 include/gio-unix-2.0/gio/gdesktopappinfo.h
 include/gio-unix-2.0/gio/gfiledescriptorbased.h
 include/gio-unix-2.0/gio/gunixconnection.h
@@ -22,6 +26,8 @@ include/gio-unix-2.0/gio/gunixoutputstream.h
 include/gio-unix-2.0/gio/gunixsocketaddress.h
 include/glib-2.0/gio/gaction.h
 include/glib-2.0/gio/gactiongroup.h
+include/glib-2.0/gio/gactiongroupexporter.h
+include/glib-2.0/gio/gactionmap.h
 include/glib-2.0/gio/gappinfo.h
 include/glib-2.0/gio/gapplication.h
 include/glib-2.0/gio/gapplicationcommandline.h
@@ -38,15 +44,25 @@ include/glib-2.0/gio/gconverteroutputstream.h
 include/glib-2.0/gio/gcredentials.h
 include/glib-2.0/gio/gdatainputstream.h
 include/glib-2.0/gio/gdataoutputstream.h
+include/glib-2.0/gio/gdbusactiongroup.h
 include/glib-2.0/gio/gdbusaddress.h
 include/glib-2.0/gio/gdbusauthobserver.h
 include/glib-2.0/gio/gdbusconnection.h
 include/glib-2.0/gio/gdbuserror.h
+include/glib-2.0/gio/gdbusinterface.h
+include/glib-2.0/gio/gdbusinterfaceskeleton.h
 include/glib-2.0/gio/gdbusintrospection.h
+include/glib-2.0/gio/gdbusmenumodel.h
 include/glib-2.0/gio/gdbusmessage.h
 include/glib-2.0/gio/gdbusmethodinvocation.h
 include/glib-2.0/gio/gdbusnameowning.h
 include/glib-2.0/gio/gdbusnamewatching.h
+include/glib-2.0/gio/gdbusobject.h
+include/glib-2.0/gio/gdbusobjectmanager.h
+include/glib-2.0/gio/gdbusobjectmanagerclient.h
+include/glib-2.0/gio/gdbusobjectmanagerserver.h
+include/glib-2.0/gio/gdbusobjectproxy.h
+include/glib-2.0/gio/gdbusobjectskeleton.h
 include/glib-2.0/gio/gdbusproxy.h
 include/glib-2.0/gio/gdbusserver.h
 include/glib-2.0/gio/gdbusutils.h
@@ -67,6 +83,7 @@ include/glib-2.0/gio/gfilterinputstream.h
 include/glib-2.0/gio/gfilteroutputstream.h
 include/glib-2.0/gio/gicon.h
 include/glib-2.0/gio/ginetaddress.h
+include/glib-2.0/gio/ginetaddressmask.h
 include/glib-2.0/gio/ginetsocketaddress.h
 include/glib-2.0/gio/ginitable.h
 include/glib-2.0/gio/ginputstream.h
@@ -81,25 +98,33 @@ include/glib-2.0/gio/giotypes.h
 include/glib-2.0/gio/gloadableicon.h
 include/glib-2.0/gio/gmemoryinputstream.h
 include/glib-2.0/gio/gmemoryoutputstream.h
+include/glib-2.0/gio/gmenu.h
+include/glib-2.0/gio/gmenuexporter.h
+include/glib-2.0/gio/gmenumodel.h
 include/glib-2.0/gio/gmount.h
 include/glib-2.0/gio/gmountoperation.h
 include/glib-2.0/gio/gnativevolumemonitor.h
 include/glib-2.0/gio/gnetworkaddress.h
+include/glib-2.0/gio/gnetworkmonitor.h
 include/glib-2.0/gio/gnetworkservice.h
 include/glib-2.0/gio/goutputstream.h
 include/glib-2.0/gio/gpermission.h
 include/glib-2.0/gio/gpollableinputstream.h
 include/glib-2.0/gio/gpollableoutputstream.h
+include/glib-2.0/gio/gpollableutils.h
 include/glib-2.0/gio/gproxy.h
 include/glib-2.0/gio/gproxyaddress.h
 include/glib-2.0/gio/gproxyaddressenumerator.h
 include/glib-2.0/gio/gproxyresolver.h
-include/glib-2.0/gio/gsimpleaction.h
-include/glib-2.0/gio/gsimpleactiongroup.h
+include/glib-2.0/gio/gremoteactiongroup.h
 include/glib-2.0/gio/gresolver.h
+include/glib-2.0/gio/gresource.h
 include/glib-2.0/gio/gseekable.h
 include/glib-2.0/gio/gsettings.h
 include/glib-2.0/gio/gsettingsbackend.h
+include/glib-2.0/gio/gsettingsschema.h
+include/glib-2.0/gio/gsimpleaction.h
+include/glib-2.0/gio/gsimpleactiongroup.h
 include/glib-2.0/gio/gsimpleasyncresult.h
 include/glib-2.0/gio/gsimplepermission.h
 include/glib-2.0/gio/gsocket.h
@@ -114,12 +139,17 @@ include/glib-2.0/gio/gsocketservice.h
 include/glib-2.0/gio/gsrvtarget.h
 include/glib-2.0/gio/gtcpconnection.h
 include/glib-2.0/gio/gtcpwrapperconnection.h
+include/glib-2.0/gio/gtestdbus.h
 include/glib-2.0/gio/gthemedicon.h
 include/glib-2.0/gio/gthreadedsocketservice.h
 include/glib-2.0/gio/gtlsbackend.h
 include/glib-2.0/gio/gtlscertificate.h
 include/glib-2.0/gio/gtlsclientconnection.h
 include/glib-2.0/gio/gtlsconnection.h
+include/glib-2.0/gio/gtlsdatabase.h
+include/glib-2.0/gio/gtlsfiledatabase.h
+include/glib-2.0/gio/gtlsinteraction.h
+include/glib-2.0/gio/gtlspassword.h
 include/glib-2.0/gio/gtlsserverconnection.h
 include/glib-2.0/gio/gvfs.h
 include/glib-2.0/gio/gvolume.h
@@ -127,7 +157,14 @@ include/glib-2.0/gio/gvolumemonitor.h
 include/glib-2.0/gio/gzlibcompressor.h
 include/glib-2.0/gio/gzlibdecompressor.h
 include/glib-2.0/glib-object.h
+include/glib-2.0/glib-unix.h
 include/glib-2.0/glib.h
+include/glib-2.0/glib/deprecated/gallocator.h
+include/glib-2.0/glib/deprecated/gcache.h
+include/glib-2.0/glib/deprecated/gcompletion.h
+include/glib-2.0/glib/deprecated/gmain.h
+include/glib-2.0/glib/deprecated/grel.h
+include/glib-2.0/glib/deprecated/gthread.h
 include/glib-2.0/glib/galloca.h
 include/glib-2.0/glib/garray.h
 include/glib-2.0/glib/gasyncqueue.h
@@ -136,17 +173,20 @@ include/glib-2.0/glib/gbacktrace.h
 include/glib-2.0/glib/gbase64.h
 include/glib-2.0/glib/gbitlock.h
 include/glib-2.0/glib/gbookmarkfile.h
-include/glib-2.0/glib/gcache.h
+include/glib-2.0/glib/gbytes.h
+include/glib-2.0/glib/gcharset.h
 include/glib-2.0/glib/gchecksum.h
-include/glib-2.0/glib/gcompletion.h
 include/glib-2.0/glib/gconvert.h
 include/glib-2.0/glib/gdataset.h
 include/glib-2.0/glib/gdate.h
 include/glib-2.0/glib/gdatetime.h
 include/glib-2.0/glib/gdir.h
+include/glib-2.0/glib/genviron.h
 include/glib-2.0/glib/gerror.h
 include/glib-2.0/glib/gfileutils.h
+include/glib-2.0/glib/ggettext.h
 include/glib-2.0/glib/ghash.h
+include/glib-2.0/glib/ghmac.h
 include/glib-2.0/glib/ghook.h
 include/glib-2.0/glib/ghostutils.h
 include/glib-2.0/glib/gi18n-lib.h
@@ -171,7 +211,6 @@ include/glib-2.0/glib/gquark.h
 include/glib-2.0/glib/gqueue.h
 include/glib-2.0/glib/grand.h
 include/glib-2.0/glib/gregex.h
-include/glib-2.0/glib/grel.h
 include/glib-2.0/glib/gscanner.h
 include/glib-2.0/glib/gsequence.h
 include/glib-2.0/glib/gshell.h
@@ -181,11 +220,13 @@ include/glib-2.0/glib/gspawn.h
 include/glib-2.0/glib/gstdio.h
 include/glib-2.0/glib/gstrfuncs.h
 include/glib-2.0/glib/gstring.h
+include/glib-2.0/glib/gstringchunk.h
 include/glib-2.0/glib/gtestutils.h
 include/glib-2.0/glib/gthread.h
 include/glib-2.0/glib/gthreadpool.h
 include/glib-2.0/glib/gtimer.h
 include/glib-2.0/glib/gtimezone.h
+include/glib-2.0/glib/gtrashstack.h
 include/glib-2.0/glib/gtree.h
 include/glib-2.0/glib/gtypes.h
 include/glib-2.0/glib/gunicode.h
@@ -193,6 +234,8 @@ include/glib-2.0/glib/gurifuncs.h
 include/glib-2.0/glib/gutils.h
 include/glib-2.0/glib/gvariant.h
 include/glib-2.0/glib/gvarianttype.h
+include/glib-2.0/glib/gversion.h
+include/glib-2.0/glib/gversionmacros.h
 include/glib-2.0/glib/gwin32.h
 include/glib-2.0/glibconfig.h
 include/glib-2.0/gmodule.h
@@ -200,6 +243,7 @@ include/glib-2.0/gobject/gbinding.h
 include/glib-2.0/gobject/gboxed.h
 include/glib-2.0/gobject/gclosure.h
 include/glib-2.0/gobject/genums.h
+include/glib-2.0/gobject/glib-types.h
 include/glib-2.0/gobject/gmarshal.h
 include/glib-2.0/gobject/gobject.h
 include/glib-2.0/gobject/gobjectnotifyqueue.c
@@ -214,6 +258,30 @@ include/glib-2.0/gobject/gvalue.h
 include/glib-2.0/gobject/gvaluearray.h
 include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
+lib/gdbus-2.0/codegen/__init__.py
+lib/gdbus-2.0/codegen/__init__.pyc
+lib/gdbus-2.0/codegen/__init__.pyo
+lib/gdbus-2.0/codegen/codegen.py
+lib/gdbus-2.0/codegen/codegen.pyc
+lib/gdbus-2.0/codegen/codegen.pyo
+lib/gdbus-2.0/codegen/codegen_docbook.py
+lib/gdbus-2.0/codegen/codegen_docbook.pyc
+lib/gdbus-2.0/codegen/codegen_docbook.pyo
+lib/gdbus-2.0/codegen/codegen_main.py
+lib/gdbus-2.0/codegen/codegen_main.pyc
+lib/gdbus-2.0/codegen/codegen_main.pyo
+lib/gdbus-2.0/codegen/config.py
+lib/gdbus-2.0/codegen/config.pyc
+lib/gdbus-2.0/codegen/config.pyo
+lib/gdbus-2.0/codegen/dbustypes.py
+lib/gdbus-2.0/codegen/dbustypes.pyc
+lib/gdbus-2.0/codegen/dbustypes.pyo
+lib/gdbus-2.0/codegen/parser.py
+lib/gdbus-2.0/codegen/parser.pyc
+lib/gdbus-2.0/codegen/parser.pyo
+lib/gdbus-2.0/codegen/utils.py
+lib/gdbus-2.0/codegen/utils.pyc
+lib/gdbus-2.0/codegen/utils.pyo
 lib/libgio-2.0.a
 lib/libgio-2.0.la
 lib/libgio-2.0.so
@@ -268,9 +336,9 @@ share/locale/da/LC_MESSAGES/glib20.mo
 share/locale/de/LC_MESSAGES/glib20.mo
 share/locale/dz/LC_MESSAGES/glib20.mo
 share/locale/el/LC_MESSAGES/glib20.mo
+share/locale/en@shaw/LC_MESSAGES/glib20.mo
 share/locale/en_CA/LC_MESSAGES/glib20.mo
 share/locale/en_GB/LC_MESSAGES/glib20.mo
-share/locale/en@shaw/LC_MESSAGES/glib20.mo
 share/locale/eo/LC_MESSAGES/glib20.mo
 share/locale/es/LC_MESSAGES/glib20.mo
 share/locale/et/LC_MESSAGES/glib20.mo
@@ -342,26 +410,6 @@ share/locale/yi/LC_MESSAGES/glib20.mo
 share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_HK/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
-@exec mkdir -p %D/share/glib-2.0/schemas
-@exec mkdir -p %D/share/GConf/gsettings
-@dirrm share/GConf/gsettings
-@dirrm share/GConf
-@exec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas
-@dirrm share/glib-2.0/schemas
-@dirrm share/glib-2.0/gettext/po
-@dirrm share/glib-2.0/gettext
-@dirrm share/glib-2.0
-@exec mkdir -p %D/lib/gio/modules
-@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -f %D/lib/gio/modules/giomodule.cache
-@dirrmtry lib/gio/modules
-@dirrmtry lib/gio
-@dirrm include/glib-2.0/gobject
-@dirrm include/glib-2.0/glib
-@dirrm include/glib-2.0/gio
-@dirrm include/glib-2.0
-@dirrm include/gio-unix-2.0/gio
-@dirrm include/gio-unix-2.0
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yi/LC_MESSAGES
@@ -416,4 +464,27 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrmtry etc/bash_completion.d
+@exec mkdir -p %D/share/glib-2.0/schemas
+@exec glib-compile-schemas %D/share/glib-2.0/schemas
+@dirrm share/glib-2.0/schemas
+@dirrm share/glib-2.0/gettext/po
+@dirrm share/glib-2.0/gettext
+@dirrm share/glib-2.0
+@dirrmtry share/bash-completion/completions
+@dirrmtry share/bash-completion
+@exec mkdir -p %D/share/GConf/gsettings
+@dirrm share/GConf/gsettings
+@dirrm share/GConf
+@exec mkdir -p %D/lib/gio/modules
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@dirrmtry lib/gio/modules
+@dirrmtry lib/gio
+@dirrm lib/gdbus-2.0/codegen
+@dirrm lib/gdbus-2.0
+@dirrm include/glib-2.0/gobject
+@dirrm include/glib-2.0/glib/deprecated
+@dirrm include/glib-2.0/glib
+@dirrm include/glib-2.0/gio
+@dirrm include/glib-2.0
+@dirrm include/gio-unix-2.0/gio
+@dirrm include/gio-unix-2.0
author	Koop Mast <kwm@FreeBSD.org>	2013-03-08 10:51:34 +0000
committer	Koop Mast <kwm@FreeBSD.org>	2013-03-08 10:51:34 +0000
commit	7887c684adab042fed1bfcba2e91589ecd17c4a8 (patch)
tree	961839899dce7f75292a08c079f548973bdbd40d /devel/glib20
parent	85544f2c01be814e0af1ebee1076012e7ed60bb0 (diff)