update to 2.20.3

changes:
-bugfixes
-translation update

9 files changed, 50 insertions, 50 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 1343bf42288..77dbab13f9e 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.196 2012/03/03 00:11:52 wiz Exp $
+# $NetBSD: Makefile,v 1.197 2012/03/21 12:18:33 drochner Exp $
 
 .include "Makefile.common"
 .include "options.mk"
 
-PKGREVISION=		3
 CATEGORIES=		devel
 
 COMMENT=		Some useful routines for C programming (glib2)
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 30ef022ed9f..d6498615dab 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.common,v 1.14 2012/01/29 10:46:52 drochner Exp $
+# $NetBSD: Makefile.common,v 1.15 2012/03/21 12:18:33 drochner Exp $
 #
 # used by devel/glib2/Makefile
 # used by sysutils/gio-fam/Makefile
 
 # When updating this package, please apply patch-ak to configure.in and
 # then run a matching version of autoconf to regen patch-aa.
-DISTNAME=		glib-2.30.2
+DISTNAME=		glib-2.30.3
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		# empty; redefined in Makefile
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.30/ \
 			${MASTER_SITE_GNOME:=sources/glib/2.30/}
-EXTRACT_SUFX=		.tar.bz2
+EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://developer.gnome.org/doc/API/2.0/glib/glib.html
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index de0dc73dad0..0a777d63223 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.64 2012/01/29 17:43:43 drochner Exp $
+@comment $NetBSD: PLIST,v 1.65 2012/03/21 12:18:33 drochner Exp $
 bin/gdbus
 bin/gio-querymodules
 bin/glib-compile-schemas
@@ -255,8 +255,8 @@ man/man1/gtester.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load/libglib-2.0.so.0.3000.2-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.3000.2-gdb.py
+share/gdb/auto-load/libglib-2.0.so.0.3000.3-gdb.py
+share/gdb/auto-load/libgobject-2.0.so.0.3000.3-gdb.py
 share/glib-2.0/gdb/glib.py
 share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/mkinstalldirs
@@ -428,6 +428,8 @@ share/gtk-doc/html/gio/gio-GDBusError.html
 share/gtk-doc/html/gio/gio-GFileAttribute.html
 share/gtk-doc/html/gio/gio-GIOError.html
 share/gtk-doc/html/gio/gio-GIOScheduler.html
+share/gtk-doc/html/gio/gio-GWin32InputStream.html
+share/gtk-doc/html/gio/gio-GWin32OutputStream.html
 share/gtk-doc/html/gio/gio-Owning-Bus-Names.html
 share/gtk-doc/html/gio/gio-TLS-Overview.html
 share/gtk-doc/html/gio/gio-Unix-Mounts.html
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index e2cd9cf4e72..5be69144e1f 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.163 2012/03/05 07:48:10 abs Exp $
+$NetBSD: distinfo,v 1.164 2012/03/21 12:18:33 drochner Exp $
 
-SHA1 (glib-2.30.2.tar.bz2) = 70208757905037fa1f8b89797db0097c5e82a140
-RMD160 (glib-2.30.2.tar.bz2) = efe0d8ae945dd3b20ca4835dcb45696fd0914c06
-Size (glib-2.30.2.tar.bz2) = 7782266 bytes
+SHA1 (glib-2.30.3.tar.xz) = ec97dd659862dca05d18093a6ea6c309dcff0cdd
+RMD160 (glib-2.30.3.tar.xz) = 0887b08e2fff75c325ed1fb1123baaf42dc9779b
+Size (glib-2.30.3.tar.xz) = 5642448 bytes
 SHA1 (glib-gio-kqueue-2.28.8-v3.patch) = d50bee14ce72201c3ec2b82d0e498c8828fbd8c2
 RMD160 (glib-gio-kqueue-2.28.8-v3.patch) = ba4859d4336db50bacb6bdaace995ee761306a85
 Size (glib-gio-kqueue-2.28.8-v3.patch) = 89920 bytes
@@ -22,20 +22,20 @@ SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772
 SHA1 (patch-an) = 9384dca0b98bde4e2d64dbca6584a3aefa0c352c
 SHA1 (patch-ap) = 38a805f95e8f7ca35c73984be9142336c6a3ec4c
 SHA1 (patch-aq) = aa7087b91c7d0eca9f9895feb6924df95eccb372
-SHA1 (patch-ar) = 27679e663399ffa1ca1ad95876084f05930bece3
+SHA1 (patch-ar) = 93bf22a9debef8deb97918adeeaee5830280038b
 SHA1 (patch-as) = 0d9b461d5bf6d267b50eac892d8ad8a82f90be18
 SHA1 (patch-at) = f4c4a2fbe84eb8b361fb342f3c3b0b5a226d1794
 SHA1 (patch-ba) = 832c85a53565d323100da91ad514afd4960b38ca
 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
 SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
-SHA1 (patch-cd) = d1c6fa921be58469adb6b860f4e91f0a7eff067e
+SHA1 (patch-cd) = 9006b880e94ae4a4fc564c1978178a296dd63024
 SHA1 (patch-ce) = 5da41dc0807b0594d895af9ec4c285537065f572
 SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44
 SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632
 SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0
 SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2
-SHA1 (patch-cj) = baaa3d2ef2b58d17b81fd8341a28f99b850648a8
+SHA1 (patch-cj) = 041eb127b4454f37be664cb885d84f9342f9680d
 SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
-SHA1 (patch-cl) = 5d4fd59b55bfc2f08fa4d4f67a3cc9323872c746
-SHA1 (patch-cm) = 8ddac97b3476c992abea3e5d9383cd3a5c9008f3
+SHA1 (patch-cl) = 42eb60fc66b881368f6f5f71d1fc5869f82db1b1
+SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e
 SHA1 (patch-cn) = b930dc95d44eacc9448f2a3a799a95db2880bfd4
diff --git a/devel/glib2/patches/patch-ar b/devel/glib2/patches/patch-ar
index cff3aad69f9..df60f63bfeb 100644
--- a/devel/glib2/patches/patch-ar
+++ b/devel/glib2/patches/patch-ar
@@ -1,16 +1,15 @@
-$NetBSD: patch-ar,v 1.1 2012/01/29 17:43:44 drochner Exp $
+$NetBSD: patch-ar,v 1.2 2012/03/21 12:18:33 drochner Exp $
 
 avoid python dependency
 
---- gio/tests/Makefile.in.orig	2011-11-11 22:11:56.000000000 +0000
+--- gio/tests/Makefile.in.orig	2012-03-11 23:36:24.000000000 +0000
 +++ gio/tests/Makefile.in
