svn commit: r261299 - in head: share/mk tools/build/mk tools/build/options usr.sbin

[Brooks Davis]

Author: brooks
Date: Thu Jan 30 21:37:43 2014
New Revision: 261299
URL: http://svnweb.freebsd.org/changeset/base/261299

Log:
  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.
  
  MFC after:	4 weeks
  Sponsored by:	DARPA, AFRL

Added:
  head/tools/build/options/WITHOUT_FMTREE   (contents, props changed)
Modified:
  head/share/mk/bsd.own.mk
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.sbin/Makefile

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Thu Jan 30 21:32:25 2014	(r261298)
+++ head/share/mk/bsd.own.mk	Thu Jan 30 21:37:43 2014	(r261299)
@@ -275,6 +275,7 @@ __DEFAULT_YES_OPTIONS = \
     ED_CRYPTO \
     EXAMPLES \
     FLOPPY \
+    FMTREE \
     FORMAT_EXTENSIONS \
     FORTH \
     FP_LIBC \

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Jan 30 21:32:25 2014	(r261298)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Jan 30 21:37:43 2014	(r261299)
@@ -600,6 +600,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

Added: head/tools/build/options/WITHOUT_FMTREE
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_FMTREE	Thu Jan 30 21:37:43 2014	(r261299)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build and install
+.Pa /usr/sbin/fmtree .

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Thu Jan 30 21:32:25 2014	(r261298)
+++ head/usr.sbin/Makefile	Thu Jan 30 21:37:43 2014	(r261299)
@@ -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