aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrakuco <rakuco@FreeBSD.org>2015-12-09 00:49:43 +0800
committerrakuco <rakuco@FreeBSD.org>2015-12-09 00:49:43 +0800
commit2447b762ada630bfd429c970df6b7dbdfeaf0a11 (patch)
tree344b6abf61ea06069f5de2c1cdcb8209791ac07e
parent761533d12d1c53c68d9d0d582a3964731b76fb2c (diff)
downloadfreebsd-ports-gnome-2447b762ada630bfd429c970df6b7dbdfeaf0a11.tar.gz
freebsd-ports-gnome-2447b762ada630bfd429c970df6b7dbdfeaf0a11.tar.zst
freebsd-ports-gnome-2447b762ada630bfd429c970df6b7dbdfeaf0a11.zip
PyQt: Replace bsd.pyqt.mk with Uses/pyqt.mk.
In preparation for landing PyQt5 ports, generalize devel/py-qt4's bsd.pyqt.mk and make it a proper file in Uses/. Ports wishing to depend on PyQt4 ports can now do the following: USES= pyqt:4 USE_PYQT= foo bar_build baz_run Other changes include the renaming of the PYQT4_DIST variable to PYQT_DIST and the introduction of the PYQT_SIPDIR plist substitution variable. The rest of the contents of Uses/pyqt.mk are pretty much identical to what we had in bsd.pyqt.mk with additional processing of USE_PYQT. Even though this patch touches files in many different ports, the goal is for it to be a no-op from an end-user perspective (so that the basic infrastructure is landed before the other, riskier changes): no dependencies have been changed, PyQt/SIP/QScintilla have not been upgraded and the plists should remain exactly the same, since PYQT_SIPDIR currently contains the same value that used to be hardcoded in the plists. Huge thanks to Guido Falsi (madpilot@) for spearheading most of the work: he took the initiative to work on PyQt5 and sent D2910 to Phabricator with the original version of this patch. Tobias Berner (tcberner@gmail.com) later applied it to kde@'s experimental area51 repositories and did some more work on it.
-rw-r--r--Mk/Uses/pyqt.mk223
-rw-r--r--databases/py-qt4-sql/Makefile9
-rw-r--r--databases/py-qt4-sql/pkg-plist28
-rw-r--r--devel/py-qt4-assistant/Makefile10
-rw-r--r--devel/py-qt4-assistant/pkg-plist4
-rw-r--r--devel/py-qt4-core/Makefile11
-rw-r--r--devel/py-qt4-core/pkg-plist196
-rw-r--r--devel/py-qt4-dbus/Makefile9
-rw-r--r--devel/py-qt4-dbus/pkg-plist30
-rw-r--r--devel/py-qt4-dbussupport/Makefile13
-rw-r--r--devel/py-qt4-declarative/Makefile10
-rw-r--r--devel/py-qt4-declarative/pkg-plist38
-rw-r--r--devel/py-qt4-designer/Makefile11
-rw-r--r--devel/py-qt4-designer/pkg-plist50
-rw-r--r--devel/py-qt4-designerplugin/Makefile11
-rw-r--r--devel/py-qt4-help/Makefile9
-rw-r--r--devel/py-qt4-help/pkg-plist16
-rw-r--r--devel/py-qt4-qscintilla2/Makefile16
-rw-r--r--devel/py-qt4-qscintilla2/pkg-plist108
-rw-r--r--devel/py-qt4-script/Makefile9
-rw-r--r--devel/py-qt4-script/pkg-plist20
-rw-r--r--devel/py-qt4-scripttools/Makefile9
-rw-r--r--devel/py-qt4-scripttools/pkg-plist4
-rw-r--r--devel/py-qt4-test/Makefile9
-rw-r--r--devel/py-qt4-test/pkg-plist10
-rw-r--r--devel/py-qt4/Makefile19
-rw-r--r--devel/py-qt4/bsd.pyqt.mk121
-rw-r--r--devel/py-sip/Makefile5
-rw-r--r--devel/qscintilla2-designerplugin/Makefile6
-rw-r--r--devel/qscintilla2/Makefile4
-rw-r--r--graphics/py-qt4-svg/Makefile9
-rw-r--r--graphics/py-qt4-svg/pkg-plist10
-rw-r--r--misc/py-qt4-demo/Makefile12
-rw-r--r--misc/py-qt4-doc/Makefile4
-rw-r--r--multimedia/py-qt4-multimedia/Makefile9
-rw-r--r--multimedia/py-qt4-multimedia/pkg-plist20
-rw-r--r--multimedia/py-qt4-phonon/Makefile9
-rw-r--r--multimedia/py-qt4-phonon/pkg-plist38
-rw-r--r--net-im/turpial/Makefile11
-rw-r--r--net/py-qt4-network/Makefile9
-rw-r--r--net/py-qt4-network/pkg-plist70
-rw-r--r--textproc/py-qt4-xml/Makefile9
-rw-r--r--textproc/py-qt4-xml/pkg-plist8
-rw-r--r--textproc/py-qt4-xmlpatterns/Makefile9
-rw-r--r--textproc/py-qt4-xmlpatterns/pkg-plist30
-rw-r--r--www/py-qt4-webkit/Makefile9
-rw-r--r--www/py-qt4-webkit/pkg-plist30
-rw-r--r--x11-toolkits/py-qt4-gui/Makefile9
-rw-r--r--x11-toolkits/py-qt4-gui/pkg-plist410
-rw-r--r--x11/py-qt4-opengl/Makefile9
-rw-r--r--x11/py-qt4-opengl/pkg-plist14
51 files changed, 910 insertions, 846 deletions
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
new file mode 100644
index 000000000000..b655f6bb94d8
--- /dev/null
+++ b/Mk/Uses/pyqt.mk
@@ -0,0 +1,223 @@
+# $FreeBSD$
+#
+# Handle PyQt related ports
+#
+# Feature: pyqt
+# Usage: USES=pyqt:ARGS
+# Valid ARGS: 4
+#
+# MAINTAINER: kde@FreeBSD.org
+#
+# Internal Port variables for PyQt ports:
+# PYQT_DIST - This port is part of PyQt4 itself. Variables and
+# targets are then set assuming a certain tarball and
+# port layout.
+# USE_PYQT - List of PyQt components to depend on
+# * foo_build only build depend
+# * foo_run only run depend
+# * foo both (default)
+# SIPDIR - Absolute path where sip files will be installed
+# SIPDIR_REL - Relative version of SIPDIR
+#
+# Also PYQT_SIPDIR=${SIPDIR_REL} will be added to PLIST_SUB.
+#
+
+.if !defined(_INCLUDE_USES_PYQT_MK)
+_INCLUDE_USES_PYQT_MK= yes
+
+# At the moment we support PyQt bindings versions 4, sip
+# option is for internal use by the py-sip ports.
+_PYQT_SUPPORTED= 4 sip
+
+.if empty(pyqt_ARGS)
+IGNORE= pyqt needs a qt-version (${_PYQT_SUPPORTED})
+.endif
+
+# At the moment we support PyQt bindings version 4
+.for ver in ${_PYQT_SUPPORTED:O:u}
+. if ${pyqt_ARGS:M${ver}}
+. if empty(_PYQT_VERSION)
+_PYQT_VERSION= ${ver}
+. else
+IGNORE?= cannot be installed: different PYQT versions specified via pyqt:[${_PYQT_SUPPORTED:S/ //g}]
+. endif
+. endif
+.endfor
+
+.if empty(_PYQT_VERSION)
+IGNORE?= USES=pyqt needs a version number (valid values: ${_PYQT_SUPPORTED})
+.endif
+
+PYQT_MAINTAINER= kde@FreeBSD.org
+
+MASTER_SITE_RIVERBANK= http://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/
+
+MASTER_SITES_SIP= SF/pyqt/sip/sip-${PORTVERSION} \
+ GENTOO
+MASTER_SITES_PYQT4= SF/pyqt/PyQt4/PyQt-${PORTVERSION} \
+ GENTOO
+MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
+ GENTOO
+
+SIP_VERSION= 4.16.5
+QSCI2_VERSION= 2.8.4
+PYQT4_VERSION= 4.11.3
+
+SIP_DISTNAME= sip-${SIP_VERSION}
+PYQT4_DISTNAME= PyQt-x11-gpl-${PYQT4_VERSION}
+PYQT4_DISTINFO_FILE= ${.CURDIR}/../../devel/${PYQT_RELNAME}/distinfo
+QSCI2_DISTNAME= QScintilla-gpl-${QSCI2_VERSION}
+
+# PyQt components split up into pyqt4/pyqt5 (upcoming)/...
+_USE_PYQT_ALL= core dbus demo designer doc gui \
+ multimedia network opengl qscintilla2 \
+ sql svg test webkit xml xmlpatterns sip
+# List of components only in pyqt4
+_USE_PYQT4_ONLY= assistant declarative dbussupport \
+ designerplugin help phonon script \
+ scripttools
+
+# Unversioned variables for the rest of the file
+PYQT_VERSION= ${PYQT${_PYQT_VERSION}_VERSION}
+PYQT_RELNAME= py-qt${_PYQT_VERSION}
+PYQT_PY_RELNAME= ${PYTHON_PKGNAMEPREFIX}qt${_PYQT_VERSION}
+PYQT_MASTERSITES= ${MASTER_SITES_PYQT${_PYQT_VERSION}}
+PYQT_DISTNAME= ${PYQT${_PYQT_VERSION}_DISTNAME}
+PYQT_DISTINFO_FILE= ${PYQT${_PYQT_VERSION}_DISTINFO_FILE}
+
+py-sip_PATH= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}
+
+py-assistant_PATH= ${PYQT_PY_RELNAME}-assistant>=${PYQT_VERSION}
+py-core_PATH= ${PYQT_PY_RELNAME}-core>=${PYQT_VERSION}
+py-dbus_PATH= ${PYQT_PY_RELNAME}-dbus>=${PYQT_VERSION}
+py-dbussupport_PATH= ${PYQT_PY_RELNAME}-dbussupport>=${PYQT_VERSION}
+py-declarative_PATH= ${PYQT_PY_RELNAME}-declarative>=${PYQT_VERSION}
+py-demo_PATH= ${PYQT_PY_RELNAME}-demo>=${PYQT_VERSION}
+py-designer_PATH= ${PYQT_PY_RELNAME}-designer>=${PYQT_VERSION}
+py-designerplugin_PATH= ${PYQT_PY_RELNAME}-designerplugin>=${PYQT_VERSION}
+py-doc_PATH= ${PYQT_PY_RELNAME}-doc>=${PYQT_VERSION}
+py-gui_PATH= ${PYQT_PY_RELNAME}-gui>=${PYQT_VERSION}
+py-help_PATH= ${PYQT_PY_RELNAME}-help>=${PYQT_VERSION}
+py-multimedia_PATH= ${PYQT_PY_RELNAME}-multimedia>=${PYQT_VERSION}
+py-network_PATH= ${PYQT_PY_RELNAME}-network>=${PYQT_VERSION}
+py-opengl_PATH= ${PYQT_PY_RELNAME}-opengl>=${PYQT_VERSION}
+py-phonon_PATH= ${PYQT_PY_RELNAME}-phonon>=${PYQT_VERSION}
+py-qscintilla2_PATH= ${PYQT_PY_RELNAME}-qscintilla2>=${QSCI2_VERSION}
+py-script_PATH= ${PYQT_PY_RELNAME}-script>=${PYQT_VERSION}
+py-scripttools_PATH= ${PYQT_PY_RELNAME}-scripttools>=${PYQT_VERSION}
+py-sql_PATH= ${PYQT_PY_RELNAME}-sql>=${PYQT_VERSION}
+py-svg_PATH= ${PYQT_PY_RELNAME}-svg>=${PYQT_VERSION}
+py-test_PATH= ${PYQT_PY_RELNAME}-test>=${PYQT_VERSION}
+py-webkit_PATH= ${PYQT_PY_RELNAME}-webkit>=${PYQT_VERSION}
+py-xml_PATH= ${PYQT_PY_RELNAME}-xml>=${PYQT_VERSION}
+py-xmlpatterns_PATH= ${PYQT_PY_RELNAME}-xmlpatterns>=${PYQT_VERSION}
+
+py-sip_PORT= devel/py-sip
+
+py-assistant_PORT= devel/${PYQT_RELNAME}-assistant
+py-core_PORT= devel/${PYQT_RELNAME}-core
+py-dbus_PORT= devel/${PYQT_RELNAME}-dbus
+py-dbussupport_PORT= devel/${PYQT_RELNAME}-dbussupport
+py-declarative_PORT= devel/${PYQT_RELNAME}-declarative
+py-demo_PORT= misc/${PYQT_RELNAME}-demo
+py-designer_PORT= devel/${PYQT_RELNAME}-designer
+py-designerplugin_PORT= devel/${PYQT_RELNAME}-designerplugin
+py-doc_PORT= misc/${PYQT_RELNAME}-doc
+py-gui_PORT= x11-toolkits/${PYQT_RELNAME}-gui
+py-help_PORT= devel/${PYQT_RELNAME}-help
+py-multimedia_PORT= multimedia/${PYQT_RELNAME}-multimedia
+py-network_PORT= net/${PYQT_RELNAME}-network
+py-opengl_PORT= x11/${PYQT_RELNAME}-opengl
+py-phonon_PORT= multimedia/${PYQT_RELNAME}-phonon
+py-qscintilla2_PORT= devel/${PYQT_RELNAME}-qscintilla2
+py-script_PORT= devel/${PYQT_RELNAME}-script
+py-scripttools_PORT= devel/${PYQT_RELNAME}-scripttools
+py-sql_PORT= databases/${PYQT_RELNAME}-sql
+py-svg_PORT= graphics/${PYQT_RELNAME}-svg
+py-test_PORT= devel/${PYQT_RELNAME}-test
+py-webkit_PORT= www/${PYQT_RELNAME}-webkit
+py-xml_PORT= textproc/${PYQT_RELNAME}-xml
+py-xmlpatterns_PORT= textproc/${PYQT_RELNAME}-xmlpatterns
+
+py-assistant_DESC= Python bindings for QtAssistant module
+py-core_DESC= Python bindings for QtCore module
+py-dbus_DESC= Python bindings for QtDBus module
+py-dbussupport_DESC= Qt event loop support for dbus-python
+py-declarative_DESC= Python bindings for QtDeclarative module
+py-demo_DESC= PyQt demo and examples
+py-designer_DESC= Python bindings for QtDesigner module
+py-designerplugin_DESC= Python bindings for QtDesigner plugin
+py-doc_DESC= PyQt documentation
+py-gui_DESC= Python bindings for QtGui module
+py-help_DESC= Python bindings for QtHelp module
+py-multimedia_DESC= Python bindings for Multimedia module
+py-network_DESC= Python bindings for QtNetwork module
+py-opengl_DESC= Python bindings for QtOpenGL module
+py-phonon_DESC= Python bindings for Phonon module
+py-qscintilla2_DESC= Python bindings for QScintilla2
+py-script_DESC= Python bindings for QtScript module
+py-scripttools_DESC= Python bindings for QtScriptTools module
+py-sql_DESC= Python bindings for QtSql module
+py-svg_DESC= Python bindings for QtSvg module
+py-test_DESC= Python bindings for QtTest module
+py-webkit_DESC= Python bindings for QtWebKit module
+py-xml_DESC= Python bindings for QtXml module
+py-xmlpatterns_DESC= Python bindings for QtXmlPatterns module
+
+SIPDIR_REL= share/py-sip
+SIPDIR= ${PREFIX}/${SIPDIR_REL}
+PLIST_SUB+= PYQT_SIPDIR=${SIPDIR_REL}
+
+.if defined(PYQT_DIST)
+PORTVERSION= ${PYQT_VERSION}
+MASTER_SITES= ${PYQT_MASTERSITES}
+PKGNAMEPREFIX= ${PYQT_PY_RELNAME}-
+DISTNAME= ${PYQT_DISTNAME}
+DISTINFO_FILE= ${PYQT_DISTINFO_FILE}
+HAS_CONFIGURE= yes
+QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS.
+
+PATCHDIR= ${.CURDIR}/../../devel/${PYQT_RELNAME}-core/files
+QSCIDIR= ${PREFIX}/share/qt${_PYQT_VERSION}/qsci
+CONFIGURE_ARGS+=-b ${PREFIX}/bin \
+ -d ${PYTHONPREFIX_SITELIBDIR} \
+ -q ${QMAKE} \
+ --confirm-license \
+ --sipdir ${SIPDIR}
+
+# One of the things PyQt looks for to determine whether to build the Qt DBus
+# main loop module (${PYQT_RELNAME}-dbussupport) is whether the dbus/ directory is
+# present. Only extract it for that port then.
+.if ${PORTNAME} != "dbussupport"
+EXTRACT_AFTER_ARGS+= --exclude "${DISTNAME}/dbus"
+.endif # ${PORTNAME} != "dbussupport"
+
+.if !target(do-configure)
+do-configure:
+ cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
+.endif # !target(do-configure)
+.endif # defined(PYQT_DIST)
+
+# Set build and run depends -- we need to prefix them internally with "py-"
+# else we conflict with the ones defined in bsd.qt.mk with the same name
+_USE_PYQT_ALL+= ${_USE_PYQT${_PYQT_VERSION}_ONLY}
+.for comp in ${_USE_PYQT_ALL:O:u}
+_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run
+py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${PORTSDIR}/${py-${comp}_PORT}
+py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${PORTSDIR}/${py-${comp}_PORT}
+py-${comp}_build_BUILD_DEPENDS?= ${py-${comp}_BUILD_DEPENDS}
+py-${comp}_run_RUN_DEPENDS?= ${py-${comp}_RUN_DEPENDS}
+.endfor
+
+_USE_PYQT= ${USE_PYQT:O:u}
+.for comp in ${_USE_PYQT}
+. if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}}
+BUILD_DEPENDS+= ${py-${comp}_BUILD_DEPENDS}
+RUN_DEPENDS+= ${py-${comp}_RUN_DEPENDS}
+. else
+IGNORE?= cannot be installed: unknown USE_PYQT component ${comp} #'
+. endif
+.endfor
+
+.endif # defined(_INCLUDE_USES_PYQT_MK)
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index fe3fe76c1240..a5f0d0ee9b64 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -8,11 +8,11 @@ CATEGORIES= databases devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtSql module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
-
CONFIGURE_ARGS= --enable QtSql
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build gui_run
USE_QT4= moc_build gui sql qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -25,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/databases/py-qt4-sql/pkg-plist b/databases/py-qt4-sql/pkg-plist
index e55c0580fb44..f4e6a9d52898 100644
--- a/databases/py-qt4-sql/pkg-plist
+++ b/databases/py-qt4-sql/pkg-plist
@@ -1,16 +1,16 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtSql.so
-share/py-sip/QtSql/QtSqlmod.sip
-share/py-sip/QtSql/qsql.sip
-share/py-sip/QtSql/qsqldatabase.sip
-share/py-sip/QtSql/qsqldriver.sip
-share/py-sip/QtSql/qsqlerror.sip
-share/py-sip/QtSql/qsqlfield.sip
-share/py-sip/QtSql/qsqlindex.sip
-share/py-sip/QtSql/qsqlquery.sip
-share/py-sip/QtSql/qsqlquerymodel.sip
-share/py-sip/QtSql/qsqlrecord.sip
-share/py-sip/QtSql/qsqlrelationaldelegate.sip
-share/py-sip/QtSql/qsqlrelationaltablemodel.sip
-share/py-sip/QtSql/qsqlresult.sip
-share/py-sip/QtSql/qsqltablemodel.sip
+%%PYQT_SIPDIR%%/QtSql/QtSqlmod.sip
+%%PYQT_SIPDIR%%/QtSql/qsql.sip
+%%PYQT_SIPDIR%%/QtSql/qsqldatabase.sip
+%%PYQT_SIPDIR%%/QtSql/qsqldriver.sip
+%%PYQT_SIPDIR%%/QtSql/qsqlerror.sip
+%%PYQT_SIPDIR%%/QtSql/qsqlfield.sip
+%%PYQT_SIPDIR%%/QtSql/qsqlindex.sip
+%%PYQT_SIPDIR%%/QtSql/qsqlquery.sip
+%%PYQT_SIPDIR%%/QtSql/qsqlquerymodel.sip
+%%PYQT_SIPDIR%%/QtSql/qsqlrecord.sip
+%%PYQT_SIPDIR%%/QtSql/qsqlrelationaldelegate.sip
+%%PYQT_SIPDIR%%/QtSql/qsqlrelationaltablemodel.sip
+%%PYQT_SIPDIR%%/QtSql/qsqlresult.sip
+%%PYQT_SIPDIR%%/QtSql/qsqltablemodel.sip
%%API%%share/qt4/qsci/api/python/QtSql.api
diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index d4ae24beda34..144fc86a3497 100644
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@@ -8,12 +8,11 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtAssistant module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
- ${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network
-
CONFIGURE_ARGS= --enable QtAssistant
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build gui_run network_run
USE_QT4= assistantclient moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -26,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/devel/py-qt4-assistant/pkg-plist b/devel/py-qt4-assistant/pkg-plist
index c831a0e8cdef..a2d7d3c65c22 100644
--- a/devel/py-qt4-assistant/pkg-plist
+++ b/devel/py-qt4-assistant/pkg-plist
@@ -1,4 +1,4 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtAssistant.so
-share/py-sip/QtAssistant/QtAssistantmod.sip
-share/py-sip/QtAssistant/qassistantclient.sip
+%%PYQT_SIPDIR%%/QtAssistant/QtAssistantmod.sip
+%%PYQT_SIPDIR%%/QtAssistant/qassistantclient.sip
%%API%%share/qt4/qsci/api/python/QtAssistant.api
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index 9bb57ae49ee6..7a7b64ceb255 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -8,12 +8,12 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtCore module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-
CONFIGURE_ARGS= --enable QtCore
-PYQT4_DIST= yes
-USE_PYTHON+= py3kplist
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYTHON= py3kplist
+USE_PYQT= sip
USE_QT4= corelib qmake_build moc_build
OPTIONS_DEFINE= API DEBUG
@@ -26,7 +26,6 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.pre.mk>
# Bug 180467: We need to remove the port_v${VERSION} directory that does not
diff --git a/devel/py-qt4-core/pkg-plist b/devel/py-qt4-core/pkg-plist
index b1c2c7998c45..130240430247 100644
--- a/devel/py-qt4-core/pkg-plist
+++ b/devel/py-qt4-core/pkg-plist
@@ -99,102 +99,102 @@ bin/pyuic4
%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.py
%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyo
-share/py-sip/QtCore/QtCoremod.sip
-share/py-sip/QtCore/qabstractanimation.sip
-share/py-sip/QtCore/qabstracteventdispatcher.sip
-share/py-sip/QtCore/qabstractfileengine.sip
-share/py-sip/QtCore/qabstractitemmodel.sip
-share/py-sip/QtCore/qabstractnativeeventfilter.sip
-share/py-sip/QtCore/qabstractstate.sip
-share/py-sip/QtCore/qabstracttransition.sip
-share/py-sip/QtCore/qanimationgroup.sip
-share/py-sip/QtCore/qbasictimer.sip
-share/py-sip/QtCore/qbitarray.sip
-share/py-sip/QtCore/qbuffer.sip
-share/py-sip/QtCore/qbytearray.sip
-share/py-sip/QtCore/qbytearraymatcher.sip
-share/py-sip/QtCore/qchar.sip
-share/py-sip/QtCore/qcoreapplication.sip
-share/py-sip/QtCore/qcoreevent.sip
-share/py-sip/QtCore/qcryptographichash.sip
-share/py-sip/QtCore/qdatastream.sip
-share/py-sip/QtCore/qdatetime.sip
-share/py-sip/QtCore/qdir.sip
-share/py-sip/QtCore/qdiriterator.sip
-share/py-sip/QtCore/qeasingcurve.sip
-share/py-sip/QtCore/qelapsedtimer.sip
-share/py-sip/QtCore/qeventloop.sip
-share/py-sip/QtCore/qeventtransition.sip
-share/py-sip/QtCore/qfile.sip
-share/py-sip/QtCore/qfiledevice.sip
-share/py-sip/QtCore/qfileinfo.sip
-share/py-sip/QtCore/qfilesystemwatcher.sip
-share/py-sip/QtCore/qfinalstate.sip
-share/py-sip/QtCore/qfsfileengine.sip
-share/py-sip/QtCore/qglobal.sip
-share/py-sip/QtCore/qhash.sip
-share/py-sip/QtCore/qhistorystate.sip
-share/py-sip/QtCore/qiodevice.sip
-share/py-sip/QtCore/qlibrary.sip
-share/py-sip/QtCore/qlibraryinfo.sip
-share/py-sip/QtCore/qline.sip
-share/py-sip/QtCore/qlist.sip
-share/py-sip/QtCore/qlocale.sip
-share/py-sip/QtCore/qmap.sip
-share/py-sip/QtCore/qmargins.sip
-share/py-sip/QtCore/qmetaobject.sip
-share/py-sip/QtCore/qmetatype.sip
-share/py-sip/QtCore/qmimedata.sip
-share/py-sip/QtCore/qmutex.sip
-share/py-sip/QtCore/qnamespace.sip
-share/py-sip/QtCore/qnumeric.sip
-share/py-sip/QtCore/qobject.sip
-share/py-sip/QtCore/qobjectcleanuphandler.sip
-share/py-sip/QtCore/qobjectdefs.sip
-share/py-sip/QtCore/qpair.sip
-share/py-sip/QtCore/qparallelanimationgroup.sip
-share/py-sip/QtCore/qpauseanimation.sip
-share/py-sip/QtCore/qpluginloader.sip
-share/py-sip/QtCore/qpoint.sip
-share/py-sip/QtCore/qprocess.sip
-share/py-sip/QtCore/qpropertyanimation.sip
-share/py-sip/QtCore/qpynullvariant.sip
-share/py-sip/QtCore/qreadwritelock.sip
-share/py-sip/QtCore/qrect.sip
-share/py-sip/QtCore/qregexp.sip
-share/py-sip/QtCore/qresource.sip
-share/py-sip/QtCore/qrunnable.sip
-share/py-sip/QtCore/qsemaphore.sip
-share/py-sip/QtCore/qsequentialanimationgroup.sip
-share/py-sip/QtCore/qset.sip
-share/py-sip/QtCore/qsettings.sip
-share/py-sip/QtCore/qsharedmemory.sip
-share/py-sip/QtCore/qsignalmapper.sip
-share/py-sip/QtCore/qsignaltransition.sip
-share/py-sip/QtCore/qsize.sip
-share/py-sip/QtCore/qsocketnotifier.sip
-share/py-sip/QtCore/qstate.sip
-share/py-sip/QtCore/qstatemachine.sip
-share/py-sip/QtCore/qstring.sip
-share/py-sip/QtCore/qstringlist.sip
-share/py-sip/QtCore/qstringmatcher.sip
-share/py-sip/QtCore/qsystemsemaphore.sip
-share/py-sip/QtCore/qtemporaryfile.sip
-share/py-sip/QtCore/qtextboundaryfinder.sip
-share/py-sip/QtCore/qtextcodec.sip
-share/py-sip/QtCore/qtextstream.sip
-share/py-sip/QtCore/qthread.sip
-share/py-sip/QtCore/qthreadpool.sip
-share/py-sip/QtCore/qtimeline.sip
-share/py-sip/QtCore/qtimer.sip
-share/py-sip/QtCore/qtranslator.sip
-share/py-sip/QtCore/qurl.sip
-share/py-sip/QtCore/qurlquery.sip
-share/py-sip/QtCore/quuid.sip
-share/py-sip/QtCore/qvariant.sip
-share/py-sip/QtCore/qvariantanimation.sip
-share/py-sip/QtCore/qvector.sip
-share/py-sip/QtCore/qwaitcondition.sip
-share/py-sip/QtCore/qwineventnotifier.sip
-share/py-sip/QtCore/qxmlstream.sip
+%%PYQT_SIPDIR%%/QtCore/QtCoremod.sip
+%%PYQT_SIPDIR%%/QtCore/qabstractanimation.sip
+%%PYQT_SIPDIR%%/QtCore/qabstracteventdispatcher.sip
+%%PYQT_SIPDIR%%/QtCore/qabstractfileengine.sip
+%%PYQT_SIPDIR%%/QtCore/qabstractitemmodel.sip
+%%PYQT_SIPDIR%%/QtCore/qabstractnativeeventfilter.sip
+%%PYQT_SIPDIR%%/QtCore/qabstractstate.sip
+%%PYQT_SIPDIR%%/QtCore/qabstracttransition.sip
+%%PYQT_SIPDIR%%/QtCore/qanimationgroup.sip
+%%PYQT_SIPDIR%%/QtCore/qbasictimer.sip
+%%PYQT_SIPDIR%%/QtCore/qbitarray.sip
+%%PYQT_SIPDIR%%/QtCore/qbuffer.sip
+%%PYQT_SIPDIR%%/QtCore/qbytearray.sip
+%%PYQT_SIPDIR%%/QtCore/qbytearraymatcher.sip
+%%PYQT_SIPDIR%%/QtCore/qchar.sip
+%%PYQT_SIPDIR%%/QtCore/qcoreapplication.sip
+%%PYQT_SIPDIR%%/QtCore/qcoreevent.sip
+%%PYQT_SIPDIR%%/QtCore/qcryptographichash.sip
+%%PYQT_SIPDIR%%/QtCore/qdatastream.sip
+%%PYQT_SIPDIR%%/QtCore/qdatetime.sip
+%%PYQT_SIPDIR%%/QtCore/qdir.sip
+%%PYQT_SIPDIR%%/QtCore/qdiriterator.sip
+%%PYQT_SIPDIR%%/QtCore/qeasingcurve.sip
+%%PYQT_SIPDIR%%/QtCore/qelapsedtimer.sip
+%%PYQT_SIPDIR%%/QtCore/qeventloop.sip
+%%PYQT_SIPDIR%%/QtCore/qeventtransition.sip
+%%PYQT_SIPDIR%%/QtCore/qfile.sip
+%%PYQT_SIPDIR%%/QtCore/qfiledevice.sip
+%%PYQT_SIPDIR%%/QtCore/qfileinfo.sip
+%%PYQT_SIPDIR%%/QtCore/qfilesystemwatcher.sip
+%%PYQT_SIPDIR%%/QtCore/qfinalstate.sip
+%%PYQT_SIPDIR%%/QtCore/qfsfileengine.sip
+%%PYQT_SIPDIR%%/QtCore/qglobal.sip
+%%PYQT_SIPDIR%%/QtCore/qhash.sip
+%%PYQT_SIPDIR%%/QtCore/qhistorystate.sip
+%%PYQT_SIPDIR%%/QtCore/qiodevice.sip
+%%PYQT_SIPDIR%%/QtCore/qlibrary.sip
+%%PYQT_SIPDIR%%/QtCore/qlibraryinfo.sip
+%%PYQT_SIPDIR%%/QtCore/qline.sip
+%%PYQT_SIPDIR%%/QtCore/qlist.sip
+%%PYQT_SIPDIR%%/QtCore/qlocale.sip
+%%PYQT_SIPDIR%%/QtCore/qmap.sip
+%%PYQT_SIPDIR%%/QtCore/qmargins.sip
+%%PYQT_SIPDIR%%/QtCore/qmetaobject.sip
+%%PYQT_SIPDIR%%/QtCore/qmetatype.sip
+%%PYQT_SIPDIR%%/QtCore/qmimedata.sip
+%%PYQT_SIPDIR%%/QtCore/qmutex.sip
+%%PYQT_SIPDIR%%/QtCore/qnamespace.sip
+%%PYQT_SIPDIR%%/QtCore/qnumeric.sip
+%%PYQT_SIPDIR%%/QtCore/qobject.sip
+%%PYQT_SIPDIR%%/QtCore/qobjectcleanuphandler.sip
+%%PYQT_SIPDIR%%/QtCore/qobjectdefs.sip
+%%PYQT_SIPDIR%%/QtCore/qpair.sip
+%%PYQT_SIPDIR%%/QtCore/qparallelanimationgroup.sip
+%%PYQT_SIPDIR%%/QtCore/qpauseanimation.sip
+%%PYQT_SIPDIR%%/QtCore/qpluginloader.sip
+%%PYQT_SIPDIR%%/QtCore/qpoint.sip
+%%PYQT_SIPDIR%%/QtCore/qprocess.sip
+%%PYQT_SIPDIR%%/QtCore/qpropertyanimation.sip
+%%PYQT_SIPDIR%%/QtCore/qpynullvariant.sip
+%%PYQT_SIPDIR%%/QtCore/qreadwritelock.sip
+%%PYQT_SIPDIR%%/QtCore/qrect.sip
+%%PYQT_SIPDIR%%/QtCore/qregexp.sip
+%%PYQT_SIPDIR%%/QtCore/qresource.sip
+%%PYQT_SIPDIR%%/QtCore/qrunnable.sip
+%%PYQT_SIPDIR%%/QtCore/qsemaphore.sip
+%%PYQT_SIPDIR%%/QtCore/qsequentialanimationgroup.sip
+%%PYQT_SIPDIR%%/QtCore/qset.sip
+%%PYQT_SIPDIR%%/QtCore/qsettings.sip
+%%PYQT_SIPDIR%%/QtCore/qsharedmemory.sip
+%%PYQT_SIPDIR%%/QtCore/qsignalmapper.sip
+%%PYQT_SIPDIR%%/QtCore/qsignaltransition.sip
+%%PYQT_SIPDIR%%/QtCore/qsize.sip
+%%PYQT_SIPDIR%%/QtCore/qsocketnotifier.sip
+%%PYQT_SIPDIR%%/QtCore/qstate.sip
+%%PYQT_SIPDIR%%/QtCore/qstatemachine.sip
+%%PYQT_SIPDIR%%/QtCore/qstring.sip
+%%PYQT_SIPDIR%%/QtCore/qstringlist.sip
+%%PYQT_SIPDIR%%/QtCore/qstringmatcher.sip
+%%PYQT_SIPDIR%%/QtCore/qsystemsemaphore.sip
+%%PYQT_SIPDIR%%/QtCore/qtemporaryfile.sip
+%%PYQT_SIPDIR%%/QtCore/qtextboundaryfinder.sip
+%%PYQT_SIPDIR%%/QtCore/qtextcodec.sip
+%%PYQT_SIPDIR%%/QtCore/qtextstream.sip
+%%PYQT_SIPDIR%%/QtCore/qthread.sip
+%%PYQT_SIPDIR%%/QtCore/qthreadpool.sip
+%%PYQT_SIPDIR%%/QtCore/qtimeline.sip
+%%PYQT_SIPDIR%%/QtCore/qtimer.sip
+%%PYQT_SIPDIR%%/QtCore/qtranslator.sip
+%%PYQT_SIPDIR%%/QtCore/qurl.sip
+%%PYQT_SIPDIR%%/QtCore/qurlquery.sip
+%%PYQT_SIPDIR%%/QtCore/quuid.sip
+%%PYQT_SIPDIR%%/QtCore/qvariant.sip
+%%PYQT_SIPDIR%%/QtCore/qvariantanimation.sip
+%%PYQT_SIPDIR%%/QtCore/qvector.sip
+%%PYQT_SIPDIR%%/QtCore/qwaitcondition.sip
+%%PYQT_SIPDIR%%/QtCore/qwineventnotifier.sip
+%%PYQT_SIPDIR%%/QtCore/qxmlstream.sip
%%API%%share/qt4/qsci/api/python/QtCore.api
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index c72c8d87838b..cbdc145f4fbc 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -9,11 +9,11 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtDBus module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
-
CONFIGURE_ARGS= --enable QtDBus
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build core_run
USE_QT4= dbus moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -26,5 +26,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/devel/py-qt4-dbus/pkg-plist b/devel/py-qt4-dbus/pkg-plist
index 27958514f5fe..673ecdf83f0f 100644
--- a/devel/py-qt4-dbus/pkg-plist
+++ b/devel/py-qt4-dbus/pkg-plist
@@ -1,17 +1,17 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtDBus.so
-share/py-sip/QtDBus/QtDBusmod.sip
-share/py-sip/QtDBus/qdbusabstractadaptor.sip
-share/py-sip/QtDBus/qdbusabstractinterface.sip
-share/py-sip/QtDBus/qdbusargument.sip
-share/py-sip/QtDBus/qdbusconnection.sip
-share/py-sip/QtDBus/qdbusconnectioninterface.sip
-share/py-sip/QtDBus/qdbuserror.sip
-share/py-sip/QtDBus/qdbusextratypes.sip
-share/py-sip/QtDBus/qdbusinterface.sip
-share/py-sip/QtDBus/qdbusmessage.sip
-share/py-sip/QtDBus/qdbuspendingcall.sip
-share/py-sip/QtDBus/qdbusservicewatcher.sip
-share/py-sip/QtDBus/qdbusunixfiledescriptor.sip
-share/py-sip/QtDBus/qpydbuspendingreply.sip
-share/py-sip/QtDBus/qpydbusreply.sip
+%%PYQT_SIPDIR%%/QtDBus/QtDBusmod.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbusabstractadaptor.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbusabstractinterface.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbusargument.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbusconnection.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbusconnectioninterface.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbuserror.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbusextratypes.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbusinterface.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbusmessage.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbuspendingcall.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbusservicewatcher.sip
+%%PYQT_SIPDIR%%/QtDBus/qdbusunixfiledescriptor.sip
+%%PYQT_SIPDIR%%/QtDBus/qpydbuspendingreply.sip
+%%PYQT_SIPDIR%%/QtDBus/qpydbusreply.sip
%%API%%share/qt4/qsci/api/python/QtDBus.api
diff --git a/devel/py-qt4-dbussupport/Makefile b/devel/py-qt4-dbussupport/Makefile
index 3c99f48471dd..9f72701dda9e 100644
--- a/devel/py-qt4-dbussupport/Makefile
+++ b/devel/py-qt4-dbussupport/Makefile
@@ -7,14 +7,14 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt event loop support for dbus-python
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \
- ${PYDBUS}
-RUN_DEPENDS= ${PYDBUS} \
- ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
+BUILD_DEPENDS= ${PYDBUS}
+RUN_DEPENDS= ${PYDBUS}
CONFIGURE_ARGS= --enable QtCore
-PYQT4_DIST= yes
-USES= pkgconfig
+PYQT_DIST= yes
+
+USES= pkgconfig python pyqt:4
+USE_PYQT= sip_build core_run
USE_QT4= corelib qmake_build moc_build
OPTIONS_DEFINE= DEBUG
@@ -25,7 +25,6 @@ INSTALL_WRKSRC= ${WRKSRC}/dbus
PLIST_FILES= %%PYTHON_SITELIBDIR%%/dbus/mainloop/qt.so
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.pre.mk>
.if ${PYTHON_MAJOR_VER} == 2
diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile
index a39b521004d0..1e91da6deed0 100644
--- a/devel/py-qt4-declarative/Makefile
+++ b/devel/py-qt4-declarative/Makefile
@@ -6,12 +6,11 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtDeclarative module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
- ${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network
-
CONFIGURE_ARGS= --enable QtDeclarative
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build gui_run network_run
USE_QT4= declarative qmake_build moc_build
OPTIONS_DEFINE= API DEBUG
@@ -24,5 +23,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/devel/py-qt4-declarative/pkg-plist b/devel/py-qt4-declarative/pkg-plist
index 07df56c3c15a..0c0b5e2225dd 100644
--- a/devel/py-qt4-declarative/pkg-plist
+++ b/devel/py-qt4-declarative/pkg-plist
@@ -1,21 +1,21 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtDeclarative.so
-share/py-sip/QtDeclarative/QtDeclarativemod.sip
-share/py-sip/QtDeclarative/qdeclarativecomponent.sip
-share/py-sip/QtDeclarative/qdeclarativecontext.sip
-share/py-sip/QtDeclarative/qdeclarativeengine.sip
-share/py-sip/QtDeclarative/qdeclarativeerror.sip
-share/py-sip/QtDeclarative/qdeclarativeexpression.sip
-share/py-sip/QtDeclarative/qdeclarativeextensionplugin.sip
-share/py-sip/QtDeclarative/qdeclarativeimageprovider.sip
-share/py-sip/QtDeclarative/qdeclarativeitem.sip
-share/py-sip/QtDeclarative/qdeclarativelist.sip
-share/py-sip/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.sip
-share/py-sip/QtDeclarative/qdeclarativeparserstatus.sip
-share/py-sip/QtDeclarative/qdeclarativeproperty.sip
-share/py-sip/QtDeclarative/qdeclarativepropertymap.sip
-share/py-sip/QtDeclarative/qdeclarativepropertyvaluesource.sip
-share/py-sip/QtDeclarative/qdeclarativescriptstring.sip
-share/py-sip/QtDeclarative/qdeclarativeview.sip
-share/py-sip/QtDeclarative/qpydeclarativelistproperty.sip
-share/py-sip/QtDeclarative/qpydeclarativepropertyvaluesource.sip
+%%PYQT_SIPDIR%%/QtDeclarative/QtDeclarativemod.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativecomponent.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativecontext.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeengine.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeerror.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeexpression.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeextensionplugin.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeimageprovider.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeitem.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativelist.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeparserstatus.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeproperty.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativepropertymap.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativepropertyvaluesource.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativescriptstring.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeview.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qpydeclarativelistproperty.sip
+%%PYQT_SIPDIR%%/QtDeclarative/qpydeclarativepropertyvaluesource.sip
%%API%%share/qt4/qsci/api/python/QtDeclarative.api
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index 70829764fe70..6042dc1f0ed7 100644
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@@ -8,13 +8,11 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtDesigner module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
- ${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml \
- ${PKGNAMEPREFIX}script>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-script
-
CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build gui_run script_run xml_run
USE_QT4= gui xml designer moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -27,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/devel/py-qt4-designer/pkg-plist b/devel/py-qt4-designer/pkg-plist
index 6defb2b10a8f..a43240c70312 100644
--- a/devel/py-qt4-designer/pkg-plist
+++ b/devel/py-qt4-designer/pkg-plist
@@ -1,27 +1,27 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtDesigner.so
-share/py-sip/QtDesigner/QtDesignermod.sip
-share/py-sip/QtDesigner/abstractactioneditor.sip
-share/py-sip/QtDesigner/abstractformbuilder.sip
-share/py-sip/QtDesigner/abstractformeditor.sip
-share/py-sip/QtDesigner/abstractformwindow.sip
-share/py-sip/QtDesigner/abstractformwindowcursor.sip
-share/py-sip/QtDesigner/abstractformwindowmanager.sip
-share/py-sip/QtDesigner/abstractobjectinspector.sip
-share/py-sip/QtDesigner/abstractpropertyeditor.sip
-share/py-sip/QtDesigner/abstractwidgetbox.sip
-share/py-sip/QtDesigner/container.sip
-share/py-sip/QtDesigner/customwidget.sip
-share/py-sip/QtDesigner/default_extensionfactory.sip
-share/py-sip/QtDesigner/extension.sip
-share/py-sip/QtDesigner/formbuilder.sip
-share/py-sip/QtDesigner/membersheet.sip
-share/py-sip/QtDesigner/propertysheet.sip
-share/py-sip/QtDesigner/qextensionmanager.sip
-share/py-sip/QtDesigner/qpydesignercontainerextension.sip
-share/py-sip/QtDesigner/qpydesignercustomwidgetcollectionplugin.sip
-share/py-sip/QtDesigner/qpydesignercustomwidgetplugin.sip
-share/py-sip/QtDesigner/qpydesignermembersheetextension.sip
-share/py-sip/QtDesigner/qpydesignerpropertysheetextension.sip
-share/py-sip/QtDesigner/qpydesignertaskmenuextension.sip
-share/py-sip/QtDesigner/taskmenu.sip
+%%PYQT_SIPDIR%%/QtDesigner/QtDesignermod.sip
+%%PYQT_SIPDIR%%/QtDesigner/abstractactioneditor.sip
+%%PYQT_SIPDIR%%/QtDesigner/abstractformbuilder.sip
+%%PYQT_SIPDIR%%/QtDesigner/abstractformeditor.sip
+%%PYQT_SIPDIR%%/QtDesigner/abstractformwindow.sip
+%%PYQT_SIPDIR%%/QtDesigner/abstractformwindowcursor.sip
+%%PYQT_SIPDIR%%/QtDesigner/abstractformwindowmanager.sip
+%%PYQT_SIPDIR%%/QtDesigner/abstractobjectinspector.sip
+%%PYQT_SIPDIR%%/QtDesigner/abstractpropertyeditor.sip
+%%PYQT_SIPDIR%%/QtDesigner/abstractwidgetbox.sip
+%%PYQT_SIPDIR%%/QtDesigner/container.sip
+%%PYQT_SIPDIR%%/QtDesigner/customwidget.sip
+%%PYQT_SIPDIR%%/QtDesigner/default_extensionfactory.sip
+%%PYQT_SIPDIR%%/QtDesigner/extension.sip
+%%PYQT_SIPDIR%%/QtDesigner/formbuilder.sip
+%%PYQT_SIPDIR%%/QtDesigner/membersheet.sip
+%%PYQT_SIPDIR%%/QtDesigner/propertysheet.sip
+%%PYQT_SIPDIR%%/QtDesigner/qextensionmanager.sip
+%%PYQT_SIPDIR%%/QtDesigner/qpydesignercontainerextension.sip
+%%PYQT_SIPDIR%%/QtDesigner/qpydesignercustomwidgetcollectionplugin.sip
+%%PYQT_SIPDIR%%/QtDesigner/qpydesignercustomwidgetplugin.sip
+%%PYQT_SIPDIR%%/QtDesigner/qpydesignermembersheetextension.sip
+%%PYQT_SIPDIR%%/QtDesigner/qpydesignerpropertysheetextension.sip
+%%PYQT_SIPDIR%%/QtDesigner/qpydesignertaskmenuextension.sip
+%%PYQT_SIPDIR%%/QtDesigner/taskmenu.sip
%%API%%share/qt4/qsci/api/python/QtDesigner.api
diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile
index de77468f29ce..7755ee85b6e1 100644
--- a/devel/py-qt4-designerplugin/Makefile
+++ b/devel/py-qt4-designerplugin/Makefile
@@ -8,15 +8,15 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtDesigner plugin
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designer
-
BUILD_WRKSRC= ${WRKSRC}/designer
INSTALL_WRKSRC= ${WRKSRC}/designer
+DESTDIRNAME= INSTALL_ROOT
CONFIGURE_ARGS= --enable QtDesigner
-DESTDIRNAME= INSTALL_ROOT
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build designer_run
USE_QT4= gui xml designer moc_build qmake_build
OPTIONS_DEFINE= DEBUG
@@ -24,5 +24,4 @@ DEBUG_CONFIGURE_ON= --debug --trace
PLIST_FILES= %%QT_PLUGINDIR%%/designer/libpyqt4.so
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile
index 1f43868b4ff0..4cfa3f87542c 100644
--- a/devel/py-qt4-help/Makefile
+++ b/devel/py-qt4-help/Makefile
@@ -6,11 +6,11 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtHelp module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
-
CONFIGURE_ARGS= --enable QtHelp
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build gui_run
USE_QT4= help moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -23,5 +23,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/devel/py-qt4-help/pkg-plist b/devel/py-qt4-help/pkg-plist
index 2f145e020c69..8ab492f39141 100644
--- a/devel/py-qt4-help/pkg-plist
+++ b/devel/py-qt4-help/pkg-plist
@@ -1,10 +1,10 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtHelp.so
-share/py-sip/QtHelp/QtHelpmod.sip
-share/py-sip/QtHelp/qhelpcontentwidget.sip
-share/py-sip/QtHelp/qhelpengine.sip
-share/py-sip/QtHelp/qhelpenginecore.sip
-share/py-sip/QtHelp/qhelpindexwidget.sip
-share/py-sip/QtHelp/qhelpsearchengine.sip
-share/py-sip/QtHelp/qhelpsearchquerywidget.sip
-share/py-sip/QtHelp/qhelpsearchresultwidget.sip
+%%PYQT_SIPDIR%%/QtHelp/QtHelpmod.sip
+%%PYQT_SIPDIR%%/QtHelp/qhelpcontentwidget.sip
+%%PYQT_SIPDIR%%/QtHelp/qhelpengine.sip
+%%PYQT_SIPDIR%%/QtHelp/qhelpenginecore.sip
+%%PYQT_SIPDIR%%/QtHelp/qhelpindexwidget.sip
+%%PYQT_SIPDIR%%/QtHelp/qhelpsearchengine.sip
+%%PYQT_SIPDIR%%/QtHelp/qhelpsearchquerywidget.sip
+%%PYQT_SIPDIR%%/QtHelp/qhelpsearchresultwidget.sip
%%API%%share/qt4/qsci/api/python/QtHelp.api
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index 94c655d39e6d..8e3b0aed1bea 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -13,30 +13,26 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for QScintilla2 (PyQt4), QSci module
LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \
- ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:${PORTSDIR}/devel/py-qt4-core \
- ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+DISTINFO_FILE= ${.CURDIR:H}/qscintilla2/distinfo
DESTDIRNAME= INSTALL_ROOT
-DISTINFO_FILE= ${QSCI2_DISTINFO_FILE}
+
HAS_CONFIGURE= yes
-USES= python
-USE_QT4= gui moc_build qmake_build
QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS.
+USES= python pyqt:4
+USE_PYQT= sip core gui
+USE_QT4= gui moc_build qmake_build
+
OPTIONS_DEFINE= DEBUG
DEBUG_CONFIGURE_ON= --debug --trace
-SIPDIR= ${PREFIX}/share/py-sip
QSCIDIR= ${PREFIX}/share/qt4/qsci
CONFIGURE_ARGS= --pyqt PyQt4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${SIPDIR} \
--apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR}
WRKSRC= ${WRKDIR}/${DISTNAME}/Python
ALL_TARGET= #empty
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
-
do-configure:
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
diff --git a/devel/py-qt4-qscintilla2/pkg-plist b/devel/py-qt4-qscintilla2/pkg-plist
index db6899836621..18d73a9e6403 100644
--- a/devel/py-qt4-qscintilla2/pkg-plist
+++ b/devel/py-qt4-qscintilla2/pkg-plist
@@ -1,56 +1,56 @@
%%PYTHON_SITELIBDIR%%/PyQt4/Qsci.so
-share/py-sip/Qsci/qsciabstractapis.sip
-share/py-sip/Qsci/qsciapis.sip
-share/py-sip/Qsci/qscicommand.sip
-share/py-sip/Qsci/qscicommandset.sip
-share/py-sip/Qsci/qscidocument.sip
-share/py-sip/Qsci/qscilexer.sip
-share/py-sip/Qsci/qscilexeravs.sip
-share/py-sip/Qsci/qscilexerbash.sip
-share/py-sip/Qsci/qscilexerbatch.sip
-share/py-sip/Qsci/qscilexercmake.sip
-share/py-sip/Qsci/qscilexercoffeescript.sip
-share/py-sip/Qsci/qscilexercpp.sip
-share/py-sip/Qsci/qscilexercsharp.sip
-share/py-sip/Qsci/qscilexercss.sip
-share/py-sip/Qsci/qscilexercustom.sip
-share/py-sip/Qsci/qscilexerd.sip
-share/py-sip/Qsci/qscilexerdiff.sip
-share/py-sip/Qsci/qscilexerfortran.sip
-share/py-sip/Qsci/qscilexerfortran77.sip
-share/py-sip/Qsci/qscilexerhtml.sip
-share/py-sip/Qsci/qscilexeridl.sip
-share/py-sip/Qsci/qscilexerjava.sip
-share/py-sip/Qsci/qscilexerjavascript.sip
-share/py-sip/Qsci/qscilexerlua.sip
-share/py-sip/Qsci/qscilexermakefile.sip
-share/py-sip/Qsci/qscilexermatlab.sip
-share/py-sip/Qsci/qscilexeroctave.sip
-share/py-sip/Qsci/qscilexerpascal.sip
-share/py-sip/Qsci/qscilexerperl.sip
-share/py-sip/Qsci/qscilexerpo.sip
-share/py-sip/Qsci/qscilexerpostscript.sip
-share/py-sip/Qsci/qscilexerpov.sip
-share/py-sip/Qsci/qscilexerproperties.sip
-share/py-sip/Qsci/qscilexerpython.sip
-share/py-sip/Qsci/qscilexerruby.sip
-share/py-sip/Qsci/qscilexerspice.sip
-share/py-sip/Qsci/qscilexersql.sip
-share/py-sip/Qsci/qscilexertcl.sip
-share/py-sip/Qsci/qscilexertex.sip
-share/py-sip/Qsci/qscilexerverilog.sip
-share/py-sip/Qsci/qscilexervhdl.sip
-share/py-sip/Qsci/qscilexerxml.sip
-share/py-sip/Qsci/qscilexeryaml.sip
-share/py-sip/Qsci/qscimacro.sip
-share/py-sip/Qsci/qscimod3.sip
-share/py-sip/Qsci/qscimod4.sip
-share/py-sip/Qsci/qscimod5.sip
-share/py-sip/Qsci/qscimodcommon.sip
-share/py-sip/Qsci/qsciprinter.sip
-share/py-sip/Qsci/qsciscintilla.sip
-share/py-sip/Qsci/qsciscintillabase3.sip
-share/py-sip/Qsci/qsciscintillabase4.sip
-share/py-sip/Qsci/qscistyle.sip
-share/py-sip/Qsci/qscistyledtext.sip
+%%PYQT_SIPDIR%%/Qsci/qsciabstractapis.sip
+%%PYQT_SIPDIR%%/Qsci/qsciapis.sip
+%%PYQT_SIPDIR%%/Qsci/qscicommand.sip
+%%PYQT_SIPDIR%%/Qsci/qscicommandset.sip
+%%PYQT_SIPDIR%%/Qsci/qscidocument.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexer.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexeravs.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerbash.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerbatch.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexercmake.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexercoffeescript.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexercpp.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexercsharp.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexercss.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexercustom.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerd.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerdiff.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerfortran.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerfortran77.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerhtml.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexeridl.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerjava.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerjavascript.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerlua.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexermakefile.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexermatlab.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexeroctave.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerpascal.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerperl.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerpo.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerpostscript.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerpov.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerproperties.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerpython.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerruby.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerspice.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexersql.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexertcl.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexertex.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerverilog.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexervhdl.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerxml.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexeryaml.sip
+%%PYQT_SIPDIR%%/Qsci/qscimacro.sip
+%%PYQT_SIPDIR%%/Qsci/qscimod3.sip
+%%PYQT_SIPDIR%%/Qsci/qscimod4.sip
+%%PYQT_SIPDIR%%/Qsci/qscimod5.sip
+%%PYQT_SIPDIR%%/Qsci/qscimodcommon.sip
+%%PYQT_SIPDIR%%/Qsci/qsciprinter.sip
+%%PYQT_SIPDIR%%/Qsci/qsciscintilla.sip
+%%PYQT_SIPDIR%%/Qsci/qsciscintillabase3.sip
+%%PYQT_SIPDIR%%/Qsci/qsciscintillabase4.sip
+%%PYQT_SIPDIR%%/Qsci/qscistyle.sip
+%%PYQT_SIPDIR%%/Qsci/qscistyledtext.sip
share/qt4/qsci/api/python/QScintilla2.api
diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile
index cee85c26bd9f..356af8fe1c2b 100644
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@@ -8,11 +8,11 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtScript module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
-
CONFIGURE_ARGS= --enable QtScript
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build core_run
USE_QT4= moc_build script qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -25,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/devel/py-qt4-script/pkg-plist b/devel/py-qt4-script/pkg-plist
index bde375fc4eac..9c452cb68d4d 100644
--- a/devel/py-qt4-script/pkg-plist
+++ b/devel/py-qt4-script/pkg-plist
@@ -1,12 +1,12 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtScript.so
-share/py-sip/QtScript/QtScriptmod.sip
-share/py-sip/QtScript/qscriptclass.sip
-share/py-sip/QtScript/qscriptclasspropertyiterator.sip
-share/py-sip/QtScript/qscriptcontext.sip
-share/py-sip/QtScript/qscriptcontextinfo.sip
-share/py-sip/QtScript/qscriptengine.sip
-share/py-sip/QtScript/qscriptengineagent.sip
-share/py-sip/QtScript/qscriptstring.sip
-share/py-sip/QtScript/qscriptvalue.sip
-share/py-sip/QtScript/qscriptvalueiterator.sip
+%%PYQT_SIPDIR%%/QtScript/QtScriptmod.sip
+%%PYQT_SIPDIR%%/QtScript/qscriptclass.sip
+%%PYQT_SIPDIR%%/QtScript/qscriptclasspropertyiterator.sip
+%%PYQT_SIPDIR%%/QtScript/qscriptcontext.sip
+%%PYQT_SIPDIR%%/QtScript/qscriptcontextinfo.sip
+%%PYQT_SIPDIR%%/QtScript/qscriptengine.sip
+%%PYQT_SIPDIR%%/QtScript/qscriptengineagent.sip
+%%PYQT_SIPDIR%%/QtScript/qscriptstring.sip
+%%PYQT_SIPDIR%%/QtScript/qscriptvalue.sip
+%%PYQT_SIPDIR%%/QtScript/qscriptvalueiterator.sip
%%API%%share/qt4/qsci/api/python/QtScript.api
diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile
index 2cb593b0a373..a17efdc970e6 100644
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtScriptTools module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
-
CONFIGURE_ARGS= --enable QtScriptTools
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build core_run
USE_QT4= moc_build scripttools qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -24,5 +24,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/devel/py-qt4-scripttools/pkg-plist b/devel/py-qt4-scripttools/pkg-plist
index 88f669362b17..80f5e7f6d7e0 100644
--- a/devel/py-qt4-scripttools/pkg-plist
+++ b/devel/py-qt4-scripttools/pkg-plist
@@ -1,4 +1,4 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtScriptTools.so
-share/py-sip/QtScriptTools/QtScriptToolsmod.sip
-share/py-sip/QtScriptTools/qscriptenginedebugger.sip
+%%PYQT_SIPDIR%%/QtScriptTools/QtScriptToolsmod.sip
+%%PYQT_SIPDIR%%/QtScriptTools/qscriptenginedebugger.sip
%%API%%share/qt4/qsci/api/python/QtScriptTools.api
diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile
index d8858b7a99c4..4b0986a6fff8 100644
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@@ -8,11 +8,11 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtTest module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
-
CONFIGURE_ARGS= --enable QtTest
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build gui_run
USE_QT4= moc_build gui qtestlib qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -25,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/devel/py-qt4-test/pkg-plist b/devel/py-qt4-test/pkg-plist
index 7056ff5bac3c..3a8472a96b6a 100644
--- a/devel/py-qt4-test/pkg-plist
+++ b/devel/py-qt4-test/pkg-plist
@@ -1,7 +1,7 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtTest.so
-share/py-sip/QtTest/QtTestmod.sip
-share/py-sip/QtTest/qtestcase.sip
-share/py-sip/QtTest/qtestkeyboard.sip
-share/py-sip/QtTest/qtestmouse.sip
-share/py-sip/QtTest/qtestsystem.sip
+%%PYQT_SIPDIR%%/QtTest/QtTestmod.sip
+%%PYQT_SIPDIR%%/QtTest/qtestcase.sip
+%%PYQT_SIPDIR%%/QtTest/qtestkeyboard.sip
+%%PYQT_SIPDIR%%/QtTest/qtestmouse.sip
+%%PYQT_SIPDIR%%/QtTest/qtestsystem.sip
%%API%%share/qt4/qsci/api/python/QtTest.api
diff --git a/devel/py-qt4/Makefile b/devel/py-qt4/Makefile
index 1df46d5a5040..74a68ad050b0 100644
--- a/devel/py-qt4/Makefile
+++ b/devel/py-qt4/Makefile
@@ -9,17 +9,18 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt 4 toolkit (meta port)
-USES= metaport python
+USES= metaport python pyqt:4
-OPTIONS_DEFINE= ALL ${PYQT4_COMPONENTS}
-OPTIONS_DEFAULT= ALL
-ALL_DESC= All PyQt4 components
+OPTIONS_DEFINE= assistant core dbus dbussupport declarative \
+ demo designer designerplugin doc gui help \
+ multimedia network opengl phonon qscintilla2 \
+ script scripttools sql svg test webkit xml \
+ xmlpatterns
+OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
-.include "${.CURDIR}/bsd.pyqt.mk"
-
-.for component in ${PYQT4_COMPONENTS}
-${component}_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt4-${component}>=0:${PORTSDIR}/${${component}_PORT}
-ALL_RUN_DEPENDS+= ${${component}_RUN_DEPENDS}
+.for opt in ${OPTIONS_DEFINE}
+${opt}_USE= PYQT=${opt}_run
+${opt}_DESC= ${py-${opt}_DESC}
.endfor
.include <bsd.port.mk>
diff --git a/devel/py-qt4/bsd.pyqt.mk b/devel/py-qt4/bsd.pyqt.mk
deleted file mode 100644
index a06f1b49ba08..000000000000
--- a/devel/py-qt4/bsd.pyqt.mk
+++ /dev/null
@@ -1,121 +0,0 @@
-# bsd.pyqt.mk - Global definitions for PyQt related ports
-#
-# $FreeBSD$
-#
-# Port variables:
-# PYQT4_DIST - This port is part of PyQt4 itself. Variables and
-# targets are then set assuming a certain tarball and
-# port layout.
-#
-
-PYQT_MAINTAINER= kde@FreeBSD.org
-
-MASTER_SITE_RIVERBANK= http://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/
-
-MASTER_SITES_SIP= SF/pyqt/sip/sip-${PORTVERSION} \
- GENTOO
-MASTER_SITES_PYQT4= SF/pyqt/PyQt4/PyQt-${PORTVERSION} \
- GENTOO
-MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
- GENTOO
-
-SIP_VERSION= 4.16.5
-PYQT4_VERSION= 4.11.3
-QSCI2_VERSION= 2.8.4
-
-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_DISTINFO_FILE= ${.CURDIR}/../../devel/qscintilla2/distinfo
-
-PYQT4_COMPONENTS= assistant core dbus dbussupport declarative \
- demo designer designerplugin doc gui help \
- multimedia network opengl phonon qscintilla2 \
- script scripttools sql svg test webkit xml \
- xmlpatterns
-
-assistant_PORT= devel/py-qt4-assistant
-core_PORT= devel/py-qt4-core
-dbus_PORT= devel/py-qt4-dbus
-dbussupport_PORT= devel/py-qt4-dbussupport
-declarative_PORT= devel/py-qt4-declarative
-demo_PORT= misc/py-qt4-demo
-designer_PORT= devel/py-qt4-designer
-designerplugin_PORT= devel/py-qt4-designerplugin
-doc_PORT= misc/py-qt4-doc
-gui_PORT= x11-toolkits/py-qt4-gui
-help_PORT= devel/py-qt4-help
-multimedia_PORT= multimedia/py-qt4-multimedia
-network_PORT= net/py-qt4-network
-opengl_PORT= x11/py-qt4-opengl
-phonon_PORT= multimedia/py-qt4-phonon
-qscintilla2_PORT= devel/py-qt4-qscintilla2
-script_PORT= devel/py-qt4-script
-scripttools_PORT= devel/py-qt4-scripttools
-sql_PORT= databases/py-qt4-sql
-svg_PORT= graphics/py-qt4-svg
-test_PORT= devel/py-qt4-test
-webkit_PORT= www/py-qt4-webkit
-xml_PORT= textproc/py-qt4-xml
-xmlpatterns_PORT= textproc/py-qt4-xmlpatterns
-
-assistant_DESC= Python bindings for QtAssistant module
-core_DESC= Python bindings for QtCore module
-dbus_DESC= Python bindings for QtDBus module
-dbussupport_DESC= Qt event loop support for dbus-python
-declarative_DESC= Python bindings for QtDeclarative module
-demo_DESC= PyQt4 demo and examples
-designer_DESC= Python bindings for QtDesigner module
-designerplugin_DESC= Python bindings for QtDesigner plugin
-doc_DESC= PyQt4 documentation
-gui_DESC= Python bindings for QtGui module
-help_DESC= Python bindings for QtHelp module
-multimedia_DESC= Python bindings for Multimedia module
-network_DESC= Python bindings for QtNetwork module
-opengl_DESC= Python bindings for QtOpenGL module
-phonon_DESC= Python bindings for Phonon module
-qscintilla2_DESC= Python bindings for QScintilla2
-script_DESC= Python bindings for QtScript module
-scripttools_DESC= Python bindings for QtScriptTools module
-sql_DESC= Python bindings for QtSql module
-svg_DESC= Python bindings for QtSvg module
-test_DESC= Python bindings for QtTest module
-webkit_DESC= Python bindings for QtWebKit module
-xml_DESC= Python bindings for QtXml module
-xmlpatterns_DESC= Python bindings for QtXmlPatterns module
-
-.if defined(PYQT4_DIST)
-PORTVERSION= ${PYQT4_VERSION}
-MASTER_SITES= ${MASTER_SITES_PYQT4}
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME= ${PYQT4_DISTNAME}
-
-DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
-HAS_CONFIGURE= yes
-USES+= python
-
-QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS.
-
-PATCHDIR= ${.CURDIR}/../../devel/py-qt4-core/files
-SIPDIR= ${PREFIX}/share/py-sip
-QSCIDIR= ${PREFIX}/share/qt4/qsci
-CONFIGURE_ARGS+=-b ${PREFIX}/bin \
- -d ${PYTHONPREFIX_SITELIBDIR} \
- -q ${QMAKE} \
- --confirm-license \
- --sipdir ${SIPDIR}
-
-# One of the things PyQt4 looks for to determine whether to build the Qt DBus
-# main loop module (py-qt4-dbussupport) is whether the dbus/ directory is
-# present. Only extract it for that port then.
-.if ${PORTNAME} != "dbussupport"
-EXTRACT_AFTER_ARGS+= --exclude "${DISTNAME}/dbus"
-.endif # ${PORTNAME} != "dbussupport"
-
-.if !target(do-configure)
-do-configure:
- cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
- ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
-.endif # !target(do-configure)
-.endif # defined(PYQT4_DIST)
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 7006ba7299f8..1e763599b0ab 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -13,8 +13,9 @@ DISTNAME= ${SIP_DISTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Python to C and C++ bindings generator
-USES= python
+USES= python pyqt:sip
USE_PYTHON= concurrent py3kplist
+USE_PYQT= #
CONFIGURE_ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \
@@ -27,8 +28,6 @@ PORTDOCS= *
OPTIONS_DEFINE= DOCS DEBUG
DEBUG_CONFIGURE_ON= --debug
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
-
do-configure:
cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile
index f59f87fe8c60..9bce26e79bde 100644
--- a/devel/qscintilla2-designerplugin/Makefile
+++ b/devel/qscintilla2-designerplugin/Makefile
@@ -14,8 +14,8 @@ COMMENT= Qt4 Designer plugin for QScintilla2
LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
-DISTINFO_FILE= ${QSCI2_DISTINFO_FILE}
-USES= qmake
+DISTINFO_FILE= ${.CURDIR:H}/qscintilla2/distinfo
+USES= qmake pyqt:4
USE_QT4= qmake_build moc_build gui xml designer
HAS_CONFIGURE= yes
@@ -23,8 +23,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/designer-Qt4Qt5
PLIST_FILES= %%QT_PLUGINDIR%%/designer/libqscintillaplugin.so
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
-
pre-configure:
${REINPLACE_CMD} -e \
's|$$$$\[QT_INSTALL_PLUGINS\]|${PREFIX}/${QT_PLUGINDIR_REL}|' \
diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile
index d6848880a3e6..db13304621e1 100644
--- a/devel/qscintilla2/Makefile
+++ b/devel/qscintilla2/Makefile
@@ -11,7 +11,8 @@ DISTNAME= ${QSCI2_DISTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 4 port of the Scintilla C++ editor class
-USES= qmake
+USES= qmake pyqt:4
+USE_PYQT= #
USE_QT4= moc_build gui xml designer
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
@@ -25,7 +26,6 @@ PORTEXAMPLES= *
OPTIONS_DEFINE= DOCS EXAMPLES NLS
OPTIONS_SUB= yes
-.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
.include <bsd.port.options.mk>
post-patch:
diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile
index ec8870594f16..d4f6b9cebfa5 100644
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@@ -8,11 +8,11 @@ CATEGORIES= graphics devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtSvg module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
-
CONFIGURE_ARGS= --enable QtSvg
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build gui_run
USE_QT4= moc_build svg qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -25,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/graphics/py-qt4-svg/pkg-plist b/graphics/py-qt4-svg/pkg-plist
index 67f60be30008..fb3dde8a90ce 100644
--- a/graphics/py-qt4-svg/pkg-plist
+++ b/graphics/py-qt4-svg/pkg-plist
@@ -1,7 +1,7 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtSvg.so
-share/py-sip/QtSvg/QtSvgmod.sip
-share/py-sip/QtSvg/qgraphicssvgitem.sip
-share/py-sip/QtSvg/qsvggenerator.sip
-share/py-sip/QtSvg/qsvgrenderer.sip
-share/py-sip/QtSvg/qsvgwidget.sip
+%%PYQT_SIPDIR%%/QtSvg/QtSvgmod.sip
+%%PYQT_SIPDIR%%/QtSvg/qgraphicssvgitem.sip
+%%PYQT_SIPDIR%%/QtSvg/qsvggenerator.sip
+%%PYQT_SIPDIR%%/QtSvg/qsvgrenderer.sip
+%%PYQT_SIPDIR%%/QtSvg/qsvgwidget.sip
%%API%%share/qt4/qsci/api/python/QtSvg.api
diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile
index 8766fad650b7..f7834161dd6f 100644
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@@ -15,15 +15,15 @@ COMMENT= Python bindings for the Qt4 toolkit, Qt demo and examples
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
-USES= python
+USES= python pyqt:4
EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
-
-.for component in ${PYQT4_COMPONENTS:Ndemo}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qt4-${component}>=0:${PORTSDIR}/${${component}_PORT}
-.endfor
+USE_PYQT= assistant_run core_run dbus_run dbussupport_run declarative_run \
+ designer_run designerplugin_run doc_run gui_run help_run \
+ multimedia_run network_run opengl_run phonon_run qscintilla2_run \
+ script_run scripttools_run sql_run svg_run test_run webkit_run xml_run \
+ xmlpatterns_run sip_run qscintilla2_run
do-build:
${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/examples
diff --git a/misc/py-qt4-doc/Makefile b/misc/py-qt4-doc/Makefile
index 7e8fc69ffb42..162865a9e25a 100644
--- a/misc/py-qt4-doc/Makefile
+++ b/misc/py-qt4-doc/Makefile
@@ -15,7 +15,8 @@ COMMENT= Python bindings for the Qt4 toolkit, documentation
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
NO_BUILD= yes
-USES= python
+USES= python pyqt:4
+USE_PYQT= #
DOCSDIR= ${PREFIX}/share/doc/py-qt4
@@ -29,5 +30,4 @@ do-install:
${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
-.include "../../devel/py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile
index fb94ef8d4c29..264940a597c4 100644
--- a/multimedia/py-qt4-multimedia/Makefile
+++ b/multimedia/py-qt4-multimedia/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= multimedia devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, Multimedia module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
-
CONFIGURE_ARGS= --enable QtMultimedia
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build gui_run
USE_QT4= moc_build multimedia qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -24,5 +24,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/multimedia/py-qt4-multimedia/pkg-plist b/multimedia/py-qt4-multimedia/pkg-plist
index f537124f9ad8..36a787a910b4 100644
--- a/multimedia/py-qt4-multimedia/pkg-plist
+++ b/multimedia/py-qt4-multimedia/pkg-plist
@@ -1,12 +1,12 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtMultimedia.so
-share/py-sip/QtMultimedia/QtMultimediamod.sip
-share/py-sip/QtMultimedia/qabstractvideobuffer.sip
-share/py-sip/QtMultimedia/qabstractvideosurface.sip
-share/py-sip/QtMultimedia/qaudio.sip
-share/py-sip/QtMultimedia/qaudiodeviceinfo.sip
-share/py-sip/QtMultimedia/qaudioformat.sip
-share/py-sip/QtMultimedia/qaudioinput.sip
-share/py-sip/QtMultimedia/qaudiooutput.sip
-share/py-sip/QtMultimedia/qvideoframe.sip
-share/py-sip/QtMultimedia/qvideosurfaceformat.sip
+%%PYQT_SIPDIR%%/QtMultimedia/QtMultimediamod.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qabstractvideobuffer.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qabstractvideosurface.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qaudio.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qaudiodeviceinfo.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qaudioformat.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qaudioinput.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qaudiooutput.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qvideoframe.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qvideosurfaceformat.sip
%%API%%share/qt4/qsci/api/python/QtMultimedia.api
diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile
index 10bb68b5367e..9d74484de306 100644
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@@ -6,11 +6,11 @@ CATEGORIES= multimedia devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, Phonon module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
-
CONFIGURE_ARGS= --enable phonon
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build core_run
USE_QT4= moc_build phonon qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -23,5 +23,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/multimedia/py-qt4-phonon/pkg-plist b/multimedia/py-qt4-phonon/pkg-plist
index 9e1ce995aa41..f99db107282c 100644
--- a/multimedia/py-qt4-phonon/pkg-plist
+++ b/multimedia/py-qt4-phonon/pkg-plist
@@ -1,21 +1,21 @@
%%PYTHON_SITELIBDIR%%/PyQt4/phonon.so
-share/py-sip/phonon/abstractaudiooutput.sip
-share/py-sip/phonon/abstractvideooutput.sip
-share/py-sip/phonon/audiooutput.sip
-share/py-sip/phonon/backendcapabilities.sip
-share/py-sip/phonon/effect.sip
-share/py-sip/phonon/effectparameter.sip
-share/py-sip/phonon/effectwidget.sip
-share/py-sip/phonon/mediacontroller.sip
-share/py-sip/phonon/medianode.sip
-share/py-sip/phonon/mediaobject.sip
-share/py-sip/phonon/mediasource.sip
-share/py-sip/phonon/objectdescription.sip
-share/py-sip/phonon/path.sip
-share/py-sip/phonon/phononmod.sip
-share/py-sip/phonon/phononnamespace.sip
-share/py-sip/phonon/seekslider.sip
-share/py-sip/phonon/videoplayer.sip
-share/py-sip/phonon/videowidget.sip
-share/py-sip/phonon/volumeslider.sip
+%%PYQT_SIPDIR%%/phonon/abstractaudiooutput.sip
+%%PYQT_SIPDIR%%/phonon/abstractvideooutput.sip
+%%PYQT_SIPDIR%%/phonon/audiooutput.sip
+%%PYQT_SIPDIR%%/phonon/backendcapabilities.sip
+%%PYQT_SIPDIR%%/phonon/effect.sip
+%%PYQT_SIPDIR%%/phonon/effectparameter.sip
+%%PYQT_SIPDIR%%/phonon/effectwidget.sip
+%%PYQT_SIPDIR%%/phonon/mediacontroller.sip
+%%PYQT_SIPDIR%%/phonon/medianode.sip
+%%PYQT_SIPDIR%%/phonon/mediaobject.sip
+%%PYQT_SIPDIR%%/phonon/mediasource.sip
+%%PYQT_SIPDIR%%/phonon/objectdescription.sip
+%%PYQT_SIPDIR%%/phonon/path.sip
+%%PYQT_SIPDIR%%/phonon/phononmod.sip
+%%PYQT_SIPDIR%%/phonon/phononnamespace.sip
+%%PYQT_SIPDIR%%/phonon/seekslider.sip
+%%PYQT_SIPDIR%%/phonon/videoplayer.sip
+%%PYQT_SIPDIR%%/phonon/videowidget.sip
+%%PYQT_SIPDIR%%/phonon/volumeslider.sip
%%API%%share/qt4/qsci/api/python/phonon.api
diff --git a/net-im/turpial/Makefile b/net-im/turpial/Makefile
index a5d916d42dc2..ebff96f460c1 100644
--- a/net-im/turpial/Makefile
+++ b/net-im/turpial/Makefile
@@ -18,18 +18,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify \
${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:${PORTSDIR}/devel/py-Jinja2 \
${PYTHON_PKGNAMEPREFIX}libturpial>=1.7.0:${PORTSDIR}/net-im/py-libturpial
-USES= python:2
+USES= pyqt:4 python:2
+USE_PYQT= core_run gui_run network_run phonon_run webkit_run
USE_PYTHON= distutils autoplist
INSTALLS_ICONS= yes
-PYQT4_PORTS= core gui network phonon webkit
-
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
-
-.for component in ${PYQT4_PORTS}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qt4-${component}>=0:${PORTSDIR}/${${component}_PORT}
-.endfor
-
LOCALES_DIR= ca de eo es fr it ja pt_BR pt_PT ru_RU tr
post-extract:
diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile
index 1cd36fd8a318..ed5efaf5e5f6 100644
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@@ -8,11 +8,11 @@ CATEGORIES= net devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtNetwork module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
-
CONFIGURE_ARGS= --enable QtNetwork
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build core_run
USE_QT4= moc_build network qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -25,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/net/py-qt4-network/pkg-plist b/net/py-qt4-network/pkg-plist
index 3f5a3cb6b18b..41aa276648b7 100644
--- a/net/py-qt4-network/pkg-plist
+++ b/net/py-qt4-network/pkg-plist
@@ -1,37 +1,37 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtNetwork.so
-share/py-sip/QtNetwork/QtNetworkmod.sip
-share/py-sip/QtNetwork/qabstractnetworkcache.sip
-share/py-sip/QtNetwork/qabstractsocket.sip
-share/py-sip/QtNetwork/qauthenticator.sip
-share/py-sip/QtNetwork/qdnslookup.sip
-share/py-sip/QtNetwork/qftp.sip
-share/py-sip/QtNetwork/qhostaddress.sip
-share/py-sip/QtNetwork/qhostinfo.sip
-share/py-sip/QtNetwork/qhttp.sip
-share/py-sip/QtNetwork/qhttpmultipart.sip
-share/py-sip/QtNetwork/qlocalserver.sip
-share/py-sip/QtNetwork/qlocalsocket.sip
-share/py-sip/QtNetwork/qnetworkaccessmanager.sip
-share/py-sip/QtNetwork/qnetworkconfigmanager.sip
-share/py-sip/QtNetwork/qnetworkconfiguration.sip
-share/py-sip/QtNetwork/qnetworkcookie.sip
-share/py-sip/QtNetwork/qnetworkcookiejar.sip
-share/py-sip/QtNetwork/qnetworkdiskcache.sip
-share/py-sip/QtNetwork/qnetworkinterface.sip
-share/py-sip/QtNetwork/qnetworkproxy.sip
-share/py-sip/QtNetwork/qnetworkreply.sip
-share/py-sip/QtNetwork/qnetworkrequest.sip
-share/py-sip/QtNetwork/qnetworksession.sip
-share/py-sip/QtNetwork/qssl.sip
-share/py-sip/QtNetwork/qsslcertificate.sip
-share/py-sip/QtNetwork/qsslcertificateextension.sip
-share/py-sip/QtNetwork/qsslcipher.sip
-share/py-sip/QtNetwork/qsslconfiguration.sip
-share/py-sip/QtNetwork/qsslerror.sip
-share/py-sip/QtNetwork/qsslkey.sip
-share/py-sip/QtNetwork/qsslsocket.sip
-share/py-sip/QtNetwork/qtcpserver.sip
-share/py-sip/QtNetwork/qtcpsocket.sip
-share/py-sip/QtNetwork/qudpsocket.sip
-share/py-sip/QtNetwork/qurlinfo.sip
+%%PYQT_SIPDIR%%/QtNetwork/QtNetworkmod.sip
+%%PYQT_SIPDIR%%/QtNetwork/qabstractnetworkcache.sip
+%%PYQT_SIPDIR%%/QtNetwork/qabstractsocket.sip
+%%PYQT_SIPDIR%%/QtNetwork/qauthenticator.sip
+%%PYQT_SIPDIR%%/QtNetwork/qdnslookup.sip
+%%PYQT_SIPDIR%%/QtNetwork/qftp.sip
+%%PYQT_SIPDIR%%/QtNetwork/qhostaddress.sip
+%%PYQT_SIPDIR%%/QtNetwork/qhostinfo.sip
+%%PYQT_SIPDIR%%/QtNetwork/qhttp.sip
+%%PYQT_SIPDIR%%/QtNetwork/qhttpmultipart.sip
+%%PYQT_SIPDIR%%/QtNetwork/qlocalserver.sip
+%%PYQT_SIPDIR%%/QtNetwork/qlocalsocket.sip
+%%PYQT_SIPDIR%%/QtNetwork/qnetworkaccessmanager.sip
+%%PYQT_SIPDIR%%/QtNetwork/qnetworkconfigmanager.sip
+%%PYQT_SIPDIR%%/QtNetwork/qnetworkconfiguration.sip
+%%PYQT_SIPDIR%%/QtNetwork/qnetworkcookie.sip
+%%PYQT_SIPDIR%%/QtNetwork/qnetworkcookiejar.sip
+%%PYQT_SIPDIR%%/QtNetwork/qnetworkdiskcache.sip
+%%PYQT_SIPDIR%%/QtNetwork/qnetworkinterface.sip
+%%PYQT_SIPDIR%%/QtNetwork/qnetworkproxy.sip
+%%PYQT_SIPDIR%%/QtNetwork/qnetworkreply.sip
+%%PYQT_SIPDIR%%/QtNetwork/qnetworkrequest.sip
+%%PYQT_SIPDIR%%/QtNetwork/qnetworksession.sip
+%%PYQT_SIPDIR%%/QtNetwork/qssl.sip
+%%PYQT_SIPDIR%%/QtNetwork/qsslcertificate.sip
+%%PYQT_SIPDIR%%/QtNetwork/qsslcertificateextension.sip
+%%PYQT_SIPDIR%%/QtNetwork/qsslcipher.sip
+%%PYQT_SIPDIR%%/QtNetwork/qsslconfiguration.sip
+%%PYQT_SIPDIR%%/QtNetwork/qsslerror.sip
+%%PYQT_SIPDIR%%/QtNetwork/qsslkey.sip
+%%PYQT_SIPDIR%%/QtNetwork/qsslsocket.sip
+%%PYQT_SIPDIR%%/QtNetwork/qtcpserver.sip
+%%PYQT_SIPDIR%%/QtNetwork/qtcpsocket.sip
+%%PYQT_SIPDIR%%/QtNetwork/qudpsocket.sip
+%%PYQT_SIPDIR%%/QtNetwork/qurlinfo.sip
%%API%%share/qt4/qsci/api/python/QtNetwork.api
diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile
index 8dd5366bff66..f061ab48a5e0 100644
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@@ -8,11 +8,11 @@ CATEGORIES= textproc devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtXml module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
-
CONFIGURE_ARGS= --enable QtXml
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build core_run
USE_QT4= xml qmake_build moc_build
OPTIONS_DEFINE= API DEBUG
@@ -25,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/textproc/py-qt4-xml/pkg-plist b/textproc/py-qt4-xml/pkg-plist
index 58d7239e1fe3..0b4d6871ec85 100644
--- a/textproc/py-qt4-xml/pkg-plist
+++ b/textproc/py-qt4-xml/pkg-plist
@@ -1,8 +1,8 @@
bin/pylupdate4
bin/pyrcc4
%%PYTHON_SITELIBDIR%%/PyQt4/QtXml.so
-share/py-sip/QtXml/QtXmlmod.sip
-share/py-sip/QtXml/qdom.sip
-share/py-sip/QtXml/qxml.sip
-share/py-sip/QtXml/qxmlstream.sip
+%%PYQT_SIPDIR%%/QtXml/QtXmlmod.sip
+%%PYQT_SIPDIR%%/QtXml/qdom.sip
+%%PYQT_SIPDIR%%/QtXml/qxml.sip
+%%PYQT_SIPDIR%%/QtXml/qxmlstream.sip
%%API%%share/qt4/qsci/api/python/QtXml.api
diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile
index 9b4a8ca2fa55..22a34fe2f2dc 100644
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= textproc devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtXmlPatterns module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml
-
CONFIGURE_ARGS= --enable QtXmlPatterns
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build xml_run
USE_QT4= moc_build xmlpatterns qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -24,5 +24,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/textproc/py-qt4-xmlpatterns/pkg-plist b/textproc/py-qt4-xmlpatterns/pkg-plist
index d75ef7183d83..a50fa6d04d37 100644
--- a/textproc/py-qt4-xmlpatterns/pkg-plist
+++ b/textproc/py-qt4-xmlpatterns/pkg-plist
@@ -1,17 +1,17 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtXmlPatterns.so
-share/py-sip/QtXmlPatterns/QtXmlPatternsmod.sip
-share/py-sip/QtXmlPatterns/qabstractmessagehandler.sip
-share/py-sip/QtXmlPatterns/qabstracturiresolver.sip
-share/py-sip/QtXmlPatterns/qabstractxmlnodemodel.sip
-share/py-sip/QtXmlPatterns/qabstractxmlreceiver.sip
-share/py-sip/QtXmlPatterns/qsimplexmlnodemodel.sip
-share/py-sip/QtXmlPatterns/qsourcelocation.sip
-share/py-sip/QtXmlPatterns/qxmlformatter.sip
-share/py-sip/QtXmlPatterns/qxmlname.sip
-share/py-sip/QtXmlPatterns/qxmlnamepool.sip
-share/py-sip/QtXmlPatterns/qxmlquery.sip
-share/py-sip/QtXmlPatterns/qxmlresultitems.sip
-share/py-sip/QtXmlPatterns/qxmlschema.sip
-share/py-sip/QtXmlPatterns/qxmlschemavalidator.sip
-share/py-sip/QtXmlPatterns/qxmlserializer.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/QtXmlPatternsmod.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qabstractmessagehandler.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qabstracturiresolver.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qabstractxmlnodemodel.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qabstractxmlreceiver.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qsimplexmlnodemodel.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qsourcelocation.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qxmlformatter.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qxmlname.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qxmlnamepool.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qxmlquery.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qxmlresultitems.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qxmlschema.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qxmlschemavalidator.sip
+%%PYQT_SIPDIR%%/QtXmlPatterns/qxmlserializer.sip
%%API%%share/qt4/qsci/api/python/QtXmlPatterns.api
diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile
index 4dca88718590..40789f1c8878 100644
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= www devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtWebKit module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
-
CONFIGURE_ARGS= --enable QtWebKit
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build gui_run
USE_QT4= qmake_build gui moc_build network webkit
OPTIONS_DEFINE= API DEBUG
@@ -24,5 +24,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/www/py-qt4-webkit/pkg-plist b/www/py-qt4-webkit/pkg-plist
index 0f77649ebe61..4308e93c3096 100644
--- a/www/py-qt4-webkit/pkg-plist
+++ b/www/py-qt4-webkit/pkg-plist
@@ -1,17 +1,17 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtWebKit.so
-share/py-sip/QtWebKit/QtWebKitmod.sip
-share/py-sip/QtWebKit/qgraphicswebview.sip
-share/py-sip/QtWebKit/qwebdatabase.sip
-share/py-sip/QtWebKit/qwebelement.sip
-share/py-sip/QtWebKit/qwebframe.sip
-share/py-sip/QtWebKit/qwebhistory.sip
-share/py-sip/QtWebKit/qwebhistoryinterface.sip
-share/py-sip/QtWebKit/qwebinspector.sip
-share/py-sip/QtWebKit/qwebkitglobal.sip
-share/py-sip/QtWebKit/qwebkitversion.sip
-share/py-sip/QtWebKit/qwebpage.sip
-share/py-sip/QtWebKit/qwebpluginfactory.sip
-share/py-sip/QtWebKit/qwebsecurityorigin.sip
-share/py-sip/QtWebKit/qwebsettings.sip
-share/py-sip/QtWebKit/qwebview.sip
+%%PYQT_SIPDIR%%/QtWebKit/QtWebKitmod.sip
+%%PYQT_SIPDIR%%/QtWebKit/qgraphicswebview.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebdatabase.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebelement.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebframe.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebhistory.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebhistoryinterface.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebinspector.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebkitglobal.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebkitversion.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebpage.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebpluginfactory.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebsecurityorigin.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebsettings.sip
+%%PYQT_SIPDIR%%/QtWebKit/qwebview.sip
%%API%%share/qt4/qsci/api/python/QtWebKit.api
diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile
index cc04047612e6..a0487b9ee454 100644
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@@ -8,11 +8,11 @@ CATEGORIES= x11-toolkits devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtGui module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
-
CONFIGURE_ARGS= --enable QtGui
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build core_run
USE_QT4= gui imageformats_run inputmethods_run iconengines_run \
qmake_build moc_build
@@ -28,5 +28,4 @@ DEBUG_CONFIGURE_ON= --debug --trace
BROKEN_sparc64= Does not compile on sparc64
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt4-gui/pkg-plist b/x11-toolkits/py-qt4-gui/pkg-plist
index 29ac73679f84..cd7e53a92f16 100644
--- a/x11-toolkits/py-qt4-gui/pkg-plist
+++ b/x11-toolkits/py-qt4-gui/pkg-plist
@@ -1,207 +1,207 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtGui.so
-share/py-sip/QtGui/QtGuimod.sip
-share/py-sip/QtGui/opengl_types.sip
-share/py-sip/QtGui/qabstractbutton.sip
-share/py-sip/QtGui/qabstractitemdelegate.sip
-share/py-sip/QtGui/qabstractitemview.sip
-share/py-sip/QtGui/qabstractprintdialog.sip
-share/py-sip/QtGui/qabstractproxymodel.sip
-share/py-sip/QtGui/qabstractscrollarea.sip
-share/py-sip/QtGui/qabstractslider.sip
-share/py-sip/QtGui/qabstractspinbox.sip
-share/py-sip/QtGui/qabstracttextdocumentlayout.sip
-share/py-sip/QtGui/qaction.sip
-share/py-sip/QtGui/qactiongroup.sip
-share/py-sip/QtGui/qapplication.sip
-share/py-sip/QtGui/qbitmap.sip
-share/py-sip/QtGui/qboxlayout.sip
-share/py-sip/QtGui/qbrush.sip
-share/py-sip/QtGui/qbuttongroup.sip
-share/py-sip/QtGui/qcalendarwidget.sip
-share/py-sip/QtGui/qcheckbox.sip
-share/py-sip/QtGui/qclipboard.sip
-share/py-sip/QtGui/qcolor.sip
-share/py-sip/QtGui/qcolordialog.sip
-share/py-sip/QtGui/qcolumnview.sip
-share/py-sip/QtGui/qcombobox.sip
-share/py-sip/QtGui/qcommandlinkbutton.sip
-share/py-sip/QtGui/qcommonstyle.sip
-share/py-sip/QtGui/qcompleter.sip
-share/py-sip/QtGui/qcursor.sip
-share/py-sip/QtGui/qdatawidgetmapper.sip
-share/py-sip/QtGui/qdatetimeedit.sip
-share/py-sip/QtGui/qdesktopservices.sip
-share/py-sip/QtGui/qdesktopwidget.sip
-share/py-sip/QtGui/qdial.sip
-share/py-sip/QtGui/qdialog.sip
-share/py-sip/QtGui/qdialogbuttonbox.sip
-share/py-sip/QtGui/qdirmodel.sip
-share/py-sip/QtGui/qdockwidget.sip
-share/py-sip/QtGui/qdrag.sip
-share/py-sip/QtGui/qdrawutil.sip
-share/py-sip/QtGui/qerrormessage.sip
-share/py-sip/QtGui/qevent.sip
-share/py-sip/QtGui/qfiledialog.sip
-share/py-sip/QtGui/qfileiconprovider.sip
-share/py-sip/QtGui/qfilesystemmodel.sip
-share/py-sip/QtGui/qfocusframe.sip
-share/py-sip/QtGui/qfont.sip
-share/py-sip/QtGui/qfontcombobox.sip
-share/py-sip/QtGui/qfontdatabase.sip
-share/py-sip/QtGui/qfontdialog.sip
-share/py-sip/QtGui/qfontinfo.sip
-share/py-sip/QtGui/qfontmetrics.sip
-share/py-sip/QtGui/qformlayout.sip
-share/py-sip/QtGui/qframe.sip
-share/py-sip/QtGui/qgenericmatrix.sip
-share/py-sip/QtGui/qgesture.sip
-share/py-sip/QtGui/qgesturerecognizer.sip
-share/py-sip/QtGui/qglyphrun.sip
-share/py-sip/QtGui/qgraphicsanchorlayout.sip
-share/py-sip/QtGui/qgraphicseffect.sip
-share/py-sip/QtGui/qgraphicsgridlayout.sip
-share/py-sip/QtGui/qgraphicsitem.sip
-share/py-sip/QtGui/qgraphicsitemanimation.sip
-share/py-sip/QtGui/qgraphicslayout.sip
-share/py-sip/QtGui/qgraphicslayoutitem.sip
-share/py-sip/QtGui/qgraphicslinearlayout.sip
-share/py-sip/QtGui/qgraphicsproxywidget.sip
-share/py-sip/QtGui/qgraphicsscene.sip
-share/py-sip/QtGui/qgraphicssceneevent.sip
-share/py-sip/QtGui/qgraphicstransform.sip
-share/py-sip/QtGui/qgraphicsview.sip
-share/py-sip/QtGui/qgraphicswidget.sip
-share/py-sip/QtGui/qgridlayout.sip
-share/py-sip/QtGui/qgroupbox.sip
-share/py-sip/QtGui/qguiapplication.sip
-share/py-sip/QtGui/qheaderview.sip
-share/py-sip/QtGui/qicon.sip
-share/py-sip/QtGui/qiconengine.sip
-share/py-sip/QtGui/qidentityproxymodel.sip
-share/py-sip/QtGui/qimage.sip
-share/py-sip/QtGui/qimageiohandler.sip
-share/py-sip/QtGui/qimagereader.sip
-share/py-sip/QtGui/qimagewriter.sip
-share/py-sip/QtGui/qinputcontext.sip
-share/py-sip/QtGui/qinputcontextfactory.sip
-share/py-sip/QtGui/qinputdialog.sip
-share/py-sip/QtGui/qitemdelegate.sip
-share/py-sip/QtGui/qitemeditorfactory.sip
-share/py-sip/QtGui/qitemselectionmodel.sip
-share/py-sip/QtGui/qkeyeventtransition.sip
-share/py-sip/QtGui/qkeysequence.sip
-share/py-sip/QtGui/qlabel.sip
-share/py-sip/QtGui/qlayout.sip
-share/py-sip/QtGui/qlayoutitem.sip
-share/py-sip/QtGui/qlcdnumber.sip
-share/py-sip/QtGui/qlineedit.sip
-share/py-sip/QtGui/qlistview.sip
-share/py-sip/QtGui/qlistwidget.sip
-share/py-sip/QtGui/qmainwindow.sip
-share/py-sip/QtGui/qmatrix.sip
-share/py-sip/QtGui/qmatrix4x4.sip
-share/py-sip/QtGui/qmdiarea.sip
-share/py-sip/QtGui/qmdisubwindow.sip
-share/py-sip/QtGui/qmenu.sip
-share/py-sip/QtGui/qmenubar.sip
-share/py-sip/QtGui/qmessagebox.sip
-share/py-sip/QtGui/qmime.sip
-share/py-sip/QtGui/qmouseeventtransition.sip
-share/py-sip/QtGui/qmovie.sip
-share/py-sip/QtGui/qpagedpaintdevice.sip
-share/py-sip/QtGui/qpagesetupdialog.sip
-share/py-sip/QtGui/qpaintdevice.sip
-share/py-sip/QtGui/qpaintengine.sip
-share/py-sip/QtGui/qpainter.sip
-share/py-sip/QtGui/qpainterpath.sip
-share/py-sip/QtGui/qpalette.sip
-share/py-sip/QtGui/qpen.sip
-share/py-sip/QtGui/qpicture.sip
-share/py-sip/QtGui/qpixmap.sip
-share/py-sip/QtGui/qpixmapcache.sip
-share/py-sip/QtGui/qplaintextedit.sip
-share/py-sip/QtGui/qpolygon.sip
-share/py-sip/QtGui/qprintdialog.sip
-share/py-sip/QtGui/qprintengine.sip
-share/py-sip/QtGui/qprinter.sip
-share/py-sip/QtGui/qprinterinfo.sip
-share/py-sip/QtGui/qprintpreviewdialog.sip
-share/py-sip/QtGui/qprintpreviewwidget.sip
-share/py-sip/QtGui/qprogressbar.sip
-share/py-sip/QtGui/qprogressdialog.sip
-share/py-sip/QtGui/qproxymodel.sip
-share/py-sip/QtGui/qpushbutton.sip
-share/py-sip/QtGui/qpytextobject.sip
-share/py-sip/QtGui/qquaternion.sip
-share/py-sip/QtGui/qradiobutton.sip
-share/py-sip/QtGui/qrawfont.sip
-share/py-sip/QtGui/qregion.sip
-share/py-sip/QtGui/qrgb.sip
-share/py-sip/QtGui/qrubberband.sip
-share/py-sip/QtGui/qscreen.sip
-share/py-sip/QtGui/qscrollarea.sip
-share/py-sip/QtGui/qscrollbar.sip
-share/py-sip/QtGui/qsessionmanager.sip
-share/py-sip/QtGui/qshortcut.sip
-share/py-sip/QtGui/qsizegrip.sip
-share/py-sip/QtGui/qsizepolicy.sip
-share/py-sip/QtGui/qslider.sip
-share/py-sip/QtGui/qsortfilterproxymodel.sip
-share/py-sip/QtGui/qsound.sip
-share/py-sip/QtGui/qspinbox.sip
-share/py-sip/QtGui/qsplashscreen.sip
-share/py-sip/QtGui/qsplitter.sip
-share/py-sip/QtGui/qstackedlayout.sip
-share/py-sip/QtGui/qstackedwidget.sip
-share/py-sip/QtGui/qstandarditemmodel.sip
-share/py-sip/QtGui/qstatictext.sip
-share/py-sip/QtGui/qstatusbar.sip
-share/py-sip/QtGui/qstringlistmodel.sip
-share/py-sip/QtGui/qstyle.sip
-share/py-sip/QtGui/qstyleditemdelegate.sip
-share/py-sip/QtGui/qstylefactory.sip
-share/py-sip/QtGui/qstyleoption.sip
-share/py-sip/QtGui/qstylepainter.sip
-share/py-sip/QtGui/qsyntaxhighlighter.sip
-share/py-sip/QtGui/qsystemtrayicon.sip
-share/py-sip/QtGui/qtabbar.sip
-share/py-sip/QtGui/qtableview.sip
-share/py-sip/QtGui/qtablewidget.sip
-share/py-sip/QtGui/qtabwidget.sip
-share/py-sip/QtGui/qtextbrowser.sip
-share/py-sip/QtGui/qtextcursor.sip
-share/py-sip/QtGui/qtextdocument.sip
-share/py-sip/QtGui/qtextdocumentfragment.sip
-share/py-sip/QtGui/qtextdocumentwriter.sip
-share/py-sip/QtGui/qtextedit.sip
-share/py-sip/QtGui/qtextformat.sip
-share/py-sip/QtGui/qtextlayout.sip
-share/py-sip/QtGui/qtextlist.sip
-share/py-sip/QtGui/qtextobject.sip
-share/py-sip/QtGui/qtextoption.sip
-share/py-sip/QtGui/qtexttable.sip
-share/py-sip/QtGui/qtoolbar.sip
-share/py-sip/QtGui/qtoolbox.sip
-share/py-sip/QtGui/qtoolbutton.sip
-share/py-sip/QtGui/qtooltip.sip
-share/py-sip/QtGui/qtouchdevice.sip
-share/py-sip/QtGui/qtransform.sip
-share/py-sip/QtGui/qtreeview.sip
-share/py-sip/QtGui/qtreewidget.sip
-share/py-sip/QtGui/qtreewidgetitemiterator.sip
-share/py-sip/QtGui/qundogroup.sip
-share/py-sip/QtGui/qundostack.sip
-share/py-sip/QtGui/qundoview.sip
-share/py-sip/QtGui/qvalidator.sip
-share/py-sip/QtGui/qvector2d.sip
-share/py-sip/QtGui/qvector3d.sip
-share/py-sip/QtGui/qvector4d.sip
-share/py-sip/QtGui/qwhatsthis.sip
-share/py-sip/QtGui/qwidget.sip
-share/py-sip/QtGui/qwidgetaction.sip
-share/py-sip/QtGui/qwindowdefs.sip
-share/py-sip/QtGui/qwizard.sip
-share/py-sip/QtGui/qworkspace.sip
-share/py-sip/QtGui/qx11embed_x11.sip
-share/py-sip/QtGui/qx11info_x11.sip
+%%PYQT_SIPDIR%%/QtGui/QtGuimod.sip
+%%PYQT_SIPDIR%%/QtGui/opengl_types.sip
+%%PYQT_SIPDIR%%/QtGui/qabstractbutton.sip
+%%PYQT_SIPDIR%%/QtGui/qabstractitemdelegate.sip
+%%PYQT_SIPDIR%%/QtGui/qabstractitemview.sip
+%%PYQT_SIPDIR%%/QtGui/qabstractprintdialog.sip
+%%PYQT_SIPDIR%%/QtGui/qabstractproxymodel.sip
+%%PYQT_SIPDIR%%/QtGui/qabstractscrollarea.sip
+%%PYQT_SIPDIR%%/QtGui/qabstractslider.sip
+%%PYQT_SIPDIR%%/QtGui/qabstractspinbox.sip
+%%PYQT_SIPDIR%%/QtGui/qabstracttextdocumentlayout.sip
+%%PYQT_SIPDIR%%/QtGui/qaction.sip
+%%PYQT_SIPDIR%%/QtGui/qactiongroup.sip
+%%PYQT_SIPDIR%%/QtGui/qapplication.sip
+%%PYQT_SIPDIR%%/QtGui/qbitmap.sip
+%%PYQT_SIPDIR%%/QtGui/qboxlayout.sip
+%%PYQT_SIPDIR%%/QtGui/qbrush.sip
+%%PYQT_SIPDIR%%/QtGui/qbuttongroup.sip
+%%PYQT_SIPDIR%%/QtGui/qcalendarwidget.sip
+%%PYQT_SIPDIR%%/QtGui/qcheckbox.sip
+%%PYQT_SIPDIR%%/QtGui/qclipboard.sip
+%%PYQT_SIPDIR%%/QtGui/qcolor.sip
+%%PYQT_SIPDIR%%/QtGui/qcolordialog.sip
+%%PYQT_SIPDIR%%/QtGui/qcolumnview.sip
+%%PYQT_SIPDIR%%/QtGui/qcombobox.sip
+%%PYQT_SIPDIR%%/QtGui/qcommandlinkbutton.sip
+%%PYQT_SIPDIR%%/QtGui/qcommonstyle.sip
+%%PYQT_SIPDIR%%/QtGui/qcompleter.sip
+%%PYQT_SIPDIR%%/QtGui/qcursor.sip
+%%PYQT_SIPDIR%%/QtGui/qdatawidgetmapper.sip
+%%PYQT_SIPDIR%%/QtGui/qdatetimeedit.sip
+%%PYQT_SIPDIR%%/QtGui/qdesktopservices.sip
+%%PYQT_SIPDIR%%/QtGui/qdesktopwidget.sip
+%%PYQT_SIPDIR%%/QtGui/qdial.sip
+%%PYQT_SIPDIR%%/QtGui/qdialog.sip
+%%PYQT_SIPDIR%%/QtGui/qdialogbuttonbox.sip
+%%PYQT_SIPDIR%%/QtGui/qdirmodel.sip
+%%PYQT_SIPDIR%%/QtGui/qdockwidget.sip
+%%PYQT_SIPDIR%%/QtGui/qdrag.sip
+%%PYQT_SIPDIR%%/QtGui/qdrawutil.sip
+%%PYQT_SIPDIR%%/QtGui/qerrormessage.sip
+%%PYQT_SIPDIR%%/QtGui/qevent.sip
+%%PYQT_SIPDIR%%/QtGui/qfiledialog.sip
+%%PYQT_SIPDIR%%/QtGui/qfileiconprovider.sip
+%%PYQT_SIPDIR%%/QtGui/qfilesystemmodel.sip
+%%PYQT_SIPDIR%%/QtGui/qfocusframe.sip
+%%PYQT_SIPDIR%%/QtGui/qfont.sip
+%%PYQT_SIPDIR%%/QtGui/qfontcombobox.sip
+%%PYQT_SIPDIR%%/QtGui/qfontdatabase.sip
+%%PYQT_SIPDIR%%/QtGui/qfontdialog.sip
+%%PYQT_SIPDIR%%/QtGui/qfontinfo.sip
+%%PYQT_SIPDIR%%/QtGui/qfontmetrics.sip
+%%PYQT_SIPDIR%%/QtGui/qformlayout.sip
+%%PYQT_SIPDIR%%/QtGui/qframe.sip
+%%PYQT_SIPDIR%%/QtGui/qgenericmatrix.sip
+%%PYQT_SIPDIR%%/QtGui/qgesture.sip
+%%PYQT_SIPDIR%%/QtGui/qgesturerecognizer.sip
+%%PYQT_SIPDIR%%/QtGui/qglyphrun.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicsanchorlayout.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicseffect.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicsgridlayout.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicsitem.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicsitemanimation.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicslayout.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicslayoutitem.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicslinearlayout.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicsproxywidget.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicsscene.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicssceneevent.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicstransform.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicsview.sip
+%%PYQT_SIPDIR%%/QtGui/qgraphicswidget.sip
+%%PYQT_SIPDIR%%/QtGui/qgridlayout.sip
+%%PYQT_SIPDIR%%/QtGui/qgroupbox.sip
+%%PYQT_SIPDIR%%/QtGui/qguiapplication.sip
+%%PYQT_SIPDIR%%/QtGui/qheaderview.sip
+%%PYQT_SIPDIR%%/QtGui/qicon.sip
+%%PYQT_SIPDIR%%/QtGui/qiconengine.sip
+%%PYQT_SIPDIR%%/QtGui/qidentityproxymodel.sip
+%%PYQT_SIPDIR%%/QtGui/qimage.sip
+%%PYQT_SIPDIR%%/QtGui/qimageiohandler.sip
+%%PYQT_SIPDIR%%/QtGui/qimagereader.sip
+%%PYQT_SIPDIR%%/QtGui/qimagewriter.sip
+%%PYQT_SIPDIR%%/QtGui/qinputcontext.sip
+%%PYQT_SIPDIR%%/QtGui/qinputcontextfactory.sip
+%%PYQT_SIPDIR%%/QtGui/qinputdialog.sip
+%%PYQT_SIPDIR%%/QtGui/qitemdelegate.sip
+%%PYQT_SIPDIR%%/QtGui/qitemeditorfactory.sip
+%%PYQT_SIPDIR%%/QtGui/qitemselectionmodel.sip
+%%PYQT_SIPDIR%%/QtGui/qkeyeventtransition.sip
+%%PYQT_SIPDIR%%/QtGui/qkeysequence.sip
+%%PYQT_SIPDIR%%/QtGui/qlabel.sip
+%%PYQT_SIPDIR%%/QtGui/qlayout.sip
+%%PYQT_SIPDIR%%/QtGui/qlayoutitem.sip
+%%PYQT_SIPDIR%%/QtGui/qlcdnumber.sip
+%%PYQT_SIPDIR%%/QtGui/qlineedit.sip
+%%PYQT_SIPDIR%%/QtGui/qlistview.sip
+%%PYQT_SIPDIR%%/QtGui/qlistwidget.sip
+%%PYQT_SIPDIR%%/QtGui/qmainwindow.sip
+%%PYQT_SIPDIR%%/QtGui/qmatrix.sip
+%%PYQT_SIPDIR%%/QtGui/qmatrix4x4.sip
+%%PYQT_SIPDIR%%/QtGui/qmdiarea.sip
+%%PYQT_SIPDIR%%/QtGui/qmdisubwindow.sip
+%%PYQT_SIPDIR%%/QtGui/qmenu.sip
+%%PYQT_SIPDIR%%/QtGui/qmenubar.sip
+%%PYQT_SIPDIR%%/QtGui/qmessagebox.sip
+%%PYQT_SIPDIR%%/QtGui/qmime.sip
+%%PYQT_SIPDIR%%/QtGui/qmouseeventtransition.sip
+%%PYQT_SIPDIR%%/QtGui/qmovie.sip
+%%PYQT_SIPDIR%%/QtGui/qpagedpaintdevice.sip
+%%PYQT_SIPDIR%%/QtGui/qpagesetupdialog.sip
+%%PYQT_SIPDIR%%/QtGui/qpaintdevice.sip
+%%PYQT_SIPDIR%%/QtGui/qpaintengine.sip
+%%PYQT_SIPDIR%%/QtGui/qpainter.sip
+%%PYQT_SIPDIR%%/QtGui/qpainterpath.sip
+%%PYQT_SIPDIR%%/QtGui/qpalette.sip
+%%PYQT_SIPDIR%%/QtGui/qpen.sip
+%%PYQT_SIPDIR%%/QtGui/qpicture.sip
+%%PYQT_SIPDIR%%/QtGui/qpixmap.sip
+%%PYQT_SIPDIR%%/QtGui/qpixmapcache.sip
+%%PYQT_SIPDIR%%/QtGui/qplaintextedit.sip
+%%PYQT_SIPDIR%%/QtGui/qpolygon.sip
+%%PYQT_SIPDIR%%/QtGui/qprintdialog.sip
+%%PYQT_SIPDIR%%/QtGui/qprintengine.sip
+%%PYQT_SIPDIR%%/QtGui/qprinter.sip
+%%PYQT_SIPDIR%%/QtGui/qprinterinfo.sip
+%%PYQT_SIPDIR%%/QtGui/qprintpreviewdialog.sip
+%%PYQT_SIPDIR%%/QtGui/qprintpreviewwidget.sip
+%%PYQT_SIPDIR%%/QtGui/qprogressbar.sip
+%%PYQT_SIPDIR%%/QtGui/qprogressdialog.sip
+%%PYQT_SIPDIR%%/QtGui/qproxymodel.sip
+%%PYQT_SIPDIR%%/QtGui/qpushbutton.sip
+%%PYQT_SIPDIR%%/QtGui/qpytextobject.sip
+%%PYQT_SIPDIR%%/QtGui/qquaternion.sip
+%%PYQT_SIPDIR%%/QtGui/qradiobutton.sip
+%%PYQT_SIPDIR%%/QtGui/qrawfont.sip
+%%PYQT_SIPDIR%%/QtGui/qregion.sip
+%%PYQT_SIPDIR%%/QtGui/qrgb.sip
+%%PYQT_SIPDIR%%/QtGui/qrubberband.sip
+%%PYQT_SIPDIR%%/QtGui/qscreen.sip
+%%PYQT_SIPDIR%%/QtGui/qscrollarea.sip
+%%PYQT_SIPDIR%%/QtGui/qscrollbar.sip
+%%PYQT_SIPDIR%%/QtGui/qsessionmanager.sip
+%%PYQT_SIPDIR%%/QtGui/qshortcut.sip
+%%PYQT_SIPDIR%%/QtGui/qsizegrip.sip
+%%PYQT_SIPDIR%%/QtGui/qsizepolicy.sip
+%%PYQT_SIPDIR%%/QtGui/qslider.sip
+%%PYQT_SIPDIR%%/QtGui/qsortfilterproxymodel.sip
+%%PYQT_SIPDIR%%/QtGui/qsound.sip
+%%PYQT_SIPDIR%%/QtGui/qspinbox.sip
+%%PYQT_SIPDIR%%/QtGui/qsplashscreen.sip
+%%PYQT_SIPDIR%%/QtGui/qsplitter.sip
+%%PYQT_SIPDIR%%/QtGui/qstackedlayout.sip
+%%PYQT_SIPDIR%%/QtGui/qstackedwidget.sip
+%%PYQT_SIPDIR%%/QtGui/qstandarditemmodel.sip
+%%PYQT_SIPDIR%%/QtGui/qstatictext.sip
+%%PYQT_SIPDIR%%/QtGui/qstatusbar.sip
+%%PYQT_SIPDIR%%/QtGui/qstringlistmodel.sip
+%%PYQT_SIPDIR%%/QtGui/qstyle.sip
+%%PYQT_SIPDIR%%/QtGui/qstyleditemdelegate.sip
+%%PYQT_SIPDIR%%/QtGui/qstylefactory.sip
+%%PYQT_SIPDIR%%/QtGui/qstyleoption.sip
+%%PYQT_SIPDIR%%/QtGui/qstylepainter.sip
+%%PYQT_SIPDIR%%/QtGui/qsyntaxhighlighter.sip
+%%PYQT_SIPDIR%%/QtGui/qsystemtrayicon.sip
+%%PYQT_SIPDIR%%/QtGui/qtabbar.sip
+%%PYQT_SIPDIR%%/QtGui/qtableview.sip
+%%PYQT_SIPDIR%%/QtGui/qtablewidget.sip
+%%PYQT_SIPDIR%%/QtGui/qtabwidget.sip
+%%PYQT_SIPDIR%%/QtGui/qtextbrowser.sip
+%%PYQT_SIPDIR%%/QtGui/qtextcursor.sip
+%%PYQT_SIPDIR%%/QtGui/qtextdocument.sip
+%%PYQT_SIPDIR%%/QtGui/qtextdocumentfragment.sip
+%%PYQT_SIPDIR%%/QtGui/qtextdocumentwriter.sip
+%%PYQT_SIPDIR%%/QtGui/qtextedit.sip
+%%PYQT_SIPDIR%%/QtGui/qtextformat.sip
+%%PYQT_SIPDIR%%/QtGui/qtextlayout.sip
+%%PYQT_SIPDIR%%/QtGui/qtextlist.sip
+%%PYQT_SIPDIR%%/QtGui/qtextobject.sip
+%%PYQT_SIPDIR%%/QtGui/qtextoption.sip
+%%PYQT_SIPDIR%%/QtGui/qtexttable.sip
+%%PYQT_SIPDIR%%/QtGui/qtoolbar.sip
+%%PYQT_SIPDIR%%/QtGui/qtoolbox.sip
+%%PYQT_SIPDIR%%/QtGui/qtoolbutton.sip
+%%PYQT_SIPDIR%%/QtGui/qtooltip.sip
+%%PYQT_SIPDIR%%/QtGui/qtouchdevice.sip
+%%PYQT_SIPDIR%%/QtGui/qtransform.sip
+%%PYQT_SIPDIR%%/QtGui/qtreeview.sip
+%%PYQT_SIPDIR%%/QtGui/qtreewidget.sip
+%%PYQT_SIPDIR%%/QtGui/qtreewidgetitemiterator.sip
+%%PYQT_SIPDIR%%/QtGui/qundogroup.sip
+%%PYQT_SIPDIR%%/QtGui/qundostack.sip
+%%PYQT_SIPDIR%%/QtGui/qundoview.sip
+%%PYQT_SIPDIR%%/QtGui/qvalidator.sip
+%%PYQT_SIPDIR%%/QtGui/qvector2d.sip
+%%PYQT_SIPDIR%%/QtGui/qvector3d.sip
+%%PYQT_SIPDIR%%/QtGui/qvector4d.sip
+%%PYQT_SIPDIR%%/QtGui/qwhatsthis.sip
+%%PYQT_SIPDIR%%/QtGui/qwidget.sip
+%%PYQT_SIPDIR%%/QtGui/qwidgetaction.sip
+%%PYQT_SIPDIR%%/QtGui/qwindowdefs.sip
+%%PYQT_SIPDIR%%/QtGui/qwizard.sip
+%%PYQT_SIPDIR%%/QtGui/qworkspace.sip
+%%PYQT_SIPDIR%%/QtGui/qx11embed_x11.sip
+%%PYQT_SIPDIR%%/QtGui/qx11info_x11.sip
%%API%%share/qt4/qsci/api/python/QtGui.api
diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile
index a7ee4e56fc22..7daddbb269b3 100644
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@@ -8,11 +8,11 @@ CATEGORIES= x11 devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtOpenGL module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
-
CONFIGURE_ARGS= --enable QtOpenGL
-PYQT4_DIST= yes
+PYQT_DIST= yes
+
+USES= python pyqt:4
+USE_PYQT= sip_build gui_run
USE_QT4= moc_build opengl qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -25,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api
API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
-.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
.include <bsd.port.mk>
diff --git a/x11/py-qt4-opengl/pkg-plist b/x11/py-qt4-opengl/pkg-plist
index fb224669434b..bb957945f5c3 100644
--- a/x11/py-qt4-opengl/pkg-plist
+++ b/x11/py-qt4-opengl/pkg-plist
@@ -1,9 +1,9 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtOpenGL.so
-share/py-sip/QtOpenGL/QtOpenGLmod.sip
-share/py-sip/QtOpenGL/qgl.sip
-share/py-sip/QtOpenGL/qglbuffer.sip
-share/py-sip/QtOpenGL/qglcolormap.sip
-share/py-sip/QtOpenGL/qglframebufferobject.sip
-share/py-sip/QtOpenGL/qglpixelbuffer.sip
-share/py-sip/QtOpenGL/qglshaderprogram.sip
+%%PYQT_SIPDIR%%/QtOpenGL/QtOpenGLmod.sip
+%%PYQT_SIPDIR%%/QtOpenGL/qgl.sip
+%%PYQT_SIPDIR%%/QtOpenGL/qglbuffer.sip
+%%PYQT_SIPDIR%%/QtOpenGL/qglcolormap.sip
+%%PYQT_SIPDIR%%/QtOpenGL/qglframebufferobject.sip
+%%PYQT_SIPDIR%%/QtOpenGL/qglpixelbuffer.sip
+%%PYQT_SIPDIR%%/QtOpenGL/qglshaderprogram.sip
%%API%%share/qt4/qsci/api/python/QtOpenGL.api