From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 19 17:40:01 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D162B106567A for ; Mon, 19 Jul 2010 17:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A9DA98FC1D for ; Mon, 19 Jul 2010 17:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o6JHe15D093566 for ; Mon, 19 Jul 2010 17:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6JHe1U0093565; Mon, 19 Jul 2010 17:40:01 GMT (envelope-from gnats) Resent-Date: Mon, 19 Jul 2010 17:40:01 GMT Resent-Message-Id: <201007191740.o6JHe1U0093565@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Marco Bröder Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3E331065676 for ; Mon, 19 Jul 2010 17:38:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id A7E848FC12 for ; Mon, 19 Jul 2010 17:38:30 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o6JHcUdU061608 for ; Mon, 19 Jul 2010 17:38:30 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o6JHcTgA061607; Mon, 19 Jul 2010 17:38:30 GMT (envelope-from nobody) Message-Id: <201007191738.o6JHcTgA061607@www.freebsd.org> Date: Mon, 19 Jul 2010 17:38:30 GMT From: Marco Bröder To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/148766: [maintainer-update] [patch] devel/dulwich: Add mirror, adjust patch file X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2010 17:40:02 -0000 >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@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 -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: