sync

24 files changed, 163 insertions, 139 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 53d2455ea83..8c6c54fcf68 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -104,7 +104,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1145,24 +1145,25 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index e1eaf048e37..b4958c7126f 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -110,7 +110,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1171,24 +1171,25 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 9cfb950d3bb..f268d429e9f 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -76,7 +76,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1158,24 +1158,25 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index abf5bbbe1f2..37c66acf0dc 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -8,7 +8,7 @@
 ./usr/lib/libheimbase.so.0.0
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libroken.so.0.0
 ./usr/lib/libwind.so.0.0
@@ -686,24 +686,25 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.beagle b/distrib/sets/lists/base/md.beagle
index 36a082cfebc..250e9271261 100644
--- a/distrib/sets/lists/base/md.beagle
+++ b/distrib/sets/lists/base/md.beagle
@@ -40,7 +40,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1133,24 +1133,25 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 1c5761959c4..46a9d5e4aa8 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -42,7 +42,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1029,24 +1029,25 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index fce45054a7e..1dfa61d453c 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -105,7 +105,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1092,24 +1092,25 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index f49e0452b68..a879a5c2bc5 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -106,7 +106,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1094,24 +1094,25 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 06771530864..54512fcc653 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -112,7 +112,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1099,24 +1099,25 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index cc5372009c2..21b6e2885c9 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -66,7 +66,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1053,24 +1053,25 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index c72ab71c76d..b743dcbe458 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -72,7 +72,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1060,24 +1060,25 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index b029b577d59..2d0037b55c2 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -41,7 +41,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1028,24 +1028,25 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index b0411fd77f6..dfc0a99bbab 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -107,7 +107,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1095,24 +1095,25 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 3144bd720f9..11a336454a2 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -40,7 +40,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1027,24 +1027,25 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index acf000157a1..619294e36d1 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -40,7 +40,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1027,24 +1027,25 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index a9785a6dedc..7a073ecacd3 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -36,7 +36,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1024,24 +1024,25 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 61f5b135869..45b973fd8d0 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -102,7 +102,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1090,24 +1090,25 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 576e3bf7da7..e002897f092 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -99,7 +99,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1087,24 +1087,25 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index f725f00698d..dc08f236a24 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -47,7 +47,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -578,24 +578,25 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 2e792898840..9f26288c421 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -107,7 +107,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -638,24 +638,25 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index a3079a291df..c258884492b 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -504,24 +504,25 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 0f953fa3361..ad8ce1d9e24 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -74,7 +74,7 @@
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
-./usr/lib/libkafs5.so.0.0
+./usr/lib/libkafs.so.19.0
 ./usr/lib/libkdc.so.0.0
 ./usr/lib/libkrb5.so.19.0
 ./usr/lib/libkvm.so.13.1
@@ -1112,24 +1112,25 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drmP.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_atomic.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_cache.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_crtc.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_crtc_helper.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_dp_helper.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_edid.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_edid_modes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_fb_helper.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_fixed.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_fourcc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_global.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_hashtab.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_linux_list.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_mem_util.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_mm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_mode.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/drm_sarea.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/i915_drm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/r300_reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/r600_blit_shaders.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/r600_microcode.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/radeon_drm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/radeon_drv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/radeon_microcode.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/refcount.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index de4bc99600b..c0c868fd2f9 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -518,24 +518,25 @@
 ./usr/include/dev/pci/drm/drm.h
 ./usr/include/dev/pci/drm/drmP.h
 ./usr/include/dev/pci/drm/drm_atomic.h
+./usr/include/dev/pci/drm/drm_cache.h
 ./usr/include/dev/pci/drm/drm_crtc.h
 ./usr/include/dev/pci/drm/drm_crtc_helper.h
 ./usr/include/dev/pci/drm/drm_dp_helper.h
 ./usr/include/dev/pci/drm/drm_edid.h
 ./usr/include/dev/pci/drm/drm_edid_modes.h
 ./usr/include/dev/pci/drm/drm_fb_helper.h
+./usr/include/dev/pci/drm/drm_fixed.h
 ./usr/include/dev/pci/drm/drm_fourcc.h
+./usr/include/dev/pci/drm/drm_global.h
+./usr/include/dev/pci/drm/drm_hashtab.h
 ./usr/include/dev/pci/drm/drm_linux_list.h
+./usr/include/dev/pci/drm/drm_mem_util.h
 ./usr/include/dev/pci/drm/drm_mm.h
 ./usr/include/dev/pci/drm/drm_mode.h
 ./usr/include/dev/pci/drm/drm_sarea.h
 ./usr/include/dev/pci/drm/i915_drm.h
-./usr/include/dev/pci/drm/r300_reg.h
-./usr/include/dev/pci/drm/r600_blit_shaders.h
-./usr/include/dev/pci/drm/r600_microcode.h
 ./usr/include/dev/pci/drm/radeon_drm.h
-./usr/include/dev/pci/drm/radeon_drv.h
-./usr/include/dev/pci/drm/radeon_microcode.h
+./usr/include/dev/pci/drm/refcount.h
 ./usr/include/dev/pci/eapreg.h
 ./usr/include/dev/pci/emuxkireg.h
 ./usr/include/dev/pci/emuxkivar.h
@@ -1703,8 +1704,8 @@
 ./usr/lib/libkadm5clnt_p.a
 ./usr/lib/libkadm5srv.a
 ./usr/lib/libkadm5srv_p.a
-./usr/lib/libkafs5.a
-./usr/lib/libkafs5_p.a
+./usr/lib/libkafs.a
+./usr/lib/libkafs_p.a
 ./usr/lib/libkdc.a
 ./usr/lib/libkdc_p.a
 ./usr/lib/libkeynote.a
@@ -4455,7 +4456,6 @@
 ./usr/share/man/man3/k_unlog.3
 ./usr/share/man/man3/kadm5_pwcheck.3
 ./usr/share/man/man3/kafs.3
-./usr/share/man/man3/kafs5.3
 ./usr/share/man/man3/kafs_set_verbose.3
 ./usr/share/man/man3/kafs_settoken.3
 ./usr/share/man/man3/kafs_settoken5.3
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index f3bb71e64e0..304d0f0adeb 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -122,6 +122,8 @@
 ./etc/rc.d/ifstated
 ./etc/rc.d/iked
 ./etc/rc.d/inetd
+./etc/rc.d/ipropd_master
+./etc/rc.d/ipropd_slave
 ./etc/rc.d/isakmpd
 ./etc/rc.d/kadmind
 ./etc/rc.d/kdc