svn commit: r267797 - in stable/10: etc/mtree share share/mk tools/build/options

[Ed Maste]

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).