[pkgsrc/trunk]: pkgsrc/mk/tools if X11_TYPE is native and certain required to...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/24e5f599260e
branches:  trunk
changeset: 575785:24e5f599260e
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Fri May 21 22:21:06 2010 +0000

description:
if X11_TYPE is native and certain required tools do not exist nonetheless,
fall back to using the pkgsrc version. This is needed for example with imake
on MacOS 10.6 but might potentially apply to other OSes, too.

diffstat:

 mk/tools/replace.mk |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 869e5938872e -r 24e5f599260e mk/tools/replace.mk
--- a/mk/tools/replace.mk       Fri May 21 22:13:44 2010 +0000
+++ b/mk/tools/replace.mk       Fri May 21 22:21:06 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.225 2010/04/25 22:01:22 seanb Exp $
+# $NetBSD: replace.mk,v 1.226 2010/05/21 22:21:06 schwarz Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1188,7 +1188,13 @@
 TOOLS_FIND_PREFIX+=    TOOLS_PREFIX.${_t_}=imake
 TOOLS_PATH.${_t_}=     ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
 .      else # !empty(X11_TYPE:Mnative)
+.        if exists(${X11BASE}/bin/${_t_})
 TOOLS_PATH.${_t_}=     ${X11BASE}/bin/${_t_}
+.        else # X11_TYPE native, but tool does not exist, so fall back
+TOOLS_DEPENDS.${_t_}?= imake-[0-9]*:../../devel/imake
+TOOLS_FIND_PREFIX+=    TOOLS_PREFIX.${_t_}=imake
+TOOLS_PATH.${_t_}=     ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+.        endif
 .      endif
 .    endif
 .  endif