ports/156234: Add OPTION for subversion-freebsd to devel/git

Doug Barton dougb at FreeBSD.org
Thu Apr 7 01:00:16 UTC 2011


>Number:         156234
>Category:       ports
>Synopsis:       Add OPTION for subversion-freebsd to devel/git
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 07 01:00:15 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Doug Barton
>Release:        FreeBSD 8.1-STABLE i386
>Organization:
AAAG
>Environment:
	DNA
>Description:
	devel/git can have a dependency on subversion, however it is
	convenient to specify a direct dependency on subversion-freebsd.
>How-To-Repeat:
	DNA
>Fix:
	Apply the following patch:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/git/Makefile,v
retrieving revision 1.100
diff -u -r1.100 Makefile
--- Makefile	5 Apr 2011 23:40:19 -0000	1.100
+++ Makefile	7 Apr 2011 00:51:13 -0000
@@ -185,6 +185,7 @@
 
 OPTIONS=	GUI "Enable building of GUI tools" off \
 		SVN "Enable required dependencies for SVN tools" off \
+		SVN_FBSD "Use devel/subversion-freebsd for SVN dependency" off \
 		GITWEB "Install gitweb" off \
 		CONTRIB "Install contributed scripts" on \
 		P4 "Enable Perforce support" on \
@@ -265,10 +266,14 @@
 MAKE_ARGS+=	NO_TCLTK=yes
 .endif
 
-.ifdef (WITH_SVN)
+.ifdef (WITH_SVN) || defined(WITH_SVN_FBSD)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
-		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
-		svn:${PORTSDIR}/devel/subversion
+		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion
+.ifdef (WITH_SVN_FBSD) 
+RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion-freebsd
+.else
+RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+.endif
 PLIST_SUB+=	SVN=""
 MAN1+=		git-svn.1
 .else
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list