Update to 2.12.3:

Overview of Changes from GLib 2.12.2 to GLib 2.12.3
===================================================

* Use Posix monotonic clocks instead of gettimeofday()
  for GTimer when available.

* Make the construction of singleton objects work
  witout warnings.

* Bugs fixed
 351583 API documentation issues with 2.15 release
 336114 desktop locks immediately after changing
        the system clock
 351853 GKeyFile creates non-UTF-8 error messages

* Translation updates (fr,hu,ja,ku,lt,lv,ml,or,
  pt,ru,sv,vi,zh_CN)

3 files changed, 21 insertions, 20 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 44e806caec2..b59fd445e39 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.104 2006/08/17 22:35:10 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2006/09/03 08:53:04 wiz Exp $
 
-DISTNAME=		glib-2.12.2
+DISTNAME=		glib-2.12.3
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.12/ \
@@ -66,9 +66,9 @@ SUBST_CLASSES+=		thr
 SUBST_STAGE.thr=	post-patch
 SUBST_FILES.thr=	gthread/Makefile.in
 .  if ${OS_VERSION:R} >= 5
-SUBST_SED.thr=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
+SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
 .  else
-SUBST_SED.thr=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
+SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
 .  endif
 SUBST_MESSAGE.thr=	Fixing libgthread.
 
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index a86f716e285..9f3f5ee939b 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.65 2006/08/17 22:35:10 wiz Exp $
+$NetBSD: distinfo,v 1.66 2006/09/03 08:53:04 wiz Exp $
 
-SHA1 (glib-2.12.2.tar.bz2) = e605b404395dd4c93150e9eed08562732ca09c5a
-RMD160 (glib-2.12.2.tar.bz2) = e822fdba12421849b9656017a6900fb515d00e73
-Size (glib-2.12.2.tar.bz2) = 2860799 bytes
-SHA1 (patch-aa) = f27b2d63399b078b9a7f9c8b27da2a8e36e35fd7
+SHA1 (glib-2.12.3.tar.bz2) = 117abb0e73fddb46650f0f38bfbbddc658dc2ddf
+RMD160 (glib-2.12.3.tar.bz2) = 65c6d717742add451af769299428f4597effb4a8
+Size (glib-2.12.3.tar.bz2) = 2896345 bytes
+SHA1 (patch-aa) = a9e2c47fc9ce32c074f08b2d09189e923f2a07f0
 SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 9566a5e7b54..c563dbd1a55 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.26 2006/08/17 22:35:11 wiz Exp $
+$NetBSD: patch-aa,v 1.27 2006/09/03 08:53:04 wiz Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=140329
 http://bugzilla.gnome.org/show_bug.cgi?id=141256
 
---- configure.orig	2006-08-15 23:32:36.000000000 +0000
+--- configure.orig	2006-08-30 05:46:14.000000000 +0000
 +++ configure
 @@ -465,7 +465,7 @@ ac_includes_default="\
  # include <unistd.h>
@@ -14,7 +14,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -32207,6 +32207,7 @@ else
+@@ -33430,6 +33430,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
-@@ -32860,6 +32861,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
+@@ -34083,6 +34084,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
-@@ -33422,9 +33489,34 @@ if test x"$have_threads" != xno; then
+@@ -34645,9 +34712,34 @@ if test x"$have_threads" != xno; then
           # skip cygwin and darwin -pthread or -pthreads test
           ;;
        *)
@@ -132,7 +132,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
            if test "$cross_compiling" = yes; then
    cat >conftest.$ac_ext <<_ACEOF
  
-@@ -33513,10 +33605,12 @@ rm -f core *.core gmon.out bb.out confte
+@@ -34736,12 +34828,13 @@ rm -f core *.core gmon.out bb.out confte
  fi
            CFLAGS="$glib_save_CFLAGS"
            if test $glib_flag_works = yes ; then
@@ -140,14 +140,15 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
 -	     G_THREAD_LIBS=-$flag
 +             G_THREAD_CFLAGS=$flag
 +	     G_THREAD_LIBS=$flag
+ 	     break;
            fi
          done
-+
-+         fi
++	 fi    
           ;;
      esac
    fi
-@@ -33569,6 +33663,15 @@ fi
+ 
+@@ -34793,6 +34886,15 @@ fi
  
    fi
  
@@ -163,7 +164,7 @@ 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
  
-@@ -35522,6 +35625,10 @@ case $host in
+@@ -36746,6 +36848,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -174,7 +175,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  esac
  
  
-@@ -39796,6 +39905,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
+@@ -41020,6 +41126,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