pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools Compute the installation prefix for every too...
details: https://anonhg.NetBSD.org/pkgsrc/rev/57a5ee3e8d70
branches: trunk
changeset: 493761:57a5ee3e8d70
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat May 14 05:57:43 2005 +0000
description:
Compute the installation prefix for every tool specified so that the
"TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE,
etc., can be used immediately after bsd.tools.mk is included.
diffstat:
mk/tools/replace.mk | 142 ++++++++++++++++++++++++++-------------------------
1 files changed, 73 insertions(+), 69 deletions(-)
diffs (truncated from 631 to 300 lines):
diff -r b02cd5dcbbb3 -r 57a5ee3e8d70 mk/tools/replace.mk
--- a/mk/tools/replace.mk Sat May 14 05:16:09 2005 +0000
+++ b/mk/tools/replace.mk Sat May 14 05:57:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.71 2005/05/13 22:08:20 jlam Exp $
+# $NetBSD: replace.mk,v 1.72 2005/05/14 05:57:43 jlam Exp $
#
# This Makefile fragment handles "replacements" of system-supplied
# tools with pkgsrc versions.
@@ -118,7 +118,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.[:M[yY][eE][sS])
TOOLS_DEPENDS.[?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= [
-EVAL_PREFIX+= TOOLS_PREFIX.[=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.[=coreutils
TOOLS_REAL_CMD.[= ${TOOLS_PREFIX.[}/bin/${GNU_PROGRAM_PREFIX}[
. endif
.endif
@@ -129,7 +129,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.awk:M[yY][eE][sS])
TOOLS_DEPENDS.awk?= gawk>=3.1.1:../../lang/gawk
TOOLS_CREATE+= awk
-EVAL_PREFIX+= TOOLS_PREFIX.awk=gawk
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.awk=gawk
TOOLS_REAL_CMD.awk= ${TOOLS_PREFIX.awk}/bin/${GNU_PROGRAM_PREFIX}awk
TOOLS_${_TOOLS_VARNAME.awk}= ${TOOLS_REAL_CMD.awk}
. endif
@@ -141,7 +141,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.basename:M[yY][eE][sS])
TOOLS_DEPENDS.basename?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= basename
-EVAL_PREFIX+= TOOLS_PREFIX.basename=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.basename=coreutils
TOOLS_REAL_CMD.basename= ${TOOLS_PREFIX.basename}/bin/${GNU_PROGRAM_PREFIX}basename
TOOLS_${_TOOLS_VARNAME.basename}= ${TOOLS_REAL_CMD.basename}
. endif
@@ -153,7 +153,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.bison:M[yY][eE][sS])
TOOLS_DEPENDS.bison?= bison>=1.0:../../devel/bison
TOOLS_CREATE+= bison
-EVAL_PREFIX+= TOOLS_PREFIX.bison=bison
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bison=bison
TOOLS_REAL_CMD.bison= ${TOOLS_PREFIX.bison}/bin/bison
TOOLS_REAL_ARGS.bison= -y
TOOLS_${_TOOLS_VARNAME.bison}= ${TOOLS_REAL_CMD.bison} ${TOOLS_REAL_ARGS.bison}
@@ -167,7 +167,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.bzcat:M[yY][eE][sS])
TOOLS_DEPENDS.bzcat?= bzip2>=0.9.0b:../../archivers/bzip2
TOOLS_CREATE+= bzcat
-EVAL_PREFIX+= TOOLS_PREFIX.bzcat=bzip2
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bzcat=bzip2
TOOLS_REAL_CMD.bzcat= ${TOOLS_PREFIX.bzcat}/bin/bzcat
TOOLS_${_TOOLS_VARNAME.bzcat}= ${TOOLS_REAL_CMD.bzcat}
. endif
@@ -179,7 +179,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.cat:M[yY][eE][sS])
TOOLS_DEPENDS.cat?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= cat
-EVAL_PREFIX+= TOOLS_PREFIX.cat=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.cat=coreutils
TOOLS_REAL_CMD.cat= ${TOOLS_PREFIX.cat}/bin/${GNU_PROGRAM_PREFIX}cat
TOOLS_${_TOOLS_VARNAME.cat}= ${TOOLS_REAL_CMD.cat}
. endif
@@ -191,7 +191,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.chgrp:M[yY][eE][sS])
TOOLS_DEPENDS.chgrp?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= chgrp
-EVAL_PREFIX+= TOOLS_PREFIX.chgrp=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.chgrp=coreutils
TOOLS_REAL_CMD.chgrp= ${TOOLS_PREFIX.chgrp}/bin/${GNU_PROGRAM_PREFIX}chgrp
TOOLS_${_TOOLS_VARNAME.chgrp}= ${TOOLS_REAL_CMD.chgrp}
. endif
@@ -203,7 +203,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.chmod:M[yY][eE][sS])
TOOLS_DEPENDS.chmod?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= chmod
-EVAL_PREFIX+= TOOLS_PREFIX.chmod=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.chmod=coreutils
TOOLS_REAL_CMD.chmod= ${TOOLS_PREFIX.chmod}/bin/${GNU_PROGRAM_PREFIX}chmod
TOOLS_${_TOOLS_VARNAME.chmod}= ${TOOLS_REAL_CMD.chmod}
. endif
@@ -215,7 +215,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.chown:M[yY][eE][sS])
TOOLS_DEPENDS.chown?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= chown
-EVAL_PREFIX+= TOOLS_PREFIX.chown=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.chown=coreutils
TOOLS_REAL_CMD.chown= ${TOOLS_PREFIX.chown}/bin/${GNU_PROGRAM_PREFIX}chown
TOOLS_${_TOOLS_VARNAME.chown}= ${TOOLS_REAL_CMD.chown}
. endif
@@ -227,7 +227,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.cmp:M[yY][eE][sS])
TOOLS_DEPENDS.cmp?= diffutils>=2.8.1:../../devel/diffutils
TOOLS_CREATE+= cmp
-EVAL_PREFIX+= TOOLS_PREFIX.cmp=diffutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.cmp=diffutils
TOOLS_REAL_CMD.cmp= ${TOOLS_PREFIX.cmp}/bin/cmp
TOOLS_${_TOOLS_VARNAME.cmp}= ${TOOLS_REAL_CMD.cmp}
. endif
@@ -239,7 +239,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.cp:M[yY][eE][sS])
TOOLS_DEPENDS.cp?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= cp
-EVAL_PREFIX+= TOOLS_PREFIX.cp=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.cp=coreutils
TOOLS_REAL_CMD.cp= ${TOOLS_PREFIX.cp}/bin/${GNU_PROGRAM_PREFIX}cp
TOOLS_${_TOOLS_VARNAME.cp}= ${TOOLS_REAL_CMD.cp}
. endif
@@ -251,7 +251,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.cut:M[yY][eE][sS])
TOOLS_DEPENDS.cut?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= cut
-EVAL_PREFIX+= TOOLS_PREFIX.cut=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.cut=coreutils
TOOLS_REAL_CMD.cut= ${TOOLS_PREFIX.cut}/bin/${GNU_PROGRAM_PREFIX}cut
TOOLS_${_TOOLS_VARNAME.cut}= ${TOOLS_REAL_CMD.cut}
. endif
@@ -263,7 +263,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.date:M[yY][eE][sS])
TOOLS_DEPENDS.date?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= date
-EVAL_PREFIX+= TOOLS_PREFIX.date=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.date=coreutils
TOOLS_REAL_CMD.date= ${TOOLS_PREFIX.date}/bin/${GNU_PROGRAM_PREFIX}date
TOOLS_${_TOOLS_VARNAME.date}= ${TOOLS_REAL_CMD.date}
. endif
@@ -275,7 +275,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.dirname:M[yY][eE][sS])
TOOLS_DEPENDS.dirname?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= dirname
-EVAL_PREFIX+= TOOLS_PREFIX.dirname=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.dirname=coreutils
TOOLS_REAL_CMD.dirname= ${TOOLS_PREFIX.dirname}/bin/${GNU_PROGRAM_PREFIX}dirname
TOOLS_${_TOOLS_VARNAME.dirname}= ${TOOLS_REAL_CMD.dirname}
. endif
@@ -287,7 +287,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.echo:M[yY][eE][sS])
TOOLS_DEPENDS.echo?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= echo
-EVAL_PREFIX+= TOOLS_PREFIX.echo=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.echo=coreutils
TOOLS_REAL_CMD.echo= ${TOOLS_PREFIX.echo}/bin/${GNU_PROGRAM_PREFIX}echo
TOOLS_${_TOOLS_VARNAME.echo}= ${TOOLS_REAL_CMD.echo}
. endif
@@ -299,7 +299,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.egrep:M[yY][eE][sS])
TOOLS_DEPENDS.egrep?= grep>=2.5.1:../../textproc/grep
TOOLS_CREATE+= egrep
-EVAL_PREFIX+= TOOLS_PREFIX.egrep=grep
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.egrep=grep
TOOLS_REAL_CMD.egrep= ${TOOLS_PREFIX.egrep}/bin/${GNU_PROGRAM_PREFIX}egrep
TOOLS_${_TOOLS_VARNAME.egrep}= ${TOOLS_REAL_CMD.egrep}
. endif
@@ -311,7 +311,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.env:M[yY][eE][sS])
TOOLS_DEPENDS.env?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= env
-EVAL_PREFIX+= TOOLS_PREFIX.env=coreutilsj
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.env=coreutilsj
TOOLS_REAL_CMD.env= ${TOOLS_PREFIX.env}/bin/${GNU_PROGRAM_PREFIX}env
TOOLS_${_TOOLS_VARNAME.env}= ${TOOLS_REAL_CMD.env}
. endif
@@ -323,7 +323,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.expr:M[yY][eE][sS])
TOOLS_DEPENDS.expr?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= expr
-EVAL_PREFIX+= TOOLS_PREFIX.expr=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.expr=coreutils
TOOLS_REAL_CMD.expr= ${TOOLS_PREFIX.expr}/bin/${GNU_PROGRAM_PREFIX}expr
TOOLS_${_TOOLS_VARNAME.expr}= ${TOOLS_REAL_CMD.expr}
. endif
@@ -335,7 +335,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.false:M[yY][eE][sS])
TOOLS_DEPENDS.false?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= false
-EVAL_PREFIX+= TOOLS_PREFIX.false=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.false=coreutils
TOOLS_REAL_CMD.false= ${TOOLS_PREFIX.false}/bin/${GNU_PROGRAM_PREFIX}false
TOOLS_${_TOOLS_VARNAME.false}= ${TOOLS_REAL_CMD.false}
. endif
@@ -347,7 +347,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.fgrep:M[yY][eE][sS])
TOOLS_DEPENDS.fgrep?= grep>=2.5.1:../../textproc/grep
TOOLS_CREATE+= fgrep
-EVAL_PREFIX+= TOOLS_PREFIX.fgrep=grep
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.fgrep=grep
TOOLS_REAL_CMD.fgrep= ${TOOLS_PREFIX.fgrep}/bin/${GNU_PROGRAM_PREFIX}fgrep
TOOLS_${_TOOLS_VARNAME.fgrep}= ${TOOLS_REAL_CMD.fgrep}
. endif
@@ -359,7 +359,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.file:M[yY][eE][sS])
TOOLS_DEPENDS.file?= file>=4.13:../../sysutils/file
TOOLS_CREATE+= file
-EVAL_PREFIX+= TOOLS_PREFIX.file=file
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.file=file
TOOLS_REAL_CMD.file= ${TOOLS_PREFIX.file}/bin/file
TOOLS_${_TOOLS_VARNAME.file}= ${TOOLS_REAL_CMD.file}
. endif
@@ -371,7 +371,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.find:M[yY][eE][sS])
TOOLS_DEPENDS.find?= findutils>=4.1:../../sysutils/findutils
TOOLS_CREATE+= find
-EVAL_PREFIX+= TOOLS_PREFIX.find=findutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.find=findutils
TOOLS_REAL_CMD.find= ${TOOLS_PREFIX.find}/bin/${GNU_PROGRAM_PREFIX}find
TOOLS_${_TOOLS_VARNAME.find}= ${TOOLS_REAL_CMD.find}
. endif
@@ -383,7 +383,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.gawk:M[yY][eE][sS])
TOOLS_DEPENDS.gawk?= gawk>=3.1.1:../../lang/gawk
TOOLS_CREATE+= gawk
-EVAL_PREFIX+= TOOLS_PREFIX.gawk=gawk
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gawk=gawk
TOOLS_REAL_CMD.gawk= ${TOOLS_PREFIX.gawk}/bin/${GNU_PROGRAM_PREFIX}awk
TOOLS_${_TOOLS_VARNAME.gawk}= ${TOOLS_REAL_CMD.gawk}
. endif
@@ -396,7 +396,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.gm4:M[yY][eE][sS])
TOOLS_DEPENDS.gm4?= m4>=1.4:../../devel/m4
TOOLS_CREATE+= gm4
-EVAL_PREFIX+= TOOLS_PREFIX.gm4=m4
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gm4=m4
TOOLS_REAL_CMD.gm4= ${TOOLS_PREFIX.gm4}/bin/gm4
TOOLS_${_TOOLS_VARNAME.gm4}= ${TOOLS_REAL_CMD.gm4}
. endif
@@ -409,7 +409,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.gmake:M[yY][eE][sS])
TOOLS_DEPENDS.gmake?= gmake>=3.78:../../devel/gmake
TOOLS_CREATE+= gmake
-EVAL_PREFIX+= TOOLS_PREFIX.gmake=gmake
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gmake=gmake
TOOLS_REAL_CMD.gmake= ${TOOLS_PREFIX.gmake}/bin/gmake
TOOLS_${_TOOLS_VARNAME.gmake}= ${TOOLS_REAL_CMD.gmake}
. endif
@@ -421,7 +421,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.grep:M[yY][eE][sS])
TOOLS_DEPENDS.grep?= grep>=2.5.1:../../textproc/grep
TOOLS_CREATE+= grep
-EVAL_PREFIX+= TOOLS_PREFIX.grep=grep
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.grep=grep
TOOLS_REAL_CMD.grep= ${TOOLS_PREFIX.grep}/bin/${GNU_PROGRAM_PREFIX}grep
TOOLS_${_TOOLS_VARNAME.grep}= ${TOOLS_REAL_CMD.grep}
. endif
@@ -433,7 +433,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.gsed:M[yY][eE][sS])
TOOLS_DEPENDS.gsed?= gsed>=3.0.2:../../textproc/gsed
TOOLS_CREATE+= gsed
-EVAL_PREFIX+= TOOLS_PREFIX.gsed=gsed
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gsed=gsed
TOOLS_REAL_CMD.gsed= ${TOOLS_PREFIX.gsed}/bin/${GNU_PROGRAM_PREFIX}sed
TOOLS_${_TOOLS_VARNAME.gsed}= ${TOOLS_REAL_CMD.gsed}
. endif
@@ -450,7 +450,7 @@
#
#TOOLS_DEPENDS.gtar?= pax>=20040802:../../archivers/pax
TOOLS_CREATE+= gtar
-EVAL_PREFIX+= TOOLS_PREFIX.gtar=pax
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gtar=pax
TOOLS_REAL_CMD.gtar= ${TOOLS_PREFIX.gtar}/bin/tar
TOOLS_${_TOOLS_VARNAME.gtar}= ${TOOLS_REAL_CMD.gtar}
. endif
@@ -463,7 +463,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.gunzip:M[yY][eE][sS])
TOOLS_DEPENDS.gunzip?= gzip-base>=1.2.4b:../../archivers/gzip-base
TOOLS_CREATE+= gunzip
-EVAL_PREFIX+= TOOLS_PREFIX.gunzip=gzip-base
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gunzip=gzip-base
TOOLS_REAL_CMD.gunzip= ${TOOLS_PREFIX.gunzip}/bin/gunzip
TOOLS_REAL_ARGS.gunzip= -f
TOOLS_${_TOOLS_VARNAME.gunzip}= ${TOOLS_REAL_CMD.gunzip} ${TOOLS_REAL_ARGS.gunzip}
@@ -476,7 +476,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.gzcat:M[yY][eE][sS])
TOOLS_DEPENDS.gzcat?= gzip-base>=1.2.4b:../../archivers/gzip-base
TOOLS_CREATE+= gzcat
-EVAL_PREFIX+= TOOLS_PREFIX.gzcat=gzip-base
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gzcat=gzip-base
TOOLS_REAL_CMD.gzcat= ${TOOLS_PREFIX.gzcat}/bin/gzcat
TOOLS_${_TOOLS_VARNAME.gzcat}= ${TOOLS_REAL_CMD.gzcat}
. endif
@@ -488,7 +488,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.gzip:M[yY][eE][sS])
TOOLS_DEPENDS.gzip?= gzip-base>=1.2.4b:../../archivers/gzip-base
TOOLS_CREATE+= gzip
-EVAL_PREFIX+= TOOLS_PREFIX.gzip=gzip-base
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gzip=gzip-base
TOOLS_REAL_CMD.gzip= ${TOOLS_PREFIX.gzip}/bin/gzip
TOOLS_REAL_ARGS.gzip= -nf ${GZIP}
TOOLS_${_TOOLS_VARNAME.gzip}= ${TOOLS_REAL_CMD.gzip} ${TOOLS_REAL_ARGS.gzip}
@@ -501,7 +501,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.head:M[yY][eE][sS])
TOOLS_DEPENDS.head?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= head
-EVAL_PREFIX+= TOOLS_PREFIX.head=coreutils
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.head=coreutils
TOOLS_REAL_CMD.head= ${TOOLS_PREFIX.head}/bin/${GNU_PROGRAM_PREFIX}head
TOOLS_${_TOOLS_VARNAME.head}= ${TOOLS_REAL_CMD.head}
. endif
@@ -513,7 +513,7 @@
. elif !empty(_TOOLS_USE_PKGSRC.hostname:M[yY][eE][sS])
TOOLS_DEPENDS.hostname?= coreutils>=5.2.1:../../sysutils/coreutils
Home |
Main Index |
Thread Index |
Old Index