From owner-svn-ports-all@freebsd.org  Wed Jun 24 17:21:30 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA57591594B;
 Wed, 24 Jun 2015 17:21:30 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D6E5F191F;
 Wed, 24 Jun 2015 17:21:30 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OHLUji069121;
 Wed, 24 Jun 2015 17:21:30 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OHLU2q069120;
 Wed, 24 Jun 2015 17:21:30 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201506241721.t5OHLU2q069120@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 24 Jun 2015 17:21:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r390499 - 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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jun 2015 17:21:31 -0000

Author: bdrewery
Date: Wed Jun 24 17:21:30 2015
New Revision: 390499
URL: https://svnweb.freebsd.org/changeset/ports/390499

Log:
  Prevent building a broken curl when using the openssl port when GSSAPI_BASE set.
  
  Without this curl would link to both /usr/lib/libssl.so and /usr/local/lib/libssl.so
  resulting in a crash at runtime.
  
  Bump revision as current builds are broken at runtime and need to be rebuilt.
  
  PR:		200555
  Submitted by:	truckman
  Approved by:	maintainer timeout

Modified:
  head/ftp/curl/Makefile

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Wed Jun 24 17:10:41 2015	(r390498)
+++ head/ftp/curl/Makefile	Wed Jun 24 17:21:30 2015	(r390499)
@@ -3,6 +3,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.43.0
+PORTREVISION=	1
 CATEGORIES=	ftp www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet
@@ -161,11 +162,14 @@ IGNORE=		only supports LDAPS with SSL
 IGNORE=		only supports LIBSSH2 with OpenSSL
 .endif
 
-.if ${PORT_OPTIONS:MOPENSSL} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"
+.if ${PORT_OPTIONS:MOPENSSL} && ( \
+	defined(WITH_OPENSSL_PORT) || \
+	(!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)) || \
+	(defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"))
 .if ${PORT_OPTIONS:MGSSAPI_BASE}
-IGNORE=		with GSSAPI_BASE, configure failed to detect OpenSSL/LibreSSL from ports and link against base OpenSSL
+IGNORE=		with GSSAPI_BASE, configure failed to detect OpenSSL/LibreSSL from ports and links against base OpenSSL
 .endif
-.if ${PORT_OPTIONS:MTLS_SRP}
+.if ${PORT_OPTIONS:MTLS_SRP} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"
 IGNORE=		unsupported TLS-SRP in LibreSSL
 .endif
 .endif