-@@ -48,17 +48,14 @@ noinst_PROGRAMS = $(am__EXEEXT_5) $(am__
- @OS_UNIX_TRUE@	gdbus-peer gdbus-exit-on-close gdbus-non-socket \
- @OS_UNIX_TRUE@	gdbus-bz627724 appinfo contenttype file $(NULL) \
- @OS_UNIX_TRUE@	live-g-file desktop-app-info unix-fd \
--@OS_UNIX_TRUE@	unix-streams gapplication gdbus-test-codegen \
-+@OS_UNIX_TRUE@	unix-streams gapplication \
- @OS_UNIX_TRUE@	$(NULL)
+@@ -49,16 +49,13 @@ noinst_PROGRAMS = $(am__EXEEXT_5) $(am__
+ @OS_UNIX_TRUE@	gdbus-non-socket gdbus-bz627724 appinfo \
+ @OS_UNIX_TRUE@	contenttype file $(NULL) live-g-file \
+ @OS_UNIX_TRUE@	desktop-app-info unix-fd unix-streams \
+-@OS_UNIX_TRUE@	gapplication gdbus-test-codegen $(NULL)
++@OS_UNIX_TRUE@	gapplication $(NULL)
  @OS_UNIX_TRUE@am__append_2 = \
  @OS_UNIX_TRUE@	gdbus-example-unix-fd-client 		\
 -@OS_UNIX_TRUE@	gdbus-example-objectmanager-server 	\
@@ -23,7 +22,7 @@ avoid python dependency
  subdir = gio/tests
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
-@@ -96,7 +93,7 @@ am__EXEEXT_1 =
+@@ -97,7 +94,7 @@ am__EXEEXT_1 =
  @OS_UNIX_TRUE@	$(am__EXEEXT_1) live-g-file$(EXEEXT) \
  @OS_UNIX_TRUE@	desktop-app-info$(EXEEXT) unix-fd$(EXEEXT) \
  @OS_UNIX_TRUE@	unix-streams$(EXEEXT) gapplication$(EXEEXT) \
@@ -32,7 +31,7 @@ avoid python dependency
  @OS_WIN32_TRUE@am__EXEEXT_3 = win32-streams$(EXEEXT)
  @HAVE_DBUS1_TRUE@am__EXEEXT_4 = gdbus-serialization$(EXEEXT)
  am__EXEEXT_5 = io-stream$(EXEEXT) actions$(EXEEXT) \
-@@ -115,8 +112,6 @@ am__EXEEXT_5 = io-stream$(EXEEXT) action
+@@ -116,8 +113,6 @@ am__EXEEXT_5 = io-stream$(EXEEXT) action
  	cancellable$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
  	$(am__EXEEXT_3) $(am__EXEEXT_4)
  @OS_UNIX_TRUE@am__EXEEXT_6 = gdbus-example-unix-fd-client$(EXEEXT) \
@@ -41,7 +40,7 @@ avoid python dependency
  @OS_UNIX_TRUE@	$(am__EXEEXT_1)
  am__EXEEXT_7 = resolver$(EXEEXT) socket-server$(EXEEXT) \
  	socket-client$(EXEEXT) echo-server$(EXEEXT) httpd$(EXEEXT) \
-@@ -902,7 +897,6 @@ TEST_PROGS = io-stream actions memory-in
+@@ -912,7 +907,6 @@ TEST_PROGS = io-stream actions memory-in
  	gdbus-addresses network-address gdbus-message socket pollable \
  	tls-certificate tls-interaction cancellable $(NULL) \
  	$(am__append_1) $(am__append_3) $(am__append_4)
diff --git a/devel/glib2/patches/patch-cd b/devel/glib2/patches/patch-cd
index 4f237aa4870..cccd09bfbaf 100644
--- a/devel/glib2/patches/patch-cd
+++ b/devel/glib2/patches/patch-cd
@@ -1,12 +1,12 @@
-$NetBSD: patch-cd,v 1.5 2010/11/17 14:36:45 drochner Exp $
+$NetBSD: patch-cd,v 1.6 2012/03/21 12:18:33 drochner Exp $
 
 sysutils/gio-fam builds the gio/fam backend as a separate module.  Force it
 to link against the installed version of glib2, as it is not rebuilt by the
 package.
 
---- gio/fam/Makefile.in.orig	2010-11-14 06:01:55.000000000 +0000
+--- gio/fam/Makefile.in.orig	2012-03-11 23:56:05.000000000 +0000
 +++ gio/fam/Makefile.in
-@@ -76,10 +76,7 @@ am__base_list = \
+@@ -87,10 +87,7 @@ am__uninstall_files_from_dir = { \
  am__installdirs = "$(DESTDIR)$(giomoduledir)"
  LTLIBRARIES = $(giomodule_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -18,7 +18,7 @@ package.
  am__objects_1 =
  am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
  	libgiofam_la-fam-module.lo \
-@@ -384,9 +381,7 @@ libgiofam_la_CFLAGS = \
+@@ -402,9 +399,7 @@ libgiofam_la_CFLAGS = \
  
  libgiofam_la_LDFLAGS = $(module_flags)
  libgiofam_la_LIBADD = \
@@ -29,7 +29,7 @@ package.
  		$(GLIB_LIBS) \
  		$(FAM_LIBS) \
  		$(NULL)
-@@ -817,9 +812,6 @@ lcov-clean:
+@@ -842,9 +837,6 @@ lcov-clean:
  check-local: test-nonrecursive
  
  install-data-hook:
@@ -38,4 +38,4 @@ package.
 -	fi
  
  uninstall-local:
- 	$(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodules.cache
+ 	$(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodule.cache
diff --git a/devel/glib2/patches/patch-cj b/devel/glib2/patches/patch-cj
index d88dbfec438..f44ffb05a3f 100644
--- a/devel/glib2/patches/patch-cj
+++ b/devel/glib2/patches/patch-cj
@@ -1,11 +1,11 @@
-$NetBSD: patch-cj,v 1.6 2012/01/29 10:46:54 drochner Exp $
+$NetBSD: patch-cj,v 1.7 2012/03/21 12:18:33 drochner Exp $
 
 The mem-overflow test contains a declaration of an empty struct, which breaks
 on at least SunPro cc, and presumably some other non-gcc compilers.  Skip this
 test for now, pending a better fix.
 https://bugzilla.gnome.org/show_bug.cgi?id=641350
 
---- glib/tests/Makefile.in.orig	2011-10-14 13:31:09.000000000 +0000
+--- glib/tests/Makefile.in.orig	2012-03-11 23:36:24.000000000 +0000
 +++ glib/tests/Makefile.in
 @@ -69,7 +69,7 @@ am__EXEEXT_2 = testing$(EXEEXT) option-c
  	strfuncs$(EXEEXT) string$(EXEEXT) markup-parse$(EXEEXT) \
@@ -52,17 +52,17 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  	base64 sequence scannerapi shell collate utf8-pointer \
  	utf8-validate utf8-misc unicode checksum hmac hash cache date \
  	node convert list slist queue tree uri dir pattern logging \
-@@ -785,9 +783,6 @@ markup-parse$(EXEEXT): $(markup_parse_OB
- markup-subparser$(EXEEXT): $(markup_subparser_OBJECTS) $(markup_subparser_DEPENDENCIES) 
+@@ -786,9 +784,6 @@ markup-parse$(EXEEXT): $(markup_parse_OB
+ markup-subparser$(EXEEXT): $(markup_subparser_OBJECTS) $(markup_subparser_DEPENDENCIES) $(EXTRA_markup_subparser_DEPENDENCIES) 
  	@rm -f markup-subparser$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(markup_subparser_OBJECTS) $(markup_subparser_LDADD) $(LIBS)
--mem-overflow$(EXEEXT): $(mem_overflow_OBJECTS) $(mem_overflow_DEPENDENCIES) 
+-mem-overflow$(EXEEXT): $(mem_overflow_OBJECTS) $(mem_overflow_DEPENDENCIES) $(EXTRA_mem_overflow_DEPENDENCIES) 
 -	@rm -f mem-overflow$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(mem_overflow_OBJECTS) $(mem_overflow_LDADD) $(LIBS)
- node$(EXEEXT): $(node_OBJECTS) $(node_DEPENDENCIES) 
+ node$(EXEEXT): $(node_OBJECTS) $(node_DEPENDENCIES) $(EXTRA_node_DEPENDENCIES) 
  	@rm -f node$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(node_OBJECTS) $(node_LDADD) $(LIBS)
-@@ -907,7 +902,6 @@ distclean-compile:
+@@ -908,7 +903,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-escape.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-parse.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-subparser.Po@am__quote@
diff --git a/devel/glib2/patches/patch-cl b/devel/glib2/patches/patch-cl
index 428a691094f..a1b7775148b 100644
--- a/devel/glib2/patches/patch-cl
+++ b/devel/glib2/patches/patch-cl
@@ -1,6 +1,6 @@
-$NetBSD: patch-cl,v 1.3 2012/01/31 18:36:01 drochner Exp $
+$NetBSD: patch-cl,v 1.4 2012/03/21 12:18:33 drochner Exp $
 
---- gio/Makefile.am.orig	2011-11-11 17:56:51.000000000 +0000
+--- gio/Makefile.am.orig	2012-03-11 21:44:19.000000000 +0000
 +++ gio/Makefile.am
 @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
  
@@ -11,9 +11,9 @@ $NetBSD: patch-cl,v 1.3 2012/01/31 18:36:01 drochner Exp $
  
  if OS_UNIX
  SUBDIRS += libasyncns xdgmime
-@@ -633,12 +633,6 @@ gdbus_LDADD = libgio-2.0.la \
- 	$(top_builddir)/glib/libglib-2.0.la 		\
- 	$(top_builddir)/gobject/libgobject-2.0.la
+@@ -635,12 +635,6 @@ gdbus_SOURCES = gdbus-tool.c
+ gdbus_LDADD = libgio-2.0.la \
+ 	$(gio_dependency_libs)
  
 -completiondir = $(sysconfdir)/bash_completion.d
 -completion_DATA = \
diff --git a/devel/glib2/patches/patch-cm b/devel/glib2/patches/patch-cm
index f616189c328..5115f86e546 100644
--- a/devel/glib2/patches/patch-cm
+++ b/devel/glib2/patches/patch-cm
@@ -1,10 +1,10 @@
-$NetBSD: patch-cm,v 1.1 2011/10/09 19:40:02 jmmv Exp $
+$NetBSD: patch-cm,v 1.2 2012/03/21 12:18:33 drochner Exp $
 
 sysutils/gio-fam builds the gio/fam backend as a separate module.  Force it
 to link against the installed version of glib2, as it is not rebuilt by the
 package.
 
---- gio/fam/Makefile.am.orig	2010-09-27 18:48:33.000000000 +0000
+--- gio/fam/Makefile.am.orig	2012-03-11 23:55:40.000000000 +0000
 +++ gio/fam/Makefile.am
 @@ -25,11 +25,9 @@ libgiofam_la_CFLAGS = \
  	-DGIO_COMPILATION		\
@@ -29,4 +29,4 @@ package.
 -	fi
  
  uninstall-local:
- 	$(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodules.cache
+ 	$(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodule.cache