20 files changed, 40 insertions, 40 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index d579ed5ded7..ff1297bfdfe 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -898,8 +898,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/isp_inline.ph
@@ -1187,6 +1185,8 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index e0fe55f0408..c886bc8cd04 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -920,8 +920,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/isp_inline.ph
@@ -1209,6 +1207,8 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index 8daab1b12bf..e4f44be15b6 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -794,8 +794,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/isp_inline.ph
@@ -1083,6 +1081,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 8aef6b9efd7..240d14e7ddc 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -946,8 +946,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/isp_inline.ph
@@ -1235,6 +1233,8 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 2ff11ee3380..4cea7f22356 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -807,8 +807,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/isp_inline.ph
@@ -1096,6 +1094,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 279a246ffc6..7c85559f265 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -847,8 +847,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/isp_inline.ph
@@ -1136,6 +1134,8 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 0026d4198f0..575c137d2ae 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -847,8 +847,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/isp_inline.ph
@@ -1136,6 +1134,8 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 25764f7b65f..63effec7e4a 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -856,8 +856,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/isp_inline.ph
@@ -1145,6 +1143,8 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 9114ed12815..8f2c2e458e8 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -747,8 +747,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/isp_inline.ph
@@ -1036,6 +1034,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 57eef0d7b09..03825ca6f84 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -808,8 +808,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/isp_inline.ph
@@ -1097,6 +1095,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index cd1f663cc72..10f22f2c60a 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -853,8 +853,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/isp_inline.ph
@@ -1142,6 +1140,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index e29ac67abda..4f7ab450b6f 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -805,8 +805,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/isp_inline.ph
@@ -1094,6 +1092,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index cb1b2a225cd..eb9c70f5cc7 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -746,8 +746,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/isp_inline.ph
@@ -1035,6 +1033,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 8b95de1172b..0a27d638ea1 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -841,8 +841,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/isp_inline.ph
@@ -1129,6 +1127,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 36c088aa851..66700c48413 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -852,8 +852,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/isp_inline.ph
@@ -1141,6 +1139,8 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 03d3a587225..c06d89c5296 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -305,8 +305,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/isp_inline.ph
@@ -594,6 +592,8 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 98b0ea6f776..43eab801f5b 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -336,8 +336,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/isp_inline.ph
@@ -625,6 +623,8 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index f8b830e4525..85109414ddf 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -240,8 +240,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/isp_inline.ph
@@ -529,6 +527,8 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 4846964d0d6..39bfec32a5a 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -885,8 +885,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/if_wi_ieee.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/if_wireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/if_wivar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/if_wpireg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/iha.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/intersil7170.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/isp_inline.ph
@@ -1174,6 +1172,8 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_vicvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_wbreg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_wpireg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_wpivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_xgereg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/isesvar.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 615897e7884..9b4e2ead177 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -261,8 +261,6 @@
 ./usr/include/dev/ic/if_wi_ieee.h
 ./usr/include/dev/ic/if_wireg.h
 ./usr/include/dev/ic/if_wivar.h
-./usr/include/dev/ic/if_wpireg.h
-./usr/include/dev/ic/if_wpivar.h
 ./usr/include/dev/ic/iha.h
 ./usr/include/dev/ic/intersil7170.h
 ./usr/include/dev/ic/isp_inline.h
@@ -550,6 +548,8 @@
 ./usr/include/dev/pci/if_vicvar.h
 ./usr/include/dev/pci/if_vrreg.h
 ./usr/include/dev/pci/if_wbreg.h
+./usr/include/dev/pci/if_wpireg.h
+./usr/include/dev/pci/if_wpivar.h
 ./usr/include/dev/pci/if_xgereg.h
 ./usr/include/dev/pci/isesreg.h
 ./usr/include/dev/pci/isesvar.h