21 files changed, 41 insertions, 292 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index a3869678527..f962f71cb8e 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -64,7 +64,7 @@
 ./usr/lib/gcc-lib/alpha-unknown-openbsd3.7/2.95.3/include
 ./usr/lib/gcc-lib/alpha-unknown-openbsd3.7/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -1753,19 +1753,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/nfs
 ./usr/libdata/perl5/site_perl/alpha-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 61aec380cf3..7577581aecd 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -64,7 +64,7 @@
 ./usr/lib/gcc-lib/amd64-unknown-openbsd3.7/3.3.5/collect2
 ./usr/lib/gcc-lib/amd64-unknown-openbsd3.7/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -92,7 +92,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.10.0
-./usr/lib/libstdc++.so.39.0
+./usr/lib/libstdc++.so.40.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
@@ -1781,19 +1781,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/nfs
 ./usr/libdata/perl5/site_perl/amd64-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 2b8ab886eee..8a540878706 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -67,7 +67,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd3.7/3.3.5/f771
 ./usr/lib/gcc-lib/arm-unknown-openbsd3.7/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -95,7 +95,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.10.0
-./usr/lib/libstdc++.so.39.0
+./usr/lib/libstdc++.so.40.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
@@ -1814,19 +1814,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/arm-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/nfs
 ./usr/libdata/perl5/site_perl/arm-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 392487b5e7e..727dede052b 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -29,7 +29,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.7/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.7/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -1737,19 +1737,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index cba5c034d0b..6600ee07d1f 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -64,7 +64,7 @@
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.7/3.3.5/collect2
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.7/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -92,7 +92,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.10.0
-./usr/lib/libstdc++.so.39.0
+./usr/lib/libstdc++.so.40.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
@@ -1762,19 +1762,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/nfs
 ./usr/libdata/perl5/site_perl/hppa-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 4e032bb33a2..fe60c8214a6 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -64,7 +64,7 @@
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd3.7/3.3.5/collect2
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd3.7/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -92,7 +92,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.10.0
-./usr/lib/libstdc++.so.39.0
+./usr/lib/libstdc++.so.40.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
@@ -1762,19 +1762,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/nfs
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 0d588e15e08..44dd80257c6 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -73,7 +73,7 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.7/3.3.5/include
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.7/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -101,7 +101,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.10.0
-./usr/lib/libstdc++.so.39.0
+./usr/lib/libstdc++.so.40.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
@@ -1794,19 +1794,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/i386-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/nfs
 ./usr/libdata/perl5/site_perl/i386-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 77ff228d11c..a8a835ddaec 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1678,19 +1678,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/nfs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index f13d213557c..ea5ca2e7572 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -28,7 +28,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.7/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.7/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -1741,19 +1741,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index b33271eede1..d10a8c89f51 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -69,7 +69,7 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.7/3.3.5/include
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.7/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -97,7 +97,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.10.0
-./usr/lib/libstdc++.so.39.0
+./usr/lib/libstdc++.so.40.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
@@ -1770,19 +1770,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/nfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index e03ee9a4d1c..5d9ded760df 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -27,7 +27,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.7/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.7/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -1737,19 +1737,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 29a9455690a..e176e0a5389 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1687,19 +1687,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/nfs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 8a9b9ab6cee..08727b2c40c 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -58,7 +58,7 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.7/2.95.3/include
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.7/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -1688,19 +1688,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/nfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 290d0dc3a96..efd03e2bc07 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -67,7 +67,7 @@
 ./usr/lib/gcc-lib/mips64-unknown-openbsd3.7/3.3.5/include
 ./usr/lib/gcc-lib/mips64-unknown-openbsd3.7/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -95,7 +95,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.10.0
-./usr/lib/libstdc++.so.39.0
+./usr/lib/libstdc++.so.40.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
@@ -1758,19 +1758,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/nfs
 ./usr/libdata/perl5/site_perl/mips64-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 786189da7ac..46af5730109 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -33,7 +33,7 @@
 ./usr/lib/gcc-lib/sparc-unknown-openbsd3.7/2.95.3/include
 ./usr/lib/gcc-lib/sparc-unknown-openbsd3.7/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -1159,19 +1159,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/nfs
 ./usr/libdata/perl5/site_perl/sparc-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index e18c41ca58c..9c68ad1cba0 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -60,7 +60,7 @@
 ./usr/lib/apache/modules/mod_vhost_alias.so
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd3.7
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -88,7 +88,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.10.0
-./usr/lib/libstdc++.so.39.0
+./usr/lib/libstdc++.so.40.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
@@ -1201,19 +1201,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/nfs
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 642a21e30f4..52e9ba225ad 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1095,19 +1095,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/vax-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/nfs
 ./usr/libdata/perl5/site_perl/vax-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 3975e67917d..1a02452c7e7 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -54,7 +54,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd3.7/3.3.5/f771
 ./usr/lib/gcc-lib/arm-unknown-openbsd3.7/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
-./usr/lib/libc.so.37.0
+./usr/lib/libc.so.38.0
 ./usr/lib/libcom_err.so.15.0
 ./usr/lib/libcrypto.so.12.0
 ./usr/lib/libcurses.so.10.0
@@ -82,7 +82,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.10.0
-./usr/lib/libstdc++.so.39.0
+./usr/lib/libstdc++.so.40.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
@@ -1755,19 +1755,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/netipx/spx_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/arm-openbsd/netnatm/natm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/idp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/idp_var.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/ns.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/ns_error.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/ns_if.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/ns_pcb.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/ns_var.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/sp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/spidp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/spp_debug.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/spp_timer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netns/spp_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/nfs
 ./usr/libdata/perl5/site_perl/arm-openbsd/nfs/krpc.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/nfs/nfs.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 38d64dde3f9..03b9dd6004d 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1784,11 +1784,9 @@
 ./usr/sbin/dnssec-signzone
 ./usr/sbin/editmap
 ./usr/sbin/edquota
-./usr/sbin/extattrctl
 ./usr/sbin/faithd
 ./usr/sbin/fs
 ./usr/sbin/getencstat
-./usr/sbin/getextattr
 ./usr/sbin/group
 ./usr/sbin/groupadd
 ./usr/sbin/groupdel
@@ -1884,7 +1882,6 @@
 ./usr/sbin/sensorsd
 ./usr/sbin/sesd
 ./usr/sbin/setencstat
-./usr/sbin/setextattr
 ./usr/sbin/setobjstat
 ./usr/sbin/sliplogin
 ./usr/sbin/slstats
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index a34ec4b3f5d..8e80513fae4 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1058,19 +1058,6 @@
 ./usr/include/netipx/spx_var.h
 ./usr/include/netnatm
 ./usr/include/netnatm/natm.h
-./usr/include/netns
-./usr/include/netns/idp.h
-./usr/include/netns/idp_var.h
-./usr/include/netns/ns.h
-./usr/include/netns/ns_error.h
-./usr/include/netns/ns_if.h
-./usr/include/netns/ns_pcb.h
-./usr/include/netns/ns_var.h
-./usr/include/netns/sp.h
-./usr/include/netns/spidp.h
-./usr/include/netns/spp_debug.h
-./usr/include/netns/spp_timer.h
-./usr/include/netns/spp_var.h
 ./usr/include/nfs
 ./usr/include/nfs/krpc.h
 ./usr/include/nfs/nfs.h
@@ -1778,13 +1765,6 @@
 ./usr/share/man/cat2/errno.0
 ./usr/share/man/cat2/exect.0
 ./usr/share/man/cat2/execve.0
