From xors@mailup.net  Sun Feb  2 20:52:32 2014
Return-Path: <xors@mailup.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id B7175F99
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  2 Feb 2014 20:52:32 +0000 (UTC)
Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 844581D93
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  2 Feb 2014 20:52:32 +0000 (UTC)
Received: from compute6.internal (compute6.nyi.mail.srv.osa [10.202.2.46])
	by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 013B4207AE;
	Sun,  2 Feb 2014 15:52:30 -0500 (EST)
Received: from frontend1 ([10.202.2.160])
  by compute6.internal (MEProxy); Sun, 02 Feb 2014 15:52:30 -0500
Received: from oak.spinney.org (unknown [37.110.157.84])
	by mail.messagingengine.com (Postfix) with ESMTPA id AB465C007B0
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  2 Feb 2014 15:52:30 -0500 (EST)
Received: by oak.spinney.org (Postfix, from userid 1001)
	id 9ED032195; Sun,  2 Feb 2014 23:47:55 +0400 (MSK)
Message-Id: <20140202194755.9ED032195@oak.spinney.org>
Date: Sun,  2 Feb 2014 23:47:55 +0400 (MSK)
From: Maxim Samsonov <xors@mailup.net>
Reply-To: Maxim Samsonov <xors@mailup.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH]: devel/py-hgsubversion Fix building with fresh mercurial 2.9
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         186390
>Category:       ports
>Synopsis:       [PATCH]: devel/py-hgsubversion Fix building with fresh mercurial 2.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 02 21:00:00 UTC 2014
>Closed-Date:    Sat May 24 14:25:53 UTC 2014
>Last-Modified:  Sat May 24 14:30:00 UTC 2014
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Feb 2 21:00:08 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186390 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Sat May 24 14:25:52 UTC 2014 
State-Changed-Why:  
Update to 1.6.1, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186390 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186390: commit references a PR
Date: Sat, 24 May 2014 14:25:42 +0000 (UTC)

 Author: wg
 Date: Sat May 24 14:25:38 2014
 New Revision: 355039
 URL: http://svnweb.freebsd.org/changeset/ports/355039
 QAT: https://qat.redports.org/buildarchive/r355039/
 
 Log:
   devel/py-hgsubversion: update to 1.6.1
   
   - Update to 1.6.1
   - Fix SUBVERTY option [1]
   
   PR:		ports/186390 [1]
   Submitted by:	Maxim Samsonov <xors at mailup net> [1]
 
 Modified:
   head/devel/py-hgsubversion/Makefile
   head/devel/py-hgsubversion/distinfo
 
 Modified: head/devel/py-hgsubversion/Makefile
 ==============================================================================
 --- head/devel/py-hgsubversion/Makefile	Sat May 24 14:23:48 2014	(r355038)
 +++ head/devel/py-hgsubversion/Makefile	Sat May 24 14:25:38 2014	(r355039)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	hgsubversion
 -PORTVERSION=	1.6
 +PORTVERSION=	1.6.1
  CATEGORIES=	devel python
  MASTER_SITES=	CHEESESHOP
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 @@ -23,9 +23,9 @@ PYDISTUTILS_AUTOPLIST=	yes
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MSUBVERTPY}
 -RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:${PORTSDIR}/devel/py-subversion
 -.else
  RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subvertpy>=0:${PORTSDIR}/devel/py-subvertpy
 +.else
 +RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:${PORTSDIR}/devel/py-subversion
  .endif
  
  .include <bsd.port.mk>
 
 Modified: head/devel/py-hgsubversion/distinfo
 ==============================================================================
 --- head/devel/py-hgsubversion/distinfo	Sat May 24 14:23:48 2014	(r355038)
 +++ head/devel/py-hgsubversion/distinfo	Sat May 24 14:25:38 2014	(r355039)
 @@ -1,2 +1,2 @@
 -SHA256 (hgsubversion-1.6.tar.gz) = 1a521638525b405406eb1d55b75bc3d16362b98a5e16d9f75817c8c95294ccde
 -SIZE (hgsubversion-1.6.tar.gz) = 172888
 +SHA256 (hgsubversion-1.6.1.tar.gz) = bb2787259a5f9716fe4ff4f6a4e6170fb8109c6f74550cbd92ec314d8d4278a0
 +SIZE (hgsubversion-1.6.1.tar.gz) = 173184
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
