Update to 2.4.0:

GLib-2.4 is a stable release adding an incremental improvement
in functionality over GLib-2.2 while maintaining binary and
source compatibility.  New features include:

General
* Watches for child process exit integrated into the main loop.
* Unicode tables updated to cover all of Unicode-4.0.
* Standard header file for gettext macros, including Q_() macro
  for strings with context.
* Improved seeding for the GRandom random number generator.

Threading
* Atomic operations on integers and pointers.
* GOnce for one-time initialization.

GObject:
* G_DEFINE_TYPE macros for easy definition of GObject types.
* Properties can now be added to interfaces.
* Instance private data allows private data members for objects.

10 files changed, 52 insertions, 321 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 1eec4a218f7..c45b268f753 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2004/03/22 22:09:17 snj Exp $
+# $NetBSD: Makefile,v 1.45 2004/04/01 18:13:31 jmmv Exp $
 
-DISTNAME=		glib-2.2.3
+DISTNAME=		glib-2.4.0
 PKGNAME=		${DISTNAME:S/glib/glib2/}
-PKGREVISION=		1
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.2/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.4/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.4/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.4/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		xtraeme@NetBSD.org
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 3774ff07ba0..3ae07a3c428 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/08/27 09:06:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/04/01 18:13:31 jmmv Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -8,6 +8,7 @@ include/glib/glib-2.0/glib.h
 include/glib/glib-2.0/glib/galloca.h
 include/glib/glib-2.0/glib/garray.h
 include/glib/glib-2.0/glib/gasyncqueue.h
+include/glib/glib-2.0/glib/gatomic.h
 include/glib/glib-2.0/glib/gbacktrace.h
 include/glib/glib-2.0/glib/gcache.h
 include/glib/glib-2.0/glib/gcompletion.h
@@ -19,6 +20,8 @@ include/glib/glib-2.0/glib/gerror.h
 include/glib/glib-2.0/glib/gfileutils.h
 include/glib/glib-2.0/glib/ghash.h
 include/glib/glib-2.0/glib/ghook.h
+include/glib/glib-2.0/glib/gi18n-lib.h
+include/glib/glib-2.0/glib/gi18n.h
 include/glib/glib-2.0/glib/giochannel.h
 include/glib/glib-2.0/glib/glist.h
 include/glib/glib-2.0/glib/gmacros.h
@@ -72,33 +75,36 @@ lib/glib-2.0/include/glibconfig.h
 lib/libglib-2.0.a
 lib/libglib-2.0.la
 lib/libglib-2.0.so
-lib/libglib-2.0.so.200
-lib/libglib-2.0.so.200.3
+lib/libglib-2.0.so.400
+lib/libglib-2.0.so.400.0
 lib/libgmodule-2.0.a
 lib/libgmodule-2.0.la
 lib/libgmodule-2.0.so
-lib/libgmodule-2.0.so.200
-lib/libgmodule-2.0.so.200.3
+lib/libgmodule-2.0.so.400
+lib/libgmodule-2.0.so.400.0
 lib/libgobject-2.0.a
 lib/libgobject-2.0.la
 lib/libgobject-2.0.so
-lib/libgobject-2.0.so.200
-lib/libgobject-2.0.so.200.3
+lib/libgobject-2.0.so.400
+lib/libgobject-2.0.so.400.0
 lib/libgthread-2.0.a
 lib/libgthread-2.0.la
 lib/libgthread-2.0.so
-lib/libgthread-2.0.so.200
-lib/libgthread-2.0.so.200.3
+lib/libgthread-2.0.so.400
+lib/libgthread-2.0.so.400.0
 lib/pkgconfig/glib-2.0.pc
 lib/pkgconfig/gmodule-2.0.pc
 lib/pkgconfig/gobject-2.0.pc
 lib/pkgconfig/gthread-2.0.pc
 man/man1/glib-genmarshal.1
+man/man1/glib-gettextize.1
 man/man1/glib-mkenums.1
