sync

9 files changed, 17 insertions, 44 deletions

diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 373c84b1649..f278c7a9695 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1210,16 +1210,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/udp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/udp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/icmp6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_ifattach.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_mroute.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/nd6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/osdep.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 42435c6dbb4..f51919e1fb8 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1205,16 +1205,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/udp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/udp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/icmp6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_ifattach.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_mroute.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/nd6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/osdep.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 9857c1fedab..8bef02361f0 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1212,16 +1212,11 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/udp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/udp_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/icmp6.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/in6_ifattach.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/in6_var.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/ip6.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/ip6_mroute.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/ip6_var.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/nd6.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/osdep.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index ccb888584a2..2dfb67196a3 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1214,16 +1214,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/udp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/udp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/icmp6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_ifattach.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_mroute.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/nd6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/osdep.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 66554db13fc..fb566248274 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -575,6 +575,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/smc93cx6var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/stireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/stivar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/tcic2reg.ph
+./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/uhareg.ph
@@ -707,6 +709,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ti_fw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ti_fw2.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ubsecreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ubsecvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/vgafb_pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/wdt50x.ph
@@ -843,13 +847,21 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/ascii.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/event_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/kbd.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/ms.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wscons_emul.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/unicode.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wscons_callbacks.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wscons_raster.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wscons_rfont.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wsconsvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wsconsio.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wsdisplay_usl_io.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wsdisplayvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wsemul_vt100var.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wsemulvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wseventvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wskbdvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wsksymdef.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wsksymvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wsmousevar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/wsmuxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dirent.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/disktab.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dlfcn.ph
@@ -1207,13 +1219,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/udp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/udp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/icmp6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_ifattach.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6protosw.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index 3d4430a66d2..b4aeda52655 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -1087,16 +1087,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/udp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/udp_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/icmp6.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_ifattach.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/ip6.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/ip6_mroute.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/ip6_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/nd6.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/osdep.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index a80b35e77e0..077d5f5c4c1 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -817,16 +817,11 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/udp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/udp_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/icmp6.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/in6_ifattach.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/in6_var.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/ip6.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/ip6_mroute.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/ip6_var.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/nd6.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/osdep.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index aaf870a1bce..d8af9f109f0 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -1170,16 +1170,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/udp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/udp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/icmp6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_ifattach.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_mroute.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/nd6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/osdep.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 92b53ad9f71..faeef20ca8e 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -814,13 +814,11 @@
 ./usr/include/netinet/udp.h
 ./usr/include/netinet/udp_var.h
 ./usr/include/netinet6
-./usr/include/netinet6/icmp6.h
 ./usr/include/netinet6/in6.h
 ./usr/include/netinet6/in6_gif.h
 ./usr/include/netinet6/in6_ifattach.h
 ./usr/include/netinet6/in6_prefix.h
 ./usr/include/netinet6/in6_var.h
-./usr/include/netinet6/ip6.h
 ./usr/include/netinet6/ip6_mroute.h
 ./usr/include/netinet6/ip6_var.h
 ./usr/include/netinet6/ip6protosw.h