diff options
author | jschauma <jschauma> | 2004-05-31 16:47:00 +0000 |
---|---|---|
committer | jschauma <jschauma> | 2004-05-31 16:47:00 +0000 |
commit | d739c86fa008f5a4391a77983194de3ead67ec4f (patch) | |
tree | bc3c3f1dd833dc4dfac4c7fe6d283d1381c7c274 /mk | |
parent | 0b51c610379880c6d897097fa9198d65ec9e3e12 (diff) | |
download | pkgsrc-d739c86fa008f5a4391a77983194de3ead67ec4f.tar.gz |
Use a cleaner approach for previous:
- set RSH on an opsys-specific basis, defaulting to /usr/bin/rsh
(XXX: please confirm/verify this on your OS)
- set SSH_RSHPATH to RSH in bsd.pkg.defaults.mk
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.defaults.mk | 6 | ||||
-rw-r--r-- | mk/defs.AIX.mk | 5 | ||||
-rw-r--r-- | mk/defs.BSDOS.mk | 5 | ||||
-rw-r--r-- | mk/defs.Darwin.mk | 5 | ||||
-rw-r--r-- | mk/defs.FreeBSD.mk | 5 | ||||
-rw-r--r-- | mk/defs.IRIX.mk | 4 | ||||
-rw-r--r-- | mk/defs.Interix.mk | 5 | ||||
-rw-r--r-- | mk/defs.Linux.mk | 5 | ||||
-rw-r--r-- | mk/defs.NetBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.OpenBSD.mk | 5 | ||||
-rw-r--r-- | mk/defs.SunOS.mk | 5 | ||||
-rw-r--r-- | mk/defs.UnixWare.mk | 5 |
12 files changed, 43 insertions, 15 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 33402b13636..6af1c180e37 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.246 2004/05/30 08:10:05 mrauch Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.247 2004/05/31 16:47:00 jschauma Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -1937,10 +1937,10 @@ SILC_CLIENT_WITH_PERL?= YES # --enable-ipf-transparent # --enable-snmp -SSH_RSHPATH?= /usr/bin/rsh +SSH_RSHPATH?= ${RSH} # Used in ssh to specify standard rsh path # Possible: path to rsh binary -# Default: /usr/bin/rsh +# Default: platform dependent; ${RSH} set in defs.${OPSYS}.mk SSH_SUID?= NO # Used in ssh to enable setuid installation of "ssh" binary. diff --git a/mk/defs.AIX.mk b/mk/defs.AIX.mk index 047e9712152..04c405a6c60 100644 --- a/mk/defs.AIX.mk +++ b/mk/defs.AIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.AIX.mk,v 1.9 2004/05/12 14:10:18 jschauma Exp $ +# $NetBSD: defs.AIX.mk,v 1.10 2004/05/31 16:47:00 jschauma Exp $ # # Variable definitions for the AIX operating system. @@ -74,6 +74,9 @@ PS?= /bin/ps PWD_CMD?= /bin/pwd # needs to print physical path RM?= /bin/rm RMDIR?= /bin/rmdir +# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform +# and remove this comment. +RSH?= /usr/bin/rsh .if exists(${LOCALBASE}/bin/nbsed) SED?= ${LOCALBASE}/bin/nbsed .else diff --git a/mk/defs.BSDOS.mk b/mk/defs.BSDOS.mk index fd1d48d4b12..8354fefd662 100644 --- a/mk/defs.BSDOS.mk +++ b/mk/defs.BSDOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.BSDOS.mk,v 1.9 2004/05/12 14:10:18 jschauma Exp $ +# $NetBSD: defs.BSDOS.mk,v 1.10 2004/05/31 16:47:00 jschauma Exp $ # # Variable definitions for the BSD/OS operating system. @@ -67,6 +67,9 @@ PS?= /bin/ps PWD_CMD?= /bin/pwd # needs to print physical path RM?= /bin/rm RMDIR?= /bin/rmdir +# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform +# and remove this comment. +RSH?= /usr/bin/rsh SED?= /usr/bin/sed SETENV?= /usr/bin/env # native sh and ksh both have problems under BSD/OS 4.3.1 diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 03af3670312..dba8e3364e9 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.75 2004/05/12 14:10:18 jschauma Exp $ +# $NetBSD: defs.Darwin.mk,v 1.76 2004/05/31 16:47:00 jschauma Exp $ # # Variable definitions for the Darwin operating system. @@ -59,6 +59,9 @@ PS?= /bin/ps PWD_CMD?= /bin/pwd # needs to print physical path RM?= /bin/rm RMDIR?= /bin/rmdir +# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform +# and remove this comment. +RSH?= /usr/bin/rsh SED?= /usr/bin/sed SETENV?= /usr/bin/env SH?= /bin/sh diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk index c6b474e0d72..cd2afddcc07 100644 --- a/mk/defs.FreeBSD.mk +++ b/mk/defs.FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.FreeBSD.mk,v 1.39 2004/05/12 14:10:18 jschauma Exp $ +# $NetBSD: defs.FreeBSD.mk,v 1.40 2004/05/31 16:47:00 jschauma Exp $ # # Variable definitions for the FreeBSD operating system. @@ -64,6 +64,9 @@ PS?= /bin/ps PWD_CMD?= /bin/pwd # needs to print physical path RM?= /bin/rm RMDIR?= /bin/rmdir +# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform +# and remove this comment. +RSH?= /usr/bin/rsh SED?= /usr/bin/sed SETENV?= /usr/bin/env SH?= /bin/sh diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk index 8bdbd4484f8..221f865011c 100644 --- a/mk/defs.IRIX.mk +++ b/mk/defs.IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.IRIX.mk,v 1.51 2004/05/31 16:34:46 jschauma Exp $ +# $NetBSD: defs.IRIX.mk,v 1.52 2004/05/31 16:47:00 jschauma Exp $ # # Variable definitions for the IRIX operating system. @@ -72,12 +72,12 @@ PS?= /sbin/ps PWD_CMD?= /sbin/pwd # needs to print physical path RM?= /sbin/rm RMDIR?= /usr/bin/rmdir +RSH?= /usr/bsd/rsh SED?= /sbin/sed SETENV?= /sbin/env SH?= /bin/ksh SHLOCK= ${LOCALBASE}/bin/shlock SORT?= /usr/bin/sort -SSH_RSHPATH= /usr/bsd/rsh # override bsd.pkg.defaults.mk SU?= /sbin/su TAIL?= /usr/bin/tail TAR?= ${LOCALBASE}/bin/tar diff --git a/mk/defs.Interix.mk b/mk/defs.Interix.mk index 0f3fc92c8e9..b7915da45b5 100644 --- a/mk/defs.Interix.mk +++ b/mk/defs.Interix.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Interix.mk,v 1.23 2004/05/12 14:10:18 jschauma Exp $ +# $NetBSD: defs.Interix.mk,v 1.24 2004/05/31 16:47:00 jschauma Exp $ # # Variable definitions for the Interix operating system. @@ -59,6 +59,9 @@ PS?= /bin/ps PWD_CMD?= /bin/pwd # needs to print physical path RM?= /bin/rm RMDIR?= /bin/rmdir +# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform +# and remove this comment. +RSH?= /usr/bin/rsh SED?= ${LOCALBASE}/bin/nbsed SETENV?= /bin/env SH?= /bin/sh diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index b66fbf6ac23..5345488a534 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.71 2004/05/12 14:10:18 jschauma Exp $ +# $NetBSD: defs.Linux.mk,v 1.72 2004/05/31 16:47:00 jschauma Exp $ # # Variable definitions for the Linux operating system. @@ -96,6 +96,9 @@ PS?= /bin/ps PWD_CMD?= /bin/pwd # needs to print physical path RM?= /bin/rm RMDIR?= /bin/rmdir +# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform +# and remove this comment. +RSH?= /usr/bin/rsh .if exists(/bin/sed) SED?= /bin/sed .elif exists(/usr/bin/sed) diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index 3699fc4045a..f6bd81e28f7 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.66 2004/05/12 14:10:18 jschauma Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.67 2004/05/31 16:47:00 jschauma Exp $ # # Variable definitions for the NetBSD operating system. @@ -57,6 +57,7 @@ PS?= /bin/ps PWD_CMD?= /bin/pwd # needs to print physical path RM?= /bin/rm RMDIR?= /bin/rmdir +RSH?= /usr/bin/rsh SED?= /usr/bin/sed SETENV?= /usr/bin/env SH?= /bin/sh diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk index 4d2a115cf29..a31dac5d85d 100644 --- a/mk/defs.OpenBSD.mk +++ b/mk/defs.OpenBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.OpenBSD.mk,v 1.33 2004/05/12 14:10:18 jschauma Exp $ +# $NetBSD: defs.OpenBSD.mk,v 1.34 2004/05/31 16:47:00 jschauma Exp $ # # Variable definitions for the OpenBSD operating system. @@ -53,6 +53,9 @@ PS?= /bin/ps PWD_CMD?= /bin/pwd # needs to print physical path RM?= /bin/rm RMDIR?= /bin/rmdir +# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform +# and remove this comment. +RSH?= /usr/bin/rsh SED?= /usr/bin/sed SETENV?= /usr/bin/env SH?= /bin/sh diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index 42001d84808..1c40a5a5523 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.85 2004/05/12 14:10:18 jschauma Exp $ +# $NetBSD: defs.SunOS.mk,v 1.86 2004/05/31 16:47:00 jschauma Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -65,6 +65,9 @@ PS?= /bin/ps PWD_CMD?= /bin/pwd # needs to print physical path RM?= /usr/bin/rm RMDIR?= /usr/bin/rmdir +# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform +# and remove this comment. +RSH?= /usr/bin/rsh .if exists(${LOCALBASE}/bin/nbsed) SED?= ${LOCALBASE}/bin/nbsed .else diff --git a/mk/defs.UnixWare.mk b/mk/defs.UnixWare.mk index a6772d8c91d..05e9cf4eab8 100644 --- a/mk/defs.UnixWare.mk +++ b/mk/defs.UnixWare.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.UnixWare.mk,v 1.3 2004/05/12 14:10:18 jschauma Exp $ +# $NetBSD: defs.UnixWare.mk,v 1.4 2004/05/31 16:47:00 jschauma Exp $ # # Variable definitions for the UnixWare 7 operating system. @@ -61,6 +61,9 @@ PS?= /usr/bin/ps PWD_CMD?= /usr/bin/pwd # needs to print physical path RM?= /usr/bin/rm RMDIR?= /usr/bin/rmdir +# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform +# and remove this comment. +RSH?= /usr/bin/rsh .if exists(${LOCALBASE}/bin/nbsed) SED?= ${LOCALBASE}/bin/nbsed .else |