16 files changed, 39 insertions, 140 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 7a0f714ce7a..0fc78990992 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1226,19 +1226,12 @@
 ./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
-./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_frag.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_icmp.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_ipip.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_ipsp.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_mroute.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_nat.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_proxy.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_state.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ip_var.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/ipl.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/tcp.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/tcp_debug.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet/tcp_fsm.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 433274d29f0..bef48c0684e 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1302,19 +1302,12 @@
 ./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
-./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_frag.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_icmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ipip.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ipsp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_mroute.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_nat.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_proxy.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_state.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ipl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp_debug.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp_fsm.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 897fe9fa27f..225d17e9050 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1297,19 +1297,12 @@
 ./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
-./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_frag.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_icmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ipip.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ipsp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_mroute.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_nat.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_proxy.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_state.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ipl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp_debug.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp_fsm.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 0e100400293..812c6041bf7 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1121,8 +1121,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/pcb.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/pccons.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/pctr.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/i386/pcvt_ioctl.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/i386/pcvt_mouse.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/pio.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/pmap.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/proc.ph
@@ -1293,19 +1291,12 @@
 ./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
-./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_frag.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_icmp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_ipip.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_ipsp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_mroute.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_nat.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_proxy.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_state.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ip_var.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet/ipl.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/tcp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/tcp_debug.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet/tcp_fsm.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 2978cab887a..627f69b2e25 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1294,19 +1294,12 @@
 ./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
-./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_frag.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_icmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ipip.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ipsp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_mroute.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_nat.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_proxy.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_state.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ipl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp_debug.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp_fsm.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 40c2b2444df..f67d77a7bd9 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1299,19 +1299,12 @@
 ./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
-./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_frag.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_icmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ipip.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ipsp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_mroute.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_nat.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_proxy.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_state.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ipl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp_debug.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp_fsm.ph
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 6ccd45f2f0a..caf2b4addf7 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -1223,19 +1223,12 @@
 ./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
-./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_frag.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_icmp.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_ipip.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_ipsp.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_mroute.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_nat.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_proxy.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_state.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ip_var.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/netinet/ipl.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/tcp.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/tcp_debug.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet/tcp_fsm.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index ca45abf9ef9..aea5a65b0ff 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -1218,19 +1218,12 @@
 ./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
-./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_frag.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_icmp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_ipip.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_ipsp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_mroute.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_nat.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_proxy.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_state.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ip_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/ipl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/tcp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/tcp_debug.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet/tcp_fsm.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 4bb1cc73cd0..0f97196ded9 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -896,19 +896,12 @@
 ./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
-./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_frag.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_icmp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_ipip.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_ipsp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_mroute.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_nat.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_proxy.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_state.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ip_var.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/ipl.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/tcp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/tcp_debug.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet/tcp_fsm.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index a41f180ad33..a47b41e4129 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -1266,19 +1266,12 @@
 ./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
-./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_frag.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_icmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ipip.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_ipsp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_mroute.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_nat.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_proxy.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_state.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ip_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/ipl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp_debug.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet/tcp_fsm.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 17d56e7cc6f..61e10e13e0c 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -835,19 +835,12 @@
 ./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
-./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_frag.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_gre.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_icmp.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_ipip.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_ipsp.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_mroute.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_nat.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_proxy.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_state.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ip_var.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netinet/ipl.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/tcp.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/tcp_debug.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet/tcp_fsm.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 497294721c0..de0a04f1a52 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -91,9 +91,6 @@
 ./sbin/halt
 ./sbin/ifconfig
 ./sbin/init
-./sbin/ipf
-./sbin/ipfstat
-./sbin/ipnat
 ./sbin/ipsecadm
 ./sbin/isakmpd
 ./sbin/kbd
@@ -1110,6 +1107,17 @@
 ./usr/libexec/afsd
 ./usr/libexec/atrun
 ./usr/libexec/auth
+./usr/libexec/auth/login_activ
+./usr/libexec/auth/login_chpass
+./usr/libexec/auth/login_crypto
+./usr/libexec/auth/login_kerberos
+./usr/libexec/auth/login_krb-or-pwd
+./usr/libexec/auth/login_lchpass
+./usr/libexec/auth/login_passwd
+./usr/libexec/auth/login_reject
+./usr/libexec/auth/login_skey
+./usr/libexec/auth/login_snk
+./usr/libexec/auth/login_token
 ./usr/libexec/comsat
 ./usr/libexec/cpp
 ./usr/libexec/cvs
@@ -1210,6 +1218,8 @@
 ./usr/sbin/ab
 ./usr/sbin/ac
 ./usr/sbin/accton
+./usr/sbin/activadm
+./usr/sbin/activinit
 ./usr/sbin/adduser
 ./usr/sbin/amd
 ./usr/sbin/amq
@@ -1227,6 +1237,8 @@
 ./usr/sbin/chroot
 ./usr/sbin/config
 ./usr/sbin/cron
