[pkgsrc/trunk]: pkgsrc/mk Back out revision 1.172 of mk/tools/replace.mk -- w...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1dca629350f8
branches:  trunk
changeset: 515921:1dca629350f8
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jul 10 22:17:58 2006 +0000

description:
Back out revision 1.172 of mk/tools/replace.mk -- we never want to
allow IMAKE to be set by anything other than the tools framework.
Modify the IRIX files so that the native imake is listed as a built-in
tool in the case where X11_TYPE is "native".  Also, move the include
of tools/default.mk a bit lower in bsd.prefs.mk so that tools.${OPSYS}.mk
files can use the value of X11_TYPE.  This should properly set and
point IMAKE to the right binary on IRIX without destroying the
configuration for platforms where IMAKE was not explicitly set, i.e.
every non-IRIX platform.

diffstat:

 mk/bsd.prefs.mk        |  35 +++++++++++++++++++----------------
 mk/platform/IRIX.mk    |   5 +----
 mk/tools/replace.mk    |   7 ++-----
 mk/tools/tools.IRIX.mk |   5 ++++-
 4 files changed, 26 insertions(+), 26 deletions(-)

diffs (117 lines):

diff -r f866ad6a79b8 -r 1dca629350f8 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Mon Jul 10 22:14:18 2006 +0000
+++ b/mk/bsd.prefs.mk   Mon Jul 10 22:17:58 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.226 2006/06/06 15:28:52 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.227 2006/07/10 22:17:58 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -286,18 +286,6 @@
 .  include "${_PKGSRC_TOPDIR}/mk/defaults/mk.conf"
 .endif
 
-USE_TOOLS?=    # empty
-
-# Provide default values for TOOLs used by the top-level make.
-USE_TOOLS+=    [ awk dirname echo grep pwd sed test true
-
-# These tools are used by the top-level make only in certain packages and
-# should eventually be moved into those particular package Makefiles.
-#
-USE_TOOLS+=    date tr
-
-.include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk"
-
 .if ${OPSYS} == "NetBSD"
 .  if ${OBJECT_FMT} == "ELF" && \
    (${MACHINE_GNU_ARCH} == "arm" || \
@@ -487,6 +475,24 @@
 MAKEFLAGS+=            DIGEST_VERSION=${DIGEST_VERSION:Q}
 .endif
 
+USE_TOOLS?=    # empty
+
+# Provide default values for TOOLs used by the top-level make.
+USE_TOOLS+=    [ awk dirname echo grep pwd sed test true
+
+# These tools are used by the top-level make only in certain packages and
+# should eventually be moved into those particular package Makefiles.
+#
+USE_TOOLS+=    date tr
+
+# These are tools used directly by bsd.prefs.mk and files included by
+# bsd.prefs.mk.
+#
+USE_TOOLS+=    awk:pkgsrc cut:pkgsrc echo:pkgsrc pwd:pkgsrc            \
+               sed:pkgsrc tr:pkgsrc uname:pkgsrc
+
+.include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk"
+
 .if exists(${LOCALBASE}/bsd/share/mk/zoularis.mk)
 PKG_FAIL_REASON+=      'You appear to have a deprecated Zoularis installation.'
 PKG_FAIL_REASON+=      'Please update your system to bootstrap-pkgsrc and remove the'
@@ -559,7 +565,4 @@
 # Make variable definitions cache
 .include "${PKGSRCDIR}/mk/bsd.makevars.mk"
 
-USE_TOOLS+=            awk:pkgsrc cut:pkgsrc echo:pkgsrc pwd:pkgsrc    \
-                       sed:pkgsrc tr:pkgsrc uname:pkgsrc
-
 .endif # BSD_PKG_MK
diff -r f866ad6a79b8 -r 1dca629350f8 mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Mon Jul 10 22:14:18 2006 +0000
+++ b/mk/platform/IRIX.mk       Mon Jul 10 22:17:58 2006 +0000
@@ -1,11 +1,8 @@
-# $NetBSD: IRIX.mk,v 1.24 2006/04/12 21:01:15 joerg Exp $
+# $NetBSD: IRIX.mk,v 1.25 2006/07/10 22:17:58 jlam Exp $
 #
 # Variable definitions for the IRIX operating system.
 
 ECHO_N?=       ${ECHO} -n
-.if exists(/usr/bin/X11/imake)
-IMAKE?=                /usr/bin/X11/imake # IRIX 5.3 location
-.endif
 IMAKE_MAKE?=   ${MAKE}         # program which gets invoked by imake
 IMAKEOPTS+=    -DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE}
 IMAKEOPTS+=    -DManUsr=${PREFIX}
diff -r f866ad6a79b8 -r 1dca629350f8 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Mon Jul 10 22:14:18 2006 +0000
+++ b/mk/tools/replace.mk       Mon Jul 10 22:17:58 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.172 2006/07/08 23:08:59 schwarz Exp $
+# $NetBSD: replace.mk,v 1.173 2006/07/10 22:17:58 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1000,10 +1000,7 @@
 TOOLS_DEPENDS.${_t_}?= xorg-imake>=6.8:../../x11/xorg-imake
 TOOLS_FIND_PREFIX+=    TOOLS_PREFIX.${_t_}=xorg-imake
 TOOLS_PATH.${_t_}=     ${TOOLS_PREFIX.${_t_}}/${X11ROOT_PREFIX}/bin/${_t_}
-      # !empty(X11_TYPE:Mnative)
-.      elif defined(${_TOOLS_VARNAME.${_t_}}) && !empty(${_TOOLS_VARNAME.${_t_}})
-TOOLS_PATH.${_t_}=     ${${_TOOLS_VARNAME.${_t_}}}
-.      else # tool not explicitly specified
+.      else # !empty(X11_TYPE:Mnative)
 TOOLS_PATH.${_t_}=     ${X11BASE}/bin/${_t_}
 .      endif
 .    endif
diff -r f866ad6a79b8 -r 1dca629350f8 mk/tools/tools.IRIX.mk
--- a/mk/tools/tools.IRIX.mk    Mon Jul 10 22:14:18 2006 +0000
+++ b/mk/tools/tools.IRIX.mk    Mon Jul 10 22:17:58 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.15 2005/11/04 20:02:01 jlam Exp $
+# $NetBSD: tools.IRIX.mk,v 1.16 2006/07/10 22:17:58 jlam Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
@@ -37,6 +37,9 @@
 TOOLS_PLATFORM.head?=          /usr/bsd/head
 TOOLS_PLATFORM.hostname?=      /usr/bsd/hostname
 TOOLS_PLATFORM.id?=            /usr/bin/id
+.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative) && exists(/usr/bin/X11/imake)
+TOOLS_PLATFORM.imake?=         /usr/bin/X11/imake
+.endif
 TOOLS_PLATFORM.ln?=            /sbin/ln
 TOOLS_PLATFORM.ls?=            /sbin/ls
 TOOLS_PLATFORM.m4?=            /sbin/m4