ports/157639: [patch] devel/qsvn fix build with subversion-freebsd

Olli Hauer ohauer at FreeBSD.org
Sun Jun 5 22:10:06 UTC 2011


>Number:         157639
>Category:       ports
>Synopsis:       [patch] devel/qsvn 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:05 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:
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:


--- qsvn.diff begins here ---
Index: qsvn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/qsvn/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- qsvn/Makefile	18 May 2010 04:07:44 -0000	1.17
+++ qsvn/Makefile	5 Jun 2011 20:45:35 -0000
@@ -15,7 +15,11 @@
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Qt based GUI frontend for Subversion
 
-LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
+.if !defined(WITH_FREEBSD_SUBVERSION)
+LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion
+.else
+LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.endif
 
 USE_QT_VER=	4
 QT_COMPONENTS=	gui sql moc_build uic_build rcc_build qmake_build
--- qsvn.diff ends here ---


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



More information about the freebsd-ports-bugs mailing list