update to 2.30.2

this switches to the 2.30 release branch

pkgsrc note: if you use net/libsoup24 with this glib2 version, make
sure to use at least version 2.34.3nb1

8 files changed, 104 insertions, 117 deletions

diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai
index b9d421cf6f9..bbefcd1c63d 100644
--- a/devel/glib2/patches/patch-ai
+++ b/devel/glib2/patches/patch-ai
@@ -1,18 +1,18 @@
-$NetBSD: patch-ai,v 1.18 2009/06/05 16:08:25 drochner Exp $
+$NetBSD: patch-ai,v 1.19 2012/01/29 10:46:53 drochner Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=583321
 
---- glib/gmain.c.orig	2009-05-29 07:18:56.000000000 +0200
+--- glib/gmain.c.orig	2011-10-14 04:03:10.000000000 +0000
 +++ glib/gmain.c
-@@ -3713,7 +3713,11 @@ g_child_watch_source_init_multi_threaded
-  
-   action.sa_handler = g_child_watch_signal_handler;
+@@ -4398,7 +4398,11 @@ ensure_unix_signal_handler_installed_unl
+ 
+   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;
 +#endif
-   sigaction (SIGCHLD, &action, NULL);
+   sigaction (signum, &action, NULL);
  }
  
diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak
index 446f08e23a8..a88465d15e5 100644
--- a/devel/glib2/patches/patch-ak
+++ b/devel/glib2/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
+$NetBSD: patch-ak,v 1.9 2012/01/29 10:46:53 drochner Exp $
 
---- configure.ac.orig	2011-06-05 19:18:49.000000000 -0400
-+++ configure.ac	2011-10-08 23:50:38.000000000 -0400
-@@ -825,7 +825,7 @@ int main (int argc, char **argv)
+--- configure.ac.orig	2011-10-14 04:12:40.000000000 +0000
++++ configure.ac
+@@ -882,7 +882,7 @@ int main (int argc, char **argv)
  AC_MSG_RESULT($g_have_gnuc_visibility)
  AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
  #else
  # include "error: this is not Sun Studio."
-@@ -1023,8 +1023,20 @@ fi
+@@ -1114,8 +1114,20 @@ AC_SUBST(NETWORK_LIBS)
  
  case $host in
    *-*-solaris* )
@@ -32,7 +32,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
       AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
       ;;
  esac
-@@ -1379,11 +1391,12 @@ if test x"$glib_native_win32" = xyes; th
+@@ -1509,11 +1521,12 @@ if test x"$glib_native_win32" = xyes; th
    G_MODULE_LDFLAGS=
  else
    export SED
@@ -46,7 +46,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
  G_MODULE_HAVE_DLERROR=0
  dnl *** force native WIN32 shared lib loader 
  if test -z "$G_MODULE_IMPL"; then
-@@ -1444,7 +1457,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
+@@ -1574,7 +1587,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
  	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
  	echo "void glib_plugin_test(void) { }" > plugin.c
@@ -55,7 +55,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
  		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
  	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
  		glib_cv_rtldglobal_broken,[
-@@ -1508,6 +1521,38 @@ dnl *** check for having dlerror()
+@@ -1638,6 +1651,38 @@ dnl *** check for having dlerror()
  		[G_MODULE_HAVE_DLERROR=0])
  	LIBS="$LIBS_orig"
  fi
@@ -94,7 +94,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
  dnl *** done, have we got an implementation?
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
-@@ -1518,7 +1563,7 @@ fi
+@@ -1648,7 +1693,7 @@ fi
  
  AC_MSG_CHECKING(for the suffix of module shared libraries)
  export SED
@@ -103,7 +103,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -1537,6 +1582,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
+@@ -1667,6 +1712,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
  AC_SUBST(G_MODULE_LDFLAGS)
  AC_SUBST(G_MODULE_HAVE_DLERROR)
  AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
@@ -112,7 +112,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
  AC_SUBST(G_MODULE_NEED_USCORE)
  AC_SUBST(GLIB_DEBUG_FLAGS)
  
-@@ -1925,22 +1972,8 @@ if test x"$have_threads" != xno; then
+@@ -2055,22 +2102,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -122,7 +122,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
 -          AC_TRY_RUN(glib_thread_test(0),
 -                     glib_flag_works=yes,
 -                     glib_flag_works=no,
--                     [AC_LINK_IFELSE(glib_thread_test(0),
+-                     [AC_LINK_IFELSE([AC_LANG_SOURCE(glib_thread_test(0))],
 -                                     glib_flag_works=yes,
 -                                     glib_flag_works=no)])
 -          CFLAGS="$glib_save_CFLAGS"
@@ -137,7 +137,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
           ;;
      esac 
    fi
-@@ -3638,7 +3671,7 @@ AC_ARG_ENABLE(Bsymbolic,
+@@ -3771,7 +3804,7 @@ AC_ARG_ENABLE(Bsymbolic,
                             enable_Bsymbolic=no)
                 LDFLAGS="${SAVED_LDFLAGS}"])
  
diff --git a/devel/glib2/patches/patch-an b/devel/glib2/patches/patch-an
index 1fb06f97076..6833f42b9db 100644
--- a/devel/glib2/patches/patch-an
+++ b/devel/glib2/patches/patch-an
@@ -1,12 +1,12 @@
-$NetBSD: patch-an,v 1.4 2010/11/02 14:52:24 drochner Exp $
+$NetBSD: patch-an,v 1.5 2012/01/29 10:46:54 drochner Exp $
 
---- gio/Makefile.in.orig	2010-09-27 16:10:12.000000000 +0000
+--- gio/Makefile.in.orig	2011-10-14 13:31:08.000000000 +0000
 +++ gio/Makefile.in
-@@ -1838,7 +1838,7 @@ info: info-recursive
+@@ -3377,7 +3377,7 @@ info: info-recursive
  
  info-am:
  
--install-data-am: install-completionSCRIPTS install-data-local \
+-install-data-am: install-completionDATA install-data-local \
 +install-data-am: install-data-local \
  	install-dist_schemaDATA install-gioincludeHEADERS \
  	install-giounixincludeHEADERS install-giowin32includeHEADERS
diff --git a/devel/glib2/patches/patch-ap b/devel/glib2/patches/patch-ap
index c17999122ad..480f554e1ce 100644
--- a/devel/glib2/patches/patch-ap
+++ b/devel/glib2/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
+$NetBSD: patch-ap,v 1.2 2012/01/29 10:46:54 drochner Exp $
 
---- gio/gcredentials.c.orig	2011-02-11 15:23:11.000000000 +0000
+--- gio/gcredentials.c.orig	2011-08-16 00:51:30.000000000 +0000
 +++ gio/gcredentials.c
-@@ -27,6 +27,9 @@
+@@ -32,6 +32,9 @@
  #include <sys/socket.h>
  #include <string.h>
  #endif
@@ -12,10 +12,10 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
  #include <stdlib.h>
  
  #include <gobject/gvaluecollector.h>
-@@ -82,6 +85,12 @@ struct _GCredentials
-   struct ucred native;
- #elif defined(__FreeBSD__)
+@@ -92,6 +95,12 @@ struct _GCredentials
    struct cmsgcred native;
+ #elif defined(__OpenBSD__)
+   struct sockpeercred native;
 +#elif defined(__NetBSD__)
 +  struct {
 +    pid_t pid;
@@ -25,7 +25,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
  #else
  #ifdef __GNUC__
  #warning Please add GCredentials support for your OS
-@@ -126,7 +135,7 @@ g_credentials_class_init (GCredentialsCl
+@@ -136,7 +145,7 @@ g_credentials_class_init (GCredentialsCl
  static void
  g_credentials_init (GCredentials *credentials)
  {
@@ -34,7 +34,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
    credentials->native.pid = getpid ();
    credentials->native.uid = geteuid ();
    credentials->native.gid = getegid ();
-@@ -178,7 +187,7 @@ g_credentials_to_string (GCredentials *c
+@@ -192,7 +201,7 @@ g_credentials_to_string (GCredentials *c
    g_return_val_if_fail (G_IS_CREDENTIALS (credentials), NULL);
  
    ret = g_string_new ("GCredentials:");
@@ -43,7 +43,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
    g_string_append (ret, "linux-ucred:");
    if (credentials->native.pid != -1)
      g_string_append_printf (ret, "pid=%" G_GINT64_FORMAT ",", (gint64) credentials->native.pid);
-@@ -233,7 +242,7 @@ g_credentials_is_same_user (GCredentials
+@@ -257,7 +266,7 @@ g_credentials_is_same_user (GCredentials
    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
  
    ret = FALSE;
@@ -52,7 +52,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
    if (credentials->native.uid == other_credentials->native.uid)
      ret = TRUE;
  #elif defined(__FreeBSD__)
-@@ -278,7 +287,7 @@ g_credentials_get_native (GCredentials  
+@@ -305,7 +314,7 @@ g_credentials_get_native (GCredentials  
  
    ret = NULL;
  
@@ -61,7 +61,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
    if (native_type != G_CREDENTIALS_TYPE_LINUX_UCRED)
      {
        g_warning ("g_credentials_get_native: Trying to get credentials of type %d but only "
-@@ -328,7 +337,7 @@ g_credentials_set_native (GCredentials  
+@@ -366,7 +375,7 @@ g_credentials_set_native (GCredentials  
                            GCredentialsType  native_type,
                            gpointer          native)
  {
@@ -70,7 +70,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
    if (native_type != G_CREDENTIALS_TYPE_LINUX_UCRED)
      {
        g_warning ("g_credentials_set_native: Trying to set credentials of type %d "
-@@ -337,7 +346,7 @@ g_credentials_set_native (GCredentials  
+@@ -375,7 +384,7 @@ g_credentials_set_native (GCredentials  
      }
    else
      {
@@ -79,7 +79,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
      }
  #elif defined(__FreeBSD__)
    if (native_type != G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED)
-@@ -384,7 +393,7 @@ g_credentials_get_unix_user (GCredential
+@@ -433,7 +442,7 @@ g_credentials_get_unix_user (GCredential
    g_return_val_if_fail (G_IS_CREDENTIALS (credentials), -1);
    g_return_val_if_fail (error == NULL || *error == NULL, -1);
  
@@ -88,7 +88,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
    ret = credentials->native.uid;
  #elif defined(__FreeBSD__)
    ret = credentials->native.cmcred_euid;
-@@ -428,7 +437,7 @@ g_credentials_set_unix_user (GCredential
+@@ -479,7 +488,7 @@ g_credentials_set_unix_user (GCredential
    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
  
    ret = FALSE;
diff --git a/devel/glib2/patches/patch-ba b/devel/glib2/patches/patch-ba
index f81884e713b..40309271fb8 100644
--- a/devel/glib2/patches/patch-ba
+++ b/devel/glib2/patches/patch-ba
@@ -1,10 +1,10 @@
-$NetBSD: patch-ba,v 1.7 2009/05/20 13:07:36 wiz Exp $
+$NetBSD: patch-ba,v 1.8 2012/01/29 10:46:54 drochner Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=583330
 
---- gio/gunixmounts.c.orig	2009-03-13 00:09:53.000000000 -0400
+--- gio/gunixmounts.c.orig	2011-10-14 03:47:57.000000000 +0000
 +++ gio/gunixmounts.c
-@@ -136,6 +136,9 @@ struct _GUnixMountMonitor {
+@@ -153,6 +153,9 @@ struct _GUnixMountMonitor {
  
    GFileMonitor *fstab_monitor;
    GFileMonitor *mtab_monitor;
@@ -14,7 +14,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
  };
  
  struct _GUnixMountMonitorClass {
-@@ -147,6 +150,8 @@ static GUnixMountMonitor *the_mount_moni
+@@ -164,6 +167,8 @@ static GUnixMountMonitor *the_mount_moni
  static GList *_g_get_unix_mounts (void);
  static GList *_g_get_unix_mount_points (void);
  
@@ -23,15 +23,15 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
  G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
  
  #define MOUNT_POLL_INTERVAL 4000
-@@ -173,6 +178,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
+@@ -190,6 +195,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
  #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>
-@@ -223,20 +229,28 @@ g_unix_is_mount_path_system_internal (co
+@@ -240,22 +246,30 @@ g_unix_is_mount_path_system_internal (co
      "/",              /* we already have "Filesystem root" in Nautilus */ 
      "/bin",
      "/boot",
@@ -43,6 +43,8 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
      "/lib",
      "/lib64",
 +    "/libexec",
+     "/live/cow",
+     "/live/image",
      "/media",
      "/mnt",
      "/opt",
@@ -58,21 +60,9 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
 +    "/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 */
-@@ -570,7 +584,11 @@ get_mtab_monitor_file (void)
- static GList *
- _g_get_unix_mounts (void)
- {
-+#ifdef __NetBSD__
-+  struct statvfs *mntent = NULL;
-+#else
-   struct statfs *mntent = NULL;
-+#endif
-   int num_mounts, i;
-   GUnixMountEntry *mount_entry;
-   GList *return_list;
-@@ -587,8 +605,18 @@ _g_get_unix_mounts (void)
+     "/var/crash",
+     "/var/local",
+@@ -634,9 +648,15 @@ _g_get_unix_mounts (void)
        
        mount_entry->mount_path = g_strdup (mntent[i].f_mntonname);
        mount_entry->device_path = g_strdup (mntent[i].f_mntfromname);
@@ -81,17 +71,14 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
 +#else
        mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename);
 +#endif
-+#if defined(__NetBSD__)
-+      if (mntent[i].f_flag & MNT_RDONLY)
+ #if defined(HAVE_GETVFSSTAT)
+       if (mntent[i].f_flag & ST_RDONLY)
 +#elif defined(__digital__)
 +      if (mntent[i].f_flags & M_RDONLY)
-+#else
+ #elif defined(HAVE_GETFSSTAT)
        if (mntent[i].f_flags & MNT_RDONLY)
-+#endif
- 	mount_entry->is_read_only = TRUE;
- 
-       mount_entry->is_system_internal =
-@@ -1056,6 +1084,10 @@ get_mounts_timestamp (void)
+ #endif
+@@ -1111,6 +1131,10 @@ get_mounts_timestamp (void)
        if (stat (monitor_file, &buf) == 0)
  	return (guint64)buf.st_mtime;
      }
@@ -102,7 +89,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
    return 0;
  }
  
-@@ -1196,6 +1228,13 @@ g_unix_mount_monitor_finalize (GObject *
+@@ -1253,6 +1277,13 @@ g_unix_mount_monitor_finalize (GObject *
        g_object_unref (monitor->mtab_monitor);
      }
  
@@ -116,7 +103,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
    the_mount_monitor = NULL;
  
    G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
-@@ -1276,6 +1315,51 @@ mtab_file_changed (GFileMonitor      *mo
+@@ -1333,6 +1364,51 @@ mtab_file_changed (GFileMonitor      *mo
    g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
  }
  
@@ -168,7 +155,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
  static void
  g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
  {
-@@ -1298,6 +1382,12 @@ g_unix_mount_monitor_init (GUnixMountMon
+@@ -1355,6 +1431,12 @@ g_unix_mount_monitor_init (GUnixMountMon
        
        g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
      }
diff --git a/devel/glib2/patches/patch-ce b/devel/glib2/patches/patch-ce
index 01927102ab7..95e811ebc2a 100644
--- a/devel/glib2/patches/patch-ce
+++ b/devel/glib2/patches/patch-ce
@@ -1,12 +1,12 @@
-$NetBSD: patch-ce,v 1.2 2010/11/02 14:52:24 drochner Exp $
+$NetBSD: patch-ce,v 1.3 2012/01/29 10:46:54 drochner Exp $
 
---- glib/gatomic-gcc.c.orig	2010-09-13 15:57:51.000000000 +0000
-+++ glib/gatomic-gcc.c
-@@ -21,6 +21,7 @@
+--- glib/gatomic.c.orig	2011-10-14 03:47:57.000000000 +0000
++++ glib/gatomic.c
+@@ -22,6 +22,7 @@
  #include "config.h"
  
  #include "gatomic.h"
 +#include "gthreadprivate.h"
  
- gint
- g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
+ /**
+  * SECTION:atomic_operations
diff --git a/devel/glib2/patches/patch-cj b/devel/glib2/patches/patch-cj
index 17d9793212c..d88dbfec438 100644
--- a/devel/glib2/patches/patch-cj
+++ b/devel/glib2/patches/patch-cj
@@ -1,22 +1,22 @@
-$NetBSD: patch-cj,v 1.5 2011/06/09 11:16:38 drochner Exp $
+$NetBSD: patch-cj,v 1.6 2012/01/29 10:46:54 drochner 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	2011-06-05 23:24:51.000000000 +0000
+--- glib/tests/Makefile.in.orig	2011-10-14 13:31:09.000000000 +0000
 +++ glib/tests/Makefile.in
-@@ -59,7 +59,7 @@ am__EXEEXT_1 = testing$(EXEEXT) option-c
- 	string$(EXEEXT) markup-parse$(EXEEXT) markup-collect$(EXEEXT) \
- 	markup-escape$(EXEEXT) markup-subparser$(EXEEXT) \
- 	array-test$(EXEEXT) hostutils$(EXEEXT) gvariant$(EXEEXT) \
--	mem-overflow$(EXEEXT) utf8-performance$(EXEEXT) utils$(EXEEXT) \
-+	utf8-performance$(EXEEXT) utils$(EXEEXT) \
- 	regex$(EXEEXT) base64$(EXEEXT) sequence$(EXEEXT) \
- 	scannerapi$(EXEEXT) shell$(EXEEXT) collate$(EXEEXT) \
- 	utf8-pointer$(EXEEXT) utf8-validate$(EXEEXT) \
-@@ -139,8 +139,6 @@ markup_parse_DEPENDENCIES = $(progs_ldad
+@@ -69,7 +69,7 @@ am__EXEEXT_2 = testing$(EXEEXT) option-c
+ 	strfuncs$(EXEEXT) string$(EXEEXT) markup-parse$(EXEEXT) \
+ 	markup-collect$(EXEEXT) markup-escape$(EXEEXT) \
+ 	markup-subparser$(EXEEXT) array-test$(EXEEXT) \
+-	hostutils$(EXEEXT) gvariant$(EXEEXT) mem-overflow$(EXEEXT) \
++	hostutils$(EXEEXT) gvariant$(EXEEXT) \
+ 	utf8-performance$(EXEEXT) utils$(EXEEXT) regex$(EXEEXT) \
+ 	base64$(EXEEXT) sequence$(EXEEXT) scannerapi$(EXEEXT) \
+ 	shell$(EXEEXT) collate$(EXEEXT) utf8-pointer$(EXEEXT) \
+@@ -173,8 +173,6 @@ markup_parse_DEPENDENCIES = $(progs_ldad
  markup_subparser_SOURCES = markup-subparser.c
  markup_subparser_OBJECTS = markup-subparser.$(OBJEXT)
  markup_subparser_DEPENDENCIES = $(progs_ldadd)
@@ -25,34 +25,34 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  mem_overflow_DEPENDENCIES = $(progs_ldadd)
  node_SOURCES = node.c
  node_OBJECTS = node.$(OBJEXT)
-@@ -242,7 +240,7 @@ SOURCES = array-test.c base64.c bookmark
- 	$(fileutils_SOURCES) $(gdatetime_SOURCES) gvariant.c hash.c \
- 	hostutils.c $(keyfile_SOURCES) list.c logging.c \
+@@ -293,7 +291,7 @@ SOURCES = array-test.c atomic.c base64.c
+ 	$(gdatetime_SOURCES) gvariant.c hash.c hmac.c hostutils.c \
+ 	$(keyfile_SOURCES) list.c logging.c mappedfile.c \
  	markup-collect.c markup-escape.c markup-parse.c \
 -	markup-subparser.c mem-overflow.c node.c \
 +	markup-subparser.c node.c \
- 	$(option_context_SOURCES) pattern.c $(protocol_SOURCES) \
- 	queue.c $(rand_SOURCES) regex.c scannerapi.c sequence.c \
- 	shell.c slist.c $(strfuncs_SOURCES) $(string_SOURCES) \
-@@ -254,7 +252,7 @@ DIST_SOURCES = array-test.c base64.c boo
- 	$(fileutils_SOURCES) $(gdatetime_SOURCES) gvariant.c hash.c \
- 	hostutils.c $(keyfile_SOURCES) list.c logging.c \
+ 	$(option_argv0_SOURCES) $(option_context_SOURCES) pattern.c \
+ 	$(protocol_SOURCES) queue.c $(rand_SOURCES) regex.c \
+ 	scannerapi.c sequence.c shell.c slist.c sort.c \
+@@ -308,7 +306,7 @@ DIST_SOURCES = array-test.c atomic.c bas
+ 	$(gdatetime_SOURCES) gvariant.c hash.c hmac.c hostutils.c \
+ 	$(keyfile_SOURCES) list.c logging.c mappedfile.c \
  	markup-collect.c markup-escape.c markup-parse.c \
 -	markup-subparser.c mem-overflow.c node.c \
 +	markup-subparser.c node.c \
- 	$(option_context_SOURCES) pattern.c $(protocol_SOURCES) \
- 	queue.c $(rand_SOURCES) regex.c scannerapi.c sequence.c \
- 	shell.c slist.c $(strfuncs_SOURCES) $(string_SOURCES) \
-@@ -507,7 +505,7 @@ EXTRA_DIST = 4096-random-bytes keyfilete
- TEST_PROGS = testing option-context keyfile fileutils test-printf \
- 	protocol rand strfuncs string markup-parse markup-collect \
- 	markup-escape markup-subparser array-test hostutils gvariant \
--	mem-overflow utf8-performance utils regex base64 sequence \
-+	utf8-performance utils regex base64 sequence \
- 	scannerapi shell collate utf8-pointer utf8-validate utf8-misc \
- 	checksum hash date node convert list slist queue tree uri dir \
- 	pattern logging error bookmarkfile gdatetime timeout \
-@@ -692,9 +690,6 @@ markup-parse$(EXEEXT): $(markup_parse_OB
+ 	$(option_argv0_SOURCES) $(option_context_SOURCES) pattern.c \
+ 	$(protocol_SOURCES) queue.c $(rand_SOURCES) regex.c \
+ 	scannerapi.c sequence.c shell.c slist.c sort.c \
+@@ -567,7 +565,7 @@ EXTRA_DIST = 4096-random-bytes keyfilete
+ TEST_PROGS = testing option-context option-argv0 keyfile fileutils \
+ 	test-printf protocol rand strfuncs string markup-parse \
+ 	markup-collect markup-escape markup-subparser array-test \
+-	hostutils gvariant mem-overflow utf8-performance utils regex \
++	hostutils gvariant utf8-performance utils regex \
+ 	base64 sequence scannerapi shell collate utf8-pointer \
+ 	utf8-validate utf8-misc unicode checksum hmac hash cache date \
+ 	node convert list slist queue tree uri dir pattern logging \
+@@ -785,9 +783,6 @@ markup-parse$(EXEEXT): $(markup_parse_OB
  markup-subparser$(EXEEXT): $(markup_subparser_OBJECTS) $(markup_subparser_DEPENDENCIES) 
  	@rm -f markup-subparser$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(markup_subparser_OBJECTS) $(markup_subparser_LDADD) $(LIBS)
@@ -62,11 +62,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  node$(EXEEXT): $(node_OBJECTS) $(node_DEPENDENCIES) 
  	@rm -f node$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(node_OBJECTS) $(node_LDADD) $(LIBS)
-@@ -793,7 +788,6 @@ distclean-compile:
+@@ -907,7 +902,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@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem-overflow.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/option-argv0.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/option-context.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern.Po@am__quote@
diff --git a/devel/glib2/patches/patch-cl b/devel/glib2/patches/patch-cl
index f1cd8678e8a..029c55671e0 100644
--- a/devel/glib2/patches/patch-cl
+++ b/devel/glib2/patches/patch-cl
@@ -1,16 +1,16 @@
-$NetBSD: patch-cl,v 1.1 2011/10/09 19:40:02 jmmv Exp $
+$NetBSD: patch-cl,v 1.2 2012/01/29 10:46:54 drochner Exp $
 
---- gio/Makefile.am.orig	2011-10-09 17:21:29.000000000 +0000
+--- gio/Makefile.am.orig	2011-10-14 03:47:57.000000000 +0000
 +++ gio/Makefile.am
-@@ -632,12 +632,6 @@ gdbus_LDADD = libgio-2.0.la \
+@@ -633,12 +633,6 @@ gdbus_LDADD = libgio-2.0.la \
  	$(top_builddir)/glib/libglib-2.0.la 		\
  	$(top_builddir)/gobject/libgobject-2.0.la
  
 -completiondir = $(sysconfdir)/bash_completion.d
--completion_SCRIPTS = \
+-completion_DATA = \
 -	gdbus-bash-completion.sh		\
 -	gsettings-bash-completion.sh
--EXTRA_DIST += $(completion_SCRIPTS)
+-EXTRA_DIST += $(completion_DATA)
 -
  # ------------------------------------------------------------------------