update to 4.9.5

changes:
-suppoty Qt v4.8.3
-minor extensions

4 files changed, 26 insertions, 22 deletions

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index 736ba3bbd62..3a43efcfc8e 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.56 2012/10/08 23:02:38 adam Exp $
+# $NetBSD: Makefile,v 1.57 2012/10/10 16:53:38 drochner Exp $
 
 PKGNAME=	${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PYQT_VERSION=	4.9.4
-PKGREVISION=	4
+PYQT_VERSION=	4.9.5
 CATEGORIES=	x11 python
-MASTER_SITES=	http://www.riverbankcomputing.com/static/Downloads/PyQt4/
+#MASTER_SITES=	http://www.riverbankcomputing.com/static/Downloads/PyQt4/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Python binding for Qt4
@@ -70,6 +70,7 @@ do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
 
+BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.14
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
diff --git a/x11/py-qt4/PLIST.common b/x11/py-qt4/PLIST.common
index 067d6760bee..58b70321ddb 100644
--- a/x11/py-qt4/PLIST.common
+++ b/x11/py-qt4/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.18 2012/07/03 18:13:07 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.19 2012/10/10 16:53:39 drochner Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
@@ -88,6 +88,7 @@ share/sip${PYVERSSUFFIX}/QtCore/qelapsedtimer.sip
 share/sip${PYVERSSUFFIX}/QtCore/qeventloop.sip
 share/sip${PYVERSSUFFIX}/QtCore/qeventtransition.sip
 share/sip${PYVERSSUFFIX}/QtCore/qfile.sip
+share/sip${PYVERSSUFFIX}/QtCore/qfiledevice.sip
 share/sip${PYVERSSUFFIX}/QtCore/qfileinfo.sip
 share/sip${PYVERSSUFFIX}/QtCore/qfilesystemwatcher.sip
 share/sip${PYVERSSUFFIX}/QtCore/qfinalstate.sip
@@ -423,6 +424,7 @@ share/sip${PYVERSSUFFIX}/QtNetwork/QtNetworkmod.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qabstractnetworkcache.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qabstractsocket.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qauthenticator.sip
+share/sip${PYVERSSUFFIX}/QtNetwork/qdnslookup.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qftp.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qhostaddress.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qhostinfo.sip
@@ -443,6 +445,7 @@ share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkrequest.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworksession.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qssl.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qsslcertificate.sip
+share/sip${PYVERSSUFFIX}/QtNetwork/qsslcertificateextension.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qsslcipher.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qsslconfiguration.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qsslerror.sip
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index 92227db04bf..8d074a079f1 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2012/07/03 18:13:07 drochner Exp $
+$NetBSD: distinfo,v 1.26 2012/10/10 16:53:39 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-4.9.4.tar.gz) = 05425e0590d709ac28cdd551ad52e76f0b02eca5
-RMD160 (PyQt-x11-gpl-4.9.4.tar.gz) = 30684642147120b2234f06759e57e87021577e57
-Size (PyQt-x11-gpl-4.9.4.tar.gz) = 9801300 bytes
-SHA1 (patch-aa) = 9fce845d6aaa62070e28b408aacdb42d6d888aff
+SHA1 (PyQt-x11-gpl-4.9.5.tar.gz) = 1f0d10fff6bcd6008a980589fd889ccdbc8eb1c8
+RMD160 (PyQt-x11-gpl-4.9.5.tar.gz) = ce2a7811e156e9d1645016a2d5f621bf06b1b4e6
+Size (PyQt-x11-gpl-4.9.5.tar.gz) = 9824076 bytes
+SHA1 (patch-aa) = d23c228029986264775c8a9c71830c11ed415de4
diff --git a/x11/py-qt4/patches/patch-aa b/x11/py-qt4/patches/patch-aa
index ca6cdd8dc52..897db9a97e7 100644
--- a/x11/py-qt4/patches/patch-aa
+++ b/x11/py-qt4/patches/patch-aa
@@ -1,28 +1,28 @@
-$NetBSD: patch-aa,v 1.6 2012/07/03 18:13:07 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2012/10/10 16:53:39 drochner Exp $
 
---- configure.py.orig	2012-06-20 18:18:11.000000000 +0000
+--- configure.py.orig	2012-09-29 11:34:33.000000000 +0000
 +++ configure.py
-@@ -358,7 +358,7 @@ class ConfigurePyQt4:
+@@ -362,7 +362,7 @@ class ConfigurePyQt4:
          pyqt_modules.append("QtCore")
  
          check_module("QtGui", "qwidget.h", "new QWidget()")
--        if qt_version < 0x050000: check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
-+        if qt_version < 0x050000: check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", extra_libs=["QtCore"])
+-        check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
++        check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", extra_libs=["QtCore"])
          if qt_version < 0x050000: check_module("QtMultimedia", "QAudioDeviceInfo",
                  "new QAudioDeviceInfo()")
-         if qt_version < 0x050000: check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
-@@ -377,8 +377,8 @@ class ConfigurePyQt4:
-         if qt_version < 0x050000: check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
-         if qt_version < 0x050000: check_module("QtXml", "qdom.h", "new QDomDocument()")
-         if qt_version < 0x050000: check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
+         check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
+@@ -396,8 +396,8 @@ class ConfigurePyQt4:
+         if qt_version < 0x050000:
+             check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
+ 
 -        if qt_version < 0x050000: check_module("phonon", "phonon/videowidget.h",
 -                "new Phonon::VideoWidget()")
 +#        if qt_version < 0x050000: check_module("phonon", "phonon/videowidget.h",
 +#                "new Phonon::VideoWidget()")
-         if qt_version < 0x050000: check_module("QtAssistant", "qassistantclient.h",
+         check_module("QtAssistant", "qassistantclient.h",
                  "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
                  extra_libs=ass_libs)
-@@ -2046,11 +2046,7 @@ int main(int argc, char **argv)
+@@ -2093,11 +2093,7 @@ int main(int argc, char **argv)
  
      out << QLibraryInfo::licensee() << '\\n';