[pkgsrc/trunk]: pkgsrc/mk/tools Too many packages fail in mysterious ways whe...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/857f3292a1e0
branches:  trunk
changeset: 525796:857f3292a1e0
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Feb 23 02:49:56 2007 +0000

description:
Too many packages fail in mysterious ways when they cannot find
pkg-config, which happens mostly after updating a package. Therefore, a
failing wrapper is installed for this tool.

diffstat:

 mk/tools/pkg-config.mk |  4 +++-
 mk/tools/replace.mk    |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r d0d18917c4d6 -r 857f3292a1e0 mk/tools/pkg-config.mk
--- a/mk/tools/pkg-config.mk    Fri Feb 23 01:46:02 2007 +0000
+++ b/mk/tools/pkg-config.mk    Fri Feb 23 02:49:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pkg-config.mk,v 1.6 2006/08/06 09:35:39 jmmv Exp $
+# $NetBSD: pkg-config.mk,v 1.7 2007/02/23 02:49:56 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -42,8 +42,10 @@
 _PKG_CONFIG_LIBDIR?=   ${BUILDLINK_DIR}/lib/pkgconfig:${BUILDLINK_DIR}/share/pkgconfig
 _PKG_CONFIG_LOG?=      ${WRKDIR}/.pkg-config.log
 
+.if !empty(USE_TOOLS:C/\:.*//:Mpkg-config)
 TOOLS_SCRIPT.pkg-config=       \
        PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q} ${TOOLS_SCRIPT_DFLT.pkg-config}
+.endif
 
 CONFIGURE_ENV+=        PKG_CONFIG=${TOOLS_CMD.pkg-config:Q}
 CONFIGURE_ENV+=        PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q}
diff -r d0d18917c4d6 -r 857f3292a1e0 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Fri Feb 23 01:46:02 2007 +0000
+++ b/mk/tools/replace.mk       Fri Feb 23 02:49:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.184 2007/01/22 20:43:04 joerg Exp $
+# $NetBSD: replace.mk,v 1.185 2007/02/23 02:49:56 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -607,6 +607,8 @@
 TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.pkg-config=pkg-config
 TOOLS_PATH.pkg-config=         ${TOOLS_PREFIX.pkg-config}/bin/pkg-config
 .  endif
+.else
+TOOLS_FAIL+=                   pkg-config
 .endif
 
 .if !defined(TOOLS_IGNORE.pod2man) && !empty(_USE_TOOLS:Mpod2man)