Upgrade to PyQT 3.5

3 files changed, 10 insertions, 62 deletions

diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index 0c3e8ffa8ab..a825015553f 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	qt
-PORTVERSION=	3.4
-PORTREVISION=	1
+PORTVERSION=	3.5
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://www.river-bank.demon.co.uk/download/PyQt/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,7 +22,7 @@ USE_QT_VER=	3
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 
-ALL_TARGET=	all install install-eric
+ALL_TARGET=	all install
 
 NO_FILTER_SHLIBS=	yes
 
@@ -41,7 +41,4 @@ do-install:
 	@( cd ${WRKDIR}/modules/ && ${TAR} -cf - . ) | \
 		( cd ${PYTHONPREFIX_SITELIBDIR} && ${TAR} xf - )
 
-post-install:
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHONPREFIX_SITELIBDIR}/eric
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt/distinfo b/x11-toolkits/py-qt/distinfo
index 071c9e2a504..5f700f669a8 100644
--- a/x11-toolkits/py-qt/distinfo
+++ b/x11-toolkits/py-qt/distinfo
@@ -1 +1 @@
-MD5 (PyQt-x11-gpl-3.4.tar.gz) = 1a61c55ad716f20f52883740c578c352
+MD5 (PyQt-x11-gpl-3.5.tar.gz) = 3145f56f187d98147de20360b990da01
diff --git a/x11-toolkits/py-qt/pkg-plist b/x11-toolkits/py-qt/pkg-plist
index 5911eb10a3f..98f2356d430 100644
--- a/x11-toolkits/py-qt/pkg-plist
+++ b/x11-toolkits/py-qt/pkg-plist
@@ -1,59 +1,5 @@
-bin/eric
-bin/helpviewer
 bin/pylupdate
 bin/pyuic
-bin/qtunittest
-lib/%%PYTHON_VERSION%%/site-packages/eric/AsyncIO.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/AsyncIO.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/BookmarkDialog.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/BookmarkDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/BookmarkForm.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/BookmarkForm.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/BreakpointDialog.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/BreakpointDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/BreakpointForm.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/BreakpointForm.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/Config.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Config.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/DebugClient.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/DebugClient.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/DebugProtocol.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/DebugProtocol.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/DebugServer.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/DebugServer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/Explorer.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Explorer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/FilterDialog.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/FilterDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/FilterForm.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/FilterForm.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/HelpWindow.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/HelpWindow.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/Icons.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Icons.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/Info.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Info.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/Scanner.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Scanner.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/Shell.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Shell.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/SourceViewer.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/SourceViewer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/UnittestDialog.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/UnittestDialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/UnittestForm.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/UnittestForm.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/UserInterface.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/UserInterface.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/VariablesViewer.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/VariablesViewer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/eric.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/eric.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/eric_de.qm
-lib/%%PYTHON_VERSION%%/site-packages/eric/helpviewer.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/helpviewer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/eric/qtunittest.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/qtunittest.pyc
 lib/%%PYTHON_VERSION%%/site-packages/libqtcanvascmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/libqtcanvascmodule.so.1
 lib/%%PYTHON_VERSION%%/site-packages/libqtcanvascmodule.so.1.0
@@ -62,6 +8,10 @@ lib/%%PYTHON_VERSION%%/site-packages/libqtcmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/libqtcmodule.so.1
 lib/%%PYTHON_VERSION%%/site-packages/libqtcmodule.so.1.0
 lib/%%PYTHON_VERSION%%/site-packages/libqtcmodule.so.1.0.0
+lib/%%PYTHON_VERSION%%/site-packages/libqtglcmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/libqtglcmodule.so.1
+lib/%%PYTHON_VERSION%%/site-packages/libqtglcmodule.so.1.0
+lib/%%PYTHON_VERSION%%/site-packages/libqtglcmodule.so.1.0.0
 lib/%%PYTHON_VERSION%%/site-packages/libqtnetworkcmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/libqtnetworkcmodule.so.1
 lib/%%PYTHON_VERSION%%/site-packages/libqtnetworkcmodule.so.1.0
@@ -82,6 +32,8 @@ lib/%%PYTHON_VERSION%%/site-packages/qt.py
 lib/%%PYTHON_VERSION%%/site-packages/qt.pyc
 lib/%%PYTHON_VERSION%%/site-packages/qtcanvas.py
 lib/%%PYTHON_VERSION%%/site-packages/qtcanvas.pyc
+lib/%%PYTHON_VERSION%%/site-packages/qtgl.py
+lib/%%PYTHON_VERSION%%/site-packages/qtgl.pyc
 lib/%%PYTHON_VERSION%%/site-packages/qtnetwork.py
 lib/%%PYTHON_VERSION%%/site-packages/qtnetwork.pyc
 lib/%%PYTHON_VERSION%%/site-packages/qtsql.py
@@ -90,4 +42,3 @@ lib/%%PYTHON_VERSION%%/site-packages/qttable.py
 lib/%%PYTHON_VERSION%%/site-packages/qttable.pyc
 lib/%%PYTHON_VERSION%%/site-packages/qtxml.py
 lib/%%PYTHON_VERSION%%/site-packages/qtxml.pyc
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/eric