diff options
| -rw-r--r-- | security/libssh/Makefile | 10 | ||||
| -rw-r--r-- | security/libssh/distinfo | 4 | ||||
| -rw-r--r-- | security/libssh/files/patch-ConfigureChecks.cmake | 18 | ||||
| -rw-r--r-- | security/libssh/pkg-plist | 8 |
4 files changed, 12 insertions, 28 deletions
diff --git a/security/libssh/Makefile b/security/libssh/Makefile index d6feaabc938f..4048be3fa076 100644 --- a/security/libssh/Makefile +++ b/security/libssh/Makefile @@ -2,7 +2,7 @@ # $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 @@ -10,10 +10,10 @@ MASTER_SITES= http://git.libssh.org/projects/libssh.git/snapshot/ \ 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 @@ -22,7 +22,6 @@ 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 @@ -40,6 +39,9 @@ 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: diff --git a/security/libssh/distinfo b/security/libssh/distinfo index ef8e653bd8a6..dc388171fbd3 100644 --- a/security/libssh/distinfo +++ b/security/libssh/distinfo @@ -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 diff --git a/security/libssh/files/patch-ConfigureChecks.cmake b/security/libssh/files/patch-ConfigureChecks.cmake deleted file mode 100644 index 75fca357ecfb..000000000000 --- a/security/libssh/files/patch-ConfigureChecks.cmake +++ /dev/null @@ -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(" - diff --git a/security/libssh/pkg-plist b/security/libssh/pkg-plist index aac8e9c38ae1..552f1b04940a 100644 --- a/security/libssh/pkg-plist +++ b/security/libssh/pkg-plist @@ -7,14 +7,14 @@ include/libssh/sftp.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 |