Date: Mon, 6 Jun 2011 00:05:30 +0200 (CEST) From: Olli Hauer <ohauer@FreeBSD.org> To: <FreeBSD-gnats-submit@FreeBSD.org> Cc: miwi <miwi@FreeBSD.org> Subject: ports/157640: [patch] devel/pecl-svn fix build with subversion-freebsd Message-ID: <20110605220530.6C9CC204E4@u18-124.dslaccess.de> Resent-Message-ID: <201106052210.p55MA66C082642@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157640
>Category: ports
>Synopsis: [patch] devel/pecl-svn 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:06 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:
Do a tinderbox build where WITH_FREEBSD_SUBVERSION is defined.
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:
--- pecl-svn.diff begins here ---
Index: pecl-svn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/pecl-svn/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- pecl-svn/Makefile 26 Jan 2011 04:58:21 -0000 1.22
+++ pecl-svn/Makefile 5 Jun 2011 20:45:28 -0000
@@ -17,7 +17,11 @@
MAINTAINER= miwi@FreeBSD.org
COMMENT= A PECL extension to the libsvn library
+.if !defined(WITH_FREEBSD_SUBVERSION)
LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion
+.else
+LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.endif
LICENSE= PHP301
USE_PHP= yes
--- pecl-svn.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110605220530.6C9CC204E4>