From owner-svn-ports-all@freebsd.org  Tue Dec 15 11:00:31 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 5C464A444CA;
 Tue, 15 Dec 2015 11:00:31 +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 2C0DC19FF;
 Tue, 15 Dec 2015 11:00:31 +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 tBFB0Uqg097214;
 Tue, 15 Dec 2015 11:00:30 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBFB0U94097212;
 Tue, 15 Dec 2015 11:00:30 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201512151100.tBFB0U94097212@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Tue, 15 Dec 2015 11:00:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r403771 - head/devel/py-qt5-designer
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2015 11:00:31 -0000

Author: rakuco
Date: Tue Dec 15 11:00:29 2015
New Revision: 403771
URL: https://svnweb.freebsd.org/changeset/ports/403771

Log:
  Stop building the Qt Designer plugin in py-qt5-designer.
  
  This is done in devel/py-qt5-designerplugin, which means both ports were
  trying to install files into the same location.

Modified:
  head/devel/py-qt5-designer/Makefile
  head/devel/py-qt5-designer/pkg-plist

Modified: head/devel/py-qt5-designer/Makefile
==============================================================================
--- head/devel/py-qt5-designer/Makefile	Tue Dec 15 10:58:47 2015	(r403770)
+++ head/devel/py-qt5-designer/Makefile	Tue Dec 15 11:00:29 2015	(r403771)
@@ -1,12 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	designer
+PORTREVISION=	1
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtDesigner module
 
-CONFIGURE_ARGS=	--enable QtDesigner
+CONFIGURE_ARGS=	--enable QtDesigner --no-designer-plugin
 PYQT_DIST=	yes
 
 USES=		python pyqt:5

Modified: head/devel/py-qt5-designer/pkg-plist
==============================================================================
--- head/devel/py-qt5-designer/pkg-plist	Tue Dec 15 10:58:47 2015	(r403770)
+++ head/devel/py-qt5-designer/pkg-plist	Tue Dec 15 11:00:29 2015	(r403771)
@@ -1,5 +1,4 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtDesigner.so
-%%QT_PLUGINDIR%%/designer/libpyqt5.so
 %%PYQT_SIPDIR%%/QtDesigner/QtDesignermod.sip
 %%PYQT_SIPDIR%%/QtDesigner/abstractactioneditor.sip
 %%PYQT_SIPDIR%%/QtDesigner/abstractformbuilder.sip