update to 2.16.3

This switches to the gnome-2.22 release branch.

7 files changed, 221 insertions, 48 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index f70bee17336..75776f66252 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.131 2008/02/21 20:53:54 tnn Exp $
+# $NetBSD: Makefile,v 1.132 2008/04/10 12:13:49 drochner Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
-DISTNAME=		glib-2.14.6
+DISTNAME=		glib-2.16.3
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.14/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.14/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.14/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.16/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.16/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.16/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -34,6 +34,8 @@ PKGCONFIG_OVERRIDE+=	gobject-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gobject-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gthread-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gthread-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gio-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gio-unix-2.0.pc.in
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
@@ -51,6 +53,11 @@ 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}\""
 CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
@@ -91,5 +98,6 @@ CONFIGURE_ARGS+=	--disable-threads
 .include "../../mk/pthread.buildlink3.mk"
 .endif
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../mk/fam.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 6717a6c5dd0..79d76f31dc6 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,8 +1,54 @@
-@comment $NetBSD: PLIST,v 1.38 2007/09/18 17:37:02 tnn Exp $
+@comment $NetBSD: PLIST,v 1.39 2008/04/10 12:13:49 drochner Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
 bin/gobject-query
+bin/gtester
+bin/gtester-report
+include/glib/gio-unix-2.0/gio/gdesktopappinfo.h
+include/glib/gio-unix-2.0/gio/gunixinputstream.h
+include/glib/gio-unix-2.0/gio/gunixmounts.h
+include/glib/gio-unix-2.0/gio/gunixoutputstream.h
+include/glib/glib-2.0/gio/gappinfo.h
+include/glib/glib-2.0/gio/gasyncresult.h
+include/glib/glib-2.0/gio/gbufferedinputstream.h
+include/glib/glib-2.0/gio/gbufferedoutputstream.h
+include/glib/glib-2.0/gio/gcancellable.h
+include/glib/glib-2.0/gio/gcontenttype.h
+include/glib/glib-2.0/gio/gdatainputstream.h
+include/glib/glib-2.0/gio/gdataoutputstream.h
+include/glib/glib-2.0/gio/gdrive.h
+include/glib/glib-2.0/gio/gfile.h
+include/glib/glib-2.0/gio/gfileattribute.h
+include/glib/glib-2.0/gio/gfileenumerator.h
+include/glib/glib-2.0/gio/gfileicon.h
+include/glib/glib-2.0/gio/gfileinfo.h
+include/glib/glib-2.0/gio/gfileinputstream.h
+include/glib/glib-2.0/gio/gfilemonitor.h
+include/glib/glib-2.0/gio/gfilenamecompleter.h
+include/glib/glib-2.0/gio/gfileoutputstream.h
+include/glib/glib-2.0/gio/gfilterinputstream.h
+include/glib/glib-2.0/gio/gfilteroutputstream.h
+include/glib/glib-2.0/gio/gicon.h
+include/glib/glib-2.0/gio/ginputstream.h
+include/glib/glib-2.0/gio/gio.h
+include/glib/glib-2.0/gio/gioenumtypes.h
+include/glib/glib-2.0/gio/gioerror.h
+include/glib/glib-2.0/gio/giomodule.h
+include/glib/glib-2.0/gio/gioscheduler.h
+include/glib/glib-2.0/gio/gloadableicon.h
+include/glib/glib-2.0/gio/gmemoryinputstream.h
+include/glib/glib-2.0/gio/gmemoryoutputstream.h
+include/glib/glib-2.0/gio/gmount.h
+include/glib/glib-2.0/gio/gmountoperation.h
+include/glib/glib-2.0/gio/gnativevolumemonitor.h
+include/glib/glib-2.0/gio/goutputstream.h
+include/glib/glib-2.0/gio/gseekable.h
+include/glib/glib-2.0/gio/gsimpleasyncresult.h
+include/glib/glib-2.0/gio/gthemedicon.h
+include/glib/glib-2.0/gio/gvfs.h
+include/glib/glib-2.0/gio/gvolume.h
+include/glib/glib-2.0/gio/gvolumemonitor.h
 include/glib/glib-2.0/glib-object.h
 include/glib/glib-2.0/glib.h
 include/glib/glib-2.0/glib/galloca.h
