27 files changed, 28 insertions, 53 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 84462ad715e..32bb2e3abf8 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1879,8 +1879,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs
 ./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/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
@@ -2230,6 +2228,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 50e26fae3f9..04215e948ba 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1971,8 +1971,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs
 ./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/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
@@ -2327,6 +2325,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 6c040489d45..202764c52d3 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -1895,8 +1895,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs
 ./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/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
@@ -2246,6 +2244,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index e6b65dd2570..7c2b873d011 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1835,8 +1835,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs
 ./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/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
@@ -2186,6 +2184,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index c42cd8003be..0efbabde82c 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1828,8 +1828,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs
 ./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/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
@@ -2179,6 +2177,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index e4e85be1e84..3ebb984c5ba 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1945,8 +1945,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs
 ./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/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
@@ -2298,6 +2296,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 8bf4101d8ca..2d4ccf1ca27 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1877,8 +1877,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs
 ./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/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
@@ -2228,6 +2226,7 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 2c6eb7529ce..9a3d606d29e 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1976,8 +1976,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs
 ./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/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
@@ -2332,6 +2330,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 87089af08cd..6d837aaca0d 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1833,8 +1833,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/miscfs
 ./usr/libdata/perl5/site_perl/sh-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/sh-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/miscfs/portal
-./usr/libdata/perl5/site_perl/sh-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/sh-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/miscfs/specfs
@@ -2184,6 +2182,7 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/scsi
 ./usr/libdata/perl5/site_perl/sh-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index eead9df5749..053086f505b 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -1958,8 +1958,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/miscfs
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/miscfs/fifofs/fifo.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/miscfs/portal
-./usr/libdata/perl5/site_perl/mips64el-openbsd/miscfs/portal/portal.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/miscfs/procfs
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/miscfs/specfs
@@ -2311,6 +2309,7 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/scsi
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index f4a748ca202..220e6f555c3 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1690,8 +1690,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs
 ./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/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
@@ -2041,6 +2039,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 7be6a5f62dd..d2e9a548d71 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1833,8 +1833,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs
 ./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/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
@@ -2184,6 +2182,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index e619b967a61..f180b75c50f 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1947,8 +1947,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs
 ./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/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
@@ -2340,6 +2338,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index de47bda8fb3..d463533d61e 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1786,8 +1786,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs
 ./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/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
@@ -2179,6 +2177,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index f0709d1f120..700b11e1067 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1782,8 +1782,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs
 ./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/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
@@ -2190,6 +2188,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 9824cade6fb..b2658b40b86 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1694,8 +1694,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs
 ./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/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
@@ -2091,6 +2089,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index b0425bf2b42..6162bb7c5ce 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -1849,8 +1849,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs
 ./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/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
@@ -2244,6 +2242,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 65818655eca..f62cc7ff17e 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1934,8 +1934,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs
 ./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/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
@@ -2287,6 +2285,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 3ce37387959..1a52a255e26 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -1890,8 +1890,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs
 ./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/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
@@ -2283,6 +2281,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index dc0165a2aa8..2f0824e4fe5 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1177,8 +1177,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs
 ./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/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
@@ -1528,6 +1526,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index d43bc547c3e..c7920e92f70 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1314,8 +1314,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs
 ./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/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
@@ -1667,6 +1665,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 7cfb32ab2c2..d090f2801f0 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1109,8 +1109,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs
 ./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/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
@@ -1460,6 +1458,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index bab877e8a44..9d12aae9c66 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -1850,8 +1850,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs
 ./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/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
@@ -2201,6 +2199,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/iscsi.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/scsi/mpathvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/safte.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_all.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_changer.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 9a0fc98b0c9..f82101fcaa9 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -143,7 +143,6 @@
 ./sbin/mount_msdos
 ./sbin/mount_nfs
 ./sbin/mount_nnpfs
-./sbin/mount_portal
 ./sbin/mount_procfs
 ./sbin/mount_udf
 ./sbin/mount_vnd
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index c8a2d7c5c5b..c14ffe96166 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1067,8 +1067,6 @@
 ./usr/include/miscfs
 ./usr/include/miscfs/fifofs
 ./usr/include/miscfs/fifofs/fifo.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
@@ -1433,6 +1431,7 @@
 ./usr/include/scsi
 ./usr/include/scsi/cd.h
 ./usr/include/scsi/iscsi.h
+./usr/include/scsi/mpathvar.h
 ./usr/include/scsi/safte.h
 ./usr/include/scsi/scsi_all.h
 ./usr/include/scsi/scsi_changer.h
@@ -1934,8 +1933,10 @@
 ./usr/share/man/cat2/alpha/writeb.0
 ./usr/share/man/cat2/alpha/writel.0
 ./usr/share/man/cat2/alpha/writew.0
+./usr/share/man/cat2/amd64/amd64_get_fsbase.0
 ./usr/share/man/cat2/amd64/amd64_get_ioperm.0
 ./usr/share/man/cat2/amd64/amd64_iopl.0
+./usr/share/man/cat2/amd64/amd64_set_fsbase.0
 ./usr/share/man/cat2/amd64/amd64_set_ioperm.0
 ./usr/share/man/cat2/armish/arm_drain_writebuf.0
 ./usr/share/man/cat2/armish/arm_sync_icache.0
@@ -6357,6 +6358,8 @@
 ./usr/share/man/cat9/disk_init.0
 ./usr/share/man/cat9/disk_unbusy.0
 ./usr/share/man/cat9/disklabel.0
+./usr/share/man/cat9/dma_alloc.0
+./usr/share/man/cat9/dma_free.0
 ./usr/share/man/cat9/dohooks.0
 ./usr/share/man/cat9/domountroothooks.0
 ./usr/share/man/cat9/dopowerhooks.0
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index 2209ca4cff0..f1256ff5620 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -88,7 +88,6 @@
 ./etc/passwd
 ./etc/pf.conf
 ./etc/pf.os
-./etc/portal.conf
 ./etc/ppp/chap-secrets
 ./etc/ppp/options
 ./etc/ppp/options.leaf
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 6e55bbe8813..2f30a11598a 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -2552,7 +2552,6 @@
 ./usr/share/man/cat5/pf.os.0
 ./usr/share/man/cat5/pkg.conf.0
 ./usr/share/man/cat5/port-modules.0
-./usr/share/man/cat5/portal.conf.0
 ./usr/share/man/cat5/printcap.0
 ./usr/share/man/cat5/protocols.0
 ./usr/share/man/cat5/ranlib.0
@@ -2689,7 +2688,6 @@
 ./usr/share/man/cat8/chroot.0
 ./usr/share/man/cat8/clri.0
 ./usr/share/man/cat8/compat_aout.0
-./usr/share/man/cat8/compat_freebsd.0
 ./usr/share/man/cat8/compat_linux.0
 ./usr/share/man/cat8/compat_svr4.0
 ./usr/share/man/cat8/comsat.0
@@ -2882,7 +2880,6 @@
 ./usr/share/man/cat8/mount_nfs.0
 ./usr/share/man/cat8/mount_nnpfs.0
 ./usr/share/man/cat8/mount_ntfs.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_vnd.0