20 files changed, 126 insertions, 466 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 6b37fc59d932..1878761a3b01 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,10 +1,9 @@
 # Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/devel/glib20/Makefile 18634 2013-07-26 10:42:35Z kwm $
+#   $MCom: ports/trunk/devel/glib20/Makefile 19944 2014-10-15 05:33:09Z gusi $
 
 PORTNAME=	glib
-PORTVERSION=	2.36.3
-PORTREVISION=	4
+PORTVERSION=	2.42.0
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -31,7 +30,7 @@ USES+=		gettext gmake iconv:wchar_t libtool pathfix perl5 \
 USE_PYTHON=	py3kplist
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-man --without-xml-catalog \
-		--enable-static \
+		--enable-static=yes \
 		--with-pcre=system \
 		--disable-fam
 CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=
@@ -39,13 +38,20 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-SHEBANG_FILES=	*/*.pl glib/gen-iswide-table.py
+SHEBANG_FILES=	*/*.pl
 
-LIBVERSION=	0.3600.3
+LIBVERSION=	0.4200.0
 PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
-OPTIONS_DEFINE=	COLLATION_FIX DEBUG
+glib_MAN=	gtester.1 gtester-report.1 glib-gettextize.1
+gio_MAN=	gdbus.1 gsettings.1 gio-querymodules.1 \
+		glib-compile-schemas.1 gapplication.1 \
+		glib-compile-resources.1 gresource.1 gdbus-codegen.1
+gobject_MAN=	glib-genmarshal.1 glib-mkenums.1 gobject-query.1
+
+OPTIONS_DEFINE=	COLLATION_FIX DEBUG GDB
 COLLATION_FIX_DESC=	fix string collation
+GDB_DESC=	Install python gdb scripts
 
 .include <bsd.port.pre.mk>
 
@@ -87,11 +93,17 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
 #CONFIGURE_ENV+=	CFLAGS="-D__STDC_ISO_10646__"
 .endif
 
+.if ${PORT_OPTIONS:MGDB}
+PLIST_SUB+=	GDB=""
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-glib_gdbscripts \
+		${FILESDIR}/extra-gobject_gdbscripts
+PLIST_SUB+=	GDB="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug=yes \
 			--disable-silent-rules
-.else
-CONFIGURE_ARGS+=	--disable-modular-tests
 .endif
 
 post-patch:
@@ -107,6 +119,11 @@ post-patch:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gio/modules
+.for m in glib gio gobject
+	${INSTALL_MAN} ${${m}_MAN:S|^|${WRKSRC}/docs/reference/${m}/|} \
+		${STAGEDIR}${PREFIX}/man/man1
+.endfor
 
 .include <bsd.port.post.mk>
 
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index f464fe5b679e..720249fcdc14 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.36.3.tar.xz) = 5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e
-SIZE (gnome2/glib-2.36.3.tar.xz) = 6626972
+SHA256 (gnome2/glib-2.42.0.tar.xz) = 94fbc0a7d10633433ff383e540607de649c1b46baaa59dea446a50977a6c4472
+SIZE (gnome2/glib-2.42.0.tar.xz) = 7062896
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/extra-glib_gdbscripts
index 30d6f1be8f8e..bdde1c66ce04 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/extra-glib_gdbscripts
@@ -1,31 +1,20 @@
---- 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 = 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
-@@ -1617,7 +1617,7 @@
+--- glib/Makefile.in.orig	2014-03-09 10:06:29.765325337 +0000
++++ glib/Makefile.in	2014-03-09 10:06:46.935323979 +0000
+@@ -2834,7 +2834,7 @@
  info-am:
  
  install-data-am: install-data-local install-deprecatedincludeHEADERS \
 -	install-dist_gdbSCRIPTS install-glibincludeHEADERS \
 +	install-glibincludeHEADERS \
