Teach the tools framework about the ``ksh'' tool, provided by the

shells/pdksh package if it doesn't exist on the base system.

4 files changed, 20 insertions, 4 deletions

diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 439de8b6d83..5efa81672a1 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.152 2006/01/08 23:00:00 jlam Exp $
+# $NetBSD: replace.mk,v 1.153 2006/01/09 18:32:52 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -426,6 +426,17 @@ TOOLS_ARGS.gzip=		-nf ${GZIP}
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.ksh) && !empty(_USE_TOOLS:Mksh)
+.  if !empty(PKGPATH:Mshells/pdksh)
+MAKEFLAGS+=			TOOLS_IGNORE.ksh=
+.  elif !empty(_TOOLS_USE_PKGSRC.ksh:M[yY][eE][sS])
+TOOLS_DEPENDS.ksh?=		pdksh>=5.2.14:../../shells/pdksh
+TOOLS_CREATE+=			ksh
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ksh=pdksh
+TOOLS_PATH.ksh=			${TOOLS_PREFIX.ksh}/bin/pdksh
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.lex) && !empty(_USE_TOOLS:Mlex)
 .  if !empty(PKGPATH:Mdevel/flex)
 MAKEFLAGS+=			TOOLS_IGNORE.lex=
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index a5cf75e6e0c..30795494916 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.20 2005/11/04 20:02:01 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.21 2006/01/09 18:32:52 jlam Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -40,6 +40,9 @@ TOOLS_PLATFORM.head?=		/usr/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
 TOOLS_PLATFORM.install?=	/usr/bin/install
+.if exists(/bin/ksh)
+TOOLS_PLATFORM.ksh?=		/bin/ksh
+.endif
 TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index e669e0b2946..00ab6da6efc 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.23 2006/01/08 23:00:00 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.24 2006/01/09 18:32:52 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -45,6 +45,7 @@ TOOLS_PLATFORM.install?=	/usr/bin/install
 .if exists(/sbin/ldconfig)
 TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 .endif
+TOOLS_PLATFORM.ksh?=		/bin/ksh
 TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index 8d1b09292cd..3e2743cd464 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.21 2005/11/08 03:36:13 tv Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.22 2006/01/09 18:32:52 jlam Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -43,6 +43,7 @@ TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
 TOOLS_PLATFORM.install?=	/usr/bin/install
 TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
+TOOLS_PLATFORM.ksh?=		/bin/ksh
 TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls