Second half of botched commit to fix this for -current users and

add support for TERM=xterm-color.

PR:		7314, 11492
Submitted by:	maintainer, steve

4 files changed, 566 insertions, 18 deletions

diff --git a/devel/ncurses-devel/distinfo b/devel/ncurses-devel/distinfo
index 5e0b016fb6e6..234eed4b561b 100644
--- a/devel/ncurses-devel/distinfo
+++ b/devel/ncurses-devel/distinfo
@@ -1 +1,2 @@
 MD5 (ncurses-4.2.tar.gz) = 7926ed3ef7090f72c0a45da1f59400bf
+MD5 (terminfo.src.gz) = 4b111861ea3a5725127290c9c1c8a7a4
diff --git a/devel/ncurses-devel/pkg-plist b/devel/ncurses-devel/pkg-plist
index 485fcab7575d..b893ddca8350 100644
--- a/devel/ncurses-devel/pkg-plist
+++ b/devel/ncurses-devel/pkg-plist
@@ -44,8 +44,8 @@ lib/libpanel.so
 lib/libpanel.so.4.2
 lib/libpanel_g.a
 lib/libpanel_p.a
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/doc/ncurses/ANNOUNCE
 share/doc/ncurses/INSTALL
 share/doc/ncurses/NEWS
@@ -107,6 +107,10 @@ share/misc/terminfo/5/5410-w
 share/misc/terminfo/5/5620
 share/misc/terminfo/5/5630-24
 share/misc/terminfo/5/5630DMD-24
+share/misc/terminfo/6/6053
+share/misc/terminfo/6/6053-dg
+share/misc/terminfo/6/605x
+share/misc/terminfo/6/605x-dg
 share/misc/terminfo/6/630-lm
 share/misc/terminfo/6/630MTG-24
 share/misc/terminfo/7/730MTG-24
@@ -117,6 +121,8 @@ share/misc/terminfo/7/730MTGr-24
 share/misc/terminfo/8/8510
 share/misc/terminfo/9/955-hb
 share/misc/terminfo/9/955-w
+share/misc/terminfo/N/NCR260VT300WPP
+share/misc/terminfo/N/NCRVT100WPP
 share/misc/terminfo/P/P12
 share/misc/terminfo/P/P12-M
 share/misc/terminfo/P/P12-M-W
@@ -212,6 +218,7 @@ share/misc/terminfo/a/adm42
 share/misc/terminfo/a/adm42-ns
 share/misc/terminfo/a/adm5
 share/misc/terminfo/a/aepro
+share/misc/terminfo/a/aixterm
 share/misc/terminfo/a/aixterm-m
 share/misc/terminfo/a/aixterm-m-old
 share/misc/terminfo/a/aj
@@ -308,6 +315,10 @@ share/misc/terminfo/a/appleII
 share/misc/terminfo/a/appleIIc
 share/misc/terminfo/a/appleIIe
 share/misc/terminfo/a/appleIIgs
+share/misc/terminfo/a/arm100
+share/misc/terminfo/a/arm100-am
+share/misc/terminfo/a/arm100-w
+share/misc/terminfo/a/arm100-wam
 share/misc/terminfo/a/at386
 share/misc/terminfo/a/atari
 share/misc/terminfo/a/att2300
@@ -387,6 +398,7 @@ share/misc/terminfo/a/att620-w
 share/misc/terminfo/a/att630
 share/misc/terminfo/a/att630-24
 share/misc/terminfo/a/att6386
+share/misc/terminfo/a/att700
 share/misc/terminfo/a/att730
 share/misc/terminfo/a/att730-24
 share/misc/terminfo/a/att730-41
@@ -440,8 +452,10 @@ share/misc/terminfo/b/bh4
 share/misc/terminfo/b/bitgraph
 share/misc/terminfo/b/blit
 share/misc/terminfo/b/bobcat
-share/misc/terminfo/b/bsdos
-share/misc/terminfo/b/bsdos-bold
+share/misc/terminfo/b/bsdos-pc
+share/misc/terminfo/b/bsdos-pc-nobold
+share/misc/terminfo/b/bsdos-ppc
+share/misc/terminfo/b/bsdos-sparc
 share/misc/terminfo/c/c100
 share/misc/terminfo/c/c100-1p
 share/misc/terminfo/c/c100-4p
@@ -552,6 +566,8 @@ share/misc/terminfo/c/contel321
 share/misc/terminfo/c/cops
 share/misc/terminfo/c/cops-10
 share/misc/terminfo/c/cops10
+share/misc/terminfo/c/crt
+share/misc/terminfo/c/crt-vt220
 share/misc/terminfo/c/cs10
 share/misc/terminfo/c/cs10-w
 share/misc/terminfo/c/ct82
@@ -562,6 +578,154 @@ share/misc/terminfo/c/cx100
 share/misc/terminfo/c/cyb110
 share/misc/terminfo/c/cyb83
 share/misc/terminfo/d/d132
+share/misc/terminfo/d/d2
+share/misc/terminfo/d/d2-dg
+share/misc/terminfo/d/d200
+share/misc/terminfo/d/d200-dg
+share/misc/terminfo/d/d210
+share/misc/terminfo/d/d210-dg
+share/misc/terminfo/d/d211
+share/misc/terminfo/d/d211-7b
+share/misc/terminfo/d/d211-dg
+share/misc/terminfo/d/d214
+share/misc/terminfo/d/d214-dg
+share/misc/terminfo/d/d215
+share/misc/terminfo/d/d215-7b
+share/misc/terminfo/d/d215-dg
+share/misc/terminfo/d/d216-dg
+share/misc/terminfo/d/d216-unix
+share/misc/terminfo/d/d216-unix-25
+share/misc/terminfo/d/d216+
+share/misc/terminfo/d/d216+25
+share/misc/terminfo/d/d216+dg
+share/misc/terminfo/d/d216e-dg
+share/misc/terminfo/d/d216e-unix
+share/misc/terminfo/d/d216e+
+share/misc/terminfo/d/d216e+dg
+share/misc/terminfo/d/d217-dg
+share/misc/terminfo/d/d217-unix
+share/misc/terminfo/d/d217-unix-25
+share/misc/terminfo/d/d220
+share/misc/terminfo/d/d220-7b
+share/misc/terminfo/d/d220-dg
+share/misc/terminfo/d/d230
+share/misc/terminfo/d/d230-dg
+share/misc/terminfo/d/d230c
+share/misc/terminfo/d/d230c-dg
+share/misc/terminfo/d/d400
+share/misc/terminfo/d/d400-dg
+share/misc/terminfo/d/d410
+share/misc/terminfo/d/d410-7b
+share/misc/terminfo/d/d410-7b-w
+share/misc/terminfo/d/d410-dg
+share/misc/terminfo/d/d410-w
+share/misc/terminfo/d/d411
+share/misc/terminfo/d/d411-7b
+share/misc/terminfo/d/d411-7b-w
+share/misc/terminfo/d/d411-dg
+share/misc/terminfo/d/d411-w
+share/misc/terminfo/d/d412-dg
+share/misc/terminfo/d/d412-unix
+share/misc/terminfo/d/d412-unix-w
+share/misc/terminfo/d/d412-unix-25
+share/misc/terminfo/d/d412-unix-s
+share/misc/terminfo/d/d412-unix-sr
+share/misc/terminfo/d/d412+
+share/misc/terminfo/d/d412+25
+share/misc/terminfo/d/d412+dg
+share/misc/terminfo/d/d412+s
+share/misc/terminfo/d/d412+sr
+share/misc/terminfo/d/d412+w
+share/misc/terminfo/d/d413-dg
+share/misc/terminfo/d/d413-unix
+share/misc/terminfo/d/d413-unix-25
+share/misc/terminfo/d/d413-unix-s
+share/misc/terminfo/d/d413-unix-sr
+share/misc/terminfo/d/d413-unix-w
+share/misc/terminfo/d/d414-unix
+share/misc/terminfo/d/d414-unix-25
+share/misc/terminfo/d/d414-unix-s
+share/misc/terminfo/d/d414-unix-sr
+share/misc/terminfo/d/d414-unix-w
+share/misc/terminfo/d/d430-dg
+share/misc/terminfo/d/d430-dg-ccc
+share/misc/terminfo/d/d430-unix
+share/misc/terminfo/d/d430-unix-w
+share/misc/terminfo/d/d430-unix-25
+share/misc/terminfo/d/d430-unix-25-ccc
+share/misc/terminfo/d/d430-unix-ccc
+share/misc/terminfo/d/d430-unix-s
+share/misc/terminfo/d/d430-unix-s-ccc
+share/misc/terminfo/d/d430-unix-sr
+share/misc/terminfo/d/d430-unix-sr-ccc
+share/misc/terminfo/d/d430-unix-w-ccc
+share/misc/terminfo/d/d430c-dg
+share/misc/terminfo/d/d430c-dg-ccc
+share/misc/terminfo/d/d430c-unix
+share/misc/terminfo/d/d430c-unix-25
+share/misc/terminfo/d/d430c-unix-25-ccc
+share/misc/terminfo/d/d430c-unix-ccc
+share/misc/terminfo/d/d430c-unix-s
+share/misc/terminfo/d/d430c-unix-s-ccc
+share/misc/terminfo/d/d430c-unix-sr
+share/misc/terminfo/d/d430c-unix-sr-ccc
+share/misc/terminfo/d/d430c-unix-w
+share/misc/terminfo/d/d430c-unix-w-ccc
+share/misc/terminfo/d/d450
+share/misc/terminfo/d/d450-dg
+share/misc/terminfo/d/d460
+share/misc/terminfo/d/d460-7b
+share/misc/terminfo/d/d460-7b-w
+share/misc/terminfo/d/d460-dg
+share/misc/terminfo/d/d460-w
+share/misc/terminfo/d/d461
+share/misc/terminfo/d/d461-7b
+share/misc/terminfo/d/d461-7b-w
+share/misc/terminfo/d/d461-dg
+share/misc/terminfo/d/d461-w
+share/misc/terminfo/d/d462-dg
+share/misc/terminfo/d/d462-unix
+share/misc/terminfo/d/d462-unix-25
+share/misc/terminfo/d/d462-unix-s
+share/misc/terminfo/d/d462-unix-sr
+share/misc/terminfo/d/d462-unix-w
+share/misc/terminfo/d/d462+
+share/misc/terminfo/d/d462+25
+share/misc/terminfo/d/d462+dg
+share/misc/terminfo/d/d462+s
+share/misc/terminfo/d/d462+sr
+share/misc/terminfo/d/d462+w
+share/misc/terminfo/d/d462e-dg
+share/misc/terminfo/d/d463-dg
+share/misc/terminfo/d/d463-unix
+share/misc/terminfo/d/d463-unix-25
+share/misc/terminfo/d/d463-unix-s
+share/misc/terminfo/d/d463-unix-sr
+share/misc/terminfo/d/d463-unix-w
+share/misc/terminfo/d/d464-unix
+share/misc/terminfo/d/d464-unix-25
+share/misc/terminfo/d/d464-unix-s
+share/misc/terminfo/d/d464-unix-sr
+share/misc/terminfo/d/d464-unix-w
+share/misc/terminfo/d/d470
+share/misc/terminfo/d/d470-7b
+share/misc/terminfo/d/d470-dg
+share/misc/terminfo/d/d470c
+share/misc/terminfo/d/d470c-7b
+share/misc/terminfo/d/d470c-dg
+share/misc/terminfo/d/d555
+share/misc/terminfo/d/d555-7b
+share/misc/terminfo/d/d555-7b-w
+share/misc/terminfo/d/d555-dg
+share/misc/terminfo/d/d555-w
+share/misc/terminfo/d/d577
+share/misc/terminfo/d/d577-7b
+share/misc/terminfo/d/d577-7b-w
+share/misc/terminfo/d/d577-dg
+share/misc/terminfo/d/d577-w
+share/misc/terminfo/d/d578
+share/misc/terminfo/d/d578-7b
+share/misc/terminfo/d/d578-dg
 share/misc/terminfo/d/d80
 share/misc/terminfo/d/d800
 share/misc/terminfo/d/datagraphix
@@ -580,6 +744,11 @@ share/misc/terminfo/d/decpro
 share/misc/terminfo/d/decwriter
 share/misc/terminfo/d/delta
 share/misc/terminfo/d/dg-ansi
+share/misc/terminfo/d/dg-generic
+share/misc/terminfo/d/dg+ccc
+share/misc/terminfo/d/dg+color
+share/misc/terminfo/d/dg+color8
+share/misc/terminfo/d/dg+fixed
 share/misc/terminfo/d/dg100
 share/misc/terminfo/d/dg200
 share/misc/terminfo/d/dg210
@@ -587,7 +756,17 @@ share/misc/terminfo/d/dg211
 share/misc/terminfo/d/dg450
 share/misc/terminfo/d/dg460-ansi
 share/misc/terminfo/d/dg6053
+share/misc/terminfo/d/dg6053-old
+share/misc/terminfo/d/dg605x
 share/misc/terminfo/d/dg6134
+share/misc/terminfo/d/dgkeys+11
+share/misc/terminfo/d/dgkeys+15
+share/misc/terminfo/d/dgkeys+7b
+share/misc/terminfo/d/dgkeys+8b
+share/misc/terminfo/d/dgmode+color
+share/misc/terminfo/d/dgmode+color8
+share/misc/terminfo/d/dgunix+ccc
+share/misc/terminfo/d/dgunix+fixed
 share/misc/terminfo/d/diablo
 share/misc/terminfo/d/diablo-lm
 share/misc/terminfo/d/diablo1620
@@ -766,6 +945,7 @@ share/misc/terminfo/h/heathkit
 share/misc/terminfo/h/heathkit-a
 share/misc/terminfo/h/hft
 share/misc/terminfo/h/hft-c
+share/misc/terminfo/h/hft-c-old
 share/misc/terminfo/h/hirez100
 share/misc/terminfo/h/hirez100-w
 share/misc/terminfo/h/hmod1
@@ -872,7 +1052,6 @@ share/misc/terminfo/h/hz1552-rv
 share/misc/terminfo/h/hz2000
 share/misc/terminfo/i/i100
 share/misc/terminfo/i/i3101
-share/misc/terminfo/i/i3151
 share/misc/terminfo/i/i3164
 share/misc/terminfo/i/i400
 share/misc/terminfo/i/ibcs2
@@ -882,6 +1061,8 @@ share/misc/terminfo/i/ibm-system1
 share/misc/terminfo/i/ibm3101
 share/misc/terminfo/i/ibm3151
 share/misc/terminfo/i/ibm3161
+share/misc/terminfo/i/ibm3161-C
+share/misc/terminfo/i/ibm3162
 share/misc/terminfo/i/ibm3163
 share/misc/terminfo/i/ibm3164
 share/misc/terminfo/i/ibm327x
@@ -892,13 +1073,18 @@ share/misc/terminfo/i/ibm5151
 share/misc/terminfo/i/ibm5154
 share/misc/terminfo/i/ibm5154-c
 share/misc/terminfo/i/ibm6153
+share/misc/terminfo/i/ibm6153-40
+share/misc/terminfo/i/ibm6153-90
 share/misc/terminfo/i/ibm6154
 share/misc/terminfo/i/ibm6154-c
 share/misc/terminfo/i/ibm6155
+share/misc/terminfo/i/ibm8503
+share/misc/terminfo/i/ibm8507
 share/misc/terminfo/i/ibm8512
 share/misc/terminfo/i/ibm8513
 share/misc/terminfo/i/ibm8514
 share/misc/terminfo/i/ibm8514-c
+share/misc/terminfo/i/ibm8604
 share/misc/terminfo/i/ibmaed
 share/misc/terminfo/i/ibmapa16
 share/misc/terminfo/i/ibmapa8
@@ -907,7 +1093,6 @@ share/misc/terminfo/i/ibmapa8c-c
 share/misc/terminfo/i/ibmega
 share/misc/terminfo/i/ibmega-c
 share/misc/terminfo/i/ibmmono
-share/misc/terminfo/i/ibmmpel
 share/misc/terminfo/i/ibmmpel-c
 share/misc/terminfo/i/ibmpc
 share/misc/terminfo/i/ibmpc3
@@ -917,6 +1102,9 @@ share/misc/terminfo/i/ibmpcx
 share/misc/terminfo/i/ibmvga
 share/misc/terminfo/i/ibmvga-c
 share/misc/terminfo/i/ibmx
+share/misc/terminfo/i/icl6402
+share/misc/terminfo/i/icl6404
+share/misc/terminfo/i/icl6404-w
 share/misc/terminfo/i/ifmr
 share/misc/terminfo/i/ims-ansi
 share/misc/terminfo/i/ims950
@@ -937,11 +1125,15 @@ share/misc/terminfo/i/iris-ansi
 share/misc/terminfo/i/iris-ansi-ap
 share/misc/terminfo/i/iris-color
 share/misc/terminfo/i/iris40
+share/misc/terminfo/j/jaixterm
 share/misc/terminfo/j/jaixterm-m
 share/misc/terminfo/j/jerq
 share/misc/terminfo/k/k45
 share/misc/terminfo/k/kaypro
 share/misc/terminfo/k/kaypro2
+share/misc/terminfo/k/kds6402
+share/misc/terminfo/k/kds7372
+share/misc/terminfo/k/kds7372-w
 share/misc/terminfo/k/kermit
 share/misc/terminfo/k/kermit-am
 share/misc/terminfo/k/klone+acs
@@ -974,6 +1166,8 @@ share/misc/terminfo/l/luna68k
 share/misc/terminfo/m/m2-nam
 share/misc/terminfo/m/mac
 share/misc/terminfo/m/mac-w
+share/misc/terminfo/m/mach
+share/misc/terminfo/m/mach-bold
 share/misc/terminfo/m/macintosh
 share/misc/terminfo/m/macterminal-w
 share/misc/terminfo/m/mai
@@ -1008,6 +1202,9 @@ share/misc/terminfo/m/mimeii
 share/misc/terminfo/m/minitel
 share/misc/terminfo/m/minitel-2
 share/misc/terminfo/m/minitel-2-nam
+share/misc/terminfo/m/minitel1
+share/misc/terminfo/m/minitel1b
+share/misc/terminfo/m/minitel1b-80
 share/misc/terminfo/m/minix
 share/misc/terminfo/m/minix-old
 share/misc/terminfo/m/minix-old-am
@@ -1032,10 +1229,64 @@ share/misc/terminfo/n/nansi.sys
 share/misc/terminfo/n/nansi.sysk
 share/misc/terminfo/n/nansisys
 share/misc/terminfo/n/nansisysk
+share/misc/terminfo/n/ncr160vppp
+share/misc/terminfo/n/ncr160vpwpp
+share/misc/terminfo/n/ncr160vt100an
+share/misc/terminfo/n/ncr160vt100pp
+share/misc/terminfo/n/ncr160vt100wan
+share/misc/terminfo/n/ncr160vt100wpp
+share/misc/terminfo/n/ncr160vt200an
+share/misc/terminfo/n/ncr160vt200pp
+share/misc/terminfo/n/ncr160vt200wan
+share/misc/terminfo/n/ncr160vt200wpp
+share/misc/terminfo/n/ncr160vt300an
+share/misc/terminfo/n/ncr160vt300pp
+share/misc/terminfo/n/ncr160vt300wan
+share/misc/terminfo/n/ncr160vt300wpp
+share/misc/terminfo/n/ncr160wy50+pp
+share/misc/terminfo/n/ncr160wy50+wpp
+share/misc/terminfo/n/ncr160wy60pp
+share/misc/terminfo/n/ncr160wy60wpp
+share/misc/terminfo/n/ncr260intan
+share/misc/terminfo/n/ncr260intpp
+share/misc/terminfo/n/ncr260intwan
+share/misc/terminfo/n/ncr260intwpp
+share/misc/terminfo/n/ncr260vppp
+share/misc/terminfo/n/ncr260vpwpp
+share/misc/terminfo/n/ncr260vt100an
+share/misc/terminfo/n/ncr260vt100pp
+share/misc/terminfo/n/ncr260vt100wan
+share/misc/terminfo/n/ncr260vt100wpp
+share/misc/terminfo/n/ncr260vt200an
+share/misc/terminfo/n/ncr260vt200pp
+share/misc/terminfo/n/ncr260vt200wan
+share/misc/terminfo/n/ncr260vt200wpp
+share/misc/terminfo/n/ncr260vt300an
+share/misc/terminfo/n/ncr260vt300pp
+share/misc/terminfo/n/ncr260vt300wan
+share/misc/terminfo/n/ncr260vt300wpp
+share/misc/terminfo/n/ncr260wy325pp
+share/misc/terminfo/n/ncr260wy325wpp
+share/misc/terminfo/n/ncr260wy350pp
+share/misc/terminfo/n/ncr260wy350wpp
+share/misc/terminfo/n/ncr260wy50+pp
+share/misc/terminfo/n/ncr260wy50+wpp
+share/misc/terminfo/n/ncr260wy60pp
+share/misc/terminfo/n/ncr260wy60wpp
 share/misc/terminfo/n/ncr7900
 share/misc/terminfo/n/ncr7900i
 share/misc/terminfo/n/ncr7900iv
 share/misc/terminfo/n/ncr7901
+share/misc/terminfo/n/ncrvt100an
+share/misc/terminfo/n/ncrvt100pp
+share/misc/terminfo/n/ncrvt100wan
+share/misc/terminfo/n/ncrvt100wpp
+share/misc/terminfo/n/ncsa
+share/misc/terminfo/n/ncsa-m
+share/misc/terminfo/n/ncsa-m-ns
+share/misc/terminfo/n/ncsa-ns
+share/misc/terminfo/n/ncsa-vt220
+share/misc/terminfo/n/ncsa-vt220-8
 share/misc/terminfo/n/nec
 share/misc/terminfo/n/nec5520
 share/misc/terminfo/n/newhp
@@ -1095,6 +1346,7 @@ share/misc/terminfo/n/nwp517-w
 share/misc/terminfo/n/nwp518
 share/misc/terminfo/n/nwp518-a
 share/misc/terminfo/n/nwp518-o
+share/misc/terminfo/n/nxterm
 share/misc/terminfo/o/o31
 share/misc/terminfo/o/o4112-nd
 share/misc/terminfo/o/o85h
@@ -1238,6 +1490,7 @@ share/misc/terminfo/q/qdcons
 share/misc/terminfo/q/qdss
 share/misc/terminfo/q/qnx
 share/misc/terminfo/q/qnx4
+share/misc/terminfo/q/qnxt2
 share/misc/terminfo/q/qume
 share/misc/terminfo/q/qume5
 share/misc/terminfo/q/qvt101
@@ -1282,7 +1535,6 @@ share/misc/terminfo/r/rt6221-w
 share/misc/terminfo/r/rtpc
 share/misc/terminfo/r/rxvt
 share/misc/terminfo/r/rxvt-basic
-share/misc/terminfo/s/s
 share/misc/terminfo/s/s4
 share/misc/terminfo/s/sb1
 share/misc/terminfo/s/sb2
@@ -1389,6 +1641,7 @@ share/misc/terminfo/t/tek4207-s
 share/misc/terminfo/t/tek4404
 share/misc/terminfo/t/teleray
 share/misc/terminfo/t/teletec
+share/misc/terminfo/t/teraterm
 share/misc/terminfo/t/terminet
 share/misc/terminfo/t/terminet1200
 share/misc/terminfo/t/terminet300
@@ -1613,6 +1866,8 @@ share/misc/terminfo/w/wren
 share/misc/terminfo/w/wrenw
 share/misc/terminfo/w/wsiris
 share/misc/terminfo/w/wy-75ap
+share/misc/terminfo/w/wy-99fgt
+share/misc/terminfo/w/wy-99fgta
 share/misc/terminfo/w/wy100
 share/misc/terminfo/w/wy100q
 share/misc/terminfo/w/wy120
@@ -1710,6 +1965,8 @@ share/misc/terminfo/w/wy60-42
 share/misc/terminfo/w/wy60-42-w
 share/misc/terminfo/w/wy60-43
 share/misc/terminfo/w/wy60-43-w
+share/misc/terminfo/w/wy60-AT
+share/misc/terminfo/w/wy60-PC
 share/misc/terminfo/w/wy60-vb
 share/misc/terminfo/w/wy60-w
 share/misc/terminfo/w/wy60-w-vb
@@ -1724,6 +1981,12 @@ share/misc/terminfo/w/wy85
 share/misc/terminfo/w/wy85-vb
 share/misc/terminfo/w/wy85-w
 share/misc/terminfo/w/wy85-wvb
+share/misc/terminfo/w/wy99-ansi
+share/misc/terminfo/w/wy99a-ansi
+share/misc/terminfo/w/wy99f
+share/misc/terminfo/w/wy99fa
+share/misc/terminfo/w/wy99fgt
+share/misc/terminfo/w/wy99fgta
 share/misc/terminfo/w/wy99gt
 share/misc/terminfo/w/wy99gt-25
 share/misc/terminfo/w/wy99gt-25-w
@@ -1811,6 +2074,8 @@ share/misc/terminfo/w/wyse60-42
 share/misc/terminfo/w/wyse60-42-w
 share/misc/terminfo/w/wyse60-43
 share/misc/terminfo/w/wyse60-43-w
+share/misc/terminfo/w/wyse60-AT
+share/misc/terminfo/w/wyse60-PC
 share/misc/terminfo/w/wyse60-vb
 share/misc/terminfo/w/wyse60-w
 share/misc/terminfo/w/wyse60-wvb
@@ -1846,11 +2111,12 @@ share/misc/terminfo/x/xerox820
 share/misc/terminfo/x/xl83
 share/misc/terminfo/x/xtalk
 share/misc/terminfo/x/xterm
-share/misc/terminfo/x/xterm+sl
-share/misc/terminfo/x/xterm+sl-twm
 share/misc/terminfo/x/xterm-16color
+share/misc/terminfo/x/xterm-24
 share/misc/terminfo/x/xterm-8bit
 share/misc/terminfo/x/xterm-bold
+share/misc/terminfo/x/xterm-color
+share/misc/terminfo/x/xterm-new
 share/misc/terminfo/x/xterm-nic
 share/misc/terminfo/x/xterm-old
 share/misc/terminfo/x/xterm-pcolor
@@ -1859,9 +2125,15 @@ share/misc/terminfo/x/xterm-r6
 share/misc/terminfo/x/xterm-sun
 share/misc/terminfo/x/xterm-xf86-v32
 share/misc/terminfo/x/xterm-xf86-v33
+share/misc/terminfo/x/xterm-xf86-v333
 share/misc/terminfo/x/xterm-xf86-v40
+share/misc/terminfo/x/xterm-xfree86
 share/misc/terminfo/x/xterm-xi
+share/misc/terminfo/x/xterm+sl
+share/misc/terminfo/x/xterm+sl-twm
 share/misc/terminfo/x/xterm1
+share/misc/terminfo/x/xtermc
+share/misc/terminfo/x/xtermm
 share/misc/terminfo/x/xterms
 share/misc/terminfo/x/xterms-sun
 share/misc/terminfo/x/xwsh
@@ -1911,6 +2183,7 @@ share/misc/terminfo/z/ztx11
 @dirrm share/misc/terminfo/7
 @dirrm share/misc/terminfo/8
 @dirrm share/misc/terminfo/9
+@dirrm share/misc/terminfo/N
 @dirrm share/misc/terminfo/P
 @dirrm share/misc/terminfo/X
 @dirrm share/misc/terminfo/a
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index 5e0b016fb6e6..234eed4b561b 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1 +1,2 @@
 MD5 (ncurses-4.2.tar.gz) = 7926ed3ef7090f72c0a45da1f59400bf
+MD5 (terminfo.src.gz) = 4b111861ea3a5725127290c9c1c8a7a4
diff --git a/devel/ncurses/pkg-plist b/devel/ncurses/pkg-plist
index 485fcab7575d..b893ddca8350 100644
--- a/devel/ncurses/pkg-plist
+++ b/devel/ncurses/pkg-plist
@@ -44,8 +44,8 @@ lib/libpanel.so
 lib/libpanel.so.4.2
 lib/libpanel_g.a
 lib/libpanel_p.a
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/doc/ncurses/ANNOUNCE
 share/doc/ncurses/INSTALL
 share/doc/ncurses/NEWS
@@ -107,6 +107,10 @@ share/misc/terminfo/5/5410-w
 share/misc/terminfo/5/5620
 share/misc/terminfo/5/5630-24
 share/misc/terminfo/5/5630DMD-24
+share/misc/terminfo/6/6053
+share/misc/terminfo/6/6053-dg
+share/misc/terminfo/6/605x
+share/misc/terminfo/6/605x-dg
 share/misc/terminfo/6/630-lm
 share/misc/terminfo/6/630MTG-24
 share/misc/terminfo/7/730MTG-24
@@ -117,6 +121,8 @@ share/misc/terminfo/7/730MTGr-24
 share/misc/terminfo/8/8510
 share/misc/terminfo/9/955-hb
 share/misc/terminfo/9/955-w
+share/misc/terminfo/N/NCR260VT300WPP
+share/misc/terminfo/N/NCRVT100WPP
 share/misc/terminfo/P/P12
 share/misc/terminfo/P/P12-M
 share/misc/terminfo/P/P12-M-W
@@ -212,6 +218,7 @@ share/misc/terminfo/a/adm42
 share/misc/terminfo/a/adm42-ns
 share/misc/terminfo/a/adm5
 share/misc/terminfo/a/aepro
+share/misc/terminfo/a/aixterm
 share/misc/terminfo/a/aixterm-m
 share/misc/terminfo/a/aixterm-m-old
 share/misc/terminfo/a/aj
@@ -308,6 +315,10 @@ share/misc/terminfo/a/appleII
 share/misc/terminfo/a/appleIIc
 share/misc/terminfo/a/appleIIe
 share/misc/terminfo/a/appleIIgs
+share/misc/terminfo/a/arm100
+share/misc/terminfo/a/arm100-am
+share/misc/terminfo/a/arm100-w
+share/misc/terminfo/a/arm100-wam
 share/misc/terminfo/a/at386
 share/misc/terminfo/a/atari
 share/misc/terminfo/a/att2300
@@ -387,6 +398,7 @@ share/misc/terminfo/a/att620-w
 share/misc/terminfo/a/att630
 share/misc/terminfo/a/att630-24
 share/misc/terminfo/a/att6386
+share/misc/terminfo/a/att700
 share/misc/terminfo/a/att730
 share/misc/terminfo/a/att730-24
 share/misc/terminfo/a/att730-41
@@ -440,8 +452,10 @@ share/misc/terminfo/b/bh4
 share/misc/terminfo/b/bitgraph
 share/misc/terminfo/b/blit
 share/misc/terminfo/b/bobcat
-share/misc/terminfo/b/bsdos
-share/misc/terminfo/b/bsdos-bold
+share/misc/terminfo/b/bsdos-pc
+share/misc/terminfo/b/bsdos-pc-nobold
+share/misc/terminfo/b/bsdos-ppc
+share/misc/terminfo/b/bsdos-sparc
 share/misc/terminfo/c/c100
 share/misc/terminfo/c/c100-1p
 share/misc/terminfo/c/c100-4p
@@ -552,6 +566,8 @@ share/misc/terminfo/c/contel321
 share/misc/terminfo/c/cops
 share/misc/terminfo/c/cops-10
 share/misc/terminfo/c/cops10
+share/misc/terminfo/c/crt
+share/misc/terminfo/c/crt-vt220
 share/misc/terminfo/c/cs10
 share/misc/terminfo/c/cs10-w
 share/misc/terminfo/c/ct82
@@ -562,6 +578,154 @@ share/misc/terminfo/c/cx100
 share/misc/terminfo/c/cyb110
 share/misc/terminfo/c/cyb83
 share/misc/terminfo/d/d132
+share/misc/terminfo/d/d2
+share/misc/terminfo/d/d2-dg
+share/misc/terminfo/d/d200
+share/misc/terminfo/d/d200-dg
+share/misc/terminfo/d/d210
+share/misc/terminfo/d/d210-dg
+share/misc/terminfo/d/d211
+share/misc/terminfo/d/d211-7b
+share/misc/terminfo/d/d211-dg
+share/misc/terminfo/d/d214
+share/misc/terminfo/d/d214-dg
+share/misc/terminfo/d/d215
+share/misc/terminfo/d/d215-7b
+share/misc/terminfo/d/d215-dg
+share/misc/terminfo/d/d216-dg
+share/misc/terminfo/d/d216-unix
+share/misc/terminfo/d/d216-unix-25
+share/misc/terminfo/d/d216+
+share/misc/terminfo/d/d216+25
+share/misc/terminfo/d/d216+dg
+share/misc/terminfo/d/d216e-dg
+share/misc/terminfo/d/d216e-unix
+share/misc/terminfo/d/d216e+
+share/misc/terminfo/d/d216e+dg
+share/misc/terminfo/d/d217-dg
+share/misc/terminfo/d/d217-unix
+share/misc/terminfo/d/d217-unix-25
+share/misc/terminfo/d/d220
+share/misc/terminfo/d/d220-7b
+share/misc/terminfo/d/d220-dg
+share/misc/terminfo/d/d230
+share/misc/terminfo/d/d230-dg
+share/misc/terminfo/d/d230c
+share/misc/terminfo/d/d230c-dg
+share/misc/terminfo/d/d400
+share/misc/terminfo/d/d400-dg
+share/misc/terminfo/d/d410
+share/misc/terminfo/d/d410-7b
+share/misc/terminfo/d/d410-7b-w
+share/misc/terminfo/d/d410-dg
+share/misc/terminfo/d/d410-w
+share/misc/terminfo/d/d411
+share/misc/terminfo/d/d411-7b
+share/misc/terminfo/d/d411-7b-w
+share/misc/terminfo/d/d411-dg
+share/misc/terminfo/d/d411-w
+share/misc/terminfo/d/d412-dg
+share/misc/terminfo/d/d412-unix
+share/misc/terminfo/d/d412-unix-w
+share/misc/terminfo/d/d412-unix-25
+share/misc/terminfo/d/d412-unix-s
+share/misc/terminfo/d/d412-unix-sr
+share/misc/terminfo/d/d412+
+share/misc/terminfo/d/d412+25
+share/misc/terminfo/d/d412+dg
+share/misc/terminfo/d/d412+s
+share/misc/terminfo/d/d412+sr
+share/misc/terminfo/d/d412+w
+share/misc/terminfo/d/d413-dg
+share/misc/terminfo/d/d413-unix
+share/misc/terminfo/d/d413-unix-25
+share/misc/terminfo/d/d413-unix-s
+share/misc/terminfo/d/d413-unix-sr
+share/misc/terminfo/d/d413-unix-w
+share/misc/terminfo/d/d414-unix
+share/misc/terminfo/d/d414-unix-25
+share/misc/terminfo/d/d414-unix-s
+share/misc/terminfo/d/d414-unix-sr
+share/misc/terminfo/d/d414-unix-w
+share/misc/terminfo/d/d430-dg
+share/misc/terminfo/d/d430-dg-ccc
+share/misc/terminfo/d/d430-unix
+share/misc/terminfo/d/d430-unix-w
+share/misc/terminfo/d/d430-unix-25
+share/misc/terminfo/d/d430-unix-25-ccc
+share/misc/terminfo/d/d430-unix-ccc
+share/misc/terminfo/d/d430-unix-s
+share/misc/terminfo/d/d430-unix-s-ccc
+share/misc/terminfo/d/d430-unix-sr
+share/misc/terminfo/d/d430-unix-sr-ccc
+share/misc/terminfo/d/d430-unix-w-ccc
+share/misc/terminfo/d/d430c-dg
+share/misc/terminfo/d/d430c-dg-ccc
+share/misc/terminfo/d/d430c-unix
+share/misc/terminfo/d/d430c-unix-25
+share/misc/terminfo/d/d430c-unix-25-ccc
+share/misc/terminfo/d/d430c-unix-ccc
+share/misc/terminfo/d/d430c-unix-s
+share/misc/terminfo/d/d430c-unix-s-ccc
+share/misc/terminfo/d/d430c-unix-sr
+share/misc/terminfo/d/d430c-unix-sr-ccc
+share/misc/terminfo/d/d430c-unix-w
+share/misc/terminfo/d/d430c-unix-w-ccc
+share/misc/terminfo/d/d450
+share/misc/terminfo/d/d450-dg
+share/misc/terminfo/d/d460
+share/misc/terminfo/d/d460-7b
+share/misc/terminfo/d/d460-7b-w
+share/misc/terminfo/d/d460-dg
+share/misc/terminfo/d/d460-w
+share/misc/terminfo/d/d461
+share/misc/terminfo/d/d461-7b
+share/misc/terminfo/d/d461-7b-w
+share/misc/terminfo/d/d461-dg
+share/misc/terminfo/d/d461-w
+share/misc/terminfo/d/d462-dg
+share/misc/terminfo/d/d462-unix
+share/misc/terminfo/d/d462-unix-25
+share/misc/terminfo/d/d462-unix-s
+share/misc/terminfo/d/d462-unix-sr
+share/misc/terminfo/d/d462-unix-w
+share/misc/terminfo/d/d462+
+share/misc/terminfo/d/d462+25
+share/misc/terminfo/d/d462+dg
+share/misc/terminfo/d/d462+s
+share/misc/terminfo/d/d462+sr
+share/misc/terminfo/d/d462+w
+share/misc/terminfo/d/d462e-dg
+share/misc/terminfo/d/d463-dg
+share/misc/terminfo/d/d463-unix
+share/misc/terminfo/d/d463-unix-25
+share/misc/terminfo/d/d463-unix-s
+share/misc/terminfo/d/d463-unix-sr
+share/misc/terminfo/d/d463-unix-w
+share/misc/terminfo/d/d464-unix
+share/misc/terminfo/d/d464-unix-25
+share/misc/terminfo/d/d464-unix-s
+share/misc/terminfo/d/d464-unix-sr
+share/misc/terminfo/d/d464-unix-w
+share/misc/terminfo/d/d470
+share/misc/terminfo/d/d470-7b
+share/misc/terminfo/d/d470-dg
+share/misc/terminfo/d/d470c
+share/misc/terminfo/d/d470c-7b
+share/misc/terminfo/d/d470c-dg
+share/misc/terminfo/d/d555
+share/misc/terminfo/d/d555-7b
+share/misc/terminfo/d/d555-7b-w
+share/misc/terminfo/d/d555-dg
+share/misc/terminfo/d/d555-w
+share/misc/terminfo/d/d577
+share/misc/terminfo/d/d577-7b
+share/misc/terminfo/d/d577-7b-w
+share/misc/terminfo/d/d577-dg
+share/misc/terminfo/d/d577-w
+share/misc/terminfo/d/d578
+share/misc/terminfo/d/d578-7b
+share/misc/terminfo/d/d578-dg
 share/misc/terminfo/d/d80
 share/misc/terminfo/d/d800
 share/misc/terminfo/d/datagraphix
@@ -580,6 +744,11 @@ share/misc/terminfo/d/decpro
 share/misc/terminfo/d/decwriter
 share/misc/terminfo/d/delta
 share/misc/terminfo/d/dg-ansi
+share/misc/terminfo/d/dg-generic
+share/misc/terminfo/d/dg+ccc
+share/misc/terminfo/d/dg+color
+share/misc/terminfo/d/dg+color8
+share/misc/terminfo/d/dg+fixed
 share/misc/terminfo/d/dg100
 share/misc/terminfo/d/dg200
 share/misc/terminfo/d/dg210
@@ -587,7 +756,17 @@ share/misc/terminfo/d/dg211
 share/misc/terminfo/d/dg450
 share/misc/terminfo/d/dg460-ansi
 share/misc/terminfo/d/dg6053
+share/misc/terminfo/d/dg6053-old
+share/misc/terminfo/d/dg605x
 share/misc/terminfo/d/dg6134
+share/misc/terminfo/d/dgkeys+11
+share/misc/terminfo/d/dgkeys+15
+share/misc/terminfo/d/dgkeys+7b
+share/misc/terminfo/d/dgkeys+8b
+share/misc/terminfo/d/dgmode+color
+share/misc/terminfo/d/dgmode+color8
+share/misc/terminfo/d/dgunix+ccc
+share/misc/terminfo/d/dgunix+fixed
 share/misc/terminfo/d/diablo
 share/misc/terminfo/d/diablo-lm
 share/misc/terminfo/d/diablo1620
@@ -766,6 +945,7 @@ share/misc/terminfo/h/heathkit
 share/misc/terminfo/h/heathkit-a
 share/misc/terminfo/h/hft
 share/misc/terminfo/h/hft-c
+share/misc/terminfo/h/hft-c-old
 share/misc/terminfo/h/hirez100
 share/misc/terminfo/h/hirez100-w
 share/misc/terminfo/h/hmod1
