svn commit: r278568 - in stable/9: share/mk tools/build/mk tools/build/options usr.bin

[Garrett Cooper]

Author: ngie
Date: Wed Feb 11 08:33:22 2015
New Revision: 278568
URL: https://svnweb.freebsd.org/changeset/base/278568

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

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

Modified: stable/9/share/mk/bsd.own.mk
==============================================================================
--- stable/9/share/mk/bsd.own.mk	Wed Feb 11 08:28:57 2015	(r278567)
+++ stable/9/share/mk/bsd.own.mk	Wed Feb 11 08:33:22 2015	(r278568)
@@ -358,6 +358,7 @@ __DEFAULT_YES_OPTIONS = \
     CXX \
     DICT \
     DYNAMICROOT \
+    EE \
     EXAMPLES \
     FLOPPY \
     FORTH \

Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb 11 08:28:57 2015	(r278567)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb 11 08:33:22 2015	(r278568)
@@ -1458,6 +1458,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/9/tools/build/options/WITHOUT_EE (from r278554, stable/10/tools/build/options/WITHOUT_EE)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_EE	Wed Feb 11 08:33:22 2015	(r278568, copy of r278554, stable/10/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/9/usr.bin/Makefile
==============================================================================
--- stable/9/usr.bin/Makefile	Wed Feb 11 08:28:57 2015	(r278567)
+++ stable/9/usr.bin/Makefile	Wed Feb 11 08:33:22 2015	(r278568)
@@ -37,7 +37,6 @@ SUBDIR=	alias \
 	cut \
 	dirname \
 	du \
-	ee \
 	elf2aout \
 	elfdump \
 	enigma \
@@ -236,6 +235,10 @@ SUBDIR+=	calendar
 _clang=		clang
 .endif
 
+.if ${MK_EE} != "no"
+SUBDIR+=	ee
+.endif
+
 .if ${MK_HESIOD} != "no"
 SUBDIR+=	hesinfo
 .endif