Re: USE_IMAKE on X11_TYPE=native

I think you'll need to change mk/tools/replace.mk.

Compare these two sections from the current version:

.for _t_ in ${_TOOLS.x11-imake}
.  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) && \
      !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
TOOLS_CREATE+=          ${_t_}
TOOLS_DEPENDS.${_t_}?=  imake-[0-9]*:../../devel/imake
TOOLS_PATH.${_t_}=      ${TOOLBASE}/bin/${_t_}
.  endif
.endfor

.if !defined(TOOLS_IGNORE.makedepend) && !empty(_USE_TOOLS:Mmakedepend) && \
    !empty(_TOOLS_USE_PKGSRC.makedepend:M[yY][eE][sS])
TOOLS_CREATE+=          makedepend
.  if ${X11_TYPE:U} == modular
TOOLS_DEPENDS.makedepend?=      makedepend-[0-9]*:../../devel/makedepend
TOOLS_PATH.makedepend=  ${TOOLBASE}/bin/makedepend
.  else
TOOLS_PATH.makedepend=  ${X11BASE}/bin/makedepend
.  endif
.endif


I think the first one needs a similar check for X11_TYPE.
 Thomas