ncurses: updated .files

1 files changed, 1056 insertions, 1056 deletions

diff --git a/repos/extra/ncurses/.files b/repos/extra/ncurses/.files
index d9cfc5d8..8b9e2b01 100644
--- a/repos/extra/ncurses/.files
+++ b/repos/extra/ncurses/.files
@@ -191,67 +191,67 @@ lrwxrwxrwx root/root    usr/share/man/man3/cur_term.3x.gz -> term_variables.3x.g
 lrwxrwxrwx root/root    usr/share/man/man3/current_field.3x.gz -> form_page.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/current_item.3x.gz -> mitem_current.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_add_wch.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_add_wchstr.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_addch.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_addchstr.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_addstr.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_add_wchstr.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_addch.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_addchstr.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_addstr.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_addwstr.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_attr.3x.gz.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_beep.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_bkgd.3x.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_attr.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_beep.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_bkgd.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_bkgrnd.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_border.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_border.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_border_set.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_clear.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_color.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_delch.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_deleteln.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_extend.3x.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_delch.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_deleteln.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_extend.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_get_wch.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_get_wstr.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_getcchar.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_get_wstr.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_getcchar.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_getch.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_getstr.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_getyx.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_in_wch.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_in_wchstr.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_inch.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_inchstr.3x.gz.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_initscr.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_inopts.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_inchstr.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_initscr.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_inopts.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_ins_wch.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_ins_wstr.3x.gz.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_insch.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_ins_wstr.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_insch.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_insstr.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_instr.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_inwstr.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_kernel.3x.gz.gz.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_inwstr.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_kernel.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_legacy.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_memleaks.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_memleaks.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_mouse.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_move.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_opaque.3x.gz.gz.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_outopts.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_opaque.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_outopts.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_overlay.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_pad.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_print.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_printw.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_print.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_printw.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_refresh.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_scanw.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_scanw.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_scr_dump.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_scroll.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/curs_set.3x.gz -> curs_kernel.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/curs_set_sp.3x.gz -> curs_sp_funcs.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_slk.3x.gz.gz.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_slk.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_sp_funcs.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_termattrs.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_termcap.3x.gz.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_terminfo.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_threads.3x.gz.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_touch.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_termcap.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_terminfo.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_threads.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_touch.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_trace.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_util.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/curs_variables.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/curs_variables.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/curs_window.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/curscr.3x.gz -> curs_variables.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/curses.3x.gz -> ncurses.3x.gz
@@ -264,7 +264,7 @@ lrwxrwxrwx root/root    usr/share/man/man3/def_prog_mode_sp.3x.gz -> curs_sp_fun
 lrwxrwxrwx root/root    usr/share/man/man3/def_shell_mode.3x.gz -> curs_kernel.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/def_shell_mode_sp.3x.gz -> curs_sp_funcs.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/default_colors.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/define_key.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/define_key.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/define_key_sp.3x.gz -> curs_sp_funcs.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/del_curterm.3x.gz -> curs_terminfo.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/del_curterm_sp.3x.gz -> curs_sp_funcs.3x.gz
@@ -327,20 +327,20 @@ lrwxrwxrwx root/root    usr/share/man/man3/flushinp.3x.gz -> curs_util.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/flushinp_sp.3x.gz -> curs_sp_funcs.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/form.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/form_cursor.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/form_data.3x.gz.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/form_driver.3x.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/form_data.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/form_driver.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/form_driver_w.3x.gz -> form_driver.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/form_field.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/form_field_attributes.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/form_field_buffer.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/form_field_info.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/form_field_just.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/form_field_new.3x.gz.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/form_field_opts.3x.gz.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/form_field_userptr.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/form_field_just.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/form_field_new.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/form_field_opts.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/form_field_userptr.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/form_field_validation.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/form_fields.3x.gz -> form_field.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/form_fieldtype.3x.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/form_fieldtype.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/form_hook.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/form_init.3x.gz -> form_hook.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/form_new.3x.gz
@@ -348,8 +348,8 @@ lrwxrwxrwx root/root    usr/share/man/man3/form_init.3x.gz -> form_hook.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/form_opts.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/form_opts_off.3x.gz -> form_opts.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/form_opts_on.3x.gz -> form_opts.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/form_page.3x.gz.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/form_post.3x.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/form_page.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/form_post.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/form_request_by_name.3x.gz -> form_requestname.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/form_request_name.3x.gz -> form_requestname.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/form_requestname.3x.gz
@@ -495,7 +495,7 @@ lrwxrwxrwx root/root    usr/share/man/man3/killchar_sp.3x.gz -> curs_sp_funcs.3x
 lrwxrwxrwx root/root    usr/share/man/man3/killwchar.3x.gz -> curs_termattrs.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/killwchar_sp.3x.gz -> curs_sp_funcs.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/leaveok.3x.gz -> curs_outopts.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/legacy_coding.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/legacy_coding.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/link_field.3x.gz -> form_field_new.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/link_fieldtype.3x.gz -> form_fieldtype.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/longname.3x.gz -> curs_termattrs.3x.gz
@@ -506,16 +506,16 @@ lrwxrwxrwx root/root    usr/share/man/man3/mcprint_sp.3x.gz -> curs_sp_funcs.3x.
 -rw-r--r-- root/root    usr/share/man/man3/menu_attributes.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/menu_back.3x.gz -> menu_attributes.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/menu_cursor.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/menu_driver.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/menu_driver.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/menu_fore.3x.gz -> menu_attributes.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/menu_format.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/menu_grey.3x.gz -> menu_attributes.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/menu_hook.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/menu_hook.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/menu_init.3x.gz -> menu_hook.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/menu_items.3x.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/menu_items.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/menu_mark.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/menu_new.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/menu_opts.3x.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/menu_opts.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/menu_opts_off.3x.gz -> menu_opts.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/menu_opts_on.3x.gz -> menu_opts.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/menu_pad.3x.gz -> menu_attributes.3x.gz
@@ -530,11 +530,11 @@ lrwxrwxrwx root/root    usr/share/man/man3/menu_term.3x.gz -> menu_hook.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/menu_userptr.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/menu_win.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/meta.3x.gz -> curs_inopts.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/mitem_current.3x.gz.gz
--rw-r--r-- root/root    usr/share/man/man3/mitem_name.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/mitem_current.3x.gz
+-rw-r--r-- root/root    usr/share/man/man3/mitem_name.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/mitem_new.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/mitem_opts.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/mitem_userptr.3x.gz.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/mitem_userptr.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/mitem_value.3x.gz
 -rw-r--r-- root/root    usr/share/man/man3/mitem_visible.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/mouse_trafo.3x.gz -> curs_mouse.3x.gz
@@ -631,7 +631,7 @@ lrwxrwxrwx root/root    usr/share/man/man3/mvwvline.3x.gz -> curs_border.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/mvwvline_set.3x.gz -> curs_border_set.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/napms.3x.gz -> curs_kernel.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/napms_sp.3x.gz -> curs_sp_funcs.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/ncurses.3x.gz.gz.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ncurses.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/new_field.3x.gz -> form_field_new.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/new_fieldtype.3x.gz -> form_fieldtype.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/new_form.3x.gz -> form_new.3x.gz
@@ -640,7 +640,7 @@ lrwxrwxrwx root/root    usr/share/man/man3/new_item.3x.gz -> mitem_new.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/new_menu.3x.gz -> menu_new.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/new_menu_sp.3x.gz -> curs_sp_funcs.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/new_page.3x.gz -> form_new_page.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/new_pair.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/new_pair.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/new_panel.3x.gz -> panel.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/new_prescr.3x.gz -> curs_sp_funcs.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/newpad.3x.gz -> curs_pad.3x.gz
@@ -674,7 +674,7 @@ lrwxrwxrwx root/root    usr/share/man/man3/overlay.3x.gz -> curs_overlay.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/overwrite.3x.gz -> curs_overlay.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/pair_content.3x.gz -> curs_color.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/pair_content_sp.3x.gz -> curs_sp_funcs.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/panel.3x.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/panel.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/panel_above.3x.gz -> panel.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/panel_below.3x.gz -> panel.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/panel_hidden.3x.gz -> panel.3x.gz
@@ -834,7 +834,7 @@ lrwxrwxrwx root/root    usr/share/man/man3/subwin.3x.gz -> curs_window.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/syncok.3x.gz -> curs_window.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/term_attrs.3x.gz -> curs_termattrs.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/term_attrs_sp.3x.gz -> curs_sp_funcs.3x.gz
--rw-r--r-- root/root    usr/share/man/man3/term_variables.3x.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/term_variables.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/termattrs.3x.gz -> curs_termattrs.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/termattrs_sp.3x.gz -> curs_sp_funcs.3x.gz
 lrwxrwxrwx root/root    usr/share/man/man3/termname.3x.gz -> curs_termattrs.3x.gz
@@ -1009,39 +1009,39 @@ drwxr-xr-x root/root    usr/share/tabset/
 -rw-r--r-- root/root    usr/share/tabset/vt300
 drwxr-xr-x root/root    usr/share/terminfo/
 drwxr-xr-x root/root    usr/share/terminfo/1/
--rw-r--r-- root/root    usr/share/terminfo/1/1178
--rw-r--r-- root/root    usr/share/terminfo/1/1730-lm -> usr/share/terminfo/x/x1700-lm
+-rw-r--r-- root/root    usr/share/terminfo/1/1178 -> usr/share/terminfo/a/adm1178
+-rw-r--r-- root/root    usr/share/terminfo/1/1730-lm
 drwxr-xr-x root/root    usr/share/terminfo/2/
--rw-r--r-- root/root    usr/share/terminfo/2/2621 -> usr/share/terminfo/h/hp2621a
--rw-r--r-- root/root    usr/share/terminfo/2/2621-wl -> usr/share/terminfo/h/hp2621a
--rw-r--r-- root/root    usr/share/terminfo/2/2621A -> usr/share/terminfo/h/hp2621a
--rw-r--r-- root/root    usr/share/terminfo/2/2621a -> usr/share/terminfo/h/hp2621a
+-rw-r--r-- root/root    usr/share/terminfo/2/2621 -> usr/share/terminfo/h/hp2621-wl
+-rw-r--r-- root/root    usr/share/terminfo/2/2621-wl -> usr/share/terminfo/h/hp2621-wl
+-rw-r--r-- root/root    usr/share/terminfo/2/2621A -> usr/share/terminfo/h/hp2621-wl
+-rw-r--r-- root/root    usr/share/terminfo/2/2621a -> usr/share/terminfo/h/hp2621-wl
 drwxr-xr-x root/root    usr/share/terminfo/3/
--rw-r--r-- root/root    usr/share/terminfo/3/386at
--rw-r--r-- root/root    usr/share/terminfo/3/3b1 -> usr/share/terminfo/u/unixpc
+-rw-r--r-- root/root    usr/share/terminfo/3/386at -> usr/share/terminfo/a/att6386
+-rw-r--r-- root/root    usr/share/terminfo/3/3b1 -> usr/share/terminfo/p/pc7300
 drwxr-xr-x root/root    usr/share/terminfo/4/
--rw-r--r-- root/root    usr/share/terminfo/4/4025ex
--rw-r--r-- root/root    usr/share/terminfo/4/4027ex -> usr/share/terminfo/4/4025ex
--rw-r--r-- root/root    usr/share/terminfo/4/4410-w
+-rw-r--r-- root/root    usr/share/terminfo/4/4025ex -> usr/share/terminfo/t/tek4025ex
+-rw-r--r-- root/root    usr/share/terminfo/4/4027ex -> usr/share/terminfo/t/tek4025ex
+-rw-r--r-- root/root    usr/share/terminfo/4/4410-w -> usr/share/terminfo/5/5410-w
 drwxr-xr-x root/root    usr/share/terminfo/5/
 -rw-r--r-- root/root    usr/share/terminfo/5/5051
--rw-r--r-- root/root    usr/share/terminfo/5/5410-w -> usr/share/terminfo/4/4410-w
--rw-r--r-- root/root    usr/share/terminfo/5/5620 -> usr/share/terminfo/t/tty5620
+-rw-r--r-- root/root    usr/share/terminfo/5/5410-w
+-rw-r--r-- root/root    usr/share/terminfo/5/5620
 -rw-r--r-- root/root    usr/share/terminfo/5/5630-24 -> usr/share/terminfo/5/5630DMD-24
 -rw-r--r-- root/root    usr/share/terminfo/5/5630DMD-24
 drwxr-xr-x root/root    usr/share/terminfo/6/
--rw-r--r-- root/root    usr/share/terminfo/6/6053 -> usr/share/terminfo/6/6053-dg
--rw-r--r-- root/root    usr/share/terminfo/6/6053-dg
--rw-r--r-- root/root    usr/share/terminfo/6/605x -> usr/share/terminfo/6/6053-dg
--rw-r--r-- root/root    usr/share/terminfo/6/605x-dg -> usr/share/terminfo/6/6053-dg
--rw-r--r-- root/root    usr/share/terminfo/6/630-lm -> usr/share/terminfo/x/x1700-lm
+-rw-r--r-- root/root    usr/share/terminfo/6/6053 -> usr/share/terminfo/d/dg6053
+-rw-r--r-- root/root    usr/share/terminfo/6/6053-dg -> usr/share/terminfo/d/dg6053
+-rw-r--r-- root/root    usr/share/terminfo/6/605x -> usr/share/terminfo/d/dg6053
+-rw-r--r-- root/root    usr/share/terminfo/6/605x-dg -> usr/share/terminfo/d/dg6053
+-rw-r--r-- root/root    usr/share/terminfo/6/630-lm -> usr/share/terminfo/1/1730-lm
 -rw-r--r-- root/root    usr/share/terminfo/6/630MTG-24 -> usr/share/terminfo/5/5630DMD-24
 drwxr-xr-x root/root    usr/share/terminfo/7/
--rw-r--r-- root/root    usr/share/terminfo/7/730MTG-24
--rw-r--r-- root/root    usr/share/terminfo/7/730MTG-41
--rw-r--r-- root/root    usr/share/terminfo/7/730MTG-41r
--rw-r--r-- root/root    usr/share/terminfo/7/730MTGr
--rw-r--r-- root/root    usr/share/terminfo/7/730MTGr-24
+-rw-r--r-- root/root    usr/share/terminfo/7/730MTG-24 -> usr/share/terminfo/a/att730-24
+-rw-r--r-- root/root    usr/share/terminfo/7/730MTG-41 -> usr/share/terminfo/a/att730-41
+-rw-r--r-- root/root    usr/share/terminfo/7/730MTG-41r -> usr/share/terminfo/a/att730r-41
+-rw-r--r-- root/root    usr/share/terminfo/7/730MTGr -> usr/share/terminfo/a/att730r
+-rw-r--r-- root/root    usr/share/terminfo/7/730MTGr-24 -> usr/share/terminfo/a/att730r-24
 drwxr-xr-x root/root    usr/share/terminfo/8/
 -rw-r--r-- root/root    usr/share/terminfo/8/8510
 drwxr-xr-x root/root    usr/share/terminfo/9/
@@ -1051,10 +1051,10 @@ drwxr-xr-x root/root    usr/share/terminfo/9/
 drwxr-xr-x root/root    usr/share/terminfo/A/
 -rw-r--r-- root/root    usr/share/terminfo/A/Apple_Terminal
 drwxr-xr-x root/root    usr/share/terminfo/E/
--rw-r--r-- root/root    usr/share/terminfo/E/Eterm
+-rw-r--r-- root/root    usr/share/terminfo/E/Eterm -> usr/share/terminfo/E/Eterm-color
 -rw-r--r-- root/root    usr/share/terminfo/E/Eterm-256color
 -rw-r--r-- root/root    usr/share/terminfo/E/Eterm-88color
--rw-r--r-- root/root    usr/share/terminfo/E/Eterm-color -> usr/share/terminfo/E/Eterm
+-rw-r--r-- root/root    usr/share/terminfo/E/Eterm-color
 drwxr-xr-x root/root    usr/share/terminfo/L/
 -rw-r--r-- root/root    usr/share/terminfo/L/LFT-PC850
 drwxr-xr-x root/root    usr/share/terminfo/M/
@@ -1066,41 +1066,41 @@ drwxr-xr-x root/root    usr/share/terminfo/N/
 -rw-r--r-- root/root    usr/share/terminfo/N/NCRVT100WPP
 drwxr-xr-x root/root    usr/share/terminfo/P/
 -rw-r--r-- root/root    usr/share/terminfo/P/P12 -> usr/share/terminfo/p/prism12
--rw-r--r-- root/root    usr/share/terminfo/P/P12-M -> usr/share/terminfo/p/prism12-m
+-rw-r--r-- root/root    usr/share/terminfo/P/P12-M -> usr/share/terminfo/p/p12-m
 -rw-r--r-- root/root    usr/share/terminfo/P/P12-M-W -> usr/share/terminfo/p/p12-m-w
 -rw-r--r-- root/root    usr/share/terminfo/P/P12-W -> usr/share/terminfo/p/prism12-w
 -rw-r--r-- root/root    usr/share/terminfo/P/P14 -> usr/share/terminfo/p/prism14
--rw-r--r-- root/root    usr/share/terminfo/P/P14-M -> usr/share/terminfo/p/p14-m
--rw-r--r-- root/root    usr/share/terminfo/P/P14-M-W -> usr/share/terminfo/p/prism14-m-w
+-rw-r--r-- root/root    usr/share/terminfo/P/P14-M -> usr/share/terminfo/p/prism14-m
+-rw-r--r-- root/root    usr/share/terminfo/P/P14-M-W -> usr/share/terminfo/p/p14-m-w
 -rw-r--r-- root/root    usr/share/terminfo/P/P14-W -> usr/share/terminfo/p/p14-w
 -rw-r--r-- root/root    usr/share/terminfo/P/P4 -> usr/share/terminfo/p/p4
--rw-r--r-- root/root    usr/share/terminfo/P/P5 -> usr/share/terminfo/p/p5
--rw-r--r-- root/root    usr/share/terminfo/P/P7 -> usr/share/terminfo/p/p7
--rw-r--r-- root/root    usr/share/terminfo/P/P8 -> usr/share/terminfo/p/prism8
+-rw-r--r-- root/root    usr/share/terminfo/P/P5 -> usr/share/terminfo/p/prism5
+-rw-r--r-- root/root    usr/share/terminfo/P/P7 -> usr/share/terminfo/p/prism7
+-rw-r--r-- root/root    usr/share/terminfo/P/P8 -> usr/share/terminfo/p/p8
 -rw-r--r-- root/root    usr/share/terminfo/P/P8-W -> usr/share/terminfo/p/p8-w
 -rw-r--r-- root/root    usr/share/terminfo/P/P9 -> usr/share/terminfo/p/p9
--rw-r--r-- root/root    usr/share/terminfo/P/P9-8 -> usr/share/terminfo/p/p9-8
+-rw-r--r-- root/root    usr/share/terminfo/P/P9-8 -> usr/share/terminfo/p/prism9-8
 -rw-r--r-- root/root    usr/share/terminfo/P/P9-8-W -> usr/share/terminfo/p/p9-8-w
--rw-r--r-- root/root    usr/share/terminfo/P/P9-W -> usr/share/terminfo/p/p9-w
+-rw-r--r-- root/root    usr/share/terminfo/P/P9-W -> usr/share/terminfo/p/prism9-w
 drwxr-xr-x root/root    usr/share/terminfo/Q/
--rw-r--r-- root/root    usr/share/terminfo/Q/Q306-8-pc
--rw-r--r-- root/root    usr/share/terminfo/Q/Q310-vip-H -> usr/share/terminfo/Q/Q310-vip-H-am
--rw-r--r-- root/root    usr/share/terminfo/Q/Q310-vip-H-am
+-rw-r--r-- root/root    usr/share/terminfo/Q/Q306-8-pc -> usr/share/terminfo/b/bq300-8-pc
+-rw-r--r-- root/root    usr/share/terminfo/Q/Q310-vip-H
+-rw-r--r-- root/root    usr/share/terminfo/Q/Q310-vip-H-am -> usr/share/terminfo/Q/Q310-vip-H
 -rw-r--r-- root/root    usr/share/terminfo/Q/Q310-vip-Hw
 -rw-r--r-- root/root    usr/share/terminfo/Q/Q310-vip-w
 -rw-r--r-- root/root    usr/share/terminfo/Q/Q310-vip-w-am -> usr/share/terminfo/Q/Q310-vip-w
 drwxr-xr-x root/root    usr/share/terminfo/X/
--rw-r--r-- root/root    usr/share/terminfo/X/X-hpterm
--rw-r--r-- root/root    usr/share/terminfo/X/X-hpterm-color2
+-rw-r--r-- root/root    usr/share/terminfo/X/X-hpterm -> usr/share/terminfo/h/hpterm
+-rw-r--r-- root/root    usr/share/terminfo/X/X-hpterm-color2 -> usr/share/terminfo/h/hpterm-color2
 drwxr-xr-x root/root    usr/share/terminfo/a/
 -rw-r--r-- root/root    usr/share/terminfo/a/a210 -> usr/share/terminfo/a/ampex210
--rw-r--r-- root/root    usr/share/terminfo/a/a80 -> usr/share/terminfo/d/dialogue
+-rw-r--r-- root/root    usr/share/terminfo/a/a80
 -rw-r--r-- root/root    usr/share/terminfo/a/a980
 -rw-r--r-- root/root    usr/share/terminfo/a/aa4080 -> usr/share/terminfo/a/annarbor4080
--rw-r--r-- root/root    usr/share/terminfo/a/aaa -> usr/share/terminfo/a/ambas
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa -> usr/share/terminfo/a/ambassador
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa+dec
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa+rv
--rw-r--r-- root/root    usr/share/terminfo/a/aaa+unk
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa+unk -> usr/share/terminfo/a/aaa-unk
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-18
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-18-rv
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-20
@@ -1109,13 +1109,13 @@ drwxr-xr-x root/root    usr/share/terminfo/a/
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-24-rv
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-26
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-28
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-30 -> usr/share/terminfo/a/ambas
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-30 -> usr/share/terminfo/a/ambassador
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-ctxt
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-rv -> usr/share/terminfo/a/aaa-rv
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-rv-ctxt -> usr/share/terminfo/a/aaa-rv-ctxt
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-s -> usr/share/terminfo/a/aaa-s
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-s-ctxt -> usr/share/terminfo/a/aaa-s-ctxt
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-s-rv
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-rv
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-rv-ctxt
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-s
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-s-ctxt
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-s-rv -> usr/share/terminfo/a/aaa-s-rv
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-30-s-rv-ct
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-36
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-36-rv
@@ -1130,41 +1130,41 @@ drwxr-xr-x root/root    usr/share/terminfo/a/
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-60-s-rv
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-ctxt -> usr/share/terminfo/a/aaa-30-ctxt
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-db
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-rv
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-rv-ctxt
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-rv -> usr/share/terminfo/a/aaa-30-rv
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-rv-ctxt -> usr/share/terminfo/a/aaa-30-rv-ctxt
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-rv-unk
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-s
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-s-ctxt
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-s-rv -> usr/share/terminfo/a/aaa-30-s-rv
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-s -> usr/share/terminfo/a/aaa-30-s
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-s-ctxt -> usr/share/terminfo/a/aaa-30-s-ctxt
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-s-rv
 -rw-r--r-- root/root    usr/share/terminfo/a/aaa-s-rv-ctxt -> usr/share/terminfo/a/aaa-30-s-rv-ct
--rw-r--r-- root/root    usr/share/terminfo/a/aaa-unk -> usr/share/terminfo/a/aaa+unk
+-rw-r--r-- root/root    usr/share/terminfo/a/aaa-unk
 -rw-r--r-- root/root    usr/share/terminfo/a/aas1901
 -rw-r--r-- root/root    usr/share/terminfo/a/abm80
 -rw-r--r-- root/root    usr/share/terminfo/a/abm85
 -rw-r--r-- root/root    usr/share/terminfo/a/abm85e
 -rw-r--r-- root/root    usr/share/terminfo/a/abm85h
--rw-r--r-- root/root    usr/share/terminfo/a/abm85h-old -> usr/share/terminfo/o/oabm85h
+-rw-r--r-- root/root    usr/share/terminfo/a/abm85h-old
 -rw-r--r-- root/root    usr/share/terminfo/a/absolute
--rw-r--r-- root/root    usr/share/terminfo/a/act4 -> usr/share/terminfo/m/microterm
--rw-r--r-- root/root    usr/share/terminfo/a/act5 -> usr/share/terminfo/m/microterm5
+-rw-r--r-- root/root    usr/share/terminfo/a/act4
+-rw-r--r-- root/root    usr/share/terminfo/a/act5
 -rw-r--r-- root/root    usr/share/terminfo/a/addrinfo
--rw-r--r-- root/root    usr/share/terminfo/a/adds200 -> usr/share/terminfo/r/regent60
+-rw-r--r-- root/root    usr/share/terminfo/a/adds200
 -rw-r--r-- root/root    usr/share/terminfo/a/adds980 -> usr/share/terminfo/a/a980
--rw-r--r-- root/root    usr/share/terminfo/a/addsviewpoint -> usr/share/terminfo/v/viewpoint
--rw-r--r-- root/root    usr/share/terminfo/a/addsvp60 -> usr/share/terminfo/v/viewpoint60
+-rw-r--r-- root/root    usr/share/terminfo/a/addsviewpoint
+-rw-r--r-- root/root    usr/share/terminfo/a/addsvp60
 -rw-r--r-- root/root    usr/share/terminfo/a/adm+sgr
--rw-r--r-- root/root    usr/share/terminfo/a/adm1
+-rw-r--r-- root/root    usr/share/terminfo/a/adm1 -> usr/share/terminfo/a/adm1a
 -rw-r--r-- root/root    usr/share/terminfo/a/adm11
--rw-r--r-- root/root    usr/share/terminfo/a/adm1178 -> usr/share/terminfo/1/1178
+-rw-r--r-- root/root    usr/share/terminfo/a/adm1178
 -rw-r--r-- root/root    usr/share/terminfo/a/adm12
--rw-r--r-- root/root    usr/share/terminfo/a/adm1a -> usr/share/terminfo/a/adm1
+-rw-r--r-- root/root    usr/share/terminfo/a/adm1a
 -rw-r--r-- root/root    usr/share/terminfo/a/adm2
 -rw-r--r-- root/root    usr/share/terminfo/a/adm20
 -rw-r--r-- root/root    usr/share/terminfo/a/adm21
 -rw-r--r-- root/root    usr/share/terminfo/a/adm22
 -rw-r--r-- root/root    usr/share/terminfo/a/adm3
 -rw-r--r-- root/root    usr/share/terminfo/a/adm31
--rw-r--r-- root/root    usr/share/terminfo/a/adm31-old -> usr/share/terminfo/o/o31
+-rw-r--r-- root/root    usr/share/terminfo/a/adm31-old
 -rw-r--r-- root/root    usr/share/terminfo/a/adm36
 -rw-r--r-- root/root    usr/share/terminfo/a/adm3a
 -rw-r--r-- root/root    usr/share/terminfo/a/adm3a+
@@ -1177,52 +1177,52 @@ drwxr-xr-x root/root    usr/share/terminfo/a/
 -rw-r--r-- root/root    usr/share/terminfo/a/aixterm-16color
 -rw-r--r-- root/root    usr/share/terminfo/a/aixterm-m
 -rw-r--r-- root/root    usr/share/terminfo/a/aixterm-m-old
--rw-r--r-- root/root    usr/share/terminfo/a/aj
+-rw-r--r-- root/root    usr/share/terminfo/a/aj -> usr/share/terminfo/a/aj830
 -rw-r--r-- root/root    usr/share/terminfo/a/aj510
--rw-r--r-- root/root    usr/share/terminfo/a/aj830 -> usr/share/terminfo/a/aj
--rw-r--r-- root/root    usr/share/terminfo/a/aj832 -> usr/share/terminfo/a/aj
+-rw-r--r-- root/root    usr/share/terminfo/a/aj830
+-rw-r--r-- root/root    usr/share/terminfo/a/aj832 -> usr/share/terminfo/a/aj830
 -rw-r--r-- root/root    usr/share/terminfo/a/alacritty
 -rw-r--r-- root/root    usr/share/terminfo/a/alacritty+common
 -rw-r--r-- root/root    usr/share/terminfo/a/alacritty-direct
 -rw-r--r-- root/root    usr/share/terminfo/a/alt2 -> usr/share/terminfo/a/altos2
--rw-r--r-- root/root    usr/share/terminfo/a/alt3 -> usr/share/terminfo/a/alt5
--rw-r--r-- root/root    usr/share/terminfo/a/alt4 -> usr/share/terminfo/a/altos4
--rw-r--r-- root/root    usr/share/terminfo/a/alt5
+-rw-r--r-- root/root    usr/share/terminfo/a/alt3 -> usr/share/terminfo/a/altos-5
+-rw-r--r-- root/root    usr/share/terminfo/a/alt4
+-rw-r--r-- root/root    usr/share/terminfo/a/alt5 -> usr/share/terminfo/a/altos-5
 -rw-r--r-- root/root    usr/share/terminfo/a/alt7
 -rw-r--r-- root/root    usr/share/terminfo/a/alt7pc
--rw-r--r-- root/root    usr/share/terminfo/a/alto-h19 -> usr/share/terminfo/a/altoh19
--rw-r--r-- root/root    usr/share/terminfo/a/alto-heath -> usr/share/terminfo/a/altoh19
--rw-r--r-- root/root    usr/share/terminfo/a/altoh19
--rw-r--r-- root/root    usr/share/terminfo/a/altoheath -> usr/share/terminfo/a/altoh19
+-rw-r--r-- root/root    usr/share/terminfo/a/alto-h19 -> usr/share/terminfo/a/altoheath
+-rw-r--r-- root/root    usr/share/terminfo/a/alto-heath -> usr/share/terminfo/a/altoheath
+-rw-r--r-- root/root    usr/share/terminfo/a/altoh19 -> usr/share/terminfo/a/altoheath
+-rw-r--r-- root/root    usr/share/terminfo/a/altoheath
 -rw-r--r-- root/root    usr/share/terminfo/a/altos-2 -> usr/share/terminfo/a/altos2
--rw-r--r-- root/root    usr/share/terminfo/a/altos-3 -> usr/share/terminfo/a/alt5
--rw-r--r-- root/root    usr/share/terminfo/a/altos-4 -> usr/share/terminfo/a/altos4
--rw-r--r-- root/root    usr/share/terminfo/a/altos-5 -> usr/share/terminfo/a/alt5
+-rw-r--r-- root/root    usr/share/terminfo/a/altos-3 -> usr/share/terminfo/a/altos-5
+-rw-r--r-- root/root    usr/share/terminfo/a/altos-4 -> usr/share/terminfo/a/alt4
+-rw-r--r-- root/root    usr/share/terminfo/a/altos-5
 -rw-r--r-- root/root    usr/share/terminfo/a/altos2
--rw-r--r-- root/root    usr/share/terminfo/a/altos3 -> usr/share/terminfo/a/alt5
--rw-r--r-- root/root    usr/share/terminfo/a/altos4
--rw-r--r-- root/root    usr/share/terminfo/a/altos5 -> usr/share/terminfo/a/alt5
+-rw-r--r-- root/root    usr/share/terminfo/a/altos3 -> usr/share/terminfo/a/altos-5
+-rw-r--r-- root/root    usr/share/terminfo/a/altos4 -> usr/share/terminfo/a/alt4
+-rw-r--r-- root/root    usr/share/terminfo/a/altos5 -> usr/share/terminfo/a/altos-5
 -rw-r--r-- root/root    usr/share/terminfo/a/altos7 -> usr/share/terminfo/a/alt7
 -rw-r--r-- root/root    usr/share/terminfo/a/altos7pc -> usr/share/terminfo/a/alt7pc
--rw-r--r-- root/root    usr/share/terminfo/a/ambas
--rw-r--r-- root/root    usr/share/terminfo/a/ambassador -> usr/share/terminfo/a/ambas
+-rw-r--r-- root/root    usr/share/terminfo/a/ambas -> usr/share/terminfo/a/ambassador
+-rw-r--r-- root/root    usr/share/terminfo/a/ambassador
 -rw-r--r-- root/root    usr/share/terminfo/a/amiga
 -rw-r--r-- root/root    usr/share/terminfo/a/amiga-8bit
 -rw-r--r-- root/root    usr/share/terminfo/a/amiga-h
 -rw-r--r-- root/root    usr/share/terminfo/a/amiga-vnc
--rw-r--r-- root/root    usr/share/terminfo/a/amp219 -> usr/share/terminfo/a/ampex-219
--rw-r--r-- root/root    usr/share/terminfo/a/amp219w -> usr/share/terminfo/a/ampex-219w
--rw-r--r-- root/root    usr/share/terminfo/a/ampex-219
--rw-r--r-- root/root    usr/share/terminfo/a/ampex-219w
--rw-r--r-- root/root    usr/share/terminfo/a/ampex-232 -> usr/share/terminfo/a/ampex232
+-rw-r--r-- root/root    usr/share/terminfo/a/amp219
+-rw-r--r-- root/root    usr/share/terminfo/a/amp219w -> usr/share/terminfo/a/ampex219w
+-rw-r--r-- root/root    usr/share/terminfo/a/ampex-219 -> usr/share/terminfo/a/amp219
+-rw-r--r-- root/root    usr/share/terminfo/a/ampex-219w -> usr/share/terminfo/a/ampex219w
+-rw-r--r-- root/root    usr/share/terminfo/a/ampex-232
 -rw-r--r-- root/root    usr/share/terminfo/a/ampex175
 -rw-r--r-- root/root    usr/share/terminfo/a/ampex175-b
 -rw-r--r-- root/root    usr/share/terminfo/a/ampex210
--rw-r--r-- root/root    usr/share/terminfo/a/ampex219 -> usr/share/terminfo/a/ampex-219
--rw-r--r-- root/root    usr/share/terminfo/a/ampex219w -> usr/share/terminfo/a/ampex-219w
--rw-r--r-- root/root    usr/share/terminfo/a/ampex232
+-rw-r--r-- root/root    usr/share/terminfo/a/ampex219 -> usr/share/terminfo/a/amp219
+-rw-r--r-- root/root    usr/share/terminfo/a/ampex219w
+-rw-r--r-- root/root    usr/share/terminfo/a/ampex232 -> usr/share/terminfo/a/ampex-232
 -rw-r--r-- root/root    usr/share/terminfo/a/ampex232w
--rw-r--r-- root/root    usr/share/terminfo/a/ampex80 -> usr/share/terminfo/d/dialogue
+-rw-r--r-- root/root    usr/share/terminfo/a/ampex80 -> usr/share/terminfo/a/a80
 -rw-r--r-- root/root    usr/share/terminfo/a/annarbor4080
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi+apparrows
@@ -1253,37 +1253,37 @@ drwxr-xr-x root/root    usr/share/terminfo/a/
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi-color-3-emx
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi-emx
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi-generic -> usr/share/terminfo/a/ansiterm
--rw-r--r-- root/root    usr/share/terminfo/a/ansi-m
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi-m -> usr/share/terminfo/a/ansi-mono
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi-mini
--rw-r--r-- root/root    usr/share/terminfo/a/ansi-mono -> usr/share/terminfo/a/ansi-m
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi-mono
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi-mr
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi-mtabs
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi-nt -> usr/share/terminfo/p/psx_ansi
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi.sys
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi.sys-old
--rw-r--r-- root/root    usr/share/terminfo/a/ansi.sysk -> usr/share/terminfo/a/ansisysk
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi.sysk
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi43m -> usr/share/terminfo/p/pcansi-43-m
 -rw-r--r-- root/root    usr/share/terminfo/a/ansi77
--rw-r--r-- root/root    usr/share/terminfo/a/ansi80x25 -> usr/share/terminfo/c/cons25
--rw-r--r-- root/root    usr/share/terminfo/a/ansi80x25-mono -> usr/share/terminfo/c/cons25-m
--rw-r--r-- root/root    usr/share/terminfo/a/ansi80x25-raw -> usr/share/terminfo/c/cons25w
--rw-r--r-- root/root    usr/share/terminfo/a/ansi80x30 -> usr/share/terminfo/c/cons30
--rw-r--r-- root/root    usr/share/terminfo/a/ansi80x30-mono -> usr/share/terminfo/c/cons30-m
--rw-r--r-- root/root    usr/share/terminfo/a/ansi80x43 -> usr/share/terminfo/c/cons43
--rw-r--r-- root/root    usr/share/terminfo/a/ansi80x43-mono -> usr/share/terminfo/c/cons43-m
--rw-r--r-- root/root    usr/share/terminfo/a/ansi80x50 -> usr/share/terminfo/c/cons50
--rw-r--r-- root/root    usr/share/terminfo/a/ansi80x50-mono -> usr/share/terminfo/c/cons50-m
--rw-r--r-- root/root    usr/share/terminfo/a/ansi80x60 -> usr/share/terminfo/c/cons60
--rw-r--r-- root/root    usr/share/terminfo/a/ansi80x60-mono -> usr/share/terminfo/c/cons60-m
--rw-r--r-- root/root    usr/share/terminfo/a/ansil -> usr/share/terminfo/c/cons50
--rw-r--r-- root/root    usr/share/terminfo/a/ansil-mono -> usr/share/terminfo/c/cons50-m
--rw-r--r-- root/root    usr/share/terminfo/a/ansis -> usr/share/terminfo/c/cons25
--rw-r--r-- root/root    usr/share/terminfo/a/ansis-mono -> usr/share/terminfo/c/cons25-m
--rw-r--r-- root/root    usr/share/terminfo/a/ansisysk
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi80x25 -> usr/share/terminfo/a/ansis
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi80x25-mono
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi80x25-raw
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi80x30
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi80x30-mono
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi80x43
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi80x43-mono
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi80x50 -> usr/share/terminfo/a/ansil
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi80x50-mono
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi80x60
+-rw-r--r-- root/root    usr/share/terminfo/a/ansi80x60-mono
+-rw-r--r-- root/root    usr/share/terminfo/a/ansil
+-rw-r--r-- root/root    usr/share/terminfo/a/ansil-mono -> usr/share/terminfo/a/ansi80x50-mono
+-rw-r--r-- root/root    usr/share/terminfo/a/ansis
+-rw-r--r-- root/root    usr/share/terminfo/a/ansis-mono -> usr/share/terminfo/a/ansi80x25-mono
+-rw-r--r-- root/root    usr/share/terminfo/a/ansisysk -> usr/share/terminfo/a/ansi.sysk
 -rw-r--r-- root/root    usr/share/terminfo/a/ansiterm
--rw-r--r-- root/root    usr/share/terminfo/a/ansiw -> usr/share/terminfo/c/cons25w
+-rw-r--r-- root/root    usr/share/terminfo/a/ansiw -> usr/share/terminfo/a/ansi80x25-raw
 -rw-r--r-- root/root    usr/share/terminfo/a/ap-vm80 -> usr/share/terminfo/a/apple-vm80
--rw-r--r-- root/root    usr/share/terminfo/a/apl -> usr/share/terminfo/i/ibm-apl
+-rw-r--r-- root/root    usr/share/terminfo/a/apl
 -rw-r--r-- root/root    usr/share/terminfo/a/apollo
 -rw-r--r-- root/root    usr/share/terminfo/a/apollo+vt132
 -rw-r--r-- root/root    usr/share/terminfo/a/apollo_15P
@@ -1296,7 +1296,7 @@ drwxr-xr-x root/root    usr/share/terminfo/a/
 -rw-r--r-- root/root    usr/share/terminfo/a/apple-uterm-vb
 -rw-r--r-- root/root    usr/share/terminfo/a/apple-videx
 -rw-r--r-- root/root    usr/share/terminfo/a/apple-videx2
--rw-r--r-- root/root    usr/share/terminfo/a/apple-videx3 -> usr/share/terminfo/v/vapple
+-rw-r--r-- root/root    usr/share/terminfo/a/apple-videx3
 -rw-r--r-- root/root    usr/share/terminfo/a/apple-vm80
 -rw-r--r-- root/root    usr/share/terminfo/a/apple2e
 -rw-r--r-- root/root    usr/share/terminfo/a/apple2e-p
@@ -1307,24 +1307,24 @@ drwxr-xr-x root/root    usr/share/terminfo/a/
 -rw-r--r-- root/root    usr/share/terminfo/a/appleIIgs
 -rw-r--r-- root/root    usr/share/terminfo/a/arm100
 -rw-r--r-- root/root    usr/share/terminfo/a/arm100-am -> usr/share/terminfo/a/arm100
--rw-r--r-- root/root    usr/share/terminfo/a/arm100-w
--rw-r--r-- root/root    usr/share/terminfo/a/arm100-wam -> usr/share/terminfo/a/arm100-w
--rw-r--r-- root/root    usr/share/terminfo/a/at -> usr/share/terminfo/s/st52-m
--rw-r--r-- root/root    usr/share/terminfo/a/at-color -> usr/share/terminfo/s/st52-color
--rw-r--r-- root/root    usr/share/terminfo/a/at-m -> usr/share/terminfo/s/st52-m
--rw-r--r-- root/root    usr/share/terminfo/a/at386 -> usr/share/terminfo/3/386at
--rw-r--r-- root/root    usr/share/terminfo/a/atari -> usr/share/terminfo/s/st52-m
--rw-r--r-- root/root    usr/share/terminfo/a/atari-color -> usr/share/terminfo/s/st52-color
--rw-r--r-- root/root    usr/share/terminfo/a/atari-m -> usr/share/terminfo/s/st52-m
+-rw-r--r-- root/root    usr/share/terminfo/a/arm100-w -> usr/share/terminfo/a/arm100-wam
+-rw-r--r-- root/root    usr/share/terminfo/a/arm100-wam
+-rw-r--r-- root/root    usr/share/terminfo/a/at -> usr/share/terminfo/a/atari_st
+-rw-r--r-- root/root    usr/share/terminfo/a/at-color -> usr/share/terminfo/a/atari_st-color
+-rw-r--r-- root/root    usr/share/terminfo/a/at-m -> usr/share/terminfo/a/atari_st
+-rw-r--r-- root/root    usr/share/terminfo/a/at386 -> usr/share/terminfo/a/att6386
+-rw-r--r-- root/root    usr/share/terminfo/a/atari -> usr/share/terminfo/a/atari_st
+-rw-r--r-- root/root    usr/share/terminfo/a/atari-color -> usr/share/terminfo/a/atari_st-color
+-rw-r--r-- root/root    usr/share/terminfo/a/atari-m -> usr/share/terminfo/a/atari_st
 -rw-r--r-- root/root    usr/share/terminfo/a/atari-old
--rw-r--r-- root/root    usr/share/terminfo/a/atari_st -> usr/share/terminfo/s/st52-m
--rw-r--r-- root/root    usr/share/terminfo/a/atari_st-color -> usr/share/terminfo/s/st52-color
--rw-r--r-- root/root    usr/share/terminfo/a/atarist-m -> usr/share/terminfo/s/st52-m
+-rw-r--r-- root/root    usr/share/terminfo/a/atari_st
+-rw-r--r-- root/root    usr/share/terminfo/a/atari_st-color
+-rw-r--r-- root/root    usr/share/terminfo/a/atarist-m -> usr/share/terminfo/a/atari_st
 -rw-r--r-- root/root    usr/share/terminfo/a/aterm
--rw-r--r-- root/root    usr/share/terminfo/a/att2300 -> usr/share/terminfo/s/sv80
+-rw-r--r-- root/root    usr/share/terminfo/a/att2300
 -rw-r--r-- root/root    usr/share/terminfo/a/att2350
 -rw-r--r-- root/root    usr/share/terminfo/a/att4410 -> usr/share/terminfo/t/tty5410
--rw-r--r-- root/root    usr/share/terminfo/a/att4410-w -> usr/share/terminfo/4/4410-w
+-rw-r--r-- root/root    usr/share/terminfo/a/att4410-w -> usr/share/terminfo/5/5410-w
 -rw-r--r-- root/root    usr/share/terminfo/a/att4410v1 -> usr/share/terminfo/t/tty5410v1
 -rw-r--r-- root/root    usr/share/terminfo/a/att4410v1-w -> usr/share/terminfo/t/tty5410v1-w
 -rw-r--r-- root/root    usr/share/terminfo/a/att4415 -> usr/share/terminfo/t/tty5420
@@ -1336,7 +1336,7 @@ drwxr-xr-x root/root    usr/share/terminfo/a/
 -rw-r--r-- root/root    usr/share/terminfo/a/att4415-w-nl -> usr/share/terminfo/t/tty5420-w-nl
 -rw-r--r-- root/root    usr/share/terminfo/a/att4415-w-rv -> usr/share/terminfo/t/tty5420-w-rv
 -rw-r--r-- root/root    usr/share/terminfo/a/att4415-w-rv-n -> usr/share/terminfo/t/tty5420-w-rv-n
--rw-r--r-- root/root    usr/share/terminfo/a/att4418 -> usr/share/terminfo/a/att5418
+-rw-r--r-- root/root    usr/share/terminfo/a/att4418
 -rw-r--r-- root/root    usr/share/terminfo/a/att4418-w
 -rw-r--r-- root/root    usr/share/terminfo/a/att4420 -> usr/share/terminfo/t/tty4420
 -rw-r--r-- root/root    usr/share/terminfo/a/att4424 -> usr/share/terminfo/t/tty4424
@@ -1346,20 +1346,20 @@ drwxr-xr-x root/root    usr/share/terminfo/a/
 -rw-r--r-- root/root    usr/share/terminfo/a/att4425-nl -> usr/share/terminfo/t/tty5425-nl
 -rw-r--r-- root/root    usr/share/terminfo/a/att4425-w -> usr/share/terminfo/t/tty5425-w
 -rw-r--r-- root/root    usr/share/terminfo/a/att4426 -> usr/share/terminfo/t/tty4426
--rw-r--r-- root/root    usr/share/terminfo/a/att500
--rw-r--r-- root/root    usr/share/terminfo/a/att505 -> usr/share/terminfo/g/gs5430
--rw-r--r-- root/root    usr/share/terminfo/a/att505-22 -> usr/share/terminfo/g/gs5430-22
--rw-r--r-- root/root    usr/share/terminfo/a/att505-24 -> usr/share/terminfo/g/gs5430-24
--rw-r--r-- root/root    usr/share/terminfo/a/att510a -> usr/share/terminfo/b/bct510a
--rw-r--r-- root/root    usr/share/terminfo/a/att510d -> usr/share/terminfo/b/bct510d
--rw-r--r-- root/root    usr/share/terminfo/a/att513 -> usr/share/terminfo/a/att500
+-rw-r--r-- root/root    usr/share/terminfo/a/att500 -> usr/share/terminfo/a/att513
+-rw-r--r-- root/root    usr/share/terminfo/a/att505 -> usr/share/terminfo/p/pt505
+-rw-r--r-- root/root    usr/share/terminfo/a/att505-22 -> usr/share/terminfo/p/pt505-22
+-rw-r--r-- root/root    usr/share/terminfo/a/att505-24 -> usr/share/terminfo/p/pt505-24
+-rw-r--r-- root/root    usr/share/terminfo/a/att510a
+-rw-r--r-- root/root    usr/share/terminfo/a/att510d
+-rw-r--r-- root/root    usr/share/terminfo/a/att513
 -rw-r--r-- root/root    usr/share/terminfo/a/att5310
 -rw-r--r-- root/root    usr/share/terminfo/a/att5320 -> usr/share/terminfo/a/att5310
 -rw-r--r-- root/root    usr/share/terminfo/a/att5410 -> usr/share/terminfo/t/tty5410
--rw-r--r-- root/root    usr/share/terminfo/a/att5410-w -> usr/share/terminfo/4/4410-w
+-rw-r--r-- root/root    usr/share/terminfo/a/att5410-w -> usr/share/terminfo/5/5410-w
 -rw-r--r-- root/root    usr/share/terminfo/a/att5410v1 -> usr/share/terminfo/t/tty5410v1
 -rw-r--r-- root/root    usr/share/terminfo/a/att5410v1-w -> usr/share/terminfo/t/tty5410v1-w
--rw-r--r-- root/root    usr/share/terminfo/a/att5418
+-rw-r--r-- root/root    usr/share/terminfo/a/att5418 -> usr/share/terminfo/a/att4418
 -rw-r--r-- root/root    usr/share/terminfo/a/att5418-w -> usr/share/terminfo/a/att4418-w
 -rw-r--r-- root/root    usr/share/terminfo/a/att5420 -> usr/share/terminfo/t/tty5420
 -rw-r--r-- root/root    usr/share/terminfo/a/att5420+nl -> usr/share/terminfo/t/tty5420+nl
@@ -1375,8 +1375,8 @@ drwxr-xr-x root/root    usr/share/terminfo/a/
 -rw-r--r-- root/root    usr/share/terminfo/a/att5425 -> usr/share/terminfo/t/tty5425
 -rw-r--r-- root/root    usr/share/terminfo/a/att5425-nl -> usr/share/terminfo/t/tty5425-nl
 -rw-r--r-- root/root    usr/share/terminfo/a/att5425-w -> usr/share/terminfo/t/tty5425-w
--rw-r--r-- root/root    usr/share/terminfo/a/att5430 -> usr/share/terminfo/g/gs5430
--rw-r--r-- root/root    usr/share/terminfo/a/att5620 -> usr/share/terminfo/t/tty5620
+-rw-r--r-- root/root    usr/share/terminfo/a/att5430 -> usr/share/terminfo/p/pt505
+-rw-r--r-- root/root    usr/share/terminfo/a/att5620 -> usr/share/terminfo/5/5620
 -rw-r--r-- root/root    usr/share/terminfo/a/att5620-1 -> usr/share/terminfo/t/tty5620-1
 -rw-r--r-- root/root    usr/share/terminfo/a/att5620-24 -> usr/share/terminfo/t/tty5620-24
 -rw-r--r-- root/root    usr/share/terminfo/a/att5620-34 -> usr/share/terminfo/t/tty5620-34
@@ -1400,65 +1400,65 @@ drwxr-xr-x root/root    usr/share/terminfo/a/
 -rw-r--r-- root/root    usr/share/terminfo/a/att620-w
 -rw-r--r-- root/root    usr/share/terminfo/a/att630
 -rw-r--r-- root/root    usr/share/terminfo/a/att630-24 -> usr/share/terminfo/5/5630DMD-24
--rw-r--r-- root/root    usr/share/terminfo/a/att6386 -> usr/share/terminfo/3/386at
+-rw-r--r-- root/root    usr/share/terminfo/a/att6386
 -rw-r--r-- root/root    usr/share/terminfo/a/att700
 -rw-r--r-- root/root    usr/share/terminfo/a/att730
--rw-r--r-- root/root    usr/share/terminfo/a/att730-24 -> usr/share/terminfo/7/730MTG-24
--rw-r--r-- root/root    usr/share/terminfo/a/att730-41 -> usr/share/terminfo/7/730MTG-41
--rw-r--r-- root/root    usr/share/terminfo/a/att7300 -> usr/share/terminfo/u/unixpc
--rw-r--r-- root/root    usr/share/terminfo/a/att730r -> usr/share/terminfo/7/730MTGr
--rw-r--r-- root/root    usr/share/terminfo/a/att730r-24 -> usr/share/terminfo/7/730MTGr-24
--rw-r--r-- root/root    usr/share/terminfo/a/att730r-41 -> usr/share/terminfo/7/730MTG-41r
+-rw-r--r-- root/root    usr/share/terminfo/a/att730-24
+-rw-r--r-- root/root    usr/share/terminfo/a/att730-41
+-rw-r--r-- root/root    usr/share/terminfo/a/att7300 -> usr/share/terminfo/p/pc7300
+-rw-r--r-- root/root    usr/share/terminfo/a/att730r
+-rw-r--r-- root/root    usr/share/terminfo/a/att730r-24
+-rw-r--r-- root/root    usr/share/terminfo/a/att730r-41
 -rw-r--r-- root/root    usr/share/terminfo/a/avatar
 -rw-r--r-- root/root    usr/share/terminfo/a/avatar0
 -rw-r--r-- root/root    usr/share/terminfo/a/avatar0+
 -rw-r--r-- root/root    usr/share/terminfo/a/avatar1 -> usr/share/terminfo/a/avatar
--rw-r--r-- root/root    usr/share/terminfo/a/avt -> usr/share/terminfo/c/concept-avt
+-rw-r--r-- root/root    usr/share/terminfo/a/avt
 -rw-r--r-- root/root    usr/share/terminfo/a/avt+s
 -rw-r--r-- root/root    usr/share/terminfo/a/avt-ns
--rw-r--r-- root/root    usr/share/terminfo/a/avt-rv -> usr/share/terminfo/a/avt-rv-s
+-rw-r--r-- root/root    usr/share/terminfo/a/avt-rv
 -rw-r--r-- root/root    usr/share/terminfo/a/avt-rv-ns
--rw-r--r-- root/root    usr/share/terminfo/a/avt-rv-s
--rw-r--r-- root/root    usr/share/terminfo/a/avt-s -> usr/share/terminfo/c/concept-avt
+-rw-r--r-- root/root    usr/share/terminfo/a/avt-rv-s -> usr/share/terminfo/a/avt-rv
+-rw-r--r-- root/root    usr/share/terminfo/a/avt-s -> usr/share/terminfo/a/avt
 -rw-r--r-- root/root    usr/share/terminfo/a/avt-w
 -rw-r--r-- root/root    usr/share/terminfo/a/avt-w-ns
--rw-r--r-- root/root    usr/share/terminfo/a/avt-w-rv
+-rw-r--r-- root/root    usr/share/terminfo/a/avt-w-rv -> usr/share/terminfo/a/avt-w-rv-s
 -rw-r--r-- root/root    usr/share/terminfo/a/avt-w-rv-ns
--rw-r--r-- root/root    usr/share/terminfo/a/avt-w-rv-s -> usr/share/terminfo/a/avt-w-rv
+-rw-r--r-- root/root    usr/share/terminfo/a/avt-w-rv-s
 -rw-r--r-- root/root    usr/share/terminfo/a/avt-w-s -> usr/share/terminfo/a/avt-w
 -rw-r--r-- root/root    usr/share/terminfo/a/aws
 -rw-r--r-- root/root    usr/share/terminfo/a/awsc
 drwxr-xr-x root/root    usr/share/terminfo/b/
 -rw-r--r-- root/root    usr/share/terminfo/b/b-128
--rw-r--r-- root/root    usr/share/terminfo/b/bantam
+-rw-r--r-- root/root    usr/share/terminfo/b/bantam -> usr/share/terminfo/p/pe550
 -rw-r--r-- root/root    usr/share/terminfo/b/basic4
 -rw-r--r-- root/root    usr/share/terminfo/b/basis
--rw-r--r-- root/root    usr/share/terminfo/b/bct510a
--rw-r--r-- root/root    usr/share/terminfo/b/bct510d
+-rw-r--r-- root/root    usr/share/terminfo/b/bct510a -> usr/share/terminfo/a/att510a
+-rw-r--r-- root/root    usr/share/terminfo/b/bct510d -> usr/share/terminfo/a/att510d
 -rw-r--r-- root/root    usr/share/terminfo/b/beacon
--rw-r--r-- root/root    usr/share/terminfo/b/bee
--rw-r--r-- root/root    usr/share/terminfo/b/beehive -> usr/share/terminfo/b/bee
--rw-r--r-- root/root    usr/share/terminfo/b/beehive3 -> usr/share/terminfo/b/beehiveIIIm
--rw-r--r-- root/root    usr/share/terminfo/b/beehive4 -> usr/share/terminfo/b/bh4
--rw-r--r-- root/root    usr/share/terminfo/b/beehiveIIIm
+-rw-r--r-- root/root    usr/share/terminfo/b/bee -> usr/share/terminfo/b/beehive
+-rw-r--r-- root/root    usr/share/terminfo/b/beehive
+-rw-r--r-- root/root    usr/share/terminfo/b/beehive3 -> usr/share/terminfo/b/bh3m
+-rw-r--r-- root/root    usr/share/terminfo/b/beehive4
+-rw-r--r-- root/root    usr/share/terminfo/b/beehiveIIIm -> usr/share/terminfo/b/bh3m
 -rw-r--r-- root/root    usr/share/terminfo/b/beterm
 -rw-r--r-- root/root    usr/share/terminfo/b/bg1.25
 -rw-r--r-- root/root    usr/share/terminfo/b/bg1.25nv
 -rw-r--r-- root/root    usr/share/terminfo/b/bg1.25rv
 -rw-r--r-- root/root    usr/share/terminfo/b/bg2.0
 -rw-r--r-- root/root    usr/share/terminfo/b/bg2.0nv -> usr/share/terminfo/b/bitgraph
--rw-r--r-- root/root    usr/share/terminfo/b/bg2.0rv
+-rw-r--r-- root/root    usr/share/terminfo/b/bg2.0rv -> usr/share/terminfo/b/bg3.10rv
 -rw-r--r-- root/root    usr/share/terminfo/b/bg3.10 -> usr/share/terminfo/b/bg2.0
 -rw-r--r-- root/root    usr/share/terminfo/b/bg3.10nv -> usr/share/terminfo/b/bitgraph
--rw-r--r-- root/root    usr/share/terminfo/b/bg3.10rv -> usr/share/terminfo/b/bg2.0rv
--rw-r--r-- root/root    usr/share/terminfo/b/bh3m -> usr/share/terminfo/b/beehiveIIIm
--rw-r--r-- root/root    usr/share/terminfo/b/bh4
+-rw-r--r-- root/root    usr/share/terminfo/b/bg3.10rv
+-rw-r--r-- root/root    usr/share/terminfo/b/bh3m
+-rw-r--r-- root/root    usr/share/terminfo/b/bh4 -> usr/share/terminfo/b/beehive4
 -rw-r--r-- root/root    usr/share/terminfo/b/bitgraph
 -rw-r--r-- root/root    usr/share/terminfo/b/blit
 -rw-r--r-- root/root    usr/share/terminfo/b/bobcat
 -rw-r--r-- root/root    usr/share/terminfo/b/bq300
 -rw-r--r-- root/root    usr/share/terminfo/b/bq300-8
--rw-r--r-- root/root    usr/share/terminfo/b/bq300-8-pc -> usr/share/terminfo/Q/Q306-8-pc
+-rw-r--r-- root/root    usr/share/terminfo/b/bq300-8-pc
 -rw-r--r-- root/root    usr/share/terminfo/b/bq300-8-pc-rv
 -rw-r--r-- root/root    usr/share/terminfo/b/bq300-8-pc-w
 -rw-r--r-- root/root    usr/share/terminfo/b/bq300-8-pc-w-rv
@@ -1474,8 +1474,8 @@ drwxr-xr-x root/root    usr/share/terminfo/b/
 -rw-r--r-- root/root    usr/share/terminfo/b/bq300-w-rv
 -rw-r--r-- root/root    usr/share/terminfo/b/bracketed+paste
 -rw-r--r-- root/root    usr/share/terminfo/b/bsdos-pc
--rw-r--r-- root/root    usr/share/terminfo/b/bsdos-pc-m -> usr/share/terminfo/b/bsdos-pc-mono
--rw-r--r-- root/root    usr/share/terminfo/b/bsdos-pc-mono
+-rw-r--r-- root/root    usr/share/terminfo/b/bsdos-pc-m
+-rw-r--r-- root/root    usr/share/terminfo/b/bsdos-pc-mono -> usr/share/terminfo/b/bsdos-pc-m
 -rw-r--r-- root/root    usr/share/terminfo/b/bsdos-pc-nobold
 -rw-r--r-- root/root    usr/share/terminfo/b/bsdos-ppc
 -rw-r--r-- root/root    usr/share/terminfo/b/bsdos-sparc
@@ -1484,17 +1484,17 @@ drwxr-xr-x root/root    usr/share/terminfo/c/
 -rw-r--r-- root/root    usr/share/terminfo/c/c100 -> usr/share/terminfo/c/concept100
 -rw-r--r-- root/root    usr/share/terminfo/c/c100-1p
 -rw-r--r-- root/root    usr/share/terminfo/c/c100-4p -> usr/share/terminfo/c/concept100
--rw-r--r-- root/root    usr/share/terminfo/c/c100-rv -> usr/share/terminfo/c/concept100-rv
--rw-r--r-- root/root    usr/share/terminfo/c/c100-rv-4p -> usr/share/terminfo/c/concept100-rv
+-rw-r--r-- root/root    usr/share/terminfo/c/c100-rv -> usr/share/terminfo/c/c100-rv-4p
+-rw-r--r-- root/root    usr/share/terminfo/c/c100-rv-4p
 -rw-r--r-- root/root    usr/share/terminfo/c/c104 -> usr/share/terminfo/c/concept100
--rw-r--r-- root/root    usr/share/terminfo/c/c108 -> usr/share/terminfo/c/c108-8p
+-rw-r--r-- root/root    usr/share/terminfo/c/c108
 -rw-r--r-- root/root    usr/share/terminfo/c/c108-4p -> usr/share/terminfo/c/concept108-4p
--rw-r--r-- root/root    usr/share/terminfo/c/c108-8p
+-rw-r--r-- root/root    usr/share/terminfo/c/c108-8p -> usr/share/terminfo/c/c108
 -rw-r--r-- root/root    usr/share/terminfo/c/c108-rv -> usr/share/terminfo/c/c108-rv-8p
 -rw-r--r-- root/root    usr/share/terminfo/c/c108-rv-4p -> usr/share/terminfo/c/concept108rv4p
 -rw-r--r-- root/root    usr/share/terminfo/c/c108-rv-8p
--rw-r--r-- root/root    usr/share/terminfo/c/c108-w -> usr/share/terminfo/c/concept108-w8p
--rw-r--r-- root/root    usr/share/terminfo/c/c108-w-8p -> usr/share/terminfo/c/concept108-w8p
+-rw-r--r-- root/root    usr/share/terminfo/c/c108-w
+-rw-r--r-- root/root    usr/share/terminfo/c/c108-w-8p -> usr/share/terminfo/c/c108-w
 -rw-r--r-- root/root    usr/share/terminfo/c/c300
 -rw-r--r-- root/root    usr/share/terminfo/c/c301 -> usr/share/terminfo/c/contel301
 -rw-r--r-- root/root    usr/share/terminfo/c/c321 -> usr/share/terminfo/c/contel301
@@ -1503,8 +1503,8 @@ drwxr-xr-x root/root    usr/share/terminfo/c/
 -rw-r--r-- root/root    usr/share/terminfo/c/cad68-3 -> usr/share/terminfo/c/cgc3
 -rw-r--r-- root/root    usr/share/terminfo/c/cbblit -> usr/share/terminfo/f/fixterm
 -rw-r--r-- root/root    usr/share/terminfo/c/cbunix
--rw-r--r-- root/root    usr/share/terminfo/c/cci -> usr/share/terminfo/z/z8001
--rw-r--r-- root/root    usr/share/terminfo/c/cci1 -> usr/share/terminfo/z/z8001
+-rw-r--r-- root/root    usr/share/terminfo/c/cci
+-rw-r--r-- root/root    usr/share/terminfo/c/cci1 -> usr/share/terminfo/c/cci
 -rw-r--r-- root/root    usr/share/terminfo/c/cdc456
 -rw-r--r-- root/root    usr/share/terminfo/c/cdc721
 -rw-r--r-- root/root    usr/share/terminfo/c/cdc721-esc
@@ -1532,59 +1532,59 @@ drwxr-xr-x root/root    usr/share/terminfo/c/
 -rw-r--r-- root/root    usr/share/terminfo/c/citoh-comp
 -rw-r--r-- root/root    usr/share/terminfo/c/citoh-elite
 -rw-r--r-- root/root    usr/share/terminfo/c/citoh-pica
--rw-r--r-- root/root    usr/share/terminfo/c/citoh-prop
--rw-r--r-- root/root    usr/share/terminfo/c/citoh-ps -> usr/share/terminfo/c/citoh-prop
+-rw-r--r-- root/root    usr/share/terminfo/c/citoh-prop -> usr/share/terminfo/i/ips
+-rw-r--r-- root/root    usr/share/terminfo/c/citoh-ps -> usr/share/terminfo/i/ips
 -rw-r--r-- root/root    usr/share/terminfo/c/coco3
--rw-r--r-- root/root    usr/share/terminfo/c/coherent
+-rw-r--r-- root/root    usr/share/terminfo/c/coherent -> usr/share/terminfo/p/pcz19
 -rw-r--r-- root/root    usr/share/terminfo/c/color_xterm
--rw-r--r-- root/root    usr/share/terminfo/c/colorscan -> usr/share/terminfo/c/cs10
+-rw-r--r-- root/root    usr/share/terminfo/c/colorscan
 -rw-r--r-- root/root    usr/share/terminfo/c/commodore -> usr/share/terminfo/b/b-128
 -rw-r--r-- root/root    usr/share/terminfo/c/concept -> usr/share/terminfo/c/concept100
--rw-r--r-- root/root    usr/share/terminfo/c/concept-avt
+-rw-r--r-- root/root    usr/share/terminfo/c/concept-avt -> usr/share/terminfo/a/avt
 -rw-r--r-- root/root    usr/share/terminfo/c/concept100
--rw-r--r-- root/root    usr/share/terminfo/c/concept100-rv
--rw-r--r-- root/root    usr/share/terminfo/c/concept108 -> usr/share/terminfo/c/c108-8p
+-rw-r--r-- root/root    usr/share/terminfo/c/concept100-rv -> usr/share/terminfo/c/c100-rv-4p
+-rw-r--r-- root/root    usr/share/terminfo/c/concept108 -> usr/share/terminfo/c/c108
 -rw-r--r-- root/root    usr/share/terminfo/c/concept108-4p
--rw-r--r-- root/root    usr/share/terminfo/c/concept108-8p -> usr/share/terminfo/c/c108-8p
--rw-r--r-- root/root    usr/share/terminfo/c/concept108-w-8 -> usr/share/terminfo/c/concept108-w8p
--rw-r--r-- root/root    usr/share/terminfo/c/concept108-w8p
+-rw-r--r-- root/root    usr/share/terminfo/c/concept108-8p -> usr/share/terminfo/c/c108
+-rw-r--r-- root/root    usr/share/terminfo/c/concept108-w-8 -> usr/share/terminfo/c/c108-w
+-rw-r--r-- root/root    usr/share/terminfo/c/concept108-w8p -> usr/share/terminfo/c/c108-w
 -rw-r--r-- root/root    usr/share/terminfo/c/concept108rv4p
--rw-r--r-- root/root    usr/share/terminfo/c/cons25
+-rw-r--r-- root/root    usr/share/terminfo/c/cons25 -> usr/share/terminfo/a/ansis
 -rw-r--r-- root/root    usr/share/terminfo/c/cons25-debian
 -rw-r--r-- root/root    usr/share/terminfo/c/cons25-iso-m
 -rw-r--r-- root/root    usr/share/terminfo/c/cons25-iso8859
--rw-r--r-- root/root    usr/share/terminfo/c/cons25-koi8-r -> usr/share/terminfo/c/cons25r
--rw-r--r-- root/root    usr/share/terminfo/c/cons25-koi8r-m
--rw-r--r-- root/root    usr/share/terminfo/c/cons25-m
+-rw-r--r-- root/root    usr/share/terminfo/c/cons25-koi8-r -> usr/share/terminfo/p/pc3r
+-rw-r--r-- root/root    usr/share/terminfo/c/cons25-koi8r-m -> usr/share/terminfo/p/pc3r-m
+-rw-r--r-- root/root    usr/share/terminfo/c/cons25-m -> usr/share/terminfo/a/ansi80x25-mono
 -rw-r--r-- root/root    usr/share/terminfo/c/cons25l1 -> usr/share/terminfo/c/cons25-iso8859
 -rw-r--r-- root/root    usr/share/terminfo/c/cons25l1-m -> usr/share/terminfo/c/cons25-iso-m
--rw-r--r-- root/root    usr/share/terminfo/c/cons25r
--rw-r--r-- root/root    usr/share/terminfo/c/cons25r-m -> usr/share/terminfo/c/cons25-koi8r-m
--rw-r--r-- root/root    usr/share/terminfo/c/cons25w
--rw-r--r-- root/root    usr/share/terminfo/c/cons30
--rw-r--r-- root/root    usr/share/terminfo/c/cons30-m
--rw-r--r-- root/root    usr/share/terminfo/c/cons43
--rw-r--r-- root/root    usr/share/terminfo/c/cons43-m
--rw-r--r-- root/root    usr/share/terminfo/c/cons50
+-rw-r--r-- root/root    usr/share/terminfo/c/cons25r -> usr/share/terminfo/p/pc3r
+-rw-r--r-- root/root    usr/share/terminfo/c/cons25r-m -> usr/share/terminfo/p/pc3r-m
+-rw-r--r-- root/root    usr/share/terminfo/c/cons25w -> usr/share/terminfo/a/ansi80x25-raw
+-rw-r--r-- root/root    usr/share/terminfo/c/cons30 -> usr/share/terminfo/a/ansi80x30
+-rw-r--r-- root/root    usr/share/terminfo/c/cons30-m -> usr/share/terminfo/a/ansi80x30-mono
+-rw-r--r-- root/root    usr/share/terminfo/c/cons43 -> usr/share/terminfo/a/ansi80x43
+-rw-r--r-- root/root    usr/share/terminfo/c/cons43-m -> usr/share/terminfo/a/ansi80x43-mono
+-rw-r--r-- root/root    usr/share/terminfo/c/cons50 -> usr/share/terminfo/a/ansil
 -rw-r--r-- root/root    usr/share/terminfo/c/cons50-iso-m
 -rw-r--r-- root/root    usr/share/terminfo/c/cons50-iso8859
 -rw-r--r-- root/root    usr/share/terminfo/c/cons50-koi8r -> usr/share/terminfo/c/cons50r
 -rw-r--r-- root/root    usr/share/terminfo/c/cons50-koi8r-m -> usr/share/terminfo/c/cons50r-m
--rw-r--r-- root/root    usr/share/terminfo/c/cons50-m
+-rw-r--r-- root/root    usr/share/terminfo/c/cons50-m -> usr/share/terminfo/a/ansi80x50-mono
 -rw-r--r-- root/root    usr/share/terminfo/c/cons50l1 -> usr/share/terminfo/c/cons50-iso8859
 -rw-r--r-- root/root    usr/share/terminfo/c/cons50l1-m -> usr/share/terminfo/c/cons50-iso-m
 -rw-r--r-- root/root    usr/share/terminfo/c/cons50r
 -rw-r--r-- root/root    usr/share/terminfo/c/cons50r-m
--rw-r--r-- root/root    usr/share/terminfo/c/cons60
+-rw-r--r-- root/root    usr/share/terminfo/c/cons60 -> usr/share/terminfo/a/ansi80x60
 -rw-r--r-- root/root    usr/share/terminfo/c/cons60-iso -> usr/share/terminfo/c/cons60l1
--rw-r--r-- root/root    usr/share/terminfo/c/cons60-iso-m
--rw-r--r-- root/root    usr/share/terminfo/c/cons60-koi8r -> usr/share/terminfo/c/cons60r
--rw-r--r-- root/root    usr/share/terminfo/c/cons60-koi8r-m
--rw-r--r-- root/root    usr/share/terminfo/c/cons60-m
+-rw-r--r-- root/root    usr/share/terminfo/c/cons60-iso-m -> usr/share/terminfo/c/cons60l1-m
+-rw-r--r-- root/root    usr/share/terminfo/c/cons60-koi8r
+-rw-r--r-- root/root    usr/share/terminfo/c/cons60-koi8r-m -> usr/share/terminfo/c/cons60r-m
+-rw-r--r-- root/root    usr/share/terminfo/c/cons60-m -> usr/share/terminfo/a/ansi80x60-mono
 -rw-r--r-- root/root    usr/share/terminfo/c/cons60l1
--rw-r--r-- root/root    usr/share/terminfo/c/cons60l1-m -> usr/share/terminfo/c/cons60-iso-m
--rw-r--r-- root/root    usr/share/terminfo/c/cons60r
--rw-r--r-- root/root    usr/share/terminfo/c/cons60r-m -> usr/share/terminfo/c/cons60-koi8r-m
+-rw-r--r-- root/root    usr/share/terminfo/c/cons60l1-m
+-rw-r--r-- root/root    usr/share/terminfo/c/cons60r -> usr/share/terminfo/c/cons60-koi8r
+-rw-r--r-- root/root    usr/share/terminfo/c/cons60r-m
 -rw-r--r-- root/root    usr/share/terminfo/c/contel300 -> usr/share/terminfo/c/c300
 -rw-r--r-- root/root    usr/share/terminfo/c/contel301
 -rw-r--r-- root/root    usr/share/terminfo/c/contel320 -> usr/share/terminfo/c/c300
@@ -1592,27 +1592,27 @@ drwxr-xr-x root/root    usr/share/terminfo/c/
 -rw-r--r-- root/root    usr/share/terminfo/c/contour
 -rw-r--r-- root/root    usr/share/terminfo/c/contour-direct
 -rw-r--r-- root/root    usr/share/terminfo/c/contour-latest -> usr/share/terminfo/c/contour
--rw-r--r-- root/root    usr/share/terminfo/c/cops
--rw-r--r-- root/root    usr/share/terminfo/c/cops-10 -> usr/share/terminfo/c/cops
--rw-r--r-- root/root    usr/share/terminfo/c/cops10 -> usr/share/terminfo/c/cops
--rw-r--r-- root/root    usr/share/terminfo/c/crt
--rw-r--r-- root/root    usr/share/terminfo/c/crt-vt220 -> usr/share/terminfo/c/crt
--rw-r--r-- root/root    usr/share/terminfo/c/cs10
+-rw-r--r-- root/root    usr/share/terminfo/c/cops -> usr/share/terminfo/c/cops10
+-rw-r--r-- root/root    usr/share/terminfo/c/cops-10 -> usr/share/terminfo/c/cops10
+-rw-r--r-- root/root    usr/share/terminfo/c/cops10
+-rw-r--r-- root/root    usr/share/terminfo/c/crt -> usr/share/terminfo/c/crt-vt220
+-rw-r--r-- root/root    usr/share/terminfo/c/crt-vt220
+-rw-r--r-- root/root    usr/share/terminfo/c/cs10 -> usr/share/terminfo/c/colorscan
 -rw-r--r-- root/root    usr/share/terminfo/c/cs10-w
--rw-r--r-- root/root    usr/share/terminfo/c/ct82
+-rw-r--r-- root/root    usr/share/terminfo/c/ct82 -> usr/share/terminfo/s/swtp
 -rw-r--r-- root/root    usr/share/terminfo/c/ct8500
 -rw-r--r-- root/root    usr/share/terminfo/c/ctrm
 -rw-r--r-- root/root    usr/share/terminfo/c/cx -> usr/share/terminfo/c/color_xterm
 -rw-r--r-- root/root    usr/share/terminfo/c/cx100 -> usr/share/terminfo/c/color_xterm
 -rw-r--r-- root/root    usr/share/terminfo/c/cyb110
--rw-r--r-- root/root    usr/share/terminfo/c/cyb83 -> usr/share/terminfo/x/xl83
+-rw-r--r-- root/root    usr/share/terminfo/c/cyb83
 -rw-r--r-- root/root    usr/share/terminfo/c/cygwin
 -rw-r--r-- root/root    usr/share/terminfo/c/cygwinB19
 -rw-r--r-- root/root    usr/share/terminfo/c/cygwinDBG
 drwxr-xr-x root/root    usr/share/terminfo/d/
--rw-r--r-- root/root    usr/share/terminfo/d/d132 -> usr/share/terminfo/d/datagraphix
--rw-r--r-- root/root    usr/share/terminfo/d/d2 -> usr/share/terminfo/6/6053-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d2-dg -> usr/share/terminfo/6/6053-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d132
+-rw-r--r-- root/root    usr/share/terminfo/d/d2 -> usr/share/terminfo/d/dg6053
+-rw-r--r-- root/root    usr/share/terminfo/d/d2-dg -> usr/share/terminfo/d/dg6053
 -rw-r--r-- root/root    usr/share/terminfo/d/d200 -> usr/share/terminfo/d/d200-dg
 -rw-r--r-- root/root    usr/share/terminfo/d/d200-dg
 -rw-r--r-- root/root    usr/share/terminfo/d/d210 -> usr/share/terminfo/d/d214
@@ -1625,125 +1625,125 @@ drwxr-xr-x root/root    usr/share/terminfo/d/
 -rw-r--r-- root/root    usr/share/terminfo/d/d215
 -rw-r--r-- root/root    usr/share/terminfo/d/d215-7b -> usr/share/terminfo/d/d211-7b
 -rw-r--r-- root/root    usr/share/terminfo/d/d215-dg -> usr/share/terminfo/d/d211-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d216+ -> usr/share/terminfo/d/d216-unix
+-rw-r--r-- root/root    usr/share/terminfo/d/d216+ -> usr/share/terminfo/d/d216e+
 -rw-r--r-- root/root    usr/share/terminfo/d/d216+25
--rw-r--r-- root/root    usr/share/terminfo/d/d216+dg -> usr/share/terminfo/d/d217-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d216-dg -> usr/share/terminfo/d/d217-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d216-unix
+-rw-r--r-- root/root    usr/share/terminfo/d/d216+dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d216-dg -> usr/share/terminfo/d/d216+dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d216-unix -> usr/share/terminfo/d/d216e+
 -rw-r--r-- root/root    usr/share/terminfo/d/d216-unix-25 -> usr/share/terminfo/d/d216+25
--rw-r--r-- root/root    usr/share/terminfo/d/d216e+ -> usr/share/terminfo/d/d216-unix
--rw-r--r-- root/root    usr/share/terminfo/d/d216e+dg -> usr/share/terminfo/d/d217-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d216e-dg -> usr/share/terminfo/d/d217-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d216e-unix -> usr/share/terminfo/d/d216-unix
--rw-r--r-- root/root    usr/share/terminfo/d/d217-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d216e+
+-rw-r--r-- root/root    usr/share/terminfo/d/d216e+dg -> usr/share/terminfo/d/d216+dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d216e-dg -> usr/share/terminfo/d/d216+dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d216e-unix -> usr/share/terminfo/d/d216e+
+-rw-r--r-- root/root    usr/share/terminfo/d/d217-dg -> usr/share/terminfo/d/d216+dg
 -rw-r--r-- root/root    usr/share/terminfo/d/d217-unix
 -rw-r--r-- root/root    usr/share/terminfo/d/d217-unix-25
 -rw-r--r-- root/root    usr/share/terminfo/d/d220
 -rw-r--r-- root/root    usr/share/terminfo/d/d220-7b
 -rw-r--r-- root/root    usr/share/terminfo/d/d220-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d230
+-rw-r--r-- root/root    usr/share/terminfo/d/d230 -> usr/share/terminfo/d/d230c
 -rw-r--r-- root/root    usr/share/terminfo/d/d230-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d230c -> usr/share/terminfo/d/d230
+-rw-r--r-- root/root    usr/share/terminfo/d/d230c
 -rw-r--r-- root/root    usr/share/terminfo/d/d230c-dg -> usr/share/terminfo/d/d230-dg
 -rw-r--r-- root/root    usr/share/terminfo/d/d400
 -rw-r--r-- root/root    usr/share/terminfo/d/d400-dg -> usr/share/terminfo/d/d400
 -rw-r--r-- root/root    usr/share/terminfo/d/d410 -> usr/share/terminfo/d/d460
--rw-r--r-- root/root    usr/share/terminfo/d/d410-7b -> usr/share/terminfo/d/d411-7b
--rw-r--r-- root/root    usr/share/terminfo/d/d410-7b-w
--rw-r--r-- root/root    usr/share/terminfo/d/d410-dg -> usr/share/terminfo/d/d460-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d410-w
+-rw-r--r-- root/root    usr/share/terminfo/d/d410-7b
+-rw-r--r-- root/root    usr/share/terminfo/d/d410-7b-w -> usr/share/terminfo/d/d460-7b-w
+-rw-r--r-- root/root    usr/share/terminfo/d/d410-dg -> usr/share/terminfo/d/d461-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d410-w -> usr/share/terminfo/d/d460-w
 -rw-r--r-- root/root    usr/share/terminfo/d/d411 -> usr/share/terminfo/d/d460
--rw-r--r-- root/root    usr/share/terminfo/d/d411-7b
--rw-r--r-- root/root    usr/share/terminfo/d/d411-7b-w -> usr/share/terminfo/d/d410-7b-w
--rw-r--r-- root/root    usr/share/terminfo/d/d411-dg -> usr/share/terminfo/d/d460-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d411-w -> usr/share/terminfo/d/d410-w
--rw-r--r-- root/root    usr/share/terminfo/d/d412+ -> usr/share/terminfo/d/d412-unix
--rw-r--r-- root/root    usr/share/terminfo/d/d412+25 -> usr/share/terminfo/d/d462+25
--rw-r--r-- root/root    usr/share/terminfo/d/d412+dg -> usr/share/terminfo/d/d462+dg
--rw-r--r-- root/root    usr/share/terminfo/d/d412+s -> usr/share/terminfo/d/d412-unix-s
--rw-r--r-- root/root    usr/share/terminfo/d/d412+sr -> usr/share/terminfo/d/d412-unix-sr
--rw-r--r-- root/root    usr/share/terminfo/d/d412+w
--rw-r--r-- root/root    usr/share/terminfo/d/d412-dg -> usr/share/terminfo/d/d462+dg
--rw-r--r-- root/root    usr/share/terminfo/d/d412-unix
--rw-r--r-- root/root    usr/share/terminfo/d/d412-unix-25 -> usr/share/terminfo/d/d462+25
--rw-r--r-- root/root    usr/share/terminfo/d/d412-unix-s
--rw-r--r-- root/root    usr/share/terminfo/d/d412-unix-sr
--rw-r--r-- root/root    usr/share/terminfo/d/d412-unix-w -> usr/share/terminfo/d/d412+w
--rw-r--r-- root/root    usr/share/terminfo/d/d413-dg -> usr/share/terminfo/d/d462+dg
--rw-r--r-- root/root    usr/share/terminfo/d/d413-unix -> usr/share/terminfo/d/d463-unix
--rw-r--r-- root/root    usr/share/terminfo/d/d413-unix-25 -> usr/share/terminfo/d/d463-unix-25
--rw-r--r-- root/root    usr/share/terminfo/d/d413-unix-s
--rw-r--r-- root/root    usr/share/terminfo/d/d413-unix-sr -> usr/share/terminfo/d/d463-unix-sr
--rw-r--r-- root/root    usr/share/terminfo/d/d413-unix-w
--rw-r--r-- root/root    usr/share/terminfo/d/d414-unix
+-rw-r--r-- root/root    usr/share/terminfo/d/d411-7b -> usr/share/terminfo/d/d410-7b
+-rw-r--r-- root/root    usr/share/terminfo/d/d411-7b-w -> usr/share/terminfo/d/d460-7b-w
+-rw-r--r-- root/root    usr/share/terminfo/d/d411-dg -> usr/share/terminfo/d/d461-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d411-w -> usr/share/terminfo/d/d460-w
+-rw-r--r-- root/root    usr/share/terminfo/d/d412+
+-rw-r--r-- root/root    usr/share/terminfo/d/d412+25 -> usr/share/terminfo/d/d412-unix-25
+-rw-r--r-- root/root    usr/share/terminfo/d/d412+dg -> usr/share/terminfo/d/d462e-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d412+s -> usr/share/terminfo/d/d462-unix-s
+-rw-r--r-- root/root    usr/share/terminfo/d/d412+sr
+-rw-r--r-- root/root    usr/share/terminfo/d/d412+w -> usr/share/terminfo/d/d462+w
+-rw-r--r-- root/root    usr/share/terminfo/d/d412-dg -> usr/share/terminfo/d/d462e-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d412-unix -> usr/share/terminfo/d/d412+
+-rw-r--r-- root/root    usr/share/terminfo/d/d412-unix-25
+-rw-r--r-- root/root    usr/share/terminfo/d/d412-unix-s -> usr/share/terminfo/d/d462-unix-s
+-rw-r--r-- root/root    usr/share/terminfo/d/d412-unix-sr -> usr/share/terminfo/d/d412+sr
+-rw-r--r-- root/root    usr/share/terminfo/d/d412-unix-w -> usr/share/terminfo/d/d462+w
+-rw-r--r-- root/root    usr/share/terminfo/d/d413-dg -> usr/share/terminfo/d/d462e-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d413-unix
+-rw-r--r-- root/root    usr/share/terminfo/d/d413-unix-25
+-rw-r--r-- root/root    usr/share/terminfo/d/d413-unix-s -> usr/share/terminfo/d/d463-unix-s
+-rw-r--r-- root/root    usr/share/terminfo/d/d413-unix-sr
+-rw-r--r-- root/root    usr/share/terminfo/d/d413-unix-w -> usr/share/terminfo/d/d463-unix-w
+-rw-r--r-- root/root    usr/share/terminfo/d/d414-unix -> usr/share/terminfo/d/d464-unix
 -rw-r--r-- root/root    usr/share/terminfo/d/d414-unix-25
--rw-r--r-- root/root    usr/share/terminfo/d/d414-unix-s
+-rw-r--r-- root/root    usr/share/terminfo/d/d414-unix-s -> usr/share/terminfo/d/d464-unix-s
 -rw-r--r-- root/root    usr/share/terminfo/d/d414-unix-sr
 -rw-r--r-- root/root    usr/share/terminfo/d/d414-unix-w -> usr/share/terminfo/d/d464-unix-w
 -rw-r--r-- root/root    usr/share/terminfo/d/d430-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d430-dg-ccc -> usr/share/terminfo/d/d430c-dg-ccc
--rw-r--r-- root/root    usr/share/terminfo/d/d430-unix -> usr/share/terminfo/d/d430c-unix
--rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-25 -> usr/share/terminfo/d/d430c-unix-25
+-rw-r--r-- root/root    usr/share/terminfo/d/d430-dg-ccc
+-rw-r--r-- root/root    usr/share/terminfo/d/d430-unix
+-rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-25
 -rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-25-ccc
--rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-ccc -> usr/share/terminfo/d/d430c-unix-ccc
+-rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-ccc
 -rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-s -> usr/share/terminfo/d/d430c-unix-s
 -rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-s-ccc -> usr/share/terminfo/d/d430c-unix-s-ccc
 -rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-sr -> usr/share/terminfo/d/d430c-unix-sr
 -rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-sr-ccc -> usr/share/terminfo/d/d430c-unix-sr-ccc
 -rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-w
--rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-w-ccc
+-rw-r--r-- root/root    usr/share/terminfo/d/d430-unix-w-ccc -> usr/share/terminfo/d/d430c-unix-w-ccc
 -rw-r--r-- root/root    usr/share/terminfo/d/d430c-dg -> usr/share/terminfo/d/d430-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d430c-dg-ccc
--rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix
--rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-25
+-rw-r--r-- root/root    usr/share/terminfo/d/d430c-dg-ccc -> usr/share/terminfo/d/d430-dg-ccc
+-rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix -> usr/share/terminfo/d/d430-unix
+-rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-25 -> usr/share/terminfo/d/d430-unix-25
 -rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-25-ccc -> usr/share/terminfo/d/d430-unix-25-ccc
--rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-ccc
+-rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-ccc -> usr/share/terminfo/d/d430-unix-ccc
 -rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-s
 -rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-s-ccc
 -rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-sr
 -rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-sr-ccc
 -rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-w -> usr/share/terminfo/d/d430-unix-w
--rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-w-ccc -> usr/share/terminfo/d/d430-unix-w-ccc
+-rw-r--r-- root/root    usr/share/terminfo/d/d430c-unix-w-ccc
 -rw-r--r-- root/root    usr/share/terminfo/d/d450 -> usr/share/terminfo/d/d400
 -rw-r--r-- root/root    usr/share/terminfo/d/d450-dg -> usr/share/terminfo/d/d400
 -rw-r--r-- root/root    usr/share/terminfo/d/d460
--rw-r--r-- root/root    usr/share/terminfo/d/d460-7b -> usr/share/terminfo/d/d411-7b
--rw-r--r-- root/root    usr/share/terminfo/d/d460-7b-w -> usr/share/terminfo/d/d410-7b-w
--rw-r--r-- root/root    usr/share/terminfo/d/d460-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d460-w -> usr/share/terminfo/d/d410-w
+-rw-r--r-- root/root    usr/share/terminfo/d/d460-7b -> usr/share/terminfo/d/d410-7b
+-rw-r--r-- root/root    usr/share/terminfo/d/d460-7b-w
+-rw-r--r-- root/root    usr/share/terminfo/d/d460-dg -> usr/share/terminfo/d/d461-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d460-w
 -rw-r--r-- root/root    usr/share/terminfo/d/d461 -> usr/share/terminfo/d/d460
--rw-r--r-- root/root    usr/share/terminfo/d/d461-7b -> usr/share/terminfo/d/d411-7b
--rw-r--r-- root/root    usr/share/terminfo/d/d461-7b-w -> usr/share/terminfo/d/d410-7b-w
--rw-r--r-- root/root    usr/share/terminfo/d/d461-dg -> usr/share/terminfo/d/d460-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d461-w -> usr/share/terminfo/d/d410-w
--rw-r--r-- root/root    usr/share/terminfo/d/d462+ -> usr/share/terminfo/d/d412-unix
--rw-r--r-- root/root    usr/share/terminfo/d/d462+25
--rw-r--r-- root/root    usr/share/terminfo/d/d462+dg
--rw-r--r-- root/root    usr/share/terminfo/d/d462+s -> usr/share/terminfo/d/d412-unix-s
--rw-r--r-- root/root    usr/share/terminfo/d/d462+sr -> usr/share/terminfo/d/d412-unix-sr
--rw-r--r-- root/root    usr/share/terminfo/d/d462+w -> usr/share/terminfo/d/d412+w
--rw-r--r-- root/root    usr/share/terminfo/d/d462-dg -> usr/share/terminfo/d/d462+dg
--rw-r--r-- root/root    usr/share/terminfo/d/d462-unix -> usr/share/terminfo/d/d412-unix
--rw-r--r-- root/root    usr/share/terminfo/d/d462-unix-25 -> usr/share/terminfo/d/d462+25
--rw-r--r-- root/root    usr/share/terminfo/d/d462-unix-s -> usr/share/terminfo/d/d412-unix-s
--rw-r--r-- root/root    usr/share/terminfo/d/d462-unix-sr -> usr/share/terminfo/d/d412-unix-sr
--rw-r--r-- root/root    usr/share/terminfo/d/d462-unix-w -> usr/share/terminfo/d/d412+w
--rw-r--r-- root/root    usr/share/terminfo/d/d462e-dg -> usr/share/terminfo/d/d462+dg
--rw-r--r-- root/root    usr/share/terminfo/d/d463-dg -> usr/share/terminfo/d/d462+dg
--rw-r--r-- root/root    usr/share/terminfo/d/d463-unix
--rw-r--r-- root/root    usr/share/terminfo/d/d463-unix-25
--rw-r--r-- root/root    usr/share/terminfo/d/d463-unix-s -> usr/share/terminfo/d/d413-unix-s
--rw-r--r-- root/root    usr/share/terminfo/d/d463-unix-sr
--rw-r--r-- root/root    usr/share/terminfo/d/d463-unix-w -> usr/share/terminfo/d/d413-unix-w
--rw-r--r-- root/root    usr/share/terminfo/d/d464-unix -> usr/share/terminfo/d/d414-unix
+-rw-r--r-- root/root    usr/share/terminfo/d/d461-7b -> usr/share/terminfo/d/d410-7b
+-rw-r--r-- root/root    usr/share/terminfo/d/d461-7b-w -> usr/share/terminfo/d/d460-7b-w
+-rw-r--r-- root/root    usr/share/terminfo/d/d461-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d461-w -> usr/share/terminfo/d/d460-w
+-rw-r--r-- root/root    usr/share/terminfo/d/d462+ -> usr/share/terminfo/d/d412+
+-rw-r--r-- root/root    usr/share/terminfo/d/d462+25 -> usr/share/terminfo/d/d412-unix-25
+-rw-r--r-- root/root    usr/share/terminfo/d/d462+dg -> usr/share/terminfo/d/d462e-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d462+s -> usr/share/terminfo/d/d462-unix-s
+-rw-r--r-- root/root    usr/share/terminfo/d/d462+sr -> usr/share/terminfo/d/d412+sr
+-rw-r--r-- root/root    usr/share/terminfo/d/d462+w
+-rw-r--r-- root/root    usr/share/terminfo/d/d462-dg -> usr/share/terminfo/d/d462e-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d462-unix -> usr/share/terminfo/d/d412+
+-rw-r--r-- root/root    usr/share/terminfo/d/d462-unix-25 -> usr/share/terminfo/d/d412-unix-25
+-rw-r--r-- root/root    usr/share/terminfo/d/d462-unix-s
+-rw-r--r-- root/root    usr/share/terminfo/d/d462-unix-sr -> usr/share/terminfo/d/d412+sr
+-rw-r--r-- root/root    usr/share/terminfo/d/d462-unix-w -> usr/share/terminfo/d/d462+w
+-rw-r--r-- root/root    usr/share/terminfo/d/d462e-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d463-dg -> usr/share/terminfo/d/d462e-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/d463-unix -> usr/share/terminfo/d/d413-unix
+-rw-r--r-- root/root    usr/share/terminfo/d/d463-unix-25 -> usr/share/terminfo/d/d413-unix-25
+-rw-r--r-- root/root    usr/share/terminfo/d/d463-unix-s
+-rw-r--r-- root/root    usr/share/terminfo/d/d463-unix-sr -> usr/share/terminfo/d/d413-unix-sr
+-rw-r--r-- root/root    usr/share/terminfo/d/d463-unix-w
+-rw-r--r-- root/root    usr/share/terminfo/d/d464-unix
 -rw-r--r-- root/root    usr/share/terminfo/d/d464-unix-25 -> usr/share/terminfo/d/d414-unix-25
--rw-r--r-- root/root    usr/share/terminfo/d/d464-unix-s -> usr/share/terminfo/d/d414-unix-s
+-rw-r--r-- root/root    usr/share/terminfo/d/d464-unix-s
 -rw-r--r-- root/root    usr/share/terminfo/d/d464-unix-sr -> usr/share/terminfo/d/d414-unix-sr
 -rw-r--r-- root/root    usr/share/terminfo/d/d464-unix-w
--rw-r--r-- root/root    usr/share/terminfo/d/d470
+-rw-r--r-- root/root    usr/share/terminfo/d/d470 -> usr/share/terminfo/d/d470c
 -rw-r--r-- root/root    usr/share/terminfo/d/d470-7b
 -rw-r--r-- root/root    usr/share/terminfo/d/d470-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d470c -> usr/share/terminfo/d/d470
+-rw-r--r-- root/root    usr/share/terminfo/d/d470c
 -rw-r--r-- root/root    usr/share/terminfo/d/d470c-7b -> usr/share/terminfo/d/d470-7b
 -rw-r--r-- root/root    usr/share/terminfo/d/d470c-dg -> usr/share/terminfo/d/d470-dg
 -rw-r--r-- root/root    usr/share/terminfo/d/d555
@@ -1759,75 +1759,75 @@ drwxr-xr-x root/root    usr/share/terminfo/d/
 -rw-r--r-- root/root    usr/share/terminfo/d/d578
 -rw-r--r-- root/root    usr/share/terminfo/d/d578-7b
 -rw-r--r-- root/root    usr/share/terminfo/d/d578-dg -> usr/share/terminfo/d/d577-dg
--rw-r--r-- root/root    usr/share/terminfo/d/d80 -> usr/share/terminfo/d/dialogue
+-rw-r--r-- root/root    usr/share/terminfo/d/d80 -> usr/share/terminfo/a/a80
 -rw-r--r-- root/root    usr/share/terminfo/d/d800
--rw-r--r-- root/root    usr/share/terminfo/d/darwin -> usr/share/terminfo/x/xnuppc
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-100x37 -> usr/share/terminfo/x/xnuppc-100x37
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-100x37-m -> usr/share/terminfo/x/xnuppc-100x37-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-112x37 -> usr/share/terminfo/x/xnuppc-112x37
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-112x37-m -> usr/share/terminfo/x/xnuppc-112x37-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-128x40 -> usr/share/terminfo/x/xnuppc-128x40
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-128x40-m -> usr/share/terminfo/x/xnuppc-128x40-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-128x48 -> usr/share/terminfo/x/xnuppc-128x48
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-128x48-m -> usr/share/terminfo/x/xnuppc-128x48-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-144x48 -> usr/share/terminfo/x/xnuppc-144x48
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-144x48-m -> usr/share/terminfo/x/xnuppc-144x48-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-160x64 -> usr/share/terminfo/x/xnuppc-160x64
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-160x64-m -> usr/share/terminfo/x/xnuppc-160x64-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-200x64 -> usr/share/terminfo/x/xnuppc-200x64
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-200x64-m -> usr/share/terminfo/x/xnuppc-200x64-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-200x75 -> usr/share/terminfo/x/xnuppc-200x75
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-200x75-m -> usr/share/terminfo/x/xnuppc-200x75-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-256x96 -> usr/share/terminfo/x/xnuppc-256x96
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-256x96-m -> usr/share/terminfo/x/xnuppc-256x96-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-80x25 -> usr/share/terminfo/x/xnuppc-80x25
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-80x25-m -> usr/share/terminfo/x/xnuppc-80x25-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-80x30 -> usr/share/terminfo/x/xnuppc-80x30
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-80x30-m -> usr/share/terminfo/x/xnuppc-80x30-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-90x30 -> usr/share/terminfo/x/xnuppc-90x30
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-90x30-m -> usr/share/terminfo/x/xnuppc-90x30-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-b -> usr/share/terminfo/x/xnuppc-b
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-f -> usr/share/terminfo/x/xnuppc-f
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-f2 -> usr/share/terminfo/x/xnuppc-f2
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-m -> usr/share/terminfo/x/xnuppc-m
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-m-b -> usr/share/terminfo/x/xnuppc-m-b
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-m-f -> usr/share/terminfo/x/xnuppc-m-f
--rw-r--r-- root/root    usr/share/terminfo/d/darwin-m-f2 -> usr/share/terminfo/x/xnuppc-m-f2
--rw-r--r-- root/root    usr/share/terminfo/d/datagraphix
--rw-r--r-- root/root    usr/share/terminfo/d/datamedia2500 -> usr/share/terminfo/d/dm2500
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-100x37
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-100x37-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-112x37
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-112x37-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-128x40
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-128x40-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-128x48
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-128x48-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-144x48
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-144x48-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-160x64
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-160x64-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-200x64
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-200x64-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-200x75
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-200x75-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-256x96
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-256x96-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-80x25
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-80x25-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-80x30
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-80x30-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-90x30
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-90x30-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-b
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-f
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-f2
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-m
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-m-b
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-m-f
+-rw-r--r-- root/root    usr/share/terminfo/d/darwin-m-f2
+-rw-r--r-- root/root    usr/share/terminfo/d/datagraphix -> usr/share/terminfo/d/d132
+-rw-r--r-- root/root    usr/share/terminfo/d/datamedia2500
 -rw-r--r-- root/root    usr/share/terminfo/d/datapoint
 -rw-r--r-- root/root    usr/share/terminfo/d/dataspeed40 -> usr/share/terminfo/t/tty40
--rw-r--r-- root/root    usr/share/terminfo/d/dd5000 -> usr/share/terminfo/d/delta
--rw-r--r-- root/root    usr/share/terminfo/d/ddr -> usr/share/terminfo/r/rebus3180
--rw-r--r-- root/root    usr/share/terminfo/d/ddr3180 -> usr/share/terminfo/r/rebus3180
+-rw-r--r-- root/root    usr/share/terminfo/d/dd5000
+-rw-r--r-- root/root    usr/share/terminfo/d/ddr
+-rw-r--r-- root/root    usr/share/terminfo/d/ddr3180 -> usr/share/terminfo/d/ddr
 -rw-r--r-- root/root    usr/share/terminfo/d/dec+pp
 -rw-r--r-- root/root    usr/share/terminfo/d/dec+sl
 -rw-r--r-- root/root    usr/share/terminfo/d/dec-vt100
 -rw-r--r-- root/root    usr/share/terminfo/d/dec-vt220
--rw-r--r-- root/root    usr/share/terminfo/d/dec-vt330 -> usr/share/terminfo/d/dec-vt340
--rw-r--r-- root/root    usr/share/terminfo/d/dec-vt340
+-rw-r--r-- root/root    usr/share/terminfo/d/dec-vt330
+-rw-r--r-- root/root    usr/share/terminfo/d/dec-vt340 -> usr/share/terminfo/d/dec-vt330
 -rw-r--r-- root/root    usr/share/terminfo/d/dec-vt400
 -rw-r--r-- root/root    usr/share/terminfo/d/decansi
 -rw-r--r-- root/root    usr/share/terminfo/d/decid+cpr
--rw-r--r-- root/root    usr/share/terminfo/d/decpro
+-rw-r--r-- root/root    usr/share/terminfo/d/decpro -> usr/share/terminfo/p/pro350
 -rw-r--r-- root/root    usr/share/terminfo/d/decwriter
--rw-r--r-- root/root    usr/share/terminfo/d/delta
+-rw-r--r-- root/root    usr/share/terminfo/d/delta -> usr/share/terminfo/d/dd5000
 -rw-r--r-- root/root    usr/share/terminfo/d/dg+ccc
 -rw-r--r-- root/root    usr/share/terminfo/d/dg+color
 -rw-r--r-- root/root    usr/share/terminfo/d/dg+color8
 -rw-r--r-- root/root    usr/share/terminfo/d/dg+fixed
--rw-r--r-- root/root    usr/share/terminfo/d/dg-ansi
+-rw-r--r-- root/root    usr/share/terminfo/d/dg-ansi -> usr/share/terminfo/d/dg210
 -rw-r--r-- root/root    usr/share/terminfo/d/dg-generic
 -rw-r--r-- root/root    usr/share/terminfo/d/dg100
 -rw-r--r-- root/root    usr/share/terminfo/d/dg200
--rw-r--r-- root/root    usr/share/terminfo/d/dg210 -> usr/share/terminfo/d/dg-ansi
+-rw-r--r-- root/root    usr/share/terminfo/d/dg210
 -rw-r--r-- root/root    usr/share/terminfo/d/dg211
--rw-r--r-- root/root    usr/share/terminfo/d/dg450 -> usr/share/terminfo/d/dg6134
+-rw-r--r-- root/root    usr/share/terminfo/d/dg450
 -rw-r--r-- root/root    usr/share/terminfo/d/dg460-ansi
--rw-r--r-- root/root    usr/share/terminfo/d/dg6053 -> usr/share/terminfo/6/6053-dg
+-rw-r--r-- root/root    usr/share/terminfo/d/dg6053
 -rw-r--r-- root/root    usr/share/terminfo/d/dg6053-old -> usr/share/terminfo/d/dg100
--rw-r--r-- root/root    usr/share/terminfo/d/dg605x -> usr/share/terminfo/6/6053-dg
--rw-r--r-- root/root    usr/share/terminfo/d/dg6134
+-rw-r--r-- root/root    usr/share/terminfo/d/dg605x -> usr/share/terminfo/d/dg6053
+-rw-r--r-- root/root    usr/share/terminfo/d/dg6134 -> usr/share/terminfo/d/dg450
 -rw-r--r-- root/root    usr/share/terminfo/d/dgkeys+11
 -rw-r--r-- root/root    usr/share/terminfo/d/dgkeys+15
 -rw-r--r-- root/root    usr/share/terminfo/d/dgkeys+7b
@@ -1836,21 +1836,21 @@ drwxr-xr-x root/root    usr/share/terminfo/d/
 -rw-r--r-- root/root    usr/share/terminfo/d/dgmode+color8
 -rw-r--r-- root/root    usr/share/terminfo/d/dgunix+ccc
 -rw-r--r-- root/root    usr/share/terminfo/d/dgunix+fixed
--rw-r--r-- root/root    usr/share/terminfo/d/diablo -> usr/share/terminfo/x/xerox
--rw-r--r-- root/root    usr/share/terminfo/d/diablo-lm -> usr/share/terminfo/x/xerox-lm
--rw-r--r-- root/root    usr/share/terminfo/d/diablo1620 -> usr/share/terminfo/d/diablo450
--rw-r--r-- root/root    usr/share/terminfo/d/diablo1620-m8
--rw-r--r-- root/root    usr/share/terminfo/d/diablo1640 -> usr/share/terminfo/x/xerox
--rw-r--r-- root/root    usr/share/terminfo/d/diablo1640-lm -> usr/share/terminfo/x/xerox-lm
--rw-r--r-- root/root    usr/share/terminfo/d/diablo1640-m8 -> usr/share/terminfo/d/diablo1620-m8
--rw-r--r-- root/root    usr/share/terminfo/d/diablo1720 -> usr/share/terminfo/d/diablo450
--rw-r--r-- root/root    usr/share/terminfo/d/diablo1730 -> usr/share/terminfo/x/xerox
--rw-r--r-- root/root    usr/share/terminfo/d/diablo1740 -> usr/share/terminfo/x/xerox
--rw-r--r-- root/root    usr/share/terminfo/d/diablo1740-lm -> usr/share/terminfo/x/x1700-lm
--rw-r--r-- root/root    usr/share/terminfo/d/diablo450
--rw-r--r-- root/root    usr/share/terminfo/d/diablo630 -> usr/share/terminfo/x/xerox
--rw-r--r-- root/root    usr/share/terminfo/d/dialogue
--rw-r--r-- root/root    usr/share/terminfo/d/dialogue80 -> usr/share/terminfo/d/dialogue
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo-lm -> usr/share/terminfo/d/diablo1640-lm
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo1620 -> usr/share/terminfo/d/diablo1720
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo1620-m8 -> usr/share/terminfo/d/diablo1640-m8
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo1640 -> usr/share/terminfo/d/diablo
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo1640-lm
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo1640-m8
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo1720
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo1730 -> usr/share/terminfo/d/diablo
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo1740 -> usr/share/terminfo/d/diablo
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo1740-lm -> usr/share/terminfo/1/1730-lm
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo450 -> usr/share/terminfo/d/diablo1720
+-rw-r--r-- root/root    usr/share/terminfo/d/diablo630 -> usr/share/terminfo/d/diablo
+-rw-r--r-- root/root    usr/share/terminfo/d/dialogue -> usr/share/terminfo/a/a80
+-rw-r--r-- root/root    usr/share/terminfo/d/dialogue80 -> usr/share/terminfo/a/a80
 -rw-r--r-- root/root    usr/share/terminfo/d/digilog
 -rw-r--r-- root/root    usr/share/terminfo/d/djgpp
 -rw-r--r-- root/root    usr/share/terminfo/d/djgpp203
@@ -1862,20 +1862,20 @@ drwxr-xr-x root/root    usr/share/terminfo/d/
 -rw-r--r-- root/root    usr/share/terminfo/d/dku7102-sna -> usr/share/terminfo/t/tws2102-sna
 -rw-r--r-- root/root    usr/share/terminfo/d/dku7103-sna -> usr/share/terminfo/t/tws2103-sna
 -rw-r--r-- root/root    usr/share/terminfo/d/dku7202
--rw-r--r-- root/root    usr/share/terminfo/d/dm1520 -> usr/share/terminfo/d/dm1521
--rw-r--r-- root/root    usr/share/terminfo/d/dm1521
--rw-r--r-- root/root    usr/share/terminfo/d/dm2500
+-rw-r--r-- root/root    usr/share/terminfo/d/dm1520
+-rw-r--r-- root/root    usr/share/terminfo/d/dm1521 -> usr/share/terminfo/d/dm1520
+-rw-r--r-- root/root    usr/share/terminfo/d/dm2500 -> usr/share/terminfo/d/datamedia2500
 -rw-r--r-- root/root    usr/share/terminfo/d/dm3025
 -rw-r--r-- root/root    usr/share/terminfo/d/dm3045
--rw-r--r-- root/root    usr/share/terminfo/d/dm80
--rw-r--r-- root/root    usr/share/terminfo/d/dm80w
+-rw-r--r-- root/root    usr/share/terminfo/d/dm80 -> usr/share/terminfo/d/dt80
+-rw-r--r-- root/root    usr/share/terminfo/d/dm80w -> usr/share/terminfo/d/dt80w
 -rw-r--r-- root/root    usr/share/terminfo/d/dmchat
--rw-r--r-- root/root    usr/share/terminfo/d/dmd -> usr/share/terminfo/t/tty5620
+-rw-r--r-- root/root    usr/share/terminfo/d/dmd -> usr/share/terminfo/5/5620
 -rw-r--r-- root/root    usr/share/terminfo/d/dmd-24 -> usr/share/terminfo/t/tty5620-24
 -rw-r--r-- root/root    usr/share/terminfo/d/dmd-34 -> usr/share/terminfo/t/tty5620-34
 -rw-r--r-- root/root    usr/share/terminfo/d/dmd1 -> usr/share/terminfo/t/tty5620-1
--rw-r--r-- root/root    usr/share/terminfo/d/dmdt80 -> usr/share/terminfo/d/dm80
--rw-r--r-- root/root    usr/share/terminfo/d/dmdt80w -> usr/share/terminfo/d/dm80w
+-rw-r--r-- root/root    usr/share/terminfo/d/dmdt80 -> usr/share/terminfo/d/dt80
+-rw-r--r-- root/root    usr/share/terminfo/d/dmdt80w -> usr/share/terminfo/d/dt80w
 -rw-r--r-- root/root    usr/share/terminfo/d/dmterm
 -rw-r--r-- root/root    usr/share/terminfo/d/domterm
 -rw-r--r-- root/root    usr/share/terminfo/d/dp3360 -> usr/share/terminfo/d/datapoint
@@ -1883,13 +1883,13 @@ drwxr-xr-x root/root    usr/share/terminfo/d/
 -rw-r--r-- root/root    usr/share/terminfo/d/ds40 -> usr/share/terminfo/t/tty40
 -rw-r--r-- root/root    usr/share/terminfo/d/ds40-2 -> usr/share/terminfo/t/tty40
 -rw-r--r-- root/root    usr/share/terminfo/d/dt-100
--rw-r--r-- root/root    usr/share/terminfo/d/dt-100w -> usr/share/terminfo/d/dt100w
+-rw-r--r-- root/root    usr/share/terminfo/d/dt-100w
 -rw-r--r-- root/root    usr/share/terminfo/d/dt100 -> usr/share/terminfo/d/dt-100
--rw-r--r-- root/root    usr/share/terminfo/d/dt100w
+-rw-r--r-- root/root    usr/share/terminfo/d/dt100w -> usr/share/terminfo/d/dt-100w
 -rw-r--r-- root/root    usr/share/terminfo/d/dt110
--rw-r--r-- root/root    usr/share/terminfo/d/dt80 -> usr/share/terminfo/d/dm80
+-rw-r--r-- root/root    usr/share/terminfo/d/dt80
 -rw-r--r-- root/root    usr/share/terminfo/d/dt80-sas
--rw-r--r-- root/root    usr/share/terminfo/d/dt80w -> usr/share/terminfo/d/dm80w
+-rw-r--r-- root/root    usr/share/terminfo/d/dt80w
 -rw-r--r-- root/root    usr/share/terminfo/d/dtc300s
 -rw-r--r-- root/root    usr/share/terminfo/d/dtc382
 -rw-r--r-- root/root    usr/share/terminfo/d/dtterm
@@ -1920,53 +1920,53 @@ drwxr-xr-x root/root    usr/share/terminfo/e/
 -rw-r--r-- root/root    usr/share/terminfo/e/emx-base
 -rw-r--r-- root/root    usr/share/terminfo/e/env230 -> usr/share/terminfo/e/envision230
 -rw-r--r-- root/root    usr/share/terminfo/e/envision230
--rw-r--r-- root/root    usr/share/terminfo/e/ep40
--rw-r--r-- root/root    usr/share/terminfo/e/ep4000 -> usr/share/terminfo/e/ep40
--rw-r--r-- root/root    usr/share/terminfo/e/ep4080
--rw-r--r-- root/root    usr/share/terminfo/e/ep48 -> usr/share/terminfo/e/ep4080
+-rw-r--r-- root/root    usr/share/terminfo/e/ep40 -> usr/share/terminfo/e/ep4000
+-rw-r--r-- root/root    usr/share/terminfo/e/ep4000
+-rw-r--r-- root/root    usr/share/terminfo/e/ep4080 -> usr/share/terminfo/e/ep48
+-rw-r--r-- root/root    usr/share/terminfo/e/ep48
 -rw-r--r-- root/root    usr/share/terminfo/e/ergo4000
 -rw-r--r-- root/root    usr/share/terminfo/e/esprit
 -rw-r--r-- root/root    usr/share/terminfo/e/esprit-am
 -rw-r--r-- root/root    usr/share/terminfo/e/eterm
 -rw-r--r-- root/root    usr/share/terminfo/e/eterm-color
 -rw-r--r-- root/root    usr/share/terminfo/e/ex155
--rw-r--r-- root/root    usr/share/terminfo/e/excel62
+-rw-r--r-- root/root    usr/share/terminfo/e/excel62 -> usr/share/terminfo/e/excel64
 -rw-r--r-- root/root    usr/share/terminfo/e/excel62-rv -> usr/share/terminfo/e/excel64-rv
--rw-r--r-- root/root    usr/share/terminfo/e/excel62-w
--rw-r--r-- root/root    usr/share/terminfo/e/excel64 -> usr/share/terminfo/e/excel62
+-rw-r--r-- root/root    usr/share/terminfo/e/excel62-w -> usr/share/terminfo/e/excel64-w
+-rw-r--r-- root/root    usr/share/terminfo/e/excel64
 -rw-r--r-- root/root    usr/share/terminfo/e/excel64-rv
--rw-r--r-- root/root    usr/share/terminfo/e/excel64-w -> usr/share/terminfo/e/excel62-w
--rw-r--r-- root/root    usr/share/terminfo/e/exec80
+-rw-r--r-- root/root    usr/share/terminfo/e/excel64-w
+-rw-r--r-- root/root    usr/share/terminfo/e/exec80 -> usr/share/terminfo/h/h80
 drwxr-xr-x root/root    usr/share/terminfo/f/
 -rw-r--r-- root/root    usr/share/terminfo/f/f100 -> usr/share/terminfo/f/freedom
--rw-r--r-- root/root    usr/share/terminfo/f/f100-rv
+-rw-r--r-- root/root    usr/share/terminfo/f/f100-rv -> usr/share/terminfo/f/freedom-rv
 -rw-r--r-- root/root    usr/share/terminfo/f/f110
 -rw-r--r-- root/root    usr/share/terminfo/f/f110-14
 -rw-r--r-- root/root    usr/share/terminfo/f/f110-14w
 -rw-r--r-- root/root    usr/share/terminfo/f/f110-w
 -rw-r--r-- root/root    usr/share/terminfo/f/f1720
 -rw-r--r-- root/root    usr/share/terminfo/f/f1720a -> usr/share/terminfo/f/f1720
--rw-r--r-- root/root    usr/share/terminfo/f/f200
+-rw-r--r-- root/root    usr/share/terminfo/f/f200 -> usr/share/terminfo/f/freedom200
 -rw-r--r-- root/root    usr/share/terminfo/f/f200-w
 -rw-r--r-- root/root    usr/share/terminfo/f/f200vi
 -rw-r--r-- root/root    usr/share/terminfo/f/f200vi-w
 -rw-r--r-- root/root    usr/share/terminfo/f/falco -> usr/share/terminfo/t/ts-1
 -rw-r--r-- root/root    usr/share/terminfo/f/falco-p -> usr/share/terminfo/t/ts1p
 -rw-r--r-- root/root    usr/share/terminfo/f/fbterm
--rw-r--r-- root/root    usr/share/terminfo/f/fenix
--rw-r--r-- root/root    usr/share/terminfo/f/fenixw
+-rw-r--r-- root/root    usr/share/terminfo/f/fenix -> usr/share/terminfo/p/pt100
+-rw-r--r-- root/root    usr/share/terminfo/f/fenixw -> usr/share/terminfo/p/pt100w
 -rw-r--r-- root/root    usr/share/terminfo/f/fixterm
 -rw-r--r-- root/root    usr/share/terminfo/f/foot
 -rw-r--r-- root/root    usr/share/terminfo/f/foot+base
 -rw-r--r-- root/root    usr/share/terminfo/f/foot-direct
 -rw-r--r-- root/root    usr/share/terminfo/f/fortune
 -rw-r--r-- root/root    usr/share/terminfo/f/fos -> usr/share/terminfo/f/fortune
--rw-r--r-- root/root    usr/share/terminfo/f/fox
+-rw-r--r-- root/root    usr/share/terminfo/f/fox -> usr/share/terminfo/p/pe1100
 -rw-r--r-- root/root    usr/share/terminfo/f/freedom
--rw-r--r-- root/root    usr/share/terminfo/f/freedom-rv -> usr/share/terminfo/f/f100-rv
+-rw-r--r-- root/root    usr/share/terminfo/f/freedom-rv
 -rw-r--r-- root/root    usr/share/terminfo/f/freedom100 -> usr/share/terminfo/f/freedom
 -rw-r--r-- root/root    usr/share/terminfo/f/freedom110 -> usr/share/terminfo/f/f110
--rw-r--r-- root/root    usr/share/terminfo/f/freedom200 -> usr/share/terminfo/f/f200
+-rw-r--r-- root/root    usr/share/terminfo/f/freedom200
 drwxr-xr-x root/root    usr/share/terminfo/g/
 -rw-r--r-- root/root    usr/share/terminfo/g/gator
 -rw-r--r-- root/root    usr/share/terminfo/g/gator-52
@@ -1991,68 +1991,68 @@ drwxr-xr-x root/root    usr/share/terminfo/g/
 -rw-r--r-- root/root    usr/share/terminfo/g/go225
 -rw-r--r-- root/root    usr/share/terminfo/g/graphos
 -rw-r--r-- root/root    usr/share/terminfo/g/graphos-30
--rw-r--r-- root/root    usr/share/terminfo/g/gs5430
--rw-r--r-- root/root    usr/share/terminfo/g/gs5430-22
--rw-r--r-- root/root    usr/share/terminfo/g/gs5430-24
+-rw-r--r-- root/root    usr/share/terminfo/g/gs5430 -> usr/share/terminfo/p/pt505
+-rw-r--r-- root/root    usr/share/terminfo/g/gs5430-22 -> usr/share/terminfo/p/pt505-22
+-rw-r--r-- root/root    usr/share/terminfo/g/gs5430-24 -> usr/share/terminfo/p/pt505-24
 -rw-r--r-- root/root    usr/share/terminfo/g/gs6300
 -rw-r--r-- root/root    usr/share/terminfo/g/gsi
 -rw-r--r-- root/root    usr/share/terminfo/g/gt100 -> usr/share/terminfo/g/gt100a
 -rw-r--r-- root/root    usr/share/terminfo/g/gt100a
 -rw-r--r-- root/root    usr/share/terminfo/g/gt40
 -rw-r--r-- root/root    usr/share/terminfo/g/gt42
--rw-r--r-- root/root    usr/share/terminfo/g/guru
+-rw-r--r-- root/root    usr/share/terminfo/g/guru -> usr/share/terminfo/g/guru-33
 -rw-r--r-- root/root    usr/share/terminfo/g/guru+rv
 -rw-r--r-- root/root    usr/share/terminfo/g/guru+s
--rw-r--r-- root/root    usr/share/terminfo/g/guru+unk -> usr/share/terminfo/g/guru
+-rw-r--r-- root/root    usr/share/terminfo/g/guru+unk -> usr/share/terminfo/g/guru-33
 -rw-r--r-- root/root    usr/share/terminfo/g/guru-24
--rw-r--r-- root/root    usr/share/terminfo/g/guru-33 -> usr/share/terminfo/g/guru
--rw-r--r-- root/root    usr/share/terminfo/g/guru-33-rv -> usr/share/terminfo/g/guru-rv
--rw-r--r-- root/root    usr/share/terminfo/g/guru-33-s -> usr/share/terminfo/g/guru-s
+-rw-r--r-- root/root    usr/share/terminfo/g/guru-33
+-rw-r--r-- root/root    usr/share/terminfo/g/guru-33-rv
+-rw-r--r-- root/root    usr/share/terminfo/g/guru-33-s
 -rw-r--r-- root/root    usr/share/terminfo/g/guru-44
 -rw-r--r-- root/root    usr/share/terminfo/g/guru-44-s
 -rw-r--r-- root/root    usr/share/terminfo/g/guru-76
--rw-r--r-- root/root    usr/share/terminfo/g/guru-76-lp -> usr/share/terminfo/g/guru-lp
+-rw-r--r-- root/root    usr/share/terminfo/g/guru-76-lp
 -rw-r--r-- root/root    usr/share/terminfo/g/guru-76-s
 -rw-r--r-- root/root    usr/share/terminfo/g/guru-76-w
 -rw-r--r-- root/root    usr/share/terminfo/g/guru-76-w-s
 -rw-r--r-- root/root    usr/share/terminfo/g/guru-76-wm
--rw-r--r-- root/root    usr/share/terminfo/g/guru-lp
+-rw-r--r-- root/root    usr/share/terminfo/g/guru-lp -> usr/share/terminfo/g/guru-76-lp
 -rw-r--r-- root/root    usr/share/terminfo/g/guru-nctxt
--rw-r--r-- root/root    usr/share/terminfo/g/guru-rv
--rw-r--r-- root/root    usr/share/terminfo/g/guru-s
+-rw-r--r-- root/root    usr/share/terminfo/g/guru-rv -> usr/share/terminfo/g/guru-33-rv
+-rw-r--r-- root/root    usr/share/terminfo/g/guru-s -> usr/share/terminfo/g/guru-33-s
 drwxr-xr-x root/root    usr/share/terminfo/h/
--rw-r--r-- root/root    usr/share/terminfo/h/h-100 -> usr/share/terminfo/z/z110
--rw-r--r-- root/root    usr/share/terminfo/h/h-100bw -> usr/share/terminfo/z/z100bw
--rw-r--r-- root/root    usr/share/terminfo/h/h100 -> usr/share/terminfo/z/z110
--rw-r--r-- root/root    usr/share/terminfo/h/h100bw -> usr/share/terminfo/z/z100bw
--rw-r--r-- root/root    usr/share/terminfo/h/h19 -> usr/share/terminfo/z/z19
--rw-r--r-- root/root    usr/share/terminfo/h/h19-a -> usr/share/terminfo/h/h19a
--rw-r--r-- root/root    usr/share/terminfo/h/h19-b -> usr/share/terminfo/z/z19
+-rw-r--r-- root/root    usr/share/terminfo/h/h-100
+-rw-r--r-- root/root    usr/share/terminfo/h/h-100bw
+-rw-r--r-- root/root    usr/share/terminfo/h/h100 -> usr/share/terminfo/h/h-100
+-rw-r--r-- root/root    usr/share/terminfo/h/h100bw -> usr/share/terminfo/h/h-100bw
+-rw-r--r-- root/root    usr/share/terminfo/h/h19 -> usr/share/terminfo/h/h19-b
+-rw-r--r-- root/root    usr/share/terminfo/h/h19-a
+-rw-r--r-- root/root    usr/share/terminfo/h/h19-b
 -rw-r--r-- root/root    usr/share/terminfo/h/h19-bs
--rw-r--r-- root/root    usr/share/terminfo/h/h19-g -> usr/share/terminfo/h/h19g
+-rw-r--r-- root/root    usr/share/terminfo/h/h19-g
 -rw-r--r-- root/root    usr/share/terminfo/h/h19-smul -> usr/share/terminfo/h/h19us
 -rw-r--r-- root/root    usr/share/terminfo/h/h19-u
 -rw-r--r-- root/root    usr/share/terminfo/h/h19-us -> usr/share/terminfo/h/h19us
--rw-r--r-- root/root    usr/share/terminfo/h/h19a
--rw-r--r-- root/root    usr/share/terminfo/h/h19g
+-rw-r--r-- root/root    usr/share/terminfo/h/h19a -> usr/share/terminfo/h/h19-a
+-rw-r--r-- root/root    usr/share/terminfo/h/h19g -> usr/share/terminfo/h/h19-g
 -rw-r--r-- root/root    usr/share/terminfo/h/h19k -> usr/share/terminfo/h/h19kermit
 -rw-r--r-- root/root    usr/share/terminfo/h/h19kermit
 -rw-r--r-- root/root    usr/share/terminfo/h/h19us
--rw-r--r-- root/root    usr/share/terminfo/h/h29a-kc-bc -> usr/share/terminfo/z/z29a-kc-bc
--rw-r--r-- root/root    usr/share/terminfo/h/h29a-kc-uc -> usr/share/terminfo/z/z29a-kc-uc
--rw-r--r-- root/root    usr/share/terminfo/h/h29a-nkc-bc -> usr/share/terminfo/z/z29a-nkc-bc
--rw-r--r-- root/root    usr/share/terminfo/h/h29a-nkc-uc -> usr/share/terminfo/z/z29a-nkc-uc
--rw-r--r-- root/root    usr/share/terminfo/h/h80 -> usr/share/terminfo/e/exec80
+-rw-r--r-- root/root    usr/share/terminfo/h/h29a-kc-bc
+-rw-r--r-- root/root    usr/share/terminfo/h/h29a-kc-uc
+-rw-r--r-- root/root    usr/share/terminfo/h/h29a-nkc-bc
+-rw-r--r-- root/root    usr/share/terminfo/h/h29a-nkc-uc
+-rw-r--r-- root/root    usr/share/terminfo/h/h80
 -rw-r--r-- root/root    usr/share/terminfo/h/ha8675
 -rw-r--r-- root/root    usr/share/terminfo/h/ha8686
--rw-r--r-- root/root    usr/share/terminfo/h/hazel -> usr/share/terminfo/e/exec80
+-rw-r--r-- root/root    usr/share/terminfo/h/hazel -> usr/share/terminfo/h/h80
 -rw-r--r-- root/root    usr/share/terminfo/h/hds200
--rw-r--r-- root/root    usr/share/terminfo/h/he80 -> usr/share/terminfo/e/exec80
--rw-r--r-- root/root    usr/share/terminfo/h/heath -> usr/share/terminfo/z/z19
--rw-r--r-- root/root    usr/share/terminfo/h/heath-19 -> usr/share/terminfo/z/z19
--rw-r--r-- root/root    usr/share/terminfo/h/heath-ansi -> usr/share/terminfo/h/h19a
--rw-r--r-- root/root    usr/share/terminfo/h/heathkit -> usr/share/terminfo/z/z19
--rw-r--r-- root/root    usr/share/terminfo/h/heathkit-a -> usr/share/terminfo/h/h19a
+-rw-r--r-- root/root    usr/share/terminfo/h/he80 -> usr/share/terminfo/h/h80
+-rw-r--r-- root/root    usr/share/terminfo/h/heath -> usr/share/terminfo/h/h19-b
+-rw-r--r-- root/root    usr/share/terminfo/h/heath-19 -> usr/share/terminfo/h/h19-b
+-rw-r--r-- root/root    usr/share/terminfo/h/heath-ansi -> usr/share/terminfo/h/h19-a
+-rw-r--r-- root/root    usr/share/terminfo/h/heathkit -> usr/share/terminfo/h/h19-b
+-rw-r--r-- root/root    usr/share/terminfo/h/heathkit-a -> usr/share/terminfo/h/h19-a
 -rw-r--r-- root/root    usr/share/terminfo/h/hft
 -rw-r--r-- root/root    usr/share/terminfo/h/hft-c
 -rw-r--r-- root/root    usr/share/terminfo/h/hft-c-old
@@ -2060,7 +2060,7 @@ drwxr-xr-x root/root    usr/share/terminfo/h/
 -rw-r--r-- root/root    usr/share/terminfo/h/hirez100
 -rw-r--r-- root/root    usr/share/terminfo/h/hirez100-w
 -rw-r--r-- root/root    usr/share/terminfo/h/hmod1
--rw-r--r-- root/root    usr/share/terminfo/h/hp
+-rw-r--r-- root/root    usr/share/terminfo/h/hp -> usr/share/terminfo/h/hpgeneric
 -rw-r--r-- root/root    usr/share/terminfo/h/hp+arrows
 -rw-r--r-- root/root    usr/share/terminfo/h/hp+color
 -rw-r--r-- root/root    usr/share/terminfo/h/hp+labels
@@ -2072,44 +2072,44 @@ drwxr-xr-x root/root    usr/share/terminfo/h/
 -rw-r--r-- root/root    usr/share/terminfo/h/hp150
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2 -> usr/share/terminfo/h/hpex2
 -rw-r--r-- root/root    usr/share/terminfo/h/hp236
--rw-r--r-- root/root    usr/share/terminfo/h/hp2382
--rw-r--r-- root/root    usr/share/terminfo/h/hp2382a -> usr/share/terminfo/h/hp2382
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2382 -> usr/share/terminfo/h/hp2382a
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2382a
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2392
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2397 -> usr/share/terminfo/h/hp2397a
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2397a
--rw-r--r-- root/root    usr/share/terminfo/h/hp2621 -> usr/share/terminfo/h/hp2621a
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2621 -> usr/share/terminfo/h/hp2621-wl
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2621-48
--rw-r--r-- root/root    usr/share/terminfo/h/hp2621-a
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2621-a -> usr/share/terminfo/h/hp2621a-a
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2621-ba
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2621-fl
--rw-r--r-- root/root    usr/share/terminfo/h/hp2621-k45 -> usr/share/terminfo/k/k45
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2621-k45 -> usr/share/terminfo/h/hp2621k45
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2621-nl
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2621-nt
--rw-r--r-- root/root    usr/share/terminfo/h/hp2621-wl -> usr/share/terminfo/h/hp2621a
--rw-r--r-- root/root    usr/share/terminfo/h/hp2621A -> usr/share/terminfo/h/hp2621a
--rw-r--r-- root/root    usr/share/terminfo/h/hp2621a
--rw-r--r-- root/root    usr/share/terminfo/h/hp2621a-a -> usr/share/terminfo/h/hp2621-a
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2621-wl
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2621A -> usr/share/terminfo/h/hp2621-wl
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2621a -> usr/share/terminfo/h/hp2621-wl
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2621a-a
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2621b
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2621b-kx
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2621b-kx-p
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2621b-p
--rw-r--r-- root/root    usr/share/terminfo/h/hp2621k45 -> usr/share/terminfo/k/k45
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2621k45
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2621p
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2621p-a
--rw-r--r-- root/root    usr/share/terminfo/h/hp2622 -> usr/share/terminfo/h/hp2622a
--rw-r--r-- root/root    usr/share/terminfo/h/hp2622a
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2622
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2622a -> usr/share/terminfo/h/hp2622
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2623
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2623a -> usr/share/terminfo/h/hp2623
--rw-r--r-- root/root    usr/share/terminfo/h/hp2624
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2624 -> usr/share/terminfo/h/hp2624a
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2624-10p -> usr/share/terminfo/h/hp2624a-10p
--rw-r--r-- root/root    usr/share/terminfo/h/hp2624a -> usr/share/terminfo/h/hp2624
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2624a
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2624a-10p
--rw-r--r-- root/root    usr/share/terminfo/h/hp2624b -> usr/share/terminfo/h/hp2624
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2624b -> usr/share/terminfo/h/hp2624a
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2624b-10p -> usr/share/terminfo/h/hp2624a-10p
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2624b-10p-p
--rw-r--r-- root/root    usr/share/terminfo/h/hp2624b-4p -> usr/share/terminfo/h/hp2624
--rw-r--r-- root/root    usr/share/terminfo/h/hp2624b-4p-p -> usr/share/terminfo/h/hp2624b-p
--rw-r--r-- root/root    usr/share/terminfo/h/hp2624b-p
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2624b-4p -> usr/share/terminfo/h/hp2624a
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2624b-4p-p
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2624b-p -> usr/share/terminfo/h/hp2624b-4p-p
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2626 -> usr/share/terminfo/h/hp2626a
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2626-12
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2626-12-s
@@ -2124,40 +2124,40 @@ drwxr-xr-x root/root    usr/share/terminfo/h/
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2627c
 -rw-r--r-- root/root    usr/share/terminfo/h/hp262x
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2640a
--rw-r--r-- root/root    usr/share/terminfo/h/hp2640b -> usr/share/terminfo/h/hp2644a
--rw-r--r-- root/root    usr/share/terminfo/h/hp2641a -> usr/share/terminfo/h/hp2647a
--rw-r--r-- root/root    usr/share/terminfo/h/hp2644a
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2640b
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2641a
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2644a -> usr/share/terminfo/h/hp2640b
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2645 -> usr/share/terminfo/h/hp45
--rw-r--r-- root/root    usr/share/terminfo/h/hp2645a -> usr/share/terminfo/h/hp2647a
--rw-r--r-- root/root    usr/share/terminfo/h/hp2647a
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2645a -> usr/share/terminfo/h/hp2641a
+-rw-r--r-- root/root    usr/share/terminfo/h/hp2647a -> usr/share/terminfo/h/hp2641a
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2648
 -rw-r--r-- root/root    usr/share/terminfo/h/hp2648a -> usr/share/terminfo/h/hp2648
 -rw-r--r-- root/root    usr/share/terminfo/h/hp300h
 -rw-r--r-- root/root    usr/share/terminfo/h/hp45
 -rw-r--r-- root/root    usr/share/terminfo/h/hp700
 -rw-r--r-- root/root    usr/share/terminfo/h/hp700-wy
--rw-r--r-- root/root    usr/share/terminfo/h/hp70092 -> usr/share/terminfo/h/hp70092a
--rw-r--r-- root/root    usr/share/terminfo/h/hp70092A -> usr/share/terminfo/h/hp70092a
--rw-r--r-- root/root    usr/share/terminfo/h/hp70092a
--rw-r--r-- root/root    usr/share/terminfo/h/hp9837 -> usr/share/terminfo/h/hp98721
+-rw-r--r-- root/root    usr/share/terminfo/h/hp70092 -> usr/share/terminfo/h/hp70092A
+-rw-r--r-- root/root    usr/share/terminfo/h/hp70092A
+-rw-r--r-- root/root    usr/share/terminfo/h/hp70092a -> usr/share/terminfo/h/hp70092A
+-rw-r--r-- root/root    usr/share/terminfo/h/hp9837
 -rw-r--r-- root/root    usr/share/terminfo/h/hp9845
--rw-r--r-- root/root    usr/share/terminfo/h/hp98550 -> usr/share/terminfo/h/hp98550a
--rw-r--r-- root/root    usr/share/terminfo/h/hp98550-color
--rw-r--r-- root/root    usr/share/terminfo/h/hp98550a
--rw-r--r-- root/root    usr/share/terminfo/h/hp98550a-color -> usr/share/terminfo/h/hp98550-color
--rw-r--r-- root/root    usr/share/terminfo/h/hp98720 -> usr/share/terminfo/h/hp98721
--rw-r--r-- root/root    usr/share/terminfo/h/hp98721
+-rw-r--r-- root/root    usr/share/terminfo/h/hp98550
+-rw-r--r-- root/root    usr/share/terminfo/h/hp98550-color -> usr/share/terminfo/h/hp98550a-color
+-rw-r--r-- root/root    usr/share/terminfo/h/hp98550a -> usr/share/terminfo/h/hp98550
+-rw-r--r-- root/root    usr/share/terminfo/h/hp98550a-color
+-rw-r--r-- root/root    usr/share/terminfo/h/hp98720 -> usr/share/terminfo/h/hp9837
+-rw-r--r-- root/root    usr/share/terminfo/h/hp98721 -> usr/share/terminfo/h/hp9837
 -rw-r--r-- root/root    usr/share/terminfo/h/hpansi -> usr/share/terminfo/h/hp700
 -rw-r--r-- root/root    usr/share/terminfo/h/hpex
 -rw-r--r-- root/root    usr/share/terminfo/h/hpex2
--rw-r--r-- root/root    usr/share/terminfo/h/hpgeneric -> usr/share/terminfo/h/hp
+-rw-r--r-- root/root    usr/share/terminfo/h/hpgeneric
 -rw-r--r-- root/root    usr/share/terminfo/h/hpsub
--rw-r--r-- root/root    usr/share/terminfo/h/hpterm -> usr/share/terminfo/X/X-hpterm
+-rw-r--r-- root/root    usr/share/terminfo/h/hpterm
 -rw-r--r-- root/root    usr/share/terminfo/h/hpterm-color
--rw-r--r-- root/root    usr/share/terminfo/h/hpterm-color2 -> usr/share/terminfo/X/X-hpterm-color2
+-rw-r--r-- root/root    usr/share/terminfo/h/hpterm-color2
 -rw-r--r-- root/root    usr/share/terminfo/h/hterm
 -rw-r--r-- root/root    usr/share/terminfo/h/hterm-256color
--rw-r--r-- root/root    usr/share/terminfo/h/htx11 -> usr/share/terminfo/z/ztx11
+-rw-r--r-- root/root    usr/share/terminfo/h/htx11
 -rw-r--r-- root/root    usr/share/terminfo/h/hurd
 -rw-r--r-- root/root    usr/share/terminfo/h/hz1000
 -rw-r--r-- root/root    usr/share/terminfo/h/hz1420
@@ -2171,28 +2171,28 @@ drwxr-xr-x root/root    usr/share/terminfo/h/
 drwxr-xr-x root/root    usr/share/terminfo/i/
 -rw-r--r-- root/root    usr/share/terminfo/i/i100 -> usr/share/terminfo/g/gt100a
 -rw-r--r-- root/root    usr/share/terminfo/i/i3101 -> usr/share/terminfo/i/ibm3101
--rw-r--r-- root/root    usr/share/terminfo/i/i3164
+-rw-r--r-- root/root    usr/share/terminfo/i/i3164 -> usr/share/terminfo/i/ibm3164
 -rw-r--r-- root/root    usr/share/terminfo/i/i400
--rw-r--r-- root/root    usr/share/terminfo/i/iTerm.app
--rw-r--r-- root/root    usr/share/terminfo/i/iTerm2.app -> usr/share/terminfo/i/iterm2
+-rw-r--r-- root/root    usr/share/terminfo/i/iTerm.app -> usr/share/terminfo/i/iterm
+-rw-r--r-- root/root    usr/share/terminfo/i/iTerm2.app
 -rw-r--r-- root/root    usr/share/terminfo/i/ibcs2
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm+16color
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm+color
--rw-r--r-- root/root    usr/share/terminfo/i/ibm-apl
+-rw-r--r-- root/root    usr/share/terminfo/i/ibm-apl -> usr/share/terminfo/a/apl
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm-pc -> usr/share/terminfo/5/5051
--rw-r--r-- root/root    usr/share/terminfo/i/ibm-system1 -> usr/share/terminfo/s/system1
+-rw-r--r-- root/root    usr/share/terminfo/i/ibm-system1
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm3101
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm3151
--rw-r--r-- root/root    usr/share/terminfo/i/ibm3161 -> usr/share/terminfo/w/wyse60-316X
+-rw-r--r-- root/root    usr/share/terminfo/i/ibm3161 -> usr/share/terminfo/i/ibm3163
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm3161-C
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm3162
--rw-r--r-- root/root    usr/share/terminfo/i/ibm3163 -> usr/share/terminfo/w/wyse60-316X
--rw-r--r-- root/root    usr/share/terminfo/i/ibm3164 -> usr/share/terminfo/i/i3164
+-rw-r--r-- root/root    usr/share/terminfo/i/ibm3163
+-rw-r--r-- root/root    usr/share/terminfo/i/ibm3164
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm327x
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm5051 -> usr/share/terminfo/5/5051
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm5081 -> usr/share/terminfo/h/hft
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm5081-c
--rw-r--r-- root/root    usr/share/terminfo/i/ibm5151 -> usr/share/terminfo/w/wyse60-AT
+-rw-r--r-- root/root    usr/share/terminfo/i/ibm5151
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm5154
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm5154-c -> usr/share/terminfo/i/ibmega-c
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm6153
@@ -2201,15 +2201,15 @@ drwxr-xr-x root/root    usr/share/terminfo/i/
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm6154
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm6154-c -> usr/share/terminfo/i/ibmapa8c-c
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm6155
--rw-r--r-- root/root    usr/share/terminfo/i/ibm8503 -> usr/share/terminfo/i/ibm8507
--rw-r--r-- root/root    usr/share/terminfo/i/ibm8507
+-rw-r--r-- root/root    usr/share/terminfo/i/ibm8503 -> usr/share/terminfo/i/ibm8604
+-rw-r--r-- root/root    usr/share/terminfo/i/ibm8507 -> usr/share/terminfo/i/ibm8604
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm8512
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm8513 -> usr/share/terminfo/i/ibm8512
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm8514
 -rw-r--r-- root/root    usr/share/terminfo/i/ibm8514-c
--rw-r--r-- root/root    usr/share/terminfo/i/ibm8604 -> usr/share/terminfo/i/ibm8507
+-rw-r--r-- root/root    usr/share/terminfo/i/ibm8604
 -rw-r--r-- root/root    usr/share/terminfo/i/ibmaed
--rw-r--r-- root/root    usr/share/terminfo/i/ibmapa16 -> usr/share/terminfo/r/rtpc
+-rw-r--r-- root/root    usr/share/terminfo/i/ibmapa16
 -rw-r--r-- root/root    usr/share/terminfo/i/ibmapa8
 -rw-r--r-- root/root    usr/share/terminfo/i/ibmapa8c -> usr/share/terminfo/i/ibmapa8
 -rw-r--r-- root/root    usr/share/terminfo/i/ibmapa8c-c
@@ -2217,14 +2217,14 @@ drwxr-xr-x root/root    usr/share/terminfo/i/
 -rw-r--r-- root/root    usr/share/terminfo/i/ibmega-c
 -rw-r--r-- root/root    usr/share/terminfo/i/ibmmono
 -rw-r--r-- root/root    usr/share/terminfo/i/ibmmpel-c -> usr/share/terminfo/i/ibm5081-c
--rw-r--r-- root/root    usr/share/terminfo/i/ibmpc -> usr/share/terminfo/w/wyse60-PC
+-rw-r--r-- root/root    usr/share/terminfo/i/ibmpc
 -rw-r--r-- root/root    usr/share/terminfo/i/ibmpc3 -> usr/share/terminfo/p/pc3-bold
--rw-r--r-- root/root    usr/share/terminfo/i/ibmpc3r -> usr/share/terminfo/c/cons25r
--rw-r--r-- root/root    usr/share/terminfo/i/ibmpc3r-mono -> usr/share/terminfo/c/cons25-koi8r-m
--rw-r--r-- root/root    usr/share/terminfo/i/ibmpcx -> usr/share/terminfo/x/xenix
+-rw-r--r-- root/root    usr/share/terminfo/i/ibmpc3r -> usr/share/terminfo/p/pc3r
+-rw-r--r-- root/root    usr/share/terminfo/i/ibmpc3r-mono -> usr/share/terminfo/p/pc3r-m
+-rw-r--r-- root/root    usr/share/terminfo/i/ibmpcx -> usr/share/terminfo/i/ibmx
 -rw-r--r-- root/root    usr/share/terminfo/i/ibmvga
 -rw-r--r-- root/root    usr/share/terminfo/i/ibmvga-c
--rw-r--r-- root/root    usr/share/terminfo/i/ibmx -> usr/share/terminfo/x/xenix
+-rw-r--r-- root/root    usr/share/terminfo/i/ibmx
 -rw-r--r-- root/root    usr/share/terminfo/i/icl6402 -> usr/share/terminfo/k/kds6402
 -rw-r--r-- root/root    usr/share/terminfo/i/icl6404 -> usr/share/terminfo/k/kds6402
 -rw-r--r-- root/root    usr/share/terminfo/i/icl6404-w -> usr/share/terminfo/k/kds7372-w
@@ -2237,23 +2237,23 @@ drwxr-xr-x root/root    usr/share/terminfo/i/
 -rw-r--r-- root/root    usr/share/terminfo/i/infoton2
 -rw-r--r-- root/root    usr/share/terminfo/i/interix
 -rw-r--r-- root/root    usr/share/terminfo/i/interix-nti
--rw-r--r-- root/root    usr/share/terminfo/i/intertec -> usr/share/terminfo/i/intertube
--rw-r--r-- root/root    usr/share/terminfo/i/intertube
+-rw-r--r-- root/root    usr/share/terminfo/i/intertec
+-rw-r--r-- root/root    usr/share/terminfo/i/intertube -> usr/share/terminfo/i/intertec
 -rw-r--r-- root/root    usr/share/terminfo/i/intertube2
 -rw-r--r-- root/root    usr/share/terminfo/i/intext
--rw-r--r-- root/root    usr/share/terminfo/i/intext2 -> usr/share/terminfo/i/intextii
--rw-r--r-- root/root    usr/share/terminfo/i/intextii
--rw-r--r-- root/root    usr/share/terminfo/i/ips -> usr/share/terminfo/c/citoh-prop
--rw-r--r-- root/root    usr/share/terminfo/i/ipsi -> usr/share/terminfo/d/diablo450
--rw-r--r-- root/root    usr/share/terminfo/i/iq120 -> usr/share/terminfo/s/soroc
--rw-r--r-- root/root    usr/share/terminfo/i/iq140 -> usr/share/terminfo/s/soroc140
+-rw-r--r-- root/root    usr/share/terminfo/i/intext2
+-rw-r--r-- root/root    usr/share/terminfo/i/intextii -> usr/share/terminfo/i/intext2
+-rw-r--r-- root/root    usr/share/terminfo/i/ips
+-rw-r--r-- root/root    usr/share/terminfo/i/ipsi -> usr/share/terminfo/d/diablo1720
+-rw-r--r-- root/root    usr/share/terminfo/i/iq120
+-rw-r--r-- root/root    usr/share/terminfo/i/iq140
 -rw-r--r-- root/root    usr/share/terminfo/i/iris-ansi -> usr/share/terminfo/i/iris-ansi-net
 -rw-r--r-- root/root    usr/share/terminfo/i/iris-ansi-ap
 -rw-r--r-- root/root    usr/share/terminfo/i/iris-ansi-net
--rw-r--r-- root/root    usr/share/terminfo/i/iris-color -> usr/share/terminfo/x/xwsh
--rw-r--r-- root/root    usr/share/terminfo/i/iris40 -> usr/share/terminfo/w/wsiris
--rw-r--r-- root/root    usr/share/terminfo/i/iterm -> usr/share/terminfo/i/iTerm.app
--rw-r--r-- root/root    usr/share/terminfo/i/iterm2
+-rw-r--r-- root/root    usr/share/terminfo/i/iris-color
+-rw-r--r-- root/root    usr/share/terminfo/i/iris40
+-rw-r--r-- root/root    usr/share/terminfo/i/iterm
+-rw-r--r-- root/root    usr/share/terminfo/i/iterm2 -> usr/share/terminfo/i/iTerm2.app
 -rw-r--r-- root/root    usr/share/terminfo/i/iterm2-direct
 drwxr-xr-x root/root    usr/share/terminfo/j/
 -rw-r--r-- root/root    usr/share/terminfo/j/jaixterm
@@ -2261,9 +2261,9 @@ drwxr-xr-x root/root    usr/share/terminfo/j/
 -rw-r--r-- root/root    usr/share/terminfo/j/jerq -> usr/share/terminfo/b/blit
 -rw-r--r-- root/root    usr/share/terminfo/j/jfbterm
 drwxr-xr-x root/root    usr/share/terminfo/k/
--rw-r--r-- root/root    usr/share/terminfo/k/k45
--rw-r--r-- root/root    usr/share/terminfo/k/kaypro -> usr/share/terminfo/k/kaypro2
--rw-r--r-- root/root    usr/share/terminfo/k/kaypro2
+-rw-r--r-- root/root    usr/share/terminfo/k/k45 -> usr/share/terminfo/h/hp2621k45
+-rw-r--r-- root/root    usr/share/terminfo/k/kaypro
+-rw-r--r-- root/root    usr/share/terminfo/k/kaypro2 -> usr/share/terminfo/k/kaypro
 -rw-r--r-- root/root    usr/share/terminfo/k/kds6402
 -rw-r--r-- root/root    usr/share/terminfo/k/kds7372 -> usr/share/terminfo/k/kds6402
 -rw-r--r-- root/root    usr/share/terminfo/k/kds7372-w
@@ -2334,10 +2334,10 @@ drwxr-xr-x root/root    usr/share/terminfo/l/
 -rw-r--r-- root/root    usr/share/terminfo/l/ln03
 -rw-r--r-- root/root    usr/share/terminfo/l/ln03-w
 -rw-r--r-- root/root    usr/share/terminfo/l/lpr -> usr/share/terminfo/p/printer
--rw-r--r-- root/root    usr/share/terminfo/l/luna
--rw-r--r-- root/root    usr/share/terminfo/l/luna68k -> usr/share/terminfo/l/luna
+-rw-r--r-- root/root    usr/share/terminfo/l/luna -> usr/share/terminfo/l/luna68k
+-rw-r--r-- root/root    usr/share/terminfo/l/luna68k
 drwxr-xr-x root/root    usr/share/terminfo/m/
--rw-r--r-- root/root    usr/share/terminfo/m/m2-nam -> usr/share/terminfo/m/minitel-2
+-rw-r--r-- root/root    usr/share/terminfo/m/m2-nam -> usr/share/terminfo/m/minitel
 -rw-r--r-- root/root    usr/share/terminfo/m/mac -> usr/share/terminfo/m/macintosh
 -rw-r--r-- root/root    usr/share/terminfo/m/mac-w
 -rw-r--r-- root/root    usr/share/terminfo/m/mach
@@ -2359,28 +2359,28 @@ drwxr-xr-x root/root    usr/share/terminfo/m/
 -rw-r--r-- root/root    usr/share/terminfo/m/mgr-sun
 -rw-r--r-- root/root    usr/share/terminfo/m/mgt
 -rw-r--r-- root/root    usr/share/terminfo/m/mgterm
--rw-r--r-- root/root    usr/share/terminfo/m/microb -> usr/share/terminfo/m/microbee
--rw-r--r-- root/root    usr/share/terminfo/m/microbee
--rw-r--r-- root/root    usr/share/terminfo/m/microterm
--rw-r--r-- root/root    usr/share/terminfo/m/microterm5
--rw-r--r-- root/root    usr/share/terminfo/m/mime -> usr/share/terminfo/m/mime1
--rw-r--r-- root/root    usr/share/terminfo/m/mime-3ax
+-rw-r--r-- root/root    usr/share/terminfo/m/microb
+-rw-r--r-- root/root    usr/share/terminfo/m/microbee -> usr/share/terminfo/m/microb
+-rw-r--r-- root/root    usr/share/terminfo/m/microterm -> usr/share/terminfo/a/act4
+-rw-r--r-- root/root    usr/share/terminfo/m/microterm5 -> usr/share/terminfo/a/act5
+-rw-r--r-- root/root    usr/share/terminfo/m/mime -> usr/share/terminfo/m/mimeii
+-rw-r--r-- root/root    usr/share/terminfo/m/mime-3ax -> usr/share/terminfo/m/mime3ax
 -rw-r--r-- root/root    usr/share/terminfo/m/mime-fb
 -rw-r--r-- root/root    usr/share/terminfo/m/mime-hb
--rw-r--r-- root/root    usr/share/terminfo/m/mime1
--rw-r--r-- root/root    usr/share/terminfo/m/mime2 -> usr/share/terminfo/m/mime1
--rw-r--r-- root/root    usr/share/terminfo/m/mime2a -> usr/share/terminfo/m/mime2a-v
+-rw-r--r-- root/root    usr/share/terminfo/m/mime1 -> usr/share/terminfo/m/mimeii
+-rw-r--r-- root/root    usr/share/terminfo/m/mime2 -> usr/share/terminfo/m/mimeii
+-rw-r--r-- root/root    usr/share/terminfo/m/mime2a
 -rw-r--r-- root/root    usr/share/terminfo/m/mime2a-s
--rw-r--r-- root/root    usr/share/terminfo/m/mime2a-v
+-rw-r--r-- root/root    usr/share/terminfo/m/mime2a-v -> usr/share/terminfo/m/mime2a
 -rw-r--r-- root/root    usr/share/terminfo/m/mime314
--rw-r--r-- root/root    usr/share/terminfo/m/mime340
+-rw-r--r-- root/root    usr/share/terminfo/m/mime340 -> usr/share/terminfo/m/mm340
 -rw-r--r-- root/root    usr/share/terminfo/m/mime3a
--rw-r--r-- root/root    usr/share/terminfo/m/mime3ax -> usr/share/terminfo/m/mime-3ax
--rw-r--r-- root/root    usr/share/terminfo/m/mimei -> usr/share/terminfo/m/mime1
--rw-r--r-- root/root    usr/share/terminfo/m/mimeii -> usr/share/terminfo/m/mime1
--rw-r--r-- root/root    usr/share/terminfo/m/minitel -> usr/share/terminfo/m/minitel-2
--rw-r--r-- root/root    usr/share/terminfo/m/minitel-2
--rw-r--r-- root/root    usr/share/terminfo/m/minitel-2-nam -> usr/share/terminfo/m/minitel-2
+-rw-r--r-- root/root    usr/share/terminfo/m/mime3ax
+-rw-r--r-- root/root    usr/share/terminfo/m/mimei -> usr/share/terminfo/m/mimeii
+-rw-r--r-- root/root    usr/share/terminfo/m/mimeii
+-rw-r--r-- root/root    usr/share/terminfo/m/minitel
+-rw-r--r-- root/root    usr/share/terminfo/m/minitel-2 -> usr/share/terminfo/m/minitel
+-rw-r--r-- root/root    usr/share/terminfo/m/minitel-2-nam -> usr/share/terminfo/m/minitel
 -rw-r--r-- root/root    usr/share/terminfo/m/minitel1
 -rw-r--r-- root/root    usr/share/terminfo/m/minitel1-nb
 -rw-r--r-- root/root    usr/share/terminfo/m/minitel12-80
@@ -2389,10 +2389,10 @@ drwxr-xr-x root/root    usr/share/terminfo/m/
 -rw-r--r-- root/root    usr/share/terminfo/m/minitel1b-nb
 -rw-r--r-- root/root    usr/share/terminfo/m/minitel2-80
 -rw-r--r-- root/root    usr/share/terminfo/m/minix
--rw-r--r-- root/root    usr/share/terminfo/m/minix-1.5
+-rw-r--r-- root/root    usr/share/terminfo/m/minix-1.5 -> usr/share/terminfo/m/minix-old
 -rw-r--r-- root/root    usr/share/terminfo/m/minix-1.7
 -rw-r--r-- root/root    usr/share/terminfo/m/minix-3.0
--rw-r--r-- root/root    usr/share/terminfo/m/minix-old -> usr/share/terminfo/m/minix-1.5
+-rw-r--r-- root/root    usr/share/terminfo/m/minix-old
 -rw-r--r-- root/root    usr/share/terminfo/m/minix-old-am
 -rw-r--r-- root/root    usr/share/terminfo/m/mintty
 -rw-r--r-- root/root    usr/share/terminfo/m/mintty+common
@@ -2404,12 +2404,12 @@ drwxr-xr-x root/root    usr/share/terminfo/m/
 -rw-r--r-- root/root    usr/share/terminfo/m/mlterm2
 -rw-r--r-- root/root    usr/share/terminfo/m/mlterm3
 -rw-r--r-- root/root    usr/share/terminfo/m/mm314 -> usr/share/terminfo/m/mime314
--rw-r--r-- root/root    usr/share/terminfo/m/mm340 -> usr/share/terminfo/m/mime340
--rw-r--r-- root/root    usr/share/terminfo/m/mod
+-rw-r--r-- root/root    usr/share/terminfo/m/mm340
+-rw-r--r-- root/root    usr/share/terminfo/m/mod -> usr/share/terminfo/m/modgraph48
 -rw-r--r-- root/root    usr/share/terminfo/m/mod24
 -rw-r--r-- root/root    usr/share/terminfo/m/modgraph -> usr/share/terminfo/m/mod24
 -rw-r--r-- root/root    usr/share/terminfo/m/modgraph2
--rw-r--r-- root/root    usr/share/terminfo/m/modgraph48 -> usr/share/terminfo/m/mod
+-rw-r--r-- root/root    usr/share/terminfo/m/modgraph48
 -rw-r--r-- root/root    usr/share/terminfo/m/mono-emx
 -rw-r--r-- root/root    usr/share/terminfo/m/morphos
 -rw-r--r-- root/root    usr/share/terminfo/m/mosh
@@ -2419,23 +2419,23 @@ drwxr-xr-x root/root    usr/share/terminfo/m/
 -rw-r--r-- root/root    usr/share/terminfo/m/mrxvt
 -rw-r--r-- root/root    usr/share/terminfo/m/mrxvt-256color
 -rw-r--r-- root/root    usr/share/terminfo/m/ms-terminal
--rw-r--r-- root/root    usr/share/terminfo/m/ms-vt-utf8 -> usr/share/terminfo/v/vt-utf8
+-rw-r--r-- root/root    usr/share/terminfo/m/ms-vt-utf8
 -rw-r--r-- root/root    usr/share/terminfo/m/ms-vt100
--rw-r--r-- root/root    usr/share/terminfo/m/ms-vt100+ -> usr/share/terminfo/v/vt100+
+-rw-r--r-- root/root    usr/share/terminfo/m/ms-vt100+
 -rw-r--r-- root/root    usr/share/terminfo/m/ms-vt100-16color
--rw-r--r-- root/root    usr/share/terminfo/m/ms-vt100-color -> usr/share/terminfo/v/vtnt
--rw-r--r-- root/root    usr/share/terminfo/m/msk227
--rw-r--r-- root/root    usr/share/terminfo/m/msk22714
+-rw-r--r-- root/root    usr/share/terminfo/m/ms-vt100-color
+-rw-r--r-- root/root    usr/share/terminfo/m/msk227 -> usr/share/terminfo/m/mskermit227
+-rw-r--r-- root/root    usr/share/terminfo/m/msk22714 -> usr/share/terminfo/m/mskermit22714
 -rw-r--r-- root/root    usr/share/terminfo/m/msk227am -> usr/share/terminfo/m/mskermit227am
--rw-r--r-- root/root    usr/share/terminfo/m/mskermit227 -> usr/share/terminfo/m/msk227
--rw-r--r-- root/root    usr/share/terminfo/m/mskermit22714 -> usr/share/terminfo/m/msk22714
+-rw-r--r-- root/root    usr/share/terminfo/m/mskermit227
+-rw-r--r-- root/root    usr/share/terminfo/m/mskermit22714
 -rw-r--r-- root/root    usr/share/terminfo/m/mskermit227am
--rw-r--r-- root/root    usr/share/terminfo/m/mt-70 -> usr/share/terminfo/m/mt70
+-rw-r--r-- root/root    usr/share/terminfo/m/mt-70
 -rw-r--r-- root/root    usr/share/terminfo/m/mt4520-rv
--rw-r--r-- root/root    usr/share/terminfo/m/mt70
+-rw-r--r-- root/root    usr/share/terminfo/m/mt70 -> usr/share/terminfo/m/mt-70
 -rw-r--r-- root/root    usr/share/terminfo/m/mterm -> usr/share/terminfo/m/mouse-sun
 -rw-r--r-- root/root    usr/share/terminfo/m/mterm-ansi
--rw-r--r-- root/root    usr/share/terminfo/m/mvterm -> usr/share/terminfo/v/vv100
+-rw-r--r-- root/root    usr/share/terminfo/m/mvterm
 drwxr-xr-x root/root    usr/share/terminfo/n/
 -rw-r--r-- root/root    usr/share/terminfo/n/n7900
 -rw-r--r-- root/root    usr/share/terminfo/n/nansi.sys
@@ -2502,8 +2502,8 @@ drwxr-xr-x root/root    usr/share/terminfo/n/
 -rw-r--r-- root/root    usr/share/terminfo/n/ncsa-ns
 -rw-r--r-- root/root    usr/share/terminfo/n/ncsa-vt220
 -rw-r--r-- root/root    usr/share/terminfo/n/ncsa-vt220-8 -> usr/share/terminfo/n/ncsa-m
--rw-r--r-- root/root    usr/share/terminfo/n/nd9500
--rw-r--r-- root/root    usr/share/terminfo/n/ndr9500 -> usr/share/terminfo/n/nd9500
+-rw-r--r-- root/root    usr/share/terminfo/n/nd9500 -> usr/share/terminfo/n/ndr9500
+-rw-r--r-- root/root    usr/share/terminfo/n/ndr9500
 -rw-r--r-- root/root    usr/share/terminfo/n/ndr9500-25
 -rw-r--r-- root/root    usr/share/terminfo/n/ndr9500-25-mc
 -rw-r--r-- root/root    usr/share/terminfo/n/ndr9500-25-mc-nl
@@ -2526,25 +2526,25 @@ drwxr-xr-x root/root    usr/share/terminfo/n/
 -rw-r--r-- root/root    usr/share/terminfo/n/news-42
 -rw-r--r-- root/root    usr/share/terminfo/n/news-42-euc
 -rw-r--r-- root/root    usr/share/terminfo/n/news-42-sjis
--rw-r--r-- root/root    usr/share/terminfo/n/news-a -> usr/share/terminfo/n/news42
+-rw-r--r-- root/root    usr/share/terminfo/n/news-a -> usr/share/terminfo/n/news40-a
 -rw-r--r-- root/root    usr/share/terminfo/n/news-o -> usr/share/terminfo/v/vt100-bm
 -rw-r--r-- root/root    usr/share/terminfo/n/news-old-unk
 -rw-r--r-- root/root    usr/share/terminfo/n/news-unk
 -rw-r--r-- root/root    usr/share/terminfo/n/news28
 -rw-r--r-- root/root    usr/share/terminfo/n/news28-a -> usr/share/terminfo/n/news29
 -rw-r--r-- root/root    usr/share/terminfo/n/news29
--rw-r--r-- root/root    usr/share/terminfo/n/news31 -> usr/share/terminfo/n/newscbm
--rw-r--r-- root/root    usr/share/terminfo/n/news31-a -> usr/share/terminfo/n/nwp518-a
--rw-r--r-- root/root    usr/share/terminfo/n/news31-o -> usr/share/terminfo/n/newscbm
--rw-r--r-- root/root    usr/share/terminfo/n/news33 -> usr/share/terminfo/n/nwp518-a
+-rw-r--r-- root/root    usr/share/terminfo/n/news31 -> usr/share/terminfo/n/nwe501-o
+-rw-r--r-- root/root    usr/share/terminfo/n/news31-a -> usr/share/terminfo/n/newscbm-a
+-rw-r--r-- root/root    usr/share/terminfo/n/news31-o -> usr/share/terminfo/n/nwe501-o
+-rw-r--r-- root/root    usr/share/terminfo/n/news33 -> usr/share/terminfo/n/newscbm-a
 -rw-r--r-- root/root    usr/share/terminfo/n/news40 -> usr/share/terminfo/v/vt100-bm
--rw-r--r-- root/root    usr/share/terminfo/n/news40-a -> usr/share/terminfo/n/news42
+-rw-r--r-- root/root    usr/share/terminfo/n/news40-a
 -rw-r--r-- root/root    usr/share/terminfo/n/news40-o -> usr/share/terminfo/v/vt100-bm
--rw-r--r-- root/root    usr/share/terminfo/n/news42
--rw-r--r-- root/root    usr/share/terminfo/n/newscbm
--rw-r--r-- root/root    usr/share/terminfo/n/newscbm-a -> usr/share/terminfo/n/nwp518-a
--rw-r--r-- root/root    usr/share/terminfo/n/newscbm-o -> usr/share/terminfo/n/newscbm
--rw-r--r-- root/root    usr/share/terminfo/n/newscbm33 -> usr/share/terminfo/n/nwp518-a
+-rw-r--r-- root/root    usr/share/terminfo/n/news42 -> usr/share/terminfo/n/news40-a
+-rw-r--r-- root/root    usr/share/terminfo/n/newscbm -> usr/share/terminfo/n/nwe501-o
+-rw-r--r-- root/root    usr/share/terminfo/n/newscbm-a
+-rw-r--r-- root/root    usr/share/terminfo/n/newscbm-o -> usr/share/terminfo/n/nwe501-o
+-rw-r--r-- root/root    usr/share/terminfo/n/newscbm33 -> usr/share/terminfo/n/newscbm-a
 -rw-r--r-- root/root    usr/share/terminfo/n/next
 -rw-r--r-- root/root    usr/share/terminfo/n/nextshell
 -rw-r--r-- root/root    usr/share/terminfo/n/no+brackets
@@ -2560,7 +2560,7 @@ drwxr-xr-x root/root    usr/share/terminfo/n/
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-256color -> usr/share/terminfo/A/Apple_Terminal
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-7
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-7-c
--rw-r--r-- root/root    usr/share/terminfo/n/nsterm-7-c-s
+-rw-r--r-- root/root    usr/share/terminfo/n/nsterm-7-c-s -> usr/share/terminfo/n/nsterm-c-s-7
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-7-m
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-7-m-s -> usr/share/terminfo/n/nsterm-m-s-7
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-7-s
@@ -2568,8 +2568,8 @@ drwxr-xr-x root/root    usr/share/terminfo/n/
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-acs-c -> usr/share/terminfo/n/nsterm-c-acs
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-acs-c-s -> usr/share/terminfo/n/nsterm-c-s-acs
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-acs-m
--rw-r--r-- root/root    usr/share/terminfo/n/nsterm-acs-m-s -> usr/share/terminfo/n/nsterm-m-s-acs
--rw-r--r-- root/root    usr/share/terminfo/n/nsterm-acs-s
+-rw-r--r-- root/root    usr/share/terminfo/n/nsterm-acs-m-s
+-rw-r--r-- root/root    usr/share/terminfo/n/nsterm-acs-s -> usr/share/terminfo/n/nsterm-s-acs
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-bce
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-build309
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-build326
@@ -2581,7 +2581,7 @@ drwxr-xr-x root/root    usr/share/terminfo/n/
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-c-7 -> usr/share/terminfo/n/nsterm-7-c
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-c-acs
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-c-s
--rw-r--r-- root/root    usr/share/terminfo/n/nsterm-c-s-7 -> usr/share/terminfo/n/nsterm-7-c-s
+-rw-r--r-- root/root    usr/share/terminfo/n/nsterm-c-s-7
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-c-s-acs
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-direct
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-m
@@ -2589,17 +2589,17 @@ drwxr-xr-x root/root    usr/share/terminfo/n/
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-m-acs -> usr/share/terminfo/n/nsterm-acs-m
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-m-s
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-m-s-7
--rw-r--r-- root/root    usr/share/terminfo/n/nsterm-m-s-acs
+-rw-r--r-- root/root    usr/share/terminfo/n/nsterm-m-s-acs -> usr/share/terminfo/n/nsterm-acs-m-s
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-old
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-s
 -rw-r--r-- root/root    usr/share/terminfo/n/nsterm-s-7 -> usr/share/terminfo/n/nsterm-7-s
--rw-r--r-- root/root    usr/share/terminfo/n/nsterm-s-acs -> usr/share/terminfo/n/nsterm-acs-s
+-rw-r--r-- root/root    usr/share/terminfo/n/nsterm-s-acs
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole -> usr/share/terminfo/i/interix
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-100 -> usr/share/terminfo/o/opennt-100
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-100-nti -> usr/share/terminfo/o/opennt-100-nti
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-25 -> usr/share/terminfo/i/interix
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-25-nti -> usr/share/terminfo/i/interix-nti
--rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-25-w -> usr/share/terminfo/o/opennt-25-w
+-rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-25-w -> usr/share/terminfo/o/opennt-w
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-25-w-vt -> usr/share/terminfo/o/opennt-w-vt
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-35 -> usr/share/terminfo/o/opennt-35
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-35-nti -> usr/share/terminfo/o/opennt-35-nti
@@ -2610,37 +2610,37 @@ drwxr-xr-x root/root    usr/share/terminfo/n/
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-60 -> usr/share/terminfo/o/opennt-60
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-60-nti -> usr/share/terminfo/o/opennt-60-nti
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-60-w -> usr/share/terminfo/o/opennt-60-w
--rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-w -> usr/share/terminfo/o/opennt-25-w
+-rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-w -> usr/share/terminfo/o/opennt-w
 -rw-r--r-- root/root    usr/share/terminfo/n/ntconsole-w-vt -> usr/share/terminfo/o/opennt-w-vt
--rw-r--r-- root/root    usr/share/terminfo/n/nwe501 -> usr/share/terminfo/n/newscbm
--rw-r--r-- root/root    usr/share/terminfo/n/nwe501-a -> usr/share/terminfo/n/nwp518-a
--rw-r--r-- root/root    usr/share/terminfo/n/nwe501-o -> usr/share/terminfo/n/newscbm
--rw-r--r-- root/root    usr/share/terminfo/n/nwp-511 -> usr/share/terminfo/n/nwp511
+-rw-r--r-- root/root    usr/share/terminfo/n/nwe501 -> usr/share/terminfo/n/nwe501-o
+-rw-r--r-- root/root    usr/share/terminfo/n/nwe501-a -> usr/share/terminfo/n/newscbm-a
+-rw-r--r-- root/root    usr/share/terminfo/n/nwe501-o
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp-511
 -rw-r--r-- root/root    usr/share/terminfo/n/nwp-517
 -rw-r--r-- root/root    usr/share/terminfo/n/nwp-517-w
--rw-r--r-- root/root    usr/share/terminfo/n/nwp251-a -> usr/share/terminfo/n/nwp518-a
--rw-r--r-- root/root    usr/share/terminfo/n/nwp251-o -> usr/share/terminfo/n/newscbm
--rw-r--r-- root/root    usr/share/terminfo/n/nwp511
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp251-a -> usr/share/terminfo/n/newscbm-a
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp251-o -> usr/share/terminfo/n/nwe501-o
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp511 -> usr/share/terminfo/n/nwp-511
 -rw-r--r-- root/root    usr/share/terminfo/n/nwp512 -> usr/share/terminfo/v/vt100-bm
--rw-r--r-- root/root    usr/share/terminfo/n/nwp512-a -> usr/share/terminfo/n/news42
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp512-a -> usr/share/terminfo/n/news40-a
 -rw-r--r-- root/root    usr/share/terminfo/n/nwp512-o -> usr/share/terminfo/v/vt100-bm
--rw-r--r-- root/root    usr/share/terminfo/n/nwp513 -> usr/share/terminfo/n/newscbm
--rw-r--r-- root/root    usr/share/terminfo/n/nwp513-a -> usr/share/terminfo/n/nwp518-a
--rw-r--r-- root/root    usr/share/terminfo/n/nwp513-o -> usr/share/terminfo/n/newscbm
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp513 -> usr/share/terminfo/n/nwe501-o
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp513-a -> usr/share/terminfo/n/newscbm-a
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp513-o -> usr/share/terminfo/n/nwe501-o
 -rw-r--r-- root/root    usr/share/terminfo/n/nwp514 -> usr/share/terminfo/v/vt100-bm
--rw-r--r-- root/root    usr/share/terminfo/n/nwp514-a -> usr/share/terminfo/n/news42
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp514-a -> usr/share/terminfo/n/news40-a
 -rw-r--r-- root/root    usr/share/terminfo/n/nwp514-o -> usr/share/terminfo/v/vt100-bm
 -rw-r--r-- root/root    usr/share/terminfo/n/nwp517 -> usr/share/terminfo/n/nwp-517
 -rw-r--r-- root/root    usr/share/terminfo/n/nwp517-w -> usr/share/terminfo/n/nwp-517-w
--rw-r--r-- root/root    usr/share/terminfo/n/nwp518 -> usr/share/terminfo/n/newscbm
--rw-r--r-- root/root    usr/share/terminfo/n/nwp518-a
--rw-r--r-- root/root    usr/share/terminfo/n/nwp518-o -> usr/share/terminfo/n/newscbm
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp518 -> usr/share/terminfo/n/nwe501-o
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp518-a -> usr/share/terminfo/n/newscbm-a
+-rw-r--r-- root/root    usr/share/terminfo/n/nwp518-o -> usr/share/terminfo/n/nwe501-o
 -rw-r--r-- root/root    usr/share/terminfo/n/nxterm -> usr/share/terminfo/x/xterm-color
 drwxr-xr-x root/root    usr/share/terminfo/o/
--rw-r--r-- root/root    usr/share/terminfo/o/o31
--rw-r--r-- root/root    usr/share/terminfo/o/o4112-nd -> usr/share/terminfo/o/otek4114
--rw-r--r-- root/root    usr/share/terminfo/o/o85h -> usr/share/terminfo/o/oabm85h
--rw-r--r-- root/root    usr/share/terminfo/o/oabm85h
+-rw-r--r-- root/root    usr/share/terminfo/o/o31 -> usr/share/terminfo/a/adm31-old
+-rw-r--r-- root/root    usr/share/terminfo/o/o4112-nd
+-rw-r--r-- root/root    usr/share/terminfo/o/o85h -> usr/share/terminfo/a/abm85h-old
+-rw-r--r-- root/root    usr/share/terminfo/o/oabm85h -> usr/share/terminfo/a/abm85h-old
 -rw-r--r-- root/root    usr/share/terminfo/o/oblit -> usr/share/terminfo/o/ojerq
 -rw-r--r-- root/root    usr/share/terminfo/o/oc100 -> usr/share/terminfo/c/c100-1p
 -rw-r--r-- root/root    usr/share/terminfo/o/oconcept -> usr/share/terminfo/c/c100-1p
@@ -2657,7 +2657,7 @@ drwxr-xr-x root/root    usr/share/terminfo/o/
 -rw-r--r-- root/root    usr/share/terminfo/o/opennt-100-nti
 -rw-r--r-- root/root    usr/share/terminfo/o/opennt-25 -> usr/share/terminfo/i/interix
 -rw-r--r-- root/root    usr/share/terminfo/o/opennt-25-nti -> usr/share/terminfo/i/interix-nti
--rw-r--r-- root/root    usr/share/terminfo/o/opennt-25-w
+-rw-r--r-- root/root    usr/share/terminfo/o/opennt-25-w -> usr/share/terminfo/o/opennt-w
 -rw-r--r-- root/root    usr/share/terminfo/o/opennt-25-w-vt -> usr/share/terminfo/o/opennt-w-vt
 -rw-r--r-- root/root    usr/share/terminfo/o/opennt-35
 -rw-r--r-- root/root    usr/share/terminfo/o/opennt-35-nti
@@ -2669,51 +2669,51 @@ drwxr-xr-x root/root    usr/share/terminfo/o/
 -rw-r--r-- root/root    usr/share/terminfo/o/opennt-60-nti
 -rw-r--r-- root/root    usr/share/terminfo/o/opennt-60-w
 -rw-r--r-- root/root    usr/share/terminfo/o/opennt-nti -> usr/share/terminfo/i/interix-nti
--rw-r--r-- root/root    usr/share/terminfo/o/opennt-w -> usr/share/terminfo/o/opennt-25-w
+-rw-r--r-- root/root    usr/share/terminfo/o/opennt-w
 -rw-r--r-- root/root    usr/share/terminfo/o/opennt-w-vt
 -rw-r--r-- root/root    usr/share/terminfo/o/opus3n1+
--rw-r--r-- root/root    usr/share/terminfo/o/origibmpc3
--rw-r--r-- root/root    usr/share/terminfo/o/origpc3 -> usr/share/terminfo/o/origibmpc3
+-rw-r--r-- root/root    usr/share/terminfo/o/origibmpc3 -> usr/share/terminfo/o/origpc3
+-rw-r--r-- root/root    usr/share/terminfo/o/origpc3
 -rw-r--r-- root/root    usr/share/terminfo/o/os9LII -> usr/share/terminfo/c/coco3
 -rw-r--r-- root/root    usr/share/terminfo/o/osborne -> usr/share/terminfo/o/osborne1
 -rw-r--r-- root/root    usr/share/terminfo/o/osborne-w -> usr/share/terminfo/o/osborne1-w
 -rw-r--r-- root/root    usr/share/terminfo/o/osborne1
 -rw-r--r-- root/root    usr/share/terminfo/o/osborne1-w
 -rw-r--r-- root/root    usr/share/terminfo/o/osexec
--rw-r--r-- root/root    usr/share/terminfo/o/otek4112 -> usr/share/terminfo/o/otek4114
--rw-r--r-- root/root    usr/share/terminfo/o/otek4113 -> usr/share/terminfo/o/otek4114
--rw-r--r-- root/root    usr/share/terminfo/o/otek4114
+-rw-r--r-- root/root    usr/share/terminfo/o/otek4112 -> usr/share/terminfo/o/o4112-nd
+-rw-r--r-- root/root    usr/share/terminfo/o/otek4113 -> usr/share/terminfo/o/o4112-nd
+-rw-r--r-- root/root    usr/share/terminfo/o/otek4114 -> usr/share/terminfo/o/o4112-nd
 -rw-r--r-- root/root    usr/share/terminfo/o/otek4115
 -rw-r--r-- root/root    usr/share/terminfo/o/owl -> usr/share/terminfo/p/pe1200
 drwxr-xr-x root/root    usr/share/terminfo/p/
 -rw-r--r-- root/root    usr/share/terminfo/p/p12 -> usr/share/terminfo/p/prism12
--rw-r--r-- root/root    usr/share/terminfo/p/p12-m -> usr/share/terminfo/p/prism12-m
+-rw-r--r-- root/root    usr/share/terminfo/p/p12-m
 -rw-r--r-- root/root    usr/share/terminfo/p/p12-m-w
 -rw-r--r-- root/root    usr/share/terminfo/p/p12-w -> usr/share/terminfo/p/prism12-w
 -rw-r--r-- root/root    usr/share/terminfo/p/p14 -> usr/share/terminfo/p/prism14
--rw-r--r-- root/root    usr/share/terminfo/p/p14-m
--rw-r--r-- root/root    usr/share/terminfo/p/p14-m-w -> usr/share/terminfo/p/prism14-m-w
+-rw-r--r-- root/root    usr/share/terminfo/p/p14-m -> usr/share/terminfo/p/prism14-m
+-rw-r--r-- root/root    usr/share/terminfo/p/p14-m-w
 -rw-r--r-- root/root    usr/share/terminfo/p/p14-w
 -rw-r--r-- root/root    usr/share/terminfo/p/p19
 -rw-r--r-- root/root    usr/share/terminfo/p/p4
--rw-r--r-- root/root    usr/share/terminfo/p/p5
--rw-r--r-- root/root    usr/share/terminfo/p/p7
--rw-r--r-- root/root    usr/share/terminfo/p/p8 -> usr/share/terminfo/p/prism8
+-rw-r--r-- root/root    usr/share/terminfo/p/p5 -> usr/share/terminfo/p/prism5
+-rw-r--r-- root/root    usr/share/terminfo/p/p7 -> usr/share/terminfo/p/prism7
+-rw-r--r-- root/root    usr/share/terminfo/p/p8
 -rw-r--r-- root/root    usr/share/terminfo/p/p8-w
--rw-r--r-- root/root    usr/share/terminfo/p/p8gl
+-rw-r--r-- root/root    usr/share/terminfo/p/p8gl -> usr/share/terminfo/p/prism8gl
 -rw-r--r-- root/root    usr/share/terminfo/p/p9
--rw-r--r-- root/root    usr/share/terminfo/p/p9-8
+-rw-r--r-- root/root    usr/share/terminfo/p/p9-8 -> usr/share/terminfo/p/prism9-8
 -rw-r--r-- root/root    usr/share/terminfo/p/p9-8-w
--rw-r--r-- root/root    usr/share/terminfo/p/p9-w
--rw-r--r-- root/root    usr/share/terminfo/p/pc-coherent -> usr/share/terminfo/c/coherent
+-rw-r--r-- root/root    usr/share/terminfo/p/p9-w -> usr/share/terminfo/p/prism9-w
+-rw-r--r-- root/root    usr/share/terminfo/p/pc-coherent -> usr/share/terminfo/p/pcz19
 -rw-r--r-- root/root    usr/share/terminfo/p/pc-minix
 -rw-r--r-- root/root    usr/share/terminfo/p/pc-venix
 -rw-r--r-- root/root    usr/share/terminfo/p/pc3
 -rw-r--r-- root/root    usr/share/terminfo/p/pc3-bold
--rw-r--r-- root/root    usr/share/terminfo/p/pc3r -> usr/share/terminfo/c/cons25r
--rw-r--r-- root/root    usr/share/terminfo/p/pc3r-m -> usr/share/terminfo/c/cons25-koi8r-m
+-rw-r--r-- root/root    usr/share/terminfo/p/pc3r
+-rw-r--r-- root/root    usr/share/terminfo/p/pc3r-m
 -rw-r--r-- root/root    usr/share/terminfo/p/pc6300plus
--rw-r--r-- root/root    usr/share/terminfo/p/pc7300 -> usr/share/terminfo/u/unixpc
+-rw-r--r-- root/root    usr/share/terminfo/p/pc7300
 -rw-r--r-- root/root    usr/share/terminfo/p/pcansi
 -rw-r--r-- root/root    usr/share/terminfo/p/pcansi-25 -> usr/share/terminfo/p/pcansi25
 -rw-r--r-- root/root    usr/share/terminfo/p/pcansi-25-m
@@ -2721,8 +2721,8 @@ drwxr-xr-x root/root    usr/share/terminfo/p/
 -rw-r--r-- root/root    usr/share/terminfo/p/pcansi-33-m
 -rw-r--r-- root/root    usr/share/terminfo/p/pcansi-43 -> usr/share/terminfo/p/pcansi43
 -rw-r--r-- root/root    usr/share/terminfo/p/pcansi-43-m
--rw-r--r-- root/root    usr/share/terminfo/p/pcansi-m
--rw-r--r-- root/root    usr/share/terminfo/p/pcansi-mono -> usr/share/terminfo/p/pcansi-m
+-rw-r--r-- root/root    usr/share/terminfo/p/pcansi-m -> usr/share/terminfo/p/pcansi-mono
+-rw-r--r-- root/root    usr/share/terminfo/p/pcansi-mono
 -rw-r--r-- root/root    usr/share/terminfo/p/pcansi25
 -rw-r--r-- root/root    usr/share/terminfo/p/pcansi25m -> usr/share/terminfo/p/pcansi-25-m
 -rw-r--r-- root/root    usr/share/terminfo/p/pcansi33 -> usr/share/terminfo/p/pcansi-33
@@ -2737,8 +2737,8 @@ drwxr-xr-x root/root    usr/share/terminfo/p/
 -rw-r--r-- root/root    usr/share/terminfo/p/pccon-m
 -rw-r--r-- root/root    usr/share/terminfo/p/pccon0
 -rw-r--r-- root/root    usr/share/terminfo/p/pccon0-m
--rw-r--r-- root/root    usr/share/terminfo/p/pccons
--rw-r--r-- root/root    usr/share/terminfo/p/pcconsole -> usr/share/terminfo/p/pccons
+-rw-r--r-- root/root    usr/share/terminfo/p/pccons -> usr/share/terminfo/p/pcconsole
+-rw-r--r-- root/root    usr/share/terminfo/p/pcconsole
 -rw-r--r-- root/root    usr/share/terminfo/p/pcix
 -rw-r--r-- root/root    usr/share/terminfo/p/pckermit
 -rw-r--r-- root/root    usr/share/terminfo/p/pckermit12 -> usr/share/terminfo/p/pckermit
@@ -2759,58 +2759,58 @@ drwxr-xr-x root/root    usr/share/terminfo/p/
 -rw-r--r-- root/root    usr/share/terminfo/p/pcvt50
 -rw-r--r-- root/root    usr/share/terminfo/p/pcvt50w
 -rw-r--r-- root/root    usr/share/terminfo/p/pcvtXX
--rw-r--r-- root/root    usr/share/terminfo/p/pcz19 -> usr/share/terminfo/c/coherent
--rw-r--r-- root/root    usr/share/terminfo/p/pe1100 -> usr/share/terminfo/f/fox
+-rw-r--r-- root/root    usr/share/terminfo/p/pcz19
+-rw-r--r-- root/root    usr/share/terminfo/p/pe1100
 -rw-r--r-- root/root    usr/share/terminfo/p/pe1200
--rw-r--r-- root/root    usr/share/terminfo/p/pe1251
--rw-r--r-- root/root    usr/share/terminfo/p/pe550 -> usr/share/terminfo/b/bantam
--rw-r--r-- root/root    usr/share/terminfo/p/pe6100 -> usr/share/terminfo/b/bantam
--rw-r--r-- root/root    usr/share/terminfo/p/pe6300 -> usr/share/terminfo/p/pe1251
--rw-r--r-- root/root    usr/share/terminfo/p/pe6312 -> usr/share/terminfo/p/pe1251
+-rw-r--r-- root/root    usr/share/terminfo/p/pe1251 -> usr/share/terminfo/p/pe6300
+-rw-r--r-- root/root    usr/share/terminfo/p/pe550
+-rw-r--r-- root/root    usr/share/terminfo/p/pe6100 -> usr/share/terminfo/p/pe550
+-rw-r--r-- root/root    usr/share/terminfo/p/pe6300
+-rw-r--r-- root/root    usr/share/terminfo/p/pe6312 -> usr/share/terminfo/p/pe6300
 -rw-r--r-- root/root    usr/share/terminfo/p/pe7000c
 -rw-r--r-- root/root    usr/share/terminfo/p/pe7000m
--rw-r--r-- root/root    usr/share/terminfo/p/pilot -> usr/share/terminfo/t/tgtelnet
--rw-r--r-- root/root    usr/share/terminfo/p/pmcons -> usr/share/terminfo/p/pmconsole
--rw-r--r-- root/root    usr/share/terminfo/p/pmconsole
+-rw-r--r-- root/root    usr/share/terminfo/p/pilot
+-rw-r--r-- root/root    usr/share/terminfo/p/pmcons
+-rw-r--r-- root/root    usr/share/terminfo/p/pmconsole -> usr/share/terminfo/p/pmcons
 -rw-r--r-- root/root    usr/share/terminfo/p/printer
 -rw-r--r-- root/root    usr/share/terminfo/p/prism12
--rw-r--r-- root/root    usr/share/terminfo/p/prism12-m
+-rw-r--r-- root/root    usr/share/terminfo/p/prism12-m -> usr/share/terminfo/p/p12-m
 -rw-r--r-- root/root    usr/share/terminfo/p/prism12-m-w -> usr/share/terminfo/p/p12-m-w
 -rw-r--r-- root/root    usr/share/terminfo/p/prism12-w
 -rw-r--r-- root/root    usr/share/terminfo/p/prism14
--rw-r--r-- root/root    usr/share/terminfo/p/prism14-m -> usr/share/terminfo/p/p14-m
--rw-r--r-- root/root    usr/share/terminfo/p/prism14-m-w
+-rw-r--r-- root/root    usr/share/terminfo/p/prism14-m
+-rw-r--r-- root/root    usr/share/terminfo/p/prism14-m-w -> usr/share/terminfo/p/p14-m-w
 -rw-r--r-- root/root    usr/share/terminfo/p/prism14-w -> usr/share/terminfo/p/p14-w
 -rw-r--r-- root/root    usr/share/terminfo/p/prism2
 -rw-r--r-- root/root    usr/share/terminfo/p/prism4 -> usr/share/terminfo/p/p4
--rw-r--r-- root/root    usr/share/terminfo/p/prism5 -> usr/share/terminfo/p/p5
--rw-r--r-- root/root    usr/share/terminfo/p/prism7 -> usr/share/terminfo/p/p7
--rw-r--r-- root/root    usr/share/terminfo/p/prism8
+-rw-r--r-- root/root    usr/share/terminfo/p/prism5
+-rw-r--r-- root/root    usr/share/terminfo/p/prism7
+-rw-r--r-- root/root    usr/share/terminfo/p/prism8 -> usr/share/terminfo/p/p8
 -rw-r--r-- root/root    usr/share/terminfo/p/prism8-w -> usr/share/terminfo/p/p8-w
--rw-r--r-- root/root    usr/share/terminfo/p/prism8gl -> usr/share/terminfo/p/p8gl
+-rw-r--r-- root/root    usr/share/terminfo/p/prism8gl
 -rw-r--r-- root/root    usr/share/terminfo/p/prism9 -> usr/share/terminfo/p/p9
--rw-r--r-- root/root    usr/share/terminfo/p/prism9-8 -> usr/share/terminfo/p/p9-8
+-rw-r--r-- root/root    usr/share/terminfo/p/prism9-8
 -rw-r--r-- root/root    usr/share/terminfo/p/prism9-8-w -> usr/share/terminfo/p/p9-8-w
--rw-r--r-- root/root    usr/share/terminfo/p/prism9-w -> usr/share/terminfo/p/p9-w
--rw-r--r-- root/root    usr/share/terminfo/p/pro350 -> usr/share/terminfo/d/decpro
+-rw-r--r-- root/root    usr/share/terminfo/p/prism9-w
+-rw-r--r-- root/root    usr/share/terminfo/p/pro350
 -rw-r--r-- root/root    usr/share/terminfo/p/ps300
--rw-r--r-- root/root    usr/share/terminfo/p/psterm
+-rw-r--r-- root/root    usr/share/terminfo/p/psterm -> usr/share/terminfo/p/psterm-basic
 -rw-r--r-- root/root    usr/share/terminfo/p/psterm-80x24
 -rw-r--r-- root/root    usr/share/terminfo/p/psterm-90x28
 -rw-r--r-- root/root    usr/share/terminfo/p/psterm-96x48
--rw-r--r-- root/root    usr/share/terminfo/p/psterm-basic -> usr/share/terminfo/p/psterm
+-rw-r--r-- root/root    usr/share/terminfo/p/psterm-basic
 -rw-r--r-- root/root    usr/share/terminfo/p/psterm-fast
 -rw-r--r-- root/root    usr/share/terminfo/p/psx_ansi
--rw-r--r-- root/root    usr/share/terminfo/p/pt100 -> usr/share/terminfo/f/fenix
--rw-r--r-- root/root    usr/share/terminfo/p/pt100w -> usr/share/terminfo/f/fenixw
--rw-r--r-- root/root    usr/share/terminfo/p/pt200 -> usr/share/terminfo/f/fenix
--rw-r--r-- root/root    usr/share/terminfo/p/pt200w -> usr/share/terminfo/f/fenixw
+-rw-r--r-- root/root    usr/share/terminfo/p/pt100
+-rw-r--r-- root/root    usr/share/terminfo/p/pt100w
+-rw-r--r-- root/root    usr/share/terminfo/p/pt200 -> usr/share/terminfo/p/pt100
+-rw-r--r-- root/root    usr/share/terminfo/p/pt200w -> usr/share/terminfo/p/pt100w
 -rw-r--r-- root/root    usr/share/terminfo/p/pt210
 -rw-r--r-- root/root    usr/share/terminfo/p/pt250
 -rw-r--r-- root/root    usr/share/terminfo/p/pt250w
--rw-r--r-- root/root    usr/share/terminfo/p/pt505 -> usr/share/terminfo/g/gs5430
--rw-r--r-- root/root    usr/share/terminfo/p/pt505-22 -> usr/share/terminfo/g/gs5430-22
--rw-r--r-- root/root    usr/share/terminfo/p/pt505-24 -> usr/share/terminfo/g/gs5430-24
+-rw-r--r-- root/root    usr/share/terminfo/p/pt505
+-rw-r--r-- root/root    usr/share/terminfo/p/pt505-22
+-rw-r--r-- root/root    usr/share/terminfo/p/pt505-24
 -rw-r--r-- root/root    usr/share/terminfo/p/pty
 -rw-r--r-- root/root    usr/share/terminfo/p/putty
 -rw-r--r-- root/root    usr/share/terminfo/p/putty+cursor
@@ -2837,14 +2837,14 @@ drwxr-xr-x root/root    usr/share/terminfo/q/
 -rw-r--r-- root/root    usr/share/terminfo/q/qansi-m
 -rw-r--r-- root/root    usr/share/terminfo/q/qansi-t
 -rw-r--r-- root/root    usr/share/terminfo/q/qansi-w
--rw-r--r-- root/root    usr/share/terminfo/q/qdcons
--rw-r--r-- root/root    usr/share/terminfo/q/qdss -> usr/share/terminfo/q/qdcons
--rw-r--r-- root/root    usr/share/terminfo/q/qnx
--rw-r--r-- root/root    usr/share/terminfo/q/qnx4 -> usr/share/terminfo/q/qnx
+-rw-r--r-- root/root    usr/share/terminfo/q/qdcons -> usr/share/terminfo/q/qdss
+-rw-r--r-- root/root    usr/share/terminfo/q/qdss
+-rw-r--r-- root/root    usr/share/terminfo/q/qnx -> usr/share/terminfo/q/qnx4
+-rw-r--r-- root/root    usr/share/terminfo/q/qnx4
 -rw-r--r-- root/root    usr/share/terminfo/q/qnxm
--rw-r--r-- root/root    usr/share/terminfo/q/qnxt -> usr/share/terminfo/q/qnxt4
+-rw-r--r-- root/root    usr/share/terminfo/q/qnxt
 -rw-r--r-- root/root    usr/share/terminfo/q/qnxt2
--rw-r--r-- root/root    usr/share/terminfo/q/qnxt4
+-rw-r--r-- root/root    usr/share/terminfo/q/qnxt4 -> usr/share/terminfo/q/qnxt
 -rw-r--r-- root/root    usr/share/terminfo/q/qnxtmono
 -rw-r--r-- root/root    usr/share/terminfo/q/qnxw
 -rw-r--r-- root/root    usr/share/terminfo/q/qume
@@ -2859,13 +2859,13 @@ drwxr-xr-x root/root    usr/share/terminfo/q/
 -rw-r--r-- root/root    usr/share/terminfo/q/qvt119
 -rw-r--r-- root/root    usr/share/terminfo/q/qvt119+ -> usr/share/terminfo/q/qvt119
 -rw-r--r-- root/root    usr/share/terminfo/q/qvt119+-25
--rw-r--r-- root/root    usr/share/terminfo/q/qvt119+-25-w -> usr/share/terminfo/q/qvt119p-25-w
+-rw-r--r-- root/root    usr/share/terminfo/q/qvt119+-25-w
 -rw-r--r-- root/root    usr/share/terminfo/q/qvt119+-w
--rw-r--r-- root/root    usr/share/terminfo/q/qvt119-25-w -> usr/share/terminfo/q/qvt119p-25-w
+-rw-r--r-- root/root    usr/share/terminfo/q/qvt119-25-w -> usr/share/terminfo/q/qvt119+-25-w
 -rw-r--r-- root/root    usr/share/terminfo/q/qvt119-w -> usr/share/terminfo/q/qvt119+-w
 -rw-r--r-- root/root    usr/share/terminfo/q/qvt119p -> usr/share/terminfo/q/qvt119
 -rw-r--r-- root/root    usr/share/terminfo/q/qvt119p-25 -> usr/share/terminfo/q/qvt119+-25
--rw-r--r-- root/root    usr/share/terminfo/q/qvt119p-25-w
+-rw-r--r-- root/root    usr/share/terminfo/q/qvt119p-25-w -> usr/share/terminfo/q/qvt119+-25-w
 -rw-r--r-- root/root    usr/share/terminfo/q/qvt119p-w -> usr/share/terminfo/q/qvt119+-w
 -rw-r--r-- root/root    usr/share/terminfo/q/qvt203
 -rw-r--r-- root/root    usr/share/terminfo/q/qvt203+ -> usr/share/terminfo/q/qvt203
@@ -2880,22 +2880,22 @@ drwxr-xr-x root/root    usr/share/terminfo/r/
 -rw-r--r-- root/root    usr/share/terminfo/r/rca
 -rw-r--r-- root/root    usr/share/terminfo/r/rcons
 -rw-r--r-- root/root    usr/share/terminfo/r/rcons-color
--rw-r--r-- root/root    usr/share/terminfo/r/rebus3180
+-rw-r--r-- root/root    usr/share/terminfo/r/rebus3180 -> usr/share/terminfo/d/ddr
 -rw-r--r-- root/root    usr/share/terminfo/r/regent
 -rw-r--r-- root/root    usr/share/terminfo/r/regent100
 -rw-r--r-- root/root    usr/share/terminfo/r/regent20
--rw-r--r-- root/root    usr/share/terminfo/r/regent200 -> usr/share/terminfo/r/regent60
+-rw-r--r-- root/root    usr/share/terminfo/r/regent200 -> usr/share/terminfo/a/adds200
 -rw-r--r-- root/root    usr/share/terminfo/r/regent25
 -rw-r--r-- root/root    usr/share/terminfo/r/regent40
 -rw-r--r-- root/root    usr/share/terminfo/r/regent40+
--rw-r--r-- root/root    usr/share/terminfo/r/regent60
+-rw-r--r-- root/root    usr/share/terminfo/r/regent60 -> usr/share/terminfo/a/adds200
 -rw-r--r-- root/root    usr/share/terminfo/r/report+da2
 -rw-r--r-- root/root    usr/share/terminfo/r/report+version
 -rw-r--r-- root/root    usr/share/terminfo/r/rio
 -rw-r--r-- root/root    usr/share/terminfo/r/rio-direct
 -rw-r--r-- root/root    usr/share/terminfo/r/rt6221
 -rw-r--r-- root/root    usr/share/terminfo/r/rt6221-w
--rw-r--r-- root/root    usr/share/terminfo/r/rtpc
+-rw-r--r-- root/root    usr/share/terminfo/r/rtpc -> usr/share/terminfo/i/ibmapa16
 -rw-r--r-- root/root    usr/share/terminfo/r/rxvt -> usr/share/terminfo/r/rxvt-color
 -rw-r--r-- root/root    usr/share/terminfo/r/rxvt+pcfkeys
 -rw-r--r-- root/root    usr/share/terminfo/r/rxvt-16color
@@ -2907,15 +2907,15 @@ drwxr-xr-x root/root    usr/share/terminfo/r/
 -rw-r--r-- root/root    usr/share/terminfo/r/rxvt-cygwin-native
 -rw-r--r-- root/root    usr/share/terminfo/r/rxvt-xpm
 drwxr-xr-x root/root    usr/share/terminfo/s/
--rw-r--r-- root/root    usr/share/terminfo/s/s4 -> usr/share/terminfo/u/unixpc
+-rw-r--r-- root/root    usr/share/terminfo/s/s4 -> usr/share/terminfo/p/pc7300
 -rw-r--r-- root/root    usr/share/terminfo/s/sb1
--rw-r--r-- root/root    usr/share/terminfo/s/sb2 -> usr/share/terminfo/s/sb3
--rw-r--r-- root/root    usr/share/terminfo/s/sb3
+-rw-r--r-- root/root    usr/share/terminfo/s/sb2
+-rw-r--r-- root/root    usr/share/terminfo/s/sb3 -> usr/share/terminfo/s/sb2
 -rw-r--r-- root/root    usr/share/terminfo/s/sbi -> usr/share/terminfo/s/superbee
 -rw-r--r-- root/root    usr/share/terminfo/s/sbobcat -> usr/share/terminfo/b/bobcat
--rw-r--r-- root/root    usr/share/terminfo/s/sc410 -> usr/share/terminfo/s/scanset
--rw-r--r-- root/root    usr/share/terminfo/s/sc415 -> usr/share/terminfo/s/scanset
--rw-r--r-- root/root    usr/share/terminfo/s/scanset
+-rw-r--r-- root/root    usr/share/terminfo/s/sc410 -> usr/share/terminfo/s/sc415
+-rw-r--r-- root/root    usr/share/terminfo/s/sc415
+-rw-r--r-- root/root    usr/share/terminfo/s/scanset -> usr/share/terminfo/s/sc415
 -rw-r--r-- root/root    usr/share/terminfo/s/scoansi
 -rw-r--r-- root/root    usr/share/terminfo/s/scoansi-new
 -rw-r--r-- root/root    usr/share/terminfo/s/scoansi-old
@@ -2952,11 +2952,11 @@ drwxr-xr-x root/root    usr/share/terminfo/s/
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.linux-s -> usr/share/terminfo/s/screen.linux
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.minitel1
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.minitel1-nb
--rw-r--r-- root/root    usr/share/terminfo/s/screen.minitel12-80
+-rw-r--r-- root/root    usr/share/terminfo/s/screen.minitel12-80 -> usr/share/terminfo/s/screen.minitel1b-80
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.minitel1b
--rw-r--r-- root/root    usr/share/terminfo/s/screen.minitel1b-80 -> usr/share/terminfo/s/screen.minitel12-80
+-rw-r--r-- root/root    usr/share/terminfo/s/screen.minitel1b-80
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.minitel1b-nb
--rw-r--r-- root/root    usr/share/terminfo/s/screen.minitel2-80 -> usr/share/terminfo/s/screen.minitel12-80
+-rw-r--r-- root/root    usr/share/terminfo/s/screen.minitel2-80 -> usr/share/terminfo/s/screen.minitel1b-80
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.mlterm
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.mlterm-256color
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.mrxvt
@@ -2970,9 +2970,9 @@ drwxr-xr-x root/root    usr/share/terminfo/s/
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.vte
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.vte-256color
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.xterm-256color
--rw-r--r-- root/root    usr/share/terminfo/s/screen.xterm-new
+-rw-r--r-- root/root    usr/share/terminfo/s/screen.xterm-new -> usr/share/terminfo/s/screen.xterm-xfree86
 -rw-r--r-- root/root    usr/share/terminfo/s/screen.xterm-r6
--rw-r--r-- root/root    usr/share/terminfo/s/screen.xterm-xfree86 -> usr/share/terminfo/s/screen.xterm-new
+-rw-r--r-- root/root    usr/share/terminfo/s/screen.xterm-xfree86
 -rw-r--r-- root/root    usr/share/terminfo/s/screen2
 -rw-r--r-- root/root    usr/share/terminfo/s/screen3
 -rw-r--r-- root/root    usr/share/terminfo/s/screen4
@@ -2984,27 +2984,27 @@ drwxr-xr-x root/root    usr/share/terminfo/s/
 -rw-r--r-- root/root    usr/share/terminfo/s/sibo
 -rw-r--r-- root/root    usr/share/terminfo/s/simpleterm
 -rw-r--r-- root/root    usr/share/terminfo/s/simterm
--rw-r--r-- root/root    usr/share/terminfo/s/soroc
--rw-r--r-- root/root    usr/share/terminfo/s/soroc120 -> usr/share/terminfo/s/soroc
--rw-r--r-- root/root    usr/share/terminfo/s/soroc140
+-rw-r--r-- root/root    usr/share/terminfo/s/soroc -> usr/share/terminfo/i/iq120
+-rw-r--r-- root/root    usr/share/terminfo/s/soroc120 -> usr/share/terminfo/i/iq120
+-rw-r--r-- root/root    usr/share/terminfo/s/soroc140 -> usr/share/terminfo/i/iq140
 -rw-r--r-- root/root    usr/share/terminfo/s/spinwriter
--rw-r--r-- root/root    usr/share/terminfo/s/st -> usr/share/terminfo/s/stterm
+-rw-r--r-- root/root    usr/share/terminfo/s/st
 -rw-r--r-- root/root    usr/share/terminfo/s/st-0.6
 -rw-r--r-- root/root    usr/share/terminfo/s/st-0.7
 -rw-r--r-- root/root    usr/share/terminfo/s/st-0.8
--rw-r--r-- root/root    usr/share/terminfo/s/st-16color
+-rw-r--r-- root/root    usr/share/terminfo/s/st-16color -> usr/share/terminfo/s/stterm-16color
 -rw-r--r-- root/root    usr/share/terminfo/s/st-256color -> usr/share/terminfo/s/stterm-256color
 -rw-r--r-- root/root    usr/share/terminfo/s/st-direct
--rw-r--r-- root/root    usr/share/terminfo/s/st52 -> usr/share/terminfo/s/st52-m
--rw-r--r-- root/root    usr/share/terminfo/s/st52-color
--rw-r--r-- root/root    usr/share/terminfo/s/st52-m
+-rw-r--r-- root/root    usr/share/terminfo/s/st52 -> usr/share/terminfo/a/atari_st
+-rw-r--r-- root/root    usr/share/terminfo/s/st52-color -> usr/share/terminfo/a/atari_st-color
+-rw-r--r-- root/root    usr/share/terminfo/s/st52-m -> usr/share/terminfo/a/atari_st
 -rw-r--r-- root/root    usr/share/terminfo/s/st52-old
--rw-r--r-- root/root    usr/share/terminfo/s/stterm
--rw-r--r-- root/root    usr/share/terminfo/s/stterm-16color -> usr/share/terminfo/s/st-16color
+-rw-r--r-- root/root    usr/share/terminfo/s/stterm -> usr/share/terminfo/s/st
+-rw-r--r-- root/root    usr/share/terminfo/s/stterm-16color
 -rw-r--r-- root/root    usr/share/terminfo/s/stterm-256color
 -rw-r--r-- root/root    usr/share/terminfo/s/stv52
 -rw-r--r-- root/root    usr/share/terminfo/s/stv52pc
--rw-r--r-- root/root    usr/share/terminfo/s/sun
+-rw-r--r-- root/root    usr/share/terminfo/s/sun -> usr/share/terminfo/s/sun2
 -rw-r--r-- root/root    usr/share/terminfo/s/sun+sl
 -rw-r--r-- root/root    usr/share/terminfo/s/sun-1
 -rw-r--r-- root/root    usr/share/terminfo/s/sun-12
@@ -3013,47 +3013,47 @@ drwxr-xr-x root/root    usr/share/terminfo/s/
 -rw-r--r-- root/root    usr/share/terminfo/s/sun-34
 -rw-r--r-- root/root    usr/share/terminfo/s/sun-48
 -rw-r--r-- root/root    usr/share/terminfo/s/sun-c -> usr/share/terminfo/s/sun-cmd
--rw-r--r-- root/root    usr/share/terminfo/s/sun-cgsix
+-rw-r--r-- root/root    usr/share/terminfo/s/sun-cgsix -> usr/share/terminfo/s/sun-ss5
 -rw-r--r-- root/root    usr/share/terminfo/s/sun-cmd
 -rw-r--r-- root/root    usr/share/terminfo/s/sun-color
--rw-r--r-- root/root    usr/share/terminfo/s/sun-e
--rw-r--r-- root/root    usr/share/terminfo/s/sun-e-s -> usr/share/terminfo/s/sun-s-e
+-rw-r--r-- root/root    usr/share/terminfo/s/sun-e -> usr/share/terminfo/s/sun-nic
+-rw-r--r-- root/root    usr/share/terminfo/s/sun-e-s
 -rw-r--r-- root/root    usr/share/terminfo/s/sun-il
--rw-r--r-- root/root    usr/share/terminfo/s/sun-nic -> usr/share/terminfo/s/sun-e
+-rw-r--r-- root/root    usr/share/terminfo/s/sun-nic
 -rw-r--r-- root/root    usr/share/terminfo/s/sun-s
--rw-r--r-- root/root    usr/share/terminfo/s/sun-s-e
--rw-r--r-- root/root    usr/share/terminfo/s/sun-ss5 -> usr/share/terminfo/s/sun-cgsix
+-rw-r--r-- root/root    usr/share/terminfo/s/sun-s-e -> usr/share/terminfo/s/sun-e-s
+-rw-r--r-- root/root    usr/share/terminfo/s/sun-ss5
 -rw-r--r-- root/root    usr/share/terminfo/s/sun-type4
--rw-r--r-- root/root    usr/share/terminfo/s/sun1 -> usr/share/terminfo/s/sun
--rw-r--r-- root/root    usr/share/terminfo/s/sun2 -> usr/share/terminfo/s/sun
--rw-r--r-- root/root    usr/share/terminfo/s/sune -> usr/share/terminfo/s/sun-e
+-rw-r--r-- root/root    usr/share/terminfo/s/sun1 -> usr/share/terminfo/s/sun2
+-rw-r--r-- root/root    usr/share/terminfo/s/sun2
+-rw-r--r-- root/root    usr/share/terminfo/s/sune -> usr/share/terminfo/s/sun-nic
 -rw-r--r-- root/root    usr/share/terminfo/s/superbee
 -rw-r--r-- root/root    usr/share/terminfo/s/superbee-xsb
 -rw-r--r-- root/root    usr/share/terminfo/s/superbeeic
 -rw-r--r-- root/root    usr/share/terminfo/s/superbrain
--rw-r--r-- root/root    usr/share/terminfo/s/sv80
--rw-r--r-- root/root    usr/share/terminfo/s/swtp -> usr/share/terminfo/c/ct82
+-rw-r--r-- root/root    usr/share/terminfo/s/sv80 -> usr/share/terminfo/a/att2300
+-rw-r--r-- root/root    usr/share/terminfo/s/swtp
 -rw-r--r-- root/root    usr/share/terminfo/s/synertek -> usr/share/terminfo/k/ktm
 -rw-r--r-- root/root    usr/share/terminfo/s/synertek380 -> usr/share/terminfo/k/ktm
--rw-r--r-- root/root    usr/share/terminfo/s/system1
+-rw-r--r-- root/root    usr/share/terminfo/s/system1 -> usr/share/terminfo/i/ibm-system1
 drwxr-xr-x root/root    usr/share/terminfo/t/
 -rw-r--r-- root/root    usr/share/terminfo/t/t10
--rw-r--r-- root/root    usr/share/terminfo/t/t1061
+-rw-r--r-- root/root    usr/share/terminfo/t/t1061 -> usr/share/terminfo/t/teleray
 -rw-r--r-- root/root    usr/share/terminfo/t/t1061f
 -rw-r--r-- root/root    usr/share/terminfo/t/t16
 -rw-r--r-- root/root    usr/share/terminfo/t/t3700
 -rw-r--r-- root/root    usr/share/terminfo/t/t3800
--rw-r--r-- root/root    usr/share/terminfo/t/t653x
--rw-r--r-- root/root    usr/share/terminfo/t/tab -> usr/share/terminfo/t/tab132
--rw-r--r-- root/root    usr/share/terminfo/t/tab132
--rw-r--r-- root/root    usr/share/terminfo/t/tab132-15 -> usr/share/terminfo/t/tab132
+-rw-r--r-- root/root    usr/share/terminfo/t/t653x -> usr/share/terminfo/t/tandem653
+-rw-r--r-- root/root    usr/share/terminfo/t/tab
+-rw-r--r-- root/root    usr/share/terminfo/t/tab132 -> usr/share/terminfo/t/tab
+-rw-r--r-- root/root    usr/share/terminfo/t/tab132-15 -> usr/share/terminfo/t/tab
 -rw-r--r-- root/root    usr/share/terminfo/t/tab132-rv
 -rw-r--r-- root/root    usr/share/terminfo/t/tab132-w
 -rw-r--r-- root/root    usr/share/terminfo/t/tab132-w-rv
 -rw-r--r-- root/root    usr/share/terminfo/t/tandem6510
--rw-r--r-- root/root    usr/share/terminfo/t/tandem653 -> usr/share/terminfo/t/t653x
--rw-r--r-- root/root    usr/share/terminfo/t/tek
--rw-r--r-- root/root    usr/share/terminfo/t/tek4012 -> usr/share/terminfo/t/tek
+-rw-r--r-- root/root    usr/share/terminfo/t/tandem653
+-rw-r--r-- root/root    usr/share/terminfo/t/tek -> usr/share/terminfo/t/tek4012
+-rw-r--r-- root/root    usr/share/terminfo/t/tek4012
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4013
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4014
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4014-sm
@@ -3065,19 +3065,19 @@ drwxr-xr-x root/root    usr/share/terminfo/t/
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4025-17
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4025-17-ws
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4025-cr
--rw-r--r-- root/root    usr/share/terminfo/t/tek4025-ex -> usr/share/terminfo/t/tek4027-ex
+-rw-r--r-- root/root    usr/share/terminfo/t/tek4025-ex
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4025a
--rw-r--r-- root/root    usr/share/terminfo/t/tek4025ex -> usr/share/terminfo/4/4025ex
+-rw-r--r-- root/root    usr/share/terminfo/t/tek4025ex
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4027 -> usr/share/terminfo/t/tek4025
--rw-r--r-- root/root    usr/share/terminfo/t/tek4027-ex
+-rw-r--r-- root/root    usr/share/terminfo/t/tek4027-ex -> usr/share/terminfo/t/tek4025-ex
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4105
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4105-30
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4105a
--rw-r--r-- root/root    usr/share/terminfo/t/tek4106brl -> usr/share/terminfo/t/tek4109brl
+-rw-r--r-- root/root    usr/share/terminfo/t/tek4106brl
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4107 -> usr/share/terminfo/t/tek4109
--rw-r--r-- root/root    usr/share/terminfo/t/tek4107brl -> usr/share/terminfo/t/tek4109brl
+-rw-r--r-- root/root    usr/share/terminfo/t/tek4107brl -> usr/share/terminfo/t/tek4106brl
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4109
--rw-r--r-- root/root    usr/share/terminfo/t/tek4109brl
+-rw-r--r-- root/root    usr/share/terminfo/t/tek4109brl -> usr/share/terminfo/t/tek4106brl
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4112 -> usr/share/terminfo/t/tek4114
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4112-5
 -rw-r--r-- root/root    usr/share/terminfo/t/tek4112-nd
@@ -3099,7 +3099,7 @@ drwxr-xr-x root/root    usr/share/terminfo/t/
 -rw-r--r-- root/root    usr/share/terminfo/t/teken-sc+fkeys
 -rw-r--r-- root/root    usr/share/terminfo/t/teken-vt
 -rw-r--r-- root/root    usr/share/terminfo/t/teken-vt+fkeys
--rw-r--r-- root/root    usr/share/terminfo/t/teleray -> usr/share/terminfo/t/t1061
+-rw-r--r-- root/root    usr/share/terminfo/t/teleray
 -rw-r--r-- root/root    usr/share/terminfo/t/teletec
 -rw-r--r-- root/root    usr/share/terminfo/t/teraterm
 -rw-r--r-- root/root    usr/share/terminfo/t/teraterm-256color
@@ -3107,29 +3107,29 @@ drwxr-xr-x root/root    usr/share/terminfo/t/
 -rw-r--r-- root/root    usr/share/terminfo/t/teraterm4.59
 -rw-r--r-- root/root    usr/share/terminfo/t/teraterm4.97
 -rw-r--r-- root/root    usr/share/terminfo/t/terminator
--rw-r--r-- root/root    usr/share/terminfo/t/terminet -> usr/share/terminfo/t/terminet300
--rw-r--r-- root/root    usr/share/terminfo/t/terminet1200 -> usr/share/terminfo/t/terminet300
--rw-r--r-- root/root    usr/share/terminfo/t/terminet300
+-rw-r--r-- root/root    usr/share/terminfo/t/terminet -> usr/share/terminfo/t/tn1200
+-rw-r--r-- root/root    usr/share/terminfo/t/terminet1200 -> usr/share/terminfo/t/tn1200
+-rw-r--r-- root/root    usr/share/terminfo/t/terminet300 -> usr/share/terminfo/t/tn1200
 -rw-r--r-- root/root    usr/share/terminfo/t/terminology
 -rw-r--r-- root/root    usr/share/terminfo/t/terminology-0.6.1
 -rw-r--r-- root/root    usr/share/terminfo/t/terminology-1.0.0
 -rw-r--r-- root/root    usr/share/terminfo/t/terminology-1.8.1
 -rw-r--r-- root/root    usr/share/terminfo/t/termite
--rw-r--r-- root/root    usr/share/terminfo/t/tgtelnet
--rw-r--r-- root/root    usr/share/terminfo/t/ti700
+-rw-r--r-- root/root    usr/share/terminfo/t/tgtelnet -> usr/share/terminfo/p/pilot
+-rw-r--r-- root/root    usr/share/terminfo/t/ti700 -> usr/share/terminfo/t/ti800
 -rw-r--r-- root/root    usr/share/terminfo/t/ti703 -> usr/share/terminfo/t/ti707
--rw-r--r-- root/root    usr/share/terminfo/t/ti703-w
+-rw-r--r-- root/root    usr/share/terminfo/t/ti703-w -> usr/share/terminfo/t/ti707-w
 -rw-r--r-- root/root    usr/share/terminfo/t/ti707
--rw-r--r-- root/root    usr/share/terminfo/t/ti707-w -> usr/share/terminfo/t/ti703-w
--rw-r--r-- root/root    usr/share/terminfo/t/ti733 -> usr/share/terminfo/t/ti700
--rw-r--r-- root/root    usr/share/terminfo/t/ti735 -> usr/share/terminfo/t/ti700
--rw-r--r-- root/root    usr/share/terminfo/t/ti745 -> usr/share/terminfo/t/ti700
--rw-r--r-- root/root    usr/share/terminfo/t/ti800 -> usr/share/terminfo/t/ti700
--rw-r--r-- root/root    usr/share/terminfo/t/ti916
+-rw-r--r-- root/root    usr/share/terminfo/t/ti707-w
+-rw-r--r-- root/root    usr/share/terminfo/t/ti733 -> usr/share/terminfo/t/ti800
+-rw-r--r-- root/root    usr/share/terminfo/t/ti735 -> usr/share/terminfo/t/ti800
+-rw-r--r-- root/root    usr/share/terminfo/t/ti745 -> usr/share/terminfo/t/ti800
+-rw-r--r-- root/root    usr/share/terminfo/t/ti800
+-rw-r--r-- root/root    usr/share/terminfo/t/ti916 -> usr/share/terminfo/t/ti916-220-7
 -rw-r--r-- root/root    usr/share/terminfo/t/ti916-132
--rw-r--r-- root/root    usr/share/terminfo/t/ti916-220-7 -> usr/share/terminfo/t/ti916
--rw-r--r-- root/root    usr/share/terminfo/t/ti916-220-8
--rw-r--r-- root/root    usr/share/terminfo/t/ti916-8 -> usr/share/terminfo/t/ti916-220-8
+-rw-r--r-- root/root    usr/share/terminfo/t/ti916-220-7
+-rw-r--r-- root/root    usr/share/terminfo/t/ti916-220-8 -> usr/share/terminfo/t/ti916-8
+-rw-r--r-- root/root    usr/share/terminfo/t/ti916-8
 -rw-r--r-- root/root    usr/share/terminfo/t/ti916-8-132
 -rw-r--r-- root/root    usr/share/terminfo/t/ti924
 -rw-r--r-- root/root    usr/share/terminfo/t/ti924-8
@@ -3141,24 +3141,24 @@ drwxr-xr-x root/root    usr/share/terminfo/t/
 -rw-r--r-- root/root    usr/share/terminfo/t/ti928-8
 -rw-r--r-- root/root    usr/share/terminfo/t/ti931
 -rw-r--r-- root/root    usr/share/terminfo/t/ti_ansi
--rw-r--r-- root/root    usr/share/terminfo/t/tkterm -> usr/share/terminfo/t/tt
+-rw-r--r-- root/root    usr/share/terminfo/t/tkterm
 -rw-r--r-- root/root    usr/share/terminfo/t/tmux
 -rw-r--r-- root/root    usr/share/terminfo/t/tmux-256color
 -rw-r--r-- root/root    usr/share/terminfo/t/tmux-direct
--rw-r--r-- root/root    usr/share/terminfo/t/tn1200 -> usr/share/terminfo/t/terminet300
--rw-r--r-- root/root    usr/share/terminfo/t/tn300 -> usr/share/terminfo/t/terminet300
+-rw-r--r-- root/root    usr/share/terminfo/t/tn1200
+-rw-r--r-- root/root    usr/share/terminfo/t/tn300 -> usr/share/terminfo/t/tn1200
 -rw-r--r-- root/root    usr/share/terminfo/t/trs16
--rw-r--r-- root/root    usr/share/terminfo/t/trs2 -> usr/share/terminfo/t/trs80II
--rw-r--r-- root/root    usr/share/terminfo/t/trs80II
--rw-r--r-- root/root    usr/share/terminfo/t/trsII -> usr/share/terminfo/t/trs80II
+-rw-r--r-- root/root    usr/share/terminfo/t/trs2 -> usr/share/terminfo/t/trsII
+-rw-r--r-- root/root    usr/share/terminfo/t/trs80II -> usr/share/terminfo/t/trsII
+-rw-r--r-- root/root    usr/share/terminfo/t/trsII
 -rw-r--r-- root/root    usr/share/terminfo/t/ts-1
 -rw-r--r-- root/root    usr/share/terminfo/t/ts-1p -> usr/share/terminfo/t/ts1p
 -rw-r--r-- root/root    usr/share/terminfo/t/ts1 -> usr/share/terminfo/t/ts-1
--rw-r--r-- root/root    usr/share/terminfo/t/ts100 -> usr/share/terminfo/t/ts100-sp
+-rw-r--r-- root/root    usr/share/terminfo/t/ts100
 -rw-r--r-- root/root    usr/share/terminfo/t/ts100-ctxt
--rw-r--r-- root/root    usr/share/terminfo/t/ts100-sp
+-rw-r--r-- root/root    usr/share/terminfo/t/ts100-sp -> usr/share/terminfo/t/ts100
 -rw-r--r-- root/root    usr/share/terminfo/t/ts1p
--rw-r--r-- root/root    usr/share/terminfo/t/tt
+-rw-r--r-- root/root    usr/share/terminfo/t/tt -> usr/share/terminfo/t/tkterm
 -rw-r--r-- root/root    usr/share/terminfo/t/tt52
 -rw-r--r-- root/root    usr/share/terminfo/t/tty33 -> usr/share/terminfo/t/tty35
 -rw-r--r-- root/root    usr/share/terminfo/t/tty35
@@ -3171,7 +3171,7 @@ drwxr-xr-x root/root    usr/share/terminfo/t/
 -rw-r--r-- root/root    usr/share/terminfo/t/tty4424m
 -rw-r--r-- root/root    usr/share/terminfo/t/tty4426
 -rw-r--r-- root/root    usr/share/terminfo/t/tty5410
--rw-r--r-- root/root    usr/share/terminfo/t/tty5410-w -> usr/share/terminfo/4/4410-w
+-rw-r--r-- root/root    usr/share/terminfo/t/tty5410-w -> usr/share/terminfo/5/5410-w
 -rw-r--r-- root/root    usr/share/terminfo/t/tty5410v1
 -rw-r--r-- root/root    usr/share/terminfo/t/tty5410v1-w
 -rw-r--r-- root/root    usr/share/terminfo/t/tty5420
@@ -3186,97 +3186,97 @@ drwxr-xr-x root/root    usr/share/terminfo/t/
 -rw-r--r-- root/root    usr/share/terminfo/t/tty5425
 -rw-r--r-- root/root    usr/share/terminfo/t/tty5425-nl
 -rw-r--r-- root/root    usr/share/terminfo/t/tty5425-w
--rw-r--r-- root/root    usr/share/terminfo/t/tty5620
+-rw-r--r-- root/root    usr/share/terminfo/t/tty5620 -> usr/share/terminfo/5/5620
 -rw-r--r-- root/root    usr/share/terminfo/t/tty5620-1
 -rw-r--r-- root/root    usr/share/terminfo/t/tty5620-24
 -rw-r--r-- root/root    usr/share/terminfo/t/tty5620-34
 -rw-r--r-- root/root    usr/share/terminfo/t/tty5620-s
--rw-r--r-- root/root    usr/share/terminfo/t/ttydmd -> usr/share/terminfo/t/tty5620
+-rw-r--r-- root/root    usr/share/terminfo/t/ttydmd -> usr/share/terminfo/5/5620
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi803
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi9065
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi910
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi910+
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912b -> usr/share/terminfo/t/tvi912c
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912 -> usr/share/terminfo/t/tvi920
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912b
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b+2p
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b+dim
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b+mc
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b+printer
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b+vb
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-2p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-2p-mc
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-2p -> usr/share/terminfo/t/tvi912c-2p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-2p-mc -> usr/share/terminfo/t/tvi912c-2p-mc
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-2p-p
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-2p-unk -> usr/share/terminfo/t/tvi912c-unk-2p
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-mc -> usr/share/terminfo/t/tvi912c-mc
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-mc-2p -> usr/share/terminfo/t/tvi912b-2p-mc
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-mc-vb
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-mc-2p -> usr/share/terminfo/t/tvi912c-2p-mc
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-mc-vb -> usr/share/terminfo/t/tvi912b-vb-mc
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-p
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-p-2p -> usr/share/terminfo/t/tvi912b-2p-p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-p-vb
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-unk
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-p-vb -> usr/share/terminfo/t/tvi912c-p-vb
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-unk -> usr/share/terminfo/t/tvi912c-unk
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-unk-2p -> usr/share/terminfo/t/tvi912c-unk-2p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-unk-vb -> usr/share/terminfo/t/tvi912c-unk-vb
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-unk-vb -> usr/share/terminfo/t/tvi912b-vb-unk
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-vb
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-vb-mc -> usr/share/terminfo/t/tvi912b-mc-vb
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-vb-p -> usr/share/terminfo/t/tvi912b-p-vb
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-vb-unk -> usr/share/terminfo/t/tvi912c-unk-vb
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912c
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-2p -> usr/share/terminfo/t/tvi912b-2p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-2p-mc -> usr/share/terminfo/t/tvi912b-2p-mc
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-vb-mc
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-vb-p -> usr/share/terminfo/t/tvi912c-p-vb
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912b-vb-unk
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912c -> usr/share/terminfo/t/tvi912b
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-2p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-2p-mc
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-2p-p -> usr/share/terminfo/t/tvi912b-2p-p
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-2p-unk -> usr/share/terminfo/t/tvi912c-unk-2p
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-mc
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-mc-2p -> usr/share/terminfo/t/tvi912b-2p-mc
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-mc-vb -> usr/share/terminfo/t/tvi912b-mc-vb
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-mc-2p -> usr/share/terminfo/t/tvi912c-2p-mc
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-mc-vb -> usr/share/terminfo/t/tvi912b-vb-mc
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-p -> usr/share/terminfo/t/tvi912b-p
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-p-2p -> usr/share/terminfo/t/tvi912b-2p-p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-p-vb -> usr/share/terminfo/t/tvi912b-p-vb
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-unk -> usr/share/terminfo/t/tvi912b-unk
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-p-vb
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-unk
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-unk-2p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-unk-vb
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-unk-vb -> usr/share/terminfo/t/tvi912b-vb-unk
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-vb -> usr/share/terminfo/t/tvi912b-vb
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-vb-mc -> usr/share/terminfo/t/tvi912b-mc-vb
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-vb-p -> usr/share/terminfo/t/tvi912b-p-vb
--rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-vb-unk -> usr/share/terminfo/t/tvi912c-unk-vb
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-vb-mc -> usr/share/terminfo/t/tvi912b-vb-mc
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-vb-p -> usr/share/terminfo/t/tvi912c-p-vb
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi912c-vb-unk -> usr/share/terminfo/t/tvi912b-vb-unk
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi912cc
--rw-r--r-- root/root    usr/share/terminfo/t/tvi914 -> usr/share/terminfo/t/tvi912
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920 -> usr/share/terminfo/t/tvi912
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi914 -> usr/share/terminfo/t/tvi920
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920b -> usr/share/terminfo/t/tvi920c
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920b+fn
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-2p -> usr/share/terminfo/t/tvi920c-2p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-2p-mc -> usr/share/terminfo/t/tvi920c-mc-2p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-2p-p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-2p-unk -> usr/share/terminfo/t/tvi920c-2p-unk
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-mc
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-mc-2p -> usr/share/terminfo/t/tvi920c-mc-2p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-2p-mc
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-2p-p -> usr/share/terminfo/t/tvi920c-p-2p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-2p-unk -> usr/share/terminfo/t/tvi920b-unk-2p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-mc -> usr/share/terminfo/t/tvi920c-mc
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-mc-2p -> usr/share/terminfo/t/tvi920b-2p-mc
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-mc-vb -> usr/share/terminfo/t/tvi920b-vb-mc
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-p -> usr/share/terminfo/t/tvi920c-p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-p-2p -> usr/share/terminfo/t/tvi920b-2p-p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-p-vb -> usr/share/terminfo/t/tvi920c-vb-p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-unk -> usr/share/terminfo/t/tvi920c-unk
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-unk-2p -> usr/share/terminfo/t/tvi920c-2p-unk
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-p-2p -> usr/share/terminfo/t/tvi920c-p-2p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-p-vb -> usr/share/terminfo/t/tvi920b-vb-p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-unk
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-unk-2p
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-unk-vb -> usr/share/terminfo/t/tvi920b-vb-unk
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-vb
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-vb -> usr/share/terminfo/t/tvi920c-vb
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-vb-mc
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-vb-p -> usr/share/terminfo/t/tvi920c-vb-p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-vb-p
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920b-vb-unk
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920c
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-2p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-2p-mc -> usr/share/terminfo/t/tvi920c-mc-2p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-2p-p -> usr/share/terminfo/t/tvi920b-2p-p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-2p-unk
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-mc -> usr/share/terminfo/t/tvi920b-mc
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-mc-2p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-2p-mc -> usr/share/terminfo/t/tvi920b-2p-mc
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-2p-p -> usr/share/terminfo/t/tvi920c-p-2p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-2p-unk -> usr/share/terminfo/t/tvi920b-unk-2p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-mc
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-mc-2p -> usr/share/terminfo/t/tvi920b-2p-mc
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-mc-vb -> usr/share/terminfo/t/tvi920b-vb-mc
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-p-2p -> usr/share/terminfo/t/tvi920b-2p-p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-p-vb -> usr/share/terminfo/t/tvi920c-vb-p
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-unk
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-unk-2p -> usr/share/terminfo/t/tvi920c-2p-unk
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-p-2p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-p-vb -> usr/share/terminfo/t/tvi920b-vb-p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-unk -> usr/share/terminfo/t/tvi920b-unk
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-unk-2p -> usr/share/terminfo/t/tvi920b-unk-2p
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-unk-vb -> usr/share/terminfo/t/tvi920b-vb-unk
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-vb -> usr/share/terminfo/t/tvi920b-vb
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-vb
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-vb-mc -> usr/share/terminfo/t/tvi920b-vb-mc
--rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-vb-p
+-rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-vb-p -> usr/share/terminfo/t/tvi920b-vb-p
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi920c-vb-unk -> usr/share/terminfo/t/tvi920b-vb-unk
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi921
 -rw-r--r-- root/root    usr/share/terminfo/t/tvi924
@@ -3303,14 +3303,14 @@ drwxr-xr-x root/root    usr/share/terminfo/t/
 -rw-r--r-- root/root    usr/share/terminfo/t/tw52-m
 -rw-r--r-- root/root    usr/share/terminfo/t/tws-generic
 -rw-r--r-- root/root    usr/share/terminfo/t/tws2102-sna
--rw-r--r-- root/root    usr/share/terminfo/t/tws2103 -> usr/share/terminfo/x/xdku
+-rw-r--r-- root/root    usr/share/terminfo/t/tws2103
 -rw-r--r-- root/root    usr/share/terminfo/t/tws2103-sna
 drwxr-xr-x root/root    usr/share/terminfo/u/
 -rw-r--r-- root/root    usr/share/terminfo/u/ultima2
 -rw-r--r-- root/root    usr/share/terminfo/u/ultimaII -> usr/share/terminfo/u/ultima2
--rw-r--r-- root/root    usr/share/terminfo/u/uniterm
--rw-r--r-- root/root    usr/share/terminfo/u/uniterm49 -> usr/share/terminfo/u/uniterm
--rw-r--r-- root/root    usr/share/terminfo/u/unixpc
+-rw-r--r-- root/root    usr/share/terminfo/u/uniterm -> usr/share/terminfo/u/uniterm49
+-rw-r--r-- root/root    usr/share/terminfo/u/uniterm49
+-rw-r--r-- root/root    usr/share/terminfo/u/unixpc -> usr/share/terminfo/p/pc7300
 -rw-r--r-- root/root    usr/share/terminfo/u/unknown
 -rw-r--r-- root/root    usr/share/terminfo/u/uts30
 -rw-r--r-- root/root    usr/share/terminfo/u/uwin
@@ -3320,12 +3320,12 @@ drwxr-xr-x root/root    usr/share/terminfo/v/
 -rw-r--r-- root/root    usr/share/terminfo/v/v3220
 -rw-r--r-- root/root    usr/share/terminfo/v/v5410
 -rw-r--r-- root/root    usr/share/terminfo/v/vanilla
--rw-r--r-- root/root    usr/share/terminfo/v/vapple
--rw-r--r-- root/root    usr/share/terminfo/v/vc103
--rw-r--r-- root/root    usr/share/terminfo/v/vc203 -> usr/share/terminfo/v/vc103
--rw-r--r-- root/root    usr/share/terminfo/v/vc303 -> usr/share/terminfo/v/vc103
--rw-r--r-- root/root    usr/share/terminfo/v/vc303a
--rw-r--r-- root/root    usr/share/terminfo/v/vc403a -> usr/share/terminfo/v/vc303a
+-rw-r--r-- root/root    usr/share/terminfo/v/vapple -> usr/share/terminfo/a/apple-videx3
+-rw-r--r-- root/root    usr/share/terminfo/v/vc103 -> usr/share/terminfo/v/vc203
+-rw-r--r-- root/root    usr/share/terminfo/v/vc203
+-rw-r--r-- root/root    usr/share/terminfo/v/vc303 -> usr/share/terminfo/v/vc203
+-rw-r--r-- root/root    usr/share/terminfo/v/vc303a -> usr/share/terminfo/v/vc403a
+-rw-r--r-- root/root    usr/share/terminfo/v/vc403a
 -rw-r--r-- root/root    usr/share/terminfo/v/vc404
 -rw-r--r-- root/root    usr/share/terminfo/v/vc404-s
 -rw-r--r-- root/root    usr/share/terminfo/v/vc414
@@ -3343,38 +3343,38 @@ drwxr-xr-x root/root    usr/share/terminfo/v/
 -rw-r--r-- root/root    usr/share/terminfo/v/vi50adm
 -rw-r--r-- root/root    usr/share/terminfo/v/vi55
 -rw-r--r-- root/root    usr/share/terminfo/v/vi550
--rw-r--r-- root/root    usr/share/terminfo/v/vi603
+-rw-r--r-- root/root    usr/share/terminfo/v/vi603 -> usr/share/terminfo/v/visual603
 -rw-r--r-- root/root    usr/share/terminfo/v/viewdata
 -rw-r--r-- root/root    usr/share/terminfo/v/viewdata-o
 -rw-r--r-- root/root    usr/share/terminfo/v/viewdata-rv
--rw-r--r-- root/root    usr/share/terminfo/v/viewpoint
+-rw-r--r-- root/root    usr/share/terminfo/v/viewpoint -> usr/share/terminfo/a/addsviewpoint
 -rw-r--r-- root/root    usr/share/terminfo/v/viewpoint3a+
--rw-r--r-- root/root    usr/share/terminfo/v/viewpoint60
--rw-r--r-- root/root    usr/share/terminfo/v/viewpoint90
+-rw-r--r-- root/root    usr/share/terminfo/v/viewpoint60 -> usr/share/terminfo/a/addsvp60
+-rw-r--r-- root/root    usr/share/terminfo/v/viewpoint90 -> usr/share/terminfo/v/vp90
 -rw-r--r-- root/root    usr/share/terminfo/v/vip
--rw-r--r-- root/root    usr/share/terminfo/v/vip-H -> usr/share/terminfo/Q/Q310-vip-H-am
+-rw-r--r-- root/root    usr/share/terminfo/v/vip-H -> usr/share/terminfo/Q/Q310-vip-H
 -rw-r--r-- root/root    usr/share/terminfo/v/vip-Hw -> usr/share/terminfo/Q/Q310-vip-Hw
 -rw-r--r-- root/root    usr/share/terminfo/v/vip-w -> usr/share/terminfo/Q/Q310-vip-w
--rw-r--r-- root/root    usr/share/terminfo/v/vip7800-H -> usr/share/terminfo/Q/Q310-vip-H-am
+-rw-r--r-- root/root    usr/share/terminfo/v/vip7800-H -> usr/share/terminfo/Q/Q310-vip-H
 -rw-r--r-- root/root    usr/share/terminfo/v/vip7800-Hw -> usr/share/terminfo/Q/Q310-vip-Hw
 -rw-r--r-- root/root    usr/share/terminfo/v/vip7800-w -> usr/share/terminfo/Q/Q310-vip-w
 -rw-r--r-- root/root    usr/share/terminfo/v/visa50
--rw-r--r-- root/root    usr/share/terminfo/v/visual603 -> usr/share/terminfo/v/vi603
+-rw-r--r-- root/root    usr/share/terminfo/v/visual603
 -rw-r--r-- root/root    usr/share/terminfo/v/vitty -> usr/share/terminfo/t/tty5620-s
 -rw-r--r-- root/root    usr/share/terminfo/v/vk100 -> usr/share/terminfo/g/gigi
 -rw-r--r-- root/root    usr/share/terminfo/v/vp3a+ -> usr/share/terminfo/v/viewpoint3a+
--rw-r--r-- root/root    usr/share/terminfo/v/vp60 -> usr/share/terminfo/v/viewpoint60
--rw-r--r-- root/root    usr/share/terminfo/v/vp90 -> usr/share/terminfo/v/viewpoint90
+-rw-r--r-- root/root    usr/share/terminfo/v/vp60 -> usr/share/terminfo/a/addsvp60
+-rw-r--r-- root/root    usr/share/terminfo/v/vp90
 -rw-r--r-- root/root    usr/share/terminfo/v/vremote
--rw-r--r-- root/root    usr/share/terminfo/v/vs100 -> usr/share/terminfo/x/xterms
+-rw-r--r-- root/root    usr/share/terminfo/v/vs100 -> usr/share/terminfo/x/xterm-24
 -rw-r--r-- root/root    usr/share/terminfo/v/vs100-x10 -> usr/share/terminfo/x/x10term
 -rw-r--r-- root/root    usr/share/terminfo/v/vsc
 -rw-r--r-- root/root    usr/share/terminfo/v/vscode -> usr/share/terminfo/x/xterm.js
 -rw-r--r-- root/root    usr/share/terminfo/v/vscode-direct
 -rw-r--r-- root/root    usr/share/terminfo/v/vt-61 -> usr/share/terminfo/v/vt61
--rw-r--r-- root/root    usr/share/terminfo/v/vt-utf8
+-rw-r--r-- root/root    usr/share/terminfo/v/vt-utf8 -> usr/share/terminfo/m/ms-vt-utf8
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100
--rw-r--r-- root/root    usr/share/terminfo/v/vt100+
+-rw-r--r-- root/root    usr/share/terminfo/v/vt100+ -> usr/share/terminfo/m/ms-vt100+
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100+4bsd
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100+enq
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100+fnkeys
@@ -3389,17 +3389,17 @@ drwxr-xr-x root/root    usr/share/terminfo/v/
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100-nam
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100-nam-w -> usr/share/terminfo/v/vt100-w-nam
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100-nav
--rw-r--r-- root/root    usr/share/terminfo/v/vt100-nav-w
+-rw-r--r-- root/root    usr/share/terminfo/v/vt100-nav-w -> usr/share/terminfo/v/vt100-w-nav
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100-putty
--rw-r--r-- root/root    usr/share/terminfo/v/vt100-s
+-rw-r--r-- root/root    usr/share/terminfo/v/vt100-s -> usr/share/terminfo/v/vt100-s-top
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100-s-bot
--rw-r--r-- root/root    usr/share/terminfo/v/vt100-s-top -> usr/share/terminfo/v/vt100-s
--rw-r--r-- root/root    usr/share/terminfo/v/vt100-top-s -> usr/share/terminfo/v/vt100-s
+-rw-r--r-- root/root    usr/share/terminfo/v/vt100-s-top
+-rw-r--r-- root/root    usr/share/terminfo/v/vt100-top-s -> usr/share/terminfo/v/vt100-s-top
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100-vb
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100-w
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100-w-am -> usr/share/terminfo/v/vt100-w
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100-w-nam
--rw-r--r-- root/root    usr/share/terminfo/v/vt100-w-nav -> usr/share/terminfo/v/vt100-nav-w
+-rw-r--r-- root/root    usr/share/terminfo/v/vt100-w-nav
 -rw-r--r-- root/root    usr/share/terminfo/v/vt100nam -> usr/share/terminfo/v/vt100-nam
 -rw-r--r-- root/root    usr/share/terminfo/v/vt102
 -rw-r--r-- root/root    usr/share/terminfo/v/vt102+enq
@@ -3408,39 +3408,39 @@ drwxr-xr-x root/root    usr/share/terminfo/v/
 -rw-r--r-- root/root    usr/share/terminfo/v/vt125
 -rw-r--r-- root/root    usr/share/terminfo/v/vt131
 -rw-r--r-- root/root    usr/share/terminfo/v/vt132
--rw-r--r-- root/root    usr/share/terminfo/v/vt200 -> usr/share/terminfo/v/vt220
--rw-r--r-- root/root    usr/share/terminfo/v/vt200-8
--rw-r--r-- root/root    usr/share/terminfo/v/vt200-8bit -> usr/share/terminfo/v/vt200-8
--rw-r--r-- root/root    usr/share/terminfo/v/vt200-js
--rw-r--r-- root/root    usr/share/terminfo/v/vt200-old
--rw-r--r-- root/root    usr/share/terminfo/v/vt200-w
--rw-r--r-- root/root    usr/share/terminfo/v/vt220
+-rw-r--r-- root/root    usr/share/terminfo/v/vt200
+-rw-r--r-- root/root    usr/share/terminfo/v/vt200-8 -> usr/share/terminfo/v/vt200-8bit
+-rw-r--r-- root/root    usr/share/terminfo/v/vt200-8bit
+-rw-r--r-- root/root    usr/share/terminfo/v/vt200-js -> usr/share/terminfo/v/vt220-js
+-rw-r--r-- root/root    usr/share/terminfo/v/vt200-old -> usr/share/terminfo/v/vt220-old
+-rw-r--r-- root/root    usr/share/terminfo/v/vt200-w -> usr/share/terminfo/v/vt220-w
+-rw-r--r-- root/root    usr/share/terminfo/v/vt220 -> usr/share/terminfo/v/vt200
 -rw-r--r-- root/root    usr/share/terminfo/v/vt220+cvis
 -rw-r--r-- root/root    usr/share/terminfo/v/vt220+cvis8
 -rw-r--r-- root/root    usr/share/terminfo/v/vt220+keypad
 -rw-r--r-- root/root    usr/share/terminfo/v/vt220+pcedit
 -rw-r--r-- root/root    usr/share/terminfo/v/vt220+vtedit
--rw-r--r-- root/root    usr/share/terminfo/v/vt220-8 -> usr/share/terminfo/v/vt200-8
--rw-r--r-- root/root    usr/share/terminfo/v/vt220-8bit -> usr/share/terminfo/v/vt200-8
+-rw-r--r-- root/root    usr/share/terminfo/v/vt220-8 -> usr/share/terminfo/v/vt200-8bit
+-rw-r--r-- root/root    usr/share/terminfo/v/vt220-8bit -> usr/share/terminfo/v/vt200-8bit
 -rw-r--r-- root/root    usr/share/terminfo/v/vt220-base
--rw-r--r-- root/root    usr/share/terminfo/v/vt220-js -> usr/share/terminfo/v/vt200-js
+-rw-r--r-- root/root    usr/share/terminfo/v/vt220-js
 -rw-r--r-- root/root    usr/share/terminfo/v/vt220-nam -> usr/share/terminfo/v/v200-nam
--rw-r--r-- root/root    usr/share/terminfo/v/vt220-old -> usr/share/terminfo/v/vt200-old
--rw-r--r-- root/root    usr/share/terminfo/v/vt220-w -> usr/share/terminfo/v/vt200-w
+-rw-r--r-- root/root    usr/share/terminfo/v/vt220-old
+-rw-r--r-- root/root    usr/share/terminfo/v/vt220-w
 -rw-r--r-- root/root    usr/share/terminfo/v/vt220d
--rw-r--r-- root/root    usr/share/terminfo/v/vt300 -> usr/share/terminfo/v/vt320
+-rw-r--r-- root/root    usr/share/terminfo/v/vt300
 -rw-r--r-- root/root    usr/share/terminfo/v/vt300-nam -> usr/share/terminfo/v/vt320-nam
 -rw-r--r-- root/root    usr/share/terminfo/v/vt300-w
--rw-r--r-- root/root    usr/share/terminfo/v/vt300-w-nam
--rw-r--r-- root/root    usr/share/terminfo/v/vt320
+-rw-r--r-- root/root    usr/share/terminfo/v/vt300-w-nam -> usr/share/terminfo/v/vt320-w-nam
+-rw-r--r-- root/root    usr/share/terminfo/v/vt320 -> usr/share/terminfo/v/vt300
 -rw-r--r-- root/root    usr/share/terminfo/v/vt320-k3
 -rw-r--r-- root/root    usr/share/terminfo/v/vt320-k311
 -rw-r--r-- root/root    usr/share/terminfo/v/vt320-nam
 -rw-r--r-- root/root    usr/share/terminfo/v/vt320-w -> usr/share/terminfo/v/vt300-w
--rw-r--r-- root/root    usr/share/terminfo/v/vt320-w-nam -> usr/share/terminfo/v/vt300-w-nam
+-rw-r--r-- root/root    usr/share/terminfo/v/vt320-w-nam
 -rw-r--r-- root/root    usr/share/terminfo/v/vt320nam
--rw-r--r-- root/root    usr/share/terminfo/v/vt330 -> usr/share/terminfo/d/dec-vt340
--rw-r--r-- root/root    usr/share/terminfo/v/vt340 -> usr/share/terminfo/d/dec-vt340
+-rw-r--r-- root/root    usr/share/terminfo/v/vt330 -> usr/share/terminfo/d/dec-vt330
+-rw-r--r-- root/root    usr/share/terminfo/v/vt340 -> usr/share/terminfo/d/dec-vt330
 -rw-r--r-- root/root    usr/share/terminfo/v/vt400 -> usr/share/terminfo/d/dec-vt400
 -rw-r--r-- root/root    usr/share/terminfo/v/vt400-24 -> usr/share/terminfo/d/dec-vt400
 -rw-r--r-- root/root    usr/share/terminfo/v/vt420
@@ -3472,78 +3472,78 @@ drwxr-xr-x root/root    usr/share/terminfo/v/
 -rw-r--r-- root/root    usr/share/terminfo/v/vte-2018
 -rw-r--r-- root/root    usr/share/terminfo/v/vte-256color
 -rw-r--r-- root/root    usr/share/terminfo/v/vte-direct
--rw-r--r-- root/root    usr/share/terminfo/v/vtnt
--rw-r--r-- root/root    usr/share/terminfo/v/vv100
+-rw-r--r-- root/root    usr/share/terminfo/v/vtnt -> usr/share/terminfo/m/ms-vt100-color
+-rw-r--r-- root/root    usr/share/terminfo/v/vv100 -> usr/share/terminfo/m/mvterm
 -rw-r--r-- root/root    usr/share/terminfo/v/vwmterm
 drwxr-xr-x root/root    usr/share/terminfo/w/
 -rw-r--r-- root/root    usr/share/terminfo/w/wezterm
 -rw-r--r-- root/root    usr/share/terminfo/w/winconsole
--rw-r--r-- root/root    usr/share/terminfo/w/wren -> usr/share/terminfo/f/fenix
--rw-r--r-- root/root    usr/share/terminfo/w/wrenw -> usr/share/terminfo/f/fenixw
--rw-r--r-- root/root    usr/share/terminfo/w/wsiris
+-rw-r--r-- root/root    usr/share/terminfo/w/wren -> usr/share/terminfo/p/pt100
+-rw-r--r-- root/root    usr/share/terminfo/w/wrenw -> usr/share/terminfo/p/pt100w
+-rw-r--r-- root/root    usr/share/terminfo/w/wsiris -> usr/share/terminfo/i/iris40
 -rw-r--r-- root/root    usr/share/terminfo/w/wsvt25
 -rw-r--r-- root/root    usr/share/terminfo/w/wsvt25m
 -rw-r--r-- root/root    usr/share/terminfo/w/wy-75ap -> usr/share/terminfo/w/wy75ap
--rw-r--r-- root/root    usr/share/terminfo/w/wy-99fgt -> usr/share/terminfo/w/wy99f
+-rw-r--r-- root/root    usr/share/terminfo/w/wy-99fgt
 -rw-r--r-- root/root    usr/share/terminfo/w/wy-99fgta -> usr/share/terminfo/w/wy99fa
 -rw-r--r-- root/root    usr/share/terminfo/w/wy100
 -rw-r--r-- root/root    usr/share/terminfo/w/wy100q
