git: 762af9c2134f - main - mail/cyrus-imapd36: some Improvement on option handling

From: Hajimu UMEMOTO <ume_at_FreeBSD.org>
Date: Sat, 07 Jan 2023 07:18:12 UTC
The branch main has been updated by ume:

URL: https://cgit.FreeBSD.org/ports/commit/?id=762af9c2134fce33f8bcbba8e76150b8f6e6e479

commit 762af9c2134fce33f8bcbba8e76150b8f6e6e479
Author:     Hajimu UMEMOTO <ume@FreeBSD.org>
AuthorDate: 2023-01-07 07:17:07 +0000
Commit:     Hajimu UMEMOTO <ume@FreeBSD.org>
CommitDate: 2023-01-07 07:17:59 +0000

    mail/cyrus-imapd36: some Improvement on option handling
---
 mail/cyrus-imapd36/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mail/cyrus-imapd36/Makefile b/mail/cyrus-imapd36/Makefile
index 129bc7388fb9..90ffb4e28ce4 100644
--- a/mail/cyrus-imapd36/Makefile
+++ b/mail/cyrus-imapd36/Makefile
@@ -74,6 +74,7 @@ CLD2_CONFIGURE_ENV=	CLD2_CFLAGS="-I${LOCALBASE}/include" \
 			CLD2_LIBS="-L${LOCALBASE}/lib -lcld2"
 CLD2_LIB_DEPENDS=	libcld2.so:devel/cld2
 HTTP_DESC=		Enable HTTP support
+HTTP_IMPLIES=		SQLITE
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
@@ -92,6 +93,7 @@ IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
+LDAP_CONFIGURE_OFF=	--without-ldap
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
@@ -101,12 +103,15 @@ NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
+PGSQL_CONFIGURE_OFF=	--without-pgsql
 REPLICATION_DESC=	Enable replication (experimental)
 REPLICATION_CONFIGURE_ENABLE=replication
 SRS_DESC=		Enable Sender Rewriting Scheme support
 SRS_CONFIGURE_ENABLE=	srs
 SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
+SQLITE_CONFIGURE_OFF=	--without-sqlite
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
@@ -171,10 +176,6 @@ REINPLACE_ARGS=	-i ''
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE}
-USES+=	sqlite
-.endif
-
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi