d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from CheriBSD:

Browse Source 
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
This commit is contained in:
Brooks Davis 2014-01-30 21:25:01 +00:00
parent 38e233371c
commit 6adfbbbf16
5 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
share/man/man5/src.conf.5
View File

@ -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

1
share/mk/bsd.own.mk
View File

@ -321,7 +321,6 @@ __DEFAULT_YES_OPTIONS = \
NIS \
NLS \
NLS_CATALOGS \
NMTREE \
NS_CACHING \
NTP \
OPENSSH \

9
tools/build/options/WITHOUT_NMTREE
View File

@ -1,9 +0,0 @@
.\" $FreeBSD$
Set to install
.Xr fmtree 8
as
.Xr mtree 8 .
By default
.Xr nmtree 8
is installed as
.Xr mtree 8 .

5
usr.sbin/mtree/Makefile
View File

@ -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

15
usr.sbin/nmtree/Makefile
View File

@ -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 <bsd.prog.mk>