@@ -13,6 +59,7 @@ include/glib/glib-2.0/glib/gbacktrace.h
 include/glib/glib-2.0/glib/gbase64.h
 include/glib/glib-2.0/glib/gbookmarkfile.h
 include/glib/glib-2.0/glib/gcache.h
+include/glib/glib-2.0/glib/gchecksum.h
 include/glib/glib-2.0/glib/gcompletion.h
 include/glib/glib-2.0/glib/gconvert.h
 include/glib/glib-2.0/glib/gdataset.h
@@ -44,8 +91,8 @@ include/glib/glib-2.0/glib/gqueue.h
 include/glib/glib-2.0/glib/grand.h
 include/glib/glib-2.0/glib/gregex.h
 include/glib/glib-2.0/glib/grel.h
-include/glib/glib-2.0/glib/gsequence.h
 include/glib/glib-2.0/glib/gscanner.h
+include/glib/glib-2.0/glib/gsequence.h
 include/glib/glib-2.0/glib/gshell.h
 include/glib/glib-2.0/glib/gslice.h
 include/glib/glib-2.0/glib/gslist.h
@@ -53,12 +100,14 @@ include/glib/glib-2.0/glib/gspawn.h
 include/glib/glib-2.0/glib/gstdio.h
 include/glib/glib-2.0/glib/gstrfuncs.h
 include/glib/glib-2.0/glib/gstring.h
+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/gtree.h
 include/glib/glib-2.0/glib/gtypes.h
 include/glib/glib-2.0/glib/gunicode.h
+include/glib/glib-2.0/glib/gurifuncs.h
 include/glib/glib-2.0/glib/gutils.h
 include/glib/glib-2.0/glib/gwin32.h
 include/glib/glib-2.0/gmodule.h
@@ -79,11 +128,15 @@ include/glib/glib-2.0/gobject/gvalue.h
 include/glib/glib-2.0/gobject/gvaluearray.h
 include/glib/glib-2.0/gobject/gvaluecollector.h
 include/glib/glib-2.0/gobject/gvaluetypes.h
+lib/gio/modules/libgiofam.la
 lib/glib-2.0/include/glibconfig.h
+lib/libgio-2.0.la
 lib/libglib-2.0.la
 lib/libgmodule-2.0.la
 lib/libgobject-2.0.la
 lib/libgthread-2.0.la
+lib/pkgconfig/gio-2.0.pc
+lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
 lib/pkgconfig/gmodule-2.0.pc
 lib/pkgconfig/gmodule-export-2.0.pc
@@ -98,6 +151,80 @@ share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/glib-2.0/gettext/mkinstalldirs
 share/glib-2.0/gettext/po/Makefile.in.in
