update to 2.26.0

This switches to the gnome-2.32 release branch.

10 files changed, 175 insertions, 47 deletions

diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 02b73323a25..f06cd153b4a 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile.common,v 1.3 2010/08/15 10:54:40 drochner Exp $
+# $NetBSD: Makefile.common,v 1.4 2010/11/02 14:52:24 drochner Exp $
 #
 # used by devel/glib2/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.24.2
+DISTNAME=		glib-2.26.0
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		# empty; redefined in Makefile
-MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.24/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.24/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.26/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.26/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -35,6 +35,7 @@ CONFIGURE_ARGS+=	--disable-fam	# See sysutils/gio-fam.
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 CONFIGURE_ARGS+=	--with-pcre=system
+CONFIGURE_ARGS+=	--disable-dtrace
 
 CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu
 
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 47a2c3de592..792976fa309 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,14 +1,18 @@
-@comment $NetBSD: PLIST,v 1.54 2010/08/15 10:54:40 drochner Exp $
+@comment $NetBSD: PLIST,v 1.55 2010/11/02 14:52:24 drochner Exp $
+bin/gdbus
 bin/gio-querymodules
+bin/glib-compile-schemas
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
 bin/gobject-query
+bin/gsettings
 bin/gtester
 bin/gtester-report
 include/glib/gio-unix-2.0/gio/gdesktopappinfo.h
 include/glib/gio-unix-2.0/gio/gfiledescriptorbased.h
 include/glib/gio-unix-2.0/gio/gunixconnection.h
+include/glib/gio-unix-2.0/gio/gunixcredentialsmessage.h
 include/glib/gio-unix-2.0/gio/gunixfdlist.h
 include/glib/gio-unix-2.0/gio/gunixfdmessage.h
 include/glib/gio-unix-2.0/gio/gunixinputstream.h
@@ -26,8 +30,21 @@ include/glib/glib-2.0/gio/gcontenttype.h
 include/glib/glib-2.0/gio/gconverter.h
 include/glib/glib-2.0/gio/gconverterinputstream.h
 include/glib/glib-2.0/gio/gconverteroutputstream.h
+include/glib/glib-2.0/gio/gcredentials.h
 include/glib/glib-2.0/gio/gdatainputstream.h
 include/glib/glib-2.0/gio/gdataoutputstream.h
+include/glib/glib-2.0/gio/gdbusaddress.h
+include/glib/glib-2.0/gio/gdbusauthobserver.h
+include/glib/glib-2.0/gio/gdbusconnection.h
+include/glib/glib-2.0/gio/gdbuserror.h
+include/glib/glib-2.0/gio/gdbusintrospection.h
+include/glib/glib-2.0/gio/gdbusmessage.h
+include/glib/glib-2.0/gio/gdbusmethodinvocation.h
+include/glib/glib-2.0/gio/gdbusnameowning.h
+include/glib/glib-2.0/gio/gdbusnamewatching.h
+include/glib/glib-2.0/gio/gdbusproxy.h
+include/glib/glib-2.0/gio/gdbusserver.h
+include/glib/glib-2.0/gio/gdbusutils.h
 include/glib/glib-2.0/gio/gdrive.h
 include/glib/glib-2.0/gio/gemblem.h
 include/glib/glib-2.0/gio/gemblemedicon.h
@@ -65,9 +82,17 @@ include/glib/glib-2.0/gio/gnativevolumemonitor.h
 include/glib/glib-2.0/gio/gnetworkaddress.h
 include/glib/glib-2.0/gio/gnetworkservice.h
 include/glib/glib-2.0/gio/goutputstream.h
+include/glib/glib-2.0/gio/gpermission.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
+include/glib/glib-2.0/gio/gproxyresolver.h
 include/glib/glib-2.0/gio/gresolver.h
 include/glib/glib-2.0/gio/gseekable.h
+include/glib/glib-2.0/gio/gsettings.h
+include/glib/glib-2.0/gio/gsettingsbackend.h
 include/glib/glib-2.0/gio/gsimpleasyncresult.h
+include/glib/glib-2.0/gio/gsimplepermission.h
 include/glib/glib-2.0/gio/gsocket.h
 include/glib/glib-2.0/gio/gsocketaddress.h
 include/glib/glib-2.0/gio/gsocketaddressenumerator.h
@@ -102,6 +127,7 @@ include/glib/glib-2.0/glib/gcompletion.h
 include/glib/glib-2.0/glib/gconvert.h
 include/glib/glib-2.0/glib/gdataset.h
 include/glib/glib-2.0/glib/gdate.h
+include/glib/glib-2.0/glib/gdatetime.h
 include/glib/glib-2.0/glib/gdir.h
 include/glib/glib-2.0/glib/gerror.h
 include/glib/glib-2.0/glib/gfileutils.h
@@ -144,6 +170,7 @@ include/glib/glib-2.0/glib/gtestutils.h
 include/glib/glib-2.0/glib/gthread.h
 include/glib/glib-2.0/glib/gthreadpool.h
 include/glib/glib-2.0/glib/gtimer.h
+include/glib/glib-2.0/glib/gtimezone.h
 include/glib/glib-2.0/glib/gtree.h
 include/glib/glib-2.0/glib/gtypes.h
 include/glib/glib-2.0/glib/gunicode.h
@@ -153,6 +180,7 @@ include/glib/glib-2.0/glib/gvariant.h
 include/glib/glib-2.0/glib/gvarianttype.h
 include/glib/glib-2.0/glib/gwin32.h
 include/glib/glib-2.0/gmodule.h
+include/glib/glib-2.0/gobject/gbinding.h
 include/glib/glib-2.0/gobject/gboxed.h
 include/glib/glib-2.0/gobject/gclosure.h
 include/glib/glib-2.0/gobject/genums.h
@@ -184,20 +212,26 @@ 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.1
+man/man1/gio-querymodules.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/gsettings.1
 man/man1/gtester-report.1
 man/man1/gtester.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
-share/gdb/auto-load/libglib-2.0.so.0.2400.2-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.2400.2-gdb.py
+share/aclocal/gsettings.m4
+share/gdb/auto-load/libglib-2.0.so.0.2600.0-gdb.py
+share/gdb/auto-load/libgobject-2.0.so.0.2600.0-gdb.py
 share/glib-2.0/gdb/glib.py
 share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/mkinstalldirs
 share/glib-2.0/gettext/po/Makefile.in.in
+share/glib-2.0/schemas/gschema.dtd
 share/gtk-doc/html/gio/GAppInfo.html
 share/gtk-doc/html/gio/GAsyncInitable.html
 share/gtk-doc/html/gio/GAsyncResult.html
@@ -206,6 +240,13 @@ share/gtk-doc/html/gio/GBufferedOutputStream.html
 share/gtk-doc/html/gio/GCancellable.html
 share/gtk-doc/html/gio/GCharsetConverter.html
 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/GDBusMessage.html
+share/gtk-doc/html/gio/GDBusMethodInvocation.html
+share/gtk-doc/html/gio/GDBusProxy.html
+share/gtk-doc/html/gio/GDBusServer.html
 share/gtk-doc/html/gio/GDataInputStream.html
 share/gtk-doc/html/gio/GDataOutputStream.html
 share/gtk-doc/html/gio/GDrive.html
@@ -238,9 +279,16 @@ share/gtk-doc/html/gio/GMountOperation.html
 share/gtk-doc/html/gio/GNetworkAddress.html
 share/gtk-doc/html/gio/GNetworkService.html
 share/gtk-doc/html/gio/GOutputStream.html
+share/gtk-doc/html/gio/GPermission.html
+share/gtk-doc/html/gio/GProxy.html
+share/gtk-doc/html/gio/GProxyAddress.html
+share/gtk-doc/html/gio/GProxyResolver.html
 share/gtk-doc/html/gio/GResolver.html
 share/gtk-doc/html/gio/GSeekable.html
+share/gtk-doc/html/gio/GSettings.html
+share/gtk-doc/html/gio/GSettingsBackend.html
 share/gtk-doc/html/gio/GSimpleAsyncResult.html
+share/gtk-doc/html/gio/GSimplePermission.html
 share/gtk-doc/html/gio/GSocket.html
 share/gtk-doc/html/gio/GSocketAddress.html
 share/gtk-doc/html/gio/GSocketClient.html
@@ -249,8 +297,11 @@ share/gtk-doc/html/gio/GSocketConnection.html
 share/gtk-doc/html/gio/GSocketControlMessage.html
 share/gtk-doc/html/gio/GSocketListener.html
 share/gtk-doc/html/gio/GSocketService.html
+share/gtk-doc/html/gio/GTcpConnection.html
 share/gtk-doc/html/gio/GThemedIcon.html
 share/gtk-doc/html/gio/GThreadedSocketService.html
+share/gtk-doc/html/gio/GUnixConnection.html
+share/gtk-doc/html/gio/GUnixCredentialsMessage.html
 share/gtk-doc/html/gio/GUnixFDList.html
 share/gtk-doc/html/gio/GUnixFDMessage.html
 share/gtk-doc/html/gio/GUnixInputStream.html
@@ -261,39 +312,66 @@ share/gtk-doc/html/gio/GVolume.html
 share/gtk-doc/html/gio/GVolumeMonitor.html
 share/gtk-doc/html/gio/GZlibCompressor.html
 share/gtk-doc/html/gio/GZlibDecompressor.html
+share/gtk-doc/html/gio/annotation-glossary.html
 share/gtk-doc/html/gio/api-index-2-18.html
 share/gtk-doc/html/gio/api-index-2-20.html
 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-deprecated.html
 share/gtk-doc/html/gio/api-index-full.html
 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/ch19.html
-share/gtk-doc/html/gio/ch20.html
-share/gtk-doc/html/gio/ch20s02.html
-share/gtk-doc/html/gio/ch20s03.html
+share/gtk-doc/html/gio/ch24.html
+share/gtk-doc/html/gio/ch25.html
+share/gtk-doc/html/gio/ch25s02.html
+share/gtk-doc/html/gio/ch25s03.html
+share/gtk-doc/html/gio/ch26.html
+share/gtk-doc/html/gio/ch26s02.html
+share/gtk-doc/html/gio/ch26s03.html
+share/gtk-doc/html/gio/ch26s04.html
+share/gtk-doc/html/gio/ch26s05.html
+share/gtk-doc/html/gio/ch26s06.html
+share/gtk-doc/html/gio/ch26s07.html
+share/gtk-doc/html/gio/ch27.html
+share/gtk-doc/html/gio/ch27s02.html
+share/gtk-doc/html/gio/ch27s03.html
+share/gtk-doc/html/gio/ch27s04.html
+share/gtk-doc/html/gio/ch27s05.html
+share/gtk-doc/html/gio/ch27s06.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-convenience.html
+share/gtk-doc/html/gio/gdbus-lowlevel.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
+share/gtk-doc/html/gio/gio-D-Bus-Utilities.html
 share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html
 share/gtk-doc/html/gio/gio-Extension-Points.html
 share/gtk-doc/html/gio/gio-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
 share/gtk-doc/html/gio/gio-GSrvTarget.html
+share/gtk-doc/html/gio/gio-Owning-Bus-Names.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-hierarchy.html
+share/gtk-doc/html/gio/gio-querymodules.html
 share/gtk-doc/html/gio/gio.devhelp
 share/gtk-doc/html/gio/gio.devhelp2
+share/gtk-doc/html/gio/glib-compile-schemas.html
+share/gtk-doc/html/gio/gsettings.html
 share/gtk-doc/html/gio/gvfs-overview.png
 share/gtk-doc/html/gio/highlevel-socket.html
 share/gtk-doc/html/gio/home.png
@@ -303,16 +381,20 @@ share/gtk-doc/html/gio/index.sgml
 share/gtk-doc/html/gio/left.png
 share/gtk-doc/html/gio/migrating.html
 share/gtk-doc/html/gio/networking.html
+share/gtk-doc/html/gio/permissions.html
 share/gtk-doc/html/gio/pt01.html
 share/gtk-doc/html/gio/pt02.html
 share/gtk-doc/html/gio/resolver.html
 share/gtk-doc/html/gio/right.png
+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/tools.html
 share/gtk-doc/html/gio/types.html
 share/gtk-doc/html/gio/up.png
 share/gtk-doc/html/gio/utils.html
 share/gtk-doc/html/gio/volume_mon.html
+share/gtk-doc/html/glib/annotation-glossary.html
 share/gtk-doc/html/glib/api-index-2-10.html
 share/gtk-doc/html/glib/api-index-2-12.html
 share/gtk-doc/html/glib/api-index-2-14.html
@@ -322,6 +404,7 @@ share/gtk-doc/html/glib/api-index-2-2.html
 share/gtk-doc/html/glib/api-index-2-20.html
 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-4.html
 share/gtk-doc/html/glib/api-index-2-6.html
 share/gtk-doc/html/glib/api-index-2-8.html
@@ -349,6 +432,8 @@ share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html
 share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html
 share/gtk-doc/html/glib/glib-Error-Reporting.html
 share/gtk-doc/html/glib/glib-File-Utilities.html
+share/gtk-doc/html/glib/glib-GDateTime.html
+share/gtk-doc/html/glib/glib-GTimeZone.html
 share/gtk-doc/html/glib/glib-GVariant.html
 share/gtk-doc/html/glib/glib-GVariantType.html
 share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
@@ -423,8 +508,10 @@ share/gtk-doc/html/glib/right.png
 share/gtk-doc/html/glib/style.css
 share/gtk-doc/html/glib/tools.html
 share/gtk-doc/html/glib/up.png
+share/gtk-doc/html/gobject/GBinding.html
 share/gtk-doc/html/gobject/GTypeModule.html
 share/gtk-doc/html/gobject/GTypePlugin.html
+share/gtk-doc/html/gobject/annotation-glossary.html
 share/gtk-doc/html/gobject/api-index-2-10.html
 share/gtk-doc/html/gobject/api-index-2-12.html
 share/gtk-doc/html/gobject/api-index-2-14.html
@@ -432,6 +519,7 @@ share/gtk-doc/html/gobject/api-index-2-18.html
 share/gtk-doc/html/gobject/api-index-2-2.html
 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-4.html
 share/gtk-doc/html/gobject/api-index-2-6.html
 share/gtk-doc/html/gobject/api-index-2-8.html
@@ -538,6 +626,7 @@ share/locale/is/LC_MESSAGES/glib20.mo
 share/locale/it/LC_MESSAGES/glib20.mo
 share/locale/ja/LC_MESSAGES/glib20.mo
 share/locale/ka/LC_MESSAGES/glib20.mo
+share/locale/kk/LC_MESSAGES/glib20.mo
 share/locale/kn/LC_MESSAGES/glib20.mo
 share/locale/ko/LC_MESSAGES/glib20.mo
 share/locale/ku/LC_MESSAGES/glib20.mo
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 20ad006b85f..8a5addd9389 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,23 +1,25 @@
-$NetBSD: distinfo,v 1.137 2010/08/15 10:54:40 drochner Exp $
+$NetBSD: distinfo,v 1.138 2010/11/02 14:52:24 drochner Exp $
 
-SHA1 (glib-2.24.2.tar.bz2) = 882350c31af929cd4e78ee6aad46108748240e78
-RMD160 (glib-2.24.2.tar.bz2) = 259d2d0a92b1a01bb624a2b759d0f82eefc227ea
-Size (glib-2.24.2.tar.bz2) = 5326328 bytes
-SHA1 (patch-aa) = 3cff899701032b955ce8737830ed41d0cbf1f236
+SHA1 (glib-2.26.0.tar.bz2) = 9d7e9dce2add3fadc35079ad291a94f45ebcf706
+RMD160 (glib-2.26.0.tar.bz2) = 176441944f24c274398903ae1816eecfe2cff36b
+Size (glib-2.26.0.tar.bz2) = 6632632 bytes
+SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f
 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
-SHA1 (patch-af) = fa3bbb257d37b3763a628d09681701b697b9b75c
+SHA1 (patch-af) = 4db7dff19ba34d5a204c12c0c410415fcb077f20
 SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b
 SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
 SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f
 SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
-SHA1 (patch-ak) = 97e3f6ef5f3b0d1bf56ccd5cd3d977337c53fd30
-SHA1 (patch-al) = 6c8b7c569fb5fae5eff719ebd2925d79f5df3b2e
+SHA1 (patch-ak) = 718dad5f27cb8254d84d6f8007a96b33e7c4a435
+SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
+SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772
+SHA1 (patch-an) = dd136645f7555f3600562b055cdcb4f60b41ae78
 SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
 SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
 SHA1 (patch-cd) = aaada4d63aaac18f71ac9fdbff15e8ef0579cf39
-SHA1 (patch-ce) = db3176ee99f7d786d87b32b45348b77b7038080d
+SHA1 (patch-ce) = 7192ae3bbf27ff92287a66ee090baa80a12cdc79
 SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index e4f07f80a22..b4c85029886 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $
+$NetBSD: patch-aa,v 1.50 2010/11/02 14:52:24 drochner Exp $
 
---- configure.orig	2010-05-03 00:59:28.000000000 +0000
+--- configure.orig	2010-09-27 16:10:14.000000000 +0000
 +++ configure
-@@ -807,6 +807,7 @@ GIO
+@@ -828,6 +828,7 @@ GIO
  GSPAWN
  GLIB_DEBUG_FLAGS
  G_MODULE_NEED_USCORE
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $
  G_MODULE_BROKEN_RTLD_GLOBAL
  G_MODULE_HAVE_DLERROR
  G_MODULE_LDFLAGS
-@@ -22220,8 +22221,8 @@ else
+@@ -21584,8 +21585,8 @@ else
  fi
  
  
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-@@ -23455,16 +23456,48 @@ fi
+@@ -22829,16 +22830,48 @@ fi
  
  case $host in
    *-*-solaris* )
@@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $
  esac
  
  if test "$ac_cv_func_statfs" = yes ; then
-@@ -24470,10 +24503,11 @@ if test x"$glib_native_win32" = xyes; th
+@@ -23844,10 +23877,11 @@ if test x"$glib_native_win32" = xyes; th
      G_MODULE_LDFLAGS=
  else
    export SED
@@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -24680,7 +24714,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
+@@ -24054,7 +24088,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
  	LIBS="$G_MODULE_LIBS $LIBS"
  	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  	echo "void glib_plugin_test(void) { }" > plugin.c
@@ -93,7 +93,7 @@ $NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $
  		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_GLOBAL brokenness" >&5
  $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; }
-@@ -24790,6 +24824,56 @@ fi
+@@ -24164,6 +24198,56 @@ fi
  
  	LIBS="$LIBS_orig"
  fi
@@ -150,7 +150,7 @@ $NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -24800,7 +24884,7 @@ fi
+@@ -24174,7 +24258,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
@@ -159,7 +159,7 @@ $NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -24824,6 +24908,8 @@ fi
+@@ -24198,6 +24282,8 @@ fi
  
  
  
@@ -168,7 +168,7 @@ $NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -25572,62 +25658,8 @@ if test x"$have_threads" != xno; then
+@@ -24946,62 +25032,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -233,3 +233,12 @@ $NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $
           ;;
      esac
    fi
+@@ -27599,7 +27631,7 @@ rm -f core conftest.err conftest.$ac_obj
+ fi
+ 
+ 
+-if test "x${enable_Bsymbolic}" == "xyes"; then
++if test "x${enable_Bsymbolic}" = "xyes"; then
+   GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
+ fi
+ 
diff --git a/devel/glib2/patches/patch-af b/devel/glib2/patches/patch-af
index 7466d2a7f71..e3aa6be3736 100644
--- a/devel/glib2/patches/patch-af
+++ b/devel/glib2/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.11 2008/09/06 11:07:20 obache Exp $
+$NetBSD: patch-af,v 1.12 2010/11/02 14:52:24 drochner Exp $
 
---- glib/libcharset/Makefile.in.orig	2008-09-02 19:29:43.000000000 +0000
+--- glib/libcharset/Makefile.in.orig	2010-09-27 16:10:13.000000000 +0000
 +++ glib/libcharset/Makefile.in
