From 31ef5c6891382c5edfa6ddd9bfd16574d85eee66 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Sun, 12 Aug 2018 13:24:53 +0000 Subject: [PATCH] Move all the newsyslog related configs to usr.sbin/newsyslog/ This is related to pkgbase and changes these to use CONFS so that these are tagged as config files. Approved by: AllanJude (mentor) Sponsored by: Essen Hackathon Differential Revision: https://reviews.freebsd.org/D16694 --- etc/Makefile | 2 -- usr.sbin/newsyslog/Makefile | 2 ++ {etc => usr.sbin/newsyslog}/newsyslog.conf | 0 .../newsyslog}/newsyslog.conf.d/Makefile | 18 +++++++++--------- .../newsyslog.conf.d/Makefile.depend | 0 .../newsyslog}/newsyslog.conf.d/amd.conf | 0 .../newsyslog}/newsyslog.conf.d/ftp.conf | 0 .../newsyslog}/newsyslog.conf.d/lpr.conf | 0 .../newsyslog}/newsyslog.conf.d/opensm.conf | 0 .../newsyslog}/newsyslog.conf.d/pf.conf | 0 .../newsyslog}/newsyslog.conf.d/ppp.conf | 0 .../newsyslog}/newsyslog.conf.d/sendmail.conf | 0 12 files changed, 11 insertions(+), 11 deletions(-) rename {etc => usr.sbin/newsyslog}/newsyslog.conf (100%) rename {etc => usr.sbin/newsyslog}/newsyslog.conf.d/Makefile (61%) rename {etc => usr.sbin/newsyslog}/newsyslog.conf.d/Makefile.depend (100%) rename {etc => usr.sbin/newsyslog}/newsyslog.conf.d/amd.conf (100%) rename {etc => usr.sbin/newsyslog}/newsyslog.conf.d/ftp.conf (100%) rename {etc => usr.sbin/newsyslog}/newsyslog.conf.d/lpr.conf (100%) rename {etc => usr.sbin/newsyslog}/newsyslog.conf.d/opensm.conf (100%) rename {etc => usr.sbin/newsyslog}/newsyslog.conf.d/pf.conf (100%) rename {etc => usr.sbin/newsyslog}/newsyslog.conf.d/ppp.conf (100%) rename {etc => usr.sbin/newsyslog}/newsyslog.conf.d/sendmail.conf (100%) diff --git a/etc/Makefile b/etc/Makefile index 979958005668..269965ab9752 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -31,7 +31,6 @@ BIN1= crontab \ motd \ netconfig \ networks \ - newsyslog.conf \ nsswitch.conf \ phones \ profile \ @@ -170,7 +169,6 @@ distribution: ${_+_}cd ${.CURDIR}/devd; ${MAKE} install ${_+_}cd ${.CURDIR}/gss; ${MAKE} install ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install - ${_+_}cd ${.CURDIR}/newsyslog.conf.d; ${MAKE} install ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap ${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile index 7e9da95d5226..81237126afed 100644 --- a/usr.sbin/newsyslog/Makefile +++ b/usr.sbin/newsyslog/Makefile @@ -2,6 +2,7 @@ .include +CONFS= newsyslog.conf PROG= newsyslog MAN= newsyslog.8 newsyslog.conf.5 SRCS= newsyslog.c ptimes.c @@ -9,5 +10,6 @@ LIBADD= sbuf HAS_TESTS= SUBDIR.${MK_TESTS}+= tests +SUBDIR+= newsyslog.conf.d .include diff --git a/etc/newsyslog.conf b/usr.sbin/newsyslog/newsyslog.conf similarity index 100% rename from etc/newsyslog.conf rename to usr.sbin/newsyslog/newsyslog.conf diff --git a/etc/newsyslog.conf.d/Makefile b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile similarity index 61% rename from etc/newsyslog.conf.d/Makefile rename to usr.sbin/newsyslog/newsyslog.conf.d/Makefile index a831f3d2c6f6..24751a361a2b 100644 --- a/etc/newsyslog.conf.d/Makefile +++ b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile @@ -2,36 +2,36 @@ .include -BINDIR= /etc/newsyslog.conf.d +CONFSDIR= /etc/newsyslog.conf.d -FILES= +CONFS= .if ${MK_AMD} != "no" -FILES+= amd.conf +CONFS+= amd.conf .endif .if ${MK_FTP} != "no" -FILES+= ftp.conf +CONFS+= ftp.conf .endif .if ${MK_LPR} != "no" -FILES+= lpr.conf +CONFS+= lpr.conf .endif .if ${MK_OFED} != "no" -FILES+= opensm.conf +CONFS+= opensm.conf .endif .if ${MK_PF} != "no" -FILES+= pf.conf +CONFS+= pf.conf .endif .if ${MK_PPP} != "no" -FILES+= ppp.conf +CONFS+= ppp.conf .endif .if ${MK_SENDMAIL} != "no" -FILES+= sendmail.conf +CONFS+= sendmail.conf .endif .include diff --git a/etc/newsyslog.conf.d/Makefile.depend b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile.depend similarity index 100% rename from etc/newsyslog.conf.d/Makefile.depend rename to usr.sbin/newsyslog/newsyslog.conf.d/Makefile.depend diff --git a/etc/newsyslog.conf.d/amd.conf b/usr.sbin/newsyslog/newsyslog.conf.d/amd.conf similarity index 100% rename from etc/newsyslog.conf.d/amd.conf rename to usr.sbin/newsyslog/newsyslog.conf.d/amd.conf diff --git a/etc/newsyslog.conf.d/ftp.conf b/usr.sbin/newsyslog/newsyslog.conf.d/ftp.conf similarity index 100% rename from etc/newsyslog.conf.d/ftp.conf rename to usr.sbin/newsyslog/newsyslog.conf.d/ftp.conf diff --git a/etc/newsyslog.conf.d/lpr.conf b/usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf similarity index 100% rename from etc/newsyslog.conf.d/lpr.conf rename to usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf diff --git a/etc/newsyslog.conf.d/opensm.conf b/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf similarity index 100% rename from etc/newsyslog.conf.d/opensm.conf rename to usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf diff --git a/etc/newsyslog.conf.d/pf.conf b/usr.sbin/newsyslog/newsyslog.conf.d/pf.conf similarity index 100% rename from etc/newsyslog.conf.d/pf.conf rename to usr.sbin/newsyslog/newsyslog.conf.d/pf.conf diff --git a/etc/newsyslog.conf.d/ppp.conf b/usr.sbin/newsyslog/newsyslog.conf.d/ppp.conf similarity index 100% rename from etc/newsyslog.conf.d/ppp.conf rename to usr.sbin/newsyslog/newsyslog.conf.d/ppp.conf diff --git a/etc/newsyslog.conf.d/sendmail.conf b/usr.sbin/newsyslog/newsyslog.conf.d/sendmail.conf similarity index 100% rename from etc/newsyslog.conf.d/sendmail.conf rename to usr.sbin/newsyslog/newsyslog.conf.d/sendmail.conf