From fe5676baea3c38ee19776983fdc1cf22c4a7d928 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Wed, 1 Jun 2016 20:44:28 +0000
Subject: [PATCH] Revert r301137 and r301163, and implement a correct fix for
 the CONFS issue with dma.conf and ppp.conf.

Thank you very much to Bryan Drewery for looking into the
problem and providing this fix.

Pointyhat:	gjb
Sponsored by:	The FreeBSD Foundation
---
 etc/Makefile                   | 8 --------
 libexec/dma/dmagent/Makefile   | 2 ++
 share/mk/bsd.subdir.mk         | 3 +--
 usr.sbin/ppp/Makefile          | 3 +++
 {etc => usr.sbin}/ppp/ppp.conf | 0
 5 files changed, 6 insertions(+), 10 deletions(-)
 rename {etc => usr.sbin}/ppp/ppp.conf (100%)

diff --git a/etc/Makefile b/etc/Makefile
index 43e6f60a900..94c4473dbf1 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -305,14 +305,6 @@ distribution:
 .endif
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
-.if ${MK_PPP} != "no"
-	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
-	    ${PPPCNF} ${DESTDIR}/etc/ppp
-.endif
-.if ${MK_DMAGENT} != "no"
-	cd ${.CURDIR}/../libexec/dma/dmagent; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-	    dma.conf ${DESTDIR}/etc/dma
-.endif
 .if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail
diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile
index 6baa90296ed..187517736e6 100644
--- a/libexec/dma/dmagent/Makefile
+++ b/libexec/dma/dmagent/Makefile
@@ -18,6 +18,8 @@ SRCS=	aliases_parse.y \
 	spool.c \
 	util.c
 MAN8=	dma.8
+CONFS=	dma.conf
+CONFSDIR=	${CONFDIR}/dma
 YFLAGS+=	-i
 CLEANFILES=	aliases_parse.i
 FILES=	mailer.conf
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index ba31e82cc9a..f1b09708d56 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -72,10 +72,9 @@ DISTRIBUTION?=	base
 distribute: .MAKE
 .for dist in ${DISTRIBUTION}
 	${_+_}cd ${.CURDIR}; \
-	    ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
+	    ${MAKE} install installconfig -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
 .endfor
 .endif
-
 # Convenience targets to run 'build${target}' and 'install${target}' when
 # calling 'make ${target}'.
 .for __target in files includes
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index e0772af2e53..1dcd3b571a0 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -21,6 +21,9 @@ PPP_NO_PAM=
 PPP_NO_RADIUS=
 PPP_NO_SUID=
 .endif
+CONFS=	ppp.conf
+CONFSDIR=	${CONFDIR}/ppp
+CONFSMODE=	600
 
 .if ${MK_ATM} == "no"
 PPP_NO_ATM=
diff --git a/etc/ppp/ppp.conf b/usr.sbin/ppp/ppp.conf
similarity index 100%
rename from etc/ppp/ppp.conf
rename to usr.sbin/ppp/ppp.conf
-- 
2.45.0