summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2005-10-16 21:51:29 +0000
committerjmmv <jmmv@pkgsrc.org>2005-10-16 21:51:29 +0000
commitd47c7a7d3d4656002108a790ab227161669032b3 (patch)
tree6cc600a7c24d0bff3310ae0a027a8332dc08b61d /devel
parentf7499628edd191e0837e1887e7778baed3465867 (diff)
downloadpkgsrc-d47c7a7d3d4656002108a790ab227161669032b3.tar.gz
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 (limited to 'devel')
-rw-r--r--devel/pkg-config/Makefile4
-rw-r--r--devel/pkg-config/distinfo4
-rw-r--r--devel/pkg-config/patches/patch-ab6
3 files changed, 7 insertions, 7 deletions
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index b047bdd65e4..885196b1f9c 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -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 --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 44f09a40ebd..651217d6982 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -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 --git a/devel/pkg-config/patches/patch-ab b/devel/pkg-config/patches/patch-ab
index 95d9b304962..aa38b564320 100644
--- a/devel/pkg-config/patches/patch-ab
+++ b/devel/pkg-config/patches/patch-ab
@@ -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 @@ Log all pkg-config calls to a file. Used by pkgtools/verifypc.
+ else
+ fprintf (log, "%s %s %s", ver->name,
+ comparison_to_str (ver->comparison),
-+ ver->version);
++ (ver->version == NULL) ? "(null)" : ver->version);
+
+ fprintf (log, "\n");
+ }