- Update PyQt4 to 4.8.5.

- Update SIP to 4.12.4.
- Use common DISTINFO_FILEs.

6 files changed, 6 insertions, 17 deletions

diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile
index 6f7ae36162d0..ac2e21e93970 100644
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	${PYQT4_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, Qt demo and examples
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 USE_PYTHON=	yes
 
 OPTIONS=	PYQT4	"Install any missing PyQt4 components" off
diff --git a/misc/py-qt4-demo/distinfo b/misc/py-qt4-demo/distinfo
deleted file mode 100644
index 55e47142c1e4..000000000000
--- a/misc/py-qt4-demo/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
diff --git a/misc/py-qt4-demo/files/patch-examples__activeqt__webbrowser__webbrowser.py b/misc/py-qt4-demo/files/patch-examples__activeqt__webbrowser__webbrowser.py
deleted file mode 100644
index 5cab1e7a0056..000000000000
--- a/misc/py-qt4-demo/files/patch-examples__activeqt__webbrowser__webbrowser.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/activeqt/webbrowser/webbrowser.py.orig	2009-10-29 13:37:30.000000000 +1000
-+++ examples/activeqt/webbrowser/webbrowser.py	2009-10-31 18:03:38.000000000 +1000
-@@ -115,7 +115,7 @@
-         QtGui.QMessageBox.about(self, "About WebBrowser",
-                 "This Example has been created using the ActiveQt integration into Qt Designer.\n"
-                 "It demonstrates the use of QAxWidget to embed the Internet Explorer ActiveX\n"
--                "control into a Qt application."))
-+                "control into a Qt application.")
- 
-     @QtCore.pyqtSlot()
-     def on_actionAboutQt_triggered(self):
diff --git a/misc/py-qt4-doc/Makefile b/misc/py-qt4-doc/Makefile
index 89d14c475db8..4ee3e85e8095 100644
--- a/misc/py-qt4-doc/Makefile
+++ b/misc/py-qt4-doc/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	${PYQT4_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, documentation
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 NO_BUILD=	yes
 USE_PYTHON=	2.5+
 
diff --git a/misc/py-qt4-doc/distinfo b/misc/py-qt4-doc/distinfo
deleted file mode 100644
index 55e47142c1e4..000000000000
--- a/misc/py-qt4-doc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
diff --git a/misc/py-qt4-doc/pkg-plist b/misc/py-qt4-doc/pkg-plist
index e3c441f97d73..fd569766ddc8 100644
--- a/misc/py-qt4-doc/pkg-plist
+++ b/misc/py-qt4-doc/pkg-plist
@@ -41,6 +41,8 @@
 %%DOCSDIR%%/html/_static/plus.png
 %%DOCSDIR%%/html/_static/pygments.css
 %%DOCSDIR%%/html/_static/searchtools.js
+%%DOCSDIR%%/html/_static/sidebar.js
+%%DOCSDIR%%/html/_static/underscore.js
 %%DOCSDIR%%/html/assistant-manual.html
 %%DOCSDIR%%/html/buffer_interface.html
 %%DOCSDIR%%/html/build_system.html
@@ -434,7 +436,6 @@
 %%DOCSDIR%%/html/installation.html
 %%DOCSDIR%%/html/introduction.html
 %%DOCSDIR%%/html/keyword_arguments.html
-%%DOCSDIR%%/html/modindex.html
 %%DOCSDIR%%/html/modules.html
 %%DOCSDIR%%/html/new_style_signals_slots.html
 %%DOCSDIR%%/html/objects.inv
@@ -468,6 +469,7 @@
 %%DOCSDIR%%/html/phonon-volumeslider.html
 %%DOCSDIR%%/html/phonon.html
 %%DOCSDIR%%/html/pickle.html
+%%DOCSDIR%%/html/py-modindex.html
 %%DOCSDIR%%/html/python_shell.html
 %%DOCSDIR%%/html/python_v3.html
 %%DOCSDIR%%/html/qabstractanimation.html
@@ -541,6 +543,7 @@
 %%DOCSDIR%%/html/qcolumnview.html
 %%DOCSDIR%%/html/qcombobox.html
 %%DOCSDIR%%/html/qcommandlinkbutton.html
+%%DOCSDIR%%/html/qcommonstyle.html
 %%DOCSDIR%%/html/qcompleter.html
 %%DOCSDIR%%/html/qconicalgradient.html
 %%DOCSDIR%%/html/qcontextmenuevent.html
@@ -1108,7 +1111,6 @@
 %%DOCSDIR%%/html/qtdeclarative.html
 %%DOCSDIR%%/html/qtdesigner.html
 %%DOCSDIR%%/html/qtemporaryfile.html
-%%DOCSDIR%%/html/qtest-qtoucheventsequence.html
 %%DOCSDIR%%/html/qtest.html
 %%DOCSDIR%%/html/qtextblock-iterator.html
 %%DOCSDIR%%/html/qtextblock.html