diff options
| author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.bin/telnet | |
| parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
| parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
| download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz | |
Merge head from 7/28
Diffstat (limited to 'usr.bin/telnet')
| -rw-r--r-- | usr.bin/telnet/Makefile | 8 | ||||
| -rw-r--r-- | usr.bin/telnet/Makefile.depend | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index d47bb91..a683f0a 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -13,6 +13,8 @@ SRCS= commands.c main.c network.c ring.c sys_bsd.c \ CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \ -I${TELNETDIR} -I${TELNETDIR}/libtelnet/ +NO_PIE= yes + .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif @@ -21,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 @@ -34,7 +36,6 @@ SRCS+= genget.c getent.c misc.c CFLAGS+= -DHAS_CGETENT .endif -.if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC @@ -47,6 +48,5 @@ CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} LDADD+= -lkrb5 -lhx509 -lasn1 -lcom_err -lroken .endif -.endif .include <bsd.prog.mk> diff --git a/usr.bin/telnet/Makefile.depend b/usr.bin/telnet/Makefile.depend index 6da6466..0bc9047 100644 --- a/usr.bin/telnet/Makefile.depend +++ b/usr.bin/telnet/Makefile.depend @@ -25,7 +25,6 @@ DIRDEPS = \ lib/libpam/libpam \ lib/libtelnet \ lib/libthr \ - lib/ncurses/ncurses \ lib/ncurses/ncursesw \ secure/lib/libcrypto \ |