-@@ -601,18 +601,6 @@ test-report perf-report full-report:	${T
- # run make test as part of make check
- check-local: test
+@@ -703,18 +703,6 @@ lcov-clean:
+ # run tests in cwd as part of make check
+ check-local: test-nonrecursive
  install-exec-local: all-local
 -	$(mkinstalldirs) $(DESTDIR)$(libdir)
 -	if test -f $(charset_alias); then \
diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak
index 925a268d746..a3979334c68 100644
--- a/devel/glib2/patches/patch-ak
+++ b/devel/glib2/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.6 2010/05/31 17:30:36 drochner Exp $
+$NetBSD: patch-ak,v 1.7 2010/11/02 14:52:24 drochner Exp $
 
---- configure.in.orig	2010-05-02 23:58:58.000000000 +0000
-+++ configure.in
+--- configure.ac.orig	2010-05-02 23:58:58.000000000 +0000
++++ configure.ac
 @@ -846,7 +846,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])
diff --git a/devel/glib2/patches/patch-al b/devel/glib2/patches/patch-al
index ff9b3a13ca8..a0407ff8b10 100644
--- a/devel/glib2/patches/patch-al
+++ b/devel/glib2/patches/patch-al
@@ -1,9 +1,9 @@
-$NetBSD: patch-al,v 1.5 2009/05/20 13:07:36 wiz Exp $
+$NetBSD: patch-al,v 1.6 2010/11/02 14:52:24 drochner Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=583329
 
---- tests/convert-test.c.orig	2008-09-02 15:09:28.000000000 +0000
-+++ tests/convert-test.c
+--- glib/tests/convert.c.orig	2008-09-02 15:09:28.000000000 +0000
++++ glib/tests/convert.c
 @@ -76,6 +76,7 @@ test_one_half (void)
    g_assert (strcmp (out, "\xbd") == 0);
    g_free (out);
diff --git a/devel/glib2/patches/patch-am b/devel/glib2/patches/patch-am
new file mode 100644
index 00000000000..0676654e01b
--- /dev/null
+++ b/devel/glib2/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.6 2010/11/02 14:52:24 drochner Exp $
+
+--- gio/tests/converter-stream.c.orig	2010-09-13 15:57:51.000000000 +0000
++++ gio/tests/converter-stream.c
+@@ -745,7 +745,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
+ 
+   };
+ 
diff --git a/devel/glib2/patches/patch-an b/devel/glib2/patches/patch-an
new file mode 100644
index 00000000000..1fb06f97076
--- /dev/null
+++ b/devel/glib2/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.4 2010/11/02 14:52:24 drochner Exp $
+
+--- gio/Makefile.in.orig	2010-09-27 16:10:12.000000000 +0000
++++ gio/Makefile.in
+@@ -1838,7 +1838,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-completionSCRIPTS install-data-local \
++install-data-am: install-data-local \
+ 	install-dist_schemaDATA install-gioincludeHEADERS \
+ 	install-giounixincludeHEADERS install-giowin32includeHEADERS
+ 	@$(NORMAL_INSTALL)
diff --git a/devel/glib2/patches/patch-ce b/devel/glib2/patches/patch-ce
index 552be10d426..01927102ab7 100644
--- a/devel/glib2/patches/patch-ce
+++ b/devel/glib2/patches/patch-ce
@@ -1,11 +1,11 @@
-$NetBSD: patch-ce,v 1.1 2010/06/01 17:28:31 drochner Exp $
+$NetBSD: patch-ce,v 1.2 2010/11/02 14:52:24 drochner Exp $
 
---- glib/gatomic-gcc.c.orig	2010-06-01 15:18:24.000000000 +0000
+--- glib/gatomic-gcc.c.orig	2010-09-13 15:57:51.000000000 +0000
 +++ glib/gatomic-gcc.c
-@@ -22,6 +22,7 @@
+@@ -21,6 +21,7 @@
+ #include "config.h"
  
- #include "glib.h"
- #include "galias.h"
+ #include "gatomic.h"
 +#include "gthreadprivate.h"
  
  gint