Teach the tools framework about "sleep" which can be provided by the

sysutils/coreutils package.

13 files changed, 36 insertions, 13 deletions

diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index 5d65e9f7e60..8f9bb17c67c 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.39 2005/11/04 19:28:33 jlam Exp $
+# $NetBSD: defaults.mk,v 1.40 2005/11/04 20:02:01 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -114,6 +114,7 @@ _TOOLS_VARNAME.rmdir=		RMDIR
 _TOOLS_VARNAME.sed=		SED
 _TOOLS_VARNAME.sh=		SH
 _TOOLS_VARNAME.shlock=		SHLOCK
+_TOOLS_VARNAME.sleep=		SLEEP
 _TOOLS_VARNAME.sort=		SORT
 _TOOLS_VARNAME.tail=		TAIL
 _TOOLS_VARNAME.tar=		TAR
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index a564c822fcf..600733f8f50 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.130 2005/10/30 17:32:07 jschauma Exp $
+# $NetBSD: replace.mk,v 1.131 2005/11/04 20:02:01 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -994,6 +994,17 @@ TOOLS_PATH.shlock=		${TOOLS_PREFIX.shlock}/bin/shlock
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.sleep) && !empty(_USE_TOOLS:Msleep)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.sleep=
+.  elif !empty(_TOOLS_USE_PKGSRC.sleep:M[yY][eE][sS])
+TOOLS_DEPENDS.sleep?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			sleep
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.sleep=coreutils
+TOOLS_PATH.sleep=		${TOOLS_PREFIX.sleep}/bin/${GNU_PROGRAM_PREFIX}sleep
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.sort) && !empty(_USE_TOOLS:Msort)
 .  if !empty(PKGPATH:Msysutils/coreutils)
 MAKEFLAGS+=			TOOLS_IGNORE.sort=
diff --git a/mk/tools/tools.AIX.mk b/mk/tools/tools.AIX.mk
index 802806e940e..40dddcbedb0 100644
--- a/mk/tools/tools.AIX.mk
+++ b/mk/tools/tools.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.AIX.mk,v 1.11 2005/06/24 20:59:59 jlam Exp $
+# $NetBSD: tools.AIX.mk,v 1.12 2005/11/04 20:02:01 jlam Exp $
 #
 # System-supplied tools for the AIX operating system.
 
@@ -43,6 +43,7 @@ TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sed?=		/usr/bin/sed
 TOOLS_PLATFORM.sh?=		/bin/sh
 TOOLS_PLATFORM.shlock?=		/usr/bin/shlock
+TOOLS_PLATFORM.shlock?=		/bin/sleep
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tar?=		/usr/bin/tar
diff --git a/mk/tools/tools.BSDOS.mk b/mk/tools/tools.BSDOS.mk
index 1717fe6437a..0251e881852 100644
--- a/mk/tools/tools.BSDOS.mk
+++ b/mk/tools/tools.BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.BSDOS.mk,v 1.15 2005/08/28 01:43:56 reed Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.16 2005/11/04 20:02:01 jlam Exp $
 #
 # System-supplied tools for the BSD/OS operating system.
 
@@ -64,6 +64,7 @@ TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sed?=		/usr/bin/sed
 TOOLS_PLATFORM.sh?=		/bin/bash
+TOOLS_PLATFORM.sleep?=		/bin/sleep
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index 1ffd5f9b5ae..a5cf75e6e0c 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.19 2005/09/20 03:50:19 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.20 2005/11/04 20:02:01 jlam Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -61,6 +61,7 @@ TOOLS_PLATFORM.sh?=		/bin/sh
 .if exists(/usr/bin/shlock)
 TOOLS_PLATFORM.shlock?=		/usr/bin/shlock
 .endif
+TOOLS_PLATFORM.sleep?=		/bin/sleep
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index 174966d6676..09f8f3c5aa7 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.19 2005/10/12 16:28:29 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.20 2005/11/04 20:02:01 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -56,6 +56,7 @@ TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sed?=		/usr/bin/sed
 TOOLS_PLATFORM.sh?=		/bin/sh
 TOOLS_PLATFORM.shlock?=		/usr/bin/shlock
+TOOLS_PLATFORM.sleep?=		/bin/sleep
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 295be8c4897..6a66093bbb1 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.21 2005/10/12 16:28:29 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.22 2005/11/04 20:02:01 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -57,6 +57,7 @@ TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sed?=		/usr/bin/sed
 TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.sleep?=		/bin/sleep
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk
index a276bdde09b..fa37aa78fbe 100644
--- a/mk/tools/tools.IRIX.mk
+++ b/mk/tools/tools.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.14 2005/06/24 20:59:59 jlam Exp $
+# $NetBSD: tools.IRIX.mk,v 1.15 2005/11/04 20:02:01 jlam Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
@@ -53,6 +53,7 @@ TOOLS_PLATFORM.rm?=		/sbin/rm
 TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
 TOOLS_PLATFORM.sed?=		/sbin/sed
 TOOLS_PLATFORM.sh?=		/bin/ksh
+TOOLS_PLATFORM.sleep?=		/sbin/sleep
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk
index 4add52e4149..809c119246b 100644
--- a/mk/tools/tools.Interix.mk
+++ b/mk/tools/tools.Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Interix.mk,v 1.16 2005/10/24 17:36:42 tv Exp $
+# $NetBSD: tools.Interix.mk,v 1.17 2005/11/04 20:02:01 jlam Exp $
 #
 # System-supplied tools for the Interix operating system.
 
@@ -43,6 +43,7 @@ TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.sleep?=		/bin/sleep
 TOOLS_PLATFORM.sort?=		/bin/sort
 TOOLS_PLATFORM.strip?=		/bin/strip
 TOOLS_PLATFORM.tail?=		/bin/tail
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 4c95e2b9d74..3d76df668cb 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.25 2005/10/12 16:28:29 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.26 2005/11/04 20:02:01 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -128,6 +128,7 @@ TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sed?=		${TOOLS_PLATFORM.gsed}
 TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.sleep?=		/bin/sleep
 .if exists(/bin/sort)
 TOOLS_PLATFORM.sort?=		/bin/sort
 .elif exists(/usr/bin/sort)
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index 791ad5b40b7..a9745130c32 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.20 2005/10/12 16:28:29 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.21 2005/11/04 20:02:01 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -64,6 +64,7 @@ TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sed?=		/usr/bin/sed
 TOOLS_PLATFORM.sh?=		/bin/sh
 TOOLS_PLATFORM.shlock?=		/usr/bin/shlock
+TOOLS_PLATFORM.sleep?=		/bin/sleep
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index 375d0c613ab..c8c41ff0fc8 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.19 2005/10/12 16:28:29 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.20 2005/11/04 20:02:01 jlam Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -61,6 +61,7 @@ TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sed?=		/usr/bin/sed
 TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.sleep?=		/bin/sleep
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index 0c5713b0807..4a0385839c6 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.21 2005/10/12 16:28:29 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.22 2005/11/04 20:02:01 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -66,6 +66,7 @@ TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/usr/bin/rm
 TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
 TOOLS_PLATFORM.sh?=		/bin/ksh
+TOOLS_PLATFORM.sleep?=		/bin/sleep
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/ccs/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/xpg4/bin/tail