diff options
25 files changed, 28 insertions, 30 deletions
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile index 8a52d5900040..968e538b9ca5 100644 --- a/databases/py-qt4-sql/Makefile +++ b/databases/py-qt4-sql/Makefile @@ -30,7 +30,7 @@ OPTIONS= API "Install QtSql API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile index 60d5fb585302..1d29b1c75d9f 100644 --- a/devel/py-qt4-assistant/Makefile +++ b/devel/py-qt4-assistant/Makefile @@ -31,7 +31,7 @@ OPTIONS= API "Install QtAssistant API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile index a1ebdb42ab3d..9481cca578cd 100644 --- a/devel/py-qt4-core/Makefile +++ b/devel/py-qt4-core/Makefile @@ -29,7 +29,7 @@ OPTIONS= API "Install QtCore API for QScintilla2" on \ SIPFILES "Install the QtCore SIP files" on \ TRACING "Enable tracing in generated code" off -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile index e784de8e5323..1266cc7f585d 100644 --- a/devel/py-qt4-dbus/Makefile +++ b/devel/py-qt4-dbus/Makefile @@ -34,7 +34,7 @@ OPTIONS= DEBUG "Enable debugging in generated code" off \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHONPREFIX_SITELIBDIR}\ diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile index aca71d59c9c4..e1a1f9064063 100644 --- a/devel/py-qt4-declarative/Makefile +++ b/devel/py-qt4-declarative/Makefile @@ -30,7 +30,7 @@ OPTIONS= API "Install QtDeclarative API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile index 03d93d597e9c..90ce86bc8ebd 100644 --- a/devel/py-qt4-designer/Makefile +++ b/devel/py-qt4-designer/Makefile @@ -32,7 +32,7 @@ OPTIONS= API "Install QtDesigner API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile index c66435724b3b..7fe1eff2e8b4 100644 --- a/devel/py-qt4-designerplugin/Makefile +++ b/devel/py-qt4-designerplugin/Makefile @@ -31,7 +31,7 @@ OPTIONS= DEBUG "Enable debugging in generated code" off \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHONPREFIX_SITELIBDIR}\ diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile index a99713faab32..19ff7ab6eadd 100644 --- a/devel/py-qt4-help/Makefile +++ b/devel/py-qt4-help/Makefile @@ -30,7 +30,7 @@ OPTIONS= API "Install QtHelp API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile index 2153cbd003d5..980e9f01d64e 100644 --- a/devel/py-qt4-qscintilla2/Makefile +++ b/devel/py-qt4-qscintilla2/Makefile @@ -32,7 +32,7 @@ OPTIONS= API "Install binding API for QScintilla2" on \ SIPFILES "Install the Qscintilla SIP files" on \ TRACING "Enable tracing in generated code" off -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci ARGS= -p 4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile index 2c4408fb8d51..2a6be097c51d 100644 --- a/devel/py-qt4-script/Makefile +++ b/devel/py-qt4-script/Makefile @@ -30,7 +30,7 @@ OPTIONS= API "Install QtScript API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile index a1f9796bc8ab..6207a00888d7 100644 --- a/devel/py-qt4-scripttools/Makefile +++ b/devel/py-qt4-scripttools/Makefile @@ -31,7 +31,7 @@ OPTIONS= API "Install QtScript API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile index 318840d26630..f7f44c5974c9 100644 --- a/devel/py-qt4-test/Makefile +++ b/devel/py-qt4-test/Makefile @@ -30,7 +30,7 @@ OPTIONS= API "Install QtTest API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile index c338b043817f..9e6b23ba9333 100644 --- a/devel/py-sip/Makefile +++ b/devel/py-sip/Makefile @@ -21,7 +21,7 @@ OPTIONS= DEBUG "Build with debugging symbols" off DATADIR= ${PREFIX}/share/py-${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR}\ -e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo index 7569fcc2cdd5..d7a523b0a436 100644 --- a/devel/py-sip/distinfo +++ b/devel/py-sip/distinfo @@ -1,2 +1,2 @@ -SHA256 (sip-4.12.4.tar.gz) = 768c1f0ae7ccdc2a75cb4ca6dfd22a46832e06b3c96b1f0e8d3e955cbec047b3 -SIZE (sip-4.12.4.tar.gz) = 753270 +SHA256 (sip-4.13.tar.gz) = b5a0231d06fe6e6a234b387ef0c6f526b40f22836937872f25211f6614ccc29f +SIZE (sip-4.13.tar.gz) = 714023 diff --git a/devel/py-sip/files/bsd.pyqt.mk b/devel/py-sip/files/bsd.pyqt.mk index 342a75c742ce..348645558253 100644 --- a/devel/py-sip/files/bsd.pyqt.mk +++ b/devel/py-sip/files/bsd.pyqt.mk @@ -6,13 +6,11 @@ MASTER_SITE_RIVERBANK= http://www.riverbankcomputing.com/static/Downloads/ MASTER_SITE_FLUFFY= http://ns.ael.ru/~fluffy.khv/pyqt/ MASTER_SITES_SIP= ${MASTER_SITE_RIVERBANK}sip4/ \ - ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} \ - ${MASTER_SITE_FLUFFY}sip4/ + ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} MASTER_SITES_PYQT3= ${MASTER_SITE_RIVERBANK}PyQt3/ \ ${MASTER_SITE_FLUFFY}PyQt3/ MASTER_SITES_PYQT4= ${MASTER_SITE_RIVERBANK}PyQt4/ \ - ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} \ - ${MASTER_SITE_FLUFFY}PyQt4/ + ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} MASTER_SITES_PYKDE3= ${MASTER_SITE_RIVERBANK}PyKDE3/ \ ${MASTER_SITE_FLUFFY}PyKDE3/ MASTER_SITES_QSCI1= ${MASTER_SITE_RIVERBANK}QScintilla1/ \ @@ -22,7 +20,7 @@ MASTER_SITES_QSCI2= ${MASTER_SITE_RIVERBANK}QScintilla2/ \ ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} \ ${MASTER_SITE_FLUFFY}QScintilla2/ -SIP_VERSION= 4.12.4 +SIP_VERSION= 4.13 #SIP_SNAP= -snapshot-20100102 PYQT3_VERSION= 3.18.2 PYQT3_SNAP= -snapshot-20091119 diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile index 139d03e66a15..e9855995fd5a 100644 --- a/graphics/py-qt4-svg/Makefile +++ b/graphics/py-qt4-svg/Makefile @@ -30,7 +30,7 @@ OPTIONS= API "Install QtSvg API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile index ac2e21e93970..94b30af9e7e0 100644 --- a/misc/py-qt4-demo/Makefile +++ b/misc/py-qt4-demo/Makefile @@ -20,7 +20,7 @@ USE_PYTHON= yes OPTIONS= PYQT4 "Install any missing PyQt4 components" off -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4 .include "../../devel/py-sip/files/bsd.pyqt.mk" diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile index c1a75a4904cb..4a527d2d6f77 100644 --- a/multimedia/py-qt4-multimedia/Makefile +++ b/multimedia/py-qt4-multimedia/Makefile @@ -30,7 +30,7 @@ OPTIONS= API "Install Phonon API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile index 3eaf65e9f744..164f9a7c1969 100644 --- a/multimedia/py-qt4-phonon/Makefile +++ b/multimedia/py-qt4-phonon/Makefile @@ -30,7 +30,7 @@ OPTIONS= API "Install Phonon API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile index fc2f3066003f..2a1d049cdc2e 100644 --- a/net/py-qt4-network/Makefile +++ b/net/py-qt4-network/Makefile @@ -30,7 +30,7 @@ OPTIONS= API "Install QtNetwork API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile index b75c26fe566f..b32ca2e89222 100644 --- a/textproc/py-qt4-xml/Makefile +++ b/textproc/py-qt4-xml/Makefile @@ -30,7 +30,7 @@ OPTIONS= API "Install QtXml API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile index f58d3f6fda3f..f4e24aa13335 100644 --- a/textproc/py-qt4-xmlpatterns/Makefile +++ b/textproc/py-qt4-xmlpatterns/Makefile @@ -29,7 +29,7 @@ OPTIONS= API "Install QtXml API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile index d8a15b205c5d..3b8a4496182c 100644 --- a/www/py-qt4-webkit/Makefile +++ b/www/py-qt4-webkit/Makefile @@ -29,7 +29,7 @@ OPTIONS= API "Install QtXml API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile index 13ece8723f4e..f03afab45d8b 100644 --- a/x11-toolkits/py-qt4-gui/Makefile +++ b/x11-toolkits/py-qt4-gui/Makefile @@ -31,7 +31,7 @@ OPTIONS= API "Install QtGui API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile index b3c2882ca86b..2df3ab9a368f 100644 --- a/x11/py-qt4-opengl/Makefile +++ b/x11/py-qt4-opengl/Makefile @@ -30,7 +30,7 @@ OPTIONS= API "Install QtOpenGL API for QScintilla2" on \ TRACING "Enable tracing in generated code" off PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" |