devel/ncurses: update to 20171007 snapshot

While here, take maintainership and set CPE info

MFH:		2017Q4
Security:	b84dbd94-e894-4c91-b8cd-d328537b1b2b

4 files changed, 192 insertions, 191 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 03e0b7d53c0e..4c2c517053a9 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	ncurses
-PORTVERSION=	6.0
-PORTREVISION=	3
+PORTVERSION=	6.0.0s${SNAPSHOT}
 CATEGORIES=	devel
-MASTER_SITES=	http://invisible-mirror.net/archives/${PORTNAME}/ \
-		ftp://invisible-island.net/${PORTNAME}/
+MASTER_SITES=	ftp://ftp.invisible-island.net/${PORTNAME}/current/
+DISTNAME=	${PORTNAME}-6.0-${SNAPSHOT}
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Library for terminal-independent, full-screen output
 
 LICENSE=	MIT
@@ -17,6 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_sparc64=	cannot build: coredump: illegal instruction
 
+SNAPSHOT=	20171007
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=../configure
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
@@ -41,7 +41,8 @@ TRACE_DESC=	Add trace() function to all models of ncurses
 CONFIGURE_ENV=	gnat_exists="no"
 
 USE_LDCONFIG=	yes
-USES=		pkgconfig shebangfix terminfo
+USES=		cpe pkgconfig shebangfix terminfo tar:tgz
+CPE_VENDOR=	gnu
 SHEBANG_FILES=	test/tracemunch
 
 WIDEC_WRKSRC=	${WRKSRC}/build.widec
@@ -54,8 +55,8 @@ CONFIGURE_WRKSRC=	${NOWIDEC_WRKSRC}
 BUILD_WRKSRC=	${NOWIDEC_WRKSRC}
 INSTALL_WRKSRC=	${NOWIDEC_WRKSRC}
 
-PLIST_SUB+=	ABI_VER=${PORTVERSION:R} \
-		REL_VER=${PORTVERSION} \
+PLIST_SUB+=	ABI_VER=6 \
+		REL_VER=6.0 \
 		WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${PREFIX}/,,} \
 		NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${PREFIX}/,,}
 
@@ -130,7 +131,7 @@ post-install:
 	${ECHO} "INPUT(libncurses.so.${PORTVERSION:R} AS_NEEDED(-ltinfo))" > ${STAGEDIR}${PREFIX}/lib/libncurses.so
 	${ECHO} "INPUT(libncursesw.so.${PORTVERSION:R} AS_NEEDED(-ltinfow))" > ${STAGEDIR}${PREFIX}/lib/libncursesw.so
 
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.${PORTVERSION}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.6.0
 
 	${MV} ${STAGEDIR}${PREFIX}/share/misc/terminfo.db \
 		${STAGEDIR}${PREFIX}/share/misc/terminfo.db.default
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index 28918243ac48..c46effc3f438 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ncurses/ncurses-6.0.tar.gz) = f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260
-SIZE (ncurses/ncurses-6.0.tar.gz) = 3131891
+TIMESTAMP = 1507736741
+SHA256 (ncurses/ncurses-6.0-20171007.tgz) = d74ce1f651824b6254a6d913d312e4ab32874812bb066288ef87b0b0482c4db5
+SIZE (ncurses/ncurses-6.0-20171007.tgz) = 3327333
diff --git a/devel/ncurses/files/patch-configure b/devel/ncurses/files/patch-configure
deleted file mode 100644
index 64aac1c6ccdb..000000000000
--- a/devel/ncurses/files/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
-# Based on upstream 6.0 patch 20160220:
-#
-#  + modify configure macro for shared-library rules to use -Wl,-rpath
-#    rather than -rpath to work around a bug in scons (FreeBSD #178732,
-#  cf: 20061021).
-#
-# See Also:
-#
-#  http://lists.gnu.org/archive/html/bug-ncurses/2016-02/msg00009.html
-#  http://lists.gnu.org/archive/html/bug-ncurses/2016-02/msg00006.html
-#
-# TODO: Remove patch on 6.1 update
-
---- configure.orig	2015-08-05 09:20:32 UTC
-+++ configure
-@@ -5863,7 +5863,7 @@ case $cf_cv_system_name in
- 	LD_RPATH_OPT="-Wl,-rpath,"
- 	;;
- (dragonfly*|freebsd*)
--	LD_RPATH_OPT="-rpath "
-+	LD_RPATH_OPT="-Wl,-rpath,"
- 	;;
- (netbsd*)
- 	LD_RPATH_OPT="-Wl,-rpath,"
diff --git a/devel/ncurses/pkg-plist b/devel/ncurses/pkg-plist
index 92fd175104ae..47a51ca3c1a1 100644
--- a/devel/ncurses/pkg-plist
+++ b/devel/ncurses/pkg-plist
@@ -120,26 +120,8 @@ man/man1/tic.1m.gz
 man/man1/toe.1m.gz
 man/man1/tput.1.gz
 man/man1/tset.1.gz
