[pkgsrc/trunk]: pkgsrc/mk/tools Add xzcat as a tool and update lzcat's TOOLS_...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8cfd66c2895b
branches:  trunk
changeset: 395499:8cfd66c2895b
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Jul 08 12:51:16 2009 +0000

description:
Add xzcat as a tool and update lzcat's TOOLS_DEPENDS to avoid conflicts.

archivers/xz provides both lzcat and xzcat.

diffstat:

 mk/tools/defaults.mk |   3 ++-
 mk/tools/replace.mk  |  17 ++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diffs (57 lines):

diff -r 2f5460745bb6 -r 8cfd66c2895b mk/tools/defaults.mk
--- a/mk/tools/defaults.mk      Wed Jul 08 12:51:06 2009 +0000
+++ b/mk/tools/defaults.mk      Wed Jul 08 12:51:16 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.56 2009/02/05 19:03:29 joerg Exp $
+# $NetBSD: defaults.mk,v 1.57 2009/07/08 12:51:16 minskim Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -145,6 +145,7 @@
 _TOOLS_VARNAME.wish=           WISH
 _TOOLS_VARNAME.xargs=          XARGS
 _TOOLS_VARNAME.xmkmf=          XMKMF_CMD
+_TOOLS_VARNAME.xzcat=          XZCAT
 _TOOLS_VARNAME.yacc=           YACC
 
 ######################################################################
diff -r 2f5460745bb6 -r 8cfd66c2895b mk/tools/replace.mk
--- a/mk/tools/replace.mk       Wed Jul 08 12:51:06 2009 +0000
+++ b/mk/tools/replace.mk       Wed Jul 08 12:51:16 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.220 2009/04/22 14:13:52 joerg Exp $
+# $NetBSD: replace.mk,v 1.221 2009/07/08 12:51:16 minskim Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -558,10 +558,10 @@
 .endif
 
 .if !defined(TOOLS_IGNORE.lzcat) && !empty(_USE_TOOLS:Mlzcat)
-.  if !empty(PKGPATH:Marchivers/lzma-utils)
+.  if !empty(PKGPATH:Marchivers/xz)
 MAKEFLAGS+=                    TOOLS_IGNORE.lzcat=
 .  elif !empty(_TOOLS_USE_PKGSRC.lzcat:M[yY][eE][sS])
-TOOLS_DEPENDS.lzcat?=          lzma-utils>=4.32.7:../../archivers/lzma-utils
+TOOLS_DEPENDS.lzcat?=          xz>=4.999.8beta:../../archivers/xz
 TOOLS_CREATE+=                 lzcat
 TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.lzcat=lzcat
 TOOLS_PATH.lzcat=              ${TOOLS_PREFIX.lzcat}/bin/lzcat
@@ -853,6 +853,17 @@
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.xzcat) && !empty(_USE_TOOLS:Mxzcat)
+.  if !empty(PKGPATH:Marchivers/xz)
+MAKEFLAGS+=                    TOOLS_IGNORE.xzcat=
+.  elif !empty(_TOOLS_USE_PKGSRC.xzcat:M[yY][eE][sS])
+TOOLS_DEPENDS.xzcat?=          xz>=4.999.8beta:../../archivers/xz
+TOOLS_CREATE+=                 xzcat
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.xzcat=xzcat
+TOOLS_PATH.xzcat=              ${TOOLS_PREFIX.xzcat}/bin/xzcat
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.yacc) && !empty(_USE_TOOLS:Myacc)
 .  if !empty(PKGPATH:Mdevel/bison)
 MAKEFLAGS+=                    TOOLS_IGNORE.yacc=