diff options
| -rw-r--r-- | share/man/man5/src.conf.5 | 12 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 | ||||
| -rw-r--r-- | tools/build/options/WITH_NMTREE | 9 | ||||
| -rw-r--r-- | usr.sbin/mtree/Makefile | 16 | ||||
| -rw-r--r-- | usr.sbin/nmtree/Makefile | 7 |
5 files changed, 42 insertions, 3 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index faa117f..16f01ea 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 236279 2012-05-30 02:37:20Z gjb .\" $FreeBSD$ -.Dd November 5, 2012 +.Dd January 9, 2013 .Dt SRC.CONF 5 .Os .Sh NAME @@ -804,6 +804,16 @@ 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 WITH_NMTREE +\" $FreeBSD$ +Set to install +.Xr nmtree 8 +as +.Xr mtree 8 . +By default +.Xr fmtree 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 78af8fb..bb99388 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -431,6 +431,7 @@ __DEFAULT_NO_OPTIONS = \ ICONV \ IDEA \ INSTALL_AS_USER \ + NMTREE \ NAND \ OFED \ SHARED_TOOLCHAIN diff --git a/tools/build/options/WITH_NMTREE b/tools/build/options/WITH_NMTREE new file mode 100644 index 0000000..1909a36 --- /dev/null +++ b/tools/build/options/WITH_NMTREE @@ -0,0 +1,9 @@ +\" $FreeBSD$ +Set to install +.Xr nmtree 8 +as +.Xr mtree 8 . +By default +.Xr fmtree 8 +is installed as +.Xr mtree 8 . diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile index cbc4fd9..c378455 100644 --- a/usr.sbin/mtree/Makefile +++ b/usr.sbin/mtree/Makefile @@ -1,10 +1,12 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../usr.bin/cksum -PROG= mtree -MAN= mtree.8 mtree.5 +PROG= fmtree +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 @@ -12,4 +14,14 @@ 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 + cp ${.ALLSRC} ${.TARGET} + .include <bsd.prog.mk> diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile index 58e46ea..1b8cc01 100644 --- a/usr.sbin/nmtree/Makefile +++ b/usr.sbin/nmtree/Makefile @@ -20,6 +20,13 @@ 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} |