+share/gtk-doc/html/gio/GAppInfo.html
+share/gtk-doc/html/gio/GAsyncResult.html
+share/gtk-doc/html/gio/GBufferedInputStream.html
+share/gtk-doc/html/gio/GBufferedOutputStream.html
+share/gtk-doc/html/gio/GCancellable.html
+share/gtk-doc/html/gio/GDataInputStream.html
+share/gtk-doc/html/gio/GDataOutputStream.html
+share/gtk-doc/html/gio/GDrive.html
+share/gtk-doc/html/gio/GFile.html
+share/gtk-doc/html/gio/GFileEnumerator.html
+share/gtk-doc/html/gio/GFileIcon.html
+share/gtk-doc/html/gio/GFileInfo.html
+share/gtk-doc/html/gio/GFileInputStream.html
+share/gtk-doc/html/gio/GFileMonitor.html
+share/gtk-doc/html/gio/GFileOutputStream.html
+share/gtk-doc/html/gio/GFilenameCompleter.html
+share/gtk-doc/html/gio/GFilterInputStream.html
+share/gtk-doc/html/gio/GFilterOutputStream.html
+share/gtk-doc/html/gio/GIOModule.html
+share/gtk-doc/html/gio/GIcon.html
+share/gtk-doc/html/gio/GInputStream.html
+share/gtk-doc/html/gio/GLoadableIcon.html
+share/gtk-doc/html/gio/GMemoryInputStream.html
+share/gtk-doc/html/gio/GMemoryOutputStream.html
+share/gtk-doc/html/gio/GMount.html
+share/gtk-doc/html/gio/GMountOperation.html
+share/gtk-doc/html/gio/GOutputStream.html
+share/gtk-doc/html/gio/GSeekable.html
+share/gtk-doc/html/gio/GSimpleAsyncResult.html
+share/gtk-doc/html/gio/GThemedIcon.html
+share/gtk-doc/html/gio/GUnixInputStream.html
+share/gtk-doc/html/gio/GUnixOutputStream.html
+share/gtk-doc/html/gio/GVfs.html
+share/gtk-doc/html/gio/GVolume.html
+share/gtk-doc/html/gio/GVolumeMonitor.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/ch14.html
+share/gtk-doc/html/gio/ch15.html
+share/gtk-doc/html/gio/ch15s02.html
+share/gtk-doc/html/gio/ch15s03.html
+share/gtk-doc/html/gio/extending.html
+share/gtk-doc/html/gio/file_mon.html
+share/gtk-doc/html/gio/file_ops.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-GFileAttribute.html
+share/gtk-doc/html/gio/gio-GIOError.html
+share/gtk-doc/html/gio/gio-GIOScheduler.html
+share/gtk-doc/html/gio/gio-Unix-Mounts.html
+share/gtk-doc/html/gio/gio-extension-points.html
+share/gtk-doc/html/gio/gio-hierarchy.html
+share/gtk-doc/html/gio/gio.devhelp
+share/gtk-doc/html/gio/gio.devhelp2
+share/gtk-doc/html/gio/gvfs-overview.png
+share/gtk-doc/html/gio/home.png
+share/gtk-doc/html/gio/icons.html
+share/gtk-doc/html/gio/index.html
+share/gtk-doc/html/gio/index.sgml
+share/gtk-doc/html/gio/ix01.html
+share/gtk-doc/html/gio/left.png
+share/gtk-doc/html/gio/migrating.html
+share/gtk-doc/html/gio/pt01.html
+share/gtk-doc/html/gio/pt02.html
+share/gtk-doc/html/gio/right.png
+share/gtk-doc/html/gio/streaming.html
+share/gtk-doc/html/gio/style.css
+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/file-name-encodings.png
 share/gtk-doc/html/glib/glib-Arrays.html
 share/gtk-doc/html/glib/glib-Asynchronous-Queues.html
@@ -112,6 +239,7 @@ share/gtk-doc/html/glib/glib-Byte-Order-Macros.html
 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-Datasets.html
 share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html
 share/gtk-doc/html/glib/glib-Double-ended-Queues.html
@@ -151,12 +279,14 @@ share/gtk-doc/html/glib/glib-Standard-Macros.html
 share/gtk-doc/html/glib/glib-String-Chunks.html
 share/gtk-doc/html/glib/glib-String-Utility-Functions.html
 share/gtk-doc/html/glib/glib-Strings.html
+share/gtk-doc/html/glib/glib-Testing.html
 share/gtk-doc/html/glib/glib-The-Main-Event-Loop.html
 share/gtk-doc/html/glib/glib-Thread-Pools.html
 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-URI-Functions.html
 share/gtk-doc/html/glib/glib-Unicode-Manipulation.html
 share/gtk-doc/html/glib/glib-Version-Information.html
 share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html
@@ -169,8 +299,8 @@ 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-resources.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
 share/gtk-doc/html/glib/glib-utilities.html
 share/gtk-doc/html/glib/glib.devhelp
@@ -188,6 +318,7 @@ share/gtk-doc/html/glib/ix06.html
 share/gtk-doc/html/glib/ix07.html
 share/gtk-doc/html/glib/ix08.html
 share/gtk-doc/html/glib/ix09.html
+share/gtk-doc/html/glib/ix10.html
 share/gtk-doc/html/glib/left.png
 share/gtk-doc/html/glib/mainloop-states.gif
 share/gtk-doc/html/glib/right.png
@@ -200,9 +331,9 @@ share/gtk-doc/html/gobject/ch01s02.html
 share/gtk-doc/html/gobject/ch06s03.html
 share/gtk-doc/html/gobject/ch07s02.html
 share/gtk-doc/html/gobject/ch07s03.html
