Index: head/security/libssh/Makefile
===================================================================
--- head/security/libssh/Makefile	(revision 343868)
+++ head/security/libssh/Makefile	(revision 343869)
@@ -1,58 +1,60 @@
 # Created by: Alexander Logvinov <ports@logvinov.com>
 # $FreeBSD$
 
 PORTNAME=	libssh
-DISTVERSION=	0.6.0
+DISTVERSION=	0.6.1
 CATEGORIES=	security devel
 MASTER_SITES=	http://git.libssh.org/projects/libssh.git/snapshot/ \
 		LOCAL/fluffy
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Library implementing the SSH1 and SSH2 protocol
 
-OPTIONS_DEFINE=	SSH1
+OPTIONS_DEFINE=	SSH1 STATIC
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	GCRYPT OPENSSL
-OPTIONS_DEFAULT=	OPENSSL
+OPTIONS_DEFAULT=	OPENSSL STATIC
 OPTIONS_SUB=	yes
 
 USE_BZIP2=	yes
 USES=		cmake
 CMAKE_SOURCE_PATH=	${WRKSRC}
 CONFIGURE_WRKSRC=	${CMAKE_SOURCE_PATH}/build
 BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC?=	${BUILD_WRKSRC}
-CMAKE_ARGS+=	-DWITH_STATIC_LIB:BOOL=ON
 USE_LDCONFIG=	yes
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 GCRYPT_CMAKE_ON=	-DWITH_GCRYPT:BOOL=ON
 GCRYPT_CMAKE_OFF=	-DWITH_GCRYPT:BOOL=OFF
 
 OPENSSL_USE=		openssl=yes
 OPENSSL_CMAKE_ON=	-DWITH_OPENSSL:BOOL=ON
 OPENSSL_CMAKE_OFF=	-DWITH_OPENSSL:BOOL=OFF
 
 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
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake
 	@${REINPLACE_CMD} -e '/add_subdirectory.*s)/d' \
 		-e 's|LIB_INSTALL_DIR}|CMAKE_INSTALL_PREFIX}/libdata|' \
 		-e 's|CMAKE_INSTALL_DIR}|CMAKE_INSTALL_DIR}/libssh|' \
 		${PATCH_WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|CMAKE_HAVE_THREADS_LIBRARY|CMAKE_USE_PTHREADS_INIT|' \
 		${PATCH_WRKSRC}/src/threads/CMakeLists.txt \
 		${PATCH_WRKSRC}/src/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|-lssh_threads|-lssh_threads ${PTHREAD_LIBS}|' \
 		-e 's|$${INCLUDE_INSTALL_DIR}|$${INCLUDE_INSTALL_DIR} ${PTHREAD_CFLAGS}|' \
 		${PATCH_WRKSRC}/libssh_threads.pc.cmake
 
 .include <bsd.port.mk>
Index: head/security/libssh/distinfo
===================================================================
--- head/security/libssh/distinfo	(revision 343868)
+++ head/security/libssh/distinfo	(revision 343869)
@@ -1,2 +1,2 @@
-SHA256 (libssh-0.6.0.tar.bz2) = c7affc1d94529a5251f52a5b8076eb3b542d5fbba87da109ddef796de1df0d29
-SIZE (libssh-0.6.0.tar.bz2) = 293784
+SHA256 (libssh-0.6.1.tar.bz2) = dc48605f8d16f86199a74bfc1976e871c3201aec649b23167c8c3d683aa2117a
+SIZE (libssh-0.6.1.tar.bz2) = 300257
Index: head/security/libssh/files/patch-ConfigureChecks.cmake
===================================================================
--- head/security/libssh/files/patch-ConfigureChecks.cmake	(revision 343868)
+++ head/security/libssh/files/patch-ConfigureChecks.cmake	(nonexistent)
@@ -1,18 +0,0 @@
---- ./ConfigureChecks.cmake
-+++ ./ConfigureChecks.cmake
-@@ -169,11 +169,9 @@ if (GCRYPT_FOUND)
-     endif (GCRYPT_VERSION VERSION_GREATER "1.4.6")
- endif (GCRYPT_FOUND)
- 
--if (CMAKE_HAVE_THREADS_LIBRARY)
--    if (CMAKE_USE_PTHREADS_INIT)
--        set(HAVE_PTHREAD 1)
--    endif (CMAKE_USE_PTHREADS_INIT)
--endif (CMAKE_HAVE_THREADS_LIBRARY)
-+if (CMAKE_USE_PTHREADS_INIT)
-+    set(HAVE_PTHREAD 1)
-+endif (CMAKE_USE_PTHREADS_INIT)
- 
- # OPTIONS
- check_c_source_compiles("
-

Property changes on: head/security/libssh/files/patch-ConfigureChecks.cmake
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/security/libssh/pkg-plist
===================================================================
--- head/security/libssh/pkg-plist	(revision 343868)
+++ head/security/libssh/pkg-plist	(revision 343869)
@@ -1,22 +1,22 @@
 include/libssh/callbacks.h
 include/libssh/legacy.h
 include/libssh/libssh.h
 include/libssh/server.h
 include/libssh/sftp.h
 %%SSH1%%include/libssh/ssh1.h
 include/libssh/ssh2.h
 lib/cmake/libssh/libssh-config.cmake
 lib/cmake/libssh/libssh-config-version.cmake
-lib/libssh.a
+%%STATIC%%lib/libssh.a
 lib/libssh.so
 lib/libssh.so.4
-lib/libssh.so.4.3.0
-lib/libssh_threads.a
+lib/libssh.so.4.4.0
+%%STATIC%%lib/libssh_threads.a
 lib/libssh_threads.so
 lib/libssh_threads.so.4
-lib/libssh_threads.so.4.3.0
+lib/libssh_threads.so.4.4.0
 libdata/pkgconfig/libssh.pc
 libdata/pkgconfig/libssh_threads.pc
 @dirrm lib/cmake/libssh
 @dirrmtry lib/cmake
 @dirrm include/libssh