- Update to 4.3.3

- Configure.py now has a flag to specify component, patch is now simpler
- Update qscintilla2 so version where used
- Use bsd.pyqt.mk

Submitted by:	Danny Pansters <danny@ricin.com> (maintainer via private mail)

6 files changed, 47 insertions, 35 deletions

diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile
index 8e55ff432c69..9736c55392b5 100644
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	demo
-PORTVERSION=	4.3.1
-PORTREVISION=	# zero
+PORTVERSION=	${PYQT4_VERSION}
+PORTREVISION=	1
+
 CATEGORIES=	misc devel python
-MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
-		http://freebsd.ricin.com/ports/distfiles/
+MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
+DISTNAME=	${PYQT4_DISTNAME}
 
-MAINTAINER=	danny@ricin.com
-COMMENT=	Python bindings for the Qt4 toolkit, demo and other examples
+MAINTAINER=	${PYQT_MAINTAINER}
+COMMENT=	Python bindings for the Qt4 toolkit, Qt demo and examples
 
 USE_PYTHON=	yes
 
@@ -23,24 +23,25 @@ OPTIONS=	PYQT4	"Install any missing PyQt4 components" on
 OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 EXAMPLESDIR=	${PREFIX}/share/examples/py-qt4
 
+.include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_PYQT4)
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtCore.so:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml \
-		${PYTHON_SITELIBDIR}/PyQt4/QtAssistant.so:${PORTSDIR}/devel/py-qt4-assistant \
-		${PYTHON_SITELIBDIR}/PyQt4/QtOpenGL.so:${PORTSDIR}/x11/py-qt4-opengl \
-		${PYTHON_SITELIBDIR}/PyQt4/QtScript.so:${PORTSDIR}/devel/py-qt4-script \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:${PORTSDIR}/databases/py-qt4-sql \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_SITELIBDIR}/PyQt4/QtTest.so:${PORTSDIR}/devel/py-qt4-test \
-		${PYTHON_SITELIBDIR}/PyQt4/QtDesigner.so:${PORTSDIR}/devel/py-qt4-designer \
-		${LOCALBASE}/lib/qt4/plugins/designer/libpythonplugin.so:${PORTSDIR}/devel/py-qt4-designerplugin \
-		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus
+RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
+		${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network \
+		${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml \
+		${PKGNAMEPREFIX}assistant>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-assistant \
+		${PKGNAMEPREFIX}opengl>=${PYQT4_VERSION}:${PORTSDIR}/x11/py-qt4-opengl \
+		${PKGNAMEPREFIX}script>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-script \
+		${PKGNAMEPREFIX}sql>=${PYQT4_VERSION}:${PORTSDIR}/databases/py-qt4-sql \
+		${PKGNAMEPREFIX}svg>=${PYQT4_VERSION}:${PORTSDIR}/graphics/py-qt4-svg \
+		${PKGNAMEPREFIX}test>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-test \
+		${PKGNAMEPREFIX}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designer \
+		${PKGNAMEPREFIX}designerplugin>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designerplugin \
+		${PKGNAMEPREFIX}dbus>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-dbus
 .if !defined(NOPORTDOCS)
-RUN_DEPENDS+=	${LOCALBASE}/share/doc/py-qt4/pyqt4ref.html:${PORTSDIR}/misc/py-qt4-doc
+RUN_DEPENDS+=	${PKGNAMEPREFIX}doc>=${PYQT4_VERSION}:${PORTSDIR}/misc/py-qt4-doc
 .endif
 .endif
 
diff --git a/misc/py-qt4-demo/distinfo b/misc/py-qt4-demo/distinfo
index 7f92e8fa957f..8c72753540f7 100644
--- a/misc/py-qt4-demo/distinfo
+++ b/misc/py-qt4-demo/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568
-SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861
-SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590
+MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4
+SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55
+SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266
diff --git a/misc/py-qt4-demo/pkg-plist b/misc/py-qt4-demo/pkg-plist
index 4f90c740ecad..bb025dabae16 100644
--- a/misc/py-qt4-demo/pkg-plist
+++ b/misc/py-qt4-demo/pkg-plist
@@ -501,7 +501,7 @@
 @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop
 @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/images
 @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/images
+@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/images/
 @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot
 @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview
 @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/chart
diff --git a/misc/py-qt4-doc/Makefile b/misc/py-qt4-doc/Makefile
index 659a635f5cd4..31eddf5ff345 100644
--- a/misc/py-qt4-doc/Makefile
+++ b/misc/py-qt4-doc/Makefile
@@ -5,15 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	doc
-PORTVERSION=	4.3.1
-PORTREVISION=	# zero
+PORTVERSION=	${PYQT4_VERSION}
+PORTREVISION=	1
+
 CATEGORIES=	misc devel python
-MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
-		http://freebsd.ricin.com/ports/distfiles/
+MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
+DISTNAME=	${PYQT4_DISTNAME}
 
-MAINTAINER=	danny@ricin.com
+MAINTAINER=	${PYQT_MAINTAINER}
 COMMENT=	Python bindings for the Qt4 toolkit, documentation
 
 NO_BUILD=	yes
@@ -25,10 +25,14 @@ do-install:
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC} &&\
 		${MKDIR} ${DOCSDIR} &&\
-		${INSTALL_DATA} ChangeLog NEWS README THANKS ${DOCSDIR} &&\
+		${INSTALL_DATA} ChangeLog GPL_EXCEPTION.TXT\
+				GPL_EXCEPTION_ADDENDUM.TXT LICENSE NEWS\
+				OPENSOURCE-NOTICE.TXT README THANKS\
+			${DOCSDIR} &&\
 		${CP} -R doc/ ${DOCSDIR}
 .else
 	@${ECHO} "NOPORTDOCS is set -- installing nothing."
 .endif
 
+.include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.mk>
diff --git a/misc/py-qt4-doc/distinfo b/misc/py-qt4-doc/distinfo
index 7f92e8fa957f..8c72753540f7 100644
--- a/misc/py-qt4-doc/distinfo
+++ b/misc/py-qt4-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568
-SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861
-SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590
+MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4
+SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55
+SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266
diff --git a/misc/py-qt4-doc/pkg-plist b/misc/py-qt4-doc/pkg-plist
index a86bb0fc6c7c..37139bb85ce7 100644
--- a/misc/py-qt4-doc/pkg-plist
+++ b/misc/py-qt4-doc/pkg-plist
@@ -1,5 +1,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/GPL_EXCEPTION.TXT
+%%PORTDOCS%%%%DOCSDIR%%/GPL_EXCEPTION_ADDENDUM.TXT
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/OPENSOURCE-NOTICE.TXT
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/default.css
@@ -143,6 +147,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qcolor-rgb.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qcolor-saturation.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qcolor-value.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qcolumnview.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qconicalgradient.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qdesktopwidget.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qerrormessage.png
@@ -284,6 +289,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/system-tray.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/taskmenuextension-example-faded.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/tcpstream.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/texttable-merge.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/texttable-split.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/threadsandobjects.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/udppackets.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/whatsthis.png