Date: Thu, 17 Jul 2014 18:24:35 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268804 - in head: bin/csh bin/ls bin/sh games/grdc gnu/lib/libreadline/readline gnu/usr.bin/gdb/gdb gnu/usr.bin/gdb/gdbtui gnu/usr.bin/gdb/kgdb gnu/usr.bin/texinfo/info kerberos5/usr.b... Message-ID: <201407171824.s6HIOZpg020943@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Jul 17 18:24:34 2014 New Revision: 268804 URL: http://svnweb.freebsd.org/changeset/base/268804 Log: Replace all uses of libncurses and libtermcap with their wide character variants. This allows usable file system images (i.e. those with both a shell and an editor) to be created with only one copy of the curses library. Exp-run: antoine PR: 189842 Discussed with: bapt Sponsored by: DARPA, AFRL Modified: head/bin/csh/Makefile head/bin/ls/Makefile head/bin/sh/Makefile head/games/grdc/Makefile head/gnu/lib/libreadline/readline/Makefile head/gnu/usr.bin/gdb/gdb/Makefile head/gnu/usr.bin/gdb/gdbtui/Makefile head/gnu/usr.bin/gdb/kgdb/Makefile head/gnu/usr.bin/texinfo/info/Makefile head/kerberos5/usr.bin/kadmin/Makefile head/lib/libedit/Makefile head/libexec/telnetd/Makefile head/rescue/rescue/Makefile head/sbin/fsdb/Makefile head/sbin/gvinum/Makefile head/secure/usr.bin/sftp/Makefile head/tools/bsdbox/Makefile head/tools/tools/net80211/stumbler/Makefile head/usr.bin/clang/clang.prog.mk head/usr.bin/ee/Makefile head/usr.bin/ftp/Makefile head/usr.bin/less/Makefile head/usr.bin/msgs/Makefile head/usr.bin/ncal/Makefile head/usr.bin/tabs/Makefile head/usr.bin/telnet/Makefile head/usr.bin/tftp/Makefile head/usr.bin/tput/Makefile head/usr.bin/tset/Makefile head/usr.bin/ul/Makefile head/usr.bin/units/Makefile head/usr.bin/vi/Makefile head/usr.sbin/cdcontrol/Makefile head/usr.sbin/lpr/lpc/Makefile head/usr.sbin/ngctl/Makefile head/usr.sbin/ntp/ntpdc/Makefile head/usr.sbin/ntp/ntpq/Makefile head/usr.sbin/pmcstat/Makefile head/usr.sbin/pppctl/Makefile head/usr.sbin/watch/Makefile head/usr.sbin/wpa/wpa_cli/Makefile Modified: head/bin/csh/Makefile ============================================================================== --- head/bin/csh/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/bin/csh/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -40,8 +40,8 @@ MLINKS= csh.1 tcsh.1 # 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 Modified: head/bin/ls/Makefile ============================================================================== --- head/bin/ls/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/bin/ls/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -11,8 +11,8 @@ LDADD= -lutil .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -DPADD+= ${LIBTERMCAP} -LDADD+= -ltermcap +DPADD+= ${LIBTERMCAPW} +LDADD+= -ltermcapw .endif .include <bsd.prog.mk> Modified: head/bin/sh/Makefile ============================================================================== --- head/bin/sh/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/bin/sh/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -18,8 +18,8 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} # 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: Modified: head/games/grdc/Makefile ============================================================================== --- head/games/grdc/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/games/grdc/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -2,7 +2,7 @@ PROG= grdc MAN= grdc.6 -DPADD= ${LIBNCURSES} -LDADD= -lncurses +DPADD= ${LIBNCURSESW} +LDADD= -lncursesw .include <bsd.prog.mk> Modified: head/gnu/lib/libreadline/readline/Makefile ============================================================================== --- head/gnu/lib/libreadline/readline/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/gnu/lib/libreadline/readline/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -23,7 +23,7 @@ ${.OBJDIR}/${_h}: ${SRCDIR}/${_h} ${INSTALL} ${.ALLSRC} ${.TARGET} .endfor -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include <bsd.lib.mk> Modified: head/gnu/usr.bin/gdb/gdb/Makefile ============================================================================== --- head/gnu/usr.bin/gdb/gdb/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/gnu/usr.bin/gdb/gdb/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -11,8 +11,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcapw -lgnuregex NO_PIE= yes Modified: head/gnu/usr.bin/gdb/gdbtui/Makefile ============================================================================== --- head/gnu/usr.bin/gdb/gdbtui/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/gnu/usr.bin/gdb/gdbtui/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -12,8 +12,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcapw -lgnuregex NO_PIE= yes Modified: head/gnu/usr.bin/gdb/kgdb/Makefile ============================================================================== --- head/gnu/usr.bin/gdb/kgdb/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/gnu/usr.bin/gdb/kgdb/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -8,9 +8,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_ ${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 ${LIBREADLINE} -ltermcap \ +LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LIBREADLINE} -ltermcapw \ -lgnuregex .if defined(GDB_CROSS_DEBUGGER) Modified: head/gnu/usr.bin/texinfo/info/Makefile ============================================================================== --- head/gnu/usr.bin/texinfo/info/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/gnu/usr.bin/texinfo/info/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -10,8 +10,8 @@ SRCS= dir.c display.c doc.c dribble.c ec CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\" -DPADD= ${LIBTERMCAP} ${LIBTXI} -LDADD= -ltermcap ${LIBTXI} +DPADD= ${LIBTERMCAPW} ${LIBTXI} +LDADD= -ltermcapw ${LIBTXI} NO_PIE= yes Modified: head/kerberos5/usr.bin/kadmin/Makefile ============================================================================== --- head/kerberos5/usr.bin/kadmin/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/kerberos5/usr.bin/kadmin/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -29,11 +29,11 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DI 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} NO_PIE= yes Modified: head/lib/libedit/Makefile ============================================================================== --- head/lib/libedit/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/lib/libedit/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -10,8 +10,8 @@ OSRCS= chared.c common.c el.c emacs.c fc 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 Modified: head/libexec/telnetd/Makefile ============================================================================== --- head/libexec/telnetd/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/libexec/telnetd/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -30,8 +30,8 @@ CFLAGS+= -I${TELNETDIR} LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} -LDADD= -lutil -ltermcap ${LIBTELNET} +DPADD= ${LIBUTIL} ${LIBTERMCAPW} ${LIBTELNET} +LDADD= -lutil -ltermcapw ${LIBTELNET} .if ${MK_OPENSSL} != "no" SRCS+= authenc.c Modified: head/rescue/rescue/Makefile ============================================================================== --- head/rescue/rescue/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/rescue/rescue/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -52,7 +52,7 @@ CRUNCH_SRCDIRS+= bin 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 @@ CRUNCH_PROGS_sbin+= zpool # 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 Modified: head/sbin/fsdb/Makefile ============================================================================== --- head/sbin/fsdb/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/sbin/fsdb/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -9,8 +9,8 @@ SRCS= fsdb.c fsdbutil.c \ 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> Modified: head/sbin/gvinum/Makefile ============================================================================== --- head/sbin/gvinum/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/sbin/gvinum/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -7,8 +7,8 @@ MAN= gvinum.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 Modified: head/secure/usr.bin/sftp/Makefile ============================================================================== --- head/secure/usr.bin/sftp/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/secure/usr.bin/sftp/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -11,8 +11,8 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa 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" Modified: head/tools/bsdbox/Makefile ============================================================================== --- head/tools/bsdbox/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/tools/bsdbox/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -57,7 +57,7 @@ CRUNCH_SRCDIRS+= bin # 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_LIBS+= -lcrypt -ledit -ll -ltermc # 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 Modified: head/tools/tools/net80211/stumbler/Makefile ============================================================================== --- head/tools/tools/net80211/stumbler/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/tools/tools/net80211/stumbler/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -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= Modified: head/usr.bin/clang/clang.prog.mk ============================================================================== --- head/usr.bin/clang/clang.prog.mk Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/clang/clang.prog.mk Thu Jul 17 18:24:34 2014 (r268804) @@ -11,8 +11,8 @@ DPADD+= ${.OBJDIR}/../../../lib/clang/li LDADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a .endfor -DPADD+= ${LIBNCURSES} -LDADD+= -lncurses +DPADD+= ${LIBNCURSESW} +LDADD+= -lncursesw BINDIR?= /usr/bin Modified: head/usr.bin/ee/Makefile ============================================================================== --- head/usr.bin/ee/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/ee/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -8,8 +8,8 @@ CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHA 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 Modified: head/usr.bin/ftp/Makefile ============================================================================== --- head/usr.bin/ftp/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/ftp/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -20,8 +20,8 @@ CFLAGS+= -DINET6 .endif CFLAGS+= -I${.CURDIR} -I${TNFTP} -LDADD= -ledit -ltermcap -lutil -DPADD= ${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL} +LDADD= -ledit -ltermcapw -lutil +DPADD= ${LIBEDIT} ${LIBTERMCAPW} ${LIBUTIL} WARNS?= 2 Modified: head/usr.bin/less/Makefile ============================================================================== --- head/usr.bin/less/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/less/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -8,8 +8,8 @@ SRCS= main.c screen.c brac.c ch.c charse 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 \ Modified: head/usr.bin/msgs/Makefile ============================================================================== --- head/usr.bin/msgs/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/msgs/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= msgs -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include <bsd.prog.mk> Modified: head/usr.bin/ncal/Makefile ============================================================================== --- head/usr.bin/ncal/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/ncal/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -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 Modified: head/usr.bin/tabs/Makefile ============================================================================== --- head/usr.bin/tabs/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/tabs/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= tabs -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include <bsd.prog.mk> Modified: head/usr.bin/telnet/Makefile ============================================================================== --- head/usr.bin/telnet/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/telnet/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -23,8 +23,8 @@ WARNS?= 2 LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -DPADD= ${LIBTERMCAP} ${LIBTELNET} -LDADD= -ltermcap ${LIBTELNET} +DPADD= ${LIBTERMCAPW} ${LIBTELNET} +LDADD= -ltermcapw ${LIBTELNET} .if !defined(RELEASE_CRUNCH) CFLAGS+= -DIPSEC Modified: head/usr.bin/tftp/Makefile ============================================================================== --- head/usr.bin/tftp/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/tftp/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -7,7 +7,7 @@ PROG= tftp 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> Modified: head/usr.bin/tput/Makefile ============================================================================== --- head/usr.bin/tput/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/tput/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -2,8 +2,8 @@ # $FreeBSD$ PROG= tput -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw SCRIPTS=clear.sh MLINKS= tput.1 clear.1 Modified: head/usr.bin/tset/Makefile ============================================================================== --- head/usr.bin/tset/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/tset/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -1,10 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/9/93 +# $FreeBSD$ 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 Modified: head/usr.bin/ul/Makefile ============================================================================== --- head/usr.bin/ul/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/ul/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -3,7 +3,7 @@ PROG= ul -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include <bsd.prog.mk> Modified: head/usr.bin/units/Makefile ============================================================================== --- head/usr.bin/units/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/units/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -6,8 +6,8 @@ PROG= units FILES= units.lib FILESDIR= ${SHAREDIR}/misc -LDADD+=-ledit -ltermcap -DPADD+=${LIBEDIT} ${LIBTERMCAP} +LDADD+=-ledit -ltermcapw +DPADD+=${LIBEDIT} ${LIBTERMCAPW} .if ${MK_TESTS} != "no" SUBDIR+= tests Modified: head/usr.bin/vi/Makefile ============================================================================== --- head/usr.bin/vi/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.bin/vi/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -36,14 +36,9 @@ CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRC 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 Modified: head/usr.sbin/cdcontrol/Makefile ============================================================================== --- head/usr.sbin/cdcontrol/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.sbin/cdcontrol/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -2,7 +2,7 @@ PROG= cdcontrol -DPADD= ${LIBEDIT} ${LIBTERMCAP} -LDADD= -ledit -ltermcap +DPADD= ${LIBEDIT} ${LIBTERMCAPW} +LDADD= -ledit -ltermcapw .include <bsd.prog.mk> Modified: head/usr.sbin/lpr/lpc/Makefile ============================================================================== --- head/usr.sbin/lpr/lpc/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.sbin/lpr/lpc/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -13,8 +13,8 @@ CFLAGS+= -I${.CURDIR}/../common_source WARNS?= 0 -DPADD= ${LIBLPR} ${LIBEDIT} ${LIBTERMCAP} -LDADD= ${LIBLPR} -ledit -ltermcap +DPADD= ${LIBLPR} ${LIBEDIT} ${LIBTERMCAPW} +LDADD= ${LIBLPR} -ledit -ltermcapw NO_PIE= yes Modified: head/usr.sbin/ngctl/Makefile ============================================================================== --- head/usr.sbin/ngctl/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.sbin/ngctl/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -22,8 +22,8 @@ LDADD= -lnetgraph .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> Modified: head/usr.sbin/ntp/ntpdc/Makefile ============================================================================== --- head/usr.sbin/ntp/ntpdc/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.sbin/ntp/ntpdc/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -15,8 +15,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n 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 Modified: head/usr.sbin/ntp/ntpq/Makefile ============================================================================== --- head/usr.sbin/ntp/ntpq/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.sbin/ntp/ntpq/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -17,8 +17,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n 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 Modified: head/usr.sbin/pmcstat/Makefile ============================================================================== --- head/usr.sbin/pmcstat/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.sbin/pmcstat/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -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 \ Modified: head/usr.sbin/pppctl/Makefile ============================================================================== --- head/usr.sbin/pppctl/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.sbin/pppctl/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -5,7 +5,7 @@ MAN= pppctl.8 WARNS?= 2 -DPADD= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP} -LDADD= -lpthread -ledit -ltermcap +DPADD= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAPW} +LDADD= -lpthread -ledit -ltermcapw .include <bsd.prog.mk> Modified: head/usr.sbin/watch/Makefile ============================================================================== --- head/usr.sbin/watch/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.sbin/watch/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -5,7 +5,7 @@ MAN= watch.8 WARNS?= 2 -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include <bsd.prog.mk> Modified: head/usr.sbin/wpa/wpa_cli/Makefile ============================================================================== --- head/usr.sbin/wpa/wpa_cli/Makefile Thu Jul 17 17:41:32 2014 (r268803) +++ head/usr.sbin/wpa/wpa_cli/Makefile Thu Jul 17 18:24:34 2014 (r268804) @@ -15,7 +15,7 @@ CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX CFLAGS+= -D_DIRENT_HAVE_D_TYPE CFLAGS+= -DCONFIG_READLINE -I${DESTDIR}/${INCLUDEDIR}/edit -LDADD+= -ledit -ltermcap -lutil -DPADD+= ${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL} +LDADD+= -ledit -ltermcapw -lutil +DPADD+= ${LIBEDIT} ${LIBTERMCAPW} ${LIBUTIL} .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407171824.s6HIOZpg020943>