-share/gtk-doc/html/gobject/chapter-intro.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
 share/gtk-doc/html/gobject/chapter-signal.html
 share/gtk-doc/html/gobject/glib-genmarshal.html
 share/gtk-doc/html/gobject/glib-mkenums.html
@@ -312,6 +443,7 @@ share/locale/mg/LC_MESSAGES/glib20.mo
 share/locale/mk/LC_MESSAGES/glib20.mo
 share/locale/ml/LC_MESSAGES/glib20.mo
 share/locale/mn/LC_MESSAGES/glib20.mo
+share/locale/mr/LC_MESSAGES/glib20.mo
 share/locale/ms/LC_MESSAGES/glib20.mo
 share/locale/nb/LC_MESSAGES/glib20.mo
 share/locale/ne/LC_MESSAGES/glib20.mo
@@ -326,6 +458,7 @@ share/locale/pt_BR/LC_MESSAGES/glib20.mo
 share/locale/ro/LC_MESSAGES/glib20.mo
 share/locale/ru/LC_MESSAGES/glib20.mo
 share/locale/rw/LC_MESSAGES/glib20.mo
+share/locale/si/LC_MESSAGES/glib20.mo
 share/locale/sk/LC_MESSAGES/glib20.mo
 share/locale/sl/LC_MESSAGES/glib20.mo
 share/locale/sq/LC_MESSAGES/glib20.mo
@@ -349,12 +482,17 @@ share/locale/zh_HK/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrm share/gtk-doc/html/gobject
 @dirrm share/gtk-doc/html/glib
+@dirrm share/gtk-doc/html/gio
 @dirrm share/glib-2.0/gettext/po
 @dirrm share/glib-2.0/gettext
 @dirrm share/glib-2.0
 @dirrm lib/glib-2.0/include
 @dirrm lib/glib-2.0
+@dirrm lib/gio/modules
 @dirrm include/glib/glib-2.0/gobject
 @dirrm include/glib/glib-2.0/glib
+@dirrm include/glib/glib-2.0/gio
 @dirrm include/glib/glib-2.0
+@dirrm include/glib/gio-unix-2.0/gio
+@dirrm include/glib/gio-unix-2.0
 @unexec ${RMDIR} %D/include/glib 2>/dev/null || ${TRUE}
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 4481cf3ff10..3983db53b1d 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,17 +1,18 @@
-$NetBSD: distinfo,v 1.93 2008/02/13 19:30:00 drochner Exp $
+$NetBSD: distinfo,v 1.94 2008/04/10 12:13:49 drochner Exp $
 
-SHA1 (glib-2.14.6.tar.bz2) = f2e2a5323357516ccb813d9e7f3921ef1e490079
-RMD160 (glib-2.14.6.tar.bz2) = a5ba2792f16c1e0dafc3190e71e3f529cd687c2f
-Size (glib-2.14.6.tar.bz2) = 3406651 bytes
-SHA1 (patch-aa) = 00c909d37493fb27ce5faf26621266e9e21dcd61
+SHA1 (glib-2.16.3.tar.bz2) = f73fd53130a46f21ff4ee9faa69b9956787c571e
+RMD160 (glib-2.16.3.tar.bz2) = 72260f5f9022ee3f97b79b5705ad6117adc279fd
+Size (glib-2.16.3.tar.bz2) = 4540919 bytes
+SHA1 (patch-aa) = 8b7c478e2e88e2b8ea380878d5219569d9c9a068
 SHA1 (patch-ab) = e84c4928b5288b83f2203b4ffd28cdb9de730e98
 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
-SHA1 (patch-af) = a60aefb2e9e381984e001cd28fb714ff58edd6ee
-SHA1 (patch-ag) = c1a10b07f22c20199e35989eac950819284eb4af
+SHA1 (patch-af) = 8fb1aef7f51789398ebf8fb3617923fd876ec20b
+SHA1 (patch-ag) = 503661e5ac1cd9cba50615146421cebd753dc932
 SHA1 (patch-ah) = 76c7337b707de496591dd881ce4cd32f3222f53b
 SHA1 (patch-ai) = e615c6b37cc9d6247940023aefb7bf75bcddc7a5
 SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
 SHA1 (patch-ak) = 4eee3ce549ba0972ab5d5d8166d37d2b61320e68
 SHA1 (patch-al) = aa2dbd63d53298aab3a30ec6d27e836717c960e3
