sync

17 files changed, 15 insertions, 104 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index fbd6236993e..c74b65d87f0 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -788,8 +788,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/mk48txxreg.ph
@@ -935,9 +934,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii
@@ -1319,7 +1315,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index abd9def3150..93e22f7b761 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -818,8 +818,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/mk48txxreg.ph
@@ -965,9 +964,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/mii
@@ -1349,7 +1345,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index e50f21f5593..0d123b57d5b 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -805,8 +805,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mk48txxreg.ph
@@ -952,9 +951,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii
@@ -1336,7 +1332,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index cb1ff9eea68..6713e6363be 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -736,8 +736,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/mk48txxreg.ph
@@ -883,9 +882,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/mii
@@ -1267,7 +1263,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 52642cfbeac..594a94fc323 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -743,8 +743,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/mk48txxreg.ph
@@ -890,9 +889,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii
@@ -1274,7 +1270,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index a64d40f2c78..560fbd28c30 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -702,8 +702,7 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/mk48txxreg.ph
@@ -849,9 +848,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/mii
@@ -1233,7 +1229,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index f5a6e82c302..438303f2426 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -707,8 +707,7 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/mk48txxreg.ph
@@ -854,9 +853,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/mii
@@ -1238,7 +1234,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 8d8bc9514a5..cc5649c97d1 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -673,8 +673,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/mk48txxreg.ph
@@ -820,9 +819,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii
@@ -1204,7 +1200,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index ee04b764568..57353a7ed58 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -738,8 +738,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mk48txxreg.ph
@@ -885,9 +884,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii
@@ -1269,7 +1265,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index ce48e18eace..3379c885025 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -705,8 +705,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mk48txxreg.ph
@@ -852,9 +851,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii
@@ -1236,7 +1232,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 93237bc1c55..cd16e4eaed1 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -736,8 +736,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/mk48txxreg.ph
@@ -883,9 +882,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii
@@ -1267,7 +1263,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 43c316dfaaa..dac47a780bc 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -731,8 +731,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/mk48txxreg.ph
@@ -878,9 +877,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii
@@ -1262,7 +1258,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index abc35f5f2eb..347b21a5120 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -276,8 +276,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/mk48txxreg.ph
@@ -423,9 +422,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii
@@ -807,7 +803,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 8be1c1d3d92..939a73accd8 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -334,8 +334,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/mk48txxreg.ph
@@ -481,9 +480,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/mii
@@ -865,7 +861,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 2e52711e5ee..64b72d3b9e3 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -759,8 +759,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mc146818reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mc6845.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mc6845reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mc68681reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mc68681var.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mfireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mfivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/mk48txxreg.ph
@@ -906,9 +905,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/viasioreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/wbsioreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/wdsreg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/wssreg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/wssvar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/midi_if.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii
@@ -1290,7 +1286,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wskbdraw.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wskbdvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsksymdef.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsksymvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsmoused.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsmouseinput.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/wscons/wsmousevar.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 030934a81d9..28379652131 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -280,8 +280,6 @@
 ./usr/include/dev/ic/mc146818reg.h
 ./usr/include/dev/ic/mc6845.h
 ./usr/include/dev/ic/mc6845reg.h
-./usr/include/dev/ic/mc68681reg.h
-./usr/include/dev/ic/mc68681var.h
 ./usr/include/dev/ic/mfireg.h
 ./usr/include/dev/ic/mfivar.h
 ./usr/include/dev/ic/mk48txxreg.h
@@ -427,9 +425,6 @@
 ./usr/include/dev/isa/viasioreg.h
 ./usr/include/dev/isa/wbsioreg.h
 ./usr/include/dev/isa/wdsreg.h
-./usr/include/dev/isa/wssreg.h
-./usr/include/dev/isa/wssvar.h
-./usr/include/dev/isa/ymvar.h
 ./usr/include/dev/midi_if.h
 ./usr/include/dev/midivar.h
 ./usr/include/dev/mii
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index b7642294f6a..b7df1ad1ca5 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1226,7 +1226,6 @@
 ./usr/share/man/man4/auvia.4
 ./usr/share/man/man4/axe.4
 ./usr/share/man/man4/axen.4
-./usr/share/man/man4/az.4
 ./usr/share/man/man4/azalia.4
 ./usr/share/man/man4/bce.4
 ./usr/share/man/man4/berkwdt.4
@@ -1318,7 +1317,6 @@
 ./usr/share/man/man4/gpr.4
 ./usr/share/man/man4/gre.4
 ./usr/share/man/man4/gscsio.4
-./usr/share/man/man4/gtp.4
 ./usr/share/man/man4/hds.4
 ./usr/share/man/man4/hifn.4
 ./usr/share/man/man4/hil.4
@@ -1385,13 +1383,11 @@
 ./usr/share/man/man4/i386/pctr.4
 ./usr/share/man/man4/i386/piixpcib.4
 ./usr/share/man/man4/i386/sb.4
-./usr/share/man/man4/i386/sea.4
 ./usr/share/man/man4/i386/skgpio.4
 ./usr/share/man/man4/i386/tcpcib.4
 ./usr/share/man/man4/i386/uha.4
 ./usr/share/man/man4/i386/wds.4
 ./usr/share/man/man4/i386/wdt.4
-./usr/share/man/man4/i386/wss.4
 ./usr/share/man/man4/ichiic.4
 ./usr/share/man/man4/ichwdt.4
 ./usr/share/man/man4/icmp.4
@@ -1624,9 +1620,7 @@
 ./usr/share/man/man4/rlphy.4
 ./usr/share/man/man4/route.4
 ./usr/share/man/man4/rsu.4
-./usr/share/man/man4/rt.4
 ./usr/share/man/man4/rtfps.4
-./usr/share/man/man4/rtii.4
 ./usr/share/man/man4/rtsx.4
 ./usr/share/man/man4/rtw.4
 ./usr/share/man/man4/rtwn.4
@@ -1644,8 +1638,6 @@
 ./usr/share/man/man4/se.4
 ./usr/share/man/man4/ses.4
 ./usr/share/man/man4/sf.4
-./usr/share/man/man4/sf2r.4
-./usr/share/man/man4/sfr.4
 ./usr/share/man/man4/sgi
 ./usr/share/man/man4/sgi/dpclock.4
 ./usr/share/man/man4/sgi/dsclock.4
@@ -1975,7 +1967,6 @@
 ./usr/share/man/man4/xnf.4
 ./usr/share/man/man4/xspd.4
 ./usr/share/man/man4/yds.4
-./usr/share/man/man4/ym.4
 ./usr/share/man/man4/zaurus
 ./usr/share/man/man4/zaurus/apm.4
 ./usr/share/man/man4/zaurus/autoconf.4