svn commit: r264903 - in head: share/mk tools/build/options usr.bin

[Warner Losh]

Author: imp
Date: Thu Apr 24 23:17:40 2014
New Revision: 264903
URL: http://svnweb.freebsd.org/changeset/base/264903

Log:
  Add option WITHOUT_VI to not build/install vi. vi was the largest
  binary without a knob to turn it off.

Added:
  head/tools/build/options/WITHOUT_VI   (contents, props changed)
Modified:
  head/share/mk/bsd.opts.mk
  head/usr.bin/Makefile

Modified: head/share/mk/bsd.opts.mk
==============================================================================
--- head/share/mk/bsd.opts.mk	Thu Apr 24 23:17:31 2014	(r264902)
+++ head/share/mk/bsd.opts.mk	Thu Apr 24 23:17:40 2014	(r264903)
@@ -166,6 +166,7 @@ __DEFAULT_YES_OPTIONS = \
     UNBOUND \
     USB \
     UTMPX \
+    VI \
     WIRELESS \
     WPA_SUPPLICANT_EAPOL \
     ZFS \

Added: head/tools/build/options/WITHOUT_VI
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_VI	Thu Apr 24 23:17:40 2014	(r264903)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build and install vi, view, ex and related programs.

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Thu Apr 24 23:17:31 2014	(r264902)
+++ head/usr.bin/Makefile	Thu Apr 24 23:17:40 2014	(r264903)
@@ -182,7 +182,6 @@ SUBDIR=	alias \
 	unvis \
 	uudecode \
 	uuencode \
-	vi \
 	vis \
 	vmstat \
 	w \
@@ -361,6 +360,10 @@ SUBDIR+=	xstr
 SUBDIR+=	yacc
 .endif
 
+.if ${MK_VI} != "no"
+SUBDIR+=	vi
+.endif
+
 .if ${MK_USB} != "no"
 SUBDIR+=	usbhidaction
 SUBDIR+=	usbhidctl