From b39df8fe2d85847497684b427a1b9c2908c4a576 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 20 May 2014 03:00:20 +0000
Subject: [PATCH] - Include /etc/newsyslog.conf.d/* and
 /usr/local/etc/newsyslog.conf.d/* by   default for newsyslog(8).

  The /usr/local/etc/newsyslog.conf.d will give packages an opportunity to
  install a default configuration to handle their own log files.

MFC after:	2 weeks
Relnotes:	yes
---
 etc/mtree/BSD.root.dist        |  2 ++
 etc/newsyslog.conf             |  3 +++
 usr.sbin/newsyslog/newsyslog.8 | 10 ++++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index d1617c645a6c..6b44bb40b105 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -42,6 +42,8 @@
         ..
         mtree
         ..
+        newsyslog.conf.d
+        ..
         ntp             mode=0700
         ..
         pam.d
diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf
index 9572f84efd1c..ab595cac61db 100644
--- a/etc/newsyslog.conf
+++ b/etc/newsyslog.conf
@@ -38,3 +38,6 @@
 /var/log/utx.log			644  3	   *	@01T05 B
 /var/log/weekly.log			640  5	   *	$W6D0 JN
 /var/log/xferlog			600  7	   100	*     JC
+
+<include> /etc/newsyslog.conf.d/*
+<include> /usr/local/etc/newsyslog.conf.d/*
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index 87f60ac46f5b..e6d79a468ef8 100644
--- a/usr.sbin/newsyslog/newsyslog.8
+++ b/usr.sbin/newsyslog/newsyslog.8
@@ -17,7 +17,7 @@
 .\" the suitability of this software for any purpose.  It is
 .\" provided "as is" without express or implied warranty.
 .\"
-.Dd January 31, 2011
+.Dd May 19, 2014
 .Dt NEWSYSLOG 8
 .Os
 .Sh NAME
@@ -261,10 +261,16 @@ If additional command line arguments are given,
 will only examine log files that match those arguments; otherwise, it
 will examine all files listed in the configuration file.
 .Sh FILES
-.Bl -tag -width /etc/newsyslog.confxxxx -compact
+.Bl -tag -width /usr/local/etc/newsyslog.conf.d -compact
 .It Pa /etc/newsyslog.conf
 .Nm
 configuration file
+.It Pa /etc/newsyslog.conf.d
+Each file in this directory will be included by the default
+.Pa newsyslog.conf .
+.It Pa /usr/local/etc/newsyslog.conf.d
+Each file in this directory will be included by the default
+.Pa newsyslog.conf .
 .El
 .Sh COMPATIBILITY
 Previous versions of the