Page MenuHomeFreeBSD
Files F151144608

D32098.id95622.diff
No OneTemporary
Actions

D32098.id95622.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -2576,7 +2576,7 @@
bin/sh \
${LOCAL_TOOL_DIRS} \
${_jevents} \
- lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
${_rescue} \
${_share} \
usr.bin/awk \
@@ -2933,6 +2933,7 @@
lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \
lib/libzstd \
${_lib_casper} \
+ lib/ncurses/tinfo \
lib/ncurses/ncurses \
lib/libopie lib/libpam/libpam lib/libthr \
${_lib_libradius} lib/libsbuf lib/libtacplus \
@@ -2954,7 +2955,7 @@
.if ${MK_DIALOG} != "no"
_prebuild_libs+= gnu/lib/libdialog
-gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncurses__L
+gnu/lib/libdialog__L: lib/msun__L lib/ncurses/tinfo__L lib/ncurses/ncurses__L
.endif
.if ${MK_GOOGLETEST} != "no"
Index: gnu/lib/libdialog/Makefile
===================================================================
--- gnu/lib/libdialog/Makefile
+++ gnu/lib/libdialog/Makefile
@@ -13,7 +13,7 @@
INCS= dialog.h dlg_colors.h dlg_config.h dlg_keys.h
MAN= dialog.3
-LIBADD= ncursesw m
+LIBADD= tinfow ncursesw m
CFLAGS+= -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED
.PATH: ${DIALOG}
Index: gnu/usr.bin/dialog/Makefile
===================================================================
--- gnu/usr.bin/dialog/Makefile
+++ gnu/usr.bin/dialog/Makefile
@@ -3,7 +3,7 @@
DIALOG= ${SRCTOP}/contrib/dialog
PROG= dialog
-LIBADD= dialog ncursesw m
+LIBADD= dialog tinfow ncursesw m
CFLAGS+= -I${.CURDIR} -I${DIALOG}
.PATH: ${DIALOG}
Index: lib/libdpv/Makefile
===================================================================
--- lib/libdpv/Makefile
+++ lib/libdpv/Makefile
@@ -7,7 +7,7 @@
MAN= dpv.3
MLINKS= dpv.3 dpv_free.3
-LIBADD= dialog figpar util ncursesw
+LIBADD= dialog figpar util tinfow ncursesw
SRCS= dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c
Index: lib/libedit/Makefile
===================================================================
--- lib/libedit/Makefile
+++ lib/libedit/Makefile
@@ -13,7 +13,7 @@
WARNS?= 3
LIB= edit
-LIBADD= ncursesw
+LIBADD= tinfow
SRCS= chared.c chartype.c common.c el.c eln.c emacs.c filecomplete.c \
hist.c history.c historyn.c keymacro.c literal.c map.c \
Index: lib/ncurses/Makefile
===================================================================
--- lib/ncurses/Makefile
+++ 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>
Index: lib/ncurses/config.mk
===================================================================
--- lib/ncurses/config.mk
+++ lib/ncurses/config.mk
@@ -11,14 +11,14 @@
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 @@
# everyone needs this
.PATH: ${NCURSES_DIR}/include
+.PATH: ${.OBJDIR:H}/tinfo/
# tools and directories
AWK?= awk
Index: lib/ncurses/ncurses/Makefile
===================================================================
--- lib/ncurses/ncurses/Makefile
+++ lib/ncurses/ncurses/Makefile
@@ -12,85 +12,16 @@
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 @@
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 @@
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 @@
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 @@
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 > $@.new
- sh ${NCURSES_DIR}/include/edit_cfg.sh ${NCURSES_CFG_H} $@.new
- mv -f $@.new $@
-
-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
- 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 \
- ${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/$@.in >$@ \
- -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 \
- curs_sp_funcs.3 termname_sp.3 \
- curs_sp_funcs.3 tgetent_sp.3 \
- curs_sp_funcs.3 tgetflag_sp.3 \
- curs_sp_funcs.3 tgetnum_sp.3 \
- curs_sp_funcs.3 tgetstr_sp.3 \
- curs_sp_funcs.3 tigetflag_sp.3 \
- curs_sp_funcs.3 tigetnum_sp.3 \
- curs_sp_funcs.3 tigetstr_sp.3 \
- curs_sp_funcs.3 tputs_sp.3 \
- curs_sp_funcs.3 typeahead_sp.3 \
- curs_sp_funcs.3 unctrl_sp.3 \
- curs_sp_funcs.3 unget_wch_sp.3 \
- curs_sp_funcs.3 ungetch_sp.3 \
- curs_sp_funcs.3 ungetmouse_sp.3 \
- curs_sp_funcs.3 update_panels_sp.3 \
- curs_sp_funcs.3 use_default_colors_sp.3 \
- curs_sp_funcs.3 use_env_sp.3 \
- curs_sp_funcs.3 use_legacy_coding_sp.3 \
- curs_sp_funcs.3 vid_attr_sp.3 \
- curs_sp_funcs.3 vid_puts_sp.3 \
- curs_sp_funcs.3 vidattr_sp.3 \
- curs_sp_funcs.3 vidputs_sp.3 \
- curs_sp_funcs.3 wunctrl_sp.3 \
- curs_termattrs.3 baudrate.3 \
- curs_termattrs.3 erasechar.3 \
- curs_termattrs.3 erasewchar.3 \
- curs_termattrs.3 has_ic.3 \
- curs_termattrs.3 has_il.3 \
- curs_termattrs.3 killchar.3 \
- curs_termattrs.3 killwchar.3 \
- curs_termattrs.3 longname.3 \
- curs_termattrs.3 term_attrs.3 \
- curs_termattrs.3 termattrs.3 \
- curs_termattrs.3 termname.3 \
- curs_termcap.3 termcap.3 \
- curs_termcap.3 tgetent.3 \
- curs_termcap.3 tgetflag.3 \
- curs_termcap.3 tgetnum.3 \
- curs_termcap.3 tgetstr.3 \
- curs_termcap.3 tgoto.3 \
- curs_termcap.3 tputs.3 \
- curs_terminfo.3 del_curterm.3 \
- curs_terminfo.3 mvcur.3 \
- curs_terminfo.3 putp.3 \
- curs_terminfo.3 restartterm.3 \
- curs_terminfo.3 set_curterm.3 \
- curs_terminfo.3 setterm.3 \
- curs_terminfo.3 setupterm.3 \
- curs_terminfo.3 tigetflag.3 \
- curs_terminfo.3 tigetnum.3 \
- curs_terminfo.3 tigetstr.3 \
- curs_terminfo.3 tparm.3 \
- curs_terminfo.3 vid_attr.3 \
- curs_terminfo.3 vid_puts.3 \
- curs_terminfo.3 vidattr.3 \
- curs_terminfo.3 vidputs.3 \
- curs_threads.3 set_escdelay.3 \
- curs_threads.3 set_tabsize.3 \
- curs_threads.3 use_screen.3 \
- curs_threads.3 use_window.3 \
- curs_touch.3 is_linetouched.3 \
- curs_touch.3 is_wintouched.3 \
- curs_touch.3 touchline.3 \
- curs_touch.3 touchwin.3 \
- curs_touch.3 untouchwin.3 \
- curs_touch.3 wtouchln.3 \
- curs_trace.3 _nc_tracebits.3 \
- curs_trace.3 _traceattr.3 \
- curs_trace.3 _traceattr2.3 \
- curs_trace.3 _tracechar.3 \
- curs_trace.3 _tracechtype.3 \
- curs_trace.3 _tracechtype2.3 \
- curs_trace.3 _tracedump.3 \
- curs_trace.3 _tracef.3 \
- curs_trace.3 _tracemouse.3 \
- curs_trace.3 trace.3 \
- curs_util.3 delay_output.3 \
- curs_util.3 filter.3 \
- curs_util.3 flushinp.3 \
- curs_util.3 getwin.3 \
- curs_util.3 key_name.3 \
- curs_util.3 keyname.3 \
- curs_util.3 nofilter.3 \
- curs_util.3 putwin.3 \
- curs_util.3 unctrl.3 \
- curs_util.3 use_env.3 \
- curs_util.3 wunctrl.3 \
- curs_window.3 delwin.3 \
- curs_window.3 derwin.3 \
- curs_window.3 dupwin.3 \
- curs_window.3 mvderwin.3 \
- curs_window.3 mvwin.3 \
- curs_window.3 newwin.3 \
- curs_window.3 subwin.3 \
- curs_window.3 syncok.3 \
- curs_window.3 wcursyncup.3 \
- curs_window.3 wsyncdown.3 \
- curs_window.3 wsyncup.3 \
- default_colors.3 assume_default_colors.3 \
- default_colors.3 use_default_colors.3 \
- legacy_coding.3 use_legacy_coding.3 \
- resizeterm.3 is_term_resized.3 \
- resizeterm.3 resize_term.3
-
-MLINKS+=curs_add_wch.3 add_wch.3 \
- curs_add_wch.3 echo_wchar.3 \
- curs_add_wch.3 mvadd_wch.3 \
- curs_add_wch.3 mvwadd_wch.3 \
- curs_add_wch.3 wadd_wch.3 \
- curs_add_wch.3 wecho_wchar.3 \
- curs_add_wchstr.3 add_wchnstr.3 \
- curs_add_wchstr.3 add_wchstr.3 \
- curs_add_wchstr.3 mvadd_wchnstr.3 \
- curs_add_wchstr.3 mvadd_wchstr.3 \
- curs_add_wchstr.3 mvwadd_wchnstr.3 \
- curs_add_wchstr.3 mvwadd_wchstr.3 \
- curs_add_wchstr.3 wadd_wchnstr.3 \
- curs_add_wchstr.3 wadd_wchstr.3 \
- curs_addwstr.3 addnwstr.3 \
- curs_addwstr.3 addwstr.3 \
- curs_addwstr.3 mvaddnwstr.3 \
- curs_addwstr.3 mvaddwstr.3 \
- curs_addwstr.3 mvwaddnwstr.3 \
- curs_addwstr.3 mvwaddwstr.3 \
- curs_addwstr.3 waddnwstr.3 \
- curs_addwstr.3 waddwstr.3 \
- curs_get_wch.3 get_wch.3 \
- curs_get_wch.3 mvget_wch.3 \
- curs_get_wch.3 mvwget_wch.3 \
- curs_get_wch.3 unget_wch.3 \
- curs_get_wch.3 wget_wch.3 \
- curs_get_wstr.3 get_wstr.3 \
- curs_get_wstr.3 getn_wstr.3 \
- curs_get_wstr.3 mvget_wstr.3 \
- curs_get_wstr.3 mvgetn_wstr.3 \
- curs_get_wstr.3 mvwget_wstr.3 \
- curs_get_wstr.3 mvwgetn_wstr.3 \
- curs_get_wstr.3 wget_wstr.3 \
- curs_get_wstr.3 wgetn_wstr.3 \
- curs_in_wch.3 in_wch.3 \
- curs_in_wch.3 mvin_wch.3 \
- curs_in_wch.3 mvwin_wch.3 \
- curs_in_wch.3 win_wch.3 \
- curs_in_wchstr.3 in_wchnstr.3 \
- curs_in_wchstr.3 in_wchstr.3 \
- curs_in_wchstr.3 mvin_wchnstr.3 \
- curs_in_wchstr.3 mvin_wchstr.3 \
- curs_in_wchstr.3 mvwin_wchnstr.3 \
- curs_in_wchstr.3 mvwin_wchstr.3 \
- curs_in_wchstr.3 win_wchnstr.3 \
- curs_in_wchstr.3 win_wchstr.3 \
- curs_ins_wch.3 ins_wch.3 \
- curs_ins_wch.3 mvins_wch.3 \
- curs_ins_wch.3 mvwins_wch.3 \
- curs_ins_wch.3 wins_wch.3 \
- curs_ins_wstr.3 ins_nwstr.3 \
- curs_ins_wstr.3 ins_wstr.3 \
- curs_ins_wstr.3 mvins_nwstr.3 \
- curs_ins_wstr.3 mvins_wstr.3 \
- curs_ins_wstr.3 mvwins_nwstr.3 \
- curs_ins_wstr.3 mvwins_wstr.3 \
- curs_ins_wstr.3 wins_nwstr.3 \
- curs_ins_wstr.3 wins_wstr.3 \
- curs_inwstr.3 innwstr.3 \
- curs_inwstr.3 inwstr.3 \
- curs_inwstr.3 mvinnwstr.3 \
- curs_inwstr.3 mvinwstr.3 \
- curs_inwstr.3 mvwinnwstr.3 \
- curs_inwstr.3 mvwinwstr.3 \
- curs_inwstr.3 winnwstr.3 \
- curs_inwstr.3 winwstr.3 \
- curs_printw.3 mvprintw.3 \
- curs_printw.3 mvwprintw.3 \
- curs_printw.3 printw.3 \
- curs_printw.3 vw_printw.3 \
- curs_printw.3 vwprintw.3 \
- curs_printw.3 wprintw.3 \
- curs_scanw.3 mvscanw.3 \
- curs_scanw.3 mvwscanw.3 \
- curs_scanw.3 scanw.3 \
- curs_scanw.3 vw_scanw.3 \
- curs_scanw.3 vwscanw.3 \
- curs_scanw.3 wscanw.3
-
.include <bsd.lib.mk>
-
-# Keep the .SUFFIXES line after the include of bsd.lib.mk
-.SUFFIXES: .3 .3x
-.3x.3:
- cat ${.IMPSRC} > ${.TARGET}
Index: lib/ncurses/ncurses/ncurses_cfg.h
===================================================================
--- /dev/null
+++ lib/ncurses/ncurses/ncurses_cfg.h
@@ -1,258 +0,0 @@
-/* include/ncurses_cfg.h. Generated automatically by configure. */
-/****************************************************************************
- * Copyright 2020 Thomas E. Dickey *
- * Copyright 1998-2016,2017 Free Software Foundation, Inc. *
- * *
- * Permission is hereby granted, free of charge, to any person obtaining a *
- * copy of this software and associated documentation files (the *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, distribute with modifications, sublicense, and/or sell *
- * copies of the Software, and to permit persons to whom the Software is *
- * furnished to do so, subject to the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be included *
- * in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
- * *
- * Except as contained in this notice, the name(s) of the above copyright *
- * holders shall not be used in advertising or otherwise to promote the *
- * sale, use or other dealings in this Software without prior written *
- * authorization. *
- ****************************************************************************/
-
-/****************************************************************************
- * Author: Thomas E. Dickey 1997-on *
- ****************************************************************************/
-/*
- * $Id: ncurses_cfg.hin,v 1.13 2020/03/08 12:37:59 tom Exp $
- *
- * Both ncurses_cfg.h and ncurses_def.h are internal header-files used when
- * building ncurses.
- *
- * This is a template-file used to generate the "ncurses_cfg.h" file.
- *
- * Rather than list every definition, the configuration script substitutes the
- * definitions that it finds using 'sed'. You need a patch (original date
- * 971222) to autoconf 2.12 or 2.13 to do this.
- *
- * See:
- * 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 SYSTEM_NAME "FreeBSD"
-#if 0
-#include <stdlib.h>
-#endif
-#define HAVE_LONG_FILE_NAMES 1
-#define MIXEDCASE_FILENAMES 1
-#ifdef __FreeBSD__
-#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 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
-#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
-#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 SIZEOF_SIGNED_CHAR 1
-#define NCURSES_EXT_FUNCS 1
-#define HAVE_ASSUME_DEFAULT_COLORS 1
-#define HAVE_CURSES_VERSION 1
-#define HAVE_HAS_KEY 1
-#define HAVE_RESIZETERM 1
-#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
-#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
-#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
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
-#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 TIME_WITH_SYS_TIME 1
-#define HAVE_REGEX_H_FUNCS 1
-#define HAVE_FCNTL_H 1
-#define HAVE_GETOPT_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_LOCALE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_POLL_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
-#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
-#define HAVE_GETCWD 1
-#define HAVE_GETEGID 1
-#define HAVE_GETEUID 1
-#define HAVE_GETOPT 1
-#define HAVE_GETTTYNAM 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
-#define HAVE_SNPRINTF 1
-#define HAVE_STRDUP 1
-#define HAVE_STRSTR 1
-#define HAVE_SYSCONF 1
-#define HAVE_TCGETPGRP 1
-#define HAVE_TIMES 1
-#define HAVE_TSEARCH 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_BSD_CGETENT 1
-#define HAVE_ISASCII 1
-#define HAVE_NANOSLEEP 1
-#define HAVE_TERMIOS_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_SYS_IOCTL_H 1
-#define HAVE_TCGETATTR 1
-#define HAVE_VSSCANF 1
-#define HAVE_UNISTD_H 1
-#define HAVE_MKSTEMP 1
-#define HAVE_SIZECHANGE 1
-#define HAVE_WORKING_POLL 1
-#define HAVE_VA_COPY 1
-#define HAVE_UNISTD_H 1
-#define HAVE_FORK 1
-#define HAVE_VFORK 1
-#define HAVE_WORKING_VFORK 1
-#define HAVE_WORKING_FORK 1
-#define USE_FOPEN_BIN_R 1
-#define USE_OPENPTY_HEADER <libutil.h>
-#define USE_XTERM_PTY 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
-#define HAVE_MENU_H 1
-#define HAVE_LIBMENU 1
-#define HAVE_FORM_H 1
-#define HAVE_LIBFORM 1
-#define NCURSES_PATHSEP ':'
-#define NCURSES_VERSION_STRING "6.2.20210220"
-#define NCURSES_OSPEED_COMPAT 1
-#define HAVE_CURSES_DATA_BOOLNAMES 1
-
-#include <ncurses_def.h>
-
- /* The C compiler may not treat these properly but C++ has to */
-#ifdef __cplusplus
-#undef const
-#undef inline
-#endif
-
- /* On HP-UX, the C compiler doesn't grok mbstate_t without
- -D_XOPEN_SOURCE=500. However, this causes problems on
- IRIX. So, we #define mbstate_t to int in configure.in
- only for the C compiler if needed. */
-#ifndef __cplusplus
-#ifdef NEED_MBSTATE_T_DEF
-#define mbstate_t int
-#endif
-#endif
-
-/*
- * vile:cmode
- */
-#endif /* NC_CONFIG_H */
Index: lib/ncurses/tinfo/Makefile
===================================================================
--- lib/ncurses/tinfo/Makefile
+++ lib/ncurses/tinfo/Makefile
@@ -7,7 +7,7 @@
.include "${.CURDIR:H}/config.mk"
-LIB= ncursesw
+LIB= tinfow
SHLIB_MAJOR= 9
NO_LINT=
@@ -65,9 +65,7 @@
GENSRCS= \
codes.c \
- expanded.c \
fallback.c \
- lib_gen.c \
lib_keyname.c \
names.c \
unctrl.c
@@ -91,85 +89,8 @@
key_defined.c \
keybound.c \
keyok.c \
- legacy_coding.c \
- lib_addch.c \
- lib_addstr.c \
- lib_beep.c \
- lib_bkgd.c \
- lib_box.c \
- lib_chgat.c \
- lib_clear.c \
- lib_clearok.c \
- lib_clrbot.c \
- lib_clreol.c \
- lib_color.c \
- 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 \
- lib_immedok.c \
- lib_inchstr.c \
- lib_initscr.c \
- lib_insch.c \
- lib_insdel.c \
- lib_insnstr.c \
- lib_instr.c \
- lib_isendwin.c \
- lib_leaveok.c \
- lib_mouse.c \
- lib_move.c \
- lib_mvwin.c \
- lib_newterm.c \
- lib_newwin.c \
- lib_nl.c \
- lib_overlay.c \
- lib_pad.c \
- lib_printw.c \
- lib_redrawln.c \
- lib_refresh.c \
- lib_restart.c \
- lib_scanw.c \
- lib_screen.c \
- lib_scroll.c \
- lib_scrollok.c \
- lib_scrreg.c \
- lib_set_term.c \
- lib_slk.c \
- lib_slkatr_set.c \
- lib_slkatrof.c \
- lib_slkatron.c \
- lib_slkatrset.c \
- lib_slkattr.c \
- lib_slkclear.c \
- lib_slkcolor.c \
- lib_slkinit.c \
- lib_slklab.c \
- lib_slkrefr.c \
- lib_slkset.c \
- lib_slktouch.c \
- lib_touch.c \
- lib_ungetch.c \
- lib_vline.c \
- lib_wattroff.c \
- 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
+ version.c
.PATH: ${NCURSES_DIR}/ncurses/tinfo
SRCS+= \
@@ -202,7 +123,6 @@
lib_longname.c \
lib_napms.c \
lib_options.c \
- lib_print.c \
lib_raw.c \
lib_setup.c \
lib_termcap.c \
@@ -223,36 +143,7 @@
.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
-
-.PATH: ${NCURSES_DIR}/ncurses/widechar
-SRCS+= \
- charable.c \
- lib_add_wch.c \
- lib_box_set.c \
- lib_cchar.c \
- lib_erasewchar.c \
- lib_get_wch.c \
- lib_get_wstr.c \
- lib_hline_set.c \
- lib_in_wch.c \
- lib_in_wchnstr.c \
- lib_ins_wch.c \
- lib_inwstr.c \
- lib_key_name.c \
- lib_pecho_wchar.c \
- lib_slk_wset.c \
- lib_unget_wch.c \
- lib_vid_attr.c \
- lib_vline_set.c \
- lib_wacs.c \
- lib_wunctrl.c
+ lib_twait.c
.PATH: ${NCURSES_DIR}/ncurses/trace
SRCS+= \
@@ -285,41 +176,29 @@
INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h
.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
+SYMLINKS+= libtinfow.a ${LIBDIR}/libtermcapw.a
+SYMLINKS+= libtinfow.a ${LIBDIR}/libtermlibw.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
+SYMLINKS+= libtinfow.a ${LIBDIR}/libtermcap.a
+SYMLINKS+= libtinfow.a ${LIBDIR}/libtermlib.a
+SYMLINKS+= libtinfow.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
+SYMLINKS+= libtinfow.so ${LIBDIR}/libtermcapw.so
+SYMLINKS+= libtinfow.so ${LIBDIR}/libtermlibw.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
+SYMLINKS+= libtinfow.so ${LIBDIR}/libtermcap.so
+SYMLINKS+= libtinfow.so ${LIBDIR}/libtermlib.so
+SYMLINKS+= libtinfow.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
+SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtermcapw_p.a
+SYMLINKS+= libtinfow_p.a ${LIBDIR}/libtermlibw_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
+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
@@ -339,10 +218,6 @@
codes.c: MKcodes.awk
${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKcodes.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > codes.c
-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
@@ -354,9 +229,6 @@
${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}
@@ -1138,6 +1010,54 @@
curs_scanw.3 vwscanw.3 \
curs_scanw.3 wscanw.3
+PCFILES= ncursesw.pc \
+ tinfow.pc \
+ panelw.pc \
+ formw.pc \
+ menuw.pc
+CLEANFILES+= ${PCFILES}
+SYMLINKS+= ncursesw.pc ${LIBDATADIR}/pkgconfig/ncurses.pc \
+ tinfow.pc ${LIBDATADIR}/pkgconfig/tinfo.pc \
+ formw.pc ${LIBDATADIR}/pkgconfig/form.pc \
+ menuw.pc ${LIBDATADIR}/pkgconfig/menu.pc \
+ panelw.pc ${LIBDATADIR}/pkgconfig/panel.pc
+
+
+.PATH: ${NCURSES_DIR}/misc
+gen-pkgconfig: gen-pkgconfig.in
+ sed -e 's,@SHELL@,/bin/sh,g ; \
+ s,@LIB_NAME@,ncursesw,g ; \
+ s,@TINFO_NAME@,tinfow,g ; \
+ s,@PANEL_NAME@,panelw,g ; \
+ s,@MENU_NAME@,menuw,g ; \
+ s,@FORM_NAME@,formw,g ; \
+ s,@CXX_NAME@,ncurses++,g ; \
+ s,@DFT_DEP_SUFFIX@,.so,g ; \
+ s,@TINFO_ARG_SUFFIX@,tinfow,g ; \
+ s,@CXX_LIB_SUFFIX@,.a,g ; \
+ s,@PC_MODULE_SUFFIX@,,g ; \
+ s,@prefix@,/usr,g ; \
+ s,@exec_prefix@,$${prefix},g ; \
+ s,@includedir@,/usr/include,g ; \
+ s,@includesubdir@,,g ; \
+ s,@libdir@,/usr/lib,g ; \
+ s,@RPATH_LIST@,$${libdir},g ; \
+ s,@PRIVATE_LIBS@,,g ; \
+ s,@USE_ARG_SUFFIX@,,g ; \
+ s,@NCURSES_MAJOR@,${NCURSES_MAJOR},g ; \
+ s,@NCURSES_MINOR@,${NCURSES_MINOR},g ; \
+ s,@NCURSES_PATCH@,${NCURSES_PATCH},g ; \
+ s,@PKG_CFLAGS@,,g ; \
+ s,@EXTRA_PKG_LDFLAGS@,${SSP_CFLAGS},g ; \
+ s,@LDFLAGS@,,g; \
+ s,@LIBS@,,g ; \
+ s,@LD_SEARCHPATH@,/usr/lib|/lib,g ; \
+ s,@PC_MODULES_TO_MAKE@,$$1,g' \
+ ${.ALLSRC} > ${.TARGET}
+
+${PCFILES}: gen-pkgconfig
+ sh ${.OBJDIR}/gen-pkgconfig ${.TARGET:R}
+
.include <bsd.lib.mk>
# Keep the .SUFFIXES line after the include of bsd.lib.mk
Index: lib/ncurses/tinfo/Makefile.depend
===================================================================
--- /dev/null
+++ lib/ncurses/tinfo/Makefile.depend
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ gnu/lib/csu \
+ include \
+ include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ lib/ncurses/ncursesw \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
Index: lib/ncurses/tinfo/pathnames.h
===================================================================
--- /dev/null
+++ lib/ncurses/tinfo/pathnames.h
@@ -0,0 +1,36 @@
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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"
+#define _PATH_DEF_SEC "/usr/share/misc/termcap"
Index: libexec/telnetd/Makefile
===================================================================
--- libexec/telnetd/Makefile
+++ libexec/telnetd/Makefile
@@ -29,7 +29,7 @@
CFLAGS+= -I${TELNETDIR}
CFLAGS+= -I${TELNETDIR}/telnet
-LIBADD= telnet util ncursesw
+LIBADD= telnet util tinfow
.if ${MK_OPENSSL} != "no"
SRCS+= authenc.c
Index: sbin/ipf/ipfstat/Makefile
===================================================================
--- sbin/ipf/ipfstat/Makefile
+++ sbin/ipf/ipfstat/Makefile
@@ -6,6 +6,6 @@
PROG= ipfstat
SRCS= ipfstat.c
MAN= ipfstat.8
-LIBADD+= ncursesw
+LIBADD+= tinfow ncursesw
.include <bsd.prog.mk>
Index: share/mk/bsd.libnames.mk
===================================================================
--- share/mk/bsd.libnames.mk
+++ share/mk/bsd.libnames.mk
@@ -147,7 +147,7 @@
LIBTERMCAP?= ${LIBDESTDIR}${LIBDIR_BASE}/libtermcap.a
LIBTERMCAPW?= ${LIBDESTDIR}${LIBDIR_BASE}/libtermcapw.a
LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP"
-LIBTINFO?= "don't use LIBTINFO, use LIBNCURSES"
+LIBTINFOW= ${LIBDESTDIR}${LIBDIR_BASE}/libtinfow.a
LIBTPOOL?= ${LIBDESTDIR}${LIBDIR_BASE}/libtpool.a
LIBUFS?= ${LIBDESTDIR}${LIBDIR_BASE}/libufs.a
LIBUGIDFW?= ${LIBDESTDIR}${LIBDIR_BASE}/libugidfw.a
Index: share/mk/src.libnames.mk
===================================================================
--- share/mk/src.libnames.mk
+++ share/mk/src.libnames.mk
@@ -193,6 +193,7 @@
sysdecode \
tacplus \
termcapw \
+ tinfow \
tpool \
ufs \
ugidfw \
@@ -273,7 +274,7 @@
.if ${MK_LDNS} != "no"
_DP_ssh+= ldns
.endif
-_DP_edit= ncursesw
+_DP_edit= tinfow
.if ${MK_OPENSSL} != "no"
_DP_bsnmp= crypto
.endif
@@ -323,8 +324,8 @@
.endif
_DP_execinfo= elf
_DP_dwarf= elf
-_DP_dpv= dialog figpar util ncursesw
-_DP_dialog= ncursesw m
+_DP_dpv= dialog figpar util tinfow ncursesw
+_DP_dialog= tinfow ncursesw m
_DP_cuse= pthread
_DP_atf_cxx= atf_c
_DP_gtest= pthread regex
@@ -375,6 +376,7 @@
_DP_stats= sbuf pthread
_DP_stdthreads= pthread
_DP_tacplus= md
+_DP_ncursesw= tinfow
_DP_panelw= ncursesw
_DP_rpcsec_gss= gssapi
_DP_smb= kiconv
@@ -692,6 +694,7 @@
LIBFORMWDIR= ${OBJTOP}/lib/ncurses/form
LIBMENUWDIR= ${OBJTOP}/lib/ncurses/menu
LIBNCURSESWDIR= ${OBJTOP}/lib/ncurses/ncurses
+LIBTINFOWDIR= ${OBJTOP}/lib/ncurses/tinfo
LIBPANELWDIR= ${OBJTOP}/lib/ncurses/panel
LIBCRYPTODIR= ${OBJTOP}/secure/lib/libcrypto
LIBSPLDIR= ${OBJTOP}/cddl/lib/libspl
@@ -701,7 +704,7 @@
LIBEGACYDIR= ${OBJTOP}/tools/build
LIBLNDIR= ${OBJTOP}/usr.bin/lex/lib
-LIBTERMCAPWDIR= ${LIBNCURSESWDIR}
+LIBTERMCAPWDIR= ${LIBTINFOWDIR}
# Default other library directories to lib/libNAME.
.for lib in ${_LIBRARIES}
Index: tools/tools/ath/athratestats/Makefile
===================================================================
--- tools/tools/ath/athratestats/Makefile
+++ tools/tools/ath/athratestats/Makefile
@@ -7,7 +7,7 @@
SRCS= main.c opt_ah.h ah_osdep.h
-LIBADD+= ncursesw
+LIBADD+= tinfow ncursesw
CLEANFILES+= opt_ah.h ah_osdep.h
Index: tools/tools/net80211/stumbler/Makefile
===================================================================
--- tools/tools/net80211/stumbler/Makefile
+++ tools/tools/net80211/stumbler/Makefile
@@ -2,7 +2,7 @@
PROG= stumbler
BINDIR= /usr/local/bin
-LIBADD= pcap ncursesw
+LIBADD= pcap tinfow ncursesw
CFLAGS=-g
MAN=
Index: usr.bin/clang/lld/Makefile
===================================================================
--- usr.bin/clang/lld/Makefile
+++ usr.bin/clang/lld/Makefile
@@ -104,7 +104,7 @@
.if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
LIBADD+= execinfo
-LIBADD+= ncursesw
+LIBADD+= tinfow
.endif
LIBADD+= pthread
LIBADD+= z
Index: usr.bin/clang/lldb-server/Makefile
===================================================================
--- usr.bin/clang/lldb-server/Makefile
+++ usr.bin/clang/lldb-server/Makefile
@@ -41,6 +41,7 @@
DPSRCS+= ${TGHDRS}
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
+LIBADD+= tinfow
LIBADD+= edit
LIBADD+= execinfo
LIBADD+= lua
Index: usr.bin/clang/lldb/Makefile
===================================================================
--- usr.bin/clang/lldb/Makefile
+++ usr.bin/clang/lldb/Makefile
@@ -34,12 +34,13 @@
DPSRCS+= ${TGHDRS}
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
+LIBADD= tinfow
LIBADD+= edit
LIBADD+= execinfo
LIBADD+= lua
LIBADD+= lzma
LIBADD+= ncursesw
-LIBADD+= panel
+LIBADD+= panelw
LIBADD+= pthread
LIBADD+= z
Index: usr.bin/clang/llvm.prog.mk
===================================================================
--- usr.bin/clang/llvm.prog.mk
+++ usr.bin/clang/llvm.prog.mk
@@ -24,7 +24,7 @@
.if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
LIBADD+= execinfo
-LIBADD+= ncursesw
+LIBADD+= tinfow
.endif
LIBADD+= pthread
Index: usr.bin/ee/Makefile
===================================================================
--- usr.bin/ee/Makefile
+++ usr.bin/ee/Makefile
@@ -9,7 +9,7 @@
PROG= ee
LINKS= ${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit
MLINKS= ee.1 ree.1 ee.1 edit.1
-LIBADD= ncursesw
+LIBADD= tinfow ncursesw
WARNS?= 2
Index: usr.bin/grdc/Makefile
===================================================================
--- usr.bin/grdc/Makefile
+++ usr.bin/grdc/Makefile
@@ -2,6 +2,6 @@
PROG= grdc
MAN= grdc.6
-LIBADD= ncursesw
+LIBADD= tinfow ncursesw
.include <bsd.prog.mk>
Index: usr.bin/less/Makefile
===================================================================
--- usr.bin/less/Makefile
+++ usr.bin/less/Makefile
@@ -9,7 +9,7 @@
signal.c tags.c ttyin.c version.c xbuf.c
SCRIPTS=lesspipe.sh zless.sh
SCRIPTSNAME_lesspipe.sh=lesspipe.sh
-LIBADD= ncursesw
+LIBADD= tinfow
LINKS= ${BINDIR}/less ${BINDIR}/more \
${BINDIR}/zless ${BINDIR}/bzless \
${BINDIR}/zless ${BINDIR}/xzless \
Index: usr.bin/msgs/Makefile
===================================================================
--- usr.bin/msgs/Makefile
+++ usr.bin/msgs/Makefile
@@ -3,6 +3,6 @@
PROG= msgs
-LIBADD= ncursesw
+LIBADD= tinfow
.include <bsd.prog.mk>
Index: usr.bin/ncal/Makefile
===================================================================
--- usr.bin/ncal/Makefile
+++ usr.bin/ncal/Makefile
@@ -4,7 +4,7 @@
PROG= ncal
-LIBADD= calendar ncursesw
+LIBADD= calendar tinfow
LINKS= ${BINDIR}/ncal ${BINDIR}/cal
MLINKS= ncal.1 cal.1
Index: usr.bin/ncurses/Makefile
===================================================================
--- usr.bin/ncurses/Makefile
+++ usr.bin/ncurses/Makefile
@@ -15,10 +15,10 @@
SRCS.tset= tset.c tty_settings.c transform.c reset_cmd.c
CFLAGS+= -I${NCURSES_DIR}/progs \
-I${NCURSES_DIR}/include \
- -I${SRCTOP}/lib/ncurses/ncurses \
- -I${OBJTOP}/lib/ncurses/ncurses \
+ -I${SRCTOP}/lib/ncurses/tinfo \
+ -I${OBJTOP}/lib/ncurses/tinfo \
-I${.CURDIR}
-LIBADD= ncursesw
+LIBADD= tinfow
CLEANFILES= termsort.c
termsort.c: MKtermsort.sh
Index: usr.bin/systat/Makefile
===================================================================
--- usr.bin/systat/Makefile
+++ usr.bin/systat/Makefile
@@ -16,6 +16,6 @@
WARNS?= 1
-LIBADD= ncursesw m devstat kvm util
+LIBADD= tinfow ncursesw m devstat kvm util
.include <bsd.prog.mk>
Index: usr.bin/tabs/Makefile
===================================================================
--- usr.bin/tabs/Makefile
+++ usr.bin/tabs/Makefile
@@ -2,6 +2,6 @@
PROG= tabs
-LIBADD= ncursesw
+LIBADD= tinfow
.include <bsd.prog.mk>
Index: usr.bin/talk/Makefile
===================================================================
--- usr.bin/talk/Makefile
+++ usr.bin/talk/Makefile
@@ -5,6 +5,6 @@
SRCS= ctl.c ctl_transact.c display.c get_addrs.c get_iface.c get_names.c \
init_disp.c invite.c io.c look_up.c msgs.c talk.c
-LIBADD= ncursesw
+LIBADD= tinfow ncursesw
.include <bsd.prog.mk>
Index: usr.bin/telnet/Makefile
===================================================================
--- usr.bin/telnet/Makefile
+++ usr.bin/telnet/Makefile
@@ -21,7 +21,7 @@
WARNS?= 2
-LIBADD= telnet ncursesw
+LIBADD= telnet tinfow
CFLAGS+= -DIPSEC
LIBADD+= ipsec
Index: usr.bin/top/Makefile
===================================================================
--- usr.bin/top/Makefile
+++ usr.bin/top/Makefile
@@ -7,5 +7,5 @@
username.c utils.c
MAN= top.1
-LIBADD= ncursesw m kvm jail util sbuf
+LIBADD= tinfow m kvm jail util sbuf
.include <bsd.prog.mk>
Index: usr.bin/ul/Makefile
===================================================================
--- usr.bin/ul/Makefile
+++ usr.bin/ul/Makefile
@@ -3,6 +3,6 @@
PROG= ul
-LIBADD= ncursesw
+LIBADD= tinfow
.include <bsd.prog.mk>
Index: usr.bin/vi/Makefile
===================================================================
--- usr.bin/vi/Makefile
+++ usr.bin/vi/Makefile
@@ -35,7 +35,7 @@
CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex \
-I${.CURDIR}/ex
-LIBADD= util ncursesw
+LIBADD= util tinfow ncursesw
.if ${MK_ICONV} == "yes" && !defined(RESCUE)
CFLAGS+= -DUSE_ICONV -DICONV_TRADITIONAL
Index: usr.sbin/bsdinstall/distextract/Makefile
===================================================================
--- usr.sbin/bsdinstall/distextract/Makefile
+++ usr.sbin/bsdinstall/distextract/Makefile
@@ -2,7 +2,7 @@
BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distextract
-LIBADD= archive dpv figpar ncursesw dialog m
+LIBADD= archive dpv dialog m
MAN=
Index: usr.sbin/bsdinstall/distfetch/Makefile
===================================================================
--- usr.sbin/bsdinstall/distfetch/Makefile
+++ usr.sbin/bsdinstall/distfetch/Makefile
@@ -2,7 +2,7 @@
BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distfetch
-LIBADD= fetch ncursesw dialog m
+LIBADD= fetch dialog m
MAN=
Index: usr.sbin/gstat/Makefile
===================================================================
--- usr.sbin/gstat/Makefile
+++ usr.sbin/gstat/Makefile
@@ -2,6 +2,6 @@
PROG= gstat
MAN= gstat.8
-LIBADD= devstat geom edit ncursesw
+LIBADD= devstat geom edit tinfow ncursesw
.include <bsd.prog.mk>
Index: usr.sbin/pmc/Makefile
===================================================================
--- usr.sbin/pmc/Makefile
+++ usr.sbin/pmc/Makefile
@@ -14,7 +14,7 @@
# Does not link when built position-independent.
MK_PIE=no
-LIBADD= kvm pmc m ncursesw pmcstat elf
+LIBADD= pmc m pmcstat elf
SRCS= pmc.c pmc_util.c cmd_pmc_stat.c \
cmd_pmc_list.c cmd_pmc_filter.cc \
Index: usr.sbin/pmcstat/Makefile
===================================================================
--- usr.sbin/pmcstat/Makefile
+++ usr.sbin/pmcstat/Makefile
@@ -6,7 +6,7 @@
MAN= pmcstat.8
CFLAGS+= -I${SRCTOP}/lib/libpmcstat
-LIBADD= kvm pmc m ncursesw pmcstat elf
+LIBADD= kvm pmc m tinfow ncursesw pmcstat elf
SRCS= pmcstat.c pmcstat.h pmcstat_log.c \
pmcpl_callgraph.c pmcpl_gprof.c pmcpl_annotate.c \
Index: usr.sbin/tzsetup/Makefile
===================================================================
--- usr.sbin/tzsetup/Makefile
+++ usr.sbin/tzsetup/Makefile
@@ -10,7 +10,7 @@
.if ${MK_DIALOG} != no && !defined(BOOTSTRAPPING)
WARNS?= 3
CFLAGS+= -I${SRCTOP}/contrib/dialog -DHAVE_DIALOG
-LIBADD= dialog ncursesw
+LIBADD= dialog tinfow
.endif
.include <bsd.prog.mk>
Index: usr.sbin/watch/Makefile
===================================================================
--- usr.sbin/watch/Makefile
+++ usr.sbin/watch/Makefile
@@ -5,6 +5,6 @@
WARNS?= 2
-LIBADD= ncursesw
+LIBADD= tinfow
.include <bsd.prog.mk>

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 9:45 AM (4 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31024034
Default Alt Text
D32098.id95622.diff (64 KB)

Event Timeline