sync

15 files changed, 22 insertions, 51 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 69d65f64483..cbb738d42bd 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -37,8 +37,8 @@
 ./usr/lib/lib45.so.1.0
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libasn1.so.2.0
-./usr/lib/libc.so.28.3
-./usr/lib/libc_r.so.6.3
+./usr/lib/libc.so.28.4
+./usr/lib/libc_r.so.6.4
 ./usr/lib/libcrypto.so.5.1
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
@@ -867,8 +867,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 30341c45851..a2b3659f651 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -34,8 +34,8 @@
 ./usr/lib/lib45.so.1.0
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libasn1.so.2.0
-./usr/lib/libc.so.28.3
-./usr/lib/libc_r.so.6.3
+./usr/lib/libc.so.28.4
+./usr/lib/libc_r.so.6.4
 ./usr/lib/libcrypto.so.5.1
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
@@ -849,8 +849,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 0b43327cf01..b2a1129bb30 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -33,8 +33,8 @@
 ./usr/lib/lib45.so.1.0
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libasn1.so.2.0
-./usr/lib/libc.so.28.3
-./usr/lib/libc_r.so.6.3
+./usr/lib/libc.so.28.4
+./usr/lib/libc_r.so.6.4
 ./usr/lib/libcrypto.so.5.1
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
@@ -809,8 +809,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 1081a617d98..f7e6a25cd60 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -727,8 +727,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 83b68c66447..6accb7b98af 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -37,8 +37,8 @@
 ./usr/lib/lib45.so.1.0
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libasn1.so.2.0
-./usr/lib/libc.so.28.3
-./usr/lib/libc_r.so.6.3
+./usr/lib/libc.so.28.4
+./usr/lib/libc_r.so.6.4
 ./usr/lib/libcrypto.so.5.1
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
@@ -813,8 +813,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 179ce3189b5..e91b73db91f 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -32,8 +32,8 @@
 ./usr/lib/lib45.so.1.0
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libasn1.so.2.0
-./usr/lib/libc.so.28.3
-./usr/lib/libc_r.so.6.3
+./usr/lib/libc.so.28.4
+./usr/lib/libc_r.so.6.4
 ./usr/lib/libcrypto.so.5.1
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
@@ -808,8 +808,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 07ad4e3c24e..2ba053f83b0 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -42,8 +42,8 @@
 ./usr/lib/lib45.so.1.0
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libasn1.so.2.0
-./usr/lib/libc.so.28.3
-./usr/lib/libc_r.so.6.3
+./usr/lib/libc.so.28.4
+./usr/lib/libc_r.so.6.4
 ./usr/lib/libcrypto.so.5.1
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
@@ -818,8 +818,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 0076626c36f..8c5194506ce 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -32,8 +32,8 @@
 ./usr/lib/lib45.so.1.0
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libasn1.so.2.0
-./usr/lib/libc.so.28.3
-./usr/lib/libc_r.so.6.3
+./usr/lib/libc.so.28.4
+./usr/lib/libc_r.so.6.4
 ./usr/lib/libcrypto.so.5.1
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
@@ -808,8 +808,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index e1c47e31de5..6218816708e 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -38,8 +38,8 @@
 ./usr/lib/lib45.so.1.0
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libasn1.so.2.0
-./usr/lib/libc.so.28.3
-./usr/lib/libc_r.so.6.3
+./usr/lib/libc.so.28.4
+./usr/lib/libc_r.so.6.4
 ./usr/lib/libcrypto.so.4.1
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
@@ -813,8 +813,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 9cf1414af31..eb0df01e397 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -32,8 +32,8 @@
 ./usr/lib/lib45.so.1.0
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libasn1.so.2.0
-./usr/lib/libc.so.28.3
-./usr/lib/libc_r.so.6.3
+./usr/lib/libc.so.28.4
+./usr/lib/libc_r.so.6.4
 ./usr/lib/libcrypto.so.5.1
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
@@ -468,8 +468,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index ed4e050a210..114cc9e2af5 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -32,8 +32,8 @@
 ./usr/lib/lib45.so.1.0
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libasn1.so.2.0
-./usr/lib/libc.so.28.3
-./usr/lib/libc_r.so.6.3
+./usr/lib/libc.so.28.4
+./usr/lib/libc_r.so.6.4
 ./usr/lib/libcrypto.so.5.1
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
@@ -468,8 +468,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 227dadbab6d..8c93c1fdee2 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -32,8 +32,8 @@
 ./usr/lib/lib45.so.1.0
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libasn1.so.2.0
-./usr/lib/libc.so.28.3
-./usr/lib/libc_r.so.6.3
+./usr/lib/libc.so.28.4
+./usr/lib/libc_r.so.6.4
 ./usr/lib/libcrypto.so.5.1
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
@@ -808,8 +808,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/lofnreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/lofnvar.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 9cc9389adea..730e0a75e26 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -409,8 +409,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_txvar.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_wxreg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_wxvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/isesreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/isesvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/lofnreg.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 5966b32a227..fc82cbc7fa6 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -418,8 +418,6 @@
 ./usr/include/dev/pci/if_txvar.h
 ./usr/include/dev/pci/if_vrreg.h
 ./usr/include/dev/pci/if_wbreg.h
-./usr/include/dev/pci/if_wxreg.h
-./usr/include/dev/pci/if_wxvar.h
 ./usr/include/dev/pci/isesreg.h
 ./usr/include/dev/pci/isesvar.h
 ./usr/include/dev/pci/lofnreg.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 608c4a8aae7..ec3b8a9739c 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1400,7 +1400,6 @@
 ./usr/share/man/cat4/wskbd.0
 ./usr/share/man/cat4/wsmouse.0
 ./usr/share/man/cat4/wsmux.0
-./usr/share/man/cat4/wx.0
 ./usr/share/man/cat4/xe.0
 ./usr/share/man/cat4/xf86.0
 ./usr/share/man/cat4/xl.0