Date: Thu, 15 May 2014 20:33:48 GMT From: Brooks Davis <brooks@freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/189842: exp-run: use only libncursesw Message-ID: <201405152033.s4FKXm1Q075913@freefall.freebsd.org> Resent-Message-ID: <201405152040.s4FKe0JK076421@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189842 >Category: ports >Synopsis: exp-run: use only libncursesw >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 15 20:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Brooks Davis >Release: FreeBSD 11.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD freefall.freebsd.org 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r265336: Sun May 4 20:43:08 UTC 2014 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64 >Description: The attached patch changes all the consumers of libncurses/libtermcap to use libncursesw/libtermcapw. In addition to applying this patch, it would be helpful if the script at http://people.freebsd.org/~brooks/stuff/check-ncurses.sh was integrated into the developer checks. It checks if any of it's arguments are linked against both libncurses and libncursesw as that's not expected to work reliably. If any files are doubly linked it returns 1. >How-To-Repeat: >Fix: Index: bin/csh/Makefile =================================================================== --- bin/csh/Makefile (revision 266142) +++ bin/csh/Makefile (working copy) @@ -40,8 +40,8 @@ # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBTERMCAP} ${LIBCRYPT} -LDADD= -ltermcap -lcrypt +DPADD= ${LIBTERMCAPW} ${LIBCRYPT} +LDADD= -ltermcapw -lcrypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh Index: bin/ls/Makefile =================================================================== --- bin/ls/Makefile (revision 266142) +++ bin/ls/Makefile (working copy) @@ -11,8 +11,8 @@ .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -DPADD+= ${LIBTERMCAP} -LDADD+= -ltermcap +DPADD+= ${LIBTERMCAPW} +LDADD+= -ltermcapw .endif .include <bsd.prog.mk> Index: bin/sh/Makefile =================================================================== --- bin/sh/Makefile (revision 266142) +++ bin/sh/Makefile (working copy) @@ -18,8 +18,8 @@ # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBEDIT} ${LIBTERMCAP} -LDADD= -ledit -ltermcap +DPADD= ${LIBEDIT} ${LIBTERMCAPW} +LDADD= -ledit -ltermcapw CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: Index: games/grdc/Makefile =================================================================== --- games/grdc/Makefile (revision 266142) +++ games/grdc/Makefile (working copy) @@ -2,7 +2,7 @@ PROG= grdc MAN= grdc.6 -DPADD= ${LIBNCURSES} -LDADD= -lncurses +DPADD= ${LIBNCURSESW} +LDADD= -lncursesw .include <bsd.prog.mk> Index: gnu/lib/libreadline/readline/Makefile =================================================================== --- gnu/lib/libreadline/readline/Makefile (revision 266142) +++ gnu/lib/libreadline/readline/Makefile (working copy) @@ -15,8 +15,8 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ rlstdc.h rlconf.h rltypedefs.h -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw INCSDIR=${INCLUDEDIR}/readline Index: gnu/usr.bin/gdb/gdb/Makefile =================================================================== --- gnu/usr.bin/gdb/gdb/Makefile (revision 266142) +++ gnu/usr.bin/gdb/gdb/Makefile (working copy) @@ -11,8 +11,9 @@ # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \ + ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcapw -lgnuregex .include <bsd.prog.mk> CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\" Index: gnu/usr.bin/gdb/gdbtui/Makefile =================================================================== --- gnu/usr.bin/gdb/gdbtui/Makefile (revision 266142) +++ gnu/usr.bin/gdb/gdbtui/Makefile (working copy) @@ -12,7 +12,8 @@ # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \ + ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcapw -lgnuregex .include <bsd.prog.mk> Index: gnu/usr.bin/gdb/kgdb/Makefile =================================================================== --- gnu/usr.bin/gdb/kgdb/Makefile (revision 266142) +++ gnu/usr.bin/gdb/kgdb/Makefile (working copy) @@ -8,9 +8,9 @@ ${OBJ_BU}/libiberty/libiberty.a GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a -DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} \ +DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \ ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm -lreadline -ltermcap \ +LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm -lreadline -ltermcapw \ -lgnuregex .if defined(GDB_CROSS_DEBUGGER) Index: gnu/usr.bin/texinfo/info/Makefile =================================================================== --- gnu/usr.bin/texinfo/info/Makefile (revision 266142) +++ gnu/usr.bin/texinfo/info/Makefile (working copy) @@ -10,8 +10,8 @@ CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\" -DPADD= ${LIBTERMCAP} ${LIBTXI} -LDADD= -ltermcap ${LIBTXI} +DPADD= ${LIBTERMCAPW} ${LIBTXI} +LDADD= -ltermcapw ${LIBTXI} .include <bsd.prog.mk> Index: kerberos5/usr.bin/kadmin/Makefile =================================================================== --- kerberos5/usr.bin/kadmin/Makefile (revision 266142) +++ kerberos5/usr.bin/kadmin/Makefile (working copy) @@ -29,11 +29,11 @@ DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \ ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBEDIT} ${LIBNCURSES} ${LDAPDPADD} + ${LIBEDIT} ${LIBNCURSESW} ${LDAPDPADD} LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \ ${LIBSL} -lroken ${LIBVERS} -lasn1 \ -lcrypto -lcrypt -lcom_err \ - -ledit -lncurses ${LDAPLDADD} + -ledit -lncursesw ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> Index: lib/libedit/Makefile =================================================================== --- lib/libedit/Makefile (revision 266142) +++ lib/libedit/Makefile (working copy) @@ -10,8 +10,8 @@ hist.c key.c map.c \ parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c -DPADD= ${LIBNCURSES} -LDADD= -lncurses +DPADD= ${LIBNCURSESW} +LDADD= -lncursesw MAN= editline.3 editrc.5 Index: libexec/telnetd/Makefile =================================================================== --- libexec/telnetd/Makefile (revision 266142) +++ libexec/telnetd/Makefile (working copy) @@ -28,8 +28,8 @@ LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} -LDADD= -lutil -ltermcap ${LIBTELNET} +DPADD= ${LIBUTIL} ${LIBTERMCAPW} ${LIBTELNET} +LDADD= -lutil -ltermcapw ${LIBTELNET} # XXX for src/release/picobsd .if !defined(RELEASE_CRUNCH) Index: rescue/rescue/Makefile =================================================================== --- rescue/rescue/Makefile (revision 266142) +++ rescue/rescue/Makefile (working copy) @@ -52,7 +52,7 @@ CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \ ed expr getfacl hostname kenv kill ln ls mkdir mv \ pkill ps pwd realpath rm rmdir setfacl sh stty sync test -CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcap -lutil +CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcapw -lutil CRUNCH_BUILDTOOLS+= bin/sh # Additional options for specific programs @@ -118,7 +118,7 @@ # crunchgen does not like C++ programs; this should be fixed someday # CRUNCH_PROGS+= devd -CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec +CRUNCH_LIBS+= -lalias -lcam -lncursesw -ldevstat -lipsec .if ${MK_ZFS} != "no" CRUNCH_LIBS+= -lavl -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem .endif Index: sbin/fsdb/Makefile =================================================================== --- sbin/fsdb/Makefile (revision 266142) +++ sbin/fsdb/Makefile (working copy) @@ -9,8 +9,8 @@ pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c CFLAGS+= -I${.CURDIR}/../fsck_ffs WARNS?= 2 -LDADD= -ledit -ltermcap -DPADD= ${LIBEDIT} ${LIBTERMCAP} +LDADD= -ledit -ltermcapw +DPADD= ${LIBEDIT} ${LIBTERMCAPW} .PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs .include <bsd.prog.mk> Index: sbin/gvinum/Makefile =================================================================== --- sbin/gvinum/Makefile (revision 266142) +++ sbin/gvinum/Makefile (working copy) @@ -7,8 +7,8 @@ WARNS?= 2 CFLAGS+= -I${.CURDIR}/../../sys -I${DESTDIR}/${INCLUDEDIR}/edit -DPADD= ${LIBEDIT} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} -LDADD= -ledit -ltermcap -ldevstat -lkvm -lgeom +DPADD= ${LIBEDIT} ${LIBTERMCAPW} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} +LDADD= -ledit -ltermcapw -ldevstat -lkvm -lgeom .PATH: ${.CURDIR}/../../sys/geom/vinum Index: secure/usr.bin/sftp/Makefile =================================================================== --- secure/usr.bin/sftp/Makefile (revision 266142) +++ secure/usr.bin/sftp/Makefile (working copy) @@ -11,8 +11,8 @@ SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} ${LIBEDIT} ${LIBNCURSES} -LDADD= -lssh -ledit -lncurses +DPADD= ${LIBSSH} ${LIBEDIT} ${LIBNCURSESW} +LDADD= -lssh -ledit -lncursesw USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" Index: tools/bsdbox/Makefile =================================================================== --- tools/bsdbox/Makefile (revision 266142) +++ tools/bsdbox/Makefile (working copy) @@ -57,7 +57,7 @@ # statically - and that ends very badly. CRUNCH_SHLIBS+= -lc -lutil -lcrypt CRUNCH_LIBS+= -lkvm -lmemstat -lnetgraph -CRUNCH_LIBS+= -lcrypt -ledit -ll -ltermcap +CRUNCH_LIBS+= -lcrypt -ledit -ll -ltermcapw ################################################################### # Programs from standard /sbin @@ -70,7 +70,7 @@ # CRUNCH_SRCDIRS+= sbin -CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec +CRUNCH_LIBS+= -lalias -lcam -lcursesw -ldevstat -lipsec # Don't forget this - ifconfig, etc -adrian CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lsbuf -lufs Index: tools/tools/net80211/stumbler/Makefile =================================================================== --- tools/tools/net80211/stumbler/Makefile (revision 266142) +++ tools/tools/net80211/stumbler/Makefile (working copy) @@ -2,8 +2,8 @@ PROG= stumbler BINDIR= /usr/local/bin -DPADD= ${LIBPCAP} ${LIBNCURSES} -LDADD= -lpcap -lncurses +DPADD= ${LIBPCAP} ${LIBNCURSESW} +LDADD= -lpcap -lncursesw CFLAGS=-g MAN= Index: usr.bin/clang/clang.prog.mk =================================================================== --- usr.bin/clang/clang.prog.mk (revision 266142) +++ usr.bin/clang/clang.prog.mk (working copy) @@ -9,8 +9,8 @@ LDADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a .endfor -DPADD+= ${LIBNCURSES} -LDADD+= -lncurses +DPADD+= ${LIBNCURSESW} +LDADD+= -lncursesw BINDIR?= /usr/bin Index: usr.bin/ee/Makefile =================================================================== --- usr.bin/ee/Makefile (revision 266142) +++ usr.bin/ee/Makefile (working copy) @@ -8,8 +8,8 @@ PROG= ee LINKS= ${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit MLINKS= ee.1 ree.1 ee.1 edit.1 -DPADD= ${LIBNCURSES} -LDADD= -lncurses +DPADD= ${LIBNCURSESW} +LDADD= -lncursesw WARNS?= 2 Index: usr.bin/ftp/Makefile =================================================================== --- usr.bin/ftp/Makefile (revision 266142) +++ usr.bin/ftp/Makefile (working copy) @@ -20,8 +20,8 @@ .endif CFLAGS+= -I${.CURDIR} -I${TNFTP} -LDADD= -ledit -ltermcap -lutil -DPADD= ${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL} +LDADD= -ledit -ltermcapw -lutil +DPADD= ${LIBEDIT} ${LIBTERMCAPW} ${LIBUTIL} WARNS?= 2 Index: usr.bin/less/Makefile =================================================================== --- usr.bin/less/Makefile (revision 266142) +++ usr.bin/less/Makefile (working copy) @@ -8,8 +8,8 @@ signal.c tags.c ttyin.c version.c SCRIPTS=lesspipe.sh zless.sh SCRIPTSNAME_lesspipe.sh=lesspipe.sh -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw LINKS= ${BINDIR}/less ${BINDIR}/more \ ${BINDIR}/zless ${BINDIR}/bzless \ ${BINDIR}/zless ${BINDIR}/xzless \ Index: usr.bin/msgs/Makefile =================================================================== --- usr.bin/msgs/Makefile (revision 266142) +++ usr.bin/msgs/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= msgs -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include <bsd.prog.mk> Index: usr.bin/ncal/Makefile =================================================================== --- usr.bin/ncal/Makefile (revision 266142) +++ usr.bin/ncal/Makefile (working copy) @@ -4,8 +4,8 @@ PROG= ncal -DPADD= ${LIBCALENDAR} ${LIBTERMCAP} -LDADD= -lcalendar -ltermcap +DPADD= ${LIBCALENDAR} ${LIBTERMCAPW} +LDADD= -lcalendar -ltermcapw LINKS= ${BINDIR}/ncal ${BINDIR}/cal MLINKS= ncal.1 cal.1 Index: usr.bin/tabs/Makefile =================================================================== --- usr.bin/tabs/Makefile (revision 266142) +++ usr.bin/tabs/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= tabs -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include <bsd.prog.mk> Index: usr.bin/telnet/Makefile =================================================================== --- usr.bin/telnet/Makefile (revision 266142) +++ usr.bin/telnet/Makefile (working copy) @@ -21,8 +21,8 @@ LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -DPADD= ${LIBTERMCAP} ${LIBTELNET} -LDADD= -ltermcap ${LIBTELNET} +DPADD= ${LIBTERMCAPW} ${LIBTELNET} +LDADD= -ltermcapw ${LIBTELNET} .if !defined(RELEASE_CRUNCH) CFLAGS+= -DIPSEC Index: usr.bin/tftp/Makefile =================================================================== --- usr.bin/tftp/Makefile (revision 266142) +++ usr.bin/tftp/Makefile (working copy) @@ -7,7 +7,7 @@ SRCS= main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c SRCS+= tftp-utils.c tftp.c CFLAGS+=-I${.CURDIR}/../../libexec/tftpd -DPADD= ${LIBEDIT} ${LIBTERMCAP} -LDADD= -ledit -ltermcap +DPADD= ${LIBEDIT} ${LIBTERMCAPW} +LDADD= -ledit -ltermcapw .include <bsd.prog.mk> Index: usr.bin/tput/Makefile =================================================================== --- usr.bin/tput/Makefile (revision 266142) +++ usr.bin/tput/Makefile (working copy) @@ -2,8 +2,8 @@ # $FreeBSD$ PROG= tput -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw SCRIPTS=clear.sh MLINKS= tput.1 clear.1 Index: usr.bin/tset/Makefile =================================================================== --- usr.bin/tset/Makefile (revision 266142) +++ usr.bin/tset/Makefile (working copy) @@ -3,8 +3,8 @@ PROG= tset SRCS= map.c misc.c set.c term.c tset.c wrterm.c -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw LINKS= ${BINDIR}/tset ${BINDIR}/reset MLINKS= tset.1 reset.1 Index: usr.bin/ul/Makefile =================================================================== --- usr.bin/ul/Makefile (revision 266142) +++ usr.bin/ul/Makefile (working copy) @@ -3,7 +3,7 @@ PROG= ul -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include <bsd.prog.mk> Index: usr.bin/units/Makefile =================================================================== --- usr.bin/units/Makefile (revision 266142) +++ usr.bin/units/Makefile (working copy) @@ -4,7 +4,7 @@ FILES= units.lib FILESDIR= ${SHAREDIR}/misc -LDADD+=-ledit -ltermcap -DPADD+=${LIBEDIT} ${LIBTERMCAP} +LDADD+=-ledit -ltermcapw +DPADD+=${LIBEDIT} ${LIBTERMCAPW} .include <bsd.prog.mk> Index: usr.bin/vi/Makefile =================================================================== --- usr.bin/vi/Makefile (revision 266157) +++ usr.bin/vi/Makefile (working copy) @@ -36,14 +36,9 @@ DPADD= ${LIBUTIL} LDADD= -lutil -.if defined(RESCUE) || defined(RELEASE_CRUNCH) -DPADD+= ${LIBNCURSES} -LDADD+= -lncurses -.else CFLAGS+= -DUSE_WIDECHAR DPADD+= ${LIBNCURSESW} LDADD+= -lncursesw -.endif .if ${MK_ICONV} == "yes" && !defined(RESCUE) && !defined(RELEASE_CRUNCH) CFLAGS+= -DUSE_ICONV Index: usr.sbin/cdcontrol/Makefile =================================================================== --- usr.sbin/cdcontrol/Makefile (revision 266142) +++ usr.sbin/cdcontrol/Makefile (working copy) @@ -2,7 +2,7 @@ PROG= cdcontrol -DPADD= ${LIBEDIT} ${LIBTERMCAP} -LDADD= -ledit -ltermcap +DPADD= ${LIBEDIT} ${LIBTERMCAPW} +LDADD= -ledit -ltermcapw .include <bsd.prog.mk> Index: usr.sbin/lpr/lpc/Makefile =================================================================== --- usr.sbin/lpr/lpc/Makefile (revision 266142) +++ usr.sbin/lpr/lpc/Makefile (working copy) @@ -13,7 +13,7 @@ WARNS?= 0 -DPADD= ${LIBLPR} ${LIBEDIT} ${LIBTERMCAP} -LDADD= ${LIBLPR} -ledit -ltermcap +DPADD= ${LIBLPR} ${LIBEDIT} ${LIBTERMCAPW} +LDADD= ${LIBLPR} -ledit -ltermcapw .include <bsd.prog.mk> Index: usr.sbin/ngctl/Makefile =================================================================== --- usr.sbin/ngctl/Makefile (revision 266142) +++ usr.sbin/ngctl/Makefile (working copy) @@ -22,8 +22,8 @@ .if !defined(NGCTL_NO_LIBEDIT) CFLAGS+= -DEDITLINE -DPADD+= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP} -LDADD+= -lpthread -ledit -ltermcap +DPADD+= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAPW} +LDADD+= -lpthread -ledit -ltermcapw .endif .include <bsd.prog.mk> Index: usr.sbin/ntp/ntpdc/Makefile =================================================================== --- usr.sbin/ntp/ntpdc/Makefile (revision 266142) +++ usr.sbin/ntp/ntpdc/Makefile (working copy) @@ -15,8 +15,8 @@ DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} LDADD= ${LIBNTP} -lm -lmd ${LIBOPTS} -DPADD+= ${LIBEDIT} ${LIBTERMCAP} -LDADD+= -ledit -ltermcap +DPADD+= ${LIBEDIT} ${LIBTERMCAPW} +LDADD+= -ledit -ltermcapw CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ -I${DESTDIR}/${INCLUDEDIR}/edit Index: usr.sbin/ntp/ntpq/Makefile =================================================================== --- usr.sbin/ntp/ntpq/Makefile (revision 266142) +++ usr.sbin/ntp/ntpq/Makefile (working copy) @@ -17,8 +17,8 @@ DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} LDADD= ${LIBNTP} -lm -lmd ${LIBOPTS} -DPADD+= ${LIBEDIT} ${LIBTERMCAP} -LDADD+= -ledit -ltermcap +DPADD+= ${LIBEDIT} ${LIBTERMCAPW} +LDADD+= -ledit -ltermcapw CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ -I${DESTDIR}/${INCLUDEDIR}/edit Index: usr.sbin/pmcstat/Makefile =================================================================== --- usr.sbin/pmcstat/Makefile (revision 266142) +++ usr.sbin/pmcstat/Makefile (working copy) @@ -5,8 +5,8 @@ PROG= pmcstat MAN= pmcstat.8 -DPADD= ${LIBELF} ${LIBKVM} ${LIBPMC} ${LIBM} ${LIBNCURSES} -LDADD= -lelf -lkvm -lpmc -lm -lncurses +DPADD= ${LIBELF} ${LIBKVM} ${LIBPMC} ${LIBM} ${LIBNCURSESW} +LDADD= -lelf -lkvm -lpmc -lm -lncursesw SRCS= pmcstat.c pmcstat.h pmcstat_log.c \ pmcpl_callgraph.c pmcpl_gprof.c pmcpl_annotate.c \ Index: usr.sbin/pppctl/Makefile =================================================================== --- usr.sbin/pppctl/Makefile (revision 266142) +++ usr.sbin/pppctl/Makefile (working copy) @@ -5,7 +5,7 @@ WARNS?= 2 -DPADD= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP} -LDADD= -lpthread -ledit -ltermcap +DPADD= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAPW} +LDADD= -lpthread -ledit -ltermcapw .include <bsd.prog.mk> Index: usr.sbin/watch/Makefile =================================================================== --- usr.sbin/watch/Makefile (revision 266142) +++ usr.sbin/watch/Makefile (working copy) @@ -5,7 +5,7 @@ WARNS?= 2 -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include <bsd.prog.mk> Index: usr.sbin/wpa/wpa_cli/Makefile =================================================================== --- usr.sbin/wpa/wpa_cli/Makefile (revision 266142) +++ usr.sbin/wpa/wpa_cli/Makefile (working copy) @@ -15,7 +15,7 @@ CFLAGS+= -D_DIRENT_HAVE_D_TYPE CFLAGS+= -DCONFIG_READLINE -I${DESTDIR}/${INCLUDEDIR}/edit -LDADD+= -ledit -ltermcap -DPADD+= ${LIBEDIT} ${LIBTERMCAP} +LDADD+= -ledit -ltermcapw +DPADD+= ${LIBEDIT} ${LIBTERMCAPW} .include <bsd.prog.mk> >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405152033.s4FKXm1Q075913>