update to 2.28.7

changes:
-bugfixes
-translation updates

6 files changed, 32 insertions, 47 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index b57d8249e9a..561981874e4 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.183 2011/04/22 13:42:05 obache Exp $
+# $NetBSD: Makefile,v 1.184 2011/05/25 09:38:42 drochner Exp $
 
 .include "Makefile.common"
 
-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 b9e720f121a..1357e6a751c 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.10 2011/04/15 16:27:37 drochner Exp $
+# $NetBSD: Makefile.common,v 1.11 2011/05/25 09:38:42 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.28.6
+DISTNAME=		glib-2.28.7
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		# empty; redefined in Makefile
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.28/ \
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 857f29bfffc..d11bb8f1aba 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.60 2011/04/15 16:27:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.61 2011/05/25 09:38:42 drochner Exp $
 bin/gdbus
 bin/gio-querymodules
 bin/glib-compile-schemas
@@ -239,8 +239,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.2800.6-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.2800.6-gdb.py
+share/gdb/auto-load/libglib-2.0.so.0.2800.7-gdb.py
+share/gdb/auto-load/libgobject-2.0.so.0.2800.7-gdb.py
 share/glib-2.0/gdb/glib.py
 share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/mkinstalldirs
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 97134ad0cb9..c6d4f6e4e06 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.151 2011/04/15 16:27:37 drochner Exp $
+$NetBSD: distinfo,v 1.152 2011/05/25 09:38:42 drochner Exp $
 
-SHA1 (glib-2.28.6.tar.bz2) = 51996339c823cf36ba28c774c4afad933d5f5744
-RMD160 (glib-2.28.6.tar.bz2) = 5858c29829352c0c59fe12dbd6dceba81aabe5f6
-Size (glib-2.28.6.tar.bz2) = 6955725 bytes
+SHA1 (glib-2.28.7.tar.bz2) = 82ea79fc2c73df29da1c6d33e0fa027e6c77ec68
+RMD160 (glib-2.28.7.tar.bz2) = 1fbb64463d89478f0e7b4c4c8818ee6644c17751
+Size (glib-2.28.7.tar.bz2) = 6972304 bytes
 SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f
 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
@@ -17,7 +17,6 @@ SHA1 (patch-ak) = 718dad5f27cb8254d84d6f8007a96b33e7c4a435
 SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
 SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772
 SHA1 (patch-an) = dd136645f7555f3600562b055cdcb4f60b41ae78
-SHA1 (patch-ao) = 293b462565ef4991af807e79c1200df5458058e7
 SHA1 (patch-ap) = 3df3c29373efb491d1b0e96d57a192b1b30f2cfa
 SHA1 (patch-aq) = aa7087b91c7d0eca9f9895feb6924df95eccb372
 SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
@@ -29,4 +28,4 @@ SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44
 SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632
 SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0
 SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2
-SHA1 (patch-cj) = a624367e0c5ba0b6bbd25e7e5a2664c284534a53
+SHA1 (patch-cj) = 942db85a799c431eff76abdec48eeaeda164f5c4
diff --git a/devel/glib2/patches/patch-ao b/devel/glib2/patches/patch-ao
deleted file mode 100644
index 007455c1723..00000000000
--- a/devel/glib2/patches/patch-ao
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2010/11/08 04:11:48 drochner Exp $
-
---- glib/gatomic.c.orig	2010-09-23 15:26:45.000000000 +0000
-+++ glib/gatomic.c
-@@ -29,6 +29,7 @@
- 
- #include "gatomic.h"
- #include "gthreadprivate.h"
-+#include "gthread.h"
- 
- /**
-  * SECTION:atomic_operations
diff --git a/devel/glib2/patches/patch-cj b/devel/glib2/patches/patch-cj
index 90c63857bfe..295e3c4a9ca 100644
--- a/devel/glib2/patches/patch-cj
+++ b/devel/glib2/patches/patch-cj
@@ -1,11 +1,11 @@
-$NetBSD: patch-cj,v 1.3 2011/03/09 11:22:04 drochner Exp $
+$NetBSD: patch-cj,v 1.4 2011/05/25 09:38:42 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-02-08 17:40:51.000000000 +0000
+--- glib/tests/Makefile.in.orig	2011-05-21 04:15:23.000000000 +0000
 +++ glib/tests/Makefile.in
 @@ -59,7 +59,7 @@ am__EXEEXT_1 = testing$(EXEEXT) option-c
  	string$(EXEEXT) markup-parse$(EXEEXT) markup-collect$(EXEEXT) \
@@ -25,34 +25,34 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  mem_overflow_DEPENDENCIES = $(progs_ldadd)
  node_SOURCES = node.c
  node_OBJECTS = node.$(OBJEXT)
-@@ -235,7 +233,7 @@ SOURCES = array-test.c base64.c bookmark
+@@ -238,7 +236,7 @@ SOURCES = array-test.c base64.c bookmark
  	$(fileutils_SOURCES) $(gdatetime_SOURCES) gvariant.c hash.c \
  	hostutils.c $(keyfile_SOURCES) list.c logging.c \
  	markup-collect.c markup-escape.c markup-parse.c \
 -	markup-subparser.c mem-overflow.c node.c \
 +	markup-subparser.c node.c \
- 	$(option_context_SOURCES) pattern.c $(printf_SOURCES) \
- 	$(protocol_SOURCES) queue.c $(rand_SOURCES) regex.c \
- 	scannerapi.c sequence.c shell.c slist.c $(strfuncs_SOURCES) \
-@@ -246,7 +244,7 @@ DIST_SOURCES = array-test.c base64.c boo
+ 	$(option_context_SOURCES) pattern.c $(protocol_SOURCES) \
+ 	queue.c $(rand_SOURCES) regex.c scannerapi.c sequence.c \
+ 	shell.c slist.c $(strfuncs_SOURCES) $(string_SOURCES) \
+@@ -250,7 +248,7 @@ DIST_SOURCES = array-test.c base64.c boo
  	$(fileutils_SOURCES) $(gdatetime_SOURCES) gvariant.c hash.c \
  	hostutils.c $(keyfile_SOURCES) list.c logging.c \
  	markup-collect.c markup-escape.c markup-parse.c \
 -	markup-subparser.c mem-overflow.c node.c \
 +	markup-subparser.c node.c \
- 	$(option_context_SOURCES) pattern.c $(printf_SOURCES) \
- 	$(protocol_SOURCES) queue.c $(rand_SOURCES) regex.c \
- 	scannerapi.c sequence.c shell.c slist.c $(strfuncs_SOURCES) \
-@@ -497,7 +495,7 @@ EXTRA_DIST = 4096-random-bytes keyfilete
- 	bookmarks.xbel
- TEST_PROGS = testing option-context keyfile fileutils printf protocol \
- 	rand strfuncs string markup-parse markup-collect markup-escape \
--	markup-subparser array-test hostutils gvariant mem-overflow \
-+	markup-subparser array-test hostutils gvariant \
- 	utils regex base64 sequence scannerapi shell collate \
- 	utf8-pointer utf8-validate utf8-misc checksum hash date node \
- 	convert list slist queue tree uri dir pattern logging error \
-@@ -678,9 +676,6 @@ markup-parse$(EXEEXT): $(markup_parse_OB
+ 	$(option_context_SOURCES) pattern.c $(protocol_SOURCES) \
+ 	queue.c $(rand_SOURCES) regex.c scannerapi.c sequence.c \
+ 	shell.c slist.c $(strfuncs_SOURCES) $(string_SOURCES) \
+@@ -503,7 +501,7 @@ EXTRA_DIST = 4096-random-bytes keyfilete
+ TEST_PROGS = testing option-context keyfile fileutils test-printf \
+ 	protocol rand strfuncs string markup-parse markup-collect \
+ 	markup-escape markup-subparser array-test hostutils gvariant \
+-	mem-overflow utils regex base64 sequence scannerapi shell \
++	utils regex base64 sequence scannerapi shell \
+ 	collate utf8-pointer utf8-validate utf8-misc checksum hash \
+ 	date node convert list slist queue tree uri dir pattern \
+ 	logging error bookmarkfile gdatetime timeout environment
+@@ -685,9 +683,6 @@ markup-parse$(EXEEXT): $(markup_parse_OB
  markup-subparser$(EXEEXT): $(markup_subparser_OBJECTS) $(markup_subparser_DEPENDENCIES) 
  	@rm -f markup-subparser$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(markup_subparser_OBJECTS) $(markup_subparser_LDADD) $(LIBS)
@@ -62,7 +62,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  node$(EXEEXT): $(node_OBJECTS) $(node_DEPENDENCIES) 
  	@rm -f node$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(node_OBJECTS) $(node_LDADD) $(LIBS)
-@@ -773,7 +768,6 @@ distclean-compile:
+@@ -783,7 +778,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@