git: 25367c806be5 - main - pkgbase: Create a FreeBSD-syslogd package

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=25367c806be5b321b6c7b2fd6bee264b99f240da

commit 25367c806be5b321b6c7b2fd6bee264b99f240da
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-12-15 09:34:00 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2021-12-21 09:17:40 +0000

    pkgbase: Create a FreeBSD-syslogd package
    
    This allow one to not install syslogd and use syslog-ng or any other
    syslog daemon.
    While here put some syslog.d file in their own package.
    
    MFC after:      2 weeks
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
    Differential Revision:  https://reviews.freebsd.org/D33455
---
 release/packages/Makefile.package |  2 ++
 usr.sbin/syslogd/Makefile         | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index bef0a753cdd9..2356940828b0 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -110,6 +110,8 @@ svn_COMMENT= 		Subversion Version Control System
 svn_DESC= 		Subversion Version Control System
 syscons_COMMENT= 	Syscons Console
 syscons_DESC= 		Syscons Console
+syslogd_COMMENT=	Syslog Daemon
+syslogd_DESC=		Syslog Daemon
 tcpd_COMMENT=		TCP Wrapper utilities
 tcpd_DESC=		TCP Wrapper utilities
 telnet_COMMENT=		Telnet and telnetd
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index 8e1e94c9dda8..f96a72274d60 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -5,11 +5,14 @@
 
 .PATH: ${SRCTOP}/usr.bin/wall
 
+PACKAGE=	syslogd
+
 CONFGROUPS=	CONFS SYSLOGD_D
 CONFS=	syslog.conf
 PROG=	syslogd
 MAN=	syslog.conf.5 syslogd.8
 SRCS=	syslogd.c ttymsg.c
+SYSLOGD_DPACAKGE=	syslogd
 
 LIBADD=	util
 
@@ -23,7 +26,10 @@ CFLAGS+= -DINET6
 SYSLOGD_D=
 SYSLOGD_DDIR=	/etc/syslog.d
 .if ${MK_FTP} != "no"
-SYSLOGD_D+=	ftp.conf
+CONFGROUPS+=	FTP
+FTP+=		ftp.conf
+FTPDIR=		/etc/syslog.d
+FTPPACKAGE=	ftpd
 .endif
 
 .if ${MK_LPR} != "no"
@@ -31,7 +37,10 @@ SYSLOGD_D+=	lpr.conf
 .endif
 
 .if ${MK_PPP} != "no"
-SYSLOGD_D+=	ppp.conf
+CONFGROUPS+=	PPP
+PPP+=		ppp.conf
+PPPDIR=		/etc/syslog.d
+PPPPACKAGE=	ppp
 .endif
 
 CFLAGS+= -I${SRCTOP}/usr.bin/wall