21 files changed, 0 insertions, 177 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 477ab743315..f4b04774629 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1613,23 +1613,14 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 8ebf41f96e7..c5502e4140f 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1641,23 +1641,14 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 2babfb8c009..c556153e51c 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -1674,23 +1674,14 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index eec888afcce..31014f086de 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1597,23 +1597,14 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 803c76e3b9f..996746149d2 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1622,23 +1622,14 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 461492972a6..5f68c7fea48 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1622,23 +1622,14 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 407dfda2bbc..e7fc0df0c79 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1653,23 +1653,14 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/mmintrin.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/ncurses.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 3bf3406ebcf..5cf4540e0ee 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1538,23 +1538,14 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 242dafd01cc..c3f8d9af501 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1601,23 +1601,14 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 3ccdcc5171d..5b35a6bad0f 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1630,23 +1630,14 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index a5882d27d84..26f76bcfb85 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1556,23 +1556,14 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/ansi.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index cce3e77910d..9fcc61ebac6 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1491,23 +1491,14 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/ansi.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index d19aade645b..14fac5d6bcc 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1548,23 +1548,14 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 763d73209c4..e1d148c629f 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1618,23 +1618,14 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 271e107dc25..f5c25075e72 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1019,23 +1019,14 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 1818c6b0bbf..7d82ddf7cd0 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1061,23 +1061,14 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 351932fe5cc..c93bb198fcd 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -955,23 +955,14 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 9844abe8683..6731c238a4b 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -1615,23 +1615,14 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/genfs
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/genfs/layer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/kernfs/kernfs.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/nullfs
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/nullfs/null.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/portal
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/specfs/specdev.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/umapfs
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/umapfs/umap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/union
-./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/union/union.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/ndbm.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 2d1d128481a..b31a69e1431 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -118,12 +118,9 @@
 ./sbin/mount_mfs
 ./sbin/mount_msdos
 ./sbin/mount_nfs
-./sbin/mount_null
 ./sbin/mount_portal
 ./sbin/mount_procfs
 ./sbin/mount_udf
-./sbin/mount_umap
-./sbin/mount_union
 ./sbin/mount_xfs
 ./sbin/mountd
 ./sbin/ncheck
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index c3f43361d1b..92faadf21d7 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -917,23 +917,14 @@
 ./usr/include/miscfs/fdesc/fdesc.h
 ./usr/include/miscfs/fifofs
 ./usr/include/miscfs/fifofs/fifo.h
-./usr/include/miscfs/genfs
-./usr/include/miscfs/genfs/layer.h
-./usr/include/miscfs/genfs/layer_extern.h
 ./usr/include/miscfs/kernfs
 ./usr/include/miscfs/kernfs/kernfs.h
-./usr/include/miscfs/nullfs
-./usr/include/miscfs/nullfs/null.h
 ./usr/include/miscfs/portal
 ./usr/include/miscfs/portal/portal.h
 ./usr/include/miscfs/procfs
 ./usr/include/miscfs/procfs/procfs.h
 ./usr/include/miscfs/specfs
 ./usr/include/miscfs/specfs/specdev.h
-./usr/include/miscfs/umapfs
-./usr/include/miscfs/umapfs/umap.h
-./usr/include/miscfs/union
-./usr/include/miscfs/union/union.h
 ./usr/include/mpool.h
 ./usr/include/ncurses.h
 ./usr/include/ndbm.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index a7f5530aa9b..5f0c4239f6f 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -2153,12 +2153,9 @@
 ./usr/share/man/cat8/mount_msdos.0
 ./usr/share/man/cat8/mount_nfs.0
 ./usr/share/man/cat8/mount_ntfs.0
-./usr/share/man/cat8/mount_null.0
 ./usr/share/man/cat8/mount_portal.0
 ./usr/share/man/cat8/mount_procfs.0
 ./usr/share/man/cat8/mount_udf.0
-./usr/share/man/cat8/mount_umap.0
-./usr/share/man/cat8/mount_union.0
 ./usr/share/man/cat8/mount_xfs.0
 ./usr/share/man/cat8/mountd.0
 ./usr/share/man/cat8/mrinfo.0