Date: Sat, 11 Apr 2020 16:56:05 +0000 (UTC) From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531436 - in head/devel/tortoisehg: . files Message-ID: <202004111656.03BGu5vJ010966@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arrowd Date: Sat Apr 11 16:56:05 2020 New Revision: 531436 URL: https://svnweb.freebsd.org/changeset/ports/531436 Log: devel/tortoisehg: Update to 5.3.2 Deleted: head/devel/tortoisehg/files/patch-thg Modified: head/devel/tortoisehg/Makefile head/devel/tortoisehg/distinfo head/devel/tortoisehg/files/patch-setup.py head/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py head/devel/tortoisehg/pkg-plist Modified: head/devel/tortoisehg/Makefile ============================================================================== --- head/devel/tortoisehg/Makefile Sat Apr 11 16:33:57 2020 (r531435) +++ head/devel/tortoisehg/Makefile Sat Apr 11 16:56:05 2020 (r531436) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tortoisehg -DISTVERSION= 5.1 +DISTVERSION= 5.3.2 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/tortoisehg/thg/get/ @@ -35,7 +35,7 @@ NO_ARCH= yes SUB_FILES= pkg-message DIST_SUBDIR= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}-thg-${TAGNAME} -TAGNAME= 89b2d1787506 +TAGNAME= 0d5a8de069c5 # Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py EXTRACT_AFTER_ARGS= --exclude ${PORTNAME}-thg-${TAGNAME}/hgext3rd/__init__.py Modified: head/devel/tortoisehg/distinfo ============================================================================== --- head/devel/tortoisehg/distinfo Sat Apr 11 16:33:57 2020 (r531435) +++ head/devel/tortoisehg/distinfo Sat Apr 11 16:56:05 2020 (r531436) @@ -1,3 +1,3 @@ -TIMESTAMP = 1572183642 -SHA256 (tortoisehg/5.1.tar.gz) = 8a59ecf7cadd93ce320e842e9a6c77ad1065e02040262bde0c953028fbb69178 -SIZE (tortoisehg/5.1.tar.gz) = 8262684 +TIMESTAMP = 1586604799 +SHA256 (tortoisehg/5.3.2.tar.gz) = 4e4c974945cdec0b9db05c206f283f8f1eccb180758889adfb4c0225cfea66d1 +SIZE (tortoisehg/5.3.2.tar.gz) = 8576605 Modified: head/devel/tortoisehg/files/patch-setup.py ============================================================================== --- head/devel/tortoisehg/files/patch-setup.py Sat Apr 11 16:33:57 2020 (r531435) +++ head/devel/tortoisehg/files/patch-setup.py Sat Apr 11 16:56:05 2020 (r531436) @@ -1,6 +1,6 @@ ---- setup.py.orig 2016-11-03 15:31:44 UTC +--- setup.py.orig 2020-04-08 09:44:12 UTC +++ setup.py -@@ -452,7 +452,7 @@ class build(_build_orig): +@@ -488,7 +488,7 @@ class build(_build_orig): lambda self: 'py2app' in self.distribution.commands), ('build_ui', None), ('build_qrc', lambda self: 'py2exe' in self.distribution.commands), @@ -9,7 +9,7 @@ ] + _build_orig.sub_commands class clean(_clean_orig): -@@ -666,10 +666,10 @@ def setup_posix(): +@@ -725,10 +725,10 @@ def setup_posix(): dirs.remove('svg') # drop source of .ico files _data_files.append((os.path.join('share/pixmaps/tortoisehg', root), [os.path.join(root, f) for f in files])) Modified: head/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py ============================================================================== --- head/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py Sat Apr 11 16:33:57 2020 (r531435) +++ head/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py Sat Apr 11 16:56:05 2020 (r531436) @@ -1,20 +1,20 @@ ---- tortoisehg/util/hgversion.py.orig 2019-06-27 21:18:37 UTC +--- tortoisehg/util/hgversion.py.orig 2020-04-08 09:44:12 UTC +++ tortoisehg/util/hgversion.py @@ -19,16 +19,4 @@ except AttributeError: - testedwith = '4.9 5.0' + testedwith = b'5.2 5.3' def checkhgversion(v): - """range check the Mercurial version""" - reqvers = testedwith.split() -- v = v.split('+')[0] -- if not v or v == 'unknown' or len(v) >= 12: +- v = v.split(b'+')[0] +- if not v or v == b'unknown' or len(v) >= 12: - # can't make any intelligent decisions about unknown or hashes - return -- vers = re.split(r'\.|-|rc', v)[:2] +- vers = re.split(br'\.|-|rc', v)[:2] - if len(vers) < 2: - return -- if '.'.join(vers) in reqvers: +- if b'.'.join(vers) in reqvers: - return -- return ('This version of TortoiseHg requires Mercurial version %s.n to ' -- '%s.n, but found %s') % (reqvers[0], reqvers[-1], v) +- return (b'This version of TortoiseHg requires Mercurial version %s.n to ' +- b'%s.n, but found %s') % (reqvers[0], reqvers[-1], v) + return Modified: head/devel/tortoisehg/pkg-plist ============================================================================== --- head/devel/tortoisehg/pkg-plist Sat Apr 11 16:33:57 2020 (r531435) +++ head/devel/tortoisehg/pkg-plist Sat Apr 11 16:56:05 2020 (r531436) @@ -95,6 +95,9 @@ bin/thg %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/guess.py %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/guess.pyc %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/guess.pyo +%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/hgconfig.py +%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/hgconfig.pyc +%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/hgconfig.pyo %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/hgemail.py %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/hgemail.pyc %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/hgemail.pyo @@ -146,9 +149,6 @@ bin/thg %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/p4pending.py %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/p4pending.pyc %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/p4pending.pyo -%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pbranch.py -%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pbranch.pyc -%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pbranch.pyo %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/phabreview.py %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/phabreview.pyc %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/phabreview.pyo @@ -248,9 +248,6 @@ bin/thg %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/run.py %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/run.pyc %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/run.pyo -%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/rupdate.py -%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/rupdate.pyc -%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/rupdate.pyo %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/serve.py %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/serve.pyc %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/serve.pyo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004111656.03BGu5vJ010966>