sync, from sthen

3 files changed, 159 insertions, 16 deletions

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 5a039dbaabb..c57e434c2ba 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -749,37 +749,37 @@
 ./usr/lib/libc.so.97.1
 ./usr/lib/libcbor.so.2.0
 ./usr/lib/libcrypto.so.52.0
-./usr/lib/libcurses.so.14.0
-./usr/lib/libedit.so.5.2
+./usr/lib/libcurses.so.15.0
+./usr/lib/libedit.so.6.0
 ./usr/lib/libelf.so.3.0
 ./usr/lib/libevent.so.4.1
 ./usr/lib/libexecinfo.so.3.0
 ./usr/lib/libexpat.so.14.0
 ./usr/lib/libfido2.so.7.0
-./usr/lib/libform.so.6.0
-./usr/lib/libformw.so.6.0
+./usr/lib/libform.so.7.0
+./usr/lib/libformw.so.7.0
 ./usr/lib/libfuse.so.2.0
 ./usr/lib/libiberty.so.12.0
 ./usr/lib/libkvm.so.17.0
 ./usr/lib/libm.so.10.1
-./usr/lib/libmenu.so.6.0
-./usr/lib/libmenuw.so.6.0
-./usr/lib/libncurses.so.14.0
-./usr/lib/libncursesw.so.14.0
+./usr/lib/libmenu.so.7.0
+./usr/lib/libmenuw.so.7.0
+./usr/lib/libncurses.so.15.0
+./usr/lib/libncursesw.so.15.0
 ./usr/lib/libossaudio.so.4.0
-./usr/lib/libpanel.so.6.0
-./usr/lib/libpanelw.so.6.0
+./usr/lib/libpanel.so.7.0
+./usr/lib/libpanelw.so.7.0
 ./usr/lib/libpcap.so.9.0
 ./usr/lib/libperl.so.23.0
 ./usr/lib/libpthread.so.27.1
 ./usr/lib/libradius.so.1.0
-./usr/lib/libreadline.so.4.0
+./usr/lib/libreadline.so.5.0
 ./usr/lib/librpcsvc.so.3.0
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.7.2
 ./usr/lib/libssl.so.55.0
-./usr/lib/libtermcap.so.14.0
-./usr/lib/libtermlib.so.14.0
+./usr/lib/libtermcap.so.15.0
+./usr/lib/libtermlib.so.15.0
 ./usr/lib/libtls.so.28.0
 ./usr/lib/libusbhid.so.7.1
 ./usr/lib/libutil.so.17.0
@@ -3117,6 +3117,7 @@
 ./usr/share/terminfo/Q/Q310-vip-w-am
 ./usr/share/terminfo/X
 ./usr/share/terminfo/X/X-hpterm
+./usr/share/terminfo/X/X-hpterm-color2
 ./usr/share/terminfo/a
 ./usr/share/terminfo/a/a210
 ./usr/share/terminfo/a/a80
@@ -3169,9 +3170,11 @@
 ./usr/share/terminfo/a/abm85e
 ./usr/share/terminfo/a/abm85h
 ./usr/share/terminfo/a/abm85h-old
+./usr/share/terminfo/a/absolute
 ./usr/share/terminfo/a/act4
 ./usr/share/terminfo/a/act5
 ./usr/share/terminfo/a/addrinfo
+./usr/share/terminfo/a/adds200
 ./usr/share/terminfo/a/adds980
 ./usr/share/terminfo/a/addsviewpoint
 ./usr/share/terminfo/a/addsvp60
@@ -3196,6 +3199,7 @@
 ./usr/share/terminfo/a/adm5
 ./usr/share/terminfo/a/aepro
 ./usr/share/terminfo/a/aixterm
+./usr/share/terminfo/a/aixterm+sl
 ./usr/share/terminfo/a/aixterm-16color
 ./usr/share/terminfo/a/aixterm-m
 ./usr/share/terminfo/a/aixterm-m-old
@@ -3203,6 +3207,9 @@
 ./usr/share/terminfo/a/aj510
 ./usr/share/terminfo/a/aj830
 ./usr/share/terminfo/a/aj832
+./usr/share/terminfo/a/alacritty
+./usr/share/terminfo/a/alacritty+common
+./usr/share/terminfo/a/alacritty-direct
 ./usr/share/terminfo/a/alt2
 ./usr/share/terminfo/a/alt3
 ./usr/share/terminfo/a/alt4
@@ -3245,11 +3252,13 @@
 ./usr/share/terminfo/a/annarbor4080
 ./usr/share/terminfo/a/ansi
 ./usr/share/terminfo/a/ansi+arrows
