update to 2.24.1

this switches to the gnome-2.30 branch

8 files changed, 112 insertions, 136 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index abc00619502..9434cf98b1b 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.173 2010/04/20 17:43:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.174 2010/05/31 17:30:36 drochner Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		1
 CATEGORIES=		devel
 
 COMMENT=		Some useful routines for C programming (glib2)
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 79d23c085be..524bda41dd4 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile.common,v 1.1 2010/04/20 17:43:50 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2010/05/31 17:30:36 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.22.5
+DISTNAME=		glib-2.24.1
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		# empty; redefined in Makefile
-MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.22/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.22/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.24/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.24/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 16db274d908..75571dc13a5 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.52 2010/04/20 17:43:50 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.53 2010/05/31 17:30:36 drochner Exp $
+bin/gio-querymodules
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -6,7 +7,9 @@ bin/gobject-query
 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/gunixfdlist.h
 include/glib/gio-unix-2.0/gio/gunixfdmessage.h
 include/glib/gio-unix-2.0/gio/gunixinputstream.h
 include/glib/gio-unix-2.0/gio/gunixmounts.h
@@ -18,7 +21,11 @@ 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/gcharsetconverter.h
 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/gdatainputstream.h
 include/glib/glib-2.0/gio/gdataoutputstream.h
 include/glib/glib-2.0/gio/gdrive.h
@@ -77,6 +84,8 @@ include/glib/glib-2.0/gio/gthreadedsocketservice.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/gio/gzlibcompressor.h
+include/glib/glib-2.0/gio/gzlibdecompressor.h
 include/glib/glib-2.0/glib-object.h
 include/glib/glib-2.0/glib.h
 include/glib/glib-2.0/glib/galloca.h
@@ -85,6 +94,7 @@ include/glib/glib-2.0/glib/gasyncqueue.h
 include/glib/glib-2.0/glib/gatomic.h
 include/glib/glib-2.0/glib/gbacktrace.h
 include/glib/glib-2.0/glib/gbase64.h
+include/glib/glib-2.0/glib/gbitlock.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
@@ -139,6 +149,8 @@ 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/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/gboxed.h
@@ -180,8 +192,8 @@ 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.2200.5-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.2200.5-gdb.py
+share/gdb/auto-load/libglib-2.0.so.0.2400.1-gdb.py
+share/gdb/auto-load/libgobject-2.0.so.0.2400.1-gdb.py
 share/glib-2.0/gdb/glib.py
 share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/mkinstalldirs
@@ -192,12 +204,15 @@ 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/GCharsetConverter.html
+share/gtk-doc/html/gio/GConverter.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/GEmblem.html
 share/gtk-doc/html/gio/GEmblemedIcon.html
 share/gtk-doc/html/gio/GFile.html
+share/gtk-doc/html/gio/GFileDescriptorBased.html
 share/gtk-doc/html/gio/GFileEnumerator.html
 share/gtk-doc/html/gio/GFileIOStream.html
 share/gtk-doc/html/gio/GFileIcon.html
@@ -236,6 +251,7 @@ share/gtk-doc/html/gio/GSocketListener.html
 share/gtk-doc/html/gio/GSocketService.html
 share/gtk-doc/html/gio/GThemedIcon.html
 share/gtk-doc/html/gio/GThreadedSocketService.html
+share/gtk-doc/html/gio/GUnixFDList.html
 share/gtk-doc/html/gio/GUnixFDMessage.html
 share/gtk-doc/html/gio/GUnixInputStream.html
 share/gtk-doc/html/gio/GUnixOutputStream.html
@@ -243,14 +259,23 @@ share/gtk-doc/html/gio/GUnixSocketAddress.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/GZlibCompressor.html
+share/gtk-doc/html/gio/GZlibDecompressor.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-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/ch18.html
 share/gtk-doc/html/gio/ch19.html
-share/gtk-doc/html/gio/ch19s02.html
-share/gtk-doc/html/gio/ch19s03.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/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
@@ -259,6 +284,8 @@ 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-GConverterInputstream.html
+share/gtk-doc/html/gio/gio-GConverterOutputstream.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
@@ -273,11 +300,6 @@ 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/ix02.html
-share/gtk-doc/html/gio/ix03.html
-share/gtk-doc/html/gio/ix04.html
-share/gtk-doc/html/gio/ix05.html
 share/gtk-doc/html/gio/left.png
 share/gtk-doc/html/gio/migrating.html
 share/gtk-doc/html/gio/networking.html
@@ -291,6 +313,20 @@ 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/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
+share/gtk-doc/html/glib/api-index-2-16.html
+share/gtk-doc/html/glib/api-index-2-18.html
+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-4.html
+share/gtk-doc/html/glib/api-index-2-6.html
+share/gtk-doc/html/glib/api-index-2-8.html
+share/gtk-doc/html/glib/api-index-deprecated.html
+share/gtk-doc/html/glib/api-index-full.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
@@ -313,6 +349,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-GVariant.html
+share/gtk-doc/html/glib/glib-GVariantType.html
 share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
 share/gtk-doc/html/glib/glib-Hash-Tables.html
 share/gtk-doc/html/glib/glib-Hook-Functions.html
@@ -375,22 +413,10 @@ share/gtk-doc/html/glib/glib.devhelp2
 share/gtk-doc/html/glib/glib.html
 share/gtk-doc/html/glib/gtester-report.html
 share/gtk-doc/html/glib/gtester.html
+share/gtk-doc/html/glib/gvariant-format-strings.html
 share/gtk-doc/html/glib/home.png
 share/gtk-doc/html/glib/index.html
 share/gtk-doc/html/glib/index.sgml
-share/gtk-doc/html/glib/ix01.html
-share/gtk-doc/html/glib/ix02.html
-share/gtk-doc/html/glib/ix03.html
-share/gtk-doc/html/glib/ix04.html
-share/gtk-doc/html/glib/ix05.html
-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/ix11.html
-share/gtk-doc/html/glib/ix12.html
-share/gtk-doc/html/glib/ix13.html
 share/gtk-doc/html/glib/left.png
 share/gtk-doc/html/glib/mainloop-states.gif
 share/gtk-doc/html/glib/right.png
@@ -399,6 +425,18 @@ share/gtk-doc/html/glib/tools.html
 share/gtk-doc/html/glib/up.png
 share/gtk-doc/html/gobject/GTypeModule.html
 share/gtk-doc/html/gobject/GTypePlugin.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
+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-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
@@ -441,17 +479,6 @@ share/gtk-doc/html/gobject/howto-interface.html
 share/gtk-doc/html/gobject/howto-signals.html
 share/gtk-doc/html/gobject/index.html
 share/gtk-doc/html/gobject/index.sgml
-share/gtk-doc/html/gobject/ix01.html
-share/gtk-doc/html/gobject/ix02.html
-share/gtk-doc/html/gobject/ix03.html
-share/gtk-doc/html/gobject/ix04.html
-share/gtk-doc/html/gobject/ix05.html
-share/gtk-doc/html/gobject/ix06.html
-share/gtk-doc/html/gobject/ix07.html
-share/gtk-doc/html/gobject/ix08.html
-share/gtk-doc/html/gobject/ix09.html
-share/gtk-doc/html/gobject/ix10.html
-share/gtk-doc/html/gobject/ix11.html
 share/gtk-doc/html/gobject/left.png
 share/gtk-doc/html/gobject/pr01.html
 share/gtk-doc/html/gobject/pt01.html
@@ -468,9 +495,11 @@ share/gtk-doc/html/gobject/tools-gtkdoc.html
 share/gtk-doc/html/gobject/tools-refdb.html
 share/gtk-doc/html/gobject/tools-vala.html
 share/gtk-doc/html/gobject/up.png
+share/locale/af/LC_MESSAGES/glib20.mo
 share/locale/am/LC_MESSAGES/glib20.mo
 share/locale/ar/LC_MESSAGES/glib20.mo
 share/locale/as/LC_MESSAGES/glib20.mo
+share/locale/ast/LC_MESSAGES/glib20.mo
 share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/be/LC_MESSAGES/glib20.mo
 share/locale/be@latin/LC_MESSAGES/glib20.mo
@@ -486,6 +515,7 @@ share/locale/da/LC_MESSAGES/glib20.mo
 share/locale/de/LC_MESSAGES/glib20.mo
 share/locale/dz/LC_MESSAGES/glib20.mo
 share/locale/el/LC_MESSAGES/glib20.mo
+share/locale/en@shaw/LC_MESSAGES/glib20.mo
 share/locale/en_CA/LC_MESSAGES/glib20.mo
 share/locale/en_GB/LC_MESSAGES/glib20.mo
 share/locale/eo/LC_MESSAGES/glib20.mo
@@ -521,6 +551,7 @@ 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/nds/LC_MESSAGES/glib20.mo
 share/locale/ne/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 05f828d337f..c974146572c 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.133 2010/04/20 22:39:55 wiz Exp $
+$NetBSD: distinfo,v 1.134 2010/05/31 17:30:36 drochner Exp $
 