-man/man3/BC.3x.gz
-man/man3/COLORS.3x.gz
-man/man3/COLOR_PAIR.3x.gz
-man/man3/COLOR_PAIRS.3x.gz
-man/man3/COLS.3x.gz
-man/man3/ESCDELAY.3x.gz
-man/man3/LINES.3x.gz
-man/man3/PAIR_NUMBER.3x.gz
-man/man3/PC.3x.gz
-man/man3/SP.3x.gz
-man/man3/TABSIZE.3x.gz
-man/man3/TYPE_ALNUM.3x.gz
-man/man3/TYPE_ALPHA.3x.gz
-man/man3/TYPE_ENUM.3x.gz
-man/man3/TYPE_INTEGER.3x.gz
-man/man3/TYPE_IPV4.3x.gz
-man/man3/TYPE_NUMERIC.3x.gz
-man/man3/TYPE_REGEXP.3x.gz
-man/man3/UP.3x.gz
 man/man3/_nc_free_and_exit.3x.gz
+man/man3/_nc_free_tinfo.3x.gz
 man/man3/_nc_freeall.3x.gz
 man/man3/_nc_tracebits.3x.gz
 man/man3/_traceattr.3x.gz
@@ -163,8 +145,10 @@ man/man3/addnstr.3x.gz
 man/man3/addnwstr.3x.gz
 man/man3/addstr.3x.gz
 man/man3/addwstr.3x.gz
-man/man3/assume_default_colors.3x.gz
+man/man3/alloc_pair_sp.3x.gz
+man/man3/alloc_pair.3x.gz
 man/man3/assume_default_colors_sp.3x.gz
+man/man3/assume_default_colors.3x.gz
 man/man3/attr_get.3x.gz
 man/man3/attr_off.3x.gz
 man/man3/attr_on.3x.gz
@@ -172,10 +156,11 @@ man/man3/attr_set.3x.gz
 man/man3/attroff.3x.gz
 man/man3/attron.3x.gz
 man/man3/attrset.3x.gz
-man/man3/baudrate.3x.gz
 man/man3/baudrate_sp.3x.gz
-man/man3/beep.3x.gz
+man/man3/baudrate.3x.gz
+man/man3/BC.3x.gz
 man/man3/beep_sp.3x.gz
+man/man3/beep.3x.gz
 man/man3/bkgd.3x.gz
 man/man3/bkgdset.3x.gz
 man/man3/bkgrnd.3x.gz
@@ -183,24 +168,28 @@ man/man3/bkgrndset.3x.gz
 man/man3/boolcodes.3x.gz
 man/man3/boolfnames.3x.gz
 man/man3/boolnames.3x.gz
-man/man3/border.3x.gz
 man/man3/border_set.3x.gz
+man/man3/border.3x.gz
 man/man3/bottom_panel.3x.gz
-man/man3/box.3x.gz
 man/man3/box_set.3x.gz
-man/man3/can_change_color.3x.gz
+man/man3/box.3x.gz
 man/man3/can_change_color_sp.3x.gz
-man/man3/cbreak.3x.gz
+man/man3/can_change_color.3x.gz
 man/man3/cbreak_sp.3x.gz
+man/man3/cbreak.3x.gz
 man/man3/ceiling_panel.3x.gz
 man/man3/chgat.3x.gz
 man/man3/clear.3x.gz
 man/man3/clearok.3x.gz
 man/man3/clrtobot.3x.gz
 man/man3/clrtoeol.3x.gz
-man/man3/color_content.3x.gz
 man/man3/color_content_sp.3x.gz
+man/man3/color_content.3x.gz
+man/man3/COLOR_PAIR.3x.gz
+man/man3/COLOR_PAIRS.3x.gz
 man/man3/color_set.3x.gz
+man/man3/COLORS.3x.gz
+man/man3/COLS.3x.gz
 man/man3/copywin.3x.gz
 man/man3/cur_term.3x.gz
 man/man3/current_field.3x.gz
@@ -215,8 +204,8 @@ man/man3/curs_attr.3x.gz
 man/man3/curs_beep.3x.gz
 man/man3/curs_bkgd.3x.gz
 man/man3/curs_bkgrnd.3x.gz
-man/man3/curs_border.3x.gz
 man/man3/curs_border_set.3x.gz
+man/man3/curs_border.3x.gz
 man/man3/curs_clear.3x.gz
 man/man3/curs_color.3x.gz
 man/man3/curs_delch.3x.gz
@@ -255,8 +244,8 @@ man/man3/curs_refresh.3x.gz
 man/man3/curs_scanw.3x.gz
 man/man3/curs_scr_dump.3x.gz
 man/man3/curs_scroll.3x.gz
-man/man3/curs_set.3x.gz
 man/man3/curs_set_sp.3x.gz
+man/man3/curs_set.3x.gz
 man/man3/curs_slk.3x.gz
 man/man3/curs_sp_funcs.3x.gz
 man/man3/curs_termattrs.3x.gz
@@ -272,38 +261,45 @@ man/man3/curscr.3x.gz
 man/man3/curses_version.3x.gz
 man/man3/data_ahead.3x.gz
 man/man3/data_behind.3x.gz
-man/man3/def_prog_mode.3x.gz
 man/man3/def_prog_mode_sp.3x.gz
-man/man3/def_shell_mode.3x.gz
+man/man3/def_prog_mode.3x.gz
 man/man3/def_shell_mode_sp.3x.gz
+man/man3/def_shell_mode.3x.gz
 man/man3/default_colors.3x.gz
-man/man3/define_key.3x.gz
 man/man3/define_key_sp.3x.gz
-man/man3/del_curterm.3x.gz
+man/man3/define_key.3x.gz
 man/man3/del_curterm_sp.3x.gz
+man/man3/del_curterm.3x.gz
 man/man3/del_panel.3x.gz
-man/man3/delay_output.3x.gz
 man/man3/delay_output_sp.3x.gz
+man/man3/delay_output.3x.gz
 man/man3/delch.3x.gz
 man/man3/deleteln.3x.gz
 man/man3/delscreen.3x.gz
 man/man3/delwin.3x.gz
 man/man3/derwin.3x.gz
-man/man3/doupdate.3x.gz
 man/man3/doupdate_sp.3x.gz
+man/man3/doupdate.3x.gz
 man/man3/dup_field.3x.gz
 man/man3/dupwin.3x.gz
 man/man3/dynamic_field_info.3x.gz
-man/man3/echo.3x.gz
 man/man3/echo_sp.3x.gz
 man/man3/echo_wchar.3x.gz
+man/man3/echo.3x.gz
 man/man3/echochar.3x.gz
-man/man3/endwin.3x.gz
 man/man3/endwin_sp.3x.gz
+man/man3/endwin.3x.gz
 man/man3/erase.3x.gz
-man/man3/erasechar.3x.gz
 man/man3/erasechar_sp.3x.gz
+man/man3/erasechar.3x.gz
 man/man3/erasewchar.3x.gz
+man/man3/ESCDELAY.3x.gz
+man/man3/extended_color_content_sp.3x.gz
+man/man3/extended_color_content.3x.gz
+man/man3/extended_pair_content_sp.3x.gz
+man/man3/extended_pair_content.3x.gz
+man/man3/extended_slk_color_sp.3x.gz
+man/man3/extended_slk_color.3x.gz
 man/man3/field_arg.3x.gz
 man/man3/field_back.3x.gz
 man/man3/field_buffer.3x.gz
@@ -313,26 +309,26 @@ man/man3/field_index.3x.gz
 man/man3/field_info.3x.gz
 man/man3/field_init.3x.gz
 man/man3/field_just.3x.gz
-man/man3/field_opts.3x.gz
 man/man3/field_opts_off.3x.gz
 man/man3/field_opts_on.3x.gz
+man/man3/field_opts.3x.gz
 man/man3/field_pad.3x.gz
 man/man3/field_status.3x.gz
 man/man3/field_term.3x.gz
 man/man3/field_type.3x.gz
 man/man3/field_userptr.3x.gz
-man/man3/filter.3x.gz
 man/man3/filter_sp.3x.gz
-man/man3/flash.3x.gz
+man/man3/filter.3x.gz
+man/man3/find_pair_sp.3x.gz
+man/man3/find_pair.3x.gz
 man/man3/flash_sp.3x.gz
-man/man3/flushinp.3x.gz
+man/man3/flash.3x.gz
 man/man3/flushinp_sp.3x.gz
-man/man3/form.3x.gz
+man/man3/flushinp.3x.gz
 man/man3/form_cursor.3x.gz
 man/man3/form_data.3x.gz
-man/man3/form_driver.3x.gz
 man/man3/form_driver_w.3x.gz
-man/man3/form_field.3x.gz
+man/man3/form_driver.3x.gz
 man/man3/form_field_attributes.3x.gz
 man/man3/form_field_buffer.3x.gz
 man/man3/form_field_info.3x.gz
@@ -341,15 +337,16 @@ man/man3/form_field_new.3x.gz
 man/man3/form_field_opts.3x.gz
 man/man3/form_field_userptr.3x.gz
 man/man3/form_field_validation.3x.gz
+man/man3/form_field.3x.gz
 man/man3/form_fields.3x.gz
 man/man3/form_fieldtype.3x.gz
 man/man3/form_hook.3x.gz
 man/man3/form_init.3x.gz
-man/man3/form_new.3x.gz
 man/man3/form_new_page.3x.gz
-man/man3/form_opts.3x.gz
+man/man3/form_new.3x.gz
 man/man3/form_opts_off.3x.gz
 man/man3/form_opts_on.3x.gz
+man/man3/form_opts.3x.gz
 man/man3/form_page.3x.gz
 man/man3/form_post.3x.gz
 man/man3/form_request_by_name.3x.gz
@@ -360,13 +357,16 @@ man/man3/form_term.3x.gz
 man/man3/form_userptr.3x.gz
 man/man3/form_variables.3x.gz
 man/man3/form_win.3x.gz
+man/man3/form.3x.gz
 man/man3/free_field.3x.gz
 man/man3/free_fieldtype.3x.gz
 man/man3/free_form.3x.gz
 man/man3/free_item.3x.gz
 man/man3/free_menu.3x.gz
-man/man3/get_escdelay.3x.gz
+man/man3/free_pair_sp.3x.gz
+man/man3/free_pair.3x.gz
 man/man3/get_escdelay_sp.3x.gz
+man/man3/get_escdelay.3x.gz
 man/man3/get_wch.3x.gz
 man/man3/get_wstr.3x.gz
 man/man3/getattrs.3x.gz
@@ -382,8 +382,8 @@ man/man3/getcury.3x.gz
 man/man3/getmaxx.3x.gz
 man/man3/getmaxy.3x.gz
 man/man3/getmaxyx.3x.gz
