svn commit: r275227 - in projects/building-blocks: share/mk tools/build/mk tools/build/options usr.bin

[Garrett Cooper]

Author: ngie
Date: Sat Nov 29 01:58:52 2014
New Revision: 275227
URL: https://svnweb.freebsd.org/changeset/base/275227

Log:
  Make ee(1) optional via MK_EE

Added:
  projects/building-blocks/tools/build/options/WITHOUT_EE   (contents, props changed)
Modified:
  projects/building-blocks/share/mk/src.opts.mk
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
  projects/building-blocks/usr.bin/Makefile

Modified: projects/building-blocks/share/mk/src.opts.mk
==============================================================================
--- projects/building-blocks/share/mk/src.opts.mk	Sat Nov 29 01:55:59 2014	(r275226)
+++ projects/building-blocks/share/mk/src.opts.mk	Sat Nov 29 01:58:52 2014	(r275227)
@@ -78,6 +78,7 @@ __DEFAULT_YES_OPTIONS = \
     DMAGENT \
     DYNAMICROOT \
     ED_CRYPTO \
+    EE \
     EXAMPLES \
     FDT \
     FINGER \

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Sat Nov 29 01:55:59 2014	(r275226)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Sat Nov 29 01:58:52 2014	(r275227)
@@ -1686,6 +1686,23 @@ OLD_FILES+=usr/share/dict/words
 OLD_DIRS+=usr/share/dict
 .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

Added: projects/building-blocks/tools/build/options/WITHOUT_EE
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/building-blocks/tools/build/options/WITHOUT_EE	Sat Nov 29 01:58:52 2014	(r275227)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build and install
+.Xr edit 1 ,
+.Xr ee 1 ,
+and related programs.

Modified: projects/building-blocks/usr.bin/Makefile
==============================================================================
--- projects/building-blocks/usr.bin/Makefile	Sat Nov 29 01:55:59 2014	(r275226)
+++ projects/building-blocks/usr.bin/Makefile	Sat Nov 29 01:58:52 2014	(r275227)
@@ -39,7 +39,6 @@ SUBDIR=	alias \
 	dirname \
 	dpv \
 	du \
-	ee \
 	elf2aout \
 	elfdump \
 	enigma \
@@ -231,6 +230,10 @@ SUBDIR+=	calendar
 _clang=		clang
 .endif
 
+.if ${MK_EE} != "no"
+SUBDIR+=	ee
+.endif
+
 .if ${MK_FINGER} != "no"
 SUBDIR+=	finger
 .endif