svn commit: r262650 - in stable/10: share/mk tools/build/mk tools/build/options usr.sbin

[Brooks Davis]

Author: brooks
Date: Sat Mar  1 04:25:52 2014
New Revision: 262650
URL: http://svnweb.freebsd.org/changeset/base/262650

Log:
  MFC r261299:
  
  Merge from CheriBSD:
  commit 2d581e8caf79d7a0f5a24590eccd06da90cccb74
  Author: Brooks Davis <brooks at one-eyed-alien.net>
  Date:   Mon Jan 27 22:57:51 2014 +0000
  
  	Add WITHOUT_FMTREE to disable building fmtree.
  
  Sponsored by:	DARPA, AFRL

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

Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk	Sat Mar  1 04:16:54 2014	(r262649)
+++ stable/10/share/mk/bsd.own.mk	Sat Mar  1 04:25:52 2014	(r262650)
@@ -274,6 +274,7 @@ __DEFAULT_YES_OPTIONS = \
     ED_CRYPTO \
     EXAMPLES \
     FLOPPY \
+    FMTREE \
     FORMAT_EXTENSIONS \
     FORTH \
     FP_LIBC \

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Sat Mar  1 04:16:54 2014	(r262649)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Sat Mar  1 04:25:52 2014	(r262650)
@@ -630,6 +630,11 @@ OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/libexec/cc1plus
 .endif
 
+.if ${MK_FMTREE} == no
+OLD_FILES+=usr/sbin/fmtree
+OLD_FILES+=usr/share/man/man8/fmtree.8.gz
+.endif
+
 .if ${MK_GNUCXX} == no
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/include/c++/4.2/algorithm

Copied: stable/10/tools/build/options/WITHOUT_FMTREE (from r261299, head/tools/build/options/WITHOUT_FMTREE)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/tools/build/options/WITHOUT_FMTREE	Sat Mar  1 04:25:52 2014	(r262650, copy of r261299, head/tools/build/options/WITHOUT_FMTREE)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build and install
+.Pa /usr/sbin/fmtree .

Modified: stable/10/usr.sbin/Makefile
==============================================================================
--- stable/10/usr.sbin/Makefile	Sat Mar  1 04:16:54 2014	(r262649)
+++ stable/10/usr.sbin/Makefile	Sat Mar  1 04:25:52 2014	(r262650)
@@ -48,7 +48,7 @@ SUBDIR=	adduser \
 	mountd \
 	mptutil \
 	mtest \
-	mtree \
+	${_mtree} \
 	newsyslog \
 	nfscbd \
 	nfsd \
@@ -142,6 +142,10 @@ SUBDIR+=	fdread
 SUBDIR+=	fdwrite
 .endif
 
+.if ${MK_FMTREE} != "no"
+SUBDIR+=	mtree
+.endif
+
 .if ${MK_FREEBSD_UPDATE} != "no"
 SUBDIR+=	freebsd-update
 .endif