diff options
author | jlam <jlam@pkgsrc.org> | 2005-06-24 20:59:59 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2005-06-24 20:59:59 +0000 |
commit | 73e8531006eaec3622cbe1171f8db98f059f1215 (patch) | |
tree | 8c59a1e04400e8a0ab81f64f6cb1342d03466173 | |
parent | 39c5fc71b78a47eb6c0dadff5fdcb9d7fbe5f2c8 (diff) | |
download | pkgsrc-73e8531006eaec3622cbe1171f8db98f059f1215.tar.gz |
Teach the tools framework about csh, and replace with tcsh if necessary.
-rw-r--r-- | mk/tools/defaults.mk | 3 | ||||
-rw-r--r-- | mk/tools/replace.mk | 14 | ||||
-rw-r--r-- | mk/tools/tools.AIX.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.BSDOS.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.Darwin.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.DragonFly.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.FreeBSD.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.IRIX.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.Interix.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.Linux.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.NetBSD.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.OSF1.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.OpenBSD.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.SunOS.mk | 3 | ||||
-rw-r--r-- | mk/tools/tools.UnixWare.mk | 3 |
15 files changed, 41 insertions, 15 deletions
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk index 7ea948d3225..550a947e52d 100644 --- a/mk/tools/defaults.mk +++ b/mk/tools/defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: defaults.mk,v 1.33 2005/06/24 20:33:52 jlam Exp $ +# $NetBSD: defaults.mk,v 1.34 2005/06/24 20:59:59 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -63,6 +63,7 @@ _TOOLS_VARNAME.chmod= CHMOD _TOOLS_VARNAME.chown= CHOWN _TOOLS_VARNAME.cmp= CMP _TOOLS_VARNAME.cp= CP +_TOOLS_VARNAME.csh= CSH _TOOLS_VARNAME.cut= CUT _TOOLS_VARNAME.date= DATE _TOOLS_VARNAME.diff= DIFF diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 0e19ea80132..9b4f4a9d2f9 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.104 2005/06/24 19:39:10 minskim Exp $ +# $NetBSD: replace.mk,v 1.105 2005/06/24 20:59:59 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -335,6 +335,18 @@ TOOLS_${_TOOLS_VARNAME.cp}= ${TOOLS_REAL_CMD.cp} . endif .endif +.if !defined(TOOLS_IGNORE.csh) && !empty(_USE_TOOLS:Mcsh) +. if !empty(PKGPATH:Mshells/tcsh) +MAKEFLAGS+= TOOLS_IGNORE.csh= +. elif !empty(_TOOLS_USE_PKGSRC.csh:M[yY][eE][sS]) +TOOLS_DEPENDS.csh?= tcsh-[0-9]*:../../shells/tcsh +TOOLS_CREATE+= csh +TOOLS_FIND_PREFIX+= TOOLS_PREFIX.csh=tcsh +TOOLS_REAL_CMD.csh= ${TOOLS_PREFIX.csh}/bin/tcsh +TOOLS_${_TOOLS_VARNAME.csh}= ${TOOLS_READ_CMD.csh} +. endif +.endif + .if !defined(TOOLS_IGNORE.cut) && !empty(_USE_TOOLS:Mcut) . if !empty(PKGPATH:Msysutils/coreutils) MAKEFLAGS+= TOOLS_IGNORE.cut= diff --git a/mk/tools/tools.AIX.mk b/mk/tools/tools.AIX.mk index 301c2574f88..802806e940e 100644 --- a/mk/tools/tools.AIX.mk +++ b/mk/tools/tools.AIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.AIX.mk,v 1.10 2005/06/23 20:45:34 jlam Exp $ +# $NetBSD: tools.AIX.mk,v 1.11 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the AIX operating system. @@ -11,6 +11,7 @@ TOOLS_PLATFORM.chmod?= /bin/chmod TOOLS_PLATFORM.chown?= /usr/bin/chown TOOLS_PLATFORM.cmp?= /usr/bin/cmp TOOLS_PLATFORM.cp?= /bin/cp +TOOLS_PLATFORM.csh?= /bin/csh TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /bin/date TOOLS_PLATFORM.diff?= /usr/bin/diff diff --git a/mk/tools/tools.BSDOS.mk b/mk/tools/tools.BSDOS.mk index c3af7b5f4f2..f84dc97ac18 100644 --- a/mk/tools/tools.BSDOS.mk +++ b/mk/tools/tools.BSDOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.BSDOS.mk,v 1.13 2005/06/23 20:45:34 jlam Exp $ +# $NetBSD: tools.BSDOS.mk,v 1.14 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the BSD/OS operating system. @@ -11,6 +11,7 @@ TOOLS_PLATFORM.chmod?= /bin/chmod TOOLS_PLATFORM.chown?= /usr/sbin/chown TOOLS_PLATFORM.cmp?= /usr/bin/cmp TOOLS_PLATFORM.cp?= /bin/cp +TOOLS_PLATFORM.csh?= /bin/csh TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /bin/date TOOLS_PLATFORM.diff?= /usr/bin/diff diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk index a082b496d83..7bb739fae91 100644 --- a/mk/tools/tools.Darwin.mk +++ b/mk/tools/tools.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Darwin.mk,v 1.16 2005/06/24 20:15:06 minskim Exp $ +# $NetBSD: tools.Darwin.mk,v 1.17 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the Darwin (Mac OS X) operating system. @@ -15,6 +15,7 @@ TOOLS_PLATFORM.chmod?= /bin/chmod TOOLS_PLATFORM.chown?= /usr/sbin/chown TOOLS_PLATFORM.cmp?= /usr/bin/cmp TOOLS_PLATFORM.cp?= /bin/cp +TOOLS_PLATFORM.csh?= /bin/tcsh TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /bin/date TOOLS_PLATFORM.diff?= /usr/bin/diff diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk index 28fe4179d39..4184931f9ae 100644 --- a/mk/tools/tools.DragonFly.mk +++ b/mk/tools/tools.DragonFly.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.DragonFly.mk,v 1.16 2005/06/23 20:45:34 jlam Exp $ +# $NetBSD: tools.DragonFly.mk,v 1.17 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the DragonFly operating system. @@ -12,6 +12,7 @@ TOOLS_PLATFORM.chmod?= /bin/chmod TOOLS_PLATFORM.chown?= /usr/sbin/chown TOOLS_PLATFORM.cmp?= /usr/bin/cmp TOOLS_PLATFORM.cp?= /bin/cp +TOOLS_PLATFORM.csh?= /bin/csh TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /bin/date TOOLS_PLATFORM.diff?= /usr/bin/diff diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk index ecb8bfafcdd..cf45c801952 100644 --- a/mk/tools/tools.FreeBSD.mk +++ b/mk/tools/tools.FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.FreeBSD.mk,v 1.16 2005/06/23 20:45:34 jlam Exp $ +# $NetBSD: tools.FreeBSD.mk,v 1.17 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the FreeBSD operating system. @@ -14,6 +14,7 @@ TOOLS_PLATFORM.chmod?= /bin/chmod TOOLS_PLATFORM.chown?= /usr/sbin/chown TOOLS_PLATFORM.cmp?= /usr/bin/cmp TOOLS_PLATFORM.cp?= /bin/cp +TOOLS_PLATFORM.csh?= /bin/csh TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /bin/date TOOLS_PLATFORM.diff?= /usr/bin/diff diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk index 0ee17165bdc..a276bdde09b 100644 --- a/mk/tools/tools.IRIX.mk +++ b/mk/tools/tools.IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.IRIX.mk,v 1.13 2005/06/23 20:45:34 jlam Exp $ +# $NetBSD: tools.IRIX.mk,v 1.14 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the IRIX operating system. @@ -11,6 +11,7 @@ TOOLS_PLATFORM.chmod?= /sbin/chmod TOOLS_PLATFORM.chown?= /sbin/chown TOOLS_PLATFORM.cmp?= /usr/bin/cmp TOOLS_PLATFORM.cp?= /sbin/cp +TOOLS_PLATFORM.csh?= /bin/csh TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /sbin/date TOOLS_PLATFORM.diff?= /usr/bin/diff diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk index f9bfbc98a51..57fd3b832c7 100644 --- a/mk/tools/tools.Interix.mk +++ b/mk/tools/tools.Interix.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Interix.mk,v 1.12 2005/06/23 20:45:34 jlam Exp $ +# $NetBSD: tools.Interix.mk,v 1.13 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the Interix operating system. @@ -11,6 +11,7 @@ TOOLS_PLATFORM.chmod?= /bin/chmod TOOLS_PLATFORM.chown?= /bin/chown TOOLS_PLATFORM.cmp?= /bin/cmp TOOLS_PLATFORM.cp?= /bin/cp +TOOLS_PLATFORM.csh?= /bin/csh TOOLS_PLATFORM.cut?= /bin/cut TOOLS_PLATFORM.date?= /bin/date TOOLS_PLATFORM.diff?= /bin/diff diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk index f72870f5cc0..8b83de1950a 100644 --- a/mk/tools/tools.Linux.mk +++ b/mk/tools/tools.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Linux.mk,v 1.22 2005/06/24 19:39:10 minskim Exp $ +# $NetBSD: tools.Linux.mk,v 1.23 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the Linux operating system. @@ -29,6 +29,7 @@ TOOLS_PLATFORM.cmp?= /bin/cmp TOOLS_PLATFORM.cmp?= /usr/bin/cmp .endif TOOLS_PLATFORM.cp?= /bin/cp +TOOLS_PLATFORM.csh?= /bin/tcsh .if exists(/bin/cut) TOOLS_PLATFORM.cut?= /bin/cut .elif exists(/usr/bin/cut) diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk index a6fcef1579e..3b9cbdc0ce8 100644 --- a/mk/tools/tools.NetBSD.mk +++ b/mk/tools/tools.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.NetBSD.mk,v 1.17 2005/06/23 20:45:34 jlam Exp $ +# $NetBSD: tools.NetBSD.mk,v 1.18 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the NetBSD operating system. @@ -14,6 +14,7 @@ TOOLS_PLATFORM.chmod?= /bin/chmod TOOLS_PLATFORM.chown?= /usr/sbin/chown TOOLS_PLATFORM.cmp?= /usr/bin/cmp TOOLS_PLATFORM.cp?= /bin/cp +TOOLS_PLATFORM.csh?= /bin/csh TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /bin/date TOOLS_PLATFORM.diff?= /usr/bin/diff diff --git a/mk/tools/tools.OSF1.mk b/mk/tools/tools.OSF1.mk index f79004a01d6..d1715f61c3b 100644 --- a/mk/tools/tools.OSF1.mk +++ b/mk/tools/tools.OSF1.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.OSF1.mk,v 1.10 2005/06/23 20:45:34 jlam Exp $ +# $NetBSD: tools.OSF1.mk,v 1.11 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the OSF/1 operating system. @@ -11,6 +11,7 @@ TOOLS_PLATFORM.chmod?= /bin/chmod TOOLS_PLATFORM.chown?= /bin/chown TOOLS_PLATFORM.cmp?= /usr/bin/cmp TOOLS_PLATFORM.cp?= /bin/cp +TOOLS_PLATFORM.csh?= /bin/csh TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /bin/date TOOLS_PLATFORM.diff?= /usr/bin/diff diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk index d65218f5ab3..ca41c335d1c 100644 --- a/mk/tools/tools.OpenBSD.mk +++ b/mk/tools/tools.OpenBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.OpenBSD.mk,v 1.16 2005/06/23 20:45:34 jlam Exp $ +# $NetBSD: tools.OpenBSD.mk,v 1.17 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the OpenBSD operating system. @@ -19,6 +19,7 @@ TOOLS_PLATFORM.chown?= /usr/sbin/chown .endif TOOLS_PLATFORM.cmp?= /usr/bin/cmp TOOLS_PLATFORM.cp?= /bin/cp +TOOLS_PLATFORM.csh?= /bin/csh TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /bin/date TOOLS_PLATFORM.diff?= /usr/bin/diff diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk index 2932d589d84..ea7cc5540b6 100644 --- a/mk/tools/tools.SunOS.mk +++ b/mk/tools/tools.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.SunOS.mk,v 1.16 2005/06/23 20:45:34 jlam Exp $ +# $NetBSD: tools.SunOS.mk,v 1.17 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the Solaris operating system. @@ -18,6 +18,7 @@ TOOLS_PLATFORM.cmp?= /bin/cmp TOOLS_PLATFORM.cmp?= /usr/bin/cmp .endif TOOLS_PLATFORM.cp?= /bin/cp +TOOLS_PLATFORM.csh?= /bin/csh TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /usr/xpg4/bin/date .if exists(/bin/diff) diff --git a/mk/tools/tools.UnixWare.mk b/mk/tools/tools.UnixWare.mk index 935632175d5..7905a470cd8 100644 --- a/mk/tools/tools.UnixWare.mk +++ b/mk/tools/tools.UnixWare.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.UnixWare.mk,v 1.11 2005/06/23 20:45:34 jlam Exp $ +# $NetBSD: tools.UnixWare.mk,v 1.12 2005/06/24 20:59:59 jlam Exp $ # # System-supplied tools for the UnixWare 7 operating system. @@ -11,6 +11,7 @@ TOOLS_PLATFORM.chmod?= /usr/bin/chmod TOOLS_PLATFORM.chown?= /usr/bin/chown TOOLS_PLATFORM.cmp?= /usr/bin/cmp TOOLS_PLATFORM.cp?= /usr/bin/cp +TOOLS_PLATFORM.csh?= /bin/csh TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /usr/bin/date TOOLS_PLATFORM.diff?= /usr/bin/diff |