svn commit: r275414 - in projects/building-blocks: tools/build/mk usr.sbin

[Garrett Cooper]

Author: ngie
Date: Tue Dec  2 17:10:11 2014
New Revision: 275414
URL: https://svnweb.freebsd.org/changeset/base/275414

Log:
  Don't install usr.sbin/mountd if MK_NFS_SERVER == no

Modified:
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
  projects/building-blocks/usr.sbin/Makefile

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Tue Dec  2 17:08:24 2014	(r275413)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Tue Dec  2 17:10:11 2014	(r275414)
@@ -4130,6 +4130,7 @@ OLD_FILES+=usr/share/misc/windrv_stub.c
 .endif
 
 .if ${MK_NFS_SERVER} == no
+OLD_FILES+=etc/rc.d/mountd
 OLD_FILES+=etc/rc.d/nfscbd
 OLD_FILES+=etc/rc.d/nfsd
 OLD_FILES+=etc/rc.d/nfsuserd
@@ -4139,7 +4140,10 @@ OLD_FILES+=usr/sbin/nfsdumpstate
 OLD_FILES+=usr/sbin/nfsrevoke
 OLD_FILES+=usr/sbin/nfsuserd
 OLD_FILES+=usr/share/man/man4/nfsv4.4.gz
+OLD_FILES+=usr/share/man/man5/exports.5.gz
+OLD_FILES+=usr/share/man/man5/netgroup.5.gz
 OLD_FILES+=usr/share/man/man5/stablerestart.5.gz
+OLD_FILES+=usr/share/man/man8/mountd.8.gz
 OLD_FILES+=usr/share/man/man8/nfscbd.8.gz
 OLD_FILES+=usr/share/man/man8/nfsd.8.gz
 OLD_FILES+=usr/share/man/man8/nfsdumpstate.8.gz

Modified: projects/building-blocks/usr.sbin/Makefile
==============================================================================
--- projects/building-blocks/usr.sbin/Makefile	Tue Dec  2 17:08:24 2014	(r275413)
+++ projects/building-blocks/usr.sbin/Makefile	Tue Dec  2 17:10:11 2014	(r275414)
@@ -38,7 +38,6 @@ SUBDIR=	adduser \
 	mfiutil \
 	mixer \
 	mlxcontrol \
-	mountd \
 	mptutil \
 	mtest \
 	${_mtree} \
@@ -237,6 +236,7 @@ SUBDIR+=	nghook
 .endif
 
 .if ${MK_NFS_SERVER} != "no"
+SUBDIR+=	mountd
 SUBDIR+=	nfscbd
 SUBDIR+=	nfsd
 SUBDIR+=	nfsdumpstate