+./usr/share/terminfo/a/ansi+cpr
 ./usr/share/terminfo/a/ansi+csr
 ./usr/share/terminfo/a/ansi+cup
 ./usr/share/terminfo/a/ansi+enq
 ./usr/share/terminfo/a/ansi+erase
 ./usr/share/terminfo/a/ansi+idc
+./usr/share/terminfo/a/ansi+idc1
 ./usr/share/terminfo/a/ansi+idl
 ./usr/share/terminfo/a/ansi+idl1
 ./usr/share/terminfo/a/ansi+inittabs
@@ -3257,6 +3266,7 @@
 ./usr/share/terminfo/a/ansi+local1
 ./usr/share/terminfo/a/ansi+pp
 ./usr/share/terminfo/a/ansi+rca
+./usr/share/terminfo/a/ansi+rca2
 ./usr/share/terminfo/a/ansi+rep
 ./usr/share/terminfo/a/ansi+sgr
 ./usr/share/terminfo/a/ansi+sgrbold
@@ -3295,10 +3305,12 @@
 ./usr/share/terminfo/a/ansis
 ./usr/share/terminfo/a/ansis-mono
 ./usr/share/terminfo/a/ansisysk
+./usr/share/terminfo/a/ansiterm
 ./usr/share/terminfo/a/ansiw
 ./usr/share/terminfo/a/ap-vm80
 ./usr/share/terminfo/a/apl
 ./usr/share/terminfo/a/apollo
+./usr/share/terminfo/a/apollo+vt132
 ./usr/share/terminfo/a/apollo_15P
 ./usr/share/terminfo/a/apollo_19L
 ./usr/share/terminfo/a/apollo_color
@@ -3361,6 +3373,7 @@
 ./usr/share/terminfo/a/att4426
 ./usr/share/terminfo/a/att500
 ./usr/share/terminfo/a/att505
+./usr/share/terminfo/a/att505-22
 ./usr/share/terminfo/a/att505-24
 ./usr/share/terminfo/a/att510a
 ./usr/share/terminfo/a/att510d
@@ -3397,6 +3410,8 @@
 ./usr/share/terminfo/a/att605-pc
 ./usr/share/terminfo/a/att605-w
 ./usr/share/terminfo/a/att610
+./usr/share/terminfo/a/att610+cvis
+./usr/share/terminfo/a/att610+cvis0
 ./usr/share/terminfo/a/att610-103k
 ./usr/share/terminfo/a/att610-103k-w
 ./usr/share/terminfo/a/att610-w
@@ -3482,6 +3497,7 @@
 ./usr/share/terminfo/b/bq300-w
 ./usr/share/terminfo/b/bq300-w-8rv
 ./usr/share/terminfo/b/bq300-w-rv
+./usr/share/terminfo/b/bracketed+paste
 ./usr/share/terminfo/b/bsdos-pc
 ./usr/share/terminfo/b/bsdos-pc-m
 ./usr/share/terminfo/b/bsdos-pc-mono
@@ -3814,6 +3830,7 @@
 ./usr/share/terminfo/d/dec-vt340
 ./usr/share/terminfo/d/dec-vt400
 ./usr/share/terminfo/d/decansi
+./usr/share/terminfo/d/decid+cpr
 ./usr/share/terminfo/d/decpro
 ./usr/share/terminfo/d/decwriter
 ./usr/share/terminfo/d/delta
@@ -3882,6 +3899,7 @@
 ./usr/share/terminfo/d/dmdt80
 ./usr/share/terminfo/d/dmdt80w
 ./usr/share/terminfo/d/dmterm
+./usr/share/terminfo/d/domterm
 ./usr/share/terminfo/d/dp3360
 ./usr/share/terminfo/d/dp8242
 ./usr/share/terminfo/d/ds40
@@ -3910,6 +3928,8 @@
 ./usr/share/terminfo/d/dwk-vt
 ./usr/share/terminfo/e
 ./usr/share/terminfo/e/ecma+color
+./usr/share/terminfo/e/ecma+index
+./usr/share/terminfo/e/ecma+italics
 ./usr/share/terminfo/e/ecma+sgr
 ./usr/share/terminfo/e/ecma+strikeout
 ./usr/share/terminfo/e/elks
@@ -3958,6 +3978,9 @@
 ./usr/share/terminfo/f/fenix
 ./usr/share/terminfo/f/fenixw
 ./usr/share/terminfo/f/fixterm
+./usr/share/terminfo/f/foot
+./usr/share/terminfo/f/foot+base
+./usr/share/terminfo/f/foot-direct
 ./usr/share/terminfo/f/fortune
 ./usr/share/terminfo/f/fos
 ./usr/share/terminfo/f/fox
