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

This allow one to install it without having to install FreeBSD-utilities.
While here put some newsyslog.d file in their own package.

MFC after:	2 weeks
Sponsored by:	Beckhoff Automation GmbH & Co. KG
Differential Revision:	https://reviews.freebsd.org/D33456
---
 release/packages/Makefile.package            |  2 ++
 usr.sbin/newsyslog/Makefile                  |  2 ++
 usr.sbin/newsyslog/newsyslog.conf.d/Makefile | 22 ++++++++++++++++----
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 2356940828b..2f90307cfda 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -79,6 +79,8 @@ mlx-tools_COMMENT=	Mellanox Utilities
 mlx-tools_DESC=		Mellanox Utilities
 mtree_COMMENT=		MTREE Files
 mtree_DESC=		MTREE Files
+newsyslog_COMMENT=	Newsyslog Utility
+newsyslog_DESC=		Newsyslog Utility
 nfs_COMMENT=		NFS Utilities
 nfs_DESC= 		NFS Utilities
 openssl_COMMENT=	OpenSSL Library and Utility
diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile
index 81237126afe..a0f93333332 100644
--- a/usr.sbin/newsyslog/Makefile
+++ b/usr.sbin/newsyslog/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	newsyslog
+
 CONFS=	newsyslog.conf
 PROG=	newsyslog
 MAN=	newsyslog.8 newsyslog.conf.5
diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
index 3974581ff57..1c8980c2e38 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
+++ b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
@@ -2,12 +2,17 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	newsyslog
 CONFSDIR=	/etc/newsyslog.conf.d
 
+CONFGROUPS=	CONFS
 CONFS=
 
 .if ${MK_FTP} != "no"
-CONFS+=		ftp.conf
+CONFGROUPS+=	FTP
+FTP+=		ftp.conf
+FTPPACKAGE=	ftpd
+FTPDIR=		/etc/newsyslog.conf.d
 .endif
 
 .if ${MK_LPR} != "no"
@@ -19,15 +24,24 @@ CONFS+=		opensm.conf
 .endif
 
 .if ${MK_PF} != "no"
-CONFS+=		pf.conf
+CONFGROUPS+=	PF
+PF+=		pf.conf
+PFPACKAGE=	pf
+PFDIR=		/etc/newsyslog.conf.d
 .endif
 
 .if ${MK_PPP} != "no"
-CONFS+=		ppp.conf
+CONFGROUPS+=	PPP
+PPP+=		ppp.conf
+PPPPACKAGE=	ppp
+PPPDIR=		/etc/newsyslog.conf.d
 .endif
 
 .if ${MK_SENDMAIL} != "no"
-CONFS+=		sendmail.conf
+CONFGROUPS+=		SENDMAIL
+SENDMAIL+=		sendmail.conf
+SENDMAILPACKAGE=	sendmail
+SENDMAILDIR=		/etc/newsyslog.conf.d
 .endif
 
 .include <bsd.prog.mk>