4 files changed, 31 insertions, 36 deletions

diff --git a/security/libssh/Makefile b/security/libssh/Makefile
index 177e57a3a16b..2cfbb14d5872 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libssh
-DISTVERSION=	0.9.4
+PORTVERSION=	0.9.5
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.libssh.org/files/${PORTVERSION:R}/
 
@@ -13,32 +13,27 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake cpe tar:xz
-USE_LDCONFIG=	yes
 
 CMAKE_OFF=	WITH_EXAMPLES
+CMAKE_ON=	BUILD_STATIC_LIB
+USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	GSSAPI STATIC ZLIB
+OPTIONS_DEFINE=	GSSAPI ZLIB
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	GCRYPT OPENSSL
-OPTIONS_DEFAULT=GSSAPI OPENSSL STATIC ZLIB
-OPTIONS_SUB=	yes
+OPTIONS_DEFAULT=GSSAPI OPENSSL ZLIB
 
+GCRYPT_CMAKE_BOOL=	WITH_GCRYPT
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
-GCRYPT_CMAKE_BOOL=	WITH_GCRYPT
 GSSAPI_CMAKE_BOOL=	WITH_GSSAPI
 OPENSSL_USES=		ssl
-STATIC_CMAKE_BOOL=	BUILD_STATIC_LIB
 ZLIB_CMAKE_BOOL=	WITH_ZLIB
 
 post-patch:
-	${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
+	@${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake
 
-post-install-STATIC-on:
-	${INSTALL_DATA} ${CONFIGURE_WRKSRC}/src/libssh.a ${STAGEDIR}${PREFIX}/lib/
+post-install:
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libssh.a ${STAGEDIR}${PREFIX}/lib/
 
 .include <bsd.port.mk>
diff --git a/security/libssh/distinfo b/security/libssh/distinfo
index 121793732cfd..e6f132c59a8f 100644
--- a/security/libssh/distinfo
+++ b/security/libssh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586473871
-SHA256 (libssh-0.9.4.tar.xz) = 150897a569852ac05aac831dc417a7ba8e610c86ca2e0154a99c6ade2486226b
-SIZE (libssh-0.9.4.tar.xz) = 500776
+TIMESTAMP = 1599924229
+SHA256 (libssh-0.9.5.tar.xz) = acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718
+SIZE (libssh-0.9.5.tar.xz) = 502876
diff --git a/security/libssh/pkg-descr b/security/libssh/pkg-descr
index 6714f079e20a..65d2dd86e964 100644
--- a/security/libssh/pkg-descr
+++ b/security/libssh/pkg-descr
@@ -3,22 +3,21 @@ implementation by the mean of a library. The complete control of the client is
 made by the programmer. With libssh, you can remotely execute programs, transfer
 files, use a secure and transparent tunnel for your remote programs.
 With its Secure FTP implementation, you can play with remote files easily,
-without third-party programs others than libcrypto (from openssl).
+without third-party programs others than libcrypto (from OpenSSL).
 
 libssh features:
+- Full C library functions for manipulating a client-side SSH connection
+- SSH2 protocol compliant
+- Fully configurable sessions
+- Server support, SSH agent authentication support
+- Support for AES-128, AES-192, AES-256, Blowfish, 3DES in CBC mode
+- Use multiple SSH connections in a same process, at same time
+- Use multiple channels in the same connection
+- Thread safety when using different sessions at same time
+- POSIX-like SFTP implementation with openssh extension support
+- SCP implementation
+- RSA and DSS server public key supported
+- Compression support (with zlib)
+- Public key (RSA and DSS), password and keyboard-interactive authentication
 
- * Full C library functions for manipulating a client-side SSH connection
- * SSH2 protocol compliant
- * Fully configurable sessions
- * Server support, SSH agent authentication support
- * Support for AES-128, AES-192, AES-256, Blowfish, 3DES in CBC mode
- * Use multiple SSH connections in a same process, at same time
- * Use multiple channels in the same connection
- * Thread safety when using different sessions at same time
- * POSIX-like SFTP implementation with openssh extension support
- * SCP implementation
- * RSA and DSS server public key supported
- * Compression support (with zlib)
- * Public key (RSA and DSS), password and keyboard-interactive authentication
-
-WWW: http://www.libssh.org/
+WWW: https://www.libssh.org/
diff --git a/security/libssh/pkg-plist b/security/libssh/pkg-plist
index 91b982db2974..d346f4d78d64 100644
--- a/security/libssh/pkg-plist
+++ b/security/libssh/pkg-plist
@@ -1,15 +1,16 @@
 include/libssh/callbacks.h
 include/libssh/legacy.h
 include/libssh/libssh.h
+include/libssh/libssh_version.h
 include/libssh/libsshpp.hpp
 include/libssh/server.h
 include/libssh/sftp.h
 include/libssh/ssh2.h
 lib/cmake/libssh/libssh-config-release.cmake
-lib/cmake/libssh/libssh-config.cmake
 lib/cmake/libssh/libssh-config-version.cmake
-%%STATIC%%lib/libssh.a
+lib/cmake/libssh/libssh-config.cmake
+lib/libssh.a
 lib/libssh.so
 lib/libssh.so.4
-lib/libssh.so.4.8.5
+lib/libssh.so.4.8.6
 libdata/pkgconfig/libssh.pc