@@ -872,7 +1052,6 @@ share/misc/terminfo/h/hz1552-rv
 share/misc/terminfo/h/hz2000
 share/misc/terminfo/i/i100
 share/misc/terminfo/i/i3101
-share/misc/terminfo/i/i3151
 share/misc/terminfo/i/i3164
 share/misc/terminfo/i/i400
 share/misc/terminfo/i/ibcs2
@@ -882,6 +1061,8 @@ share/misc/terminfo/i/ibm-system1
 share/misc/terminfo/i/ibm3101
 share/misc/terminfo/i/ibm3151
 share/misc/terminfo/i/ibm3161
+share/misc/terminfo/i/ibm3161-C
+share/misc/terminfo/i/ibm3162
 share/misc/terminfo/i/ibm3163
 share/misc/terminfo/i/ibm3164
 share/misc/terminfo/i/ibm327x
@@ -892,13 +1073,18 @@ share/misc/terminfo/i/ibm5151
 share/misc/terminfo/i/ibm5154
 share/misc/terminfo/i/ibm5154-c
 share/misc/terminfo/i/ibm6153
+share/misc/terminfo/i/ibm6153-40
+share/misc/terminfo/i/ibm6153-90
 share/misc/terminfo/i/ibm6154
 share/misc/terminfo/i/ibm6154-c
 share/misc/terminfo/i/ibm6155
+share/misc/terminfo/i/ibm8503
+share/misc/terminfo/i/ibm8507
 share/misc/terminfo/i/ibm8512
 share/misc/terminfo/i/ibm8513
 share/misc/terminfo/i/ibm8514
 share/misc/terminfo/i/ibm8514-c
+share/misc/terminfo/i/ibm8604
 share/misc/terminfo/i/ibmaed
 share/misc/terminfo/i/ibmapa16
 share/misc/terminfo/i/ibmapa8
@@ -907,7 +1093,6 @@ share/misc/terminfo/i/ibmapa8c-c
 share/misc/terminfo/i/ibmega
 share/misc/terminfo/i/ibmega-c
 share/misc/terminfo/i/ibmmono
-share/misc/terminfo/i/ibmmpel
 share/misc/terminfo/i/ibmmpel-c
 share/misc/terminfo/i/ibmpc
 share/misc/terminfo/i/ibmpc3
@@ -917,6 +1102,9 @@ share/misc/terminfo/i/ibmpcx
 share/misc/terminfo/i/ibmvga
 share/misc/terminfo/i/ibmvga-c
 share/misc/terminfo/i/ibmx
+share/misc/terminfo/i/icl6402
+share/misc/terminfo/i/icl6404
+share/misc/terminfo/i/icl6404-w
 share/misc/terminfo/i/ifmr
 share/misc/terminfo/i/ims-ansi
 share/misc/terminfo/i/ims950
@@ -937,11 +1125,15 @@ share/misc/terminfo/i/iris-ansi
 share/misc/terminfo/i/iris-ansi-ap
 share/misc/terminfo/i/iris-color
 share/misc/terminfo/i/iris40
+share/misc/terminfo/j/jaixterm
 share/misc/terminfo/j/jaixterm-m
 share/misc/terminfo/j/jerq
 share/misc/terminfo/k/k45
 share/misc/terminfo/k/kaypro
 share/misc/terminfo/k/kaypro2
+share/misc/terminfo/k/kds6402
+share/misc/terminfo/k/kds7372
+share/misc/terminfo/k/kds7372-w
 share/misc/terminfo/k/kermit
 share/misc/terminfo/k/kermit-am
 share/misc/terminfo/k/klone+acs
@@ -974,6 +1166,8 @@ share/misc/terminfo/l/luna68k
 share/misc/terminfo/m/m2-nam
 share/misc/terminfo/m/mac
 share/misc/terminfo/m/mac-w
+share/misc/terminfo/m/mach
+share/misc/terminfo/m/mach-bold
 share/misc/terminfo/m/macintosh
 share/misc/terminfo/m/macterminal-w
 share/misc/terminfo/m/mai
@@ -1008,6 +1202,9 @@ share/misc/terminfo/m/mimeii
 share/misc/terminfo/m/minitel
 share/misc/terminfo/m/minitel-2
 share/misc/terminfo/m/minitel-2-nam
+share/misc/terminfo/m/minitel1
+share/misc/terminfo/m/minitel1b
+share/misc/terminfo/m/minitel1b-80
 share/misc/terminfo/m/minix
 share/misc/terminfo/m/minix-old
 share/misc/terminfo/m/minix-old-am
@@ -1032,10 +1229,64 @@ share/misc/terminfo/n/nansi.sys
 share/misc/terminfo/n/nansi.sysk
 share/misc/terminfo/n/nansisys
 share/misc/terminfo/n/nansisysk
+share/misc/terminfo/n/ncr160vppp
+share/misc/terminfo/n/ncr160vpwpp
+share/misc/terminfo/n/ncr160vt100an
+share/misc/terminfo/n/ncr160vt100pp
+share/misc/terminfo/n/ncr160vt100wan
+share/misc/terminfo/n/ncr160vt100wpp
+share/misc/terminfo/n/ncr160vt200an
+share/misc/terminfo/n/ncr160vt200pp
+share/misc/terminfo/n/ncr160vt200wan
+share/misc/terminfo/n/ncr160vt200wpp
+share/misc/terminfo/n/ncr160vt300an
+share/misc/terminfo/n/ncr160vt300pp
+share/misc/terminfo/n/ncr160vt300wan
+share/misc/terminfo/n/ncr160vt300wpp
+share/misc/terminfo/n/ncr160wy50+pp
+share/misc/terminfo/n/ncr160wy50+wpp
+share/misc/terminfo/n/ncr160wy60pp
+share/misc/terminfo/n/ncr160wy60wpp
+share/misc/terminfo/n/ncr260intan
+share/misc/terminfo/n/ncr260intpp
+share/misc/terminfo/n/ncr260intwan
+share/misc/terminfo/n/ncr260intwpp
+share/misc/terminfo/n/ncr260vppp
+share/misc/terminfo/n/ncr260vpwpp
+share/misc/terminfo/n/ncr260vt100an
+share/misc/terminfo/n/ncr260vt100pp
+share/misc/terminfo/n/ncr260vt100wan
+share/misc/terminfo/n/ncr260vt100wpp
+share/misc/terminfo/n/ncr260vt200an
+share/misc/terminfo/n/ncr260vt200pp
+share/misc/terminfo/n/ncr260vt200wan
+share/misc/terminfo/n/ncr260vt200wpp
+share/misc/terminfo/n/ncr260vt300an
+share/misc/terminfo/n/ncr260vt300pp
+share/misc/terminfo/n/ncr260vt300wan
+share/misc/terminfo/n/ncr260vt300wpp
+share/misc/terminfo/n/ncr260wy325pp
+share/misc/terminfo/n/ncr260wy325wpp
+share/misc/terminfo/n/ncr260wy350pp
+share/misc/terminfo/n/ncr260wy350wpp
+share/misc/terminfo/n/ncr260wy50+pp
+share/misc/terminfo/n/ncr260wy50+wpp
+share/misc/terminfo/n/ncr260wy60pp
+share/misc/terminfo/n/ncr260wy60wpp
 share/misc/terminfo/n/ncr7900
 share/misc/terminfo/n/ncr7900i
 share/misc/terminfo/n/ncr7900iv
 share/misc/terminfo/n/ncr7901