-man/man3/getmouse.3x.gz
 man/man3/getmouse_sp.3x.gz
+man/man3/getmouse.3x.gz
 man/man3/getn_wstr.3x.gz
 man/man3/getnstr.3x.gz
 man/man3/getparx.3x.gz
@@ -391,25 +391,25 @@ man/man3/getpary.3x.gz
 man/man3/getparyx.3x.gz
 man/man3/getstr.3x.gz
 man/man3/getsyx.3x.gz
-man/man3/getwin.3x.gz
 man/man3/getwin_sp.3x.gz
+man/man3/getwin.3x.gz
 man/man3/getyx.3x.gz
 man/man3/ground_panel.3x.gz
-man/man3/halfdelay.3x.gz
 man/man3/halfdelay_sp.3x.gz
-man/man3/has_colors.3x.gz
+man/man3/halfdelay.3x.gz
 man/man3/has_colors_sp.3x.gz
-man/man3/has_ic.3x.gz
+man/man3/has_colors.3x.gz
 man/man3/has_ic_sp.3x.gz
-man/man3/has_il.3x.gz
+man/man3/has_ic.3x.gz
 man/man3/has_il_sp.3x.gz
-man/man3/has_key.3x.gz
+man/man3/has_il.3x.gz
 man/man3/has_key_sp.3x.gz
-man/man3/has_mouse.3x.gz
+man/man3/has_key.3x.gz
 man/man3/has_mouse_sp.3x.gz
+man/man3/has_mouse.3x.gz
 man/man3/hide_panel.3x.gz
-man/man3/hline.3x.gz
 man/man3/hline_set.3x.gz
+man/man3/hline.3x.gz
 man/man3/idcok.3x.gz
 man/man3/idlok.3x.gz
 man/man3/immedok.3x.gz
@@ -419,10 +419,14 @@ man/man3/in_wchstr.3x.gz
 man/man3/inch.3x.gz
 man/man3/inchnstr.3x.gz
 man/man3/inchstr.3x.gz
-man/man3/init_color.3x.gz
 man/man3/init_color_sp.3x.gz
-man/man3/init_pair.3x.gz
+man/man3/init_color.3x.gz
+man/man3/init_extended_color_sp.3x.gz
+man/man3/init_extended_color.3x.gz
+man/man3/init_extended_pair_sp.3x.gz
+man/man3/init_extended_pair.3x.gz
 man/man3/init_pair_sp.3x.gz
+man/man3/init_pair.3x.gz
 man/man3/initscr.3x.gz
 man/man3/innstr.3x.gz
 man/man3/innwstr.3x.gz
@@ -435,8 +439,8 @@ man/man3/insertln.3x.gz
 man/man3/insnstr.3x.gz
 man/man3/insstr.3x.gz
 man/man3/instr.3x.gz
-man/man3/intrflush.3x.gz
 man/man3/intrflush_sp.3x.gz
+man/man3/intrflush.3x.gz
 man/man3/inwstr.3x.gz
 man/man3/is_cleared.3x.gz
 man/man3/is_idcok.3x.gz
@@ -451,44 +455,45 @@ man/man3/is_pad.3x.gz
 man/man3/is_scrollok.3x.gz
 man/man3/is_subwin.3x.gz
 man/man3/is_syncok.3x.gz
-man/man3/is_term_resized.3x.gz
 man/man3/is_term_resized_sp.3x.gz
+man/man3/is_term_resized.3x.gz
 man/man3/is_wintouched.3x.gz
-man/man3/isendwin.3x.gz
 man/man3/isendwin_sp.3x.gz
+man/man3/isendwin.3x.gz
 man/man3/item_count.3x.gz
 man/man3/item_description.3x.gz
 man/man3/item_index.3x.gz
 man/man3/item_init.3x.gz
 man/man3/item_name.3x.gz
-man/man3/item_opts.3x.gz
 man/man3/item_opts_off.3x.gz
 man/man3/item_opts_on.3x.gz
+man/man3/item_opts.3x.gz
 man/man3/item_term.3x.gz
 man/man3/item_userptr.3x.gz
 man/man3/item_value.3x.gz
 man/man3/item_visible.3x.gz
-man/man3/key_defined.3x.gz
 man/man3/key_defined_sp.3x.gz
+man/man3/key_defined.3x.gz
 man/man3/key_name.3x.gz
-man/man3/keybound.3x.gz
 man/man3/keybound_sp.3x.gz
-man/man3/keyname.3x.gz
+man/man3/keybound.3x.gz
 man/man3/keyname_sp.3x.gz
-man/man3/keyok.3x.gz
+man/man3/keyname.3x.gz
 man/man3/keyok_sp.3x.gz
+man/man3/keyok.3x.gz
 man/man3/keypad.3x.gz
-man/man3/killchar.3x.gz
 man/man3/killchar_sp.3x.gz
+man/man3/killchar.3x.gz
 man/man3/killwchar.3x.gz
 man/man3/leaveok.3x.gz
 man/man3/legacy_coding.3x.gz
+man/man3/LINES.3x.gz
 man/man3/link_field.3x.gz
 man/man3/link_fieldtype.3x.gz
+man/man3/longname_sp.3x.gz
 man/man3/longname.3x.gz
-man/man3/mcprint.3x.gz
 man/man3/mcprint_sp.3x.gz
-man/man3/menu.3x.gz
+man/man3/mcprint.3x.gz
 man/man3/menu_attributes.3x.gz
 man/man3/menu_back.3x.gz
 man/man3/menu_cursor.3x.gz
@@ -501,9 +506,9 @@ man/man3/menu_init.3x.gz
 man/man3/menu_items.3x.gz
 man/man3/menu_mark.3x.gz
 man/man3/menu_new.3x.gz
-man/man3/menu_opts.3x.gz
 man/man3/menu_opts_off.3x.gz
 man/man3/menu_opts_on.3x.gz
+man/man3/menu_opts.3x.gz
 man/man3/menu_pad.3x.gz
 man/man3/menu_pattern.3x.gz
 man/man3/menu_post.3x.gz
@@ -515,6 +520,7 @@ man/man3/menu_sub.3x.gz
 man/man3/menu_term.3x.gz
 man/man3/menu_userptr.3x.gz
 man/man3/menu_win.3x.gz
+man/man3/menu.3x.gz
 man/man3/meta.3x.gz
 man/man3/mitem_current.3x.gz
 man/man3/mitem_name.3x.gz
@@ -524,13 +530,13 @@ man/man3/mitem_userptr.3x.gz
 man/man3/mitem_value.3x.gz
 man/man3/mitem_visible.3x.gz
 man/man3/mouse_trafo.3x.gz
-man/man3/mouseinterval.3x.gz
 man/man3/mouseinterval_sp.3x.gz
-man/man3/mousemask.3x.gz
+man/man3/mouseinterval.3x.gz
 man/man3/mousemask_sp.3x.gz
-man/man3/move.3x.gz
+man/man3/mousemask.3x.gz
 man/man3/move_field.3x.gz
 man/man3/move_panel.3x.gz
+man/man3/move.3x.gz
 man/man3/mvadd_wch.3x.gz
 man/man3/mvadd_wchnstr.3x.gz
 man/man3/mvadd_wchstr.3x.gz
@@ -542,8 +548,8 @@ man/man3/mvaddnwstr.3x.gz
 man/man3/mvaddstr.3x.gz
 man/man3/mvaddwstr.3x.gz
 man/man3/mvchgat.3x.gz
-man/man3/mvcur.3x.gz
 man/man3/mvcur_sp.3x.gz
+man/man3/mvcur.3x.gz
 man/man3/mvdelch.3x.gz
 man/man3/mvderwin.3x.gz
 man/man3/mvget_wch.3x.gz
@@ -552,8 +558,8 @@ man/man3/mvgetch.3x.gz
 man/man3/mvgetn_wstr.3x.gz
 man/man3/mvgetnstr.3x.gz
 man/man3/mvgetstr.3x.gz
-man/man3/mvhline.3x.gz
 man/man3/mvhline_set.3x.gz
+man/man3/mvhline.3x.gz
 man/man3/mvin_wch.3x.gz
 man/man3/mvin_wchnstr.3x.gz
 man/man3/mvin_wchstr.3x.gz
@@ -572,8 +578,8 @@ man/man3/mvinstr.3x.gz
 man/man3/mvinwstr.3x.gz
 man/man3/mvprintw.3x.gz
 man/man3/mvscanw.3x.gz
-man/man3/mvvline.3x.gz
 man/man3/mvvline_set.3x.gz
+man/man3/mvvline.3x.gz
 man/man3/mvwadd_wch.3x.gz
 man/man3/mvwadd_wchnstr.3x.gz
 man/man3/mvwadd_wchstr.3x.gz
@@ -592,12 +598,12 @@ man/man3/mvwgetch.3x.gz
 man/man3/mvwgetn_wstr.3x.gz
 man/man3/mvwgetnstr.3x.gz
 man/man3/mvwgetstr.3x.gz
-man/man3/mvwhline.3x.gz
 man/man3/mvwhline_set.3x.gz
-man/man3/mvwin.3x.gz
+man/man3/mvwhline.3x.gz
 man/man3/mvwin_wch.3x.gz
 man/man3/mvwin_wchnstr.3x.gz
 man/man3/mvwin_wchstr.3x.gz
+man/man3/mvwin.3x.gz
 man/man3/mvwinch.3x.gz
 man/man3/mvwinchnstr.3x.gz
 man/man3/mvwinchstr.3x.gz
@@ -613,43 +619,44 @@ man/man3/mvwinstr.3x.gz
 man/man3/mvwinwstr.3x.gz
 man/man3/mvwprintw.3x.gz
 man/man3/mvwscanw.3x.gz
-man/man3/mvwvline.3x.gz
 man/man3/mvwvline_set.3x.gz
-man/man3/napms.3x.gz
+man/man3/mvwvline.3x.gz
 man/man3/napms_sp.3x.gz
+man/man3/napms.3x.gz
 man/man3/ncurses.3x.gz
 man/man3/new_field.3x.gz
 man/man3/new_fieldtype.3x.gz
-man/man3/new_form.3x.gz
 man/man3/new_form_sp.3x.gz
+man/man3/new_form.3x.gz
 man/man3/new_item.3x.gz
-man/man3/new_menu.3x.gz
 man/man3/new_menu_sp.3x.gz
+man/man3/new_menu.3x.gz
 man/man3/new_page.3x.gz
