Update glib2 to 2.38.2

Patches removed:
- patch-ce:                      fixed in 690d6b97 (Bug 697386)
- patch-gio_gcontenttype.c:      committed as ab5aa2aa
- patch-gio_glocalfile.c:        fixed in 584358 (Bug 698348)
- patch-gio_gthreadedresolver.c: fixed in 8372f22b
- patch-glib_gfileutils.c:       fixed in 8372f22b
- patch-glib_gmarkup.c: :        fixed in 8372f22b
- patch-glib_gstrfuncs.c:        fixed in 8372f22b

Patches changed:
- patch-aa: last 3 hunks removed as committed as 996edb0 (Bug 706958)
- patch-ah: last 2 hunks removed as something similar in 8372f2
- patch-ak: last 3 hunks removed as committed as 996edb0 (Bug 706958)
- patch-ba: hunk 9 removed as committed as d47430 (Bug 697365)


Overview of changes from GLib 2.38.1 to 2.38.2
===============================================

 * GCancellableSource will now dispatch for each time a cancellable is
   cancelled (ie: in the case that it was reset) but this is still
   considered undefined behaviour

 * fix g_source_add_child_source() thread safety issues

 * add workaround for buggy D-Bus daemons when path-matching on '/'

 * fallback to pathname queryinfo to help g_file_copy() work on gvfs
   filesystems that don't implement query_info_on_read()

 * don't crash if loading a DBusActivatable application from keyfile

 * fix crash when replacing a symlink with another using GIO

 * add a fallback for '-symbolic' icons to the non-symbolic form

Overview of changes from GLib 2.38.0 to 2.38.1
===============================================

 * Fix error code checks when SOCK_CLOEXEC is defined but not supported
   (fix support for GNU/Hurd)

 * g_settings_list_children: only list viable schemas
   (fix gsettings list-recursively crashes with invalid schemas installed)

 * GDBusObjectManagerClient: Fix typo in the /org/freedesktop/DBus path
   when adding match rules

 * Various -Werror=format-nonliteral fixes

 * gmessages: fix clang annotations to work with older versions

 * gio: don't dist (generated file) gnetworking.h

 * Restore gl_GLIBC21 to configure; needed for libcharset

Translations:
 Catalan (Valencian)
 Norwegian bokmål
 Russian
 Serbian

What's new in Glib 2.38
========================

 * Application support

  - GIO now provides an implementation of Desktop Actions from the
    desktop entry specification

  - GApplication now implements the org.freedesktop.Application
    interface as per the desktop entry specification, allowing for
    standards-based D-Bus launching of GLib-based applications

  - GDesktopAppInfo now supports DBusActivatable as per the desktop
    entry specification, allowing GLib-based applications to use D-Bus
    to launch other applications

  - GApplication now has a "busy" flag that can be set on an application
    to allow the shell to show that it is busy

 * GObject

  - the private offset for a given class type is now always constant.
    This was done by reorganising the memory layout of instances so that
    the private data comes before the "official" pointer for the object
    (ie: at a negative offset).  Valgrind macros were added to mitigate
    any problems that this may have caused.

  - a new G_DEFINE_TYPE_WITH_PRIVATE has been added along with a
    generated function *_get_instance_private() that can now serve as an
    equally-performing alternative to ->priv pointers in instances
    (allowing memory savings)

  - new G_PRIVATE_FIELD, G_PRIVATE_FIELD_P and G_PRIVATE_OFFSET macros
    provide a convenient method of converting between named variables in
    private structures and their (now constant) offsets

  - installing properties on a GObjectClass must now be done from
    class_init.  It is no longer valid to install them after class_init
    has returned.

  - it is now possible to manually break a GObject property binding
    without destroying one of the objects involved

 * Icons

  - the requirements for implementing the GIcon interface have changed
    in order to make it possible to consume all implementations of GIcon
    with a finite number of cases

  - a new GBytesIcon type was added for an icon represented by an
    in-memory binary blob in a known image format (ideally png).

  - new APIs g_icon_serialize() and g_icon_deserialize() replace the old
    to/from_string APIs and will always work, irrespective of which
    types have been initialised in the calling process, allowing for a
    serialised GdkPixbuf to be deserialised in a process that doesn't
    have GdkPixbuf

  - support for icons has been added to GMenuModel using the new APIs

 * Actions and menus

  - GPropertyAction provides a convenient way of creating a stateful
    property corresponding to a property on a GObject, such as the
    "visible-child-name" property of a GtkStack

  - new API g_menu_remove_all()

  - we now have established rules about what is a "valid" action name
    and an API to check them

  - a new API for converting detailed action names to and from the
    split-out name and parameter value (as GVariant)

  - for backwards compatibility, invalid action names can still be used
    with most functions, but this is not recommended

 * Other GIO

  - GDBus now supports services that wish to handle some of all
    properties on an interface asynchronously, without requiring the
    service to reimplement the entire org.freedesktop.DBus.Properties
    interface

  - GFile now has a new _measure_disk_usage() (and async) API for
    recursively determining the amount of disk space used by a
    particular directory (akin to 'du').

  - asynchronous version of g_file_trash() and g_file_make_directory()
    have been added

 * Other new API

  - GRegex has a new function to query the maximum lookbehind length to
    allow for regexp matching on streams

  - GVariant has two new APIs for constructing strings that allow
    avoiding copies in some cases: g_variant_new_take_string() and
    g_variant_new_printf()

 * Testing

  - we can now generate TAP output

  - new support functions for simplifying the process of dealing with
    data files for srcdir != builddir and installed test cases

  - g_test_trap_subprocess() provides a portable alternative to
    g_test_trap_fork()

 * Other

  - GLib now builds on Android against the bionic C library

Overview of changes from GLib 2.37.93 to 2.38.0
================================================

* fix the documentation for GSourceFuncs

* fix compilation on OS X/ppc64

Bugs fixed: 708445, 647145

Translations updated:
 Danish
 French
 Portuguese
 Punjabi

Overview of changes from GLib 2.37.92 to 2.37.93
================================================

* a couple of bugfixes in the new g_file_measure_disk_usage() API

* updated Traditional Chinese translation

Overview of changes from GLib 2.37.7 to 2.37.92
===============================================

* new API g_file_measure_disk_usage() similar to du(1)

* minor fixes

* Translation updates:
 Assamese
 Belarusian
 Brazilian Portuguese
 Catalan
 Czech
 Galician
 German
 Hungarian
 Indonesian
 Italian
 Korean
 Korean
 Latvian
 Lithuanian
 Polish
 Serbian
 Slovenian
 Spanish

Overview of changes from GLib 2.37.6 to 2.37.7
==============================================

* GDateTime now supports %:z formatting variations
  for timezones. This is a GNU date extension.

* Bugs fixed:
 685387 Segfault with GObject.signal_handler_is_connected()...
 686786 g_socket_get_available_bytes() returns wrong value ...
 705027 GSocket GSource not threadsafe on Windows
 706469 Fix G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE documentation
 706706 Fix Gir annotations on g_loadable_icon_load_finish
 706888 gtype: fix a no-op assertion
 706958 configure.ac: fix atomic opts detection
 707092 "File Utilities" page for GLib documentation doesn'...
 707151 gdatetime: Extend the '%z' timezone format

* Translation updates:
 Catalan
 Hungarian
 Japanese
 Polish
 Slovak
 Tamil


Overview of changes from GLib 2.37.5 to 2.37.6
==============================================

* Tests using the g_test facilities can now generate TAP output

* Bugs fixed:
 680926 generic type fallback logic is broken for -symbolic
 684327 setting null icon to icon list
 689245 GSocket unable to reuse (address,port) on Mac OS X
 692125 Support TAP as GTest output format
 693335 build: fix dtrace-related warnings
 696633 gdbus-codegen trips over unicode chars when using python 3.x
 696970 Compiling 2.36.0 for win64 fails
 697185 GSocket – Allow specifying the multicast interface from...
 700268 Add support for using the clang analyzer
 701318 Add G_SPAWN_DEFAULT to GSpawnFlags
 701529 glib/tests/gdatetime: use UTC time in test_GDateTime_diff()
 701800 a new approach to reporting critical errors
 702674 g_date_time_new_utc crash
 704165 GLib.IOChannel read_unichar() fails
 705075 Simplify g_get_tmp_dir()
 705152 Race in glib/task.test
 705398 gtype: Fix typo in g_type_class_add_private() error message
 705570 Check ref_count in g_object_notify_by_pspec
 705600 Deprecate GSimpleActionGroup functions?

* Updated translations:
 Assamese
 Brazilian Portuguese
 Czech
 Dutch
 Galician
 Gujarati
 Hebrew
 Italian
 Lithuanian
 Marathi
 Norwegian bokmål
 Russian
 Slovenian
 Spanish
 Thai
 Traditional Chinese


Overview of changes from GLib 2.37.4 to 2.37.5
==============================================

* Implement the Desktop Action specification: In the case that the
  application is a GApplication and DBusActivatable, actions from the
  desktop file are translated into GActions that have been added to
  the  application with g_action_map_add_action().

* GPropertyAction is a new type of GAction that represents the value
  of a property on an object, and allows to change the value when
  activated.

* GNetworkMonitorNetlink can now handle default routes via a device.

* The gsettings tool now reports failure to write a key (e.g. because
  the key was locked down)

* Miscellaneous new api:
 - g_variant_new_printf
 - g_action_print_detailed_name
 - g_regex_get_max_lookbehind

* Bugs fixed:
 664444 Support additional application actions in .desktop files
 684123 glib build only tries -D_GNU_SOURCE if glibc is detected
 689794 support incremental matching
 699259 add org.freedesktop.Application support to GIO
 700460 rewrite tests to not rely on precise timing of timeouts
 701511 updates to various GSource types
 701609 gnetworkmonitornetlink: handle default route via device
 703270 add GPropertyAction
 704157 GAction: add function for printing detailed names
 704250 Doc: various fixes
 704267 regression gsourceclosure: segfault in gedit file chooser
 704322 glib-unix: fix handling of multiple signal source for the...
 704424 No error when failing to override a locked key
 704447 Fix build/use of g_child_watch_closure_callback on Windows
 704523 g_thread_create_full() can dereference NULL pointer
 704543 Add implementations for G_GNUC_*_IGNORE_DEPRECATIONS for ...
 704567 gdbusnameowning: Don't spew an error if we're releasing a...
 704585 libc printf can give mixed-case strings for NaN and Inf
 704587 FTBFS: statfs_result is undeclared for statvfs()
 704699 gmain: Reset signal handlers to default when source is
 704704 AI_NUMERICSERV cannot be used with ai_socktype = 0
 704873 inotify: don't assume mainloop is running
 704999 glib/convert.test crashing due to lack of iconv cache
 704931 GMenuModel: add annotations to virtual functions

* Translation updates:
 Assamese
 Czech
 German
 Gujarati
 Spanish
 Tamil


Overview of changes from GLib 2.37.3 to 2.37.4
==============================================

* Bugs fixed:
 701283 g_source_add_child_source() segfault
 702147 inconsistency of G_STRFUNC
 703191 new private macros interact poorly with versioning macros
 703254 Doc: various fixes
 703407 g_spawn_async() keeps child_pid_report_pipe open in child process
 703437 GDBusConnection: be more careful with async GetAll
 703478 Missing G_BEGIN/END_DECLS in gsettingsschema.h

* Translation updates:
 Catalan

Overview of changes from GLib 2.37.2 to 2.37.3
==============================================

* add a new API for instance private data: G_DEFINE_TYPE_WITH_PRIVATE

* fix timestamps in tarball to prevent automake from being required to
  build the unmodified source

* add new D-Bus API for async property handling

* add back fsync() on ext4 for g_file_set_contents() after it was
  discovered that despite statements in the ext4 documentation
  suggesting that this is safe, it is not safe.

* Translations:
 Italian
 Norwegian bokmål

* Bugs fixed:
 698375 - D-Bus async properties
 700350 - timestamp issue
 701560 - fsync issue (fixed again)
 700035 - new API for instance private data

Overview of changes from GLib 2.37.1 to 2.37.2
==============================================

* The GLib test utilities have grown some file-related APIs
  to support tests that can be used installed and uninstalled.

* Installing properties after class initialization is deprecated,
  and will trigger a warning.

* GApplication:
 - Support org.freedesktop.Application, including D-Bus activation
   from desktop files
 - Set prgname to appid for services

* Bugs fixed:
 549783 gtester lacks framework for tests with data files
 692848 Fix property example in gobject tutorial
 698018 Add an explicit g_binding_release()
 698614 GObject: prevent installing properties after init
 699259 add org.freedesktop.Application support to GIO
 699959 g_file_copy(): Ensure we create private files by default
 700123 Test failure: g_inet_socket_address_get_scope_id
 700725 GIcon: NULLify the `type' out param in the sync methods too
 701401 gtest: add function for testing for WINE
 701456 Error in gnome/glib/gio/tests/file.c
 701474 Error building glibmm due to extra comma in glib/gtestutils.h
 701560 various improvements for g_file_set_contents()
 701680 GFileEnumerator: Add some documentation about ordering
 701878 Check wakeup() before iteration(TRUE) doesn't block

* Translations:
 Assamese
 Czech
 Galician
 Gujarati
 Kannada
 Marathi
 Odia
 Polish
 Slovenian
 Spanish
 Telugu


Overview of changes from GLib 2.37.0 to 2.37.1
==============================================

 * add support for installed tests:
   https://live.gnome.org/GnomeGoals/InstalledTests

 * add a new g_test_trap_subprocess() that works on Windows as a
   replacement for the (now deprecated) g_test_trap_fork()

 * support for explicitly cancelling a gobject property binding

 * performance improvements for signal argument handling

 * stop using `quotes' in very many log messages generated by GLib, for
   favour of 'this style'.  This may cause testcases in other packages
   to fail if they were matching on the previous text.

 * improve manpages: add missing arguments and flags

Translations:
 Aragonese
 Assamese
 Gujarati
 Hindi
 Kannada
 Norwegian bokmål
 Odia
 Slovenian
 Spanish
 Tamil
 Telugu

