ports/142272: [maintainer-update] [patch] devel/dulwich: Update to 0.4.1.

[Marco Bröder]

>Number:         142272
>Category:       ports
>Synopsis:       [maintainer-update] [patch] devel/dulwich: Update to 0.4.1.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 03 19:20:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Marco Bröder
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
>Description:
devel/dulwich:

- Update to 0.4.1
- Add patch to remove the upstream added import of setuptools in setup.py,
because it does not work properly, but distutils does

devel/hg-git:

- Depend on dulwich >=0.4.1, because it really requires this new version (bugfix)
- So bump PORTREVISION
- Make 'PYVER' construct slightly smaller


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/devel/dulwich/Makefile b/devel/dulwich/Makefile
index b4a598a..46049a2 100644
--- a/devel/dulwich/Makefile
+++ b/devel/dulwich/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dulwich
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 CATEGORIES=	devel python
 MASTER_SITES=	http://samba.org/~jelmer/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -24,7 +24,6 @@ PORTDOCS=	AUTHORS COPYING HACKING NEWS README
 post-patch:
 	${REINPLACE_CMD} -e 's|PYTHON = python|PYTHON = /usr/bin/env python|g; \
 		s|/usr|${PREFIX}|g' ${WRKSRC}/Makefile
-
 	${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \
 		${WRKSRC}/setup.py
 
diff --git a/devel/dulwich/distinfo b/devel/dulwich/distinfo
index 0f06474..c7df7b5 100644
--- a/devel/dulwich/distinfo
+++ b/devel/dulwich/distinfo
@@ -1,3 +1,3 @@
-MD5 (dulwich-0.4.0.tar.gz) = 579f2c60b0cdf05774da9842d5580c1f
-SHA256 (dulwich-0.4.0.tar.gz) = 03c082349f934c332df98072d711874953e1134f17504dc51c16084cf0a81565
-SIZE (dulwich-0.4.0.tar.gz) = 73140
+MD5 (dulwich-0.4.1.tar.gz) = ffa4b48682f43f47dcf70968cfc45133
+SHA256 (dulwich-0.4.1.tar.gz) = 002e6731b8dd12de92d5059efbeb6f4881cb0345236e98bd7e50f1ff0141c452
+SIZE (dulwich-0.4.1.tar.gz) = 75577
diff --git a/devel/dulwich/files/patch-setup.py b/devel/dulwich/files/patch-setup.py
new file mode 100644
index 0000000..7a50084
--- /dev/null
+++ b/devel/dulwich/files/patch-setup.py
@@ -0,0 +1,14 @@
+--- ./setup.py.orig	2010-01-03 19:09:07.000000000 +0100
++++ ./setup.py	2010-01-03 19:09:19.000000000 +0100
+@@ -2,10 +2,7 @@
+ # Setup file for bzr-git
+ # Copyright (C) 2008-2009 Jelmer Vernooij <jelmer at samba.org>
+ 
+-try:
+-    from setuptools import setup
+-except ImportError:
+-    from distutils.core import setup
++from distutils.core import setup
+ from distutils.extension import Extension
+ 
+ dulwich_version_string = '0.4.1'
diff --git a/devel/dulwich/pkg-plist b/devel/dulwich/pkg-plist
index d8df96e..71dbb13 100644
--- a/devel/dulwich/pkg-plist
+++ b/devel/dulwich/pkg-plist
@@ -29,6 +29,9 @@ bin/dulwich
 %%PYTHON_SITELIBDIR%%/dulwich/pack.py
 %%PYTHON_SITELIBDIR%%/dulwich/pack.pyc
 %%PYTHON_SITELIBDIR%%/dulwich/pack.pyo
+%%PYTHON_SITELIBDIR%%/dulwich/patch.py
+%%PYTHON_SITELIBDIR%%/dulwich/patch.pyc
+%%PYTHON_SITELIBDIR%%/dulwich/patch.pyo
 %%PYTHON_SITELIBDIR%%/dulwich/protocol.py
 %%PYTHON_SITELIBDIR%%/dulwich/protocol.pyc
 %%PYTHON_SITELIBDIR%%/dulwich/protocol.pyo
diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
index 919f028..4cf5eeb 100644
--- a/devel/hg-git/Makefile
+++ b/devel/hg-git/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hg-git
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,14 +15,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	marco.broeder at gmx.eu
 COMMENT=	Mercurial extension to pull from or push to a Git repository
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=0.4.0:${PORTSDIR}/devel/dulwich \
+RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=0.4.1:${PORTSDIR}/devel/dulwich \
 		hg:${PORTSDIR}/devel/mercurial
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 
-PLIST_SUB=	VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/python//}
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/hg_git-%%VERSION%%-py%%PYVER%%.egg
+PLIST_SUB=	VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/thon//}
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/hg_git-%%VERSION%%-%%PYVER%%.egg
 
 post-install:
 	@${CAT} ${PKGMESSAGE}


>Release-Note:
>Audit-Trail:
>Unformatted: