From 0bfcfa8634a6b65620a03d1ecfe226b2b38a6c1b Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 15 Aug 2017 22:16:15 +0000
Subject: [PATCH] Unconditionally install rwhod support scripts.

r322277 moved rwho* and ruptime out of the MK_RCMDS conditional including
updating the obsolete files entries to not remove these scripts due to
WITHOUT_RCMDS=yes.  However, the initial installation was still conditional
on MK_RCMDS, so new installs did not include these scripts and upgrades via
mergemaster or etcupdate removed them.

PR:		220953
MFC after:	1 month
---
 etc/periodic/daily/Makefile | 9 +--------
 etc/rc.d/Makefile           | 7 +------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 56ab5aee4e57..d06e59df8c85 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -7,6 +7,7 @@ FILESGROUPS=FILES
 FILES=	100.clean-disks \
 	110.clean-tmps \
 	120.clean-preserve \
+	140.clean-rwho \
 	200.backup-passwd \
 	210.backup-aliases \
 	330.news \
@@ -46,14 +47,6 @@ FILES+=	480.status-ntpd \
 	480.leapfile-ntpd
 .endif
 
-.if ${MK_RCMDS} != "no"
-FILESGROUPS+=	RCMDS
-RCMDS+=	140.clean-rwho
-.endif
-RCMDSDIR=	/etc/periodic/daily
-RCMDSMODE=	${BINMODE}
-RCMDSPACKAGE=	rcmds
-
 .if ${MK_SENDMAIL} != "no"
 FILES+=	150.clean-hoststat \
 	440.status-mailq \
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index e27ac915b9ad..5e4d5b5c72fa 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -100,6 +100,7 @@ FILES=	DAEMON \
 	rpcbind \
 	rtadvd \
 	rtsold \
+	rwho \
 	savecore \
 	securelevel \
 	serial \
@@ -271,12 +272,6 @@ SSHPACKAGE=	ssh
 FILES+=		ftp-proxy
 .endif
 
-.if ${MK_RCMDS} != "no"
-FILESGROUPS+=	RCMDS
-RCMDS+=		rwho
-RCMDSPACKAGE=	rcmds
-.endif
-
 .if ${MK_ROUTED} != "no"
 FILES+=		routed
 .endif