pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools Teach the tools framework about csh, and repl...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba6abec27680
branches:  trunk
changeset: 496261:ba6abec27680
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jun 24 20:59:59 2005 +0000

description:
Teach the tools framework about csh, and replace with tcsh if necessary.

diffstat:

 mk/tools/defaults.mk        |   3 ++-
 mk/tools/replace.mk         |  14 +++++++++++++-
 mk/tools/tools.AIX.mk       |   3 ++-
 mk/tools/tools.BSDOS.mk     |   3 ++-
 mk/tools/tools.Darwin.mk    |   3 ++-
 mk/tools/tools.DragonFly.mk |   3 ++-
 mk/tools/tools.FreeBSD.mk   |   3 ++-
 mk/tools/tools.IRIX.mk      |   3 ++-
 mk/tools/tools.Interix.mk   |   3 ++-
 mk/tools/tools.Linux.mk     |   3 ++-
 mk/tools/tools.NetBSD.mk    |   3 ++-
 mk/tools/tools.OSF1.mk      |   3 ++-
 mk/tools/tools.OpenBSD.mk   |   3 ++-
 mk/tools/tools.SunOS.mk     |   3 ++-
 mk/tools/tools.UnixWare.mk  |   3 ++-
 15 files changed, 41 insertions(+), 15 deletions(-)

diffs (266 lines):

diff -r 27dfbede06cf -r ba6abec27680 mk/tools/defaults.mk
--- a/mk/tools/defaults.mk      Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/defaults.mk      Fri Jun 24 20:59:59 2005 +0000
@@ -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.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 -r 27dfbede06cf -r ba6abec27680 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/replace.mk       Fri Jun 24 20:59:59 2005 +0000
@@ -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 @@
 .  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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.AIX.mk
--- a/mk/tools/tools.AIX.mk     Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.AIX.mk     Fri Jun 24 20:59:59 2005 +0000
@@ -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.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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.BSDOS.mk
--- a/mk/tools/tools.BSDOS.mk   Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.BSDOS.mk   Fri Jun 24 20:59:59 2005 +0000
@@ -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.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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk  Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.Darwin.mk  Fri Jun 24 20:59:59 2005 +0000
@@ -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.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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.DragonFly.mk
--- a/mk/tools/tools.DragonFly.mk       Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.DragonFly.mk       Fri Jun 24 20:59:59 2005 +0000
@@ -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.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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.FreeBSD.mk
--- a/mk/tools/tools.FreeBSD.mk Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.FreeBSD.mk Fri Jun 24 20:59:59 2005 +0000
@@ -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.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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.IRIX.mk
--- a/mk/tools/tools.IRIX.mk    Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.IRIX.mk    Fri Jun 24 20:59:59 2005 +0000
@@ -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.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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.Interix.mk
--- a/mk/tools/tools.Interix.mk Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.Interix.mk Fri Jun 24 20:59:59 2005 +0000
@@ -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.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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.Linux.mk
--- a/mk/tools/tools.Linux.mk   Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.Linux.mk   Fri Jun 24 20:59:59 2005 +0000
@@ -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?=           /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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.NetBSD.mk  Fri Jun 24 20:59:59 2005 +0000
@@ -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.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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.OSF1.mk
--- a/mk/tools/tools.OSF1.mk    Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.OSF1.mk    Fri Jun 24 20:59:59 2005 +0000
@@ -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.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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.OpenBSD.mk
--- a/mk/tools/tools.OpenBSD.mk Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.OpenBSD.mk Fri Jun 24 20:59:59 2005 +0000
@@ -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 @@
 .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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.SunOS.mk
--- a/mk/tools/tools.SunOS.mk   Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.SunOS.mk   Fri Jun 24 20:59:59 2005 +0000
@@ -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?=           /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 -r 27dfbede06cf -r ba6abec27680 mk/tools/tools.UnixWare.mk
--- a/mk/tools/tools.UnixWare.mk        Fri Jun 24 20:53:20 2005 +0000
+++ b/mk/tools/tools.UnixWare.mk        Fri Jun 24 20:59:59 2005 +0000
@@ -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.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



Home | Main Index | Thread Index | Old Index