-./usr/share/man/cat2/extattr.0
-./usr/share/man/cat2/extattr_delete_fd.0
-./usr/share/man/cat2/extattr_delete_file.0
-./usr/share/man/cat2/extattr_get_fd.0
-./usr/share/man/cat2/extattr_get_file.0
-./usr/share/man/cat2/extattr_set_fd.0
-./usr/share/man/cat2/extattr_set_file.0
 ./usr/share/man/cat2/fchdir.0
 ./usr/share/man/cat2/fchflags.0
 ./usr/share/man/cat2/fchmod.0
@@ -3191,9 +3171,6 @@
 ./usr/share/man/cat3/expf.0
 ./usr/share/man/cat3/expm1.0
 ./usr/share/man/cat3/expm1f.0
-./usr/share/man/cat3/extattr.0
-./usr/share/man/cat3/extattr_namespace_to_string.0
-./usr/share/man/cat3/extattr_string_to_namespace.0
 ./usr/share/man/cat3/f.0
 ./usr/share/man/cat3/fabs.0
 ./usr/share/man/cat3/fabsf.0
@@ -3210,6 +3187,8 @@
 ./usr/share/man/cat3/fgetln.0
 ./usr/share/man/cat3/fgetpos.0
 ./usr/share/man/cat3/fgets.0
+./usr/share/man/cat3/fgetwc.0
+./usr/share/man/cat3/fgetws.0
 ./usr/share/man/cat3/field_arg.0
 ./usr/share/man/cat3/field_back.0
 ./usr/share/man/cat3/field_buffer.0
@@ -3285,6 +3264,8 @@
 ./usr/share/man/cat3/fpurge.0
 ./usr/share/man/cat3/fputc.0
 ./usr/share/man/cat3/fputs.0
+./usr/share/man/cat3/fputwc.0
+./usr/share/man/cat3/fputws.0
 ./usr/share/man/cat3/fread.0
 ./usr/share/man/cat3/free.0
 ./usr/share/man/cat3/free_field.0
@@ -3316,6 +3297,7 @@
 ./usr/share/man/cat3/ftw.0
 ./usr/share/man/cat3/funlockfile.0
 ./usr/share/man/cat3/funopen.0
+./usr/share/man/cat3/fwide.0
 ./usr/share/man/cat3/fwopen.0
 ./usr/share/man/cat3/fwrite.0
 ./usr/share/man/cat3/gai_strerror.0
@@ -3402,6 +3384,8 @@
 ./usr/share/man/cat3/getttynam.0
 ./usr/share/man/cat3/getusershell.0
 ./usr/share/man/cat3/getw.0
+./usr/share/man/cat3/getwc.0
+./usr/share/man/cat3/getwchar.0
 ./usr/share/man/cat3/getwd.0
 ./usr/share/man/cat3/getwin.0
 ./usr/share/man/cat3/getyx.0
@@ -4140,9 +4124,6 @@
 ./usr/share/man/cat3/noraw.0
 ./usr/share/man/cat3/notimeout.0
 ./usr/share/man/cat3/nrand48.0
-./usr/share/man/cat3/ns.0
-./usr/share/man/cat3/ns_addr.0
-./usr/share/man/cat3/ns_ntoa.0
 ./usr/share/man/cat3/ntoa.0
 ./usr/share/man/cat3/ntohl.0
 ./usr/share/man/cat3/ntohs.0
@@ -4219,7 +4200,6 @@
 ./usr/share/man/cat3/popen.0
 ./usr/share/man/cat3/pos_form_cursor.0
 ./usr/share/man/cat3/pos_menu_cursor.0
-./usr/share/man/cat3/posix1e.0
 ./usr/share/man/cat3/posix2time.0
 ./usr/share/man/cat3/post_form.0
 ./usr/share/man/cat3/post_menu.0
@@ -4314,6 +4294,8 @@
 ./usr/share/man/cat3/putp.0
 ./usr/share/man/cat3/puts.0
 ./usr/share/man/cat3/putw.0
