From owner-svn-ports-head@freebsd.org Mon Jan 25 11:28:38 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B3AFA458FF; Mon, 25 Jan 2016 11:28:38 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2EAA5DAC; Mon, 25 Jan 2016 11:28:38 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PBSbKm062745; Mon, 25 Jan 2016 11:28:37 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PBSb2w062744; Mon, 25 Jan 2016 11:28:37 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201601251128.u0PBSb2w062744@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 25 Jan 2016 11:28:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407203 - head/x11-toolkits/qt5-uiplugin X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2016 11:28:38 -0000 Author: rakuco Date: Mon Jan 25 11:28:37 2016 New Revision: 407203 URL: https://svnweb.freebsd.org/changeset/ports/407203 Log: Remove CONFLICTS with older qt5-designer versions. It is causing portmaster to fail with an error like this: ===>>> x11-toolkits/qt5-uiplugin seems to depend on devel/qt5-designer which looks like a dependency loop which is not really what's happening here; the error comes from the fact that qt5-designer 5.4.1 is being upgraded to 5.5.1, qt5-uiplugin is added as a dependency that must be built first, but then it's marked as CONFLICTing with the installed qt5-designer version. Since qt5-designer < 5.5.0 does not actually install any of the uiplugin files (since it was not an independent module before), we can just remove the CONFLICTS line. Thanks to Walter Schwarzenfeld (w.schwarzenfeld@aon.at) for the report. PR: 206435 Modified: head/x11-toolkits/qt5-uiplugin/Makefile Modified: head/x11-toolkits/qt5-uiplugin/Makefile ============================================================================== --- head/x11-toolkits/qt5-uiplugin/Makefile Mon Jan 25 10:16:30 2016 (r407202) +++ head/x11-toolkits/qt5-uiplugin/Makefile Mon Jan 25 11:28:37 2016 (r407203) @@ -8,9 +8,6 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Custom Qt widget plugin interface for Qt Designer -# This port used to be part of qt5-designer itself before 5.5.0. -CONFLICTS= qt5-designer-5.[0-4].* - USE_QT5= core gui widgets QT_DIST= tools USES= qmake