+man/man1/gobject-query.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/doc/html/glib/glib-Arrays.html
 share/doc/html/glib/glib-Asynchronous-Queues.html
+share/doc/html/glib/glib-Atomic-Operations.html
 share/doc/html/glib/glib-Automatic-String-Completion.html
 share/doc/html/glib/glib-Balanced-Binary-Trees.html
 share/doc/html/glib/glib-Basic-Types.html
@@ -116,6 +122,7 @@ share/doc/html/glib/glib-File-Utilities.html
 share/doc/html/glib/glib-Glob-style-pattern-matching.html
 share/doc/html/glib/glib-Hash-Tables.html
 share/doc/html/glib/glib-Hook-Functions.html
+share/doc/html/glib/glib-I18N.html
 share/doc/html/glib/glib-IO-Channels.html
 share/doc/html/glib/glib-Keyed-Data-Lists.html
 share/doc/html/glib/glib-Lexical-Scanner.html
@@ -153,8 +160,10 @@ share/doc/html/glib/glib-building.html
 share/doc/html/glib/glib-changes.html
 share/doc/html/glib/glib-compiling.html
 share/doc/html/glib/glib-core.html
+share/doc/html/glib/glib-cross-compiling.html
 share/doc/html/glib/glib-data-types.html
 share/doc/html/glib/glib-fundamentals.html
+share/doc/html/glib/glib-gettextize.html
 share/doc/html/glib/glib-resources.html
 share/doc/html/glib/glib-running.html
 share/doc/html/glib/glib-utilities.html
@@ -167,20 +176,24 @@ share/doc/html/glib/ix01.html
 share/doc/html/glib/left.png
 share/doc/html/glib/mainloop-states.gif
 share/doc/html/glib/right.png
+share/doc/html/glib/tools.html
 share/doc/html/glib/up.png
+share/doc/html/gobject/GTypeModule.html
+share/doc/html/gobject/GTypePlugin.html
+share/doc/html/gobject/glib-genmarshal.html
+share/doc/html/gobject/glib-mkenums.html
 share/doc/html/gobject/gobject-Boxed-Types.html
 share/doc/html/gobject/gobject-Closures.html
 share/doc/html/gobject/gobject-Enumeration-and-Flag-Types.html
 share/doc/html/gobject/gobject-GParamSpec.html
-share/doc/html/gobject/gobject-GType.html
-share/doc/html/gobject/gobject-GTypeModule.html
-share/doc/html/gobject/gobject-GTypePlugin.html
 share/doc/html/gobject/gobject-Generic-values.html
 share/doc/html/gobject/gobject-Signals.html
 share/doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html
 share/doc/html/gobject/gobject-The-Base-Object-Type.html
+share/doc/html/gobject/gobject-Type-Information.html
 share/doc/html/gobject/gobject-Value-arrays.html
 share/doc/html/gobject/gobject-Varargs-Value-Collection.html
+share/doc/html/gobject/gobject-query.html
 share/doc/html/gobject/gobject.devhelp
 share/doc/html/gobject/home.png
 share/doc/html/gobject/index.html
@@ -190,9 +203,11 @@ share/doc/html/gobject/left.png
 share/doc/html/gobject/pr01.html
 share/doc/html/gobject/right.png
 share/doc/html/gobject/rn01.html
+share/doc/html/gobject/rn02.html
 share/doc/html/gobject/up.png
 share/glib-2.0/gettext/po/Makefile.in.in
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/glib20.mo
@@ -210,23 +225,25 @@ ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/glib20.mo
-${PKGLOCALEDIR}/locale/li/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/glib20.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/glib20.mo
@@ -237,6 +254,7 @@ ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/glib20.mo
diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk
index 593bd0b9f3a..eacceea2e3b 100644
--- a/devel/glib2/buildlink2.mk
+++ b/devel/glib2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.13 2004/02/19 17:54:05 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2004/04/01 18:13:31 jmmv Exp $
 
 .if !defined(GLIB2_BUILDLINK2_MK)
 GLIB2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		glib2
-BUILDLINK_DEPENDS.glib2?=	glib2>=2.2.2nb1
+BUILDLINK_DEPENDS.glib2?=	glib2>=2.4.0
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.glib2=glib2
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index 0e47d3a57a6..238145246b4 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/04/01 18:13:31 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB2_BUILDLINK3_MK:=	${GLIB2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglib2}
 BUILDLINK_PACKAGES+=	glib2
 
 .if !empty(GLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.2.2nb1
+BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
 .endif	# GLIB2_BUILDLINK3_MK
 
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index af2ff1b2c06..d4843b6c620 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.25 2004/03/31 19:41:21 tron Exp $
+$NetBSD: distinfo,v 1.26 2004/04/01 18:13:31 jmmv Exp $
 
-SHA1 (glib-2.2.3.tar.bz2) = 05580cbe110b94dd5020a07cf6d380190a2a13af
-Size (glib-2.2.3.tar.bz2) = 1636987 bytes
+SHA1 (glib-2.4.0.tar.bz2) = 17822e7180791f18c1723110e9e757dc5526440c
+Size (glib-2.4.0.tar.bz2) = 2034272 bytes
 SHA1 (patch-aa) = 62ef4cd4908314d843b99aa792d94b3865c439f2
-SHA1 (patch-ab) = b951b1480eaa66074e311f347df2e1b137ec7089
-SHA1 (patch-ac) = 1b94c567ac0086abfc927f5af1e657f14b091218
-SHA1 (patch-ad) = 58739c123a640a66206c9afa8c28d81e3eb02986
-SHA1 (patch-ae) = fcbd0e4e3bab6805c829c10ae5f3be405b1e9bb5
-SHA1 (patch-af) = 1ed91e9d2371911b689cab162cdc59859dd770c2
+SHA1 (patch-ac) = 5f3d1446a41e71f1bf5556a1dd2a2a04e77d45da
+SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
diff --git a/devel/glib2/patches/patch-ab b/devel/glib2/patches/patch-ab
deleted file mode 100644
index 962950de1df..00000000000
--- a/devel/glib2/patches/patch-ab
+++ /dev/null
@@ -1,258 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2003/12/30 12:25:44 gavan Exp $
-
---- glib/trio/trio.c.orig	2003-08-26 02:17:43.000000000 +0200
-+++ glib/trio/trio.c
-@@ -3575,9 +3575,12 @@ TRIO_ARGS2((format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-+
-   assert(VALID(format));
- 
--  return TrioFormat(stdout, 0, TrioOutStreamFile, format, &args, NULL);
-+  G_VA_COPY(args2, args);
-+  return TrioFormat(stdout, 0, TrioOutStreamFile, format, &args2, NULL);
- }
- 
- /**
-@@ -3644,10 +3647,13 @@ TRIO_ARGS3((file, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-+
-   assert(VALID(file));
-   assert(VALID(format));
--  
--  return TrioFormat(file, 0, TrioOutStreamFile, format, &args, NULL);
-+
-+  G_VA_COPY(args2, args);  
-+  return TrioFormat(file, 0, TrioOutStreamFile, format, &args2, NULL);
- }
- 
- /**
-@@ -3716,9 +3722,12 @@ TRIO_ARGS3((fd, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-+
-   assert(VALID(format));
--  
--  return TrioFormat(&fd, 0, TrioOutStreamFileDescriptor, format, &args, NULL);
-+
-+  G_VA_COPY(args2, args);  
-+  return TrioFormat(&fd, 0, TrioOutStreamFileDescriptor, format, &args2, NULL);
- }
- 
- /**
-@@ -3775,6 +3784,7 @@ TRIO_ARGS4((stream, closure, format, arg
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   trio_custom_t data;
- 
-   assert(VALID(stream));
-@@ -3782,7 +3792,8 @@ TRIO_ARGS4((stream, closure, format, arg
- 
-   data.stream.out = stream;
-   data.closure = closure;
--  return TrioFormat(&data, 0, TrioOutStreamCustom, format, &args, NULL);
-+  G_VA_COPY(args2, args);
-+  return TrioFormat(&data, 0, TrioOutStreamCustom, format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
-@@ -3850,12 +3861,14 @@ TRIO_ARGS3((buffer, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   int status;
- 
-   assert(VALID(buffer));
-   assert(VALID(format));
- 
--  status = TrioFormat(&buffer, 0, TrioOutStreamString, format, &args, NULL);
-+  G_VA_COPY(args2, args);
-+  status = TrioFormat(&buffer, 0, TrioOutStreamString, format, &args2, NULL);
-   *buffer = NIL;
-   return status;
- }
-@@ -3938,13 +3951,15 @@ TRIO_ARGS4((buffer, max, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   int status;
- 
-   assert(max == 0 || VALID(buffer));
-   assert(VALID(format));
- 
-+  G_VA_COPY(args2, args);
-   status = TrioFormat(&buffer, max > 0 ? max - 1 : 0,
--		      TrioOutStreamStringMax, format, &args, NULL);
-+		      TrioOutStreamStringMax, format, &args2, NULL);
-   if (max > 0)
-     *buffer = NIL;
-   return status;
-@@ -4019,6 +4034,7 @@ TRIO_ARGS4((buffer, max, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   int status;
-   size_t buf_len;
-   
-@@ -4027,8 +4043,9 @@ TRIO_ARGS4((buffer, max, format, args),
- 
-   buf_len = trio_length(buffer);
-   buffer = &buffer[buf_len];
-+  G_VA_COPY(args2, args);
-   status = TrioFormat(&buffer, max - 1 - buf_len,
--		      TrioOutStreamStringMax, format, &args, NULL);
-+		      TrioOutStreamStringMax, format, &args2, NULL);
-   *buffer = NIL;
-   return status;
- }
-@@ -4072,6 +4089,7 @@ TRIO_ARGS2((format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   trio_string_t *info;
-   char *result = NULL;
-   
-@@ -4080,8 +4098,9 @@ TRIO_ARGS2((format, args),
-   info = trio_xstring_duplicate("");
-   if (info)
-     {
-+      G_VA_COPY(args2, args);
-       (void)TrioFormat(info, 0, TrioOutStreamStringDynamic,
--		       format, &args, NULL);
-+		       format, &args2, NULL);
-       trio_string_terminate(info);
-       result = trio_string_extract(info);
-       trio_string_destroy(info);
-@@ -4132,6 +4151,7 @@ TRIO_ARGS3((result, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   int status;
-   trio_string_t *info;
-   
-@@ -4146,8 +4166,9 @@ TRIO_ARGS3((result, format, args),
-     }
-   else
-     {
-+      G_VA_COPY(args2, args);
-       status = TrioFormat(info, 0, TrioOutStreamStringDynamic,
--			  format, &args, NULL);
-+			  format, &args2, NULL);
-       if (status >= 0)
- 	{
- 	  trio_string_terminate(info);
-@@ -4834,9 +4855,11 @@ TRIO_ARGS3((ref, format, arglist),
- 	   TRIO_CONST char *format,
- 	   va_list arglist)
- {
-+  va_list args2;
-   assert(VALID(format));
--  
--  return TrioFormatRef((trio_reference_t *)ref, format, &arglist, NULL);
-+
-+  G_VA_COPY(args2, arglist); 
-+  return TrioFormatRef((trio_reference_t *)ref, format, &args2, NULL);
- }
- 
- /*************************************************************************
-@@ -6487,11 +6510,13 @@ TRIO_ARGS2((format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   assert(VALID(format));
--  
-+
-+  G_VA_COPY(args2, args);
-   return TrioScan((trio_pointer_t)stdin, 0,
- 		  TrioInStreamFile,
--		  format, &args, NULL);
-+		  format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
-@@ -6538,12 +6563,15 @@ TRIO_ARGS3((file, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-+
-   assert(VALID(file));
-   assert(VALID(format));
--  
-+
-+  G_VA_COPY(args2, args);  
-   return TrioScan((trio_pointer_t)file, 0,
- 		  TrioInStreamFile,
--		  format, &args, NULL);
-+		  format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
-@@ -6591,11 +6619,13 @@ TRIO_ARGS3((fd, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   assert(VALID(format));
--  
-+
-+  G_VA_COPY(args2, args); 
-   return TrioScan((trio_pointer_t)&fd, 0,
- 		  TrioInStreamFileDescriptor,
--		  format, &args, NULL);
-+		  format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
-@@ -6646,6 +6676,7 @@ TRIO_ARGS4((stream, closure, format, arg
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   trio_custom_t data;
-   
-   assert(VALID(stream));
-@@ -6653,7 +6684,9 @@ TRIO_ARGS4((stream, closure, format, arg
- 
-   data.stream.in = stream;
-   data.closure = closure;
--  return TrioScan(&data, 0, TrioInStreamCustom, format, &args, NULL);
-+
-+  G_VA_COPY(args2, args);
-+  return TrioScan(&data, 0, TrioInStreamCustom, format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
-@@ -6705,12 +6738,15 @@ TRIO_ARGS3((buffer, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-+
-   assert(VALID(buffer));
-   assert(VALID(format));
--  
-+
-+  G_VA_COPY(args2, args);  
-   return TrioScan((trio_pointer_t)&buffer, 0,
- 		  TrioInStreamString,
--		  format, &args, NULL);
-+		  format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
diff --git a/devel/glib2/patches/patch-ac b/devel/glib2/patches/patch-ac
index 6efb25039e9..f3e98a295f2 100644
--- a/devel/glib2/patches/patch-ac
+++ b/devel/glib2/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.7 2003/11/11 13:39:09 fvdl Exp $
+$NetBSD: patch-ac,v 1.8 2004/04/01 18:13:31 jmmv Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=107626
 
 --- gmodule/gmodule-dyld.c.orig	2002-03-02 21:30:33.000000000 +0100
 +++ gmodule/gmodule-dyld.c
diff --git a/devel/glib2/patches/patch-ad b/devel/glib2/patches/patch-ad
index f0fc9dc3ed8..e31e48f874a 100644
--- a/devel/glib2/patches/patch-ad
+++ b/devel/glib2/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.7 2003/11/11 13:39:09 fvdl Exp $
+$NetBSD: patch-ad,v 1.8 2004/04/01 18:13:31 jmmv Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=134119
 
 --- gthread/gthread-posix.c.orig	2002-11-04 21:09:47.000000000 +0100
 +++ gthread/gthread-posix.c
diff --git a/devel/glib2/patches/patch-ae b/devel/glib2/patches/patch-ae
deleted file mode 100644
index bc81eaeb0d5..00000000000
--- a/devel/glib2/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/11/13 10:58:43 fvdl Exp $
-
---- tests/patterntest.c.orig	2003-08-19 15:43:56.000000000 +0200
-+++ tests/patterntest.c
-@@ -31,8 +31,10 @@ static void
- verbose (const gchar *format, ...)
- {
-   va_list args;
-+  gchar *msg;
-+
-   va_start (args, format);
--  gchar *msg = g_strdup_vprintf (format, args);
-+  msg = g_strdup_vprintf (format, args);
-   va_end (args);
-   if (noisy) 
-     g_print (msg);
diff --git a/devel/glib2/patches/patch-af b/devel/glib2/patches/patch-af
deleted file mode 100644
index 653dafa234d..00000000000
--- a/devel/glib2/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2004/01/07 07:33:54 xtraeme Exp $
-
---- gthread/Makefile.in.orig	Wed Jan  7 07:22:18 2004
-+++ gthread/Makefile.in	Wed Jan  7 07:24:09 2004
-@@ -194,7 +194,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
- CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ ${PTHREAD_LDFLAGS}
- LIBS = @LIBS@
- libgthread_2_0_la_OBJECTS =  gthread-impl.lo
- CFLAGS = @CFLAGS@