+share/misc/terminfo/n/ncrvt100an
+share/misc/terminfo/n/ncrvt100pp
+share/misc/terminfo/n/ncrvt100wan
+share/misc/terminfo/n/ncrvt100wpp
+share/misc/terminfo/n/ncsa
+share/misc/terminfo/n/ncsa-m
+share/misc/terminfo/n/ncsa-m-ns
+share/misc/terminfo/n/ncsa-ns
+share/misc/terminfo/n/ncsa-vt220
+share/misc/terminfo/n/ncsa-vt220-8
 share/misc/terminfo/n/nec
 share/misc/terminfo/n/nec5520
 share/misc/terminfo/n/newhp
@@ -1095,6 +1346,7 @@ share/misc/terminfo/n/nwp517-w
 share/misc/terminfo/n/nwp518
 share/misc/terminfo/n/nwp518-a
 share/misc/terminfo/n/nwp518-o
+share/misc/terminfo/n/nxterm
 share/misc/terminfo/o/o31
 share/misc/terminfo/o/o4112-nd
 share/misc/terminfo/o/o85h
@@ -1238,6 +1490,7 @@ share/misc/terminfo/q/qdcons
 share/misc/terminfo/q/qdss
 share/misc/terminfo/q/qnx
 share/misc/terminfo/q/qnx4
+share/misc/terminfo/q/qnxt2
 share/misc/terminfo/q/qume
 share/misc/terminfo/q/qume5
 share/misc/terminfo/q/qvt101
@@ -1282,7 +1535,6 @@ share/misc/terminfo/r/rt6221-w
 share/misc/terminfo/r/rtpc
 share/misc/terminfo/r/rxvt
 share/misc/terminfo/r/rxvt-basic
-share/misc/terminfo/s/s
 share/misc/terminfo/s/s4
 share/misc/terminfo/s/sb1
 share/misc/terminfo/s/sb2
@@ -1389,6 +1641,7 @@ share/misc/terminfo/t/tek4207-s
 share/misc/terminfo/t/tek4404
 share/misc/terminfo/t/teleray
 share/misc/terminfo/t/teletec
+share/misc/terminfo/t/teraterm
 share/misc/terminfo/t/terminet
 share/misc/terminfo/t/terminet1200
 share/misc/terminfo/t/terminet300
@@ -1613,6 +1866,8 @@ share/misc/terminfo/w/wren
 share/misc/terminfo/w/wrenw
 share/misc/terminfo/w/wsiris
 share/misc/terminfo/w/wy-75ap
+share/misc/terminfo/w/wy-99fgt
+share/misc/terminfo/w/wy-99fgta
 share/misc/terminfo/w/wy100
 share/misc/terminfo/w/wy100q
 share/misc/terminfo/w/wy120
@@ -1710,6 +1965,8 @@ share/misc/terminfo/w/wy60-42
 share/misc/terminfo/w/wy60-42-w
 share/misc/terminfo/w/wy60-43
 share/misc/terminfo/w/wy60-43-w
+share/misc/terminfo/w/wy60-AT
+share/misc/terminfo/w/wy60-PC
 share/misc/terminfo/w/wy60-vb
 share/misc/terminfo/w/wy60-w
 share/misc/terminfo/w/wy60-w-vb
@@ -1724,6 +1981,12 @@ share/misc/terminfo/w/wy85
 share/misc/terminfo/w/wy85-vb
 share/misc/terminfo/w/wy85-w
 share/misc/terminfo/w/wy85-wvb
+share/misc/terminfo/w/wy99-ansi
+share/misc/terminfo/w/wy99a-ansi
+share/misc/terminfo/w/wy99f
+share/misc/terminfo/w/wy99fa
+share/misc/terminfo/w/wy99fgt
+share/misc/terminfo/w/wy99fgta
 share/misc/terminfo/w/wy99gt
 share/misc/terminfo/w/wy99gt-25
 share/misc/terminfo/w/wy99gt-25-w
@@ -1811,6 +2074,8 @@ share/misc/terminfo/w/wyse60-42
 share/misc/terminfo/w/wyse60-42-w
 share/misc/terminfo/w/wyse60-43
 share/misc/terminfo/w/wyse60-43-w
+share/misc/terminfo/w/wyse60-AT
+share/misc/terminfo/w/wyse60-PC
 share/misc/terminfo/w/wyse60-vb
 share/misc/terminfo/w/wyse60-w
 share/misc/terminfo/w/wyse60-wvb
@@ -1846,11 +2111,12 @@ share/misc/terminfo/x/xerox820
 share/misc/terminfo/x/xl83
 share/misc/terminfo/x/xtalk
 share/misc/terminfo/x/xterm
-share/misc/terminfo/x/xterm+sl
-share/misc/terminfo/x/xterm+sl-twm
 share/misc/terminfo/x/xterm-16color
+share/misc/terminfo/x/xterm-24
 share/misc/terminfo/x/xterm-8bit
 share/misc/terminfo/x/xterm-bold
+share/misc/terminfo/x/xterm-color
+share/misc/terminfo/x/xterm-new
 share/misc/terminfo/x/xterm-nic
 share/misc/terminfo/x/xterm-old
 share/misc/terminfo/x/xterm-pcolor
@@ -1859,9 +2125,15 @@ share/misc/terminfo/x/xterm-r6
 share/misc/terminfo/x/xterm-sun
 share/misc/terminfo/x/xterm-xf86-v32
 share/misc/terminfo/x/xterm-xf86-v33
+share/misc/terminfo/x/xterm-xf86-v333
 share/misc/terminfo/x/xterm-xf86-v40
+share/misc/terminfo/x/xterm-xfree86
 share/misc/terminfo/x/xterm-xi
+share/misc/terminfo/x/xterm+sl
+share/misc/terminfo/x/xterm+sl-twm
 share/misc/terminfo/x/xterm1
+share/misc/terminfo/x/xtermc
+share/misc/terminfo/x/xtermm
 share/misc/terminfo/x/xterms
 share/misc/terminfo/x/xterms-sun
 share/misc/terminfo/x/xwsh
@@ -1911,6 +2183,7 @@ share/misc/terminfo/z/ztx11
 @dirrm share/misc/terminfo/7
 @dirrm share/misc/terminfo/8
 @dirrm share/misc/terminfo/9
+@dirrm share/misc/terminfo/N
 @dirrm share/misc/terminfo/P
 @dirrm share/misc/terminfo/X
 @dirrm share/misc/terminfo/a