git: 7e391f798bae - 2023Q4 - ftp/curl: Convert to options helper

The branch 2023Q4 has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7e391f798baea59a5b3ef50675d42cc32bfc8717

commit 7e391f798baea59a5b3ef50675d42cc32bfc8717
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-10-08 12:28:17 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-10-11 13:11:56 +0000

    ftp/curl: Convert to options helper
    
    (cherry picked from commit aabdfa405a77f8ecabb504e2bde73aae57488ad0)
---
 ftp/curl/Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 2f41a9caf739..2d5b51fdca99 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -26,10 +26,10 @@ CONFIGURE_ARGS=	--disable-werror \
 		--enable-netrc \
 		--enable-openssl-auto-load-config \
 		--enable-progress-meter \
-		--without-ca-bundle \
-		--without-ca-path \
 		--with-fish-functions-dir=${LOCALBASE}/share/fish/completions \
-		--with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions
+		--with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \
+		--without-ca-bundle \
+		--without-ca-path
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE} \
 		ac_cv_func_SSLv2_client_method=no
 GNU_CONFIGURE=	yes
@@ -86,6 +86,7 @@ CURL_DEBUG_CONFIGURE_ENABLE=	curldebug
 DEBUG_CONFIGURE_ENABLE=	debug
 DICT_CONFIGURE_ENABLE=	dict
 FTP_CONFIGURE_ENABLE=	ftp
+GNUTLS_CONFIGURE_ON=	--with-ca-fallback
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libnettle.so:security/nettle
@@ -123,6 +124,7 @@ LIBSSH2_CONFIGURE_WITH=	libssh2
 LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
 MQTT_CONFIGURE_ENABLE=	mqtt
 NTLM_CONFIGURE_ENABLE=	ntlm
+OPENSSL_CONFIGURE_ON=	--with-ca-fallback
 OPENSSL_CONFIGURE_WITH=	openssl=${OPENSSLBASE}
 OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
 OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
@@ -150,10 +152,6 @@ ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL}
-CONFIGURE_ARGS+=--with-ca-fallback
-.endif
-
 .if ((!${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}) || (${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mlibressl*})) && ${PORT_OPTIONS:MTLS_SRP}
 IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
 .endif