diff options
author | jlam <jlam@pkgsrc.org> | 2005-07-15 18:27:48 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2005-07-15 18:27:48 +0000 |
commit | bf9129c41e2b7be767d2c17d60e379900e6dda5f (patch) | |
tree | 91f275af994eade5936cfd1677c803fdc48b0f89 /mk | |
parent | 2e277f69ef4ed4af438f9af4c09272a7ccbb2475 (diff) | |
download | pkgsrc-bf9129c41e2b7be767d2c17d60e379900e6dda5f.tar.gz |
Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by making
PKGSRC_USE_TOOLS go away. There is now only a single USE_TOOLS variable
that specifies all of the tools we need to build/run the package.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.check.mk | 4 | ||||
-rw-r--r-- | mk/bsd.pkg.extract.mk | 20 | ||||
-rw-r--r-- | mk/bsd.pkg.mk | 20 | ||||
-rw-r--r-- | mk/bsd.pkg.patch.mk | 10 | ||||
-rw-r--r-- | mk/bsd.prefs.mk | 9 | ||||
-rw-r--r-- | mk/buildlink3/find-files.mk | 10 | ||||
-rw-r--r-- | mk/buildlink3/find-libs.mk | 10 | ||||
-rw-r--r-- | mk/buildlink3/imake-check.mk | 6 | ||||
-rw-r--r-- | mk/tools/defaults.mk | 8 | ||||
-rw-r--r-- | mk/tools/imake.mk | 14 | ||||
-rw-r--r-- | mk/tools/replace.mk | 26 |
11 files changed, 62 insertions, 75 deletions
diff --git a/mk/bsd.pkg.check.mk b/mk/bsd.pkg.check.mk index e96f2a53ed6..668c8cb68b0 100644 --- a/mk/bsd.pkg.check.mk +++ b/mk/bsd.pkg.check.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.check.mk,v 1.6 2005/06/23 21:34:01 kristerw Exp $ +# $NetBSD: bsd.pkg.check.mk,v 1.7 2005/07/15 18:27:54 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines the # relevant variables and targets the for various install-time "check" @@ -41,7 +41,7 @@ CHECK_FILES?= no CHECK_FILES_STRICT?= no CHECK_WRKREF?= no -PKGSRC_USE_TOOLS+= awk cat cmp diff echo find grep rm sed test \ +USE_TOOLS+= awk cat cmp diff echo find grep rm sed test \ touch true ########################################################################### diff --git a/mk/bsd.pkg.extract.mk b/mk/bsd.pkg.extract.mk index d9f82ee4d67..d226d0f318e 100644 --- a/mk/bsd.pkg.extract.mk +++ b/mk/bsd.pkg.extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.extract.mk,v 1.9 2005/05/22 19:11:12 jlam Exp $ +# $NetBSD: bsd.pkg.extract.mk,v 1.10 2005/07/15 18:27:54 jlam Exp $ # # This Makefile fragment is included to bsd.pkg.mk and defines the # relevant variables and targets for the "extract" phase. @@ -55,34 +55,34 @@ _EXTRACT_SUFFIXES+= .rar !empty(EXTRACT_SUFX:M*.tbz) || !empty(EXTRACT_SUFX:M*.tgz) || \ !empty(EXTRACT_ONLY:M*_tar.gz) || !empty(EXTRACT_SUFX:M*_tar.gz) . if !empty(EXTRACT_USING:Mgtar) -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar . elif !empty(EXTRACT_USING:Mnbtar) -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= tar . else -PKGSRC_USE_TOOLS+= pax +USE_TOOLS+= pax . endif .endif .if !empty(EXTRACT_ONLY:M*.bz2) || !empty(EXTRACT_ONLY:M*.tbz) || \ !empty(EXTRACT_SUFX:M*.bz2) || !empty(EXTRACT_SUFX:M*.tbz) -PKGSRC_USE_TOOLS+= bzcat +USE_TOOLS+= bzcat .endif .if !empty(EXTRACT_ONLY:M*.zip) || !empty(EXTRACT_SUFX:M*.zip) -PKGSRC_USE_TOOLS+= unzip +USE_TOOLS+= unzip .endif .if !empty(EXTRACT_ONLY:M*.lzh) || !empty(EXTRACT_ONLY:M*.lha) || \ !empty(EXTRACT_SUFX:M*.lzh) || !empty(EXTRACT_SUFX:M*.lha) -PKGSRC_USE_TOOLS+= lha +USE_TOOLS+= lha .endif .if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \ !empty(EXTRACT_SUFX:M*.gz) || !empty(EXTRACT_SUFX:M*.tgz) || \ !empty(EXTRACT_ONLY:M*.Z) || !empty(EXTRACT_SUFX:M*.Z) -PKGSRC_USE_TOOLS+= gzcat +USE_TOOLS+= gzcat .endif .if !empty(EXTRACT_ONLY:M*.zoo) || !empty(EXTRACT_SUFX:M*.zoo) -PKGSRC_USE_TOOLS+= unzoo +USE_TOOLS+= unzoo .endif .if !empty(EXTRACT_ONLY:M*.rar) || !empty(EXTRACT_SUFX:M*.rar) -PKGSRC_USE_TOOLS+= unrar +USE_TOOLS+= unrar .endif DECOMPRESS_CMD.tar.gz?= ${GZCAT} diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d6a99286e72..8e49d1d8c17 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1706 2005/07/06 05:52:34 reed Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1707 2005/07/15 18:27:54 jlam Exp $ # # This file is in the public domain. # @@ -779,38 +779,38 @@ BUILD_DEFS+= PKG_SYSCONFBASEDIR PKG_SYSCONFDIR # eventually be split up into lists of tools required by different # phases of a pkgsrc build. # -PKGSRC_USE_TOOLS+= \ +USE_TOOLS+= \ [ awk basename cat chgrp chmod chown cmp cp cut dirname echo \ egrep env false file find grep head hostname id install ln ls \ mkdir mv pax pwd rm rmdir sed sh sort tail test touch tr true \ wc xargs # bsd.wrapper.mk -PKGSRC_USE_TOOLS+= expr +USE_TOOLS+= expr # bsd.bulk-pkg.mk uses certain tools .if defined(BATCH) -PKGSRC_USE_TOOLS+= tee tsort +USE_TOOLS+= tee tsort .endif .if !defined(NO_MTREE) -PKGSRC_USE_TOOLS+= mtree +USE_TOOLS+= mtree .endif .if defined(PKG_PRESERVE) -PKGSRC_USE_TOOLS+= date +USE_TOOLS+= date .endif # We need a mail command to send mail to ${PKGSRC_MESSAGE_RECIPIENTS}. .if !empty(PKGSRC_MESSAGE_RECIPIENTS) -PKGSRC_USE_TOOLS+= mail +USE_TOOLS+= mail .endif # We need shlock if we're using locking to synchronize multiple builds # over the same pkgsrc tree. # .if ${PKGSRC_LOCKTYPE} != "none" -PKGSRC_USE_TOOLS+= shlock +USE_TOOLS+= shlock .endif # If MANZ is defined, then we want the final man pages to be compressed. @@ -847,10 +847,10 @@ _MANZ= ${MANZ:Dyes:Uno} MAKEVARS+= _MANCOMPRESSED _MANZ .if !empty(_MANCOMPRESSED:M[yY][eE][sS]) && empty(_MANZ:M[yY][eE][sS]) -PKGSRC_USE_TOOLS+= gunzip +USE_TOOLS+= gunzip .endif .if empty(_MANCOMPRESSED:M[yY][eE][sS]) && !empty(_MANZ:M[yY][eE][sS]) -PKGSRC_USE_TOOLS+= gzip +USE_TOOLS+= gzip .endif # Extract diff --git a/mk/bsd.pkg.patch.mk b/mk/bsd.pkg.patch.mk index 752916331ce..0bee3814fac 100644 --- a/mk/bsd.pkg.patch.mk +++ b/mk/bsd.pkg.patch.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.patch.mk,v 1.15 2005/06/12 03:59:42 jlam Exp $ +# $NetBSD: bsd.pkg.patch.mk,v 1.16 2005/07/15 18:27:55 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines the # relevant variables and targets for the "patch" phase. @@ -63,19 +63,19 @@ .if (defined(PATCHFILES) && !empty(PATCHFILES)) || \ (defined(PATCHDIR) && exists(${PATCHDIR})) || \ (defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH})) -PKGSRC_USE_TOOLS+= patch +USE_TOOLS+= patch .endif # These tools are used to output the contents of the distribution patches # to stdout. # .if defined(PATCHFILES) -PKGSRC_USE_TOOLS+= cat +USE_TOOLS+= cat . if !empty(PATCHFILES:M*.Z) || !empty(PATCHFILES:M*.gz) -PKGSRC_USE_TOOLS+= gzcat +USE_TOOLS+= gzcat . endif . if !empty(PATCHFILES:M*.bz2) -PKGSRC_USE_TOOLS+= bzcat +USE_TOOLS+= bzcat . endif .endif diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index c5392bee06b..87a392e43bb 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.195 2005/06/14 07:25:24 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.196 2005/07/15 18:27:55 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -267,16 +267,15 @@ _PKGSRC_TOPDIR= ${.CURDIR}/../.. . include "${_PKGSRC_TOPDIR}/mk/defaults/mk.conf" .endif -PKGSRC_USE_TOOLS?= # empty -USE_TOOLS?= # empty +USE_TOOLS?= # empty # Provide default values for TOOLs used by the top-level make. -PKGSRC_USE_TOOLS+= [ awk dirname echo grep pwd sed test true +USE_TOOLS+= [ awk dirname echo grep pwd sed test true # These tools are used by the top-level make only in certain packages and # should eventually be moved into those particular package Makefiles. # -PKGSRC_USE_TOOLS+= date tr +USE_TOOLS+= date tr .include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk" diff --git a/mk/buildlink3/find-files.mk b/mk/buildlink3/find-files.mk index cd1ff634eca..cdc51e8d25c 100644 --- a/mk/buildlink3/find-files.mk +++ b/mk/buildlink3/find-files.mk @@ -1,4 +1,4 @@ -# $NetBSD: find-files.mk,v 1.1 2005/06/01 18:03:06 jlam Exp $ +# $NetBSD: find-files.mk,v 1.2 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -72,11 +72,11 @@ # .include "../../mk/buildlink3/builtin-files.mk" # -.if empty(PKGSRC_USE_TOOLS:Mecho) -PKGSRC_USE_TOOLS+= echo +.if empty(USE_TOOLS:Mecho) +USE_TOOLS+= echo .endif -.if empty(PKGSRC_USE_TOOLS:Mgrep) -PKGSRC_USE_TOOLS+= grep +.if empty(USE_TOOLS:Mgrep) +USE_TOOLS+= grep .endif .for _var_ in ${BUILTIN_FIND_FILES_VAR} diff --git a/mk/buildlink3/find-libs.mk b/mk/buildlink3/find-libs.mk index 9cd0ce0475f..b0022893368 100644 --- a/mk/buildlink3/find-libs.mk +++ b/mk/buildlink3/find-libs.mk @@ -1,4 +1,4 @@ -# $NetBSD: find-libs.mk,v 1.2 2005/06/01 18:03:06 jlam Exp $ +# $NetBSD: find-libs.mk,v 1.3 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -52,11 +52,11 @@ # # either "yes" or "no". # -.if empty(PKGSRC_USE_TOOLS:Mecho) -PKGSRC_USE_TOOLS+= echo +.if empty(USE_TOOLS:Mecho) +USE_TOOLS+= echo .endif -.if empty(PKGSRC_USE_TOOLS:Mtest) -PKGSRC_USE_TOOLS+= test +.if empty(USE_TOOLS:Mtest) +USE_TOOLS+= test .endif .for _lib_ in ${BUILTIN_FIND_LIBS} diff --git a/mk/buildlink3/imake-check.mk b/mk/buildlink3/imake-check.mk index af7d3cafbce..914a02992e1 100644 --- a/mk/buildlink3/imake-check.mk +++ b/mk/buildlink3/imake-check.mk @@ -1,4 +1,4 @@ -# $NetBSD: imake-check.mk,v 1.1 2005/06/03 19:12:49 jlam Exp $ +# $NetBSD: imake-check.mk,v 1.2 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -58,8 +58,8 @@ # .for _pair_ in ${BUILTIN_IMAKE_CHECK} -PKGSRC_USE_TOOLS+= cat echo grep imake mkdir rm # XXX -IMAKE?= ${X11BASE}/bin/imake # XXX +USE_TOOLS+= cat echo grep imake mkdir rm # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX . if !defined(BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}) BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}!= \ diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk index 550a947e52d..81ea80ef7f4 100644 --- a/mk/tools/defaults.mk +++ b/mk/tools/defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: defaults.mk,v 1.34 2005/06/24 20:59:59 jlam Exp $ +# $NetBSD: defaults.mk,v 1.35 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -172,13 +172,13 @@ _TOOLS_VARNAME_GNU.yacc= YACC ###################################################################### -# Set a default value for the TOOL names for each of the tools we claim -# we'll use in PKGSRC_USE_TOOLS to point to the platform command, e.g., +# Set a default value for the TOOL names for each of the tools we +# claim we'll use in USE_TOOLS to point to the platform command, e.g., # TBL, YACC, etc. These tools are used in the top-level make(1), not # just in the targets, so these must be defined here, and this file be # included by bsd.prefs.mk. # -.for _t_ in ${PKGSRC_USE_TOOLS:O:u} +.for _t_ in ${USE_TOOLS:O:u} . if defined(_TOOLS_VARNAME.${_t_}) && \ defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_}) . for _v_ in ${_TOOLS_VARNAME.${_t_}} diff --git a/mk/tools/imake.mk b/mk/tools/imake.mk index b673ee6535f..2b126c277f4 100644 --- a/mk/tools/imake.mk +++ b/mk/tools/imake.mk @@ -1,4 +1,4 @@ -# $NetBSD: imake.mk,v 1.15 2005/07/08 13:43:47 jlam Exp $ +# $NetBSD: imake.mk,v 1.16 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -56,7 +56,7 @@ # that use imake. # # This file needs to be included before replace.mk as it modifies the -# PKGSRC_USE_TOOLS and USE_TOOLS variables that are used by replace.mk. +# USE_TOOLS variables that are used by replace.mk. # .if defined(USE_IMAKE) @@ -64,19 +64,13 @@ USE_TOOLS+= imake xmkmf .endif # imake and xmkmf imply each other -.if !empty(PKGSRC_USE_TOOLS:Mimake) || !empty(PKGSRC_USE_TOOLS:Mxmkmf) -PKGSRC_USE_TOOLS+= imake xmkmf -.endif .if !empty(USE_TOOLS:Mimake) || !empty(USE_TOOLS:Mxmkmf) -USE_TOOLS+= imake xmkmf +USE_TOOLS+= imake xmkmf .endif # Add any extra tools that may be required when using imake, e.g. gmake. -.if !empty(PKGSRC_USE_TOOLS:Mimake) -PKGSRC_USE_TOOLS+= ${IMAKE_TOOLS:Nimake} -.endif .if !empty(USE_TOOLS:Mimake) -USE_TOOLS+= ${IMAKE_TOOLS:Nimake} +USE_TOOLS+= ${IMAKE_TOOLS:Nimake} .endif TOOLS_REAL_ARGS.imake?= ${IMAKEOPTS} diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 39f40a28819..c4b11cf7bd4 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.107 2005/06/24 21:21:31 minskim Exp $ +# $NetBSD: replace.mk,v 1.108 2005/07/15 18:27:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -54,14 +54,10 @@ # The tools that could be replaced with pkgsrc counterparts (usually # GNU versions of the tools) that are required by pkgsrc itself, i.e. # in targets that are part of pkgsrc infrastructure or part of the -# package Makefile, should be listed as: -# -# PKGSRC_USE_TOOLS+= awk sed -# -# The tools that are required by the package itself, i.e. within the +# package Makefile, or by the package itself, i.e. within the # software's own build system, should be listed as: # -# USE_TOOLS+= gawk gmake lex +# USE_TOOLS+= awk gmake lex sed # # If a package requires yacc to generate a parser, then the package # Makefile should contain one of the following two lines: @@ -103,13 +99,11 @@ USE_TOOLS+= bison-yacc ###################################################################### -# Create _USE_TOOLS, a sanitized version of PKGSRC_USE_TOOLS and -# USE_TOOLS that removes the ones that are overridden by superseding -# ones. +# Create _USE_TOOLS, a sanitized version of USE_TOOLS that removes the +# ones that are overridden by superseding ones. # .if !defined(_USE_TOOLS) -_USE_TOOLS:= ${PKGSRC_USE_TOOLS} ${USE_TOOLS} -_USE_TOOLS:= ${_USE_TOOLS:O:u} +_USE_TOOLS:= ${USE_TOOLS:O:u} . if !empty(USE_TOOLS:Mbison-yacc) # bison-yacc > yacc _USE_TOOLS:= ${_USE_TOOLS:Nyacc} . endif @@ -1205,11 +1199,11 @@ ${TOOLS_DEPMETHOD.${_t_}}+= ${_dep_} ###################################################################### -# For each tool that pkgsrc requires, make sure that the "TOOL" name -# points to the real command, e.g., AWK, SED, etc., provided that -# "TOOL" has been associated with <tool>. +# For each tool, make sure that the "TOOL" name points to the real +# command, e.g., AWK, SED, etc., provided that "TOOL" has been +# associated with <tool>. # -.for _t_ in ${PKGSRC_USE_TOOLS:O:u} +.for _t_ in ${_USE_TOOLS} _TOOLS_USE_PKGSRC.${_t_}?= no . if defined(_TOOLS_VARNAME.${_t_}) . if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[nN][oO]) |