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

[Garrett Cooper]

Author: ngie
Date: Sun Mar  1 22:07:54 2015
New Revision: 279506
URL: https://svnweb.freebsd.org/changeset/base/279506

Log:
  MFC r278193:
  
  Add MK_FILE to control whether or not to build file(1), libmagic(3), etc
  
  Sponsored by: EMC / Isilon Storage Division

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

Modified: stable/10/lib/Makefile
==============================================================================
--- stable/10/lib/Makefile	Sun Mar  1 22:03:52 2015	(r279505)
+++ stable/10/lib/Makefile	Sun Mar  1 22:07:54 2015	(r279506)
@@ -59,7 +59,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libkvm \
 	${_libldns} \
 	liblzma \
-	libmagic \
+	${_libmagic} \
 	libmandoc \
 	libmemstat \
 	libmd \
@@ -171,6 +171,10 @@ _libbsnmp=	libbsnmp
 _clang=		clang
 .endif
 
+.if ${MK_FILE} != "no"
+_libmagic=	libmagic
+.endif
+
 .if ${MK_GPIB} != "no"
 _libgpib=	libgpib
 .endif

Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk	Sun Mar  1 22:03:52 2015	(r279505)
+++ stable/10/share/mk/bsd.own.mk	Sun Mar  1 22:07:54 2015	(r279506)
@@ -280,6 +280,7 @@ __DEFAULT_YES_OPTIONS = \
     ED_CRYPTO \
     EE \
     EXAMPLES \
+    FILE \
     FINGER \
     FLOPPY \
     FMTREE \

Copied: stable/10/tools/build/options/WITHOUT_FILE (from r278193, head/tools/build/options/WITHOUT_FILE)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/tools/build/options/WITHOUT_FILE	Sun Mar  1 22:07:54 2015	(r279506, copy of r278193, head/tools/build/options/WITHOUT_FILE)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr file 1
+and related programs.

Modified: stable/10/usr.bin/Makefile
==============================================================================
--- stable/10/usr.bin/Makefile	Sun Mar  1 22:03:52 2015	(r279505)
+++ stable/10/usr.bin/Makefile	Sun Mar  1 22:07:54 2015	(r279506)
@@ -45,7 +45,6 @@ SUBDIR=	alias \
 	expand \
 	false \
 	fetch \
-	file \
 	find \
 	fmt \
 	fold \
@@ -230,6 +229,10 @@ _clang=		clang
 SUBDIR+=	ee
 .endif
 
+.if ${MK_FILE} != "no"
+SUBDIR+=	file
+.endif
+
 .if ${MK_FINGER} != "no"
 SUBDIR+=	finger
 .endif