-SHA1 (glib-2.22.5.tar.bz2) = a35acb06c3155937651aaffc1f1895c6e19a91a4
-RMD160 (glib-2.22.5.tar.bz2) = 2e2f06f956f63a75121b335e4150edc44f5e04f2
-Size (glib-2.22.5.tar.bz2) = 4988402 bytes
-SHA1 (patch-aa) = c88b260236d4cfdf4b621ed29bc6292456b3e38d
+SHA1 (glib-2.24.1.tar.bz2) = d4835bb1618fc1e1dfe88ef8443c12fcae69f90e
+RMD160 (glib-2.24.1.tar.bz2) = c6ce09654c1bd28b8844435d150fcb51e6f4e872
+Size (glib-2.24.1.tar.bz2) = 5332511 bytes
+SHA1 (patch-aa) = 3cff899701032b955ce8737830ed41d0cbf1f236
 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
@@ -13,10 +13,9 @@ SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b
 SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
 SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f
 SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
-SHA1 (patch-ak) = 04e3d1eb9648186776dee81d2db9507c0df0c62e
+SHA1 (patch-ak) = 97e3f6ef5f3b0d1bf56ccd5cd3d977337c53fd30
 SHA1 (patch-al) = 6c8b7c569fb5fae5eff719ebd2925d79f5df3b2e
-SHA1 (patch-an) = e4a4b88a029c534f5be552eb301607ac57961915
 SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
 SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
-SHA1 (patch-cd) = ce935240b5517acc4514992167d2112305063b5d
+SHA1 (patch-cd) = 6023be38b13f9a30e9c3d364b5b589c936a955bb
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 2a63cdaa733..e4f07f80a22 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $
+$NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $
 
---- configure.orig	2010-03-16 02:52:21.000000000 +0000
+--- configure.orig	2010-05-03 00:59:28.000000000 +0000
 +++ configure
-@@ -803,6 +803,7 @@ GIO
+@@ -807,6 +807,7 @@ GIO
  GSPAWN
  GLIB_DEBUG_FLAGS
  G_MODULE_NEED_USCORE
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $
  G_MODULE_BROKEN_RTLD_GLOBAL
  G_MODULE_HAVE_DLERROR
  G_MODULE_LDFLAGS
-@@ -22163,8 +22164,8 @@ else
+@@ -22220,8 +22221,8 @@ else
  fi
  
  
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-@@ -23434,16 +23435,48 @@ fi
+@@ -23455,16 +23456,48 @@ fi
  
  case $host in
    *-*-solaris* )
@@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $
  esac
  
  if test "$ac_cv_func_statfs" = yes ; then
-@@ -24449,10 +24482,11 @@ if test x"$glib_native_win32" = xyes; th
+@@ -24470,10 +24503,11 @@ if test x"$glib_native_win32" = xyes; th
      G_MODULE_LDFLAGS=
  else
    export SED
@@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -24659,7 +24693,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
+@@ -24680,7 +24714,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.48 2010/03/16 13:41:15 wiz 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; }
-@@ -24769,6 +24803,56 @@ fi
+@@ -24790,6 +24824,56 @@ fi
  
  	LIBS="$LIBS_orig"
  fi
@@ -150,7 +150,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -24779,7 +24863,7 @@ fi
+@@ -24800,7 +24884,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.48 2010/03/16 13:41:15 wiz Exp $
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -24803,6 +24887,8 @@ fi
+@@ -24824,6 +24908,8 @@ fi
  
  
  
@@ -168,7 +168,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -25551,62 +25637,8 @@ if test x"$have_threads" != xno; then
+@@ -25572,62 +25658,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -233,14 +233,3 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $
           ;;
      esac
    fi
-@@ -26388,6 +26420,10 @@ case $host in
-   *)
-     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
-     ;;
-+  *-*-netbsd*)
-+    # On NetBSD, pkgsrc's libtool does the right thing.
-+    G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
-+    ;;
- esac
- 
- 
diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak
index 7516e4fb6de..925a268d746 100644
--- a/devel/glib2/patches/patch-ak
+++ b/devel/glib2/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $
+$NetBSD: patch-ak,v 1.6 2010/05/31 17:30:36 drochner Exp $
 
---- configure.in.orig	2009-10-07 15:29:47.000000000 +0200
-+++ configure.in	2009-11-22 15:18:00.124347084 +0100
-@@ -835,7 +835,7 @@
+--- configure.in.orig	2010-05-02 23:58:58.000000000 +0000
++++ configure.in
+@@ -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])
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
  #else
  # include "error: this is not Sun Studio."
-@@ -1023,10 +1023,22 @@
+@@ -1043,10 +1043,22 @@ fi
  
  case $host in
    *-*-solaris* )
@@ -38,7 +38,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $
  esac
  
  dnl
-@@ -1379,11 +1391,12 @@
+@@ -1399,11 +1411,12 @@ if test x"$glib_native_win32" = xyes; th
    G_MODULE_LDFLAGS=
  else
    export SED
@@ -52,7 +52,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $
  G_MODULE_HAVE_DLERROR=0
  dnl *** force native WIN32 shared lib loader 
  if test -z "$G_MODULE_IMPL"; then
