From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 7 01:00:16 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C6481065674 for ; Thu, 7 Apr 2011 01:00:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AE5108FC12 for ; Thu, 7 Apr 2011 01:00:15 +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 p3710FWp064755 for ; Thu, 7 Apr 2011 01:00:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p3710FIw064754; Thu, 7 Apr 2011 01:00:15 GMT (envelope-from gnats) Resent-Date: Thu, 7 Apr 2011 01:00:15 GMT Resent-Message-Id: <201104070100.p3710FIw064754@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Doug Barton Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 390C2106566B for ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/156234: Add OPTION for subversion-freebsd to devel/git X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Doug Barton List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2011 01:00:16 -0000 >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: