- 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)

3 files changed, 21 insertions, 10 deletions

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