Date: Sun, 2 Feb 2014 23:47:55 +0400 (MSK) From: Maxim Samsonov <xors@mailup.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/186390: [PATCH]: devel/py-hgsubversion Fix building with fresh mercurial 2.9 Message-ID: <20140202194755.9ED032195@oak.spinney.org> Resent-Message-ID: <201402022100.s12L00cf091111@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186390 >Category: ports >Synopsis: [PATCH]: devel/py-hgsubversion Fix building with fresh mercurial 2.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 02 21:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Maxim Samsonov >Release: FreeBSD 9.2-STABLE amd64 >Organization: >Environment: >Description: Fix building with fresh mercurial 2.9. Patch was obtained from hgsubversion repository. https://bitbucket.org/durin42/hgsubversion/diff/hgsubversion/svnexternals.py?diff2=91cf81a36236&at=default Fix dependencies list. >How-To-Repeat: >Fix: --- devel_py-hgsubversion.patch begins here --- diff --git a/devel/py-hgsubversion/Makefile b/devel/py-hgsubversion/Makefile --- a/devel/py-hgsubversion/Makefile +++ b/devel/py-hgsubversion/Makefile @@ -22,9 +22,9 @@ .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSUBVERTPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subvertpy>=0:${PORTSDIR}/devel/py-subvertpy +.else RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:${PORTSDIR}/devel/py-subversion -.else -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subvertpy>=0:${PORTSDIR}/devel/py-subvertpy .endif post-patch: diff --git a/devel/py-hgsubversion/files/patch-hgsubversion_svnexternals.py b/devel/py-hgsubversion/files/patch-hgsubversion_svnexternals.py new file mode 100644 --- /dev/null +++ b/devel/py-hgsubversion/files/patch-hgsubversion_svnexternals.py @@ -0,0 +1,18 @@ +--- hgsubversion/svnexternals.py.orig 2012-11-17 22:32:09.000000000 +0400 ++++ hgsubversion/svnexternals.py 2014-02-02 23:20:36.556353159 +0400 +@@ -16,9 +16,13 @@ + try: + canonpath = hgutil.canonpath + except (ImportError, AttributeError): +- from mercurial import scmutil +- canonpath = scmutil.canonpath + passpegrev = False ++ try: ++ from mercurial import scmutil ++ canonpath = scmutil.canonpath ++ except (ImportError, AttributeError): ++ from mercurial import pathutil ++ canonpath = pathutil.canonpath + + import util + --- devel_py-hgsubversion.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140202194755.9ED032195>