summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc8
-rw-r--r--usr.bin/Makefile4
-rw-r--r--usr.bin/ruptime/ruptime.19
-rw-r--r--usr.bin/rwho/rwho.19
-rw-r--r--usr.sbin/Makefile2
-rw-r--r--usr.sbin/rwhod/rwhod.89
6 files changed, 3 insertions, 38 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 380aff6..8c9d6af 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -7147,24 +7147,16 @@ OLD_FILES+=usr/share/man/man8/rbootd.8.gz
.if ${MK_RCMDS} == no
OLD_FILES+=bin/rcp
-OLD_FILES+=etc/rc.d/rwho
-OLD_FILES+=etc/periodic/daily/140.clean-rwho
OLD_FILES+=rescue/rcp
OLD_FILES+=usr/bin/rlogin
OLD_FILES+=usr/bin/rsh
-OLD_FILES+=usr/bin/ruptime
-OLD_FILES+=usr/bin/rwho
OLD_FILES+=usr/libexec/rlogind
OLD_FILES+=usr/libexec/rshd
-OLD_FILES+=usr/sbin/rwhod
OLD_FILES+=usr/share/man/man1/rcp.1.gz
OLD_FILES+=usr/share/man/man1/rlogin.1.gz
OLD_FILES+=usr/share/man/man1/rsh.1.gz
-OLD_FILES+=usr/share/man/man1/ruptime.1.gz
-OLD_FILES+=usr/share/man/man1/rwho.1.gz
OLD_FILES+=usr/share/man/man8/rlogind.8.gz
OLD_FILES+=usr/share/man/man8/rshd.8.gz
-OLD_FILES+=usr/share/man/man8/rwhod.8.gz
.endif
.if ${MK_RCS} == no
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
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 8485fab..b4fa1b1 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -73,6 +73,7 @@ SUBDIR= adduser \
rpc.statd \
rpc.umntall \
rtprio \
+ rwhod \
service \
services_mkdb \
sesutil \
@@ -190,7 +191,6 @@ SUBDIR.${MK_PPP}+= ppp
SUBDIR.${MK_QUOTAS}+= edquota
SUBDIR.${MK_QUOTAS}+= quotaon
SUBDIR.${MK_QUOTAS}+= repquota
-SUBDIR.${MK_RCMDS}+= rwhod
SUBDIR.${MK_SENDMAIL}+= editmap
SUBDIR.${MK_SENDMAIL}+= mailstats
SUBDIR.${MK_SENDMAIL}+= makemap
diff --git a/usr.sbin/rwhod/rwhod.8 b/usr.sbin/rwhod/rwhod.8
index 18eb3ed..ac47f5b 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -40,15 +40,6 @@
.Op Fl p
.Op Fl l
.Op Fl m Op Ar ttl
-.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
OpenPOWER on IntegriCloud