[pkgsrc/trunk]: pkgsrc/mk/tools Teach the tools framework about wish and tcls...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3779afe24bf6
branches:  trunk
changeset: 502796:3779afe24bf6
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Nov 08 23:06:38 2005 +0000

description:
Teach the tools framework about wish and tclsh, and set WISH and TCLSH
accordingly for packages that need it.

diffstat:

 mk/tools/defaults.mk |   6 +++++-
 mk/tools/replace.mk  |  24 +++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diffs (83 lines):

diff -r 10ec0aa8a7cf -r 3779afe24bf6 mk/tools/defaults.mk
--- a/mk/tools/defaults.mk      Tue Nov 08 23:05:22 2005 +0000
+++ b/mk/tools/defaults.mk      Tue Nov 08 23:06:38 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.41 2005/11/08 03:36:13 tv Exp $
+# $NetBSD: defaults.mk,v 1.42 2005/11/08 23:06:38 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -120,6 +120,7 @@
 _TOOLS_VARNAME.tail=           TAIL
 _TOOLS_VARNAME.tar=            TAR
 _TOOLS_VARNAME.tbl=            TBL
+_TOOLS_VARNAME.tclsh=          TCLSH
 _TOOLS_VARNAME.tee=            TEE
 _TOOLS_VARNAME.test=           TEST
 _TOOLS_VARNAME.touch=          TOUCH
@@ -130,6 +131,7 @@
 _TOOLS_VARNAME.unzip=          UNZIP
 _TOOLS_VARNAME.unzoo=          UNZOO
 _TOOLS_VARNAME.wc=             WC
+_TOOLS_VARNAME.wish=           WISH
 _TOOLS_VARNAME.xargs=          XARGS
 _TOOLS_VARNAME.xmkmf=          XMKMF_CMD
 _TOOLS_VARNAME.yacc=           YACC
@@ -169,10 +171,12 @@
 _TOOLS_VARNAME_GNU.sed=                SED
 _TOOLS_VARNAME_GNU.sort=       SORT
 _TOOLS_VARNAME_GNU.tar=                TAR
+_TOOLS_VARNAME_GNU.tclsh=      TCLSH
 _TOOLS_VARNAME_GNU.test=       TEST ac_cv_path_TEST
 _TOOLS_VARNAME_GNU.touch=      TOUCH
 _TOOLS_VARNAME_GNU.tr=         TR
 _TOOLS_VARNAME_GNU.true=       TRUE ac_cv_path_TRUE
+_TOOLS_VARNAME_GNU.wish=       WISH
 _TOOLS_VARNAME_GNU.xmkmf=      XMKMF
 _TOOLS_VARNAME_GNU.yacc=       YACC
 
diff -r 10ec0aa8a7cf -r 3779afe24bf6 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Tue Nov 08 23:05:22 2005 +0000
+++ b/mk/tools/replace.mk       Tue Nov 08 23:06:38 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.134 2005/11/08 17:41:26 jlam Exp $
+# $NetBSD: replace.mk,v 1.135 2005/11/08 23:06:38 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -659,6 +659,17 @@
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.tclsh) && !empty(_USE_TOOLS:Mtclsh)
+.  if !empty(PKGPATH:Mlang/tcl)
+MAKEFLAGS+=                    TOOLS_IGNORE.tclsh=
+.  elif !empty(_TOOLS_USE_PKGSRC.tclsh:M[yY][eE][sS])
+TOOLS_DEPENDS.tclsh?=          tcl>=8.4:../../lang/tcl
+TOOLS_CREATE+=                 tclsh
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.tclsh=tcl
+TOOLS_PATH.tclsh=              ${TOOLS_PREFIX.tclsh}/bin/tclsh
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.unrar) && !empty(_USE_TOOLS:Munrar)
 .  if !empty(PKGPATH:Marchivers/unrar)
 MAKEFLAGS+=                    TOOLS_IGNORE.unrar=
@@ -692,6 +703,17 @@
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.wish) && !empty(_USE_TOOLS:Mwish)
+.  if !empty(PKGPATH:Mx11/tk)
+MAKEFLAGS+=                    TOOLS_IGNORE.wish=
+.  elif !empty(_TOOLS_USE_PKGSRC.wish:M[yY][eE][sS])
+TOOLS_DEPENDS.wish?=           tk>=8.4:../../x11/tk
+TOOLS_CREATE+=                 wish
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.wish=tk
+TOOLS_PATH.wish=               ${TOOLS_PREFIX.wish}/bin/wish
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.xargs) && !empty(_USE_TOOLS:Mxargs)
 .  if !empty(PKGPATH:Msysutils/findutils)
 MAKEFLAGS+=                    TOOLS_IGNORE.xargs=