Add bzip2 as tool. All platforms that had code to deal with bzcat

also get bzip2, the rest falls back to archivers/bzip2.

OK jlam.

8 files changed, 31 insertions, 19 deletions

diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index 09dd9004f33..4f260ca1f55 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.49 2006/10/15 01:56:06 minskim Exp $
+# $NetBSD: defaults.mk,v 1.50 2007/06/19 17:01:12 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -58,6 +58,7 @@ _TOOLS_VARNAME.bash=		BASH
 _TOOLS_VARNAME.bison-yacc=	YACC
 _TOOLS_VARNAME.byacc=		YACC
 _TOOLS_VARNAME.bzcat=		BZCAT
+_TOOLS_VARNAME.bzip2=		BZIP2
 _TOOLS_VARNAME.cat=		CAT
 _TOOLS_VARNAME.chgrp=		CHGRP
 _TOOLS_VARNAME.chmod=		CHMOD
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 4dcc4a7e608..eef1d048f4b 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.191 2007/06/19 14:21:18 joerg Exp $
+# $NetBSD: replace.mk,v 1.192 2007/06/19 17:01:12 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -270,16 +270,18 @@ TOOLS_CMD.byacc=		${TOOLS_DIR}/bin/yacc
 .  endif
 .endif
 
-.if !defined(TOOLS_IGNORE.bzcat) && !empty(_USE_TOOLS:Mbzcat)
-.  if !empty(PKGPATH:Marchivers/bzip2)
-MAKEFLAGS+=			TOOLS_IGNORE.bzcat=
-.  elif !empty(_TOOLS_USE_PKGSRC.bzcat:M[yY][eE][sS])
-TOOLS_DEPENDS.bzcat?=		bzip2>=0.9.0b:../../archivers/bzip2
-TOOLS_CREATE+=			bzcat
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bzcat=bzip2
-TOOLS_PATH.bzcat=		${TOOLS_PREFIX.bzcat}/bin/bzcat
+.for _t_ in bzip2 bzcat
+.  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
+.    if !empty(PKGPATH:Marchivers/bzip2)
+MAKEFLAGS+=			TOOLS_IGNORE.${_t_}=
+.    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
+TOOLS_DEPENDS.${_t_}?=		bzip2>=0.9.0b:../../archivers/bzip2
+TOOLS_CREATE+=			${_t_}
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.${_t_}=bzip2
+TOOLS_PATH.bzcat=		${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+.    endif
 .  endif
-.endif
+.endfor
 
 .if !defined(TOOLS_IGNORE.csh) && !empty(_USE_TOOLS:Mcsh)
 .  if !empty(PKGPATH:Mshells/tcsh)
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index 77a0fcaad70..cb96d584e69 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.32 2007/06/19 14:21:19 joerg Exp $
+# $NetBSD: tools.Darwin.mk,v 1.33 2007/06/19 17:01:12 joerg Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -13,6 +13,9 @@ TOOLS_PLATFORM.byacc?=		/usr/bin/yacc
 .if exists(/usr/bin/bzcat)
 TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
 .endif
+.if exists(/usr/bin/bzip2)
+TOOLS_PLATFORM.bzip2?=		/usr/bin/bzip2
+.endif
 TOOLS_PLATFORM.cat?=		/bin/cat
 TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
 TOOLS_PLATFORM.chmod?=		/bin/chmod
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index e2fbbaa430a..c76fc1dd25d 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.29 2007/06/19 14:21:19 joerg Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.30 2007/06/19 17:01:12 joerg Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -8,6 +8,7 @@ TOOLS_PLATFORM.basename?=	/usr/bin/basename
 TOOLS_PLATFORM.byacc?=		/usr/bin/yacc
 TOOLS_PLATFORM.cat?=		/bin/cat
 TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
+TOOLS_PLATFORM.bzip2?=		/usr/bin/bzip2
 TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
 TOOLS_PLATFORM.chmod?=		/bin/chmod
 TOOLS_PLATFORM.chown?=		/usr/sbin/chown
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 4179923ce4e..b56c318d734 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.29 2007/06/19 14:21:19 joerg Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.30 2007/06/19 17:01:12 joerg Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -6,9 +6,8 @@ TOOLS_PLATFORM.[?=		[			# shell builtin
 TOOLS_PLATFORM.awk?=		/usr/bin/awk
 TOOLS_PLATFORM.basename?=	/usr/bin/basename
 TOOLS_PLATFORM.byacc?=		/usr/bin/yacc
-.if exists(/usr/bin/bzcat)
 TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
-.endif
+TOOLS_PLATFORM.bzip2?=		/usr/bin/bzip2
 TOOLS_PLATFORM.cat?=		/bin/cat
 TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
 TOOLS_PLATFORM.chmod?=		/bin/chmod
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index 3f2046411a2..1a7b05f1e8a 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.34 2007/06/19 14:21:19 joerg Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.35 2007/06/19 17:01:13 joerg Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -9,6 +9,7 @@ TOOLS_PLATFORM.byacc?=		/usr/bin/yacc
 .if exists(/usr/bin/bzcat)
 TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
 .endif
+TOOLS_PLATFORM.bzip2?=		/usr/bin/bzip2
 TOOLS_PLATFORM.cat?=		/bin/cat
 TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
 TOOLS_PLATFORM.chmod?=		/bin/chmod
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index 9c5967b556d..d16496f83ee 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,10 +1,12 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.28 2007/06/19 14:21:19 joerg Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.29 2007/06/19 17:01:13 joerg Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
 TOOLS_PLATFORM.[?=		[			# shell builtin
 TOOLS_PLATFORM.awk?=		/usr/bin/awk
 TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
+TOOLS_PLATFORM.bzip2?=		/usr/bin/bzip2
 TOOLS_PLATFORM.byacc?=		/usr/bin/yacc
 TOOLS_PLATFORM.cat?=		/bin/cat
 .if exists(/bin/chgrp)
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index 84e0794a5ee..77f0a9017dc 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.25 2006/07/05 04:32:10 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.26 2007/06/19 17:01:13 joerg Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -8,6 +8,9 @@ TOOLS_PLATFORM.basename?=	/usr/bin/basename
 .if exists(/usr/bin/bzcat)
 TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
 .endif
+.if exists(/usr/bin/bzip2)
+TOOLS_PLATFORM.bzip2?=		/usr/bin/bzip2
+.endif
 TOOLS_PLATFORM.cat?=		/usr/bin/cat
 TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
 TOOLS_PLATFORM.chmod?=		/usr/bin/chmod