From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 5 22:10:06 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 1A8F81065679 for ; Sun, 5 Jun 2011 22:10:06 +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 CA0A38FC19 for ; Sun, 5 Jun 2011 22:10:05 +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 p55MA51W082584 for ; Sun, 5 Jun 2011 22:10:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p55MA5la082575; Sun, 5 Jun 2011 22:10:05 GMT (envelope-from gnats) Resent-Date: Sun, 5 Jun 2011 22:10:05 GMT Resent-Message-Id: <201106052210.p55MA5la082575@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 0F02E1065674 for ; Sun, 5 Jun 2011 22:05:22 +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 BB27C8FC0C for ; Sun, 5 Jun 2011 22:05:21 +0000 (UTC) Received: by u18-124.dslaccess.de (Postfix, from userid 1100) id E244F204E4; Mon, 6 Jun 2011 00:05:20 +0200 (CEST) Message-Id: <20110605220520.E244F204E4@u18-124.dslaccess.de> Date: Mon, 6 Jun 2011 00:05:20 +0200 (CEST) From: Olli Hauer To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: naylor.b.david@gmail.com Subject: ports/157638: [patch] devel/kdesvn-kde4 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:06 -0000 >Number: 157638 >Category: ports >Synopsis: [patch] devel/kdesvn-kde4 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: --- kdesvn-kde4.diff begins here --- Index: kdesvn-kde4/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/kdesvn-kde4/Makefile,v retrieving revision 1.46 diff -u -r1.46 Makefile --- kdesvn-kde4/Makefile 15 Sep 2010 18:47:10 -0000 1.46 +++ kdesvn-kde4/Makefile 5 Jun 2011 20:45:18 -0000 @@ -12,7 +12,11 @@ MAINTAINER= naylor.b.david@gmail.com COMMENT= KDE frontend for 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 LICENSE= GPLv2 --- kdesvn-kde4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: