From owner-svn-ports-head@FreeBSD.ORG Wed Feb 12 09:34:08 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C71CF2; Wed, 12 Feb 2014 09:34:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 396B61B19; Wed, 12 Feb 2014 09:34:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1C9Y8cw008276; Wed, 12 Feb 2014 09:34:08 GMT (envelope-from fluffy@svn.freebsd.org) Received: (from fluffy@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1C9Y7D4008273; Wed, 12 Feb 2014 09:34:07 GMT (envelope-from fluffy@svn.freebsd.org) Message-Id: <201402120934.s1C9Y7D4008273@svn.freebsd.org> From: Dima Panov Date: Wed, 12 Feb 2014 09:34:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343869 - in head/security/libssh: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 09:34:08 -0000 Author: fluffy Date: Wed Feb 12 09:34:07 2014 New Revision: 343869 URL: http://svnweb.freebsd.org/changeset/ports/343869 QAT: https://qat.redports.org/buildarchive/r343869/ Log: - Update to 0.6.1 maintenance release - Make static libs optional - Remove patch merged upstream Deleted: head/security/libssh/files/patch-ConfigureChecks.cmake Modified: head/security/libssh/Makefile head/security/libssh/distinfo head/security/libssh/pkg-plist Modified: head/security/libssh/Makefile ============================================================================== --- head/security/libssh/Makefile Wed Feb 12 08:43:59 2014 (r343868) +++ head/security/libssh/Makefile Wed Feb 12 09:34:07 2014 (r343869) @@ -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/proj 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 post-patch: Modified: head/security/libssh/distinfo ============================================================================== --- head/security/libssh/distinfo Wed Feb 12 08:43:59 2014 (r343868) +++ head/security/libssh/distinfo Wed Feb 12 09:34:07 2014 (r343869) @@ -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 Modified: head/security/libssh/pkg-plist ============================================================================== --- head/security/libssh/pkg-plist Wed Feb 12 08:43:59 2014 (r343868) +++ head/security/libssh/pkg-plist Wed Feb 12 09:34:07 2014 (r343869) @@ -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