FreeBSD Bugzilla – Attachment 133368 Details for
Bug 177830
[maintainer-update] [patch] devel/hg-git: Update to 0.4.0 release
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 3.20 KB, created by
Marco Bröder
on 2013-04-13 07:40:02 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Marco Bröder
Created:
2013-04-13 07:40:02 UTC
Size:
3.20 KB
patch
obsolete
>diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile >index 48c2538..6a516fc 100644 >--- a/devel/hg-git/Makefile >+++ b/devel/hg-git/Makefile >@@ -2,7 +2,7 @@ > # $FreeBSD: ports/devel/hg-git/Makefile,v 1.13 2012/11/17 05:55:47 svnexp Exp $ > > PORTNAME= hg-git >-PORTVERSION= 0.3.4 >+PORTVERSION= 0.4.0 > CATEGORIES= devel python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} >@@ -12,12 +12,13 @@ COMMENT= Mercurial extension to pull from or push to a Git repository > > LICENSE= GPLv2 > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.5:${PORTSDIR}/devel/dulwich \ >- mercurial>=2.3.2:${PORTSDIR}/devel/mercurial >+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= yes >+USE_PYTHON= -2.7 > USE_PYDISTUTILS=yes > PYDISTUTILS_PKGNAME= ${PORTNAME:S/-/_/} > >diff --git a/devel/hg-git/distinfo b/devel/hg-git/distinfo >index c6d272e..8d2f78e 100644 >--- a/devel/hg-git/distinfo >+++ b/devel/hg-git/distinfo >@@ -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 >diff --git a/devel/hg-git/files/patch-setup.py b/devel/hg-git/files/patch-setup.py >index adceafe..bdab167 100644 >--- a/devel/hg-git/files/patch-setup.py >+++ b/devel/hg-git/files/patch-setup.py >@@ -1,17 +1,24 @@ >---- ./setup.py.orig 2012-11-01 15:10:46.000000000 +0100 >-+++ ./setup.py 2012-11-03 10:28:03.799021557 +0100 >-@@ -1,7 +1,4 @@ >+--- ./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', >-@@ -20,5 +17,4 @@ >+@@ -26,5 +18,4 @@ > license='GPLv2', > packages=['hggit'], > package_data={ 'hggit': ['help/git.rst'] }, >-- install_requires=['dulwich>=0.8.0'], >+- install_requires=['dulwich>=0.8.6'] + extra_req, > ) >diff --git a/devel/hg-git/pkg-descr b/devel/hg-git/pkg-descr >index 888a42b..bad3160 100644 >--- a/devel/hg-git/pkg-descr >+++ b/devel/hg-git/pkg-descr >@@ -18,4 +18,4 @@ The plugin is basically functional and usable now, but there are still some > 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/ >diff --git a/devel/hg-git/pkg-plist b/devel/hg-git/pkg-plist >index cebe734..279e14b 100644 >--- a/devel/hg-git/pkg-plist >+++ b/devel/hg-git/pkg-plist >@@ -19,4 +19,6 @@ > %%PYTHON_SITELIBDIR%%/hggit/util.py > %%PYTHON_SITELIBDIR%%/hggit/util.pyc > %%PYTHON_SITELIBDIR%%/hggit/util.pyo >+%%PYTHON_SITELIBDIR%%/hggit/help/git.rst >+@dirrm %%PYTHON_SITELIBDIR%%/hggit/help > @dirrm %%PYTHON_SITELIBDIR%%/hggit
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 177830
: 133368