Skip site navigation (1)Skip section navigation (2)
Date:      Mon,  6 Jun 2011 00:05:34 +0200 (CEST)
From:      Olli Hauer <ohauer@FreeBSD.org>
To:        <FreeBSD-gnats-submit@FreeBSD.org>
Cc:        bra@fsn.hu
Subject:   ports/157641: [patch] devel/pysvn fix build with subversion-freebsd
Message-ID:  <20110605220534.26C94204E4@u18-124.dslaccess.de>
Resent-Message-ID: <201106052210.p55MA6HH082660@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         157641
>Category:       ports
>Synopsis:       [patch] devel/pysvn fix build with subversion-freebsd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 05 22:10:06 UTC 2011
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110605220534.26C94204E4>