19 files changed, 91 insertions, 91 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
diff --git a/distrib/sets/lists/comp/md.powerpc b/distrib/sets/lists/comp/md.powerpc
index b5b77cd9625..edfe5813dd6 100644
--- a/distrib/sets/lists/comp/md.powerpc
+++ b/distrib/sets/lists/comp/md.powerpc
@@ -61,8 +61,8 @@
 ./usr/include/readline/keymaps.h
 ./usr/include/readline/readline.h
 ./usr/lib/crtbegin.o
-./usr/lib/crtend.o
 ./usr/lib/crtbeginS.o
+./usr/lib/crtend.o
 ./usr/lib/crtendS.o
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/SYSCALLS.c.X
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/cc1
@@ -83,25 +83,8 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/soft-float
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/soft-float/libgcc.a
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/specs
-./usr/lib/libbfd.a
-./usr/lib/libmmalloc.a
-./usr/lib/libopcodes.a
-./usr/lib/libreadline.a
-./usr/lib/scrt0.o
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
-./usr/share/man/cat3/dlclose.0
-./usr/share/man/cat3/dlctl.0
-./usr/share/man/cat3/dlerror.0
-./usr/share/man/cat3/dlfcn.0
-./usr/share/man/cat3/dlopen.0
-./usr/share/man/cat3/dlsym.0
-./usr/share/man/cat3/kvm_dump.0
-./usr/share/man/cat3/kvm_dump_inval.0
-./usr/share/man/cat3/kvm_dump_mkheader.0
-./usr/share/man/cat3/kvm_dump_wrtheader.0
 ./usr/lib/libacl_pic.a
+./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libc_r_pic.a
 ./usr/lib/libcom_err_pic.a
@@ -109,6 +92,7 @@
 ./usr/lib/libcurses++_pic.a
 ./usr/lib/libcurses_pic.a
 ./usr/lib/libdes_pic.a
+./usr/lib/libdl_pic.a
 ./usr/lib/libedit_pic.a
 ./usr/lib/libform_pic.a
 ./usr/lib/libg2c_pic.a
@@ -120,13 +104,16 @@
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
+./usr/lib/libmmalloc.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
+./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libperl_pic.a
+./usr/lib/libreadline.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
 ./usr/lib/libstdc++_pic.a
@@ -136,7 +123,7 @@
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
-./usr/lib/libdl_pic.a
+./usr/lib/scrt0.o
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/elf32ppc.x
 ./usr/libdata/ldscripts/elf32ppc.xbn
@@ -144,3 +131,16 @@
 ./usr/libdata/ldscripts/elf32ppc.xr
 ./usr/libdata/ldscripts/elf32ppc.xs
 ./usr/libdata/ldscripts/elf32ppc.xu
+./usr/share/man/cat1/gdb.0
+./usr/share/man/cat1/objcopy.0
+./usr/share/man/cat1/objdump.0
+./usr/share/man/cat3/dlclose.0
+./usr/share/man/cat3/dlctl.0
+./usr/share/man/cat3/dlerror.0
+./usr/share/man/cat3/dlfcn.0
+./usr/share/man/cat3/dlopen.0
+./usr/share/man/cat3/dlsym.0
+./usr/share/man/cat3/kvm_dump.0
+./usr/share/man/cat3/kvm_dump_inval.0
+./usr/share/man/cat3/kvm_dump_mkheader.0
+./usr/share/man/cat3/kvm_dump_wrtheader.0
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 869376f0cca..521ac9bf07c 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -268,8 +268,8 @@
 ./usr/include/dev/midisynvar.h
 ./usr/include/dev/midivar.h
 ./usr/include/dev/mii
-./usr/include/dev/mii/brgphyreg.h
 ./usr/include/dev/mii/amphyreg.h
+./usr/include/dev/mii/brgphyreg.h
 ./usr/include/dev/mii/icsphyreg.h
 ./usr/include/dev/mii/inphyreg.h
 ./usr/include/dev/mii/iophyreg.h
diff --git a/distrib/sets/lists/man/md.powerpc b/distrib/sets/lists/man/md.powerpc
index 40600ede1bc..f08d3159af5 100644
--- a/distrib/sets/lists/man/md.powerpc
+++ b/distrib/sets/lists/man/md.powerpc
@@ -1,2 +1,2 @@
-./usr/share/man/cat8/ldconfig.0
 ./usr/share/man/cat1/ldd.0
+./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/md.sun3 b/distrib/sets/lists/man/md.sun3
index c687db7602d..56c9853cfc6 100644
--- a/distrib/sets/lists/man/md.sun3
+++ b/distrib/sets/lists/man/md.sun3
@@ -1,15 +1,5 @@
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
-./usr/share/man/cat4/sun3/bwtwo.0
-./usr/share/man/cat4/sun3/cgfour.0
-./usr/share/man/cat4/sun3/cgtwo.0
-./usr/share/man/cat4/sun3/ie.0
-./usr/share/man/cat4/sun3/kmem.0
-./usr/share/man/cat4/sun3/le.0
-./usr/share/man/cat4/sun3/leds.0
-./usr/share/man/cat4/sun3/mem.0
 ./usr/share/man/cat5/ar.0
 ./usr/share/man/cat5/ranlib.0
 ./usr/share/man/cat8/ldconfig.0
-./usr/share/man/cat8/sun3/MAKEDEV.0
-./usr/share/man/cat8/sun3/makedev.0
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 5b3dadd125b..853922ec601 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -913,6 +913,7 @@
 ./usr/share/man/cat4/amiga/ser.0
 ./usr/share/man/cat4/amiga/wesc.0
 ./usr/share/man/cat4/amiga/zssc.0
+./usr/share/man/cat4/amphy.0
 ./usr/share/man/cat4/an.0
 ./usr/share/man/cat4/arandom.0
 ./usr/share/man/cat4/arc
@@ -1174,6 +1175,14 @@
 ./usr/share/man/cat4/stdout.0
 ./usr/share/man/cat4/ste.0
 ./usr/share/man/cat4/sun3
+./usr/share/man/cat4/sun3/bwtwo.0
+./usr/share/man/cat4/sun3/cgfour.0
+./usr/share/man/cat4/sun3/cgtwo.0
+./usr/share/man/cat4/sun3/ie.0
+./usr/share/man/cat4/sun3/kmem.0
+./usr/share/man/cat4/sun3/le.0
+./usr/share/man/cat4/sun3/leds.0
+./usr/share/man/cat4/sun3/mem.0
 ./usr/share/man/cat4/sv.0
 ./usr/share/man/cat4/svnd.0
 ./usr/share/man/cat4/tb.0
@@ -1554,7 +1563,6 @@
 ./usr/share/man/cat8/i386/memconfig.0
 ./usr/share/man/cat8/i386/moused.0
 ./usr/share/man/cat8/i386/wicontrol.0
-./usr/share/man/cat8/spppcontrol.0
 ./usr/share/man/cat8/i386/zzz.0
 ./usr/share/man/cat8/identd.0
 ./usr/share/man/cat8/ifconfig.0
@@ -1750,6 +1758,7 @@
 ./usr/share/man/cat8/sparc/eeprom.0
 ./usr/share/man/cat8/sparc/installboot.0
 ./usr/share/man/cat8/sparc/makedev.0
+./usr/share/man/cat8/spppcontrol.0
 ./usr/share/man/cat8/spray.0
 ./usr/share/man/cat8/sprayd.0
 ./usr/share/man/cat8/sshd.0
@@ -1760,8 +1769,10 @@
 ./usr/share/man/cat8/sudo.0
 ./usr/share/man/cat8/suexec.0
 ./usr/share/man/cat8/sun3
+./usr/share/man/cat8/sun3/MAKEDEV.0
 ./usr/share/man/cat8/sun3/eeprom.0
 ./usr/share/man/cat8/sun3/installboot.0
+./usr/share/man/cat8/sun3/makedev.0
 ./usr/share/man/cat8/supfilesrv.0
 ./usr/share/man/cat8/supscan.0
 ./usr/share/man/cat8/supservers.0
@@ -1914,4 +1925,3 @@
 ./usr/share/man/man8/sun3
 ./usr/share/man/man8/vax
 ./usr/share/man/man9
-./usr/share/man/cat4/amphy.0