+./usr/share/man/cat3/putwc.0
+./usr/share/man/cat3/putwchar.0
 ./usr/share/man/cat3/putwin.0
 ./usr/share/man/cat3/pw_abort.0
 ./usr/share/man/cat3/pw_copy.0
@@ -4778,6 +4760,7 @@
 ./usr/share/man/cat3/ungetc.0
 ./usr/share/man/cat3/ungetch.0
 ./usr/share/man/cat3/ungetmouse.0
+./usr/share/man/cat3/ungetwc.0
 ./usr/share/man/cat3/unpost_form.0
 ./usr/share/man/cat3/unpost_menu.0
 ./usr/share/man/cat3/unsetenv.0
@@ -5139,6 +5122,11 @@
 ./usr/share/man/cat9/bus_space_write_region_4.0
 ./usr/share/man/cat9/bus_space_write_region_8.0
 ./usr/share/man/cat9/bwrite.0
+./usr/share/man/cat9/cache_enter.0
+./usr/share/man/cat9/cache_lookup.0
+./usr/share/man/cat9/cache_purge.0
+./usr/share/man/cat9/cache_purgevfs.0
+./usr/share/man/cat9/cache_revlookup.0
 ./usr/share/man/cat9/cdevvp.0
 ./usr/share/man/cat9/config_activate.0
 ./usr/share/man/cat9/config_attach.0
@@ -5189,7 +5177,6 @@
 ./usr/share/man/cat9/evcount.0
 ./usr/share/man/cat9/evcount_attach.0
 ./usr/share/man/cat9/evcount_detach.0
-./usr/share/man/cat9/extattr.0
 ./usr/share/man/cat9/extent.0
 ./usr/share/man/cat9/extent_alloc.0
 ./usr/share/man/cat9/extent_alloc_region.0
@@ -5552,6 +5539,7 @@
 ./usr/share/man/cat9/vflush.0
 ./usr/share/man/cat9/vflushbuf.0
 ./usr/share/man/cat9/vfs.0
+./usr/share/man/cat9/vfs_cache.0
 ./usr/share/man/cat9/vget.0
 ./usr/share/man/cat9/vgone.0
 ./usr/share/man/cat9/vgonel.0
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 3066c150ef0..7534a39879f 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1624,6 +1624,7 @@
 ./usr/share/man/cat4/uhid.0
 ./usr/share/man/cat4/uhidev.0
 ./usr/share/man/cat4/uhub.0
+./usr/share/man/cat4/uipaq.0
 ./usr/share/man/cat4/uk.0
 ./usr/share/man/cat4/ukbd.0
 ./usr/share/man/cat4/ukphy.0
@@ -1994,7 +1995,6 @@
 ./usr/share/man/cat8/dumpfs.0
 ./usr/share/man/cat8/editmap.0
 ./usr/share/man/cat8/edquota.0
-./usr/share/man/cat8/extattrctl.0
 ./usr/share/man/cat8/faithd.0
 ./usr/share/man/cat8/faq.0
 ./usr/share/man/cat8/fingerd.0
@@ -2009,7 +2009,6 @@
 ./usr/share/man/cat8/genassym.sh.0
 ./usr/share/man/cat8/getNAME.0
 ./usr/share/man/cat8/getencstat.0
-./usr/share/man/cat8/getextattr.0
 ./usr/share/man/cat8/getty.0
 ./usr/share/man/cat8/group.0
 ./usr/share/man/cat8/groupadd.0
@@ -2267,7 +2266,6 @@
 ./usr/share/man/cat8/sensorsd.0
 ./usr/share/man/cat8/sesd.0
 ./usr/share/man/cat8/setencstat.0
-./usr/share/man/cat8/setextattr.0
 ./usr/share/man/cat8/setobjstat.0
 ./usr/share/man/cat8/sftp-server.0
 ./usr/share/man/cat8/sgi