From owner-svn-ports-all@freebsd.org Sat Jan 27 18:42:35 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A68ECED0C9E; Sat, 27 Jan 2018 18:42:35 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 58A747485D; Sat, 27 Jan 2018 18:42:35 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5379B6742; Sat, 27 Jan 2018 18:42:35 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0RIgZ59052127; Sat, 27 Jan 2018 18:42:35 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0RIgZgr052126; Sat, 27 Jan 2018 18:42:35 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201801271842.w0RIgZgr052126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 27 Jan 2018 18:42:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460136 - head/ftp/curl X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/ftp/curl X-SVN-Commit-Revision: 460136 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jan 2018 18:42:35 -0000 Author: sunpoet Date: Sat Jan 27 18:42:35 2018 New Revision: 460136 URL: https://svnweb.freebsd.org/changeset/ports/460136 Log: Remove LIBSSH option to avoid circular dependency libssh uses cmake which depends on curl. Modified: head/ftp/curl/Makefile Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Sat Jan 27 18:06:19 2018 (r460135) +++ head/ftp/curl/Makefile Sat Jan 27 18:42:35 2018 (r460136) @@ -13,7 +13,7 @@ COMMENT= Command line tool and library for transferrin LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6 LDAP LDAPS LIBSSH LIBSSH2 METALINK PROXY PSL RTMP SMB TLS_SRP +OPTIONS_DEFINE= BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6 LDAP LDAPS LIBSSH2 METALINK PROXY PSL RTMP SMB TLS_SRP OPTIONS_RADIO= SSL OPTIONS_SINGLE= GSSAPI RESOLV OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL POLARSSL WOLFSSL @@ -25,8 +25,6 @@ CA_BUNDLE_IMPLIES= OPENSSL COOKIES_DESC= Cookies support CURL_DEBUG_DESC= cURL debug memory tracking LDAPS_IMPLIES= LDAP -LIBSSH_DESC= SCP/SFTP support via libssh -LIBSSH_IMPLIES= OPENSSL LIBSSH2_DESC= SCP/SFTP support via libssh2 LIBSSH2_IMPLIES= OPENSSL RESOLV_DESC= DNS resolving options @@ -99,8 +97,6 @@ IPV6_CONFIGURE_ENABLE= ipv6 LDAP_CONFIGURE_ENABLE= ldap LDAP_USE= OPENLDAP=yes LDAPS_CONFIGURE_ENABLE= ldaps -LIBSSH_CONFIGURE_WITH= libssh -LIBSSH_LIB_DEPENDS= libssh.so:security/libssh LIBSSH2_CONFIGURE_WITH= libssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 METALINK_CONFIGURE_WITH=libmetalink