svn commit: r278554 - in stable/10: share/mk tools/build/mk tools/build/options usr.bin

[Garrett Cooper]

Author: ngie
Date: Wed Feb 11 06:57:20 2015
New Revision: 278554
URL: https://svnweb.freebsd.org/changeset/base/278554

Log:
  MFC r277663:
  
  r277663:
  
    Add MK_EE knob to control installing edit, ee, etc
  
    Sponsored by: EMC / Isilon Storage Division

Added:
  stable/10/tools/build/options/WITHOUT_EE
     - copied unchanged from r277663, head/tools/build/options/WITHOUT_EE
Modified:
  stable/10/share/mk/bsd.own.mk
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
  stable/10/usr.bin/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk	Wed Feb 11 06:52:00 2015	(r278553)
+++ stable/10/share/mk/bsd.own.mk	Wed Feb 11 06:57:20 2015	(r278554)
@@ -272,6 +272,7 @@ __DEFAULT_YES_OPTIONS = \
     DICT \
     DYNAMICROOT \
     ED_CRYPTO \
+    EE \
     EXAMPLES \
     FLOPPY \
     FMTREE \

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb 11 06:52:00 2015	(r278553)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb 11 06:57:20 2015	(r278554)
@@ -1252,6 +1252,23 @@ OLD_FILES+=usr/share/dict/web2a
 OLD_FILES+=usr/share/dict/words
 .endif
 
+.if ${MK_EE} == no
+OLD_FILES+=usr/bin/edit
+OLD_FILES+=usr/bin/ee
+OLD_FILES+=usr/bin/ree
+OLD_FILES+=usr/share/man/man1/edit.1.gz
+OLD_FILES+=usr/share/man/man1/ee.1.gz
+OLD_FILES+=usr/share/man/man1/ree.1.gz
+OLD_FILES+=usr/share/nls/C/ee.cat
+OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat
+OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat
+OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat
+OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
+.endif
+
 #.if ${MK_EXAMPLES} == no
 # to be filled in
 #.endif

Copied: stable/10/tools/build/options/WITHOUT_EE (from r277663, head/tools/build/options/WITHOUT_EE)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/tools/build/options/WITHOUT_EE	Wed Feb 11 06:57:20 2015	(r278554, copy of r277663, head/tools/build/options/WITHOUT_EE)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build and install
+.Xr edit 1 ,
+.Xr ee 1 ,
+and related programs.

Modified: stable/10/usr.bin/Makefile
==============================================================================
--- stable/10/usr.bin/Makefile	Wed Feb 11 06:52:00 2015	(r278553)
+++ stable/10/usr.bin/Makefile	Wed Feb 11 06:57:20 2015	(r278554)
@@ -38,7 +38,6 @@ SUBDIR=	alias \
 	dirname \
 	dpv \
 	du \
-	ee \
 	elf2aout \
 	elfdump \
 	enigma \
@@ -232,6 +231,10 @@ SUBDIR+=	calendar
 _clang=		clang
 .endif
 
+.if ${MK_EE} != "no"
+SUBDIR+=	ee
+.endif
+
 .if ${MK_GPL_DTC} != "yes"
 SUBDIR+=	dtc
 .endif