ports/157643: [patch] devel/svn2git fix build with subversion-freebsd

[Olli Hauer]

>Number:         157643
>Category:       ports
>Synopsis:       [patch] devel/svn2git 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:07 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:


--- svn2git.diff begins here ---
Index: svn2git/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/svn2git/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- svn2git/Makefile	13 Apr 2011 19:38:28 -0000	1.2
+++ svn2git/Makefile	5 Jun 2011 20:45:45 -0000
@@ -12,7 +12,12 @@
 MAINTAINER=	naylor.b.david at gmail.com
 COMMENT=	Imports svn repositories into git
 
+.if !defined(WITH_FREEBSD_SUBVERSION)
 LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion
+.else
+LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.endif
+
 RUN_DEPENDS+=	git:${PORTSDIR}/devel/git \
 		${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
 		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion
--- svn2git.diff ends here ---


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