Attachment #133368 for bug #177830

View | Details | Raw Unified | Return to bug 177830
Collapse All | Expand All




# $FreeBSD: ports/devel/hg-git/Makefile,v 1.13 2012/11/17 05:55:47 svnexp Exp $

PORTNAME=	hg-git
PORTVERSION=	0.4.0
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


LICENSE=	GPLv2

RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=0.8.7:${PORTSDIR}/devel/dulwich \
		mercurial>=2.5.2:${PORTSDIR}/devel/mercurial \
		${PKGNAMEPREFIX}ordereddict>=1.1:${PORTSDIR}/devel/py-ordereddict

MAKE_JOBS_SAFE=	yes

USE_PYTHON=	-2.7
USE_PYDISTUTILS=yes
PYDISTUTILS_PKGNAME=	${PORTNAME:S/-/_/}


Lines 1-2 Link Here

(-)b/devel/hg-git/distinfo (-2 / +2 lines)
1	SHA256 (hg-git-0.3.4.tar.gz) = 3770dd4ce9f230fedff9c699f3a8f8d7210510b799c2ee7df774758026612c50	1	SHA256 (hg-git-0.4.0.tar.gz) = 6a2289539bae5f898c25e66c149cb27eacb3ac2bcd90d3e247ba42ebba9f8a9c
2	SIZE (hg-git-0.3.4.tar.gz) = 18554	2	SIZE (hg-git-0.4.0.tar.gz) = 21981




--- ./setup.py.orig	2013-03-24 22:35:51.000000000 +0100
+++ ./setup.py	2013-03-30 13:51:43.535271164 +0100
@@ -1,13 +1,5 @@
-try:
-    from setuptools import setup
-except:
-    from distutils.core import setup
-
-try:
-    from collections import OrderedDict
-    extra_req = []
-except ImportError:
-    extra_req = ['ordereddict>=1.1']
+from distutils.core import setup
+from collections import OrderedDict
 
 setup(
     name='hg-git',
@@ -26,5 +18,4 @@
     license='GPLv2',
     packages=['hggit'],
     package_data={ 'hggit': ['help/git.rst'] },
-    install_requires=['dulwich>=0.8.6'] + extra_req,
 )

Lines 18-21 The plugin is basically functional and usable now, but there are still some Link Here

(-)b/devel/hg-git/pkg-descr (-1 / +1 lines)
18	edge cases. However, there are several people using it effectively, so please	18	edge cases. However, there are several people using it effectively, so please
19	test it yourself and report encountered bugs upstream (see website). Thanks!	19	test it yourself and report encountered bugs upstream (see website). Thanks!
20		20
21	WWW: http://hg-git.github.com/	21	WWW: http://hg-git.github.com/

Lines 19-22 Link Here

(-)b/devel/hg-git/pkg-plist (+2 lines)
19	%%PYTHON_SITELIBDIR%%/hggit/util.py	19	%%PYTHON_SITELIBDIR%%/hggit/util.py
20	%%PYTHON_SITELIBDIR%%/hggit/util.pyc	20	%%PYTHON_SITELIBDIR%%/hggit/util.pyc
21	%%PYTHON_SITELIBDIR%%/hggit/util.pyo	21	%%PYTHON_SITELIBDIR%%/hggit/util.pyo
		22	%%PYTHON_SITELIBDIR%%/hggit/help/git.rst
		23	@dirrm %%PYTHON_SITELIBDIR%%/hggit/help
22	@dirrm %%PYTHON_SITELIBDIR%%/hggit	24	@dirrm %%PYTHON_SITELIBDIR%%/hggit

Return to bug 177830

Lines 2-8 Link Here

(-)b/devel/hg-git/Makefile (-4 / +5 lines)
2	# $FreeBSD: ports/devel/hg-git/Makefile,v 1.13 2012/11/17 05:55:47 svnexp Exp $	2	# $FreeBSD: ports/devel/hg-git/Makefile,v 1.13 2012/11/17 05:55:47 svnexp Exp $
3		3
4	PORTNAME= hg-git	4	PORTNAME= hg-git
5	PORTVERSION= 0.3.4	5	PORTVERSION= 0.4.0
6	CATEGORIES= devel python	6	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 12-23 COMMENT= Mercurial extension to pull from or push to a Git repository Link Here
12		12
13	LICENSE= GPLv2	13	LICENSE= GPLv2
14		14
15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.5:${PORTSDIR}/devel/dulwich \	15	RUN_DEPENDS= ${PKGNAMEPREFIX}dulwich>=0.8.7:${PORTSDIR}/devel/dulwich \
16	mercurial>=2.3.2:${PORTSDIR}/devel/mercurial	16	mercurial>=2.5.2:${PORTSDIR}/devel/mercurial \
		17	${PKGNAMEPREFIX}ordereddict>=1.1:${PORTSDIR}/devel/py-ordereddict
17		18
18	MAKE_JOBS_SAFE= yes	19	MAKE_JOBS_SAFE= yes
19		20
20	USE_PYTHON= yes	21	USE_PYTHON= -2.7
21	USE_PYDISTUTILS=yes	22	USE_PYDISTUTILS=yes
22	PYDISTUTILS_PKGNAME= ${PORTNAME:S/-/_/}	23	PYDISTUTILS_PKGNAME= ${PORTNAME:S/-/_/}
23		24

Lines 1-17 Link Here

(-)b/devel/hg-git/files/patch-setup.py (-5 / +12 lines)
1	--- ./setup.py.orig 2012-11-01 15:10:46.000000000 +0100	1	--- ./setup.py.orig 2013-03-24 22:35:51.000000000 +0100
2	+++ ./setup.py 2012-11-03 10:28:03.799021557 +0100	2	+++ ./setup.py 2013-03-30 13:51:43.535271164 +0100
3	@@ -1,7 +1,4 @@	3	@@ -1,13 +1,5 @@
4	-try:	4	-try:
5	- from setuptools import setup	5	- from setuptools import setup
6	-except:	6	-except:
7	- from distutils.core import setup	7	- from distutils.core import setup
		8	-
		9	-try:
		10	- from collections import OrderedDict
		11	- extra_req = []
		12	-except ImportError:
		13	- extra_req = ['ordereddict>=1.1']
8	+from distutils.core import setup	14	+from distutils.core import setup
		15	+from collections import OrderedDict
9		16
10	setup(	17	setup(
11	name='hg-git',	18	name='hg-git',
12	@@ -20,5 +17,4 @@	19	@@ -26,5 +18,4 @@
13	license='GPLv2',	20	license='GPLv2',
14	packages=['hggit'],	21	packages=['hggit'],
15	package_data={ 'hggit': ['help/git.rst'] },	22	package_data={ 'hggit': ['help/git.rst'] },
16	- install_requires=['dulwich>=0.8.0'],	23	- install_requires=['dulwich>=0.8.6'] + extra_req,
17	)	24	)