git: 294c4c05d691 - main - mail/mutt: Update to 2.2.5 add GNU SASL option
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 20 May 2022 15:40:08 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=294c4c05d6916e5c0a397806c154b914f3c326f2
commit 294c4c05d6916e5c0a397806c154b914f3c326f2
Author: Derek Schrock <dereks@lifeofadishwasher.com>
AuthorDate: 2022-05-20 07:06:25 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-05-20 15:37:41 +0000
mail/mutt: Update to 2.2.5 add GNU SASL option
ChangeLog: https://marc.info/?l=mutt-users&m=165272386215588&w=2
* Move SASL auth to a OPTIONS_SINGLE
SASL_CYRUS Cyrus SASL default (old SASL option)
SASL_GSASL GNU SASL
PR: 264091
Reported by: dereks@lifeofadishwasher.com (maintainer)
---
mail/mutt/Makefile | 21 +++++++++++++--------
mail/mutt/distinfo | 6 +++---
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 8659b0e2dc86..7fcaae1d938f 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,8 +1,7 @@
# Created by: Udo Schweigert
PORTNAME= mutt
-DISTVERSION= 2.2.4
-PORTREVISION= 1
+DISTVERSION= 2.2.5
CATEGORIES+= mail
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
https://bitbucket.org/mutt/mutt/downloads/ \
@@ -51,16 +50,18 @@ INFO= ${PORTNAME}
OPTIONS_DEFINE= AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK GPGME \
GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \
- REVERSE_REPLY_PATCH SASL SMART_DATE SMIME SMTP URLVIEW
+ REVERSE_REPLY_PATCH SMART_DATE SMIME SMTP URLVIEW
OPTIONS_DEFAULT= AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_LMDB HTML \
ICONV IDN IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES \
MAILDIR_MTIME_PATCH NCURSES NLS QUOTE_PATCH \
- REVERSE_REPLY_PATCH SASL SMART_DATE SMIME SMTP URLVIEW
+ REVERSE_REPLY_PATCH SASL_CYRUS SMART_DATE SMIME SMTP \
+ URLVIEW
-OPTIONS_SINGLE= GSSAPI HCACHE SCREEN
+OPTIONS_SINGLE= GSSAPI HCACHE SASL SCREEN
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_GDBM HCACHE_KYOTOCABINET HCACHE_LMDB \
HCACHE_NONE HCACHE_QDBM HCACHE_TOKYOCABINET
+OPTIONS_SINGLE_SASL= SASL_CYRUS SASL_GSASL SASL_NONE
OPTIONS_SINGLE_SCREEN= NCURSES SLANG
OPTIONS_SUB= yes
@@ -87,7 +88,9 @@ NCURSES_DESC= Ncurses support
NLS_DESC= Native language support (implies ICONV)
QUOTE_PATCH_DESC= Extended quoting
REVERSE_REPLY_PATCH_DESC= Reverse_reply
-SASL_DESC= SASL authentication
+SASL_CYRUS_DESC= Cyrus SASL Authentication
+SASL_GSASL_DESC= GNU SASL Authentication
+SASL_NONE_DESC= Disable SASL Authentication
SLANG_DESC= SLANG support
SMART_DATE_DESC= Dynamic date formatting with "%@"
SMIME_DESC= SMIME email check option patch
@@ -174,8 +177,10 @@ QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply
-SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE}
+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}
# Handle ncurses/ncurses-port/slang
SLANG_LIB_DEPENDS= libslang.so:devel/libslang2
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 03d890dc8244..566b0cbd0ac9 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1651351940
-SHA256 (mutt/mutt-2.2.4.tar.gz) = b82776bebff0e10820a33fa1e7eafa5cba4ab3a011b08e83b66ed62d75c6e060
-SIZE (mutt/mutt-2.2.4.tar.gz) = 5515825
+TIMESTAMP = 1653001771
+SHA256 (mutt/mutt-2.2.5.tar.gz) = ff8b781159794adcca126b551d5e419174b7b38a582a159bfe4e13451a757e47
+SIZE (mutt/mutt-2.2.5.tar.gz) = 5516189
SHA256 (mutt/mutt-2.2.0.vc.greeting) = 7abb467cfaa0ccbfa1fa7cdf8585eefef94e039459ff95fb59efe23043d941d2
SIZE (mutt/mutt-2.2.0.vc.greeting) = 1979
SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02