The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=396851c20aebdfada7c108bef5695c6a372e75b1
commit 396851c20aebdfada7c108bef5695c6a372e75b1 Author: Baptiste Daroussin <[email protected]> AuthorDate: 2021-09-23 01:49:51 +0000 Commit: Baptiste Daroussin <[email protected]> CommitDate: 2021-10-04 09:38:21 +0000 ncurses: split libtinfo from libncurses many external program expects libncurses to not be provided as a single library. Instead of fixing all ports, distribute ncurses the way upstream distributes it Turn libncursesw.so into a ldscript which will link automatically as needed to libtinfow so so this change is seamless at compile time. Differential Revision: https://reviews.freebsd.org/D32098 --- lib/ncurses/Makefile | 6 +- lib/ncurses/config.mk | 5 +- lib/ncurses/ncurses/Makefile | 1001 +----------------------- lib/ncurses/ncurses/libncursesw.ldscript | 1 + lib/ncurses/tinfo/Makefile | 1066 ++++++++++++++++++++++++++ lib/ncurses/tinfo/Makefile.depend | 18 + lib/ncurses/{ncurses => tinfo}/ncurses_cfg.h | 0 lib/ncurses/tinfo/pathnames.h | 36 + share/mk/bsd.libnames.mk | 2 +- share/mk/src.libnames.mk | 5 +- 10 files changed, 1151 insertions(+), 989 deletions(-) diff --git a/lib/ncurses/Makefile b/lib/ncurses/Makefile index be8697fbc609..da3791d01703 100644 --- a/lib/ncurses/Makefile +++ b/lib/ncurses/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -SUBDIR= ncurses form menu panel +SUBDIR= tinfo ncurses form menu panel SUBDIR_PARALLEL= -.for subdir in ${SUBDIR:Nncurses*} -SUBDIR_DEPEND_${subdir}= ncurses +.for subdir in ${SUBDIR:Ntinfo*} +SUBDIR_DEPEND_${subdir}= tinfo .endfor .include <bsd.subdir.mk> diff --git a/lib/ncurses/config.mk b/lib/ncurses/config.mk index 0ca0e4547ba8..c322cbeaa681 100644 --- a/lib/ncurses/config.mk +++ b/lib/ncurses/config.mk @@ -11,14 +11,14 @@ CFLAGS+= -D_XOPEN_SOURCE_EXTENDED NCURSES_CFG_H= ${.CURDIR}/ncurses_cfg.h CFLAGS+= -I. -CFLAGS+= -I${.CURDIR:H}/ncurses +CFLAGS+= -I${.CURDIR:H}/tinfo # for ${NCURSES_CFG_H} CFLAGS+= -I${.CURDIR:H}/ncurses CFLAGS+= -I${NCURSES_DIR}/include CFLAGS+= -I${NCURSES_DIR}/ncurses -CFLAGS+= -I${.OBJDIR:H}/ncurses/ +CFLAGS+= -I${.OBJDIR:H}/tinfo/ CFLAGS+= -Wall @@ -28,6 +28,7 @@ CFLAGS+= -DHAVE_CONFIG_H # everyone needs this .PATH: ${NCURSES_DIR}/include +.PATH: ${.OBJDIR:H}/tinfo/ # tools and directories AWK?= awk diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index 5a1fab7003a6..35b123a22292 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -12,85 +12,16 @@ 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]*%%' - -# From autoconf (!) -NCURSES_CH_T= cchar_t -NCURSES_OK_WCHAR_T= 1 -NEED_WCHAR_H= 1 -NCURSES_EXT_COLORS= 1 -NCURSES_EXT_FUNCS= 1 -NCURSES_CONST= const -NCURSES_INLINE= inline -NCURSES_LIBUTF8= 0 -NCURSES_MBSTATE_T= 0 -NCURSES_MOUSE_VERSION= 2 -NCURSES_INTEROP_FUNCS= 1 -NCURSES_OPAQUE= 0 -NCURSES_OPAQUE= 0 -NCURSES_OPAQUE_FORM= 0 -NCURSES_OPAQUE_MENU= 0 -NCURSES_OPAQUE_PANEL= 0 -NCURSES_OSPEED= short -NCURSES_SBOOL= char -NCURSES_SIZE_T= short -NCURSES_TPARM_VARARGS= 1 -NCURSES_WCHAR_T= 0 -NCURSES_WINT_T= 0 -NCURSES_XNAMES= 1 -NCURSES_WCWIDTH_GRAPHICS= 1 -NCURSES_WATTR_MACROS= 1 -NCURSES_TPARM_ARG= intptr_t -NCURSES_SP_FUNCS= 1 -BROKEN_LINKER= 0 -BUILTIN_BOOL= 1 -ENABLE_LP64= 1 -ENABLE_OPAQUE= NCURSES_OPAQUE -ENABLE_REENTRANT= 0 -HAVE_TCGETATTR= 1 -HAVE_TERMIOS_H= 1 -HAVE_TERMIO_H= 0 -HAVE_VSSCANF= 1 -HAVE_STDINT_H= 1 -HEADER_STDBOOL= 1 -# XXX amd64 1L and int -ONEUL= 1U -TYPEOF_CHTYPE= uint32_t -TYPEOF_MMASK_T= uint32_t -TYPE_OF_BOOL= unsigned char -USE_BIG_STRINGS= 1 -USE_CXX_BOOL= defined(__cplusplus) - GENSRCS= \ - codes.c \ expanded.c \ - fallback.c \ - lib_gen.c \ - lib_keyname.c \ - names.c \ - unctrl.c + lib_gen.c -GENHDRS= \ - curses.h \ - hashsize.h \ - init_keytry.h \ - ncurses_def.h \ - nomacros.h \ - parametrized.h \ - term.h \ - termcap.h \ - unctrl.h - -SRCS= ${GENHDRS} ${GENSRCS} +SRCS= ${GENSRCS} .PATH: ${NCURSES_DIR}/ncurses/base SRCS+= \ - define_key.c \ - key_defined.c \ - keybound.c \ - keyok.c \ + new_pair.c \ + lib_dft_fgbg.c \ legacy_coding.c \ lib_addch.c \ lib_addstr.c \ @@ -106,12 +37,10 @@ SRCS+= \ lib_colorset.c \ lib_delch.c \ lib_delwin.c \ - lib_dft_fgbg.c \ lib_echo.c \ lib_endwin.c \ lib_erase.c \ lib_flash.c \ - lib_freeall.c \ lib_getch.c \ lib_getstr.c \ lib_hline.c \ @@ -132,6 +61,7 @@ SRCS+= \ lib_nl.c \ lib_overlay.c \ lib_pad.c \ + lib_print.c \ lib_printw.c \ lib_redrawln.c \ lib_refresh.c \ @@ -162,72 +92,29 @@ SRCS+= \ lib_wattron.c \ lib_winch.c \ lib_window.c \ - new_pair.c \ nc_panel.c \ resizeterm.c \ safe_sprintf.c \ - tries.c \ - version.c \ vsscanf.c \ - wresize.c + wresize.c \ + lib_freeall.c \ .PATH: ${NCURSES_DIR}/ncurses/tinfo SRCS+= \ - access.c \ - add_tries.c \ - alloc_entry.c \ - alloc_ttype.c \ - captoinfo.c \ - comp_captab.c \ - comp_error.c \ - comp_expand.c \ - comp_hash.c \ - comp_parse.c \ - comp_scan.c \ - comp_userdefs.c \ - db_iterator.c \ - doalloc.c \ - entries.c \ - free_ttype.c \ - getenv_num.c \ - hashed_db.c \ - home_terminfo.c \ - init_keytry.c \ - lib_acs.c \ - lib_baudrate.c \ - lib_cur_term.c \ - lib_data.c \ - lib_has_cap.c \ - lib_kernel.c \ - lib_longname.c \ - lib_napms.c \ - lib_options.c \ - lib_print.c \ - lib_raw.c \ - lib_setup.c \ - lib_termcap.c \ - lib_termname.c \ - lib_tgoto.c \ - lib_ti.c \ - lib_tparm.c \ - lib_tputs.c \ - lib_ttyflags.c \ - name_match.c \ - obsolete.c \ - parse_entry.c \ - read_entry.c \ - read_termcap.c \ - strings.c \ - trim_sgr0.c \ - write_entry.c + use_screen.c \ + use_window.c +.PATH: ${NCURSES_DIR}/ncurses/trace +SRCS+= \ + varargs.c + +# DONE .PATH: ${NCURSES_DIR}/ncurses/tty SRCS+= \ hardscroll.c \ hashmap.c \ lib_mvcur.c \ lib_tstp.c \ - lib_twait.c \ lib_vidattr.c \ tty_update.c @@ -254,893 +141,43 @@ SRCS+= \ lib_wacs.c \ lib_wunctrl.c -.PATH: ${NCURSES_DIR}/ncurses/trace -SRCS+= \ - lib_trace.c \ - visbuf.c - # Currently unused, for debugging libncurses itself. DBGSRCS= \ - lib_traceatr.c \ - lib_tracebits.c \ - lib_tracechr.c \ - lib_tracedmp.c \ - lib_tracemse.c \ - trace_buf.c \ - trace_tries.c \ - trace_xnames.c \ varargs.c -CLEANFILES= ${GENSRCS} ${GENHDRS} keys.list make_hash term.h.new \ - make_keys MKterm.h.awk comp_captab.c curses.head - -CFLAGS+= -DTERMIOS - -# Installed -HEADERS= curses.h term.h termcap.h unctrl.h -SRCHDRS= ncurses_dll.h -CLEANFILES+= ncurses_dll.h - -INCS= ${HEADERS} ${SRCHDRS} -INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h +CLEANFILES= ${GENSRCS} .if ${MK_INSTALLLIB} != "no" SYMLINKS+= libncursesw.a ${LIBDIR}/libcursesw.a -SYMLINKS+= libncursesw.a ${LIBDIR}/libtermcapw.a -SYMLINKS+= libncursesw.a ${LIBDIR}/libtermlibw.a -SYMLINKS+= libncursesw.a ${LIBDIR}/libtinfow.a # backward compat SYMLINKS+= libncursesw.a ${LIBDIR}/libncurses.a SYMLINKS+= libncursesw.a ${LIBDIR}/libcurses.a -SYMLINKS+= libncursesw.a ${LIBDIR}/libtermcap.a -SYMLINKS+= libncursesw.a ${LIBDIR}/libtermlib.a -SYMLINKS+= libncursesw.a ${LIBDIR}/libtinfo.a .endif .if !defined(NO_PIC) # no need for major at all, it's an ld-time redirection only SYMLINKS+= libncursesw.so ${LIBDIR}/libcursesw.so -SYMLINKS+= libncursesw.so ${LIBDIR}/libtermcapw.so -SYMLINKS+= libncursesw.so ${LIBDIR}/libtermlibw.so -SYMLINKS+= libncursesw.so ${LIBDIR}/libtinfow.so # backward compat SYMLINKS+= libncursesw.so ${LIBDIR}/libncurses.so SYMLINKS+= libncursesw.so ${LIBDIR}/libcurses.so -SYMLINKS+= libncursesw.so ${LIBDIR}/libtermcap.so -SYMLINKS+= libncursesw.so ${LIBDIR}/libtermlib.so -SYMLINKS+= libncursesw.so ${LIBDIR}/libtinfo.so .endif .if ${MK_PROFILE} != "no" SYMLINKS+= libncursesw_p.a ${LIBDIR}/libcursesw_p.a -SYMLINKS+= libncursesw_p.a ${LIBDIR}/libtermcapw_p.a -SYMLINKS+= libncursesw_p.a ${LIBDIR}/libtermlibw_p.a -SYMLINKS+= libncursesw_p.a ${LIBDIR}/libtinfow_p.a # backward compat SYMLINKS+= libncursesw_p.a ${LIBDIR}/libncurses_p.a SYMLINKS+= libncursesw_p.a ${LIBDIR}/libcurses_p.a -SYMLINKS+= libncursesw_p.a ${LIBDIR}/libtermcap_p.a -SYMLINKS+= libncursesw_p.a ${LIBDIR}/libtermlib_p.a -SYMLINKS+= libncursesw_p.a ${LIBDIR}/libtinfo_p.a .endif -DOCSDIR= ${SHAREDIR}/doc/ncurses -DOCS= ncurses-intro.html hackguide.html +LIBADD+= tinfow +SHLIB_LDSCRIPT= libncursesw.ldscript -.if ${MK_HTML} != "no" -.PATH: ${NCURSES_DIR}/doc/html -FILESGROUPS= DOCS -.endif - -# Generated source -.ORDER: names.c codes.c - -names.c: MKnames.awk - ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKnames.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > names.c - -codes.c: MKcodes.awk - ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKcodes.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > codes.c +libncurses.ldscript: + @${ECHO} "INPUT(${SHLIB_NAME} AS NEEDED(-ltinfow))" >$@ lib_gen.c: MKlib_gen.sh curses.h ncurses_dll.h LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CPP:N${CCACHE_BIN}} ${CFLAGS}" \ "${AWK}" generated < curses.h >$@ -lib_keyname.c: keys.list MKkeyname.awk - ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk 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 - -comp_captab.c: MKcaptab.sh MKcaptab.awk Caps Caps-ncurses make_hash - env PATH=${BTOOLSPATH:U.}:${PATH} sh ${NCURSES_DIR}/ncurses/tinfo/MKcaptab.sh "${AWK}" \ - ${USE_BIG_STRINGS} ${NCURSES_DIR}/ncurses/tinfo/MKcaptab.awk \ - ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses > comp_captab.c - expanded.c: MKexpanded.sh sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC:N${CCACHE_BIN}} -E" ${CFLAGS} >expanded.c -fallback.c: MKfallback.sh - sh ${NCURSES_DIR}/ncurses/tinfo/MKfallback.sh "" "" "" > ${.TARGET}.tmp && \ - mv -f ${.TARGET}.tmp ${.TARGET} - -comp_userdefs.c: MKuserdefs.sh Caps Caps-ncurses make_hash - env PATH=${BTOOLSPATH:U.}:${PATH} sh ${NCURSES_DIR}/ncurses/tinfo/MKuserdefs.sh "${AWK}" \ - ${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses > ${.TARGET} - -# Generated headers -nomacros.h: MKlib_gen.sh curses.h - LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CC:N${CCACHE_BIN}} -E ${CFLAGS}" \ - "${AWK}" generated < curses.h | fgrep undef > $@ - -init_keytry.h: keys.list make_keys - ${BTOOLSPATH:U.}/make_keys keys.list > init_keytry.h - -hashsize.h: MKhashsize.sh Caps Caps-ncurses - sh ${NCURSES_DIR}/include/MKhashsize.sh ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses > $@ - -parametrized.h: MKparametrized.sh Caps Caps-ncurses - AWK=${AWK} sh ${NCURSES_DIR}/include/MKparametrized.sh \ - ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses > $@ - -term.h: MKterm.h.awk edit_cfg.sh Caps Caps-ncurses - ${AWK} -f MKterm.h.awk ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses > [email protected] - sh ${NCURSES_DIR}/include/edit_cfg.sh ${NCURSES_CFG_H} [email protected] - mv -f [email protected] $@ - -curses.h: curses.head MKkey_defs.sh Caps Caps-ncurses - cat curses.head > [email protected] - AWK=${AWK} _POSIX2_VERSION=199209 sh ${NCURSES_DIR}/include/MKkey_defs.sh \ - ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses >> [email protected] - cat ${NCURSES_DIR}/include/curses.wide >> [email protected] - cat ${NCURSES_DIR}/include/curses.tail >> [email protected] - mv -f [email protected] $@ - -# Generated intermediate files -keys.list: MKkeys_list.sh Caps Caps-ncurses - AWK=${AWK} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \ - ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses | LC_ALL=C sort > keys.list - -# Build tools -DEPENDOBJS+= make_hash make_keys -build-tools: make_hash make_keys - -make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} - ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c - -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 - -# ./configure generated -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@%1%g" \ - -e "s%@NCURSES_USE_TERMCAP@%1%g" \ - -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ - -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \ - -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \ - -e "/@NCURSES_TPARM_VARARGS@/s%%${NCURSES_TPARM_VARARGS}%" \ - -e "/@NCURSES_SBOOL@/s%%${NCURSES_SBOOL}%" \ - -e "/@NCURSES_XNAMES@/s%%${NCURSES_XNAMES}%" \ - -e "/@NCURSES_EXT_COLORS@/s%%${NCURSES_EXT_COLORS}%" \ - -e "/@HAVE_TERMIOS_H@/s%%${HAVE_TERMIOS_H}%" \ - -e "/@HAVE_TERMIO_H@/s%%${HAVE_TERMIO_H}%" \ - -e "/@HAVE_TCGETATTR@/s%%${HAVE_TCGETATTR}%" \ - -e "s%@cf_cv_enable_reentrant@%${ENABLE_REENTRANT}%g" \ - -e "s%@NCURSES_SP_FUNCS@%1%" \ - -e "s%@NCURSES_PATCH@%${NCURSES_PATCH}%" - -termcap.h: termcap.h.in - sed <${NCURSES_DIR}/include/termcap.h.in >$@ \ - -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ - -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \ - -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \ - -e "/@NCURSES_OSPEED@/s%%${NCURSES_OSPEED}%" - -ncurses_dll.h: ncurses_dll.h.in - sed <${NCURSES_DIR}/include/ncurses_dll.h.in >$@ \ - -e "s%@NCURSES_WRAP_PREFIX@%_nc_%g" - -curses.head: curses.h.in - sed <${NCURSES_DIR}/include/curses.h.in >$@ \ - -e "/@BROKEN_LINKER@/s%%${BROKEN_LINKER}%" \ - -e "/@HAVE_VSSCANF@/s%%${HAVE_VSSCANF}%" \ - -e "/@HAVE_STDINT_H@/s%%${HAVE_STDINT_H}%" \ - -e "/@NCURSES_CH_T@/s%%${NCURSES_CH_T}%" \ - -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \ - -e "/@NCURSES_EXT_COLORS@/s%%${NCURSES_EXT_COLORS}%" \ - -e "/@NCURSES_EXT_FUNCS@/s%%${NCURSES_EXT_FUNCS}%" \ - -e "/@NCURSES_INLINE@/s%%${NCURSES_INLINE}%" \ - -e "/@NCURSES_LIBUTF8@/s%%${NCURSES_LIBUTF8}%" \ - -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ - -e "/@NCURSES_MBSTATE_T@/s%%${NCURSES_MBSTATE_T}%" \ - -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \ - -e "/@NCURSES_MOUSE_VERSION@/s%%${NCURSES_MOUSE_VERSION}%" \ - -e "/@NCURSES_OK_WCHAR_T@/s%%${NCURSES_OK_WCHAR_T}%" \ - -e "/@NCURSES_OPAQUE@/s%%${NCURSES_OPAQUE}%" \ - -e "/@NCURSES_OPAQUE_FORM@/s%%${NCURSES_OPAQUE_FORM}%" \ - -e "/@NCURSES_OPAQUE_MENU@/s%%${NCURSES_OPAQUE_MENU}%" \ - -e "/@NCURSES_OPAQUE_PANEL@/s%%${NCURSES_OPAQUE_PANEL}%" \ - -e "/@NCURSES_PATCH@/s%%${NCURSES_PATCH}%" \ - -e "/@NCURSES_SIZE_T@/s%%${NCURSES_SIZE_T}%" \ - -e "/@NCURSES_TPARM_VARARGS@/s%%${NCURSES_TPARM_VARARGS}%" \ - -e "/@NCURSES_WATTR_MACROS@/s%%${NCURSES_WATTR_MACROS}%"\ - -e "/@NCURSES_WCHAR_T@/s%%${NCURSES_WCHAR_T}%" \ - -e "/@NCURSES_WCHAR_T@/s%%${NCURSES_WCHAR_T}%" \ - -e "/@NCURSES_WCWIDTH_GRAPHICS@/s%%${NCURSES_WCWIDTH_GRAPHICS}%g" \ - -e "/@NCURSES_WINT_T@/s%%${NCURSES_WINT_T}%" \ - -e "/@NCURSES_INTEROP_FUNCS@/s%%${NCURSES_INTEROP_FUNCS}%g" \ - -e "/@NCURSES_TPARM_ARG@/s%%${NCURSES_TPARM_ARG}%g" \ - -e "/@NCURSES_SP_FUNCS@/s%%${NCURSES_SP_FUNCS}%g" \ - -e "/@NEED_WCHAR_H@/s%%${NEED_WCHAR_H}%" \ - -e "/@USE_CXX_BOOL@/s%%${USE_CXX_BOOL}%" \ - -e "/@GENERATED_EXT_FUNCS@/s%%generated%g" \ - -e "s%@NCURSES_CCHARW_MAX@%5%g" \ - -e "s%@cf_cv_1UL@%${ONEUL}%g" \ - -e "s%@cf_cv_builtin_bool@%${BUILTIN_BOOL}%g" \ - -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_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" \ - -e "s%@cf_cv_typeof_mmask_t@%${TYPEOF_MMASK_T}%g" \ - -e "s/ _WCHAR_T/ __wchar_t/g" \ - -e "s/ _WINT_T/ __wint_t/g" - -unctrl.h: unctrl.h.in - sed <${NCURSES_DIR}/include/[email protected] >$@ \ - -e "s%@NCURSES_SP_FUNCS@%${NCURSES_SP_FUNCS}%g" \ - -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ - -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" - -# MAN page gunk -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 >$@ - -CLEANFILES+= terminfo.5 - -.PATH: ${NCURSES_DIR}/man -MAN= \ - curs_addch.3 \ - curs_addchstr.3 \ - curs_addstr.3 \ - curs_attr.3 \ - curs_beep.3 \ - curs_bkgd.3 \ - curs_bkgrnd.3 \ - curs_border.3 \ - curs_border_set.3 \ - curs_clear.3 \ - curs_color.3 \ - curs_delch.3 \ - curs_deleteln.3 \ - curs_extend.3 \ - curs_getcchar.3 \ - curs_getch.3 \ - curs_getstr.3 \ - curs_getyx.3 \ - curs_inch.3 \ - curs_inchstr.3 \ - curs_initscr.3 \ - curs_inopts.3 \ - curs_insch.3 \ - curs_insstr.3 \ - curs_instr.3 \ - curs_inwstr.3 \ - curs_kernel.3 \ - curs_legacy.3 \ - curs_memleaks.3 \ - curs_mouse.3 \ - curs_move.3 \ - curs_opaque.3 \ - curs_outopts.3 \ - curs_overlay.3 \ - curs_pad.3 \ - curs_print.3 \ - curs_refresh.3 \ - curs_scr_dump.3 \ - curs_scroll.3 \ - curs_slk.3 \ - curs_sp_funcs.3 \ - curs_termattrs.3 \ - curs_termcap.3 \ - curs_terminfo.3 \ - curs_threads.3 \ - curs_touch.3 \ - curs_trace.3 \ - curs_util.3 \ - curs_variables.3 \ - curs_window.3 \ - default_colors.3 \ - define_key.3 \ - key_defined.3 \ - keybound.3 \ - keyok.3 \ - legacy_coding.3 \ - ncurses.3 \ - new_pair.3 \ - resizeterm.3 \ - term_variables.3 \ - wresize.3 - -MAN+= \ - curs_add_wch.3 \ - curs_add_wchstr.3 \ - curs_addwstr.3 \ - curs_get_wch.3 \ - curs_get_wstr.3 \ - curs_in_wch.3 \ - curs_in_wchstr.3 \ - curs_ins_wch.3 \ - curs_ins_wstr.3 \ - curs_printw.3 \ - curs_scanw.3 - -MAN+= term.5 terminfo.5 scr_dump.5 user_caps.5 -MAN+= term.7 - -CLEANFILES+= ${MAN:M*.3} - -MLINKS= ncurses.3 curses.3 \ - curs_addch.3 addch.3 \ - curs_addch.3 echochar.3 \ - curs_addch.3 mvaddch.3 \ - curs_addch.3 mvwaddch.3 \ - curs_addch.3 waddch.3 \ - curs_addch.3 wechochar.3 \ - curs_addchstr.3 addchnstr.3 \ - curs_addchstr.3 addchstr.3 \ - curs_addchstr.3 mvaddchnstr.3 \ - curs_addchstr.3 mvaddchstr.3 \ - curs_addchstr.3 mvwaddchnstr.3 \ - curs_addchstr.3 mvwaddchstr.3 \ - curs_addchstr.3 waddchnstr.3 \ - curs_addchstr.3 waddchstr.3 \ - curs_addstr.3 addnstr.3 \ - curs_addstr.3 addstr.3 \ - curs_addstr.3 mvaddnstr.3 \ - curs_addstr.3 mvaddstr.3 \ - curs_addstr.3 mvwaddnstr.3 \ - curs_addstr.3 mvwaddstr.3 \ - curs_addstr.3 waddnstr.3 \ - curs_addstr.3 waddstr.3 \ - curs_attr.3 PAIR_NUMBER.3 \ - curs_attr.3 attr_get.3 \ - curs_attr.3 attr_off.3 \ - curs_attr.3 attr_on.3 \ - curs_attr.3 attr_set.3 \ - curs_attr.3 attroff.3 \ - curs_attr.3 attron.3 \ - curs_attr.3 attrset.3 \ - curs_attr.3 chgat.3 \ - curs_attr.3 color_set.3 \ - curs_attr.3 mvchgat.3 \ - curs_attr.3 mvwchgat.3 \ - curs_attr.3 standend.3 \ - curs_attr.3 standout.3 \ - curs_attr.3 wattr_get.3 \ - curs_attr.3 wattr_off.3 \ - curs_attr.3 wattr_on.3 \ - curs_attr.3 wattr_set.3 \ - curs_attr.3 wattroff.3 \ - curs_attr.3 wattron.3 \ - curs_attr.3 wattrset.3 \ - curs_attr.3 wchgat.3 \ - curs_attr.3 wcolor_set.3 \ - curs_attr.3 wstandend.3 \ - curs_attr.3 wstandout.3 \ - curs_beep.3 beep.3 \ - curs_beep.3 flash.3 \ - curs_bkgd.3 bkgd.3 \ - curs_bkgd.3 bkgdset.3 \ - curs_bkgd.3 getbkgd.3 \ - curs_bkgd.3 wbkgd.3 \ - curs_bkgd.3 wbkgdset.3 \ - curs_bkgrnd.3 bkgrnd.3 \ - curs_bkgrnd.3 bkgrndset.3 \ - curs_bkgrnd.3 getbkgrnd.3 \ - curs_bkgrnd.3 wbkgrnd.3 \ - curs_bkgrnd.3 wbkgrndset.3 \ - curs_bkgrnd.3 wgetbkgrnd.3 \ - curs_border.3 border.3 \ - curs_border.3 box.3 \ - curs_border.3 hline.3 \ - curs_border.3 mvhline.3 \ - curs_border.3 mvvline.3 \ - curs_border.3 mvwhline.3 \ - curs_border.3 mvwvline.3 \ - curs_border.3 vline.3 \ - curs_border.3 wborder.3 \ - curs_border.3 whline.3 \ - curs_border.3 wvline.3 \ - curs_border_set.3 border_set.3 \ - curs_border_set.3 box_set.3 \ - curs_border_set.3 hline_set.3 \ - curs_border_set.3 mvhline_set.3 \ - curs_border_set.3 mvvline_set.3 \ - curs_border_set.3 mvwhline_set.3 \ - curs_border_set.3 mvwvline_set.3 \ - curs_border_set.3 vline_set.3 \ - curs_border_set.3 wborder_set.3 \ - curs_border_set.3 whline_set.3 \ - curs_border_set.3 wvline_set.3 \ - curs_clear.3 clear.3 \ - curs_clear.3 clrtobot.3 \ - curs_clear.3 clrtoeol.3 \ - curs_clear.3 erase.3 \ - curs_clear.3 wclear.3 \ - curs_clear.3 wclrtobot.3 \ - curs_clear.3 wclrtoeol.3 \ - curs_clear.3 werase.3 \ - curs_color.3 COLOR_PAIR.3 \ - curs_color.3 can_change_color.3 \ - curs_color.3 color_content.3 \ - curs_color.3 has_colors.3 \ - curs_color.3 init_color.3 \ - curs_color.3 init_pair.3 \ - curs_color.3 pair_content.3 \ - curs_color.3 start_color.3 \ - curs_delch.3 delch.3 \ - curs_delch.3 mvdelch.3 \ - curs_delch.3 mvwdelch.3 \ - curs_delch.3 wdelch.3 \ - curs_deleteln.3 deleteln.3 \ - curs_deleteln.3 insdelln.3 \ - curs_deleteln.3 insertln.3 \ - curs_deleteln.3 wdeleteln.3 \ - curs_deleteln.3 winsdelln.3 \ - curs_deleteln.3 winsertln.3 \ - curs_extend.3 curses_version.3 \ - curs_extend.3 use_extended_names.3 \ - curs_getcchar.3 getcchar.3 \ - curs_getcchar.3 setcchar.3 \ - curs_getch.3 getch.3 \ - curs_getch.3 has_key.3 \ - curs_getch.3 mvgetch.3 \ - curs_getch.3 mvwgetch.3 \ - curs_getch.3 ungetch.3 \ - curs_getch.3 wgetch.3 \ - curs_getstr.3 getnstr.3 \ - curs_getstr.3 getstr.3 \ - curs_getstr.3 mvgetnstr.3 \ - curs_getstr.3 mvgetstr.3 \ - curs_getstr.3 mvwgetnstr.3 \ - curs_getstr.3 mvwgetstr.3 \ - curs_getstr.3 wgetnstr.3 \ - curs_getstr.3 wgetstr.3 \ - curs_getyx.3 getbegyx.3 \ - curs_getyx.3 getmaxyx.3 \ - curs_getyx.3 getparyx.3 \ - curs_getyx.3 getyx.3 \ - curs_inch.3 inch.3 \ - curs_inch.3 mvinch.3 \ - curs_inch.3 mvwinch.3 \ - curs_inch.3 winch.3 \ - curs_inchstr.3 inchnstr.3 \ - curs_inchstr.3 inchstr.3 \ - curs_inchstr.3 mvinchnstr.3 \ - curs_inchstr.3 mvinchstr.3 \ - curs_inchstr.3 mvwinchnstr.3 \ - curs_inchstr.3 mvwinchstr.3 \ - curs_inchstr.3 winchnstr.3 \ - curs_inchstr.3 winchstr.3 \ - curs_initscr.3 delscreen.3 \ - curs_initscr.3 endwin.3 \ - curs_initscr.3 initscr.3 \ - curs_initscr.3 isendwin.3 \ - curs_initscr.3 newterm.3 \ - curs_initscr.3 set_term.3 \ - curs_inopts.3 cbreak.3 \ - curs_inopts.3 echo.3 \ - curs_inopts.3 halfdelay.3 \ - curs_inopts.3 intrflush.3 \ - curs_inopts.3 keypad.3 \ - curs_inopts.3 meta.3 \ - curs_inopts.3 nocbreak.3 \ - curs_inopts.3 nodelay.3 \ - curs_inopts.3 noecho.3 \ - curs_inopts.3 noqiflush.3 \ - curs_inopts.3 noraw.3 \ - curs_inopts.3 notimeout.3 \ - curs_inopts.3 qiflush.3 \ - curs_inopts.3 raw.3 \ - curs_inopts.3 timeout.3 \ - curs_inopts.3 typeahead.3 \ - curs_inopts.3 wtimeout.3 \ - curs_insch.3 insch.3 \ - curs_insch.3 mvinsch.3 \ - curs_insch.3 mvwinsch.3 \ - curs_insch.3 winsch.3 \ - curs_insstr.3 insnstr.3 \ - curs_insstr.3 insstr.3 \ - curs_insstr.3 mvinsnstr.3 \ - curs_insstr.3 mvinsstr.3 \ - curs_insstr.3 mvwinsnstr.3 \ - curs_insstr.3 mvwinsstr.3 \ - curs_insstr.3 winsnstr.3 \ - curs_insstr.3 winsstr.3 \ - curs_instr.3 innstr.3 \ - curs_instr.3 instr.3 \ - curs_instr.3 mvinnstr.3 \ - curs_instr.3 mvinstr.3 \ - curs_instr.3 mvwinnstr.3 \ - curs_instr.3 mvwinstr.3 \ - curs_instr.3 winnstr.3 \ - curs_instr.3 winstr.3 \ - curs_kernel.3 curs_set.3 \ - curs_kernel.3 def_prog_mode.3 \ - curs_kernel.3 def_shell_mode.3 \ - curs_kernel.3 getsyx.3 \ - curs_kernel.3 napms.3 \ - curs_kernel.3 reset_prog_mode.3 \ - curs_kernel.3 reset_shell_mode.3 \ - curs_kernel.3 resetty.3 \ - curs_kernel.3 ripoffline.3 \ - curs_kernel.3 savetty.3 \ - curs_kernel.3 setsyx.3 \ - curs_legacy.3 getbegx.3 \ - curs_legacy.3 getbegy.3 \ - curs_legacy.3 getcurx.3 \ - curs_legacy.3 getcury.3 \ - curs_legacy.3 getmaxx.3 \ - curs_legacy.3 getmaxy.3 \ - curs_legacy.3 getparx.3 \ - curs_legacy.3 getpary.3 \ - curs_memleaks.3 _nc_free_and_exit.3 \ - curs_memleaks.3 _nc_freeall.3 \ - curs_mouse.3 getmouse.3 \ - curs_mouse.3 mouse_trafo.3 \ - curs_mouse.3 mouseinterval.3 \ - curs_mouse.3 mousemask.3 \ - curs_mouse.3 ungetmouse.3 \ - curs_mouse.3 wenclose.3 \ - curs_mouse.3 wmouse_trafo.3 \ - curs_move.3 move.3 \ - curs_move.3 wmove.3 \ - curs_opaque.3 is_cleared.3 \ - curs_opaque.3 is_idcok.3 \ - curs_opaque.3 is_idlok.3 \ - curs_opaque.3 is_immedok.3 \ - curs_opaque.3 is_keypad.3 \ - curs_opaque.3 is_leaveok.3 \ - curs_opaque.3 is_nodelay.3 \ - curs_opaque.3 is_notimeout.3 \ - curs_opaque.3 is_scrollok.3 \ - curs_opaque.3 is_syncok.3 \ - curs_opaque.3 is_timeout.3 \ - curs_opaque.3 wgetparent.3 \ - curs_opaque.3 wgetscrreg.3 \ - curs_outopts.3 clearok.3 \ - curs_outopts.3 idcok.3 \ - curs_outopts.3 idlok.3 \ - curs_outopts.3 immedok.3 \ - curs_outopts.3 leaveok.3 \ - curs_outopts.3 nl.3 \ - curs_outopts.3 nonl.3 \ - curs_outopts.3 scrollok.3 \ - curs_outopts.3 setscrreg.3 \ - curs_outopts.3 wsetscrreg.3 \ - curs_overlay.3 copywin.3 \ - curs_overlay.3 overlay.3 \ - curs_overlay.3 overwrite.3 \ - curs_pad.3 newpad.3 \ - curs_pad.3 pecho_wchar.3 \ - curs_pad.3 pechochar.3 \ - curs_pad.3 pnoutrefresh.3 \ - curs_pad.3 prefresh.3 \ - curs_pad.3 subpad.3 \ - curs_print.3 mcprint.3 \ - curs_refresh.3 doupdate.3 \ - curs_refresh.3 redrawwin.3 \ - curs_refresh.3 refresh.3 \ - curs_refresh.3 wnoutrefresh.3 \ - curs_refresh.3 wredrawln.3 \ - curs_refresh.3 wrefresh.3 \ - curs_scr_dump.3 scr_dump.3 \ - curs_scr_dump.3 scr_init.3 \ - curs_scr_dump.3 scr_restore.3 \ - curs_scr_dump.3 scr_set.3 \ - curs_scroll.3 scrl.3 \ - curs_scroll.3 scroll.3 \ - curs_scroll.3 wscrl.3 \ - curs_slk.3 slk_attr.3 \ - curs_slk.3 slk_attr_off.3 \ - curs_slk.3 slk_attr_on.3 \ - curs_slk.3 slk_attr_set.3 \ - curs_slk.3 slk_attroff.3 \ - curs_slk.3 slk_attron.3 \ - curs_slk.3 slk_attrset.3 \ - curs_slk.3 slk_clear.3 \ - curs_slk.3 slk_color.3 \ - curs_slk.3 slk_init.3 \ - curs_slk.3 slk_label.3 \ - curs_slk.3 slk_noutrefresh.3 \ - curs_slk.3 slk_refresh.3 \ - curs_slk.3 slk_restore.3 \ - curs_slk.3 slk_set.3 \ - curs_slk.3 slk_touch.3 \ - curs_sp_funcs.3 sp_funcs.3 \ - curs_sp_funcs.3 assume_default_colors_sp.3 \ - curs_sp_funcs.3 baudrate_sp.3 \ - curs_sp_funcs.3 beep_sp.3 \ - curs_sp_funcs.3 can_change_color_sp.3 \ - curs_sp_funcs.3 cbreak_sp.3 \ - curs_sp_funcs.3 ceiling_panel.3 \ - curs_sp_funcs.3 color_content_sp.3 \ - curs_sp_funcs.3 curs_set_sp.3 \ - curs_sp_funcs.3 def_prog_mode_sp.3 \ - curs_sp_funcs.3 def_shell_mode_sp.3 \ - curs_sp_funcs.3 define_key_sp.3 \ - curs_sp_funcs.3 del_curterm_sp.3 \ - curs_sp_funcs.3 delay_output_sp.3 \ - curs_sp_funcs.3 doupdate_sp.3 \ - curs_sp_funcs.3 echo_sp.3 \ - curs_sp_funcs.3 endwin_sp.3 \ - curs_sp_funcs.3 erasechar_sp.3 \ - curs_sp_funcs.3 filter_sp.3 \ - curs_sp_funcs.3 flash_sp.3 \ - curs_sp_funcs.3 flushinp_sp.3 \ - curs_sp_funcs.3 get_escdelay_sp.3 \ - curs_sp_funcs.3 getmouse_sp.3 \ - curs_sp_funcs.3 getwin_sp.3 \ - curs_sp_funcs.3 ground_panel.3 \ - curs_sp_funcs.3 halfdelay_sp.3 \ - curs_sp_funcs.3 has_colors_sp.3 \ - curs_sp_funcs.3 has_ic_sp.3 \ - curs_sp_funcs.3 has_il_sp.3 \ - curs_sp_funcs.3 has_key_sp.3 \ - curs_sp_funcs.3 has_mouse_sp.3 \ - curs_sp_funcs.3 init_color_sp.3 \ - curs_sp_funcs.3 init_pair_sp.3 \ - curs_sp_funcs.3 intrflush_sp.3 \ - curs_sp_funcs.3 is_term_resized_sp.3 \ - curs_sp_funcs.3 isendwin_sp.3 \ - curs_sp_funcs.3 key_defined_sp.3 \ - curs_sp_funcs.3 keybound_sp.3 \ - curs_sp_funcs.3 keyname_sp.3 \ - curs_sp_funcs.3 keyok_sp.3 \ - curs_sp_funcs.3 killchar_sp.3 \ - curs_sp_funcs.3 mcprint_sp.3 \ - curs_sp_funcs.3 mouseinterval_sp.3 \ - curs_sp_funcs.3 mousemask_sp.3 \ - curs_sp_funcs.3 mvcur_sp.3 \ - curs_sp_funcs.3 napms_sp.3 \ - curs_sp_funcs.3 new_form_sp.3 \ - curs_sp_funcs.3 new_menu_sp.3 \ - curs_sp_funcs.3 new_prescr.3 \ - curs_sp_funcs.3 newpad_sp.3 \ - curs_sp_funcs.3 newterm_sp.3 \ - curs_sp_funcs.3 newwin_sp.3 \ - curs_sp_funcs.3 nl_sp.3 \ - curs_sp_funcs.3 nocbreak_sp.3 \ - curs_sp_funcs.3 noecho_sp.3 \ - curs_sp_funcs.3 nofilter_sp.3 \ - curs_sp_funcs.3 nonl_sp.3 \ - curs_sp_funcs.3 noqiflush_sp.3 \ - curs_sp_funcs.3 noraw_sp.3 \ - curs_sp_funcs.3 pair_content_sp.3 \ - curs_sp_funcs.3 putp_sp.3 \ - curs_sp_funcs.3 qiflush_sp.3 \ - curs_sp_funcs.3 raw_sp.3 \ - curs_sp_funcs.3 reset_prog_mode_sp.3 \ - curs_sp_funcs.3 reset_shell_mode_sp.3 \ - curs_sp_funcs.3 resetty_sp.3 \ - curs_sp_funcs.3 resize_term_sp.3 \ - curs_sp_funcs.3 resizeterm_sp.3 \ - curs_sp_funcs.3 restartterm_sp.3 \ - curs_sp_funcs.3 ripoffline_sp.3 \ - curs_sp_funcs.3 savetty_sp.3 \ - curs_sp_funcs.3 scr_init_sp.3 \ - curs_sp_funcs.3 scr_restore_sp.3 \ - curs_sp_funcs.3 scr_set_sp.3 \ - curs_sp_funcs.3 set_curterm_sp.3 \ - curs_sp_funcs.3 set_escdelay_sp.3 \ - curs_sp_funcs.3 set_tabsize_sp.3 \ - curs_sp_funcs.3 slk_attr_set_sp.3 \ - curs_sp_funcs.3 slk_attr_sp.3 \ - curs_sp_funcs.3 slk_attroff_sp.3 \ - curs_sp_funcs.3 slk_attron_sp.3 \ - curs_sp_funcs.3 slk_attrset_sp.3 \ - curs_sp_funcs.3 slk_clear_sp.3 \ - curs_sp_funcs.3 slk_color_sp.3 \ - curs_sp_funcs.3 slk_init_sp.3 \ - curs_sp_funcs.3 slk_label_sp.3 \ - curs_sp_funcs.3 slk_noutrefresh_sp.3 \ - curs_sp_funcs.3 slk_refresh_sp.3 \ - curs_sp_funcs.3 slk_restore_sp.3 \ - curs_sp_funcs.3 slk_set_sp.3 \ - curs_sp_funcs.3 slk_touch_sp.3 \ - curs_sp_funcs.3 start_color_sp.3 \ - curs_sp_funcs.3 term_attrs_sp.3 \ - curs_sp_funcs.3 termattrs_sp.3 \ *** 1389 LINES SKIPPED *** _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