@@ -4141,7 +4164,9 @@
 ./usr/share/terminfo/h/hp9837
 ./usr/share/terminfo/h/hp9845
 ./usr/share/terminfo/h/hp98550
+./usr/share/terminfo/h/hp98550-color
 ./usr/share/terminfo/h/hp98550a
+./usr/share/terminfo/h/hp98550a-color
 ./usr/share/terminfo/h/hp98720
 ./usr/share/terminfo/h/hp98721
 ./usr/share/terminfo/h/hpansi
@@ -4151,6 +4176,9 @@
 ./usr/share/terminfo/h/hpsub
 ./usr/share/terminfo/h/hpterm
 ./usr/share/terminfo/h/hpterm-color
+./usr/share/terminfo/h/hpterm-color2
+./usr/share/terminfo/h/hterm
+./usr/share/terminfo/h/hterm-256color
 ./usr/share/terminfo/h/htx11
 ./usr/share/terminfo/h/hurd
 ./usr/share/terminfo/h/hz1000
@@ -4168,6 +4196,7 @@
 ./usr/share/terminfo/i/i3164
 ./usr/share/terminfo/i/i400
 ./usr/share/terminfo/i/iTerm.app
+./usr/share/terminfo/i/iTerm2.app
 ./usr/share/terminfo/i/ibcs2
 ./usr/share/terminfo/i/ibm+16color
 ./usr/share/terminfo/i/ibm+color
@@ -4227,6 +4256,7 @@
 ./usr/share/terminfo/i/ims950-b
 ./usr/share/terminfo/i/ims950-rv
 ./usr/share/terminfo/i/infoton
+./usr/share/terminfo/i/infoton2
 ./usr/share/terminfo/i/interix
 ./usr/share/terminfo/i/interix-nti
 ./usr/share/terminfo/i/intertec
@@ -4245,6 +4275,8 @@
 ./usr/share/terminfo/i/iris-color
 ./usr/share/terminfo/i/iris40
 ./usr/share/terminfo/i/iterm
+./usr/share/terminfo/i/iterm2
+./usr/share/terminfo/i/iterm2-direct
 ./usr/share/terminfo/j
 ./usr/share/terminfo/j/jaixterm
 ./usr/share/terminfo/j/jaixterm-m
@@ -4259,6 +4291,10 @@
 ./usr/share/terminfo/k/kds7372-w
 ./usr/share/terminfo/k/kermit
 ./usr/share/terminfo/k/kermit-am
+./usr/share/terminfo/k/kitty
+./usr/share/terminfo/k/kitty+common
+./usr/share/terminfo/k/kitty+setal
+./usr/share/terminfo/k/kitty-direct
 ./usr/share/terminfo/k/klone+acs
 ./usr/share/terminfo/k/klone+color
 ./usr/share/terminfo/k/klone+koi8acs
@@ -4272,6 +4308,7 @@
 ./usr/share/terminfo/k/konsole-16color
 ./usr/share/terminfo/k/konsole-256color
 ./usr/share/terminfo/k/konsole-base
+./usr/share/terminfo/k/konsole-direct
 ./usr/share/terminfo/k/konsole-linux
 ./usr/share/terminfo/k/konsole-solaris
 ./usr/share/terminfo/k/konsole-vt100
@@ -4291,6 +4328,9 @@
 ./usr/share/terminfo/l/lft
 ./usr/share/terminfo/l/lft-pc850
 ./usr/share/terminfo/l/linux
+./usr/share/terminfo/l/linux+decid
+./usr/share/terminfo/l/linux+kbs
+./usr/share/terminfo/l/linux+sfkeys
 ./usr/share/terminfo/l/linux-16color
 ./usr/share/terminfo/l/linux-basic
 ./usr/share/terminfo/l/linux-c
@@ -4303,6 +4343,7 @@
 ./usr/share/terminfo/l/linux-m1b
 ./usr/share/terminfo/l/linux-m2
 ./usr/share/terminfo/l/linux-nic
+./usr/share/terminfo/l/linux-s
 ./usr/share/terminfo/l/linux-vt
 ./usr/share/terminfo/l/linux2.2
 ./usr/share/terminfo/l/linux2.6
@@ -4375,9 +4416,13 @@
 ./usr/share/terminfo/m/minix-3.0
 ./usr/share/terminfo/m/minix-old
 ./usr/share/terminfo/m/minix-old-am
+./usr/share/terminfo/m/mintty
+./usr/share/terminfo/m/mintty+common
+./usr/share/terminfo/m/mintty-direct
 ./usr/share/terminfo/m/mlterm
 ./usr/share/terminfo/m/mlterm+pcfkeys
 ./usr/share/terminfo/m/mlterm-256color
