View | Details | Raw Unified | Return to bug 189842
Collapse All | Expand All

(-)bin/csh/Makefile (-2 / +2 lines)
Lines 40-47 Link Here
40
# utilities of the same name are handled with the associated manpage,
40
# utilities of the same name are handled with the associated manpage,
41
# builtin.1 in share/man/man1/.
41
# builtin.1 in share/man/man1/.
42
42
43
DPADD=	${LIBTERMCAP} ${LIBCRYPT}
43
DPADD=	${LIBTERMCAPW} ${LIBCRYPT}
44
LDADD=	-ltermcap -lcrypt
44
LDADD=	-ltermcapw -lcrypt
45
45
46
LINKS=	${BINDIR}/csh ${BINDIR}/tcsh
46
LINKS=	${BINDIR}/csh ${BINDIR}/tcsh
47
47
(-)bin/ls/Makefile (-2 / +2 lines)
Lines 11-18 Link Here
11
.if !defined(RELEASE_CRUNCH) && \
11
.if !defined(RELEASE_CRUNCH) && \
12
	${MK_LS_COLORS} != no
12
	${MK_LS_COLORS} != no
13
CFLAGS+= -DCOLORLS
13
CFLAGS+= -DCOLORLS
14
DPADD+=	${LIBTERMCAP}
14
DPADD+=	${LIBTERMCAPW}
15
LDADD+=	-ltermcap
15
LDADD+=	-ltermcapw
16
.endif
16
.endif
17
17
18
.include <bsd.prog.mk>
18
.include <bsd.prog.mk>
(-)bin/sh/Makefile (-2 / +2 lines)
Lines 18-25 Link Here
18
# utilities of the same name are handled with the associated manpage,
18
# utilities of the same name are handled with the associated manpage,
19
# builtin.1 in share/man/man1/.
19
# builtin.1 in share/man/man1/.
20
20
21
DPADD= ${LIBEDIT} ${LIBTERMCAP}
21
DPADD= ${LIBEDIT} ${LIBTERMCAPW}
22
LDADD= -ledit -ltermcap
22
LDADD= -ledit -ltermcapw
23
23
24
CFLAGS+=-DSHELL -I. -I${.CURDIR}
24
CFLAGS+=-DSHELL -I. -I${.CURDIR}
25
# for debug:
25
# for debug:
(-)games/grdc/Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
2
3
PROG=	grdc
3
PROG=	grdc
4
MAN=	grdc.6
4
MAN=	grdc.6
5
DPADD=	${LIBNCURSES}
5
DPADD=	${LIBNCURSESW}
6
LDADD=	-lncurses
6
LDADD=	-lncursesw
7
7
8
.include <bsd.prog.mk>
8
.include <bsd.prog.mk>
(-)gnu/lib/libreadline/readline/Makefile (-2 / +2 lines)
Lines 15-22 Link Here
15
INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
15
INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
16
		   rlstdc.h rlconf.h rltypedefs.h
16
		   rlstdc.h rlconf.h rltypedefs.h