+SHA1 (patch-ba) = 43dda2f4d89a82e645ef8f24d62f13ca9e4ddd9d
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index fe28fe4bc37..33b55f1f73c 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.40 2008/02/13 19:30:00 drochner Exp $
+$NetBSD: patch-aa,v 1.41 2008/04/10 12:13:49 drochner Exp $
 
---- configure.orig	2008-02-07 06:41:30.000000000 +0100
+--- configure.orig	2008-04-08 05:51:40.000000000 +0200
 +++ configure
-@@ -945,6 +945,7 @@ G_MODULE_PLUGIN_LIBS
+@@ -959,6 +959,7 @@ G_MODULE_PLUGIN_LIBS
  G_MODULE_LDFLAGS
  G_MODULE_HAVE_DLERROR
  G_MODULE_BROKEN_RTLD_GLOBAL
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.40 2008/02/13 19:30:00 drochner Exp $
  G_MODULE_NEED_USCORE
  GLIB_DEBUG_FLAGS
  GSPAWN
-@@ -33910,6 +33911,7 @@ else
+@@ -36598,6 +36599,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.40 2008/02/13 19:30:00 drochner Exp $
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -34705,6 +34707,84 @@ fi
+@@ -37393,6 +37395,84 @@ fi
  
  	LIBS="$LIBS_orig"
  fi
@@ -103,7 +103,7 @@ $NetBSD: patch-aa,v 1.40 2008/02/13 19:30:00 drochner Exp $
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -34741,6 +34821,8 @@ fi
+@@ -37429,6 +37509,8 @@ fi
  
  
  
@@ -112,7 +112,7 @@ $NetBSD: patch-aa,v 1.40 2008/02/13 19:30:00 drochner Exp $
  { echo "$as_me:$LINENO: checking for gspawn implementation" >&5
  echo $ECHO_N "checking for gspawn implementation... $ECHO_C" >&6; }
  case "$host" in
-@@ -35088,110 +35170,8 @@ if test x"$have_threads" != xno; then
+@@ -39087,110 +39169,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -225,7 +225,7 @@ $NetBSD: patch-aa,v 1.40 2008/02/13 19:30:00 drochner Exp $
           ;;
      esac
    fi
-@@ -37152,6 +37132,10 @@ case $host in
+@@ -41303,6 +41283,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -236,7 +236,7 @@ $NetBSD: patch-aa,v 1.40 2008/02/13 19:30:00 drochner Exp $
  esac
  
  
-@@ -42228,6 +42212,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
+@@ -46418,10 +46402,10 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
  G_MODULE_LDFLAGS!$G_MODULE_LDFLAGS$ac_delim
  G_MODULE_HAVE_DLERROR!$G_MODULE_HAVE_DLERROR$ac_delim
  G_MODULE_BROKEN_RTLD_GLOBAL!$G_MODULE_BROKEN_RTLD_GLOBAL$ac_delim
@@ -244,28 +244,24 @@ $NetBSD: patch-aa,v 1.40 2008/02/13 19:30:00 drochner Exp $
  G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim
  GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim
  GSPAWN!$GSPAWN$ac_delim
-@@ -42245,7 +42230,6 @@ G_THREAD_LIBS_EXTRA!$G_THREAD_LIBS_EXTRA
- ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_delim
- ENABLE_REGEX_FALSE!$ENABLE_REGEX_FALSE$ac_delim
- USE_SYSTEM_PCRE_TRUE!$USE_SYSTEM_PCRE_TRUE$ac_delim
--USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim
+-GIO!$GIO$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -42287,6 +42271,7 @@ _ACEOF
+@@ -46463,6 +46447,7 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
-+USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim
- PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
- PCRE_LIBS!$PCRE_LIBS$ac_delim
- PCRE_REQUIRES!$PCRE_REQUIRES$ac_delim
-@@ -42310,7 +42295,7 @@ LIBOBJS!$LIBOBJS$ac_delim
++GIO!$GIO$ac_delim
+ GIO_MODULE_DIR!$GIO_MODULE_DIR$ac_delim
+ SELINUX_LIBS!$SELINUX_LIBS$ac_delim
+ HAVE_INOTIFY_TRUE!$HAVE_INOTIFY_TRUE$ac_delim
+@@ -46508,7 +46493,7 @@ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/devel/glib2/patches/patch-af b/devel/glib2/patches/patch-af
index 141fb0691bd..1c8e33df64b 100644
--- a/devel/glib2/patches/patch-af
+++ b/devel/glib2/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.9 2007/11/25 23:38:52 wiz Exp $
+$NetBSD: patch-af,v 1.10 2008/04/10 12:13:49 drochner Exp $
 
