From ohauer@FreeBSD.org  Sun Jun  5 22:05:38 2011
Return-Path: <ohauer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4E782106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  5 Jun 2011 22:05:35 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from u18-124.dslaccess.de (unknown [194.231.39.124])
	by mx1.freebsd.org (Postfix) with ESMTP id 029E58FC13
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  5 Jun 2011 22:05:35 +0000 (UTC)
Received: by u18-124.dslaccess.de (Postfix, from userid 1100)
	id 26C94204E4; Mon,  6 Jun 2011 00:05:34 +0200 (CEST)
Message-Id: <20110605220534.26C94204E4@u18-124.dslaccess.de>
Date: Mon,  6 Jun 2011 00:05:34 +0200 (CEST)
From: Olli Hauer <ohauer@FreeBSD.org>
Reply-To: Olli Hauer <ohauer@FreeBSD.org>
To: <FreeBSD-gnats-submit@freebsd.org>
Cc: <bra@fsn.hu>
Subject: [patch] devel/pysvn fix build with subversion-freebsd
X-Send-Pr-Version: 3.113
X-GNATS-Notify: bra@fsn.hu

>Number:         157641
>Category:       ports
>Synopsis:       [patch] devel/pysvn fix build with subversion-freebsd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ohauer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 05 22:10:06 UTC 2011
>Closed-Date:    Tue Jun 07 05:23:00 UTC 2011
>Last-Modified:  Tue Jun 07 05:23:00 UTC 2011
>Originator:     Olli Hauer
>Release:        
>Organization:
>Environment:

>Description:
Fix build in tinderbox if WITH_FREEBSD_SUBVERSION is defined

>How-To-Repeat:
Do a tinderbox build where WITH_FREEBSD_SUBVERSION is defined.

Define WITH_FREEBSD_SUBVERSION in a tinderbox build.
RUN/BUILD_DEPENDS are OK, but LIB_DEPENDS fail mostly because
subversion is added twice (subversion for the port and 
subversion-freebsd for RUN/BUILD_DEPENDS ports)

>Fix:


--- pysvn.diff begins here ---
Index: pysvn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/pysvn/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- pysvn/Makefile	18 May 2010 04:07:44 -0000	1.16
+++ pysvn/Makefile	5 Jun 2011 20:45:31 -0000
@@ -14,7 +14,11 @@
 MAINTAINER=	bra@fsn.hu
 COMMENT=	Python binding for Subversion
 
+.if !defined(WITH_FREEBSD_SUBVERSION)
 LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion
+.else
+LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.endif
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
--- pysvn.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ohauer 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jun 5 22:10:46 UTC 2011 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157641 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Jun 5 22:10:51 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157641 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: bra@fsn.hu
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/157641: [patch] devel/pysvn fix build with subversion-freebsd
Date: Sun, 5 Jun 2011 22:10:49 UT

 Maintainer of devel/pysvn,
 
 Please note that PR ports/157641 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/157641
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: ohauer 
State-Changed-When: Tue Jun 7 05:22:26 UTC 2011 
State-Changed-Why:  
Close my own PR, 
will start writing a new Mk/bsd.svn.mk to add new  
USE_SVN... knobs to solve this globally. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=157641 
>Unformatted:
