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/buildlink3 | |
| 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/buildlink3')
| -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 |
3 files changed, 13 insertions, 13 deletions
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/\:[^:]*$//}!= \ |