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 /secure/usr.bin/sftp | |
parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz |
Merge head from 7/28
Diffstat (limited to 'secure/usr.bin/sftp')
-rw-r--r-- | secure/usr.bin/sftp/Makefile | 4 | ||||
-rw-r--r-- | secure/usr.bin/sftp/Makefile.depend | 4 |
2 files changed, 3 insertions, 5 deletions
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/secure/usr.bin/sftp/Makefile.depend b/secure/usr.bin/sftp/Makefile.depend index 2a5eb5d..99872e5 100644 --- a/secure/usr.bin/sftp/Makefile.depend +++ b/secure/usr.bin/sftp/Makefile.depend @@ -10,7 +10,6 @@ DIRDEPS = \ include/xlocale \ kerberos5/lib/libasn1 \ kerberos5/lib/libheimbase \ - kerberos5/lib/libheimipcc \ kerberos5/lib/libhx509 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ @@ -22,13 +21,12 @@ DIRDEPS = \ lib/libcrypt \ lib/libedit \ lib/libgssapi \ - lib/libldns \ lib/libmd \ lib/libpam/libpam \ lib/libthr \ lib/libutil \ lib/libz \ - lib/ncurses/ncurses \ + lib/ncurses/ncursesw \ secure/lib/libcrypto \ secure/lib/libssh \ |