Index: branches/2020Q3/mail/notmuch/Makefile
===================================================================
--- branches/2020Q3/mail/notmuch/Makefile	(revision 544496)
+++ branches/2020Q3/mail/notmuch/Makefile	(revision 544497)
@@ -1,91 +1,91 @@
 # Created by: DarwinSurvivor <darwinsurvivor@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	notmuch
 PORTVERSION=	0.29.1
 PORTREVISION?=	1
 CATEGORIES?=	mail
 MASTER_SITES=	https://notmuchmail.org/releases/
 
-MAINTAINER=	seschwar@gmail.com
+MAINTAINER=	dbaio@FreeBSD.org
 COMMENT?=	Thread-based email index, search and tagging application
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3
 
 .ifndef MASTERDIR
 LIB_DEPENDS=	libgmime-3.0.so:mail/gmime30 \
 		libxapian.so:databases/xapian-core \
 		libtalloc.so:devel/talloc
 TEST_DEPENDS=	bash:shells/bash \
 		emacs:editors/emacs@nox \
 		dtach:misc/dtach \
 		gdate:sysutils/coreutils \
 		gbase64:sysutils/coreutils \
 		gsed:textproc/gsed \
 		gsha256sum:sysutils/coreutils \
 		gpg:security/gnupg \
 		gwc:sysutils/coreutils \
 		${LOCALBASE}/bin/gdb:devel/gdb
 
 USES=		compiler:c++11-lang gmake gnome pkgconfig python:build,test
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 .endif
 
 USES+=		tar:xz
 
 .ifndef MASTERDIR
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} \
 		--mandir=${MANPREFIX}/man \
 		--prefix=${PREFIX} \
 		--with-bash-completion \
 		--with-retry-lock \
 		--with-zsh-completion \
 		--without-emacs
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 TEST_ENV+=	NOTMUCH_SKIP_TESTS="basic.12 count.14 insert.2[89] insert.3[0-9] message-property.6 regexp-query.21" \
 		TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
 		TEST_GDB=${LOCALBASE}/bin/gdb \
 		V=1
 TEST_TARGET=	test
 .endif
 
 PATCH_WRKSRC=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}
 PKGDIR=		${.CURDIR}
 
 .ifndef MASTERDIR
 OPTIONS_DEFINE=	DOXYGEN MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=	yes
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_WITH=	api-docs
 MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_WITH=	docs
 
 # Avoid conflict with C++20 <version> by ignoring <...> under WRKSRC
 post-patch:
 	@${REINPLACE_CMD} -i .c++20 's/-I$$(srcdir)/-iquote$$(srcdir)/' \
 		${WRKSRC}/*/Makefile.local
 
 # Install bash completions without incurring a dependency on
 # shells/bash-completion.
 post-configure:
 	${REINPLACE_CMD} \
 		-e '/^BASH_ABSOLUTE[[:blank:]]*=/s|=.*|=${LOCALBASE}/bin/bash|' \
 		-e '/^HAVE_BASH[[:blank:]]*=/s/=.*/=1/' \
 		-e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \
 		${WRKSRC}/Makefile.config
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?*
 
 # Keep poudriere-testport(8) happy.
 post-install-MANPAGES-on:
 	@${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-emacs-mua.1.gz
 .endif
 
 .include <bsd.port.mk>
Index: branches/2020Q3/mail/py-afew/Makefile
===================================================================
--- branches/2020Q3/mail/py-afew/Makefile	(revision 544496)
+++ branches/2020Q3/mail/py-afew/Makefile	(revision 544497)
@@ -1,51 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	afew
 DISTVERSION=	1.3.0
 PORTREVISION=	3
 CATEGORIES=	mail python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 PATCH_SITES=	https://github.com/afewmail/${PORTNAME}/commit/
 PATCHFILES=	1d290ab4d631fdcec60b79fd3a4f873e774adac2.patch:-p1 # fix of the documentation build
 
-MAINTAINER=	seschwar@gmail.com
+MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Initial tagging script for Notmuch mail
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dkimpy>0:mail/py-dkimpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}notmuch>0:mail/py-notmuch@${PY_FLAVOR} \
 		notmuch:mail/notmuch
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	MANPAGES DOCS
 OPTIONS_DEFAULT=	MANPAGES
 
 DOCS_BUILD_DEPENDS=	${PY_SPHINX}
 MANPAGES_BUILD_DEPENDS=	${PY_SPHINX}
 MANPAGES_PLIST_FILES=	man/man1/afew.1.gz
 
 PORTDOCS=	*
 
 post-build-MANPAGES-on:
 	@${MAKE_CMD} -C ${WRKSRC}/docs SPHINXBUILD=sphinx-build-${PYTHON_VER} man
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/docs/build/man/afew.1 ${STAGEDIR}${PREFIX}/man/man1
 
 post-build-DOCS-on:
 	@${MAKE_CMD} -C ${WRKSRC}/docs SPHINXBUILD=sphinx-build-${PYTHON_VER} html
 
 post-install-DOCS-on:
 	cd ${WRKSRC}/docs/build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
 
 .include <bsd.port.mk>
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 544496)
+++ branches/2020Q3	(revision 544497)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r544270-544271,544289