Update to 2.6.3:

Overview of Changes from GLib 2.6.2 to GLib 2.6.3
=================================================
* GOption
 - Fix formatting of --help output [Matthias Clasen]
 - Accept -? [Matthias]
* Win32 bug fixes [Bill Skaggs, Tor Lillqvist,
  J. Ali Harlow, Daniel Atallah]
* Other bug fixes [Ed Avis, Manish Singh, Matthias,
  Nicolas Laurent, Kjartan Maraas, Bastian Nocera,
  Suren A. Chilingaryan, Michael Banck]
* Documentation improvements [Matthias]
* New and updated translations (ar,el,et,fi,fr,gu,nb,no,uk,xh)

7 files changed, 38 insertions, 35 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 37280783388..ce688c78b30 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2005/02/13 19:12:14 recht Exp $
+# $NetBSD: Makefile,v 1.67 2005/03/02 15:38:08 wiz Exp $
 
-DISTNAME=		glib-2.6.2
+DISTNAME=		glib-2.6.3
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.6/ \
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 9ed06638612..f0bafe464e7 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2005/02/04 11:21:11 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.23 2005/03/02 15:38:08 wiz Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -171,6 +171,7 @@ share/doc/glib/ix05.html
 share/doc/glib/left.png
 share/doc/glib/mainloop-states.gif
 share/doc/glib/right.png
+share/doc/glib/style.css
 share/doc/glib/tools.html
 share/doc/glib/up.png
 share/doc/gobject/GTypeModule.html
@@ -203,6 +204,7 @@ share/doc/gobject/pr01.html
 share/doc/gobject/right.png
 share/doc/gobject/rn01.html
 share/doc/gobject/rn02.html
+share/doc/gobject/style.css
 share/doc/gobject/up.png
 share/glib-2.0/gettext/mkinstalldirs
 share/glib-2.0/gettext/po/Makefile.in.in
@@ -269,6 +271,7 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/glib20.mo
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index c6281b695fb..29d5f161101 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.45 2005/02/23 22:24:15 agc Exp $
+$NetBSD: distinfo,v 1.46 2005/03/02 15:38:08 wiz Exp $
 
-SHA1 (glib-2.6.2.tar.bz2) = 18e198ae5f49096ef44a0d92d1fa7b2cddcb91bf
-RMD160 (glib-2.6.2.tar.bz2) = 501f6ab4fb2c2382e4abb4d81ea9f3c29e32d309
-Size (glib-2.6.2.tar.bz2) = 2343753 bytes
-SHA1 (patch-aa) = 46da4262302066d79932de95cd727dd322f757e8
-SHA1 (patch-ab) = a231346877b6246e086312fda107a90dffdd0adb
-SHA1 (patch-ac) = 5f3d1446a41e71f1bf5556a1dd2a2a04e77d45da
+SHA1 (glib-2.6.3.tar.bz2) = e010bf33c1bff517b953c9e32ab277eabdac7359
+RMD160 (glib-2.6.3.tar.bz2) = df98624febed40e7b624ffdde6a96f18047ab1d8
+Size (glib-2.6.3.tar.bz2) = 2300144 bytes
+SHA1 (patch-aa) = abe511bd89abc57fb3fa9e80872a4b00bf27c4be
+SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
+SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
-SHA1 (patch-af) = c7f29961a832b65feef0e8f4cf218491a440f68c
+SHA1 (patch-af) = 53354cb832436b339dcb530acc5b8b583d0f6a2d
 SHA1 (patch-ag) = 3917075e80139e0bd937ee9c2b42745fa6e69747
 SHA1 (patch-ah) = 81dc8f02aad56af7634479f5554cc68adbe730f9
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 8cb35fe2df9..7c22c3a1b80 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.18 2005/01/09 17:30:00 jmmv Exp $
+$NetBSD: patch-aa,v 1.19 2005/03/02 15:38:08 wiz Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=140329
 http://bugzilla.gnome.org/show_bug.cgi?id=141256
 
---- configure.orig	2005-01-07 17:17:00.000000000 +0100
+--- configure.orig	2005-02-28 06:29:44.000000000 +0100
 +++ configure
 @@ -465,7 +465,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot GLIB_MAJOR_VERSION GLIB_MINOR_VERSION GLIB_MICRO_VERSION GLIB_VERSION GLIB_INTERFACE_AGE GLIB_BINARY_AGE LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LT_CURRENT_MINUS_AGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_WIN32_TRUE OS_WIN32_FALSE OS_UNIX_TRUE OS_UNIX_FALSE OS_LINUX_TRUE OS_LINUX_FALSE G_LIB_WIN32_RESOURCE G_MODULE_WIN32_RESOURCE G_OBJECT_WIN32_RESOURCE G_THREAD_WIN32_RESOURCE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP NM ac_ct_NM RANLIB ac_ct_RANLIB ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE LIBTOOL_EXPORT_OPTIONS ENABLE_GC_FRIENDLY DISABLE_MEM_POOLS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE HAVE_CXX_TRUE HAVE_CXX_FALSE PKG_CONFIG PERL INDENT REBUILD PERL_PATH CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE ICONV_LIBS LN_S ECHO AR ac_ct_AR CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA GLIBC21 HAVE_GOOD_PRINTF_TRUE HAVE_GOOD_PRINTF_FALSE G_MODULE_SUPPORTED G_MODULE_IMPL G_MODULE_LIBS G_MODULE_LIBS_EXTRA G_MODULE_PLUGIN_LIBS G_MODULE_LDFLAGS G_MODULE_HAVE_DLERROR G_MODULE_BROKEN_RTLD_GLOBAL G_MODULE_NEED_USCORE GLIB_DEBUG_FLAGS GSPAWN GIO PLATFORMDEP ENABLE_TIMELOOP_TRUE ENABLE_TIMELOOP_FALSE PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE GTHREAD_COMPILE_IMPL_DEFINES G_THREAD_CFLAGS G_THREAD_LIBS G_THREAD_LIBS_FOR_GTHREAD G_THREAD_LIBS_EXTRA G_LIBS_EXTRA CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE GLIB_GENMARSHAL HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_MAN_TRUE ENABLE_MAN_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot GLIB_MAJOR_VERSION GLIB_MINOR_VERSION GLIB_MICRO_VERSION GLIB_VERSION GLIB_INTERFACE_AGE GLIB_BINARY_AGE LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LT_CURRENT_MINUS_AGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_WIN32_TRUE OS_WIN32_FALSE OS_UNIX_TRUE OS_UNIX_FALSE OS_LINUX_TRUE OS_LINUX_FALSE G_LIB_WIN32_RESOURCE G_MODULE_WIN32_RESOURCE G_OBJECT_WIN32_RESOURCE G_THREAD_WIN32_RESOURCE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP NM ac_ct_NM RANLIB ac_ct_RANLIB ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE LIBTOOL_EXPORT_OPTIONS ENABLE_GC_FRIENDLY DISABLE_MEM_POOLS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE HAVE_CXX_TRUE HAVE_CXX_FALSE PKG_CONFIG PERL INDENT REBUILD PERL_PATH CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE ICONV_LIBS LN_S ECHO AR ac_ct_AR CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA GLIBC21 HAVE_GOOD_PRINTF_TRUE HAVE_GOOD_PRINTF_FALSE G_MODULE_SUPPORTED G_MODULE_IMPL G_MODULE_LIBS G_MODULE_LIBS_EXTRA G_MODULE_PLUGIN_LIBS G_MODULE_LDFLAGS G_MODULE_HAVE_DLERROR G_MODULE_BROKEN_RTLD_GLOBAL G_MODULE_BROKEN_DLOPEN_NULL G_MODULE_NEED_USCORE GLIB_DEBUG_FLAGS GSPAWN GIO PLATFORMDEP ENABLE_TIMELOOP_TRUE ENABLE_TIMELOOP_FALSE PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE GTHREAD_COMPILE_IMPL_DEFINES G_THREAD_CFLAGS G_THREAD_LIBS G_THREAD_LIBS_FOR_GTHREAD G_THREAD_LIBS_EXTRA G_LIBS_EXTRA CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE GLIB_GENMARSHAL HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_MAN_TRUE ENABLE_MAN_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot GLIB_MAJOR_VERSION GLIB_MINOR_VERSION GLIB_MICRO_VERSION GLIB_VERSION GLIB_INTERFACE_AGE GLIB_BINARY_AGE LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LT_CURRENT_MINUS_AGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_WIN32_TRUE OS_WIN32_FALSE OS_UNIX_TRUE OS_UNIX_FALSE OS_LINUX_TRUE OS_LINUX_FALSE G_LIB_WIN32_RESOURCE G_MODULE_WIN32_RESOURCE G_OBJECT_WIN32_RESOURCE G_THREAD_WIN32_RESOURCE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP NM ac_ct_NM RANLIB ac_ct_RANLIB ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE LIBTOOL_EXPORT_OPTIONS ENABLE_GC_FRIENDLY DISABLE_MEM_POOLS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE HAVE_CXX_TRUE HAVE_CXX_FALSE PKG_CONFIG PERL INDENT REBUILD PERL_PATH CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE ICONV_LIBS LN_S ECHO AR ac_ct_AR CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA HAVE_GNUC_VISIBILITY_TRUE HAVE_GNUC_VISIBILITY_FALSE GLIBC21 HAVE_GOOD_PRINTF_TRUE HAVE_GOOD_PRINTF_FALSE G_MODULE_SUPPORTED G_MODULE_IMPL G_MODULE_LIBS G_MODULE_LIBS_EXTRA G_MODULE_PLUGIN_LIBS G_MODULE_LDFLAGS G_MODULE_HAVE_DLERROR G_MODULE_BROKEN_RTLD_GLOBAL G_MODULE_NEED_USCORE GLIB_DEBUG_FLAGS GSPAWN GIO PLATFORMDEP ENABLE_TIMELOOP_TRUE ENABLE_TIMELOOP_FALSE PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE GTHREAD_COMPILE_IMPL_DEFINES G_THREAD_CFLAGS G_THREAD_LIBS G_THREAD_LIBS_FOR_GTHREAD G_THREAD_LIBS_EXTRA G_LIBS_EXTRA CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE GLIB_GENMARSHAL HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_MAN_TRUE ENABLE_MAN_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot GLIB_MAJOR_VERSION GLIB_MINOR_VERSION GLIB_MICRO_VERSION GLIB_VERSION GLIB_INTERFACE_AGE GLIB_BINARY_AGE LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LT_CURRENT_MINUS_AGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_WIN32_TRUE OS_WIN32_FALSE OS_UNIX_TRUE OS_UNIX_FALSE OS_LINUX_TRUE OS_LINUX_FALSE G_LIB_WIN32_RESOURCE G_MODULE_WIN32_RESOURCE G_OBJECT_WIN32_RESOURCE G_THREAD_WIN32_RESOURCE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP NM ac_ct_NM RANLIB ac_ct_RANLIB ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE LIBTOOL_EXPORT_OPTIONS ENABLE_GC_FRIENDLY DISABLE_MEM_POOLS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE HAVE_CXX_TRUE HAVE_CXX_FALSE PKG_CONFIG PERL INDENT REBUILD PERL_PATH CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE ICONV_LIBS LN_S ECHO AR ac_ct_AR CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA HAVE_GNUC_VISIBILITY_TRUE HAVE_GNUC_VISIBILITY_FALSE GLIBC21 HAVE_GOOD_PRINTF_TRUE HAVE_GOOD_PRINTF_FALSE G_MODULE_SUPPORTED G_MODULE_IMPL G_MODULE_LIBS G_MODULE_LIBS_EXTRA G_MODULE_PLUGIN_LIBS G_MODULE_LDFLAGS G_MODULE_HAVE_DLERROR G_MODULE_BROKEN_RTLD_GLOBAL G_MODULE_BROKEN_DLOPEN_NULL G_MODULE_NEED_USCORE GLIB_DEBUG_FLAGS GSPAWN GIO PLATFORMDEP ENABLE_TIMELOOP_TRUE ENABLE_TIMELOOP_FALSE PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE GTHREAD_COMPILE_IMPL_DEFINES G_THREAD_CFLAGS G_THREAD_LIBS G_THREAD_LIBS_FOR_GTHREAD G_THREAD_LIBS_EXTRA G_LIBS_EXTRA CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE GLIB_GENMARSHAL HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_MAN_TRUE ENABLE_MAN_FALSE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -31043,6 +31043,7 @@ else
