The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=cbc83e378a7ee8f8aea9811906a2786a8f3bdeb3
commit cbc83e378a7ee8f8aea9811906a2786a8f3bdeb3 Author: Baptiste Daroussin <[email protected]> AuthorDate: 2021-09-23 01:52:46 +0000 Commit: Baptiste Daroussin <[email protected]> CommitDate: 2021-10-04 09:38:24 +0000 ncurses: chase dependency changes in the source tree Differential Revision: https://reviews.freebsd.org/D32098 --- Makefile.inc1 | 5 +++-- gnu/lib/libdialog/Makefile | 2 +- gnu/usr.bin/dialog/Makefile | 2 +- lib/libdpv/Makefile | 2 +- lib/libedit/Makefile | 2 +- libexec/telnetd/Makefile | 2 +- sbin/ipf/ipfstat/Makefile | 2 +- share/mk/src.libnames.mk | 6 +++--- tools/tools/ath/athratestats/Makefile | 2 +- tools/tools/net80211/stumbler/Makefile | 2 +- usr.bin/clang/lld/Makefile | 2 +- usr.bin/clang/lldb-server/Makefile | 1 + usr.bin/clang/lldb/Makefile | 3 ++- usr.bin/clang/llvm.prog.mk | 2 +- usr.bin/ee/Makefile | 2 +- usr.bin/grdc/Makefile | 2 +- usr.bin/less/Makefile | 2 +- usr.bin/msgs/Makefile | 2 +- usr.bin/ncal/Makefile | 2 +- usr.bin/ncurses/Makefile | 6 +++--- usr.bin/systat/Makefile | 2 +- usr.bin/tabs/Makefile | 2 +- usr.bin/talk/Makefile | 2 +- usr.bin/telnet/Makefile | 2 +- usr.bin/top/Makefile | 2 +- usr.bin/ul/Makefile | 2 +- usr.bin/vi/Makefile | 2 +- usr.sbin/gstat/Makefile | 2 +- usr.sbin/pmc/Makefile | 2 +- usr.sbin/pmcstat/Makefile | 2 +- usr.sbin/tzsetup/Makefile | 2 +- usr.sbin/watch/Makefile | 2 +- 32 files changed, 39 insertions(+), 36 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ff5911edc384..6dcfa6a17d3d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2576,7 +2576,7 @@ _bt_clean= ${CLEANDIR} bin/sh \ ${LOCAL_TOOL_DIRS} \ ${_jevents} \ - lib/ncurses/ncurses \ + lib/ncurses/tinfo \ ${_rescue} \ ${_share} \ usr.bin/awk \ @@ -2933,6 +2933,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ 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 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ .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" diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile index b97e4df9373a..6de2460c62a5 100644 --- a/gnu/lib/libdialog/Makefile +++ b/gnu/lib/libdialog/Makefile @@ -13,7 +13,7 @@ SRCS= argv.c arrows.c buildlist.c buttons.c calendar.c checklist.c \ 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} diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile index 71496f774830..bb50dc46cea8 100644 --- a/gnu/usr.bin/dialog/Makefile +++ b/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} diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile index be28debc70bc..5b432602ff7b 100644 --- a/lib/libdpv/Makefile +++ b/lib/libdpv/Makefile @@ -7,7 +7,7 @@ INCS= dpv.h 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 diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile index e549ac15c000..28014feafab7 100644 --- a/lib/libedit/Makefile +++ b/lib/libedit/Makefile @@ -13,7 +13,7 @@ SHLIBDIR?= /lib 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 \ diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 15dc0af01f0b..09136d360a71 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -29,7 +29,7 @@ CFLAGS+= -DINET6 CFLAGS+= -I${TELNETDIR} CFLAGS+= -I${TELNETDIR}/telnet -LIBADD= telnet util ncursesw +LIBADD= telnet util tinfow .if ${MK_OPENSSL} != "no" SRCS+= authenc.c diff --git a/sbin/ipf/ipfstat/Makefile b/sbin/ipf/ipfstat/Makefile index 4714f2c0394e..80c2e89a2c88 100644 --- a/sbin/ipf/ipfstat/Makefile +++ b/sbin/ipf/ipfstat/Makefile @@ -6,6 +6,6 @@ PACKAGE= ipf PROG= ipfstat SRCS= ipfstat.c MAN= ipfstat.8 -LIBADD+= ncursesw +LIBADD+= tinfow ncursesw .include <bsd.prog.mk> diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 77f32c8cecb1..e014e12cb3c9 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -274,7 +274,7 @@ _DP_ssh= crypto crypt z .if ${MK_LDNS} != "no" _DP_ssh+= ldns .endif -_DP_edit= ncursesw +_DP_edit= tinfow .if ${MK_OPENSSL} != "no" _DP_bsnmp= crypto .endif @@ -324,8 +324,8 @@ _DP_fetch= md .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 diff --git a/tools/tools/ath/athratestats/Makefile b/tools/tools/ath/athratestats/Makefile index ccf04ebd8da0..c924370a31e7 100644 --- a/tools/tools/ath/athratestats/Makefile +++ b/tools/tools/ath/athratestats/Makefile @@ -7,7 +7,7 @@ PROG= athratestats SRCS= main.c opt_ah.h ah_osdep.h -LIBADD+= ncursesw +LIBADD+= tinfow ncursesw CLEANFILES+= opt_ah.h ah_osdep.h diff --git a/tools/tools/net80211/stumbler/Makefile b/tools/tools/net80211/stumbler/Makefile index e840be7446ce..614fc6064cb8 100644 --- a/tools/tools/net80211/stumbler/Makefile +++ b/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= diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 8e95ccc07f04..7e6743133835 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -104,7 +104,7 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) LIBADD+= execinfo -LIBADD+= ncursesw +LIBADD+= tinfow .endif LIBADD+= pthread LIBADD+= z diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index 28e0c4ce7260..56aa4e565ffb 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -41,6 +41,7 @@ TGHDRS+= ${INCFILE} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} +LIBADD+= tinfow LIBADD+= edit LIBADD+= execinfo LIBADD+= lua diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index c309559b06e7..8a2c247688aa 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -34,12 +34,13 @@ TGHDRS+= ${INCFILE} 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 diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index 56698c4138d3..3a708805d3ea 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -24,7 +24,7 @@ PACKAGE= clang .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) LIBADD+= execinfo -LIBADD+= ncursesw +LIBADD+= tinfow .endif LIBADD+= pthread diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile index c30a510a510c..d18c58191222 100644 --- a/usr.bin/ee/Makefile +++ b/usr.bin/ee/Makefile @@ -9,7 +9,7 @@ PACKAGE=ee 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 diff --git a/usr.bin/grdc/Makefile b/usr.bin/grdc/Makefile index d12277df8466..4ea181508b45 100644 --- a/usr.bin/grdc/Makefile +++ b/usr.bin/grdc/Makefile @@ -2,6 +2,6 @@ PROG= grdc MAN= grdc.6 -LIBADD= ncursesw +LIBADD= tinfow ncursesw .include <bsd.prog.mk> diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile index 08c5249598f9..630750c3e117 100644 --- a/usr.bin/less/Makefile +++ b/usr.bin/less/Makefile @@ -9,7 +9,7 @@ SRCS= main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c cvt.c \ 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 \ diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile index 3af95c31ea0d..7dbf9ff149be 100644 --- a/usr.bin/msgs/Makefile +++ b/usr.bin/msgs/Makefile @@ -3,6 +3,6 @@ PROG= msgs -LIBADD= ncursesw +LIBADD= tinfow .include <bsd.prog.mk> diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile index 8cfd9b1c62e0..e6bcf4232b8a 100644 --- a/usr.bin/ncal/Makefile +++ b/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 diff --git a/usr.bin/ncurses/Makefile b/usr.bin/ncurses/Makefile index cd8344aa1a97..33e8794aa0e5 100644 --- a/usr.bin/ncurses/Makefile +++ b/usr.bin/ncurses/Makefile @@ -15,10 +15,10 @@ SRCS.clear= clear.c clear_cmd.c tty_settings.c 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 diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile index ca3f7ed72ce4..01cd36877101 100644 --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -16,6 +16,6 @@ CFLAGS+= -DINET6 WARNS?= 1 -LIBADD= ncursesw m devstat kvm util +LIBADD= tinfow ncursesw m devstat kvm util .include <bsd.prog.mk> diff --git a/usr.bin/tabs/Makefile b/usr.bin/tabs/Makefile index f8c085bfbe80..a67780a2a365 100644 --- a/usr.bin/tabs/Makefile +++ b/usr.bin/tabs/Makefile @@ -2,6 +2,6 @@ PROG= tabs -LIBADD= ncursesw +LIBADD= tinfow .include <bsd.prog.mk> diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile index f595be8839c4..ba5692c4196b 100644 --- a/usr.bin/talk/Makefile +++ b/usr.bin/talk/Makefile @@ -5,6 +5,6 @@ PROG= talk 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> diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 33c8b9cba193..91b88f592b66 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -21,7 +21,7 @@ CFLAGS+= -DINET6 WARNS?= 2 -LIBADD= telnet ncursesw +LIBADD= telnet tinfow CFLAGS+= -DIPSEC LIBADD+= ipsec diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile index d11b91273b50..c4a3aca3dd62 100644 --- a/usr.bin/top/Makefile +++ b/usr.bin/top/Makefile @@ -7,5 +7,5 @@ SRCS= commands.c display.c machine.c screen.c top.c \ 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> diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile index 817f07ba14cb..9418dee7529d 100644 --- a/usr.bin/ul/Makefile +++ b/usr.bin/ul/Makefile @@ -3,6 +3,6 @@ PROG= ul -LIBADD= ncursesw +LIBADD= tinfow .include <bsd.prog.mk> diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index 5769a34c6d2e..4449982f118c 100644 --- a/usr.bin/vi/Makefile +++ b/usr.bin/vi/Makefile @@ -35,7 +35,7 @@ MLINKS+=vi.1 nex.1 vi.1 nview.1 vi.1 nvi.1 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 diff --git a/usr.sbin/gstat/Makefile b/usr.sbin/gstat/Makefile index 1c71f2285622..fcf90fa3b130 100644 --- a/usr.sbin/gstat/Makefile +++ b/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> diff --git a/usr.sbin/pmc/Makefile b/usr.sbin/pmc/Makefile index b67641de9f62..8f026f131a8b 100644 --- a/usr.sbin/pmc/Makefile +++ b/usr.sbin/pmc/Makefile @@ -14,7 +14,7 @@ CFLAGS+= -I${SRCTOP}/lib/libpmcstat # 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 \ diff --git a/usr.sbin/pmcstat/Makefile b/usr.sbin/pmcstat/Makefile index fa3c8948a7f9..5d938677306c 100644 --- a/usr.sbin/pmcstat/Makefile +++ b/usr.sbin/pmcstat/Makefile @@ -6,7 +6,7 @@ PROG_CXX= pmcstat 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 \ diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile index e3d7526838a1..7274b7680ca9 100644 --- a/usr.sbin/tzsetup/Makefile +++ b/usr.sbin/tzsetup/Makefile @@ -10,7 +10,7 @@ CFLAGS+= -I. .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> diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile index 981aec0a4749..215ff61e9004 100644 --- a/usr.sbin/watch/Makefile +++ b/usr.sbin/watch/Makefile @@ -5,6 +5,6 @@ MAN= watch.8 WARNS?= 2 -LIBADD= ncursesw +LIBADD= tinfow .include <bsd.prog.mk> _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
