diff options
31 files changed, 55 insertions, 75 deletions
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile index 6a076918c45e..fe98bbbe8d56 100644 --- a/databases/py-qt4-sql/Makefile +++ b/databases/py-qt4-sql/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q 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 <bsd.port.options.mk> diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile index 9dc13ad5471d..b165fbd3cb33 100644 --- a/devel/py-qt4-assistant/Makefile +++ b/devel/py-qt4-assistant/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q 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 <bsd.port.options.mk> diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile index ff506bc9b9ad..893697a25fe1 100644 --- a/devel/py-qt4-core/Makefile +++ b/devel/py-qt4-core/Makefile @@ -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 <bsd.port.options.mk> @@ -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\ diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile index 6d5aeffd3968..7889fe5e3940 100644 --- a/devel/py-qt4-dbus/Makefile +++ b/devel/py-qt4-dbus/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-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 <bsd.port.options.mk> diff --git a/devel/py-qt4-dbussupport/Makefile b/devel/py-qt4-dbussupport/Makefile index 86c58234b936..9fb272cc0998 100644 --- a/devel/py-qt4-dbussupport/Makefile +++ b/devel/py-qt4-dbussupport/Makefile @@ -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) diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile index ca0b7393ed8e..9158e476f859 100644 --- a/devel/py-qt4-declarative/Makefile +++ b/devel/py-qt4-declarative/Makefile @@ -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 <bsd.port.options.mk> diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile index 9fa681dae5cb..c5e11f99c3d9 100644 --- a/devel/py-qt4-designer/Makefile +++ b/devel/py-qt4-designer/Makefile @@ -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 <bsd.port.options.mk> diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile index 33125bc7b4b7..2141e7575aaa 100644 --- a/devel/py-qt4-designerplugin/Makefile +++ b/devel/py-qt4-designerplugin/Makefile @@ -19,6 +19,11 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4 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) diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile index 2e9f771e75b5..06494f925553 100644 --- a/devel/py-qt4-help/Makefile +++ b/devel/py-qt4-help/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q 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 <bsd.port.options.mk> diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile index 206d41c71734..7d2a3e7c36f2 100644 --- a/devel/py-qt4-qscintilla2/Makefile +++ b/devel/py-qt4-qscintilla2/Makefile @@ -18,10 +18,15 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-s ${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_SITELIBDIR}/PyQt4 -v ${SIPDIR} \ WRKSRC= ${WRKDIR}/${DISTNAME}/Python ALL_TARGET= #empty -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include <bsd.port.options.mk> diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile index dcefa76fe59f..cbf90ec83a3f 100644 --- a/devel/py-qt4-script/Makefile +++ b/devel/py-qt4-script/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor 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 <bsd.port.options.mk> diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile index 457f4211039a..793ac5af4110 100644 --- a/devel/py-qt4-scripttools/Makefile +++ b/devel/py-qt4-scripttools/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor 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 <bsd.port.options.mk> diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile index 2e5e8b6bac52..627d4c66d349 100644 --- a/devel/py-qt4-test/Makefile +++ b/devel/py-qt4-test/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q 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 <bsd.port.options.mk> diff --git a/devel/py-qt4/Makefile b/devel/py-qt4/Makefile index 3acb15e68152..0a4533235e45 100644 --- a/devel/py-qt4/Makefile +++ b/devel/py-qt4/Makefile @@ -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>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-c ${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 <bsd.port.options.mk> diff --git a/devel/py-qt4/bsd.pyqt.mk b/devel/py-qt4/bsd.pyqt.mk index eb2cdbce8c89..ce83d00e86c1 100644 --- a/devel/py-qt4/bsd.pyqt.mk +++ b/devel/py-qt4/bsd.pyqt.mk @@ -14,15 +14,12 @@ MASTER_SITES_PYQT4= SF/pyqt/PyQt4/PyQt-${PORTVERSION} \ 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 diff --git a/devel/py-qt4/distinfo b/devel/py-qt4/distinfo index 36fd09db64e6..68d28f711118 100644 --- a/devel/py-qt4/distinfo +++ b/devel/py-qt4/distinfo @@ -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 diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile index f4402134408c..5902f385533e 100644 --- a/devel/py-sip/Makefile +++ b/devel/py-sip/Makefile @@ -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 ${PYTHONPREFIX_SITELIBDIR} \ PORTDOCS= * -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include <bsd.port.options.mk> @@ -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" &&\ diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo index 6bcd5cf23370..1bab3a6db4dd 100644 --- a/devel/py-sip/distinfo +++ b/devel/py-sip/distinfo @@ -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 diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile index 5d3c1ecd1595..aa5b5bab99ee 100644 --- a/devel/qscintilla2-designerplugin/Makefile +++ b/devel/qscintilla2-designerplugin/Makefile @@ -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 <bsd.port.pre.mk> diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile index 6e0dfbe8e21e..17bd84eb5699 100644 --- a/devel/qscintilla2/Makefile +++ b/devel/qscintilla2/Makefile @@ -23,7 +23,6 @@ QMAKE_ARGS= -unix PREFIX=${PREFIX} PORTDOCS= * PORTEXAMPLES= * -NO_STAGE= yes .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include <bsd.port.options.mk> @@ -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 <bsd.port.mk> diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile index 2bd5ce2cda6f..9728312160b0 100644 --- a/graphics/py-qt4-svg/Makefile +++ b/graphics/py-qt4-svg/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q 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 <bsd.port.options.mk> diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile index f36661882785..8e8762863b8c 100644 --- a/misc/py-qt4-demo/Makefile +++ b/misc/py-qt4-demo/Makefile @@ -22,7 +22,6 @@ OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4 PORTEXAMPLES= * -NO_STAGE= yes .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include <bsd.port.options.mk> @@ -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 <bsd.port.mk> diff --git a/misc/py-qt4-doc/Makefile b/misc/py-qt4-doc/Makefile index aa8c406da818..f7bf7297227f 100644 --- a/misc/py-qt4-doc/Makefile +++ b/misc/py-qt4-doc/Makefile @@ -19,7 +19,6 @@ USE_PYTHON= 2.5+ DOCSDIR= ${PREFIX}/share/doc/py-qt4 PORTDOCS= * -NO_STAGE= yes do-install: cd ${WRKSRC} &&\ ${MKDIR} ${DOCSDIR} &&\ diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile index 9202522bbdba..2732b689c453 100644 --- a/multimedia/py-qt4-multimedia/Makefile +++ b/multimedia/py-qt4-multimedia/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q 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 <bsd.port.options.mk> diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile index 7658c57b3ad9..836da3af05ac 100644 --- a/multimedia/py-qt4-phonon/Makefile +++ b/multimedia/py-qt4-phonon/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor 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 <bsd.port.options.mk> diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile index eb38f1b9e260..067f726258df 100644 --- a/net/py-qt4-network/Makefile +++ b/net/py-qt4-network/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor 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 <bsd.port.options.mk> diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile index 41766e1172fe..1fc9fb701e3a 100644 --- a/textproc/py-qt4-xml/Makefile +++ b/textproc/py-qt4-xml/Makefile @@ -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 <bsd.port.options.mk> diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile index 1ed3d2170fcd..dfdd6884ef6a 100644 --- a/textproc/py-qt4-xmlpatterns/Makefile +++ b/textproc/py-qt4-xmlpatterns/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-x 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 <bsd.port.options.mk> diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile index 56f7c43c4bfb..e83c6d248371 100644 --- a/www/py-qt4-webkit/Makefile +++ b/www/py-qt4-webkit/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q 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 <bsd.port.options.mk> diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile index 430aebe0e36c..47dbca4e99da 100644 --- a/x11-toolkits/py-qt4-gui/Makefile +++ b/x11-toolkits/py-qt4-gui/Makefile @@ -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 <bsd.port.options.mk> diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile index feddf4dd661b..18a2bba7f02d 100644 --- a/x11/py-qt4-opengl/Makefile +++ b/x11/py-qt4-opengl/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q 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 <bsd.port.options.mk> |