git: 2b05168eb864 - main - periodic: move some periodic scripts to their packages

The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=2b05168eb8647262da7ce3506a3599b8be966845

commit 2b05168eb8647262da7ce3506a3599b8be966845
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-05-14 12:14:58 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-05-15 00:02:52 +0000

    periodic: move some periodic scripts to their packages
    
    Periodic scripts for rwho, geom, zfs and tcpwrappers are only relevant
    if those packages are installed, so move them to the appropriate
    package.
    
    Reviewed by:    manu, des, emaste
    Approved by:    des (mentor)
    Differential Revision:  https://reviews.freebsd.org/D50341
---
 usr.sbin/periodic/etc/daily/Makefile    | 32 ++++++++++++++++++++------------
 usr.sbin/periodic/etc/security/Makefile |  4 +++-
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/usr.sbin/periodic/etc/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile
index d1b000df01e4..c92b4ed8a6ee 100644
--- a/usr.sbin/periodic/etc/daily/Makefile
+++ b/usr.sbin/periodic/etc/daily/Makefile
@@ -7,17 +7,9 @@ CONFGROUPS=	CONFS
 CONFS=	100.clean-disks \
 	110.clean-tmps \
 	120.clean-preserve \
-	140.clean-rwho \
 	200.backup-passwd \
 	210.backup-aliases \
-	221.backup-gpart \
-	222.backup-gmirror \
 	400.status-disks \
-	401.status-graid \
-	406.status-gmirror \
-	407.status-graid3 \
-	408.status-gstripe \
-	409.status-gconcat \
 	410.status-mfi \
 	420.status-network \
 	430.status-uptime \
@@ -25,6 +17,20 @@ CONFS=	100.clean-disks \
 	510.status-world-kernel \
 	999.local
 
+CONFGROUPS+=	GEOM
+GEOM+=		221.backup-gpart \
+		222.backup-gmirror \
+		401.status-graid \
+		406.status-gmirror \
+		407.status-graid3 \
+		408.status-gstripe \
+		409.status-gconcat
+GEOMPACKAGE=	geom
+
+CONFGROUPS+=	RCMDS
+RCMDS+=		140.clean-rwho
+RCMDSPACKAGE=	rcmds
+
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_ACCT} != "no"
@@ -60,10 +66,12 @@ SENDMAILPACKAGE=	sendmail
 .endif
 
 .if ${MK_ZFS} != "no"
-CONFS+=	223.backup-zfs \
-	404.status-zfs \
-	800.scrub-zfs  \
-	801.trim-zfs
+CONFGROUPS+=	ZFS
+ZFS+=		223.backup-zfs \
+		404.status-zfs \
+		800.scrub-zfs  \
+		801.trim-zfs
+ZFSPACKAGE=	zfs
 .endif
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/periodic/etc/security/Makefile b/usr.sbin/periodic/etc/security/Makefile
index 4c6b39d9062d..c153523d7c39 100644
--- a/usr.sbin/periodic/etc/security/Makefile
+++ b/usr.sbin/periodic/etc/security/Makefile
@@ -40,7 +40,9 @@ PFPACKAGE=	pf
 .endif
 
 .if ${MK_INETD} != "no" && ${MK_TCP_WRAPPERS} != "no"
-CONFS+=	900.tcpwrap
+CONFGROUPS+=	TCPWRAP
+TCPWRAP+=	900.tcpwrap
+TCPWRAPPACKAGE=	tcpd
 .endif
 
 .include <bsd.prog.mk>