- 	install-glibsubincludeHEADERS install-tapsetDATA
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1906,9 +1906,7 @@
- libglib-gdb.py: libglib-gdb.py.in
+ 	install-glibsubincludeHEADERS \
+ 	install-installed_testLTLIBRARIES \
+ 	install-installed_testPROGRAMS install-installed_testSCRIPTS \
+@@ -3084,8 +3084,6 @@
  	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
  
--install-data-hook: libglib-gdb.py
+ install-data-hook: libglib-gdb.py
 -	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
 -	$(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)
  @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/extra-gobject_gdbscripts
index 9283cabe8bcd..8501b6f612e7 100644
--- a/devel/glib20/files/patch-gobject_Makefile.in
+++ b/devel/glib20/files/extra-gobject_gdbscripts
@@ -1,23 +1,15 @@
---- gobject/Makefile.in.orig	2012-05-03 11:42:11.000000000 +0200
-+++ gobject/Makefile.in	2012-05-03 11:42:51.000000000 +0200
-@@ -566,6 +566,7 @@
- @OS_WIN32_AND_DLL_COMPILATION_TRUE@gobject_win32_res_ldflag = -Wl,$(gobject_win32_res)
- libgobjectincludedir = $(includedir)/glib-2.0/gobject
- libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
-+  -Wl,-z,nodelete \
-   $(gobject_win32_res_ldflag) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-   -export-dynamic $(no_undefined)
-@@ -1331,7 +1332,7 @@
+--- gobject/Makefile.in.orig	2014-03-09 10:09:41.628312066 +0000
++++ gobject/Makefile.in	2014-03-09 10:09:48.181311433 +0000
+@@ -2003,7 +2003,7 @@
  
  info-am:
  
 -install-data-am: install-data-local install-dist_gdbSCRIPTS \
 +install-data-am: install-data-local \
- 	install-libgobjectincludeHEADERS install-tapsetDATA
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1586,9 +1587,7 @@
+ 	install-installed_testLTLIBRARIES \
+ 	install-installed_testPROGRAMS install-installed_testSCRIPTS \
+ 	install-installed_test_metaDATA \
+@@ -2230,9 +2230,7 @@
  uninstall-gdb:
  	-rm -r $(DESTDIR)$(datadir)/gdb
  
