patch-ab is upstream now (PKG_CONFIG_LOG support). Remove the patch to

avoid crashing with double free on glibc.

Bump PKGREVISION for new "not crash" functionality.

3 files changed, 3 insertions, 68 deletions

diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index a1bb6bdcbf0..f08273d39ab 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/09/23 07:07:46 adam Exp $
+# $NetBSD: Makefile,v 1.18 2010/09/28 04:52:41 dsainty Exp $
 
 DISTNAME=	pkg-config-0.25
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
 
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 4cc5da6ece2..f5d3aebf1a6 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.16 2010/09/23 07:07:46 adam Exp $
+$NetBSD: distinfo,v 1.17 2010/09/28 04:52:41 dsainty Exp $
 
 SHA1 (pkg-config-0.25.tar.gz) = 8922aeb4edeff7ed554cc1969cbb4ad5a4e6b26e
 RMD160 (pkg-config-0.25.tar.gz) = 835509d01f68c45823ee89c718776eb66f61316b
 Size (pkg-config-0.25.tar.gz) = 988899 bytes
-SHA1 (patch-ab) = bb7f25365032d424dd6299254c96dce9995148fa
 SHA1 (patch-ac) = 567c7c7dba33253263de81818178d7cebcce8645
 SHA1 (patch-ad) = a9c162409c2bbb4e016855ddc691e03d7a3197cb
 SHA1 (patch-ah) = 2a19dc53da8c0c611bf47f410862f7d30a06a344
diff --git a/devel/pkg-config/patches/patch-ab b/devel/pkg-config/patches/patch-ab
deleted file mode 100644
index 680c0df033e..00000000000
--- a/devel/pkg-config/patches/patch-ab
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2010/09/23 07:07:47 adam Exp $
-
-Log all pkg-config calls to a file.  Used by pkgtools/verifypc.
-
---- main.c.orig	2010-05-10 17:58:57.000000000 +0000
-+++ main.c
-@@ -462,12 +462,27 @@ main (int argc, char **argv)
-     gboolean failed = FALSE;
-     GSList *reqs;
-     GSList *iter;
-+    char *log_name;
-+    FILE *log;
- 
-     reqs = parse_module_list (NULL, str->str,
-                               "(command line arguments)");
- 
-     iter = reqs;
- 
-+    log_name = getenv ("PKG_CONFIG_LOG");
-+    if (log_name != NULL)
-+      {
-+        log = fopen (getenv ("PKG_CONFIG_LOG"), "a");
-+        if (log == NULL)
-+          {
-+            fprintf (stderr, "Cannot open log file: %s\n", log_name);
-+            exit (1);
-+          }
-+      }
-+    else
-+      log = NULL;
-+
-     while (iter != NULL)
-       {
-         Package *req;
-@@ -489,6 +504,18 @@ main (int argc, char **argv)
- 	    fprintf (log, "\n");
- 	  }
- 
-+        if (log != NULL)
-+          {
-+            if (req == NULL)
-+              fprintf (log, "%s NOT-FOUND", ver->name);
-+            else
-+              fprintf (log, "%s %s %s", ver->name,
-+                       comparison_to_str (ver->comparison),
-+                       (ver->version == NULL) ? "(null)" : ver->version);
-+
-+            fprintf (log, "\n");
-+          }
-+
-         if (req == NULL)
-           {
-             failed = TRUE;
-@@ -524,6 +551,11 @@ main (int argc, char **argv)
- 	fclose (log);
-       }
- 
-+    if (log != NULL)
-+      {
-+        fclose (log);
-+      }
-+
-     if (failed) {
-       return 1;
-     }