diff options
Diffstat (limited to 'lib/ncurses/tinfo')
| -rw-r--r-- | lib/ncurses/tinfo/Makefile | 66 | ||||
| -rw-r--r-- | lib/ncurses/tinfo/Makefile.depend | 5 | ||||
| -rw-r--r-- | lib/ncurses/tinfo/ncurses_cfg.h | 64 | ||||
| -rw-r--r-- | lib/ncurses/tinfo/pathnames.h | 3 |
4 files changed, 81 insertions, 57 deletions
diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile index d7b7343dfcdc..8f01557edaee 100644 --- a/lib/ncurses/tinfo/Makefile +++ b/lib/ncurses/tinfo/Makefile @@ -1,6 +1,3 @@ -# $FreeBSD$ - -PACKAGE= clibs SHLIBDIR?= /lib .include <src.opts.mk> @@ -10,8 +7,6 @@ SHLIBDIR?= /lib LIB= tinfow SHLIB_MAJOR= 9 -NO_LINT= - NCURSES_MAJOR!= egrep 'NCURSES_MAJOR[ ]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%' NCURSES_MINOR!= egrep 'NCURSES_MINOR[ ]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%' NCURSES_PATCH!= egrep 'NCURSES_PATCH[ ]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%' @@ -55,6 +50,8 @@ HAVE_TERMIO_H= 0 HAVE_VSSCANF= 1 HAVE_STDINT_H= 1 HEADER_STDBOOL= 1 +HAVE_STDNORETURN_H= 0 +ENABLE_SIGWINCH= 1 # XXX amd64 1L and int ONEUL= 1U TYPEOF_CHTYPE= uint32_t @@ -75,6 +72,7 @@ GENHDRS= \ hashsize.h \ init_keytry.h \ ncurses_def.h \ + ncurses_dll.h \ nomacros.h \ parametrized.h \ term.h \ @@ -167,10 +165,12 @@ CLEANFILES= ${GENSRCS} ${GENHDRS} keys.list make_hash term.h.new \ CFLAGS+= -DTERMIOS +CWARNFLAGS.comp_parse.c= ${NO_WUNUSED_BUT_SET_VARIABLE} +CWARNFLAGS.read_entry.c= ${NO_WUNUSED_BUT_SET_VARIABLE} + # Installed -HEADERS= curses.h term.h termcap.h unctrl.h -SRCHDRS= ncurses_dll.h -CLEANFILES+= ncurses_dll.h +HEADERS= curses.h ncurses_dll.h term.h termcap.h unctrl.h +SRCHDRS= INCS= ${HEADERS} ${SRCHDRS} INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h @@ -192,14 +192,6 @@ SYMLINKS+= libtinfow.so ${LIBDIR}/libtermcap.so SYMLINKS+= libtinfow.so ${LIBDIR}/libtermlib.so SYMLINKS+= libtinfow.so ${LIBDIR}/libtinfo.so .endif -.if ${MK_PROFILE} != "no" -SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtermcapw_p.a -SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtermlibw_p.a -# backward compat -SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtermcap_p.a -SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtermlib_p.a -SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtinfo_p.a -.endif DOCSDIR= ${SHAREDIR}/doc/ncurses DOCS= ncurses-intro.html hackguide.html @@ -212,6 +204,14 @@ FILESGROUPS= DOCS # Generated source .ORDER: names.c codes.c +# Serialize the build just a little bit; there's nothing stopping the build from +# proceeding before ncurses_dll.h and curses.h are actually generated on a clean +# build since we have no dependency information to prevent it. +.ORDER: ncurses_dll.h curses.h +.for f in ${SRCS:M*.c} +.ORDER: curses.h ${f} +.endfor + names.c: MKnames.awk ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKnames.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > names.c @@ -219,7 +219,8 @@ codes.c: MKcodes.awk ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKcodes.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > codes.c lib_keyname.c: keys.list MKkeyname.awk - ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk bigstrings=${USE_BIG_STRINGS} keys.list > lib_keyname.c + ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk use_sigwinch=${ENABLE_SIGWINCH} \ + bigstrings=${USE_BIG_STRINGS} keys.list > lib_keyname.c unctrl.c: MKunctrl.awk echo | ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKunctrl.awk bigstrings=${USE_BIG_STRINGS} > unctrl.c @@ -257,19 +258,32 @@ term.h: MKterm.h.awk edit_cfg.sh Caps Caps-ncurses sh ${NCURSES_DIR}/include/edit_cfg.sh ${NCURSES_CFG_H} $@.new mv -f $@.new $@ +# Avoid hard-coding absolute source paths if requested. +.if ${MK_REPRODUCIBLE_BUILD} != "no" +NCURSES_SRCTOP=/usr/src +.else +NCURSES_SRCTOP=${SRCTOP} +.endif + curses.h: curses.head MKkey_defs.sh Caps Caps-ncurses cat curses.head > $@.new AWK=${AWK} _POSIX2_VERSION=199209 sh ${NCURSES_DIR}/include/MKkey_defs.sh \ ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses >> $@.new + sed -i '' 's|${SRCTOP}|${NCURSES_SRCTOP}|g' $@.new cat ${NCURSES_DIR}/include/curses.wide >> $@.new cat ${NCURSES_DIR}/include/curses.tail >> $@.new mv -f $@.new $@ # Generated intermediate files keys.list: MKkeys_list.sh Caps Caps-ncurses - AWK=${AWK} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \ + AWK=${AWK} USE_SIGWINCH=${ENABLE_SIGWINCH} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \ ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses | LC_ALL=C sort > keys.list +.if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host" +# we need to override the default +BTOOLSPATH= ${HOST_OBJTOP}/${RELDIR:S,w$,,} +.endif +.if ${MACHINE} == "host" || ${MK_DIRDEPS_BUILD} == "no" # Build tools DEPENDOBJS+= make_hash make_keys build-tools: make_hash make_keys @@ -280,6 +294,14 @@ make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} make_hash: make_hash.c hashsize.h ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} -DMAIN_PROGRAM \ ${NCURSES_DIR}/ncurses/tinfo/make_hash.c +.endif +.if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host" +make_keys: ${BTOOLSPATH}/make_keys + ${LN:Uln} -sf ${.ALLSRC} ${.TARGET} + +make_hash: ${BTOOLSPATH}/make_hash + ${LN:Uln} -sf ${.ALLSRC} ${.TARGET} +.endif # ./configure generated MKterm.h.awk: MKterm.h.awk.in @@ -317,6 +339,7 @@ curses.head: curses.h.in -e "/@BROKEN_LINKER@/s%%${BROKEN_LINKER}%" \ -e "/@HAVE_VSSCANF@/s%%${HAVE_VSSCANF}%" \ -e "/@HAVE_STDINT_H@/s%%${HAVE_STDINT_H}%" \ + -e "/@HAVE_STDNORETURN_H@/s%%${HAVE_STDNORETURN_H}%" \ -e "/@NCURSES_CH_T@/s%%${NCURSES_CH_T}%" \ -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \ -e "/@NCURSES_EXT_COLORS@/s%%${NCURSES_EXT_COLORS}%" \ @@ -327,6 +350,7 @@ curses.head: curses.h.in -e "/@NCURSES_MBSTATE_T@/s%%${NCURSES_MBSTATE_T}%" \ -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \ -e "/@NCURSES_MOUSE_VERSION@/s%%${NCURSES_MOUSE_VERSION}%" \ + -e "/@NCURSES_XNAMES@/s%%${NCURSES_XNAMES}%" \ -e "/@NCURSES_OK_WCHAR_T@/s%%${NCURSES_OK_WCHAR_T}%" \ -e "/@NCURSES_OPAQUE@/s%%${NCURSES_OPAQUE}%" \ -e "/@NCURSES_OPAQUE_FORM@/s%%${NCURSES_OPAQUE_FORM}%" \ @@ -352,6 +376,7 @@ curses.head: curses.h.in -e "s%@cf_cv_enable_lp64@%${ENABLE_LP64}%g" \ -e "s%@cf_cv_enable_opaque@%${ENABLE_OPAQUE}%g" \ -e "s%@cf_cv_enable_reentrant@%${ENABLE_REENTRANT}%g" \ + -e "s%@cf_cv_enable_sigwinch@%${ENABLE_SIGWINCH}%g" \ -e "s%@cf_cv_header_stdbool_h@%${HEADER_STDBOOL}%g" \ -e "s%@cf_cv_type_of_bool@%${TYPE_OF_BOOL}%g" \ -e "s%@cf_cv_typeof_chtype@%${TYPEOF_CHTYPE}%g" \ @@ -369,6 +394,7 @@ unctrl.h: unctrl.h.in terminfo.5: MKterminfo.sh terminfo.head Caps sh ${NCURSES_DIR}/man/MKterminfo.sh ${NCURSES_DIR}/man/terminfo.head \ ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/man/terminfo.tail >$@ + sed -i '' 's|${SRCTOP}|${NCURSES_SRCTOP}|g' $@ CLEANFILES+= terminfo.5 @@ -1038,9 +1064,9 @@ gen-pkgconfig: gen-pkgconfig.in s,@PC_MODULE_SUFFIX@,,g ; \ s,@prefix@,/usr,g ; \ s,@exec_prefix@,$${prefix},g ; \ - s,@includedir@,/usr/include,g ; \ + s,@includedir@,${INCLUDEDIR},g ; \ s,@includesubdir@,,g ; \ - s,@libdir@,/usr/lib,g ; \ + s,@libdir@,${LIBDIR},g ; \ s,@RPATH_LIST@,$${libdir},g ; \ s,@PRIVATE_LIBS@,,g ; \ s,@USE_ARG_SUFFIX@,,g ; \ diff --git a/lib/ncurses/tinfo/Makefile.depend b/lib/ncurses/tinfo/Makefile.depend index 9b2a343de2dc..996a149f6041 100644 --- a/lib/ncurses/tinfo/Makefile.depend +++ b/lib/ncurses/tinfo/Makefile.depend @@ -1,14 +1,13 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ + bin/sh.host \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/ncurses/ncursesw \ + lib/ncurses/tinfo.host \ .include <dirdeps.mk> diff --git a/lib/ncurses/tinfo/ncurses_cfg.h b/lib/ncurses/tinfo/ncurses_cfg.h index 259d5c656af7..33890f300310 100644 --- a/lib/ncurses/tinfo/ncurses_cfg.h +++ b/lib/ncurses/tinfo/ncurses_cfg.h @@ -47,36 +47,47 @@ * https://invisible-island.net/autoconf/ * ftp://ftp.invisible-island.net/autoconf/ */ - -/* $FreeBSD$ */ - #ifndef NC_CONFIG_H #define NC_CONFIG_H #define PACKAGE "ncurses" -#define NCURSES_VERSION "6.2" -#define NCURSES_PATCHDATE 20210220 +#define NCURSES_VERSION "6.5" +#define NCURSES_PATCHDATE 20240427 #define SYSTEM_NAME "FreeBSD" #if 0 #include <stdlib.h> #endif #define HAVE_LONG_FILE_NAMES 1 #define MIXEDCASE_FILENAMES 1 -#ifdef __FreeBSD__ +#define STDC_HEADERS 1 +#define USE_GETCAP 1 +#define USE_BSD_TPUTS 1 +#define HAVE_BSD_CGETENT 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_STAT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_UNISTD_H 1 +#define HAVE_DIRENT_H 1 #define USE_SYSMOUSE 1 -#endif #define TERMINFO_DIRS "/usr/share/terminfo:/usr/local/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 +#define USE_HOME_TERMINFO 1 +#define USE_ROOT_ENVIRON 1 +#define USE_ROOT_ACCESS 1 +#define USE_SETUID_ENVIRON 1 #define HAVE_UNISTD_H 1 #define HAVE_REMOVE 1 #define HAVE_UNLINK 1 #define HAVE_LINK 1 #define HAVE_SYMLINK 1 #define USE_LINKS 1 -#define BSD_TPUTS 1 #define HAVE_LANGINFO_CODESET 1 #define USE_WIDEC_SUPPORT 1 #define NCURSES_WIDECHAR 1 @@ -85,6 +96,7 @@ #define HAVE_PUTWC 1 #define HAVE_BTOWC 1 #define HAVE_WCTOB 1 +#define HAVE_WMEMCHR 1 #define HAVE_MBTOWC 1 #define HAVE_WCTOMB 1 #define HAVE_MBLEN 1 @@ -96,16 +108,7 @@ #define HAVE_MBSTOWCS 1 #define NEED_WCHAR_H 1 #define HAVE_FSEEKO 1 -#define STDC_HEADERS 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_UNISTD_H 1 +#define RGB_PATH "no" #define SIZEOF_SIGNED_CHAR 1 #define NCURSES_EXT_FUNCS 1 #define HAVE_ASSUME_DEFAULT_COLORS 1 @@ -115,7 +118,6 @@ #define HAVE_RESIZE_TERM 1 #define HAVE_TERM_ENTRY_H 1 #define HAVE_USE_DEFAULT_COLORS 1 -#define HAVE_USE_EXTENDED_NAMES 1 #define HAVE_USE_SCREEN 1 #define HAVE_USE_WINDOW 1 #define HAVE_WRESIZE 1 @@ -128,10 +130,10 @@ #define NCURSES_EXT_PUTWIN 1 #define NCURSES_NO_PADDING 1 #define USE_SIGWINCH 1 +#define NCURSES_XNAMES 1 #define NCURSES_WRAP_PREFIX "_nc_" #define USE_ASSUMED_COLOR 1 #define USE_HASHMAP 1 -#define USE_COLORFGBG 1 #define GCC_SCANF 1 #define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var))) #define GCC_PRINTF 1 @@ -139,9 +141,7 @@ #define GCC_UNUSED __attribute__((unused)) #define GCC_NORETURN __attribute__((noreturn)) #define HAVE_NC_ALLOC_H 1 -#define HAVE_GETTIMEOFDAY 1 -#define STDC_HEADERS 1 -#define HAVE_DIRENT_H 1 +#define HAVE_MATH_FUNCS 1 #define TIME_WITH_SYS_TIME 1 #define HAVE_REGEX_H_FUNCS 1 #define HAVE_FCNTL_H 1 @@ -150,13 +150,13 @@ #define HAVE_LOCALE_H 1 #define HAVE_MATH_H 1 #define HAVE_POLL_H 1 +#define HAVE_SYS_AUXV_H 1 #define HAVE_SYS_IOCTL_H 1 #define HAVE_SYS_PARAM_H 1 #define HAVE_SYS_POLL_H 1 #define HAVE_SYS_SELECT_H 1 #define HAVE_SYS_TIME_H 1 #define HAVE_SYS_TIMES_H 1 -#define HAVE_TTYENT_H 1 #define HAVE_UNISTD_H 1 #define HAVE_WCTYPE_H 1 #define HAVE_UNISTD_H 1 @@ -170,20 +170,20 @@ #define HAVE_SYS_TIME_SELECT 1 #define SIG_ATOMIC_T volatile sig_atomic_t #define HAVE_ERRNO 1 +#define HAVE_CLOCK_GETTIME 1 +#define HAVE_FPATHCONF 1 #define HAVE_GETCWD 1 #define HAVE_GETEGID 1 #define HAVE_GETEUID 1 #define HAVE_GETOPT 1 -#define HAVE_GETTTYNAM 1 +#define HAVE_GETUID 1 #define HAVE_ISSETUGID 1 #define HAVE_LOCALECONV 1 #define HAVE_POLL 1 -#define HAVE_PUTENV 1 #define HAVE_REMOVE 1 #define HAVE_SELECT 1 #define HAVE_SETBUF 1 #define HAVE_SETBUFFER 1 -#define HAVE_SETENV 1 #define HAVE_SETVBUF 1 #define HAVE_SIGACTION 1 #define HAVE_SIGVEC 1 @@ -195,7 +195,8 @@ #define HAVE_TIMES 1 #define HAVE_TSEARCH 1 #define HAVE_VSNPRINTF 1 -#define HAVE_BSD_CGETENT 1 +#define HAVE_PATH_TTYS 1 +#define HAVE_GETTTYNAM 1 #define HAVE_ISASCII 1 #define HAVE_NANOSLEEP 1 #define HAVE_TERMIOS_H 1 @@ -207,6 +208,7 @@ #define HAVE_MKSTEMP 1 #define HAVE_SIZECHANGE 1 #define HAVE_WORKING_POLL 1 +#define HAVE_CONSISTENT_MB_LEN_MAX 1 #define HAVE_VA_COPY 1 #define HAVE_UNISTD_H 1 #define HAVE_FORK 1 @@ -220,6 +222,7 @@ #define HAVE_IOSTREAM 1 #define IOSTREAM_NAMESPACE 1 #define SIZEOF_BOOL 1 +#define CPP_HAS_OVERRIDE 1 #define CPP_HAS_STATIC_CAST 1 #define SIZEOF_WCHAR_T 4 #define HAVE_SLK_COLOR 1 @@ -230,9 +233,8 @@ #define HAVE_FORM_H 1 #define HAVE_LIBFORM 1 #define NCURSES_PATHSEP ':' -#define NCURSES_VERSION_STRING "6.2.20210220" +#define NCURSES_VERSION_STRING "6.5.20240427" #define NCURSES_OSPEED_COMPAT 1 -#define HAVE_CURSES_DATA_BOOLNAMES 1 #include <ncurses_def.h> diff --git a/lib/ncurses/tinfo/pathnames.h b/lib/ncurses/tinfo/pathnames.h index 582d7e8b4b02..1c007ef6e943 100644 --- a/lib/ncurses/tinfo/pathnames.h +++ b/lib/ncurses/tinfo/pathnames.h @@ -27,9 +27,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/4/93 - * $FreeBSD$ */ #define _PATH_DEF ".termcap /usr/share/misc/termcap /etc/termcap.small" |