From ea5a037d1f7b17969046da0165700dcc51245472 Mon Sep 17 00:00:00 2001 From: brooks Date: Thu, 17 Jul 2014 18:24:34 +0000 Subject: 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 --- bin/csh/Makefile | 4 ++-- bin/ls/Makefile | 4 ++-- bin/sh/Makefile | 4 ++-- games/grdc/Makefile | 4 ++-- gnu/lib/libreadline/readline/Makefile | 4 ++-- gnu/usr.bin/gdb/gdb/Makefile | 4 ++-- gnu/usr.bin/gdb/gdbtui/Makefile | 4 ++-- gnu/usr.bin/gdb/kgdb/Makefile | 4 ++-- gnu/usr.bin/texinfo/info/Makefile | 4 ++-- kerberos5/usr.bin/kadmin/Makefile | 4 ++-- lib/libedit/Makefile | 4 ++-- libexec/telnetd/Makefile | 4 ++-- rescue/rescue/Makefile | 4 ++-- sbin/fsdb/Makefile | 4 ++-- sbin/gvinum/Makefile | 4 ++-- secure/usr.bin/sftp/Makefile | 4 ++-- tools/bsdbox/Makefile | 4 ++-- tools/tools/net80211/stumbler/Makefile | 4 ++-- usr.bin/clang/clang.prog.mk | 4 ++-- usr.bin/ee/Makefile | 4 ++-- usr.bin/ftp/Makefile | 4 ++-- usr.bin/less/Makefile | 4 ++-- usr.bin/msgs/Makefile | 4 ++-- usr.bin/ncal/Makefile | 4 ++-- usr.bin/tabs/Makefile | 4 ++-- usr.bin/telnet/Makefile | 4 ++-- usr.bin/tftp/Makefile | 4 ++-- usr.bin/tput/Makefile | 4 ++-- usr.bin/tset/Makefile | 5 +++-- usr.bin/ul/Makefile | 4 ++-- usr.bin/units/Makefile | 4 ++-- usr.bin/vi/Makefile | 5 ----- usr.sbin/cdcontrol/Makefile | 4 ++-- usr.sbin/lpr/lpc/Makefile | 4 ++-- usr.sbin/ngctl/Makefile | 4 ++-- usr.sbin/ntp/ntpdc/Makefile | 4 ++-- usr.sbin/ntp/ntpq/Makefile | 4 ++-- usr.sbin/pmcstat/Makefile | 4 ++-- usr.sbin/pppctl/Makefile | 4 ++-- usr.sbin/watch/Makefile | 4 ++-- usr.sbin/wpa/wpa_cli/Makefile | 4 ++-- 41 files changed, 81 insertions(+), 85 deletions(-) diff --git a/bin/csh/Makefile b/bin/csh/Makefile index c8845f9..9f305b4 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -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 diff --git a/bin/ls/Makefile b/bin/ls/Makefile index 7149d91..dce2046 100644 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -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 diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 6a982bc..ad43d33 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -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: diff --git a/games/grdc/Makefile b/games/grdc/Makefile index 6b1d6ee..73d395a 100644 --- a/games/grdc/Makefile +++ b/games/grdc/Makefile @@ -2,7 +2,7 @@ PROG= grdc MAN= grdc.6 -DPADD= ${LIBNCURSES} -LDADD= -lncurses +DPADD= ${LIBNCURSESW} +LDADD= -lncursesw .include diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile index 6ebea3a..f09e943 100644 --- a/gnu/lib/libreadline/readline/Makefile +++ b/gnu/lib/libreadline/readline/Makefile @@ -23,7 +23,7 @@ ${.OBJDIR}/${_h}: ${SRCDIR}/${_h} ${INSTALL} ${.ALLSRC} ${.TARGET} .endfor -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile index 473ffa3..9da4da1 100644 --- a/gnu/usr.bin/gdb/gdb/Makefile +++ b/gnu/usr.bin/gdb/gdb/Makefile @@ -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 diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile index 34946ea..8369b7f 100644 --- a/gnu/usr.bin/gdb/gdbtui/Makefile +++ b/gnu/usr.bin/gdb/gdbtui/Makefile @@ -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 diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile index 7a7542a..bbc886b 100644 --- a/gnu/usr.bin/gdb/kgdb/Makefile +++ b/gnu/usr.bin/gdb/kgdb/Makefile @@ -8,9 +8,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${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) diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile index a68a1c6..de95af6 100644 --- a/gnu/usr.bin/texinfo/info/Makefile +++ b/gnu/usr.bin/texinfo/info/Makefile @@ -10,8 +10,8 @@ SRCS= dir.c display.c doc.c dribble.c echo-area.c filesys.c \ CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\" -DPADD= ${LIBTERMCAP} ${LIBTXI} -LDADD= -ltermcap ${LIBTXI} +DPADD= ${LIBTERMCAPW} ${LIBTXI} +LDADD= -ltermcapw ${LIBTXI} NO_PIE= yes diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index 91b53a2..b01d789 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -29,11 +29,11 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ 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 diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile index c8de253..df86778 100644 --- a/lib/libedit/Makefile +++ b/lib/libedit/Makefile @@ -10,8 +10,8 @@ OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \ 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 diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index a63b937..f80bf5c 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -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 diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 1e9cb19..a5b77a1 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -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 diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile index f921e89..21ac09f 100644 --- a/sbin/fsdb/Makefile +++ b/sbin/fsdb/Makefile @@ -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 diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile index c9716e9..1b5f948 100644 --- a/sbin/gvinum/Makefile +++ b/sbin/gvinum/Makefile @@ -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 diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 15dcaa5..bb1c325 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -11,8 +11,8 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h 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" diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile index 2e3d6a3..aaf6ab9 100644 --- a/tools/bsdbox/Makefile +++ b/tools/bsdbox/Makefile @@ -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 -ltermcap # 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 diff --git a/tools/tools/net80211/stumbler/Makefile b/tools/tools/net80211/stumbler/Makefile index c3970b2..e7ea87c 100644 --- a/tools/tools/net80211/stumbler/Makefile +++ b/tools/tools/net80211/stumbler/Makefile @@ -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= diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index 5f8f7a9..1b4e126 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -11,8 +11,8 @@ DPADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a LDADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a .endfor -DPADD+= ${LIBNCURSES} -LDADD+= -lncurses +DPADD+= ${LIBNCURSESW} +LDADD+= -lncursesw BINDIR?= /usr/bin diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile index 7437731..8dcf2f5 100644 --- a/usr.bin/ee/Makefile +++ b/usr.bin/ee/Makefile @@ -8,8 +8,8 @@ CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \ 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 diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index abdd6b7..2cd7f36 100644 --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -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 diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile index 3bfadfa..22147cd 100644 --- a/usr.bin/less/Makefile +++ b/usr.bin/less/Makefile @@ -8,8 +8,8 @@ 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 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 \ diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile index 21cb151..6c5a8d9 100644 --- a/usr.bin/msgs/Makefile +++ b/usr.bin/msgs/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= msgs -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile index b26605f..1422ce1 100644 --- a/usr.bin/ncal/Makefile +++ b/usr.bin/ncal/Makefile @@ -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 diff --git a/usr.bin/tabs/Makefile b/usr.bin/tabs/Makefile index 4b5d40e..2c5f729 100644 --- a/usr.bin/tabs/Makefile +++ b/usr.bin/tabs/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= tabs -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 2952237..a683f0a 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -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 diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile index 7521e4e..88f8c37 100644 --- a/usr.bin/tftp/Makefile +++ b/usr.bin/tftp/Makefile @@ -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 diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile index 143dc65..c42ef79 100644 --- a/usr.bin/tput/Makefile +++ b/usr.bin/tput/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PROG= tput -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw SCRIPTS=clear.sh MLINKS= tput.1 clear.1 diff --git a/usr.bin/tset/Makefile b/usr.bin/tset/Makefile index 126cf321..c486bf8 100644 --- a/usr.bin/tset/Makefile +++ b/usr.bin/tset/Makefile @@ -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 diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile index 9aaf775..685e4a4 100644 --- a/usr.bin/ul/Makefile +++ b/usr.bin/ul/Makefile @@ -3,7 +3,7 @@ PROG= ul -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile index 3abbd3f..3757c85 100644 --- a/usr.bin/units/Makefile +++ b/usr.bin/units/Makefile @@ -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 diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index e3ee3f6e..6ed95ee 100644 --- a/usr.bin/vi/Makefile +++ b/usr.bin/vi/Makefile @@ -36,14 +36,9 @@ CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex 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 diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile index a505e3a..fa0dc2c 100644 --- a/usr.sbin/cdcontrol/Makefile +++ b/usr.sbin/cdcontrol/Makefile @@ -2,7 +2,7 @@ PROG= cdcontrol -DPADD= ${LIBEDIT} ${LIBTERMCAP} -LDADD= -ledit -ltermcap +DPADD= ${LIBEDIT} ${LIBTERMCAPW} +LDADD= -ledit -ltermcapw .include diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile index 65a8010..7f228d6 100644 --- a/usr.sbin/lpr/lpc/Makefile +++ b/usr.sbin/lpr/lpc/Makefile @@ -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 diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile index a1d1e6b..cf72f39 100644 --- a/usr.sbin/ngctl/Makefile +++ b/usr.sbin/ngctl/Makefile @@ -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 diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile index d4ea36f..e4e8960 100644 --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -15,8 +15,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ 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 diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile index 7fcdd2b..a1ddcd4 100644 --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -17,8 +17,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ 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 diff --git a/usr.sbin/pmcstat/Makefile b/usr.sbin/pmcstat/Makefile index b8c8081..78cde44 100644 --- a/usr.sbin/pmcstat/Makefile +++ b/usr.sbin/pmcstat/Makefile @@ -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 \ diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile index 2f2be4b..4a03b86 100644 --- a/usr.sbin/pppctl/Makefile +++ b/usr.sbin/pppctl/Makefile @@ -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 diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile index e8a8ea6..184d331 100644 --- a/usr.sbin/watch/Makefile +++ b/usr.sbin/watch/Makefile @@ -5,7 +5,7 @@ MAN= watch.8 WARNS?= 2 -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw .include diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile index 7e92207..93a1ba7 100644 --- a/usr.sbin/wpa/wpa_cli/Makefile +++ b/usr.sbin/wpa/wpa_cli/Makefile @@ -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 -- cgit v1.1