+man/man3/new_pair.3x.gz
 man/man3/new_panel.3x.gz
 man/man3/new_prescr.3x.gz
-man/man3/newpad.3x.gz
 man/man3/newpad_sp.3x.gz
+man/man3/newpad.3x.gz
 man/man3/newscr.3x.gz
-man/man3/newterm.3x.gz
 man/man3/newterm_sp.3x.gz
-man/man3/newwin.3x.gz
+man/man3/newterm.3x.gz
 man/man3/newwin_sp.3x.gz
-man/man3/nl.3x.gz
+man/man3/newwin.3x.gz
 man/man3/nl_sp.3x.gz
-man/man3/nocbreak.3x.gz
+man/man3/nl.3x.gz
 man/man3/nocbreak_sp.3x.gz
+man/man3/nocbreak.3x.gz
 man/man3/nodelay.3x.gz
-man/man3/noecho.3x.gz
 man/man3/noecho_sp.3x.gz
-man/man3/nofilter.3x.gz
+man/man3/noecho.3x.gz
 man/man3/nofilter_sp.3x.gz
-man/man3/nonl.3x.gz
+man/man3/nofilter.3x.gz
 man/man3/nonl_sp.3x.gz
-man/man3/noqiflush.3x.gz
+man/man3/nonl.3x.gz
 man/man3/noqiflush_sp.3x.gz
-man/man3/noraw.3x.gz
+man/man3/noqiflush.3x.gz
 man/man3/noraw_sp.3x.gz
+man/man3/noraw.3x.gz
 man/man3/notimeout.3x.gz
 man/man3/numcodes.3x.gz
 man/man3/numfnames.3x.gz
@@ -657,14 +664,16 @@ man/man3/numnames.3x.gz
 man/man3/ospeed.3x.gz
 man/man3/overlay.3x.gz
 man/man3/overwrite.3x.gz
-man/man3/pair_content.3x.gz
 man/man3/pair_content_sp.3x.gz
-man/man3/panel.3x.gz
+man/man3/pair_content.3x.gz
+man/man3/PAIR_NUMBER.3x.gz
 man/man3/panel_above.3x.gz
 man/man3/panel_below.3x.gz
 man/man3/panel_hidden.3x.gz
 man/man3/panel_userptr.3x.gz
 man/man3/panel_window.3x.gz
+man/man3/panel.3x.gz
+man/man3/PC.3x.gz
 man/man3/pecho_wchar.3x.gz
 man/man3/pechochar.3x.gz
 man/man3/pnoutrefresh.3x.gz
@@ -674,51 +683,52 @@ man/man3/post_form.3x.gz
 man/man3/post_menu.3x.gz
 man/man3/prefresh.3x.gz
 man/man3/printw.3x.gz
-man/man3/putp.3x.gz
 man/man3/putp_sp.3x.gz
+man/man3/putp.3x.gz
 man/man3/putwin.3x.gz
-man/man3/qiflush.3x.gz
 man/man3/qiflush_sp.3x.gz
-man/man3/raw.3x.gz
+man/man3/qiflush.3x.gz
 man/man3/raw_sp.3x.gz
+man/man3/raw.3x.gz
 man/man3/redrawwin.3x.gz
 man/man3/refresh.3x.gz
 man/man3/replace_panel.3x.gz
-man/man3/reset_prog_mode.3x.gz
+man/man3/reset_color_pairs.3x.gz
 man/man3/reset_prog_mode_sp.3x.gz
-man/man3/reset_shell_mode.3x.gz
+man/man3/reset_prog_mode.3x.gz
 man/man3/reset_shell_mode_sp.3x.gz
-man/man3/resetty.3x.gz
+man/man3/reset_shell_mode.3x.gz
 man/man3/resetty_sp.3x.gz
-man/man3/resize_term.3x.gz
+man/man3/resetty.3x.gz
 man/man3/resize_term_sp.3x.gz
-man/man3/resizeterm.3x.gz
+man/man3/resize_term.3x.gz
 man/man3/resizeterm_sp.3x.gz
-man/man3/restartterm.3x.gz
+man/man3/resizeterm.3x.gz
 man/man3/restartterm_sp.3x.gz
-man/man3/ripoffline.3x.gz
+man/man3/restartterm.3x.gz
 man/man3/ripoffline_sp.3x.gz
-man/man3/savetty.3x.gz
+man/man3/ripoffline.3x.gz
 man/man3/savetty_sp.3x.gz
+man/man3/savetty.3x.gz
 man/man3/scale_form.3x.gz
 man/man3/scale_menu.3x.gz
 man/man3/scanw.3x.gz
 man/man3/scr_dump.3x.gz
-man/man3/scr_init.3x.gz
 man/man3/scr_init_sp.3x.gz
-man/man3/scr_restore.3x.gz
+man/man3/scr_init.3x.gz
 man/man3/scr_restore_sp.3x.gz
-man/man3/scr_set.3x.gz
+man/man3/scr_restore.3x.gz
 man/man3/scr_set_sp.3x.gz
+man/man3/scr_set.3x.gz
 man/man3/scrl.3x.gz
 man/man3/scroll.3x.gz
 man/man3/scrollok.3x.gz
 man/man3/set_current_field.3x.gz
 man/man3/set_current_item.3x.gz
-man/man3/set_curterm.3x.gz
 man/man3/set_curterm_sp.3x.gz
-man/man3/set_escdelay.3x.gz
+man/man3/set_curterm.3x.gz
 man/man3/set_escdelay_sp.3x.gz
+man/man3/set_escdelay.3x.gz
 man/man3/set_field_back.3x.gz
 man/man3/set_field_buffer.3x.gz
 man/man3/set_field_fore.3x.gz
@@ -763,8 +773,8 @@ man/man3/set_menu_userptr.3x.gz
 man/man3/set_menu_win.3x.gz
 man/man3/set_new_page.3x.gz
 man/man3/set_panel_userptr.3x.gz
-man/man3/set_tabsize.3x.gz
 man/man3/set_tabsize_sp.3x.gz
+man/man3/set_tabsize.3x.gz
 man/man3/set_term.3x.gz
 man/man3/set_top_row.3x.gz
 man/man3/setcchar.3x.gz
@@ -773,41 +783,42 @@ man/man3/setsyx.3x.gz
 man/man3/setterm.3x.gz
 man/man3/setupterm.3x.gz
 man/man3/show_panel.3x.gz
-man/man3/slk_attr.3x.gz
 man/man3/slk_attr_off.3x.gz
 man/man3/slk_attr_on.3x.gz
-man/man3/slk_attr_set.3x.gz
 man/man3/slk_attr_set_sp.3x.gz
+man/man3/slk_attr_set.3x.gz
 man/man3/slk_attr_sp.3x.gz
-man/man3/slk_attroff.3x.gz
+man/man3/slk_attr.3x.gz
 man/man3/slk_attroff_sp.3x.gz
-man/man3/slk_attron.3x.gz
+man/man3/slk_attroff.3x.gz
 man/man3/slk_attron_sp.3x.gz
-man/man3/slk_attrset.3x.gz
+man/man3/slk_attron.3x.gz
 man/man3/slk_attrset_sp.3x.gz
-man/man3/slk_clear.3x.gz
+man/man3/slk_attrset.3x.gz
 man/man3/slk_clear_sp.3x.gz
-man/man3/slk_color.3x.gz
+man/man3/slk_clear.3x.gz
 man/man3/slk_color_sp.3x.gz
-man/man3/slk_init.3x.gz
+man/man3/slk_color.3x.gz
 man/man3/slk_init_sp.3x.gz
-man/man3/slk_label.3x.gz
+man/man3/slk_init.3x.gz
 man/man3/slk_label_sp.3x.gz
-man/man3/slk_noutrefresh.3x.gz
+man/man3/slk_label.3x.gz
 man/man3/slk_noutrefresh_sp.3x.gz
-man/man3/slk_refresh.3x.gz
+man/man3/slk_noutrefresh.3x.gz
 man/man3/slk_refresh_sp.3x.gz
-man/man3/slk_restore.3x.gz
+man/man3/slk_refresh.3x.gz
 man/man3/slk_restore_sp.3x.gz
-man/man3/slk_set.3x.gz
+man/man3/slk_restore.3x.gz
 man/man3/slk_set_sp.3x.gz
-man/man3/slk_touch.3x.gz
+man/man3/slk_set.3x.gz
 man/man3/slk_touch_sp.3x.gz
+man/man3/slk_touch.3x.gz
 man/man3/slk_wset.3x.gz
+man/man3/SP.3x.gz
 man/man3/standend.3x.gz
 man/man3/standout.3x.gz
-man/man3/start_color.3x.gz
 man/man3/start_color_sp.3x.gz
+man/man3/start_color.3x.gz
 man/man3/stdscr.3x.gz
 man/man3/strcodes.3x.gz
 man/man3/strfnames.3x.gz
@@ -815,28 +826,29 @@ man/man3/strnames.3x.gz
 man/man3/subpad.3x.gz
 man/man3/subwin.3x.gz
 man/man3/syncok.3x.gz
-man/man3/term_attrs.3x.gz
+man/man3/TABSIZE.3x.gz
 man/man3/term_attrs_sp.3x.gz
+man/man3/term_attrs.3x.gz
 man/man3/term_variables.3x.gz
-man/man3/termattrs.3x.gz
 man/man3/termattrs_sp.3x.gz
-man/man3/termname.3x.gz
+man/man3/termattrs.3x.gz
 man/man3/termname_sp.3x.gz
-man/man3/tgetent.3x.gz
+man/man3/termname.3x.gz
 man/man3/tgetent_sp.3x.gz
-man/man3/tgetflag.3x.gz
+man/man3/tgetent.3x.gz
 man/man3/tgetflag_sp.3x.gz
-man/man3/tgetnum.3x.gz
+man/man3/tgetflag.3x.gz
 man/man3/tgetnum_sp.3x.gz
-man/man3/tgetstr.3x.gz
+man/man3/tgetnum.3x.gz
 man/man3/tgetstr_sp.3x.gz
+man/man3/tgetstr.3x.gz
 man/man3/tgoto.3x.gz
-man/man3/tigetflag.3x.gz
 man/man3/tigetflag_sp.3x.gz
-man/man3/tigetnum.3x.gz
+man/man3/tigetflag.3x.gz
 man/man3/tigetnum_sp.3x.gz
