On Tue 06/05/2025 15:15, Lucas Gabriel Vuotto wrote:
> On Thu, May 01, 2025 at 08:02:32PM +0200, Bjorn Ketelaars wrote:
> > On Tue 15/04/2025 05:25, Bjorn Ketelaars wrote:
> > > Diff below updates notmuch to 0.39. Overview on changes can be found at
> > > https://nmbug.notmuchmail.org/nmweb/show/87cyei9cap.fsf%40tethera.net.
> > > Main change is that the legacy python bindings are no longer supported.
> > > These bindings have been deprecated since 2020. As of this release they
> > > are no longer built or tested, and patches for them will no longer be
> > > accepted.
> > > 
> > > Changes to the port:
> > > - Drop notmuch/py-notmuch as python bindings are no longer supported.
> > >   There are no consumers for this, so this should be no issue.
> > > - No need any more to split up notmuch into notmuch/notmuch and
> > >   notmuch/py-notmuch. From now on notmuch lives in notmuch.
> > > - @pkgpath markers have been set in all of the subpackages.
> > > 
> > > Testing:
> > > - No new failing regression tests.
> > > - Run tested on amd64
> > > - Checked that 'pkg_add -u' works.
> > > 
> > > 
> > > I have a separate diff for changes to notmuch consumers (LDEP in
> > > mail/aerc and mail/neomutt) as well as a quirk.
> > > 
> > > Comments / OK?
> 
> The CLI still works for me, but I mainly consume it with neomutt. I was
> able to build neomutt without modifications tho, so I'd like to see the
> patch for it.

Ah, my bad. I thought that I sent the changes for the consumers of
notmuch, plus a quirk, in a separate mail. Guess I fooled myself. Diff
below.

> ok lucas

Thank you! Also OK for the diff below?


diff --git devel/quirks/Makefile devel/quirks/Makefile
index 4ffdf2c3141..1c06d809745 100644
--- devel/quirks/Makefile
+++ devel/quirks/Makefile
@@ -3,7 +3,7 @@ CATEGORIES =	devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =	quirks-7.108
+PKGNAME =	quirks-7.109
 PKG_ARCH =	*
 MAINTAINER =	Marc Espie <espie@openbsd.org>
 
diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
index 4409b695fba..bd9eaf2c723 100644
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -1250,6 +1250,7 @@ setup_obsolete_reason(
 	5 => 'xsd',
 	29 => 'fastnetmon',
 	3 => 'kross-interpreters-kf5',
+	1 => 'py3-notmucH',
 );
 
 # though it's not yet used, these should be pkgnames, so that eventually
diff --git mail/aerc/Makefile mail/aerc/Makefile
index cd54c6e3d3b..b193c6449a3 100644
--- mail/aerc/Makefile
+++ mail/aerc/Makefile
@@ -8,7 +8,7 @@ MODGO_VERSION =	v0.0.0-20250127210717-2ecb8770224a
 
 V =		0.20.1
 DISTNAME =	aerc-$V
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	mail
 
@@ -35,7 +35,7 @@ FLAVOR ?=
 
 .if ${FLAVOR:Mnotmuch}
 MODGO_FLAGS +=	-tags=notmuch
-LIB_DEPENDS =	mail/notmuch/notmuch
+LIB_DEPENDS =	mail/notmuch,-main
 WANTLIB += notmuch
 .endif
 
diff --git mail/neomutt/Makefile mail/neomutt/Makefile
index ad51ba7f157..06f28b6944d 100644
--- mail/neomutt/Makefile
+++ mail/neomutt/Makefile
@@ -3,6 +3,7 @@ COMMENT=	tty-based e-mail client, forked from Mutt
 GH_ACCOUNT=	neomutt
 GH_PROJECT=	neomutt
 GH_TAGNAME=	20250404
+REVISION=	0
 
 DIST_TUPLE=	github neomutt neomutt-test-files \
 		7404f4423b11cd5da2d123b3636c7a310bbbed9f neomutt-test-files
@@ -76,7 +77,7 @@ WANTLIB+=	sasl2
 
 .if ${FLAVOR:Mnotmuch}
 CONFIGURE_ARGS+= --notmuch
-LIB_DEPENDS+=	mail/notmuch/notmuch,-main
+LIB_DEPENDS+=	mail/notmuch,-main
 WANTLIB+=	notmuch
 .endif