[pkgsrc/trunk]: pkgsrc/devel/pkg-config Fix pkg.m4: it was broken in the case...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/03ba34f04aa6
branches:  trunk
changeset: 529357:03ba34f04aa6
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jun 01 19:03:46 2007 +0000

description:
Fix pkg.m4: it was broken in the case when pkg-config is not installed,
but the path to an installed dependency is passed via FOO_CFLAGS/FOO_LIBS.

Bump PKGREVISION.

diffstat:

 devel/pkg-config/Makefile         |   3 ++-
 devel/pkg-config/distinfo         |   3 ++-
 devel/pkg-config/patches/patch-af |  29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r 9444115456d0 -r 03ba34f04aa6 devel/pkg-config/Makefile
--- a/devel/pkg-config/Makefile Fri Jun 01 18:23:41 2007 +0000
+++ b/devel/pkg-config/Makefile Fri Jun 01 19:03:46 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/11/02 18:17:22 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/06/01 19:03:46 wiz Exp $
 #
 
 DISTNAME=      pkg-config-0.21
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://pkgconfig.freedesktop.org/releases/
 
diff -r 9444115456d0 -r 03ba34f04aa6 devel/pkg-config/distinfo
--- a/devel/pkg-config/distinfo Fri Jun 01 18:23:41 2007 +0000
+++ b/devel/pkg-config/distinfo Fri Jun 01 19:03:46 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/10/04 18:48:04 rillig Exp $
+$NetBSD: distinfo,v 1.8 2007/06/01 19:03:46 wiz Exp $
 
 SHA1 (pkg-config-0.21.tar.gz) = b2508ba8404cad46ec42f6f58cbca43ae59d715f
 RMD160 (pkg-config-0.21.tar.gz) = 6d48e449a3cedb576c0f54b08825be6ab684d955
@@ -8,3 +8,4 @@
 SHA1 (patch-ac) = a8a4cfa7b6e9052b0c111088c6d8ede810d61752
 SHA1 (patch-ad) = 9000209dc393925bb1750ffacdbb15f0edbf4729
 SHA1 (patch-ae) = b924f64ee3c7ef9f3efe6d83b60bc0a6fbe1f26d
+SHA1 (patch-af) = 1186777da42151583594fd137e135ef6a77ee09f
diff -r 9444115456d0 -r 03ba34f04aa6 devel/pkg-config/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pkg-config/patches/patch-af Fri Jun 01 19:03:46 2007 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-af,v 1.1 2007/06/01 19:03:46 wiz Exp $
+
+--- pkg.m4.orig        2006-08-16 17:05:30.000000000 +0000
++++ pkg.m4
+@@ -66,16 +66,14 @@ fi])
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+-[if test -n "$PKG_CONFIG"; then
+-    if test -n "$$1"; then
+-        pkg_cv_[]$1="$$1"
+-    else
+-        PKG_CHECK_EXISTS([$3],
+-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+-                       [pkg_failed=yes])
+-    fi
+-else
+-      pkg_failed=untried
++[if test -n "$$1"; then
++    pkg_cv_[]$1="$$1"
++ elif test -n "$PKG_CONFIG"; then
++    PKG_CHECK_EXISTS([$3],
++                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++                   [pkg_failed=yes])
++ else
++    pkg_failed=untried
+ fi[]dnl
+ ])# _PKG_CONFIG
+