mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00
Code Issues Releases Activity

- Update to 0.6.1 maintenance release

Browse Source 
- Make static libs optional
- Remove patch merged upstream
This commit is contained in:
Dima Panov 2014-02-12 09:34:07 +00:00
parent 1054001293
commit a5c760c189
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=343869
4 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/libssh/Makefile
View File

@ -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:

4
security/libssh/distinfo
View File

@ -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

18
security/libssh/files/patch-ConfigureChecks.cmake
View File

@ -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("

8
security/libssh/pkg-plist
View File

@ -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