@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.152 2011/05/25 09:38:42 drochner Exp $
+$NetBSD: distinfo,v 1.153 2011/06/09 11:16:38 drochner Exp $
 
-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 (glib-2.28.8.tar.bz2) = 20cd63705a8805260da0320c65b979233f2e3c18
+RMD160 (glib-2.28.8.tar.bz2) = f087a71445eb40fae5eab45a14cb74d4e239d5e6
+Size (glib-2.28.8.tar.bz2) = 7017806 bytes
 SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f
 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
@@ -28,4 +28,4 @@
 SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632
 SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0
 SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2
-SHA1 (patch-cj) = 942db85a799c431eff76abdec48eeaeda164f5c4
+SHA1 (patch-cj) = ef6b6ec1986990df096b342cfd8e9513e42671df

@@ -1,22 +1,22 @@
-$NetBSD: patch-cj,v 1.4 2011/05/25 09:38:42 drochner Exp $
+$NetBSD: patch-cj,v 1.5 2011/06/09 11:16:38 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-05-21 04:15:23.000000000 +0000
+--- glib/tests/Makefile.in.orig	2011-06-05 23:24:51.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) \
  	markup-escape$(EXEEXT) markup-subparser$(EXEEXT) \
  	array-test$(EXEEXT) hostutils$(EXEEXT) gvariant$(EXEEXT) \
--	mem-overflow$(EXEEXT) utils$(EXEEXT) regex$(EXEEXT) \
-+	utils$(EXEEXT) regex$(EXEEXT) \
- 	base64$(EXEEXT) sequence$(EXEEXT) scannerapi$(EXEEXT) \
- 	shell$(EXEEXT) collate$(EXEEXT) utf8-pointer$(EXEEXT) \
- 	utf8-validate$(EXEEXT) utf8-misc$(EXEEXT) checksum$(EXEEXT) \
-@@ -138,8 +138,6 @@ markup_parse_DEPENDENCIES = $(progs_ldad
+-	mem-overflow$(EXEEXT) utf8-performance$(EXEEXT) utils$(EXEEXT) \
++	utf8-performance$(EXEEXT) utils$(EXEEXT) \
+ 	regex$(EXEEXT) base64$(EXEEXT) sequence$(EXEEXT) \
+ 	scannerapi$(EXEEXT) shell$(EXEEXT) collate$(EXEEXT) \
+ 	utf8-pointer$(EXEEXT) utf8-validate$(EXEEXT) \
+@@ -139,8 +139,6 @@ markup_parse_DEPENDENCIES = $(progs_ldad
  markup_subparser_SOURCES = markup-subparser.c
  markup_subparser_OBJECTS = markup-subparser.$(OBJEXT)
  markup_subparser_DEPENDENCIES = $(progs_ldadd)
@@ -25,7 +25,7 @@
  mem_overflow_DEPENDENCIES = $(progs_ldadd)
  node_SOURCES = node.c
  node_OBJECTS = node.$(OBJEXT)
-@@ -238,7 +236,7 @@ SOURCES = array-test.c base64.c bookmark
+@@ -242,7 +240,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 \
@@ -34,7 +34,7 @@
  	$(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
+@@ -254,7 +252,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 \
@@ -43,16 +43,16 @@
  	$(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
+@@ -507,7 +505,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
+-	mem-overflow utf8-performance utils regex base64 sequence \
++	utf8-performance 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 \
+@@ -692,9 +690,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 @@
  node$(EXEEXT): $(node_OBJECTS) $(node_DEPENDENCIES) 
  	@rm -f node$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(node_OBJECTS) $(node_LDADD) $(LIBS)
-@@ -783,7 +778,6 @@ distclean-compile:
+@@ -793,7 +788,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@