---- glib/libcharset/Makefile.in.orig	2007-11-24 06:41:56.000000000 +0000
+--- glib/libcharset/Makefile.in.orig	2008-03-11 01:41:07.000000000 +0100
 +++ glib/libcharset/Makefile.in
-@@ -556,18 +556,6 @@ uninstall-am: uninstall-info-am uninstal
- 	uninstall-am uninstall-info-am uninstall-local
- 
+@@ -598,18 +598,6 @@ test-report perf-report full-report:	${T
+ # run make test as part of make check
+ check-local: test
  install-exec-local: all-local
 -	$(mkinstalldirs) $(DESTDIR)$(libdir)
 -	if test -f $(charset_alias); then \
diff --git a/devel/glib2/patches/patch-ag b/devel/glib2/patches/patch-ag
index 81912879da2..02d05635291 100644
--- a/devel/glib2/patches/patch-ag
+++ b/devel/glib2/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.14 2008/01/08 23:31:56 tnn Exp $
+$NetBSD: patch-ag,v 1.15 2008/04/10 12:13:49 drochner Exp $
 
---- glib/gutils.h.orig	2008-01-08 02:39:49.000000000 +0100
+--- glib/gutils.h.orig	2008-03-31 22:45:04.000000000 +0200
 +++ glib/gutils.h
-@@ -108,6 +108,8 @@ G_BEGIN_DECLS
+@@ -96,6 +96,8 @@ G_BEGIN_DECLS
  #ifdef G_IMPLEMENT_INLINES
  #  define G_INLINE_FUNC
  #  undef  G_CAN_INLINE
 +#elif defined (__APPLE__)
 +#  define G_INLINE_FUNC static inline
  #elif defined (__GNUC__) 
- #  if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) \
-    && __STDC_VERSION__ >= 199901L
+ #  if defined (__GNUC_STDC_INLINE__) || defined (__GNUC_GNU_INLINE__)
+ #   define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
diff --git a/devel/glib2/patches/patch-ba b/devel/glib2/patches/patch-ba
new file mode 100644
index 00000000000..7466f23b40a
--- /dev/null
+++ b/devel/glib2/patches/patch-ba
@@ -0,0 +1,30 @@
+$NetBSD: patch-ba,v 1.1 2008/04/10 12:13:49 drochner Exp $
+
+--- gio/gunixmounts.c.orig	2008-04-01 15:51:11.000000000 +0200
++++ gio/gunixmounts.c
+@@ -561,7 +561,11 @@ get_mtab_monitor_file (void)
+ static GList *
+ _g_get_unix_mounts (void)
+ {
++#ifdef __NetBSD__
++  struct statvfs *mntent = NULL;
++#else
+   struct statfs *mntent = NULL;
++#endif
+   int num_mounts, i;
+   GUnixMountEntry *mount_entry;
+   GList *return_list;
+@@ -579,8 +583,13 @@ _g_get_unix_mounts (void)
+       mount_entry->mount_path = g_strdup (mntent[i].f_mntonname);
+       mount_entry->device_path = g_strdup (mntent[i].f_mntfromname);
+       mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename);
++#ifdef __NetBSD__
++      if (mntent[i].f_flag & MNT_RDONLY)
++	mount_entry->is_read_only = TRUE;
++#else
+       if (mntent[i].f_flags & MNT_RDONLY)
+ 	mount_entry->is_read_only = TRUE;
++#endif
+ 
+       mount_entry->is_system_internal =
+ 	guess_system_internal (mount_entry->mount_path,