Add more options

- Add protocol group
- Convert already-enabled protocols to IMAP, POP3, RTSP and SMTP options
- Add DICT, FTP, GOPHER, HTTP, TELNET and TFP options
- Update CA_BUNDLE_DESC
- Use CA_BUNDLE_CONFIGURE_WITH and OPENSSL_CONFIGURE_WITH
- Merge TLS_SRP check

PR:		223967 (based on)
Submitted by:	brnrd

1 files changed, 26 insertions, 15 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index a39727ea7305..a918a3273406 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -13,27 +13,34 @@ COMMENT=	Command line tool and library for transferring data with URLs
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6 LDAP LDAPS LIBSSH2 METALINK PROXY PSL RTMP SMB TLS_SRP
+OPTIONS_DEFINE=	BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK PROXY PSL TLS_SRP
+OPTIONS_GROUP=	PROTOCOL
 OPTIONS_RADIO=	SSL
 OPTIONS_SINGLE=	GSSAPI RESOLV
+OPTIONS_GROUP_PROTOCOL=	DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS LIBSSH2 POP3 RTMP RTSP SMB SMTP TELNET TFTP
 OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL POLARSSL WOLFSSL
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SINGLE_RESOLV=	CARES THREADED_RESOLVER
-OPTIONS_DEFAULT=	CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} HTTP2 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
-CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
-CA_BUNDLE_IMPLIES=	OPENSSL
+OPTIONS_DEFAULT=	CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} HTTP2 IMAP OPENSSL POP3 PROXY RESOLV RTSP SMTP THREADED_RESOLVER TLS_SRP
+CA_BUNDLE_DESC=		Enable CA bundle for OpenSSL/GnuTLS/mbedTLS
 COOKIES_DESC=		Cookies support
 CURL_DEBUG_DESC=	cURL debug memory tracking
+DICT_DESC=		DICT (RFC 2229) support
+HTTP_DESC=		HTTP/HTTPS support
+HTTP2_DESC=		HTTP/2 support (requires HTTP)
+HTTP2_IMPLIES=		HTTP
+IMAP_DESC=		IMAP/IMAPS support
 LDAPS_IMPLIES=		LDAP
 LIBSSH2_DESC=		SCP/SFTP support via libssh2
 LIBSSH2_IMPLIES=	OPENSSL
+POP3_DESC=		POP3/POP3S support
 RESOLV_DESC=		DNS resolving options
 SMB_DESC=		SMB/CIFS support
+SMTP_DESC=		SMTP/SMTPS support
 THREADED_RESOLVER_DESC=	Threaded DNS resolver
 TLS_SRP_DESC=		TLS-SRP (Secure Remote Password) support
 
 CONFIGURE_ARGS=	--disable-werror \
-		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
 		--with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \
 		--without-axtls
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE} \
@@ -59,18 +66,20 @@ DOCS=		BUGS CODE_OF_CONDUCT.md CODE_STYLE.md CONTRIBUTE.md FAQ \
 
 SHEBANG_FILES=	*/*.pl
 
-BROTLI_CONFIGURE_WITH=	brotli=${LOCALBASE}
+BROTLI_CONFIGURE_WITH=	brotli
 BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
-CA_BUNDLE_CONFIGURE_OFF=--without-ca-bundle
-CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
+CA_BUNDLE_CONFIGURE_WITH=	ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 CARES_CONFIGURE_ENABLE=	ares
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 COOKIES_CONFIGURE_ENABLE=	cookies
 CURL_DEBUG_CONFIGURE_ENABLE=	curldebug
 DEBUG_CONFIGURE_ENABLE=	debug
+DICT_CONFIGURE_ENABLE=	dict
+FTP_CONFIGURE_ENABLE=	ftp
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+GOPHER_CONFIGURE_ENABLE=gopher
 GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_BASE_CPPFLAGS=	${GSSAPICPPFLAGS}
 GSSAPI_BASE_LDFLAGS=	${GSSAPILDFLAGS}
@@ -87,11 +96,13 @@ GSSAPI_MIT_LDFLAGS=	${GSSAPILDFLAGS}
 GSSAPI_MIT_LIBS=	${GSSAPILIBS}
 GSSAPI_MIT_USES=	gssapi:mit
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
+HTTP_CONFIGURE_ENABLE=	http
 HTTP2_CONFIGURE_WITH=	nghttp2
 HTTP2_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
 HTTP2_USES=		pkgconfig
 IDN_CONFIGURE_WITH=	libidn2
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
+IMAP_CONFIGURE_ENABLE=	imap
 IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_ENABLE=	ipv6
 LDAP_CONFIGURE_ENABLE=	ldap
@@ -105,20 +116,24 @@ METALINK_LIBS=		-lcrypto
 NSS_CONFIGURE_WITH=	nss
 NSS_LIB_DEPENDS=	libnss3.so:security/nss
 NSS_USES=		pkgconfig
-OPENSSL_CONFIGURE_OFF=	--without-ssl
-OPENSSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
+OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
 OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
 OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
 OPENSSL_USES=		ssl
 POLARSSL_CONFIGURE_WITH=polarssl
 POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:security/polarssl13
+POP3_CONFIGURE_ENABLE=	pop3
 PROXY_CONFIGURE_ENABLE=	proxy
 PSL_CONFIGURE_WITH=	libpsl
 PSL_LIB_DEPENDS=	libpsl.so:dns/libpsl
 RTMP_CONFIGURE_WITH=	librtmp
 RTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
 RTMP_USES=		pkgconfig
+RTSP_ENABLE=		rtsp
 SMB_CONFIGURE_ENABLE=	smb
+SMTP_CONFIGURE_ENABLE=	smtp
+TELNET_CONFIGURE_ENABLE=telnet
+TFTP_CONFIGURE_ENABLE=	tftp
 THREADED_RESOLVER_CONFIGURE_ENABLE=	pthreads threaded-resolver
 TLS_SRP_CONFIGURE_ENABLE=	tls-srp
 WOLFSSL_CONFIGURE_WITH=	cyassl
@@ -126,7 +141,7 @@ WOLFSSL_LIB_DEPENDS=	libwolfssl.so:security/wolfssl
 
 .include <bsd.port.pre.mk>
 
-.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MTLS_SRP}
+.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
 
@@ -134,10 +149,6 @@ IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
 IGNORE=		only supports LDAPS with SSL
 .endif
 
-.if ${PORT_OPTIONS:MTLS_SRP} && ${SSL_DEFAULT:Mlibressl*}
-IGNORE=		unsupported TLS-SRP in LibreSSL
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs scripts|; /^DIST_SUBDIRS = / s| docs scripts||; /cd docs &&/d' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure