From owner-svn-src-all@freebsd.org  Sat Oct 10 10:48:11 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C4EA9D16F1;
 Sat, 10 Oct 2015 10:48:11 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0DA7A863;
 Sat, 10 Oct 2015 10:48:10 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9AAmAHO054465;
 Sat, 10 Oct 2015 10:48:10 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9AAm9UN054460;
 Sat, 10 Oct 2015 10:48:09 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201510101048.t9AAm9UN054460@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 10 Oct 2015 10:48:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r289114 - in head: libexec/dma/dmagent share/mk
 usr.sbin/ppp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2015 10:48:11 -0000

Author: bapt
Date: Sat Oct 10 10:48:09 2015
New Revision: 289114
URL: https://svnweb.freebsd.org/changeset/base/289114

Log:
  Install bsd.confs.mk
  Rename ETCDIR into CONFIGDIR to avoid conflicts with the ports tree

Modified:
  head/libexec/dma/dmagent/Makefile
  head/share/mk/Makefile
  head/share/mk/bsd.confs.mk
  head/share/mk/bsd.own.mk
  head/usr.sbin/ppp/Makefile

Modified: head/libexec/dma/dmagent/Makefile
==============================================================================
--- head/libexec/dma/dmagent/Makefile	Sat Oct 10 09:37:31 2015	(r289113)
+++ head/libexec/dma/dmagent/Makefile	Sat Oct 10 10:48:09 2015	(r289114)
@@ -17,7 +17,7 @@ SRCS=	aliases_parse.y \
 	util.c
 MAN8=	dma.8
 CONFS=	dma.conf
-CONFSDIR=	${ETCDIR}/dma
+CONFSDIR=	${CONFIGDIR}/dma
 YFLAGS+=	-i
 CLEANFILES=	aliases_parse.i
 FILES=	mailer.conf

Modified: head/share/mk/Makefile
==============================================================================
--- head/share/mk/Makefile	Sat Oct 10 09:37:31 2015	(r289113)
+++ head/share/mk/Makefile	Sat Oct 10 10:48:09 2015	(r289114)
@@ -13,6 +13,7 @@ FILES=	\
 	bsd.README \
 	bsd.arch.inc.mk \
 	bsd.compiler.mk \
+	bsd.confs.mk \
 	bsd.cpu.mk \
 	bsd.crunchgen.mk \
 	bsd.dep.mk \

Modified: head/share/mk/bsd.confs.mk
==============================================================================
--- head/share/mk/bsd.confs.mk	Sat Oct 10 09:37:31 2015	(r289113)
+++ head/share/mk/bsd.confs.mk	Sat Oct 10 10:48:09 2015	(r289114)
@@ -22,7 +22,7 @@ all: buildconfig
 ${group}OWN?=	${SHAREOWN}
 ${group}GRP?=	${SHAREGRP}
 ${group}MODE?=	${CONFMODE}
-${group}DIR?=	${ETCDIR}/
+${group}DIR?=	${CONFIGDIR}/
 STAGE_SETS+=	${group}
 STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR}
 STAGE_SYMLINKS_DIR.${group}= ${STAGE_OBJTOP}

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat Oct 10 09:37:31 2015	(r289113)
+++ head/share/mk/bsd.own.mk	Sat Oct 10 10:48:09 2015	(r289114)
@@ -213,7 +213,7 @@ NLSGRP?=	${SHAREGRP}
 NLSMODE?=	${NOBINMODE}
 
 INCLUDEDIR?=	/usr/include
-ETCDIR?=	/etc
+CONFIGDIR?=	/etc
 
 #
 # install(1) parameters.

Modified: head/usr.sbin/ppp/Makefile
==============================================================================
--- head/usr.sbin/ppp/Makefile	Sat Oct 10 09:37:31 2015	(r289113)
+++ head/usr.sbin/ppp/Makefile	Sat Oct 10 10:48:09 2015	(r289114)
@@ -22,7 +22,7 @@ PPP_NO_RADIUS=
 PPP_NO_SUID=
 .endif
 CONFS=	ppp.conf
-CONFSDIR=	${ETCDIR}/ppp
+CONFSDIR=	${CONFIGDIR}/ppp
 CONFSMODE=	600
 
 .if ${MK_ATM} == "no"