Bugs fixed:
 679683 replace g_test_trap_fork()
 694380 Improve signal argument collection performance
 695233 Strings require plural forms
 697849 spelling fixes in cross.xml and running.xml
 698877 GProxyAddressEnumerator calls g_network_address_parse_uri without port
 698981 [PATCH] test /gdbus/connection/large_message could hang forever
 699079 Prototype support for installed tests
 699485 [PATCH] tests/mappedfile: Also handle ENOMEM
 699493 SOCKS5 proxy code crashes if it cannot authenticate
 699500 gbitlock: fix this to not unconditionally use futex emulation
 699779 [PATCH] G_GNUC_FORMAT: documentation error
 700263 m4macros/glib-gettext.m4: Don't use AC_HEADER_STDC
 700714 [PATCH] gtestutils: Ensure test subprocesses don't dump core
 700746 Use 'dumb quotes' rather than `really dumb quotes'

24 files changed, 149 insertions, 377 deletions

diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 0674903fbe6..f187a441e20 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2013/09/19 11:45:22 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.34 2013/12/08 13:08:59 prlw1 Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
@@ -6,7 +6,7 @@
 
 # When updating this package, please apply patch-ak to configure.in and
 # then run a matching version of autoconf to regen patch-aa.
-DISTNAME=	glib-2.36.4
+DISTNAME=	glib-2.38.2
 PKGNAME=	${DISTNAME:S/glib/glib2/}
 CATEGORIES=	# empty; redefined in Makefile
 MASTER_SITES=	ftp://ftp.gtk.org/pub/glib/${PKGVERSION_NOREV:R}/ \
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 7858f593515..9105184ecaf 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.77 2013/08/17 11:52:36 richard Exp $
+@comment $NetBSD: PLIST,v 1.78 2013/12/08 13:08:59 prlw1 Exp $
 bin/gdbus
 bin/gio-querymodules
 bin/glib-compile-resources
@@ -32,6 +32,7 @@ include/glib/glib-2.0/gio/gasyncinitable.h
 include/glib/glib-2.0/gio/gasyncresult.h
 include/glib/glib-2.0/gio/gbufferedinputstream.h
 include/glib/glib-2.0/gio/gbufferedoutputstream.h
+include/glib/glib-2.0/gio/gbytesicon.h
 include/glib/glib-2.0/gio/gcancellable.h
 include/glib/glib-2.0/gio/gcharsetconverter.h
 include/glib/glib-2.0/gio/gcontenttype.h
@@ -110,6 +111,7 @@ include/glib/glib-2.0/gio/gpermission.h
 include/glib/glib-2.0/gio/gpollableinputstream.h
 include/glib/glib-2.0/gio/gpollableoutputstream.h
 include/glib/glib-2.0/gio/gpollableutils.h
+include/glib/glib-2.0/gio/gpropertyaction.h
 include/glib/glib-2.0/gio/gproxy.h
 include/glib/glib-2.0/gio/gproxyaddress.h
 include/glib/glib-2.0/gio/gproxyaddressenumerator.h
@@ -274,8 +276,8 @@ lib/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load/libglib-2.0.so.0.3600.4-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.3600.4-gdb.py
+share/gdb/auto-load/libglib-2.0.so.0.3800.2-gdb.py
+share/gdb/auto-load/libgobject-2.0.so.0.3800.2-gdb.py
 share/glib-2.0/gdb/glib.py
 share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/po/Makefile.in.in
@@ -412,6 +414,7 @@ share/gtk-doc/html/gio/api-index-2-30.html
 share/gtk-doc/html/gio/api-index-2-32.html
 share/gtk-doc/html/gio/api-index-2-34.html
 share/gtk-doc/html/gio/api-index-2-36.html
+share/gtk-doc/html/gio/api-index-2-38.html
 share/gtk-doc/html/gio/api-index-deprecated.html
 share/gtk-doc/html/gio/api-index-full.html
 share/gtk-doc/html/gio/application.html
@@ -453,6 +456,7 @@ share/gtk-doc/html/gio/gio-D-Bus-Utilities.html
 share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html
 share/gtk-doc/html/gio/gio-Extension-Points.html
 share/gtk-doc/html/gio/gio-GActionGroup-exporter.html
+share/gtk-doc/html/gio/gio-GBytesIcon.html
 share/gtk-doc/html/gio/gio-GContentType.html
 share/gtk-doc/html/gio/gio-GConverterInputstream.html
 share/gtk-doc/html/gio/gio-GConverterOutputstream.html
@@ -462,6 +466,7 @@ share/gtk-doc/html/gio/gio-GIOError.html
 share/gtk-doc/html/gio/gio-GIOScheduler.html
 share/gtk-doc/html/gio/gio-GInetAddressMask.html
 share/gtk-doc/html/gio/gio-GMenuModel-exporter.html
+share/gtk-doc/html/gio/gio-GPropertyAction.html
 share/gtk-doc/html/gio/gio-GResource.html
 share/gtk-doc/html/gio/gio-GSettingsSchema-GSettingsSchemaSource.html
 share/gtk-doc/html/gio/gio-GWin32InputStream.html
@@ -523,6 +528,7 @@ share/gtk-doc/html/glib/api-index-2-30.html
 share/gtk-doc/html/glib/api-index-2-32.html
 share/gtk-doc/html/glib/api-index-2-34.html
 share/gtk-doc/html/glib/api-index-2-36.html
+share/gtk-doc/html/glib/api-index-2-38.html
 share/gtk-doc/html/glib/api-index-2-4.html
 share/gtk-doc/html/glib/api-index-2-6.html
 share/gtk-doc/html/glib/api-index-2-8.html
@@ -645,6 +651,7 @@ share/gtk-doc/html/gobject/api-index-2-30.html
 share/gtk-doc/html/gobject/api-index-2-32.html
 share/gtk-doc/html/gobject/api-index-2-34.html
 share/gtk-doc/html/gobject/api-index-2-36.html
+share/gtk-doc/html/gobject/api-index-2-38.html
 share/gtk-doc/html/gobject/api-index-2-4.html
 share/gtk-doc/html/gobject/api-index-2-6.html
 share/gtk-doc/html/gobject/api-index-2-8.html
@@ -710,6 +717,7 @@ share/gtk-doc/html/gobject/tools-vala.html
 share/gtk-doc/html/gobject/up.png
 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
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 5008383fb70..201c7dcdc9a 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,38 +1,31 @@
-$NetBSD: distinfo,v 1.194 2013/10/03 14:41:00 prlw1 Exp $
+$NetBSD: distinfo,v 1.195 2013/12/08 13:08:59 prlw1 Exp $
 
-SHA1 (glib-2.36.4.tar.xz) = ae189818c9f4ae8e404cc17c195f3e1c644fd97a
-RMD160 (glib-2.36.4.tar.xz) = b6ec32c05231fbdd7520ad077034bbda5508ecb0
-Size (glib-2.36.4.tar.xz) = 6570720 bytes
-SHA1 (patch-aa) = ae0c88420d83e40d38c9395b94c41f73f236b92e
+SHA1 (glib-2.38.2.tar.xz) = 685c5a4215b776b83dd5330ab9084c5dcb0a51b8
+RMD160 (glib-2.38.2.tar.xz) = 1dcc15ce6dac0faafaee448f393284bb038f2a76
+Size (glib-2.38.2.tar.xz) = 6718296 bytes
+SHA1 (patch-aa) = 737581b71133ecbfec0fe8b3e836a2a21b7af84b
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
-SHA1 (patch-af) = 45c46d5d01517563fde21ba1a2fdd7d0485932ca
-SHA1 (patch-ah) = 64765bc71ed7d75ff3e47f77359ecfce63c0e851
+SHA1 (patch-af) = 237b38ac1e273da51fd49e632c96901899494600
+SHA1 (patch-ah) = 2e23c228047d07769ef5b03b0ff636daa0435ee5
 SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
-SHA1 (patch-ai) = 037e2bb85fbc473c431bbf736dae89825236ff31
-SHA1 (patch-ak) = cfd91a9b120ab0f9f71deb1ff3d0006bb3b3a3c2
-SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
+SHA1 (patch-ai) = 3264cf22844f7202f1c9dc413c09c8f960de04f6
+SHA1 (patch-ak) = f5699914c2fe212316a27c64dd129ea7dde594f0
+SHA1 (patch-al) = 4eb4e241488dabe254973f5ada92898af57cd0f5
 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
-SHA1 (patch-an) = 2d4eaa904347481bec55668e56d2ac431b567bc9
+SHA1 (patch-an) = 6cfb371539dad1fb89b1c1cce03de34556f6e40b
 SHA1 (patch-ap) = 5bc134ebe768c7171f25ce356b40edeae30c5b92
 SHA1 (patch-aq) = 217a8ea4ba7dbdcc315cb16575d55b9949997b64
-SHA1 (patch-ba) = fca39248cbb9a51adc1d729fde70d4486c11e8d4
+SHA1 (patch-ba) = 2080a1240539be7d10777b79adfb3fcf4d2bd44e
 SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
 SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871
-SHA1 (patch-cd) = 312e2f322b295ddec613f9ce9760ecafeab69047
-SHA1 (patch-ce) = dc2aa070a3bc0003fce495a5fdaced35d49054e8
-SHA1 (patch-cj) = 6e5fa171080b45372af9c95ab0abfde5e90fdf57
+SHA1 (patch-cd) = 0d574419257a604ca19e18a43aa42ec6e9a36c78
+SHA1 (patch-cj) = 1098ae4d3936a7fa4e9c39b0dc8734bef34f03b2
 SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
-SHA1 (patch-cl) = eb00468c5c5c70dd41803a2a263204686959a415
-SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e
-SHA1 (patch-cn) = ca3140375cb82ad9ef93d6157e04e40a593c36cd
-SHA1 (patch-gio_gcontenttype.c) = 72f0e1b2911df5997e15ef428706c3ba6b62dd83
-SHA1 (patch-gio_gdbusauthmechanismsha1.c) = 6fc057d968f84d3ebc28cdc9f06858b85a148ec2
+SHA1 (patch-cl) = c95e9fbff6ac66d5daedf0358ef3df89986b99ff
+SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
+SHA1 (patch-cn) = 0cb2fa14b2d3f0ff66f5d5f32e79a36c71a99b78
+SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa
 SHA1 (patch-gio_gdbusmessage.c) = 63030dac620e2e098acf079e5288e356f1f44504
-SHA1 (patch-gio_glocalfile.c) = 2087b54b187ae8812897f3ca9e893e542a5dd414
 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
-SHA1 (patch-gio_gthreadedresolver.c) = 7626d08da36e52d9997ec33453fba5c4efdaf57e
-SHA1 (patch-glib_gfileutils.c) = 667e9ed2a8a9cca09f9eb4218e467d11544822f3
-SHA1 (patch-glib_gmarkup.c) = 238cce5f20d2fd9a12832d47d498edfd7290075b
-SHA1 (patch-glib_gstrfuncs.c) = 6719b83e35e1f4e4e8b1c113faa8596676fd9ae5
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 8455754151f..d448995ea32 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
+$NetBSD: patch-aa,v 1.56 2013/12/08 13:08:59 prlw1 Exp $
 
---- configure.orig	2013-06-09 22:53:42.000000000 +0000
+--- configure.orig	2013-10-15 19:14:48.000000000 +0000
 +++ configure
-@@ -724,6 +724,7 @@ GIO
+@@ -730,6 +730,7 @@ GIO
  GSPAWN
  GLIB_DEBUG_FLAGS
  G_MODULE_NEED_USCORE
@@ -10,7 +10,16 @@ $NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
  G_MODULE_BROKEN_RTLD_GLOBAL
  G_MODULE_HAVE_DLERROR
  G_MODULE_LDFLAGS
-@@ -21108,6 +21109,8 @@ else
+@@ -5929,7 +5930,7 @@ else
+   ENABLE_ALWAYS_BUILD_TESTS_FALSE=
+ fi
+ 
+-  if test "$ENABLE_INSTALLED_TESTS" == "1"; then
++  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+     installed_test_metadir=${datadir}/installed-tests/glib
+ 
+     installed_testdir=${libexecdir}/installed-tests/glib
+@@ -21145,6 +21146,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -19,7 +28,7 @@ $NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -22153,8 +22156,8 @@ else
+@@ -22150,8 +22153,8 @@ else
  fi
  
  
@@ -30,7 +39,7 @@ $NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-@@ -23807,16 +23810,48 @@ fi
+@@ -24049,16 +24052,48 @@ fi
  
  case $host in
    *-*-solaris* )
@@ -80,7 +89,7 @@ $NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
  esac
  
  if test "$ac_cv_func_statfs" = yes; then :
-@@ -24829,10 +24864,11 @@ if test x"$glib_native_win32" = xyes; th
+@@ -25050,10 +25085,11 @@ if test x"$glib_native_win32" = xyes; th
      G_MODULE_LDFLAGS=
  else
    export SED
@@ -93,7 +102,7 @@ $NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -25050,13 +25086,13 @@ if  test "$G_MODULE_IMPL" = "G_MODULE_IM
+@@ -25271,13 +25307,13 @@ if  test "$G_MODULE_IMPL" = "G_MODULE_IM
  	LIBS="$G_MODULE_LIBS $LIBS"
  	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  	echo "void glib_plugin_test(void) { }" > plugin.c
@@ -110,7 +119,7 @@ $NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_GLOBAL brokenness" >&5
  $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; }
  if ${glib_cv_rtldglobal_broken+:} false; then :
-@@ -25166,6 +25202,56 @@ fi
+@@ -25387,6 +25423,56 @@ fi
  	LIBS="$LIBS_orig"
  
  fi
@@ -167,7 +176,7 @@ $NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -25176,7 +25262,7 @@ fi
+@@ -25397,7 +25483,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the suffix of module shared libraries" >&5
  $as_echo_n "checking for the suffix of module shared libraries... " >&6; }
  export SED
@@ -176,7 +185,7 @@ $NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -25200,6 +25286,7 @@ fi
+@@ -25421,6 +25507,7 @@ fi
  
  
  
@@ -184,7 +193,7 @@ $NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -26177,62 +26264,8 @@ if  test x"$have_threads" = xposix; then
+@@ -26398,62 +26485,8 @@ if  test x"$have_threads" = xposix; then
        G_THREAD_LIBS="-lpthread -lthread"
        ;;
      *)
@@ -249,7 +258,7 @@ $NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
         ;;
    esac
  
-@@ -26746,6 +26779,7 @@ case $host in
+@@ -27053,6 +27086,7 @@ case $host in
      ;;
    *-*-openbsd*)
      LDFLAGS="$LDFLAGS -pthread"
@@ -257,30 +266,3 @@ $NetBSD: patch-aa,v 1.55 2013/06/23 04:26:49 tsutsui Exp $
      ;;
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
-@@ -26844,7 +26878,7 @@ volatile int atomic = 2;\
-   return 0;
- }
- _ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
-+if ac_fn_c_try_link "$LINENO"; then :
-   glib_cv_g_atomic_lock_free=yes
- else
-   glib_cv_g_atomic_lock_free=no
-@@ -26865,7 +26899,7 @@ volatile int atomic = 2;\
-   return 0;
- }
- _ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
-+if ac_fn_c_try_link "$LINENO"; then :
-   as_fn_error $? "GLib must be build with -march=i486 or later." "$LINENO" 5
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -26896,7 +26930,7 @@ __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4;
-   return 0;
- }
- _ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
-+if ac_fn_c_try_link "$LINENO"; then :
- 
- else
- 
diff --git a/devel/glib2/patches/patch-af b/devel/glib2/patches/patch-af
index 7fb2c520d0f..dfd5d03d999 100644
--- a/devel/glib2/patches/patch-af
+++ b/devel/glib2/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.14 2012/11/13 21:23:07 adam Exp $
+$NetBSD: patch-af,v 1.15 2013/12/08 13:08:59 prlw1 Exp $
 
---- glib/libcharset/Makefile.in.orig	2010-09-27 16:10:13.000000000 +0000
+--- glib/libcharset/Makefile.in.orig	2013-10-15 19:14:52.000000000 +0000
 +++ glib/libcharset/Makefile.in
-@@ -776,18 +776,6 @@ lcov-clean:
- # run tests in cwd as part of make check
- check-local: test-nonrecursive
+@@ -1549,18 +1549,6 @@ check-local: test-nonrecursive
+ @ENABLE_INSTALLED_TESTS_TRUE@	echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \
+ @ENABLE_INSTALLED_TESTS_TRUE@	mv $@.tmp $@)
  install-exec-local: all-local
 -	$(mkinstalldirs) $(DESTDIR)$(libdir)
 -	if test -f $(charset_alias); then \
diff --git a/devel/glib2/patches/patch-ah b/devel/glib2/patches/patch-ah
index 9d0fe907999..c8eac6ee7af 100644
--- a/devel/glib2/patches/patch-ah
+++ b/devel/glib2/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.11 2013/04/25 12:10:48 joerg Exp $
+$NetBSD: patch-ah,v 1.12 2013/12/08 13:08:59 prlw1 Exp $
 
 --- glib/gutils.c.orig	2013-04-15 21:27:24.000000000 +0000
 +++ glib/gutils.c
@@ -20,20 +20,3 @@ $NetBSD: patch-ah,v 1.11 2013/04/25 12:10:48 joerg Exp $
  
        conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
-@@ -2167,6 +2167,8 @@ g_format_size (guint64 size)
-  *
-  * Since: 2.30
-  */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
- gchar *
- g_format_size_full (guint64          size,
-                     GFormatSizeFlags flags)
-@@ -2284,6 +2286,7 @@ g_format_size_full (guint64          siz
- 
-   return g_string_free (string, FALSE);
- }
-+#pragma GCC diagnostic pop
- 
- /**
-  * g_format_size_for_display:
diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai
index 3726ef0f961..ee9520588db 100644
--- a/devel/glib2/patches/patch-ai
+++ b/devel/glib2/patches/patch-ai
@@ -1,18 +1,18 @@
-$NetBSD: patch-ai,v 1.21 2012/11/13 21:23:07 adam Exp $
+$NetBSD: patch-ai,v 1.22 2013/12/08 13:08:59 prlw1 Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=583321
 
---- glib/gmain.c.orig	2011-10-14 04:03:10.000000000 +0000
+--- glib/gmain.c.orig	2013-10-15 19:07:46.000000000 +0000
 +++ glib/gmain.c
-@@ -4538,7 +4538,11 @@ ensure_unix_signal_handler_installed_unl
- 
-   action.sa_handler = g_unix_signal_handler;
-   sigemptyset (&action.sa_mask);
+@@ -4963,7 +4963,11 @@ ref_unix_signal_handler_unlocked (int si
+       struct sigaction action;
+       action.sa_handler = g_unix_signal_handler;
+       sigemptyset (&action.sa_mask);
 +#ifdef SA_RESTART
-   action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
-+#else /* QNX */
-+  action.sa_flags = SA_NOCLDSTOP;
+       action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
++#else
++      action.sa_flags = SA_NOCLDSTOP;
 +#endif
-   sigaction (signum, &action, NULL);
+       sigaction (signum, &action, NULL);
+     }
  }
- 
diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak
index 86af6c001df..320e8edd69a 100644
--- a/devel/glib2/patches/patch-ak
+++ b/devel/glib2/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.16 2013/06/23 04:26:49 tsutsui Exp $
+$NetBSD: patch-ak,v 1.17 2013/12/08 13:08:59 prlw1 Exp $
 
 --- configure.ac.orig	2013-06-09 22:53:13.000000000 +0000
 +++ configure.ac
@@ -158,30 +158,3 @@ $NetBSD: patch-ak,v 1.16 2013/06/23 04:26:49 tsutsui Exp $
      ;;
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
-@@ -2390,7 +2423,7 @@ AC_CACHE_CHECK([for lock-free atomic int
-       glib_cv_g_atomic_lock_free=yes
-       ;;
-     *)
--      AC_TRY_COMPILE([],
-+      AC_TRY_LINK([],
-                      [volatile int atomic = 2;\
-                       __sync_bool_compare_and_swap (&atomic, 2, 3);],
-                      [glib_cv_g_atomic_lock_free=yes],
-@@ -2398,7 +2431,7 @@ AC_CACHE_CHECK([for lock-free atomic int
-       if test "$glib_cv_g_atomic_lock_free" = "no"; then
-         SAVE_CFLAGS="${CFLAGS}"
-         CFLAGS="-march=i486"
--        AC_TRY_COMPILE([],
-+        AC_TRY_LINK([],
-                        [volatile int atomic = 2;\
-                         __sync_bool_compare_and_swap (&atomic, 2, 3);],
-                        [AC_MSG_ERROR([GLib must be build with -march=i486 or later.])],
-@@ -2416,7 +2449,7 @@ case $host in
-     # Some compilers support atomic operations but do not define
-     # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4, like clang
-     if test x"$glib_cv_g_atomic_lock_free" = xyes; then
--      AC_TRY_COMPILE([],
-+      AC_TRY_LINK([],
-                      [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4;],
-                      [],
-                      [AC_DEFINE(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4, 1, [ compiler supports atomic operations])])
diff --git a/devel/glib2/patches/patch-al b/devel/glib2/patches/patch-al
index a0407ff8b10..02a68cf17ac 100644
--- a/devel/glib2/patches/patch-al
+++ b/devel/glib2/patches/patch-al
@@ -1,20 +1,20 @@
-$NetBSD: patch-al,v 1.6 2010/11/02 14:52:24 drochner Exp $
+$NetBSD: patch-al,v 1.7 2013/12/08 13:08:59 prlw1 Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=583329
 
---- glib/tests/convert.c.orig	2008-09-02 15:09:28.000000000 +0000
+--- glib/tests/convert.c.orig	2013-09-05 10:43:41.000000000 +0000
 +++ glib/tests/convert.c
-@@ -76,6 +76,7 @@ test_one_half (void)
-   g_assert (strcmp (out, "\xbd") == 0);
-   g_free (out);
+@@ -65,6 +65,7 @@ test_one_half (void)
+   gsize bytes_written = 0;
+   GError *error = NULL;  
  
-+#if 0 /* these 2 tests depend on GNU iconv specific behaviour */
++#if 0 /* these tests depend on GNU iconv specific behaviour */
    out = g_convert (in, -1, 
- 		   "ISO-8859-15", "UTF-8",
+ 		   "ISO-8859-1", "UTF-8",
  		   &bytes_read, &bytes_written,
 @@ -99,6 +100,7 @@ test_one_half (void)
-   g_assert (bytes_written == 1);
-   g_assert (strcmp (out, "a") == 0);
+   g_assert_cmpint (bytes_written, ==, 1);
+   g_assert_cmpstr (out, ==, "a");
    g_free (out);
 +#endif
  }
diff --git a/devel/glib2/patches/patch-an b/devel/glib2/patches/patch-an
index 7ecd69a31d3..fd434db4c5b 100644
--- a/devel/glib2/patches/patch-an
+++ b/devel/glib2/patches/patch-an
@@ -1,25 +1,25 @@
-$NetBSD: patch-an,v 1.10 2013/04/19 22:21:41 prlw1 Exp $
+$NetBSD: patch-an,v 1.11 2013/12/08 13:08:59 prlw1 Exp $
 
 Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
 Don't install completion data.
 
---- gio/Makefile.in.orig	2013-03-25 21:07:16.000000000 +0000
+--- gio/Makefile.in.orig	2013-10-15 19:14:51.000000000 +0000
 +++ gio/Makefile.in
-@@ -810,7 +810,7 @@ EXTRA_DIST = gdbusdaemon.c gdbusdaemon.h
- 	gnetworking.h.win32 $(NULL) $(completion_DATA)
- TEST_PROGS = 
- NULL = 
--SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \
-+SUBDIRS = $(am__append_1) $(am__append_4) \
- 	$(am__append_7) $(am__append_11) $(am__append_14) . \
- 	$(am__append_17) $(am__append_24)
- @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
-@@ -3460,7 +3460,7 @@ info: info-recursive
+@@ -1173,7 +1173,7 @@ all_test_ltlibs = $(test_ltlibraries) $(
+ @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
+ 
+ @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
+-SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \
++SUBDIRS = $(am__append_15) $(am__append_19) \
+ 	$(am__append_22) $(am__append_26) $(am__append_29) . tests \
+ 	$(am__append_32)
+ @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
+@@ -4200,7 +4200,7 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-completionDATA install-data-local \
 +install-data-am: install-data-local \
  	install-dist_schemaDATA install-gioincludeHEADERS \
- 	install-giounixincludeHEADERS install-giowin32includeHEADERS
- 	@$(NORMAL_INSTALL)
+ 	install-giounixincludeHEADERS install-giowin32includeHEADERS \
+ 	install-installed_testLTLIBRARIES \
diff --git a/devel/glib2/patches/patch-ba b/devel/glib2/patches/patch-ba
index 2b590497ca7..e91f54bd53c 100644
--- a/devel/glib2/patches/patch-ba
+++ b/devel/glib2/patches/patch-ba
@@ -1,7 +1,6 @@
-$NetBSD: patch-ba,v 1.12 2013/10/03 14:41:00 prlw1 Exp $
+$NetBSD: patch-ba,v 1.13 2013/12/08 13:08:59 prlw1 Exp $
 
-* http://bugzilla.gnome.org/show_bug.cgi?id=583330
-* http://bugzilla.gnome.org/show_bug.cgi?id=697365
+http://bugzilla.gnome.org/show_bug.cgi?id=583330
 
 --- gio/gunixmounts.c.orig	2013-08-07 14:34:32.000000000 +0000
 +++ gio/gunixmounts.c
@@ -115,18 +114,6 @@ $NetBSD: patch-ba,v 1.12 2013/10/03 14:41:00 prlw1 Exp $
  #endif
          mount_entry->is_read_only = TRUE;
  
-@@ -774,9 +791,11 @@ _g_get_unix_mount_points (void)
-           (strcmp (mntent->mnt_dir, "none") == 0))
- 	continue;
- 
-+#ifdef HAVE_HASMNTOPT
-       /* We ignore bind fstab entries, as we ignore bind mounts anyway */
-       if (hasmntopt (mntent, "bind"))
-         continue;
-+#endif
- 
-       mount_entry = g_new0 (GUnixMountPoint, 1);
-       mount_entry->mount_path = g_strdup (mntent->mnt_dir);
 @@ -1126,6 +1145,10 @@ get_mounts_timestamp (void)
        if (stat (monitor_file, &buf) == 0)
  	return (guint64)buf.st_mtime;
diff --git a/devel/glib2/patches/patch-cd b/devel/glib2/patches/patch-cd
index cd74619005f..1d1da8baf4e 100644
--- a/devel/glib2/patches/patch-cd
+++ b/devel/glib2/patches/patch-cd
@@ -1,14 +1,14 @@
-$NetBSD: patch-cd,v 1.7 2012/05/01 18:45:53 adam Exp $
+$NetBSD: patch-cd,v 1.8 2013/12/08 13:08:59 prlw1 Exp $
 
 sysutils/gio-fam builds the gio/fam backend as a separate module.  Force it
 to link against the installed version of glib2, as it is not rebuilt by the
 package.
 
---- gio/fam/Makefile.in.orig	2012-03-11 23:56:05.000000000 +0000
+--- gio/fam/Makefile.in.orig	2013-10-15 19:14:51.000000000 +0000
 +++ gio/fam/Makefile.in
-@@ -87,10 +87,7 @@ am__uninstall_files_from_dir = { \
- am__installdirs = "$(DESTDIR)$(giomoduledir)"
- LTLIBRARIES = $(giomodule_LTLIBRARIES)
+@@ -175,10 +175,7 @@ am__installdirs = "$(DESTDIR)$(giomodule
+ LTLIBRARIES = $(giomodule_LTLIBRARIES) $(installed_test_LTLIBRARIES) \
+ 	$(noinst_LTLIBRARIES)
  am__DEPENDENCIES_1 =
 -libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
 -	$(top_builddir)/gobject/libgobject-2.0.la \
@@ -18,7 +18,7 @@ package.
  am__objects_1 =
  am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
  	libgiofam_la-fam-module.lo \
-@@ -403,9 +400,7 @@ libgiofam_la_CFLAGS = \
+@@ -792,9 +789,7 @@ libgiofam_la_CFLAGS = \
  
  libgiofam_la_LDFLAGS = $(module_flags)
  libgiofam_la_LIBADD = \
@@ -29,8 +29,8 @@ package.
  		$(GLIB_LIBS) \
  		$(FAM_LIBS) \
  		$(NULL)
-@@ -843,9 +838,6 @@ lcov-clean:
- check-local: test-nonrecursive
+@@ -1639,9 +1634,6 @@ check-local: test-nonrecursive
+ @ENABLE_INSTALLED_TESTS_TRUE@	mv $@.tmp $@)
  
  install-data-hook:
 -	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
diff --git a/devel/glib2/patches/patch-ce b/devel/glib2/patches/patch-ce
deleted file mode 100644
index 0379cbd1b5e..00000000000
--- a/devel/glib2/patches/patch-ce
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ce,v 1.6 2013/06/23 04:26:49 tsutsui Exp $
-
-Fix inconsistency of .hidden attributes, leading to link error on amd64,
-reported by Tobias Nygren.
-
---- glib/gatomic.c.orig	2013-06-09 22:03:17.000000000 +0000
-+++ glib/gatomic.c
-@@ -22,6 +22,7 @@
- #include "config.h"
- 
- #include "gatomic.h"
-+#include "gthreadprivate.h"
- 
- /**
-  * SECTION:atomic_operations
-@@ -682,7 +683,7 @@ gsize
- static pthread_mutex_t g_atomic_lock = PTHREAD_MUTEX_INITIALIZER;
- 
- gint
--(g_atomic_int_get) (volatile gint *atomic)
-+(g_atomic_int_get) (const volatile gint *atomic)
- {
-   gint value;
- 
-@@ -797,9 +798,9 @@ guint
- 
- 
- gpointer
--(g_atomic_pointer_get) (volatile void *atomic)
-+(g_atomic_pointer_get) (const volatile void *atomic)
- {
--  volatile gpointer *ptr = atomic;
-+  const volatile gpointer *ptr = atomic;
-   gpointer value;
- 
-   pthread_mutex_lock (&g_atomic_lock);
diff --git a/devel/glib2/patches/patch-cj b/devel/glib2/patches/patch-cj
index b5e46f633f2..4e1a350a106 100644
--- a/devel/glib2/patches/patch-cj
+++ b/devel/glib2/patches/patch-cj
@@ -1,13 +1,14 @@
-$NetBSD: patch-cj,v 1.10 2013/06/14 21:04:03 wiz Exp $
+$NetBSD: patch-cj,v 1.11 2013/12/08 13:08:59 prlw1 Exp $
 
 The mem-overflow test contains a declaration of an empty struct, which breaks
 on at least SunPro cc, and presumably some other non-gcc compilers.  Skip this
 test for now, pending a better fix.
+
 https://bugzilla.gnome.org/show_bug.cgi?id=641350
 
---- glib/tests/Makefile.in.orig	2013-06-09 22:53:46.000000000 +0000
+--- glib/tests/Makefile.in.orig	2013-10-15 19:14:53.000000000 +0000
 +++ glib/tests/Makefile.in
-@@ -119,7 +119,7 @@ am__EXEEXT_3 = array-test$(EXEEXT) async
+@@ -194,7 +194,7 @@ am__EXEEXT_3 = array-test$(EXEEXT) async
  	keyfile$(EXEEXT) list$(EXEEXT) logging$(EXEEXT) \
  	mainloop$(EXEEXT) mappedfile$(EXEEXT) markup-parse$(EXEEXT) \
  	markup-collect$(EXEEXT) markup-escape$(EXEEXT) \
@@ -16,7 +17,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  	node$(EXEEXT) once$(EXEEXT) option-context$(EXEEXT) \
  	option-argv0$(EXEEXT) pattern$(EXEEXT) private$(EXEEXT) \
  	protocol$(EXEEXT) queue$(EXEEXT) rand$(EXEEXT) \
-@@ -315,10 +315,6 @@ markup_subparser_SOURCES = markup-subpar
+@@ -399,10 +399,6 @@ markup_subparser_SOURCES = markup-subpar
  markup_subparser_OBJECTS = markup-subparser.$(OBJEXT)
  markup_subparser_LDADD = $(LDADD)
  markup_subparser_DEPENDENCIES = $(top_builddir)/glib/libglib-2.0.la
@@ -27,7 +28,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  mutex_SOURCES = mutex.c
  mutex_OBJECTS = mutex.$(OBJEXT)
  mutex_LDADD = $(LDADD)
-@@ -513,7 +509,7 @@ SOURCES = $(1bit_emufutex_SOURCES) 1bit-
+@@ -606,7 +602,7 @@ SOURCES = $(1bit_emufutex_SOURCES) 1bit-
  	$(gwakeup_SOURCES) $(gwakeup_fallback_SOURCES) hash.c hmac.c \
  	hook.c hostutils.c include.c keyfile.c list.c logging.c \
  	mainloop.c mappedfile.c markup-collect.c markup-escape.c \
@@ -36,7 +37,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  	node.c once.c option-argv0.c option-context.c pattern.c \
  	private.c protocol.c queue.c rand.c rec-mutex.c regex.c \
  	rwlock.c scannerapi.c sequence.c shell.c slice.c slist.c \
-@@ -529,7 +525,7 @@ DIST_SOURCES = $(1bit_emufutex_SOURCES) 
+@@ -622,7 +618,7 @@ DIST_SOURCES = $(1bit_emufutex_SOURCES) 
  	$(gwakeup_SOURCES) $(am__gwakeup_fallback_SOURCES_DIST) hash.c \
  	hmac.c hook.c hostutils.c include.c keyfile.c list.c logging.c \
  	mainloop.c mappedfile.c markup-collect.c markup-escape.c \
@@ -45,16 +46,16 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  	node.c once.c option-argv0.c option-context.c pattern.c \
  	private.c protocol.c queue.c rand.c rec-mutex.c regex.c \
  	rwlock.c scannerapi.c sequence.c shell.c slice.c slist.c \
-@@ -815,7 +811,7 @@ TEST_PROGS = array-test asyncqueue atomi
- 	environment error fileutils gdatetime gvariant gwakeup hash \
- 	hmac hook hostutils keyfile list logging mainloop mappedfile \
+@@ -1166,7 +1162,7 @@ test_programs = array-test asyncqueue ba
+ 	environment error fileutils gdatetime gvariant hash hmac hook \
+ 	hostutils keyfile list logging mainloop mappedfile \
  	markup-parse markup-collect markup-escape markup-subparser \
 -	mem-overflow mutex node once option-context option-argv0 \
 +	mutex node once option-context option-argv0 \
  	pattern private protocol queue rand rec-mutex regex rwlock \
  	scannerapi sequence shell slice slist sort spawn-multithreaded \
  	spawn-singlethread strfuncs string testing test-printf thread \
-@@ -1051,9 +1047,7 @@ markup-subparser$(EXEEXT): $(markup_subp
+@@ -1526,9 +1522,7 @@ markup-subparser$(EXEEXT): $(markup_subp
  	@rm -f markup-subparser$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(markup_subparser_OBJECTS) $(markup_subparser_LDADD) $(LIBS)
  
@@ -65,7 +66,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  
  mutex$(EXEEXT): $(mutex_OBJECTS) $(mutex_DEPENDENCIES) $(EXTRA_mutex_DEPENDENCIES) 
  	@rm -f mutex$(EXEEXT)
-@@ -1251,7 +1245,6 @@ distclean-compile:
+@@ -1761,7 +1755,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-escape.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-parse.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-subparser.Po@am__quote@
@@ -73,3 +74,17 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mutex.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/once.Po@am__quote@
+@@ -2373,13 +2366,6 @@ markup-subparser.log: markup-subparser$(
+ 	--log-file $$b.log --trs-file $$b.trs \
+ 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-mem-overflow.log: mem-overflow$(EXEEXT)
+-	@p='mem-overflow$(EXEEXT)'; \
+-	b='mem-overflow'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ mutex.log: mutex$(EXEEXT)
+ 	@p='mutex$(EXEEXT)'; \
+ 	b='mutex'; \
diff --git a/devel/glib2/patches/patch-cl b/devel/glib2/patches/patch-cl
index acebe66dbce..aaf7a82a1cb 100644
--- a/devel/glib2/patches/patch-cl
+++ b/devel/glib2/patches/patch-cl
@@ -1,17 +1,19 @@
-$NetBSD: patch-cl,v 1.9 2012/11/13 21:23:07 adam Exp $
+$NetBSD: patch-cl,v 1.10 2013/12/08 13:08:59 prlw1 Exp $
 
---- gio/Makefile.am.orig	2012-07-14 20:33:13.000000000 +0000
+Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
+Don't install completion data.
+(patch-an)
+--- gio/Makefile.am.orig	2013-10-15 19:07:46.000000000 +0000
 +++ gio/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
- 
- NULL =
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
  
 -SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
++SUBDIRS = 
  
  if OS_UNIX
  SUBDIRS += xdgmime
-@@ -722,13 +722,6 @@ gdbus_LDADD = libgio-2.0.la \
+@@ -718,13 +718,6 @@ gdbus_LDADD = libgio-2.0.la \
  	$(top_builddir)/glib/libglib-2.0.la 		\
  	$(top_builddir)/gobject/libgobject-2.0.la
  
diff --git a/devel/glib2/patches/patch-cm b/devel/glib2/patches/patch-cm
index 5115f86e546..f8139460306 100644
--- a/devel/glib2/patches/patch-cm
+++ b/devel/glib2/patches/patch-cm
@@ -1,9 +1,9 @@
-$NetBSD: patch-cm,v 1.2 2012/03/21 12:18:33 drochner Exp $
+$NetBSD: patch-cm,v 1.3 2013/12/08 13:08:59 prlw1 Exp $
 
 sysutils/gio-fam builds the gio/fam backend as a separate module.  Force it
 to link against the installed version of glib2, as it is not rebuilt by the
 package.
-
+(patch-cd)
 --- gio/fam/Makefile.am.orig	2012-03-11 23:55:40.000000000 +0000
 +++ gio/fam/Makefile.am
 @@ -25,11 +25,9 @@ libgiofam_la_CFLAGS = \
diff --git a/devel/glib2/patches/patch-cn b/devel/glib2/patches/patch-cn
index 2a9041eba42..198715f6d9d 100644
--- a/devel/glib2/patches/patch-cn
+++ b/devel/glib2/patches/patch-cn
@@ -1,10 +1,10 @@
-$NetBSD: patch-cn,v 1.4 2013/04/19 22:21:41 prlw1 Exp $
+$NetBSD: patch-cn,v 1.5 2013/12/08 13:08:59 prlw1 Exp $
 
 The mem-overflow test contains a declaration of an empty struct, which breaks
 on at least SunPro cc, and presumably some other non-gcc compilers.  Skip this
 test for now, pending a better fix.
 https://bugzilla.gnome.org/show_bug.cgi?id=641350
-
+(patch-cj)
 --- glib/tests/Makefile.am.orig	2013-03-25 17:02:43.000000000 +0000
 +++ glib/tests/Makefile.am
 @@ -46,7 +46,6 @@ TEST_PROGS += 				\
diff --git a/devel/glib2/patches/patch-gio_gcontenttype.c b/devel/glib2/patches/patch-gio_gcontenttype.c
deleted file mode 100644
index abcd936e97d..00000000000
--- a/devel/glib2/patches/patch-gio_gcontenttype.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-gio_gcontenttype.c,v 1.1 2013/04/25 12:10:48 joerg Exp $
-
---- gio/gcontenttype.c.orig	2013-04-23 20:39:41.000000000 +0000
-+++ gio/gcontenttype.c
-@@ -393,6 +393,8 @@ g_content_type_get_mime_type (const char
-   return g_strdup (type);
- }
- 
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
- 
- static GIcon *
- g_content_type_get_icon_internal (const gchar *type,
-@@ -457,6 +459,7 @@ g_content_type_get_icon_internal (const 
- 
-   return themed_icon;
- }
-+#pragma GCC diagnostic pop
- 
- /**
-  * g_content_type_get_icon:
diff --git a/devel/glib2/patches/patch-gio_gdbusauthmechanismsha1.c b/devel/glib2/patches/patch-gio_gdbusauthmechanismsha1.c
index aab3b2a8182..09b310e529c 100644
--- a/devel/glib2/patches/patch-gio_gdbusauthmechanismsha1.c
+++ b/devel/glib2/patches/patch-gio_gdbusauthmechanismsha1.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-gio_gdbusauthmechanismsha1.c,v 1.1 2013/08/25 08:39:12 richard Exp $
+$NetBSD: patch-gio_gdbusauthmechanismsha1.c,v 1.2 2013/12/08 13:08:59 prlw1 Exp $
 
-* suppress format warnings that are converted to errors with gcc 4.8
-*
---- gio/gdbusauthmechanismsha1.c.orig	2013-08-07 14:34:32.000000000 +0000
+Suppress format warnings that are converted to errors with gcc 4.8
+
+--- gio/gdbusauthmechanismsha1.c.orig	2013-08-08 10:00:40.000000000 +0000
 +++ gio/gdbusauthmechanismsha1.c
-@@ -277,7 +277,7 @@ ensure_keyring_directory (GError **error
+@@ -273,7 +273,7 @@ ensure_keyring_directory (GError **error
                             G_IO_ERROR_FAILED,
-                            _("Permissions on directory `%s' are malformed. Expected mode 0700, got 0%o"),
+                            _("Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"),
                             path,
 -                           statbuf.st_mode & 0777);
 +                           (guint)statbuf.st_mode & 0777);
