Index: Makefile.inc1 =================================================================== --- Makefile.inc1 +++ Makefile.inc1 @@ -2463,7 +2463,6 @@ ${LOCAL_TOOL_DIRS} \ ${_jevents} \ lib/ncurses/ncurses \ - lib/ncurses/ncursesw \ ${_rescue} \ ${_share} \ usr.bin/awk \ @@ -2843,7 +2842,7 @@ lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \ lib/libzstd \ ${_lib_casper} \ - lib/ncurses/ncurses lib/ncurses/ncursesw \ + lib/ncurses/ncurses \ lib/libopie lib/libpam/libpam ${_lib_libthr} \ ${_lib_libradius} lib/libsbuf lib/libtacplus \ lib/libgeom \ @@ -2865,7 +2864,7 @@ .if ${MK_DIALOG} != "no" _prebuild_libs+= gnu/lib/libdialog -gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L +gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncurses__L .endif .if ${MK_LIBCPLUSPLUS} != "no" Index: Makefile.libcompat =================================================================== --- Makefile.libcompat +++ Makefile.libcompat @@ -46,7 +46,7 @@ _LC_INCDIRS= \ include \ - lib/ncurses/ncursesw \ + lib/ncurses/ncurses \ ${_LC_LIBDIRS.yes} .if ${MK_FILE} != "no" @@ -95,7 +95,7 @@ DIRPRFX=${_dir}/ ${_t} .endfor .endfor -.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw ${_libmagic} ${_jevents} +.for _dir in lib/ncurses/ncurses ${_libmagic} ${_jevents} .for _t in ${_obj} build-tools ${_+_}cd ${.CURDIR}/${_dir}; \ WORLDTMP=${WORLDTMP} \ Index: bin/csh/Makefile =================================================================== --- bin/csh/Makefile +++ bin/csh/Makefile @@ -48,7 +48,7 @@ # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -LIBADD= termcapw crypt +LIBADD= termcap crypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh Index: bin/ls/Makefile =================================================================== --- bin/ls/Makefile +++ bin/ls/Makefile @@ -10,7 +10,7 @@ .if ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -LIBADD+= termcapw +LIBADD+= termcap .endif HAS_TESTS= 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= ncurses m CFLAGS+= -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused .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 ncurses m CFLAGS+= -I${.CURDIR} -I${DIALOG} .PATH: ${DIALOG} Index: gnu/usr.bin/gdb/gdb/Makefile =================================================================== --- gnu/usr.bin/gdb/gdb/Makefile +++ gnu/usr.bin/gdb/gdb/Makefile @@ -14,7 +14,7 @@ DPADD= ${GDBLIBS} ${BULIBS} LDADD= ${GDBLIBS} ${BULIBS} -LIBADD+= m edit ncursesw gnuregex +LIBADD+= m edit ncurses gnuregex .include CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\" Index: gnu/usr.bin/gdb/kgdb/Makefile =================================================================== --- gnu/usr.bin/gdb/kgdb/Makefile +++ gnu/usr.bin/gdb/kgdb/Makefile @@ -11,6 +11,6 @@ DPADD= ${GDBLIBS} ${BULIBS} LDADD= ${GDBLIBS} ${BULIBS} -LIBADD+= m edit ncursesw gnuregex kvm +LIBADD+= m edit ncurses gnuregex kvm .include 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 ncurses 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= ncurses 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,13 +1,11 @@ # $FreeBSD$ -SUBDIR= ncurses form menu panel \ - ncursesw formw menuw panelw +SUBDIR= ncurses form menu panel SUBDIR_PARALLEL= -.for subdir in ${SUBDIR:Nncurses*:N*w} +.for subdir in ${SUBDIR:Nncurses*:N*} SUBDIR_DEPEND_${subdir}= ncurses -SUBDIR_DEPEND_${subdir}w= ncursesw .endfor .include Index: lib/ncurses/config.mk =================================================================== --- lib/ncurses/config.mk +++ lib/ncurses/config.mk @@ -4,20 +4,14 @@ NCURSES_DIR= ${SRCTOP}/contrib/ncurses -.if defined(ENABLE_WIDEC) -LIB_SUFFIX= w CFLAGS+= -D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC NCURSES_CFG_H= ${.CURDIR:H}/ncurses/ncurses_cfg.h -.else -LIB_SUFFIX= -NCURSES_CFG_H= ${.CURDIR}/ncurses_cfg.h -.endif CFLAGS+= -I. -.if exists(${.OBJDIR:H}/ncurses${LIB_SUFFIX}) -CFLAGS+= -I${.OBJDIR:H}/ncurses${LIB_SUFFIX} +.if exists(${.OBJDIR:H}/ncurses) +CFLAGS+= -I${.OBJDIR:H}/ncurses .endif -CFLAGS+= -I${.CURDIR:H}/ncurses${LIB_SUFFIX} +CFLAGS+= -I${.CURDIR:H}/ncurses # for ${NCURSES_CFG_H} CFLAGS+= -I${.CURDIR:H}/ncurses Index: lib/ncurses/form/Makefile =================================================================== --- lib/ncurses/form/Makefile +++ lib/ncurses/form/Makefile @@ -56,7 +56,6 @@ LIBADD+= ncurses${LIB_SUFFIX} -.if defined(ENABLE_WIDEC) INCS= form.h .PATH: ${NCURSES_DIR}/man @@ -156,9 +155,6 @@ form_win.3 scale_form.3 \ form_win.3 set_form_sub.3 \ form_win.3 set_form_win.3 -.else -MAN= -.endif .include Index: lib/ncurses/formw/Makefile =================================================================== --- lib/ncurses/formw/Makefile +++ lib/ncurses/formw/Makefile @@ -1,5 +0,0 @@ -# $FreeBSD$ - -ENABLE_WIDEC= - -.include "${.CURDIR:H}/form/Makefile" Index: lib/ncurses/formw/Makefile.depend =================================================================== --- lib/ncurses/formw/Makefile.depend +++ lib/ncurses/formw/Makefile.depend @@ -1,18 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - lib/ncurses/ncursesw \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif Index: lib/ncurses/menu/Makefile =================================================================== --- lib/ncurses/menu/Makefile +++ lib/ncurses/menu/Makefile @@ -42,7 +42,6 @@ LIBADD+= ncurses${LIB_SUFFIX} -.if defined(ENABLE_WIDEC) INCS= menu.h eti.h .PATH: ${NCURSES_DIR}/man @@ -128,9 +127,6 @@ mitem_value.3 item_value.3 \ mitem_value.3 set_item_value.3 \ mitem_visible.3 item_visible.3 -.else -MAN= -.endif .include Index: lib/ncurses/menuw/Makefile =================================================================== --- lib/ncurses/menuw/Makefile +++ lib/ncurses/menuw/Makefile @@ -1,5 +0,0 @@ -# $FreeBSD$ - -ENABLE_WIDEC= - -.include "${.CURDIR:H}/menu/Makefile" Index: lib/ncurses/menuw/Makefile.depend =================================================================== --- lib/ncurses/menuw/Makefile.depend +++ lib/ncurses/menuw/Makefile.depend @@ -1,18 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - lib/ncurses/ncursesw \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif Index: lib/ncurses/ncurses/Makefile =================================================================== --- lib/ncurses/ncurses/Makefile +++ lib/ncurses/ncurses/Makefile @@ -3,11 +3,6 @@ PACKAGE= clibs SHLIBDIR?= /lib -.if !defined(ENABLE_WIDEC) -# Override any MAN= setting below.. -MK_MAN=no -.endif - .include .include "${.CURDIR:H}/config.mk" @@ -22,15 +17,9 @@ NCURSES_PATCH!= egrep 'NCURSES_PATCH[ ]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%' # From autoconf (!) -.if defined(ENABLE_WIDEC) NCURSES_CH_T= cchar_t NCURSES_OK_WCHAR_T= 1 NEED_WCHAR_H= 1 -.else -NCURSES_CH_T= chtype -NCURSES_OK_WCHAR_T= -NEED_WCHAR_H= 0 -.endif NCURSES_CONST= const NCURSES_EXT_COLORS= 0 NCURSES_EXT_FUNCS= 1 @@ -229,7 +218,6 @@ lib_vidattr.c \ tty_update.c -.if defined(ENABLE_WIDEC) .PATH: ${NCURSES_DIR}/ncurses/widechar SRCS+= \ charable.c \ @@ -252,7 +240,6 @@ lib_vline_set.c \ lib_wacs.c \ lib_wunctrl.c -.endif .PATH: ${NCURSES_DIR}/ncurses/trace SRCS+= \ @@ -285,10 +272,8 @@ SRCHDRS= ncurses_dll.h CLEANFILES+= ncurses_dll.h -.if defined(ENABLE_WIDEC) INCS= ${HEADERS} ${SRCHDRS} INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h -.endif .if ${MK_INSTALLLIB} != "no" SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libcurses${LIB_SUFFIX}.a @@ -310,17 +295,13 @@ SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtinfo${LIB_SUFFIX}_p.a .endif -.if ${.CURDIR:T} == "ncursesw" -.if defined(ENABLE_WIDEC) DOCSDIR= ${SHAREDIR}/doc/ncurses DOCS= ncurses-intro.html hackguide.html -.endif .if ${MK_HTML} != "no" .PATH: ${NCURSES_DIR}/doc/html FILESGROUPS= DOCS .endif -.endif # Generated source .ORDER: names.c codes.c @@ -377,9 +358,7 @@ cat curses.head > $@.new AWK=${AWK} _POSIX2_VERSION=199209 sh ${NCURSES_DIR}/include/MKkey_defs.sh \ ${NCURSES_DIR}/include/Caps >> $@.new -.if defined(ENABLE_WIDEC) cat ${NCURSES_DIR}/include/curses.wide >> $@.new -.endif cat ${NCURSES_DIR}/include/curses.tail >> $@.new mv -f $@.new $@ @@ -480,7 +459,6 @@ CLEANFILES+= terminfo.5 -.if defined(ENABLE_WIDEC) .PATH: ${NCURSES_DIR}/man MAN= \ curs_addch.3 \ @@ -559,7 +537,6 @@ MAN+= term.5 terminfo.5 MAN+= term.7 -.endif CLEANFILES+= ${MAN:M*.3} @@ -1039,7 +1016,6 @@ resizeterm.3 is_term_resized.3 \ resizeterm.3 resize_term.3 -.if defined(ENABLE_WIDEC) MLINKS+=curs_add_wch.3 add_wch.3 \ curs_add_wch.3 echo_wchar.3 \ curs_add_wch.3 mvadd_wch.3 \ @@ -1119,7 +1095,6 @@ curs_scanw.3 vw_scanw.3 \ curs_scanw.3 vwscanw.3 \ curs_scanw.3 wscanw.3 -.endif .include Index: lib/ncurses/ncursesw/Makefile =================================================================== --- lib/ncurses/ncursesw/Makefile +++ lib/ncurses/ncursesw/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -ENABLE_WIDEC= - -.PATH: ${.CURDIR:H}/ncurses - -.include "${.CURDIR:H}/ncurses/Makefile" Index: lib/ncurses/ncursesw/Makefile.depend =================================================================== --- lib/ncurses/ncursesw/Makefile.depend +++ lib/ncurses/ncursesw/Makefile.depend @@ -1,17 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif Index: lib/ncurses/panel/Makefile =================================================================== --- lib/ncurses/panel/Makefile +++ lib/ncurses/panel/Makefile @@ -31,7 +31,6 @@ LIBADD+= ncurses${LIB_SUFFIX} -.if defined(ENABLE_WIDEC) INCS= panel.h # generate MAN @@ -56,10 +55,7 @@ panel.3 show_panel.3 \ panel.3 top_panel.3 \ panel.3 update_panels.3 -.else -MAN= -.endif - + .include # Keep the .SUFFIXES line after the include of bsd.lib.mk Index: lib/ncurses/panelw/Makefile =================================================================== --- lib/ncurses/panelw/Makefile +++ lib/ncurses/panelw/Makefile @@ -1,5 +0,0 @@ -# $FreeBSD$ - -ENABLE_WIDEC= - -.include "${.CURDIR:H}/panel/Makefile" Index: lib/ncurses/panelw/Makefile.depend =================================================================== --- lib/ncurses/panelw/Makefile.depend +++ lib/ncurses/panelw/Makefile.depend @@ -1,18 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - lib/ncurses/ncursesw \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif Index: libexec/telnetd/Makefile =================================================================== --- libexec/telnetd/Makefile +++ libexec/telnetd/Makefile @@ -27,7 +27,7 @@ CFLAGS+= -I${TELNETDIR} CFLAGS+= -I${TELNETDIR}/telnet -LIBADD= telnet util ncursesw +LIBADD= telnet util ncurses .if ${MK_OPENSSL} != "no" SRCS+= authenc.c Index: rescue/rescue/Makefile =================================================================== --- rescue/rescue/Makefile +++ rescue/rescue/Makefile @@ -55,7 +55,7 @@ ed expr getfacl hostname kenv kill ln ls mkdir mv \ pkill ps pwd realpath rm rmdir setfacl sh sleep stty \ sync test -CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -ll -ltermcapw -lutil -lxo +CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -ll -ltermcap -lutil -lxo CRUNCH_BUILDTOOLS+= bin/sh # Additional options for specific programs @@ -126,7 +126,7 @@ # crunchgen does not like C++ programs; this should be fixed someday # CRUNCH_PROGS+= devd -CRUNCH_LIBS+= -l80211 -lalias -lcam -lncursesw -ldevstat -lipsec -llzma +CRUNCH_LIBS+= -l80211 -lalias -lcam -lncurses -ldevstat -lipsec -llzma .if ${MK_ZFS} != "no" CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem CRUNCH_LIBS+= -lbe 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+= ncurses .include Index: share/mk/bsd.libnames.mk =================================================================== --- share/mk/bsd.libnames.mk +++ share/mk/bsd.libnames.mk @@ -105,7 +105,6 @@ LIBMP?= ${LIBDESTDIR}${LIBDIR_BASE}/libmp.a LIBMT?= ${LIBDESTDIR}${LIBDIR_BASE}/libmt.a LIBNCURSES?= ${LIBDESTDIR}${LIBDIR_BASE}/libncurses.a -LIBNCURSESW?= ${LIBDESTDIR}${LIBDIR_BASE}/libncursesw.a LIBNETGRAPH?= ${LIBDESTDIR}${LIBDIR_BASE}/libnetgraph.a LIBNGATM?= ${LIBDESTDIR}${LIBDIR_BASE}/libngatm.a LIBNV?= ${LIBDESTDIR}${LIBDIR_BASE}/libnv.a @@ -117,7 +116,6 @@ LIBOSMVENDOR?= ${LIBDESTDIR}${LIBDIR_BASE}/libosmvendor.a LIBPAM?= ${LIBDESTDIR}${LIBDIR_BASE}/libpam.a LIBPANEL?= ${LIBDESTDIR}${LIBDIR_BASE}/libpanel.a -LIBPANELW?= ${LIBDESTDIR}${LIBDIR_BASE}/libpanelw.a LIBPCAP?= ${LIBDESTDIR}${LIBDIR_BASE}/libpcap.a LIBPJDLOG?= ${LIBDESTDIR}${LIBDIR_BASE}/libpjdlog.a LIBPMC?= ${LIBDESTDIR}${LIBDIR_BASE}/libpmc.a @@ -143,7 +141,6 @@ LIBSYSDECODE?= ${LIBDESTDIR}${LIBDIR_BASE}/libsysdecode.a LIBTACPLUS?= ${LIBDESTDIR}${LIBDIR_BASE}/libtacplus.a 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" LIBUFS?= ${LIBDESTDIR}${LIBDIR_BASE}/libufs.a Index: share/mk/src.libnames.mk =================================================================== --- share/mk/src.libnames.mk +++ share/mk/src.libnames.mk @@ -135,7 +135,6 @@ mp \ mt \ ncurses \ - ncursesw \ netgraph \ ngatm \ nv \ @@ -144,7 +143,6 @@ opie \ pam \ panel \ - panelw \ pcap \ pcsclite \ pjdlog \ @@ -171,7 +169,6 @@ sysdecode \ tacplus \ termcap \ - termcapw \ ufs \ ugidfw \ ulog \ @@ -248,7 +245,7 @@ .if ${MK_LDNS} != "no" _DP_ssh+= ldns .endif -_DP_edit= ncursesw +_DP_edit= ncurses .if ${MK_OPENSSL} != "no" _DP_bsnmp= crypto .endif @@ -300,8 +297,8 @@ .endif _DP_execinfo= elf _DP_dwarf= elf -_DP_dpv= dialog figpar util ncursesw -_DP_dialog= ncursesw m +_DP_dpv= dialog figpar util ncurses +_DP_dialog= ncurses m _DP_cuse= pthread _DP_atf_cxx= atf_c _DP_gtest= pthread @@ -351,7 +348,6 @@ _DP_stdthreads= pthread _DP_tacplus= md _DP_panel= ncurses -_DP_panelw= ncursesw _DP_rpcsec_gss= gssapi _DP_smb= kiconv _DP_ulog= md @@ -607,13 +603,9 @@ LIBPTHREADDIR= ${OBJTOP}/lib/libthr LIBMDIR= ${OBJTOP}/lib/msun LIBFORMDIR= ${OBJTOP}/lib/ncurses/form -LIBFORMLIBWDIR= ${OBJTOP}/lib/ncurses/formw LIBMENUDIR= ${OBJTOP}/lib/ncurses/menu -LIBMENULIBWDIR= ${OBJTOP}/lib/ncurses/menuw LIBNCURSESDIR= ${OBJTOP}/lib/ncurses/ncurses -LIBNCURSESWDIR= ${OBJTOP}/lib/ncurses/ncursesw LIBPANELDIR= ${OBJTOP}/lib/ncurses/panel -LIBPANELWDIR= ${OBJTOP}/lib/ncurses/panelw LIBCRYPTODIR= ${OBJTOP}/secure/lib/libcrypto LIBSSHDIR= ${OBJTOP}/secure/lib/libssh LIBSSLDIR= ${OBJTOP}/secure/lib/libssl @@ -622,7 +614,6 @@ LIBLNDIR= ${OBJTOP}/usr.bin/lex/lib LIBTERMCAPDIR= ${LIBNCURSESDIR} -LIBTERMCAPWDIR= ${LIBNCURSESWDIR} # Default other library directories to lib/libNAME. .for lib in ${_LIBRARIES} Index: sys/teken/demo/Makefile =================================================================== --- sys/teken/demo/Makefile +++ sys/teken/demo/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= teken_demo -LDADD= -lncursesw -lteken -lutil +LDADD= -lncurses -lteken -lutil MAN= WARNS?= 6 Index: tools/bsdbox/Makefile =================================================================== --- tools/bsdbox/Makefile +++ tools/bsdbox/Makefile @@ -57,7 +57,7 @@ # statically - and that ends very badly. CRUNCH_SHLIBS+= -lc -lutil -lcrypt -lxo -lgpio CRUNCH_LIBS+= -lkvm -lmemstat -lnetgraph -CRUNCH_LIBS+= -lcrypt -ledit -ll -ltermcapw +CRUNCH_LIBS+= -lcrypt -ledit -ll -ltermcap ################################################################### # Programs from standard /sbin Index: tools/bsdbox/Makefile.base =================================================================== --- tools/bsdbox/Makefile.base +++ tools/bsdbox/Makefile.base @@ -14,7 +14,7 @@ CRUNCH_PROGS_usr.bin+= vmstat #CRUNCH_PROGS_user.bin+= systat -CRUNCH_LIBS+= -ldevstat -lncursesw -lncurses -lmemstat -lkvm -lelf +CRUNCH_LIBS+= -ldevstat -lncurses -lmemstat -lkvm -lelf # CRUNCH_PROGS_usr.bin+= tar CRUNCH_PROGS_usr.bin+= cpio 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 ncurses CFLAGS=-g MAN= Index: usr.bin/clang/clang.prog.mk =================================================================== --- usr.bin/clang/clang.prog.mk +++ usr.bin/clang/clang.prog.mk @@ -18,7 +18,7 @@ PACKAGE= clang LIBADD+= execinfo -LIBADD+= ncursesw +LIBADD+= ncurses LIBADD+= pthread .include Index: usr.bin/clang/lld/Makefile =================================================================== --- usr.bin/clang/lld/Makefile +++ usr.bin/clang/lld/Makefile @@ -101,7 +101,7 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LIBADD+= execinfo -LIBADD+= ncursesw +LIBADD+= ncurses LIBADD+= pthread LIBADD+= z Index: usr.bin/clang/lldb/Makefile =================================================================== --- usr.bin/clang/lldb/Makefile +++ usr.bin/clang/lldb/Makefile @@ -39,7 +39,7 @@ LIBADD+= edit LIBADD+= execinfo LIBADD+= panel -LIBADD+= ncursesw +LIBADD+= ncurses LIBADD+= pthread LIBADD+= z Index: usr.bin/clang/llvm-objcopy/Makefile =================================================================== --- usr.bin/clang/llvm-objcopy/Makefile +++ usr.bin/clang/llvm-objcopy/Makefile @@ -47,7 +47,7 @@ PACKAGE= clang LIBADD+= execinfo -LIBADD+= ncursesw +LIBADD+= ncurses LIBADD+= pthread LIBADD+= z Index: usr.bin/clang/llvm.prog.mk =================================================================== --- usr.bin/clang/llvm.prog.mk +++ usr.bin/clang/llvm.prog.mk @@ -23,7 +23,7 @@ PACKAGE= clang LIBADD+= execinfo -LIBADD+= ncursesw +LIBADD+= ncurses LIBADD+= pthread .include 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= ncurses 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= ncurses .include Index: usr.bin/less/Makefile =================================================================== --- usr.bin/less/Makefile +++ usr.bin/less/Makefile @@ -8,7 +8,7 @@ signal.c tags.c ttyin.c version.c SCRIPTS=lesspipe.sh zless.sh SCRIPTSNAME_lesspipe.sh=lesspipe.sh -LIBADD= ncursesw +LIBADD= ncurses 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= ncurses .include Index: usr.bin/ncal/Makefile =================================================================== --- usr.bin/ncal/Makefile +++ usr.bin/ncal/Makefile @@ -4,7 +4,7 @@ PROG= ncal -LIBADD= calendar ncursesw +LIBADD= calendar ncurses LINKS= ${BINDIR}/ncal ${BINDIR}/cal MLINKS= ncal.1 cal.1 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= ncurses m devstat kvm util .include Index: usr.bin/tabs/Makefile =================================================================== --- usr.bin/tabs/Makefile +++ usr.bin/tabs/Makefile @@ -2,6 +2,6 @@ PROG= tabs -LIBADD= ncursesw +LIBADD= ncurses .include 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= ncurses .include Index: usr.bin/telnet/Makefile =================================================================== --- usr.bin/telnet/Makefile +++ usr.bin/telnet/Makefile @@ -19,7 +19,7 @@ WARNS?= 2 -LIBADD= telnet ncursesw +LIBADD= telnet ncurses 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= ncurses m kvm jail util sbuf .include Index: usr.bin/tput/Makefile =================================================================== --- usr.bin/tput/Makefile +++ usr.bin/tput/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= tput -LIBADD= ncursesw +LIBADD= ncurses SCRIPTS=clear.sh MLINKS= tput.1 clear.1 Index: usr.bin/tset/Makefile =================================================================== --- usr.bin/tset/Makefile +++ usr.bin/tset/Makefile @@ -4,7 +4,7 @@ PROG= tset SRCS= map.c misc.c set.c term.c tset.c wrterm.c -LIBADD= ncursesw +LIBADD= ncurses LINKS= ${BINDIR}/tset ${BINDIR}/reset MLINKS= tset.1 reset.1 Index: usr.bin/ul/Makefile =================================================================== --- usr.bin/ul/Makefile +++ usr.bin/ul/Makefile @@ -3,6 +3,6 @@ PROG= ul -LIBADD= ncursesw +LIBADD= ncurses .include Index: usr.bin/vi/Makefile =================================================================== --- usr.bin/vi/Makefile +++ usr.bin/vi/Makefile @@ -34,7 +34,7 @@ CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex -LIBADD= util ncursesw +LIBADD= util ncurses CFLAGS+= -DUSE_WIDECHAR .if ${MK_ICONV} == "yes" && !defined(RESCUE) 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 figpar ncurses dialog m WARNS?= 6 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 ncurses dialog m WARNS?= 6 MAN= Index: usr.sbin/bsdinstall/partedit/Makefile =================================================================== --- usr.sbin/bsdinstall/partedit/Makefile +++ usr.sbin/bsdinstall/partedit/Makefile @@ -5,7 +5,7 @@ LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart SYMLINKS= ../libexec/bsdinstall/partedit /usr/sbin/sade -LIBADD+= geom ncursesw util dialog m +LIBADD+= geom ncurses util dialog m PARTEDIT_ARCH= ${MACHINE} .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" 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 ncurses .include Index: usr.sbin/pmc/Makefile =================================================================== --- usr.sbin/pmc/Makefile +++ usr.sbin/pmc/Makefile @@ -10,7 +10,7 @@ CXXSTD= c++14 CWARNFLAGS.gcc+= -Wno-redundant-decls -LIBADD= kvm pmc m ncursesw pmcstat elf +LIBADD= kvm pmc m ncurses 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 @@ -5,7 +5,7 @@ PROG_CXX= pmcstat MAN= pmcstat.8 -LIBADD= kvm pmc m ncursesw pmcstat elf +LIBADD= kvm pmc m ncurses 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 WARNS?= 3 CFLAGS+= -I${SRCTOP}/contrib/dialog -DHAVE_DIALOG -LIBADD= dialog ncursesw +LIBADD= dialog ncurses .endif .include Index: usr.sbin/watch/Makefile =================================================================== --- usr.sbin/watch/Makefile +++ usr.sbin/watch/Makefile @@ -5,6 +5,6 @@ WARNS?= 2 -LIBADD= ncursesw +LIBADD= ncurses .include