svn commit: r290880 - in stable/9: share/man/man4 share/man/man5 tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:25:26 2015
New Revision: 290880
URL: https://svnweb.freebsd.org/changeset/base/290880

Log:
  MFstable/10 r290879:
  
  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 at 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/9/share/man/man4/Makefile
  stable/9/share/man/man5/Makefile
  stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/9/   (props changed)
  stable/9/share/   (props changed)
  stable/9/share/man/   (props changed)
  stable/9/share/man/man4/   (props changed)
  stable/9/share/man/man5/   (props changed)
  stable/9/tools/   (props changed)
  stable/9/tools/build/   (props changed)

Modified: stable/9/share/man/man4/Makefile
==============================================================================
--- stable/9/share/man/man4/Makefile	Sun Nov 15 20:23:09 2015	(r290879)
+++ stable/9/share/man/man4/Makefile	Sun Nov 15 20:25:26 2015	(r290880)
@@ -275,7 +275,6 @@ MAN=	aac.4 \
 	ng_atm.4 \
 	ngatmbase.4 \
 	ng_atmllc.4 \
-	ng_bluetooth.4 \
 	ng_bpf.4 \
 	ng_bridge.4 \
 	ng_bt3c.4 \
@@ -751,6 +750,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/9/share/man/man5/Makefile
==============================================================================
--- stable/9/share/man/man5/Makefile	Sun Nov 15 20:23:09 2015	(r290879)
+++ stable/9/share/man/man5/Makefile	Sun Nov 15 20:25:26 2015	(r290880)
@@ -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 \
@@ -79,6 +76,12 @@ MLINKS+=quota.user.5 quota.group.5
 MLINKS+=rc.conf.5 rc.conf.local.5
 MLINKS+=resolver.5 resolv.conf.5
 
+.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/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Sun Nov 15 20:23:09 2015	(r290879)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Sun Nov 15 20:25:26 2015	(r290880)
@@ -460,6 +460,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