diff --git a/devel/glib2/patches/patch-gio_glocalfile.c b/devel/glib2/patches/patch-gio_glocalfile.c
deleted file mode 100644
index 1e748356e9e..00000000000
--- a/devel/glib2/patches/patch-gio_glocalfile.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-gio_glocalfile.c,v 1.1 2013/04/19 22:21:41 prlw1 Exp $
-
-In is_remote_fs(), statfs_result is also used in the USE_STATVFS
-case.
-    
-https://bugzilla.gnome.org/show_bug.cgi?id=698348
-
---- gio/glocalfile.c.orig	2013-03-25 17:02:43.000000000 +0000
-+++ gio/glocalfile.c
-@@ -2422,10 +2422,10 @@ static gboolean
- is_remote_fs (const gchar *filename)
- {
-   const char *fsname = NULL;
-+  int statfs_result = 0;
- 
- #ifdef USE_STATFS
-   struct statfs statfs_buffer;
--  int statfs_result = 0;
- 
- #if STATFS_ARGS == 2
-   statfs_result = statfs (filename, &statfs_buffer);
diff --git a/devel/glib2/patches/patch-gio_gthreadedresolver.c b/devel/glib2/patches/patch-gio_gthreadedresolver.c
deleted file mode 100644
index e881135e23d..00000000000
--- a/devel/glib2/patches/patch-gio_gthreadedresolver.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-gio_gthreadedresolver.c,v 1.2 2013/06/14 21:04:03 wiz Exp $
-
---- gio/gthreadedresolver.c.orig	2013-06-09 22:07:09.000000000 +0000
-+++ gio/gthreadedresolver.c
-@@ -369,6 +369,8 @@ g_resolver_record_type_to_rrtype (GResol
-   g_return_val_if_reached (-1);
- }
- 
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
- static GList *
- g_resolver_records_from_res_query (const gchar      *rrname,
-                                    gint              rrtype,
-@@ -482,6 +484,7 @@ g_resolver_records_from_res_query (const
-   else
-     return records;
- }
-+#pragma GCC diagnostic pop
- 
- #elif defined(G_OS_WIN32)
- 
diff --git a/devel/glib2/patches/patch-glib_gfileutils.c b/devel/glib2/patches/patch-glib_gfileutils.c
deleted file mode 100644
index 1f1baeb3732..00000000000
--- a/devel/glib2/patches/patch-glib_gfileutils.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-glib_gfileutils.c,v 1.3 2013/06/16 20:37:07 joerg Exp $
-
---- glib/gfileutils.c.orig	2013-06-09 22:15:54.000000000 +0000
-+++ glib/gfileutils.c
-@@ -1009,6 +1009,8 @@ rename_file (const char  *old_name,
-  *   - the place for the filename
-  *   - the place for the strerror
-  */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
- static void
- format_error_message (GError      **error,
-                       const gchar  *filename,
-@@ -1024,6 +1026,7 @@ format_error_message (GError      **erro
- 
-   g_free (display_name);
- }
-+#pragma GCC diagnostic pop
- 
- static gchar *
- write_to_temp_file (const gchar  *contents,
diff --git a/devel/glib2/patches/patch-glib_gmarkup.c b/devel/glib2/patches/patch-glib_gmarkup.c
deleted file mode 100644
index a05522da584..00000000000
--- a/devel/glib2/patches/patch-glib_gmarkup.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-glib_gmarkup.c,v 1.1 2013/04/25 12:10:48 joerg Exp $
-
---- glib/gmarkup.c.orig	2013-04-23 20:29:01.000000000 +0000
-+++ glib/gmarkup.c
-@@ -2366,6 +2366,9 @@ find_conversion (const char  *format,
-  *
-  * Since: 2.4
-  */
-+
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
- gchar *
- g_markup_vprintf_escaped (const gchar *format,
-                           va_list      args)
-@@ -2437,6 +2440,7 @@ g_markup_vprintf_escaped (const gchar *f
-     }
- 
-   output2 = g_strdup_vprintf (format2->str, args2);
-+
-   va_end (args2);
-   if (!output2)
-     goto cleanup;
-@@ -2491,6 +2495,7 @@ g_markup_vprintf_escaped (const gchar *f
-   else
-     return NULL;
- }
-+#pragma GCC diagnostic pop
- 
- /**
-  * g_markup_printf_escaped:
diff --git a/devel/glib2/patches/patch-glib_gstrfuncs.c b/devel/glib2/patches/patch-glib_gstrfuncs.c
deleted file mode 100644
index 376b8142cf1..00000000000
--- a/devel/glib2/patches/patch-glib_gstrfuncs.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-glib_gstrfuncs.c,v 1.1 2013/04/25 12:10:48 joerg Exp $
-
---- glib/gstrfuncs.c.orig	2013-04-23 20:34:39.000000000 +0000
-+++ glib/gstrfuncs.c
-@@ -892,6 +892,8 @@ g_ascii_dtostr (gchar       *buffer,
-  *
-  * Return value: The pointer to the buffer with the converted string.
-  */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
- gchar *
- g_ascii_formatd (gchar       *buffer,
-                  gint         buf_len,
-@@ -974,6 +976,7 @@ g_ascii_formatd (gchar       *buffer,
-   return buffer;
- #endif
- }
-+#pragma GCC diagnostic pop
- 
- #define ISSPACE(c)              ((c) == ' ' || (c) == '\f' || (c) == '\n' || \
-                                  (c) == '\r' || (c) == '\t' || (c) == '\v')