From owner-svn-src-head@FreeBSD.ORG  Thu Apr 24 23:17:41 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 66822CF1;
 Thu, 24 Apr 2014 23:17:41 +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 53B531C69;
 Thu, 24 Apr 2014 23:17:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ONHf3a092644;
 Thu, 24 Apr 2014 23:17:41 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ONHeDI092641;
 Thu, 24 Apr 2014 23:17:40 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201404242317.s3ONHeDI092641@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 24 Apr 2014 23:17:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264903 - in head: share/mk tools/build/options usr.bin
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2014 23:17:41 -0000

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