Update to 0.23:

 - Add support for setting sysroot through PKG_CONFIG_SYSROOT_DIR in
   the environment.
 - Update included glib to 1.2.10.
 - Other minor fixes, including a segfault.

11 files changed, 55 insertions, 137 deletions

diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index c71a047e6be..e08713945c7 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/11/30 22:12:07 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 09:22:27 wiz Exp $
 #
 
-DISTNAME=	pkg-config-0.22
+DISTNAME=	pkg-config-0.23
 CATEGORIES=	devel
 MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
 
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 1da2db7037b..1c13a674311 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.13 2008/01/31 21:46:43 joerg Exp $
+$NetBSD: distinfo,v 1.14 2008/03/04 09:22:27 wiz Exp $
 
-SHA1 (pkg-config-0.22.tar.gz) = 3ec40bda9864d7aa3c912c6ae87a750fd8b6e420
-RMD160 (pkg-config-0.22.tar.gz) = f82754f9892469d2865cc5d2fd3c2ca4513dab5b
-Size (pkg-config-0.22.tar.gz) = 1006425 bytes
-SHA1 (patch-aa) = 86e1d0b7e86fe125482533f4f5d41e6b230031b5
-SHA1 (patch-ab) = 2298c2798be04669796bf990d9dbddbfc8ee1897
-SHA1 (patch-ac) = 53d90ba40f8aafe0eae9c898e122a95ce951d2e3
-SHA1 (patch-ad) = ad7805b2aa69e3c872fa35eb08a938fa3f8d323b
-SHA1 (patch-ae) = b924f64ee3c7ef9f3efe6d83b60bc0a6fbe1f26d
-SHA1 (patch-af) = 1186777da42151583594fd137e135ef6a77ee09f
-SHA1 (patch-ah) = 9b5e537f2c0606efa45078d02de53700f3d3439a
-SHA1 (patch-ca) = eacefe584576fe3f78f4b0b52cfcd9199307a8d4
-SHA1 (patch-cb) = d8c7f26fbf9e485658a9c567eff9c4b336a4f300
+SHA1 (pkg-config-0.23.tar.gz) = b59dddd6b5320bd74c0f74b3339618a327096b2a
+RMD160 (pkg-config-0.23.tar.gz) = 0aa5565430d609319917ac2c8ffeaa5e4a509489
+Size (pkg-config-0.23.tar.gz) = 1032839 bytes
+SHA1 (patch-ab) = 341bf28ed435314856e1c7cecab3d6d5f232aea7
+SHA1 (patch-ac) = 65954b5f1d6608e2546602b1a4bc7c75db683238
+SHA1 (patch-ad) = 4628f5ce73b3dcaa2df92e3be2fd7955ab38ffa4
+SHA1 (patch-ah) = 3cee7ec1a5592e2a550f74a3eb8da2a9e3ab1773
+SHA1 (patch-ca) = 22690d923ddf0e1ce2ca9eddb56ada385f6cefe4
+SHA1 (patch-cb) = 23412858615649c8d8305ce4e6571f06e17073fd
diff --git a/devel/pkg-config/patches/patch-aa b/devel/pkg-config/patches/patch-aa
deleted file mode 100644
index b0aadc50ecb..00000000000
--- a/devel/pkg-config/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/10/04 18:48:04 rillig Exp $
-
-ISO C90 does not accept qualified initializers. Needed at least for IRIX
-5.
-
---- pkg.c.orig	2006-09-19 01:21:12.000000000 +0200
-+++ pkg.c	2006-09-19 01:21:50.000000000 +0200
-@@ -58,11 +58,11 @@
- gboolean ignore_private_libs = TRUE;
- 
- static Package pkg_config_package = {
--  .key = PACKAGE,
--  .name = PACKAGE,
--  .version = VERSION, /* .version */
--  .description = "returns metainformation about installed libraries",
--  .url = "http://pkg-config.freedesktop.org",
-+  PACKAGE,
-+  PACKAGE,
-+  VERSION, /* .version */
-+  "returns metainformation about installed libraries",
-+  "http://pkg-config.freedesktop.org",
-   0 /* keep the rest as null */
- };
- 
diff --git a/devel/pkg-config/patches/patch-ab b/devel/pkg-config/patches/patch-ab
index 30e079dd235..ff662ff57c2 100644
--- a/devel/pkg-config/patches/patch-ab
+++ b/devel/pkg-config/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2007/11/30 22:12:07 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2008/03/04 09:22:27 wiz Exp $
 
 The static variables are needed because they are used in a struct
 initializer. The IRIX/mipseb C compiler needs those addresses to be
@@ -6,9 +6,9 @@ constant.
 
 Log all pkg-config calls to a file.  Used by pkgtools/verifypc.
 
---- main.c.orig	2007-06-18 21:35:05.000000000 +0000
+--- main.c.orig	2008-01-16 22:06:48.000000000 +0000
 +++ main.c
-@@ -172,27 +172,27 @@ pkg_uninstalled (Package *pkg)
+@@ -173,27 +173,27 @@ pkg_uninstalled (Package *pkg)
  int
  main (int argc, char **argv)
  {
@@ -56,7 +56,7 @@ Log all pkg-config calls to a file.  Used by pkgtools/verifypc.
    GString *str;
    GSList *packages = NULL;
    char *search_path;
-@@ -461,12 +461,27 @@ main (int argc, char **argv)
+@@ -472,12 +472,27 @@ main (int argc, char **argv)
      gboolean failed = FALSE;
      GSList *reqs;
      GSList *iter;
@@ -84,7 +84,7 @@ Log all pkg-config calls to a file.  Used by pkgtools/verifypc.
      while (iter != NULL)
        {
          Package *req;
-@@ -477,6 +492,18 @@ main (int argc, char **argv)
+@@ -488,6 +503,18 @@ main (int argc, char **argv)
          else
            req = get_package (ver->name);
  
@@ -103,7 +103,7 @@ Log all pkg-config calls to a file.  Used by pkgtools/verifypc.
          if (req == NULL)
            {
              failed = TRUE;
-@@ -507,6 +534,11 @@ main (int argc, char **argv)
+@@ -518,6 +545,11 @@ main (int argc, char **argv)
          iter = g_slist_next (iter);
        }
  
diff --git a/devel/pkg-config/patches/patch-ac b/devel/pkg-config/patches/patch-ac
index fe266c890af..f7bbb84b76e 100644
--- a/devel/pkg-config/patches/patch-ac
+++ b/devel/pkg-config/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2007/11/30 22:12:07 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2008/03/04 09:22:27 wiz Exp $
 
 Arbitrary strings should not be passed to "eval".
 
---- configure.orig	2007-06-18 21:36:04.000000000 +0000
+--- configure.orig	2008-01-16 22:52:31.000000000 +0000
 +++ configure
-@@ -19890,7 +19890,7 @@ echo use_indirect_deps=$use_indirect_dep
+@@ -20150,7 +20150,7 @@ echo use_indirect_deps=$use_indirect_dep
  echo $ECHO_N "checking whether to list both direct and indirect dependencies... $ECHO_C" >&6; }
  case $use_indirect_deps in
    auto)
diff --git a/devel/pkg-config/patches/patch-ad b/devel/pkg-config/patches/patch-ad
index 9bb3551392f..d83d85384b2 100644
--- a/devel/pkg-config/patches/patch-ad
+++ b/devel/pkg-config/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2007/11/30 22:12:07 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2008/03/04 09:22:27 wiz Exp $
 
 see patch-ac.
 
---- configure.in.orig	2007-06-18 21:35:05.000000000 +0000
+--- configure.in.orig	2008-01-16 22:48:07.000000000 +0000
 +++ configure.in
 @@ -41,7 +41,7 @@ echo use_indirect_deps=$use_indirect_dep
  AC_MSG_CHECKING([whether to list both direct and indirect dependencies])
diff --git a/devel/pkg-config/patches/patch-ae b/devel/pkg-config/patches/patch-ae
deleted file mode 100644
index 12d2e560ffe..00000000000
--- a/devel/pkg-config/patches/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/10/04 18:48:04 rillig Exp $
-
-According to a private mail from Tollef Fog Heen, the pkg-config
-maintainer, the test suite has been wrong, but the code ok. This patch
-fixes the tests.
-
---- check/check-requires-private.orig	2006-08-16 19:05:30.000000000 +0200
-+++ check/check-requires-private	2006-10-04 20:42:05.000000000 +0200
-@@ -9,14 +9,14 @@ fi
- 
- . ${srcdir}/common
- 
--# expect cflags from requires-test and public-dep
-+# expect cflags from requires-test, private-dep and public-dep
- ARGS="--cflags requires-test"
--RESULT="-I/requires-test/include -I/public-dep/include"
-+RESULT="-I/requires-test/include -I/private-dep/include -I/public-dep/include"
- run_test
- 
- # still expect those cflags for static linking case
- ARGS="--static --cflags requires-test"
--RESULT="-I/requires-test/include -I/public-dep/include"
-+RESULT="-I/requires-test/include -I/private-dep/include -I/public-dep/include"
- run_test
- 
- # expect libs for just requires-test and public-dep
diff --git a/devel/pkg-config/patches/patch-af b/devel/pkg-config/patches/patch-af
deleted file mode 100644
index 67ccd9ab4bb..00000000000
--- a/devel/pkg-config/patches/patch-af
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/06/01 19:03:46 wiz Exp $
-
---- pkg.m4.orig	2006-08-16 17:05:30.000000000 +0000
-+++ pkg.m4
-@@ -66,16 +66,14 @@ fi])
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
--[if test -n "$PKG_CONFIG"; then
--    if test -n "$$1"; then
--        pkg_cv_[]$1="$$1"
--    else
--        PKG_CHECK_EXISTS([$3],
--                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
--			 [pkg_failed=yes])
--    fi
--else
--	pkg_failed=untried
-+[if test -n "$$1"; then
-+    pkg_cv_[]$1="$$1"
-+ elif test -n "$PKG_CONFIG"; then
-+    PKG_CHECK_EXISTS([$3],
-+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+		     [pkg_failed=yes])
-+ else
-+    pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
- 
diff --git a/devel/pkg-config/patches/patch-ah b/devel/pkg-config/patches/patch-ah
index 2d55506b1e0..15e0e76d458 100644
--- a/devel/pkg-config/patches/patch-ah
+++ b/devel/pkg-config/patches/patch-ah
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.2 2007/11/30 22:12:08 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2008/03/04 09:22:27 wiz Exp $
 
 Don't call gnome-config, it has been dead for ages and the warnings
 just confuse users.
 
---- parse.c.orig	2007-06-18 21:35:05.000000000 +0000
+--- parse.c.orig	2008-01-16 20:42:49.000000000 +0000
 +++ parse.c
 @@ -1418,102 +1418,8 @@ get_compat_package (const char *name)
      }
diff --git a/devel/pkg-config/patches/patch-ca b/devel/pkg-config/patches/patch-ca
index 8ae63bac9b1..e429c691773 100644
--- a/devel/pkg-config/patches/patch-ca
+++ b/devel/pkg-config/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
+$NetBSD: patch-ca,v 1.3 2008/03/04 09:22:27 wiz Exp $
 
---- glib-1.2.8/configure.orig	2007-06-18 23:36:00.000000000 +0200
-+++ glib-1.2.8/configure
-@@ -20267,119 +20267,6 @@ if test "x$GCC" = "xyes"; then
+--- glib-1.2.10/configure.orig	2008-01-16 22:52:28.000000000 +0000
++++ glib-1.2.10/configure
+@@ -20561,119 +20561,6 @@ if test "x$GCC" = "xyes"; then
    fi
  fi
  
@@ -122,7 +122,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  { echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5
  echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
-@@ -23474,14 +23361,7 @@ if test "${glib_cv_has__inline+set}" = s
+@@ -23768,14 +23655,7 @@ if test "${glib_cv_has__inline+set}" = s
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -138,7 +138,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -23492,41 +23372,33 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23786,41 +23666,33 @@ cat >>conftest.$ac_ext <<_ACEOF
  	int main () { return foo (); }
  
  _ACEOF
@@ -193,7 +193,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  
  fi
  
-@@ -23544,14 +23416,7 @@ if test "${glib_cv_has__inline__+set}" =
+@@ -23838,14 +23710,7 @@ if test "${glib_cv_has__inline__+set}" =
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -209,7 +209,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -23562,41 +23427,33 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23856,41 +23721,33 @@ cat >>conftest.$ac_ext <<_ACEOF
  	int main () { return foo (); }
  
  _ACEOF
@@ -264,7 +264,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  
  fi
  
-@@ -23614,14 +23471,7 @@ if test "${glib_cv_hasinline+set}" = set
+@@ -23908,14 +23765,7 @@ if test "${glib_cv_hasinline+set}" = set
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -280,7 +280,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -23632,41 +23482,33 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23926,41 +23776,33 @@ cat >>conftest.$ac_ext <<_ACEOF
  	int main () { return foo (); }
  
  _ACEOF
@@ -336,7 +336,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  
  fi
  
-@@ -26108,14 +25950,7 @@ if test "${glib_cv_va_copy+set}" = set; 
+@@ -26402,14 +26244,7 @@ if test "${glib_cv_va_copy+set}" = set; 
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -352,7 +352,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -26131,46 +25966,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -26425,46 +26260,41 @@ cat >>conftest.$ac_ext <<_ACEOF
  	  exit (1);
  	va_end (args1); va_end (args2);
  	}
@@ -420,7 +420,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  
  fi
  
-@@ -26182,14 +26012,7 @@ if test "${glib_cv___va_copy+set}" = set
+@@ -26476,14 +26306,7 @@ if test "${glib_cv___va_copy+set}" = set
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -436,7 +436,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -26205,46 +26028,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -26499,46 +26322,41 @@ cat >>conftest.$ac_ext <<_ACEOF
  	  exit (1);
  	va_end (args1); va_end (args2);
  	}
@@ -505,7 +505,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  
  fi
  
-@@ -26256,14 +26074,7 @@ if test "${glib_cv_va_val_copy+set}" = s
+@@ -26550,14 +26368,7 @@ if test "${glib_cv_va_val_copy+set}" = s
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -521,7 +521,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -26279,46 +26090,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -26573,46 +26384,41 @@ cat >>conftest.$ac_ext <<_ACEOF
  	  exit (1);
  	va_end (args1); va_end (args2);
  	}
@@ -589,7 +589,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  
  fi
  
-@@ -28655,6 +28461,15 @@ _ACEOF
+@@ -29031,6 +28837,15 @@ _ACEOF
  
  
  
@@ -605,7 +605,7 @@ $NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
  glib_sysdefso="glibconfig-sysdefs.h"
  glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ 	]*//g'`
  if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
-@@ -28748,7 +28563,7 @@ fi
+@@ -29124,7 +28939,7 @@ fi
  
  rm -f confrun.c
  
diff --git a/devel/pkg-config/patches/patch-cb b/devel/pkg-config/patches/patch-cb
index 4a667d848cb..6797d13f8f1 100644
--- a/devel/pkg-config/patches/patch-cb
+++ b/devel/pkg-config/patches/patch-cb
@@ -1,8 +1,8 @@
-$NetBSD: patch-cb,v 1.2 2008/01/31 21:46:43 joerg Exp $
+$NetBSD: patch-cb,v 1.3 2008/03/04 09:22:27 wiz Exp $
 
---- glib-1.2.8/configure.in.orig	2007-06-18 23:35:54.000000000 +0200
-+++ glib-1.2.8/configure.in
-@@ -157,26 +157,6 @@ if test "x$GCC" = "xyes"; then
+--- glib-1.2.10/configure.in.orig	2008-01-16 22:52:24.000000000 +0000
++++ glib-1.2.10/configure.in
+@@ -178,26 +178,6 @@ if test "x$GCC" = "xyes"; then
  fi
  changequote([,])dnl
  
@@ -29,7 +29,7 @@ $NetBSD: patch-cb,v 1.2 2008/01/31 21:46:43 joerg Exp $
  dnl NeXTStep cc seems to need this
  AC_MSG_CHECKING([for extra flags for POSIX compliance])
  AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
-@@ -213,14 +193,13 @@ dnl truely know which ones of `inline', 
+@@ -234,14 +214,13 @@ dnl truely know which ones of `inline', 
  dnl actually supported.
  AC_MSG_CHECKING(for __inline)
  AC_CACHE_VAL(glib_cv_has__inline,[
@@ -49,7 +49,7 @@ $NetBSD: patch-cb,v 1.2 2008/01/31 21:46:43 joerg Exp $
  ])
  AC_MSG_RESULT($glib_cv_has__inline)
  case x$glib_cv_has__inline in
-@@ -228,14 +207,13 @@ xyes) AC_DEFINE(G_HAVE___INLINE)
+@@ -249,14 +228,13 @@ xyes) AC_DEFINE(G_HAVE___INLINE)
  esac
  AC_MSG_CHECKING(for __inline__)
  AC_CACHE_VAL(glib_cv_has__inline__,[
@@ -69,7 +69,7 @@ $NetBSD: patch-cb,v 1.2 2008/01/31 21:46:43 joerg Exp $
  ])
  AC_MSG_RESULT($glib_cv_has__inline__)
  case x$glib_cv_has__inline__ in
-@@ -243,14 +221,13 @@ xyes) AC_DEFINE(G_HAVE___INLINE__)
+@@ -264,14 +242,13 @@ xyes) AC_DEFINE(G_HAVE___INLINE__)
  esac
  AC_MSG_CHECKING(for inline)
  AC_CACHE_VAL(glib_cv_hasinline,[
@@ -89,7 +89,7 @@ $NetBSD: patch-cb,v 1.2 2008/01/31 21:46:43 joerg Exp $
  ])
  AC_MSG_RESULT($glib_cv_hasinline)
  case x$glib_cv_hasinline in
-@@ -401,7 +378,8 @@ dnl we currently check for all three va_
+@@ -422,7 +399,8 @@ dnl we currently check for all three va_
  dnl all results in config.log for bug reports.
  AC_MSG_CHECKING(for an implementation of va_copy())
  AC_CACHE_VAL(glib_cv_va_copy,[
@@ -99,7 +99,7 @@ $NetBSD: patch-cb,v 1.2 2008/01/31 21:46:43 joerg Exp $
  	#include <stdarg.h>
  	void f (int i, ...) {
  	va_list args1, args2;
-@@ -411,19 +389,15 @@ AC_CACHE_VAL(glib_cv_va_copy,[
+@@ -432,19 +410,15 @@ AC_CACHE_VAL(glib_cv_va_copy,[
  	  exit (1);
  	va_end (args1); va_end (args2);
  	}
@@ -124,7 +124,7 @@ $NetBSD: patch-cb,v 1.2 2008/01/31 21:46:43 joerg Exp $
  	#include <stdarg.h>
  	void f (int i, ...) {
  	va_list args1, args2;
-@@ -433,19 +407,15 @@ AC_CACHE_VAL(glib_cv___va_copy,[
+@@ -454,19 +428,15 @@ AC_CACHE_VAL(glib_cv___va_copy,[
  	  exit (1);
  	va_end (args1); va_end (args2);
  	}
@@ -149,7 +149,7 @@ $NetBSD: patch-cb,v 1.2 2008/01/31 21:46:43 joerg Exp $
  	#include <stdarg.h>
  	void f (int i, ...) {
  	va_list args1, args2;
-@@ -455,14 +425,9 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[
+@@ -476,14 +446,9 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[
  	  exit (1);
  	va_end (args1); va_end (args2);
  	}
@@ -167,7 +167,7 @@ $NetBSD: patch-cb,v 1.2 2008/01/31 21:46:43 joerg Exp $
  ])
  if test "x$glib_cv_va_copy" = "xyes"; then
    AC_DEFINE(G_VA_COPY, va_copy)
-@@ -893,13 +858,22 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes,
+@@ -946,13 +911,22 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes,
  dnl ****************************************
  dnl *** GLib POLL* compatibility defines ***
  dnl ****************************************