[pkgsrc/trunk]: pkgsrc/devel/pkg-config Remove calls to gnomeconfig when no m...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/897162f364f6
branches:  trunk
changeset: 534447:897162f364f6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Oct 21 14:01:16 2007 +0000

description:
Remove calls to gnomeconfig when no matching .pc file was found.
Bump revision.

diffstat:

 devel/pkg-config/Makefile         |    4 +-
 devel/pkg-config/distinfo         |    3 +-
 devel/pkg-config/patches/patch-ah |  112 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+), 3 deletions(-)

diffs (144 lines):

diff -r 7b56992b8ae3 -r 897162f364f6 devel/pkg-config/Makefile
--- a/devel/pkg-config/Makefile Sun Oct 21 13:54:07 2007 +0000
+++ b/devel/pkg-config/Makefile Sun Oct 21 14:01:16 2007 +0000
@@ -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 -r 7b56992b8ae3 -r 897162f364f6 devel/pkg-config/distinfo
--- a/devel/pkg-config/distinfo Sun Oct 21 13:54:07 2007 +0000
+++ b/devel/pkg-config/distinfo Sun Oct 21 14:01:16 2007 +0000
@@ -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-ae) = b924f64ee3c7ef9f3efe6d83b60bc0a6fbe1f26d
 SHA1 (patch-af) = 1186777da42151583594fd137e135ef6a77ee09f
 SHA1 (patch-ag) = 507ace528c51cb544c3ee8a05c2a36882828bb77
+SHA1 (patch-ah) = c9e5b296886e525cf01c0c275ad06ec9f857860c
diff -r 7b56992b8ae3 -r 897162f364f6 devel/pkg-config/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pkg-config/patches/patch-ah Sun Oct 21 14:01:16 2007 +0000
@@ -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
+ }