svn commit: r407203 - head/x11-toolkits/qt5-uiplugin

[Raphael Kubo da Costa]

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 at 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 at 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