Support bash as a tool, so that packages containing bash scripts

(e.g. graphics/netpbm) use native bash if available.

4 files changed, 19 insertions, 4 deletions

diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index 0212c19c132..a70c5430a50 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.31 2005/06/23 20:39:39 jlam Exp $
+# $NetBSD: defaults.mk,v 1.32 2005/06/24 19:39:10 minskim Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -54,6 +54,7 @@ TOOLS_DEFAULTS_MK=	defined
 
 _TOOLS_VARNAME.awk=		AWK
 _TOOLS_VARNAME.basename=	BASENAME
+_TOOLS_VARNAME.bash=		BASH
 _TOOLS_VARNAME.bison-yacc=	YACC
 _TOOLS_VARNAME.bzcat=		BZCAT
 _TOOLS_VARNAME.cat=		CAT
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index fb7570d1057..0e19ea80132 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.103 2005/06/24 06:43:45 jlam Exp $
+# $NetBSD: replace.mk,v 1.104 2005/06/24 19:39:10 minskim Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -194,6 +194,18 @@ TOOLS_${_TOOLS_VARNAME.basename}=	${TOOLS_REAL_CMD.basename}
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.bash) && !empty(_USE_TOOLS:Mbash)
+.  if !empty(PKGPATH:Mshells/bash)
+MAKEFLAGS+=			TOOLS_IGNORE.bash=
+.  elif !empty(_TOOLS_USE_PKGSRC.bash:M[yY][eE][sS])
+TOOLS_DEPENDS.bash?=		bash-[0-9]*:../../shells/bash
+TOOLS_CREATE+=			bash
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bash=bash
+TOOLS_REAL_CMD.bash=		${TOOLS_PREFIX.bash}/bin/bash
+TOOLS_${_TOOLS_VARNAME.bash}=	${TOOLS_READ_CMD.bash}
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.bdftopcf) && !empty(_USE_TOOLS:Mbdftopcf)
 .  if !empty(PKGPATH:Mx11/XFree86-clients) || !empty(PKGPATH:Mx11/xorg-clients)
 MAKEFLAGS+=			TOOLS_IGNORE.bdftopcf=
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index 1c26dcec276..fe7b1ecb85c 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,10 +1,11 @@
-# $NetBSD: tools.Darwin.mk,v 1.14 2005/06/23 20:45:34 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.15 2005/06/24 19:39:10 minskim Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
 TOOLS_PLATFORM.[?=		[			# shell builtin
 TOOLS_PLATFORM.awk?=		/usr/bin/awk
 TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.bash?=		/bin/bash
 TOOLS_PLATFORM.cat?=		/bin/cat
 TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
 TOOLS_PLATFORM.chmod?=		/bin/chmod
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 74493d4d440..f72870f5cc0 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.21 2005/06/23 20:45:34 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.22 2005/06/24 19:39:10 minskim Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -9,6 +9,7 @@ TOOLS_PLATFORM.basename?=	/bin/basename
 .elif exists(/usr/bin/basename)
 TOOLS_PLATFORM.basename?=	/usr/bin/basename
 .endif
+TOOLS_PLATFORM.bash?=		/bin/bash
 .if exists(/usr/bin/bison)
 TOOLS_PLATFORM.bison?=		/usr/bin/bison
 TOOLS_PLATFORM.bison-yacc?=	/usr/bin/bison -y