+@@ -31053,6 +31053,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -22,7 +22,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -31696,6 +31697,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
+@@ -31706,6 +31707,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
  	else
    		G_MODULE_BROKEN_RTLD_GLOBAL=0
  	fi
@@ -95,7 +95,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  	echo "$as_me:$LINENO: checking for preceeding underscore in symbols" >&5
  echo $ECHO_N "checking for preceeding underscore in symbols... $ECHO_C" >&6
  if test "${glib_cv_uscore+set}" = set; then
-@@ -32325,9 +32392,33 @@ if test x"$have_threads" != xno; then
+@@ -32335,9 +32402,33 @@ if test x"$have_threads" != xno; then
           # skip cygwin -pthread or -pthreads test
           ;;
        *)
@@ -131,7 +131,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
            if test "$cross_compiling" = yes; then
    cat >conftest.$ac_ext <<_ACEOF
  
-@@ -32416,10 +32507,12 @@ rm -f core *.core gmon.out bb.out confte
+@@ -32426,10 +32517,12 @@ rm -f core *.core gmon.out bb.out confte
  fi
            CFLAGS="$glib_save_CFLAGS"
            if test $glib_flag_works = yes ; then
@@ -146,7 +146,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
           ;;
      esac
    fi
-@@ -32482,6 +32575,15 @@ fi
+@@ -32492,6 +32585,15 @@ fi
  
    fi
  
@@ -162,9 +162,9 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
      # if we are not finding the localtime_r function, then we probably are
      # not using the proper multithread flag
  
-@@ -34796,6 +34898,10 @@ case $host in
-   *-*-linux*)
-     G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
+@@ -34809,6 +34911,10 @@ case $host in
+   *)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
 +  *-*-netbsd*)
 +    # On NetBSD, pkgsrc's libtool does the right thing.
@@ -173,7 +173,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  esac
  
  
-@@ -39040,6 +39146,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
+@@ -39062,6 +39168,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
  s,@G_MODULE_LDFLAGS@,$G_MODULE_LDFLAGS,;t t
  s,@G_MODULE_HAVE_DLERROR@,$G_MODULE_HAVE_DLERROR,;t t
  s,@G_MODULE_BROKEN_RTLD_GLOBAL@,$G_MODULE_BROKEN_RTLD_GLOBAL,;t t
diff --git a/devel/glib2/patches/patch-ab b/devel/glib2/patches/patch-ab
index 2f58cfe9f9a..2f59bceb586 100644
--- a/devel/glib2/patches/patch-ab
+++ b/devel/glib2/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.10 2004/04/17 10:37:12 jmmv Exp $
+$NetBSD: patch-ab,v 1.11 2005/03/02 15:38:08 wiz Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=140329
 
---- gmodule/gmodule.c.orig	2004-02-24 15:00:19.000000000 +0100
-+++ gmodule/gmodule.c	2004-04-17 11:43:31.000000000 +0200
-@@ -521,6 +521,24 @@
+--- gmodule/gmodule.c.orig	2005-01-02 17:03:56.000000000 +0100
++++ gmodule/gmodule.c
+@@ -560,6 +560,24 @@ g_module_error (void)
    return g_static_private_get (&module_error_private);
  }
  
@@ -29,7 +29,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=140329
  gboolean
  g_module_symbol (GModule	*module,
  		 const gchar	*symbol_name,
-@@ -538,17 +556,28 @@
+@@ -577,17 +595,28 @@ g_module_symbol (GModule	*module,
    
    g_static_rec_mutex_lock (&g_module_global_lock);
  
diff --git a/devel/glib2/patches/patch-ac b/devel/glib2/patches/patch-ac
index f3e98a295f2..08d8d7d1fc7 100644
--- a/devel/glib2/patches/patch-ac
+++ b/devel/glib2/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.8 2004/04/01 18:13:31 jmmv Exp $
+$NetBSD: patch-ac,v 1.9 2005/03/02 15:38:08 wiz Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=107626
 
---- gmodule/gmodule-dyld.c.orig	2002-03-02 21:30:33.000000000 +0100
+--- gmodule/gmodule-dyld.c.orig	2004-02-20 02:41:00.000000000 +0100
 +++ gmodule/gmodule-dyld.c
-@@ -116,7 +116,13 @@ _g_module_symbol (gpointer     handle,
+@@ -119,7 +119,13 @@ _g_module_symbol (gpointer     handle,
        if (NSIsSymbolNameDefined (symbol_name))
  	sym = NSLookupAndBindSymbol (symbol_name);
        else
diff --git a/devel/glib2/patches/patch-af b/devel/glib2/patches/patch-af
index 657023b31c5..f7339d8fa7a 100644
--- a/devel/glib2/patches/patch-af
+++ b/devel/glib2/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2004/04/24 04:54:07 minskim Exp $
+$NetBSD: patch-af,v 1.6 2005/03/02 15:38:08 wiz Exp $
 
---- glib/libcharset/Makefile.in.orig	2004-03-16 11:13:14.000000000 -0600
+--- glib/libcharset/Makefile.in.orig	2005-02-28 06:29:39.000000000 +0100
 +++ glib/libcharset/Makefile.in
-@@ -528,18 +528,6 @@ uninstall-am: uninstall-info-am uninstal
+@@ -537,18 +537,6 @@ uninstall-am: uninstall-info-am uninstal
  	uninstall-am uninstall-info-am uninstall-local
  
  install-exec-local: all-local