Update to 5.4.

PR:		63338
Submitted by:	linimon

6 files changed, 488 insertions, 162 deletions

diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile
index a57ed28a1dc8..38d41253f1a4 100644
--- a/devel/ncurses-devel/Makefile
+++ b/devel/ncurses-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		ncurses
-PORTVERSION=		5.3
+PORTVERSION=		5.4
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	ncurses
@@ -28,6 +28,10 @@ CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
 		--with-profile --with-shared --without-debug \
 		--without-curses-h --with-termlib --program-prefix= \
 		--enable-safe-sprintf --disable-root-environ	#--enable-widec
+# needed by devel/py-ncurses port
+.if defined(WITH_TRACE)
+CONFIGURE_ARGS+=	--with-trace
+.endif
 
 CONFIGURE_ENV=	gnat_exists="no" \
 		ac_cv_path_LDCONFIG="${LDCONFIG} -m ${PREFIX}/lib"
@@ -65,75 +69,75 @@ MAN3=	COLOR_PAIR.3x PAIR_NUMBER.3x _nc_tracebits.3x _traceattr.3x \
 	del_curterm.3x del_panel.3x delay_output.3x delch.3x deleteln.3x \
 	delscreen.3x delwin.3x derwin.3x doupdate.3x dup_field.3x dupwin.3x \
 	dynamic_field_info.3x echo.3x echo_wchar.3x echochar.3x endwin.3x \
-	erase.3x erasechar.3x erasewchar.3x field_arg.3x field_back.3x \
-	field_buffer.3x field_count.3x field_fore.3x field_index.3x \
-	field_info.3x field_just.3x field_opts.3x field_opts_off.3x \
-	field_opts_on.3x field_pad.3x field_status.3x field_type.3x \
-	field_userptr.3x filter.3x flash.3x flushinp.3x form.3x form_cursor.3x \
-	form_data.3x form_driver.3x form_field.3x form_field_attributes.3x \
-	form_field_buffer.3x form_field_info.3x form_field_just.3x \
-	form_field_new.3x form_field_opts.3x form_field_userptr.3x \
-	form_field_validation.3x form_fields.3x form_fieldtype.3x form_hook.3x \
-	form_new.3x form_new_page.3x form_opts.3x form_opts_off.3x \
-	form_opts_on.3x form_page.3x form_post.3x form_request_by_name.3x \
-	form_request_name.3x form_requestname.3x form_sub.3x form_userptr.3x \
-	form_win.3x free_field.3x free_fieldtype.3x free_form.3x free_item.3x \
-	free_menu.3x get_wch.3x get_wstr.3x getbegx.3x getbegy.3x getbegyx.3x \
-	getbkgd.3x getbkgrnd.3x getcchar.3x getch.3x getcurx.3x getcury.3x \
-	getmaxx.3x getmaxy.3x getmaxyx.3x getmouse.3x getn_wstr.3x getnstr.3x \
-	getparx.3x getpary.3x getparyx.3x getstr.3x getsyx.3x getwin.3x \
-	getyx.3x halfdelay.3x has_colors.3x has_ic.3x has_il.3x has_key.3x \
-	hide_panel.3x hline.3x hline_set.3x idcok.3x idlok.3x immedok.3x \
-	in_wch.3x in_wchnstr.3x in_wchstr.3x inch.3x inchnstr.3x inchstr.3x \
-	init_color.3x init_pair.3x initscr.3x innstr.3x innwstr.3x \
-	ins_nwstr.3x ins_wch.3x ins_wstr.3x insch.3x insdelln.3x insertln.3x \
-	insnstr.3x insstr.3x instr.3x intrflush.3x inwstr.3x is_linetouched.3x \
-	is_term_resized.3x is_wintouched.3x isendwin.3x item_count.3x \
-	item_description.3x item_index.3x item_name.3x item_opts.3x \
-	item_opts_off.3x item_opts_on.3x item_userptr.3x item_value.3x \
-	item_visible.3x key_name.3x keybound.3x keyname.3x keyok.3x keypad.3x \
-	killchar.3x killwchar.3x leaveok.3x link_field.3x link_fieldtype.3x \
-	longname.3x mcprint.3x menu.3x menu_attributes.3x menu_back.3x \
-	menu_cursor.3x menu_driver.3x menu_fore.3x menu_format.3x menu_grey.3x \
-	menu_hook.3x menu_items.3x menu_mark.3x menu_new.3x menu_opts.3x \
-	menu_opts_off.3x menu_opts_on.3x menu_pad.3x menu_pattern.3x \
-	menu_post.3x menu_request_by_name.3x menu_request_name.3x \
-	menu_requestname.3x menu_spacing.3x menu_sub.3x menu_userptr.3x \
-	menu_win.3x meta.3x mitem_current.3x mitem_name.3x mitem_new.3x \
-	mitem_opts.3x mitem_userptr.3x mitem_value.3x mitem_visible.3x \
-	mouse_trafo.3x mouseinterval.3x mousemask.3x move.3x move_field.3x \
-	move_panel.3x mvadd_wch.3x mvadd_wchnstr.3x mvadd_wchstr.3x mvaddch.3x \
-	mvaddchnstr.3x mvaddchstr.3x mvaddnstr.3x mvaddnwstr.3x mvaddstr.3x \
-	mvaddwstr.3x mvchgat.3x mvcur.3x mvdelch.3x mvderwin.3x mvget_wch.3x \
-	mvget_wstr.3x mvgetch.3x mvgetn_wstr.3x mvgetnstr.3x mvgetstr.3x \
-	mvhline.3x mvhline_set.3x mvin_wch.3x mvin_wchnstr.3x mvin_wchstr.3x \
-	mvinch.3x mvinchnstr.3x mvinchstr.3x mvinnstr.3x mvinnwstr.3x \
-	mvins_nwstr.3x mvins_wch.3x mvins_wstr.3x mvinsch.3x mvinsnstr.3x \
-	mvinsstr.3x mvinstr.3x mvinwstr.3x mvprintw.3x mvscanw.3x mvvline.3x \
-	mvvline_set.3x mvwadd_wch.3x mvwadd_wchnstr.3x mvwadd_wchstr.3x \
-	mvwaddch.3x mvwaddchnstr.3x mvwaddchstr.3x mvwaddnstr.3x \
-	mvwaddnwstr.3x mvwaddstr.3x mvwaddwstr.3x mvwchgat.3x mvwdelch.3x \
-	mvwget_wch.3x mvwget_wstr.3x mvwgetch.3x mvwgetn_wstr.3x mvwgetnstr.3x \
-	mvwgetstr.3x mvwhline.3x mvwhline_set.3x mvwin.3x mvwin_wch.3x \
-	mvwin_wchnstr.3x mvwin_wchstr.3x mvwinch.3x mvwinchnstr.3x \
-	mvwinchstr.3x mvwinnstr.3x mvwinnwstr.3x mvwins_nwstr.3x mvwins_wch.3x \
-	mvwins_wstr.3x mvwinsch.3x mvwinsnstr.3x mvwinsstr.3x mvwinstr.3x \
-	mvwinwstr.3x mvwprintw.3x mvwscanw.3x mvwvline.3x mvwvline_set.3x \
-	napms.3x ncurses.3x new_field.3x new_fieldtype.3x new_form.3x \
-	new_item.3x new_menu.3x new_page.3x new_panel.3x newpad.3x newterm.3x \
-	newwin.3x nl.3x nocbreak.3x nodelay.3x noecho.3x nonl.3x noqiflush.3x \
-	noraw.3x notimeout.3x overlay.3x overwrite.3x pair_content.3x panel.3x \
-	panel_above.3x panel_below.3x panel_hidden.3x panel_userptr.3x \
-	panel_window.3x pechochar.3x pnoutrefresh.3x pos_form_cursor.3x \
-	pos_menu_cursor.3x post_form.3x post_menu.3x prefresh.3x printw.3x \
-	putp.3x putwin.3x qiflush.3x raw.3x redrawwin.3x refresh.3x \
-	replace_panel.3x reset_prog_mode.3x reset_shell_mode.3x resetty.3x \
-	resize_term.3x resizeterm.3x restartterm.3x ripoffline.3x savetty.3x \
-	scale_form.3x scale_menu.3x scanw.3x scr_dump.3x scr_init.3x \
-	scr_restore.3x scr_set.3x scrl.3x scroll.3x scrollok.3x \
-	set_current_field.3x set_current_item.3x set_curterm.3x \
-	set_field_back.3x set_field_buffer.3x set_field_fore.3x \
-	set_field_init.3x set_field_just.3x set_field_opts.3x set_field_pad.3x \
+	erase.3x erasechar.3x erasewchar.3x fgetu8.3 field_arg.3x \
+	field_back.3x field_buffer.3x field_count.3x field_fore.3x \
+	field_index.3x field_info.3x field_just.3x field_opts.3x \
+	field_opts_off.3x field_opts_on.3x field_pad.3x field_status.3x \
+	field_type.3x field_userptr.3x filter.3x flash.3x flushinp.3x form.3x \
+	form_cursor.3x form_data.3x form_driver.3x form_field.3x \
+	form_field_attributes.3x form_field_buffer.3x form_field_info.3x \
+	form_field_just.3x form_field_new.3x form_field_opts.3x \
+	form_field_userptr.3x form_field_validation.3x form_fields.3x \
+	form_fieldtype.3x form_hook.3x form_new.3x form_new_page.3x \
+	form_opts.3x form_opts_off.3x form_opts_on.3x form_page.3x \
+	form_post.3x form_request_by_name.3x form_request_name.3x \
+	form_requestname.3x form_sub.3x form_userptr.3x form_win.3x \
+	free_field.3x free_fieldtype.3x free_form.3x free_item.3x free_menu.3x \
+	get_wch.3x get_wstr.3x getbegyx.3x getbkgd.3x getbkgrnd.3x getcchar.3x \
+	getch.3x getmaxyx.3x getmouse.3x getn_wstr.3x getnstr.3x getparyx.3x \
+	getstr.3x getsyx.3x getwin.3x getyx.3x halfdelay.3x has_colors.3x \
+	has_ic.3x has_il.3x has_key.3x hide_panel.3x hline.3x hline_set.3x \
+	idcok.3x idlok.3x immedok.3x in_wch.3x in_wchnstr.3x in_wchstr.3x \
+	inch.3x inchnstr.3x inchstr.3x init_color.3x init_pair.3x initscr.3x \
+	innstr.3x innwstr.3x ins_nwstr.3x ins_wch.3x ins_wstr.3x insch.3x \
+	insdelln.3x insertln.3x insnstr.3x insstr.3x instr.3x intrflush.3x \
+	inwstr.3x is_linetouched.3x is_term_resized.3x is_wintouched.3x \
+	isendwin.3x item_count.3x item_description.3x item_index.3x \
+	item_name.3x item_opts.3x item_opts_off.3x item_opts_on.3x \
+	item_userptr.3x item_value.3x item_visible.3x key_name.3x keybound.3x \
+	keyname.3x keyok.3x keypad.3x killchar.3x killwchar.3x leaveok.3x \
+	link_field.3x link_fieldtype.3x longname.3x mcprint.3x menu.3x \
+	menu_attributes.3x menu_back.3x menu_cursor.3x menu_driver.3x \
+	menu_fore.3x menu_format.3x menu_grey.3x menu_hook.3x menu_items.3x \
+	menu_mark.3x menu_new.3x menu_opts.3x menu_opts_off.3x menu_opts_on.3x \
+	menu_pad.3x menu_pattern.3x menu_post.3x menu_request_by_name.3x \
+	menu_request_name.3x menu_requestname.3x menu_spacing.3x menu_sub.3x \
+	menu_userptr.3x menu_win.3x meta.3x mitem_current.3x mitem_name.3x \
+	mitem_new.3x mitem_opts.3x mitem_userptr.3x mitem_value.3x \
+	mitem_visible.3x mouse_trafo.3x mouseinterval.3x mousemask.3x move.3x \
+	move_field.3x move_panel.3x mvadd_wch.3x mvadd_wchnstr.3x \
+	mvadd_wchstr.3x mvaddch.3x mvaddchnstr.3x mvaddchstr.3x mvaddnstr.3x \
+	mvaddnwstr.3x mvaddstr.3x mvaddwstr.3x mvchgat.3x mvcur.3x mvdelch.3x \
+	mvderwin.3x mvget_wch.3x mvget_wstr.3x mvgetch.3x mvgetn_wstr.3x \
+	mvgetnstr.3x mvgetstr.3x mvhline.3x mvhline_set.3x mvin_wch.3x \
+	mvin_wchnstr.3x mvin_wchstr.3x mvinch.3x mvinchnstr.3x mvinchstr.3x \
+	mvinnstr.3x mvinnwstr.3x mvins_nwstr.3x mvins_wch.3x mvins_wstr.3x \
+	mvinsch.3x mvinsnstr.3x mvinsstr.3x mvinstr.3x mvinwstr.3x mvprintw.3x \
+	mvscanw.3x mvvline.3x mvvline_set.3x mvwadd_wch.3x mvwadd_wchnstr.3x \
+	mvwadd_wchstr.3x mvwaddch.3x mvwaddchnstr.3x mvwaddchstr.3x \
+	mvwaddnstr.3x mvwaddnwstr.3x mvwaddstr.3x mvwaddwstr.3x mvwchgat.3x \
+	mvwdelch.3x mvwget_wch.3x mvwget_wstr.3x mvwgetch.3x mvwgetn_wstr.3x \
+	mvwgetnstr.3x mvwgetstr.3x mvwhline.3x mvwhline_set.3x mvwin.3x \
+	mvwin_wch.3x mvwin_wchnstr.3x mvwin_wchstr.3x mvwinch.3x \
+	mvwinchnstr.3x mvwinchstr.3x mvwinnstr.3x mvwinnwstr.3x \
+	mvwins_nwstr.3x mvwins_wch.3x mvwins_wstr.3x mvwinsch.3x mvwinsnstr.3x \
+	mvwinsstr.3x mvwinstr.3x mvwinwstr.3x mvwprintw.3x mvwscanw.3x \
+	mvwvline.3x mvwvline_set.3x napms.3x ncurses.3x new_field.3x \
+	new_fieldtype.3x new_form.3x new_item.3x new_menu.3x new_page.3x \
+	new_panel.3x newpad.3x newterm.3x newwin.3x nl.3x nocbreak.3x \
+	nodelay.3x noecho.3x nonl.3x noqiflush.3x noraw.3x notimeout.3x \
+	overlay.3x overwrite.3x pair_content.3x panel.3x panel_above.3x \
+	panel_below.3x panel_hidden.3x panel_userptr.3x panel_window.3x \
+	pechochar.3x pnoutrefresh.3x pos_form_cursor.3x pos_menu_cursor.3x \
+	post_form.3x post_menu.3x prefresh.3x printw.3x putp.3x putwin.3x \
+	qiflush.3x raw.3x redrawwin.3x refresh.3x replace_panel.3x \
+	reset_prog_mode.3x reset_shell_mode.3x resetty.3x resize_term.3x \
+	resizeterm.3x restartterm.3x ripoffline.3x savetty.3x scale_form.3x \
+	scale_menu.3x scanw.3x scr_dump.3x scr_init.3x scr_restore.3x \
+	scr_set.3x scrl.3x scroll.3x scrollok.3x set_current_field.3x \
+	set_current_item.3x set_curterm.3x set_field_back.3x \
+	set_field_buffer.3x set_field_fore.3x set_field_init.3x \
+	set_field_just.3x set_field_opts.3x set_field_pad.3x \
 	set_field_status.3x set_field_term.3x set_field_type.3x \
 	set_field_userptr.3x set_fieldtype_arg.3x set_fieldtype_choice.3x \
 	set_form_fields.3x set_form_init.3x set_form_opts.3x set_form_page.3x \
