ports/148766: [maintainer-update] [patch] devel/dulwich: Add mirror, adjust patch file

[Marco Bröder]

>Number:         148766
>Category:       ports
>Synopsis:       [maintainer-update] [patch] devel/dulwich: Add mirror, adjust patch file
>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:   Mon Jul 19 17:40:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Marco Bröder
>Release:        RELENG_8 amd64
>Organization:
>Environment:
>Description:
- Add launchpad mirror
- Override default FETCH_ARGS to allow 302 redirects used by launchpad
- Adjust 'files/patch-setup.py' from three to two context lines (this removes a context line with version info, so the patch does not need to be modified with every new port version)

Tinderbox log follows as follow-up mail (because of web form limitations).

Thanks and regards!

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/devel/dulwich/Makefile b/devel/dulwich/Makefile
index cc977af..78183ad 100644
--- a/devel/dulwich/Makefile
+++ b/devel/dulwich/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	dulwich
 PORTVERSION=	0.6.0
 CATEGORIES=	devel python
-MASTER_SITES=	http://samba.org/~jelmer/${PORTNAME}/
+MASTER_SITES=	http://samba.org/~jelmer/${PORTNAME}/ \
+		http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	marco.broeder at gmx.eu
@@ -17,6 +18,8 @@ COMMENT=	Pure-Python implementation of the Git file formats and protocols
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
+FETCH_ARGS=	-pRr	# default '-ApRr' prevents 302 redirects by launchpad
+
 .ifndef (NOPORTDOCS)
 PORTDOCS=	AUTHORS COPYING HACKING NEWS README
 .endif
diff --git a/devel/dulwich/files/patch-setup.py b/devel/dulwich/files/patch-setup.py
index 43379f7..04fcce8 100644
--- a/devel/dulwich/files/patch-setup.py
+++ b/devel/dulwich/files/patch-setup.py
@@ -1,7 +1,6 @@
 --- ./setup.py.orig     2010-03-03 16:33:52.000000000 +0100
 +++ ./setup.py  2010-03-03 21:13:31.000000000 +0100
-@@ -2,10 +2,7 @@
- # Setup file for bzr-git
+@@ -3,8 +3,5 @@
  # Copyright (C) 2008-2010 Jelmer Vernooij <jelmer at samba.org>
 
 -try:
@@ -11,4 +10,3 @@
 +from distutils.core import setup, Extension
  from distutils.core import Distribution
 
- dulwich_version_string = '0.6.0'


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