From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 5 22:10:07 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 C9CE01065673 for ; Sun, 5 Jun 2011 22:10:07 +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 9EB6C8FC08 for ; Sun, 5 Jun 2011 22:10:07 +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 p55MA7ne082672 for ; Sun, 5 Jun 2011 22:10:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p55MA7p2082669; Sun, 5 Jun 2011 22:10:07 GMT (envelope-from gnats) Resent-Date: Sun, 5 Jun 2011 22:10:07 GMT Resent-Message-Id: <201106052210.p55MA7p2082669@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, Olli Hauer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 576EA1065672 for ; Sun, 5 Jun 2011 22:05:39 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from u18-124.dslaccess.de (unknown [194.231.39.124]) by mx1.freebsd.org (Postfix) with ESMTP id 06E458FC14 for ; Sun, 5 Jun 2011 22:05:39 +0000 (UTC) Received: by u18-124.dslaccess.de (Postfix, from userid 1100) id 2AB3B204E4; Mon, 6 Jun 2011 00:05:38 +0200 (CEST) Message-Id: <20110605220538.2AB3B204E4@u18-124.dslaccess.de> Date: Mon, 6 Jun 2011 00:05:38 +0200 (CEST) From: Olli Hauer To: X-Send-Pr-Version: 3.113 Cc: Subject: ports/157642: [patch] devel/subcommander fix build with subversion-freebsd X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Olli Hauer List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jun 2011 22:10:08 -0000 >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: