Update to glib2-2.29.92 (2.30 coming in the next few days).

Committing now (along with upcoming atk, pango and gtk+3 updates) during
the hackathon where we have time to fix all the eventual fallout (bulk
running).

ok jasper@ robert@

devel/glib2/Makefile

@@ -1,26 +1,26 @@
-# $OpenBSD: Makefile,v 1.130 2011/09/16 09:24:49 espie Exp $
+# $OpenBSD: Makefile,v 1.131 2011/09/20 21:09:34 ajacoutot Exp $
 
 COMMENT-main=		general-purpose utility library
 COMMENT-docs=		glib2 documentation
 
-VERSION=		2.28.8
+VERSION=		2.29.92
 DISTNAME=		glib-${VERSION}
+EXTRACT_SUFX=		.tar.xz
+
 PKGNAME-main=		glib2-${VERSION}
 PKGNAME-docs=		glib2-docs-${VERSION}
 
-REVISION-main=		4
-
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.gtk.org/
 
 MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 
-SHARED_LIBS +=  glib-2.0             2800.0   # 2800.7
+SHARED_LIBS +=  glib-2.0             2992.0   # 2992.0
-SHARED_LIBS +=  gmodule-2.0          2800.0   # 2800.7
+SHARED_LIBS +=  gmodule-2.0          2992.0   # 2992.0
-SHARED_LIBS +=  gthread-2.0          2800.0   # 2800.7
+SHARED_LIBS +=  gthread-2.0          2992.0   # 2992.0
-SHARED_LIBS +=  gobject-2.0          2800.0   # 2800.7
+SHARED_LIBS +=  gobject-2.0          2992.0   # 2992.0
-SHARED_LIBS +=  gio-2.0              2800.0   # 2800.7
+SHARED_LIBS +=  gio-2.0              2992.0   # 2992.0
 
 # LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -29,26 +29,26 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glib/${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}/}
-EXTRACT_SUFX=		.tar.bz2
 
 MULTI_PACKAGES=		-main -docs
 
 MODULES=		devel/gettext \
 			lang/python
 
-# Although gtester-report(1) is a python script we do not want to force
+# Although gtester-report(1) and gdbus-codegen(1) are python scripts, we
-# a dependency on python.
+# do not want to force a dependency on python.
 MODPY_RUNDEP=		No
 # Python is needed for the regress tests.
 MODPY_BUILDDEP=		Yes
 MODPY_ADJ_FILES=	glib/gtester-report \
 			gio/tests/gdbus-testserver.py
 
-WANTLIB-main=		${WANTLIB} c pthread z pcre fam
+WANTLIB-main += ${WANTLIB} c pthread z pcre fam ffi
 
 LIB_DEPENDS-main=	${LIB_DEPENDS} \
-			devel/pcre>=8.12 \
+			devel/pcre>=8.13 \
-			sysutils/gamin,no_server,no_python
+			sysutils/gamin,no_server,no_python \
+			devel/libffi
 
 PKG_ARCH-docs=		*
 WANTLIB-docs=
@@ -75,12 +75,15 @@ CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 			--disable-gtk-doc \
 			--disable-Bsymbolic \
 			--disable-selinux \
+			--disable-systemtap \
 			--disable-xattr
 
 # OpenBSD has support for monotonic clock (CLOCK_MONOTONIC), however we
 # currently don't have most of the _POSIX_* defines in unistd.h (e.g.
 # _POSIX_MONOTONIC_CLOCK 200112L) and the associated sysconf(3)
 # _SC_MONOTONIC_CLOCK variable.
+# (see also: patches/patch-glib_gmain_c
+#            patches/patch-gthread_gthread-posix_c)
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include \
 				-D_POSIX_MONOTONIC_CLOCK=200112L" \
 			LDFLAGS="-L${LOCALBASE}/lib -pthread"

devel/glib2/distinfo

@@ -1,5 +1,5 @@
-MD5 (glib-2.28.8.tar.bz2) = eJ51IPccakvwi8aD7HZNJA==
+MD5 (glib-2.29.92.tar.xz) = cKysLzJG5Ib/qr67cx2Oag==
-RMD160 (glib-2.28.8.tar.bz2) = 8IenFEXrQPrl6rRaFMt01OI51eY=
+RMD160 (glib-2.29.92.tar.xz) = YTiDzUDoKtVKIDDm7DmNrTeqAwM=
-SHA1 (glib-2.28.8.tar.bz2) = IM1jcFqIBSYNoDIMZbl5Iz8uPBg=
+SHA1 (glib-2.29.92.tar.xz) = +PFrArANmzT7W99iu1GPqQXRwNc=
-SHA256 (glib-2.28.8.tar.bz2) = Ii8wVdbEE0F7UJAQCMZUhl5aMRxz8K6RiwqZeNH5Rm8=
+SHA256 (glib-2.29.92.tar.xz) = H2jXmQ0DpSz4EoTwOd6UsEHD9es9U2YxZrMeR3VX6LE=
-SIZE (glib-2.28.8.tar.bz2) = 7017806
+SIZE (glib-2.29.92.tar.xz) = 5712428

devel/glib2/patches/patch-gio_gcredentials_c

