svn commit: r245241 - in head: share/man/man5 share/mk tools/build/options usr.sbin/mtree usr.sbin/nmtree

[Brooks Davis]

Author: brooks
Date: Wed Jan  9 21:07:08 2013
New Revision: 245241
URL: http://svnweb.freebsd.org/changeset/base/245241

Log:
  Always install our mtree as /usr/sbin/fmtree and link it as
  /usr/sbin/mtree by default.
  
  Add a src.conf option WITH_NMTREE that causes NetBSD's mtree to be linked
  as /usr/sbin/mtree as well as /usr/sbin/nmtree.

Added:
  head/tools/build/options/WITH_NMTREE   (contents, props changed)
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	Wed Jan  9 20:39:29 2013	(r245240)
+++ head/share/man/man5/src.conf.5	Wed Jan  9 21:07:08 2013	(r245241)
@@ -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

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Wed Jan  9 20:39:29 2013	(r245240)
+++ head/share/mk/bsd.own.mk	Wed Jan  9 21:07:08 2013	(r245241)
@@ -431,6 +431,7 @@ __DEFAULT_NO_OPTIONS = \
     ICONV \
     IDEA \
     INSTALL_AS_USER \
+    NMTREE \
     NAND \
     OFED \
     SHARED_TOOLCHAIN

Added: head/tools/build/options/WITH_NMTREE
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITH_NMTREE	Wed Jan  9 21:07:08 2013	(r245241)
@@ -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 .

Modified: head/usr.sbin/mtree/Makefile
==============================================================================
--- head/usr.sbin/mtree/Makefile	Wed Jan  9 20:39:29 2013	(r245240)
+++ head/usr.sbin/mtree/Makefile	Wed Jan  9 21:07:08 2013	(r245241)
@@ -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>

Modified: head/usr.sbin/nmtree/Makefile
==============================================================================
--- head/usr.sbin/nmtree/Makefile	Wed Jan  9 20:39:29 2013	(r245240)
+++ head/usr.sbin/nmtree/Makefile	Wed Jan  9 21:07:08 2013	(r245241)
@@ -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}