From owner-svn-ports-all@FreeBSD.ORG Sun Feb 23 15:20:41 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 19C725CB; Sun, 23 Feb 2014 15:20:41 +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 02E8E15B3; Sun, 23 Feb 2014 15:20:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1NFKeT3088622; Sun, 23 Feb 2014 15:20:40 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1NFKe2W088621; Sun, 23 Feb 2014 15:20:40 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201402231520.s1NFKe2W088621@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 23 Feb 2014 15:20:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345728 - head/ftp/curl X-SVN-Group: ports-head 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.17 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: Sun, 23 Feb 2014 15:20:41 -0000 Author: sunpoet Date: Sun Feb 23 15:20:40 2014 New Revision: 345728 URL: http://svnweb.freebsd.org/changeset/ports/345728 QAT: https://qat.redports.org/buildarchive/r345728/ Log: - Remove no-op NTLM option PR: ports/186902 Submitted by: Jeremy Chadwick Modified: head/ftp/curl/Makefile Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Sun Feb 23 15:15:00 2014 (r345727) +++ head/ftp/curl/Makefile Sun Feb 23 15:20:40 2014 (r345728) @@ -13,7 +13,7 @@ COMMENT?= Non-interactive tool to get fi LICENSE= MIT -OPTIONS_DEFINE= CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES GSSAPI IDN IPV6 LDAP LDAPS LIBSSH2 NTLM PROXY RTMP SPNEGO TLS_SRP +OPTIONS_DEFINE= CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES GSSAPI IDN IPV6 LDAP LDAPS LIBSSH2 PROXY RTMP SPNEGO TLS_SRP OPTIONS_RADIO= RESOLV SSL OPTIONS_RADIO_RESOLV= CARES THREADED_RESOLVER OPTIONS_RADIO_SSL= CYASSL GNUTLS NSS OPENSSL POLARSSL @@ -92,8 +92,6 @@ LIBSSH2_LIB_DEPENDS= libssh2.so:${PORTSD NSS_CONFIGURE_OFF= --without-nss NSS_CONFIGURE_ON= --with-nss=${LOCALBASE} NSS_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss -NTLM_CONFIGURE_OFF= --disable-ntlm -NTLM_CONFIGURE_ON= --enable-ntlm OPENSSL_CONFIGURE_OFF= --without-ssl OPENSSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE} OPENSSL_CPPFLAGS= -I${OPENSSLINC} @@ -138,10 +136,6 @@ IGNORE= only supports LDAPS with SSL IGNORE= only supports LIBSSH2 with OpenSSL .endif -.if ${PORT_OPTIONS:MNTLM} && !${PORT_OPTIONS:MCYASSL} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL} -IGNORE= only supports NTLM with SSL -.endif - post-patch: @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in