17
17
18
DPADD=	${LIBTERMCAP}
18
DPADD=	${LIBTERMCAPW}
19
LDADD=	-ltermcap
19
LDADD=	-ltermcapw
20
20
21
INCSDIR=${INCLUDEDIR}/readline
21
INCSDIR=${INCLUDEDIR}/readline
22
22
(-)gnu/usr.bin/gdb/gdb/Makefile (-2 / +3 lines)
Lines 11-18 Link Here
11
# global symbols visible.
11
# global symbols visible.
12
LDFLAGS+= -Wl,-E
12
LDFLAGS+= -Wl,-E
13
13
14
DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
14
DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \
15
LDADD=	${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex
15
	${LIBGNUREGEX}
16
LDADD=	${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcapw -lgnuregex
16
17
17
.include <bsd.prog.mk>
18
.include <bsd.prog.mk>
18
CFLAGS+=	-DDEBUGDIR=\"${DEBUGDIR}\"
19
CFLAGS+=	-DDEBUGDIR=\"${DEBUGDIR}\"
(-)gnu/usr.bin/gdb/gdbtui/Makefile (-2 / +3 lines)
Lines 12-18 Link Here
12
# global symbols visible.
12
# global symbols visible.
13
LDFLAGS+= -Wl,-E
13
LDFLAGS+= -Wl,-E
14
14
15
DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
15
DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \
16
LDADD=	${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex
16
	${LIBGNUREGEX}
17
LDADD=	${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcapw -lgnuregex
17
18
18
.include <bsd.prog.mk>
19
.include <bsd.prog.mk>
(-)gnu/usr.bin/gdb/kgdb/Makefile (-2 / +2 lines)
Lines 8-16 Link Here
8
	${OBJ_BU}/libiberty/libiberty.a
8
	${OBJ_BU}/libiberty/libiberty.a
9
GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
9
GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
10
10
11
DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} \
11
DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \
12
	${LIBGNUREGEX}
12
	${LIBGNUREGEX}
13
LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm -lreadline -ltermcap \
13
LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm -lreadline -ltermcapw \
14
	-lgnuregex
14
	-lgnuregex
15
15
16
.if defined(GDB_CROSS_DEBUGGER)
16
.if defined(GDB_CROSS_DEBUGGER)
(-)gnu/usr.bin/texinfo/info/Makefile (-2 / +2 lines)
Lines 10-17 Link Here
10
10
11
CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
11
CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
12
12
13
DPADD=	${LIBTERMCAP} ${LIBTXI}
13
DPADD=	${LIBTERMCAPW} ${LIBTXI}
14
LDADD=	-ltermcap ${LIBTXI}
14
LDADD=	-ltermcapw ${LIBTXI}
15
15
16
.include <bsd.prog.mk>
16
.include <bsd.prog.mk>
17
17
(-)kerberos5/usr.bin/kadmin/Makefile (-2 / +2 lines)
Lines 29-39 Link Here
29
DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \
29
DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \
30
	${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
30
	${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
31
	${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
31
	${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
32
	${LIBEDIT} ${LIBNCURSES} ${LDAPDPADD}
32
	${LIBEDIT} ${LIBNCURSESW} ${LDAPDPADD}
33
LDADD=	-lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \
33
LDADD=	-lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \
34
	${LIBSL} -lroken ${LIBVERS} -lasn1 \
34
	${LIBSL} -lroken ${LIBVERS} -lasn1 \
35
	-lcrypto -lcrypt -lcom_err \
35
	-lcrypto -lcrypt -lcom_err \
36
	-ledit -lncurses ${LDAPLDADD}
36
	-ledit -lncursesw ${LDAPLDADD}
37
LDFLAGS=${LDAPLDFLAGS}
37
LDFLAGS=${LDAPLDFLAGS}
38
38
39
.include <bsd.prog.mk>
39
.include <bsd.prog.mk>
(-)lib/libedit/Makefile (-2 / +2 lines)
Lines 10-17 Link Here
10
	hist.c key.c map.c \
10
	hist.c key.c map.c \
11
	parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c
11
	parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c
12
12
13
DPADD=	${LIBNCURSES}
13
DPADD=	${LIBNCURSESW}
14
LDADD=	-lncurses
14
LDADD=	-lncursesw
15
15
16
MAN=	editline.3 editrc.5
16
MAN=	editline.3 editrc.5
17
17
(-)libexec/telnetd/Makefile (-2 / +2 lines)
Lines 28-35 Link Here
28
28
29
LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
29
LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
30
30
31
DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
31
DPADD=		${LIBUTIL} ${LIBTERMCAPW} ${LIBTELNET}
32
LDADD=		-lutil -ltermcap ${LIBTELNET}
32
LDADD=		-lutil -ltermcapw ${LIBTELNET}
33
33
34
# XXX for src/release/picobsd
34
# XXX for src/release/picobsd
35
.if !defined(RELEASE_CRUNCH)
35
.if !defined(RELEASE_CRUNCH)
(-)rescue/rescue/Makefile (-2 / +2 lines)
Lines 52-58 Link Here
52
CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo 	\
52
CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo 	\
53
	 ed expr getfacl hostname kenv kill ln ls mkdir mv	\
53
	 ed expr getfacl hostname kenv kill ln ls mkdir mv	\
54
	 pkill ps pwd realpath rm rmdir setfacl sh stty sync test
54
	 pkill ps pwd realpath rm rmdir setfacl sh stty sync test
55
CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcap -lutil
55
CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcapw -lutil
56
CRUNCH_BUILDTOOLS+= bin/sh
56
CRUNCH_BUILDTOOLS+= bin/sh
57
57
58
# Additional options for specific programs
58
# Additional options for specific programs
Lines 118-124 Link Here
118
# crunchgen does not like C++ programs; this should be fixed someday
118
# crunchgen does not like C++ programs; this should be fixed someday
119
# CRUNCH_PROGS+= devd
119
# CRUNCH_PROGS+= devd
120
120
121
CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
121
CRUNCH_LIBS+= -lalias -lcam -lncursesw -ldevstat -lipsec
122
.if ${MK_ZFS} != "no"
122
.if ${MK_ZFS} != "no"
123
CRUNCH_LIBS+= -lavl -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
123
CRUNCH_LIBS+= -lavl -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
124
.endif
124
.endif
(-)sbin/fsdb/Makefile (-2 / +2 lines)
Lines 9-16 Link Here
9
	pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c
9
	pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c
10
CFLAGS+= -I${.CURDIR}/../fsck_ffs
10
CFLAGS+= -I${.CURDIR}/../fsck_ffs
11
WARNS?= 2
11
WARNS?= 2
12
LDADD=	-ledit -ltermcap
12
LDADD=	-ledit -ltermcapw
13
DPADD=	${LIBEDIT} ${LIBTERMCAP}
13
DPADD=	${LIBEDIT} ${LIBTERMCAPW}
14
.PATH:	${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs
14
.PATH:	${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs
15
15
16
.include <bsd.prog.mk>
16
.include <bsd.prog.mk>
(-)sbin/gvinum/Makefile (-2 / +2 lines)
Lines 7-14 Link Here
7
WARNS?=	2
7
WARNS?=	2
8
CFLAGS+=	-I${.CURDIR}/../../sys -I${DESTDIR}/${INCLUDEDIR}/edit
8
CFLAGS+=	-I${.CURDIR}/../../sys -I${DESTDIR}/${INCLUDEDIR}/edit
9
9
10
DPADD=	${LIBEDIT} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM}
10
DPADD=	${LIBEDIT} ${LIBTERMCAPW} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM}
11
LDADD=	-ledit -ltermcap -ldevstat -lkvm -lgeom
11
LDADD=	-ledit -ltermcapw -ldevstat -lkvm -lgeom
12
12
13
.PATH: ${.CURDIR}/../../sys/geom/vinum
13
.PATH: ${.CURDIR}/../../sys/geom/vinum
14
14
(-)secure/usr.bin/sftp/Makefile (-2 / +2 lines)
Lines 11-18 Link Here
11
SRCS+=	roaming_dummy.c
11
SRCS+=	roaming_dummy.c
12
.endif
12
.endif
13
13
14
DPADD=	${LIBSSH} ${LIBEDIT} ${LIBNCURSES}
14
DPADD=	${LIBSSH} ${LIBEDIT} ${LIBNCURSESW}
15
LDADD=	-lssh -ledit -lncurses
15
LDADD=	-lssh -ledit -lncursesw
16
USEPRIVATELIB= ssh
16
USEPRIVATELIB= ssh
17
17
18
.if ${MK_LDNS} != "no"
18
.if ${MK_LDNS} != "no"
(-)tools/bsdbox/Makefile (-2 / +2 lines)
Lines 57-63 Link Here
57
# statically - and that ends very badly.
57
# statically - and that ends very badly.
58
CRUNCH_SHLIBS+=	-lc -lutil -lcrypt
58
CRUNCH_SHLIBS+=	-lc -lutil -lcrypt
59
CRUNCH_LIBS+= -lkvm -lmemstat -lnetgraph
59
CRUNCH_LIBS+= -lkvm -lmemstat -lnetgraph
60
CRUNCH_LIBS+= -lcrypt -ledit -ll -ltermcap
60
CRUNCH_LIBS+= -lcrypt -ledit -ll -ltermcapw
61
61
62
###################################################################
62
###################################################################
63
# Programs from standard /sbin
63
# Programs from standard /sbin
Lines 70-76 Link Here
70
#
70
#
71
CRUNCH_SRCDIRS+= sbin
71
CRUNCH_SRCDIRS+= sbin
72
72
73
CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
73
CRUNCH_LIBS+= -lalias -lcam -lcursesw -ldevstat -lipsec
74
# Don't forget this - ifconfig, etc -adrian
74
# Don't forget this - ifconfig, etc -adrian
75
CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lsbuf -lufs
75
CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lsbuf -lufs
76
76
(-)tools/tools/net80211/stumbler/Makefile (-2 / +2 lines)
Lines 2-9 Link Here
2
2
3
PROG=	stumbler
3
PROG=	stumbler
4
BINDIR=	/usr/local/bin
4
BINDIR=	/usr/local/bin
5
DPADD=	${LIBPCAP} ${LIBNCURSES}
5
DPADD=	${LIBPCAP} ${LIBNCURSESW}
6
LDADD=	-lpcap -lncurses
6
LDADD=	-lpcap -lncursesw
7
CFLAGS=-g
7
CFLAGS=-g
8
MAN=
8
MAN=
9
9
(-)usr.bin/clang/clang.prog.mk (-2 / +2 lines)
Lines 9-16 Link Here
9
LDADD+=	${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
9
LDADD+=	${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
10
.endfor
10
.endfor
11
11
12
DPADD+=	${LIBNCURSES}
12
DPADD+=	${LIBNCURSESW}
13
LDADD+=	-lncurses
13
LDADD+=	-lncursesw
14
14
15
BINDIR?= /usr/bin
15
BINDIR?= /usr/bin
16
16
(-)usr.bin/ee/Makefile (-2 / +2 lines)
Lines 8-15 Link Here
8
PROG=	ee
8
PROG=	ee
9
LINKS=	${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit
9
LINKS=	${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit
10
MLINKS=	ee.1 ree.1 ee.1 edit.1
10
MLINKS=	ee.1 ree.1 ee.1 edit.1
11
DPADD=	${LIBNCURSES}
11
DPADD=	${LIBNCURSESW}
12
LDADD=	-lncurses
12
LDADD=	-lncursesw
13
13
14
WARNS?=	2
14
WARNS?=	2
15
15
(-)usr.bin/ftp/Makefile (-2 / +2 lines)
Lines 20-27 Link Here
20
.endif
20
.endif
21
21
22
CFLAGS+= -I${.CURDIR} -I${TNFTP}
22
CFLAGS+= -I${.CURDIR} -I${TNFTP}
23
LDADD=	-ledit -ltermcap -lutil
23
LDADD=	-ledit -ltermcapw -lutil
24
DPADD=	${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL}
24
DPADD=	${LIBEDIT} ${LIBTERMCAPW} ${LIBUTIL}
25
25
26
WARNS?=	2
26
WARNS?=	2
27
27
(-)usr.bin/less/Makefile (-2 / +2 lines)
Lines 8-15 Link Here
8
	signal.c tags.c ttyin.c version.c
8
	signal.c tags.c ttyin.c version.c
9
SCRIPTS=lesspipe.sh zless.sh
9
SCRIPTS=lesspipe.sh zless.sh
10
SCRIPTSNAME_lesspipe.sh=lesspipe.sh
10
SCRIPTSNAME_lesspipe.sh=lesspipe.sh
11
DPADD=	${LIBTERMCAP}
11
DPADD=	${LIBTERMCAPW}
12
LDADD=	-ltermcap
12
LDADD=	-ltermcapw
13
LINKS=	${BINDIR}/less ${BINDIR}/more \
13
LINKS=	${BINDIR}/less ${BINDIR}/more \
14
	${BINDIR}/zless ${BINDIR}/bzless \
14
	${BINDIR}/zless ${BINDIR}/bzless \
15
	${BINDIR}/zless ${BINDIR}/xzless \
15
	${BINDIR}/zless ${BINDIR}/xzless \
(-)usr.bin/msgs/Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PROG=	msgs
4
PROG=	msgs
5
DPADD=	${LIBTERMCAP}
5
DPADD=	${LIBTERMCAPW}
6
LDADD=	-ltermcap
6
LDADD=	-ltermcapw
7
7
8
.include <bsd.prog.mk>
8
.include <bsd.prog.mk>
(-)usr.bin/ncal/Makefile (-2 / +2 lines)
Lines 4-11 Link Here
4
4
5
PROG=	ncal
5
PROG=	ncal
6
6
7
DPADD=	${LIBCALENDAR} ${LIBTERMCAP}
7
DPADD=	${LIBCALENDAR} ${LIBTERMCAPW}
8
LDADD=	-lcalendar -ltermcap
8
LDADD=	-lcalendar -ltermcapw
9
9
10
LINKS=	${BINDIR}/ncal ${BINDIR}/cal
10
LINKS=	${BINDIR}/ncal ${BINDIR}/cal
11
MLINKS=	ncal.1 cal.1
11
MLINKS=	ncal.1 cal.1
(-)usr.bin/tabs/Makefile (-2 / +2 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PROG=	tabs
3
PROG=	tabs
4
DPADD=	${LIBTERMCAP}
4
DPADD=	${LIBTERMCAPW}
5
LDADD=	-ltermcap
5
LDADD=	-ltermcapw
6
6
7
.include <bsd.prog.mk>
7
.include <bsd.prog.mk>
(-)usr.bin/telnet/Makefile (-2 / +2 lines)
Lines 21-28 Link Here
21
21
22
LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
22
LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
23
23
24
DPADD=		${LIBTERMCAP} ${LIBTELNET}
24
DPADD=		${LIBTERMCAPW} ${LIBTELNET}
25
LDADD=		-ltermcap ${LIBTELNET}
25
LDADD=		-ltermcapw ${LIBTELNET}
26
26
27
.if !defined(RELEASE_CRUNCH)
27
.if !defined(RELEASE_CRUNCH)
28
CFLAGS+=	-DIPSEC
28
CFLAGS+=	-DIPSEC
(-)usr.bin/tftp/Makefile (-2 / +2 lines)
Lines 7-13 Link Here
7
SRCS=	main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c
7
SRCS=	main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c
8
SRCS+=	tftp-utils.c tftp.c
8
SRCS+=	tftp-utils.c tftp.c
9
CFLAGS+=-I${.CURDIR}/../../libexec/tftpd
9
CFLAGS+=-I${.CURDIR}/../../libexec/tftpd
10
DPADD=	${LIBEDIT} ${LIBTERMCAP}
10
DPADD=	${LIBEDIT} ${LIBTERMCAPW}
11
LDADD=	-ledit -ltermcap
11
LDADD=	-ledit -ltermcapw
12
12
13
.include <bsd.prog.mk>
13
.include <bsd.prog.mk>
(-)usr.bin/tput/Makefile (-2 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PROG=	tput
4
PROG=	tput
5
DPADD=	${LIBTERMCAP}
5
DPADD=	${LIBTERMCAPW}
6
LDADD=	-ltermcap
6
LDADD=	-ltermcapw
7
SCRIPTS=clear.sh
7
SCRIPTS=clear.sh
8
MLINKS=	tput.1 clear.1
8
MLINKS=	tput.1 clear.1
9
9
(-)usr.bin/tset/Makefile (-2 / +2 lines)
Lines 3-10 Link Here
3
PROG=	tset
3
PROG=	tset
4
SRCS=	map.c misc.c set.c term.c tset.c wrterm.c
4
SRCS=	map.c misc.c set.c term.c tset.c wrterm.c
5
5
6
DPADD=	${LIBTERMCAP}
6
DPADD=	${LIBTERMCAPW}
7
LDADD=	-ltermcap
7
LDADD=	-ltermcapw
8
LINKS=	${BINDIR}/tset ${BINDIR}/reset
8
LINKS=	${BINDIR}/tset ${BINDIR}/reset
9
MLINKS=	tset.1 reset.1
9
MLINKS=	tset.1 reset.1
10
10
(-)usr.bin/ul/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PROG=	ul
4
PROG=	ul
5
5
6
DPADD=	${LIBTERMCAP}
6
DPADD=	${LIBTERMCAPW}
7
LDADD=	-ltermcap
7
LDADD=	-ltermcapw
8
8
9
.include <bsd.prog.mk>
9
.include <bsd.prog.mk>
(-)usr.bin/units/Makefile (-2 / +2 lines)
Lines 4-10 Link Here
4
FILES=	units.lib
4
FILES=	units.lib
5
FILESDIR=	${SHAREDIR}/misc
5
FILESDIR=	${SHAREDIR}/misc
6
6
7
LDADD+=-ledit -ltermcap
7
LDADD+=-ledit -ltermcapw
8
DPADD+=${LIBEDIT} ${LIBTERMCAP}
8
DPADD+=${LIBEDIT} ${LIBTERMCAPW}
9
9
10
.include <bsd.prog.mk>
10
.include <bsd.prog.mk>
(-)usr.bin/vi/Makefile (-5 lines)
Lines 36-49 Link Here
36
DPADD=		${LIBUTIL}
36
DPADD=		${LIBUTIL}
37
LDADD=		-lutil
37
LDADD=		-lutil
38
38
39
.if defined(RESCUE) || defined(RELEASE_CRUNCH)
40
DPADD+=		${LIBNCURSES}
41
LDADD+=		-lncurses
42
.else
43
CFLAGS+=	-DUSE_WIDECHAR
39
CFLAGS+=	-DUSE_WIDECHAR
44
DPADD+=		${LIBNCURSESW}
40
DPADD+=		${LIBNCURSESW}
45
LDADD+=		-lncursesw
41
LDADD+=		-lncursesw
46
.endif
47
42
48
.if ${MK_ICONV} == "yes" && !defined(RESCUE) && !defined(RELEASE_CRUNCH)
43
.if ${MK_ICONV} == "yes" && !defined(RESCUE) && !defined(RELEASE_CRUNCH)
49
CFLAGS+=	-DUSE_ICONV
44
CFLAGS+=	-DUSE_ICONV
(-)usr.sbin/cdcontrol/Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
2
3
PROG= cdcontrol
3
PROG= cdcontrol
4
4
5
DPADD=	${LIBEDIT} ${LIBTERMCAP}
5
DPADD=	${LIBEDIT} ${LIBTERMCAPW}
6
LDADD=	-ledit -ltermcap
6
LDADD=	-ledit -ltermcapw
7
7
8
.include <bsd.prog.mk>
8
.include <bsd.prog.mk>
(-)usr.sbin/lpr/lpc/Makefile (-2 / +2 lines)
Lines 13-19 Link Here
13
13
14
WARNS?=	0
14
WARNS?=	0
15
15
16
DPADD=	${LIBLPR} ${LIBEDIT} ${LIBTERMCAP}
16
DPADD=	${LIBLPR} ${LIBEDIT} ${LIBTERMCAPW}
17
LDADD=	${LIBLPR} -ledit -ltermcap
17
LDADD=	${LIBLPR} -ledit -ltermcapw
18
18
19
.include <bsd.prog.mk>
19
.include <bsd.prog.mk>
(-)usr.sbin/ngctl/Makefile (-2 / +2 lines)
Lines 22-29 Link Here
22
22
23
.if !defined(NGCTL_NO_LIBEDIT)
23
.if !defined(NGCTL_NO_LIBEDIT)
24
CFLAGS+= -DEDITLINE
24
CFLAGS+= -DEDITLINE
25
DPADD+=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
25
DPADD+=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAPW}
26
LDADD+=	-lpthread -ledit -ltermcap
26
LDADD+=	-lpthread -ledit -ltermcapw
27
.endif
27
.endif
28
28
29
.include <bsd.prog.mk>
29
.include <bsd.prog.mk>
(-)usr.sbin/ntp/ntpdc/Makefile (-2 / +2 lines)
Lines 15-22 Link Here
15
DPADD=	${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS}
15
DPADD=	${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS}
16
LDADD=	${LIBNTP} -lm -lmd ${LIBOPTS}
16
LDADD=	${LIBNTP} -lm -lmd ${LIBOPTS}
17
17
18
DPADD+=		${LIBEDIT} ${LIBTERMCAP}
18
DPADD+=		${LIBEDIT} ${LIBTERMCAPW}
19
LDADD+=		-ledit -ltermcap
19
LDADD+=		-ledit -ltermcapw
20
CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
20
CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
21
		-I${DESTDIR}/${INCLUDEDIR}/edit
21
		-I${DESTDIR}/${INCLUDEDIR}/edit
22
22
(-)usr.sbin/ntp/ntpq/Makefile (-2 / +2 lines)
Lines 17-24 Link Here
17
DPADD=	${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS}
17
DPADD=	${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS}
18
LDADD=	${LIBNTP} -lm -lmd ${LIBOPTS}
18
LDADD=	${LIBNTP} -lm -lmd ${LIBOPTS}
19
19
20
DPADD+=		${LIBEDIT} ${LIBTERMCAP}
20
DPADD+=		${LIBEDIT} ${LIBTERMCAPW}
21
LDADD+=		-ledit -ltermcap
21
LDADD+=		-ledit -ltermcapw
22
CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
22
CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
23
		-I${DESTDIR}/${INCLUDEDIR}/edit
23
		-I${DESTDIR}/${INCLUDEDIR}/edit
24
24
(-)usr.sbin/pmcstat/Makefile (-2 / +2 lines)
Lines 5-12 Link Here
5
PROG=	pmcstat
5
PROG=	pmcstat
6
MAN=	pmcstat.8
6
MAN=	pmcstat.8
7
7
8
DPADD=	${LIBELF} ${LIBKVM} ${LIBPMC} ${LIBM} ${LIBNCURSES}
8
DPADD=	${LIBELF} ${LIBKVM} ${LIBPMC} ${LIBM} ${LIBNCURSESW}
9
LDADD=	-lelf -lkvm -lpmc -lm -lncurses
9
LDADD=	-lelf -lkvm -lpmc -lm -lncursesw
10
10
11
SRCS=	pmcstat.c pmcstat.h pmcstat_log.c \
11
SRCS=	pmcstat.c pmcstat.h pmcstat_log.c \
12
pmcpl_callgraph.c pmcpl_gprof.c pmcpl_annotate.c \
12
pmcpl_callgraph.c pmcpl_gprof.c pmcpl_annotate.c \
(-)usr.sbin/pppctl/Makefile (-2 / +2 lines)
Lines 5-11 Link Here
5
5
6
WARNS?=	2
6
WARNS?=	2
7
7
8
DPADD=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
8
DPADD=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAPW}
9
LDADD=	-lpthread -ledit -ltermcap
9
LDADD=	-lpthread -ledit -ltermcapw
10
10
11
.include <bsd.prog.mk>
11
.include <bsd.prog.mk>
(-)usr.sbin/watch/Makefile (-2 / +2 lines)
Lines 5-11 Link Here
5
5
6
WARNS?=	2
6
WARNS?=	2
7
7
8
DPADD=	${LIBTERMCAP}
8
DPADD=	${LIBTERMCAPW}
9
LDADD=	-ltermcap
9
LDADD=	-ltermcapw
10
10
11
.include <bsd.prog.mk>
11
.include <bsd.prog.mk>
(-)usr.sbin/wpa/wpa_cli/Makefile (-2 / +2 lines)
Lines 15-21 Link Here
15
CFLAGS+= -D_DIRENT_HAVE_D_TYPE
15
CFLAGS+= -D_DIRENT_HAVE_D_TYPE
16
16
17
CFLAGS+= -DCONFIG_READLINE -I${DESTDIR}/${INCLUDEDIR}/edit
17
CFLAGS+= -DCONFIG_READLINE -I${DESTDIR}/${INCLUDEDIR}/edit
18
LDADD+= -ledit -ltermcap
18
LDADD+= -ledit -ltermcapw
19
DPADD+= ${LIBEDIT} ${LIBTERMCAP}
19
DPADD+= ${LIBEDIT} ${LIBTERMCAPW}
20
20
21
.include <bsd.prog.mk>
21
.include <bsd.prog.mk>

Return to bug 189842