Update files to remove when MK_BLUETOOTH=no.

1 files changed, 67 insertions, 28 deletions

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index c2a33a1..2e624a8 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -338,33 +338,50 @@ OLD_DIRS+=var/named/etc/namedb/dynamic
 #.endif
 
 .if ${MK_BLUETOOTH} == no
+OLD_FILES+=etc/bluetooth/hcsecd.conf
+OLD_FILES+=etc/bluetooth/hosts
+OLD_FILES+=etc/bluetooth/protocols
 OLD_FILES+=usr/bin/bthost
 OLD_FILES+=usr/bin/btsockstat
 OLD_FILES+=usr/bin/rfcomm_sppd
+OLD_FILES+=usr/include/bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bt3c.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
+OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_sco.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_h4.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_hci.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_ubt.h
 OLD_DIRS+=usr/include/netgraph/bluetooth/include
 OLD_DIRS+=usr/include/netgraph/bluetooth
-OLD_FILES+=usr/include/bluetooth.h
 OLD_FILES+=usr/include/sdp.h
 OLD_FILES+=usr/lib/libbluetooth.a
-OLD_FILES+=usr/lib/libbluetooth_p.a
-OLD_LIBS+=usr/lib/libbluetooth.so.2
 OLD_FILES+=usr/lib/libbluetooth.so
+OLD_LIBS+=usr/lib/libbluetooth.so.4
+OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libsdp.a
-OLD_FILES+=usr/lib/libsdp_p.a
-OLD_LIBS+=usr/lib/libsdp.so.2
 OLD_FILES+=usr/lib/libsdp.so
+OLD_LIBS+=usr/lib/libsdp.so.4
+OLD_FILES+=usr/lib/libsdp_p.a
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libbluetooth.a
+OLD_FILES+=usr/lib32/libbluetooth.so
+OLD_LIBS+=usr/lib32/libbluetooth.so.4
+OLD_FILES+=usr/lib32/libbluetooth_p.a
+OLD_FILES+=usr/lib32/libsdp.a
+OLD_FILES+=usr/lib32/libsdp.so
+OLD_LIBS+=usr/lib32/libsdp.so.4
+OLD_FILES+=usr/lib32/libsdp_p.a
+.endif
 OLD_FILES+=usr/sbin/bcmfw
 OLD_FILES+=usr/sbin/bt3cfw
+OLD_FILES+=usr/sbin/bthidcontrol
+OLD_FILES+=usr/sbin/bthidd
+OLD_FILES+=usr/sbin/btpand
 OLD_FILES+=usr/sbin/hccontrol
 OLD_FILES+=usr/sbin/hcsecd
 OLD_FILES+=usr/sbin/hcseriald
@@ -376,45 +393,67 @@ OLD_FILES+=usr/sbin/sdpd
 OLD_FILES+=usr/share/man/man1/bthost.1.gz
 OLD_FILES+=usr/share/man/man1/btsockstat.1.gz
 OLD_FILES+=usr/share/man/man1/rfcomm_sppd.1.gz
+OLD_FILES+=usr/share/man/man3/SDP_GET128.3.gz
+OLD_FILES+=usr/share/man/man3/SDP_GET16.3.gz
+OLD_FILES+=usr/share/man/man3/SDP_GET32.3.gz
+OLD_FILES+=usr/share/man/man3/SDP_GET64.3.gz
+OLD_FILES+=usr/share/man/man3/SDP_GET8.3.gz
+OLD_FILES+=usr/share/man/man3/SDP_PUT128.3.gz
+OLD_FILES+=usr/share/man/man3/SDP_PUT16.3.gz
+OLD_FILES+=usr/share/man/man3/SDP_PUT32.3.gz
+OLD_FILES+=usr/share/man/man3/SDP_PUT64.3.gz
+OLD_FILES+=usr/share/man/man3/SDP_PUT8.3.gz
+OLD_FILES+=usr/share/man/man3/bdaddr_any.3.gz
+OLD_FILES+=usr/share/man/man3/bdaddr_copy.3.gz
+OLD_FILES+=usr/share/man/man3/bdaddr_same.3.gz
 OLD_FILES+=usr/share/man/man3/bluetooth.3.gz
