From owner-svn-src-all@FreeBSD.ORG  Mon Jun 23 13:50:04 2014
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 ESMTPS id 133C84C5;
 Mon, 23 Jun 2014 13:50:04 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D9D8D2A63;
 Mon, 23 Jun 2014 13:50:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5NDo3Yn043961;
 Mon, 23 Jun 2014 13:50:03 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5NDo3P8043956;
 Mon, 23 Jun 2014 13:50:03 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201406231350.s5NDo3P8043956@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 23 Jun 2014 13:50:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r267797 - in stable/10: etc/mtree share share/mk
 tools/build/options
X-SVN-Group: stable-10
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.18
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: Mon, 23 Jun 2014 13:50:04 -0000

Author: emaste
Date: Mon Jun 23 13:50:02 2014
New Revision: 267797
URL: http://svnweb.freebsd.org/changeset/base/267797

Log:
  MFC r267124, r267582:
  
    Install VT support files
  
    They can be disabled by setting WITHOUT_VT_SUPPORT=yes in src.conf.

Added:
  stable/10/tools/build/options/WITHOUT_VT_SUPPORT
     - copied, changed from r267124, head/tools/build/options/WITHOUT_VT_SUPPORT
Modified:
  stable/10/etc/mtree/BSD.usr.dist
  stable/10/share/Makefile
  stable/10/share/mk/bsd.own.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/mtree/BSD.usr.dist
==============================================================================
--- stable/10/etc/mtree/BSD.usr.dist	Mon Jun 23 13:41:20 2014	(r267796)
+++ stable/10/etc/mtree/BSD.usr.dist	Mon Jun 23 13:50:02 2014	(r267797)
@@ -1406,6 +1406,12 @@
             catalog
             ..
         ..
+        vt
+            fonts
+            ..
+            keymaps
+            ..
+        ..
         zoneinfo
             Africa
             ..

Modified: stable/10/share/Makefile
==============================================================================
--- stable/10/share/Makefile	Mon Jun 23 13:41:20 2014	(r267796)
+++ stable/10/share/Makefile	Mon Jun 23 13:50:02 2014	(r267797)
@@ -28,6 +28,7 @@ SUBDIR=	${_colldef} \
 	termcap \
 	${_tests} \
 	${_timedef} \
+	${_vt} \
 	${_zoneinfo}
 
 # NB: keep these sorted by MK_* knobs
@@ -85,6 +86,10 @@ _syscons=	syscons
 _tests=		tests
 .endif
 
+.if ${MK_VT_SUPPORT} != "no"
+_vt=		vt
+.endif
+
 .if ${MK_ZONEINFO} != "no"
 _zoneinfo=	zoneinfo
 .endif

Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk	Mon Jun 23 13:41:20 2014	(r267796)
+++ stable/10/share/mk/bsd.own.mk	Mon Jun 23 13:50:02 2014	(r267797)
@@ -358,6 +358,7 @@ __DEFAULT_YES_OPTIONS = \
     UNBOUND \
     USB \
     UTMPX \
+    VT_SUPPORT \
     WIRELESS \
     WPA_SUPPLICANT_EAPOL \
     ZFS \

Copied and modified: stable/10/tools/build/options/WITHOUT_VT_SUPPORT (from r267124, head/tools/build/options/WITHOUT_VT_SUPPORT)
==============================================================================
--- head/tools/build/options/WITHOUT_VT_SUPPORT	Thu Jun  5 18:53:56 2014	(r267124, copy source)
+++ stable/10/tools/build/options/WITHOUT_VT_SUPPORT	Mon Jun 23 13:50:02 2014	(r267797)
@@ -1,4 +1,4 @@
 .\" $FreeBSD$
 Set to not build
 .Xr vt 4
-support files (fonts).
+support files (fonts and keymaps).