diff options
| -rw-r--r-- | devel/hg-git/Makefile | 3 | ||||
| -rw-r--r-- | devel/hg-git/distinfo | 4 | ||||
| -rw-r--r-- | devel/hg-git/files/patch-hggit__git_handler.py | 11 | ||||
| -rw-r--r-- | devel/hg-git/files/patch-setup.py | 24 |
4 files changed, 3 insertions, 39 deletions
diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile index 18b48bbdd25c..ac6bf909d60c 100644 --- a/devel/hg-git/Makefile +++ b/devel/hg-git/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hg-git -PORTVERSION= 0.4.0 +PORTVERSION= 0.5.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,6 +19,5 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}dulwich>=*:${PORTSDIR}/devel/dulwich \ USE_PYTHON= 2 USE_PYDISTUTILS=yes PYDISTUTILS_AUTOPLIST= yes -PYDISTUTILS_PKGNAME= ${PORTNAME:S/-/_/} .include <bsd.port.mk> diff --git a/devel/hg-git/distinfo b/devel/hg-git/distinfo index 8d2f78ec7fb9..2a0e409934b4 100644 --- a/devel/hg-git/distinfo +++ b/devel/hg-git/distinfo @@ -1,2 +1,2 @@ -SHA256 (hg-git-0.4.0.tar.gz) = 6a2289539bae5f898c25e66c149cb27eacb3ac2bcd90d3e247ba42ebba9f8a9c -SIZE (hg-git-0.4.0.tar.gz) = 21981 +SHA256 (hg-git-0.5.0.tar.gz) = bad27f98f4a3d58acbea6495b93d6b7ca27e5544e1c685c4432e5d0fe09fcbee +SIZE (hg-git-0.5.0.tar.gz) = 28923 diff --git a/devel/hg-git/files/patch-hggit__git_handler.py b/devel/hg-git/files/patch-hggit__git_handler.py deleted file mode 100644 index 9901ae9b0bc5..000000000000 --- a/devel/hg-git/files/patch-hggit__git_handler.py +++ /dev/null @@ -1,11 +0,0 @@ ---- ./hggit/git_handler.py.orig 2013-03-24 22:35:51.000000000 +0100 -+++ ./hggit/git_handler.py 2013-10-05 10:40:01.222598222 +0200 -@@ -1034,7 +1034,7 @@ - and ( ref.startswith('refs/heads/') or ref.startswith('refs/tags/') ) ] - want = [x for x in want if x not in self.git] - return want -- f, commit = self.git.object_store.add_pack() -+ f, commit = self.git.object_store.add_pack()[:2] - try: - try: - progress = GitProgress(self.ui) diff --git a/devel/hg-git/files/patch-setup.py b/devel/hg-git/files/patch-setup.py deleted file mode 100644 index bdab16745110..000000000000 --- a/devel/hg-git/files/patch-setup.py +++ /dev/null @@ -1,24 +0,0 @@ ---- ./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, - ) |