From d1900df6cc083e82a82ec7161f567a71f6c8ba37 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 1 Jun 2016 20:06:55 +0000
Subject: [PATCH] Implement a hack to re-enable installation of the dma.conf.

The 'CONFS' entries in share/mk/bsd.confs.mk explicitly check
for the 'installconfig', but does not behave properly with the
'distribute' target.

This seems to be related to the previously-reported issues
with files within /etc in the past.

Reported by:	Ben Woods
Sponsored by:	The FreeBSD Foundation
---
 etc/Makefile                 | 4 ++++
 libexec/dma/dmagent/Makefile | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index e01b2a49673..43e6f60a900 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -309,6 +309,10 @@ distribution:
 	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 187517736e6..6baa90296ed 100644
--- a/libexec/dma/dmagent/Makefile
+++ b/libexec/dma/dmagent/Makefile
@@ -18,8 +18,6 @@ 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