[pkgsrc/trunk]: pkgsrc/mk/buildlink3 If using X11_TYPE=modular this means we ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/09c17ee4fd08
branches:  trunk
changeset: 531269:09c17ee4fd08
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Jul 27 17:44:43 2007 +0000

description:
If using X11_TYPE=modular this means we have imake(1) from pkgsrc.
We can't use our own imake to check for builtin packages so disable the
check and always report that no builtin implementation exists.
No objections on tech-pkg@

diffstat:

 mk/buildlink3/imake-check.mk |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r b2b99f4e9c14 -r 09c17ee4fd08 mk/buildlink3/imake-check.mk
--- a/mk/buildlink3/imake-check.mk      Fri Jul 27 17:28:48 2007 +0000
+++ b/mk/buildlink3/imake-check.mk      Fri Jul 27 17:44:43 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: imake-check.mk,v 1.5 2006/09/10 16:39:31 tron Exp $
+# $NetBSD: imake-check.mk,v 1.6 2007/07/27 17:44:43 tnn Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -58,12 +58,15 @@
 #
 
 .for _pair_ in ${BUILTIN_IMAKE_CHECK}
+.  if ${X11_TYPE} == "modular"
+BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}=    no
+.  else
 USE_TOOLS+=    cat:pkgsrc echo:pkgsrc grep:pkgsrc mkdir:pkgsrc         \
                rm:pkgsrc test:pkgsrc
 USE_TOOLS+=    imake:pkgsrc ${IMAKE_TOOLS:S/$/:pkgsrc/}        # XXX
 IMAKE?=                ${X11BASE}/bin/imake                            # XXX
 
-.  if !defined(BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//})
+.    if !defined(BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//})
 BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}!=                           \
        if ${SETENV} CAT=${CAT:Q} ECHO=${ECHO:Q} GREP=${GREP:Q}         \
                IMAKE=${IMAKE:Q} IMAKE_MAKE=${IMAKE_MAKE:Q}             \
@@ -77,6 +80,7 @@
        else                                                            \
                ${ECHO} no;                                             \
        fi
-.  endif
+.    endif
 MAKEVARS+=     BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}
+.  endif
 .endfor