+./usr/share/terminfo/m/mlterm-direct
 ./usr/share/terminfo/m/mlterm2
 ./usr/share/terminfo/m/mlterm3
 ./usr/share/terminfo/m/mm314
@@ -4389,9 +4434,12 @@
 ./usr/share/terminfo/m/modgraph48
 ./usr/share/terminfo/m/mono-emx
 ./usr/share/terminfo/m/morphos
+./usr/share/terminfo/m/mosh
+./usr/share/terminfo/m/mosh-256color
 ./usr/share/terminfo/m/mouse-sun
 ./usr/share/terminfo/m/mrxvt
 ./usr/share/terminfo/m/mrxvt-256color
+./usr/share/terminfo/m/ms-terminal
 ./usr/share/terminfo/m/ms-vt-utf8
 ./usr/share/terminfo/m/ms-vt100
 ./usr/share/terminfo/m/ms-vt100+
@@ -4409,6 +4457,7 @@
 ./usr/share/terminfo/m/mterm-ansi
 ./usr/share/terminfo/m/mvterm
 ./usr/share/terminfo/n
+./usr/share/terminfo/n/n7900
 ./usr/share/terminfo/n/nansi.sys
 ./usr/share/terminfo/n/nansi.sysk
 ./usr/share/terminfo/n/nansisys
@@ -4435,8 +4484,10 @@
 ./usr/share/terminfo/n/ncr260intpp
 ./usr/share/terminfo/n/ncr260intwan
 ./usr/share/terminfo/n/ncr260intwpp
+./usr/share/terminfo/n/ncr260vp+sl
 ./usr/share/terminfo/n/ncr260vppp
 ./usr/share/terminfo/n/ncr260vpwpp
+./usr/share/terminfo/n/ncr260vt+sl
 ./usr/share/terminfo/n/ncr260vt100an
 ./usr/share/terminfo/n/ncr260vt100pp
 ./usr/share/terminfo/n/ncr260vt100wan
@@ -4516,6 +4567,7 @@
 ./usr/share/terminfo/n/newscbm33
 ./usr/share/terminfo/n/next
 ./usr/share/terminfo/n/nextshell
+./usr/share/terminfo/n/no+brackets
 ./usr/share/terminfo/n/northstar
 ./usr/share/terminfo/n/nsterm
 ./usr/share/terminfo/n/nsterm+7
@@ -4539,15 +4591,19 @@
 ./usr/share/terminfo/n/nsterm-acs-m-s
 ./usr/share/terminfo/n/nsterm-acs-s
 ./usr/share/terminfo/n/nsterm-bce
+./usr/share/terminfo/n/nsterm-build309
 ./usr/share/terminfo/n/nsterm-build326
 ./usr/share/terminfo/n/nsterm-build343
 ./usr/share/terminfo/n/nsterm-build361
+./usr/share/terminfo/n/nsterm-build400
+./usr/share/terminfo/n/nsterm-build440
 ./usr/share/terminfo/n/nsterm-c
 ./usr/share/terminfo/n/nsterm-c-7
 ./usr/share/terminfo/n/nsterm-c-acs
 ./usr/share/terminfo/n/nsterm-c-s
 ./usr/share/terminfo/n/nsterm-c-s-7
 ./usr/share/terminfo/n/nsterm-c-s-acs
+./usr/share/terminfo/n/nsterm-direct
 ./usr/share/terminfo/n/nsterm-m
 ./usr/share/terminfo/n/nsterm-m-7
 ./usr/share/terminfo/n/nsterm-m-acs
@@ -4776,6 +4832,7 @@
 ./usr/share/terminfo/p/pt505-24
 ./usr/share/terminfo/p/pty
 ./usr/share/terminfo/p/putty
+./usr/share/terminfo/p/putty+cursor
 ./usr/share/terminfo/p/putty+fnkeys
 ./usr/share/terminfo/p/putty+fnkeys+esc
 ./usr/share/terminfo/p/putty+fnkeys+linux
@@ -4783,12 +4840,15 @@
 ./usr/share/terminfo/p/putty+fnkeys+vt100
 ./usr/share/terminfo/p/putty+fnkeys+vt400
 ./usr/share/terminfo/p/putty+fnkeys+xterm
+./usr/share/terminfo/p/putty+keypad
+./usr/share/terminfo/p/putty+screen
 ./usr/share/terminfo/p/putty-256color
 ./usr/share/terminfo/p/putty-m1
 ./usr/share/terminfo/p/putty-m1b
 ./usr/share/terminfo/p/putty-m2
 ./usr/share/terminfo/p/putty-noapp
 ./usr/share/terminfo/p/putty-sco