+./usr/sbin/cryptoadm
+./usr/sbin/cryptoinit
 ./usr/sbin/dev_mkdb
 ./usr/sbin/dhcpd
 ./usr/sbin/dhcrelay
@@ -1247,12 +1259,6 @@
 ./usr/sbin/ifmcstat
 ./usr/sbin/inetd
 ./usr/sbin/iostat
-./usr/sbin/ipfs
-./usr/sbin/ipftest
-./usr/sbin/ipmon
-./usr/sbin/ipresend
-./usr/sbin/ipsend
-./usr/sbin/iptest
 ./usr/sbin/kadmin
 ./usr/sbin/kdb_destroy
 ./usr/sbin/kdb_edit
@@ -1338,6 +1344,8 @@
 ./usr/sbin/setobjstat
 ./usr/sbin/sliplogin
 ./usr/sbin/slstats
+./usr/sbin/snkadm
+./usr/sbin/snkinit
 ./usr/sbin/spppcontrol
 ./usr/sbin/spray
 ./usr/sbin/sshd
@@ -1353,6 +1361,8 @@
 ./usr/sbin/tcpdump
 ./usr/sbin/timed
 ./usr/sbin/timedc
+./usr/sbin/tokenadm
+./usr/sbin/tokeninit
 ./usr/sbin/traceroute
 ./usr/sbin/traceroute6
 ./usr/sbin/trpt
@@ -1657,30 +1667,6 @@
 ./usr/share/groff_font/devps/text.enc
 ./usr/share/groff_font/devps/zapfdr.pfa
 ./usr/share/info
-./usr/share/ipf
-./usr/share/ipf/example.1
-./usr/share/ipf/example.10
-./usr/share/ipf/example.11
-./usr/share/ipf/example.12
-./usr/share/ipf/example.13
-./usr/share/ipf/example.14
-./usr/share/ipf/example.15
-./usr/share/ipf/example.16
-./usr/share/ipf/example.2
-./usr/share/ipf/example.3
-./usr/share/ipf/example.4
-./usr/share/ipf/example.5
-./usr/share/ipf/example.6
-./usr/share/ipf/example.7
-./usr/share/ipf/example.8
-./usr/share/ipf/example.9
-./usr/share/ipf/firewall.1
-./usr/share/ipf/firewall.2
-./usr/share/ipf/firewall.3
-./usr/share/ipf/firewall.4
-./usr/share/ipf/nat.1
-./usr/share/ipf/nat.2
-./usr/share/ipf/nat.3
 ./usr/share/ipsec
 ./usr/share/ipsec/attributes.conf
 ./usr/share/ipsec/isakmpd
@@ -1918,6 +1904,7 @@
 ./usr/share/sendmail/ostype/dgux.m4
 ./usr/share/sendmail/ostype/domainos.m4
 ./usr/share/sendmail/ostype/dynix3.2.m4
+./usr/share/sendmail/ostype/freebsd4.m4
 ./usr/share/sendmail/ostype/gnu.m4
 ./usr/share/sendmail/ostype/hpux10.m4
 ./usr/share/sendmail/ostype/hpux11.m4
@@ -2651,4 +2638,3 @@
 ./var/yp/Makefile.yp
 ./var/yp/Makefile.yp.dist
 ./var/yp/README
-./usr/share/sendmail/ostype/freebsd4.m4
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index e6387f36b94..9bd16719015 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -34,8 +34,6 @@
 ./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 424c8ba0b8d..88c22aa877e 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -895,19 +895,12 @@
 ./usr/include/netinet/ip_ecn.h
 ./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_frag.h
 ./usr/include/netinet/ip_gre.h
 ./usr/include/netinet/ip_icmp.h
 ./usr/include/netinet/ip_ipip.h
 ./usr/include/netinet/ip_ipsp.h
 ./usr/include/netinet/ip_mroute.h
-./usr/include/netinet/ip_nat.h
-./usr/include/netinet/ip_proxy.h
-./usr/include/netinet/ip_state.h
 ./usr/include/netinet/ip_var.h
-./usr/include/netinet/ipl.h
 ./usr/include/netinet/tcp.h
 ./usr/include/netinet/tcp_debug.h
 ./usr/include/netinet/tcp_fsm.h
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index d1d52f56a86..89f99630650 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -30,8 +30,6 @@
 ./etc/hosts.equiv
 ./etc/hosts.lpd
 ./etc/inetd.conf
-./etc/ipf.rules
-./etc/ipnat.rules
 ./etc/kerberosIV/README
 ./etc/kerberosIV/krb.conf
 ./etc/kerberosIV/krb.equiv
@@ -135,7 +133,6 @@
 ./var/log/authlog
 ./var/log/daemon
 ./var/log/ftpd
-./var/log/ipflog
 ./var/log/lastlog
 ./var/log/lpd-errs
 ./var/log/maillog
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 35c5966f7fc..4b3337017d0 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -325,10 +325,6 @@
 ./usr/share/man/cat1/intro.0
 ./usr/share/man/cat1/ipcrm.0
 ./usr/share/man/cat1/ipcs.0
