summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2023-05-15 13:42:37 +0200
committerBaptiste Daroussin <bapt@FreeBSD.org>2023-05-15 13:43:15 +0200
commitc58e0a94d8ea9156e0f23f0a5ba1ef3d11c4f0c8 (patch)
treea76abc9bd7f979bbf6595b78c0114bb95da5a3b6
parent1c496a596c661813e80a627982d4acf654aa0746 (diff)
downloadfreebsd-ports-c58e0a94d8ea9156e0f23f0a5ba1ef3d11c4f0c8.zip
mail/neomutt: update to 20230512
-rw-r--r--mail/neomutt/Makefile2
-rw-r--r--mail/neomutt/distinfo6
-rw-r--r--mail/neomutt/files/patch-lmap58
3 files changed, 4 insertions, 62 deletions
diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index ca8039c1f2d1..fb79122c5ec8 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,5 +1,5 @@
PORTNAME= neomutt
-PORTVERSION= 20230407
+PORTVERSION= 20230512
CATEGORIES= mail
MAINTAINER= bapt@FreeBSD.org
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) <gahr@gahr.ch>
-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
-
- ###############################################################################