[pkgsrc/trunk]: pkgsrc/mk Teach the new tools framework about USE_TOOLS+=bzcat.

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86eb54ae22f9
branches:  trunk
changeset: 493264:86eb54ae22f9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon May 02 02:50:33 2005 +0000

description:
Teach the new tools framework about USE_TOOLS+=bzcat.

diffstat:

 mk/bsd.pkg.mk               |  10 +++++++---
 mk/tools/defaults.mk        |   3 ++-
 mk/tools/replace.mk         |  15 ++++++++++++++-
 mk/tools/tools.DragonFly.mk |   3 ++-
 mk/tools/tools.FreeBSD.mk   |   5 ++++-
 mk/tools/tools.NetBSD.mk    |   5 ++++-
 mk/tools/tools.SunOS.mk     |   5 ++++-
 7 files changed, 37 insertions(+), 9 deletions(-)

diffs (148 lines):

diff -r 3153a3456e5d -r 86eb54ae22f9 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon May 02 02:14:23 2005 +0000
+++ b/mk/bsd.pkg.mk     Mon May 02 02:50:33 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1618 2005/04/30 04:35:54 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1619 2005/05/02 02:50:33 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -533,7 +533,9 @@
 # We need bzip2 for PATCHFILES with .bz2 suffix.
 .if defined(PATCHFILES)
 .  if !empty(PATCHFILES:M*.bz2) && ${EXTRACT_SUFX} != ".tar.bz2"
-.    if exists(/usr/bin/bzcat)
+.    if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+USE_TOOLS+=            bzcat
+.    elif exists(/usr/bin/bzcat)
 BZCAT=                 /usr/bin/bzcat
 .    else
 BZCAT=                 ${LOCALBASE}/bin/bzcat
@@ -1735,7 +1737,9 @@
 #
 .if !empty(EXTRACT_ONLY:M*.bz2) || !empty(EXTRACT_ONLY:M*.tbz) || \
     !empty(EXTRACT_SUFX:M*.bz2) || !empty(EXTRACT_SUFX:M*.tbz)
-.  if exists(/usr/bin/bzcat)
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+USE_TOOLS+=            bzcat
+.  elif exists(/usr/bin/bzcat)
 BZCAT=                 /usr/bin/bzcat <
 .  else
 BUILD_DEPENDS+=                bzip2>=0.9.0b:../../archivers/bzip2
diff -r 3153a3456e5d -r 86eb54ae22f9 mk/tools/defaults.mk
--- a/mk/tools/defaults.mk      Mon May 02 02:14:23 2005 +0000
+++ b/mk/tools/defaults.mk      Mon May 02 02:50:33 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.1 2005/04/30 04:35:54 jlam Exp $
+# $NetBSD: defaults.mk,v 1.2 2005/05/02 02:50:34 jlam Exp $
 
 .if !defined(TOOLS_DEFAULTS_MK)
 TOOLS_DEFAULTS_MK=     defined
@@ -17,6 +17,7 @@
 _TOOLS_VARNAME.awk=            AWK
 _TOOLS_VARNAME.basename=       BASENAME
 _TOOLS_VARNAME.bison=          YACC
+_TOOLS_VARNAME.bzcat=          BZCAT
 _TOOLS_VARNAME.cat=            CAT
 _TOOLS_VARNAME.chgrp=          CHGRP
 _TOOLS_VARNAME.chmod=          CHMOD
diff -r 3153a3456e5d -r 86eb54ae22f9 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Mon May 02 02:14:23 2005 +0000
+++ b/mk/tools/replace.mk       Mon May 02 02:50:33 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.54 2005/04/30 04:35:54 jlam Exp $
+# $NetBSD: replace.mk,v 1.55 2005/05/02 02:50:34 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -137,6 +137,19 @@
 TOOLS_CMD.bison=               ${TOOLS_DIR}/bin/yacc
 .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_SYMLINK+=                        bzcat
+TOOLS_REAL_CMD.bzcat=          ${LOCALBASE}/bin/bzcat
+.    if exists(${TOOLS_REAL_CMD.bzcat})
+${_TOOLS_VARNAME.bzcat}=       ${TOOLS_REAL_CMD.bzcat}
+.    endif
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.cat) && !empty(_USE_TOOLS:Mcat)
 .  if !empty(PKGPATH:Msysutils/coreutils)
 MAKEFLAGS+=                    TOOLS_IGNORE.cat=
diff -r 3153a3456e5d -r 86eb54ae22f9 mk/tools/tools.DragonFly.mk
--- a/mk/tools/tools.DragonFly.mk       Mon May 02 02:14:23 2005 +0000
+++ b/mk/tools/tools.DragonFly.mk       Mon May 02 02:50:33 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.4 2005/04/28 17:30:24 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.5 2005/05/02 02:50:34 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -6,6 +6,7 @@
 TOOLS_PLATFORM.awk?=           /usr/bin/awk
 TOOLS_PLATFORM.basename?=      /usr/bin/basename
 TOOLS_PLATFORM.cat?=           /bin/cat
+TOOLS_PLATFORM.bzcat?=         /usr/bin/bzcat
 TOOLS_PLATFORM.chgrp?=         /usr/bin/chgrp
 TOOLS_PLATFORM.chmod?=         /bin/chmod
 TOOLS_PLATFORM.chown?=         /usr/sbin/chown
diff -r 3153a3456e5d -r 86eb54ae22f9 mk/tools/tools.FreeBSD.mk
--- a/mk/tools/tools.FreeBSD.mk Mon May 02 02:14:23 2005 +0000
+++ b/mk/tools/tools.FreeBSD.mk Mon May 02 02:50:33 2005 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.4 2005/04/28 17:30:24 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.5 2005/05/02 02:50:34 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
 TOOLS_PLATFORM.[?=             [                       # shell builtin
 TOOLS_PLATFORM.awk?=           /usr/bin/awk
 TOOLS_PLATFORM.basename?=      /usr/bin/basename
+.if exists(/usr/bin/bzcat)
+TOOLS_PLATFORM.bzcat?=         /usr/bin/bzcat
+.endif
 TOOLS_PLATFORM.cat?=           /bin/cat
 TOOLS_PLATFORM.chgrp?=         /usr/bin/chgrp
 TOOLS_PLATFORM.chmod?=         /bin/chmod
diff -r 3153a3456e5d -r 86eb54ae22f9 mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Mon May 02 02:14:23 2005 +0000
+++ b/mk/tools/tools.NetBSD.mk  Mon May 02 02:50:33 2005 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: tools.NetBSD.mk,v 1.4 2005/04/28 17:30:24 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.5 2005/05/02 02:50:34 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
 TOOLS_PLATFORM.[?=             [                       # shell builtin
 TOOLS_PLATFORM.awk?=           /usr/bin/awk
 TOOLS_PLATFORM.basename?=      /usr/bin/basename
+.if exists(/usr/bin/bzcat)
+TOOLS_PLATFORM.bzcat?=         /usr/bin/bzcat
+.endif
 TOOLS_PLATFORM.cat?=           /bin/cat
 TOOLS_PLATFORM.chgrp?=         /usr/bin/chgrp
 TOOLS_PLATFORM.chmod?=         /bin/chmod
diff -r 3153a3456e5d -r 86eb54ae22f9 mk/tools/tools.SunOS.mk
--- a/mk/tools/tools.SunOS.mk   Mon May 02 02:14:23 2005 +0000
+++ b/mk/tools/tools.SunOS.mk   Mon May 02 02:50:33 2005 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: tools.SunOS.mk,v 1.4 2005/04/28 17:30:24 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.5 2005/05/02 02:50:34 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
 TOOLS_PLATFORM.[?=             [                       # shell builtin
 TOOLS_PLATFORM.awk?=           /usr/bin/nawk
 TOOLS_PLATFORM.basename?=      /usr/bin/basename
+.if exist(/usr/bin/bzcat)
+TOOLS_PLATFORM.bzcat?=         /usr/bin/bzcat
+.endif
 TOOLS_PLATFORM.cat?=           /usr/bin/cat
 TOOLS_PLATFORM.chgrp?=         /usr/bin/chgrp
 TOOLS_PLATFORM.chmod?=         /usr/bin/chmod