update to 2.12.11

changes:
-bugfixes
-translation updates

4 files changed, 19 insertions, 21 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 71c433fb338..a267d98db7b 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.113 2007/01/18 22:42:56 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2007/03/20 15:33:57 drochner Exp $
 
-DISTNAME=		glib-2.12.9
+DISTNAME=		glib-2.12.11
 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 e555380e8bd..50f96ff2405 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2006/11/13 18:34:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.36 2007/03/20 15:33:57 drochner Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -261,6 +261,7 @@ share/locale/am/LC_MESSAGES/glib20.mo
 share/locale/ar/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
 share/locale/bg/LC_MESSAGES/glib20.mo
 share/locale/bn/LC_MESSAGES/glib20.mo
 share/locale/bn_IN/LC_MESSAGES/glib20.mo
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 347cb96b268..faea8257c42 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.78 2007/01/18 22:42:56 wiz Exp $
+$NetBSD: distinfo,v 1.79 2007/03/20 15:33:59 drochner Exp $
 
-SHA1 (glib-2.12.9.tar.bz2) = 387da30929047ef88a6f369831a34f41a3d027f7
-RMD160 (glib-2.12.9.tar.bz2) = f762b65131f5c1f30ee2e25cb771c296715e6bd6
-Size (glib-2.12.9.tar.bz2) = 2902738 bytes
-SHA1 (patch-aa) = 7fc166157fc62dccfddc1bb64e27d31e511897aa
+SHA1 (glib-2.12.11.tar.bz2) = 02d344295ddaeafeec6bc6824b71e12bbf1b0394
+RMD160 (glib-2.12.11.tar.bz2) = 8680d27e630643e6653d88537907d06e3ba6e91a
+Size (glib-2.12.11.tar.bz2) = 2925342 bytes
+SHA1 (patch-aa) = d6224959a9422706f20d5df63a3270330e51e718
 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 bcf1f6e2377..2f21df3e6e3 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,11 +1,8 @@
-$NetBSD: patch-aa,v 1.32 2007/01/08 15:56:14 drochner Exp $
+$NetBSD: patch-aa,v 1.33 2007/03/20 15:33:59 drochner Exp $
 
-http://bugzilla.gnome.org/show_bug.cgi?id=140329
-http://bugzilla.gnome.org/show_bug.cgi?id=141256
-
---- configure.orig	2007-01-04 22:41:19.000000000 +0100
+--- configure.orig	2007-03-09 05:04:21.000000000 +0100
 +++ configure
-@@ -924,6 +924,7 @@ G_MODULE_PLUGIN_LIBS
+@@ -925,6 +925,7 @@ G_MODULE_PLUGIN_LIBS
  G_MODULE_LDFLAGS
  G_MODULE_HAVE_DLERROR
  G_MODULE_BROKEN_RTLD_GLOBAL
@@ -13,7 +10,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  G_MODULE_NEED_USCORE
  GLIB_DEBUG_FLAGS
  GSPAWN
-@@ -35644,6 +35645,7 @@ else
+@@ -35674,6 +35675,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -21,7 +18,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
-@@ -36381,6 +36383,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
+@@ -36411,6 +36413,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
  	else
    		G_MODULE_BROKEN_RTLD_GLOBAL=0
  	fi
@@ -94,7 +91,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
-@@ -37010,126 +37078,8 @@ if test x"$have_threads" != xno; then
+@@ -37040,126 +37108,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -223,7 +220,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
           ;;
      esac
    fi
-@@ -39453,6 +39403,10 @@ case $host in
+@@ -39483,6 +39433,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -234,7 +231,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  esac
  
  
-@@ -44639,6 +44593,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
+@@ -44671,6 +44625,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
  G_MODULE_LDFLAGS!$G_MODULE_LDFLAGS$ac_delim
  G_MODULE_HAVE_DLERROR!$G_MODULE_HAVE_DLERROR$ac_delim
  G_MODULE_BROKEN_RTLD_GLOBAL!$G_MODULE_BROKEN_RTLD_GLOBAL$ac_delim
@@ -242,8 +239,8 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim
  GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim
  GSPAWN!$GSPAWN$ac_delim
-@@ -44665,7 +44620,7 @@ GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_L
- XSLTPROC!$XSLTPROC$ac_delim
+@@ -44696,7 +44651,7 @@ GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LI
+ GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim
  _ACEOF
  
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then