pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools Use EVAL_PREFIX to be pkgviews-friendly.
details: https://anonhg.NetBSD.org/pkgsrc/rev/83274cf8aaf0
branches: trunk
changeset: 493667:83274cf8aaf0
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed May 11 19:42:17 2005 +0000
description:
Use EVAL_PREFIX to be pkgviews-friendly.
diffstat:
mk/tools/perl.mk | 5 +-
mk/tools/replace.mk | 194 ++++++++++++++++++++++++++++++++++-----------------
2 files changed, 132 insertions(+), 67 deletions(-)
diffs (truncated from 668 to 300 lines):
diff -r a42dbf2a7ceb -r 83274cf8aaf0 mk/tools/perl.mk
--- a/mk/tools/perl.mk Wed May 11 16:15:50 2005 +0000
+++ b/mk/tools/perl.mk Wed May 11 19:42:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: perl.mk,v 1.6 2005/05/10 19:34:02 jlam Exp $
+# $NetBSD: perl.mk,v 1.7 2005/05/11 19:42:17 jlam Exp $
# Create a symlink from ${TOOLS_DIR}/bin/perl to ${PERL5} when USE_PERL5
# is defined. This ensures that when "perl" is invoked, the pkgsrc perl
@@ -12,7 +12,8 @@
TOOLS_DEPMETHOD.perl?= BUILD_DEPENDS
TOOLS_DEPENDS.perl?= ${BUILDLINK_DEPENDS.perl}:${BUILDLINK_PKGSRCDIR.perl}
TOOLS_CREATE+= perl
-TOOLS_REAL_CMD.perl= ${LOCALBASE}/bin/perl
+EVAL_PREFIX+= TOOLS_PREFIX.perl=perl
+TOOLS_REAL_CMD.perl= ${TOOLS_PREFIX.perl}/bin/perl
PERL5= ${TOOLS_REAL_CMD.perl}
. endif
. if defined(TOOLS_DEPMETHOD.perl) && defined(TOOLS_DEPENDS.perl)
diff -r a42dbf2a7ceb -r 83274cf8aaf0 mk/tools/replace.mk
--- a/mk/tools/replace.mk Wed May 11 16:15:50 2005 +0000
+++ b/mk/tools/replace.mk Wed May 11 19:42:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.66 2005/05/11 05:05:03 jlam Exp $
+# $NetBSD: replace.mk,v 1.67 2005/05/11 19:42:17 jlam Exp $
#
# This Makefile fragment handles "replacements" of system-supplied
# tools with pkgsrc versions.
@@ -118,7 +118,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.[:M[yY][eE][sS])
TOOLS_DEPENDS.[?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= [
-TOOLS_REAL_CMD.[= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}[
+EVAL_PREFIX+= TOOLS_PREFIX.[=coreutils
+TOOLS_REAL_CMD.[= ${TOOLS_PREFIX.[}/bin/${GNU_PROGRAM_PREFIX}[
. endif
.endif
@@ -128,7 +129,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.awk:M[yY][eE][sS])
TOOLS_DEPENDS.awk?= gawk>=3.1.1:../../lang/gawk
TOOLS_CREATE+= awk
-TOOLS_REAL_CMD.awk= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
+EVAL_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
.endif
@@ -139,7 +141,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.basename:M[yY][eE][sS])
TOOLS_DEPENDS.basename?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= basename
-TOOLS_REAL_CMD.basename= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}basename
+EVAL_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
.endif
@@ -150,7 +153,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.bison:M[yY][eE][sS])
TOOLS_DEPENDS.bison?= bison>=1.0:../../devel/bison
TOOLS_CREATE+= bison
-TOOLS_REAL_CMD.bison= ${LOCALBASE}/bin/bison
+EVAL_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}
. endif
@@ -163,7 +167,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.bzcat:M[yY][eE][sS])
TOOLS_DEPENDS.bzcat?= bzip2>=0.9.0b:../../archivers/bzip2
TOOLS_CREATE+= bzcat
-TOOLS_REAL_CMD.bzcat= ${LOCALBASE}/bin/bzcat
+EVAL_PREFIX+= TOOLS_PREFIX.bzcat=bzip2
+TOOLS_REAL_CMD.bzcat= ${TOOLS_PREFIX.bzcat}/bin/bzcat
TOOLS_${_TOOLS_VARNAME.bzcat}= ${TOOLS_REAL_CMD.bzcat}
. endif
.endif
@@ -174,7 +179,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.cat:M[yY][eE][sS])
TOOLS_DEPENDS.cat?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= cat
-TOOLS_REAL_CMD.cat= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}cat
+EVAL_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
.endif
@@ -185,7 +191,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.chgrp:M[yY][eE][sS])
TOOLS_DEPENDS.chgrp?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= chgrp
-TOOLS_REAL_CMD.chgrp= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}chgrp
+EVAL_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
.endif
@@ -196,7 +203,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.chmod:M[yY][eE][sS])
TOOLS_DEPENDS.chmod?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= chmod
-TOOLS_REAL_CMD.chmod= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}chmod
+EVAL_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
.endif
@@ -207,7 +215,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.chown:M[yY][eE][sS])
TOOLS_DEPENDS.chown?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= chown
-TOOLS_REAL_CMD.chown= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}chown
+EVAL_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
.endif
@@ -218,7 +227,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.cmp:M[yY][eE][sS])
TOOLS_DEPENDS.cmp?= diffutils>=2.8.1:../../devel/diffutils
TOOLS_CREATE+= cmp
-TOOLS_REAL_CMD.cmp= ${LOCALBASE}/bin/cmp
+EVAL_PREFIX+= TOOLS_PREFIX.cmp=diffutils
+TOOLS_REAL_CMD.cmp= ${TOOLS_PREFIX.cmp}/bin/cmp
TOOLS_${_TOOLS_VARNAME.cmp}= ${TOOLS_REAL_CMD.cmp}
. endif
.endif
@@ -229,7 +239,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.cp:M[yY][eE][sS])
TOOLS_DEPENDS.cp?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= cp
-TOOLS_REAL_CMD.cp= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}cp
+EVAL_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
.endif
@@ -240,7 +251,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.cut:M[yY][eE][sS])
TOOLS_DEPENDS.cut?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= cut
-TOOLS_REAL_CMD.cut= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}cut
+EVAL_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
.endif
@@ -251,7 +263,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.date:M[yY][eE][sS])
TOOLS_DEPENDS.date?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= date
-TOOLS_REAL_CMD.date= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}date
+EVAL_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
.endif
@@ -262,7 +275,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.dirname:M[yY][eE][sS])
TOOLS_DEPENDS.dirname?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= dirname
-TOOLS_REAL_CMD.dirname= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}dirname
+EVAL_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
.endif
@@ -273,7 +287,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.echo:M[yY][eE][sS])
TOOLS_DEPENDS.echo?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= echo
-TOOLS_REAL_CMD.echo= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}echo
+EVAL_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
.endif
@@ -284,7 +299,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.egrep:M[yY][eE][sS])
TOOLS_DEPENDS.egrep?= grep>=2.5.1:../../textproc/grep
TOOLS_CREATE+= egrep
-TOOLS_REAL_CMD.egrep= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}egrep
+EVAL_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
.endif
@@ -295,7 +311,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.env:M[yY][eE][sS])
TOOLS_DEPENDS.env?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= env
-TOOLS_REAL_CMD.env= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}env
+EVAL_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
.endif
@@ -306,7 +323,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.expr:M[yY][eE][sS])
TOOLS_DEPENDS.expr?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= expr
-TOOLS_REAL_CMD.expr= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}expr
+EVAL_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
.endif
@@ -317,7 +335,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.false:M[yY][eE][sS])
TOOLS_DEPENDS.false?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= false
-TOOLS_REAL_CMD.false= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}false
+EVAL_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
.endif
@@ -328,7 +347,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.fgrep:M[yY][eE][sS])
TOOLS_DEPENDS.fgrep?= grep>=2.5.1:../../textproc/grep
TOOLS_CREATE+= fgrep
-TOOLS_REAL_CMD.fgrep= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}fgrep
+EVAL_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
.endif
@@ -339,7 +359,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.file:M[yY][eE][sS])
TOOLS_DEPENDS.file?= file>=4.13:../../sysutils/file
TOOLS_CREATE+= file
-TOOLS_REAL_CMD.file= ${LOCALBASE}/bin/file
+EVAL_PREFIX+= TOOLS_PREFIX.file=file
+TOOLS_REAL_CMD.file= ${TOOLS_PREFIX.file}/bin/file
TOOLS_${_TOOLS_VARNAME.file}= ${TOOLS_REAL_CMD.file}
. endif
.endif
@@ -350,7 +371,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.find:M[yY][eE][sS])
TOOLS_DEPENDS.find?= findutils>=4.1:../../sysutils/findutils
TOOLS_CREATE+= find
-TOOLS_REAL_CMD.find= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}find
+EVAL_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
.endif
@@ -361,7 +383,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.gawk:M[yY][eE][sS])
TOOLS_DEPENDS.gawk?= gawk>=3.1.1:../../lang/gawk
TOOLS_CREATE+= gawk
-TOOLS_REAL_CMD.gawk= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
+EVAL_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
TOOLS_ALIASES.gawk= awk
@@ -373,7 +396,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.gm4:M[yY][eE][sS])
TOOLS_DEPENDS.gm4?= m4>=1.4:../../devel/m4
TOOLS_CREATE+= gm4
-TOOLS_REAL_CMD.gm4= ${LOCALBASE}/bin/gm4
+EVAL_PREFIX+= TOOLS_PREFIX.gm4=m4
+TOOLS_REAL_CMD.gm4= ${TOOLS_PREFIX.gm4}/bin/gm4
TOOLS_${_TOOLS_VARNAME.gm4}= ${TOOLS_REAL_CMD.gm4}
. endif
TOOLS_ALIASES.gm4= m4
@@ -385,7 +409,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.gmake:M[yY][eE][sS])
TOOLS_DEPENDS.gmake?= gmake>=3.78:../../devel/gmake
TOOLS_CREATE+= gmake
-TOOLS_REAL_CMD.gmake= ${LOCALBASE}/bin/gmake
+EVAL_PREFIX+= TOOLS_PREFIX.gmake=gmake
+TOOLS_REAL_CMD.gmake= ${TOOLS_PREFIX.gmake}/bin/gmake
TOOLS_${_TOOLS_VARNAME.gmake}= ${TOOLS_REAL_CMD.gmake}
. endif
.endif
@@ -396,7 +421,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.grep:M[yY][eE][sS])
TOOLS_DEPENDS.grep?= grep>=2.5.1:../../textproc/grep
TOOLS_CREATE+= grep
-TOOLS_REAL_CMD.grep= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep
+EVAL_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
.endif
@@ -407,7 +433,8 @@
. elif !empty(_TOOLS_USE_PKGSRC.gsed:M[yY][eE][sS])
TOOLS_DEPENDS.gsed?= gsed>=3.0.2:../../textproc/gsed
TOOLS_CREATE+= gsed
-TOOLS_REAL_CMD.gsed= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sed
+EVAL_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
TOOLS_ALIASES.gsed= sed
@@ -423,7 +450,8 @@
#
Home |
Main Index |
Thread Index |
Old Index