[pkgsrc/trunk]: pkgsrc/devel/pkg-config Avoid passing a NULL pointer to fprin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/202bdffc98fc
branches:  trunk
changeset: 501110:202bdffc98fc
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Oct 16 21:51:29 2005 +0000

description:
Avoid passing a NULL pointer to fprintf, which causes a segfault under
Solaris 9.  My fault; I assumed all implementations could print '(null)'
in that case.  Bump PKGREVISION to 2.  Fixes PR pkg/31838 by John Heasley.

diffstat:

 devel/pkg-config/Makefile         |  4 ++--
 devel/pkg-config/distinfo         |  4 ++--
 devel/pkg-config/patches/patch-ab |  6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r 93d52df2ff03 -r 202bdffc98fc devel/pkg-config/Makefile
--- a/devel/pkg-config/Makefile Sun Oct 16 21:39:11 2005 +0000
+++ b/devel/pkg-config/Makefile Sun Oct 16 21:51:29 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/10/01 12:52:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2005/10/16 21:51:29 jmmv Exp $
 #
 
 DISTNAME=      pkg-config-0.19
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  http://pkgconfig.freedesktop.org/releases/
 
diff -r 93d52df2ff03 -r 202bdffc98fc devel/pkg-config/distinfo
--- a/devel/pkg-config/distinfo Sun Oct 16 21:39:11 2005 +0000
+++ b/devel/pkg-config/distinfo Sun Oct 16 21:51:29 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/10/01 12:52:16 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2005/10/16 21:51:29 jmmv 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) = 4554bbb56ffaa857051e44b31897f0b254650803
+SHA1 (patch-ab) = da074d760c95671c4b7fbcb6fb5110830470eb04
diff -r 93d52df2ff03 -r 202bdffc98fc devel/pkg-config/patches/patch-ab
--- a/devel/pkg-config/patches/patch-ab Sun Oct 16 21:39:11 2005 +0000
+++ b/devel/pkg-config/patches/patch-ab Sun Oct 16 21:51:29 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/10/01 12:52:16 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2005/10/16 21:51:29 jmmv Exp $
 
 Log all pkg-config calls to a file.  Used by pkgtools/verifypc.
 
---- main.c.orig        2005-05-21 11:14:47.000000000 +0200
+--- main.c.orig        2005-10-16 23:42:25.000000000 +0200
 +++ main.c
 @@ -458,12 +458,27 @@ main (int argc, char **argv)
    {
@@ -43,7 +43,7 @@
 +            else
 +              fprintf (log, "%s %s %s", ver->name,
 +                       comparison_to_str (ver->comparison),
-+                       ver->version);
++                       (ver->version == NULL) ? "(null)" : ver->version);
 +
 +            fprintf (log, "\n");
 +          }