[pkgsrc/trunk]: pkgsrc/mk Use a cleaner approach for previous:

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d74390a07d6
branches:  trunk
changeset: 475985:5d74390a07d6
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Mon May 31 16:47:00 2004 +0000

description:
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:

 mk/bsd.pkg.defaults.mk |  6 +++---
 mk/defs.AIX.mk         |  5 ++++-
 mk/defs.BSDOS.mk       |  5 ++++-
 mk/defs.Darwin.mk      |  5 ++++-
 mk/defs.FreeBSD.mk     |  5 ++++-
 mk/defs.IRIX.mk        |  4 ++--
 mk/defs.Interix.mk     |  5 ++++-
 mk/defs.Linux.mk       |  5 ++++-
 mk/defs.NetBSD.mk      |  3 ++-
 mk/defs.OpenBSD.mk     |  5 ++++-
 mk/defs.SunOS.mk       |  5 ++++-
 mk/defs.UnixWare.mk    |  5 ++++-
 12 files changed, 43 insertions(+), 15 deletions(-)

diffs (233 lines):

diff -r 664e397c879e -r 5d74390a07d6 mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk    Mon May 31 16:43:45 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk    Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 #          --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 -r 664e397c879e -r 5d74390a07d6 mk/defs.AIX.mk
--- a/mk/defs.AIX.mk    Mon May 31 16:43:45 2004 +0000
+++ b/mk/defs.AIX.mk    Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 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 -r 664e397c879e -r 5d74390a07d6 mk/defs.BSDOS.mk
--- a/mk/defs.BSDOS.mk  Mon May 31 16:43:45 2004 +0000
+++ b/mk/defs.BSDOS.mk  Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 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 -r 664e397c879e -r 5d74390a07d6 mk/defs.Darwin.mk
--- a/mk/defs.Darwin.mk Mon May 31 16:43:45 2004 +0000
+++ b/mk/defs.Darwin.mk Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 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 -r 664e397c879e -r 5d74390a07d6 mk/defs.FreeBSD.mk
--- a/mk/defs.FreeBSD.mk        Mon May 31 16:43:45 2004 +0000
+++ b/mk/defs.FreeBSD.mk        Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 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 -r 664e397c879e -r 5d74390a07d6 mk/defs.IRIX.mk
--- a/mk/defs.IRIX.mk   Mon May 31 16:43:45 2004 +0000
+++ b/mk/defs.IRIX.mk   Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 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 -r 664e397c879e -r 5d74390a07d6 mk/defs.Interix.mk
--- a/mk/defs.Interix.mk        Mon May 31 16:43:45 2004 +0000
+++ b/mk/defs.Interix.mk        Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 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 -r 664e397c879e -r 5d74390a07d6 mk/defs.Linux.mk
--- a/mk/defs.Linux.mk  Mon May 31 16:43:45 2004 +0000
+++ b/mk/defs.Linux.mk  Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 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 -r 664e397c879e -r 5d74390a07d6 mk/defs.NetBSD.mk
--- a/mk/defs.NetBSD.mk Mon May 31 16:43:45 2004 +0000
+++ b/mk/defs.NetBSD.mk Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 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 -r 664e397c879e -r 5d74390a07d6 mk/defs.OpenBSD.mk
--- a/mk/defs.OpenBSD.mk        Mon May 31 16:43:45 2004 +0000
+++ b/mk/defs.OpenBSD.mk        Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 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 -r 664e397c879e -r 5d74390a07d6 mk/defs.SunOS.mk
--- a/mk/defs.SunOS.mk  Mon May 31 16:43:45 2004 +0000
+++ b/mk/defs.SunOS.mk  Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 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 -r 664e397c879e -r 5d74390a07d6 mk/defs.UnixWare.mk
--- a/mk/defs.UnixWare.mk       Mon May 31 16:43:45 2004 +0000
+++ b/mk/defs.UnixWare.mk       Mon May 31 16:47:00 2004 +0000
@@ -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 @@
 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