Index: head/security/libssh/Makefile
===================================================================
--- head/security/libssh/Makefile	(revision 482278)
+++ head/security/libssh/Makefile	(revision 482279)
@@ -1,56 +1,56 @@
 # Created by: Alexander Logvinov <ports@logvinov.com>
 # $FreeBSD$
 
 PORTNAME=	libssh
-DISTVERSION=	0.7.5
+DISTVERSION=	0.8.4
 CATEGORIES=	security devel
-MASTER_SITES=	https://git.libssh.org/projects/libssh.git/snapshot/
+MASTER_SITES=	https://www.libssh.org/files/0.8/
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Library implementing the SSH1 and SSH2 protocol
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_SSL=	openssl-devel
 BROKEN_SSL_REASON_openssl-devel=	error: variable has incomplete type 'EVP_MD_CTX' (aka 'struct evp_md_ctx_st')
 
 OPTIONS_DEFINE=	SSH1 STATIC
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	GCRYPT OPENSSL
 OPTIONS_DEFAULT=	OPENSSL STATIC
 OPTIONS_SUB=	yes
 
 USES=		cmake:outsource cpe tar:xz
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DWITH_EXAMPLES:BOOL=OFF \
 		-DWITH_GSSAPI:BOOL=ON \
 		-DWITH_TESTING:BOOL=OFF \
 		-DWITH_ZLIB:BOOL=ON
 
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CMAKE_ON=	-DWITH_GCRYPT:BOOL=ON
 GCRYPT_CMAKE_OFF=	-DWITH_GCRYPT:BOOL=OFF
 
 OPENSSL_USES=		ssl
 
 SSH1_DESC=		Build with SSH1 support
 SSH1_CMAKE_ON=		-DWITH_SSH1:BOOL=ON
 SSH1_CMAKE_OFF=		-DWITH_SSH1:BOOL=OFF
 
 STATIC_CMAKE_ON=	-DWITH_STATIC_LIB:BOOL=ON
 STATIC_CMAKE_OFF=	-DWITH_STATIC_LIB:BOOL=OFF
 
 post-patch:
-	@${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake
-	@${REINPLACE_CMD} \
+	${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake
+	${REINPLACE_CMD} \
 		-e 's|LIB_INSTALL_DIR}|CMAKE_INSTALL_PREFIX}/libdata|' \
 		-e 's|CMAKE_INSTALL_DIR}|CMAKE_INSTALL_DIR}/libssh|' \
 		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|-lssh_threads|-lssh_threads -lpthread|' \
-		${WRKSRC}/libssh_threads.pc.cmake
-	@${REINPLACE_CMD} -e 's| -pedantic-errors||' \
+#	${REINPLACE_CMD} -e 's|-lssh_threads|-lssh_threads -lpthread|' \
+#		${WRKSRC}/libssh_threads.pc.cmake
+	${REINPLACE_CMD} -e 's| -pedantic-errors||' \
 		${WRKSRC}/cmake/Modules/DefineCompilerFlags.cmake
 
 .include <bsd.port.mk>
Index: head/security/libssh/distinfo
===================================================================
--- head/security/libssh/distinfo	(revision 482278)
+++ head/security/libssh/distinfo	(revision 482279)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493578451
-SHA256 (libssh-0.7.5.tar.xz) = 6f7d5b9f3089164eec7408d35b99194b17352cce436a4a95485b511bce2aab4b
-SIZE (libssh-0.7.5.tar.xz) = 351364
+TIMESTAMP = 1539760504
+SHA256 (libssh-0.8.4.tar.xz) = 6bb07713021a8586ba2120b2c36c468dc9ac8096d043f9b1726639aa4275b81b
+SIZE (libssh-0.8.4.tar.xz) = 425848
Index: head/security/libssh/pkg-plist
===================================================================
--- head/security/libssh/pkg-plist	(revision 482278)
+++ head/security/libssh/pkg-plist	(revision 482279)
@@ -1,20 +1,15 @@
 include/libssh/callbacks.h
 include/libssh/legacy.h
 include/libssh/libssh.h
 include/libssh/libsshpp.hpp
 include/libssh/server.h
 include/libssh/sftp.h
 %%SSH1%%include/libssh/ssh1.h
 include/libssh/ssh2.h
 lib/cmake/libssh/libssh/libssh-config.cmake
 lib/cmake/libssh/libssh/libssh-config-version.cmake
 %%STATIC%%lib/libssh.a
 lib/libssh.so
 lib/libssh.so.4
-lib/libssh.so.4.4.2
-%%STATIC%%lib/libssh_threads.a
-lib/libssh_threads.so
-lib/libssh_threads.so.4
-lib/libssh_threads.so.4.4.2
+lib/libssh.so.4.7.1
 libdata/pkgconfig/libssh.pc
-libdata/pkgconfig/libssh_threads.pc