Update to 2.12.4:

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

* Fix build problems related to Posix timers.

* Bugs fixed
 321974 nanosleep on AIX / g_timer API using high
        resolution timers
 353584 va_end called on caller supplied va_list
 353580 va_copy detection breaks if user sets
        CFLAGS=-Werror-implicit-function-declaration
 354522 Small problem with PLT hiding 6 symbols
 358421 typos in gmain.c

* New and updated translations (bn,bn_IN,dz,el,en_GB,
  et,fa,hi,hy,it,ka,nn,pt_BR,ro,sl,sr,sr@Latn,ta)

5 files changed, 21 insertions, 50 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 2bd3a0a805b..e77a8bb1e6d 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.106 2006/09/10 10:18:05 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2006/10/06 18:05:21 wiz Exp $
 
-DISTNAME=		glib-2.12.3
+DISTNAME=		glib-2.12.4
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.12/ \
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 535367a1917..827bf9547c4 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2006/07/23 14:15:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.34 2006/10/06 18:05:22 wiz Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -270,6 +270,7 @@ share/locale/cs/LC_MESSAGES/glib20.mo
 share/locale/cy/LC_MESSAGES/glib20.mo
 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_CA/LC_MESSAGES/glib20.mo
 share/locale/en_GB/LC_MESSAGES/glib20.mo
@@ -287,6 +288,7 @@ share/locale/he/LC_MESSAGES/glib20.mo
 share/locale/hi/LC_MESSAGES/glib20.mo
 share/locale/hr/LC_MESSAGES/glib20.mo
 share/locale/hu/LC_MESSAGES/glib20.mo
+share/locale/hy/LC_MESSAGES/glib20.mo
 share/locale/id/LC_MESSAGES/glib20.mo
 share/locale/is/LC_MESSAGES/glib20.mo
 share/locale/it/LC_MESSAGES/glib20.mo
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 30f6587269b..67b2489a2ae 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.70 2006/10/03 02:31:46 dmcmahill Exp $
+$NetBSD: distinfo,v 1.71 2006/10/06 18:05:22 wiz Exp $
 
-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) = b5b6d8fd2247d46d885947fad4b7f89a48ee088c
+SHA1 (glib-2.12.4.tar.bz2) = 35be8f8a7ce47bb0f53ffcd50605a6f9596ebd04
+RMD160 (glib-2.12.4.tar.bz2) = 3aac5f23cedcef25f7fd7acb6d4ebfa744e38edc
+Size (glib-2.12.4.tar.bz2) = 2868828 bytes
+SHA1 (patch-aa) = cf9e6efb01acdff5988e65952ba42faa73ad9838
 SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
@@ -11,5 +11,4 @@ SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae
 SHA1 (patch-ag) = 456ec5678684e3a440991f037e74a2b0262b156b
 SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905
-SHA1 (patch-ai) = 1cdbe158b288600d03f41ce7ead656f61fa9d119
 SHA1 (patch-aj) = f0c15174e83dae88cca50d040d0c09438ee9053b
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 150c8fc586e..42ef1e70398 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.28 2006/09/04 09:45:36 tron Exp $
+$NetBSD: patch-aa,v 1.29 2006/10/06 18:05:22 wiz Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=140329
 http://bugzilla.gnome.org/show_bug.cgi?id=141256
 
---- configure.orig	2006-08-30 06:46:14.000000000 +0100
-+++ configure	2006-09-04 10:43:16.000000000 +0100
-@@ -465,7 +465,7 @@
+--- configure.orig	2006-10-01 23:05:29.000000000 +0000
++++ configure
+@@ -465,7 +465,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
@@ -14,7 +14,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -33430,6 +33430,7 @@
+@@ -32564,6 +32564,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
-@@ -34083,6 +34084,72 @@
+@@ -33217,6 +33218,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
-@@ -34645,9 +34712,34 @@
+@@ -33779,9 +33846,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
  
-@@ -34736,11 +34828,12 @@
+@@ -33870,11 +33962,12 @@ rm -f core *.core gmon.out bb.out confte
  fi
            CFLAGS="$glib_save_CFLAGS"
            if test $glib_flag_works = yes ; then
@@ -147,7 +147,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
           ;;
      esac
    fi
-@@ -34793,6 +34886,15 @@
+@@ -33927,6 +34020,15 @@ fi
  
    fi
  
@@ -163,7 +163,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
  
-@@ -36746,6 +36848,10 @@
+@@ -35880,6 +35982,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -174,7 +174,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  esac
  
  
-@@ -41020,6 +41126,7 @@
+@@ -40154,6 +40260,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-ai b/devel/glib2/patches/patch-ai
deleted file mode 100644
index 0884ba092eb..00000000000
--- a/devel/glib2/patches/patch-ai
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ai,v 1.9 2006/10/03 02:31:46 dmcmahill Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=359190
-
---- glib/gtimer.c.orig	2006-08-27 23:05:42.000000000 -0400
-+++ glib/gtimer.c	2006-10-02 09:34:45.507139000 -0400
-@@ -48,4 +48,6 @@
- #endif /* G_OS_WIN32 */
- 
-+#include <time.h>
-+
- #include "glib.h"
- #include "galias.h"
-@@ -92,5 +94,9 @@
-     {
-       initialized = TRUE;
--#if !defined(_POSIX_MONOTONIC_CLOCK) || _POSIX_MONOTONIC_CLOCK >= 0
-+#if defined(__DragonFly__)
-+     /* DragonFly has a monotonic clock, but not the define or sysconf support */
-+     posix_clock = CLOCK_MONOTONIC;
-+#else
-+#if defined(_SC_MONOTONIC_CLOCK) && (!defined(_POSIX_MONOTONIC_CLOCK) || _POSIX_MONOTONIC_CLOCK >= 0)
-       if (sysconf (_SC_MONOTONIC_CLOCK) >= 0)
- 	posix_clock = CLOCK_MONOTONIC;
-@@ -98,4 +104,5 @@
- #endif
- 	posix_clock = CLOCK_REALTIME;
-+#endif
-     }
- }