Update glib2 and therefore gdbus-codegen and gio-fam to 2.34.0

- patch-ar and patch-as to avoid dependending on python are no longer
  necessary since the introduction of --disable-modular-tests
- patch-co has been committed to glib in 2360d04e
- other patches cargo culted across
- statfs test was fixed in glib with commit afa82ae8
- no longer provide man pages as that requires docbook & xsltproc

Many changes in glib since 2.32.4, especially GDBus improvements.
See NEWS file http://git.gnome.org/browse/glib/plain/NEWS?id=2.34.0 for details.

14 files changed, 115 insertions, 238 deletions

diff --git a/devel/gdbus-codegen/Makefile b/devel/gdbus-codegen/Makefile
index bb749f40688..522e818d493 100644
--- a/devel/gdbus-codegen/Makefile
+++ b/devel/gdbus-codegen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/07/15 00:28:09 marino Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/06 20:44:04 prlw1 Exp $
 
 .include "../../devel/glib2/Makefile.common"
 
@@ -9,7 +9,7 @@ COMMENT=	gdbus-codegen utility
 
 NOT_FOR_PLATFORM=	HPUX-*-* OSF1-*-*
 
-USE_TOOLS+=		pkg-config msgfmt
+USE_TOOLS+=		pkg-config msgfmt perl:run
 
 BUILD_DIRS=		gio/gdbus-2.0/codegen
 INSTALL_DIRS=		${BUILD_DIRS}
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 9be10b5b51d..efdaa1858f0 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.211 2012/10/03 21:54:30 wiz Exp $
+# $NetBSD: Makefile,v 1.212 2012/10/06 20:44:04 prlw1 Exp $
 
 .include "Makefile.common"
 .include "options.mk"
 
-PKGREVISION=		2
 CATEGORIES=		devel
 
 COMMENT=		Some useful routines for C programming (glib2)
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 0b4353c0262..71d1cfa22fd 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile.common,v 1.20 2012/07/24 18:23:38 drochner Exp $
+# $NetBSD: Makefile.common,v 1.21 2012/10/06 20:44:04 prlw1 Exp $
 #
 # used by devel/glib2/Makefile
+# used by devel/gdbus-codegen/Makefile
 # used by sysutils/gio-fam/Makefile
 
 # 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.32.4
+DISTNAME=	glib-2.34.0
 PKGNAME=	${DISTNAME:S/glib/glib2/}
 CATEGORIES=	# empty; redefined in Makefile
 MASTER_SITES=	ftp://ftp.gtk.org/pub/glib/${PKGVERSION_NOREV:R}/ \
@@ -36,6 +37,7 @@ CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 CONFIGURE_ARGS+=	--with-pcre=system
 CONFIGURE_ARGS+=	--disable-dtrace
+CONFIGURE_ARGS+=	--disable-modular-tests
 
 CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu
 
@@ -43,10 +45,6 @@ CONFIGURE_ENV+=		PERL_PATH=${PERL5:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
-# configure detects wrongly
-CONFIGURE_ENV+=		ac_cv_func_statfs=no
-.endif
 
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 CPPFLAGS+=		-DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
@@ -89,3 +87,6 @@ SUBST_FILES.dbusdb+=	gio/gdbusprivate.c
 SUBST_FILES.dbusdb+=	po/glib20.pot
 SUBST_FILES.dbusdb+=	po/*.po
 SUBST_SED.dbusdb=	-e 's,/var/lib/dbus,${VARBASE}/db/dbus,g'
+
+pre-configure:
+	${TOUCH} ${WRKSRC}/configure ${WRKSRC}/aclocal.m4 ${WRKSRC}/config.h.in
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 10a74cf9980..f937c301a2c 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.69 2012/07/24 18:23:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.70 2012/10/06 20:44:04 prlw1 Exp $
 bin/gdbus
 bin/gio-querymodules
 bin/glib-compile-resources
@@ -108,6 +108,7 @@ include/glib/glib-2.0/gio/goutputstream.h
 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/gproxy.h
 include/glib/glib-2.0/gio/gproxyaddress.h
 include/glib/glib-2.0/gio/gproxyaddressenumerator.h
@@ -135,6 +136,7 @@ include/glib/glib-2.0/gio/gsocketservice.h
 include/glib/glib-2.0/gio/gsrvtarget.h
 include/glib/glib-2.0/gio/gtcpconnection.h
 include/glib/glib-2.0/gio/gtcpwrapperconnection.h
+include/glib/glib-2.0/gio/gtestdbus.h
 include/glib/glib-2.0/gio/gthemedicon.h
 include/glib/glib-2.0/gio/gthreadedsocketservice.h
 include/glib/glib-2.0/gio/gtlsbackend.h
@@ -266,24 +268,11 @@ 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/man1/gdbus-codegen.1
-man/man1/gdbus.1
-man/man1/gio-querymodules.1
-man/man1/glib-compile-resources.1
-man/man1/glib-compile-schemas.1
-man/man1/glib-genmarshal.1
-man/man1/glib-gettextize.1
-man/man1/glib-mkenums.1
-man/man1/gobject-query.1
-man/man1/gresource.1
-man/man1/gsettings.1
-man/man1/gtester-report.1
-man/man1/gtester.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load/libglib-2.0.so.0.3200.4-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.3200.4-gdb.py
+share/gdb/auto-load/libglib-2.0.so.0.3400.0-gdb.py
+share/gdb/auto-load/libgobject-2.0.so.0.3400.0-gdb.py
 share/glib-2.0/gdb/glib.py
 share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/mkinstalldirs
@@ -384,6 +373,7 @@ share/gtk-doc/html/gio/GSocketService.html
 share/gtk-doc/html/gio/GSrvTarget.html
 share/gtk-doc/html/gio/GTcpConnection.html
 share/gtk-doc/html/gio/GTcpWrapperConnection.html
+share/gtk-doc/html/gio/GTestDBus.html
 share/gtk-doc/html/gio/GThemedIcon.html
 share/gtk-doc/html/gio/GThreadedSocketService.html
 share/gtk-doc/html/gio/GTlsBackend.html
@@ -416,6 +406,7 @@ 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-2-32.html
+share/gtk-doc/html/gio/api-index-2-34.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
@@ -423,22 +414,22 @@ share/gtk-doc/html/gio/async.html
 share/gtk-doc/html/gio/ch01.html
 share/gtk-doc/html/gio/ch02.html
 share/gtk-doc/html/gio/ch03.html
-share/gtk-doc/html/gio/ch27.html
-share/gtk-doc/html/gio/ch28.html
-share/gtk-doc/html/gio/ch28s02.html
-share/gtk-doc/html/gio/ch28s03.html
 share/gtk-doc/html/gio/ch29.html
-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/ch29s07.html
 share/gtk-doc/html/gio/ch30.html
 share/gtk-doc/html/gio/ch30s02.html
 share/gtk-doc/html/gio/ch30s03.html
-share/gtk-doc/html/gio/ch30s04.html
-share/gtk-doc/html/gio/ch30s05.html
+share/gtk-doc/html/gio/ch31.html
+share/gtk-doc/html/gio/ch31s02.html
+share/gtk-doc/html/gio/ch31s03.html
+share/gtk-doc/html/gio/ch31s04.html
+share/gtk-doc/html/gio/ch31s05.html
+share/gtk-doc/html/gio/ch31s06.html
+share/gtk-doc/html/gio/ch31s07.html
+share/gtk-doc/html/gio/ch32.html
+share/gtk-doc/html/gio/ch32s02.html
+share/gtk-doc/html/gio/ch32s03.html
+share/gtk-doc/html/gio/ch32s04.html
+share/gtk-doc/html/gio/ch32s05.html
 share/gtk-doc/html/gio/conversion.html
 share/gtk-doc/html/gio/extending-gio.html
 share/gtk-doc/html/gio/extending.html
@@ -474,6 +465,7 @@ share/gtk-doc/html/gio/gio-Owning-Bus-Names.html
 share/gtk-doc/html/gio/gio-TLS-Overview.html
 share/gtk-doc/html/gio/gio-Unix-Mounts.html
 share/gtk-doc/html/gio/gio-Watching-Bus-Names.html
+share/gtk-doc/html/gio/gio-gpollableutils.html
 share/gtk-doc/html/gio/gio-hierarchy.html
 share/gtk-doc/html/gio/gio-querymodules.html
 share/gtk-doc/html/gio/gio.devhelp2
@@ -498,9 +490,11 @@ share/gtk-doc/html/gio/pt02.html
 share/gtk-doc/html/gio/resolver.html
 share/gtk-doc/html/gio/resources.html
 share/gtk-doc/html/gio/right.png
+share/gtk-doc/html/gio/running-gio-apps.html
 share/gtk-doc/html/gio/settings.html
 share/gtk-doc/html/gio/streaming.html
 share/gtk-doc/html/gio/style.css
+share/gtk-doc/html/gio/testing.html
 share/gtk-doc/html/gio/tls.html
 share/gtk-doc/html/gio/tools.html
 share/gtk-doc/html/gio/types.html
@@ -521,6 +515,7 @@ 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-32.html
+share/gtk-doc/html/glib/api-index-2-34.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
@@ -606,6 +601,7 @@ share/gtk-doc/html/glib/glib-cross-compiling.html
 share/gtk-doc/html/glib/glib-data-types.html
 share/gtk-doc/html/glib/glib-fundamentals.html
 share/gtk-doc/html/glib/glib-gettextize.html
+share/gtk-doc/html/glib/glib-programming.html
 share/gtk-doc/html/glib/glib-regex-syntax.html
 share/gtk-doc/html/glib/glib-resources.html
 share/gtk-doc/html/glib/glib-running.html
@@ -640,13 +636,13 @@ 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-32.html
+share/gtk-doc/html/gobject/api-index-2-34.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
 share/gtk-doc/html/gobject/api-index-deprecated.html
 share/gtk-doc/html/gobject/api-index-full.html
 share/gtk-doc/html/gobject/ch01s02.html
-share/gtk-doc/html/gobject/ch06s03.html
 share/gtk-doc/html/gobject/chapter-gobject.html
 share/gtk-doc/html/gobject/chapter-gtype.html
 share/gtk-doc/html/gobject/chapter-intro.html
@@ -681,6 +677,8 @@ share/gtk-doc/html/gobject/howto-gobject-destruction.html
 share/gtk-doc/html/gobject/howto-gobject-methods.html
 share/gtk-doc/html/gobject/howto-gobject.html
 share/gtk-doc/html/gobject/howto-interface-implement.html
+share/gtk-doc/html/gobject/howto-interface-override.html
+share/gtk-doc/html/gobject/howto-interface-prerequisite.html
 share/gtk-doc/html/gobject/howto-interface-properties.html
 share/gtk-doc/html/gobject/howto-interface.html
 share/gtk-doc/html/gobject/howto-signals.html
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index e556365651d..66af3e07e41 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2012/09/15 10:04:09 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2012/10/06 20:44:04 prlw1 Exp $
 
 BUILDLINK_TREE+=	glib2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	glib2
 GLIB2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0
-BUILDLINK_ABI_DEPENDS.glib2+=	glib2>=2.32.4nb1
+BUILDLINK_ABI_DEPENDS.glib2+=	glib2>=2.34.0
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 55b4fdce94e..5eb9aa7c605 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.176 2012/07/24 18:23:38 drochner Exp $
+$NetBSD: distinfo,v 1.177 2012/10/06 20:44:04 prlw1 Exp $
 
-SHA1 (glib-2.32.4.tar.xz) = 5b6481cbb34f560e8ea78887200b6b7f5448dcb4
-RMD160 (glib-2.32.4.tar.xz) = 9ed87203d42b9432842ddbc0d5b1bd0cab61ae13
-Size (glib-2.32.4.tar.xz) = 6178556 bytes
-SHA1 (glib-gio-kqueue-2.32.1-v1.patch) = 4498e11396bc33ac48a5b7c27056914f66951a32
-RMD160 (glib-gio-kqueue-2.32.1-v1.patch) = 6d2a8eb014822c7734c6cd7a733d51fa4ca810d4
-Size (glib-gio-kqueue-2.32.1-v1.patch) = 100340 bytes
-SHA1 (patch-aa) = 059197e7e9ee88c87cea168635467780912519e0
+SHA1 (glib-2.34.0.tar.xz) = f695d4d3a6ded331e4d45f077a9774d6ca8a47e4
+RMD160 (glib-2.34.0.tar.xz) = e24d7b410937c7469a725c7dfd51cff671819966
+Size (glib-2.34.0.tar.xz) = 6368532 bytes
+SHA1 (glib-gio-kqueue-2.32.4-v3.patch) = e849a2b306caa17aeffae1a4a480999681e98b5b
+RMD160 (glib-gio-kqueue-2.32.4-v3.patch) = 38c00a1ea75a5176720fcc4bc8160d1d9b0c3895
+Size (glib-gio-kqueue-2.32.4-v3.patch) = 100892 bytes
+SHA1 (patch-aa) = 71405ed89d2abd25edec375d52c43fe50c9f7c82
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
@@ -15,14 +15,12 @@ SHA1 (patch-ah) = 66761b7994c54651933d50024eb607952565b214
 SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
 SHA1 (patch-ai) = ec634baa67088c08513c3dfeca137c4765e79492
 SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
-SHA1 (patch-ak) = 9b64fa949785f3e61cf7bc46ea7096da85d4a0ae
+SHA1 (patch-ak) = 2d6826e2a07852a7c093353996361547cce1d17f
 SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
-SHA1 (patch-am) = 7298efee37f50d81b6a1b1b00d60dca33b19ce9f
-SHA1 (patch-an) = 45d695332ad9c79938a0a808928f89fffc86cf48
+SHA1 (patch-am) = 387d1ebb481052a2f7b9c14fa916c0286efcdb97
+SHA1 (patch-an) = c93823539ba95a0e182a25714ef5024c91da3a47
 SHA1 (patch-ap) = eeabf999a65cc51bc792798e4d81fef2ad35837b
 SHA1 (patch-aq) = 42ee287341bb3569bb95959a09fcde7c94e49088
-SHA1 (patch-ar) = 17b698a22b08434690c25569cfc7d483daf08a76
-SHA1 (patch-as) = 2e1eb46d4fe4b2c66994ff83d30a2e009e50c490
 SHA1 (patch-at) = f4c4a2fbe84eb8b361fb342f3c3b0b5a226d1794
 SHA1 (patch-ba) = f4233cd4e0109f9bee5630c655b0ab7b22ba0c61
 SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
@@ -37,7 +35,6 @@ SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
 SHA1 (patch-cl) = 973e0fa003d9200cf07bb0a6a07fa5b3e2b4cb68
 SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e
 SHA1 (patch-cn) = 7a2f42fc1199bfc3fd2ccbd2ed1c56a7f6c0028f
-SHA1 (patch-co) = 146d7102970bd92beff382b7b8f0bb681e0b8520
 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
 SHA1 (patch-glib_goption.c) = 323297aa328b85493f156792b4baa0cb04fa82ad
 SHA1 (patch-glib_tests_include.c) = 95f7d34e6e03849316bbfac1541eec4582b92ffc
diff --git a/devel/glib2/options.mk b/devel/glib2/options.mk
index 42ad9f3b2fd..7376cc6a24d 100644
--- a/devel/glib2/options.mk
+++ b/devel/glib2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2012/05/31 04:58:34 reed Exp $
+# $NetBSD: options.mk,v 1.18 2012/10/06 20:44:04 prlw1 Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.glib2
 PKG_SUPPORTED_OPTIONS=	kqueue
@@ -18,11 +18,11 @@ PKG_SUGGESTED_OPTIONS=	# empty
 
 .if $(PKG_OPTIONS:Mkqueue)
 PATCH_SITES=		http://distfiles.bsdfrog.org/
-PATCHFILES=		glib-gio-kqueue-2.32.1-v1.patch
-PATCH_DIST_STRIP=	-p0
+PATCHFILES=		glib-gio-kqueue-2.32.4-v3.patch
+PATCH_DIST_STRIP=	-p1
 
 BUILD_DEPENDS+=	gtk-doc>=1.17nb1:../../textproc/gtk-doc
-USE_TOOLS+=	autoconf autoheader automake
+USE_TOOLS+=	aclocal autoconf autoheader automake
 pre-configure: regen-autotools
 regen-autotools:
 	cd ${WRKSRC} && aclocal
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 4f5e906e62d..06d374d7d24 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.53 2012/05/04 10:22:08 obache Exp $
+$NetBSD: patch-aa,v 1.54 2012/10/06 20:44:05 prlw1 Exp $
 
---- configure.orig	2012-05-01 00:10:54.000000000 +0000
+--- configure.orig	2012-09-24 01:26:24.000000000 +0000
 +++ configure
-@@ -698,6 +698,7 @@ GIO
+@@ -721,6 +721,7 @@ GIO
  GSPAWN
  GLIB_DEBUG_FLAGS
  G_MODULE_NEED_USCORE
@@ -10,18 +10,27 @@ $NetBSD: patch-aa,v 1.53 2012/05/04 10:22:08 obache Exp $
  G_MODULE_BROKEN_RTLD_GLOBAL
  G_MODULE_HAVE_DLERROR
  G_MODULE_LDFLAGS
-@@ -22511,8 +22512,8 @@ else
+@@ -21565,6 +21566,8 @@ else
+ # ifdef _MSC_VER
+ #  include <malloc.h>
+ #  define alloca _alloca
++# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
++#   include <stdlib.h>
+ # else
+ #  ifdef HAVE_ALLOCA_H
+ #   include <alloca.h>
+@@ -22610,8 +22613,8 @@ else
  fi
  
  
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler" >&5
 -$as_echo_n "checking whether using Sun Studio C compiler... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler visibilily" >&5
-+$as_echo_n "checking whether using Sun Studio C compiler visibilily... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler visibility" >&5
++$as_echo_n "checking whether using Sun Studio C compiler visibility... " >&6; }
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-@@ -24107,16 +24108,48 @@ fi
+@@ -24210,16 +24213,48 @@ fi
  
  case $host in
    *-*-solaris* )
@@ -70,8 +79,8 @@ $NetBSD: patch-aa,v 1.53 2012/05/04 10:22:08 obache Exp $
 +    ;;
  esac
  
- if test "$ac_cv_func_statfs" = yes ; then
-@@ -25109,10 +25142,11 @@ if test x"$glib_native_win32" = xyes; th
+ if test "$ac_cv_func_statfs" = yes; then :
+@@ -25231,10 +25266,11 @@ if test x"$glib_native_win32" = xyes; th
      G_MODULE_LDFLAGS=
  else
    export SED
@@ -84,7 +93,7 @@ $NetBSD: patch-aa,v 1.53 2012/05/04 10:22:08 obache Exp $
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -25319,13 +25353,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
+@@ -25452,13 +25488,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
@@ -101,13 +110,13 @@ $NetBSD: patch-aa,v 1.53 2012/05/04 10:22:08 obache 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 :
-@@ -25434,6 +25468,56 @@ fi
- 
+@@ -25568,6 +25604,56 @@ fi
  	LIBS="$LIBS_orig"
+ 
  fi
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen(NULL, 0) brokenness" >&5
 +$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; }
-+if test "${glib_cv_dlopennull_broken+set}" = set; then :
++if ${glib_cv_dlopennull_broken+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +
@@ -158,7 +167,7 @@ $NetBSD: patch-aa,v 1.53 2012/05/04 10:22:08 obache Exp $
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -25444,7 +25528,7 @@ fi
+@@ -25578,7 +25664,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
@@ -167,16 +176,15 @@ $NetBSD: patch-aa,v 1.53 2012/05/04 10:22:08 obache Exp $
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -25468,6 +25552,8 @@ fi
+@@ -25602,6 +25688,7 @@ fi
  
  
  
 +
-+
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -26401,62 +26487,8 @@ if test x"$have_threads" = xposix; then
+@@ -26543,62 +26630,8 @@ if  test x"$have_threads" = xposix; then
        G_THREAD_LIBS="-lpthread -lthread"
        ;;
      *)
@@ -240,8 +248,8 @@ $NetBSD: patch-aa,v 1.53 2012/05/04 10:22:08 obache Exp $
 +      G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
         ;;
    esac
- fi
-@@ -26954,6 +26986,7 @@ case $host in
+ 
+@@ -27112,6 +27145,7 @@ case $host in
      ;;
    *-*-openbsd*)
      LDFLAGS="$LDFLAGS -pthread"
diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak
index 9c109bd57cb..4d8d84e9153 100644
--- a/devel/glib2/patches/patch-ak
+++ b/devel/glib2/patches/patch-ak
@@ -1,20 +1,24 @@
-$NetBSD: patch-ak,v 1.12 2012/05/04 10:22:08 obache Exp $
+$NetBSD: patch-ak,v 1.13 2012/10/06 20:44:05 prlw1 Exp $
 
---- configure.ac.orig	2012-05-01 00:06:39.000000000 +0000
+--- configure.ac.orig	2012-09-25 07:35:55.000000000 +0000
 +++ configure.ac
-@@ -852,7 +852,7 @@ int main (int argc, char **argv)
+@@ -864,7 +864,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])
  
 -AC_MSG_CHECKING([whether using Sun Studio C compiler])
-+AC_MSG_CHECKING([whether using Sun Studio C compiler visibilily])
++AC_MSG_CHECKING([whether using Sun Studio C compiler visibility])
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
  #else
  # include "error: this is not Sun Studio."
-@@ -1103,8 +1103,20 @@ AC_CHECK_TYPE([struct ip_mreqn], [
+@@ -1115,10 +1115,22 @@ AC_CHECK_TYPE([struct ip_mreqn], [
  
  case $host in
    *-*-solaris* )
+-     AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
+-     AC_DEFINE(_XOPEN_SOURCE,          2, Needed to get declarations for msg_control and msg_controllen on Solaris)
+-     AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
+-     ;;
 +    AC_MSG_CHECKING([whether using Sun Studio C compiler with C99])
 +    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__STDC_VERSION__) || (__STDC_VERSION__ - 0 >= 199901L)
 +#else
@@ -25,14 +29,16 @@ $NetBSD: patch-ak,v 1.12 2012/05/04 10:22:08 obache Exp $
 +    if test $g_have_sunstudio_c99 = yes; then
 +      AC_DEFINE(_XOPEN_SOURCE,          600, Needed to get declarations for msg_control and msg_controllen on Solaris)
 +    else
-      AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-      AC_DEFINE(_XOPEN_SOURCE,          2, Needed to get declarations for msg_control and msg_controllen on Solaris)
++      AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
++      AC_DEFINE(_XOPEN_SOURCE,          2, Needed to get declarations for msg_control and msg_controllen on Solaris)
 +    fi
 +
-      AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-      ;;
++    AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
++    ;;
  esac
-@@ -1465,11 +1477,12 @@ if test x"$glib_native_win32" = xyes; th
+ 
+ dnl
+@@ -1477,11 +1489,12 @@ if test x"$glib_native_win32" = xyes; th
    G_MODULE_LDFLAGS=
  else
    export SED
@@ -46,7 +52,7 @@ $NetBSD: patch-ak,v 1.12 2012/05/04 10:22:08 obache Exp $
  G_MODULE_HAVE_DLERROR=0
  dnl *** force native WIN32 shared lib loader 
  if test -z "$G_MODULE_IMPL"; then
-@@ -1530,13 +1543,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
+@@ -1542,13 +1555,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODUL
  	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
  	echo "void glib_plugin_test(void) { }" > plugin.c
@@ -63,10 +69,10 @@ $NetBSD: patch-ak,v 1.12 2012/05/04 10:22:08 obache Exp $
  	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
  		glib_cv_rtldglobal_broken,[
  		AC_TRY_RUN([
-@@ -1599,6 +1612,38 @@ dnl *** check for having dlerror()
+@@ -1611,6 +1624,38 @@ dnl *** check for having dlerror()
  		[G_MODULE_HAVE_DLERROR=0])
  	LIBS="$LIBS_orig"
- fi
+ ])
 +dnl *** check for dlopen(NULL, 0) brokenness
 +	AC_CACHE_CHECK([for dlopen(NULL, 0) brokenness],
 +		glib_cv_dlopennull_broken,[
@@ -102,7 +108,7 @@ $NetBSD: patch-ak,v 1.12 2012/05/04 10:22:08 obache Exp $
  dnl *** done, have we got an implementation?
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
-@@ -1609,7 +1654,7 @@ fi
+@@ -1621,7 +1666,7 @@ fi
  
  AC_MSG_CHECKING(for the suffix of module shared libraries)
  export SED
@@ -111,16 +117,15 @@ $NetBSD: patch-ak,v 1.12 2012/05/04 10:22:08 obache Exp $
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -1628,6 +1673,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
+@@ -1640,6 +1685,7 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
  AC_SUBST(G_MODULE_LDFLAGS)
  AC_SUBST(G_MODULE_HAVE_DLERROR)
  AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
 +AC_SUBST(G_MODULE_BROKEN_DLOPEN_NULL)
-+
  AC_SUBST(G_MODULE_NEED_USCORE)
  AC_SUBST(GLIB_DEBUG_FLAGS)
  
-@@ -1995,22 +2042,8 @@ if test x"$have_threads" = xposix; then
+@@ -2010,22 +2056,8 @@ AS_IF([ test x"$have_threads" = xposix],
        G_THREAD_LIBS="-lpthread -lthread"
        ;;
      *)
@@ -144,8 +149,8 @@ $NetBSD: patch-ak,v 1.12 2012/05/04 10:22:08 obache Exp $
 +      G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
         ;;
    esac
- fi
-@@ -2301,6 +2334,7 @@ case $host in
+ ])
+@@ -2311,6 +2343,7 @@ case $host in
      ;;
    *-*-openbsd*)
      LDFLAGS="$LDFLAGS -pthread"
diff --git a/devel/glib2/patches/patch-am b/devel/glib2/patches/patch-am
index 0246b1805ef..556a1c7475c 100644
--- a/devel/glib2/patches/patch-am
+++ b/devel/glib2/patches/patch-am
@@ -1,14 +1,14 @@
-$NetBSD: patch-am,v 1.7 2012/05/01 18:45:52 adam Exp $
+$NetBSD: patch-am,v 1.8 2012/10/06 20:44:05 prlw1 Exp $
 
---- gio/tests/converter-stream.c.orig	2010-09-13 15:57:51.000000000 +0000
+--- gio/tests/converter-stream.c.orig	2012-09-03 14:24:05.000000000 +0000
 +++ gio/tests/converter-stream.c
-@@ -739,7 +739,9 @@ main (int   argc,
+@@ -1167,7 +1167,9 @@ main (int   argc,
    CharsetTest charset_tests[] = {
      { "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 },
      { "/converter-input-stream/charset/latin1->utf8", "ISO-8859-1", "\305rr Sant\351", "UTF-8", "\303\205rr Sant\303\251", 0 },
 +#if 0 /* this depends on GNU iconv specific behaviour */
      { "/converter-input-stream/charset/fallbacks", "UTF-8", "Some characters just don't fit into latin1: πא", "ISO-8859-1", "Some characters just don't fit into latin1: \\CF\\80\\D7\\90", 4 },
 +#endif
- 
    };
  
+   gint i;
diff --git a/devel/glib2/patches/patch-an b/devel/glib2/patches/patch-an
index 5e3dc929baf..d1f74137e1a 100644
--- a/devel/glib2/patches/patch-an
+++ b/devel/glib2/patches/patch-an
@@ -1,17 +1,17 @@
-$NetBSD: patch-an,v 1.8 2012/05/01 18:45:52 adam Exp $
+$NetBSD: patch-an,v 1.9 2012/10/06 20:44:05 prlw1 Exp $
 
---- gio/Makefile.in.orig	2012-05-01 00:10:52.000000000 +0000
+--- gio/Makefile.in.orig	2012-09-24 01:26:29.000000000 +0000
 +++ gio/Makefile.in
-@@ -760,7 +760,7 @@ EXTRA_DIST = gdbusdaemon.c gdbusdaemon.h
+@@ -802,7 +802,7 @@ EXTRA_DIST = gdbusdaemon.c gdbusdaemon.h
  	gschema.dtd gconstructor_as_data.h $(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_8) $(am__append_11) . $(am__append_14) tests
+ 	$(am__append_8) $(am__append_11) . $(am__append_14) \
+ 	$(am__append_21)
  @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
- @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
-@@ -3431,7 +3431,7 @@ info: info-recursive
+@@ -3511,7 +3511,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/devel/glib2/patches/patch-ar b/devel/glib2/patches/patch-ar
deleted file mode 100644
index b8e10213497..00000000000
--- a/devel/glib2/patches/patch-ar
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ar,v 1.4 2012/05/01 18:45:52 adam Exp $
-
-avoid python dependency
-
---- gio/tests/Makefile.in.orig	2012-05-01 00:10:52.000000000 +0000
-+++ gio/tests/Makefile.in
-@@ -47,21 +47,18 @@ noinst_PROGRAMS = $(am__EXEEXT_5) $(am__
- @OS_UNIX_TRUE@	gdbus-names gdbus-proxy gdbus-proxy-threads \
- @OS_UNIX_TRUE@	gdbus-proxy-well-known-name gdbus-introspection \
- @OS_UNIX_TRUE@	gdbus-threading gdbus-export gdbus-error \
--@OS_UNIX_TRUE@	gdbus-peer gdbus-exit-on-close gdbus-non-socket \
-+@OS_UNIX_TRUE@	gdbus-exit-on-close gdbus-non-socket \
- @OS_UNIX_TRUE@	gdbus-bz627724 gmenumodel appinfo contenttype \
- @OS_UNIX_TRUE@	mimeapps file $(NULL) live-g-file \
- @OS_UNIX_TRUE@	desktop-app-info unix-fd unix-streams \
- @OS_UNIX_TRUE@	gapplication basic-application \
--@OS_UNIX_TRUE@	gdbus-test-codegen $(NULL)
-+@OS_UNIX_TRUE@	$(NULL)
- @OS_UNIX_TRUE@am__append_2 = \
- @OS_UNIX_TRUE@	gdbus-example-unix-fd-client 		\
--@OS_UNIX_TRUE@	gdbus-example-objectmanager-server 	\
--@OS_UNIX_TRUE@	gdbus-example-objectmanager-client 	\
- @OS_UNIX_TRUE@	$(NULL)
- 
- @OS_WIN32_TRUE@am__append_3 = win32-streams
- @HAVE_DBUS1_TRUE@am__append_4 = gdbus-serialization
--@OS_UNIX_TRUE@am__append_5 = gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
- subdir = gio/tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
-@@ -105,7 +102,7 @@ am__EXEEXT_1 =
- @OS_UNIX_TRUE@	gdbus-proxy-well-known-name$(EXEEXT) \
- @OS_UNIX_TRUE@	gdbus-introspection$(EXEEXT) \
- @OS_UNIX_TRUE@	gdbus-threading$(EXEEXT) gdbus-export$(EXEEXT) \
--@OS_UNIX_TRUE@	gdbus-error$(EXEEXT) gdbus-peer$(EXEEXT) \
-+@OS_UNIX_TRUE@	gdbus-error$(EXEEXT) \
- @OS_UNIX_TRUE@	gdbus-exit-on-close$(EXEEXT) \
- @OS_UNIX_TRUE@	gdbus-non-socket$(EXEEXT) \
- @OS_UNIX_TRUE@	gdbus-bz627724$(EXEEXT) gmenumodel$(EXEEXT) \
-@@ -114,7 +111,7 @@ am__EXEEXT_1 =
- @OS_UNIX_TRUE@	live-g-file$(EXEEXT) desktop-app-info$(EXEEXT) \
- @OS_UNIX_TRUE@	unix-fd$(EXEEXT) unix-streams$(EXEEXT) \
- @OS_UNIX_TRUE@	gapplication$(EXEEXT) basic-application$(EXEEXT) \
--@OS_UNIX_TRUE@	gdbus-test-codegen$(EXEEXT) $(am__EXEEXT_1)
-+@OS_UNIX_TRUE@	$(am__EXEEXT_1)
- @OS_WIN32_TRUE@am__EXEEXT_3 = win32-streams$(EXEEXT)
- @HAVE_DBUS1_TRUE@am__EXEEXT_4 = gdbus-serialization$(EXEEXT)
- am__EXEEXT_5 = io-stream$(EXEEXT) memory-input-stream$(EXEEXT) \
-@@ -134,8 +131,6 @@ am__EXEEXT_5 = io-stream$(EXEEXT) memory
- 	resources$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
- 	$(am__EXEEXT_3) $(am__EXEEXT_4)
- @OS_UNIX_TRUE@am__EXEEXT_6 = gdbus-example-unix-fd-client$(EXEEXT) \
--@OS_UNIX_TRUE@	gdbus-example-objectmanager-server$(EXEEXT) \
--@OS_UNIX_TRUE@	gdbus-example-objectmanager-client$(EXEEXT) \
- @OS_UNIX_TRUE@	$(am__EXEEXT_1)
- am__EXEEXT_7 = resolver$(EXEEXT) socket-server$(EXEEXT) \
- 	socket-client$(EXEEXT) echo-server$(EXEEXT) httpd$(EXEEXT) \
-@@ -967,7 +962,6 @@ TEST_PROGS = io-stream memory-input-stre
- 	tls-certificate tls-interaction cancellable vfs \
- 	network-monitor fileattributematcher resources $(NULL) \
- 	$(am__append_1) $(am__append_3) $(am__append_4)
--SUBDIRS = gdbus-object-manager-example
- INCLUDES = \
- 	-g 			\
- 	$(gio_INCLUDES)		\
diff --git a/devel/glib2/patches/patch-as b/devel/glib2/patches/patch-as
deleted file mode 100644
index 6a574b6f31d..00000000000
--- a/devel/glib2/patches/patch-as
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-as,v 1.3 2012/05/22 20:40:08 jmmv Exp $
-
-avoid python dependency
-
---- gio/tests/Makefile.am.orig	2012-05-01 00:06:39.000000000 +0000
-+++ gio/tests/Makefile.am
-@@ -4,7 +4,7 @@ BUILT_SOURCES =
- 
- include $(top_srcdir)/Makefile.decl
- 
--SUBDIRS = gdbus-object-manager-example
-+#SUBDIRS = gdbus-object-manager-example
- 
- INCLUDES = 			\
- 	-g 			\
-@@ -77,7 +77,6 @@ TEST_PROGS +=			\
- 	gdbus-threading		\
- 	gdbus-export		\
- 	gdbus-error		\
--	gdbus-peer		\
- 	gdbus-exit-on-close	\
- 	gdbus-non-socket	\
- 	gdbus-bz627724		\
-@@ -103,7 +102,6 @@ SAMPLE_PROGS = 				\
- 	gdbus-example-watch-proxy	\
- 	gdbus-example-server		\
- 	gdbus-example-subtree		\
--	gdbus-example-peer		\
- 	gdbus-example-proxy-subclass	\
- 	gdbus-connection-flush-helper	\
- 	appinfo-test			\
-@@ -123,12 +121,9 @@ TEST_PROGS += 			\
- 	unix-streams 		\
- 	gapplication 		\
- 	basic-application	\
--	gdbus-test-codegen 	\
- 	$(NULL)
- SAMPLE_PROGS +=					\
- 	gdbus-example-unix-fd-client 		\
--	gdbus-example-objectmanager-server 	\
--	gdbus-example-objectmanager-client 	\
- 	$(NULL)
- endif
- 
-@@ -295,7 +290,7 @@ gdbus-test-codegen-generated.h gdbus-tes
- 		$(srcdir)/test-codegen.xml \
- 		$(NULL)
- 
--BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
-+#BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
- 
- gdbus_test_codegen_SOURCES  = gdbus-test-codegen.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
- gdbus_test_codegen_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
diff --git a/devel/glib2/patches/patch-co b/devel/glib2/patches/patch-co
deleted file mode 100644
index 2fd36a88601..00000000000
--- a/devel/glib2/patches/patch-co
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-co,v 1.1 2012/05/22 20:40:08 jmmv Exp $
-
---- glib/Makefile.am.orig	2012-05-01 00:06:39.000000000 +0000
-+++ glib/Makefile.am
-@@ -82,7 +82,7 @@ EXTRA_DIST += 			\
- 	gconstructor.h		\
- 	$(MIRRORING_TAB_SOURCE)
- 
--CLEANFILES= libglib-gdb.py
-+CLEANFILES += libglib-gdb.py
- 
- # These may be in the builddir too
- BUILT_EXTRA_DIST = 		\