Index: head/devel/mercurial/Makefile
===================================================================
--- head/devel/mercurial/Makefile	(revision 548182)
+++ head/devel/mercurial/Makefile	(revision 548183)
@@ -1,84 +1,85 @@
 # Created by: Andreas Kohn
 # $FreeBSD$
 
 PORTNAME=	mercurial
 PORTVERSION=	5.5
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	https://www.mercurial-scm.org/release/
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Fast, lightweight source control management system
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe python shebangfix
 SHEBANG_FILES=	contrib/hgweb.fcgi hgweb.cgi
 USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=		CA_BUNDLE DATA DOCS NLS FREEBSD
 OPTIONS_DEFAULT=	CA_BUNDLE DATA
 OPTIONS_SUB=		yes
 
 CA_BUNDLE_DESC=		Install CA Certificates
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 DATA_SUB_FILES=		pkg-message
 FREEBSD_DESC=		Patches used internally by the FreeBSD Project
 FREEBSD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-authormapsuffix
 NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-setup.py
 NLS_USES=		gettext
 
 CONTRIB_FILES=	bash_completion \
 		casesmash.py \
 		check-code.py \
 		debugcmdserver.py \
 		debugshell.py \
 		dumprevlog \
 		hg-ssh \
 		hgk \
 		hgsh/Makefile \
 		hgsh/hgsh.c \
 		mercurial.el \
 		mq.el \
 		pylintrc \
 		python-hook-examples.py \
 		simplemerge \
 		tcsh_completion \
 		tcsh_completion_build.sh \
 		undumprevlog \
 		zsh_completion \
 		vim/HGAnnotate.vim \
 		vim/hg-menu.vim \
 		vim/hgcommand.vim \
 		vim/hgtest.vim \
 		vim/patchreview.txt \
 		vim/patchreview.vim
 PORTDOCS=	CONTRIBUTORS README.rst
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} != ${PYTHON_DEFAULT}
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 .endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DATA-on:
 .for d in hgsh vim
 	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/${d}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/www
 .for f in ${CONTRIB_FILES}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${f} \
 		${STAGEDIR}${DATADIR}/contrib/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/hgweb.cgi ${WRKSRC}/contrib/hgweb.* ${STAGEDIR}${DATADIR}/www
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
Index: head/devel/mercurial/files/extra-patch-authormapsuffix
===================================================================
--- head/devel/mercurial/files/extra-patch-authormapsuffix	(revision 548182)
+++ head/devel/mercurial/files/extra-patch-authormapsuffix	(revision 548183)
@@ -1,37 +1,53 @@
---- hgext/convert/convcmd.py.orig	2020-06-05 21:21:27.000000000 +0200
-+++ hgext/convert/convcmd.py	2020-06-06 17:13:20.086884000 +0200
-@@ -74,7 +74,7 @@
+--- hgext/convert/__init__.py.orig	2020-08-03 17:43:51 UTC
++++ hgext/convert/__init__.py
+@@ -59,6 +59,13 @@ testedwith = b'ships-with-hg-core'
+         ),
+         (
+             b'',
++            b'authormapsuffix',
++            b'',
++            _(b'append this suffix to remapped author names'),
++            _(b'SUFFIX')
++        ),
++        (
++            b'',
+             b'filemap',
+             b'',
+             _(b'remap file names using contents of file'),
+--- hgext/convert/convcmd.py.orig	2020-08-03 17:43:51 UTC
++++ hgext/convert/convcmd.py
+@@ -74,7 +74,7 @@ def readauthormap(ui, authorfile, author
                  continue
  
              srcauthor = srcauthor.strip()
 -            dstauthor = dstauthor.strip()
 +            dstauthor = dstauthor.strip() + self.authormapsuffix
              if authors.get(srcauthor) in (None, dstauthor):
                  msg = _(b'mapping author %s to %s\n')
                  ui.debug(msg % (srcauthor, dstauthor))
-@@ -209,12 +209,16 @@
+@@ -209,12 +209,16 @@ class converter(object):
          self.commitcache = {}
          self.authors = {}
          self.authorfile = None
 +        self.authormapsuffix = b''
  
          # Record converted revisions persistently: maps source revision
          # ID to target revision ID (both strings).  (This is how
          # incremental conversions work.)
          self.map = mapfile(ui, revmapfile)
  
 +        if opts.get('authormapsuffix'):
 +            self.authormapsuffix = opts.get('authormapsuffix')
 +
          # Read first the dst author map if any
          authorfile = self.dest.authorfile()
          if authorfile and os.path.exists(authorfile):
-@@ -482,7 +486,7 @@
+@@ -482,7 +486,7 @@ class converter(object):
  
      def cachecommit(self, rev):
          commit = self.source.getcommit(rev)
 -        commit.author = self.authors.get(commit.author, commit.author)
 +        commit.author = self.authors.get(commit.author, commit.author + self.authormapsuffix)
          commit.branch = mapbranch(commit.branch, self.branchmap)
          self.commitcache[rev] = commit
          return commit