mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-09 06:51:44 +00:00
Code Issues Releases Activity

mail/neomutt: update to 20230512

Browse Source
This commit is contained in:
Baptiste Daroussin 2023-05-15 13:42:37 +02:00
parent 1c496a596c
commit c58e0a94d8
3 changed files with 4 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/neomutt/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= neomutt
PORTVERSION= 20230407
PORTVERSION= 20230512
CATEGORIES= mail
MAINTAINER= bapt@FreeBSD.org

6
mail/neomutt/distinfo
View File

@ -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

58
mail/neomutt/files/patch-lmap
View File

@ -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
###############################################################################