Teach the tools framework about ``printf'', which can be replaced by the

printf in sysutils/coreutils.

8 files changed, 28 insertions, 8 deletions

diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 76be6751142..53959302bd2 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.127 2005/10/10 17:22:06 reed Exp $
+# $NetBSD: replace.mk,v 1.128 2005/10/12 16:28:29 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -911,6 +911,17 @@ TOOLS_PATH.pod2man=		${TOOLS_PREFIX.pod2man}/bin/pod2man
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.printf) && !empty(_USE_TOOLS:Mprintf)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.printf=
+.  elif !empty(_TOOLS_USE_PKGSRC.printf:M[yY][eE][sS])
+TOOLS_DEPENDS.printf?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			printf
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.printf=coreutils
+TOOLS_PATH.printf=		${TOOLS_PREFIX.printf}/bin/${GNU_PROGRAM_PREFIX}printf
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.pwd) && !empty(_USE_TOOLS:Mpwd)
 .  if !empty(PKGPATH:Msysutils/coreutils)
 MAKEFLAGS+=			TOOLS_IGNORE.pwd=
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index db8d0334253..174966d6676 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.18 2005/09/20 03:50:19 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.19 2005/10/12 16:28:29 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -49,6 +49,7 @@ TOOLS_PLATFORM.nice?=		/usr/bin/nice
 TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
 TOOLS_PLATFORM.pax?=		/bin/pax
+TOOLS_PLATFORM.printf?=		/usr/bin/printf
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 7a5d0962299..295be8c4897 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.20 2005/09/20 03:50:19 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.21 2005/10/12 16:28:29 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -51,6 +51,7 @@ TOOLS_PLATFORM.nice?=		/usr/bin/nice
 TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
 TOOLS_PLATFORM.pax?=		/bin/pax
+TOOLS_PLATFORM.printf?=		/usr/bin/printf
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk
index 16623019551..b9cf7483df7 100644
--- a/mk/tools/tools.Interix.mk
+++ b/mk/tools/tools.Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Interix.mk,v 1.14 2005/10/05 16:10:20 tv Exp $
+# $NetBSD: tools.Interix.mk,v 1.15 2005/10/12 16:28:29 jlam Exp $
 #
 # System-supplied tools for the Interix operating system.
 
@@ -38,6 +38,7 @@ TOOLS_PLATFORM.mail?=		/bin/mail
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/bin/nice
+TOOLS_PLATFORM.printf?=		/bin/printf
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index fd1bd5c1ed9..4c95e2b9d74 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.24 2005/08/26 05:41:39 reed Exp $
+# $NetBSD: tools.Linux.mk,v 1.25 2005/10/12 16:28:29 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -120,6 +120,9 @@ TOOLS_PLATFORM.nice?=		/usr/bin/nice
 TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 .endif
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
+.if exists(/usr/bin/printf)
+TOOLS_PLATFORM.printf?=		/usr/bin/printf
+.endif
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index e3f5ee2a297..791ad5b40b7 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.19 2005/09/20 03:50:19 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.20 2005/10/12 16:28:29 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -57,6 +57,7 @@ TOOLS_PLATFORM.nice?=		/usr/bin/nice
 TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
 TOOLS_PLATFORM.pax?=		/bin/pax
+TOOLS_PLATFORM.printf?=		/usr/bin/printf
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index fd7509ed971..375d0c613ab 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.18 2005/09/20 03:50:19 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.19 2005/10/12 16:28:29 jlam Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -55,6 +55,7 @@ TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
 TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.printf?=		/usr/bin/printf
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index de3ade52a71..0c5713b0807 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.20 2005/08/30 00:32:46 dmcmahill Exp $
+# $NetBSD: tools.SunOS.mk,v 1.21 2005/10/12 16:28:29 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -61,6 +61,7 @@ TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 .if exists(/usr/bin/gpatch)
 TOOLS_PLATFORM.patch?=		/usr/bin/gpatch
 .endif
+TOOLS_PLATFORM.printf?=		/bin/printf
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/usr/bin/rm
 TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir