diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-06-24 17:21:30 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-06-24 17:21:30 +0000 |
| commit | da907e5cb7c58a714761388dcb7ad52d8a281b98 (patch) | |
| tree | 04c304d7f07dd1926e5189458474a1f19b108b06 /ftp/curl | |
| parent | graphics/darktable: Update to 1.6.7 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=390499
Diffstat (limited to 'ftp/curl')
| -rw-r--r-- | ftp/curl/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index eee4fb9589fa..3a082ae4da82 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -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 |