summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2016-05-06 08:42:33 +0000
committerngie <ngie@FreeBSD.org>2016-05-06 08:42:33 +0000
commit735cc6857991874cb7b579c5c3ea5f80fb89c0c7 (patch)
treea0310ea7688fa5d3a59307a914654446d03fc19b
parented879e9400e0f15b6720e4e3a0171a2fac670f4b (diff)
downloadFreeBSD-src-735cc6857991874cb7b579c5c3ea5f80fb89c0c7.zip
FreeBSD-src-735cc6857991874cb7b579c5c3ea5f80fb89c0c7.tar.gz
Only install NIS section 8 manpages if MK_NIS != no
MFC after: 1 week Sponsored by: EMC / Isilon Storage Division
-rw-r--r--share/man/man8/Makefile6
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc11
2 files changed, 16 insertions, 1 deletions
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 54b1314..c2a6194 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -13,7 +13,6 @@ MAN= crash.8 \
rc.subr.8 \
rescue.8 \
${_uefi.8} \
- yp.8
MLINKS= \
nanobsd.8 nanobsd.sh.8 \
@@ -25,9 +24,14 @@ MLINKS= \
rc.8 rc.pccard.8 \
rc.8 rc.serial.8 \
rc.8 rc.shutdown.8
+
+.if ${MK_NIS!= "no"
+MAN+= yp.8
+
MLINKS+=yp.8 NIS.8 \
yp.8 nis.8 \
yp.8 YP.8
+.endif
.if ${MACHINE_CPUARCH} == "amd64"
_uefi.8= uefi.8
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index ac33a13..66fd1ad 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -5998,6 +5998,13 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt
.endif
.if ${MK_NIS} == no
+OLD_FILES+=etc/rc.d/nisdomain
+OLD_FILES+=etc/rc.d/ypbind
+OLD_FILES+=etc/rc.d/yppasswdd
+OLD_FILES+=etc/rc.d/ypserv
+OLD_FILES+=etc/rc.d/ypset
+OLD_FILES+=etc/rc.d/ypupdated
+OLD_FILES+=etc/rc.d/ypxfrd
OLD_FILES+=usr/bin/ypcat
OLD_FILES+=usr/bin/ypchfn
OLD_FILES+=usr/bin/ypchpass
@@ -6040,6 +6047,10 @@ OLD_FILES+=usr/share/man/man5/netid.5.gz
OLD_FILES+=usr/share/man/man8/mknetid.8.gz
OLD_FILES+=usr/share/man/man8/rpc.yppasswdd.8.gz
OLD_FILES+=usr/share/man/man8/rpc.ypxfrd.8.gz
+OLD_FILES+=usr/share/man/man8/NIS.8.gz
+OLD_FILES+=usr/share/man/man8/YP.8.gz
+OLD_FILES+=usr/share/man/man8/yp.8.gz
+OLD_FILES+=usr/share/man/man8/nis.8.gz
OLD_FILES+=usr/share/man/man8/yp_mkdb.8.gz
OLD_FILES+=usr/share/man/man8/ypbind.8.gz
OLD_FILES+=usr/share/man/man8/ypinit.8.gz
OpenPOWER on IntegriCloud