From owner-svn-src-all@FreeBSD.ORG Thu Jan 30 21:25:03 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C636C4; Thu, 30 Jan 2014 21:25:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1D644179F; Thu, 30 Jan 2014 21:25:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0ULP24L041807; Thu, 30 Jan 2014 21:25:02 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0ULP2fR041802; Thu, 30 Jan 2014 21:25:02 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201401302125.s0ULP2fR041802@svn.freebsd.org> From: Brooks Davis Date: Thu, 30 Jan 2014 21:25:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261297 - in head: share/man/man5 share/mk tools/build/options usr.sbin/mtree 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jan 2014 21:25:03 -0000 Author: brooks Date: Thu Jan 30 21:25:01 2014 New Revision: 261297 URL: http://svnweb.freebsd.org/changeset/base/261297 Log: Merge from CheriBSD: commit 6b569451b92c48ccf1768da32e7e89189e1aa253 Author: Brooks Davis Date: Mon Jan 27 22:50:46 2014 +0000 Always install nmtree as mtree. For compability, link mtree to nmtree. X-MFC after: never Sponsored by: DARPA, AFRL Deleted: head/tools/build/options/WITHOUT_NMTREE Modified: head/share/man/man5/src.conf.5 head/share/mk/bsd.own.mk head/usr.sbin/mtree/Makefile head/usr.sbin/nmtree/Makefile Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Thu Jan 30 21:08:36 2014 (r261296) +++ head/share/man/man5/src.conf.5 Thu Jan 30 21:25:01 2014 (r261297) @@ -749,16 +749,6 @@ Set to not build NLS catalogs. .\" from FreeBSD: head/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 WITHOUT_NMTREE -.\" from FreeBSD: head/tools/build/options/WITHOUT_NMTREE 257138 2013-10-25 22:45:18Z brooks -Set to install -.Xr fmtree 8 -as -.Xr mtree 8 . -By default -.Xr nmtree 8 -is installed as -.Xr mtree 8 . .It Va WITHOUT_NS_CACHING .\" from FreeBSD: head/tools/build/options/WITHOUT_NS_CACHING 172803 2007-10-19 14:01:25Z ru Set to disable name caching in the Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Thu Jan 30 21:08:36 2014 (r261296) +++ head/share/mk/bsd.own.mk Thu Jan 30 21:25:01 2014 (r261297) @@ -321,7 +321,6 @@ __DEFAULT_YES_OPTIONS = \ NIS \ NLS \ NLS_CATALOGS \ - NMTREE \ NS_CACHING \ NTP \ OPENSSH \ Modified: head/usr.sbin/mtree/Makefile ============================================================================== --- head/usr.sbin/mtree/Makefile Thu Jan 30 21:08:36 2014 (r261296) +++ head/usr.sbin/mtree/Makefile Thu Jan 30 21:25:01 2014 (r261297) @@ -14,11 +14,6 @@ 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 Modified: head/usr.sbin/nmtree/Makefile ============================================================================== --- head/usr.sbin/nmtree/Makefile Thu Jan 30 21:08:36 2014 (r261296) +++ head/usr.sbin/nmtree/Makefile Thu Jan 30 21:25:01 2014 (r261297) @@ -4,8 +4,8 @@ .PATH: ${.CURDIR}/../../contrib/mtree -PROG= nmtree -MAN= nmtree.8 +PROG= mtree +MAN= mtree.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 @@ -20,14 +20,7 @@ LIBNETBSD= ${LIBNETBSDDIR}/libnetbsd.a DPADD+= ${LIBNETBSD} LDADD+= ${LIBNETBSD} -.if ${MK_NMTREE} != "no" -LINKS= ${BINDIR}/nmtree ${BINDIR}/mtree -MLINKS= nmtree.8 mtree.8 -.endif - -CLEANFILES+= nmtree.8 - -nmtree.8: mtree.8 - cp ${.ALLSRC} ${.TARGET} +LINKS= ${BINDIR}/mtree ${BINDIR}/nmtree +MLINKS= mtree.8 nmtree.8 .include