diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | ee7b0571c2c18bdec848ed2044223cc88db29bd8 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /secure/usr.bin/sftp | |
| parent | ffda191e301f128a62c152fde92b692548367fca (diff) | |
| parent | 15fc2873832ea5b9b639e701bbbf2e73af8b6a88 (diff) | |
| download | src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.tar.gz src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.zip | |
Merge head from 7/28
Notes
Notes:
svn path=/projects/bmake/; revision=270164
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 15dcaa52061d..bb1c325ed85e 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 2a5eb5d4204e..99872e529731 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 \ |