Update to 2.12.1:

Overview of Changes from GLib 2.12.0 to GLib 2.12.1
===================================================

* Update to final Unicode Character Database 5.0.0

* Bugs fixed:
 346660 issues with base64 api documentation / g_base64_decode_cl...
 348136 Coverity reports allocation of wrong size CID #2839
 336281 Update to UCD 5.0
 346197 g_date_strftime %F option doesnt work for win32
 348011 Small optimization to real_toupper()
 246494 prototype mismatch in glib/gconvert.c

* New and updated translations (bg,bn_IN,ca,dz,eu,fi,
  fr,he,it,ja,mk,or,pt)

6 files changed, 24 insertions, 39 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index aaeb275c891..4903c33961d 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.102 2006/07/08 16:16:40 minskim Exp $
+# $NetBSD: Makefile,v 1.103 2006/07/23 14:15:02 wiz Exp $
 
-DISTNAME=		glib-2.12.0
+DISTNAME=		glib-2.12.1
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.12/ \
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index e414c0083c3..535367a1917 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2006/07/03 21:01:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.33 2006/07/23 14:15:02 wiz Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -263,6 +263,7 @@ share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/be/LC_MESSAGES/glib20.mo
 share/locale/bg/LC_MESSAGES/glib20.mo
 share/locale/bn/LC_MESSAGES/glib20.mo
+share/locale/bn_IN/LC_MESSAGES/glib20.mo
 share/locale/bs/LC_MESSAGES/glib20.mo
 share/locale/ca/LC_MESSAGES/glib20.mo
 share/locale/cs/LC_MESSAGES/glib20.mo
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index b2de6cfe814..ba79a9e311e 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.63 2006/07/03 21:01:54 wiz Exp $
+$NetBSD: distinfo,v 1.64 2006/07/23 14:15:02 wiz Exp $
 
-SHA1 (glib-2.12.0.tar.bz2) = 3a5afb427bf7ea064b47ecd9316603ddd07de1f1
-RMD160 (glib-2.12.0.tar.bz2) = 05c42ad616b3cb4aec3831d30414516c70142a4f
-Size (glib-2.12.0.tar.bz2) = 2862476 bytes
-SHA1 (patch-aa) = e8e2c1f3084a58de26a5033a269a9c2bd5c74d65
+SHA1 (glib-2.12.1.tar.bz2) = 9c406074cedcaf5e2c6271dbbb5800bdf6324084
+RMD160 (glib-2.12.1.tar.bz2) = d4e9fe18b02bd5836c3c3c0ff23448ba2234b84a
+Size (glib-2.12.1.tar.bz2) = 2870280 bytes
+SHA1 (patch-aa) = b2b67e40d5db054431a3ec3084c31c9121aeb772
 SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae
-SHA1 (patch-ag) = 312ca380107765534b80e9f6c27f98cc2f24e449
-SHA1 (patch-ah) = aac1edb4b40a7c82e04d78d96b33ff9f4321eb45
+SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905
 SHA1 (patch-aj) = f0c15174e83dae88cca50d040d0c09438ee9053b
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 85d335732ac..2b9a86c9234 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.24 2006/07/03 21:01:54 wiz Exp $
+$NetBSD: patch-aa,v 1.25 2006/07/23 14:15:02 wiz Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=140329
 http://bugzilla.gnome.org/show_bug.cgi?id=141256
 
---- configure.orig	2006-07-02 18:48:07.000000000 +0000
+--- configure.orig	2006-07-22 17:37:42.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
+@@ -33251,6 +33251,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
+@@ -33904,6 +33905,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
+@@ -34466,9 +34533,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
+@@ -34557,10 +34649,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
-@@ -33569,6 +33663,15 @@ fi
+@@ -34613,6 +34707,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
  
-@@ -35522,6 +35625,10 @@ case $host in
+@@ -36566,6 +36669,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
  
  
-@@ -39796,6 +39905,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
+@@ -40840,6 +40947,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-ag b/devel/glib2/patches/patch-ag
deleted file mode 100644
index 375a55cd2f4..00000000000
--- a/devel/glib2/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2006/07/03 21:01:54 wiz Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=346494
-
---- glib/gconvert.c.orig	2006-05-10 00:44:49.000000000 +0000
-+++ glib/gconvert.c
-@@ -88,7 +88,7 @@ try_to_aliases (const char **to_aliases,
-   return FALSE;
- }
- 
--extern const char **_g_charset_get_aliases (const char *canonical_name) G_GNUC_INTERNAL;
-+extern const char ** G_GNUC_INTERNAL _g_charset_get_aliases (const char *canonical_name);
- 
- /**
-  * g_iconv_open:
diff --git a/devel/glib2/patches/patch-ah b/devel/glib2/patches/patch-ah
index b981106ad61..886d3bfb142 100644
--- a/devel/glib2/patches/patch-ah
+++ b/devel/glib2/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.6 2006/07/03 21:01:54 wiz Exp $
+$NetBSD: patch-ah,v 1.7 2006/07/23 14:15:02 wiz Exp $
 
---- glib/gutils.c.orig	2006-06-13 22:46:52.000000000 +0000
+--- glib/gutils.c.orig	2006-07-06 20:30:16.000000000 +0000
 +++ glib/gutils.c
-@@ -2472,7 +2472,7 @@ g_get_system_data_dirs (void)
+@@ -2489,7 +2489,7 @@ g_get_system_data_dirs (void)
        gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
  
        if (!data_dirs || !data_dirs[0])
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.6 2006/07/03 21:01:54 wiz Exp $
  
        data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
-@@ -2526,7 +2526,7 @@ g_get_system_config_dirs (void)
+@@ -2543,7 +2543,7 @@ g_get_system_config_dirs (void)
        conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
  
        if (!conf_dirs || !conf_dirs[0])
@@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.6 2006/07/03 21:01:54 wiz Exp $
  
        conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
-@@ -2607,7 +2607,7 @@ unalias_lang (char *lang)
+@@ -2624,7 +2624,7 @@ unalias_lang (char *lang)
    int i;
  
    if (!alias_table)