From dougb@FreeBSD.org  Thu Apr  7 00:58:05 2011
Return-Path: <dougb@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 390C2106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  7 Apr 2011 00:58:05 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 2AFF08FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  7 Apr 2011 00:58:05 +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 p370w5aj064675
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 7 Apr 2011 00:58:05 GMT
	(envelope-from dougb@freefall.freebsd.org)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p370w5ee064674;
	Thu, 7 Apr 2011 00:58:05 GMT
	(envelope-from dougb)
Message-Id: <201104070058.p370w5ee064674@freefall.freebsd.org>
Date: Thu, 7 Apr 2011 00:58:05 GMT
From: Doug Barton <dougb@freebsd.org>
Reply-To: Doug Barton <dougb@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Add OPTION for subversion-freebsd to devel/git
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         156234
>Category:       ports
>Synopsis:       Add OPTION for subversion-freebsd to devel/git
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 07 01:00:15 UTC 2011
>Closed-Date:    Thu Apr 07 12:15:36 UTC 2011
>Last-Modified:  Thu Apr  7 12:20:08 UTC 2011
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Apr 7 01:00:26 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156234 
Class-Changed-From-To: sw-bug->change-request 
Class-Changed-By: dougb 
Class-Changed-When: Thu Apr 7 01:19:28 UTC 2011 
Class-Changed-Why:  

I put in the wrong class to start with 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156234 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Thu Apr 7 12:15:35 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/156234: commit references a PR
Date: Thu,  7 Apr 2011 12:15:28 +0000 (UTC)

 wxs         2011-04-07 12:15:19 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/git            Makefile 
   Log:
   Add OPTION for subversion-freebsd dependency.
   
   PR:             ports/156234
   Submitted by:   dougb@
   
   Revision  Changes    Path
   1.101     +8 -3      ports/devel/git/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