-@@ -1444,7 +1457,7 @@
+@@ -1464,7 +1477,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
  	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
  	echo "void glib_plugin_test(void) { }" > plugin.c
@@ -61,7 +61,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $
  		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
  	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
  		glib_cv_rtldglobal_broken,[
-@@ -1508,6 +1521,38 @@
+@@ -1528,6 +1541,38 @@ dnl *** check for having dlerror()
  		[G_MODULE_HAVE_DLERROR=0])
  	LIBS="$LIBS_orig"
  fi
@@ -100,7 +100,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $
  dnl *** done, have we got an implementation?
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
-@@ -1518,7 +1563,7 @@
+@@ -1538,7 +1583,7 @@ fi
  
  AC_MSG_CHECKING(for the suffix of module shared libraries)
  export SED
@@ -109,7 +109,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -1537,6 +1582,8 @@
+@@ -1557,6 +1602,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
  AC_SUBST(G_MODULE_LDFLAGS)
  AC_SUBST(G_MODULE_HAVE_DLERROR)
  AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
@@ -118,7 +118,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $
  AC_SUBST(G_MODULE_NEED_USCORE)
  AC_SUBST(GLIB_DEBUG_FLAGS)
  
-@@ -1925,22 +1972,8 @@
+@@ -1945,22 +1992,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -143,14 +143,3 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $
           ;;
      esac 
    fi
-@@ -2336,6 +2369,10 @@
-   *) 	 
-     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" 	 
-     ;;
-+  *-*-netbsd*)
-+    # On NetBSD, pkgsrc's libtool does the right thing.
-+    G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
-+    ;;
- esac
- 
- AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c",
diff --git a/devel/glib2/patches/patch-an b/devel/glib2/patches/patch-an
deleted file mode 100644
index 24c2d62d6da..00000000000
--- a/devel/glib2/patches/patch-an
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-an,v 1.2 2010/02/19 19:46:53 roy Exp $
-
-Use RTLD_DEFAULT if the platform defines it.
-
-Upstream URL
-https://bugzilla.gnome.org/show_bug.cgi?id=610490
-
---- gmodule/gmodule-dl.c	2009-04-01 00:04:20.000000000 +0100
-+++ gmodule/gmodule-dl.c	2010-02-19 07:13:26.000000000 +0000
-@@ -107,6 +107,9 @@
- static gpointer
- _g_module_self (void)
- {
-+#ifdef RTLD_DEFAULT
-+  return RTLD_DEFAULT;
-+#else
-   gpointer handle;
-   
-   /* to query symbols from the program itself, special link options
-@@ -118,6 +121,7 @@
-     g_module_set_error (fetch_dlerror (TRUE));
-   
-   return handle;
-+#endif
- }
- 
- static void
diff --git a/devel/glib2/patches/patch-cd b/devel/glib2/patches/patch-cd
index dd5860bbdc5..bd719bc8520 100644
--- a/devel/glib2/patches/patch-cd
+++ b/devel/glib2/patches/patch-cd
@@ -1,10 +1,6 @@
-$NetBSD: patch-cd,v 1.2 2010/04/20 22:39:55 wiz Exp $
+$NetBSD: patch-cd,v 1.3 2010/05/31 17:30:36 drochner Exp $
 
-sysutils/gio-fam builds the gio/fam backend as a separate module.  Force it
-to link against the installed version of glib2, as it is not rebuilt by the
-package.
-
---- gio/fam/Makefile.in.orig	2010-03-16 02:52:15.000000000 +0000
+--- gio/fam/Makefile.in.orig	2010-05-03 00:59:22.000000000 +0000
 +++ gio/fam/Makefile.in
 @@ -76,10 +76,7 @@ am__base_list = \
  am__installdirs = "$(DESTDIR)$(giomoduledir)"
@@ -18,16 +14,7 @@ package.
  am__objects_1 =
  am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
  	libgiofam_la-fam-module.lo \
-@@ -311,7 +308,7 @@ infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
--localedir = @localedir@
-+localedir = /usr/pkg/share/locale
- localstatedir = @localstatedir@
- lt_ECHO = @lt_ECHO@
- mandir = @mandir@
-@@ -369,9 +366,7 @@ libgiofam_la_CFLAGS = \
+@@ -370,9 +367,7 @@ libgiofam_la_CFLAGS = \
  
  libgiofam_la_LDFLAGS = $(module_flags)
  libgiofam_la_LIBADD = \
@@ -38,3 +25,12 @@ package.
  		$(GLIB_LIBS) \
  		$(FAM_LIBS) \
  		$(NULL)
+@@ -777,7 +772,7 @@ check-local: test
+ 
+ install-data-hook:
+ 	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
+-		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
++		${LOCALBASE}/bin/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
+ 	fi
+ 
+ uninstall-local: