sync

14 files changed, 15 insertions, 12 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 2d16ca194ea..d448192a7ad 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1159,7 +1159,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_ether.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_fil.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_fil_compat.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_compat.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_frag.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_icmp.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 04e12e63a07..f2671972cb8 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1245,7 +1245,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ether.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_frag.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_icmp.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 61f2b20f655..6655e893477 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1239,7 +1239,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ether.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_frag.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_icmp.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index b173ebc4a75..1282479ca41 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1235,7 +1235,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_ether.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_fil.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_fil_compat.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_compat.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_frag.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_icmp.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index d68708f4595..187b07ccbfc 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1237,7 +1237,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ether.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_frag.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_icmp.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 47fad86faaf..69db6ac6393 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1241,7 +1241,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ether.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_frag.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_icmp.ph
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 3690b933877..8dfe9867691 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -1180,7 +1180,7 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_ether.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_fil.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_fil_compat.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_compat.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_frag.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_icmp.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index 88e3d29fd7e..77edb921e66 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -1161,7 +1161,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_ether.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_fil.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_fil_compat.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_compat.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_frag.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_icmp.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 2c011842fbc..860e75f56a8 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -847,7 +847,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_ether.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_fil.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_fil_compat.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_compat.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_frag.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_icmp.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 59fec99325e..373fdcb05ac 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -1212,7 +1212,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ether.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_fil_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_frag.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_icmp.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index f7d8e8deb0f..bad1dbe0fba 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -765,7 +765,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_esp.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_ether.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_fil.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_fil_compat.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_compat.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_frag.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_icmp.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 93f735682b5..4b627fd8132 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,3 +1,5 @@
+./usr/libexec/sm.bin
+./usr/sbin/ipfs
 ./altroot
 ./bin
 ./bin/[
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index e1d9a5a2916..071f2bb0477 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -848,7 +848,7 @@
 ./usr/include/netinet/ip_esp.h
 ./usr/include/netinet/ip_ether.h
 ./usr/include/netinet/ip_fil.h
-./usr/include/netinet/ip_fil_compat.h
+./usr/include/netinet/ip_compat.h
 ./usr/include/netinet/ip_frag.h
 ./usr/include/netinet/ip_gre.h
 ./usr/include/netinet/ip_icmp.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index ac784daba71..2130b779d18 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -2034,3 +2034,4 @@
 ./var/www/htdocs/manual/win_service.html
 ./usr/share/man/cat4/clct.0
 ./usr/share/man/cat4/maestro.0
+./usr/share/man/cat8/ipfs.0