From owner-svn-src-all@FreeBSD.ORG  Tue Sep 24 10:04:52 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A7280BD0;
 Tue, 24 Sep 2013 10:04:52 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 943B72FF9;
 Tue, 24 Sep 2013 10:04:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8OA4qni087924;
 Tue, 24 Sep 2013 10:04:52 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8OA4qi9087922;
 Tue, 24 Sep 2013 10:04:52 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201309241004.r8OA4qi9087922@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Tue, 24 Sep 2013 10:04:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255841 - in head/etc: . mtree
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.14
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Sep 2013 10:04:52 -0000

Author: des
Date: Tue Sep 24 10:04:51 2013
New Revision: 255841
URL: http://svnweb.freebsd.org/changeset/base/255841

Log:
  Replace the unused /etc/unbound directory with a symlink to /var/unbound.
  
  Approved by:	re (blanket)

Modified:
  head/etc/Makefile
  head/etc/mtree/BSD.root.dist

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Tue Sep 24 09:56:58 2013	(r255840)
+++ head/etc/Makefile	Tue Sep 24 10:04:51 2013	(r255841)
@@ -250,6 +250,11 @@ distribution:
 .if ${MK_BIND_ETC} != "no"
 	${_+_}cd ${.CURDIR}/namedb; ${MAKE} install
 .endif
+.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

Modified: head/etc/mtree/BSD.root.dist
==============================================================================
--- head/etc/mtree/BSD.root.dist	Tue Sep 24 09:56:58 2013	(r255840)
+++ head/etc/mtree/BSD.root.dist	Tue Sep 24 10:04:51 2013	(r255841)
@@ -66,8 +66,6 @@
         ..
         ssl
         ..
-        unbound
-        ..
         zfs
         ..
     ..