Revert r262648 to stop severe tinderbox spamming on stable@.

usr.sbin/mtree/Makefile

@@ -6,7 +6,7 @@
 .PATH: ${.CURDIR}/../../usr.bin/cksum
 
 PROG=	fmtree
-MAN=	fmtree.8
+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
 

usr.sbin/mtree/mtree.5

@@ -259,6 +259,13 @@ The
 entry format was added by
 .Nx .
 .Sh BUGS
+The
+.Fx
+implementation of mtree does not currently support
+the
+.Nm
+2.0
+format.
 The requirement for a
 .Dq #mtree
 signature line is new and not yet widely implemented.

usr.sbin/nmtree/Makefile

@@ -4,8 +4,8 @@
 
 .PATH: ${.CURDIR}/../../contrib/mtree
 
-PROG=		mtree
-MAN=		mtree.5 mtree.8
+PROG=		nmtree
+MAN=		nmtree.8
 SRCS=		compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
 		only.c spec.c specspec.c verify.c
 LDADD+=		-lmd -lutil