Attachment #138953 for bug #185100

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

Lines 2-8 Link Here

(-)b/devel/hg-git/Makefile (-2 / +1 lines)
2	# $FreeBSD: head/devel/hg-git/Makefile 330310 2013-10-14 12:10:40Z wg $	2	# $FreeBSD: head/devel/hg-git/Makefile 330310 2013-10-14 12:10:40Z wg $
3		3
4	PORTNAME= hg-git	4	PORTNAME= hg-git
5	PORTVERSION= 0.4.0	5	PORTVERSION= 0.5.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 19-24 RUN_DEPENDS= ${PKGNAMEPREFIX}dulwich>=*:${PORTSDIR}/devel/dulwich \ Link Here
19	USE_PYTHON= 2	19	USE_PYTHON= 2
20	USE_PYDISTUTILS=yes	20	USE_PYDISTUTILS=yes
21	PYDISTUTILS_AUTOPLIST= yes	21	PYDISTUTILS_AUTOPLIST= yes
22	PYDISTUTILS_PKGNAME= ${PORTNAME:S/-/_/}
23		22
24	.include <bsd.port.mk>	23	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/devel/hg-git/distinfo (-2 / +2 lines)
1	SHA256 (hg-git-0.4.0.tar.gz) = 6a2289539bae5f898c25e66c149cb27eacb3ac2bcd90d3e247ba42ebba9f8a9c	1	SHA256 (hg-git-0.5.0.tar.gz) = bad27f98f4a3d58acbea6495b93d6b7ca27e5544e1c685c4432e5d0fe09fcbee
2	SIZE (hg-git-0.4.0.tar.gz) = 21981	2	SIZE (hg-git-0.5.0.tar.gz) = 28923

Removed Link Here

(-)a/devel/hg-git/files/patch-hggit__git_handler.py (-11 lines)
1	--- ./hggit/git_handler.py.orig 2013-03-24 22:35:51.000000000 +0100
2	+++ ./hggit/git_handler.py 2013-10-05 10:40:01.222598222 +0200
3	@@ -1034,7 +1034,7 @@
4	and ( ref.startswith('refs/heads/') or ref.startswith('refs/tags/') ) ]
5	want = [x for x in want if x not in self.git]
6	return want
7	- f, commit = self.git.object_store.add_pack()
8	+ f, commit = self.git.object_store.add_pack()[:2]
9	try:
10	try:
11	progress = GitProgress(self.ui)




--- ./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,
 )

Return to bug 185100

Removed Link Here

(-)a/devel/hg-git/files/patch-setup.py (-24 lines)
1	--- ./setup.py.orig 2013-03-24 22:35:51.000000000 +0100
2	+++ ./setup.py 2013-03-30 13:51:43.535271164 +0100
3	@@ -1,13 +1,5 @@
4	-try:
5	- from setuptools import setup
6	-except:
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']
14	+from distutils.core import setup
15	+from collections import OrderedDict
16
17	setup(
18	name='hg-git',
19	@@ -26,5 +18,4 @@
20	license='GPLv2',
21	packages=['hggit'],
22	package_data={ 'hggit': ['help/git.rst'] },
23	- install_requires=['dulwich>=0.8.6'] + extra_req,
24	)