From owner-svn-src-head@FreeBSD.ORG  Fri Dec 21 21:00:01 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D6DD395B;
 Fri, 21 Dec 2012 21:00:01 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A10D88FC12;
 Fri, 21 Dec 2012 21:00:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLL01OC037166;
 Fri, 21 Dec 2012 21:00:01 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLL01qt037156;
 Fri, 21 Dec 2012 21:00:01 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212212100.qBLL01qt037156@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Dec 2012 21:00:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244562 - in head: contrib/mknod contrib/mtree usr.sbin
 usr.sbin/nmtree
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 21:00:01 -0000

Author: brooks
Date: Fri Dec 21 21:00:00 2012
New Revision: 244562
URL: http://svnweb.freebsd.org/changeset/base/244562

Log:
  Add NetBSD's mtree to the tree and install it as nmtree as the first step
  towards replacing our mtree.
  
  Sponsored by:	DARPA, AFRL
  Thanks to:	cristos@NetBSD for reviewing and committing my patches
  		wiz@NetBSD for fixing typos in my patches

Added:
  head/contrib/mknod/
     - copied from r244548, vendor/NetBSD/mknod/dist/
  head/contrib/mtree/
     - copied from r244548, vendor/NetBSD/mtree/dist/
  head/usr.sbin/nmtree/
  head/usr.sbin/nmtree/Makefile   (contents, props changed)
Modified:
  head/usr.sbin/Makefile

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Fri Dec 21 20:50:47 2012	(r244561)
+++ head/usr.sbin/Makefile	Fri Dec 21 21:00:00 2012	(r244562)
@@ -55,6 +55,7 @@ SUBDIR=	adduser \
 	nfsdumpstate \
 	nfsrevoke \
 	nfsuserd \
+	nmtree \
 	nologin \
 	pc-sysinstall \
 	pciconf \

Added: head/usr.sbin/nmtree/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/nmtree/Makefile	Fri Dec 21 21:00:00 2012	(r244562)
@@ -0,0 +1,26 @@
+#	$FreeBSD$
+
+.include <bsd.own.mk>
+
+.PATH: ${.CURDIR}/../../contrib/mtree
+
+PROG=		nmtree
+MAN=		nmtree.8
+SRCS=		compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
+		spec.c specspec.c verify.c
+LDADD+=		-lmd -lutil
+
+CFLAGS+=	-I${.CURDIR}/../../contrib/mknod
+.PATH:		${.CURDIR}/../../contrib/mknod
+SRCS+=		pack_dev.c
+
+CFLAGS+=	-I${.CURDIR}/../../lib/libnetbsd
+LIBNETBSDDIR=	${.OBJDIR}/../../lib/libnetbsd
+LIBNETBSD=	${LIBNETBSDDIR}/libnetbsd.a
+DPADD+=		{LIBNETBSD}
+LDADD+=		${LIBNETBSD}
+
+nmtree.8: mtree.8
+	cp ${.ALLSRC} ${.TARGET}
+
+.include <bsd.prog.mk>