-man/man3/tigetstr.3x.gz
+man/man3/tigetnum.3x.gz
 man/man3/tigetstr_sp.3x.gz
+man/man3/tigetstr.3x.gz
 man/man3/timeout.3x.gz
 man/man3/tiparm.3x.gz
 man/man3/top_panel.3x.gz
@@ -844,45 +856,54 @@ man/man3/top_row.3x.gz
 man/man3/touchline.3x.gz
 man/man3/touchwin.3x.gz
 man/man3/tparm.3x.gz
-man/man3/tputs.3x.gz
 man/man3/tputs_sp.3x.gz
+man/man3/tputs.3x.gz
 man/man3/trace.3x.gz
 man/man3/ttytype.3x.gz
-man/man3/typeahead.3x.gz
+man/man3/TYPE_ALNUM.3x.gz
+man/man3/TYPE_ALPHA.3x.gz
+man/man3/TYPE_ENUM.3x.gz
+man/man3/TYPE_INTEGER.3x.gz
+man/man3/TYPE_IPV4.3x.gz
+man/man3/TYPE_NUMERIC.3x.gz
+man/man3/TYPE_REGEXP.3x.gz
 man/man3/typeahead_sp.3x.gz
-man/man3/unctrl.3x.gz
+man/man3/typeahead.3x.gz
 man/man3/unctrl_sp.3x.gz
-man/man3/unget_wch.3x.gz
+man/man3/unctrl.3x.gz
+man/man3/unfocus_current_field.3x.gz
 man/man3/unget_wch_sp.3x.gz
-man/man3/ungetch.3x.gz
+man/man3/unget_wch.3x.gz
 man/man3/ungetch_sp.3x.gz
-man/man3/ungetmouse.3x.gz
+man/man3/ungetch.3x.gz
 man/man3/ungetmouse_sp.3x.gz
+man/man3/ungetmouse.3x.gz
 man/man3/unpost_form.3x.gz
 man/man3/unpost_menu.3x.gz
 man/man3/untouchwin.3x.gz
-man/man3/update_panels.3x.gz
+man/man3/UP.3x.gz
 man/man3/update_panels_sp.3x.gz
-man/man3/use_default_colors.3x.gz
+man/man3/update_panels.3x.gz
 man/man3/use_default_colors_sp.3x.gz
-man/man3/use_env.3x.gz
+man/man3/use_default_colors.3x.gz
 man/man3/use_env_sp.3x.gz
+man/man3/use_env.3x.gz
 man/man3/use_extended_names.3x.gz
-man/man3/use_legacy_coding.3x.gz
 man/man3/use_legacy_coding_sp.3x.gz
+man/man3/use_legacy_coding.3x.gz
 man/man3/use_screen.3x.gz
 man/man3/use_tioctl.3x.gz
 man/man3/use_window.3x.gz
-man/man3/vid_attr.3x.gz
 man/man3/vid_attr_sp.3x.gz
-man/man3/vid_puts.3x.gz
+man/man3/vid_attr.3x.gz
 man/man3/vid_puts_sp.3x.gz
-man/man3/vidattr.3x.gz
+man/man3/vid_puts.3x.gz
 man/man3/vidattr_sp.3x.gz
-man/man3/vidputs.3x.gz
+man/man3/vidattr.3x.gz
 man/man3/vidputs_sp.3x.gz
-man/man3/vline.3x.gz
+man/man3/vidputs.3x.gz
 man/man3/vline_set.3x.gz
+man/man3/vline.3x.gz
 man/man3/vw_printw.3x.gz
 man/man3/vw_scanw.3x.gz
 man/man3/vwprintw.3x.gz
@@ -908,8 +929,8 @@ man/man3/wbkgd.3x.gz
 man/man3/wbkgdset.3x.gz
 man/man3/wbkgrnd.3x.gz
 man/man3/wbkgrndset.3x.gz
-man/man3/wborder.3x.gz
 man/man3/wborder_set.3x.gz
+man/man3/wborder.3x.gz
 man/man3/wchgat.3x.gz
 man/man3/wclear.3x.gz
 man/man3/wclrtobot.3x.gz
@@ -932,8 +953,8 @@ man/man3/wgetnstr.3x.gz
 man/man3/wgetparent.3x.gz
 man/man3/wgetscrreg.3x.gz
 man/man3/wgetstr.3x.gz
-man/man3/whline.3x.gz
 man/man3/whline_set.3x.gz
+man/man3/whline.3x.gz
 man/man3/win_wch.3x.gz
 man/man3/win_wchnstr.3x.gz
 man/man3/win_wchstr.3x.gz
@@ -968,12 +989,14 @@ man/man3/wsyncdown.3x.gz
 man/man3/wsyncup.3x.gz
 man/man3/wtimeout.3x.gz
 man/man3/wtouchln.3x.gz
-man/man3/wunctrl.3x.gz
 man/man3/wunctrl_sp.3x.gz
-man/man3/wvline.3x.gz
+man/man3/wunctrl.3x.gz
 man/man3/wvline_set.3x.gz
+man/man3/wvline.3x.gz
+man/man5/scr_dump.5.gz
 man/man5/term.5.gz
 man/man5/terminfo.5.gz
+man/man5/user_caps.5.gz
 man/man7/term.7.gz
 share/misc/tabset/std
 share/misc/tabset/stdcrt