On Mon, May 24, 2021 at 09:11:51AM -0400, Aisha Tammy wrote: > Hi, > I've reattached the patch with comments on each > patch and removed the GH_TAGNAME.
> Thanks, > Aisha Committed. Thanks! --Kurt > diff --git a/mail/mutt-wizard/Makefile b/mail/mutt-wizard/Makefile > index 016d0eacb91..b8b3034b143 100644 > --- a/mail/mutt-wizard/Makefile > +++ b/mail/mutt-wizard/Makefile > @@ -2,10 +2,11 @@ > > COMMENT = neomutt and isync configuration with good defaults > CATEGORIES = mail > +DISTNAME = mutt-wizard-3.2.1p20210504 > > GH_ACCOUNT = LukeSmithxyz > GH_PROJECT = mutt-wizard > -GH_TAGNAME = v3.1.1 > +GH_COMMIT = 80aee073122c63d1b570dc32e4490909ff15753b > > EPOCH = 0 > > @@ -14,10 +15,11 @@ MAINTAINER = Aisha Tammy <[email protected]> > # GPLv3 > PERMIT_PACKAGE = Yes > > -RUN_DEPENDS = mail/neomutt \ > +RUN_DEPENDS = mail/neomutt,gpgme,sasl,notmuch \ > mail/isync \ > mail/msmtp \ > - security/password-store > + security/password-store \ > + sysutils/coreutils > > NO_BUILD = Yes > NO_TEST = Yes > diff --git a/mail/mutt-wizard/distinfo b/mail/mutt-wizard/distinfo > index c7ba28ea0eb..314c589677c 100644 > --- a/mail/mutt-wizard/distinfo > +++ b/mail/mutt-wizard/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (mutt-wizard-3.1.1.tar.gz) = > 8H7/c2LfKQkxddAa8iwPQwk7aQK/U0P5KiWroO8ERuU= > -SIZE (mutt-wizard-3.1.1.tar.gz) = 33346 > +SHA256 (mutt-wizard-3.2.1p20210504-80aee073.tar.gz) = > ElO1Qk5iy0wKcMVcv2GtAPYD5Hf5o/6ycs403qmj3AQ= > +SIZE (mutt-wizard-3.2.1p20210504-80aee073.tar.gz) = 33798 > diff --git a/mail/mutt-wizard/patches/patch-bin_mailsync > b/mail/mutt-wizard/patches/patch-bin_mailsync > new file mode 100644 > index 00000000000..e3b654935cd > --- /dev/null > +++ b/mail/mutt-wizard/patches/patch-bin_mailsync > @@ -0,0 +1,26 @@ > +$OpenBSD$ > + > +pidof is not on openbsd, use pgrep > +pgrep has no -a on openbsd > + > +Index: bin/mailsync > +--- bin/mailsync.orig > ++++ bin/mailsync > +@@ -14,7 +14,7 @@ > + # Run only if user logged in (prevent cron errors) > + pgrep -u "${USER:=$LOGNAME}" >/dev/null || { echo "$USER not logged in; > sync will not run."; exit ;} > + # Run only if not already running in other instance > +-pidof -s mbsync >/dev/null && { echo "mbsync is already running." ; exit ;} > ++pgrep mbsync >/dev/null && { echo "mbsync is already running." ; exit ;} > + > + # First, we have to get the right variables for the mbsync file, the pass > + # archive, notmuch and the GPG home. This is done by searching common > profile > +@@ -40,7 +40,7 @@ case "$(uname)" in > + ;; > + *) > + # 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 > diff --git a/mail/mutt-wizard/patches/patch-bin_mw > b/mail/mutt-wizard/patches/patch-bin_mw > new file mode 100644 > index 00000000000..a30e5b9b8d6 > --- /dev/null > +++ b/mail/mutt-wizard/patches/patch-bin_mw > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +rename for coreutils gseq > + > +Index: bin/mw > +--- bin/mw.orig > ++++ bin/mw > +@@ -226,7 +226,7 @@ getboxes() { if [ -n "${force+x}" ] ; then > + mailboxes="$(echo "$info" | grep -v HasChildren | sed "s/.*\" > //;s/\"//g" | tr -d ' ')" > + fi > + [ "$type" = "pop" ] && mailboxes="INBOX" > +- getaccounts; for x in $(seq 1 9); do echo "$accounts" | grep -q "^$x:" > || { export idnum="$x"; break ;}; done > ++ getaccounts; for x in $(gseq 1 9); do echo "$accounts" | grep -q "^$x:" > || { export idnum="$x"; break ;}; done > + toappend="mailboxes $(echo "$mailboxes" | sed "s/^/\"=/;s/$/\"/" | > paste -sd ' ' - )" > + for x in $mailboxes; do > + case "$x" in >
