Index: Makefile =================================================================== --- Makefile (Revision 538097) +++ Makefile (Arbeitskopie) @@ -1,19 +1,21 @@ # Created by: Andreas Kohn # $FreeBSD$ -PORTNAME= mercurial -PORTVERSION= 5.1.2 -CATEGORIES= devel python +PORTNAME= mercurial +PORTVERSION= 5.4.1 +CATEGORIES= devel python MASTER_SITES= https://www.mercurial-scm.org/release/ +PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} -MAINTAINER= python@FreeBSD.org -COMMENT= Fast, lightweight source control management system +MAINTAINER= python@FreeBSD.org +COMMENT= Fast, lightweight source control management system -LICENSE= GPLv2 +LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe python:2.7 -USE_PYTHON= distutils +USES= cpe python shebangfix +SHEBANG_REGEX= ./contrib/.*\.(sh|pl|cgi|fcgi) +USE_PYTHON= autoplist distutils concurrent OPTIONS_DEFINE= CA_BUNDLE DATA DOCS NLS FREEBSD OPTIONS_DEFAULT=CA_BUNDLE DATA Index: distinfo =================================================================== --- distinfo (Revision 538097) +++ distinfo (Arbeitskopie) @@ -1,3 +1,3 @@ -TIMESTAMP = 1570127396 -SHA256 (mercurial-5.1.2.tar.gz) = 15af0b090b23649e0e53621a88dde97b55a734d7cb08b77d3df284db70d44e2e -SIZE (mercurial-5.1.2.tar.gz) = 7286238 +TIMESTAMP = 1591456260 +SHA256 (mercurial-5.4.1.tar.gz) = c31c026b09e8e1301ff23b5acc8a8563eeecbf7ff3495110b13688f01ba88ac6 +SIZE (mercurial-5.4.1.tar.gz) = 7725893 Index: files/extra-patch-authormapsuffix =================================================================== --- files/extra-patch-authormapsuffix (Revision 538097) +++ files/extra-patch-authormapsuffix (Arbeitskopie) @@ -1,20 +1,19 @@ ---- hgext/convert/__init__.py.orig 2015-07-18 22:33:53 UTC -+++ hgext/convert/__init__.py -@@ -31,6 +31,7 @@ testedwith = 'internal' - ('d', 'dest-type', '', _('destination repository type'), _('TYPE')), - ('r', 'rev', [], _('import up to source revision REV'), _('REV')), - ('A', 'authormap', '', _('remap usernames using this file'), _('FILE')), -+ ('', 'authormapsuffix', '', _('append this suffix to remapped author names'), _('SUFFIX')), - ('', 'filemap', '', _('remap file names using contents of file'), - _('FILE')), - ('', 'full', None, ---- hgext/convert/convcmd.py.orig 2015-07-18 22:33:53 UTC -+++ hgext/convert/convcmd.py -@@ -136,12 +136,16 @@ class converter(object): +--- 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 @@ + 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 @@ self.commitcache = {} self.authors = {} self.authorfile = None -+ self.authormapsuffix = '' ++ self.authormapsuffix = b'' # Record converted revisions persistently: maps source revision # ID to target revision ID (both strings). (This is how @@ -27,16 +26,7 @@ # Read first the dst author map if any authorfile = self.dest.authorfile() if authorfile and os.path.exists(authorfile): -@@ -395,7 +399,7 @@ class converter(object): - continue - - srcauthor = srcauthor.strip() -- dstauthor = dstauthor.strip() -+ dstauthor = dstauthor.strip() + self.authormapsuffix - if self.authors.get(srcauthor) in (None, dstauthor): - msg = _('mapping author %s to %s\n') - self.ui.debug(msg % (srcauthor, dstauthor)) -@@ -409,7 +413,7 @@ class converter(object): +@@ -482,7 +486,7 @@ def cachecommit(self, rev): commit = self.source.getcommit(rev) Index: files/pkg-message.in =================================================================== --- files/pkg-message.in (Revision 538097) +++ files/pkg-message.in (Arbeitskopie) @@ -1,6 +1,11 @@ [ { type: install message: <