devel/py-qt4:

- Improve comment
- Use options helpers
- Add options for all PyQt4 ports

2 files changed, 65 insertions, 36 deletions

diff --git a/devel/py-qt4/Makefile b/devel/py-qt4/Makefile
index 0a4533235e45..647cc3f764bf 100644
--- a/devel/py-qt4/Makefile
+++ b/devel/py-qt4/Makefile
@@ -10,50 +10,23 @@ DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	The "meta-port" for PyQt4
+COMMENT=	Python bindings for the Qt 4 toolkit (meta port)
 
 USE_PYTHON=	yes
 
 NO_BUILD=	yes
+NO_INSTALL=	yes
 NO_MTREE=	yes
 
-PKGNAMEPREFIX2=	${PYTHON_PKGNAMEPREFIX}${PORTNAME}-
-
-RUN_DEPENDS+=	${PKGNAMEPREFIX2}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
-		${PKGNAMEPREFIX2}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PKGNAMEPREFIX2}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network \
-		${PKGNAMEPREFIX2}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml \
-		${PKGNAMEPREFIX2}assistant>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-assistant \
-		${PKGNAMEPREFIX2}opengl>=${PYQT4_VERSION}:${PORTSDIR}/x11/py-qt4-opengl \
-		${PKGNAMEPREFIX2}script>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-script \
-		${PKGNAMEPREFIX2}scripttools>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-scripttools \
-		${PKGNAMEPREFIX2}sql>=${PYQT4_VERSION}:${PORTSDIR}/databases/py-qt4-sql \
-		${PKGNAMEPREFIX2}svg>=${PYQT4_VERSION}:${PORTSDIR}/graphics/py-qt4-svg \
-		${PKGNAMEPREFIX2}test>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-test \
-		${PKGNAMEPREFIX2}declarative>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-declarative \
-		${PKGNAMEPREFIX2}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designer \
-		${PKGNAMEPREFIX2}designerplugin>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designerplugin \
-		${PKGNAMEPREFIX2}dbus>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-dbus \
-		${PKGNAMEPREFIX2}dbussupport>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-dbussupport \
-		${PKGNAMEPREFIX2}xmlpatterns>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xmlpatterns \
-		${PKGNAMEPREFIX2}help>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-help \
-		${PKGNAMEPREFIX2}webkit>=${PYQT4_VERSION}:${PORTSDIR}/www/py-qt4-webkit \
-		${PKGNAMEPREFIX2}multimedia>=${PYQT4_VERSION}:${PORTSDIR}/multimedia/py-qt4-multimedia \
-		${PKGNAMEPREFIX2}phonon>=${PYQT4_VERSION}:${PORTSDIR}/multimedia/py-qt4-phonon \
-		${PKGNAMEPREFIX2}qscintilla2>=${QSCI2_VERSION}:${PORTSDIR}/devel/py-qt4-qscintilla2
+OPTIONS_DEFINE=	ALL ${PYQT4_COMPONENTS}
+OPTIONS_DEFAULT=	ALL
+ALL_DESC=	All PyQt4 components
 
 .include "${.CURDIR}/bsd.pyqt.mk"
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MEXAMPLES}
-RUN_DEPENDS+=	${PKGNAMEPREFIX2}demo>=${PYQT4_VERSION}:${PORTSDIR}/misc/py-qt4-demo
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-RUN_DEPENDS+=	${PKGNAMEPREFIX2}doc>=${PYQT4_VERSION}:${PORTSDIR}/misc/py-qt4-doc
-.endif
-
-do-install:
-	${DO_NADA}
+.for component in ${PYQT4_COMPONENTS}
+${component}_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-${component}>=0:${PORTSDIR}/${${component}_PORT}
+ALL_RUN_DEPENDS+=		${${component}_RUN_DEPENDS}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt4/bsd.pyqt.mk b/devel/py-qt4/bsd.pyqt.mk
index ce83d00e86c1..4ede21c1a513 100644
--- a/devel/py-qt4/bsd.pyqt.mk
+++ b/devel/py-qt4/bsd.pyqt.mk
@@ -23,3 +23,59 @@ 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=	Python bindings for D-Bus
+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