+./usr/share/terminfo/p/putty-screen
 ./usr/share/terminfo/p/putty-vt100
 ./usr/share/terminfo/q
 ./usr/share/terminfo/q/qansi
@@ -4848,6 +4908,8 @@
 ./usr/share/terminfo/r/regent40
 ./usr/share/terminfo/r/regent40+
 ./usr/share/terminfo/r/regent60
+./usr/share/terminfo/r/report+da2
+./usr/share/terminfo/r/report+version
 ./usr/share/terminfo/r/rt6221
 ./usr/share/terminfo/r/rt6221-w
 ./usr/share/terminfo/r/rtpc
@@ -4887,6 +4949,7 @@
 ./usr/share/terminfo/s/screen-256color-bce
 ./usr/share/terminfo/s/screen-256color-bce-s
 ./usr/share/terminfo/s/screen-256color-s
+./usr/share/terminfo/s/screen-base
 ./usr/share/terminfo/s/screen-bce
 ./usr/share/terminfo/s/screen-bce.Eterm
 ./usr/share/terminfo/s/screen-bce.gnome
@@ -4905,6 +4968,7 @@
 ./usr/share/terminfo/s/screen.linux-m1
 ./usr/share/terminfo/s/screen.linux-m1b
 ./usr/share/terminfo/s/screen.linux-m2
+./usr/share/terminfo/s/screen.linux-s
 ./usr/share/terminfo/s/screen.minitel1
 ./usr/share/terminfo/s/screen.minitel1-nb
 ./usr/share/terminfo/s/screen.minitel12-80
@@ -4930,8 +4994,12 @@
 ./usr/share/terminfo/s/screen.xterm-xfree86
 ./usr/share/terminfo/s/screen2
 ./usr/share/terminfo/s/screen3
+./usr/share/terminfo/s/screen4
+./usr/share/terminfo/s/screen5
 ./usr/share/terminfo/s/screwpoint
 ./usr/share/terminfo/s/scrhp
+./usr/share/terminfo/s/scrt
+./usr/share/terminfo/s/securecrt
 ./usr/share/terminfo/s/sibo
 ./usr/share/terminfo/s/simpleterm
 ./usr/share/terminfo/s/simterm
@@ -4940,8 +5008,12 @@
 ./usr/share/terminfo/s/soroc140
 ./usr/share/terminfo/s/spinwriter
 ./usr/share/terminfo/s/st
+./usr/share/terminfo/s/st-0.6
+./usr/share/terminfo/s/st-0.7
+./usr/share/terminfo/s/st-0.8
 ./usr/share/terminfo/s/st-16color
 ./usr/share/terminfo/s/st-256color
+./usr/share/terminfo/s/st-direct
 ./usr/share/terminfo/s/st52
 ./usr/share/terminfo/s/st52-color
 ./usr/share/terminfo/s/st52-m
@@ -5039,18 +5111,35 @@
 ./usr/share/terminfo/t/tek4207-s
 ./usr/share/terminfo/t/tek4404
 ./usr/share/terminfo/t/teken
+./usr/share/terminfo/t/teken-16color
+./usr/share/terminfo/t/teken-2018
+./usr/share/terminfo/t/teken-2022
+./usr/share/terminfo/t/teken-sc
+./usr/share/terminfo/t/teken-sc+fkeys
+./usr/share/terminfo/t/teken-vt
+./usr/share/terminfo/t/teken-vt+fkeys
 ./usr/share/terminfo/t/teleray
 ./usr/share/terminfo/t/teletec
 ./usr/share/terminfo/t/teraterm
+./usr/share/terminfo/t/teraterm-256color
 ./usr/share/terminfo/t/teraterm2.3
 ./usr/share/terminfo/t/teraterm4.59
+./usr/share/terminfo/t/teraterm4.97
 ./usr/share/terminfo/t/terminator
 ./usr/share/terminfo/t/terminet
 ./usr/share/terminfo/t/terminet1200
 ./usr/share/terminfo/t/terminet300
 ./usr/share/terminfo/t/terminology
+./usr/share/terminfo/t/terminology-0.6.1
+./usr/share/terminfo/t/terminology-1.0.0
+./usr/share/terminfo/t/terminology-1.8.1
+./usr/share/terminfo/t/termite
 ./usr/share/terminfo/t/tgtelnet
 ./usr/share/terminfo/t/ti700
