Update to 0.20:

 - Fix test suite to work on Solaris.  Yay non-POSIX /bin/sh :-(
 - Fix segfault on --help with gcc4.  Fix segfault on bigendian arches
   in some cases.
 - Win32 fixes
 - Add --short-errors, now used by pkg.m4 if available.  This gives a
   better error message if some libraries can't be found.

4 files changed, 73 insertions, 77 deletions

diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index 885196b1f9c..8a6328ac36a 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/10/16 21:51:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2005/10/22 12:59:14 wiz Exp $
 #
 
-DISTNAME=	pkg-config-0.19
-PKGREVISION=	2
+DISTNAME=	pkg-config-0.20
 CATEGORIES=	devel
 MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
 
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 651217d6982..77fe1b309b0 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/10/16 21:51:29 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2005/10/22 12:59:14 wiz Exp $
 
-SHA1 (pkg-config-0.19.tar.gz) = b09fa43dcc44fe0db8df1c4994a8ff9eab371666
-RMD160 (pkg-config-0.19.tar.gz) = 30355004c09fe947dc3cf8f1159f068924d0d7a2
-Size (pkg-config-0.19.tar.gz) = 968790 bytes
-SHA1 (patch-aa) = b07ff0f2a8caaef6d91673c1883f0de9d4d2ae7f
-SHA1 (patch-ab) = da074d760c95671c4b7fbcb6fb5110830470eb04
+SHA1 (pkg-config-0.20.tar.gz) = 285a486e2cf97e3c6bcb3eec9a7fed299031eb6e
+RMD160 (pkg-config-0.20.tar.gz) = 2ebea903646e405d8e9a9e43648de445041499a6
+Size (pkg-config-0.20.tar.gz) = 969993 bytes
+SHA1 (patch-ab) = b4c43bd021cca8b5fc78c268d52e3e96daf6c280
diff --git a/devel/pkg-config/patches/patch-aa b/devel/pkg-config/patches/patch-aa
deleted file mode 100644
index 3ff827e666b..00000000000
--- a/devel/pkg-config/patches/patch-aa
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/07/21 16:22:43 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
-constant.
-
---- main.c.orig	2005-05-18 13:52:58.000000000 +0200
-+++ main.c
-@@ -172,26 +172,26 @@ pkg_uninstalled (Package *pkg)
- int
- main (int argc, char **argv)
- {
--  int want_my_version = 0;
--  int want_version = 0;
--  int want_libs = 0;
--  int want_cflags = 0;
--  int want_l_libs = 0;
--  int want_L_libs = 0;
--  int want_other_libs = 0;
--  int want_I_cflags = 0;
--  int want_other_cflags = 0;
--  int want_list = 0;
--  int want_static_lib_list = ENABLE_INDIRECT_DEPS;
-+  static int want_my_version = 0;
-+  static int want_version = 0;
-+  static int want_libs = 0;
-+  static int want_cflags = 0;
-+  static int want_l_libs = 0;
-+  static int want_L_libs = 0;
-+  static int want_other_libs = 0;
-+  static int want_I_cflags = 0;
-+  static int want_other_cflags = 0;
-+  static int want_list = 0;
-+  static int want_static_lib_list = ENABLE_INDIRECT_DEPS;
-   int result;
--  int want_uninstalled = 0;
--  char *variable_name = NULL;
--  int want_exists = 0;
--  char *required_atleast_version = NULL;
--  char *required_exact_version = NULL;
--  char *required_max_version = NULL;
--  char *required_pkgconfig_version = NULL;
--  int want_silence_errors = 0;
-+  static int want_uninstalled = 0;
-+  static char *variable_name = NULL;
-+  static int want_exists = 0;
-+  static char *required_atleast_version = NULL;
-+  static char *required_exact_version = NULL;
-+  static char *required_max_version = NULL;
-+  static char *required_pkgconfig_version = NULL;
-+  static int want_silence_errors = 0;
-   GString *str;
-   GSList *packages = NULL;
-   char *search_path;
diff --git a/devel/pkg-config/patches/patch-ab b/devel/pkg-config/patches/patch-ab
index aa38b564320..9cb98603ffd 100644
--- a/devel/pkg-config/patches/patch-ab
+++ b/devel/pkg-config/patches/patch-ab
@@ -1,11 +1,63 @@
-$NetBSD: patch-ab,v 1.2 2005/10/16 21:51:29 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2005/10/22 12:59:14 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
+constant.
 
 Log all pkg-config calls to a file.  Used by pkgtools/verifypc.
 
---- main.c.orig	2005-10-16 23:42:25.000000000 +0200
+--- main.c.orig	2005-10-22 14:48:50.000000000 +0200
 +++ main.c
-@@ -458,12 +458,27 @@ main (int argc, char **argv)
-   {
+@@ -172,27 +172,27 @@ pkg_uninstalled (Package *pkg)
+ int
+ main (int argc, char **argv)
+ {
+-  int want_my_version = 0;
+-  int want_version = 0;
+-  int want_libs = 0;
+-  int want_cflags = 0;
+-  int want_l_libs = 0;
+-  int want_L_libs = 0;
+-  int want_other_libs = 0;
+-  int want_I_cflags = 0;
+-  int want_other_cflags = 0;
+-  int want_list = 0;
+-  int want_static_lib_list = ENABLE_INDIRECT_DEPS;
+-  int want_short_errors = 0;
++  static int want_my_version = 0;
++  static int want_version = 0;
++  static int want_libs = 0;
++  static int want_cflags = 0;
++  static int want_l_libs = 0;
++  static int want_L_libs = 0;
++  static int want_other_libs = 0;
++  static int want_I_cflags = 0;
++  static int want_other_cflags = 0;
++  static int want_list = 0;
++  static int want_static_lib_list = ENABLE_INDIRECT_DEPS;
++  static int want_short_errors = 0;
+   int result;
+-  int want_uninstalled = 0;
+-  char *variable_name = NULL;
+-  int want_exists = 0;
+-  char *required_atleast_version = NULL;
+-  char *required_exact_version = NULL;
+-  char *required_max_version = NULL;
+-  char *required_pkgconfig_version = NULL;
+-  int want_silence_errors = 0;
++  static int want_uninstalled = 0;
++  static char *variable_name = NULL;
++  static int want_exists = 0;
++  static char *required_atleast_version = NULL;
++  static char *required_exact_version = NULL;
++  static char *required_max_version = NULL;
++  static char *required_pkgconfig_version = NULL;
++  static int want_silence_errors = 0;
+   GString *str;
+   GSList *packages = NULL;
+   char *search_path;
+@@ -462,12 +462,27 @@ main (int argc, char **argv)
+     gboolean failed = FALSE;
      GSList *reqs;
      GSList *iter;
 +    char *log_name;
@@ -32,9 +84,9 @@ Log all pkg-config calls to a file.  Used by pkgtools/verifypc.
      while (iter != NULL)
        {
          Package *req;
-@@ -471,6 +486,18 @@ main (int argc, char **argv)
- 
-         req = get_package (ver->name);
+@@ -478,6 +493,18 @@ main (int argc, char **argv)
+         else
+           req = get_package (ver->name);
  
 +        if (log != NULL)
 +          {
@@ -50,16 +102,16 @@ Log all pkg-config calls to a file.  Used by pkgtools/verifypc.
 +
          if (req == NULL)
            {
-             verbose_error ("No package '%s' found\n", ver->name);
-@@ -497,6 +524,11 @@ main (int argc, char **argv)
- 
+             failed = TRUE;
+@@ -508,6 +535,11 @@ main (int argc, char **argv)
          iter = g_slist_next (iter);
        }
-+
+ 
 +    if (log != NULL)
 +      {
 +        fclose (log);
 +      }
-   }
- 
-   g_string_free (str, TRUE);
++
+     if (failed) {
+       return 1;
+     }