From b3d14eaccc5f606690d99b1998bfdf32a22404f6 Mon Sep 17 00:00:00 2001
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Wed, 15 Dec 2021 10:08:20 +0100
Subject: [PATCH] pkgbase: Create a FreeBSD-periodic package

While here put the periodic files for some utilities in their own
packages.

MFC after:	2 weeks
Sponsored by:	Beckhoff Automation GmbH & Co. KG
Differential Revision:	https://reviews.freebsd.org/D33454
---
 release/packages/Makefile.package       |  2 ++
 usr.sbin/periodic/Makefile              |  2 ++
 usr.sbin/periodic/etc/daily/Makefile    | 12 ++++++++----
 usr.sbin/periodic/etc/monthly/Makefile  |  2 ++
 usr.sbin/periodic/etc/security/Makefile | 22 ++++++++++++++++------
 usr.sbin/periodic/etc/weekly/Makefile   |  2 ++
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index a64ee77b0617..bef0a753cdd9 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -83,6 +83,8 @@ nfs_COMMENT=		NFS Utilities
 nfs_DESC= 		NFS Utilities
 openssl_COMMENT=	OpenSSL Library and Utility
 openssl_DESC=		OpenSSL Library and Utility
+periodic_COMMENT=	Periodic Utility
+periodic_DESC=		Periodic Utility
 rc_COMMENT= 		RC Scripts
 rc_DESC= 		RC Scripts
 rcmds_COMMENT= 		Remote Command Utilities
diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile
index 6b2da5b1e03c..62a1cff105a2 100644
--- a/usr.sbin/periodic/Makefile
+++ b/usr.sbin/periodic/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	periodic
+
 CONFS=	periodic.conf
 CONFSDIR=	/etc/defaults
 SCRIPTS=periodic.sh
diff --git a/usr.sbin/periodic/etc/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile
index f6557a10ba80..2bffdba05d2b 100644
--- a/usr.sbin/periodic/etc/daily/Makefile
+++ b/usr.sbin/periodic/etc/daily/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	periodic
+
 CONFGROUPS=	CONFS
 
 CONFS=	100.clean-disks \
@@ -49,10 +51,12 @@ CONFS+=	480.status-ntpd \
 .endif
 
 .if ${MK_SENDMAIL} != "no"
-CONFS+=	150.clean-hoststat \
-	440.status-mailq \
-	460.status-mail-rejects \
-	500.queuerun
+CONFGROUPS+=		SENDMAIL
+SENDMAIL+=		150.clean-hoststat \
+			440.status-mailq \
+			460.status-mail-rejects \
+			500.queuerun
+SENDMAILPACKAGE=	sendmail
 .endif
 
 .if ${MK_ZFS} != "no"
diff --git a/usr.sbin/periodic/etc/monthly/Makefile b/usr.sbin/periodic/etc/monthly/Makefile
index ddcc9d9372c1..b4aaf6967891 100644
--- a/usr.sbin/periodic/etc/monthly/Makefile
+++ b/usr.sbin/periodic/etc/monthly/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	periodic
+
 CONFGROUPS=	CONFS
 
 CONFS=	450.status-security \
diff --git a/usr.sbin/periodic/etc/security/Makefile b/usr.sbin/periodic/etc/security/Makefile
index ce9e5f7ba5c5..02d2264be15a 100644
--- a/usr.sbin/periodic/etc/security/Makefile
+++ b/usr.sbin/periodic/etc/security/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	periodic
+
 CONFGROUPS=	CONFS DATA
 
 CONFS=	100.chksetuid \
@@ -12,23 +14,31 @@ CONFS=	100.chksetuid \
 	410.logincheck \
 	700.kernelmsg \
 	800.loginfail
-DATA=	security.functions
+
+DATA=		security.functions
 DATAMODE=	444
+DATAPACKAGE=	periodic
 
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_IPFILTER} != "no"
-CONFS+=	510.ipfdenied
-CONFS+=	610.ipf6denied
+CONFGROUPS+=		IPFILTER
+IPFILTER+=		510.ipfdenied
+IPFILTER+=		610.ipf6denied
+IPFILTERPACKAGE=	ipfilter
 .endif
 
 .if ${MK_IPFW} != "no"
-CONFS+=	500.ipfwdenied \
-	550.ipfwlimit
+CONFGROUPS+=	IPFW
+IPFW+=		500.ipfwdenied \
+		550.ipfwlimit
+IPFWPACKAGE=	ipfw
 .endif
 
 .if ${MK_PF} != "no"
-CONFS+=	520.pfdenied
+CONFGROUPS+=	PF
+PF+=		520.pfdenied
+PFPACKAGE=	pf
 .endif
 
 .if ${MK_INETD} != "no" && ${MK_TCP_WRAPPERS} != "no"
diff --git a/usr.sbin/periodic/etc/weekly/Makefile b/usr.sbin/periodic/etc/weekly/Makefile
index 9c54eaa6483f..74ab84f3684e 100644
--- a/usr.sbin/periodic/etc/weekly/Makefile
+++ b/usr.sbin/periodic/etc/weekly/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	periodic
+
 CONFS=	340.noid \
 	450.status-security \
 	999.local