svn commit: r553854 - head/ftp/curl

[Matthias Andree]

Author: mandree
Date: Sun Nov  1 20:10:06 2020
New Revision: 553854
URL: https://svnweb.freebsd.org/changeset/ports/553854

Log:
  ftp/curl: avoid auto-enabling ZSTD, make explicit option; ensure GSSAPI compilation.
  
  Since August 2020, curl would auto-enable ZSTD if available while
  configuring, this would however not propagate to the LIB_DEPENDS.
  Make sure to explicitly control ZSTD by introducing an option that
  defaults to off.
  
  While here, also mark BROKEN if GSSAPI_BASE is selected while
  krb5 is installed when building.
  
  PR:		250414
  Approved by:	sunpoet@ (maintainer timeout, 14d)

Modified:
  head/ftp/curl/Makefile

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Sun Nov  1 19:51:47 2020	(r553853)
+++ head/ftp/curl/Makefile	Sun Nov  1 20:10:06 2020	(r553854)
@@ -32,7 +32,7 @@ DOCS=		FAQ FEATURES INSTALL KNOWN_BUGS MAIL-ETIQUETTE 
 
 SHEBANG_FILES=	*/*.pl
 
-OPTIONS_DEFINE=	ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK NTLM PROXY PSL TLS_SRP
+OPTIONS_DEFINE=	ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK NTLM PROXY PSL TLS_SRP ZSTD
 OPTIONS_GROUP=	PROTOCOL
 OPTIONS_RADIO=	SSL
 OPTIONS_SINGLE=	GSSAPI RESOLV
@@ -136,6 +136,8 @@ THREADED_RESOLVER_CONFIGURE_ENABLE=	pthreads threaded-
 TLS_SRP_CONFIGURE_ENABLE=	tls-srp
 WOLFSSL_CONFIGURE_WITH=	wolfssl
 WOLFSSL_LIB_DEPENDS=	libwolfssl.so:security/wolfssl
+ZSTD_CONFIGURE_WITH=	zstd
+ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .include <bsd.port.pre.mk>
 
@@ -149,6 +151,12 @@ IGNORE=		only supports TLS-SRP with either OpenSSL or 
 
 .if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MWOLFSSL}
 IGNORE=		only supports LDAPS with SSL
+.endif
+
+.if ${PORT_OPTIONS:MGSSAPI_BASE} && exists(${LOCALBASE}/lib/libkrb5support.so)
+BROKEN=		The GSSAPI_BASE option is selected, but you have krb5 installed. \
+		This is incompatible. In order to build, either select GSSAPI_MIT, \
+		or temporarily deinstall krb5 to build curl, or build in poudriere
 .endif
 
 post-patch: