[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Complete previous, by entering the packa...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e7b322e8022
branches:  trunk
changeset: 547986:1e7b322e8022
user:      cube <cube%pkgsrc.org@localhost>
date:      Mon Oct 06 13:19:11 2008 +0000

description:
Complete previous, by entering the package version definition if the file
looked up is not a pkgconfig one, at the condition that the version
script is defined.

diffstat:

 mk/buildlink3/pkgconfig-builtin.mk |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 9c91c2e70962 -r 1e7b322e8022 mk/buildlink3/pkgconfig-builtin.mk
--- a/mk/buildlink3/pkgconfig-builtin.mk        Mon Oct 06 13:08:16 2008 +0000
+++ b/mk/buildlink3/pkgconfig-builtin.mk        Mon Oct 06 13:19:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pkgconfig-builtin.mk,v 1.3 2008/10/06 13:08:16 cube Exp $
+# $NetBSD: pkgconfig-builtin.mk,v 1.4 2008/10/06 13:19:11 cube Exp $
 
 # This file is used to factor out a common pattern in builtin.mk files backed
 # up by the existence of a pkgconfig file.
@@ -30,7 +30,9 @@
 
 .if !defined(BUILTIN_PKG.${BUILTIN_PKG}) && \
     !empty(IS_BUILTIN.${BUILTIN_PKG}:M[yY][eE][sS]) && \
-    !empty(FIND_FILES_${BUILTIN_PKG}:M*.pc)
+    (!empty(FIND_FILES_${BUILTIN_PKG}:M*.pc) || \
+     (empty(FIND_FILES_${BUILTIN_PKG}:M__nonexistent__) && \
+     defined(BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG})))
 . if !defined(BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG})
 BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG}= ${SED} -n -e 's/Version: //p'
 . endif