From 53acc90852ae4d1a7208fe2d387716a95e3412ae Mon Sep 17 00:00:00 2001
From: emaste <emaste@FreeBSD.org>
Date: Sun, 11 Mar 2018 17:40:02 +0000
Subject: MFC r322277 by jlh:

rwho/ruptime/rwhod shouldn't be gated by RCMDS.

As peter@ points out in pr/220953:
"rwho, rwhod and ruptime are not part of the remote login suite (rsh, rlogin
etc).

They should *not* be in the rcmds package which is disabled by default.  We
rely on rwho/rwhod/ruptime in the freebsd.org cluster."

This commit is a re-commit of r322029 and r322031 with a better commit log, as
pointed out by ngie@.

This also includes the necesary changes to OptionalObsoleteFiles.inc, as
requested by jhb@.

PR:		220953
---
 usr.bin/Makefile          | 4 ++--
 usr.bin/ruptime/ruptime.1 | 9 ---------
 usr.bin/rwho/rwho.1       | 9 ---------
 3 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index e16b30e..523da29 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -133,8 +133,10 @@ SUBDIR=	alias \
 	rpcinfo \
 	rs \
 	rup \
+	ruptime \
 	rusers \
 	rwall \
+	rwho \
 	script \
 	sdiff \
 	sed \
@@ -255,8 +257,6 @@ SUBDIR.${MK_OPENSSL}+=	newkey
 SUBDIR.${MK_QUOTAS}+=	quota
 SUBDIR.${MK_RCMDS}+=	rlogin
 SUBDIR.${MK_RCMDS}+=	rsh
-SUBDIR.${MK_RCMDS}+=	ruptime
-SUBDIR.${MK_RCMDS}+=	rwho
 SUBDIR.${MK_SENDMAIL}+=	vacation
 SUBDIR.${MK_TALK}+=	talk
 SUBDIR.${MK_TELNET}+=	telnet
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index f0318ed..49b0b95 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -38,15 +38,6 @@
 .Nm
 .Op Fl alrtu
 .Op Ar host ...
-.Sh DEPRECATION NOTICE
-.Nm
-is deprecated and will be removed from future versions of the
-.Fx
-base system.
-If
-.Nm
-is still required, it can be installed from ports or packages
-(net/bsdrcmds).
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index d619791..53cecd1 100644
--- a/usr.bin/rwho/rwho.1
+++ b/usr.bin/rwho/rwho.1
@@ -37,15 +37,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl a
-.Sh DEPRECATION NOTICE
-.Nm
-is deprecated and will be removed from future versions of the
-.Fx
-base system.
-If
-.Nm
-is still required, it can be installed from ports or packages
-(net/bsdrcmds).
 .Sh DESCRIPTION
 The
 .Nm
-- 
cgit v1.1