Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 May 2023 08:20:50 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 37e65e1ec393 - main - mail/mutt: Fix SASL option to not always disable SASL
Message-ID:  <202305180820.34I8Koa1056804@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=37e65e1ec393e94d95f9285501fb9208d475c0cf

commit 37e65e1ec393e94d95f9285501fb9208d475c0cf
Author:     Derek Schrock <dereks@lifeofadishwasher.com>
AuthorDate: 2023-05-13 20:14:46 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-05-18 08:19:52 +0000

    mail/mutt: Fix SASL option to not always disable SASL
    
    With 60ba31d73e SASL_NONE_CONFIGURE_WITH however with it unchecked
    --without-sasl was added.  Always disabling sasl.
    
    Use OPT_CONFIGURE_OFF and OPT_CONFIGURE_ON to make sure --without-sasl
    isn't added when SASL_NONE is unchecked.
    
    PR:             271395
    Approved by:    kh@panix.com (maintainer)
---
 mail/mutt/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 2dd624b27c0f..bf9a5d68b059 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mutt
 DISTVERSION=	2.2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		https://bitbucket.org/mutt/mutt/downloads/ \
@@ -181,7 +181,8 @@ SASL_CYRUS_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 SASL_CYRUS_CONFIGURE_WITH=	sasl=${LOCALBASE}
 SASL_GSASL_LIB_DEPENDS=		libgsasl.so:security/libgsasl
 SASL_GSASL_CONFIGURE_WITH=	gsasl=${LOCALBASE}
-SASL_NONE_CONFIGURE_WITH=	sasl=no
+SASL_NONE_CONFIGURE_ON=		--with-sasl=no
+SASL_NONE_CONFIGURE_OFF=
 
 # Handle ncurses/ncurses-port/slang
 SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305180820.34I8Koa1056804>