Update to 0.22:

pkg-config 0.22
===
 - Make Requires.private a whole lot more useful by traversing the
   whole tree, not just the top-level, for Cflags.
 - Add support for using the system glib.
 - Update URL to pkg-config website
 - Fix some win32 problems.
 - Other minor fixes.

7 files changed, 27 insertions, 225 deletions

diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index b135c4ed2ad..c71a047e6be 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2007/10/21 14:01:16 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/11/30 22:12:07 wiz Exp $
 #
 
-DISTNAME=	pkg-config-0.21
-PKGREVISION=	2
+DISTNAME=	pkg-config-0.22
 CATEGORIES=	devel
 MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
 
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index f01da99f08c..8d561971faa 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.10 2007/10/21 14:01:16 joerg Exp $
+$NetBSD: distinfo,v 1.11 2007/11/30 22:12:07 wiz Exp $
 
-SHA1 (pkg-config-0.21.tar.gz) = b2508ba8404cad46ec42f6f58cbca43ae59d715f
-RMD160 (pkg-config-0.21.tar.gz) = 6d48e449a3cedb576c0f54b08825be6ab684d955
-Size (pkg-config-0.21.tar.gz) = 998420 bytes
+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) = b4c43bd021cca8b5fc78c268d52e3e96daf6c280
-SHA1 (patch-ac) = a8a4cfa7b6e9052b0c111088c6d8ede810d61752
-SHA1 (patch-ad) = 9000209dc393925bb1750ffacdbb15f0edbf4729
+SHA1 (patch-ab) = 2298c2798be04669796bf990d9dbddbfc8ee1897
+SHA1 (patch-ac) = 53d90ba40f8aafe0eae9c898e122a95ce951d2e3
+SHA1 (patch-ad) = ad7805b2aa69e3c872fa35eb08a938fa3f8d323b
 SHA1 (patch-ae) = b924f64ee3c7ef9f3efe6d83b60bc0a6fbe1f26d
 SHA1 (patch-af) = 1186777da42151583594fd137e135ef6a77ee09f
-SHA1 (patch-ag) = 507ace528c51cb544c3ee8a05c2a36882828bb77
-SHA1 (patch-ah) = c9e5b296886e525cf01c0c275ad06ec9f857860c
+SHA1 (patch-ah) = 9b5e537f2c0606efa45078d02de53700f3d3439a
diff --git a/devel/pkg-config/patches/patch-ab b/devel/pkg-config/patches/patch-ab
index 9cb98603ffd..30e079dd235 100644
--- a/devel/pkg-config/patches/patch-ab
+++ b/devel/pkg-config/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2005/10/22 12:59:14 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2007/11/30 22:12:07 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,7 +6,7 @@ constant.
 
 Log all pkg-config calls to a file.  Used by pkgtools/verifypc.
 
---- main.c.orig	2005-10-22 14:48:50.000000000 +0200
+--- main.c.orig	2007-06-18 21:35:05.000000000 +0000
 +++ main.c
 @@ -172,27 +172,27 @@ pkg_uninstalled (Package *pkg)
  int
@@ -56,7 +56,7 @@ Log all pkg-config calls to a file.  Used by pkgtools/verifypc.
    GString *str;
    GSList *packages = NULL;
    char *search_path;
-@@ -462,12 +462,27 @@ main (int argc, char **argv)
+@@ -461,12 +461,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;
-@@ -478,6 +493,18 @@ main (int argc, char **argv)
+@@ -477,6 +492,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;
-@@ -508,6 +535,11 @@ main (int argc, char **argv)
+@@ -507,6 +534,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 ef29aa60719..fe266c890af 100644
--- a/devel/pkg-config/patches/patch-ac
+++ b/devel/pkg-config/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.1 2006/10/04 18:48:04 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2007/11/30 22:12:07 wiz Exp $
 
 Arbitrary strings should not be passed to "eval".
 
---- configure.orig	2006-08-16 21:10:18.000000000 +0200
-+++ configure	2006-10-04 20:39:13.000000000 +0200
-@@ -19397,7 +19397,7 @@ echo "$as_me:$LINENO: checking whether t
- echo $ECHO_N "checking whether to list both direct and indirect dependencies... $ECHO_C" >&6
+--- configure.orig	2007-06-18 21:36:04.000000000 +0000
++++ configure
+@@ -19890,7 +19890,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)
 -    deplibs_check_method=`(./libtool --config; echo eval echo \$deplibs_check_method) | sh`
diff --git a/devel/pkg-config/patches/patch-ad b/devel/pkg-config/patches/patch-ad
index 7fc1b54cf67..9bb3551392f 100644
--- a/devel/pkg-config/patches/patch-ad
+++ b/devel/pkg-config/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.1 2006/10/04 18:48:04 rillig Exp $
+$NetBSD: patch-ad,v 1.2 2007/11/30 22:12:07 wiz Exp $
 
 see patch-ac.
 
---- configure.in.orig	2006-08-16 21:09:30.000000000 +0200
-+++ configure.in	2006-10-04 20:39:27.000000000 +0200
-@@ -42,7 +42,7 @@ echo use_indirect_deps=$use_indirect_dep
+--- configure.in.orig	2007-06-18 21:35:05.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])
  case $use_indirect_deps in
    auto)
diff --git a/devel/pkg-config/patches/patch-ag b/devel/pkg-config/patches/patch-ag
deleted file mode 100644
index d2057f878c0..00000000000
--- a/devel/pkg-config/patches/patch-ag
+++ /dev/null
@@ -1,196 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/07/03 17:42:58 joerg Exp $
-
-The last chunk is slightly bogus as it hard-codes the NetBSD values.
-Since pkg-config doesn't use the event model of glib-1.2, this is
-irrelevant.
-
---- glib-1.2.8/configure.orig	2006-08-16 20:24:36.000000000 +0200
-+++ glib-1.2.8/configure
-@@ -19728,6 +19728,7 @@ if test "x$GCC" = "xyes"; then
-   fi
- fi
- 
-+if false; then
- echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5
- echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6
- glib_save_LIBS=$LIBS
-@@ -19818,6 +19819,7 @@ fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- LIBS=$glib_save_LIBS
-+fi
- 
- 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
-@@ -22938,7 +22940,7 @@ if test "${glib_cv_has__inline+set}" = s
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--        if test "$cross_compiling" = yes; then
-+        if test "$cross_compiling" = XXX; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
-@@ -22961,12 +22963,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   (eval $ac_link) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); }; then
-   glib_cv_has__inline=yes
- 
- else
-@@ -22997,7 +22994,7 @@ if test "${glib_cv_has__inline__+set}" =
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--        if test "$cross_compiling" = yes; then
-+        if test "$cross_compiling" = XXX; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
-@@ -23020,12 +23017,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   (eval $ac_link) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); }; then
-   glib_cv_has__inline__=yes
- 
- else
-@@ -23056,7 +23048,7 @@ if test "${glib_cv_hasinline+set}" = set
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--        if test "$cross_compiling" = yes; then
-+        if test "$cross_compiling" = XXX; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
-@@ -23079,12 +23071,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   (eval $ac_link) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); }; then
-   glib_cv_hasinline=yes
- 
- else
-@@ -25638,7 +25625,7 @@ if test "${glib_cv_va_copy+set}" = set; 
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--	if test "$cross_compiling" = yes; then
-+	if test "$cross_compiling" = XXX; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
-@@ -25671,12 +25658,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   (eval $ac_link) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); }; then
-   glib_cv_va_copy=yes
- 
- else
-@@ -25701,7 +25683,7 @@ if test "${glib_cv___va_copy+set}" = set
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--	if test "$cross_compiling" = yes; then
-+	if test "$cross_compiling" = XXX; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
-@@ -25734,12 +25716,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   (eval $ac_link) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); }; then
-   glib_cv___va_copy=yes
- 
- else
-@@ -25764,7 +25741,7 @@ if test "${glib_cv_va_val_copy+set}" = s
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--	if test "$cross_compiling" = yes; then
-+	if test "$cross_compiling" = XXX; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
-@@ -25797,12 +25774,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   (eval $ac_link) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); }; then
-   glib_cv_va_val_copy=yes
- 
- else
-@@ -28203,7 +28175,7 @@ for glib_sysdef_input in POLLIN:1 POLLOU
- 	echo "#endif" >>confrun.c
- done
- echo "return 0; }" >>confrun.c
--if test "$cross_compiling" = yes; then
-+if test "$cross_compiling" = XXX; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
-@@ -28223,12 +28195,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   (eval $ac_link) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  (exit $ac_status); } && {
-+  if test "$cross_compiling" = yes; then
-+    echo '#define GLIB_SYSDEF_POLLIN =1' >> glibconfig-sysdefs.h
-+    echo '#define GLIB_SYSDEF_POLLOUT =4' >> glibconfig-sysdefs.h
-+    echo '#define GLIB_SYSDEF_POLLPRI =2' >> glibconfig-sysdefs.h
-+    echo '#define GLIB_SYSDEF_POLLERR =8' >> glibconfig-sysdefs.h
-+    echo '#define GLIB_SYSDEF_POLLHUP =16' >> glibconfig-sysdefs.h
-+    echo '#define GLIB_SYSDEF_POLLNVAL =32' >> glibconfig-sysdefs.h
-+  else
-+ ac_try='./conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); };
-+  fi }; then
-   echo "$as_me:$LINENO: result: done" >&5
- echo "${ECHO_T}done" >&6
- else
diff --git a/devel/pkg-config/patches/patch-ah b/devel/pkg-config/patches/patch-ah
index f8b993819e7..2d55506b1e0 100644
--- a/devel/pkg-config/patches/patch-ah
+++ b/devel/pkg-config/patches/patch-ah
@@ -1,11 +1,11 @@
-$NetBSD: patch-ah,v 1.1 2007/10/21 14:01:16 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2007/11/30 22:12:08 wiz Exp $
 
 Don't call gnome-config, it has been dead for ages and the warnings
 just confuse users.
 
---- parse.c.orig	2006-08-16 20:45:45.000000000 +0200
+--- parse.c.orig	2007-06-18 21:35:05.000000000 +0000
 +++ parse.c
-@@ -1396,102 +1396,8 @@ get_compat_package (const char *name)
+@@ -1418,102 +1418,8 @@ get_compat_package (const char *name)
      }
    else
      {