diff options
| author | brooks <brooks@FreeBSD.org> | 2014-01-30 21:25:01 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2014-01-30 21:25:01 +0000 |
| commit | 70d3dd535136a5d8f4b47d26e8b3307d50b66a64 (patch) | |
| tree | 2e75a9fbb61ae92c9216c3d8137c5ef713d97368 /share | |
| parent | f1b43045b34f3a11eb2202d754836c300f3aee39 (diff) | |
| download | FreeBSD-src-70d3dd535136a5d8f4b47d26e8b3307d50b66a64.zip FreeBSD-src-70d3dd535136a5d8f4b47d26e8b3307d50b66a64.tar.gz | |
Merge from CheriBSD:
commit 6b569451b92c48ccf1768da32e7e89189e1aa253
Author: Brooks Davis <brooks@one-eyed-alien.net>
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
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man5/src.conf.5 | 10 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index f8152b0..35c192c 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -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 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 76ac493..7fe2b04 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -321,7 +321,6 @@ __DEFAULT_YES_OPTIONS = \ NIS \ NLS \ NLS_CATALOGS \ - NMTREE \ NS_CACHING \ NTP \ OPENSSH \ |
