FreeBSD Port: py27-hg-git-0.3.4

[Kubilay Kocak]

On 29/03/2013 5:05 AM, Tod Olson wrote:
> Having upgraded to mercurial 2.5.2, we see problems with hg-git 0.3.4, and they seem to be fixed with hg-git 0.4.0. Will you be updating the FreeBSD port of hg-git in the near future?
> 
> Best,
> 
> -Tod
> 
> 
> Tod Olson <tod at uchicago.edu>
> Systems Librarian     
> University of Chicago Library
> 
> 
> 
> _______________________________________________
> freebsd-ports at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-ports
> To unsubscribe, send any mail to "freebsd-ports-unsubscribe at freebsd.org"
> 

Tod,

The patch attached updates hg-git to 0.4.0 and tweaks a couple of port
things:

- Re-patch setup.py
- Tab->space in pkg-descr
- Update min version required for dulwich
- Require py-ordereddict for users running Python < 2.7

Kick the tyres, take it for a test run and submit a PR for Marco if it
works out well :)

--
Ta,

Koobs
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 315519)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hg-git
-PORTVERSION=	0.3.4
+PORTVERSION=	0.4.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.5:${PORTSDIR}/devel/dulwich \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.6:${PORTSDIR}/devel/dulwich \
 		mercurial>=2.3.2:${PORTSDIR}/devel/mercurial
 
 MAKE_JOBS_SAFE=	yes
@@ -21,7 +21,13 @@
 USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	${PORTNAME:S/-/_/}
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 270
+RUn_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ordereddict>=1.1:${PORTSDIR}/devel/py-ordereddict
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 315519)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (hg-git-0.3.4.tar.gz) = 3770dd4ce9f230fedff9c699f3a8f8d7210510b799c2ee7df774758026612c50
-SIZE (hg-git-0.3.4.tar.gz) = 18554
+SHA256 (hg-git-0.4.0.tar.gz) = 6a2289539bae5f898c25e66c149cb27eacb3ac2bcd90d3e247ba42ebba9f8a9c
+SIZE (hg-git-0.4.0.tar.gz) = 21981
Index: files/patch-setup.py
===================================================================
--- files/patch-setup.py	(revision 315519)
+++ files/patch-setup.py	(working copy)
@@ -1,5 +1,5 @@
---- ./setup.py.orig	2012-11-01 15:10:46.000000000 +0100
-+++ ./setup.py	2012-11-03 10:28:03.799021557 +0100
+--- ./setup.py.orig	2013-03-25 08:35:51.000000000 +1100
++++ ./setup.py	2013-03-29 15:04:08.555460472 +1100
 @@ -1,7 +1,4 @@
 -try:
 -    from setuptools import setup
@@ -7,11 +7,12 @@
 -    from distutils.core import setup
 +from distutils.core import setup
  
- setup(
-     name='hg-git',
-@@ -20,5 +17,4 @@
+ try:
+     from collections import OrderedDict
+@@ -25,6 +22,4 @@
+     keywords='hg git mercurial',
      license='GPLv2',
      packages=['hggit'],
-     package_data={ 'hggit': ['help/git.rst'] },
--    install_requires=['dulwich>=0.8.0'],
+-    package_data={ 'hggit': ['help/git.rst'] },
+-    install_requires=['dulwich>=0.8.6'] + extra_req,
  )
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 315519)
+++ pkg-descr	(working copy)
@@ -18,4 +18,4 @@
 edge cases. However, there are several people using it effectively, so please
 test it yourself and report encountered bugs upstream (see website). Thanks!
 
-WWW:	http://hg-git.github.com/
+WWW: http://hg-git.github.com/