-./usr/share/man/cat1/ipftest.0
-./usr/share/man/cat1/ipresend.0
-./usr/share/man/cat1/ipsend.0
-./usr/share/man/cat1/iptest.0
 ./usr/share/man/cat1/jobs.0
 ./usr/share/man/cat1/join.0
 ./usr/share/man/cat1/jot.0
@@ -1052,9 +1048,6 @@
 ./usr/share/man/cat4/iophy.0
 ./usr/share/man/cat4/ip.0
 ./usr/share/man/cat4/ip6.0
-./usr/share/man/cat4/ipf.0
-./usr/share/man/cat4/ipl.0
-./usr/share/man/cat4/ipnat.0
 ./usr/share/man/cat4/ipsec.0
 ./usr/share/man/cat4/isa.0
 ./usr/share/man/cat4/isapnp.0
@@ -1378,9 +1371,6 @@
 ./usr/share/man/cat5/info.0
 ./usr/share/man/cat5/inode.0
 ./usr/share/man/cat5/intro.0
-./usr/share/man/cat5/ipf.0
-./usr/share/man/cat5/ipnat.0
-./usr/share/man/cat5/ipsend.0
 ./usr/share/man/cat5/isakmpd.conf.0
 ./usr/share/man/cat5/isakmpd.policy.0
 ./usr/share/man/cat5/keynote.0
@@ -1481,6 +1471,8 @@
 ./usr/share/man/cat8/ab.0
 ./usr/share/man/cat8/ac.0
 ./usr/share/man/cat8/accton.0
+./usr/share/man/cat8/activadm.0
+./usr/share/man/cat8/activinit.0
 ./usr/share/man/cat8/afsd.0
 ./usr/share/man/cat8/alpha
 ./usr/share/man/cat8/alpha/boot_alpha.0
@@ -1534,6 +1526,8 @@
 ./usr/share/man/cat8/config.0
 ./usr/share/man/cat8/crash.0
 ./usr/share/man/cat8/cron.0
+./usr/share/man/cat8/cryptoadm.0
+./usr/share/man/cat8/cryptoinit.0
 ./usr/share/man/cat8/cvsbug.0
 ./usr/share/man/cat8/dev_mkdb.0
 ./usr/share/man/cat8/dhclient-script.0
@@ -1605,11 +1599,6 @@
 ./usr/share/man/cat8/init.0
 ./usr/share/man/cat8/intro.0
 ./usr/share/man/cat8/iostat.0
-./usr/share/man/cat8/ipf.0
-./usr/share/man/cat8/ipfs.0
-./usr/share/man/cat8/ipfstat.0
-./usr/share/man/cat8/ipmon.0
-./usr/share/man/cat8/ipnat.0
 ./usr/share/man/cat8/ipsecadm.0
 ./usr/share/man/cat8/isakmpd.0
 ./usr/share/man/cat8/kadmin.0
@@ -1629,6 +1618,17 @@
 ./usr/share/man/cat8/kvm_mkdb.0
 ./usr/share/man/cat8/lmccontrol.0
 ./usr/share/man/cat8/locate.updatedb.0
+./usr/share/man/cat8/login_activ.0
+./usr/share/man/cat8/login_chpass.0
+./usr/share/man/cat8/login_crypto.0
+./usr/share/man/cat8/login_kerberos.0
+./usr/share/man/cat8/login_krb-or-pwd.0
+./usr/share/man/cat8/login_lchpass.0
+./usr/share/man/cat8/login_passwd.0
+./usr/share/man/cat8/login_reject.0
+./usr/share/man/cat8/login_skey.0
+./usr/share/man/cat8/login_snk.0
+./usr/share/man/cat8/login_token.0
 ./usr/share/man/cat8/logresolve.0
 ./usr/share/man/cat8/lpc.0
 ./usr/share/man/cat8/lpd.0
@@ -1794,6 +1794,8 @@
 ./usr/share/man/cat8/smrsh.0
 ./usr/share/man/cat8/smtpd.0
 ./usr/share/man/cat8/smtpfwdd.0
+./usr/share/man/cat8/snkadm.0
+./usr/share/man/cat8/snkinit.0
 ./usr/share/man/cat8/sparc
 ./usr/share/man/cat8/sparc/MAKEDEV.0
 ./usr/share/man/cat8/sparc/boot_sparc.0
@@ -1833,6 +1835,8 @@
 ./usr/share/man/cat8/tftpd.0
 ./usr/share/man/cat8/timed.0
 ./usr/share/man/cat8/timedc.0
+./usr/share/man/cat8/tokenadm.0
+./usr/share/man/cat8/tokeninit.0
 ./usr/share/man/cat8/traceroute.0
 ./usr/share/man/cat8/traceroute6.0
 ./usr/share/man/cat8/trpt.0