Hi, an update to mercurial 2.6.1, released yesterday. patch file is now obsolete.
regress tests for i386 and loongson on the way. Index: devel/mercurial/Makefile =================================================================== RCS file: /cvs/ports/devel/mercurial/Makefile,v retrieving revision 1.52 diff -u -r1.52 Makefile --- devel/mercurial/Makefile 11 Mar 2013 10:50:11 -0000 1.52 +++ devel/mercurial/Makefile 15 May 2013 07:38:18 -0000 @@ -2,7 +2,7 @@ COMMENT = fast, lightweight source control management -MODPY_EGG_VERSION = 2.4.2 +MODPY_EGG_VERSION = 2.6.1 DISTNAME = mercurial-${MODPY_EGG_VERSION} CATEGORIES = devel Index: devel/mercurial/distinfo =================================================================== RCS file: /cvs/ports/devel/mercurial/distinfo,v retrieving revision 1.35 diff -u -r1.35 distinfo --- devel/mercurial/distinfo 9 Jan 2013 11:54:38 -0000 1.35 +++ devel/mercurial/distinfo 15 May 2013 07:38:18 -0000 @@ -1,2 +1,2 @@ -SHA256 (mercurial-2.4.2.tar.gz) = zCEIPX6rTKqBWblB42xyKay7bUGianvtIadxs/Y97fM= -SIZE (mercurial-2.4.2.tar.gz) = 3613392 +SHA256 (mercurial-2.6.1.tar.gz) = tkE6ozn9kahiiN989Pnbm/NEOx/1XoEYUw/bnox4jmQ= +SIZE (mercurial-2.6.1.tar.gz) = 3728067 Index: devel/mercurial/patches/patch-tests_run-tests_py =================================================================== RCS file: devel/mercurial/patches/patch-tests_run-tests_py diff -N devel/mercurial/patches/patch-tests_run-tests_py --- devel/mercurial/patches/patch-tests_run-tests_py 9 Jan 2013 11:54:38 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-tests_run-tests_py,v 1.5 2013/01/09 11:54:38 rpointel Exp $ ---- tests/run-tests.py.orig Wed Jan 2 07:07:38 2013 -+++ tests/run-tests.py Tue Jan 8 11:09:30 2013 -@@ -93,7 +93,8 @@ IMPL_PATH = 'PYTHONPATH' - if 'java' in sys.platform: - IMPL_PATH = 'JYTHONPATH' - --requiredtools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"] -+requiredtools = ["diff", "grep", "unzip", "gunzip", "bunzip2", "sed"] -+requiredtools.insert(0, os.path.basename(PYTHON)) - - defaults = { - 'jobs': ('HGTEST_JOBS', 1), Index: devel/mercurial/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v retrieving revision 1.26 diff -u -r1.26 PLIST --- devel/mercurial/pkg/PLIST 12 Dec 2012 06:07:14 -0000 1.26 +++ devel/mercurial/pkg/PLIST 15 May 2013 07:38:18 -0000 @@ -1,10 +1,12 @@ -@comment $OpenBSD: PLIST,v 1.26 2012/12/12 06:07:14 rpointel Exp $ +@comment $OpenBSD$ bin/hg lib/python${MODPY_VERSION}/site-packages/hgext/ lib/python${MODPY_VERSION}/site-packages/hgext/__init__.py lib/python${MODPY_VERSION}/site-packages/hgext/__init__.pyc lib/python${MODPY_VERSION}/site-packages/hgext/acl.py lib/python${MODPY_VERSION}/site-packages/hgext/acl.pyc +lib/python${MODPY_VERSION}/site-packages/hgext/blackbox.py +lib/python${MODPY_VERSION}/site-packages/hgext/blackbox.pyc lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.py lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc lib/python${MODPY_VERSION}/site-packages/hgext/children.py @@ -141,6 +143,8 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/bdiff.so lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.py lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.pyc +lib/python${MODPY_VERSION}/site-packages/mercurial/branchmap.py +lib/python${MODPY_VERSION}/site-packages/mercurial/branchmap.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.py lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/byterange.py @@ -167,6 +171,8 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/dagutil.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/demandimport.py lib/python${MODPY_VERSION}/site-packages/mercurial/demandimport.pyc +lib/python${MODPY_VERSION}/site-packages/mercurial/dicthelpers.py +lib/python${MODPY_VERSION}/site-packages/mercurial/dicthelpers.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelpers.so lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.py lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.pyc @@ -339,12 +345,18 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/py3kcompat.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/repair.py lib/python${MODPY_VERSION}/site-packages/mercurial/repair.pyc +lib/python${MODPY_VERSION}/site-packages/mercurial/repoview.py +lib/python${MODPY_VERSION}/site-packages/mercurial/repoview.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/revlog.py lib/python${MODPY_VERSION}/site-packages/mercurial/revlog.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/revset.py lib/python${MODPY_VERSION}/site-packages/mercurial/revset.pyc +lib/python${MODPY_VERSION}/site-packages/mercurial/scmposix.py +lib/python${MODPY_VERSION}/site-packages/mercurial/scmposix.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/scmutil.py lib/python${MODPY_VERSION}/site-packages/mercurial/scmutil.pyc +lib/python${MODPY_VERSION}/site-packages/mercurial/scmwindows.py +lib/python${MODPY_VERSION}/site-packages/mercurial/scmwindows.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/setdiscovery.py lib/python${MODPY_VERSION}/site-packages/mercurial/setdiscovery.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/similar.py @@ -377,6 +389,8 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/templates/atom/ lib/python${MODPY_VERSION}/site-packages/mercurial/templates/atom/bookmarkentry.tmpl lib/python${MODPY_VERSION}/site-packages/mercurial/templates/atom/bookmarks.tmpl +lib/python${MODPY_VERSION}/site-packages/mercurial/templates/atom/branchentry.tmpl +lib/python${MODPY_VERSION}/site-packages/mercurial/templates/atom/branches.tmpl lib/python${MODPY_VERSION}/site-packages/mercurial/templates/atom/changelog.tmpl lib/python${MODPY_VERSION}/site-packages/mercurial/templates/atom/changelogentry.tmpl lib/python${MODPY_VERSION}/site-packages/mercurial/templates/atom/error.tmpl @@ -483,6 +497,8 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/ lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/bookmarkentry.tmpl lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/bookmarks.tmpl +lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/branchentry.tmpl +lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/branches.tmpl lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/changelog.tmpl lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/changelogentry.tmpl lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/error.tmpl @@ -519,6 +535,7 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/coal-file.png lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/coal-folder.png lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/excanvas.js +lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/feed-icon-14x14.png lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/hgicon.png lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/hglogo.png lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/mercurial.js @@ -533,6 +550,8 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/treediscovery.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/ui.py lib/python${MODPY_VERSION}/site-packages/mercurial/ui.pyc +lib/python${MODPY_VERSION}/site-packages/mercurial/unionrepo.py +lib/python${MODPY_VERSION}/site-packages/mercurial/unionrepo.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/url.py lib/python${MODPY_VERSION}/site-packages/mercurial/url.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/util.py @@ -545,6 +564,8 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/windows.pyc lib/python${MODPY_VERSION}/site-packages/mercurial/wireproto.py lib/python${MODPY_VERSION}/site-packages/mercurial/wireproto.pyc +lib/python${MODPY_VERSION}/site-packages/mercurial/worker.py +lib/python${MODPY_VERSION}/site-packages/mercurial/worker.pyc @man man/man1/hg.1 @man man/man5/hgignore.5 @man man/man5/hgrc.5