From nobody Thu May 18 08:20:50 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QMNGB6kj7z3bNF0; Thu, 18 May 2023 08:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QMNGB52W5z3Ljs; Thu, 18 May 2023 08:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684398050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I0JCu0d2Cb1iotjvES9fK4ib/A2yXb08JGca7FbxZSg=; b=mSycrPceP0t9KIERJwpQGw+CMd7brQs33PQtsgI6K0Iaey/d9lyL/nnbu+8stt8hCiaNQU fiszR1DsYO2W09euayOB0XiONa5oonw2NiZDR27fhe1H3zFaQIkikrXzHx9gKuuj2Zbtqv /Qf2PiQSLgP/7ZqD6k4SrpcE2fOZft12rX/c+7l6tC2ok2D1I9iEOKR+EkiyuYdpQlA14A lNJBIVM23OmfvDWXdvZQvIrifZTV6x9A+gfHUPGpEOLCaboX26+8GnXX3MmGJnLIB86YMp mMFD+507ZoVLAPxMwJNq3oXzvukwZvDXow8CR6D+J9yqngoQXloH5KWNs+hUsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684398050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I0JCu0d2Cb1iotjvES9fK4ib/A2yXb08JGca7FbxZSg=; b=WG4ryWE9gnPGwSPDbOnQq9iYhT1/7iSh4nYbirgoVIlnQYaBG82XgBg/FQx6K+JtS86SVj xWR8DSvUOkGrvo1/P27OwGKO5EDB0JNfP1hJhg8bpmRsoCbwr8PxAoC0WMa0qdSISVLtdt W1H5RFA4uOB2opjvuVtW510gbAz0aK5txV9gFfNz60deXWHwwRvr30PmSzzDZrfREjpF3P 6C+X9982qQqBRFKekHlfCGV5DS4FQI43gSaMgY6XpGkJ6IVFp4e0/sN+xg6shvLmVptSXR vaRHsY/AjRNmcaR14iyhtHJp+hQ+NbXCLKI5W14RPL/zm6Jb3kRiiBnp8otMHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684398050; a=rsa-sha256; cv=none; b=na3zNN2tRedBRlmueoxnV8BAMJmyotkwe5XxVPINp9RgMFzmFIR5oZVJGOSxr7J27xvvWa HZmNnI4X2d5aTrVHXSMc2kIDJpvfgbZi8fYKtJ/inlmI/DkUgc9nnEuORxvtHzdb6WavxX BAxuLPvdvEYLPzu2QphPYFci0l3teW/3VicQxVDU7yJTcCOwE6P2wA8/Z2FPpTPxVaACUR sJEG5nPchnAkoTjPGO0Vvmldy5tj9YrTFojmQmJq9u0LtY2A6oicYSjSzcS02dF1EZFyuc 913qNsecvcb9gv2bW4oQE3Bai/WLHW2tfwtyDuBzkA/YK+FhXDQPnmoKyu2PaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QMNGB3HNgzdy3; Thu, 18 May 2023 08:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34I8KogU056805; Thu, 18 May 2023 08:20:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34I8Koa1056804; Thu, 18 May 2023 08:20:50 GMT (envelope-from git) Date: Thu, 18 May 2023 08:20:50 GMT Message-Id: <202305180820.34I8Koa1056804@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 37e65e1ec393 - main - mail/mutt: Fix SASL option to not always disable SASL List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37e65e1ec393e94d95f9285501fb9208d475c0cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=37e65e1ec393e94d95f9285501fb9208d475c0cf commit 37e65e1ec393e94d95f9285501fb9208d475c0cf Author: Derek Schrock AuthorDate: 2023-05-13 20:14:46 +0000 Commit: Robert Clausecker 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