From owner-svn-ports-all@FreeBSD.ORG Tue Oct 15 21:52:40 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C5C7BB64; Tue, 15 Oct 2013 21:52:40 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A304B2B46; Tue, 15 Oct 2013 21:52:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FLqewl041103; Tue, 15 Oct 2013 21:52:40 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FLqYaC041055; Tue, 15 Oct 2013 21:52:34 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201310152152.r9FLqYaC041055@svn.freebsd.org> From: Raphael Kubo da Costa Date: Tue, 15 Oct 2013 21:52:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330463 - in head: databases/py-qt4-sql devel/py-qt4 devel/py-qt4-assistant devel/py-qt4-core devel/py-qt4-dbus devel/py-qt4-dbussupport devel/py-qt4-declarative devel/py-qt4-designer d... 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.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2013 21:52:40 -0000 Author: rakuco Date: Tue Oct 15 21:52:33 2013 New Revision: 330463 URL: http://svnweb.freebsd.org/changeset/ports/330463 Log: Update SIP to 4.15.2 and PyQt to 4.10.3. This commit also adds proper staging support to all the ports being updated. In collaboration with Schaich Alonso and Tomasz Kowalczyk . Modified: head/databases/py-qt4-sql/Makefile head/devel/py-qt4-assistant/Makefile head/devel/py-qt4-core/Makefile head/devel/py-qt4-dbus/Makefile head/devel/py-qt4-dbussupport/Makefile head/devel/py-qt4-declarative/Makefile head/devel/py-qt4-designer/Makefile head/devel/py-qt4-designerplugin/Makefile head/devel/py-qt4-help/Makefile head/devel/py-qt4-qscintilla2/Makefile head/devel/py-qt4-script/Makefile head/devel/py-qt4-scripttools/Makefile head/devel/py-qt4-test/Makefile head/devel/py-qt4/Makefile head/devel/py-qt4/bsd.pyqt.mk head/devel/py-qt4/distinfo head/devel/py-sip/Makefile head/devel/py-sip/distinfo head/devel/qscintilla2-designerplugin/Makefile head/devel/qscintilla2/Makefile head/graphics/py-qt4-svg/Makefile head/misc/py-qt4-demo/Makefile head/misc/py-qt4-doc/Makefile head/multimedia/py-qt4-multimedia/Makefile head/multimedia/py-qt4-phonon/Makefile head/net/py-qt4-network/Makefile head/textproc/py-qt4-xml/Makefile head/textproc/py-qt4-xmlpatterns/Makefile head/www/py-qt4-webkit/Makefile head/x11-toolkits/py-qt4-gui/Makefile head/x11/py-qt4-opengl/Makefile Modified: head/databases/py-qt4-sql/Makefile ============================================================================== --- head/databases/py-qt4-sql/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/databases/py-qt4-sql/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= sql qmake_build +USE_QT4= moc_build sql qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -38,7 +38,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-assistant/Makefile ============================================================================== --- head/devel/py-qt4-assistant/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-assistant/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= assistantclient qmake_build +USE_QT4= assistantclient moc_build qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -39,7 +39,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-core/Makefile ============================================================================== --- head/devel/py-qt4-core/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-core/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -37,7 +37,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include @@ -69,8 +68,8 @@ post-configure: ${WRKSRC}/qpy/QtCore/Makefile post-install: - ${INSTALL_DATA} ${FILESDIR}/Qt.py ${PYTHONPREFIX_SITELIBDIR}/PyQt4 &&\ - cd ${PYTHONPREFIX_SITELIBDIR}/PyQt4 &&\ + ${INSTALL_DATA} ${FILESDIR}/Qt.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt4 &&\ + cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt4 &&\ ${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py\ `ls *.py */*.py */*/*.py` &&\ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/py_compile.py\ Modified: head/devel/py-qt4-dbus/Makefile ============================================================================== --- head/devel/py-qt4-dbus/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-dbus/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= dbus qmake_build +USE_QT4= dbus moc_build qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -40,7 +40,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-dbussupport/Makefile ============================================================================== --- head/devel/py-qt4-dbussupport/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-dbussupport/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -39,7 +39,6 @@ ARGS= -b ${PREFIX}/bin \ PLIST_FILES= %%PYTHON_SITELIBDIR%%/dbus/mainloop/qt.so -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .if defined(WITH_DEBUG) Modified: head/devel/py-qt4-declarative/Makefile ============================================================================== --- head/devel/py-qt4-declarative/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-declarative/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -37,7 +37,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-designer/Makefile ============================================================================== --- head/devel/py-qt4-designer/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-designer/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -41,7 +41,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-designerplugin/Makefile ============================================================================== --- head/devel/py-qt4-designerplugin/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-designerplugin/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -19,6 +19,11 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}designer>=$ BUILD_WRKSRC= ${WRKSRC}/designer INSTALL_WRKSRC= ${WRKSRC}/designer +# For staging support. +# TODO: Once all the PyQt ports start using configure-ng.py, this can be +# moved to bsd.pyqt.mk itself. +DESTDIRNAME= INSTALL_ROOT + DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -34,7 +39,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .if defined(WITH_DEBUG) Modified: head/devel/py-qt4-help/Makefile ============================================================================== --- head/devel/py-qt4-help/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-help/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= help qmake_build +USE_QT4= help moc_build qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -36,7 +36,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-qscintilla2/Makefile ============================================================================== --- head/devel/py-qt4-qscintilla2/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-qscintilla2/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -18,10 +18,15 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}si ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui RUN_DEPENDS:= ${BUILD_DEPENDS} +# For staging support. +# TODO: Once all the PyQt ports start using configure-ng.py, this can be +# moved to bsd.pyqt.mk itself. +DESTDIRNAME= INSTALL_ROOT + DISTINFO_FILE= ${QSCI2_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= gui qmake_build +USE_QT4= gui moc_build qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -35,7 +40,6 @@ ARGS= --pyqt PyQt4 -d ${PYTHONPREFIX_SI WRKSRC= ${WRKDIR}/${DISTNAME}/Python ALL_TARGET= #empty -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-script/Makefile ============================================================================== --- head/devel/py-qt4-script/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-script/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQ DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= script qmake_build +USE_QT4= moc_build script qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -38,7 +38,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-scripttools/Makefile ============================================================================== --- head/devel/py-qt4-scripttools/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-scripttools/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQ DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= scripttools qmake_build +USE_QT4= moc_build scripttools qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -37,7 +37,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-test/Makefile ============================================================================== --- head/devel/py-qt4-test/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4-test/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= qtestlib qmake_build +USE_QT4= moc_build qtestlib qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -38,7 +38,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4/Makefile ============================================================================== --- head/devel/py-qt4/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -15,6 +15,7 @@ COMMENT= The "meta-port" for PyQt4 USE_PYTHON= yes NO_BUILD= yes +NO_MTREE= yes PKGNAMEPREFIX2= ${PYTHON_PKGNAMEPREFIX}${PORTNAME}- @@ -41,7 +42,6 @@ RUN_DEPENDS+= ${PKGNAMEPREFIX2}core>=${P ${PKGNAMEPREFIX2}phonon>=${PYQT4_VERSION}:${PORTSDIR}/multimedia/py-qt4-phonon \ ${PKGNAMEPREFIX2}qscintilla2>=${QSCI2_VERSION}:${PORTSDIR}/devel/py-qt4-qscintilla2 -NO_STAGE= yes .include "${.CURDIR}/bsd.pyqt.mk" .include Modified: head/devel/py-qt4/bsd.pyqt.mk ============================================================================== --- head/devel/py-qt4/bsd.pyqt.mk Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4/bsd.pyqt.mk Tue Oct 15 21:52:33 2013 (r330463) @@ -14,15 +14,12 @@ MASTER_SITES_PYQT4= SF/pyqt/PyQt4/PyQt-$ MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} -SIP_VERSION= 4.14.7 -#SIP_SNAP= -snapshot-20100102 -PYQT4_VERSION= 4.10.2 -#PYQT4_SNAP= -snapshot-20100110 +SIP_VERSION= 4.15.2 +PYQT4_VERSION= 4.10.3 QSCI2_VERSION= 2.7.2 -#QSCI2_SNAP= -snapshot-20091222 -SIP_DISTNAME= sip-${SIP_VERSION}${SIP_SNAP} -PYQT4_DISTNAME= PyQt-x11-gpl-${PYQT4_VERSION}${PYQT4_SNAP} +SIP_DISTNAME= sip-${SIP_VERSION} +PYQT4_DISTNAME= PyQt-x11-gpl-${PYQT4_VERSION} PYQT4_DISTINFO_FILE= ${.CURDIR}/../../devel/py-qt4/distinfo -QSCI2_DISTNAME= QScintilla-gpl-${QSCI2_VERSION}${QSCI2_SNAP} +QSCI2_DISTNAME= QScintilla-gpl-${QSCI2_VERSION} QSCI2_DISTINFO_FILE= ${.CURDIR}/../../devel/qscintilla2/distinfo Modified: head/devel/py-qt4/distinfo ============================================================================== --- head/devel/py-qt4/distinfo Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-qt4/distinfo Tue Oct 15 21:52:33 2013 (r330463) @@ -1,2 +1,2 @@ -SHA256 (PyQt-x11-gpl-4.10.2.tar.gz) = 747cf2fe285ef050d891bbbbfa213a380583d464a085906ef525058c154be6fe -SIZE (PyQt-x11-gpl-4.10.2.tar.gz) = 11280941 +SHA256 (PyQt-x11-gpl-4.10.3.tar.gz) = a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 +SIZE (PyQt-x11-gpl-4.10.3.tar.gz) = 11187362 Modified: head/devel/py-sip/Makefile ============================================================================== --- head/devel/py-sip/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-sip/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -12,7 +12,7 @@ DISTNAME= ${SIP_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python to C and C++ bindings generator -USE_PYTHON= 2.5+ +USE_PYTHON= yes DATADIR= ${PREFIX}/share/py-${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} @@ -24,7 +24,6 @@ ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFI PORTDOCS= * -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include @@ -37,11 +36,11 @@ do-configure: post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} && cd ${WRKSRC}/doc/html && \ - ${COPYTREE_SHARE} \. ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \ + ${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR} .endif - ${MKDIR} ${DATADIR} &&\ - cd ${PYTHONPREFIX_SITELIBDIR} &&\ + ${MKDIR} ${STAGEDIR}${DATADIR} &&\ + cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} &&\ ${PYTHON_CMD} -c "import sipconfig" &&\ ${PYTHON_CMD} -O -c "import sipconfig" &&\ ${PYTHON_CMD} -c "import sipdistutils" &&\ Modified: head/devel/py-sip/distinfo ============================================================================== --- head/devel/py-sip/distinfo Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/py-sip/distinfo Tue Oct 15 21:52:33 2013 (r330463) @@ -1,2 +1,2 @@ -SHA256 (sip-4.14.7.tar.gz) = 05669120a53a2c98f98560424cda413ae95f5528494c80764004dbea78d361b7 -SIZE (sip-4.14.7.tar.gz) = 754916 +SHA256 (sip-4.15.2.tar.gz) = b418cfdc3fabdd9175e7c29bab935812075d325ba5e0f693ec84b5473b802624 +SIZE (sip-4.15.2.tar.gz) = 773688 Modified: head/devel/qscintilla2-designerplugin/Makefile ============================================================================== --- head/devel/qscintilla2-designerplugin/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/qscintilla2-designerplugin/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -22,7 +22,6 @@ QMAKE_ARGS= -unix PREFIX=${PREFIX} WRKSRC= ${WRKDIR}/${DISTNAME}/designer-Qt4Qt5 -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/qscintilla2/Makefile ============================================================================== --- head/devel/qscintilla2/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/devel/qscintilla2/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -23,7 +23,6 @@ QMAKE_ARGS= -unix PREFIX=${PREFIX} PORTDOCS= * PORTEXAMPLES= * -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include @@ -35,10 +34,10 @@ PLIST_SUB+= NLS="@comment " post-patch: cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e \ - 's|$$$$\[QT_INSTALL_HEADERS\]|${PREFIX}/${QT_INCDIR_REL}|; \ - s|$$$$\[QT_INSTALL_LIBS\]|${PREFIX}/${QT_LIBDIR_REL}|; \ - s|$$$$\[QT_INSTALL_TRANSLATIONS\]|${PREFIX}/share/qt4/translations|; \ - s|$$$$\[QT_INSTALL_DATA\]|${PREFIX}/share/qt4|' \ + 's|$$$$\[QT_INSTALL_HEADERS\]|${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}|; \ + s|$$$$\[QT_INSTALL_LIBS\]|${STAGEDIR}${PREFIX}/${QT_LIBDIR_REL}|; \ + s|$$$$\[QT_INSTALL_TRANSLATIONS\]|${STAGEDIR}${PREFIX}/share/qt4/translations|; \ + s|$$$$\[QT_INSTALL_DATA\]|${STAGEDIR}${PREFIX}/share/qt4|' \ qscintilla.pro .if empty(PORT_OPTIONS:MNLS) @@ -53,15 +52,15 @@ do-configure: post-install: .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC} &&\ - ${MKDIR} ${DOCSDIR}/html ${DOCSDIR}/Scintilla &&\ - ${INSTALL_DATA} NEWS README ${DOCSDIR} &&\ - ${INSTALL_DATA} doc/html-Qt4Qt5/* ${DOCSDIR}/html &&\ - ${INSTALL_DATA} doc/Scintilla/* ${DOCSDIR}/Scintilla + ${MKDIR} ${STAGEDIR}${DOCSDIR}/html ${STAGEDIR}${DOCSDIR}/Scintilla &&\ + ${INSTALL_DATA} NEWS README ${STAGEDIR}${DOCSDIR} &&\ + ${INSTALL_DATA} doc/html-Qt4Qt5/* ${STAGEDIR}${DOCSDIR}/html &&\ + ${INSTALL_DATA} doc/Scintilla/* ${STAGEDIR}${DOCSDIR}/Scintilla .endif .if ${PORT_OPTIONS:MEXAMPLES} cd ${WRKSRC}/example-Qt4Qt5 &&\ - ${MKDIR} ${EXAMPLESDIR}/images &&\ - ${INSTALL_DATA} *.* ${EXAMPLESDIR} &&\ - ${INSTALL_DATA} images/* ${EXAMPLESDIR}/images + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/images &&\ + ${INSTALL_DATA} *.* ${STAGEDIR}${EXAMPLESDIR} &&\ + ${INSTALL_DATA} images/* ${STAGEDIR}${EXAMPLESDIR}/images .endif .include Modified: head/graphics/py-qt4-svg/Makefile ============================================================================== --- head/graphics/py-qt4-svg/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/graphics/py-qt4-svg/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= svg qmake_build +USE_QT4= moc_build svg qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -38,7 +38,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include Modified: head/misc/py-qt4-demo/Makefile ============================================================================== --- head/misc/py-qt4-demo/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/misc/py-qt4-demo/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -22,7 +22,6 @@ OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${POR EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4 PORTEXAMPLES= * -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include @@ -55,7 +54,7 @@ do-build: do-install: ${RM} -f ${WRKSRC}/examples/designer/plugins/plugins.py.orig - ${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/misc/py-qt4-doc/Makefile ============================================================================== --- head/misc/py-qt4-doc/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/misc/py-qt4-doc/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -19,7 +19,6 @@ USE_PYTHON= 2.5+ DOCSDIR= ${PREFIX}/share/doc/py-qt4 PORTDOCS= * -NO_STAGE= yes do-install: cd ${WRKSRC} &&\ ${MKDIR} ${DOCSDIR} &&\ Modified: head/multimedia/py-qt4-multimedia/Makefile ============================================================================== --- head/multimedia/py-qt4-multimedia/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/multimedia/py-qt4-multimedia/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= multimedia qmake_build +USE_QT4= moc_build multimedia qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -37,7 +37,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include Modified: head/multimedia/py-qt4-phonon/Makefile ============================================================================== --- head/multimedia/py-qt4-phonon/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/multimedia/py-qt4-phonon/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQ DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= phonon qmake_build +USE_QT4= moc_build phonon qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -36,7 +36,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include Modified: head/net/py-qt4-network/Makefile ============================================================================== --- head/net/py-qt4-network/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/net/py-qt4-network/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQ DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= network qmake_build +USE_QT4= moc_build network qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -38,7 +38,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include Modified: head/textproc/py-qt4-xml/Makefile ============================================================================== --- head/textproc/py-qt4-xml/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/textproc/py-qt4-xml/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -38,7 +38,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include Modified: head/textproc/py-qt4-xmlpatterns/Makefile ============================================================================== --- head/textproc/py-qt4-xmlpatterns/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/textproc/py-qt4-xmlpatterns/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}xml>=${PYQT DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= xmlpatterns qmake_build +USE_QT4= moc_build xmlpatterns qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -37,7 +37,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include Modified: head/www/py-qt4-webkit/Makefile ============================================================================== --- head/www/py-qt4-webkit/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/www/py-qt4-webkit/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= qmake_build gui network webkit +USE_QT4= qmake_build gui moc_build network webkit OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -37,7 +37,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include Modified: head/x11-toolkits/py-qt4-gui/Makefile ============================================================================== --- head/x11-toolkits/py-qt4-gui/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/x11-toolkits/py-qt4-gui/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -39,7 +39,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include Modified: head/x11/py-qt4-opengl/Makefile ============================================================================== --- head/x11/py-qt4-opengl/Makefile Tue Oct 15 21:49:18 2013 (r330462) +++ head/x11/py-qt4-opengl/Makefile Tue Oct 15 21:52:33 2013 (r330463) @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= opengl qmake_build +USE_QT4= moc_build opengl qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API @@ -38,7 +38,6 @@ ARGS= -b ${PREFIX}/bin \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include