From owner-svn-ports-head@freebsd.org Wed Nov 1 07:32:35 2017 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 A84A9E655E4; Wed, 1 Nov 2017 07:32:35 +0000 (UTC) (envelope-from antoine@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 8478C19E8; Wed, 1 Nov 2017 07:32:35 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA17WYvo075279; Wed, 1 Nov 2017 07:32:34 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA17WYog075275; Wed, 1 Nov 2017 07:32:34 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201711010732.vA17WYog075275@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 1 Nov 2017 07:32:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453263 - in head: Mk/Uses devel/py-qt5-qscintilla2 misc/py-qt4-demo misc/py-qt5-demo X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in head: Mk/Uses devel/py-qt5-qscintilla2 misc/py-qt4-demo misc/py-qt5-demo X-SVN-Commit-Revision: 453263 X-SVN-Commit-Repository: ports 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.23 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: Wed, 01 Nov 2017 07:32:35 -0000 Author: antoine Date: Wed Nov 1 07:32:34 2017 New Revision: 453263 URL: https://svnweb.freebsd.org/changeset/ports/453263 Log: - py-qt5-*: Fix build when using non default version of python, in this case sip is installed as sip-${PYTHON_VER} - py-qt*-demo: Fix packaging with python3, those ports have a python2 pkg-plist so USE_PYTHON=py3kplist must be used to convert it PR: 219641 Modified: head/Mk/Uses/pyqt.mk head/devel/py-qt5-qscintilla2/Makefile head/misc/py-qt4-demo/Makefile head/misc/py-qt5-demo/Makefile Modified: head/Mk/Uses/pyqt.mk ============================================================================== --- head/Mk/Uses/pyqt.mk Wed Nov 1 06:44:04 2017 (r453262) +++ head/Mk/Uses/pyqt.mk Wed Nov 1 07:32:34 2017 (r453263) @@ -219,6 +219,7 @@ CONFIGURE_ARGS+=-b ${PREFIX}/bin \ -d ${PYTHONPREFIX_SITELIBDIR} \ -q ${QMAKE} \ --confirm-license \ + --sip ${LOCALBASE}/bin/sip-${PYTHON_VER} \ --sipdir ${SIPDIR} # One of the things PyQt looks for to determine whether to build the Qt DBus Modified: head/devel/py-qt5-qscintilla2/Makefile ============================================================================== --- head/devel/py-qt5-qscintilla2/Makefile Wed Nov 1 06:44:04 2017 (r453262) +++ head/devel/py-qt5-qscintilla2/Makefile Wed Nov 1 07:32:34 2017 (r453263) @@ -29,7 +29,8 @@ DEBUG_CONFIGURE_ON= --debug --trace QSCIDIR= ${PREFIX}/share/qt5/qsci CONFIGURE_ARGS= --pyqt PyQt5 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 -v ${SIPDIR} \ - --apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} + --apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} \ + --sip ${LOCALBASE}/bin/sip-${PYTHON_VER} WRKSRC= ${WRKDIR}/${DISTNAME}/Python ALL_TARGET= #empty Modified: head/misc/py-qt4-demo/Makefile ============================================================================== --- head/misc/py-qt4-demo/Makefile Wed Nov 1 06:44:04 2017 (r453262) +++ head/misc/py-qt4-demo/Makefile Wed Nov 1 07:32:34 2017 (r453263) @@ -16,6 +16,7 @@ DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} NO_BUILD= yes USES= python pyqt:4 +USE_PYTHON= py3kplist EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4 Modified: head/misc/py-qt5-demo/Makefile ============================================================================== --- head/misc/py-qt5-demo/Makefile Wed Nov 1 06:44:04 2017 (r453262) +++ head/misc/py-qt5-demo/Makefile Wed Nov 1 07:32:34 2017 (r453263) @@ -22,6 +22,7 @@ USE_PYQT= core_run dbus_run designer_run \ sql_run svg_run test_run webkit_run xml_run \ xmlpatterns_run sip_run qscintilla2_run \ printsupport_run serialport_run webkitwidgets_run widgets_run +USE_PYTHON= py3kplist EXAMPLESDIR= ${PREFIX}/share/examples/py-qt5