Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Jun 2016 22:11:43 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416981 - head/ftp/curl
Message-ID:  <201606162211.u5GMBhMx072523@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu Jun 16 22:11:43 2016
New Revision: 416981
URL: https://svnweb.freebsd.org/changeset/ports/416981

Log:
  Unbreak.
  
  Sponsored by:	Absolight

Modified:
  head/ftp/curl/Makefile   (contents, props changed)

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Thu Jun 16 20:08:06 2016	(r416980)
+++ head/ftp/curl/Makefile	Thu Jun 16 22:11:43 2016	(r416981)
@@ -33,9 +33,7 @@ TLS_SRP_DESC=		TLS-SRP (Secure Remote Pa
 
 LOCALBASE?=	/usr/local
 
-.include <${.CURDIR}/../../Mk/bsd.default-versions.mk>
-
-.if ${SSL_DEFAULT} != base
+.if exists(${LOCALBASE}/lib/libcrypto.so)
 OPTIONS_DEFAULT+=	GSSAPI_NONE
 .else
 OPTIONS_DEFAULT+=	GSSAPI_BASE
@@ -141,7 +139,7 @@ TLS_SRP_CONFIGURE_ENABLE=	tls-srp
 WOLFSSL_CONFIGURE_WITH=	cyassl
 WOLFSSL_LIB_DEPENDS=	libwolfssl.so:security/wolfssl
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MTLS_SRP}
 IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
@@ -191,4 +189,4 @@ pre-test-PROXY-off:
 	@${ECHO_MSG} "* This is being addressed.               *"
 	@${ECHO_MSG} "******************************************"
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606162211.u5GMBhMx072523>