Index: Makefile =================================================================== --- Makefile (Revision 544349) +++ Makefile (Arbeitskopie) @@ -1,33 +1,35 @@ # Created by: Andreas Kohn # $FreeBSD$ -PORTNAME= mercurial -PORTVERSION= 5.1.2 -CATEGORIES= devel python -MASTER_SITES= https://www.mercurial-scm.org/release/ +PORTNAME= mercurial +PORTVERSION= 5.4.2 +CATEGORIES= devel python +MASTER_SITES= https://www.mercurial-scm.org/release/ -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_FILE= ${WRKSRC}/COPYING +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe python:2.7 -USE_PYTHON= distutils +USES= cpe python shebangfix +SHEBANG_FILES= contrib/hgweb.fcgi hgweb.cgi +USE_PYTHON= autoplist distutils concurrent +py27_PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -OPTIONS_DEFINE= CA_BUNDLE DATA DOCS NLS FREEBSD -OPTIONS_DEFAULT=CA_BUNDLE DATA -OPTIONS_SUB= yes +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 +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 \ +CONTRIB_FILES= bash_completion \ casesmash.py \ check-code.py \ debugcmdserver.py \ @@ -52,7 +54,7 @@ vim/hgtest.vim \ vim/patchreview.txt \ vim/patchreview.vim -PORTDOCS= CONTRIBUTORS README.rst +PORTDOCS= CONTRIBUTORS README.rst post-install: ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/ Index: distinfo =================================================================== --- distinfo (Revision 544349) +++ 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 = 1596874147 +SHA256 (mercurial-5.4.2.tar.gz) = 5c8b93da701ee39e312da9e35a7f3163e17ed173a4707857bc467c3b3ab74853 +SIZE (mercurial-5.4.2.tar.gz) = 7730738 Index: files/extra-patch-authormapsuffix =================================================================== --- files/extra-patch-authormapsuffix (Revision 544349) +++ 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 544349) +++ files/pkg-message.in (Arbeitskopie) @@ -1,6 +1,11 @@ [ { type: install message: <