Index: head/etc/newsyslog.conf
===================================================================
--- head/etc/newsyslog.conf	(revision 337685)
+++ head/etc/newsyslog.conf	(nonexistent)
@@ -1,35 +0,0 @@
-# configuration file for newsyslog
-# $FreeBSD$
-#
-# Entries which do not specify the '/pid_file' field will cause the
-# syslogd process to be signalled when that log file is rotated.  This
-# action is only appropriate for log files which are written to by the
-# syslogd process (ie, files listed in /etc/syslog.conf).  If there
-# is no process which needs to be signalled when a given log file is
-# rotated, then the entry for that file should include the 'N' flag.
-#
-# Note: some sites will want to select more restrictive protections than the
-# defaults.  In particular, it may be desirable to switch many of the 644
-# entries to 640 or 600.  For example, some sites will consider the
-# contents of maillog, messages, and lpd-errs to be confidential.  In the
-# future, these defaults may change to more conservative ones.
-#
-# logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
-/var/log/all.log			600  7	   *	@T00  J
-/var/log/auth.log			600  7     1000 @0101T JC
-/var/log/console.log			600  5	   1000	*     J
-/var/log/cron				600  3	   1000	*     JC
-/var/log/daily.log			640  7	   *	@T00  JN
-/var/log/debug.log			600  7     1000 *     JC
-/var/log/init.log			644  3	   1000	*     J
-/var/log/kerberos.log			600  7	   1000	*     J
-/var/log/maillog			640  7	   *	@T00  JC
-/var/log/messages			644  5	   1000	@0101T JC
-/var/log/monthly.log			640  12	   *	$M1D0 JN
-/var/log/devd.log			644  3	   1000	*     JC
-/var/log/security			600  10	   1000	*     JC
-/var/log/utx.log			644  3	   *	@01T05 B
-/var/log/weekly.log			640  5	   *	$W6D0 JN
-
-<include> /etc/newsyslog.conf.d/*
-<include> /usr/local/etc/newsyslog.conf.d/*

Property changes on: head/etc/newsyslog.conf
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/etc/newsyslog.conf.d/ppp.conf
===================================================================
--- head/etc/newsyslog.conf.d/ppp.conf	(revision 337685)
+++ head/etc/newsyslog.conf.d/ppp.conf	(nonexistent)
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/ppp.log	root:network	640  3	   1000	*     JC

Property changes on: head/etc/newsyslog.conf.d/ppp.conf
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/etc/newsyslog.conf.d/Makefile.depend
===================================================================
--- head/etc/newsyslog.conf.d/Makefile.depend	(revision 337685)
+++ head/etc/newsyslog.conf.d/Makefile.depend	(nonexistent)
@@ -1,11 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif

Property changes on: head/etc/newsyslog.conf.d/Makefile.depend
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/etc/newsyslog.conf.d/sendmail.conf
===================================================================
--- head/etc/newsyslog.conf.d/sendmail.conf	(revision 337685)
+++ head/etc/newsyslog.conf.d/sendmail.conf	(nonexistent)
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/sendmail.st			640  10	   *	168   BN

Property changes on: head/etc/newsyslog.conf.d/sendmail.conf
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/etc/newsyslog.conf.d/ftp.conf
===================================================================
--- head/etc/newsyslog.conf.d/ftp.conf	(revision 337685)
+++ head/etc/newsyslog.conf.d/ftp.conf	(nonexistent)
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/xferlog			600  7	   1000	*     JC

Property changes on: head/etc/newsyslog.conf.d/ftp.conf
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/etc/newsyslog.conf.d/pf.conf
===================================================================
--- head/etc/newsyslog.conf.d/pf.conf	(revision 337685)
+++ head/etc/newsyslog.conf.d/pf.conf	(nonexistent)
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/pflog				600  3	   1000	*     JB    /var/run/pflogd.pid

Property changes on: head/etc/newsyslog.conf.d/pf.conf
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/etc/newsyslog.conf.d/amd.conf
===================================================================
--- head/etc/newsyslog.conf.d/amd.conf	(revision 337685)
+++ head/etc/newsyslog.conf.d/amd.conf	(nonexistent)
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/amd.log			644  7	   1000	*     J

Property changes on: head/etc/newsyslog.conf.d/amd.conf
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/etc/newsyslog.conf.d/Makefile
===================================================================
--- head/etc/newsyslog.conf.d/Makefile	(revision 337685)
+++ head/etc/newsyslog.conf.d/Makefile	(nonexistent)
@@ -1,37 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-BINDIR=		/etc/newsyslog.conf.d
-
-FILES=
-
-.if ${MK_AMD} != "no"
-FILES+=		amd.conf
-.endif
-
-.if ${MK_FTP} != "no"
-FILES+=		ftp.conf
-.endif
-
-.if ${MK_LPR} != "no"
-FILES+=		lpr.conf
-.endif
-
-.if ${MK_OFED} != "no"
-FILES+=		opensm.conf
-.endif
-
-.if ${MK_PF} != "no"
-FILES+=		pf.conf
-.endif
-
-.if ${MK_PPP} != "no"
-FILES+=		ppp.conf
-.endif
-
-.if ${MK_SENDMAIL} != "no"
-FILES+=		sendmail.conf
-.endif
-
-.include <bsd.prog.mk>

Property changes on: head/etc/newsyslog.conf.d/Makefile
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/etc/newsyslog.conf.d/opensm.conf
===================================================================
--- head/etc/newsyslog.conf.d/opensm.conf	(revision 337685)
+++ head/etc/newsyslog.conf.d/opensm.conf	(nonexistent)
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-/var/log/opensm.log			600  7	*	*	Z	/var/run/opensm.pid	30

Property changes on: head/etc/newsyslog.conf.d/opensm.conf
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/etc/newsyslog.conf.d/lpr.conf
===================================================================
--- head/etc/newsyslog.conf.d/lpr.conf	(revision 337685)
+++ head/etc/newsyslog.conf.d/lpr.conf	(nonexistent)
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/lpd-errs			644  7	   1000	*     JC

Property changes on: head/etc/newsyslog.conf.d/lpr.conf
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile	(revision 337685)
+++ head/etc/Makefile	(revision 337686)
@@ -1,339 +1,337 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 FILESGROUPS=	FILES
 
 # No need as it is empty and just causes rebuilds since this file does so much.
 UPDATE_DEPENDFILE=	no
 
 .if ${MK_SENDMAIL} != "no"
 SUBDIR+=sendmail
 .endif
 
 BIN1=	crontab \
 	devd.conf \
 	devfs.conf \
 	dhclient.conf \
 	disktab \
 	fbtab \
 	gettytab \
 	group \
 	hosts \
 	hosts.allow \
 	hosts.equiv \
 	libalias.conf \
 	libmap.conf \
 	login.access \
 	login.conf \
 	mac.conf \
 	motd \
 	netconfig \
 	networks \
-	newsyslog.conf \
 	nsswitch.conf \
 	phones \
 	profile \
 	protocols \
 	rc.bsdextended \
 	rc.firewall \
 	remote \
 	rpc \
 	services \
 	syslog.conf \
 	termcap.small
 
 .if exists(${.CURDIR}/etc.${MACHINE}/ttys)
 BIN1+=	etc.${MACHINE}/ttys
 .elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys)
 BIN1+=	etc.${MACHINE_ARCH}/ttys
 .elif exists(${.CURDIR}/etc.${MACHINE_CPUARCH}/ttys)
 BIN1+=	etc.${MACHINE_CPUARCH}/ttys
 .else
 .error etc.MACHINE/ttys missing
 .endif
 
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_AMD} != "no"
 BIN1+= amd.map
 .endif
 
 .if ${MK_FTP} != "no"
 BIN1+= ftpusers
 .endif
 
 .if ${MK_INETD} != "no"
 BIN1+= inetd.conf
 .endif
 
 .if ${MK_LOCATE} != "no"
 BIN1+=	${SRCTOP}/usr.bin/locate/locate/locate.rc
 .endif
 
 .if ${MK_LPR} != "no"
 BIN1+=	hosts.lpd printcap
 .endif
 
 .if ${MK_MAIL} != "no"
 BIN1+=	${SRCTOP}/usr.bin/mail/misc/mail.rc
 .endif
 
 .if ${MK_OPENSSH} != "no"
 SSH=	${SRCTOP}/crypto/openssh/ssh_config \
 	${SRCTOP}/crypto/openssh/sshd_config \
 	${SRCTOP}/crypto/openssh/moduli
 .endif
 .if ${MK_OPENSSL} != "no"
 SSL=	${SRCTOP}/crypto/openssl/apps/openssl.cnf
 .endif
 
 .if ${MK_SENDMAIL} != "no"
 BIN1+=	rc.sendmail
 .endif
 
 .if ${MK_TCSH} != "no"
 BIN1+= csh.cshrc csh.login csh.logout
 .endif
 
 .if ${MK_WIRELESS} != "no"
 BIN1+= regdomain.xml
 .endif
 
 .if ${MK_SENDMAIL} == "no"
 ETCMAIL=mailer.conf aliases
 .else
 ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
 	mailertable.sample aliases
 .endif
 
 # Special top level files for FreeBSD
 FREEBSD=COPYRIGHT
 
 # Sanitize DESTDIR
 DESTDIR:=	${DESTDIR:C://*:/:g}
 
 afterinstall:
 .if ${MK_MAN} != "no"
 	${_+_}cd ${SRCTOP}/share/man; ${MAKE} makedb
 .endif
 
 distribute:
 	# Avoid installing tests here; "make distribution" will do this and
 	# correctly place them in the right location.
 	${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \
 	    DESTDIR=${DISTDIR}/${DISTRIBUTION}
 	${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION}
 
 .include <bsd.endian.mk>
 
 .if defined(NO_ROOT)
 METALOG.add?=	cat -l >> ${METALOG}
 .endif
 
 distribution:
 .if !defined(DESTDIR)
 	@echo "set DESTDIR before running \"make ${.TARGET}\""
 	@false
 .endif
 	cd ${.CURDIR}; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		${BIN1} ${DESTDIR}/etc; \
 	    cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
 
 .if ${MK_SERVICESDB} != "no"
 	cd ${.CURDIR}; \
 	    services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
 		${DESTDIR}/etc/services;
 .endif
 
 .if ${MK_TCSH} == "no"
 	sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
 .endif
 	pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
 .if defined(NO_ROOT)
 	( \
 		echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
 		echo "./var/db/services.db type=file mode=0644 uname=root gname=wheel"; \
 	) | ${METALOG.add}
 .endif
 .if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}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
 	${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
 .if ${MK_UNBOUND} != "no"
 	if [ ! -e ${DESTDIR}/etc/unbound ]; then \
 		${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
 	fi
 .endif
 .if ${MK_SENDMAIL} != "no"
 	${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
 .if ${MK_OPENSSH} != "no"
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${SSH} ${DESTDIR}/etc/ssh
 .endif
 .if ${MK_OPENSSL} != "no"
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${SSL} ${DESTDIR}/etc/ssl
 .endif
 .if ${MK_KERBEROS} != "no"
 	cd ${.CURDIR}/root; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.k5login ${DESTDIR}/root/.k5login;
 .endif
 	cd ${.CURDIR}/root; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.profile ${DESTDIR}/root/.profile; \
 	    rm -f ${DESTDIR}/.profile; \
 	    ${INSTALL_LINK} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 .if ${MK_TCSH} != "no"
 	cd ${.CURDIR}/root; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.cshrc ${DESTDIR}/root/.cshrc; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.login ${DESTDIR}/root/.login; \
 	    rm -f ${DESTDIR}/.cshrc; \
 	    ${INSTALL_LINK} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
 .endif
 .if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail
 	if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
 	      ! -f ${DESTDIR}/etc/aliases ]; then \
 		${INSTALL_SYMLINK} mail/aliases ${DESTDIR}/etc/aliases; \
 	fi
 .endif
 .if ${MK_LOCATE} != "no"
 	${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/db/locate.database
 .endif
 	cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${FREEBSD} ${DESTDIR}/
 .if ${MK_BOOT} != "no"
 .if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints)
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \
 	    ${DESTDIR}/boot/device.hints
 .endif
 .endif
 .if ${MK_NIS} == "no"
 	sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
 		${DESTDIR}/etc/nsswitch.conf
 .endif
 
 MTREE_CMD?=	mtree
 
 MTREES=		mtree/BSD.root.dist		/		\
 		mtree/BSD.var.dist		/var		\
 		mtree/BSD.usr.dist		/usr		\
 		mtree/BSD.include.dist		/usr/include	\
 		mtree/BSD.debug.dist		/usr/lib
 .if ${MK_LIB32} != "no"
 MTREES+=	mtree/BSD.lib32.dist		/usr
 MTREES+=	mtree/BSD.lib32.dist		/usr/lib/debug/usr
 .endif
 .if ${MK_LIBSOFT} != "no"
 MTREES+=	mtree/BSD.libsoft.dist		/usr
 MTREES+=	mtree/BSD.libsoft.dist		/usr/lib/debug/usr
 .endif
 .if ${MK_TESTS} != "no"
 MTREES+=	mtree/BSD.tests.dist		${TESTSBASE}
 MTREES+=	mtree/BSD.tests.dist		/usr/lib/debug/${TESTSBASE}
 .endif
 .if ${MK_SENDMAIL} != "no"
 MTREES+=	mtree/BSD.sendmail.dist		/
 .endif
 .for mtree in ${LOCAL_MTREE}
 MTREES+=	../${mtree}			/
 .endfor
 
 # Clean up some directories that where mistakenly created as files that
 # should not have been as part of the nvi update in r281994.
 # This should be removed after 11.0-RELEASE.
 DISTRIB_CLEANUP_SHARE_FILES=	${SHAREDIR}/doc/usd/10.exref ${SHAREDIR}/doc/usd/11.edit
 DISTRIB_CLEANUP_SHARE_FILES+=	${SHAREDIR}/doc/usd/12.vi ${SHAREDIR}/doc/usd/13.viref
 distrib-cleanup: .PHONY
 	for file in ${DISTRIB_CLEANUP_SHARE_FILES}; do \
 		if [ -f ${DESTDIR}/$${file} ]; then \
 			rm -f ${DESTDIR}/$${file}; \
 		fi; \
 	done
 
 distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
 	@set ${MTREES}; \
 	while test $$# -ge 2; do \
 		m=${.CURDIR}/$$1; \
 		shift; \
 		d=${DESTDIR}$$1; \
 		shift; \
 		test -d $$d || mkdir -p $$d; \
 		${ECHO} ${MTREE_CMD} -deU ${MTREE_FSCHG} \
 		    ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
 		${MTREE_FILTER} $$m | \
 		${MTREE_CMD} -deU ${MTREE_FSCHG} ${MTREE_FOLLOWS_SYMLINKS} \
 		    -p $$d; \
 	done; true
 .if defined(NO_ROOT)
 	@set ${MTREES}; \
 	while test $$# -ge 2; do \
 		m=${.CURDIR}/$$1; \
 		shift; \
 		d=$$1; \
 		test "$$d" == "/" && d=""; \
 		d=${DISTBASE}$$d; \
 		shift; \
 		test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \
 		${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \
 		    "sed s#^\.#.$$d# | ${METALOG.add}" ; \
 		${MTREE_FILTER} $$m | \
 		${MTREE_CMD:N-W} -C -K all | sed s#^\.#.$$d# | \
 		    ${METALOG.add} ; \
 	done; true
 .endif
 .if ${MK_NLS} != "no"
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
 	while [ $$# -gt 0 ] ; do \
 		${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/nls/$$1"; \
 		shift; shift; \
 	done
 .endif
 
 etc-examples-install: ${META_DEPS}
 	cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${BIN1} ${BIN2} nsmb.conf opieaccess \
 	    ${DESTDIR}${SHAREDIR}/examples/etc
 
 etc-examples: etc-examples-install
 	${_+_}cd ${.CURDIR}/defaults; \
 	    ${MAKE} ${${MK_STAGING} == "yes":?all:install} \
 	    DESTDIR=${DESTDIR}${SHAREDIR}/examples
 
 .include <bsd.prog.mk>
 
 .if ${MK_INSTALL_AS_USER} == "yes" && ${_uid} != 0
 MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \
 	-e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \
 	-e 's,\(gid=\)[^ ]* ,\1${_gid} ,' \
 	-e 's,\(uid=\)[^ ]*$$,\1${_uid},' \
 	-e 's,\(gid=\)[^ ]*$$,\1${_gid},'
 .else
 MTREE_FILTER= cat
 .if !defined(NO_FSCHG)
 MTREE_FSCHG=	-i
 .endif
 .endif
Index: head/usr.sbin/newsyslog/Makefile
===================================================================
--- head/usr.sbin/newsyslog/Makefile	(revision 337685)
+++ head/usr.sbin/newsyslog/Makefile	(revision 337686)
@@ -1,13 +1,15 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
+CONFS=	newsyslog.conf
 PROG=	newsyslog
 MAN=	newsyslog.8 newsyslog.conf.5
 SRCS=	newsyslog.c ptimes.c
 LIBADD=	sbuf
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
+SUBDIR+=	newsyslog.conf.d
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/newsyslog/newsyslog.conf
===================================================================
--- head/usr.sbin/newsyslog/newsyslog.conf	(nonexistent)
+++ head/usr.sbin/newsyslog/newsyslog.conf	(revision 337686)
@@ -0,0 +1,35 @@
+# configuration file for newsyslog
+# $FreeBSD$
+#
+# Entries which do not specify the '/pid_file' field will cause the
+# syslogd process to be signalled when that log file is rotated.  This
+# action is only appropriate for log files which are written to by the
+# syslogd process (ie, files listed in /etc/syslog.conf).  If there
+# is no process which needs to be signalled when a given log file is
+# rotated, then the entry for that file should include the 'N' flag.
+#
+# Note: some sites will want to select more restrictive protections than the
+# defaults.  In particular, it may be desirable to switch many of the 644
+# entries to 640 or 600.  For example, some sites will consider the
+# contents of maillog, messages, and lpd-errs to be confidential.  In the
+# future, these defaults may change to more conservative ones.
+#
+# logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
+/var/log/all.log			600  7	   *	@T00  J
+/var/log/auth.log			600  7     1000 @0101T JC
+/var/log/console.log			600  5	   1000	*     J
+/var/log/cron				600  3	   1000	*     JC
+/var/log/daily.log			640  7	   *	@T00  JN
+/var/log/debug.log			600  7     1000 *     JC
+/var/log/init.log			644  3	   1000	*     J
+/var/log/kerberos.log			600  7	   1000	*     J
+/var/log/maillog			640  7	   *	@T00  JC
+/var/log/messages			644  5	   1000	@0101T JC
+/var/log/monthly.log			640  12	   *	$M1D0 JN
+/var/log/devd.log			644  3	   1000	*     JC
+/var/log/security			600  10	   1000	*     JC
+/var/log/utx.log			644  3	   *	@01T05 B
+/var/log/weekly.log			640  5	   *	$W6D0 JN
+
+<include> /etc/newsyslog.conf.d/*
+<include> /usr/local/etc/newsyslog.conf.d/*

Property changes on: head/usr.sbin/newsyslog/newsyslog.conf
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
===================================================================
--- head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile	(nonexistent)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile	(revision 337686)
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+CONFSDIR=	/etc/newsyslog.conf.d
+
+CONFS=
+
+.if ${MK_AMD} != "no"
+CONFS+=		amd.conf
+.endif
+
+.if ${MK_FTP} != "no"
+CONFS+=		ftp.conf
+.endif
+
+.if ${MK_LPR} != "no"
+CONFS+=		lpr.conf
+.endif
+
+.if ${MK_OFED} != "no"
+CONFS+=		opensm.conf
+.endif
+
+.if ${MK_PF} != "no"
+CONFS+=		pf.conf
+.endif
+
+.if ${MK_PPP} != "no"
+CONFS+=		ppp.conf
+.endif
+
+.if ${MK_SENDMAIL} != "no"
+CONFS+=		sendmail.conf
+.endif
+
+.include <bsd.prog.mk>

Property changes on: head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/usr.sbin/newsyslog/newsyslog.conf.d/amd.conf
===================================================================
--- head/usr.sbin/newsyslog/newsyslog.conf.d/amd.conf	(nonexistent)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/amd.conf	(revision 337686)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+/var/log/amd.log			644  7	   1000	*     J

Property changes on: head/usr.sbin/newsyslog/newsyslog.conf.d/amd.conf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/usr.sbin/newsyslog/newsyslog.conf.d/ftp.conf
===================================================================
--- head/usr.sbin/newsyslog/newsyslog.conf.d/ftp.conf	(nonexistent)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/ftp.conf	(revision 337686)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+/var/log/xferlog			600  7	   1000	*     JC

Property changes on: head/usr.sbin/newsyslog/newsyslog.conf.d/ftp.conf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf
===================================================================
--- head/usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf	(nonexistent)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf	(revision 337686)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+/var/log/lpd-errs			644  7	   1000	*     JC

Property changes on: head/usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/usr.sbin/newsyslog/newsyslog.conf.d/pf.conf
===================================================================
--- head/usr.sbin/newsyslog/newsyslog.conf.d/pf.conf	(nonexistent)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/pf.conf	(revision 337686)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+/var/log/pflog				600  3	   1000	*     JB    /var/run/pflogd.pid

Property changes on: head/usr.sbin/newsyslog/newsyslog.conf.d/pf.conf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/usr.sbin/newsyslog/newsyslog.conf.d/ppp.conf
===================================================================
--- head/usr.sbin/newsyslog/newsyslog.conf.d/ppp.conf	(nonexistent)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/ppp.conf	(revision 337686)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+/var/log/ppp.log	root:network	640  3	   1000	*     JC

Property changes on: head/usr.sbin/newsyslog/newsyslog.conf.d/ppp.conf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/usr.sbin/newsyslog/newsyslog.conf.d/sendmail.conf
===================================================================
--- head/usr.sbin/newsyslog/newsyslog.conf.d/sendmail.conf	(nonexistent)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/sendmail.conf	(revision 337686)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+/var/log/sendmail.st			640  10	   *	168   BN

Property changes on: head/usr.sbin/newsyslog/newsyslog.conf.d/sendmail.conf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile.depend
===================================================================
--- head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile.depend	(nonexistent)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile.depend	(revision 337686)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Property changes on: head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile.depend
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf
===================================================================
--- head/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf	(nonexistent)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf	(revision 337686)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+/var/log/opensm.log			600  7	*	*	Z	/var/run/opensm.pid	30

Property changes on: head/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property