diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile index ca8039c1f2d1..fb79122c5ec8 100644 --- a/mail/neomutt/Makefile +++ b/mail/neomutt/Makefile @@ -1,109 +1,109 @@ PORTNAME= neomutt -PORTVERSION= 20230407 +PORTVERSION= 20230512 CATEGORIES= mail MAINTAINER= bapt@FreeBSD.org COMMENT= Bringing together all the Mutt Code WWW= https://neomutt.org LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support \ urlview:textproc/urlview LIB_DEPENDS= libpcre2-posix.so:devel/pcre2 USES= cpe iconv:translit localbase ncurses perl5 pkgconfig python:env shebangfix ssl USE_GITHUB= yes USE_PERL5= build MAKE_JOBS_UNSAFE= yes HAS_CONFIGURE= yes OPTIONS_SUB= yes SHEBANG_FILES= contrib/smime_keys \ contrib/oauth2/mutt_oauth2.py \ data/account-command/macos-keychain/keychain.py OPTIONS_DEFINE= NLS DOCS SASL IDN FLOCK GPGME NOTMUCH OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB NCURSES GSSAPI_BASE OPTIONS_MULTI= HCACHE OPTIONS_MULTI_HCACHE= BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT FLOCK_DESC= Use flock() to lock files GPGME_DESC= Use gpgme to handle pgp NOTMUCH_DESC= Use notmuch for tagging and searching HCACHE_DESC= Header-cache backend KYOTOCABINET_DESC= Kyoto Cabinet support LMDB_DESC= Lightning Memory-Mapped Database support QDBM_DESC= Quick DataBase Manager support TOKYOCABINET_DESC= Tokyo Cabinet support SCREEN_DESC= Screen options CONFIGURE_ARGS= --with-ssl="${OPENSSLBASE}" \ --locales-fix \ --fmemopen \ --pcre2 \ --disable-idn \ --prefix=${PREFIX} \ --mandir=${PREFIX}/man \ ${ICONV_CONFIGURE_ARGS} CONFIGURE_ENV= CC_FOR_BUILD="${CC}" # Header cache BDB_CONFIGURE_ON= --bdb BDB_USES= bdb GDBM_CONFIGURE_ON= --gdbm GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm KYOTOCABINET_CONFIGURE_ON= --kyotocabinet KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet LMDB_CONFIGURE_ON= --lmdb LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb QDBM_CONFIGURE_ON= --qdbm QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm TOKYOCABINET_CONFIGURE_ON= --tokyocabinet TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_CONFIGURE_ON= --idn2 FLOCK_CONFIGURE_ON= --with-lock=flock SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ON= --sasl GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme \ libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error GPGME_CONFIGURE_ENABLE= gpgme NOTMUCH_LIB_DEPENDS= libnotmuch.so:mail/notmuch NOTMUCH_CONFIGURE_ENABLE= notmuch # GSSAPI GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --gss GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gss=${LOCALBASE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-gss=${LOCALBASE} GSSAPI_NONE_CONFIGURE_ON= --disable-gss DOCS_CONFIGURE_OFF= --disable-doc DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \ lynx:www/lynx post-install: ${RM} ${STAGEDIR}${PREFIX}/etc/mime* ${MV} ${STAGEDIR}${PREFIX}/etc/neomuttrc ${STAGEDIR}${PREFIX}/etc/neomuttrc.dist ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/neomutt \ ${STAGEDIR}${PREFIX}/libexec/neomutt/pgpewrap .include diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo index 75ea124691d3..922eb293e9c5 100644 --- a/mail/neomutt/distinfo +++ b/mail/neomutt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682345655 -SHA256 (neomutt-neomutt-20230407_GH0.tar.gz) = 9c1167984337d136368fbca56be8c04a550060a2fdd33c96538910ea13ba6d4f -SIZE (neomutt-neomutt-20230407_GH0.tar.gz) = 3725060 +TIMESTAMP = 1684145379 +SHA256 (neomutt-neomutt-20230512_GH0.tar.gz) = 44a6c9d8e6f58c6a3b21b6af5f044ffd0ed2deb1a7cdc6bdda14669917bd09c4 +SIZE (neomutt-neomutt-20230512_GH0.tar.gz) = 3791505 diff --git a/mail/neomutt/files/patch-lmap b/mail/neomutt/files/patch-lmap deleted file mode 100644 index 728a338f54f0..000000000000 --- a/mail/neomutt/files/patch-lmap +++ /dev/null @@ -1,58 +0,0 @@ -commit 90871d3963ee739c7d52425c77ea4e619b94732c -Author: Pietro Cerutti (@gahr) -Date: Tue Apr 11 06:25:27 2023 +0000 - - Remove use of lmap in auto.def, provide lkill alternative - -diff --git auto.def.orig auto.def -index 00d8839c9..27419a5d8 100644 ---- auto.def.orig -+++ auto.def -@@ -288,6 +288,17 @@ if {1} { - return 0 - } - } -+ -+ # lkill l p is the list of the elements in l that don't match p -+ proc lkill {l p} { -+ set res [list] -+ foreach elem $l { -+ if {![apply $p $elem]} { -+ lappend res $elem -+ } -+ } -+ set res -+ } - } - ############################################################################### - -@@ -1138,9 +1149,7 @@ set conststrings "\ - unsigned char cc_cflags\[\] = {[text2c [expr { - [get-define want-include-path-in-cflags] - ? [get-define CFLAGS] -- : [lmap x [get-define CFLAGS] { -- expr {[string equal -length 2 $x {-I}] ? [continue] : $x} -- }] -+ : [lkill [get-define CFLAGS] {{x} {string equal -length 2 $x {-I}}}] - }]]};\n\ - unsigned char configure_options\[\] = {[text2c $conf_options]};\n" - if {[catch {set fd [open conststrings.c w] -@@ -1225,16 +1234,8 @@ make-config-header config.h -auto $auto_rep -bare $bare_rep -str $str_rep - - ############################################################################### - # Generate .clang_complete --proc cflags-for-clang-complete {} { -- lmap x [get-define CFLAGS] { -- if {[string match "-MJ*" $x]} { -- continue -- } else { -- set x -- } -- } --} --define cflags-one-per-line [string map {" " "\n"} [cflags-for-clang-complete]] -+define cflags-one-per-line [string map {" " "\n"} \ -+ [lkill [get-define CFLAGS] {{x} {string equal -length 3 $x "-MJ"}}]] - make-template .clang_complete.in - - ###############################################################################