diff options
| author | minskim <minskim> | 2009-07-08 12:51:16 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2009-07-08 12:51:16 +0000 |
| commit | 0cdb7c307e29ccc5c12465bd2c18d2a361f87b24 (patch) | |
| tree | 4986162239aef329f398f5e898db2fa3a9c053c4 /mk | |
| parent | f5dd1458e6ad1b0517880cb07ce24864f89b8f98 (diff) | |
| download | pkgsrc-0cdb7c307e29ccc5c12465bd2c18d2a361f87b24.tar.gz | |
Add xzcat as a tool and update lzcat's TOOLS_DEPENDS to avoid conflicts.
archivers/xz provides both lzcat and xzcat.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/defaults.mk | 3 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 17 |
2 files changed, 16 insertions, 4 deletions
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk index ec0310718d6..bafd4a4d9e6 100644 --- a/mk/tools/defaults.mk +++ b/mk/tools/defaults.mk @@ -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.wc= WC _TOOLS_VARNAME.wish= WISH _TOOLS_VARNAME.xargs= XARGS _TOOLS_VARNAME.xmkmf= XMKMF_CMD +_TOOLS_VARNAME.xzcat= XZCAT _TOOLS_VARNAME.yacc= YACC ###################################################################### diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 5a653e34564..4148a6976e5 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -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 @@ TOOLS_PATH.lha= ${TOOLS_PREFIX.lha}/bin/lha .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 @@ TOOLS_ARGS.xargs= -r # don't run command if stdin is empty . 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= |