svn commit: r245462 - in stable/9: share/man/man5 share/mk tools/build/options usr.sbin usr.sbin/mtree

[Brooks Davis]

Author: brooks
Date: Tue Jan 15 16:46:51 2013
New Revision: 245462
URL: http://svnweb.freebsd.org/changeset/base/245462

Log:
  MFC r244562,245241,245435
  
  Add NetBSD's mtree to the tree and install it as nmtree.
  
  Always install our mtree as /usr/sbin/fmtree and link it as
  /usr/sbin/mtree by default.
  
  Add a src.conf option WITH_NMTREE that causes NetBSD's mtree to be linked
  as /usr/sbin/mtree as well as /usr/sbin/nmtree.
  
  Sponsored by:	DARPA, AFRL

Added:
     - copied from r245460, head/contrib/mknod/
     - copied from r245442, head/contrib/mtree/
  stable/9/tools/build/options/WITH_NMTREE
     - copied, changed from r245241, head/tools/build/options/WITH_NMTREE
     - copied from r245442, head/usr.sbin/nmtree/
Directory Properties:
  stable/9/contrib/mknod/   (props changed)
  stable/9/contrib/mtree/   (props changed)
  stable/9/usr.sbin/nmtree/   (props changed)
Modified:
  stable/9/share/man/man5/src.conf.5
  stable/9/share/mk/bsd.own.mk
  stable/9/usr.sbin/Makefile   (contents, props changed)
  stable/9/usr.sbin/mtree/Makefile
Directory Properties:
  stable/9/share/man/man5/   (props changed)
  stable/9/share/mk/   (props changed)
  stable/9/tools/build/options/   (props changed)
  stable/9/usr.sbin/mtree/   (props changed)

Modified: stable/9/share/man/man5/src.conf.5
==============================================================================
--- stable/9/share/man/man5/src.conf.5	Tue Jan 15 16:41:52 2013	(r245461)
+++ stable/9/share/man/man5/src.conf.5	Tue Jan 15 16:46:51 2013	(r245462)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: stable/9/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru
 .\" $FreeBSD$
-.Dd May 13, 2012
+.Dd January 14, 2013
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -740,6 +740,16 @@ Set to not build NLS catalogs.
 .\" from FreeBSD: stable/9/tools/build/options/WITHOUT_NLS_CATALOGS 156932 2006-03-21 07:50:50Z ru
 Set to not build NLS catalog support for
 .Xr csh 1 .
+.It Va WITH_NMTREE
+.\" from FreeBSD: head/tools/build/options/WITH_NMTREE 245241 2013-01-09 21:07:08Z brooks
+Set to install
+.Xr nmtree 8
+as
+.Xr mtree 8 .
+By default
+.Xr fmtree 8
+is installed as
+.Xr mtree 8 .
 .It Va WITHOUT_NS_CACHING
 .\" from FreeBSD: stable/9/tools/build/options/WITHOUT_NS_CACHING 172803 2007-10-19 14:01:25Z ru
 Set to disable name caching in the

Modified: stable/9/share/mk/bsd.own.mk
==============================================================================
--- stable/9/share/mk/bsd.own.mk	Tue Jan 15 16:41:52 2013	(r245461)
+++ stable/9/share/mk/bsd.own.mk	Tue Jan 15 16:46:51 2013	(r245462)
@@ -428,6 +428,7 @@ __DEFAULT_NO_OPTIONS = \
     ICONV \
     IDEA \
     LIBCPLUSPLUS \
+    NMTREE \
     OFED \
     SHARED_TOOLCHAIN
 

Copied and modified: stable/9/tools/build/options/WITH_NMTREE (from r245241, head/tools/build/options/WITH_NMTREE)
==============================================================================
--- head/tools/build/options/WITH_NMTREE	Wed Jan  9 21:07:08 2013	(r245241, copy source)
+++ stable/9/tools/build/options/WITH_NMTREE	Tue Jan 15 16:46:51 2013	(r245462)
@@ -1,4 +1,4 @@
-\" $FreeBSD$
+.\" $FreeBSD$
 Set to install
 .Xr nmtree 8
 as

Modified: stable/9/usr.sbin/Makefile
==============================================================================
--- stable/9/usr.sbin/Makefile	Tue Jan 15 16:41:52 2013	(r245461)
+++ stable/9/usr.sbin/Makefile	Tue Jan 15 16:46:51 2013	(r245462)
@@ -54,6 +54,7 @@ SUBDIR=	adduser \
 	nfsdumpstate \
 	nfsrevoke \
 	nfsuserd \
+	nmtree \
 	nologin \
 	pc-sysinstall \
 	pciconf \

Modified: stable/9/usr.sbin/mtree/Makefile
==============================================================================
--- stable/9/usr.sbin/mtree/Makefile	Tue Jan 15 16:41:52 2013	(r245461)
+++ stable/9/usr.sbin/mtree/Makefile	Tue Jan 15 16:46:51 2013	(r245462)
@@ -1,10 +1,12 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../usr.bin/cksum
 
-PROG=	mtree
-MAN=	mtree.8 mtree.5
+PROG=	fmtree
+MAN=	fmtree.8 mtree.5
 SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
 SRCS+=	specspec.c
 
@@ -12,4 +14,14 @@ CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
 DPADD=	${LIBMD}
 LDADD=	-lmd
 
+.if ${MK_NMTREE} == "no"
+LINKS=	${BINDIR}/fmtree ${BINDIR}/mtree
+MLINKS=	fmtree.8 mtree.8
+.endif
+
+CLEANFILES+=	fmtree.8
+
+fmtree.8: mtree.8
+	cp ${.ALLSRC} ${.TARGET}
+
 .include <bsd.prog.mk>