Attachment 114563 Details for Bug 156234 – file.diff

[patch] file.diff

file.diff (text/plain), 1.14 KB, created by Doug Barton on 2011-04-07 02:00:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Doug Barton

Created: 2011-04-07 02:00:15 UTC

Size: 1.14 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 156234: 114563