From 0307499056589e642c1ac522e28439406d82e115 Mon Sep 17 00:00:00 2001 From: ngie Date: Sun, 15 Nov 2015 20:23:09 +0000 Subject: [PATCH] MFC r290659,r290660: r290659: - Move ng_bluetooth.4 under MK_BLUETOOTH != no - Move all section 5 bluetooth manpages under MK_BLUETOOTH != no PR: 193260 Reported by: Philippe Michel Sponsored by: EMC / Isilon Storage Division r290660: Move the MK_BLUETOOTH block down below the architecture specific sections by the other generic options PR: 193260 Sponsored by: EMC / Isilon Storage Divisions git-svn-id: svn://svn.freebsd.org/base/stable/10@290879 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- share/man/man4/Makefile | 5 ++++- share/man/man5/Makefile | 9 ++++++--- tools/build/mk/OptionalObsoleteFiles.inc | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 80cf3e951..dad7ecd10 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -297,7 +297,6 @@ MAN= aac.4 \ ng_atm.4 \ ngatmbase.4 \ ng_atmllc.4 \ - ng_bluetooth.4 \ ng_bpf.4 \ ng_bridge.4 \ ng_bt3c.4 \ @@ -816,6 +815,10 @@ _nvram2env.4= nvram2env.4 SUBDIR= man4.${MACHINE_CPUARCH} .endif +.if ${MK_BLUETOOTH} != "no" +MAN+= ng_bluetooth.4 +.endif + .if ${MK_CCD} != "no" _ccd.4= ccd.4 .endif diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index a3e8c0f36..fce2ec921 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -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 \ @@ -83,6 +80,12 @@ MLINKS+=resolver.5 resolv.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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index ade842b3f..549b7b6ee 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -296,6 +296,10 @@ OLD_FILES+=usr/share/man/man3/sdp_register_service.3.gz 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/bcmfw.8.gz OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz -- 2.45.0