cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to mutt-wizard-3.2.1 with some patches, from maintainer Aisha Tammy

Browse Source
This commit is contained in:
sthen 2022-01-23 14:29:45 +00:00
parent cd0278c6ef
commit 939cb3a492
4 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mail/mutt-wizard/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.6 2021/10/16 14:38:45 thfr Exp $
# $OpenBSD: Makefile,v 1.7 2022/01/23 14:29:45 sthen Exp $
COMMENT = neomutt and isync configuration with good defaults
CATEGORIES = mail
DISTNAME = mutt-wizard-3.2.1.20211006
DISTNAME = mutt-wizard-3.2.1.20220121
GH_ACCOUNT = LukeSmithxyz
GH_PROJECT = mutt-wizard
GH_COMMIT = 85c5d01dcd09058094a8a180c38751e88416b1f4
GH_COMMIT = 29b7b59ffd1b0dfad10c74b5daa6ff67954261b9
EPOCH = 0
@ -27,7 +27,7 @@ USE_GMAKE = Yes
FAKE_FLAGS = PREFIX=${TRUEPREFIX} MANPREFIX=${PREFIX}/man
post-patch:
post-extract:
cd ${WRKSRC} && \
sed -e "s/\<grep\>/ggrep/g" -i bin/mw

4
mail/mutt-wizard/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mutt-wizard-3.2.1.20211006-85c5d01d.tar.gz) = NzpGCHDzOL48MRwgueOaZmMCW3eSWHmpSYIZSjcdUIA=
SIZE (mutt-wizard-3.2.1.20211006-85c5d01d.tar.gz) = 34101
SHA256 (mutt-wizard-3.2.1.20220121-29b7b59f.tar.gz) = LwrZBiZTlfBlgaaL0UbbrO9TNu9prz4I/uT/VRQc0Qc=
SIZE (mutt-wizard-3.2.1.20220121-29b7b59f.tar.gz) = 34439

14
mail/mutt-wizard/patches/patch-bin_mailsync Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-bin_mailsync,v 1.1 2022/01/23 14:29:45 sthen Exp $
Index: bin/mailsync
--- bin/mailsync.orig
+++ bin/mailsync
@@ -40,7 +40,7 @@ case "$(uname)" in
*systemd*|*openrc*) export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus ;;
esac
# remember if a display server is running since `ps` doesn't always contain a display
- pgrepoutput="$(pgrep -a X\(org\|wayland\))"
+ pgrepoutput="$(pgrep X\(org\|wayland\))"
displays="$(echo "$pgrepoutput" | grep -wo "[0-9]*:[0-9]\+" | sort -u)"
notify() { [ -n "$pgrepoutput" ] && for x in ${displays:-0:}; do
export DISPLAY=$x

33
mail/mutt-wizard/patches/patch-bin_mw Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-bin_mw,v 1.1 2022/01/23 14:29:45 sthen Exp $
fix account number switch macro
fix account deletion
publish gpg using gpg-wks protocol
dynamically load mailboxes
Index: bin/mw
--- bin/mw.orig
+++ bin/mw
@@ -173,7 +173,7 @@ delete() { if [ -z "${fulladdr+x}" ]; then
sed -ibu "/IMAPStore $fulladdr-remote$/,/# End profile/d" "$mbsyncrc" 2>/dev/null ; rm -f "$mbsyncrc"bu
rm -rf "${cachedir:?}/${fulladdr:?}" "$accdir/$fulladdr.muttrc" "$accdir/"[0-9]-"$fulladdr.muttrc"
- sed -ibu "/\([0-9]-\)\?$fulladdr.muttrc/d" "$muttrc" 2>/dev/null; rm -f "$muttrc"bu
+ sed -ibu "/macro.*i[0-9].*$fulladdr.muttrc/d" "$muttrc" 2>/dev/null; rm -f "$muttrc"bu
sed -ibu "/account $fulladdr$/,/^\(\s*$\|account\)/d" "$msmtprc" 2>/dev/null; rm -f "$msmtprc"bu
sed -ibu "/account $fulladdr$/,/^\(\s*$\|account\)/d" "$mpoprc" 2>/dev/null; rm -f "$mpoprc"bu
pass rm -f "$fulladdr" >/dev/null 2>&1
@@ -224,11 +224,11 @@ getboxes() { if [ -n "${force+x}" ] ; then
mailboxes="$(echo "$info" | ggrep -v HasChildren | sed "s/.*\" //;s/\"//g" | tr -d '\r')"
fi
[ "$type" = "pop" ] && mailboxes="INBOX"
- for x in $(sed -n "/^macro.* i[0-9] / s/\(^macro.* i\| .*\)//gp " "$muttrc" | sort -u; echo 0); do
+ for x in $(ggrep -Eo "^macro.* i[0-9] " "$muttrc" | sed "s/^macro.* i//g" | sort -u; echo 0); do
idnum=$((idnum + 1))
[ "$idnum" -eq "$x" ] || break
done
- toappend="mailboxes $(echo "$mailboxes" | sed "s/^/\"=/;s/$/\"/" | paste -sd ' ' - )"
+ toappend="mailboxes \`mdir=$maildir/$fulladdr/; find \$mdir -mindepth 1 -type d -name cur | sed -e 's:/cur\$:\":' -e \"s:\$mdir:\\\"=:\" | sort | tr '\\\n' ' '\`"
}
finalize() { echo "$toappend" >> "$accdir/$fulladdr.muttrc"