@@ -1,133 +0,0 @@
-$OpenBSD: patch-gio_gcredentials_c,v 1.2 2011/05/28 07:32:06 ajacoutot Exp $
-
-From 77f4f5aa02458e6c7f909dc6087a39d9b75d0ba6 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@openbsd.org>
-Date: Fri, 27 May 2011 13:51:08 +0000
-Subject: Add glib credentials support to OpenBSD.
-
---- gio/gcredentials.c.orig	Fri Nov 12 14:52:52 2010
-+++ gio/gcredentials.c	Wed Dec  8 08:36:10 2010
-@@ -27,6 +27,11 @@
- #include <sys/socket.h>
- #include <string.h>
- #endif
-+#ifdef __OpenBSD__
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <string.h>
-+#endif
- #include <stdlib.h>
- 
- #include <gobject/gvaluecollector.h>
-@@ -63,6 +68,9 @@
-  *
-  * On FreeBSD, the native credential type is a <type>struct cmsgcred</type>.
-  * This corresponds to %G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED.
-+ *
-+ * On OpenBSD, the native credential type is a <type>struct sockpeercred</type>.
-+ * This corresponds to %G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED.
-  */
- 
- /**
-@@ -82,6 +90,8 @@ struct _GCredentials
-   struct ucred native;
- #elif defined(__FreeBSD__)
-   struct cmsgcred native;
-+#elif defined(__OpenBSD__)
-+  struct sockpeercred native;
- #else
- #ifdef __GNUC__
- #warning Please add GCredentials support for your OS
-@@ -135,6 +145,10 @@ g_credentials_init (GCredentials *credentials)
-   credentials->native.cmcred_pid  = getpid ();
-   credentials->native.cmcred_euid = geteuid ();
-   credentials->native.cmcred_gid  = getegid ();
-+#elif defined(__OpenBSD__)
-+  credentials->native.pid = getpid ();
-+  credentials->native.uid = geteuid ();
-+  credentials->native.gid = getegid ();
- #endif
- }
- 
-@@ -196,6 +210,16 @@ g_credentials_to_string (GCredentials *credentials)
-     g_string_append_printf (ret, "uid=%" G_GINT64_FORMAT ",", (gint64) credentials->native.cmcred_euid);
-   if (credentials->native.cmcred_gid != -1)
-     g_string_append_printf (ret, "gid=%" G_GINT64_FORMAT ",", (gint64) credentials->native.cmcred_gid);
-+#elif defined(__OpenBSD__)
-+  g_string_append (ret, "openbsd-sockpeercred:");
-+  if (credentials->native.pid != -1)
-+    g_string_append_printf (ret, "pid=%" G_GINT64_FORMAT ",", (gint64) credentials->native.pid);
-+  if (credentials->native.uid != -1)
-+    g_string_append_printf (ret, "uid=%" G_GINT64_FORMAT ",", (gint64) credentials->native.uid);
-+  if (credentials->native.gid != -1)
-+    g_string_append_printf (ret, "gid=%" G_GINT64_FORMAT ",", (gint64) credentials->native.gid);
-+  if (ret->str[ret->len - 1] == ',')
-+    ret->str[ret->len - 1] = '\0';
- #else
-   g_string_append (ret, "unknown");
- #endif
-@@ -239,6 +263,9 @@ g_credentials_is_same_user (GCredentials  *credentials
- #elif defined(__FreeBSD__)
-   if (credentials->native.cmcred_euid == other_credentials->native.cmcred_euid)
-     ret = TRUE;
-+#elif defined(__OpenBSD__)
-+  if (credentials->native.uid == other_credentials->native.uid)
-+    ret = TRUE;
- #else
-   g_set_error_literal (error,
-                        G_IO_ERROR,
-@@ -300,6 +327,17 @@ g_credentials_get_native (GCredentials     *credential
-     {
-       ret = &credentials->native;
-     }
-+#elif defined(__OpenBSD__)
-+  if (native_type != G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED)
-+    {
-+      g_warning ("g_credentials_get_native: Trying to get credentials of type %d but only "
-+                 "G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED is supported.",
-+                 native_type);
-+    }
-+  else
-+    {
-+      ret = &credentials->native;
-+    }
- #else
-   g_warning ("g_credentials_get_native: Trying to get credentials but GLib has no support "
-              "for the native credentials type. Please add support.");
-@@ -350,6 +388,17 @@ g_credentials_set_native (GCredentials     *credential
-     {
-       memcpy (&credentials->native, native, sizeof (struct cmsgcred));
-     }
-+#elif defined(__OpenBSD__)
-+  if (native_type != G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED)
-+    {
-+      g_warning ("g_credentials_set_native: Trying to set credentials of type %d "
-+                 "but only G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED is supported.",
-+                 native_type);
-+    }
-+  else
-+    {
-+      memcpy (&credentials->native, native, sizeof (struct sockpeercred));
-+    }
- #else
-   g_warning ("g_credentials_set_native: Trying to set credentials but GLib has no support "
-              "for the native credentials type. Please add support.");
-@@ -388,6 +437,8 @@ g_credentials_get_unix_user (GCredentials    *credenti
-   ret = credentials->native.uid;
- #elif defined(__FreeBSD__)
-   ret = credentials->native.cmcred_euid;
-+#elif defined(__OpenBSD__)
-+  ret = credentials->native.uid;
- #else
-   ret = -1;
-   g_set_error_literal (error,
-@@ -433,6 +484,9 @@ g_credentials_set_unix_user (GCredentials    *credenti
-   ret = TRUE;
- #elif defined(__FreeBSD__)
-   credentials->native.cmcred_euid = uid;
-+  ret = TRUE;
-+#elif defined(__OpenBSD__)
-+  credentials->native.uid = uid;
-   ret = TRUE;
- #else
-   g_set_error_literal (error,

devel/glib2/patches/patch-gio_gdbusauth_c

@@ -1,34 +0,0 @@
-$OpenBSD: patch-gio_gdbusauth_c,v 1.1 2011/05/28 07:32:06 ajacoutot Exp $
-
-From 77f4f5aa02458e6c7f909dc6087a39d9b75d0ba6 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@openbsd.org>
-Date: Fri, 27 May 2011 13:51:08 +0000
-Subject: Add glib credentials support to OpenBSD.
-
---- gio/gdbusauth.c.orig	Sat May 21 05:29:51 2011
-+++ gio/gdbusauth.c	Fri May 27 15:42:09 2011
-@@ -612,7 +612,7 @@ _g_dbus_auth_run_client (GDBusAuth     *auth,
-   g_data_input_stream_set_newline_type (dis, G_DATA_STREAM_NEWLINE_TYPE_CR_LF);
- 
- #ifdef G_OS_UNIX
--  if (G_IS_UNIX_CONNECTION (auth->priv->stream) && g_unix_credentials_message_is_supported ())
-+  if (G_IS_UNIX_CONNECTION (auth->priv->stream))
-     {
-       credentials = g_credentials_new ();
-       if (!g_unix_connection_send_credentials (G_UNIX_CONNECTION (auth->priv->stream),
-@@ -989,13 +989,13 @@ _g_dbus_auth_run_server (GDBusAuth              *auth,
- 
-   /* first read the NUL-byte (TODO: read credentials if using a unix domain socket) */
- #ifdef G_OS_UNIX
--  if (G_IS_UNIX_CONNECTION (auth->priv->stream) && g_unix_credentials_message_is_supported ())
-+  if (G_IS_UNIX_CONNECTION (auth->priv->stream))
-     {
-       local_error = NULL;
-       credentials = g_unix_connection_receive_credentials (G_UNIX_CONNECTION (auth->priv->stream),
-                                                            cancellable,
-                                                            &local_error);
--      if (credentials == NULL)
-+      if (credentials == NULL && !g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
-         {
-           g_propagate_error (error, local_error);
-           goto out;

devel/glib2/patches/patch-gio_gioenums_h

@@ -1,27 +0,0 @@
-$OpenBSD: patch-gio_gioenums_h,v 1.2 2011/05/28 07:32:06 ajacoutot Exp $
-
-From 77f4f5aa02458e6c7f909dc6087a39d9b75d0ba6 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@openbsd.org>
-Date: Fri, 27 May 2011 13:51:08 +0000
-Subject: Add glib credentials support to OpenBSD.
-
---- gio/gioenums.h.orig	Sat May 21 05:29:24 2011
-+++ gio/gioenums.h	Fri May 27 15:47:24 2011
-@@ -1214,6 +1214,7 @@ typedef enum
-  * @G_CREDENTIALS_TYPE_INVALID: Indicates an invalid native credential type.
-  * @G_CREDENTIALS_TYPE_LINUX_UCRED: The native credentials type is a <type>struct ucred</type>.
-  * @G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED: The native credentials type is a <type>struct cmsgcred</type>.
-+ * @G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED: The native credentials type is a <type>struct sockpeercred</type>. Added in 2.30.
-  *
-  * Enumeration describing different kinds of native credential types.
-  *
-@@ -1223,7 +1224,8 @@ typedef enum
- {
-   G_CREDENTIALS_TYPE_INVALID,
-   G_CREDENTIALS_TYPE_LINUX_UCRED,
--  G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED
-+  G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
-+  G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED
- } GCredentialsType;
- 
- /**

devel/glib2/patches/patch-gio_gioenumtypes_c

@@ -1,17 +0,0 @@
-$OpenBSD: patch-gio_gioenumtypes_c,v 1.2 2011/05/28 07:32:06 ajacoutot Exp $
-
-From 77f4f5aa02458e6c7f909dc6087a39d9b75d0ba6 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@openbsd.org>
-Date: Fri, 27 May 2011 13:51:08 +0000
-Subject: Add glib credentials support to OpenBSD.
-
---- gio/gioenumtypes.c.orig	Sat May 21 06:17:13 2011
-+++ gio/gioenumtypes.c	Thu May 26 08:40:57 2011
-@@ -1161,6 +1161,7 @@ g_credentials_type_get_type (void)
-         { G_CREDENTIALS_TYPE_INVALID, "G_CREDENTIALS_TYPE_INVALID", "invalid" },
-         { G_CREDENTIALS_TYPE_LINUX_UCRED, "G_CREDENTIALS_TYPE_LINUX_UCRED", "linux-ucred" },
-         { G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED, "G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED", "freebsd-cmsgcred" },
-+        { G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED, "G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED", "openbsd-sockpeercred" },
-         { 0, NULL, NULL }
-       };
-       GType g_define_type_id =

devel/glib2/patches/patch-gio_gnetworkingprivate_h

@@ -1,31 +0,0 @@
-$OpenBSD: patch-gio_gnetworkingprivate_h,v 1.2 2011/05/27 09:13:09 ajacoutot Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=651223
-
---- gio/gnetworkingprivate.h.orig	Tue Sep 28 15:25:02 2010
-+++ gio/gnetworkingprivate.h	Tue Sep 28 15:26:25 2010
-@@ -49,11 +49,6 @@
- #endif
- 
- #include <sys/types.h>
--#include <arpa/inet.h>
--#include <arpa/nameser.h>
--#if defined(HAVE_ARPA_NAMESER_COMPAT_H) && !defined(GETSHORT)
--#include <arpa/nameser_compat.h>
--#endif
- 
- #ifndef T_SRV
- #define T_SRV 33
-@@ -71,6 +66,12 @@
- #include <resolv.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-+
-+#include <arpa/inet.h>
-+#include <arpa/nameser.h>
-+#if defined(HAVE_ARPA_NAMESER_COMPAT_H) && !defined(GETSHORT)
-+#include <arpa/nameser_compat.h>
-+#endif
- 
- #ifndef _PATH_RESCONF
- #define _PATH_RESCONF "/etc/resolv.conf"

devel/glib2/patches/patch-gio_gsocket_c

@@ -1,40 +0,0 @@
-$OpenBSD: patch-gio_gsocket_c,v 1.1 2011/05/28 07:32:06 ajacoutot Exp $
-
-From 77f4f5aa02458e6c7f909dc6087a39d9b75d0ba6 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@openbsd.org>
-Date: Fri, 27 May 2011 13:51:08 +0000
-Subject: Add glib credentials support to OpenBSD.
-
---- gio/gsocket.c.orig	Sat May 21 05:29:24 2011
-+++ gio/gsocket.c	Fri May 27 15:43:31 2011
-@@ -3514,11 +3514,16 @@ g_socket_get_credentials (GSocket   *socket,
- 
-   ret = NULL;
- 
--#ifdef __linux__
-+#if defined(__linux__) || defined(__OpenBSD__)
-   {
--    struct ucred native_creds;
-     socklen_t optlen;
-+#if defined(__linux__)
-+    struct ucred native_creds;
-     optlen = sizeof (struct ucred);
-+#elif defined(__OpenBSD__)
-+    struct sockpeercred native_creds;
-+    optlen = sizeof (struct sockpeercred);
-+#endif
-     if (getsockopt (socket->priv->fd,
-                     SOL_SOCKET,
-                     SO_PEERCRED,
-@@ -3536,7 +3541,11 @@ g_socket_get_credentials (GSocket   *socket,
-       {
-         ret = g_credentials_new ();
-         g_credentials_set_native (ret,
-+#if defined(__linux__)
-                                   G_CREDENTIALS_TYPE_LINUX_UCRED,
-+#elif defined(__OpenBSD__)
-+                                  G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED,
-+#endif
-                                   &native_creds);
-       }
-   }

devel/glib2/patches/patch-gio_gunixconnection_c

@@ -1,119 +0,0 @@
-$OpenBSD: patch-gio_gunixconnection_c,v 1.3 2011/05/28 07:32:06 ajacoutot Exp $
-
-From 77f4f5aa02458e6c7f909dc6087a39d9b75d0ba6 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@openbsd.org>
-Date: Fri, 27 May 2011 13:51:08 +0000
-Subject: Add glib credentials support to OpenBSD.
-
---- gio/gunixconnection.c.orig	Sat May 21 05:29:24 2011
-+++ gio/gunixconnection.c	Fri May 27 15:57:02 2011
-@@ -334,6 +334,7 @@ g_unix_connection_send_credentials (GUnixConnection   
-   gboolean ret;
-   GOutputVector vector;
-   guchar nul_byte[1] = {'\0'};
-+  gint num_messages;
- 
-   g_return_val_if_fail (G_IS_UNIX_CONNECTION (connection), FALSE);
-   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-@@ -344,14 +345,25 @@ g_unix_connection_send_credentials (GUnixConnection   
- 
-   vector.buffer = &nul_byte;
-   vector.size = 1;
--  scm = g_unix_credentials_message_new_with_credentials (credentials);
-+
-+  if (g_unix_credentials_message_is_supported ())
-+    {
-+      scm = g_unix_credentials_message_new_with_credentials (credentials);
-+      num_messages = 1;
-+    }
-+  else
-+    {
-+      scm = NULL;
-+      num_messages = 0;
-+    }
-+
-   g_object_get (connection, "socket", &socket, NULL);
-   if (g_socket_send_message (socket,
-                              NULL, /* address */
-                              &vector,
-                              1,
-                              &scm,
--                             1,
-+                             num_messages,
-                              G_SOCKET_MSG_NONE,
-                              cancellable,
-                              error) != 1)
-@@ -364,7 +376,8 @@ g_unix_connection_send_credentials (GUnixConnection   
- 
-  out:
-   g_object_unref (socket);
--  g_object_unref (scm);
-+  if (scm != NULL)
-+    g_object_unref (scm);
-   g_object_unref (credentials);
-   return ret;
- }
-@@ -497,27 +510,46 @@ g_unix_connection_receive_credentials (GUnixConnection
-       goto out;
-     }
- 
--  if (nscm != 1)
-+  if (g_unix_credentials_message_is_supported ())
-     {
--      g_set_error (error,
--                   G_IO_ERROR,
--                   G_IO_ERROR_FAILED,
--		   _("Expecting 1 control message, got %d"),
--                   nscm);
--      goto out;
--    }
-+      if (nscm != 1)
-+        {
-+          g_set_error (error,
-+                       G_IO_ERROR,
-+                       G_IO_ERROR_FAILED,
-+                       _("Expecting 1 control message, got %d"),
-+                       nscm);
-+          goto out;
-+        }
- 
--  if (!G_IS_UNIX_CREDENTIALS_MESSAGE (scms[0]))
-+      if (!G_IS_UNIX_CREDENTIALS_MESSAGE (scms[0]))
-+        {
-+          g_set_error_literal (error,
-+                               G_IO_ERROR,
-+                               G_IO_ERROR_FAILED,
-+                               _("Unexpected type of ancillary data"));
-+          goto out;
-+        }
-+
-+      ret = g_unix_credentials_message_get_credentials (G_UNIX_CREDENTIALS_MESSAGE (scms[0]));
-+      g_object_ref (ret);
-+    }
-+  else
-     {
--      g_set_error_literal (error,
--                           G_IO_ERROR,
--                           G_IO_ERROR_FAILED,
--			   _("Unexpected type of ancillary data"));
--      goto out;
-+      if (nscm != 0)
-+        {
-+          g_set_error (error,
-+                       G_IO_ERROR,
-+                       G_IO_ERROR_FAILED,
-+                       _("Not expecting control message, but got %d"),
-+                       nscm);
-+          goto out;
-+        }
-+      else
-+        {
-+          ret = g_socket_get_credentials (socket, error);
-+        }
-     }
--
--  ret = g_unix_credentials_message_get_credentials (G_UNIX_CREDENTIALS_MESSAGE (scms[0]));
--  g_object_ref (ret);
- 
-  out:
- 

devel/glib2/patches/patch-gio_gunixmounts_c

@@ -1,12 +1,17 @@
-$OpenBSD: patch-gio_gunixmounts_c,v 1.3 2011/03/07 19:17:14 ajacoutot Exp $
+$OpenBSD: patch-gio_gunixmounts_c,v 1.4 2011/09/20 21:09:34 ajacoutot Exp $
 
 https://bugzilla.gnome.org/show_bug.cgi?id=583330
 From FreeBSD: poll the list of mounted filesystems since we can't rely
 on checking for mtab updates like other systems.
 
---- gio/gunixmounts.c.orig	Fri Jan  7 17:55:29 2011
+From 0db338bdb0e9a0216681b6db7286ffb0f1711db1 Mon Sep 17 00:00:00 2001
-+++ gio/gunixmounts.c	Mon Jan 31 10:14:44 2011
+From: Antoine Jacoutot <ajacoutot@openbsd.org>
-@@ -135,6 +135,9 @@ struct _GUnixMountMonitor {
+Date: Mon, 19 Sep 2011 23:18:45 +0000
+Subject: gunixmounts: Fix compilation on BSD
+
+--- gio/gunixmounts.c.orig	Thu Sep 15 02:10:44 2011
++++ gio/gunixmounts.c	Tue Sep 20 01:14:25 2011
+@@ -153,6 +153,9 @@ struct _GUnixMountMonitor {
  
    GFileMonitor *fstab_monitor;
    GFileMonitor *mtab_monitor;
@@ -16,7 +21,7 @@ on checking for mtab updates like other systems.
  };
  
  struct _GUnixMountMonitorClass {
-@@ -146,6 +149,8 @@ static GUnixMountMonitor *the_mount_monitor = NULL;
+@@ -164,6 +167,8 @@ static GUnixMountMonitor *the_mount_monitor = NULL;
  static GList *_g_get_unix_mounts (void);
  static GList *_g_get_unix_mount_points (void);
  
@@ -25,15 +30,15 @@ on checking for mtab updates like other systems.
  G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
  
  #define MOUNT_POLL_INTERVAL 4000
-@@ -172,6 +177,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor
+@@ -190,6 +195,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor
  #endif
  
- #if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
+ #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
 +#include <sys/param.h>
  #include <sys/ucred.h>
  #include <sys/mount.h>
  #include <fstab.h>
-@@ -222,20 +228,28 @@ g_unix_is_mount_path_system_internal (const char *moun
+@@ -240,11 +246,14 @@ g_unix_is_mount_path_system_internal (const char *moun
      "/",              /* we already have "Filesystem root" in Nautilus */ 
      "/bin",
      "/boot",
@@ -45,12 +50,10 @@ on checking for mtab updates like other systems.
      "/lib",
      "/lib64",
 +    "/libexec",
+     "/live/cow",
+     "/live/image",
      "/media",
-     "/mnt",
+@@ -255,7 +264,12 @@ g_unix_is_mount_path_system_internal (const char *moun
-     "/opt",
-+    "/rescue",
-     "/root",
-     "/sbin",
      "/srv",
      "/tmp",
      "/usr",
@@ -58,11 +61,20 @@ on checking for mtab updates like other systems.
      "/usr/local",
 +    "/usr/obj",
 +    "/usr/ports",
++    "/usr/xobj",
 +    "/usr/src",
      "/var",
-     "/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */
+     "/var/crash",
-     "/var/tmp",       /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */
+     "/var/local",
-@@ -1056,6 +1070,10 @@ get_mounts_timestamp (void)
+@@ -1023,6 +1037,7 @@ _g_get_unix_mount_points (void)
+   GList *return_list;
+ #ifdef HAVE_SYS_SYSCTL_H
+   int usermnt = 0;
++  size_t len = sizeof(usermnt);
+   struct stat sb;
+ #endif
+   
+@@ -1108,6 +1123,10 @@ get_mounts_timestamp (void)
        if (stat (monitor_file, &buf) == 0)
  	return (guint64)buf.st_mtime;
      }
@@ -73,7 +85,7 @@ on checking for mtab updates like other systems.
    return 0;
  }
  
-@@ -1198,6 +1216,13 @@ g_unix_mount_monitor_finalize (GObject *object)
+@@ -1250,6 +1269,13 @@ g_unix_mount_monitor_finalize (GObject *object)
        g_object_unref (monitor->mtab_monitor);
      }
  
@@ -87,7 +99,7 @@ on checking for mtab updates like other systems.
    the_mount_monitor = NULL;
  
    G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
-@@ -1278,6 +1303,51 @@ mtab_file_changed (GFileMonitor      *monitor,
+@@ -1330,6 +1356,51 @@ mtab_file_changed (GFileMonitor      *monitor,
    g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
  }
  
@@ -139,7 +151,7 @@ on checking for mtab updates like other systems.
  static void
  g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
  {
-@@ -1299,6 +1369,12 @@ g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
+@@ -1351,6 +1422,12 @@ g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
        g_object_unref (file);
        
        g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);

devel/glib2/patches/patch-gio_tests_gdbus-connection_c

@@ -1,27 +0,0 @@
-$OpenBSD: patch-gio_tests_gdbus-connection_c,v 1.2 2011/05/28 07:32:06 ajacoutot Exp $
-
-From ce0f7cafa1746a94f90b74860c2890b6c18ca385 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@bsdfrog.org>
-Date: Mon, 23 May 2011 17:11:10 +0000
-Subject: Fix build with gcc-2.*.
-
---- gio/tests/gdbus-connection.c.orig	Wed Dec 29 09:41:16 2010
-+++ gio/tests/gdbus-connection.c	Wed Dec 29 09:48:35 2010
-@@ -529,6 +529,8 @@ test_connection_signals (void)
-   GError *error;
-   gboolean ret;
-   GVariant *result;
-+  gboolean quit_mainloop_fired;
-+  guint quit_mainloop_id;
- 
-   error = NULL;
- 
-@@ -686,8 +688,6 @@ test_connection_signals (void)
-    * Also to check the total amount of NameOwnerChanged signals - use a 5 second ceiling
-    * to avoid spinning forever
-    */
--  gboolean quit_mainloop_fired;
--  guint quit_mainloop_id;
-   quit_mainloop_fired = FALSE;
-   quit_mainloop_id = g_timeout_add (30000, test_connection_quit_mainloop, &quit_mainloop_fired);
-   while (count_name_owner_changed < 2 && !quit_mainloop_fired)

devel/glib2/patches/patch-gio_tests_gdbus-peer_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gio_tests_gdbus-peer_c,v 1.1 2011/09/20 21:09:34 ajacoutot Exp $
+--- gio/tests/gdbus-peer.c.orig	Tue Sep 20 00:33:14 2011
++++ gio/tests/gdbus-peer.c	Tue Sep 20 00:34:39 2011
+@@ -39,6 +39,8 @@
+ #include <gio/gunixsocketaddress.h>
+ #include <gio/gunixfdlist.h>
+ 
++#include <sys/socket.h>
++
+ /* used in test_overflow */
+ #ifdef G_OS_UNIX
+ #include <gio/gunixconnection.h>

devel/glib2/patches/patch-gio_tests_memory-output-stream_c

@@ -1,36 +0,0 @@
-$OpenBSD: patch-gio_tests_memory-output-stream_c,v 1.3 2011/05/28 07:32:06 ajacoutot Exp $
-
-From ce0f7cafa1746a94f90b74860c2890b6c18ca385 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@bsdfrog.org>
-Date: Mon, 23 May 2011 17:11:10 +0000
-Subject: Fix build with gcc-2.*.
-
---- gio/tests/memory-output-stream.c.orig	Mon Aug  9 15:34:46 2010
-+++ gio/tests/memory-output-stream.c	Mon Sep 27 14:42:36 2010
-@@ -118,6 +118,10 @@ test_properties (void)
-   GDataOutputStream *o;
-   int i;
-   GError *error = NULL;
-+  gsize data_size_fun;
-+  gsize data_size_prop;
-+  gpointer data_fun;
-+  gpointer data_prop;
- 
-   g_test_bug ("605733");
- 
-@@ -133,13 +137,11 @@ test_properties (void)
-       g_assert_no_error (error);
-     }
- 
--  gsize data_size_fun = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo));
--  gsize data_size_prop;
-+  data_size_fun = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo));
-   g_object_get (mo, "data-size", &data_size_prop, NULL);
-   g_assert_cmpint (data_size_fun, ==, data_size_prop);
- 
--  gpointer data_fun = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mo));
--  gpointer data_prop;
-+  data_fun = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mo));
-   g_object_get (mo, "data", &data_prop, NULL);
-   g_assert_cmphex (GPOINTER_TO_SIZE (data_fun), ==, GPOINTER_TO_SIZE (data_prop));
- 

devel/glib2/patches/patch-gio_xdgmime_xdgmimecache_h

@@ -1,17 +0,0 @@
-$OpenBSD: patch-gio_xdgmime_xdgmimecache_h,v 1.1 2009/01/28 09:24:38 jasper Exp $
-
-Fix XDG conflicting symbols, from FreeBSD's
-devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h
-
---- gio/xdgmime/xdgmimecache.h.orig	Tue Jan 27 18:49:55 2009
-+++ gio/xdgmime/xdgmimecache.h	Tue Jan 27 18:50:32 2009
-@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCache;
- #define _xdg_mime_cache_get_icon                      XDG_RESERVED_ENTRY(cache_get_icon)
- #define _xdg_mime_cache_get_generic_icon              XDG_RESERVED_ENTRY(cache_get_generic_icon)
- #define _xdg_mime_cache_glob_dump                     XDG_RESERVED_ENTRY(cache_glob_dump)
-+#define _xdg_mime_cache_is_valid_mime_type            XDG_RESERVED_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal               XDG_RESERVED_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal              XDG_RESERVED_ENTRY(cache_media_type_equal)
- #endif
- 
- extern XdgMimeCache **_caches;

devel/glib2/patches/patch-glib_gbacktrace_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-glib_gbacktrace_c,v 1.6 2010/09/30 07:17:19 ajacoutot Exp $
+$OpenBSD: patch-glib_gbacktrace_c,v 1.7 2011/09/20 21:09:34 ajacoutot Exp $
---- glib/gbacktrace.c.orig	Mon Sep 13 17:57:51 2010
+--- glib/gbacktrace.c.orig	Fri Sep  9 21:58:10 2011
-+++ glib/gbacktrace.c	Mon Sep 27 14:42:36 2010
++++ glib/gbacktrace.c	Mon Sep 19 23:11:45 2011
-@@ -172,7 +172,7 @@ g_on_error_stack_trace (const gchar *prg_name)
+@@ -235,7 +235,7 @@ g_on_error_stack_trace (const gchar *prg_name)
    if (!prg_name)
      return;
  

devel/glib2/patches/patch-glib_giounix_c

@@ -1,24 +0,0 @@
-$OpenBSD: patch-glib_giounix_c,v 1.1 2011/08/16 15:03:46 ajacoutot Exp $
-
-From 230efe70f418017e809e99710e0519f716edebe3 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@openbsd.org>
-Date: Sat, 13 Aug 2011 23:23:36 +0000
-Subject: open(2): POSIX compatibility.
-
---- glib/giounix.c.orig	Thu Dec  2 20:54:01 2010
-+++ glib/giounix.c	Mon Aug 15 16:29:44 2011
-@@ -524,7 +524,13 @@ g_io_channel_new_file (const gchar *filename,
-     }
- 
-   create_mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
--  fid = open (filename, flags, create_mode);
-+
-+  do
-+    {
-+      fid = open (filename, flags, create_mode);
-+    }
-+  while (fid == -1 && errno == EINTR);
-+
-   if (fid == -1)
-     {
-       int err = errno;

devel/glib2/patches/patch-glib_gmain_c

@@ -1,13 +1,18 @@
-$OpenBSD: patch-glib_gmain_c,v 1.3 2011/06/06 06:22:19 ajacoutot Exp $
+$OpenBSD: patch-glib_gmain_c,v 1.4 2011/09/20 21:09:34 ajacoutot Exp $
---- glib/gmain.c.orig	Mon Jun  6 01:18:49 2011
+--- glib/gmain.c.orig	Sun Sep 18 15:36:48 2011
-+++ glib/gmain.c	Mon Jun  6 08:01:27 2011
++++ glib/gmain.c	Mon Sep 19 23:28:57 2011
-@@ -2055,7 +2055,9 @@ g_get_monotonic_time (void)
+@@ -2054,10 +2054,14 @@ g_get_monotonic_time (void)
+       {
+ 	clockid_t best_clockid;
  
-       if G_UNLIKELY (!checked)
-         {
 +#ifndef __OpenBSD__
-           if (sysconf (_SC_MONOTONIC_CLOCK) >= 0)
+ 	if (sysconf (_SC_MONOTONIC_CLOCK) >= 0)
+ 	  best_clockid = CLOCK_MONOTONIC;
+ 	else
+ 	  best_clockid = CLOCK_REALTIME;
++#else
++	  best_clockid = CLOCK_MONOTONIC;
 +#endif
-             clockid = CLOCK_MONOTONIC;
+ 	g_once_init_leave (&clockid, (gsize)best_clockid);
-           checked = TRUE;
+       }
-         }
+ #endif

devel/glib2/patches/patch-glib_gstrfuncs_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-glib_gstrfuncs_c,v 1.10 2010/09/30 07:17:19 ajacoutot Exp $
+$OpenBSD: patch-glib_gstrfuncs_c,v 1.11 2011/09/20 21:09:34 ajacoutot Exp $
---- glib/gstrfuncs.c.orig	Mon Sep 13 17:57:51 2010
+--- glib/gstrfuncs.c.orig	Sun Sep 18 08:12:24 2011
-+++ glib/gstrfuncs.c	Mon Sep 27 14:44:40 2010
++++ glib/gstrfuncs.c	Mon Sep 19 23:11:45 2011
-@@ -1394,7 +1394,7 @@ g_strerror (gint errnum)
+@@ -1392,7 +1392,7 @@ g_strerror (gint errnum)
        g_static_private_set (&msg_private, msg, g_free);
      }
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-glib_gstrfuncs_c,v 1.10 2010/09/30 07:17:19 ajacoutot Exp $
  
    errno = saved_errno;
    return msg;
-@@ -1558,7 +1558,7 @@ extern const char *strsignal(int);
+@@ -1556,7 +1556,7 @@ extern const char *strsignal(int);
        g_static_private_set (&msg_private, msg, g_free);
      }
  

devel/glib2/patches/patch-glib_tests_gdatetime_c

@@ -1,10 +1,10 @@
-$OpenBSD: patch-glib_tests_gdatetime_c,v 1.2 2011/07/03 17:14:24 ajacoutot Exp $
+$OpenBSD: patch-glib_tests_gdatetime_c,v 1.3 2011/09/20 21:09:34 ajacoutot Exp $
 
 gdatetime.c:774: warning: format '%ld' expects type 'long int', but argument 3 has type 'time_t'
 
---- glib/tests/gdatetime.c.orig	Wed Apr 27 19:00:05 2011
+--- glib/tests/gdatetime.c.orig	Thu Sep 15 02:10:44 2011
-+++ glib/tests/gdatetime.c	Wed Apr 27 19:00:13 2011
++++ glib/tests/gdatetime.c	Mon Sep 19 23:11:45 2011
-@@ -771,7 +771,7 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24,
+@@ -799,7 +799,7 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24,
    tt.tm_min = 0;
    tt.tm_hour = 0;
    t = mktime (&tt);

devel/glib2/patches/patch-tests_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-tests_Makefile_in,v 1.20 2011/05/28 21:15:47 ajacoutot Exp $
+$OpenBSD: patch-tests_Makefile_in,v 1.21 2011/09/20 21:09:34 ajacoutot Exp $
---- tests/Makefile.in.orig	Sat Jan 29 03:46:14 2011
+--- tests/Makefile.in.orig	Sun Sep 18 16:07:00 2011
-+++ tests/Makefile.in	Mon Jan 31 10:14:44 2011
++++ tests/Makefile.in	Mon Sep 19 23:11:45 2011
-@@ -643,8 +643,7 @@ test_programs = \
+@@ -656,8 +656,7 @@ test_programs = \
  	thread-test				\
  	threadpool-test				\
  	type-test				\

devel/glib2/patches/patch-tests_refcount_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-tests_refcount_Makefile_in,v 1.18 2011/03/07 19:17:14 ajacoutot Exp $
+$OpenBSD: patch-tests_refcount_Makefile_in,v 1.19 2011/09/20 21:09:34 ajacoutot Exp $
---- tests/refcount/Makefile.in.orig	Sat Jan 29 03:46:14 2011
+--- tests/refcount/Makefile.in.orig	Sun Sep 18 16:07:00 2011
-+++ tests/refcount/Makefile.in	Mon Jan 31 10:14:44 2011
++++ tests/refcount/Makefile.in	Mon Sep 19 23:11:45 2011
-@@ -407,7 +407,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
+@@ -414,7 +414,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
  libgobject = $(top_builddir)/gobject/libgobject-2.0.la
  LDADD = $(libglib) $(libgobject) $(libgthread) $(G_THREAD_LIBS)
  test_programs = \

devel/glib2/pkg/PLIST-docs

@@ -1,8 +1,12 @@
-@comment $OpenBSD: PLIST-docs,v 1.21 2011/03/07 19:17:14 ajacoutot Exp $
+@comment $OpenBSD: PLIST-docs,v 1.22 2011/09/20 21:09:34 ajacoutot Exp $
 @conflict glib2-<2.4.6
 share/gtk-doc/
 share/gtk-doc/html/
 share/gtk-doc/html/gio/
+share/gtk-doc/html/gio/ExampleAnimal.html
+share/gtk-doc/html/gio/ExampleCat.html
+share/gtk-doc/html/gio/ExampleObject.html
+share/gtk-doc/html/gio/ExampleObjectManagerClient.html
 share/gtk-doc/html/gio/GAction.html
 share/gtk-doc/html/gio/GActionGroup.html
 share/gtk-doc/html/gio/GAppInfo.html
@@ -18,9 +22,16 @@ share/gtk-doc/html/gio/GConverter.html
 share/gtk-doc/html/gio/GCredentials.html
 share/gtk-doc/html/gio/GDBusAuthObserver.html
 share/gtk-doc/html/gio/GDBusConnection.html
-share/gtk-doc/html/gio/GDBusError.html
+share/gtk-doc/html/gio/GDBusInterface.html
+share/gtk-doc/html/gio/GDBusInterfaceSkeleton.html
 share/gtk-doc/html/gio/GDBusMessage.html
 share/gtk-doc/html/gio/GDBusMethodInvocation.html
+share/gtk-doc/html/gio/GDBusObject.html
+share/gtk-doc/html/gio/GDBusObjectManager.html
+share/gtk-doc/html/gio/GDBusObjectManagerClient.html
+share/gtk-doc/html/gio/GDBusObjectManagerServer.html
+share/gtk-doc/html/gio/GDBusObjectProxy.html
+share/gtk-doc/html/gio/GDBusObjectSkeleton.html
 share/gtk-doc/html/gio/GDBusProxy.html
 share/gtk-doc/html/gio/GDBusServer.html
 share/gtk-doc/html/gio/GDataInputStream.html
@@ -86,6 +97,10 @@ share/gtk-doc/html/gio/GTlsBackend.html
 share/gtk-doc/html/gio/GTlsCertificate.html
 share/gtk-doc/html/gio/GTlsClientConnection.html
 share/gtk-doc/html/gio/GTlsConnection.html
+share/gtk-doc/html/gio/GTlsDatabase.html
+share/gtk-doc/html/gio/GTlsFileDatabase.html
+share/gtk-doc/html/gio/GTlsInteraction.html
+share/gtk-doc/html/gio/GTlsPassword.html
 share/gtk-doc/html/gio/GTlsServerConnection.html
 share/gtk-doc/html/gio/GUnixConnection.html
 share/gtk-doc/html/gio/GUnixCredentialsMessage.html
@@ -106,6 +121,7 @@ share/gtk-doc/html/gio/api-index-2-22.html
 share/gtk-doc/html/gio/api-index-2-24.html
 share/gtk-doc/html/gio/api-index-2-26.html
 share/gtk-doc/html/gio/api-index-2-28.html
+share/gtk-doc/html/gio/api-index-2-30.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
@@ -129,15 +145,17 @@ share/gtk-doc/html/gio/ch29s02.html
 share/gtk-doc/html/gio/ch29s03.html
 share/gtk-doc/html/gio/ch29s04.html
 share/gtk-doc/html/gio/ch29s05.html
-share/gtk-doc/html/gio/ch29s06.html
 share/gtk-doc/html/gio/conversion.html
 share/gtk-doc/html/gio/extending-gio.html
 share/gtk-doc/html/gio/extending.html
 share/gtk-doc/html/gio/failable_initialization.html
 share/gtk-doc/html/gio/file_mon.html
 share/gtk-doc/html/gio/file_ops.html
+share/gtk-doc/html/gio/gdbus-codegen.html
 share/gtk-doc/html/gio/gdbus-convenience.html
 share/gtk-doc/html/gio/gdbus-lowlevel.html
+share/gtk-doc/html/gio/gdbus-org.gtk.GDBus.Example.ObjectManager.Animal.html
+share/gtk-doc/html/gio/gdbus-org.gtk.GDBus.Example.ObjectManager.Cat.html
 share/gtk-doc/html/gio/gdbus.html
 share/gtk-doc/html/gio/gio-D-Bus-Addresses.html
 share/gtk-doc/html/gio/gio-D-Bus-Introspection-Data.html
@@ -147,6 +165,7 @@ share/gtk-doc/html/gio/gio-Extension-Points.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
+share/gtk-doc/html/gio/gio-GDBusError.html
 share/gtk-doc/html/gio/gio-GFileAttribute.html
 share/gtk-doc/html/gio/gio-GIOError.html
 share/gtk-doc/html/gio/gio-GIOScheduler.html
@@ -196,6 +215,7 @@ share/gtk-doc/html/glib/api-index-2-22.html
 share/gtk-doc/html/glib/api-index-2-24.html
 share/gtk-doc/html/glib/api-index-2-26.html
 share/gtk-doc/html/glib/api-index-2-28.html
+share/gtk-doc/html/glib/api-index-2-30.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
@@ -216,6 +236,7 @@ share/gtk-doc/html/glib/glib-Caches.html
 share/gtk-doc/html/glib/glib-Character-Set-Conversion.html
 share/gtk-doc/html/glib/glib-Commandline-option-parser.html
 share/gtk-doc/html/glib/glib-Data-Checksums.html
+share/gtk-doc/html/glib/glib-Data-HMACs.html
 share/gtk-doc/html/glib/glib-Datasets.html
 share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html
 share/gtk-doc/html/glib/glib-Double-ended-Queues.html
@@ -267,6 +288,7 @@ share/gtk-doc/html/glib/glib-Threads.html
 share/gtk-doc/html/glib/glib-Timers.html
 share/gtk-doc/html/glib/glib-Trash-Stacks.html
 share/gtk-doc/html/glib/glib-Type-Conversion-Macros.html
+share/gtk-doc/html/glib/glib-UNIX-specific-utilities-and-integration.html
 share/gtk-doc/html/glib/glib-URI-Functions.html
 share/gtk-doc/html/glib/glib-Unicode-Manipulation.html
 share/gtk-doc/html/glib/glib-Version-Information.html
@@ -314,6 +336,7 @@ share/gtk-doc/html/gobject/api-index-2-22.html
 share/gtk-doc/html/gobject/api-index-2-24.html
 share/gtk-doc/html/gobject/api-index-2-26.html
 share/gtk-doc/html/gobject/api-index-2-28.html
+share/gtk-doc/html/gobject/api-index-2-30.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

devel/glib2/pkg/PLIST-main

@@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST-main,v 1.20 2011/05/28 21:15:47 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.21 2011/09/20 21:09:34 ajacoutot Exp $
 @conflict glib2-fam-*
 @pkgpath devel/glib2
 @pkgpath devel/glib2,-fam
 @unexec-delete rm -f %D/share/glib-2.0/schemas/gschemas.compiled
 @bin bin/gdbus
+bin/gdbus-codegen
 @bin bin/gio-querymodules
 @bin bin/glib-compile-schemas
 @bin bin/glib-genmarshal
@@ -49,11 +50,19 @@ include/glib-2.0/gio/gdbusaddress.h
 include/glib-2.0/gio/gdbusauthobserver.h
 include/glib-2.0/gio/gdbusconnection.h
 include/glib-2.0/gio/gdbuserror.h
+include/glib-2.0/gio/gdbusinterface.h
+include/glib-2.0/gio/gdbusinterfaceskeleton.h
 include/glib-2.0/gio/gdbusintrospection.h
 include/glib-2.0/gio/gdbusmessage.h
 include/glib-2.0/gio/gdbusmethodinvocation.h
 include/glib-2.0/gio/gdbusnameowning.h
 include/glib-2.0/gio/gdbusnamewatching.h
+include/glib-2.0/gio/gdbusobject.h
+include/glib-2.0/gio/gdbusobjectmanager.h
+include/glib-2.0/gio/gdbusobjectmanagerclient.h
+include/glib-2.0/gio/gdbusobjectmanagerserver.h
+include/glib-2.0/gio/gdbusobjectproxy.h
+include/glib-2.0/gio/gdbusobjectskeleton.h
 include/glib-2.0/gio/gdbusproxy.h
 include/glib-2.0/gio/gdbusserver.h
 include/glib-2.0/gio/gdbusutils.h
@@ -127,6 +136,10 @@ include/glib-2.0/gio/gtlsbackend.h
 include/glib-2.0/gio/gtlscertificate.h
 include/glib-2.0/gio/gtlsclientconnection.h
 include/glib-2.0/gio/gtlsconnection.h
+include/glib-2.0/gio/gtlsdatabase.h
+include/glib-2.0/gio/gtlsfiledatabase.h
+include/glib-2.0/gio/gtlsinteraction.h
+include/glib-2.0/gio/gtlspassword.h
 include/glib-2.0/gio/gtlsserverconnection.h
 include/glib-2.0/gio/gvfs.h
 include/glib-2.0/gio/gvolume.h
@@ -135,6 +148,7 @@ include/glib-2.0/gio/gzlibcompressor.h
 include/glib-2.0/gio/gzlibdecompressor.h
 include/glib-2.0/glib/
 include/glib-2.0/glib-object.h
+include/glib-2.0/glib-unix.h
 include/glib-2.0/glib.h
 include/glib-2.0/glib/galloca.h
 include/glib-2.0/glib/garray.h
@@ -155,6 +169,7 @@ include/glib-2.0/glib/gdir.h
 include/glib-2.0/glib/gerror.h
 include/glib-2.0/glib/gfileutils.h
 include/glib-2.0/glib/ghash.h
+include/glib-2.0/glib/ghmac.h
 include/glib-2.0/glib/ghook.h
 include/glib-2.0/glib/ghostutils.h
 include/glib-2.0/glib/gi18n-lib.h
@@ -208,6 +223,7 @@ include/glib-2.0/gobject/gbinding.h
 include/glib-2.0/gobject/gboxed.h
 include/glib-2.0/gobject/gclosure.h
 include/glib-2.0/gobject/genums.h
+include/glib-2.0/gobject/glib-types.h
 include/glib-2.0/gobject/gmarshal.h
 include/glib-2.0/gobject/gobject.h
 include/glib-2.0/gobject/gobjectnotifyqueue.c
@@ -223,6 +239,32 @@ include/glib-2.0/gobject/gvaluearray.h
 include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
 @comment lib/charset.alias
+lib/gdbus-2.0/
+lib/gdbus-2.0/codegen/
+lib/gdbus-2.0/codegen/__init__.py
+lib/gdbus-2.0/codegen/__init__.pyc
+lib/gdbus-2.0/codegen/__init__.pyo
+lib/gdbus-2.0/codegen/codegen.py
+lib/gdbus-2.0/codegen/codegen.pyc
+lib/gdbus-2.0/codegen/codegen.pyo
+lib/gdbus-2.0/codegen/codegen_docbook.py
+lib/gdbus-2.0/codegen/codegen_docbook.pyc
+lib/gdbus-2.0/codegen/codegen_docbook.pyo
+lib/gdbus-2.0/codegen/codegen_main.py
+lib/gdbus-2.0/codegen/codegen_main.pyc
+lib/gdbus-2.0/codegen/codegen_main.pyo
+lib/gdbus-2.0/codegen/config.py
+lib/gdbus-2.0/codegen/config.pyc
+lib/gdbus-2.0/codegen/config.pyo
+lib/gdbus-2.0/codegen/dbustypes.py
+lib/gdbus-2.0/codegen/dbustypes.pyc
+lib/gdbus-2.0/codegen/dbustypes.pyo
+lib/gdbus-2.0/codegen/parser.py
+lib/gdbus-2.0/codegen/parser.pyc
+lib/gdbus-2.0/codegen/parser.pyo
+lib/gdbus-2.0/codegen/utils.py
+lib/gdbus-2.0/codegen/utils.pyc
+lib/gdbus-2.0/codegen/utils.pyo
 lib/gio/
 lib/gio/modules/
 @comment lib/gio/modules/libgiofam.a
@@ -240,7 +282,6 @@ lib/libgobject-2.0.a
 lib/libgobject-2.0.la
 lib/libgthread-2.0.a
 lib/libgthread-2.0.la
-lib/pkgconfig/
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -249,6 +290,7 @@ lib/pkgconfig/gmodule-export-2.0.pc
 lib/pkgconfig/gmodule-no-export-2.0.pc
 lib/pkgconfig/gobject-2.0.pc
 lib/pkgconfig/gthread-2.0.pc
+@man man/man1/gdbus-codegen.1
 @man man/man1/gdbus.1
 @man man/man1/gio-querymodules.1
 @man man/man1/glib-compile-schemas.1
@@ -259,7 +301,6 @@ lib/pkgconfig/gthread-2.0.pc
 @man man/man1/gsettings.1
 @man man/man1/gtester-report.1
 @man man/man1/gtester.1
-share/aclocal/
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4