Author: ngie
Date: Tue Nov 10 13:28:41 2015
New Revision: 290659
URL: https://svnweb.freebsd.org/changeset/base/290659
Log:
- Move ng_bluetooth.4 under MK_BLUETOOTH != no
- Move all section 5 bluetooth manpages under MK_BLUETOOTH != no
MFC after: 3 days
PR: 193260
Reported by: Philippe Michel <philippe.mich...@sfr.fr>
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/man/man4/Makefile
head/share/man/man5/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile Tue Nov 10 13:27:02 2015
(r290658)
+++ head/share/man/man4/Makefile Tue Nov 10 13:28:41 2015
(r290659)
@@ -311,7 +311,6 @@ MAN= aac.4 \
ng_atm.4 \
ngatmbase.4 \
ng_atmllc.4 \
- ng_bluetooth.4 \
ng_bpf.4 \
ng_bridge.4 \
ng_bt3c.4 \
@@ -821,6 +820,10 @@ _bhyve.4= bhyve.4
.endif
.endif
+.if ${MK_BLUETOOTH} != "no"
+MAN+= ng_bluetooth.4
+.endif
+
.if ${MACHINE_CPUARCH} == "mips"
_nvram2env.4= nvram2env.4
.endif
Modified: head/share/man/man5/Makefile
==============================================================================
--- head/share/man/man5/Makefile Tue Nov 10 13:27:02 2015
(r290658)
+++ head/share/man/man5/Makefile Tue Nov 10 13:28:41 2015
(r290659)
@@ -7,9 +7,6 @@
MAN= acct.5 \
ar.5 \
a.out.5 \
- bluetooth.device.conf.5 \
- bluetooth.hosts.5 \
- bluetooth.protocols.5 \
${_boot.config.5} \
core.5 \
devfs.5 \
@@ -84,6 +81,12 @@ MLINKS+=src.conf.5 src-env.conf.5
MAN+= autofs.5
.endif
+.if ${MK_BLUETOOTH} != "no"
+MAN+= bluetooth.device.conf.5 \
+ bluetooth.hosts.5 \
+ bluetooth.protocols.5
+.endif
+
.if ${MK_FREEBSD_UPDATE} != "no"
MAN+= freebsd-update.conf.5
.endif
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 10 13:27:02
2015 (r290658)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 10 13:28:41
2015 (r290659)
@@ -517,6 +517,10 @@ OLD_FILES+=usr/share/man/man3/sdp_regist
OLD_FILES+=usr/share/man/man3/sdp_search.3.gz
OLD_FILES+=usr/share/man/man3/sdp_unregister_service.3.gz
OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz
+OLD_FILES+=usr/share/man/man4/ng_bluetooth.4.gz
+OLD_FILES+=usr/share/man/man5/bluetooth.device.conf.5.gz
+OLD_FILES+=usr/share/man/man5/bluetooth.hosts.5.gz
+OLD_FILES+=usr/share/man/man5/bluetooth.protocols.5.gz
OLD_FILES+=usr/share/man/man5/hcsecd.conf.5.gz
OLD_FILES+=usr/share/man/man8/ath3kfw.8.gz
OLD_FILES+=usr/share/man/man8/bcmfw.8.gz
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