diff --git a/devel/glib20/files/patch-configure b/devel/glib20/files/patch-configure
index 9396ef32ab24..9a57c07a7a2c 100644
--- a/devel/glib20/files/patch-configure
+++ b/devel/glib20/files/patch-configure
@@ -1,67 +1,16 @@
---- configure.orig	2013-08-29 23:29:13.255661322 +0200
-+++ configure	2013-08-29 23:48:08.845647995 +0200
-@@ -603,6 +603,9 @@
- #ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
- #ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
-@@ -5778,7 +5781,7 @@
- fi
- 
- GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
--ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
-+ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
- 
- 
-  if test "x$with_runtime_libdir" != "x"; then
-@@ -7444,13 +7447,12 @@
- 
-       ;;
-     native)
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
--$as_echo_n "checking for iconv_open in -liconv... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open" >&5
-+$as_echo_n "checking for iconv_open... " >&6; }
- if ${ac_cv_lib_iconv_iconv_open+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-liconv  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -8648,6 +8650,7 @@
+--- configure.orig	2014-09-28 09:31:41.079343419 +0200
++++ configure	2014-09-28 09:31:41.243342071 +0200
+@@ -26730,9 +26728,12 @@
+   *android*)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
-   native)
- 
-+ICONV_LIBS=""
- $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h
- 
-     ;;
-@@ -23201,7 +23204,7 @@
- fi
- done
- 
--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"
-@@ -26741,10 +26744,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/-lpthread/`"
      ;;
--  *-*-openbsd*)
-+  *-*-openbsd*|*-*-freebsd*)
-     LDFLAGS="$LDFLAGS -pthread"
-     ;;
++  *-*-freebsd*)
++    LDFLAGS="$LDFLAGS -pthread"
++    ;;    
    *)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
+     ;;
diff --git a/devel/glib20/files/patch-doc_reference_Makefile.in b/devel/glib20/files/patch-doc_reference_Makefile.in
deleted file mode 100644
index 3784d16b8ed2..000000000000
--- a/devel/glib20/files/patch-doc_reference_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/reference/Makefile.in.orig	2007-12-21 16:54:10.000000000 -0500
-+++ docs/reference/Makefile.in	2007-12-21 16:54:40.000000000 -0500
-@@ -268,7 +268,7 @@ GTESTER_REPORT = $(top_builddir)/glib/gt
- # initialize variables for unconditional += appending
- EXTRA_DIST = 
- TEST_PROGS = 
--SUBDIRS = glib gobject gio
-+SUBDIRS = #glib gobject gio
- all: all-recursive
- 
- .SUFFIXES:
diff --git a/devel/glib20/files/patch-docs_reference_Makefile.in b/devel/glib20/files/patch-docs_reference_Makefile.in
new file mode 100644
index 000000000000..8e3dfab92edc
--- /dev/null
+++ b/devel/glib20/files/patch-docs_reference_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/reference/Makefile.in.orig	2013-09-26 18:08:36.000000000 +0200
++++ docs/reference/Makefile.in	2013-09-26 18:08:53.000000000 +0200
+@@ -422,7 +422,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = glib gobject gio
++SUBDIRS = #glib gobject gio
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/devel/glib20/files/patch-gio_fam_Makefile.in b/devel/glib20/files/patch-gio_fam_Makefile.in
deleted file mode 100644
index 033ff3f5dcda..000000000000
--- a/devel/glib20/files/patch-gio_fam_Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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_gunixmount.c b/devel/glib20/files/patch-gio_gunixmount.c
index e0b3caa374e2..3e4df930ac00 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	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             *
+--- gio/gunixmount.c.orig	2014-09-21 13:00:08.875162804 +0200
++++ gio/gunixmount.c	2014-09-21 13:00:14.327163623 +0200
+@@ -353,12 +353,17 @@
                      gpointer             user_data)
  {
    GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
@@ -12,9 +12,8 @@
    else
      argv[1] = unix_mount->device_path;
 +#else
-+  char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
-+
-+  argv[2] = unix_mount->device_path;
++   char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
++   argv[2] = unix_mount->device_path;
 +#endif
  
    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 debd8a9267db..f73b3af2a941 100644
--- a/devel/glib20/files/patch-gio_gunixmounts.c
+++ b/devel/glib20/files/patch-gio_gunixmounts.c
@@ -1,87 +1,16 @@
---- gio/gunixmounts.c.orig	2013-06-09 18:03:17.000000000 -0400
-+++ gio/gunixmounts.c	2013-12-14 11:45:36.749181267 -0500
-@@ -155,6 +155,9 @@ struct _GUnixMountMonitor {
+--- gio/gunixmounts.c.orig	2014-09-22 15:42:12.000000000 +0200
++++ gio/gunixmounts.c	2014-09-28 10:03:52.141514611 +0200
+@@ -150,6 +150,7 @@
    GFileMonitor *fstab_monitor;
    GFileMonitor *mtab_monitor;
  
 +  guint mount_poller_source;
-+  GList *mount_poller_mounts;
-+
-   GSource *proc_mounts_watch_source;
- };
- 
-@@ -167,6 +170,8 @@ static GUnixMountMonitor *the_mount_moni
- static GList *_g_get_unix_mounts (void);
- static GList *_g_get_unix_mount_points (void);
- 
-+static guint64 mount_poller_time = 0;
-+
- G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
- 
- #define MOUNT_POLL_INTERVAL 4000
-@@ -193,6 +198,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
- #endif
+   GList *mount_poller_mounts;
  
- #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>
-@@ -243,22 +249,29 @@ g_unix_is_mount_path_system_internal (co
-     "/",              /* we already have "Filesystem root" in Nautilus */ 
-     "/bin",
-     "/boot",
-+    "/compat/linux/proc",
-+    "/compat/linux/sys",
-     "/dev",
-     "/etc",
-     "/home",
-     "/lib",
-     "/lib64",
-+    "/libexec",
-     "/live/cow",
-     "/live/image",
-     "/media",
-     "/mnt",
-     "/opt",
-+    "/rescue",
-     "/root",
-     "/sbin",
-     "/srv",
-     "/tmp",
-     "/usr",
-     "/usr/local",
-+    "/usr/obj",
-+    "/usr/ports",
-+    "/usr/src",
-     "/var",
-     "/var/crash",
-     "/var/local",
-@@ -299,8 +312,10 @@ guess_system_internal (const char *mount
-     "devfs",
-     "devpts",
-     "ecryptfs",
-+    "fdescfs",
-     "kernfs",
-     "linprocfs",
-+    "nullfs",
-     "proc",
-     "procfs",
-     "ptyfs",
-@@ -1126,6 +1141,10 @@ get_mounts_timestamp (void)
-       if (stat (monitor_file, &buf) == 0)
- 	return (guint64)buf.st_mtime;
-     }
-+  else
-+    {
-+      return mount_poller_time;
-+    }
-   return 0;
- }
+   GSource *proc_mounts_watch_source;
+@@ -1293,6 +1294,13 @@
  
-@@ -1271,6 +1290,13 @@ g_unix_mount_monitor_finalize (GObject *
-       g_object_unref (monitor->mtab_monitor);
-     }
+   g_list_free_full (monitor->mount_poller_mounts, (GDestroyNotify)g_unix_mount_free);
  
 +  if (monitor->mount_poller_source > 0)
 +    {
@@ -93,69 +22,3 @@
    the_mount_monitor = NULL;
  
    G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
-@@ -1352,6 +1378,52 @@ mtab_file_changed (GFileMonitor      *mo
- }
- 
- static gboolean
-+mount_change_poller (gpointer user_data)
-+{
-+  GUnixMountMonitor *mount_monitor;
-+  GList *current_mounts;
-+  gboolean has_changed = FALSE;
-+
-+  mount_monitor = user_data;
-+  current_mounts = _g_get_unix_mounts ();
-+
-+  if (g_list_length (current_mounts) != g_list_length (mount_monitor->mount_poller_mounts))
-+    {
-+      g_list_foreach (mount_monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL);
-+      has_changed = TRUE;
-+    }
-+  else
-+    {
-+      int i;
-+
-+      for (i = 0; i < g_list_length (current_mounts); i++)
-+        {
-+          GUnixMountEntry *m1;
-+         GUnixMountEntry *m2;
-+
-+         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_list_free (mount_monitor->mount_poller_mounts);
-+  mount_monitor->mount_poller_mounts = current_mounts;
-+
-+  if (has_changed)
-+    {
-+      mount_poller_time = (guint64)time (NULL);
-+      g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
-+    }
-+
-+  return TRUE;
-+}
-+
-+
-+static gboolean
- proc_mounts_changed (GIOChannel   *channel,
-                      GIOCondition  cond,
-                      gpointer      user_data)
-@@ -1416,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon
-           g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
-         }
-     }
-+  else
-+    {
-+      monitor->mount_poller_mounts = _g_get_unix_mounts ();
-+      mount_poller_time = (guint64)time (NULL);
-+      monitor->mount_poller_source = g_timeout_add_seconds (3, (GSourceFunc)mount_change_poller, monitor);
-+    }
- }
- 
- /**
diff --git a/devel/glib20/files/patch-gio_gunixvolume.c b/devel/glib20/files/patch-gio_gunixvolume.c
index b22563047d84..21316e02f55f 100644
--- a/devel/glib20/files/patch-gio_gunixvolume.c
+++ b/devel/glib20/files/patch-gio_gunixvolume.c
@@ -1,14 +1,14 @@
---- gio/gunixvolume.c.orig	2009-11-30 04:35:27.000000000 +0100
-+++ gio/gunixvolume.c	2009-12-08 19:32:03.000000000 +0100
-@@ -465,9 +465,14 @@ g_unix_volume_eject (GVolume            
+--- gio/gunixvolume.c.orig	2014-03-20 04:50:45.000000000 +0100
++++ gio/gunixvolume.c	2014-03-24 20:44:40.000000000 +0100
+@@ -356,9 +356,14 @@
                       gpointer             user_data)
  {
    GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
 +#ifdef __FreeBSD__
-+  char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
++  const gchar *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
 +  argv[2] = unix_volume->device_path;
 +#else
-   char *argv[] = { "eject", NULL, NULL };
+   const gchar *argv[] = { "eject", NULL, NULL };
  
    argv[1] = unix_volume->device_path;
 +#endif
diff --git a/devel/glib20/files/patch-gio_tests_gdbus-peer.c b/devel/glib20/files/patch-gio_tests_gdbus-peer.c
deleted file mode 100644
index 1ab76dc8c704..000000000000
--- a/devel/glib20/files/patch-gio_tests_gdbus-peer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gio/tests/gdbus-peer.c.orig	2010-08-16 21:30:03.000000000 +0200
-+++ gio/tests/gdbus-peer.c	2010-08-16 23:13:32.000000000 +0200
-@@ -42,6 +42,8 @@
- #include <sys/socket.h>
- #endif
- 
-+#include <sys/socket.h>
-+
- /* used in test_overflow */
- #ifdef G_OS_UNIX
- #include <gio/gunixconnection.h>
diff --git a/devel/glib20/files/patch-glib-2.0.pc.in b/devel/glib20/files/patch-glib-2.0.pc.in
deleted file mode 100644
index 9bd74ad4394e..000000000000
--- a/devel/glib20/files/patch-glib-2.0.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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: @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_deprecated_gthread.h b/devel/glib20/files/patch-glib_deprecated_gthread.h
deleted file mode 100644
index 889976f1fca9..000000000000
--- a/devel/glib20/files/patch-glib_deprecated_gthread.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./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_gmain.c b/devel/glib20/files/patch-glib_gmain.c
deleted file mode 100644
index 0a618a07571a..000000000000
--- a/devel/glib20/files/patch-glib_gmain.c
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0513c855cba69b96e4c9d2200719249a8a0c586e Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Wed, 10 Apr 2013 11:39:12 -0400
-Subject: [PATCH] gmain: fix double-unlock in g_main_context_unref()
-
-When unreffing a context with sources still attached, it would end up
-unlocking an already-unlocked context, causing crashes on platforms
-that (unlike Linux) actually check for that.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=697595
----
- glib/gmain.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/glib/gmain.c b/glib/gmain.c
-index 68a7f8e..d6037ba 100644
---- glib/gmain.c
-+++ glib/gmain.c
-@@ -520,12 +520,16 @@ g_main_context_unref (GMainContext *context)
-   main_context_list = g_slist_remove (main_context_list, context);
-   G_UNLOCK (main_context_list);
- 
-+  /* g_source_iter_next() assumes the context is locked. */
-+  LOCK_CONTEXT (context);
-   g_source_iter_init (&iter, context, TRUE);
-   while (g_source_iter_next (&iter, &source))
-     {
-       source->context = NULL;
--      g_source_destroy_internal (source, context, FALSE);
-+      g_source_destroy_internal (source, context, TRUE);
-     }
-+  UNLOCK_CONTEXT (context);
-+
-   for (sl_iter = context->source_lists; sl_iter; sl_iter = sl_iter->next)
-     {
-       list = sl_iter->data;
--- 
-1.8.1.4
diff --git a/devel/glib20/files/patch-glib_gthread-posix.c b/devel/glib20/files/patch-glib_gthread-posix.c
index f19007f8c636..3334a19ba25a 100644
--- a/devel/glib20/files/patch-glib_gthread-posix.c
+++ b/devel/glib20/files/patch-glib_gthread-posix.c
@@ -1,15 +1,15 @@
---- 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 @@
+--- glib/gthread-posix.c.orig	2014-09-22 15:42:12.000000000 +0200
++++ glib/gthread-posix.c	2014-09-28 09:46:56.659280343 +0200
+@@ -98,7 +98,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 @@
+   pthread_mutexattr_init (&attr);
+   pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
+   pattr = &attr;
+@@ -107,7 +107,7 @@
    if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0)
      g_thread_abort (status, "pthread_mutex_init");
  
diff --git a/devel/glib20/files/patch-glib__libcharset__Makefile.in b/devel/glib20/files/patch-glib_libcharset_Makefile.in
index b3589ad592c5..b3589ad592c5 100644
--- a/devel/glib20/files/patch-glib__libcharset__Makefile.in
+++ b/devel/glib20/files/patch-glib_libcharset_Makefile.in
diff --git a/devel/glib20/files/patch-glib_tests_gdatetime.c b/devel/glib20/files/patch-glib_tests_gdatetime.c
index e86fb7ffde09..3904e106a0ca 100644
--- a/devel/glib20/files/patch-glib_tests_gdatetime.c
+++ b/devel/glib20/files/patch-glib_tests_gdatetime.c
@@ -1,20 +1,20 @@
---- glib/tests/gdatetime.c.orig	2013-03-13 13:39:09.000000000 +0000
-+++ glib/tests/gdatetime.c	2013-03-28 10:15:49.000000000 +0000
-@@ -1276,7 +1276,7 @@
+--- glib/tests/gdatetime.c.orig	2014-03-09 10:29:13.925231275 +0000
++++ glib/tests/gdatetime.c	2014-03-09 10:30:18.235227107 +0000
+@@ -1322,7 +1322,7 @@
    gint i1, i2;
  
  #ifdef G_OS_UNIX
--  tz = g_time_zone_new ("Canada/Eastern");
-+  tz = g_time_zone_new ("America/Montreal");
+-  tz = g_time_zone_new ("America/Toronto");
++  tz = g_time_zone_new ("America/Toronto Eastern");
  #elif defined G_OS_WIN32
    tz = g_time_zone_new ("Eastern Standard Time");
  #endif
-@@ -1309,7 +1309,7 @@
+@@ -1355,7 +1355,7 @@
    gint i1, i2;
  
  #ifdef G_OS_UNIX
--  tz = g_time_zone_new ("Canada/Eastern");
-+  tz = g_time_zone_new ("America/Montreal");
+-  tz = g_time_zone_new ("America/Toronto");
++  tz = g_time_zone_new ("America/Toronto Eastern");
  #elif defined G_OS_WIN32
    tz = g_time_zone_new ("Eastern Standard Time");
  #endif
diff --git a/devel/glib20/files/patch-gmodule__gmodule-dl.c b/devel/glib20/files/patch-gmodule_gmodule-dl.c
index 586d7f80bd62..586d7f80bd62 100644
--- a/devel/glib20/files/patch-gmodule__gmodule-dl.c
+++ b/devel/glib20/files/patch-gmodule_gmodule-dl.c
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index e9016c103563..cbfc71914d10 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,3 +1,4 @@
+bin/gapplication
 bin/gdbus
 bin/gdbus-codegen
 bin/gio-querymodules
@@ -35,6 +36,7 @@ include/glib-2.0/gio/gasyncinitable.h
 include/glib-2.0/gio/gasyncresult.h
 include/glib-2.0/gio/gbufferedinputstream.h
 include/glib-2.0/gio/gbufferedoutputstream.h
+include/glib-2.0/gio/gbytesicon.h
 include/glib-2.0/gio/gcancellable.h
 include/glib-2.0/gio/gcharsetconverter.h
 include/glib-2.0/gio/gcontenttype.h
@@ -108,11 +110,13 @@ include/glib-2.0/gio/gnetworkaddress.h
 include/glib-2.0/gio/gnetworking.h
 include/glib-2.0/gio/gnetworkmonitor.h
 include/glib-2.0/gio/gnetworkservice.h
+include/glib-2.0/gio/gnotification.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/gpropertyaction.h
 include/glib-2.0/gio/gproxy.h
 include/glib-2.0/gio/gproxyaddress.h
 include/glib-2.0/gio/gproxyaddressenumerator.h
@@ -139,6 +143,8 @@ include/glib-2.0/gio/gsocketcontrolmessage.h
 include/glib-2.0/gio/gsocketlistener.h
 include/glib-2.0/gio/gsocketservice.h
 include/glib-2.0/gio/gsrvtarget.h
+include/glib-2.0/gio/gsubprocess.h
+include/glib-2.0/gio/gsubprocesslauncher.h
 include/glib-2.0/gio/gtask.h
 include/glib-2.0/gio/gtcpconnection.h
 include/glib-2.0/gio/gtcpwrapperconnection.h
@@ -240,7 +246,6 @@ 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
 include/glib-2.0/gobject/gbinding.h
 include/glib-2.0/gobject/gboxed.h
@@ -261,6 +266,7 @@ 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/glib-2.0/include/glibconfig.h
 lib/libgio-2.0.a
 lib/libgio-2.0.so
 lib/libgio-2.0.so.0
@@ -289,9 +295,26 @@ libdata/pkgconfig/gmodule-export-2.0.pc
 libdata/pkgconfig/gmodule-no-export-2.0.pc
 libdata/pkgconfig/gobject-2.0.pc
 libdata/pkgconfig/gthread-2.0.pc
+man/man1/gapplication.1.gz
+man/man1/gdbus-codegen.1.gz
+man/man1/gdbus.1.gz
+man/man1/gio-querymodules.1.gz
+man/man1/glib-compile-resources.1.gz
+man/man1/glib-compile-schemas.1.gz
+man/man1/glib-genmarshal.1.gz
+man/man1/glib-gettextize.1.gz
+man/man1/glib-mkenums.1.gz
+man/man1/gobject-query.1.gz
+man/man1/gresource.1.gz
+man/man1/gsettings.1.gz
+man/man1/gtester-report.1.gz
+man/man1/gtester.1.gz
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
+share/bash-completion/completions/gapplication
+%%GDB%%share/gdb/auto-load/libglib-2.0.so.%%LIBVERSION%%-gdb.py
+%%GDB%%share/gdb/auto-load/libgobject-2.0.so.%%LIBVERSION%%-gdb.py
 share/glib-2.0/codegen/__init__.py
 share/glib-2.0/codegen/__init__.pyc
 share/glib-2.0/codegen/__init__.pyo
@@ -316,10 +339,13 @@ share/glib-2.0/codegen/parser.pyo
 share/glib-2.0/codegen/utils.py
 share/glib-2.0/codegen/utils.pyc
 share/glib-2.0/codegen/utils.pyo
+%%GDB%%share/glib-2.0/gdb/glib.py
+%%GDB%%share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/po/Makefile.in.in
 share/glib-2.0/schemas/gschema.dtd
 share/locale/af/LC_MESSAGES/glib20.mo
 share/locale/am/LC_MESSAGES/glib20.mo
+share/locale/an/LC_MESSAGES/glib20.mo
 share/locale/ar/LC_MESSAGES/glib20.mo
 share/locale/as/LC_MESSAGES/glib20.mo
 share/locale/ast/LC_MESSAGES/glib20.mo
@@ -413,80 +439,7 @@ 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
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/yi/LC_MESSAGES
-@dirrmtry share/locale/yi
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/tt/LC_MESSAGES
-@dirrmtry share/locale/tt
-@dirrmtry share/locale/tl/LC_MESSAGES
-@dirrmtry share/locale/tl
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@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/codegen
-@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
+@dir lib/gio/modules
+@dir share/GConf/gsettings
+@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas 2>/dev/null || /usr/bin/true
 @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
-@dirrmtry lib/gio/modules
-@dirrmtry lib/gio
-@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