pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools Merge coreutils.mk into replace.mk. Also rem...
details: https://anonhg.NetBSD.org/pkgsrc/rev/78bd7a307464
branches: trunk
changeset: 493158:78bd7a307464
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Apr 28 17:35:48 2005 +0000
description:
Merge coreutils.mk into replace.mk. Also remove the "coreutils" option
to USE_TOOLS and replace it with the names of the various tools we're
getting from coreutils, e.g. "mv", "mkdir", "rm", etc.
diffstat:
mk/tools/coreutils.mk | 79 --------
mk/tools/replace.mk | 475 +++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 474 insertions(+), 80 deletions(-)
diffs (truncated from 675 to 300 lines):
diff -r 3468212b9cf8 -r 78bd7a307464 mk/tools/coreutils.mk
--- a/mk/tools/coreutils.mk Thu Apr 28 17:30:24 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-# $NetBSD: coreutils.mk,v 1.5 2005/04/28 03:01:11 jlam Exp $
-#
-# This Makefile fragment unconditionally replaces the system-supplied
-# "core" utilities with the ones from the GNU coreutils package when
-# "coreutils" is added to USE_TOOLS.
-#
-# Set TOOLS_DEPMETHOD.coreutils to "DEPENDS" to get a run-time dependency
-# on coreutils.
-#
-
-.if !defined(TOOLS_IGNORE.coreutils) && !empty(USE_TOOLS:Mcoreutils)
-. if !empty(PKGPATH:Msysutils/coreutils)
-MAKEFLAGS+= TOOLS_IGNORE.coreutils=
-. else
-TOOLS_DEPMETHOD.coreutils?= BUILD_DEPENDS
-TOOLS_DEPENDS.coreutils?= coreutils>=5.2.1:../../sysutils/coreutils
-. if empty(${TOOLS_DEPMETHOD.coreutils}:M${TOOLS_DEPENDS.coreutils})
-${TOOLS_DEPMETHOD.coreutils}+= ${TOOLS_DEPENDS.coreutils}
-. endif
-
-# List of core utilities for which we'll create symlinks under
-# ${TOOLS_DIR}. This isn't every utility provided by coreutils, but
-# is instead restricted to just the ones that are also listed in
-# mk/platform/*.mk.
-#
-_TOOLS_COREUTILS+= [ basename cat chgrp chmod chown cp cut date \
- dirname echo env expr false head hostname id ln \
- ls mkdir mv nice pwd rm rmdir sort tail tee \
- test touch tr true tsort wc
-
-_TOOLS_VARNAME.basename= BASENAME
-_TOOLS_VARNAME.cat= CAT
-_TOOLS_VARNAME.chgrp= CHGRP
-_TOOLS_VARNAME.chmod= CHMOD
-_TOOLS_VARNAME.chown= CHOWN
-_TOOLS_VARNAME.cp= CP
-_TOOLS_VARNAME.cut= CUT
-_TOOLS_VARNAME.date= DATE
-_TOOLS_VARNAME.dirname= DIRNAME
-_TOOLS_VARNAME.echo= ECHO
-_TOOLS_VARNAME.env= SETENV
-_TOOLS_VARNAME.expr= EXPR
-_TOOLS_VARNAME.false= FALSE
-_TOOLS_VARNAME.head= HEAD
-_TOOLS_VARNAME.hostname= HOSTNAME
-_TOOLS_VARNAME.id= ID
-_TOOLS_VARNAME.ln= LN
-_TOOLS_VARNAME.ls= LS
-_TOOLS_VARNAME.mkdir= MKDIR
-_TOOLS_VARNAME.mv= MV
-_TOOLS_VARNAME.nice= NICE
-_TOOLS_VARNAME.pwd= PWD
-_TOOLS_VARNAME.rm= RM
-_TOOLS_VARNAME.rmdir= RMDIR
-_TOOLS_VARNAME.sort= SORT
-_TOOLS_VARNAME.tail= TAIL
-_TOOLS_VARNAME.tee= TEE
-_TOOLS_VARNAME.test= TEST
-_TOOLS_VARNAME.touch= TOUCH
-_TOOLS_VARNAME.tr= TR
-_TOOLS_VARNAME.true= TRUE
-_TOOLS_VARNAME.tsort= TSORT
-_TOOLS_VARNAME.wc= WC
-
-# Create symlinks for each of the coreutils under ${TOOLS_DIR}.
-. for _t_ in ${_TOOLS_COREUTILS}
-TOOLS_SYMLINK+= ${_t_}
-TOOLS_REAL_CMD.${_t_}= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}${_t_}
-. if defined(_TOOLS_VARNAME.${_t_}) && exists(${TOOLS_REAL_CMD.${_t_}})
-${_TOOLS_VARNAME.${_t_}}= ${TOOLS_REAL_CMD.${_t_}}
-. endif
-. endfor
-. undef _t_
-#
-# Fix up a few definitions, e.g. ${MKDIR} needs to be "mkdir -p".
-#
-${_TOOLS_VARNAME.mkdir}:= ${${_TOOLS_VARNAME.mkdir}} -p
-. endif
-.endif
diff -r 3468212b9cf8 -r 78bd7a307464 mk/tools/replace.mk
--- a/mk/tools/replace.mk Thu Apr 28 17:30:24 2005 +0000
+++ b/mk/tools/replace.mk Thu Apr 28 17:35:48 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.51 2005/04/28 16:00:58 jlam Exp $
+# $NetBSD: replace.mk,v 1.52 2005/04/28 17:35:48 jlam Exp $
#
# This Makefile fragment handles "replacements" of system-supplied
# tools with pkgsrc versions. The replacements are placed under
@@ -50,9 +50,22 @@
# "TOOL" variable names associated with each of the tools
_TOOLS_VARNAME.awk= AWK
+_TOOLS_VARNAME.basename= BASENAME
_TOOLS_VARNAME.bison= YACC
+_TOOLS_VARNAME.cat= CAT
+_TOOLS_VARNAME.chgrp= CHGRP
+_TOOLS_VARNAME.chmod= CHMOD
+_TOOLS_VARNAME.chown= CHOWN
_TOOLS_VARNAME.cmp= CMP
+_TOOLS_VARNAME.cp= CP
+_TOOLS_VARNAME.cut= CUT
+_TOOLS_VARNAME.date= DATE
+_TOOLS_VARNAME.dirname= DIRNAME
+_TOOLS_VARNAME.echo= ECHO
_TOOLS_VARNAME.egrep= EGREP
+_TOOLS_VARNAME.env= SETENV
+_TOOLS_VARNAME.expr= EXPR
+_TOOLS_VARNAME.false= FALSE
_TOOLS_VARNAME.fgrep= FGREP
_TOOLS_VARNAME.file= FILE_CMD
_TOOLS_VARNAME.find= FIND
@@ -65,15 +78,35 @@
_TOOLS_VARNAME.gunzip= GUNZIP_CMD
_TOOLS_VARNAME.gzcat= GZCAT
_TOOLS_VARNAME.gzip= GZIP_CMD
+_TOOLS_VARNAME.head= HEAD
+_TOOLS_VARNAME.hostname= HOSTNAME
+_TOOLS_VARNAME.id= ID
_TOOLS_VARNAME.lex= LEX
+_TOOLS_VARNAME.ln= LN
+_TOOLS_VARNAME.ls= LS
_TOOLS_VARNAME.m4= M4
+_TOOLS_VARNAME.mkdir= MKDIR
_TOOLS_VARNAME.mtree= MTREE
+_TOOLS_VARNAME.mv= MV
+_TOOLS_VARNAME.nice= NICE
_TOOLS_VARNAME.patch= PATCH
_TOOLS_VARNAME.pax= PAX
+_TOOLS_VARNAME.pwd= PWD
+_TOOLS_VARNAME.rm= RM
+_TOOLS_VARNAME.rmdir= RMDIR
_TOOLS_VARNAME.sed= SED
_TOOLS_VARNAME.sh= SH
_TOOLS_VARNAME.shlock= SHLOCK
+_TOOLS_VARNAME.sort= SORT
+_TOOLS_VARNAME.tail= TAIL
_TOOLS_VARNAME.tbl= TBL
+_TOOLS_VARNAME.tee= TEE
+_TOOLS_VARNAME.test= TEST
+_TOOLS_VARNAME.touch= TOUCH
+_TOOLS_VARNAME.tr= TR
+_TOOLS_VARNAME.true= TRUE
+_TOOLS_VARNAME.tsort= TSORT
+_TOOLS_VARNAME.wc= WC
_TOOLS_VARNAME.xargs= XARGS
_TOOLS_VARNAME.yacc= YACC
@@ -125,6 +158,16 @@
# of TOOLS_IGNORE.<tool>. If we're using the system-supplied tool, we
# defer the setting of TOOLS_REAL_CMD.<tool> until the loop at the end.
+.if !defined(TOOLS_IGNORE.[) && !empty(_USE_TOOLS:M\[)
+. if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+= TOOLS_IGNORE.[=
+. elif !empty(_TOOLS_USE_PKGSRC.[:M[yY][eE][sS])
+TOOLS_DEPENDS.[?= coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_SYMLINK+= [
+TOOLS_REAL_CMD.[= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}[
+. endif
+.endif
+
.if !defined(TOOLS_IGNORE.awk) && !empty(_USE_TOOLS:Mawk)
. if !empty(PKGPATH:Mlang/gawk)
MAKEFLAGS+= TOOLS_IGNORE.awk=
@@ -138,6 +181,19 @@
. endif
.endif
+.if !defined(TOOLS_IGNORE.basename) && !empty(_USE_TOOLS:Mbasename)
+. if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+= TOOLS_IGNORE.basename=
+. elif !empty(_TOOLS_USE_PKGSRC.basename:M[yY][eE][sS])
+TOOLS_DEPENDS.basename?= coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_SYMLINK+= basename
+TOOLS_REAL_CMD.basename= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}basename
+. if exists(${TOOLS_REAL_CMD.basename})
+${_TOOLS_VARNAME.basename}= ${TOOLS_REAL_CMD.basename}
+. endif
+. endif
+.endif
+
.if !defined(TOOLS_IGNORE.bison) && !empty(_USE_TOOLS:Mbison)
. if !empty(PKGPATH:Mdevel/bison)
MAKEFLAGS+= TOOLS_IGNORE.bison=
@@ -153,6 +209,58 @@
TOOLS_CMD.bison= ${TOOLS_DIR}/bin/yacc
.endif
+.if !defined(TOOLS_IGNORE.cat) && !empty(_USE_TOOLS:Mcat)
+. if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+= TOOLS_IGNORE.cat=
+. elif !empty(_TOOLS_USE_PKGSRC.cat:M[yY][eE][sS])
+TOOLS_DEPENDS.cat?= coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_SYMLINK+= cat
+TOOLS_REAL_CMD.cat= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}cat
+. if exists(${TOOLS_REAL_CMD.cat})
+${_TOOLS_VARNAME.cat}= ${TOOLS_REAL_CMD.cat}
+. endif
+. endif
+.endif
+
+.if !defined(TOOLS_IGNORE.chgrp) && !empty(_USE_TOOLS:Mchgrp)
+. if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+= TOOLS_IGNORE.chgrp=
+. elif !empty(_TOOLS_USE_PKGSRC.chgrp:M[yY][eE][sS])
+TOOLS_DEPENDS.chgrp?= coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_SYMLINK+= chgrp
+TOOLS_REAL_CMD.chgrp= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}chgrp
+. if exists(${TOOLS_REAL_CMD.chgrp})
+${_TOOLS_VARNAME.chgrp}= ${TOOLS_REAL_CMD.chgrp}
+. endif
+. endif
+.endif
+
+.if !defined(TOOLS_IGNORE.chmod) && !empty(_USE_TOOLS:Mchmod)
+. if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+= TOOLS_IGNORE.chmod=
+. elif !empty(_TOOLS_USE_PKGSRC.chmod:M[yY][eE][sS])
+TOOLS_DEPENDS.chmod?= coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_SYMLINK+= chmod
+TOOLS_REAL_CMD.chmod= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}chmod
+. if exists(${TOOLS_REAL_CMD.chmod})
+${_TOOLS_VARNAME.chmod}= ${TOOLS_REAL_CMD.chmod}
+. endif
+. endif
+.endif
+
+.if !defined(TOOLS_IGNORE.chown) && !empty(_USE_TOOLS:Mchown)
+. if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+= TOOLS_IGNORE.chown=
+. elif !empty(_TOOLS_USE_PKGSRC.chown:M[yY][eE][sS])
+TOOLS_DEPENDS.chown?= coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_SYMLINK+= chown
+TOOLS_REAL_CMD.chown= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}chown
+. if exists(${TOOLS_REAL_CMD.chown})
+${_TOOLS_VARNAME.chown}= ${TOOLS_REAL_CMD.chown}
+. endif
+. endif
+.endif
+
.if !defined(TOOLS_IGNORE.cmp) && !empty(_USE_TOOLS:Mcmp)
. if !empty(PKGPATH:Mdevel/diffutils)
MAKEFLAGS+= TOOLS_IGNORE.cmp=
@@ -166,6 +274,71 @@
. endif
.endif
+.if !defined(TOOLS_IGNORE.cp) && !empty(_USE_TOOLS:Mcp)
+. if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+= TOOLS_IGNORE.cp=
+. elif !empty(_TOOLS_USE_PKGSRC.cp:M[yY][eE][sS])
+TOOLS_DEPENDS.cp?= coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_SYMLINK+= cp
+TOOLS_REAL_CMD.cp= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}cp
+. if exists(${TOOLS_REAL_CMD.cp})
+${_TOOLS_VARNAME.cp}= ${TOOLS_REAL_CMD.cp}
+. endif
+. endif
+.endif
+
+.if !defined(TOOLS_IGNORE.cut) && !empty(_USE_TOOLS:Mcut)
+. if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+= TOOLS_IGNORE.cut=
+. elif !empty(_TOOLS_USE_PKGSRC.cut:M[yY][eE][sS])
+TOOLS_DEPENDS.cut?= coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_SYMLINK+= cut
+TOOLS_REAL_CMD.cut= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}cut
+. if exists(${TOOLS_REAL_CMD.cut})
+${_TOOLS_VARNAME.cut}= ${TOOLS_REAL_CMD.cut}
+. endif
+. endif
+.endif
+
+.if !defined(TOOLS_IGNORE.date) && !empty(_USE_TOOLS:Mdate)
+. if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+= TOOLS_IGNORE.date=
+. elif !empty(_TOOLS_USE_PKGSRC.date:M[yY][eE][sS])
+TOOLS_DEPENDS.date?= coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_SYMLINK+= date
+TOOLS_REAL_CMD.date= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}date
+. if exists(${TOOLS_REAL_CMD.date})
+${_TOOLS_VARNAME.date}= ${TOOLS_REAL_CMD.date}
+. endif
+. endif
+.endif
+
+.if !defined(TOOLS_IGNORE.dirname) && !empty(_USE_TOOLS:Mdirname)
+. if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+= TOOLS_IGNORE.dirname=
+. elif !empty(_TOOLS_USE_PKGSRC.dirname:M[yY][eE][sS])
+TOOLS_DEPENDS.dirname?= coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_SYMLINK+= dirname
+TOOLS_REAL_CMD.dirname= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}dirname
+. if exists(${TOOLS_REAL_CMD.dirname})
+${_TOOLS_VARNAME.dirname}= ${TOOLS_REAL_CMD.dirname}
+. endif
Home |
Main Index |
Thread Index |
Old Index