@@ -174,10 +178,14 @@ MAN3=	COLOR_PAIR.3x PAIR_NUMBER.3x _nc_tracebits.3x _traceattr.3x \
 	wnoutrefresh.3x wprintw.3x wredrawln.3x wrefresh.3x wresize.3x \
 	wscanw.3x wscrl.3x wsetscrreg.3x wstandend.3x wstandout.3x \
 	wsyncdown.3x wsyncup.3x wtimeout.3x wtouchln.3x wunctrl.3x wvline.3x \
-	wvline_set.3x
+	wvline_set.3x field_init.3x field_term.3x form_init.3x form_term.3x \
+	fputu8.3 item_init.3x item_term.3x key_defined.3x menu_init.3x \
+	menu_term.3x pecho_wchar.3x sgetu8.3 sputu8.3
 MAN5=	term.5 terminfo.5
 MAN7=	term.7
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 DOCS=		ANNOUNCE INSTALL NEWS README TO-DO doc/html/announce.html \
 		doc/hackguide.doc doc/html/hackguide.html \
 		doc/html/index.html doc/ncurses-intro.doc \
@@ -194,6 +202,16 @@ EXAMPLES_CPP=	Makefile NEWS PROBLEMS README-first cursesapp.cc \
 		cursesw.h cursslk.cc cursslk.h demo.cc etip.h \
 		internal.h
 
+pre-configure:
+	${MKDIR} ${WRKDIR}
+	${ECHO_CMD} \
+	"Warning:  source code for this version has not been reviewed!" \
+		> ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD} 
+	@${ECHO_CMD} Waiting ten seconds--press control-C to cancel build.
+	@sleep 10
+
 post-install:
 	@ ${GZIP_CMD} ${PREFIX}/man/man1/tack.1
 	@ ${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}/c++
diff --git a/devel/ncurses-devel/distinfo b/devel/ncurses-devel/distinfo
index e072484a4f3c..f1737aad18c1 100644
--- a/devel/ncurses-devel/distinfo
+++ b/devel/ncurses-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (ncurses-5.3.tar.gz) = 5dcc9faa93157eafa572494bffed131a
-SIZE (ncurses-5.3.tar.gz) = 2067718
+MD5 (ncurses-5.4.tar.gz) = 069c8880072060373290a4fefff43520
+SIZE (ncurses-5.4.tar.gz) = 2154022
diff --git a/devel/ncurses-devel/pkg-plist b/devel/ncurses-devel/pkg-plist
index 81f8e0673f71..33bd0449b31b 100644
--- a/devel/ncurses-devel/pkg-plist
+++ b/devel/ncurses-devel/pkg-plist
@@ -26,24 +26,24 @@ include/ncurses/termcap.h
 include/ncurses/unctrl.h
 lib/libform.a
 lib/libform.so
