sync

15 files changed, 20 insertions, 12 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 7a0fd920756..5c6590cd03f 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1175,7 +1175,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip6.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_ah.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_auth.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_compat.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_fil_compat.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_ecn.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_ether.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 36cd190bd1f..2078a47b4d5 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1248,7 +1248,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ah.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_auth.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ecn.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ether.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 62579c9df59..eac28374b58 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1242,7 +1242,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ah.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_auth.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ecn.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ether.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 169c2cf8b57..ea9a34b12e3 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1236,7 +1236,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip6.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_ah.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_auth.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_compat.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_fil_compat.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_ecn.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_ether.ph
@@ -1764,3 +1764,5 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/ugraphire_rdesc.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/uyap_firmware.ph
+./usr/sbin/wsconscfg
+./usr/sbin/wsfontload
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 58118d35264..bd833e815b4 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1239,7 +1239,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ah.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_auth.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ecn.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ether.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 6714ef02f6b..bb543f3c4a8 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1244,7 +1244,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ah.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_auth.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ecn.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ether.ph
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index addc8e02dad..4f2800298a0 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -1183,7 +1183,7 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip6.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_ah.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_auth.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_compat.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_fil_compat.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_ecn.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_ether.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index d84461695e5..ee90217c439 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -1164,7 +1164,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip6.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_ah.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_auth.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_compat.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_fil_compat.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_ecn.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_ether.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 09ba896ce3f..504461c8e2c 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -842,7 +842,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip6.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_ah.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_auth.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_compat.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_fil_compat.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_ecn.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_ether.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index d2b6bc924bc..ac632ba6cd6 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -1207,7 +1207,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ah.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_auth.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ecn.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ether.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 0e34e7d3b61..8e30040ba91 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -784,7 +784,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip6.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_ah.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_auth.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_compat.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_fil_compat.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_ecn.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_ether.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 29b7f7178df..aa0cc093675 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -151,6 +151,7 @@
 ./sbin/ttyflags
 ./sbin/tunefs
 ./sbin/umount
+./sbin/wsconsctl
 ./stand
 ./tmp
 ./usr
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 602b584e1ec..81231d87ecd 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -36,6 +36,8 @@
 ./usr/include/i386/pcb.h
 ./usr/include/i386/pccons.h
 ./usr/include/i386/pctr.h
+./usr/include/i386/pcvt_ioctl.h
+./usr/include/i386/pcvt_mouse.h
 ./usr/include/i386/pio.h
 ./usr/include/i386/pmap.h
 ./usr/include/i386/proc.h
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 5319093a611..62c17e06880 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -851,7 +851,7 @@
 ./usr/include/netinet/ip6.h
 ./usr/include/netinet/ip_ah.h
 ./usr/include/netinet/ip_auth.h
-./usr/include/netinet/ip_compat.h
+./usr/include/netinet/ip_fil_compat.h
 ./usr/include/netinet/ip_ecn.h
 ./usr/include/netinet/ip_esp.h
 ./usr/include/netinet/ip_ether.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index fd52327e238..063ad5fcbd4 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -2031,3 +2031,6 @@
 ./usr/share/man/cat4/usscanner.0
 ./usr/share/man/cat4/uyap.0
 ./usr/share/man/cat4/upl.0
+./usr/share/man/cat8/i386/wsconscfg.0
+./usr/share/man/cat8/i386/wsconsctl.0
+./usr/share/man/cat8/i386/wsfontload.0