Remove calls to gnomeconfig when no matching .pc file was found.

Bump revision.

3 files changed, 116 insertions, 3 deletions

diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index dac604a8f4d..b135c4ed2ad 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/07/03 17:42:58 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/10/21 14:01:16 joerg Exp $
 #
 
 DISTNAME=	pkg-config-0.21
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
 
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 659e22df69e..f01da99f08c 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2007/07/03 17:42:58 joerg Exp $
+$NetBSD: distinfo,v 1.10 2007/10/21 14:01:16 joerg Exp $
 
 SHA1 (pkg-config-0.21.tar.gz) = b2508ba8404cad46ec42f6f58cbca43ae59d715f
 RMD160 (pkg-config-0.21.tar.gz) = 6d48e449a3cedb576c0f54b08825be6ab684d955
@@ -10,3 +10,4 @@ SHA1 (patch-ad) = 9000209dc393925bb1750ffacdbb15f0edbf4729
 SHA1 (patch-ae) = b924f64ee3c7ef9f3efe6d83b60bc0a6fbe1f26d
 SHA1 (patch-af) = 1186777da42151583594fd137e135ef6a77ee09f
 SHA1 (patch-ag) = 507ace528c51cb544c3ee8a05c2a36882828bb77
+SHA1 (patch-ah) = c9e5b296886e525cf01c0c275ad06ec9f857860c
diff --git a/devel/pkg-config/patches/patch-ah b/devel/pkg-config/patches/patch-ah
new file mode 100644
index 00000000000..f8b993819e7
--- /dev/null
+++ b/devel/pkg-config/patches/patch-ah
@@ -0,0 +1,112 @@
+$NetBSD: patch-ah,v 1.1 2007/10/21 14:01:16 joerg 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
+@@ -1396,102 +1396,8 @@ get_compat_package (const char *name)
+     }
+   else
+     {
+-      /* Check for the module in gnome-config */
+-      char *output;
+-      char *p;
+-      char *command;
+-
+-      debug_spew ("Calling gnome-config\n");
+-      
+-      /* Annoyingly, --modversion doesn't return a failure
+-       * code if the lib is unknown, so we have to use --libs
+-       * for that.
+-       */
+-      
+-      command = g_strdup_printf ("gnome-config --libs %s",
+-                                 name);
+-      
+-      if (!try_command (command))
+-        {
+-          g_free (command);
+-          g_free (pkg);
+-          return NULL;
+-        }
+-      else
+-        g_free (command);
+-      
+-      command = g_strdup_printf ("gnome-config --modversion %s",
+-                                 name);
+-      
+-      output = backticks (command);
+-      g_free (command);
+-      if (output == NULL)
+-        {
+-          g_free (pkg);
+-          return NULL;
+-        }
+-      
+-      /* Unknown modules give "Unknown library `foo'" from gnome-config
+-       * (but on stderr so this is useless, nevermind)
+-       */
+-      if (strstr (output, "Unknown") || *output == '\0')
+-        {
+-          g_free (output);
+-          g_free (pkg);
+-          return NULL;
+-        }
+-
+-      /* gnome-config --modversion gnomeui outputs e.g. "gnome-libs-1.2.4"
+-       * or libglade-0.12
+-       */
+-      p = output;
+-
+-      while (*p && isspace ((guchar)*p))
+-        ++p;
+-
+-      if (*p == '\0')
+-        {
+-          /* empty output */
+-          g_free (output);
+-          g_free (pkg);
+-          return NULL;
+-        }
+-
+-      /* only heuristic; find a number or . */
+-      while (*p && ! (isdigit ((guchar)*p) || *p == '.'))
+-        ++p;      
+-
+-      pkg->version = g_strdup (p);
+-
+-      g_free (output);
+-      
+-      /* Strip newline */
+-      p = pkg->version;
+-      while (*p)
+-        {
+-          if (*p == '\n')
+-            *p = '\0';
+-
+-          ++p;
+-        }
+-      
+-      pkg->name = g_strdup (name);
+-      pkg->key = g_strdup (name);
+-      pkg->description = g_strdup ("No description");
+-
+-      command = g_strdup_printf ("gnome-config --libs %s", name);
+-      output = backticks (command);
+-      g_free (command);
+-      parse_libs (pkg, output, "gnome-config");
+-      g_free (output);
+-
+-      command = g_strdup_printf ("gnome-config --cflags %s", name);
+-      output = backticks (command);
+-      g_free (command);
+-      parse_cflags (pkg, output, "gnome-config");
+-      g_free (output);
+-
+-      return pkg;
++      g_free (pkg);
++      return NULL;
+     }
+ #endif
+ }