Date: Mon, 6 Jun 2011 00:05:38 +0200 (CEST) From: Olli Hauer <ohauer@FreeBSD.org> To: <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/157642: [patch] devel/subcommander fix build with subversion-freebsd Message-ID: <20110605220538.2AB3B204E4@u18-124.dslaccess.de> Resent-Message-ID: <201106052210.p55MA7p2082669@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157642
>Category: ports
>Synopsis: [patch] devel/subcommander 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:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Olli Hauer
>Release:
>Organization:
>Environment:
>Description:
Fix build in tinderbox if WITH_FREEBSD_SUBVERSION is defined
Same fix for subcommander2 even the port is marked as broken!
>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:
--- subcommander.diff begins here ---
Index: subcommander/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/subcommander/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- subcommander/Makefile 30 Jul 2010 22:14:46 -0000 1.22
+++ subcommander/Makefile 5 Jun 2011 20:45:38 -0000
@@ -16,8 +16,13 @@
COMMENT= Qt based multiplatform subversion client, diff & merge tool
LIB_DEPENDS= neon.27:${PORTSDIR}/www/neon29 \
- boost_thread.4:${PORTSDIR}/devel/boost-libs \
- svn_client-1.0:${PORTSDIR}/devel/subversion
+ boost_thread.4:${PORTSDIR}/devel/boost-libs
+
+.if !defined(WITH_FREEBSD_SUBVERSION)
+LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion
+.else
+LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
--- subcommander.diff ends here ---
--- subcommander2.diff begins here ---
Index: subcommander2/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/subcommander2/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- subcommander2/Makefile 23 May 2011 23:02:24 -0000 1.23
+++ subcommander2/Makefile 5 Jun 2011 20:45:41 -0000
@@ -17,9 +17,14 @@
LIB_DEPENDS= neon.27:${PORTSDIR}/www/neon29 \
boost_thread.4:${PORTSDIR}/devel/boost-libs \
- svn_client-1.0:${PORTSDIR}/devel/subversion \
sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+.if !defined(WITH_FREEBSD_SUBVERSION)
+LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion
+.else
+LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.endif
+
BROKEN= does not link
LATEST_LINK= subcommander2
--- subcommander2.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?20110605220538.2AB3B204E4>