sync

14 files changed, 57 insertions, 57 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 972cc053859..6e4389b0329 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -588,6 +588,8 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/tcic2var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/tropicreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/tropicvar.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/twereg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/twevar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/uhareg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/uhavar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/vgavar.ph
@@ -650,8 +652,8 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/inphyreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/iophyreg.ph
@@ -1234,6 +1236,8 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netiso/tp_user.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netiso/tp_var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netiso/tuba_table.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/netnatm
+./usr/libdata/perl5/site_perl/alpha-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netns
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netns/idp.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netns/idp_var.ph
@@ -1675,7 +1679,3 @@
 ./usr/share/info/ld.info-1
 ./usr/share/info/ld.info-2
 ./usr/share/info/ld.info-3
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/twereg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/twevar.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netnatm
-./usr/libdata/perl5/site_perl/alpha-openbsd/netnatm/natm.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 13d31810771..4aec9284519 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -624,6 +624,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tcic2var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tropicreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tropicvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twevar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/uhareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/uhavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/vgavar.ph
@@ -686,8 +688,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/inphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/iophyreg.ph
@@ -1304,6 +1306,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tp_user.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tuba_table.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
+./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp_var.ph
@@ -1736,7 +1740,3 @@
 ./usr/share/keymaps/amiga/fr.map
 ./usr/share/keymaps/amiga/sw.map
 ./usr/share/keymaps/amiga/us.map
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twereg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twevar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
-./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index f6a773297dc..686fdbd3795 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -432,8 +432,10 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/stireg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/stivar.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/twereg.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/twevar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/mii/xmphyreg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/auviavar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/cmpcireg.ph
@@ -470,6 +472,8 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet6/ip6_var.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet6/ip6protosw.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/netnatm
+./usr/libdata/perl5/site_perl/mips-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/pcap-int.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/stdbool.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/sys/ataio.ph
@@ -485,7 +489,3 @@
 ./usr/mipsel-unknown-openbsd2.8/bin
 ./usr/mipsel-unknown-openbsd2.8/lib
 ./usr/mipsel-unknown-openbsd2.8/lib/ldscripts
-./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/twereg.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/twevar.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/netnatm
-./usr/libdata/perl5/site_perl/mips-openbsd/netnatm/natm.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index ecacf2a1fee..06b17055e57 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -583,6 +583,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tcic2var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tropicreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tropicvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twevar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/uhareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/uhavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/vgavar.ph
@@ -645,8 +647,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/inphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/iophyreg.ph
@@ -1298,6 +1300,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tp_user.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tuba_table.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
+./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp_var.ph
@@ -1732,7 +1736,3 @@
 ./usr/mdec/uboot.lif
 ./usr/sbin/grfinfo
 ./usr/sbin/hilinfo
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twereg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twevar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
-./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 5a6d98902eb..af7c85dd516 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -587,6 +587,8 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/tcic2var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/tropicreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/tropicvar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/twereg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/twevar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/uhareg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/uhavar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/vgavar.ph
@@ -649,8 +651,8 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/inphyreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/iophyreg.ph
@@ -1294,6 +1296,8 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/netiso/tp_user.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netiso/tp_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netiso/tuba_table.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/netnatm
+./usr/libdata/perl5/site_perl/i386-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netns
 ./usr/libdata/perl5/site_perl/i386-openbsd/netns/idp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netns/idp_var.ph
@@ -1749,7 +1753,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/twereg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/twevar.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netnatm
-./usr/libdata/perl5/site_perl/i386-openbsd/netnatm/natm.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index c58425e241f..5afb49fbd7e 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -581,6 +581,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/stivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tropicreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tropicvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twevar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/uhareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/uhavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/vgavar.ph
@@ -643,8 +645,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/inphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/iophyreg.ph
@@ -1295,6 +1297,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tp_user.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tuba_table.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
+./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp_var.ph
@@ -1716,7 +1720,3 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/zlib.ph
 ./usr/libexec/ld.so
 ./usr/local/libdata/perl5/site_perl/m68k-openbsd
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twereg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twevar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
-./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index e9678e84a19..f01064a128c 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -583,6 +583,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tcic2var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tropicreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tropicvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twevar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/uhareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/uhavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/vgavar.ph
@@ -645,8 +647,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/inphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/iophyreg.ph
@@ -1300,6 +1302,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tp_user.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tuba_table.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
+./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp_var.ph
@@ -1729,7 +1733,3 @@
 ./usr/mdec/rboot
 ./usr/mdec/sboot
 ./usr/mdec/stboot
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twereg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twevar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
-./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index b33d6e26107..f19374c5c31 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -379,6 +379,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/rijndael.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/stireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/stivar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/twereg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/twevar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/xmphyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/cmpcireg.ph
@@ -411,6 +413,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/ip6_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/ip6protosw.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm
+./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/pcap-int.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/stdbool.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/ataio.ph
@@ -429,7 +433,3 @@
 ./usr/mdec/installboot
 ./usr/mdec/netboot
 ./usr/mdec/stboot
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/twereg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/twevar.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm
-./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm/natm.ph
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 661a3e7ed2c..5c700200339 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -564,6 +564,8 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/tcic2var.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/tropicreg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/tropicvar.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/twereg.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/twevar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/uhareg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/uhavar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/vgavar.ph
@@ -626,8 +628,8 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/mii
-./usr/libdata/perl5/site_perl/mips-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/mii/inphyreg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/mii/iophyreg.ph
@@ -1252,6 +1254,8 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/netiso/tp_user.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netiso/tp_var.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netiso/tuba_table.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/netnatm
+./usr/libdata/perl5/site_perl/mips-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netns
 ./usr/libdata/perl5/site_perl/mips-openbsd/netns/idp.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netns/idp_var.ph
@@ -1752,7 +1756,3 @@
 ./usr/share/info/ld.info-1
 ./usr/share/info/ld.info-2
 ./usr/share/info/ld.info-3
-./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/twereg.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/dev/ic/twevar.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/netnatm
-./usr/libdata/perl5/site_perl/mips-openbsd/netnatm/natm.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index beed0220573..3b31686f4ca 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -636,8 +636,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/inphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/iophyreg.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index f2aac892fb8..c13a0882b71 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -250,6 +250,8 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/tcic2var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/tropicreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/tropicvar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/twereg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/twevar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/uhareg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/uhavar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/vgavar.ph
@@ -312,8 +314,8 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/inphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/iophyreg.ph
@@ -898,6 +900,8 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netiso/tp_user.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netiso/tp_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netiso/tuba_table.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/netnatm
+./usr/libdata/perl5/site_perl/sparc-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netns
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netns/idp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netns/idp_var.ph
@@ -1722,7 +1726,3 @@
 ./usr/sbin/eeprom
 ./usr/sbin/fdformat
 ./usr/sbin/screenblank
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/twereg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/twevar.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netnatm
-./usr/libdata/perl5/site_perl/sparc-openbsd/netnatm/natm.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index fabb6f87eba..0a919c28f4e 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -583,6 +583,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tcic2var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tropicreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tropicvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twevar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/uhareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/uhavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/vgavar.ph
@@ -645,8 +647,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/inphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/iophyreg.ph
@@ -1263,6 +1265,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tp_user.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netiso/tuba_table.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
+./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp_var.ph
@@ -1742,7 +1746,3 @@
 ./usr/mdec/ufsboot
 ./usr/sbin/eeprom
 ./usr/sbin/screenblank
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twereg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/twevar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
-./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 47b188560ce..05d4ed50773 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -257,8 +257,8 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/amphyreg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/brgphyreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/inphyreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/iophyreg.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index f8b50812980..228be5dc595 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1252,6 +1252,7 @@
 ./usr/sbin/setobjstat
 ./usr/sbin/sliplogin
 ./usr/sbin/slstats
+./usr/sbin/spppcontrol
 ./usr/sbin/spray
 ./usr/sbin/sshd
 ./usr/sbin/stdethers
@@ -2550,4 +2551,3 @@
 ./var/yp/Makefile.yp
 ./var/yp/Makefile.yp.dist
 ./var/yp/README
-./usr/sbin/spppcontrol