sync

22 files changed, 22 insertions, 110 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 1d002394ddb..84e3d009e4d 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1785,14 +1785,10 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netbt
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 24050dfa327..732e423e9ad 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1808,14 +1808,10 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netbt
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index e6b5ef140d9..bde8ab59c89 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -1810,14 +1810,10 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index b4e9eb64ef5..55740c6b85b 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1689,14 +1689,10 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index e14e7f4a1ef..aa8036c22e3 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -1824,14 +1824,10 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index d46674e19a3..b9a6b356d80 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1746,14 +1746,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 19a2794d386..17bbe04845b 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1785,14 +1785,10 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netbt
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index e443e56a643..f388905b4a8 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1782,14 +1782,10 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netbt
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 714d55463cb..e7e367fa8e8 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1816,14 +1816,10 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netbt
 ./usr/libdata/perl5/site_perl/i386-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 4beb642fc9e..6e8ab236915 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1678,14 +1678,10 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/netbt
 ./usr/libdata/perl5/site_perl/sh-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index a3d44da0214..787e56939ac 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1684,14 +1684,10 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 96a1e3fb0cb..0e3eac43b45 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1750,14 +1750,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 9dcbfc318b3..98bc7603e1d 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1791,14 +1791,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index c59997e4e96..70ffcf6a8d7 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1745,14 +1745,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index d82adf556ca..7457f7c2ef7 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1693,14 +1693,10 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index f082b0c46f2..bacdddc644e 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1704,14 +1704,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 0758a22d752..c3caec6c458 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1780,14 +1780,10 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netbt
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index eca8aa374db..6b815c3618c 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1167,14 +1167,10 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netbt
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index a4aeb3d81ee..f3b706dff41 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1222,14 +1222,10 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netbt
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index eec8b4dc3d2..ef6dda8a4f7 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1102,14 +1102,10 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netbt
 ./usr/libdata/perl5/site_perl/vax-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index de75f0c9abd..2a8894ab4bc 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -1766,14 +1766,10 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/netatalk/phase2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/bluetooth.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/bt.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/netbt/sco.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/bt_var.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/h4.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/hci.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/hci_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netbt/l2cap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/l2cap_var.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netbt/rfcomm_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netdb.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netgroup.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netinet
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index e5c0cdfb35c..17491bc7f5d 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1064,14 +1064,10 @@
 ./usr/include/netatalk/phase2.h
 ./usr/include/netbt
 ./usr/include/netbt/bluetooth.h
-./usr/include/netbt/bt.h
 ./usr/include/netbt/bt_var.h
-./usr/include/netbt/h4.h
 ./usr/include/netbt/hci.h
-./usr/include/netbt/hci_var.h
 ./usr/include/netbt/l2cap.h
-./usr/include/netbt/l2cap_var.h
-./usr/include/netbt/rfcomm_var.h
+./usr/include/netbt/sco.h
 ./usr/include/netdb.h
 ./usr/include/netgroup.h
 ./usr/include/netinet