+./usr/share/terminfo/t/ti703
+./usr/share/terminfo/t/ti703-w
+./usr/share/terminfo/t/ti707
+./usr/share/terminfo/t/ti707-w
 ./usr/share/terminfo/t/ti733
 ./usr/share/terminfo/t/ti735
 ./usr/share/terminfo/t/ti745
@@ -5074,6 +5163,7 @@
 ./usr/share/terminfo/t/tkterm
 ./usr/share/terminfo/t/tmux
 ./usr/share/terminfo/t/tmux-256color
+./usr/share/terminfo/t/tmux-direct
 ./usr/share/terminfo/t/tn1200
 ./usr/share/terminfo/t/tn300
 ./usr/share/terminfo/t/trs16
@@ -5088,7 +5178,6 @@
 ./usr/share/terminfo/t/ts100-sp
 ./usr/share/terminfo/t/ts1p
 ./usr/share/terminfo/t/tt
-./usr/share/terminfo/t/tt505-22
 ./usr/share/terminfo/t/tt52
 ./usr/share/terminfo/t/tty33
 ./usr/share/terminfo/t/tty35
@@ -5299,6 +5388,8 @@
 ./usr/share/terminfo/v/vs100
 ./usr/share/terminfo/v/vs100-x10
 ./usr/share/terminfo/v/vsc
+./usr/share/terminfo/v/vscode
+./usr/share/terminfo/v/vscode-direct
 ./usr/share/terminfo/v/vt-61
 ./usr/share/terminfo/v/vt-utf8
 ./usr/share/terminfo/v/vt100
@@ -5341,9 +5432,14 @@
 ./usr/share/terminfo/v/vt200-old
 ./usr/share/terminfo/v/vt200-w
 ./usr/share/terminfo/v/vt220
+./usr/share/terminfo/v/vt220+cvis
+./usr/share/terminfo/v/vt220+cvis8
 ./usr/share/terminfo/v/vt220+keypad
+./usr/share/terminfo/v/vt220+pcedit
+./usr/share/terminfo/v/vt220+vtedit
 ./usr/share/terminfo/v/vt220-8
 ./usr/share/terminfo/v/vt220-8bit
+./usr/share/terminfo/v/vt220-base
 ./usr/share/terminfo/v/vt220-js
 ./usr/share/terminfo/v/vt220-nam
 ./usr/share/terminfo/v/vt220-old
@@ -5365,6 +5461,7 @@
 ./usr/share/terminfo/v/vt400
 ./usr/share/terminfo/v/vt400-24
 ./usr/share/terminfo/v/vt420
+./usr/share/terminfo/v/vt420+lrmm
 ./usr/share/terminfo/v/vt420f
 ./usr/share/terminfo/v/vt420pc
 ./usr/share/terminfo/v/vt420pcdos
@@ -5374,6 +5471,8 @@
 ./usr/share/terminfo/v/vt510pc
 ./usr/share/terminfo/v/vt510pcdos
 ./usr/share/terminfo/v/vt52
+./usr/share/terminfo/v/vt52+keypad
+./usr/share/terminfo/v/vt52-basic
 ./usr/share/terminfo/v/vt520
 ./usr/share/terminfo/v/vt520ansi
 ./usr/share/terminfo/v/vt525
@@ -5385,7 +5484,10 @@
 ./usr/share/terminfo/v/vte-2008
 ./usr/share/terminfo/v/vte-2012
 ./usr/share/terminfo/v/vte-2014
+./usr/share/terminfo/v/vte-2017
+./usr/share/terminfo/v/vte-2018
 ./usr/share/terminfo/v/vte-256color
+./usr/share/terminfo/v/vte-direct
 ./usr/share/terminfo/v/vtnt
 ./usr/share/terminfo/v/vv100
 ./usr/share/terminfo/v/vwmterm
@@ -5526,6 +5628,7 @@
 ./usr/share/terminfo/w/wy99gt-w
 ./usr/share/terminfo/w/wy99gt-w-vb
 ./usr/share/terminfo/w/wy99gt-wvb
+./usr/share/terminfo/w/wyse+sl
 ./usr/share/terminfo/w/wyse-325
 ./usr/share/terminfo/w/wyse-75ap
 ./usr/share/terminfo/w/wyse-vp
@@ -5629,6 +5732,7 @@
 ./usr/share/terminfo/w/wyse99gt-wvb
 ./usr/share/terminfo/x
 ./usr/share/terminfo/x/x10term
+./usr/share/terminfo/x/x10term+sl
 ./usr/share/terminfo/x/x1700
 ./usr/share/terminfo/x/x1700-lm
 ./usr/share/terminfo/x/x1720
@@ -5643,6 +5747,7 @@
 ./usr/share/terminfo/x/xerox1720
 ./usr/share/terminfo/x/xerox820
 ./usr/share/terminfo/x/xfce
+./usr/share/terminfo/x/xgterm
 ./usr/share/terminfo/x/xiterm
 ./usr/share/terminfo/x/xl83
 ./usr/share/terminfo/x/xnuppc
@@ -5697,12 +5802,30 @@
 ./usr/share/terminfo/x/xtalk
 ./usr/share/terminfo/x/xterm
 ./usr/share/terminfo/x/xterm+256color
+./usr/share/terminfo/x/xterm+256color2
 ./usr/share/terminfo/x/xterm+256setaf
 ./usr/share/terminfo/x/xterm+88color
+./usr/share/terminfo/x/xterm+88color2
+./usr/share/terminfo/x/xterm+acs
+./usr/share/terminfo/x/xterm+alt+title
+./usr/share/terminfo/x/xterm+alt1049
+./usr/share/terminfo/x/xterm+alt47
 ./usr/share/terminfo/x/xterm+app
+./usr/share/terminfo/x/xterm+direct
+./usr/share/terminfo/x/xterm+direct16
+./usr/share/terminfo/x/xterm+direct2
+./usr/share/terminfo/x/xterm+direct256
 ./usr/share/terminfo/x/xterm+edit
+./usr/share/terminfo/x/xterm+focus
+./usr/share/terminfo/x/xterm+indirect
 ./usr/share/terminfo/x/xterm+kbs
+./usr/share/terminfo/x/xterm+keypad
+./usr/share/terminfo/x/xterm+meta
+./usr/share/terminfo/x/xterm+noalt
 ./usr/share/terminfo/x/xterm+noapp
+./usr/share/terminfo/x/xterm+nofkeys
+./usr/share/terminfo/x/xterm+nopcfkeys
+./usr/share/terminfo/x/xterm+osc104
 ./usr/share/terminfo/x/xterm+pc+edit
 ./usr/share/terminfo/x/xterm+pcc0
 ./usr/share/terminfo/x/xterm+pcc1
@@ -5714,12 +5837,15 @@
 ./usr/share/terminfo/x/xterm+pcfkeys
 ./usr/share/terminfo/x/xterm+r6f2
 ./usr/share/terminfo/x/xterm+sl
+./usr/share/terminfo/x/xterm+sl-alt
 ./usr/share/terminfo/x/xterm+sl-twm
 ./usr/share/terminfo/x/xterm+sm+1002
 ./usr/share/terminfo/x/xterm+sm+1003
 ./usr/share/terminfo/x/xterm+sm+1005
 ./usr/share/terminfo/x/xterm+sm+1006
+./usr/share/terminfo/x/xterm+titlestack
 ./usr/share/terminfo/x/xterm+tmux
+./usr/share/terminfo/x/xterm+tmux2
 ./usr/share/terminfo/x/xterm+vt+edit
 ./usr/share/terminfo/x/xterm+x10mouse
 ./usr/share/terminfo/x/xterm+x11hilite
@@ -5736,11 +5862,18 @@
 ./usr/share/terminfo/x/xterm-basic
 ./usr/share/terminfo/x/xterm-bold
 ./usr/share/terminfo/x/xterm-color
+./usr/share/terminfo/x/xterm-direct
+./usr/share/terminfo/x/xterm-direct16
+./usr/share/terminfo/x/xterm-direct2
+./usr/share/terminfo/x/xterm-direct256
 ./usr/share/terminfo/x/xterm-hp
+./usr/share/terminfo/x/xterm-mono
 ./usr/share/terminfo/x/xterm-new
 ./usr/share/terminfo/x/xterm-nic
 ./usr/share/terminfo/x/xterm-noapp
 ./usr/share/terminfo/x/xterm-old
+./usr/share/terminfo/x/xterm-p370
+./usr/share/terminfo/x/xterm-p371
 ./usr/share/terminfo/x/xterm-pcolor
 ./usr/share/terminfo/x/xterm-r5
 ./usr/share/terminfo/x/xterm-r6
@@ -5760,6 +5893,7 @@
 ./usr/share/terminfo/x/xterm-xf86-v44
 ./usr/share/terminfo/x/xterm-xfree86
 ./usr/share/terminfo/x/xterm-xi
+./usr/share/terminfo/x/xterm.js
 ./usr/share/terminfo/x/xterm1
 ./usr/share/terminfo/x/xtermc
 ./usr/share/terminfo/x/xtermm
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index d58882e8c0f..7c0dacefbaf 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -959,6 +959,7 @@
 ./usr/include/msdosfs/fat.h
 ./usr/include/msdosfs/msdosfsmount.h
 ./usr/include/ncurses.h
+./usr/include/ncurses_dll.h
 ./usr/include/ndbm.h
 ./usr/include/net
 ./usr/include/net/art.h
@@ -2375,6 +2376,7 @@
 ./usr/share/man/man3/curs_extend.3
 ./usr/share/man/man3/curs_get_wch.3
 ./usr/share/man/man3/curs_get_wstr.3
+./usr/share/man/man3/curs_getcchar.3
 ./usr/share/man/man3/curs_getch.3
 ./usr/share/man/man3/curs_getstr.3
 ./usr/share/man/man3/curs_getyx.3
@@ -2392,6 +2394,7 @@
 ./usr/share/man/man3/curs_inwstr.3
 ./usr/share/man/man3/curs_kernel.3
 ./usr/share/man/man3/curs_legacy.3
+./usr/share/man/man3/curs_memleaks.3
 ./usr/share/man/man3/curs_mouse.3
 ./usr/share/man/man3/curs_move.3
 ./usr/share/man/man3/curs_opaque.3
@@ -2405,9 +2408,12 @@
 ./usr/share/man/man3/curs_scr_dump.3
 ./usr/share/man/man3/curs_scroll.3
 ./usr/share/man/man3/curs_slk.3
+./usr/share/man/man3/curs_sp_funcs.3
 ./usr/share/man/man3/curs_termattrs.3
+./usr/share/man/man3/curs_threads.3
 ./usr/share/man/man3/curs_touch.3
 ./usr/share/man/man3/curs_util.3
+./usr/share/man/man3/curs_variables.3
 ./usr/share/man/man3/curs_window.3
 ./usr/share/man/man3/curses.3
 ./usr/share/man/man3/d2i_ASN1_NULL.3
@@ -2566,6 +2572,7 @@
 ./usr/share/man/man3/form_post.3
 ./usr/share/man/man3/form_requestname.3
 ./usr/share/man/man3/form_userptr.3
+./usr/share/man/man3/form_variables.3
 ./usr/share/man/man3/form_win.3
 ./usr/share/man/man3/fparseln.3
 ./usr/share/man/man3/fpclassify.3
@@ -2778,6 +2785,7 @@
 ./usr/share/man/man3/moncontrol.3
 ./usr/share/man/man3/nan.3
 ./usr/share/man/man3/ndbm.3
+./usr/share/man/man3/new_pair.3
 ./usr/share/man/man3/newlocale.3
 ./usr/share/man/man3/nextafter.3
 ./usr/share/man/man3/nice.3
@@ -2987,6 +2995,7 @@
 ./usr/share/man/man3/tcsendbreak.3
 ./usr/share/man/man3/tcsetattr.3
 ./usr/share/man/man3/tcsetpgrp.3
+./usr/share/man/man3/term_variables.3
 ./usr/share/man/man3/termcap.3
 ./usr/share/man/man3/terminfo.3
 ./usr/share/man/man3/time.3
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 992646db53a..50abc960a73 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -29,7 +29,6 @@
 ./usr/share/man/man1/cal.1
 ./usr/share/man/man1/calendar.1
 ./usr/share/man/man1/cap_mkdb.1
-./usr/share/man/man1/captoinfo.1
 ./usr/share/man/man1/cat.1
 ./usr/share/man/man1/cdio.1
 ./usr/share/man/man1/check-lib-depends.1
@@ -116,7 +115,6 @@
 ./usr/share/man/man1/info.1
 ./usr/share/man/man1/infocmp.1
 ./usr/share/man/man1/infokey.1
-./usr/share/man/man1/infotocap.1
 ./usr/share/man/man1/install-info.1
 ./usr/share/man/man1/install.1
 ./usr/share/man/man1/instmodsh.1
@@ -2303,6 +2301,7 @@
 ./usr/share/man/man5/rpc.5
 ./usr/share/man/man5/ruby-module.5
 ./usr/share/man/man5/sasyncd.conf.5
+./usr/share/man/man5/scr_dump.5
 ./usr/share/man/man5/securenet.5
 ./usr/share/man/man5/sensorsd.conf.5
 ./usr/share/man/man5/services.5
@@ -2325,6 +2324,7 @@
 ./usr/share/man/man5/tzfile.5
 ./usr/share/man/man5/unbound.conf.5
 ./usr/share/man/man5/unwind.conf.5
+./usr/share/man/man5/user_caps.5
 ./usr/share/man/man5/usermgmt.conf.5
 ./usr/share/man/man5/utmp.5
 ./usr/share/man/man5/uuencode.5