From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 5 22:10:05 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 9BAB01065674 for ; Sun, 5 Jun 2011 22:10:05 +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 726E88FC17 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 p55MA5eo082567 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 p55MA5Gx082566; 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.p55MA5Gx082566@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 1651E106564A; Sun, 5 Jun 2011 22:05:15 +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 777398FC08; Sun, 5 Jun 2011 22:05:14 +0000 (UTC) Received: by u18-124.dslaccess.de (Postfix, from userid 1100) id 572F4204E4; Mon, 6 Jun 2011 00:05:11 +0200 (CEST) Message-Id: <20110605220511.572F4204E4@u18-124.dslaccess.de> Date: Mon, 6 Jun 2011 00:05:11 +0200 (CEST) From: Olli Hauer To: X-Send-Pr-Version: 3.113 Cc: kde@FreeBSD.org Subject: ports/157637: [patch] devel/kdesdk3 devel/kdesdk4 and other kde@ maintained ports 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:05 -0000 >Number: 157637 >Category: ports >Synopsis: [patch] devel/kdesdk3 devel/kdesdk4 and other kde@ maintained ports 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 - kdesdk3 - kdesdk4 - kdevelop - kdevplatform >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: --- kdesdk3.diff begins here --- Index: kdesdk3/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/kdesdk3/Makefile,v retrieving revision 1.77 diff -u -r1.77 Makefile --- kdesdk3/Makefile 25 Feb 2011 01:31:43 -0000 1.77 +++ kdesdk3/Makefile 5 Jun 2011 20:45:11 -0000 @@ -17,7 +17,12 @@ COMMENT= KDE Software Development Kit RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -LIB_DEPENDS= svn_client-1.0:${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 CONFLICTS= umbrello-[0-9]* kcachegrind-[0-9]* --- kdesdk3.diff ends here --- --- kdesdk4.diff begins here --- Index: kdesdk4/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/kdesdk4/Makefile,v retrieving revision 1.98 diff -u -r1.98 Makefile --- kdesdk4/Makefile 25 Mar 2011 10:33:48 -0000 1.98 +++ kdesdk4/Makefile 5 Jun 2011 20:45:14 -0000 @@ -16,10 +16,15 @@ BUILD_DEPENDS= ${LOCALBASE}/include/ltdl.h:${PORTSDIR}/devel/libltdl RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ hunspell-1.2.0:${PORTSDIR}/hungarian/hunspell +.if !defined(WITH_FREEBSD_SUBVERSION) +LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion +.else +LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion-freebsd +.endif + LATEST_LINK= ${PORTNAME}4 CONFLICTS= kdeutils-4.5.[0-5] --- kdesdk4.diff ends here --- --- kdevelop.diff begins here --- Index: kdevelop/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/kdevelop/Makefile,v retrieving revision 1.114 diff -u -r1.114 Makefile --- kdevelop/Makefile 25 Feb 2011 01:31:43 -0000 1.114 +++ kdevelop/Makefile 5 Jun 2011 20:45:21 -0000 @@ -19,7 +19,13 @@ BUILD_DEPENDS= cervisia:${PORTSDIR}/devel/kdesdk3 \ dot:${PORTSDIR}/graphics/graphviz -LIB_DEPENDS= svn_client-1.0:${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 + RUN_DEPENDS= ${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools \ extractrc:${PORTSDIR}/devel/kdesdk3 \ gdb66:${PORTSDIR}/devel/gdb66 \ --- kdevelop.diff ends here --- --- kdevplatform.diff begins here --- Index: kdevplatform/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/kdevplatform/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- kdevplatform/Makefile 9 Nov 2010 01:52:43 -0000 1.2 +++ kdevplatform/Makefile 5 Jun 2011 20:45:24 -0000 @@ -14,10 +14,15 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE development platform -LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ qjson.0:${PORTSDIR}/devel/qjson +.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_BZIP2= yes USE_KDE4= automoc4 kdehier kdelibs kdeprefix KDE4_BUILDENV= yes --- kdevplatform.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: