The branch vendor/ncurses has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=bf0ab54638a5ef969749f6ceae30e864f9556ea8
commit bf0ab54638a5ef969749f6ceae30e864f9556ea8 Author: Baptiste Daroussin <b...@freebsd.org> AuthorDate: 2021-02-25 17:22:00 +0000 Commit: Baptiste Daroussin <b...@freebsd.org> CommitDate: 2021-02-25 17:22:00 +0000 Vendor import ncurses 6.2-20210220 --- Ada95/Makefile.in | 14 +- Ada95/aclocal.m4 | 858 +- Ada95/configure | 7521 ++++--- Ada95/configure.in | 23 +- Ada95/doc/Makefile.in | 6 +- Ada95/gen/Makefile.in | 17 +- Ada95/gen/gen.c | 210 +- Ada95/package/debian/compat | 2 +- Ada95/package/debian/copyright | 7 +- Ada95/samples/Makefile.in | 14 +- Ada95/src/Makefile.in | 89 +- Ada95/src/library.gpr.in | 16 +- Ada95/src/terminal_interface-curses-mouse.adb | 5 +- COPYING | 4 +- INSTALL | 116 +- MANIFEST | 11 +- NEWS | 469 +- README.MinGW | 139 +- VERSION | 2 +- aclocal.m4 | 1536 +- announce.html.in | 10 +- c++/Makefile.in | 63 +- c++/cursesapp.cc | 11 +- c++/cursesapp.h | 21 +- c++/cursesf.cc | 13 +- c++/cursesf.h | 39 +- c++/cursesm.h | 12 +- c++/cursesmain.cc | 4 +- c++/cursesp.h | 4 +- c++/cursesw.h | 21 +- c++/cursslk.cc | 6 +- c++/cursslk.h | 20 +- c++/demo.cc | 22 +- c++/etip.h.in | 17 +- c++/internal.h | 8 +- configure | 21719 ++++++++++--------- configure.in | 275 +- convert_configure.pl | 120 - dist.mk | 8 +- doc/html/ada/funcs/M.htm | 2 +- doc/html/ada/funcs/U.htm | 2 +- doc/html/ada/funcs/W.htm | 2 +- .../ada/terminal_interface-curses-mouse__adb.htm | 43 +- .../ada/terminal_interface-curses-mouse__ads.htm | 18 +- doc/html/announce.html | 11 +- doc/html/man/adacurses6-config.1.html | 2 +- doc/html/man/captoinfo.1m.html | 14 +- doc/html/man/clear.1.html | 41 +- doc/html/man/curs_add_wch.3x.html | 132 +- doc/html/man/curs_add_wchstr.3x.html | 5 +- doc/html/man/curs_addch.3x.html | 101 +- doc/html/man/curs_addchstr.3x.html | 21 +- doc/html/man/curs_addstr.3x.html | 23 +- doc/html/man/curs_addwstr.3x.html | 3 +- doc/html/man/curs_attr.3x.html | 4 +- doc/html/man/curs_beep.3x.html | 14 +- doc/html/man/curs_bkgd.3x.html | 32 +- doc/html/man/curs_bkgrnd.3x.html | 12 +- doc/html/man/curs_border.3x.html | 34 +- doc/html/man/curs_clear.3x.html | 40 +- doc/html/man/curs_color.3x.html | 24 +- doc/html/man/curs_delch.3x.html | 20 +- doc/html/man/curs_deleteln.3x.html | 26 +- doc/html/man/curs_extend.3x.html | 14 +- doc/html/man/curs_get_wch.3x.html | 3 +- doc/html/man/curs_get_wstr.3x.html | 3 +- doc/html/man/curs_getcchar.3x.html | 16 +- doc/html/man/curs_getch.3x.html | 12 +- doc/html/man/curs_getstr.3x.html | 19 +- doc/html/man/curs_getyx.3x.html | 33 +- doc/html/man/curs_in_wch.3x.html | 9 +- doc/html/man/curs_in_wchstr.3x.html | 3 +- doc/html/man/curs_inch.3x.html | 21 +- doc/html/man/curs_inchstr.3x.html | 19 +- doc/html/man/curs_initscr.3x.html | 4 +- doc/html/man/curs_inopts.3x.html | 137 +- doc/html/man/curs_ins_wch.3x.html | 9 +- doc/html/man/curs_ins_wstr.3x.html | 3 +- doc/html/man/curs_insch.3x.html | 19 +- doc/html/man/curs_insstr.3x.html | 31 +- doc/html/man/curs_instr.3x.html | 27 +- doc/html/man/curs_inwstr.3x.html | 19 +- doc/html/man/curs_kernel.3x.html | 6 +- doc/html/man/curs_legacy.3x.html | 43 +- doc/html/man/curs_memleaks.3x.html | 50 +- doc/html/man/curs_mouse.3x.html | 13 +- doc/html/man/curs_move.3x.html | 6 +- doc/html/man/curs_opaque.3x.html | 32 +- doc/html/man/curs_outopts.3x.html | 82 +- doc/html/man/curs_print.3x.html | 14 +- doc/html/man/curs_printw.3x.html | 60 +- doc/html/man/curs_refresh.3x.html | 11 +- doc/html/man/curs_scanw.3x.html | 77 +- doc/html/man/curs_scr_dump.3x.html | 10 +- doc/html/man/curs_scroll.3x.html | 9 +- doc/html/man/curs_slk.3x.html | 3 +- doc/html/man/curs_sp_funcs.3x.html | 275 +- doc/html/man/curs_termattrs.3x.html | 25 +- doc/html/man/curs_termcap.3x.html | 88 +- doc/html/man/curs_terminfo.3x.html | 145 +- doc/html/man/curs_threads.3x.html | 26 +- doc/html/man/curs_touch.3x.html | 18 +- doc/html/man/curs_util.3x.html | 52 +- doc/html/man/curs_variables.3x.html | 2 +- doc/html/man/default_colors.3x.html | 50 +- doc/html/man/define_key.3x.html | 12 +- doc/html/man/form.3x.html | 43 +- doc/html/man/form_cursor.3x.html | 9 +- doc/html/man/form_data.3x.html | 11 +- doc/html/man/form_driver.3x.html | 31 +- doc/html/man/form_field.3x.html | 25 +- doc/html/man/form_field_attributes.3x.html | 25 +- doc/html/man/form_field_buffer.3x.html | 32 +- doc/html/man/form_field_info.3x.html | 34 +- doc/html/man/form_field_just.3x.html | 15 +- doc/html/man/form_field_new.3x.html | 23 +- doc/html/man/form_field_opts.3x.html | 28 +- doc/html/man/form_field_userptr.3x.html | 17 +- doc/html/man/form_field_validation.3x.html | 159 +- doc/html/man/form_fieldtype.3x.html | 140 +- doc/html/man/form_hook.3x.html | 26 +- doc/html/man/form_new.3x.html | 13 +- doc/html/man/form_new_page.3x.html | 11 +- doc/html/man/form_opts.3x.html | 16 +- doc/html/man/form_page.3x.html | 22 +- doc/html/man/form_post.3x.html | 15 +- doc/html/man/form_requestname.3x.html | 26 +- doc/html/man/form_userptr.3x.html | 13 +- doc/html/man/form_variables.3x.html | 9 +- doc/html/man/form_win.3x.html | 35 +- doc/html/man/infocmp.1m.html | 223 +- doc/html/man/infotocap.1m.html | 6 +- doc/html/man/key_defined.3x.html | 4 +- doc/html/man/keybound.3x.html | 8 +- doc/html/man/keyok.3x.html | 4 +- doc/html/man/legacy_coding.3x.html | 8 +- doc/html/man/menu.3x.html | 41 +- doc/html/man/menu_attributes.3x.html | 30 +- doc/html/man/menu_cursor.3x.html | 17 +- doc/html/man/menu_driver.3x.html | 25 +- doc/html/man/menu_format.3x.html | 17 +- doc/html/man/menu_hook.3x.html | 26 +- doc/html/man/menu_items.3x.html | 15 +- doc/html/man/menu_mark.3x.html | 13 +- doc/html/man/menu_new.3x.html | 13 +- doc/html/man/menu_opts.3x.html | 23 +- doc/html/man/menu_pattern.3x.html | 13 +- doc/html/man/menu_post.3x.html | 15 +- doc/html/man/menu_requestname.3x.html | 13 +- doc/html/man/menu_spacing.3x.html | 23 +- doc/html/man/menu_userptr.3x.html | 13 +- doc/html/man/menu_win.3x.html | 35 +- doc/html/man/mitem_current.3x.html | 21 +- doc/html/man/mitem_name.3x.html | 13 +- doc/html/man/mitem_new.3x.html | 13 +- doc/html/man/mitem_opts.3x.html | 16 +- doc/html/man/mitem_userptr.3x.html | 17 +- doc/html/man/mitem_value.3x.html | 11 +- doc/html/man/mitem_visible.3x.html | 9 +- doc/html/man/ncurses.3x.html | 892 +- doc/html/man/ncurses6-config.1.html | 8 +- doc/html/man/new_pair.3x.html | 60 +- doc/html/man/panel.3x.html | 44 +- doc/html/man/resizeterm.3x.html | 32 +- doc/html/man/scr_dump.5.html | 85 +- doc/html/man/tabs.1.html | 113 +- doc/html/man/term.5.html | 288 +- doc/html/man/term.7.html | 56 +- doc/html/man/terminfo.5.html | 1493 +- doc/html/man/tic.1m.html | 276 +- doc/html/man/toe.1m.html | 48 +- doc/html/man/tput.1.html | 184 +- doc/html/man/tset.1.html | 187 +- doc/html/man/user_caps.5.html | 136 +- doc/html/man/wresize.3x.html | 4 +- form/Makefile.in | 39 +- form/f_trace.c | 12 +- form/fld_arg.c | 8 +- form/fld_attr.c | 16 +- form/fld_current.c | 10 +- form/fld_def.c | 18 +- form/fld_dup.c | 15 +- form/fld_ftchoice.c | 4 +- form/fld_ftlink.c | 4 +- form/fld_info.c | 10 +- form/fld_just.c | 12 +- form/fld_link.c | 8 +- form/fld_max.c | 4 +- form/fld_move.c | 10 +- form/fld_newftyp.c | 8 +- form/fld_opts.c | 12 +- form/fld_pad.c | 8 +- form/fld_page.c | 10 +- form/fld_stat.c | 10 +- form/fld_type.c | 8 +- form/fld_user.c | 10 +- form/form.h | 203 +- form/form.priv.h | 76 +- form/frm_cursor.c | 4 +- form/frm_data.c | 8 +- form/frm_def.c | 82 +- form/frm_driver.c | 78 +- form/frm_hook.c | 6 +- form/frm_opts.c | 18 +- form/frm_page.c | 6 +- form/frm_post.c | 6 +- form/frm_req_name.c | 6 +- form/frm_scale.c | 4 +- form/frm_sub.c | 6 +- form/frm_user.c | 10 +- form/frm_win.c | 6 +- form/fty_alnum.c | 12 +- form/fty_alpha.c | 12 +- form/fty_enum.c | 11 +- form/fty_generic.c | 19 +- form/fty_int.c | 15 +- form/fty_ipv4.c | 8 +- form/fty_num.c | 15 +- form/fty_regex.c | 12 +- include/Caps | 10 +- include/Caps-ncurses | 12 +- include/Caps.aix4 | 10 +- include/Caps.hpux11 | 10 +- include/Caps.keys | 10 +- include/Caps.osf1r5 | 10 +- include/Caps.uwin | 10 +- include/MKkey_defs.sh | 14 +- include/MKterm.h.awk.in | 37 +- include/Makefile.in | 20 +- include/curses.events | 55 + include/curses.h.in | 54 +- include/headers | 4 +- include/nc_alloc.h | 4 +- include/nc_mingw.h | 23 +- include/nc_termios.h | 8 +- include/nc_tparm.h | 14 +- include/nc_win32.h | 183 + include/ncurses_cfg.hin | 4 +- include/ncurses_defs | 6 +- include/ncurses_dll.h.in | 70 +- include/term_entry.h | 6 +- include/win32_curses.h | 75 + man/curs_add_wch.3x | 23 +- man/curs_add_wchstr.3x | 8 +- man/curs_addch.3x | 38 +- man/curs_addchstr.3x | 24 +- man/curs_addstr.3x | 20 +- man/curs_addwstr.3x | 4 +- man/curs_bkgd.3x | 6 +- man/curs_bkgrnd.3x | 6 +- man/curs_border.3x | 38 +- man/curs_clear.3x | 36 +- man/curs_color.3x | 20 +- man/curs_delch.3x | 8 +- man/curs_deleteln.3x | 14 +- man/curs_extend.3x | 4 +- man/curs_get_wch.3x | 4 +- man/curs_get_wstr.3x | 4 +- man/curs_getch.3x | 10 +- man/curs_getstr.3x | 20 +- man/curs_getyx.3x | 10 +- man/curs_in_wch.3x | 6 +- man/curs_in_wchstr.3x | 4 +- man/curs_inch.3x | 10 +- man/curs_inchstr.3x | 20 +- man/curs_initscr.3x | 6 +- man/curs_inopts.3x | 79 +- man/curs_ins_wch.3x | 10 +- man/curs_ins_wstr.3x | 4 +- man/curs_insch.3x | 12 +- man/curs_insstr.3x | 20 +- man/curs_instr.3x | 20 +- man/curs_inwstr.3x | 4 +- man/curs_kernel.3x | 10 +- man/curs_legacy.3x | 28 +- man/curs_memleaks.3x | 23 +- man/curs_mouse.3x | 17 +- man/curs_move.3x | 6 +- man/curs_opaque.3x | 32 +- man/curs_outopts.3x | 101 +- man/curs_print.3x | 6 +- man/curs_printw.3x | 52 +- man/curs_refresh.3x | 12 +- man/curs_scanw.3x | 54 +- man/curs_scr_dump.3x | 10 +- man/curs_scroll.3x | 10 +- man/curs_slk.3x | 4 +- man/curs_sp_funcs.3x | 289 +- man/curs_termcap.3x | 83 +- man/curs_terminfo.3x | 60 +- man/curs_threads.3x | 14 +- man/curs_touch.3x | 22 +- man/curs_util.3x | 37 +- man/curs_variables.3x | 4 +- man/default_colors.3x | 8 +- man/define_key.3x | 4 +- man/form.3x | 12 +- man/form_cursor.3x | 6 +- man/form_data.3x | 8 +- man/form_driver.3x | 6 +- man/form_field.3x | 14 +- man/form_field_attributes.3x | 20 +- man/form_field_buffer.3x | 18 +- man/form_field_info.3x | 18 +- man/form_field_just.3x | 8 +- man/form_field_new.3x | 20 +- man/form_field_opts.3x | 14 +- man/form_field_userptr.3x | 11 +- man/form_field_validation.3x | 104 +- man/form_fieldtype.3x | 119 +- man/form_hook.3x | 26 +- man/form_new.3x | 10 +- man/form_new_page.3x | 8 +- man/form_opts.3x | 14 +- man/form_page.3x | 22 +- man/form_post.3x | 8 +- man/form_requestname.3x | 17 +- man/form_userptr.3x | 10 +- man/form_variables.3x | 5 +- man/form_win.3x | 18 +- man/infocmp.1m | 6 +- man/infotocap.1m | 6 +- man/key_defined.3x | 4 +- man/keybound.3x | 4 +- man/keyok.3x | 4 +- man/legacy_coding.3x | 4 +- man/manhtml.aliases | 11 +- man/manhtml.externs | 4 +- man/manlinks.sed | 8 +- man/menu_attributes.3x | 26 +- man/menu_cursor.3x | 6 +- man/menu_driver.3x | 10 +- man/menu_format.3x | 8 +- man/menu_hook.3x | 26 +- man/menu_items.3x | 12 +- man/menu_mark.3x | 10 +- man/menu_new.3x | 10 +- man/menu_opts.3x | 14 +- man/menu_pattern.3x | 10 +- man/menu_post.3x | 8 +- man/menu_requestname.3x | 12 +- man/menu_spacing.3x | 20 +- man/menu_userptr.3x | 10 +- man/menu_win.3x | 18 +- man/mitem_current.3x | 20 +- man/mitem_name.3x | 10 +- man/mitem_new.3x | 10 +- man/mitem_opts.3x | 14 +- man/mitem_userptr.3x | 10 +- man/mitem_value.3x | 8 +- man/mitem_visible.3x | 6 +- man/ncurses.3x | 185 +- man/new_pair.3x | 8 +- man/resizeterm.3x | 8 +- man/tabs.1 | 4 +- man/term.5 | 124 +- man/terminfo.tail | 6 +- man/tic.1m | 4 +- man/toe.1m | 6 +- man/tput.1 | 8 +- man/user_caps.5 | 19 +- man/wresize.3x | 4 +- menu/Makefile.in | 31 +- menu/m_attribs.c | 6 +- menu/m_cursor.c | 16 +- menu/m_driver.c | 10 +- menu/m_format.c | 10 +- menu/m_global.c | 62 +- menu/m_hook.c | 6 +- menu/m_item_cur.c | 16 +- menu/m_item_nam.c | 10 +- menu/m_item_new.c | 24 +- menu/m_item_opt.c | 18 +- menu/m_item_top.c | 12 +- menu/m_item_use.c | 10 +- menu/m_item_val.c | 10 +- menu/m_item_vis.c | 6 +- menu/m_items.c | 16 +- menu/m_new.c | 19 +- menu/m_opts.c | 20 +- menu/m_pad.c | 12 +- menu/m_pattern.c | 10 +- menu/m_post.c | 22 +- menu/m_req_name.c | 6 +- menu/m_scale.c | 6 +- menu/m_spacing.c | 10 +- menu/m_sub.c | 10 +- menu/m_trace.c | 20 +- menu/m_userptr.c | 10 +- menu/m_win.c | 10 +- menu/menu.h | 330 +- menu/menu.priv.h | 40 +- misc/Makefile.in | 8 +- misc/gen-pkgconfig.in | 58 +- misc/ncurses-config.in | 45 +- misc/terminfo.src | 2071 +- mk-1st.awk | 36 +- mk-2nd.awk | 11 +- mk-hdr.awk | 11 +- ncurses/Makefile.in | 46 +- ncurses/base/MKlib_gen.sh | 17 +- ncurses/base/lib_addch.c | 18 +- ncurses/base/lib_addstr.c | 10 +- ncurses/base/lib_bkgd.c | 74 +- ncurses/base/lib_color.c | 45 +- ncurses/base/lib_driver.c | 4 +- ncurses/base/lib_getch.c | 74 +- ncurses/base/lib_getstr.c | 3 +- ncurses/base/lib_initscr.c | 9 +- ncurses/base/lib_mouse.c | 62 +- ncurses/base/lib_newterm.c | 13 +- ncurses/base/lib_screen.c | 8 +- ncurses/base/lib_set_term.c | 29 +- ncurses/base/new_pair.c | 27 +- ncurses/base/wresize.c | 12 +- ncurses/curses.priv.h | 79 +- ncurses/llib-lncurses | 283 +- ncurses/llib-lncursest | 283 +- ncurses/llib-lncursestw | 419 +- ncurses/llib-lncursesw | 419 +- ncurses/llib-ltinfo | 17 + ncurses/llib-ltinfot | 17 + ncurses/llib-ltinfotw | 17 + ncurses/llib-ltinfow | 17 + ncurses/modules | 8 +- ncurses/new_pair.h | 5 +- ncurses/report_hashing.c | 73 + ncurses/tinfo/MKcaptab.sh | 0 ncurses/tinfo/MKfallback.sh | 16 +- ncurses/tinfo/access.c | 12 +- ncurses/tinfo/captoinfo.c | 13 +- ncurses/tinfo/comp_parse.c | 4 +- ncurses/tinfo/doalloc.c | 4 +- ncurses/tinfo/lib_baudrate.c | 20 +- ncurses/tinfo/lib_cur_term.c | 7 +- ncurses/tinfo/lib_data.c | 7 +- ncurses/tinfo/lib_kernel.c | 12 +- ncurses/tinfo/lib_napms.c | 4 +- ncurses/tinfo/lib_options.c | 6 +- ncurses/tinfo/lib_print.c | 6 +- ncurses/tinfo/lib_raw.c | 11 +- ncurses/tinfo/lib_setup.c | 29 +- ncurses/tinfo/lib_tgoto.c | 4 +- ncurses/tinfo/lib_tparm.c | 459 +- ncurses/tinfo/lib_tputs.c | 16 +- ncurses/tinfo/lib_ttyflags.c | 6 +- ncurses/tinfo/lib_win32con.c | 1256 ++ ncurses/tinfo/lib_win32util.c | 134 + ncurses/tinfo/parse_entry.c | 10 +- ncurses/tinfo/read_entry.c | 16 +- ncurses/tinfo/tinfo_driver.c | 137 +- ncurses/tinfo/trim_sgr0.c | 4 +- ncurses/tinfo/write_entry.c | 4 +- ncurses/trace/lib_trace.c | 6 +- ncurses/trace/lib_tracebits.c | 42 +- ncurses/tty/hashmap.c | 4 +- ncurses/tty/lib_mvcur.c | 105 +- ncurses/tty/lib_twait.c | 4 +- ncurses/tty/lib_vidattr.c | 22 +- ncurses/tty/tty_update.c | 62 +- ncurses/wcwidth.h | 8 +- ncurses/widechar/lib_cchar.c | 16 +- ncurses/widechar/lib_ins_wch.c | 6 +- ncurses/widechar/lib_vid_attr.c | 23 +- ncurses/widechar/widechars.c | 6 +- ncurses/win32con/gettimeofday.c | 4 +- ncurses/win32con/wcwidth.c | 10 +- ncurses/win32con/win32_driver.c | 1221 ++ ncurses/win32con/win_driver.c | 22 +- package/debian-mingw/changelog | 4 +- package/debian-mingw/compat | 2 +- package/debian-mingw/copyright | 5 +- package/debian-mingw64/changelog | 4 +- package/debian-mingw64/compat | 2 +- package/debian-mingw64/copyright | 5 +- package/debian/changelog | 4 +- package/debian/compat | 2 +- package/debian/copyright | 5 +- package/debian/rules | 24 +- package/mingw-ncurses.nsi | 8 +- package/mingw-ncurses.spec | 2 +- package/ncurses.map | 9 +- package/ncurses.spec | 2 +- package/ncursest.map | 9 +- package/ncursest.spec | 2 +- package/ncursestw.map | 9 +- package/ncursesw.map | 9 +- panel/Makefile.in | 28 +- panel/llib-lpanel | 3 +- panel/llib-lpanelt | 3 +- panel/llib-lpaneltw | 3 +- panel/llib-lpanelw | 3 +- panel/p_above.c | 6 +- panel/p_below.c | 6 +- panel/p_bottom.c | 6 +- panel/p_delete.c | 17 +- panel/p_hidden.c | 4 +- panel/p_hide.c | 6 +- panel/p_move.c | 4 +- panel/p_new.c | 54 +- panel/p_replace.c | 4 +- panel/p_show.c | 6 +- panel/p_top.c | 4 +- panel/p_update.c | 6 +- panel/p_user.c | 6 +- panel/p_win.c | 4 +- panel/panel.c | 34 +- panel/panel.h | 49 +- panel/panel.priv.h | 22 +- progs/Makefile.in | 24 +- progs/dump_entry.c | 22 +- progs/dump_entry.h | 4 +- progs/infocmp.c | 9 +- progs/progs.priv.h | 20 +- progs/reset_cmd.c | 43 +- progs/tabs.c | 4 +- progs/tic.c | 124 +- progs/tparm_type.c | 30 +- progs/tparm_type.h | 6 +- progs/tput.c | 20 +- progs/tset.c | 15 +- test/Makefile.in | 25 +- test/README | 154 +- test/aclocal.m4 | 720 +- test/back_ground.c | 300 + test/background.c | 5 +- test/clip_printw.c | 7 +- test/color_name.h | 4 +- test/configure | 10358 +++++---- test/configure.in | 18 +- test/demo_defkey.c | 6 +- test/demo_forms.c | 32 +- test/demo_new_pair.c | 44 +- test/demo_terminfo.c | 6 +- test/dots.c | 23 +- test/dots_curses.c | 26 +- test/dots_mvcur.c | 23 +- test/dots_termcap.c | 29 +- test/dots_xcurses.c | 25 +- test/dup_field.c | 394 + test/filter.c | 3 +- test/modules | 16 +- test/move_field.c | 524 + test/ncurses.c | 13 +- test/package/debian-mingw/compat | 2 +- test/package/debian-mingw/copyright | 5 +- test/package/debian-mingw64/compat | 2 +- test/package/debian-mingw64/copyright | 5 +- test/package/debian/compat | 2 +- test/package/debian/copyright | 3 +- test/picsmap.c | 20 +- test/programs | 8 +- test/railroad.c | 6 +- test/rain.c | 4 +- test/tclock.c | 4 +- test/test.priv.h | 44 +- test/test_tparm.c | 388 + test/tracemunch | 974 +- test/widechars.h | 4 +- 559 files changed, 41822 insertions(+), 27048 deletions(-) diff --git a/Ada95/Makefile.in b/Ada95/Makefile.in index 67625d7e9cda..8d78bbf4f19c 100644 --- a/Ada95/Makefile.in +++ b/Ada95/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.23 2020/02/02 23:34:34 tom Exp $ +# $Id: Makefile.in,v 1.26 2021/01/23 20:34:50 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2021 Thomas E. Dickey # # Copyright 1998-2010,2015 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -31,7 +31,7 @@ # Author: Juergen Pfeifer, 1996 # # Version Control -# $Revision: 1.23 $ +# $Revision: 1.26 $ # SHELL = @SHELL@ VPATH = @srcdir@ @@ -39,7 +39,7 @@ THIS = Makefile SUBDIRS = @ADA_SUBDIRS@ -CF_MFLAGS = @cf_cv_makeflags@ +TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" @SET_MAKE@ all \ @@ -50,19 +50,19 @@ install.libs \ uninstall \ uninstall.libs :: for d in $(SUBDIRS); do \ - (cd $$d ; $(MAKE) $(CF_MFLAGS) $@) ;\ + ( cd $$d && $(MAKE) $(TOP_MFLAGS) $@ ) ;\ done clean \ mostlyclean :: for d in $(SUBDIRS); do \ - (cd $$d ; $(MAKE) $(CF_MFLAGS) $@) ;\ + ( cd $$d && $(MAKE) $(TOP_MFLAGS) $@ ) ;\ done distclean \ realclean :: for d in $(SUBDIRS); do \ - (cd $$d ; $(MAKE) $(CF_MFLAGS) $@) ;\ + ( cd $$d && $(MAKE) $(TOP_MFLAGS) $@ ) ;\ done rm -rf lib for lib_kind in static dynamic; do \ diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index 7438acc170da..703300c8a247 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2019,2020 Thomas E. Dickey * +dnl Copyright 2018-2020,2021 Thomas E. Dickey * dnl Copyright 2010-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.153 2020/02/08 21:04:00 tom Exp $ +dnl $Id: aclocal.m4,v 1.171 2021/01/06 01:29:44 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -100,10 +100,11 @@ AC_DEFUN([CF_ADD_ADAFLAGS],[ AC_SUBST(ADAFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40 +dnl CF_ADD_CFLAGS version: 15 updated: 2020/12/31 10:54:15 dnl ------------- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS -dnl The second parameter if given makes this macro verbose. +dnl $1 = flags to add +dnl $2 = if given makes this macro verbose. dnl dnl Put any preprocessor definitions that use quoted strings in $EXTRA_CPPFLAGS, dnl to simplify use of $CPPFLAGS in compiler checks, etc., that are easily @@ -117,19 +118,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $1 do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags) continue elif test "${cf_tst_cflags}" = "\"'" ; then @@ -142,7 +143,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags) @@ -160,7 +161,7 @@ case $cf_fix_cppflags in (yes) CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[[^"]]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -188,7 +189,7 @@ AC_SUBST(EXTRA_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_INCDIR version: 15 updated: 2018/06/20 20:23:13 +dnl CF_ADD_INCDIR version: 16 updated: 2020/12/31 20:19:42 dnl ------------- dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's dnl redundant. We don't normally need to add -I/usr/local/include for gcc, @@ -200,9 +201,9 @@ AC_DEFUN([CF_ADD_INCDIR], if test -n "$1" ; then for cf_add_incdir in $1 do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -233,7 +234,7 @@ if test -n "$1" ; then CF_VERBOSE(adding $cf_add_incdir to include-path) ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -255,7 +256,7 @@ dnl $1 = library to add, without the "-l" dnl $2 = variable to update (default $LIBS) AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_LIBDIR version: 10 updated: 2015/04/18 08:56:57 +dnl CF_ADD_LIBDIR version: 11 updated: 2020/12/31 20:19:42 dnl ------------- dnl Adds to the library-path dnl @@ -269,9 +270,9 @@ AC_DEFUN([CF_ADD_LIBDIR], if test -n "$1" ; then for cf_add_libdir in $1 do - if test $cf_add_libdir = /usr/lib ; then + if test "$cf_add_libdir" = /usr/lib ; then : - elif test -d $cf_add_libdir + elif test -d "$cf_add_libdir" then cf_have_libdir=no if test -n "$LDFLAGS$LIBS" ; then @@ -317,7 +318,7 @@ done ifelse($2,,LIBS,[$2])="$cf_add_libs" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05 +dnl CF_ADD_SUBDIR_PATH version: 5 updated: 2020/12/31 20:19:42 dnl ------------------ dnl Append to a search-list for a nonstandard header/lib-file dnl $1 = the variable to return as result @@ -329,13 +330,13 @@ AC_DEFUN([CF_ADD_SUBDIR_PATH], [ test "x$4" != "x$5" && \ test -d "$4" && \ -ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) { +ifelse([$5],NONE,,[{ test -z "$5" || test "x$5" = xNONE || test "x$4" != "x$5"; } &&]) { test -n "$verbose" && echo " ... testing for $3-directories under $4" - test -d $4/$3 && $1="[$]$1 $4/$3" - test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2" - test -d $4/$3/$2/$3 && $1="[$]$1 $4/$3/$2/$3" - test -d $4/$2/$3 && $1="[$]$1 $4/$2/$3" - test -d $4/$2/$3/$2 && $1="[$]$1 $4/$2/$3/$2" + test -d "$4/$3" && $1="[$]$1 $4/$3" + test -d "$4/$3/$2" && $1="[$]$1 $4/$3/$2" + test -d "$4/$3/$2/$3" && $1="[$]$1 $4/$3/$2/$3" + test -d "$4/$2/$3" && $1="[$]$1 $4/$2/$3" + test -d "$4/$2/$3/$2" && $1="[$]$1 $4/$2/$3/$2" } ])dnl dnl --------------------------------------------------------------------------- @@ -355,6 +356,12 @@ dnl Allow user to disable a normally-on option. AC_DEFUN([CF_ARG_DISABLE], [CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl dnl --------------------------------------------------------------------------- +dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31 +dnl ------------- +dnl Allow user to enable a normally-off option. +AC_DEFUN([CF_ARG_ENABLE], +[CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl +dnl --------------------------------------------------------------------------- dnl CF_ARG_OPTION version: 5 updated: 2015/05/10 19:52:14 dnl ------------- dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus @@ -378,7 +385,7 @@ ifelse([$3],,[ :]dnl ])dnl ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05 +dnl CF_AR_FLAGS version: 9 updated: 2021/01/01 13:31:04 dnl ----------- dnl Check for suitable "ar" (archiver) options for updating an archive. dnl @@ -389,39 +396,55 @@ AC_DEFUN([CF_AR_FLAGS],[ AC_REQUIRE([CF_PROG_AR]) AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[ - cf_cv_ar_flags=unknown - for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv - do + case "$cf_cv_system_name" in + (*-msvc*) + cf_cv_ar_flags='' + cat >mk_static_lib.sh <<-EOF + #!$SHELL + MSVC_BIN="[$]AR" + out="\[$]1" + shift + exec \[$]MSVC_BIN -out:"\[$]out" \[$]@ + EOF + chmod +x mk_static_lib.sh + AR=`pwd`/mk_static_lib.sh + ;; + (*) + cf_cv_ar_flags=unknown + for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv + do - # check if $ARFLAGS already contains this choice - if test "x$ARFLAGS" != "x" ; then - cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` - if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then - cf_cv_ar_flags= - break + # check if $ARFLAGS already contains this choice + if test "x$ARFLAGS" != "x" ; then + cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` + if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then + cf_cv_ar_flags= + break + fi fi - fi - rm -f conftest.$ac_cv_objext - rm -f conftest.a + rm -f "conftest.$ac_cv_objext" + rm -f conftest.a - cat >conftest.$ac_ext <<EOF + cat >"conftest.$ac_ext" <<EOF #line __oline__ "configure" int testdata[[3]] = { 123, 456, 789 }; EOF - if AC_TRY_EVAL(ac_compile) ; then - echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC - $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null - if test -f conftest.a ; then - cf_cv_ar_flags=$cf_ar_flags + if AC_TRY_EVAL(ac_compile) ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&AC_FD_CC 1>/dev/null + if test -f conftest.a ; then + cf_cv_ar_flags="$cf_ar_flags" + break + fi + else + CF_VERBOSE(cannot compile test-program) break fi - else - CF_VERBOSE(cannot compile test-program) - break - fi - done - rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + done + rm -f conftest.a "conftest.$ac_ext" "conftest.$ac_cv_objext" + ;; + esac ]) if test -n "$ARFLAGS" ; then @@ -435,7 +458,7 @@ fi AC_SUBST(ARFLAGS) ]) dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 8 updated: 2018/01/04 20:31:04 +dnl CF_BUILD_CC version: 9 updated: 2021/01/02 09:31:20 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -501,7 +524,7 @@ if test "$cross_compiling" = yes ; then : ${BUILD_CC:='${CC}'} - if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then + if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then AC_MSG_ERROR([Cross-build requires two compilers. Use --with-build-cc to specify the native compiler.]) fi @@ -527,7 +550,7 @@ AC_SUBST(BUILD_EXEEXT) AC_SUBST(BUILD_OBJEXT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26 +dnl CF_CC_ENV_FLAGS version: 10 updated: 2020/12/31 18:40:20 dnl --------------- dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content dnl into CC. This will not help with broken scripts that wrap the compiler @@ -542,7 +565,7 @@ dnl outweighs that limitation. AC_DEFUN([CF_CC_ENV_FLAGS], [ # This should have been defined by AC_PROG_CC -: ${CC:=cc} +: "${CC:=cc}" AC_MSG_CHECKING(\$CFLAGS variable) case "x$CFLAGS" in @@ -591,7 +614,7 @@ case "$CC" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CFG_DEFAULTS version: 11 updated: 2015/04/17 21:13:04 +dnl CF_CFG_DEFAULTS version: 16 updated: 2021/01/04 19:33:05 dnl --------------- dnl Determine the default configuration into which we'll install ncurses. This dnl can be overridden by the user's command-line options. There's two items to @@ -604,7 +627,8 @@ dnl We don't use AC_PREFIX_DEFAULT, because it gets evaluated too soon, and dnl we don't use AC_PREFIX_PROGRAM, because we cannot distinguish ncurses's dnl programs from a vendor's. AC_DEFUN([CF_CFG_DEFAULTS], -[ +[AC_REQUIRE([AC_PROG_FGREP])dnl + AC_MSG_CHECKING(for prefix) if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in @@ -622,20 +646,20 @@ if test "x$prefix" = "xNONE" ; then AC_MSG_CHECKING(for default include-directory) test -n "$verbose" && echo 1>&AC_FD_MSG for cf_symbol in \ - $includedir \ - $includedir/ncurses \ - $prefix/include \ - $prefix/include/ncurses \ + "$includedir" \ + "$includedir/ncurses" \ + "$prefix/include" \ + "$prefix/include/ncurses" \ /usr/local/include \ /usr/local/include/ncurses \ /usr/include \ /usr/include/ncurses do - cf_dir=`eval echo $cf_symbol` - if test -f $cf_dir/curses.h ; then - if ( fgrep NCURSES_VERSION $cf_dir/curses.h 2>&1 >/dev/null ) ; then + cf_dir=`eval echo "$cf_symbol"` + if test -f "$cf_dir/curses.h" ; then + if ( ${FGREP-fgrep} NCURSES_VERSION "$cf_dir/curses.h" >/dev/null 2>&1 ) ; then includedir="$cf_symbol" - test -n "$verbose" && echo $ac_n " found " 1>&AC_FD_MSG + test -n "$verbose" && echo $ECHO_N " found " 1>&AC_FD_MSG break fi fi @@ -645,7 +669,7 @@ AC_MSG_RESULT($includedir) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03 +dnl CF_CHECK_CACHE version: 13 updated: 2020/12/31 10:54:15 dnl -------------- dnl Check if we're accidentally using a cache from a different machine. dnl Derive the system name, as a check for reusing the autoconf cache. @@ -659,7 +683,7 @@ dnl Note: we would use $ac_config_sub, but that is one of the places where dnl autoconf 2.5x broke compatibility with autoconf 2.13 AC_DEFUN([CF_CHECK_CACHE], [ -if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then +if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then ifelse([$1],,[AC_CANONICAL_HOST],[$1]) system_name="$host_os" *** 129577 LINES SKIPPED *** _______________________________________________ dev-commits-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"