-lib/libform.so.5.3
+lib/libform.so.5.4
 lib/libform_p.a
 lib/libmenu.a
 lib/libmenu.so
-lib/libmenu.so.5.3
+lib/libmenu.so.5.4
 lib/libmenu_p.a
 lib/libncurses++.a
 lib/libncurses.a
 lib/libncurses.so
-lib/libncurses.so.5.3
+lib/libncurses.so.5.4
 lib/libncurses_p.a
 lib/libpanel.a
 lib/libpanel.so
-lib/libpanel.so.5.3
+lib/libpanel.so.5.4
 lib/libpanel_p.a
 lib/libtinfo.a
 lib/libtinfo.so
-lib/libtinfo.so.5.3
+lib/libtinfo.so.5.4
 lib/libtinfo_p.a
 share/doc/ncurses/ANNOUNCE
 share/doc/ncurses/INSTALL
@@ -654,6 +654,7 @@ share/misc/terminfo/c/cyb110
 share/misc/terminfo/c/cyb83
 share/misc/terminfo/c/cygwin
 share/misc/terminfo/c/cygwinB19
+share/misc/terminfo/c/cygwinDBG
 share/misc/terminfo/d/d132
 share/misc/terminfo/d/d2
 share/misc/terminfo/d/d2-dg
@@ -849,6 +850,7 @@ share/misc/terminfo/d/dec-vt220
 share/misc/terminfo/d/dec-vt330
 share/misc/terminfo/d/dec-vt340
 share/misc/terminfo/d/dec-vt400
+share/misc/terminfo/d/decansi
 share/misc/terminfo/d/decpro
 share/misc/terminfo/d/decwriter
 share/misc/terminfo/d/delta
@@ -892,6 +894,9 @@ share/misc/terminfo/d/diablo630
 share/misc/terminfo/d/dialogue
 share/misc/terminfo/d/dialogue80
 share/misc/terminfo/d/digilog
+share/misc/terminfo/d/djgpp
+share/misc/terminfo/d/djgpp203
+share/misc/terminfo/d/djgpp204
 share/misc/terminfo/d/dku7003
 share/misc/terminfo/d/dku7003-dumb
 share/misc/terminfo/d/dku7102
@@ -945,6 +950,7 @@ share/misc/terminfo/e/elks-glasstty
 share/misc/terminfo/e/elks-vt52
 share/misc/terminfo/e/emots
 share/misc/terminfo/e/emu
+share/misc/terminfo/e/emx-base
 share/misc/terminfo/e/env230
 share/misc/terminfo/e/envision230
 share/misc/terminfo/e/ep40
@@ -997,6 +1003,8 @@ share/misc/terminfo/g/glasstty
 share/misc/terminfo/g/gnome
 share/misc/terminfo/g/gnome-rh62
 share/misc/terminfo/g/gnome-rh72
+share/misc/terminfo/g/gnome-rh80
+share/misc/terminfo/g/gnome-rh90
 share/misc/terminfo/g/go-225
 share/misc/terminfo/g/go140
 share/misc/terminfo/g/go140w
@@ -1235,6 +1243,8 @@ share/misc/terminfo/i/ims950
 share/misc/terminfo/i/ims950-b
 share/misc/terminfo/i/ims950-rv
 share/misc/terminfo/i/infoton
+share/misc/terminfo/i/interix
+share/misc/terminfo/i/interix-nti
 share/misc/terminfo/i/intertec
 share/misc/terminfo/i/intertube
 share/misc/terminfo/i/intertube2
@@ -1294,6 +1304,7 @@ share/misc/terminfo/l/linux-koi8r
 share/misc/terminfo/l/linux-lat
 share/misc/terminfo/l/linux-m
 share/misc/terminfo/l/linux-nic
+share/misc/terminfo/l/linux-vt
 share/misc/terminfo/l/lisa
 share/misc/terminfo/l/lisaterm
 share/misc/terminfo/l/lisaterm-w
@@ -1358,7 +1369,10 @@ share/misc/terminfo/m/modgraph
 share/misc/terminfo/m/modgraph2
 share/misc/terminfo/m/modgraph48
 share/misc/terminfo/m/mono-emx
+share/misc/terminfo/m/mouse-sun
+share/misc/terminfo/m/ms-vt-utf8
 share/misc/terminfo/m/ms-vt100
+share/misc/terminfo/m/ms-vt100+
 share/misc/terminfo/m/ms-vt100-color
 share/misc/terminfo/m/msk227
 share/misc/terminfo/m/msk22714
@@ -1369,6 +1383,8 @@ share/misc/terminfo/m/mskermit227am
 share/misc/terminfo/m/mt-70
 share/misc/terminfo/m/mt4520-rv
 share/misc/terminfo/m/mt70
+share/misc/terminfo/m/mterm
+share/misc/terminfo/m/mterm-ansi
 share/misc/terminfo/m/mvterm
 share/misc/terminfo/n/nansi.sys
 share/misc/terminfo/n/nansi.sysk
@@ -1502,6 +1518,24 @@ share/misc/terminfo/n/nsterm-m-s-acs
 share/misc/terminfo/n/nsterm-s
 share/misc/terminfo/n/nsterm-s-7
 share/misc/terminfo/n/nsterm-s-acs
+share/misc/terminfo/n/ntconsole
+share/misc/terminfo/n/ntconsole-100
+share/misc/terminfo/n/ntconsole-100-nti
+share/misc/terminfo/n/ntconsole-25
+share/misc/terminfo/n/ntconsole-25-nti
+share/misc/terminfo/n/ntconsole-25-w
+share/misc/terminfo/n/ntconsole-25-w-vt
+share/misc/terminfo/n/ntconsole-35
+share/misc/terminfo/n/ntconsole-35-nti
+share/misc/terminfo/n/ntconsole-35-w
+share/misc/terminfo/n/ntconsole-50
+share/misc/terminfo/n/ntconsole-50-nti
+share/misc/terminfo/n/ntconsole-50-w
+share/misc/terminfo/n/ntconsole-60
+share/misc/terminfo/n/ntconsole-60-nti
+share/misc/terminfo/n/ntconsole-60-w
+share/misc/terminfo/n/ntconsole-w
+share/misc/terminfo/n/ntconsole-w-vt
 share/misc/terminfo/n/nwe501
 share/misc/terminfo/n/nwe501-a
 share/misc/terminfo/n/nwe501-o
@@ -1539,6 +1573,25 @@ share/misc/terminfo/o/oldibmpc3
 share/misc/terminfo/o/oldpc3
 share/misc/terminfo/o/oldsun
 share/misc/terminfo/o/omron
+share/misc/terminfo/o/opennt
+share/misc/terminfo/o/opennt-100
+share/misc/terminfo/o/opennt-100-nti
+share/misc/terminfo/o/opennt-25
+share/misc/terminfo/o/opennt-25-nti
+share/misc/terminfo/o/opennt-25-w
+share/misc/terminfo/o/opennt-25-w-vt
+share/misc/terminfo/o/opennt-35
+share/misc/terminfo/o/opennt-35-nti
+share/misc/terminfo/o/opennt-35-w
+share/misc/terminfo/o/opennt-50
+share/misc/terminfo/o/opennt-50-nti
+share/misc/terminfo/o/opennt-50-w
+share/misc/terminfo/o/opennt-60
+share/misc/terminfo/o/opennt-60-nti
+share/misc/terminfo/o/opennt-60-w
+share/misc/terminfo/o/opennt-nti
+share/misc/terminfo/o/opennt-w
+share/misc/terminfo/o/opennt-w-vt
 share/misc/terminfo/o/opus3n1+
 share/misc/terminfo/o/origibmpc3
 share/misc/terminfo/o/origpc3
@@ -1733,6 +1786,10 @@ share/misc/terminfo/r/rtpc
 share/misc/terminfo/r/rxvt
 share/misc/terminfo/r/rxvt-16color
 share/misc/terminfo/r/rxvt-basic
+share/misc/terminfo/r/rxvt-color
+share/misc/terminfo/r/rxvt-cygwin
+share/misc/terminfo/r/rxvt-cygwin-native
+share/misc/terminfo/r/rxvt-xpm
 share/misc/terminfo/s/s4
 share/misc/terminfo/s/sb1
 share/misc/terminfo/s/sb2
@@ -1746,7 +1803,10 @@ share/misc/terminfo/s/scoansi
 share/misc/terminfo/s/scoansi-new
 share/misc/terminfo/s/scoansi-old
 share/misc/terminfo/s/screen
+share/misc/terminfo/s/screen-bce
+share/misc/terminfo/s/screen-s
 share/misc/terminfo/s/screen-w
+share/misc/terminfo/s/screen.linux
 share/misc/terminfo/s/screen.teraterm
 share/misc/terminfo/s/screen.xterm-r6
 share/misc/terminfo/s/screen.xterm-xfree86
@@ -1778,6 +1838,7 @@ share/misc/terminfo/s/sun-nic
 share/misc/terminfo/s/sun-s
 share/misc/terminfo/s/sun-s-e
 share/misc/terminfo/s/sun-ss5
+share/misc/terminfo/s/sun-type4
 share/misc/terminfo/s/sun1
 share/misc/terminfo/s/sun2
 share/misc/terminfo/s/sune
@@ -1872,6 +1933,7 @@ share/misc/terminfo/t/ti928
 share/misc/terminfo/t/ti928-8
 share/misc/terminfo/t/ti931
 share/misc/terminfo/t/ti_ansi
+share/misc/terminfo/t/tkterm
 share/misc/terminfo/t/tn1200
 share/misc/terminfo/t/tn300
 share/misc/terminfo/t/trs16
@@ -1885,6 +1947,7 @@ share/misc/terminfo/t/ts100
 share/misc/terminfo/t/ts100-ctxt
 share/misc/terminfo/t/ts100-sp
 share/misc/terminfo/t/ts1p
+share/misc/terminfo/t/tt
 share/misc/terminfo/t/tt505-22
 share/misc/terminfo/t/tty33
 share/misc/terminfo/t/tty35
@@ -1918,21 +1981,92 @@ share/misc/terminfo/t/tty5620-24
 share/misc/terminfo/t/tty5620-34
 share/misc/terminfo/t/tty5620-s
 share/misc/terminfo/t/ttydmd
-share/misc/terminfo/t/tvi-2p
 share/misc/terminfo/t/tvi803
 share/misc/terminfo/t/tvi9065
 share/misc/terminfo/t/tvi910
 share/misc/terminfo/t/tvi910+
 share/misc/terminfo/t/tvi912
-share/misc/terminfo/t/tvi912-2p
 share/misc/terminfo/t/tvi912b
+share/misc/terminfo/t/tvi912b+2p
+share/misc/terminfo/t/tvi912b+dim
+share/misc/terminfo/t/tvi912b+mc
+share/misc/terminfo/t/tvi912b+printer
+share/misc/terminfo/t/tvi912b+vb
+share/misc/terminfo/t/tvi912b-2p
+share/misc/terminfo/t/tvi912b-2p-mc
+share/misc/terminfo/t/tvi912b-2p-p
+share/misc/terminfo/t/tvi912b-2p-unk
+share/misc/terminfo/t/tvi912b-mc
+share/misc/terminfo/t/tvi912b-mc-2p
+share/misc/terminfo/t/tvi912b-mc-vb
+share/misc/terminfo/t/tvi912b-p
+share/misc/terminfo/t/tvi912b-p-2p
+share/misc/terminfo/t/tvi912b-p-vb
+share/misc/terminfo/t/tvi912b-unk
+share/misc/terminfo/t/tvi912b-unk-2p
+share/misc/terminfo/t/tvi912b-unk-vb
+share/misc/terminfo/t/tvi912b-vb
+share/misc/terminfo/t/tvi912b-vb-mc
+share/misc/terminfo/t/tvi912b-vb-p
+share/misc/terminfo/t/tvi912b-vb-unk
 share/misc/terminfo/t/tvi912c
+share/misc/terminfo/t/tvi912c-2p
+share/misc/terminfo/t/tvi912c-2p-mc
+share/misc/terminfo/t/tvi912c-2p-p
+share/misc/terminfo/t/tvi912c-2p-unk
+share/misc/terminfo/t/tvi912c-mc
+share/misc/terminfo/t/tvi912c-mc-2p
+share/misc/terminfo/t/tvi912c-mc-vb
+share/misc/terminfo/t/tvi912c-p
+share/misc/terminfo/t/tvi912c-p-2p
+share/misc/terminfo/t/tvi912c-p-vb
+share/misc/terminfo/t/tvi912c-unk
+share/misc/terminfo/t/tvi912c-unk-2p
+share/misc/terminfo/t/tvi912c-unk-vb
+share/misc/terminfo/t/tvi912c-vb
+share/misc/terminfo/t/tvi912c-vb-mc
+share/misc/terminfo/t/tvi912c-vb-p
+share/misc/terminfo/t/tvi912c-vb-unk
 share/misc/terminfo/t/tvi912cc
 share/misc/terminfo/t/tvi914
 share/misc/terminfo/t/tvi920
-share/misc/terminfo/t/tvi920-2p
 share/misc/terminfo/t/tvi920b
+share/misc/terminfo/t/tvi920b+fn
+share/misc/terminfo/t/tvi920b-2p
+share/misc/terminfo/t/tvi920b-2p-mc
+share/misc/terminfo/t/tvi920b-2p-p
+share/misc/terminfo/t/tvi920b-2p-unk
+share/misc/terminfo/t/tvi920b-mc
+share/misc/terminfo/t/tvi920b-mc-2p
+share/misc/terminfo/t/tvi920b-mc-vb
+share/misc/terminfo/t/tvi920b-p
+share/misc/terminfo/t/tvi920b-p-2p
+share/misc/terminfo/t/tvi920b-p-vb
+share/misc/terminfo/t/tvi920b-unk
+share/misc/terminfo/t/tvi920b-unk-2p
+share/misc/terminfo/t/tvi920b-unk-vb
+share/misc/terminfo/t/tvi920b-vb
+share/misc/terminfo/t/tvi920b-vb-mc
+share/misc/terminfo/t/tvi920b-vb-p
+share/misc/terminfo/t/tvi920b-vb-unk
 share/misc/terminfo/t/tvi920c
+share/misc/terminfo/t/tvi920c-2p
+share/misc/terminfo/t/tvi920c-2p-mc
+share/misc/terminfo/t/tvi920c-2p-p
+share/misc/terminfo/t/tvi920c-2p-unk
+share/misc/terminfo/t/tvi920c-mc
+share/misc/terminfo/t/tvi920c-mc-2p
+share/misc/terminfo/t/tvi920c-mc-vb
+share/misc/terminfo/t/tvi920c-p
+share/misc/terminfo/t/tvi920c-p-2p
+share/misc/terminfo/t/tvi920c-p-vb
+share/misc/terminfo/t/tvi920c-unk
+share/misc/terminfo/t/tvi920c-unk-2p
+share/misc/terminfo/t/tvi920c-unk-vb
+share/misc/terminfo/t/tvi920c-vb
+share/misc/terminfo/t/tvi920c-vb-mc
+share/misc/terminfo/t/tvi920c-vb-p
+share/misc/terminfo/t/tvi920c-vb-unk
 share/misc/terminfo/t/tvi921
 share/misc/terminfo/t/tvi924
 share/misc/terminfo/t/tvi925
@@ -1964,6 +2098,7 @@ share/misc/terminfo/u/uniterm49
 share/misc/terminfo/u/unixpc
 share/misc/terminfo/u/unknown
 share/misc/terminfo/u/uts30
+share/misc/terminfo/u/uwin
 share/misc/terminfo/v/v200-nam
 share/misc/terminfo/v/v320n
 share/misc/terminfo/v/v3220
@@ -2016,7 +2151,12 @@ share/misc/terminfo/v/vs100
 share/misc/terminfo/v/vs100-x10
 share/misc/terminfo/v/vsc
 share/misc/terminfo/v/vt-61
+share/misc/terminfo/v/vt-utf8
 share/misc/terminfo/v/vt100
+share/misc/terminfo/v/vt100+
+share/misc/terminfo/v/vt100+fnkeys
+share/misc/terminfo/v/vt100+keypad
+share/misc/terminfo/v/vt100+pfkeys
 share/misc/terminfo/v/vt100-am
 share/misc/terminfo/v/vt100-bm
 share/misc/terminfo/v/vt100-bm-o
@@ -2048,6 +2188,7 @@ share/misc/terminfo/v/vt200-js
 share/misc/terminfo/v/vt200-old
 share/misc/terminfo/v/vt200-w
 share/misc/terminfo/v/vt220
+share/misc/terminfo/v/vt220+keypad
 share/misc/terminfo/v/vt220-8
 share/misc/terminfo/v/vt220-8bit
 share/misc/terminfo/v/vt220-js
@@ -2084,6 +2225,7 @@ share/misc/terminfo/v/vt520
 share/misc/terminfo/v/vt525
 share/misc/terminfo/v/vt61
 share/misc/terminfo/v/vt61.5
+share/misc/terminfo/v/vtnt
 share/misc/terminfo/v/vv100
 share/misc/terminfo/w/wren
 share/misc/terminfo/w/wrenw
@@ -2390,6 +2532,8 @@ share/misc/terminfo/x/xtalk
 share/misc/terminfo/x/xterm
 share/misc/terminfo/x/xterm+sl
 share/misc/terminfo/x/xterm+sl-twm
+share/misc/terminfo/x/xterm-1002
+share/misc/terminfo/x/xterm-1003
 share/misc/terminfo/x/xterm-16color
 share/misc/terminfo/x/xterm-24
 share/misc/terminfo/x/xterm-256color
@@ -2414,6 +2558,7 @@ share/misc/terminfo/x/xterm-xf86-v32
 share/misc/terminfo/x/xterm-xf86-v33
 share/misc/terminfo/x/xterm-xf86-v333
 share/misc/terminfo/x/xterm-xf86-v40
+share/misc/terminfo/x/xterm-xf86-v43
 share/misc/terminfo/x/xterm-xfree86
 share/misc/terminfo/x/xterm-xi
 share/misc/terminfo/x/xterm1
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index a57ed28a1dc8..38d41253f1a4 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		ncurses
-PORTVERSION=		5.3
+PORTVERSION=		5.4
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	ncurses
@@ -28,6 +28,10 @@ CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
 		--with-profile --with-shared --without-debug \
 		--without-curses-h --with-termlib --program-prefix= \
 		--enable-safe-sprintf --disable-root-environ	#--enable-widec
+# needed by devel/py-ncurses port
+.if defined(WITH_TRACE)
+CONFIGURE_ARGS+=	--with-trace
+.endif
 
 CONFIGURE_ENV=	gnat_exists="no" \
 		ac_cv_path_LDCONFIG="${LDCONFIG} -m ${PREFIX}/lib"
@@ -65,75 +69,75 @@ MAN3=	COLOR_PAIR.3x PAIR_NUMBER.3x _nc_tracebits.3x _traceattr.3x \
 	del_curterm.3x del_panel.3x delay_output.3x delch.3x deleteln.3x \
 	delscreen.3x delwin.3x derwin.3x doupdate.3x dup_field.3x dupwin.3x \
 	dynamic_field_info.3x echo.3x echo_wchar.3x echochar.3x endwin.3x \
-	erase.3x erasechar.3x erasewchar.3x field_arg.3x field_back.3x \
-	field_buffer.3x field_count.3x field_fore.3x field_index.3x \
-	field_info.3x field_just.3x field_opts.3x field_opts_off.3x \
-	field_opts_on.3x field_pad.3x field_status.3x field_type.3x \
-	field_userptr.3x filter.3x flash.3x flushinp.3x form.3x form_cursor.3x \
-	form_data.3x form_driver.3x form_field.3x form_field_attributes.3x \
-	form_field_buffer.3x form_field_info.3x form_field_just.3x \
-	form_field_new.3x form_field_opts.3x form_field_userptr.3x \
-	form_field_validation.3x form_fields.3x form_fieldtype.3x form_hook.3x \
-	form_new.3x form_new_page.3x form_opts.3x form_opts_off.3x \
-	form_opts_on.3x form_page.3x form_post.3x form_request_by_name.3x \
-	form_request_name.3x form_requestname.3x form_sub.3x form_userptr.3x \
-	form_win.3x free_field.3x free_fieldtype.3x free_form.3x free_item.3x \
-	free_menu.3x get_wch.3x get_wstr.3x getbegx.3x getbegy.3x getbegyx.3x \
-	getbkgd.3x getbkgrnd.3x getcchar.3x getch.3x getcurx.3x getcury.3x \
-	getmaxx.3x getmaxy.3x getmaxyx.3x getmouse.3x getn_wstr.3x getnstr.3x \
-	getparx.3x getpary.3x getparyx.3x getstr.3x getsyx.3x getwin.3x \
-	getyx.3x halfdelay.3x has_colors.3x has_ic.3x has_il.3x has_key.3x \
-	hide_panel.3x hline.3x hline_set.3x idcok.3x idlok.3x immedok.3x \
-	in_wch.3x in_wchnstr.3x in_wchstr.3x inch.3x inchnstr.3x inchstr.3x \
-	init_color.3x init_pair.3x initscr.3x innstr.3x innwstr.3x \
-	ins_nwstr.3x ins_wch.3x ins_wstr.3x insch.3x insdelln.3x insertln.3x \
-	insnstr.3x insstr.3x instr.3x intrflush.3x inwstr.3x is_linetouched.3x \
-	is_term_resized.3x is_wintouched.3x isendwin.3x item_count.3x \
-	item_description.3x item_index.3x item_name.3x item_opts.3x \
-	item_opts_off.3x item_opts_on.3x item_userptr.3x item_value.3x \
-	item_visible.3x key_name.3x keybound.3x keyname.3x keyok.3x keypad.3x \
-	killchar.3x killwchar.3x leaveok.3x link_field.3x link_fieldtype.3x \
-	longname.3x mcprint.3x menu.3x menu_attributes.3x menu_back.3x \
-	menu_cursor.3x menu_driver.3x menu_fore.3x menu_format.3x menu_grey.3x \
-	menu_hook.3x menu_items.3x menu_mark.3x menu_new.3x menu_opts.3x \
-	menu_opts_off.3x menu_opts_on.3x menu_pad.3x menu_pattern.3x \
-	menu_post.3x menu_request_by_name.3x menu_request_name.3x \
-	menu_requestname.3x menu_spacing.3x menu_sub.3x menu_userptr.3x \
-	menu_win.3x meta.3x mitem_current.3x mitem_name.3x mitem_new.3x \
-	mitem_opts.3x mitem_userptr.3x mitem_value.3x mitem_visible.3x \
-	mouse_trafo.3x mouseinterval.3x mousemask.3x move.3x move_field.3x \
-	move_panel.3x mvadd_wch.3x mvadd_wchnstr.3x mvadd_wchstr.3x mvaddch.3x \
-	mvaddchnstr.3x mvaddchstr.3x mvaddnstr.3x mvaddnwstr.3x mvaddstr.3x \
-	mvaddwstr.3x mvchgat.3x mvcur.3x mvdelch.3x mvderwin.3x mvget_wch.3x \
-	mvget_wstr.3x mvgetch.3x mvgetn_wstr.3x mvgetnstr.3x mvgetstr.3x \
-	mvhline.3x mvhline_set.3x mvin_wch.3x mvin_wchnstr.3x mvin_wchstr.3x \
-	mvinch.3x mvinchnstr.3x mvinchstr.3x mvinnstr.3x mvinnwstr.3x \
-	mvins_nwstr.3x mvins_wch.3x mvins_wstr.3x mvinsch.3x mvinsnstr.3x \
-	mvinsstr.3x mvinstr.3x mvinwstr.3x mvprintw.3x mvscanw.3x mvvline.3x \
-	mvvline_set.3x mvwadd_wch.3x mvwadd_wchnstr.3x mvwadd_wchstr.3x \
-	mvwaddch.3x mvwaddchnstr.3x mvwaddchstr.3x mvwaddnstr.3x \
-	mvwaddnwstr.3x mvwaddstr.3x mvwaddwstr.3x mvwchgat.3x mvwdelch.3x \
-	mvwget_wch.3x mvwget_wstr.3x mvwgetch.3x mvwgetn_wstr.3x mvwgetnstr.3x \
-	mvwgetstr.3x mvwhline.3x mvwhline_set.3x mvwin.3x mvwin_wch.3x \
-	mvwin_wchnstr.3x mvwin_wchstr.3x mvwinch.3x mvwinchnstr.3x \
-	mvwinchstr.3x mvwinnstr.3x mvwinnwstr.3x mvwins_nwstr.3x mvwins_wch.3x \
-	mvwins_wstr.3x mvwinsch.3x mvwinsnstr.3x mvwinsstr.3x mvwinstr.3x \
-	mvwinwstr.3x mvwprintw.3x mvwscanw.3x mvwvline.3x mvwvline_set.3x \
-	napms.3x ncurses.3x new_field.3x new_fieldtype.3x new_form.3x \
-	new_item.3x new_menu.3x new_page.3x new_panel.3x newpad.3x newterm.3x \
-	newwin.3x nl.3x nocbreak.3x nodelay.3x noecho.3x nonl.3x noqiflush.3x \
-	noraw.3x notimeout.3x overlay.3x overwrite.3x pair_content.3x panel.3x \
-	panel_above.3x panel_below.3x panel_hidden.3x panel_userptr.3x \
-	panel_window.3x pechochar.3x pnoutrefresh.3x pos_form_cursor.3x \
-	pos_menu_cursor.3x post_form.3x post_menu.3x prefresh.3x printw.3x \
-	putp.3x putwin.3x qiflush.3x raw.3x redrawwin.3x refresh.3x \
-	replace_panel.3x reset_prog_mode.3x reset_shell_mode.3x resetty.3x \
-	resize_term.3x resizeterm.3x restartterm.3x ripoffline.3x savetty.3x \
-	scale_form.3x scale_menu.3x scanw.3x scr_dump.3x scr_init.3x \
-	scr_restore.3x scr_set.3x scrl.3x scroll.3x scrollok.3x \
-	set_current_field.3x set_current_item.3x set_curterm.3x \
-	set_field_back.3x set_field_buffer.3x set_field_fore.3x \
-	set_field_init.3x set_field_just.3x set_field_opts.3x set_field_pad.3x \
+	erase.3x erasechar.3x erasewchar.3x fgetu8.3 field_arg.3x \
+	field_back.3x field_buffer.3x field_count.3x field_fore.3x \
+	field_index.3x field_info.3x field_just.3x field_opts.3x \
+	field_opts_off.3x field_opts_on.3x field_pad.3x field_status.3x \
+	field_type.3x field_userptr.3x filter.3x flash.3x flushinp.3x form.3x \
+	form_cursor.3x form_data.3x form_driver.3x form_field.3x \
+	form_field_attributes.3x form_field_buffer.3x form_field_info.3x \
+	form_field_just.3x form_field_new.3x form_field_opts.3x \
+	form_field_userptr.3x form_field_validation.3x form_fields.3x \
+	form_fieldtype.3x form_hook.3x form_new.3x form_new_page.3x \
+	form_opts.3x form_opts_off.3x form_opts_on.3x form_page.3x \
+	form_post.3x form_request_by_name.3x form_request_name.3x \
+	form_requestname.3x form_sub.3x form_userptr.3x form_win.3x \
+	free_field.3x free_fieldtype.3x free_form.3x free_item.3x free_menu.3x \
+	get_wch.3x get_wstr.3x getbegyx.3x getbkgd.3x getbkgrnd.3x getcchar.3x \
+	getch.3x getmaxyx.3x getmouse.3x getn_wstr.3x getnstr.3x getparyx.3x \
+	getstr.3x getsyx.3x getwin.3x getyx.3x halfdelay.3x has_colors.3x \
+	has_ic.3x has_il.3x has_key.3x hide_panel.3x hline.3x hline_set.3x \
+	idcok.3x idlok.3x immedok.3x in_wch.3x in_wchnstr.3x in_wchstr.3x \
+	inch.3x inchnstr.3x inchstr.3x init_color.3x init_pair.3x initscr.3x \
+	innstr.3x innwstr.3x ins_nwstr.3x ins_wch.3x ins_wstr.3x insch.3x \
+	insdelln.3x insertln.3x insnstr.3x insstr.3x instr.3x intrflush.3x \
+	inwstr.3x is_linetouched.3x is_term_resized.3x is_wintouched.3x \
+	isendwin.3x item_count.3x item_description.3x item_index.3x \
+	item_name.3x item_opts.3x item_opts_off.3x item_opts_on.3x \
+	item_userptr.3x item_value.3x item_visible.3x key_name.3x keybound.3x \
+	keyname.3x keyok.3x keypad.3x killchar.3x killwchar.3x leaveok.3x \
+	link_field.3x link_fieldtype.3x longname.3x mcprint.3x menu.3x \
+	menu_attributes.3x menu_back.3x menu_cursor.3x menu_driver.3x \
+	menu_fore.3x menu_format.3x menu_grey.3x menu_hook.3x menu_items.3x \
+	menu_mark.3x menu_new.3x menu_opts.3x menu_opts_off.3x menu_opts_on.3x \
+	menu_pad.3x menu_pattern.3x menu_post.3x menu_request_by_name.3x \
+	menu_request_name.3x menu_requestname.3x menu_spacing.3x menu_sub.3x \
+	menu_userptr.3x menu_win.3x meta.3x mitem_current.3x mitem_name.3x \
+	mitem_new.3x mitem_opts.3x mitem_userptr.3x mitem_value.3x \
+	mitem_visible.3x mouse_trafo.3x mouseinterval.3x mousemask.3x move.3x \
+	move_field.3x move_panel.3x mvadd_wch.3x mvadd_wchnstr.3x \
+	mvadd_wchstr.3x mvaddch.3x mvaddchnstr.3x mvaddchstr.3x mvaddnstr.3x \
+	mvaddnwstr.3x mvaddstr.3x mvaddwstr.3x mvchgat.3x mvcur.3x mvdelch.3x \
+	mvderwin.3x mvget_wch.3x mvget_wstr.3x mvgetch.3x mvgetn_wstr.3x \
+	mvgetnstr.3x mvgetstr.3x mvhline.3x mvhline_set.3x mvin_wch.3x \
+	mvin_wchnstr.3x mvin_wchstr.3x mvinch.3x mvinchnstr.3x mvinchstr.3x \
+	mvinnstr.3x mvinnwstr.3x mvins_nwstr.3x mvins_wch.3x mvins_wstr.3x \
+	mvinsch.3x mvinsnstr.3x mvinsstr.3x mvinstr.3x mvinwstr.3x mvprintw.3x \
+	mvscanw.3x mvvline.3x mvvline_set.3x mvwadd_wch.3x mvwadd_wchnstr.3x \
+	mvwadd_wchstr.3x mvwaddch.3x mvwaddchnstr.3x mvwaddchstr.3x \
+	mvwaddnstr.3x mvwaddnwstr.3x mvwaddstr.3x mvwaddwstr.3x mvwchgat.3x \
+	mvwdelch.3x mvwget_wch.3x mvwget_wstr.3x mvwgetch.3x mvwgetn_wstr.3x \
+	mvwgetnstr.3x mvwgetstr.3x mvwhline.3x mvwhline_set.3x mvwin.3x \
+	mvwin_wch.3x mvwin_wchnstr.3x mvwin_wchstr.3x mvwinch.3x \
+	mvwinchnstr.3x mvwinchstr.3x mvwinnstr.3x mvwinnwstr.3x \
+	mvwins_nwstr.3x mvwins_wch.3x mvwins_wstr.3x mvwinsch.3x mvwinsnstr.3x \
+	mvwinsstr.3x mvwinstr.3x mvwinwstr.3x mvwprintw.3x mvwscanw.3x \
+	mvwvline.3x mvwvline_set.3x napms.3x ncurses.3x new_field.3x \
+	new_fieldtype.3x new_form.3x new_item.3x new_menu.3x new_page.3x \
+	new_panel.3x newpad.3x newterm.3x newwin.3x nl.3x nocbreak.3x \
+	nodelay.3x noecho.3x nonl.3x noqiflush.3x noraw.3x notimeout.3x \
+	overlay.3x overwrite.3x pair_content.3x panel.3x panel_above.3x \
+	panel_below.3x panel_hidden.3x panel_userptr.3x panel_window.3x \
+	pechochar.3x pnoutrefresh.3x pos_form_cursor.3x pos_menu_cursor.3x \
+	post_form.3x post_menu.3x prefresh.3x printw.3x putp.3x putwin.3x \
+	qiflush.3x raw.3x redrawwin.3x refresh.3x replace_panel.3x \
+	reset_prog_mode.3x reset_shell_mode.3x resetty.3x resize_term.3x \
+	resizeterm.3x restartterm.3x ripoffline.3x savetty.3x scale_form.3x \
+	scale_menu.3x scanw.3x scr_dump.3x scr_init.3x scr_restore.3x \
+	scr_set.3x scrl.3x scroll.3x scrollok.3x set_current_field.3x \
+	set_current_item.3x set_curterm.3x set_field_back.3x \
+	set_field_buffer.3x set_field_fore.3x set_field_init.3x \
+	set_field_just.3x set_field_opts.3x set_field_pad.3x \
 	set_field_status.3x set_field_term.3x set_field_type.3x \
 	set_field_userptr.3x set_fieldtype_arg.3x set_fieldtype_choice.3x \
 	set_form_fields.3x set_form_init.3x set_form_opts.3x set_form_page.3x \
@@ -174,10 +178,14 @@ MAN3=	COLOR_PAIR.3x PAIR_NUMBER.3x _nc_tracebits.3x _traceattr.3x \
 	wnoutrefresh.3x wprintw.3x wredrawln.3x wrefresh.3x wresize.3x \
 	wscanw.3x wscrl.3x wsetscrreg.3x wstandend.3x wstandout.3x \
 	wsyncdown.3x wsyncup.3x wtimeout.3x wtouchln.3x wunctrl.3x wvline.3x \
-	wvline_set.3x
+	wvline_set.3x field_init.3x field_term.3x form_init.3x form_term.3x \
+	fputu8.3 item_init.3x item_term.3x key_defined.3x menu_init.3x \
+	menu_term.3x pecho_wchar.3x sgetu8.3 sputu8.3
 MAN5=	term.5 terminfo.5
 MAN7=	term.7
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 DOCS=		ANNOUNCE INSTALL NEWS README TO-DO doc/html/announce.html \
 		doc/hackguide.doc doc/html/hackguide.html \
 		doc/html/index.html doc/ncurses-intro.doc \
@@ -194,6 +202,16 @@ EXAMPLES_CPP=	Makefile NEWS PROBLEMS README-first cursesapp.cc \
 		cursesw.h cursslk.cc cursslk.h demo.cc etip.h \
 		internal.h
 
+pre-configure:
+	${MKDIR} ${WRKDIR}
+	${ECHO_CMD} \
+	"Warning:  source code for this version has not been reviewed!" \
+		> ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD} 
+	@${ECHO_CMD} Waiting ten seconds--press control-C to cancel build.
+	@sleep 10
+
 post-install:
 	@ ${GZIP_CMD} ${PREFIX}/man/man1/tack.1
 	@ ${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}/c++
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index e072484a4f3c..f1737aad18c1 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,2 +1,2 @@
-MD5 (ncurses-5.3.tar.gz) = 5dcc9faa93157eafa572494bffed131a
-SIZE (ncurses-5.3.tar.gz) = 2067718
+MD5 (ncurses-5.4.tar.gz) = 069c8880072060373290a4fefff43520
+SIZE (ncurses-5.4.tar.gz) = 2154022
diff --git a/devel/ncurses/pkg-plist b/devel/ncurses/pkg-plist
index 81f8e0673f71..33bd0449b31b 100644
--- a/devel/ncurses/pkg-plist
+++ b/devel/ncurses/pkg-plist
@@ -26,24 +26,24 @@ include/ncurses/termcap.h
 include/ncurses/unctrl.h
 lib/libform.a
 lib/libform.so
-lib/libform.so.5.3
+lib/libform.so.5.4
 lib/libform_p.a
 lib/libmenu.a
 lib/libmenu.so
-lib/libmenu.so.5.3
+lib/libmenu.so.5.4
 lib/libmenu_p.a
 lib/libncurses++.a
 lib/libncurses.a
 lib/libncurses.so
-lib/libncurses.so.5.3
+lib/libncurses.so.5.4
 lib/libncurses_p.a
 lib/libpanel.a
 lib/libpanel.so
-lib/libpanel.so.5.3
+lib/libpanel.so.5.4
 lib/libpanel_p.a
 lib/libtinfo.a
 lib/libtinfo.so
-lib/libtinfo.so.5.3
+lib/libtinfo.so.5.4
 lib/libtinfo_p.a
 share/doc/ncurses/ANNOUNCE
 share/doc/ncurses/INSTALL
@@ -654,6 +654,7 @@ share/misc/terminfo/c/cyb110
 share/misc/terminfo/c/cyb83
 share/misc/terminfo/c/cygwin
 share/misc/terminfo/c/cygwinB19
+share/misc/terminfo/c/cygwinDBG
 share/misc/terminfo/d/d132
 share/misc/terminfo/d/d2
 share/misc/terminfo/d/d2-dg
@@ -849,6 +850,7 @@ share/misc/terminfo/d/dec-vt220
 share/misc/terminfo/d/dec-vt330
 share/misc/terminfo/d/dec-vt340
 share/misc/terminfo/d/dec-vt400
+share/misc/terminfo/d/decansi
 share/misc/terminfo/d/decpro
 share/misc/terminfo/d/decwriter
 share/misc/terminfo/d/delta
@@ -892,6 +894,9 @@ share/misc/terminfo/d/diablo630
 share/misc/terminfo/d/dialogue
 share/misc/terminfo/d/dialogue80
 share/misc/terminfo/d/digilog
+share/misc/terminfo/d/djgpp
+share/misc/terminfo/d/djgpp203
+share/misc/terminfo/d/djgpp204
 share/misc/terminfo/d/dku7003
 share/misc/terminfo/d/dku7003-dumb
 share/misc/terminfo/d/dku7102
@@ -945,6 +950,7 @@ share/misc/terminfo/e/elks-glasstty
 share/misc/terminfo/e/elks-vt52
 share/misc/terminfo/e/emots
 share/misc/terminfo/e/emu
+share/misc/terminfo/e/emx-base
 share/misc/terminfo/e/env230
 share/misc/terminfo/e/envision230
 share/misc/terminfo/e/ep40
@@ -997,6 +1003,8 @@ share/misc/terminfo/g/glasstty
 share/misc/terminfo/g/gnome
 share/misc/terminfo/g/gnome-rh62
 share/misc/terminfo/g/gnome-rh72
+share/misc/terminfo/g/gnome-rh80
+share/misc/terminfo/g/gnome-rh90
 share/misc/terminfo/g/go-225
 share/misc/terminfo/g/go140
 share/misc/terminfo/g/go140w
@@ -1235,6 +1243,8 @@ share/misc/terminfo/i/ims950
 share/misc/terminfo/i/ims950-b
 share/misc/terminfo/i/ims950-rv
 share/misc/terminfo/i/infoton
+share/misc/terminfo/i/interix
+share/misc/terminfo/i/interix-nti
 share/misc/terminfo/i/intertec
 share/misc/terminfo/i/intertube
 share/misc/terminfo/i/intertube2
@@ -1294,6 +1304,7 @@ share/misc/terminfo/l/linux-koi8r
 share/misc/terminfo/l/linux-lat
 share/misc/terminfo/l/linux-m
 share/misc/terminfo/l/linux-nic
+share/misc/terminfo/l/linux-vt
 share/misc/terminfo/l/lisa
 share/misc/terminfo/l/lisaterm
 share/misc/terminfo/l/lisaterm-w
@@ -1358,7 +1369,10 @@ share/misc/terminfo/m/modgraph
 share/misc/terminfo/m/modgraph2
 share/misc/terminfo/m/modgraph48
 share/misc/terminfo/m/mono-emx
+share/misc/terminfo/m/mouse-sun
+share/misc/terminfo/m/ms-vt-utf8
 share/misc/terminfo/m/ms-vt100
+share/misc/terminfo/m/ms-vt100+
 share/misc/terminfo/m/ms-vt100-color
 share/misc/terminfo/m/msk227
 share/misc/terminfo/m/msk22714
@@ -1369,6 +1383,8 @@ share/misc/terminfo/m/mskermit227am
 share/misc/terminfo/m/mt-70
 share/misc/terminfo/m/mt4520-rv
 share/misc/terminfo/m/mt70
+share/misc/terminfo/m/mterm
+share/misc/terminfo/m/mterm-ansi
 share/misc/terminfo/m/mvterm
 share/misc/terminfo/n/nansi.sys
 share/misc/terminfo/n/nansi.sysk
@@ -1502,6 +1518,24 @@ share/misc/terminfo/n/nsterm-m-s-acs
 share/misc/terminfo/n/nsterm-s
 share/misc/terminfo/n/nsterm-s-7
 share/misc/terminfo/n/nsterm-s-acs
+share/misc/terminfo/n/ntconsole
+share/misc/terminfo/n/ntconsole-100
+share/misc/terminfo/n/ntconsole-100-nti
+share/misc/terminfo/n/ntconsole-25
+share/misc/terminfo/n/ntconsole-25-nti
+share/misc/terminfo/n/ntconsole-25-w
+share/misc/terminfo/n/ntconsole-25-w-vt
+share/misc/terminfo/n/ntconsole-35
+share/misc/terminfo/n/ntconsole-35-nti
+share/misc/terminfo/n/ntconsole-35-w
+share/misc/terminfo/n/ntconsole-50
+share/misc/terminfo/n/ntconsole-50-nti
+share/misc/terminfo/n/ntconsole-50-w
+share/misc/terminfo/n/ntconsole-60
+share/misc/terminfo/n/ntconsole-60-nti
+share/misc/terminfo/n/ntconsole-60-w
+share/misc/terminfo/n/ntconsole-w
+share/misc/terminfo/n/ntconsole-w-vt
 share/misc/terminfo/n/nwe501
 share/misc/terminfo/n/nwe501-a
 share/misc/terminfo/n/nwe501-o
@@ -1539,6 +1573,25 @@ share/misc/terminfo/o/oldibmpc3
 share/misc/terminfo/o/oldpc3
 share/misc/terminfo/o/oldsun
 share/misc/terminfo/o/omron
+share/misc/terminfo/o/opennt
+share/misc/terminfo/o/opennt-100
+share/misc/terminfo/o/opennt-100-nti
+share/misc/terminfo/o/opennt-25
+share/misc/terminfo/o/opennt-25-nti
+share/misc/terminfo/o/opennt-25-w
+share/misc/terminfo/o/opennt-25-w-vt
+share/misc/terminfo/o/opennt-35
+share/misc/terminfo/o/opennt-35-nti
+share/misc/terminfo/o/opennt-35-w
+share/misc/terminfo/o/opennt-50
+share/misc/terminfo/o/opennt-50-nti
+share/misc/terminfo/o/opennt-50-w
+share/misc/terminfo/o/opennt-60
+share/misc/terminfo/o/opennt-60-nti
+share/misc/terminfo/o/opennt-60-w
+share/misc/terminfo/o/opennt-nti
+share/misc/terminfo/o/opennt-w
+share/misc/terminfo/o/opennt-w-vt
 share/misc/terminfo/o/opus3n1+
 share/misc/terminfo/o/origibmpc3
 share/misc/terminfo/o/origpc3
@@ -1733,6 +1786,10 @@ share/misc/terminfo/r/rtpc
 share/misc/terminfo/r/rxvt
 share/misc/terminfo/r/rxvt-16color
 share/misc/terminfo/r/rxvt-basic
+share/misc/terminfo/r/rxvt-color
+share/misc/terminfo/r/rxvt-cygwin
+share/misc/terminfo/r/rxvt-cygwin-native
+share/misc/terminfo/r/rxvt-xpm
 share/misc/terminfo/s/s4
 share/misc/terminfo/s/sb1
 share/misc/terminfo/s/sb2
@@ -1746,7 +1803,10 @@ share/misc/terminfo/s/scoansi
 share/misc/terminfo/s/scoansi-new
 share/misc/terminfo/s/scoansi-old
 share/misc/terminfo/s/screen
+share/misc/terminfo/s/screen-bce
+share/misc/terminfo/s/screen-s
 share/misc/terminfo/s/screen-w
+share/misc/terminfo/s/screen.linux
 share/misc/terminfo/s/screen.teraterm
 share/misc/terminfo/s/screen.xterm-r6
 share/misc/terminfo/s/screen.xterm-xfree86
@@ -1778,6 +1838,7 @@ share/misc/terminfo/s/sun-nic
 share/misc/terminfo/s/sun-s
 share/misc/terminfo/s/sun-s-e
 share/misc/terminfo/s/sun-ss5
+share/misc/terminfo/s/sun-type4
 share/misc/terminfo/s/sun1
 share/misc/terminfo/s/sun2
 share/misc/terminfo/s/sune
@@ -1872,6 +1933,7 @@ share/misc/terminfo/t/ti928
 share/misc/terminfo/t/ti928-8
 share/misc/terminfo/t/ti931
 share/misc/terminfo/t/ti_ansi
+share/misc/terminfo/t/tkterm
 share/misc/terminfo/t/tn1200
 share/misc/terminfo/t/tn300
 share/misc/terminfo/t/trs16
@@ -1885,6 +1947,7 @@ share/misc/terminfo/t/ts100
 share/misc/terminfo/t/ts100-ctxt
 share/misc/terminfo/t/ts100-sp
 share/misc/terminfo/t/ts1p
+share/misc/terminfo/t/tt
 share/misc/terminfo/t/tt505-22
 share/misc/terminfo/t/tty33
 share/misc/terminfo/t/tty35
@@ -1918,21 +1981,92 @@ share/misc/terminfo/t/tty5620-24
 share/misc/terminfo/t/tty5620-34
 share/misc/terminfo/t/tty5620-s
 share/misc/terminfo/t/ttydmd
-share/misc/terminfo/t/tvi-2p
 share/misc/terminfo/t/tvi803
 share/misc/terminfo/t/tvi9065
 share/misc/terminfo/t/tvi910
 share/misc/terminfo/t/tvi910+
 share/misc/terminfo/t/tvi912
-share/misc/terminfo/t/tvi912-2p
 share/misc/terminfo/t/tvi912b
+share/misc/terminfo/t/tvi912b+2p
+share/misc/terminfo/t/tvi912b+dim
+share/misc/terminfo/t/tvi912b+mc
+share/misc/terminfo/t/tvi912b+printer
+share/misc/terminfo/t/tvi912b+vb
+share/misc/terminfo/t/tvi912b-2p
+share/misc/terminfo/t/tvi912b-2p-mc
+share/misc/terminfo/t/tvi912b-2p-p
+share/misc/terminfo/t/tvi912b-2p-unk
+share/misc/terminfo/t/tvi912b-mc
+share/misc/terminfo/t/tvi912b-mc-2p
+share/misc/terminfo/t/tvi912b-mc-vb
+share/misc/terminfo/t/tvi912b-p
+share/misc/terminfo/t/tvi912b-p-2p
+share/misc/terminfo/t/tvi912b-p-vb
+share/misc/terminfo/t/tvi912b-unk
+share/misc/terminfo/t/tvi912b-unk-2p
+share/misc/terminfo/t/tvi912b-unk-vb
+share/misc/terminfo/t/tvi912b-vb
+share/misc/terminfo/t/tvi912b-vb-mc
+share/misc/terminfo/t/tvi912b-vb-p
+share/misc/terminfo/t/tvi912b-vb-unk
 share/misc/terminfo/t/tvi912c
+share/misc/terminfo/t/tvi912c-2p
+share/misc/terminfo/t/tvi912c-2p-mc
+share/misc/terminfo/t/tvi912c-2p-p
+share/misc/terminfo/t/tvi912c-2p-unk
+share/misc/terminfo/t/tvi912c-mc
+share/misc/terminfo/t/tvi912c-mc-2p
+share/misc/terminfo/t/tvi912c-mc-vb
+share/misc/terminfo/t/tvi912c-p
+share/misc/terminfo/t/tvi912c-p-2p
+share/misc/terminfo/t/tvi912c-p-vb
+share/misc/terminfo/t/tvi912c-unk
+share/misc/terminfo/t/tvi912c-unk-2p
+share/misc/terminfo/t/tvi912c-unk-vb
+share/misc/terminfo/t/tvi912c-vb
+share/misc/terminfo/t/tvi912c-vb-mc
+share/misc/terminfo/t/tvi912c-vb-p
+share/misc/terminfo/t/tvi912c-vb-unk
 share/misc/terminfo/t/tvi912cc
 share/misc/terminfo/t/tvi914
 share/misc/terminfo/t/tvi920
-share/misc/terminfo/t/tvi920-2p
 share/misc/terminfo/t/tvi920b
+share/misc/terminfo/t/tvi920b+fn
+share/misc/terminfo/t/tvi920b-2p
+share/misc/terminfo/t/tvi920b-2p-mc
+share/misc/terminfo/t/tvi920b-2p-p
+share/misc/terminfo/t/tvi920b-2p-unk
+share/misc/terminfo/t/tvi920b-mc
+share/misc/terminfo/t/tvi920b-mc-2p
+share/misc/terminfo/t/tvi920b-mc-vb
+share/misc/terminfo/t/tvi920b-p
+share/misc/terminfo/t/tvi920b-p-2p
+share/misc/terminfo/t/tvi920b-p-vb
+share/misc/terminfo/t/tvi920b-unk
+share/misc/terminfo/t/tvi920b-unk-2p
+share/misc/terminfo/t/tvi920b-unk-vb
+share/misc/terminfo/t/tvi920b-vb
+share/misc/terminfo/t/tvi920b-vb-mc
+share/misc/terminfo/t/tvi920b-vb-p
+share/misc/terminfo/t/tvi920b-vb-unk
 share/misc/terminfo/t/tvi920c
+share/misc/terminfo/t/tvi920c-2p
+share/misc/terminfo/t/tvi920c-2p-mc
+share/misc/terminfo/t/tvi920c-2p-p
+share/misc/terminfo/t/tvi920c-2p-unk
+share/misc/terminfo/t/tvi920c-mc
+share/misc/terminfo/t/tvi920c-mc-2p
+share/misc/terminfo/t/tvi920c-mc-vb
+share/misc/terminfo/t/tvi920c-p
+share/misc/terminfo/t/tvi920c-p-2p
+share/misc/terminfo/t/tvi920c-p-vb
+share/misc/terminfo/t/tvi920c-unk
+share/misc/terminfo/t/tvi920c-unk-2p
+share/misc/terminfo/t/tvi920c-unk-vb
+share/misc/terminfo/t/tvi920c-vb
+share/misc/terminfo/t/tvi920c-vb-mc
+share/misc/terminfo/t/tvi920c-vb-p
+share/misc/terminfo/t/tvi920c-vb-unk
 share/misc/terminfo/t/tvi921
 share/misc/terminfo/t/tvi924
 share/misc/terminfo/t/tvi925
@@ -1964,6 +2098,7 @@ share/misc/terminfo/u/uniterm49
 share/misc/terminfo/u/unixpc
 share/misc/terminfo/u/unknown
 share/misc/terminfo/u/uts30
+share/misc/terminfo/u/uwin
 share/misc/terminfo/v/v200-nam
 share/misc/terminfo/v/v320n
 share/misc/terminfo/v/v3220
@@ -2016,7 +2151,12 @@ share/misc/terminfo/v/vs100
 share/misc/terminfo/v/vs100-x10
 share/misc/terminfo/v/vsc
 share/misc/terminfo/v/vt-61
+share/misc/terminfo/v/vt-utf8
 share/misc/terminfo/v/vt100
+share/misc/terminfo/v/vt100+
+share/misc/terminfo/v/vt100+fnkeys
+share/misc/terminfo/v/vt100+keypad
+share/misc/terminfo/v/vt100+pfkeys
 share/misc/terminfo/v/vt100-am
 share/misc/terminfo/v/vt100-bm
 share/misc/terminfo/v/vt100-bm-o
@@ -2048,6 +2188,7 @@ share/misc/terminfo/v/vt200-js
 share/misc/terminfo/v/vt200-old
 share/misc/terminfo/v/vt200-w
 share/misc/terminfo/v/vt220
+share/misc/terminfo/v/vt220+keypad
 share/misc/terminfo/v/vt220-8
 share/misc/terminfo/v/vt220-8bit
 share/misc/terminfo/v/vt220-js
@@ -2084,6 +2225,7 @@ share/misc/terminfo/v/vt520
 share/misc/terminfo/v/vt525
 share/misc/terminfo/v/vt61
 share/misc/terminfo/v/vt61.5
+share/misc/terminfo/v/vtnt
 share/misc/terminfo/v/vv100
 share/misc/terminfo/w/wren
 share/misc/terminfo/w/wrenw
@@ -2390,6 +2532,8 @@ share/misc/terminfo/x/xtalk
 share/misc/terminfo/x/xterm
 share/misc/terminfo/x/xterm+sl
 share/misc/terminfo/x/xterm+sl-twm
+share/misc/terminfo/x/xterm-1002
+share/misc/terminfo/x/xterm-1003
 share/misc/terminfo/x/xterm-16color
 share/misc/terminfo/x/xterm-24
 share/misc/terminfo/x/xterm-256color
@@ -2414,6 +2558,7 @@ share/misc/terminfo/x/xterm-xf86-v32
 share/misc/terminfo/x/xterm-xf86-v33
 share/misc/terminfo/x/xterm-xf86-v333
 share/misc/terminfo/x/xterm-xf86-v40
+share/misc/terminfo/x/xterm-xf86-v43
 share/misc/terminfo/x/xterm-xfree86
 share/misc/terminfo/x/xterm-xi
 share/misc/terminfo/x/xterm1