Date: Sun, 15 Nov 2015 20:23:09 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r290879 - in stable/10: share/man/man4 share/man/man5 tools/build/mk Message-ID: <201511152023.tAFKN9L5086956@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Nov 15 20:23:09 2015 New Revision: 290879 URL: https://svnweb.freebsd.org/changeset/base/290879 Log: 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 <philippe.michel7@sfr.fr> 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 Modified: stable/10/share/man/man4/Makefile stable/10/share/man/man5/Makefile stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/Makefile ============================================================================== --- stable/10/share/man/man4/Makefile Sun Nov 15 20:20:03 2015 (r290878) +++ stable/10/share/man/man4/Makefile Sun Nov 15 20:23:09 2015 (r290879) @@ -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 Modified: stable/10/share/man/man5/Makefile ============================================================================== --- stable/10/share/man/man5/Makefile Sun Nov 15 20:20:03 2015 (r290878) +++ stable/10/share/man/man5/Makefile Sun Nov 15 20:23:09 2015 (r290879) @@ -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 Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 15 20:20:03 2015 (r290878) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 15 20:23:09 2015 (r290879) @@ -296,6 +296,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/bcmfw.8.gz OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511152023.tAFKN9L5086956>