Move all syslogd related configs to usr.sbin/syslogd/

This helps with pkgbase as it switches these to use CONFS which properly tags
them as config files.

Approved by:	will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16783
This commit is contained in:
Brad Davis 2018-08-21 17:01:47 +00:00
parent cd4d034fd6
commit 64be79ef76
7 changed files with 16 additions and 21 deletions

View File

@ -38,7 +38,6 @@ BIN1= crontab \
remote \
rpc \
services \
syslog.conf \
termcap.small
.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
@ -154,7 +153,6 @@ distribution:
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
.if ${MK_UNBOUND} != "no"

View File

@ -1,19 +0,0 @@
# $FreeBSD$
.include <src.opts.mk>
.if ${MK_FTP} != "no"
FILES+= ftp.conf
.endif
.if ${MK_LPR} != "no"
FILES+= lpr.conf
.endif
.if ${MK_PPP} != "no"
FILES+= ppp.conf
.endif
BINDIR= /etc/syslog.d
.include <bsd.prog.mk>

View File

@ -5,6 +5,8 @@
.PATH: ${SRCTOP}/usr.bin/wall
CONFGROUPS= CONFS SYSLOGD_D
CONFS= syslog.conf
PROG= syslogd
MAN= syslog.conf.5 syslogd.8
SRCS= syslogd.c ttymsg.c
@ -18,6 +20,20 @@ CFLAGS+= -DINET
CFLAGS+= -DINET6
.endif
SYSLOGD_D=
SYSLOGD_DDIR= /etc/syslog.d/
.if ${MK_FTP} != "no"
SYSLOGD_D+= ftp.conf
.endif
.if ${MK_LPR} != "no"
SYSLOGD_D+= lpr.conf
.endif
.if ${MK_PPP} != "no"
SYSLOGD_D+= ppp.conf
.endif
CFLAGS+= -I${SRCTOP}/usr.bin/wall
.include <bsd.prog.mk>