sync

23 files changed, 217 insertions, 87 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 930191e6924..9c9c30af9fd 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -122,7 +122,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1268,11 +1268,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 22840c4148d..e0d76282eab 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -128,7 +128,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -777,7 +777,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/limits.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/loadfile_machdep.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/lock.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/mcontext.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/mpbiosreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/mpbiosvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/mpconfig.ph
@@ -1295,11 +1294,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 8d920f22deb..3fae984d77f 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -94,7 +94,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1281,11 +1281,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index f28ada783b8..81ea5928ce6 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1207,11 +1207,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index b7ff712d625..53b2d4701e5 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -60,7 +60,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1152,11 +1152,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index e0f8a901579..8a8e37d850f 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -123,7 +123,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1215,11 +1215,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 7b9145dc6cb..d08bb2968f7 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -124,7 +124,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1217,11 +1217,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 7515e41a794..4745edf0e5b 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -130,7 +130,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1222,11 +1222,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index e7163df6739..111bbfc649f 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -84,7 +84,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1176,11 +1176,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 501dc4a5ac3..fa853728bc8 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -90,7 +90,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1183,11 +1183,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index ccd80aacc8f..51b4cb590c8 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -73,7 +73,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1165,11 +1165,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 3244fa958c8..d15a4c04485 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -125,7 +125,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1218,11 +1218,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index a81743d00b7..0b6b0fda464 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -58,7 +58,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1150,11 +1150,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 2b798bf3c9e..3e4dc778cf4 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -72,7 +72,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1164,11 +1164,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index 3d839ef8d28..a75f3b4256f 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -91,7 +91,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1234,11 +1234,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index d310986d71a..a12cb68369f 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -120,7 +120,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1213,11 +1213,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index b7d803a165d..4f992f4459f 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -117,7 +117,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1210,11 +1210,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 462f7a4f303..e4809f91471 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -65,7 +65,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -572,11 +572,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index e3805dc2ef8..710dbb1c869 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -125,7 +125,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -632,11 +632,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 7ff6ca7b8a0..177812d5f53 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -505,11 +505,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 057ff21a9f0..273258c725b 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -92,7 +92,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
-./usr/lib/libsqlite3.so.21.0
+./usr/lib/libsqlite3.so.22.0
 ./usr/lib/libssl.so.19.0
 ./usr/lib/libstdc++.so.55.0
 ./usr/lib/libtermcap.so.12.1
@@ -1235,11 +1235,17 @@
 ./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_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_fourcc.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_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/i915_drv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/i915_reg.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
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index 5c3c9ced216..301cffc4e53 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -42,7 +42,6 @@
 ./usr/include/amd64/limits.h
 ./usr/include/amd64/loadfile_machdep.h
 ./usr/include/amd64/lock.h
-./usr/include/amd64/mcontext.h
 ./usr/include/amd64/mpbiosreg.h
 ./usr/include/amd64/mpbiosvar.h
 ./usr/include/amd64/mpconfig.h
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 4e861084b37..61007f9e440 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -519,11 +519,17 @@
 ./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_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_fourcc.h
+./usr/include/dev/pci/drm/drm_linux_list.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/i915_drv.h
-./usr/include/dev/pci/drm/i915_reg.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