-OLD_FILES+=usr/share/man/man3/bt_gethostbyname.3.gz
+OLD_FILES+=usr/share/man/man3/bt_aton.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devaddr.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devclose.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devenum.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devfilter.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_clr.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_set.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_tst.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_clr.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_set.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_tst.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devinfo.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devinquiry.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devname.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devopen.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devreq.3.gz
+OLD_FILES+=usr/share/man/man3/bt_devsend.3.gz
+OLD_FILES+=usr/share/man/man3/bt_endhostent.3.gz
+OLD_FILES+=usr/share/man/man3/bt_endprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostbyaddr.3.gz
+OLD_FILES+=usr/share/man/man3/bt_gethostbyname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostent.3.gz
-OLD_FILES+=usr/share/man/man3/bt_sethostent.3.gz
-OLD_FILES+=usr/share/man/man3/bt_endhostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotobyname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotobynumber.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotoent.3.gz
-OLD_FILES+=usr/share/man/man3/bt_setprotoent.3.gz
-OLD_FILES+=usr/share/man/man3/bt_endprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_ntoa.3.gz
-OLD_FILES+=usr/share/man/man3/bt_aton.3.gz
+OLD_FILES+=usr/share/man/man3/bt_sethostent.3.gz
+OLD_FILES+=usr/share/man/man3/bt_setprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/sdp.3.gz
-OLD_FILES+=usr/share/man/man3/SDP_GET8.3.gz
-OLD_FILES+=usr/share/man/man3/SDP_GET16.3.gz
-OLD_FILES+=usr/share/man/man3/SDP_GET32.3.gz
-OLD_FILES+=usr/share/man/man3/SDP_GET64.3.gz
-OLD_FILES+=usr/share/man/man3/SDP_GET128.3.gz
-OLD_FILES+=usr/share/man/man3/SDP_PUT8.3.gz
-OLD_FILES+=usr/share/man/man3/SDP_PUT16.3.gz
-OLD_FILES+=usr/share/man/man3/SDP_PUT32.3.gz
-OLD_FILES+=usr/share/man/man3/SDP_PUT64.3.gz
-OLD_FILES+=usr/share/man/man3/SDP_PUT128.3.gz
-OLD_FILES+=usr/share/man/man3/sdp_open.3.gz
-OLD_FILES+=usr/share/man/man3/sdp_open_local.3.gz
+OLD_FILES+=usr/share/man/man3/sdp_attr2desc.3.gz
+OLD_FILES+=usr/share/man/man3/sdp_change_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_close.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_error.3.gz
-OLD_FILES+=usr/share/man/man3/sdp_search.3.gz
-OLD_FILES+=usr/share/man/man3/sdp_attr2desc.3.gz
-OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz
+OLD_FILES+=usr/share/man/man3/sdp_open.3.gz
+OLD_FILES+=usr/share/man/man3/sdp_open_local.3.gz
 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_change_service.3.gz
+OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.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
-OLD_FILES+=usr/share/man/man8/hcsecd.8.gz
+OLD_FILES+=usr/share/man/man8/bthidcontrol.8.gz
+OLD_FILES+=usr/share/man/man8/bthidd.8.gz
+OLD_FILES+=usr/share/man/man8/btpand.8.gz
 OLD_FILES+=usr/share/man/man8/hccontrol.8.gz
+OLD_FILES+=usr/share/man/man8/hcsecd.8.gz
 OLD_FILES+=usr/share/man/man8/hcseriald.8.gz
 OLD_FILES+=usr/share/man/man8/l2control.8.gz
 OLD_FILES+=usr/share/man/man8/l2ping.8.gz