--rw-r--r-- root/root    usr/share/terminfo/w/wy120 -> usr/share/terminfo/w/wyse150
+-rw-r--r-- root/root    usr/share/terminfo/w/wy120 -> usr/share/terminfo/w/wyse120
 -rw-r--r-- root/root    usr/share/terminfo/w/wy120-25 -> usr/share/terminfo/w/wyse120-25
 -rw-r--r-- root/root    usr/share/terminfo/w/wy120-25-w -> usr/share/terminfo/w/wy150-25-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy120-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy120-w -> usr/share/terminfo/w/wy150-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy120-w-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy120-wvb -> usr/share/terminfo/w/wy120-w-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy150 -> usr/share/terminfo/w/wyse150
+-rw-r--r-- root/root    usr/share/terminfo/w/wy120-vb -> usr/share/terminfo/w/wyse150-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy120-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy120-w-vb -> usr/share/terminfo/w/wy120-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy120-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy150 -> usr/share/terminfo/w/wyse120
 -rw-r--r-- root/root    usr/share/terminfo/w/wy150-25 -> usr/share/terminfo/w/wyse120-25
 -rw-r--r-- root/root    usr/share/terminfo/w/wy150-25-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy150-vb -> usr/share/terminfo/w/wy120-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy150-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy150-w-vb -> usr/share/terminfo/w/wy120-w-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy150-vb -> usr/share/terminfo/w/wyse150-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy150-w -> usr/share/terminfo/w/wy120-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy150-w-vb -> usr/share/terminfo/w/wy120-wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy160 -> usr/share/terminfo/w/wyse160
--rw-r--r-- root/root    usr/share/terminfo/w/wy160-25
+-rw-r--r-- root/root    usr/share/terminfo/w/wy160-25 -> usr/share/terminfo/w/wyse160-25
 -rw-r--r-- root/root    usr/share/terminfo/w/wy160-25-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy160-42 -> usr/share/terminfo/w/wyse160-42
 -rw-r--r-- root/root    usr/share/terminfo/w/wy160-42-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy160-43
--rw-r--r-- root/root    usr/share/terminfo/w/wy160-43-w -> usr/share/terminfo/w/wyse160-43-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy160-43-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy160-tek
--rw-r--r-- root/root    usr/share/terminfo/w/wy160-vb -> usr/share/terminfo/w/wyse160-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy160-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy160-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy160-w-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy160-wvb -> usr/share/terminfo/w/wy160-w-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy185
+-rw-r--r-- root/root    usr/share/terminfo/w/wy160-w-vb -> usr/share/terminfo/w/wy160-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy160-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy185 -> usr/share/terminfo/w/wyse185
 -rw-r--r-- root/root    usr/share/terminfo/w/wy185-24
 -rw-r--r-- root/root    usr/share/terminfo/w/wy185-vb -> usr/share/terminfo/w/wyse185-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy185-w -> usr/share/terminfo/w/wyse185-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy185-wvb -> usr/share/terminfo/w/wyse185-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy185-wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy30
 -rw-r--r-- root/root    usr/share/terminfo/w/wy30-mc -> usr/share/terminfo/w/wyse30-mc
--rw-r--r-- root/root    usr/share/terminfo/w/wy30-vb -> usr/share/terminfo/w/wyse30-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy30-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy325 -> usr/share/terminfo/w/wyse325
--rw-r--r-- root/root    usr/share/terminfo/w/wy325-25 -> usr/share/terminfo/w/wyse325-25
--rw-r--r-- root/root    usr/share/terminfo/w/wy325-25w
--rw-r--r-- root/root    usr/share/terminfo/w/wy325-42
--rw-r--r-- root/root    usr/share/terminfo/w/wy325-42w -> usr/share/terminfo/w/wyse325-42w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy325-25 -> usr/share/terminfo/w/wy325-80
+-rw-r--r-- root/root    usr/share/terminfo/w/wy325-25w -> usr/share/terminfo/w/wyse325-25w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy325-42 -> usr/share/terminfo/w/wyse325-42
+-rw-r--r-- root/root    usr/share/terminfo/w/wy325-42w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy325-42w-vb -> usr/share/terminfo/w/wy325-42wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy325-42wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy325-43 -> usr/share/terminfo/w/wyse325-43
 -rw-r--r-- root/root    usr/share/terminfo/w/wy325-43w
--rw-r--r-- root/root    usr/share/terminfo/w/wy325-43w-vb -> usr/share/terminfo/w/wy325-43wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wy325-43wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wy325-80 -> usr/share/terminfo/w/wyse325-25
+-rw-r--r-- root/root    usr/share/terminfo/w/wy325-43w-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy325-43wvb -> usr/share/terminfo/w/wy325-43w-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy325-80
 -rw-r--r-- root/root    usr/share/terminfo/w/wy325-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy325-w -> usr/share/terminfo/w/wy325w-24
--rw-r--r-- root/root    usr/share/terminfo/w/wy325-w-vb -> usr/share/terminfo/w/wyse325-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wy325-wvb -> usr/share/terminfo/w/wyse325-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wy325w-24
--rw-r--r-- root/root    usr/share/terminfo/w/wy350
--rw-r--r-- root/root    usr/share/terminfo/w/wy350-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy325-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy325-w-vb -> usr/share/terminfo/w/wy325-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy325-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy325w-24 -> usr/share/terminfo/w/wy325-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy350 -> usr/share/terminfo/w/wyse350
+-rw-r--r-- root/root    usr/share/terminfo/w/wy350-vb -> usr/share/terminfo/w/wyse350-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy350-w -> usr/share/terminfo/w/wyse350-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy350-wvb -> usr/share/terminfo/w/wyse350-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wy370 -> usr/share/terminfo/w/wy370-101k
--rw-r--r-- root/root    usr/share/terminfo/w/wy370-101k
+-rw-r--r-- root/root    usr/share/terminfo/w/wy350-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy370 -> usr/share/terminfo/w/wyse370
+-rw-r--r-- root/root    usr/share/terminfo/w/wy370-101k -> usr/share/terminfo/w/wyse370
 -rw-r--r-- root/root    usr/share/terminfo/w/wy370-105k
 -rw-r--r-- root/root    usr/share/terminfo/w/wy370-EPC
 -rw-r--r-- root/root    usr/share/terminfo/w/wy370-nk
@@ -3552,191 +3552,191 @@ drwxr-xr-x root/root    usr/share/terminfo/w/
 -rw-r--r-- root/root    usr/share/terminfo/w/wy370-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy370-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy370-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wy50
+-rw-r--r-- root/root    usr/share/terminfo/w/wy50 -> usr/share/terminfo/w/wyse50
 -rw-r--r-- root/root    usr/share/terminfo/w/wy50-mc -> usr/share/terminfo/w/wyse50-mc
--rw-r--r-- root/root    usr/share/terminfo/w/wy50-vb -> usr/share/terminfo/w/wyse50-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy50-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy50-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy50-w -> usr/share/terminfo/w/wyse50-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy50-wvb -> usr/share/terminfo/w/wyse50-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wy520 -> usr/share/terminfo/w/wyse520
+-rw-r--r-- root/root    usr/share/terminfo/w/wy520
 -rw-r--r-- root/root    usr/share/terminfo/w/wy520-24 -> usr/share/terminfo/w/wyse520-24
--rw-r--r-- root/root    usr/share/terminfo/w/wy520-36 -> usr/share/terminfo/w/wyse520-36
--rw-r--r-- root/root    usr/share/terminfo/w/wy520-36pc
+-rw-r--r-- root/root    usr/share/terminfo/w/wy520-36
+-rw-r--r-- root/root    usr/share/terminfo/w/wy520-36pc -> usr/share/terminfo/w/wyse520-36pc
 -rw-r--r-- root/root    usr/share/terminfo/w/wy520-36w -> usr/share/terminfo/w/wyse520-36w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy520-36wpc
 -rw-r--r-- root/root    usr/share/terminfo/w/wy520-48 -> usr/share/terminfo/w/wyse520-48
--rw-r--r-- root/root    usr/share/terminfo/w/wy520-48pc
--rw-r--r-- root/root    usr/share/terminfo/w/wy520-48w -> usr/share/terminfo/w/wyse520-48w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy520-48pc -> usr/share/terminfo/w/wyse520-48pc
+-rw-r--r-- root/root    usr/share/terminfo/w/wy520-48w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy520-48wpc -> usr/share/terminfo/w/wyse520-48wpc
--rw-r--r-- root/root    usr/share/terminfo/w/wy520-epc -> usr/share/terminfo/w/wyse520-epc
+-rw-r--r-- root/root    usr/share/terminfo/w/wy520-epc
 -rw-r--r-- root/root    usr/share/terminfo/w/wy520-epc-24 -> usr/share/terminfo/w/wyse520-pc-24
--rw-r--r-- root/root    usr/share/terminfo/w/wy520-epc-vb -> usr/share/terminfo/w/wyse520-pc-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy520-epc-w -> usr/share/terminfo/w/wyse520-epc-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy520-epc-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy520-epc-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy520-epc-wvb -> usr/share/terminfo/w/wyse520-p-wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy520-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy520-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy520-wvb -> usr/share/terminfo/w/wyse520-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wy60
+-rw-r--r-- root/root    usr/share/terminfo/w/wy520-w -> usr/share/terminfo/w/wyse520-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy520-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy60 -> usr/share/terminfo/w/wyse60
 -rw-r--r-- root/root    usr/share/terminfo/w/wy60-25 -> usr/share/terminfo/w/wyse60-25
 -rw-r--r-- root/root    usr/share/terminfo/w/wy60-25-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy60-316X -> usr/share/terminfo/w/wyse60-316X
--rw-r--r-- root/root    usr/share/terminfo/w/wy60-42 -> usr/share/terminfo/w/wyse60-42
--rw-r--r-- root/root    usr/share/terminfo/w/wy60-42-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy60-316X -> usr/share/terminfo/i/ibm3163
+-rw-r--r-- root/root    usr/share/terminfo/w/wy60-42
+-rw-r--r-- root/root    usr/share/terminfo/w/wy60-42-w -> usr/share/terminfo/w/wyse60-42-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy60-43 -> usr/share/terminfo/w/wyse60-43
 -rw-r--r-- root/root    usr/share/terminfo/w/wy60-43-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy60-AT -> usr/share/terminfo/w/wyse60-AT
--rw-r--r-- root/root    usr/share/terminfo/w/wy60-PC -> usr/share/terminfo/w/wyse60-PC
--rw-r--r-- root/root    usr/share/terminfo/w/wy60-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy60-AT -> usr/share/terminfo/i/ibm5151
+-rw-r--r-- root/root    usr/share/terminfo/w/wy60-PC -> usr/share/terminfo/i/ibmpc
+-rw-r--r-- root/root    usr/share/terminfo/w/wy60-vb -> usr/share/terminfo/w/wyse60-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy60-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy60-w-vb -> usr/share/terminfo/w/wy60-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wy60-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wy75
+-rw-r--r-- root/root    usr/share/terminfo/w/wy60-w-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy60-wvb -> usr/share/terminfo/w/wy60-w-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy75 -> usr/share/terminfo/w/wyse75
 -rw-r--r-- root/root    usr/share/terminfo/w/wy75-mc -> usr/share/terminfo/w/wyse75-mc
 -rw-r--r-- root/root    usr/share/terminfo/w/wy75-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy75-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy75-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy75-wvb -> usr/share/terminfo/w/wyse75-wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy75ap
 -rw-r--r-- root/root    usr/share/terminfo/w/wy85 -> usr/share/terminfo/w/wyse85
--rw-r--r-- root/root    usr/share/terminfo/w/wy85-8bit
--rw-r--r-- root/root    usr/share/terminfo/w/wy85-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy85-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy85-8bit -> usr/share/terminfo/w/wyse85-8bit
+-rw-r--r-- root/root    usr/share/terminfo/w/wy85-vb -> usr/share/terminfo/w/wyse85-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy85-w -> usr/share/terminfo/w/wyse85-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy85-wvb -> usr/share/terminfo/w/wyse85-wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wy99-ansi
 -rw-r--r-- root/root    usr/share/terminfo/w/wy99a-ansi
--rw-r--r-- root/root    usr/share/terminfo/w/wy99f
+-rw-r--r-- root/root    usr/share/terminfo/w/wy99f -> usr/share/terminfo/w/wy-99fgt
 -rw-r--r-- root/root    usr/share/terminfo/w/wy99fa
--rw-r--r-- root/root    usr/share/terminfo/w/wy99fgt -> usr/share/terminfo/w/wy99f
+-rw-r--r-- root/root    usr/share/terminfo/w/wy99fgt -> usr/share/terminfo/w/wy-99fgt
 -rw-r--r-- root/root    usr/share/terminfo/w/wy99fgta -> usr/share/terminfo/w/wy99fa
 -rw-r--r-- root/root    usr/share/terminfo/w/wy99gt
--rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-25
--rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-25-w -> usr/share/terminfo/w/wyse99gt-25-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-25 -> usr/share/terminfo/w/wyse99gt-25
+-rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-25-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-tek
--rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-vb -> usr/share/terminfo/w/wyse99gt-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-w
--rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-w-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-wvb -> usr/share/terminfo/w/wy99gt-w-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-w -> usr/share/terminfo/w/wyse99gt-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-w-vb -> usr/share/terminfo/w/wy99gt-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wy99gt-wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse+sl
--rw-r--r-- root/root    usr/share/terminfo/w/wyse-325 -> usr/share/terminfo/w/wyse325-25
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse-325 -> usr/share/terminfo/w/wy325-80
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse-75ap -> usr/share/terminfo/w/wy75ap
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse-vp
--rw-r--r-- root/root    usr/share/terminfo/w/wyse120 -> usr/share/terminfo/w/wyse150
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse120
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse120-25
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse120-25-w -> usr/share/terminfo/w/wy150-25-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse120-vb -> usr/share/terminfo/w/wy120-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse120-w -> usr/share/terminfo/w/wy150-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse120-wvb -> usr/share/terminfo/w/wy120-w-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse150
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse120-vb -> usr/share/terminfo/w/wyse150-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse120-w -> usr/share/terminfo/w/wy120-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse120-wvb -> usr/share/terminfo/w/wy120-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse150 -> usr/share/terminfo/w/wyse120
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse150-25 -> usr/share/terminfo/w/wyse120-25
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse150-25-w -> usr/share/terminfo/w/wy150-25-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse150-vb -> usr/share/terminfo/w/wy120-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse150-w -> usr/share/terminfo/w/wy150-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse150-w-vb -> usr/share/terminfo/w/wy120-w-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse150-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse150-w -> usr/share/terminfo/w/wy120-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse150-w-vb -> usr/share/terminfo/w/wy120-wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse160
--rw-r--r-- root/root    usr/share/terminfo/w/wyse160-25 -> usr/share/terminfo/w/wy160-25
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse160-25
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse160-25-w -> usr/share/terminfo/w/wy160-25-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse160-42
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse160-42-w -> usr/share/terminfo/w/wy160-42-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse160-43 -> usr/share/terminfo/w/wy160-43
--rw-r--r-- root/root    usr/share/terminfo/w/wyse160-43-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse160-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse160-43-w -> usr/share/terminfo/w/wy160-43-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse160-vb -> usr/share/terminfo/w/wy160-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse160-w -> usr/share/terminfo/w/wy160-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse160-wvb -> usr/share/terminfo/w/wy160-w-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse185 -> usr/share/terminfo/w/wy185
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse160-wvb -> usr/share/terminfo/w/wy160-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse185
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse185-24 -> usr/share/terminfo/w/wy185-24
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse185-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse185-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse185-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse185-wvb -> usr/share/terminfo/w/wy185-wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse30 -> usr/share/terminfo/w/wy30
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse30-mc
--rw-r--r-- root/root    usr/share/terminfo/w/wyse30-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse30-vb -> usr/share/terminfo/w/wy30-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse325
--rw-r--r-- root/root    usr/share/terminfo/w/wyse325-25
--rw-r--r-- root/root    usr/share/terminfo/w/wyse325-25w -> usr/share/terminfo/w/wy325-25w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse325-42 -> usr/share/terminfo/w/wy325-42
--rw-r--r-- root/root    usr/share/terminfo/w/wyse325-42w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse325-25 -> usr/share/terminfo/w/wy325-80
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse325-25w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse325-42
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse325-42w -> usr/share/terminfo/w/wy325-42w
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse325-43
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse325-43w -> usr/share/terminfo/w/wy325-43w
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse325-vb -> usr/share/terminfo/w/wy325-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse325-w -> usr/share/terminfo/w/wy325w-24
--rw-r--r-- root/root    usr/share/terminfo/w/wyse325-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse350 -> usr/share/terminfo/w/wy350
--rw-r--r-- root/root    usr/share/terminfo/w/wyse350-vb -> usr/share/terminfo/w/wy350-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse325-w -> usr/share/terminfo/w/wy325-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse325-wvb -> usr/share/terminfo/w/wy325-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse350
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse350-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse350-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse350-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse370 -> usr/share/terminfo/w/wy370-101k
--rw-r--r-- root/root    usr/share/terminfo/w/wyse50 -> usr/share/terminfo/w/wy50
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse350-wvb -> usr/share/terminfo/w/wy350-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse370
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse50
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse50-mc
--rw-r--r-- root/root    usr/share/terminfo/w/wyse50-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse50-w -> usr/share/terminfo/w/wy50-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse50-vb -> usr/share/terminfo/w/wy50-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse50-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse50-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse520
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse520 -> usr/share/terminfo/w/wy520
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse520-24
--rw-r--r-- root/root    usr/share/terminfo/w/wyse520-36
--rw-r--r-- root/root    usr/share/terminfo/w/wyse520-36pc -> usr/share/terminfo/w/wy520-36pc
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse520-36 -> usr/share/terminfo/w/wy520-36
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse520-36pc
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse520-36w
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse520-36wpc -> usr/share/terminfo/w/wy520-36wpc
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse520-48
--rw-r--r-- root/root    usr/share/terminfo/w/wyse520-48pc -> usr/share/terminfo/w/wy520-48pc
--rw-r--r-- root/root    usr/share/terminfo/w/wyse520-48w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse520-48pc
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse520-48w -> usr/share/terminfo/w/wy520-48w
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse520-48wpc
--rw-r--r-- root/root    usr/share/terminfo/w/wyse520-epc
--rw-r--r-- root/root    usr/share/terminfo/w/wyse520-epc-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse520-epc -> usr/share/terminfo/w/wy520-epc
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse520-epc-w -> usr/share/terminfo/w/wy520-epc-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse520-p-wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse520-pc-24
--rw-r--r-- root/root    usr/share/terminfo/w/wyse520-pc-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse520-pc-vb -> usr/share/terminfo/w/wy520-epc-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse520-vb -> usr/share/terminfo/w/wy520-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse520-w -> usr/share/terminfo/w/wy520-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse520-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse60 -> usr/share/terminfo/w/wy60
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse520-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse520-wvb -> usr/share/terminfo/w/wy520-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse60
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse60-25
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse60-25-w -> usr/share/terminfo/w/wy60-25-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse60-316X
--rw-r--r-- root/root    usr/share/terminfo/w/wyse60-42
--rw-r--r-- root/root    usr/share/terminfo/w/wyse60-42-w -> usr/share/terminfo/w/wy60-42-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse60-316X -> usr/share/terminfo/i/ibm3163
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse60-42 -> usr/share/terminfo/w/wy60-42
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse60-42-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse60-43
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse60-43-w -> usr/share/terminfo/w/wy60-43-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse60-AT
--rw-r--r-- root/root    usr/share/terminfo/w/wyse60-PC
--rw-r--r-- root/root    usr/share/terminfo/w/wyse60-vb -> usr/share/terminfo/w/wy60-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse60-AT -> usr/share/terminfo/i/ibm5151
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse60-PC -> usr/share/terminfo/i/ibmpc
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse60-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse60-w -> usr/share/terminfo/w/wy60-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse60-wvb -> usr/share/terminfo/w/wy60-wvb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse75 -> usr/share/terminfo/w/wy75
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse60-wvb -> usr/share/terminfo/w/wy60-w-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse75
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse75-mc
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse75-vb -> usr/share/terminfo/w/wy75-vb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse75-w -> usr/share/terminfo/w/wy75-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse75-wvb -> usr/share/terminfo/w/wy75-wvb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse75-wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse75ap -> usr/share/terminfo/w/wy75ap
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse85
--rw-r--r-- root/root    usr/share/terminfo/w/wyse85-8bit -> usr/share/terminfo/w/wy85-8bit
--rw-r--r-- root/root    usr/share/terminfo/w/wyse85-vb -> usr/share/terminfo/w/wy85-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse85-w -> usr/share/terminfo/w/wy85-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse85-8bit
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse85-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse85-w
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse85-wvb
 -rw-r--r-- root/root    usr/share/terminfo/w/wyse99gt -> usr/share/terminfo/w/wy99gt
--rw-r--r-- root/root    usr/share/terminfo/w/wyse99gt-25 -> usr/share/terminfo/w/wy99gt-25
--rw-r--r-- root/root    usr/share/terminfo/w/wyse99gt-25-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse99gt-vb
--rw-r--r-- root/root    usr/share/terminfo/w/wyse99gt-w -> usr/share/terminfo/w/wy99gt-w
--rw-r--r-- root/root    usr/share/terminfo/w/wyse99gt-wvb -> usr/share/terminfo/w/wy99gt-w-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse99gt-25
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse99gt-25-w -> usr/share/terminfo/w/wy99gt-25-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse99gt-vb -> usr/share/terminfo/w/wy99gt-vb
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse99gt-w
+-rw-r--r-- root/root    usr/share/terminfo/w/wyse99gt-wvb -> usr/share/terminfo/w/wy99gt-wvb
 drwxr-xr-x root/root    usr/share/terminfo/x/
 -rw-r--r-- root/root    usr/share/terminfo/x/x10term
 -rw-r--r-- root/root    usr/share/terminfo/x/x10term+sl
--rw-r--r-- root/root    usr/share/terminfo/x/x1700 -> usr/share/terminfo/x/xerox
--rw-r--r-- root/root    usr/share/terminfo/x/x1700-lm
--rw-r--r-- root/root    usr/share/terminfo/x/x1720 -> usr/share/terminfo/x/x1750
--rw-r--r-- root/root    usr/share/terminfo/x/x1750
--rw-r--r-- root/root    usr/share/terminfo/x/x68k -> usr/share/terminfo/x/x68k-ite
--rw-r--r-- root/root    usr/share/terminfo/x/x68k-ite
--rw-r--r-- root/root    usr/share/terminfo/x/x820
--rw-r--r-- root/root    usr/share/terminfo/x/xdku
--rw-r--r-- root/root    usr/share/terminfo/x/xenix
--rw-r--r-- root/root    usr/share/terminfo/x/xerox
--rw-r--r-- root/root    usr/share/terminfo/x/xerox-lm
--rw-r--r-- root/root    usr/share/terminfo/x/xerox1720 -> usr/share/terminfo/x/x1750
--rw-r--r-- root/root    usr/share/terminfo/x/xerox820 -> usr/share/terminfo/x/x820
+-rw-r--r-- root/root    usr/share/terminfo/x/x1700 -> usr/share/terminfo/d/diablo
+-rw-r--r-- root/root    usr/share/terminfo/x/x1700-lm -> usr/share/terminfo/1/1730-lm
+-rw-r--r-- root/root    usr/share/terminfo/x/x1720
+-rw-r--r-- root/root    usr/share/terminfo/x/x1750 -> usr/share/terminfo/x/x1720
+-rw-r--r-- root/root    usr/share/terminfo/x/x68k
+-rw-r--r-- root/root    usr/share/terminfo/x/x68k-ite -> usr/share/terminfo/x/x68k
+-rw-r--r-- root/root    usr/share/terminfo/x/x820 -> usr/share/terminfo/x/xerox820
+-rw-r--r-- root/root    usr/share/terminfo/x/xdku -> usr/share/terminfo/t/tws2103
+-rw-r--r-- root/root    usr/share/terminfo/x/xenix -> usr/share/terminfo/i/ibmx
+-rw-r--r-- root/root    usr/share/terminfo/x/xerox -> usr/share/terminfo/d/diablo
+-rw-r--r-- root/root    usr/share/terminfo/x/xerox-lm -> usr/share/terminfo/d/diablo1640-lm
+-rw-r--r-- root/root    usr/share/terminfo/x/xerox1720 -> usr/share/terminfo/x/x1720
+-rw-r--r-- root/root    usr/share/terminfo/x/xerox820
 -rw-r--r-- root/root    usr/share/terminfo/x/xfce
 -rw-r--r-- root/root    usr/share/terminfo/x/xgterm
 -rw-r--r-- root/root    usr/share/terminfo/x/xiterm
--rw-r--r-- root/root    usr/share/terminfo/x/xl83
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc
+-rw-r--r-- root/root    usr/share/terminfo/x/xl83 -> usr/share/terminfo/c/cyb83
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc -> usr/share/terminfo/d/darwin
 -rw-r--r-- root/root    usr/share/terminfo/x/xnuppc+100x37
 -rw-r--r-- root/root    usr/share/terminfo/x/xnuppc+112x37
 -rw-r--r-- root/root    usr/share/terminfo/x/xnuppc+128x40
@@ -3754,37 +3754,37 @@ drwxr-xr-x root/root    usr/share/terminfo/x/
 -rw-r--r-- root/root    usr/share/terminfo/x/xnuppc+c
 -rw-r--r-- root/root    usr/share/terminfo/x/xnuppc+f
 -rw-r--r-- root/root    usr/share/terminfo/x/xnuppc+f2
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-100x37
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-100x37-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-112x37
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-112x37-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-128x40
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-128x40-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-128x48
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-128x48-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-144x48
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-144x48-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-160x64
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-160x64-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-200x64
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-200x64-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-200x75
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-200x75-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-256x96
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-256x96-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-80x25
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-80x25-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-80x30
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-80x30-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-90x30
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-90x30-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-b
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-f
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-f2
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-m
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-m-b
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-m-f
--rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-m-f2
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-100x37 -> usr/share/terminfo/d/darwin-100x37
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-100x37-m -> usr/share/terminfo/d/darwin-100x37-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-112x37 -> usr/share/terminfo/d/darwin-112x37
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-112x37-m -> usr/share/terminfo/d/darwin-112x37-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-128x40 -> usr/share/terminfo/d/darwin-128x40
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-128x40-m -> usr/share/terminfo/d/darwin-128x40-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-128x48 -> usr/share/terminfo/d/darwin-128x48
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-128x48-m -> usr/share/terminfo/d/darwin-128x48-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-144x48 -> usr/share/terminfo/d/darwin-144x48
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-144x48-m -> usr/share/terminfo/d/darwin-144x48-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-160x64 -> usr/share/terminfo/d/darwin-160x64
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-160x64-m -> usr/share/terminfo/d/darwin-160x64-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-200x64 -> usr/share/terminfo/d/darwin-200x64
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-200x64-m -> usr/share/terminfo/d/darwin-200x64-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-200x75 -> usr/share/terminfo/d/darwin-200x75
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-200x75-m -> usr/share/terminfo/d/darwin-200x75-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-256x96 -> usr/share/terminfo/d/darwin-256x96
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-256x96-m -> usr/share/terminfo/d/darwin-256x96-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-80x25 -> usr/share/terminfo/d/darwin-80x25
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-80x25-m -> usr/share/terminfo/d/darwin-80x25-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-80x30 -> usr/share/terminfo/d/darwin-80x30
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-80x30-m -> usr/share/terminfo/d/darwin-80x30-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-90x30 -> usr/share/terminfo/d/darwin-90x30
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-90x30-m -> usr/share/terminfo/d/darwin-90x30-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-b -> usr/share/terminfo/d/darwin-b
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-f -> usr/share/terminfo/d/darwin-f
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-f2 -> usr/share/terminfo/d/darwin-f2
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-m -> usr/share/terminfo/d/darwin-m
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-m-b -> usr/share/terminfo/d/darwin-m-b
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-m-f -> usr/share/terminfo/d/darwin-m-f
+-rw-r--r-- root/root    usr/share/terminfo/x/xnuppc-m-f2 -> usr/share/terminfo/d/darwin-m-f2
 -rw-r--r-- root/root    usr/share/terminfo/x/xtalk
 -rw-r--r-- root/root    usr/share/terminfo/x/xterm
 -rw-r--r-- root/root    usr/share/terminfo/x/xterm+256color
@@ -3843,7 +3843,7 @@ drwxr-xr-x root/root    usr/share/terminfo/x/
 -rw-r--r-- root/root    usr/share/terminfo/x/xterm-1005
 -rw-r--r-- root/root    usr/share/terminfo/x/xterm-1006
 -rw-r--r-- root/root    usr/share/terminfo/x/xterm-16color
--rw-r--r-- root/root    usr/share/terminfo/x/xterm-24 -> usr/share/terminfo/x/xterms
+-rw-r--r-- root/root    usr/share/terminfo/x/xterm-24
 -rw-r--r-- root/root    usr/share/terminfo/x/xterm-256color
 -rw-r--r-- root/root    usr/share/terminfo/x/xterm-88color
 -rw-r--r-- root/root    usr/share/terminfo/x/xterm-8bit
@@ -3885,39 +3885,39 @@ drwxr-xr-x root/root    usr/share/terminfo/x/
 -rw-r--r-- root/root    usr/share/terminfo/x/xterm1
 -rw-r--r-- root/root    usr/share/terminfo/x/xtermc
 -rw-r--r-- root/root    usr/share/terminfo/x/xtermm
--rw-r--r-- root/root    usr/share/terminfo/x/xterms
+-rw-r--r-- root/root    usr/share/terminfo/x/xterms -> usr/share/terminfo/x/xterm-24
 -rw-r--r-- root/root    usr/share/terminfo/x/xterms-sun
--rw-r--r-- root/root    usr/share/terminfo/x/xwsh
+-rw-r--r-- root/root    usr/share/terminfo/x/xwsh -> usr/share/terminfo/i/iris-color
 drwxr-xr-x root/root    usr/share/terminfo/z/
--rw-r--r-- root/root    usr/share/terminfo/z/z-100 -> usr/share/terminfo/z/z110
--rw-r--r-- root/root    usr/share/terminfo/z/z-100bw -> usr/share/terminfo/z/z100bw
--rw-r--r-- root/root    usr/share/terminfo/z/z100 -> usr/share/terminfo/z/z110
--rw-r--r-- root/root    usr/share/terminfo/z/z100bw
--rw-r--r-- root/root    usr/share/terminfo/z/z110
--rw-r--r-- root/root    usr/share/terminfo/z/z110bw -> usr/share/terminfo/z/z100bw
--rw-r--r-- root/root    usr/share/terminfo/z/z19
+-rw-r--r-- root/root    usr/share/terminfo/z/z-100 -> usr/share/terminfo/h/h-100
+-rw-r--r-- root/root    usr/share/terminfo/z/z-100bw -> usr/share/terminfo/h/h-100bw
+-rw-r--r-- root/root    usr/share/terminfo/z/z100 -> usr/share/terminfo/h/h-100
+-rw-r--r-- root/root    usr/share/terminfo/z/z100bw -> usr/share/terminfo/h/h-100bw
+-rw-r--r-- root/root    usr/share/terminfo/z/z110 -> usr/share/terminfo/h/h-100
+-rw-r--r-- root/root    usr/share/terminfo/z/z110bw -> usr/share/terminfo/h/h-100bw
+-rw-r--r-- root/root    usr/share/terminfo/z/z19 -> usr/share/terminfo/h/h19-b
 -rw-r--r-- root/root    usr/share/terminfo/z/z29 -> usr/share/terminfo/z/z29b
--rw-r--r-- root/root    usr/share/terminfo/z/z29a -> usr/share/terminfo/z/z29a-kc-bc
--rw-r--r-- root/root    usr/share/terminfo/z/z29a-kc-bc
--rw-r--r-- root/root    usr/share/terminfo/z/z29a-kc-uc
--rw-r--r-- root/root    usr/share/terminfo/z/z29a-nkc-bc
--rw-r--r-- root/root    usr/share/terminfo/z/z29a-nkc-uc
+-rw-r--r-- root/root    usr/share/terminfo/z/z29a -> usr/share/terminfo/h/h29a-kc-bc
+-rw-r--r-- root/root    usr/share/terminfo/z/z29a-kc-bc -> usr/share/terminfo/h/h29a-kc-bc
+-rw-r--r-- root/root    usr/share/terminfo/z/z29a-kc-uc -> usr/share/terminfo/h/h29a-kc-uc
+-rw-r--r-- root/root    usr/share/terminfo/z/z29a-nkc-bc -> usr/share/terminfo/h/h29a-nkc-bc
+-rw-r--r-- root/root    usr/share/terminfo/z/z29a-nkc-uc -> usr/share/terminfo/h/h29a-nkc-uc
 -rw-r--r-- root/root    usr/share/terminfo/z/z29b
 -rw-r--r-- root/root    usr/share/terminfo/z/z30
 -rw-r--r-- root/root    usr/share/terminfo/z/z340
 -rw-r--r-- root/root    usr/share/terminfo/z/z340-nam
 -rw-r--r-- root/root    usr/share/terminfo/z/z39-a -> usr/share/terminfo/z/zenith39-ansi
 -rw-r--r-- root/root    usr/share/terminfo/z/z39a -> usr/share/terminfo/z/zenith39-ansi
--rw-r--r-- root/root    usr/share/terminfo/z/z50 -> usr/share/terminfo/z/zen50
--rw-r--r-- root/root    usr/share/terminfo/z/z8001
+-rw-r--r-- root/root    usr/share/terminfo/z/z50
+-rw-r--r-- root/root    usr/share/terminfo/z/z8001 -> usr/share/terminfo/c/cci
 -rw-r--r-- root/root    usr/share/terminfo/z/zen30 -> usr/share/terminfo/z/z30
--rw-r--r-- root/root    usr/share/terminfo/z/zen50
--rw-r--r-- root/root    usr/share/terminfo/z/zen8001 -> usr/share/terminfo/z/z8001
--rw-r--r-- root/root    usr/share/terminfo/z/zenith -> usr/share/terminfo/z/z19
+-rw-r--r-- root/root    usr/share/terminfo/z/zen50 -> usr/share/terminfo/z/z50
+-rw-r--r-- root/root    usr/share/terminfo/z/zen8001 -> usr/share/terminfo/c/cci
+-rw-r--r-- root/root    usr/share/terminfo/z/zenith -> usr/share/terminfo/h/h19-b
 -rw-r--r-- root/root    usr/share/terminfo/z/zenith29 -> usr/share/terminfo/z/z29b
 -rw-r--r-- root/root    usr/share/terminfo/z/zenith39-a -> usr/share/terminfo/z/zenith39-ansi
 -rw-r--r-- root/root    usr/share/terminfo/z/zenith39-ansi
--rw-r--r-- root/root    usr/share/terminfo/z/zt-1 -> usr/share/terminfo/z/ztx11
--rw-r--r-- root/root    usr/share/terminfo/z/ztx -> usr/share/terminfo/z/ztx11
--rw-r--r-- root/root    usr/share/terminfo/z/ztx-1-a -> usr/share/terminfo/z/ztx11
--rw-r--r-- root/root    usr/share/terminfo/z/ztx11
+-rw-r--r-- root/root    usr/share/terminfo/z/zt-1 -> usr/share/terminfo/h/htx11
+-rw-r--r-- root/root    usr/share/terminfo/z/ztx -> usr/share/terminfo/h/htx11
+-rw-r--r-- root/root    usr/share/terminfo/z/ztx-1-a -> usr/share/terminfo/h/htx11
+-rw-r--r-- root/root    usr/share/terminfo/z/ztx11 -> usr/share/terminfo/h/htx11