ncurses: Add support for terminfo database

Along with the termcap database, ncurses will now lookup for the
terminfo database, note that the terminfo database is being looked
up first and then it fallsback on the termcap one.

While here drop our custom reader for the termcap database, over the
time it is needed maintenance to be able to catchup with changes on ncurses
side.

Install the ncurses tools which are needed to deal with the terminfo
database: tic, infocmp, toe

Replace our termcap only aware tools with the ncurses counterpart:
tput, tabs, tset, clear and reset

In particular they can your the extra capabilities described in the
terminfo database, which does not exist in termcap

Note that to add a new terminfo information to the database from ports
the ports will just need to add their extra information into:
/usr/local/share/site-terminfo/<firstletteroftheterm>/<term>

Tested by:	jbeich, manu

Author: bapt

Diff for: lib/ncurses/config.mk

@@ -3,8 +3,11 @@
 # This Makefile is shared by libncurses, libform, libmenu, libpanel.
 
 NCURSES_DIR=	${SRCTOP}/contrib/ncurses
+NCURSES_MAJOR=	6
+NCURSES_MINOR=	2
+NCURSES_PATCH=	20200215
 
-CFLAGS+=	-D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC
+CFLAGS+=	-D_XOPEN_SOURCE_EXTENDED
 NCURSES_CFG_H=	${.CURDIR}/ncurses_cfg.h
 
 CFLAGS+=	-I.
@@ -41,5 +44,12 @@ MANFILTER=	sed -e 's%@TERMINFO@%${TERMINFODIR}/terminfo%g' \
 		    -e 's%@NCURSES_MAJOR@%${NCURSES_MAJOR}%g' \
 		    -e 's%@NCURSES_MINOR@%${NCURSES_MINOR}%g' \
 		    -e 's%@NCURSES_PATCH@%${NCURSES_PATCH}%g' \
+		    -e 's%@TSET@%tset%g' \
+		    -e 's%@RESET@%reset%g' \
+		    -e 's%@CLEAR@%clear%g' \
+		    -e 's%@TABS@%tabs%g' \
 		    -e 's%@TIC@%tic%g' \
-		    -e 's%@INFOCMP@%infocmp%g'
+		    -e 's%@TOE@%toe%g' \
+		    -e 's%@INFOCMP@%infocmp%g' \
+		    -e 's%@CAPTOINFO@%captoinfo%g' \
+		    -e 's%@INFOTOCAP@%infotocap%g'

Diff for: lib/ncurses/ncurses/Makefile

@@ -216,6 +216,7 @@ SRCS+=	\
 	obsolete.c \
 	parse_entry.c \
 	read_entry.c \
+	read_termcap.c \
 	strings.c \
 	trim_sgr0.c \
 	write_entry.c
@@ -270,14 +271,10 @@ DBGSRCS= \
 	trace_xnames.c \
 	varargs.c
 
-# From our old libtermcap.
-# Used instead of the hideous read_termcap.c abomination.
-SRCS+=	termcap.c
-
 CLEANFILES=	${GENSRCS} ${GENHDRS} keys.list make_hash term.h.new \
 		make_keys MKterm.h.awk comp_captab.c curses.head
 
-CFLAGS+=	-DFREEBSD_NATIVE -DTERMIOS
+CFLAGS+=	-DTERMIOS
 
 # Installed
 HEADERS=	curses.h term.h termcap.h unctrl.h
@@ -416,7 +413,7 @@ make_hash: make_hash.c hashsize.h ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META}
 MKterm.h.awk: MKterm.h.awk.in
 	sed <${NCURSES_DIR}/include/MKterm.h.awk.in >$@ \
 	    -e "/@BROKEN_LINKER@/s%%${BROKEN_LINKER}%" \
-	    -e "s%@NCURSES_USE_DATABASE@%0%g" \
+	    -e "s%@NCURSES_USE_DATABASE@%1%g" \
 	    -e "s%@NCURSES_USE_TERMCAP@%1%g" \
 	    -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \
 	    -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \

Diff for: lib/ncurses/ncurses/ncurses_cfg.h

@@ -59,6 +59,8 @@
 #define HAVE_LONG_FILE_NAMES 1
 #define MIXEDCASE_FILENAMES 1
 #define USE_SYSMOUSE 1
+#define TERMINFO_DIRS "/usr/share/terminfo:/usr/local/share/site-terminfo"
+#define TERMINFO "/usr/share/terminfo"
 #define HAVE_BIG_CORE 1
 #define TERMPATH "/etc/termcap:/usr/share/misc/termcap"
 #define USE_GETCAP 1
@@ -70,6 +72,23 @@
 #define USE_LINKS 1
 #define BSD_TPUTS 1
 #define HAVE_LANGINFO_CODESET 1
+#define USE_WIDEC_SUPPORT 1
+#define NCURSES_WIDECHAR 1
+#define HAVE_WCHAR_H 1
+#define HAVE_WCTYPE_H 1
+#define HAVE_PUTWC 1
+#define HAVE_BTOWC 1
+#define HAVE_WCTOB 1
+#define HAVE_MBTOWC 1
+#define HAVE_WCTOMB 1
+#define HAVE_MBLEN 1
+#define HAVE_MBRLEN 1
+#define HAVE_MBRTOWC 1
+#define HAVE_WCSRTOMBS 1
+#define HAVE_MBSRTOWCS 1
+#define HAVE_WCSTOMBS 1
+#define HAVE_MBSTOWCS 1
+#define NEED_WCHAR_H 1
 #define HAVE_FSEEKO 1
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
@@ -96,6 +115,10 @@
 #define HAVE_WRESIZE 1
 #define NCURSES_SP_FUNCS 1
 #define HAVE_TPUTS_SP 1
+#define NCURSES_EXT_COLORS 1
+#define HAVE_ALLOC_PAIR 1
+#define HAVE_INIT_EXTENDED_COLOR 1
+#define HAVE_RESET_COLOR_PAIRS 1
 #define NCURSES_EXT_PUTWIN 1
 #define NCURSES_NO_PADDING 1
 #define USE_SIGWINCH 1
@@ -133,6 +156,11 @@
 #define HAVE_UNISTD_H 1
 #define HAVE_GETOPT_H 1
 #define HAVE_GETOPT_HEADER 1
+#define DECL_ENVIRON 1
+#define HAVE_ENVIRON 1
+#define HAVE_PUTENV 1
+#define HAVE_SETENV 1
+#define HAVE_STRDUP 1
 #define HAVE_SYS_TIME_SELECT 1
 #define SIG_ATOMIC_T volatile sig_atomic_t
 #define HAVE_ERRNO 1
@@ -153,6 +181,7 @@
 #define HAVE_SETVBUF 1
 #define HAVE_SIGACTION 1
 #define HAVE_SIGVEC 1
+#define HAVE_SNPRINTF 1
 #define HAVE_STRDUP 1
 #define HAVE_STRSTR 1
 #define HAVE_SYSCONF 1
@@ -181,11 +210,12 @@
 #define USE_FOPEN_BIN_R 1
 #define USE_OPENPTY_HEADER <libutil.h>
 #define USE_XTERM_PTY 1
-#define USE_HASHED_DB 1
 #define HAVE_TYPEINFO 1
 #define HAVE_IOSTREAM 1
 #define IOSTREAM_NAMESPACE 1
+#define SIZEOF_BOOL 1
 #define CPP_HAS_STATIC_CAST 1
+#define SIZEOF_WCHAR_T 4
 #define HAVE_SLK_COLOR 1
 #define HAVE_PANEL_H 1
 #define HAVE_LIBPANEL 1
@@ -198,37 +228,6 @@
 #define NCURSES_OSPEED_COMPAT 1
 #define HAVE_CURSES_DATA_BOOLNAMES 1
 
-/*
- * Begin FreeBSD-specific changes
- */
-/* Support ENABLE_WIDEC */
-#ifdef ENABLE_WIDEC
-#define USE_WIDEC_SUPPORT 1
-#define NCURSES_WIDECHAR 1
-#define NCURSES_EXT_FUNCS 1
-#define NCURSES_EXT_COLORS 1
-#define HAVE_ALLOC_PAIR 1
-#define HAVE_INIT_EXTENDED_COLOR 1
-#define HAVE_RESET_COLOR_PAIRS 1
-#define HAVE_PUTWC 1
-#define HAVE_BTOWC 1
-#define HAVE_WCTOB 1
-#define HAVE_MBTOWC 1
-#define HAVE_WCTOMB 1
-#define HAVE_MBLEN 1
-#define HAVE_MBRLEN 1
-#define HAVE_MBRTOWC 1
-#define HAVE_WCSRTOMBS 1
-#define HAVE_MBSRTOWCS 1
-#define HAVE_WCSTOMBS 1
-#define HAVE_MBSTOWCS 1
-#define NEED_WCHAR_H 1
-#define SIZEOF_WCHAR_T 4
-#endif
-/*
- * End FreeBSD-specific changes
- */
-
 #include <ncurses_def.h>
 
 	/* The C compiler may not treat these properly but C++ has to */