24 files changed, 353 insertions, 186 deletions

diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index 8a6a6c322cc5..cd23a0ef389c 100644
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	assistant
-PORTVERSION=	20070318
+PORTVERSION=	4.2
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt4/ \
+MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME=	PyQt-x11-gpl-4-snapshot-${PORTVERSION}
+DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
 
 MAINTAINER=	danny@ricin.com
 COMMENT=	Python bindings for the Qt4 toolkit, QtAssistant module
diff --git a/devel/py-qt4-assistant/distinfo b/devel/py-qt4-assistant/distinfo
index b42fc45ded6f..3317bc659e04 100644
--- a/devel/py-qt4-assistant/distinfo
+++ b/devel/py-qt4-assistant/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 538cd5167ccb14a6b6a3ee687432617a
-SHA256 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = d98516e20b02194264c199deddda2562845efca64315608522cc05a36c9210c7
-SIZE (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 1076275
+MD5 (PyQt-x11-gpl-4.2.tar.gz) = af4baa7f7441914f9a527ef3cf788fef
+SHA256 (PyQt-x11-gpl-4.2.tar.gz) = 6fa8a853a66ae500f36629793e7d4c54896c7ccf6337c2b90ea0175b28aa7ae6
+SIZE (PyQt-x11-gpl-4.2.tar.gz) = 5661258
diff --git a/devel/py-qt4-assistant/files/patch-configure.py b/devel/py-qt4-assistant/files/patch-configure.py
index 6e41f91abde3..2cdac1d13c66 100644
--- a/devel/py-qt4-assistant/files/patch-configure.py
+++ b/devel/py-qt4-assistant/files/patch-configure.py
@@ -1,6 +1,6 @@
---- configure.py.orig	Mon Feb 19 04:39:13 2007
-+++ configure.py	Tue Feb 20 16:34:36 2007
-@@ -133,21 +133,21 @@
+--- configure.py.orig	Tue Apr 10 17:59:52 2007
++++ configure.py	Thu Apr 12 20:50:50 2007
+@@ -138,26 +138,26 @@
          }
  
      def check_modules(self):
@@ -22,9 +22,17 @@
 +        #check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 +        #check_module("QtXml", "qdom.h", "new QDomDocument()")
          check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
--        check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+ 
+-        if sipcfg.universal:
+-            sipconfig.inform("QtDesigner module disabled with universal binaries")
+-        else:
+-            check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
++        #if sipcfg.universal:
++        #    sipconfig.inform("QtDesigner module disabled with universal binaries")
++        #else:
++        #    check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+ 
 -        check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
-+        #check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
 +        #check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
  
 -        if os.path.isdir("dbus"):
@@ -34,7 +42,7 @@
  
      def code(self):
          # Note that the order of the dependent modules is important.
-@@ -201,31 +201,31 @@
+@@ -211,31 +211,31 @@
              generate_code("QAxContainer", ["QAxContainer", "QtGui", "QtCore"])
  
          # Generate the consolidated module.
@@ -81,7 +89,7 @@
  
      def qpylibs(self):
          # See which QPy libraries to build.
-@@ -278,7 +278,7 @@
+@@ -308,7 +308,7 @@
              tool.append("dbus")
  
          # Only include ElementTree for older versions of Python.
@@ -90,7 +98,7 @@
              sipconfig.inform("Creating elementtree Makefile...")
  
              makefile = sipconfig.PythonModuleMakefile(
-@@ -309,7 +309,7 @@
+@@ -339,7 +339,7 @@
          )
  
          makefile.generate()
@@ -99,7 +107,26 @@
  
          if "QtXml" in pyqt_modules:
              sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -428,7 +428,7 @@
+@@ -376,7 +376,8 @@
+             makefile.generate()
+             tool.append("pyrcc")
+         else:
+-            sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
++            #sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
++            pass
+ 
+         if "QtDesigner" in pyqt_modules:
+             enabled = True
+@@ -460,7 +461,7 @@
+     sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
+     sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
+     sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir)
+-    sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
++    #sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
+ 
+     if opt_api:
+         sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python"))
+@@ -470,7 +471,7 @@
  
      sipconfig.inform("The PyQt .sip files will be installed in %s." % opt_pyqtsipdir)
  
@@ -108,7 +135,7 @@
  
      if opt_vendorcheck:
          sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -761,7 +761,8 @@
+@@ -808,7 +809,8 @@
      sipfiles = []
  
      for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -118,7 +145,7 @@
  
      installs.append([sipfiles, os.path.join(opt_pyqtsipdir, mname)])
  
-@@ -825,7 +826,7 @@
+@@ -873,7 +875,7 @@
              sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qted)
  
      # Confirm the license.
@@ -127,7 +154,7 @@
      print "Type 'L' to view the license."
      print "Type 'yes' to accept the terms of the license."
      print "Type 'no' to decline the terms of the license."
-@@ -847,7 +848,7 @@
+@@ -895,7 +897,7 @@
  
          if resp == "l":
              os.system("more LICENSE")
@@ -136,12 +163,12 @@
      # If there should be a license file then check it is where it should be.
      if lfile:
          if os.access(os.path.join("sip", lfile), os.F_OK):
-@@ -1367,16 +1368,18 @@
-     scidir = os.path.join(qt_datadir, "qsci")
+@@ -1434,16 +1436,18 @@
+     installs=[(pyqt.module_installs(), opt_pyqtmoddir)]
  
-     if opt_api or os.path.isdir(scidir):
--        installs.append(("PyQt4.api", os.path.join(scidir, "api", "python")))
-+        installs.append(("QtAssistant.api", os.path.join(scidir, "api", "python")))
+     if opt_api:
+-        installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python")))
++        installs.append(("QtAssistant.api", os.path.join(opt_qscidir, "api", "python")))
 +
 +    pyqt_modules = ["QtAssistant"]
  
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index 8fb5e70eb454..09e3827a5ee9 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	dbus
-PORTVERSION=	20070318
+PORTVERSION=	4.2
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt4/ \
+MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME=	PyQt-x11-gpl-4-snapshot-${PORTVERSION}
+DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
 
 MAINTAINER=	danny@ricin.com
 COMMENT=	Python bindings for the Qt4 toolkit, D-BUS module
diff --git a/devel/py-qt4-dbus/distinfo b/devel/py-qt4-dbus/distinfo
index b42fc45ded6f..3317bc659e04 100644
--- a/devel/py-qt4-dbus/distinfo
+++ b/devel/py-qt4-dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 538cd5167ccb14a6b6a3ee687432617a
-SHA256 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = d98516e20b02194264c199deddda2562845efca64315608522cc05a36c9210c7
-SIZE (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 1076275
+MD5 (PyQt-x11-gpl-4.2.tar.gz) = af4baa7f7441914f9a527ef3cf788fef
+SHA256 (PyQt-x11-gpl-4.2.tar.gz) = 6fa8a853a66ae500f36629793e7d4c54896c7ccf6337c2b90ea0175b28aa7ae6
+SIZE (PyQt-x11-gpl-4.2.tar.gz) = 5661258
diff --git a/devel/py-qt4-dbus/files/patch-configure.py b/devel/py-qt4-dbus/files/patch-configure.py
index 1931490a72e0..6afe5b439156 100644
--- a/devel/py-qt4-dbus/files/patch-configure.py
+++ b/devel/py-qt4-dbus/files/patch-configure.py
@@ -1,6 +1,6 @@
---- configure.py.orig	Mon Feb 19 04:39:13 2007
-+++ configure.py	Tue Feb 20 12:45:35 2007
-@@ -133,18 +133,18 @@
+--- configure.py.orig	Tue Apr 10 17:59:52 2007
++++ configure.py	Thu Apr 12 21:03:18 2007
+@@ -138,23 +138,23 @@
          }
  
      def check_modules(self):
@@ -15,8 +15,6 @@
 -        check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 -        check_module("QtXml", "qdom.h", "new QDomDocument()")
 -        check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
--        check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
--        check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
 +        #check_module("QtGui", "qwidget.h", "new QWidget()")
 +        #check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
 +        #check_module("QtOpenGL", "qgl.h", "new QGLWidget()")
@@ -25,12 +23,23 @@
 +        #check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 +        #check_module("QtXml", "qdom.h", "new QDomDocument()")
 +        #check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
-+        #check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
++
++        #if sipcfg.universal:
++        #    sipconfig.inform("QtDesigner module disabled with universal binaries")
++        #else:
++        #    check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+ 
+-        if sipcfg.universal:
+-            sipconfig.inform("QtDesigner module disabled with universal binaries")
+-        else:
+-            check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+-
+-        check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
 +        #check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
  
          if os.path.isdir("dbus"):
              check_dbus()
-@@ -201,31 +201,31 @@
+@@ -211,31 +211,31 @@
              generate_code("QAxContainer", ["QAxContainer", "QtGui", "QtCore"])
  
          # Generate the consolidated module.
@@ -77,7 +86,7 @@
  
      def qpylibs(self):
          # See which QPy libraries to build.
-@@ -278,7 +278,7 @@
+@@ -308,7 +308,7 @@
              tool.append("dbus")
  
          # Only include ElementTree for older versions of Python.
@@ -86,7 +95,7 @@
              sipconfig.inform("Creating elementtree Makefile...")
  
              makefile = sipconfig.PythonModuleMakefile(
-@@ -309,7 +309,7 @@
+@@ -339,7 +339,7 @@
          )
  
          makefile.generate()
@@ -95,7 +104,7 @@
  
          if "QtXml" in pyqt_modules:
              sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -344,7 +344,8 @@
+@@ -376,7 +376,8 @@
              makefile.generate()
              tool.append("pyrcc")
          else:
@@ -105,15 +114,21 @@
  
          if "QtDesigner" in pyqt_modules:
              enabled = True
-@@ -419,16 +420,16 @@
+@@ -458,19 +459,19 @@
      sipconfig.inform("The %s Qt library is in %s." % (qt_lib, qt_libdir))
      sipconfig.inform("The Qt binaries are in %s." % qt_bindir)
      sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
 -    sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
-+    #sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
- 
 -    sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir)
+-    sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
++    #sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
 +    #sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir)
++    #sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
+ 
+-    if opt_api:
+-        sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python"))
++    #if opt_api:
++    #    sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python"))
  
      if pydbusmoddir:
          sipconfig.inform("The dbus support module will be installed in %s." % pydbusmoddir)
@@ -126,7 +141,7 @@
  
      if opt_vendorcheck:
          sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -761,7 +762,8 @@
+@@ -808,7 +809,8 @@
      sipfiles = []
  
      for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -136,7 +151,7 @@
  
      installs.append([sipfiles, os.path.join(opt_pyqtsipdir, mname)])
  
-@@ -825,7 +827,7 @@
+@@ -873,7 +875,7 @@
              sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qted)
  
      # Confirm the license.
@@ -145,7 +160,7 @@
      print "Type 'L' to view the license."
      print "Type 'yes' to accept the terms of the license."
      print "Type 'no' to decline the terms of the license."
-@@ -847,7 +849,7 @@
+@@ -895,7 +897,7 @@
  
          if resp == "l":
              os.system("more LICENSE")
@@ -154,14 +169,14 @@
      # If there should be a license file then check it is where it should be.
      if lfile:
          if os.access(os.path.join("sip", lfile), os.F_OK):
-@@ -1366,17 +1368,17 @@
+@@ -1433,17 +1435,17 @@
  
-     scidir = os.path.join(qt_datadir, "qsci")
+     installs=[(pyqt.module_installs(), opt_pyqtmoddir)]
  
--    if opt_api or os.path.isdir(scidir):
--        installs.append(("PyQt4.api", os.path.join(scidir, "api", "python")))
-+    #if opt_api or os.path.isdir(scidir):
-+    #    installs.append(("PyQt4.api", os.path.join(scidir, "api", "python")))
+-    if opt_api:
+-        installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python")))
++    #if opt_api:
++    #    installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python")))
  
      sipconfig.ParentMakefile(
          configuration=sipcfg,
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index be94d1a384a5..44c1ffd5d4ff 100644
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@@ -5,17 +5,18 @@
 # $FreeBSD$
 
 PORTNAME=	designer
-PORTVERSION=	20070318
+PORTVERSION=	4.2
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt4/ \
+MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME=	PyQt-x11-gpl-4-snapshot-${PORTVERSION}
+DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
 
 MAINTAINER=	danny@ricin.com
 COMMENT=	Python bindings for the Qt4 toolkit, QtDesigner module
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 HAS_CONFIGURE=	yes
diff --git a/devel/py-qt4-designer/distinfo b/devel/py-qt4-designer/distinfo
index b42fc45ded6f..3317bc659e04 100644
--- a/devel/py-qt4-designer/distinfo
+++ b/devel/py-qt4-designer/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 538cd5167ccb14a6b6a3ee687432617a
-SHA256 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = d98516e20b02194264c199deddda2562845efca64315608522cc05a36c9210c7
-SIZE (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 1076275
+MD5 (PyQt-x11-gpl-4.2.tar.gz) = af4baa7f7441914f9a527ef3cf788fef
+SHA256 (PyQt-x11-gpl-4.2.tar.gz) = 6fa8a853a66ae500f36629793e7d4c54896c7ccf6337c2b90ea0175b28aa7ae6
+SIZE (PyQt-x11-gpl-4.2.tar.gz) = 5661258
diff --git a/devel/py-qt4-designer/files/patch-configure.py b/devel/py-qt4-designer/files/patch-configure.py
index 189c4b8f6157..be44c3ba7760 100644
--- a/devel/py-qt4-designer/files/patch-configure.py
+++ b/devel/py-qt4-designer/files/patch-configure.py
@@ -1,6 +1,6 @@
---- configure.py.orig	Mon Feb 19 04:39:13 2007
-+++ configure.py	Tue Feb 20 19:59:20 2007
-@@ -133,21 +133,21 @@
+--- configure.py.orig	Tue Apr 10 17:59:52 2007
++++ configure.py	Thu Apr 12 21:26:39 2007
+@@ -138,26 +138,26 @@
          }
  
      def check_modules(self):
@@ -23,7 +23,12 @@
 +        #check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 +        #check_module("QtXml", "qdom.h", "new QDomDocument()")
 +        #check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
-         check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+ 
+         if sipcfg.universal:
+             sipconfig.inform("QtDesigner module disabled with universal binaries")
+         else:
+             check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+ 
 -        check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
 +        #check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
  
@@ -34,7 +39,7 @@
  
      def code(self):
          # Note that the order of the dependent modules is important.
-@@ -201,31 +201,31 @@
+@@ -211,31 +211,31 @@
              generate_code("QAxContainer", ["QAxContainer", "QtGui", "QtCore"])
  
          # Generate the consolidated module.
@@ -81,7 +86,7 @@
  
      def qpylibs(self):
          # See which QPy libraries to build.
-@@ -278,7 +278,7 @@
+@@ -308,7 +308,7 @@
              tool.append("dbus")
  
          # Only include ElementTree for older versions of Python.
@@ -90,7 +95,7 @@
              sipconfig.inform("Creating elementtree Makefile...")
  
              makefile = sipconfig.PythonModuleMakefile(
-@@ -309,7 +309,7 @@
+@@ -339,7 +339,7 @@
          )
  
          makefile.generate()
@@ -99,7 +104,35 @@
  
          if "QtXml" in pyqt_modules:
              sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -428,7 +428,7 @@
+@@ -376,7 +376,8 @@
+             makefile.generate()
+             tool.append("pyrcc")
+         else:
+-            sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
++            #sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
++            pass
+ 
+         if "QtDesigner" in pyqt_modules:
+             enabled = True
+@@ -400,7 +401,7 @@
+                       glob.glob("%s/lib/libpython%d.%d*" % (ducfg["prefix"], py_major, py_minor))):
+                     link = "-L%s/lib -lpython%d.%d" % (ducfg["prefix"], py_major, py_minor)
+                 else:
+-                    sipconfig.inform("Qt Designer plugin disabled because Python library is static")
++                    #sipconfig.inform("Qt Designer plugin disabled because Python library is static")
+                     enabled = False
+ 
+                 pysh_lib = ducfg["LDLIBRARY"]
+@@ -460,7 +461,7 @@
+     sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
+     sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
+     sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir)
+-    sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
++    #sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
+ 
+     if opt_api:
+         sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python"))
+@@ -470,7 +471,7 @@
  
      sipconfig.inform("The PyQt .sip files will be installed in %s." % opt_pyqtsipdir)
  
@@ -108,7 +141,7 @@
  
      if opt_vendorcheck:
          sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -761,7 +761,8 @@
+@@ -808,7 +809,8 @@
      sipfiles = []
  
      for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -118,7 +151,7 @@
  
      installs.append([sipfiles, os.path.join(opt_pyqtsipdir, mname)])
  
-@@ -825,7 +826,7 @@
+@@ -873,7 +875,7 @@
              sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qted)
  
      # Confirm the license.
@@ -127,7 +160,7 @@
      print "Type 'L' to view the license."
      print "Type 'yes' to accept the terms of the license."
      print "Type 'no' to decline the terms of the license."
-@@ -847,7 +848,7 @@
+@@ -895,7 +897,7 @@
  
          if resp == "l":
              os.system("more LICENSE")
@@ -136,14 +169,15 @@
      # If there should be a license file then check it is where it should be.
      if lfile:
          if os.access(os.path.join("sip", lfile), os.F_OK):
-@@ -1367,16 +1368,18 @@
-     scidir = os.path.join(qt_datadir, "qsci")
+@@ -1433,17 +1435,19 @@
+ 
+     installs=[(pyqt.module_installs(), opt_pyqtmoddir)]
  
-     if opt_api or os.path.isdir(scidir):
--        installs.append(("PyQt4.api", os.path.join(scidir, "api", "python")))
-+        installs.append(("QtDesigner.api", os.path.join(scidir, "api", "python")))
-+
 +    pyqt_modules = ["QtDesigner"]
++
+     if opt_api:
+-        installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python")))
++        installs.append(("QtDesigner.api", os.path.join(opt_qscidir, "api", "python")))
  
      sipconfig.ParentMakefile(
          configuration=sipcfg,
diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile
index 847b8ee9f417..bae2a502cf2f 100644
--- a/devel/py-qt4-designerplugin/Makefile
+++ b/devel/py-qt4-designerplugin/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	designerplugin
-PORTVERSION=	20070318
+PORTVERSION=	4.2
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt4/ \
+MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME=	PyQt-x11-gpl-4-snapshot-${PORTVERSION}
+DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
 
 MAINTAINER=	danny@ricin.com
 COMMENT=	Python bindings for the Qt4 toolkit, QtDesigner plugin
diff --git a/devel/py-qt4-designerplugin/distinfo b/devel/py-qt4-designerplugin/distinfo
index b42fc45ded6f..3317bc659e04 100644
--- a/devel/py-qt4-designerplugin/distinfo
+++ b/devel/py-qt4-designerplugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 538cd5167ccb14a6b6a3ee687432617a
-SHA256 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = d98516e20b02194264c199deddda2562845efca64315608522cc05a36c9210c7
-SIZE (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 1076275
+MD5 (PyQt-x11-gpl-4.2.tar.gz) = af4baa7f7441914f9a527ef3cf788fef
+SHA256 (PyQt-x11-gpl-4.2.tar.gz) = 6fa8a853a66ae500f36629793e7d4c54896c7ccf6337c2b90ea0175b28aa7ae6
+SIZE (PyQt-x11-gpl-4.2.tar.gz) = 5661258
diff --git a/devel/py-qt4-designerplugin/files/patch-configure.py b/devel/py-qt4-designerplugin/files/patch-configure.py
index 4337fca664b7..387ab8215400 100644
--- a/devel/py-qt4-designerplugin/files/patch-configure.py
+++ b/devel/py-qt4-designerplugin/files/patch-configure.py
@@ -1,6 +1,6 @@
---- configure.py.orig	Mon Mar 19 04:33:57 2007
-+++ configure.py	Mon Mar 19 20:02:07 2007
-@@ -133,21 +133,21 @@
+--- configure.py.orig	Tue Apr 10 17:59:52 2007
++++ configure.py	Thu Apr 12 21:36:39 2007
+@@ -138,26 +138,26 @@
          }
  
      def check_modules(self):
@@ -23,7 +23,12 @@
 +        #check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 +        #check_module("QtXml", "qdom.h", "new QDomDocument()")
 +        #check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
-         check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+ 
+         if sipcfg.universal:
+             sipconfig.inform("QtDesigner module disabled with universal binaries")
+         else:
+             check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+ 
 -        check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
 +        #check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
  
@@ -34,7 +39,7 @@
  
      def code(self):
          # Note that the order of the dependent modules is important.
-@@ -201,31 +201,31 @@
+@@ -211,31 +211,31 @@
              generate_code("QAxContainer", ["QAxContainer", "QtGui", "QtCore"])
  
          # Generate the consolidated module.
@@ -81,7 +86,7 @@
  
      def qpylibs(self):
          # See which QPy libraries to build.
-@@ -278,7 +278,7 @@
+@@ -308,7 +308,7 @@
              tool.append("dbus")
  
          # Only include ElementTree for older versions of Python.
@@ -90,7 +95,7 @@
              sipconfig.inform("Creating elementtree Makefile...")
  
              makefile = sipconfig.PythonModuleMakefile(
-@@ -309,7 +309,7 @@
+@@ -339,7 +339,7 @@
          )
  
          makefile.generate()
@@ -99,7 +104,7 @@
  
          if "QtXml" in pyqt_modules:
              sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -344,7 +344,8 @@
+@@ -376,7 +376,8 @@
              makefile.generate()
              tool.append("pyrcc")
          else:
@@ -109,7 +114,7 @@
  
          if "QtDesigner" in pyqt_modules:
              enabled = True
-@@ -364,7 +365,10 @@
+@@ -396,7 +397,10 @@
                      # We need to work out how to specify the right framework
                      # version.
                      link = "-framework Python"
@@ -121,15 +126,20 @@
                        glob.glob("%s/lib/libpython%d.%d*" % (ducfg["prefix"], py_major, py_minor))):
                      link = "-L%s/lib -lpython%d.%d" % (ducfg["prefix"], py_major, py_minor)
                  else:
-@@ -420,16 +424,16 @@
+@@ -458,19 +462,19 @@
      sipconfig.inform("The %s Qt library is in %s." % (qt_lib, qt_libdir))
      sipconfig.inform("The Qt binaries are in %s." % qt_bindir)
      sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
 -    sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
-+    #sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
- 
 -    sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir)
++    #sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
 +    #sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir)
+     sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
+ 
+-    if opt_api:
+-        sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python"))
++    #if opt_api:
++    #    sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python"))
  
      if pydbusmoddir:
          sipconfig.inform("The dbus support module will be installed in %s." % pydbusmoddir)
@@ -142,7 +152,7 @@
  
      if opt_vendorcheck:
          sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -767,7 +771,8 @@
+@@ -808,7 +812,8 @@
      sipfiles = []
  
      for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -152,7 +162,7 @@
  
      installs.append([sipfiles, os.path.join(opt_pyqtsipdir, mname)])
  
-@@ -831,7 +836,7 @@
+@@ -873,7 +878,7 @@
              sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qted)
  
      # Confirm the license.
@@ -161,7 +171,7 @@
      print "Type 'L' to view the license."
      print "Type 'yes' to accept the terms of the license."
      print "Type 'no' to decline the terms of the license."
-@@ -853,7 +858,7 @@
+@@ -895,7 +900,7 @@
  
          if resp == "l":
              os.system("more LICENSE")
@@ -170,14 +180,14 @@
      # If there should be a license file then check it is where it should be.
      if lfile:
          if os.access(os.path.join("sip", lfile), os.F_OK):
-@@ -1372,17 +1377,17 @@
+@@ -1433,17 +1438,17 @@
  
-     scidir = os.path.join(qt_datadir, "qsci")
+     installs=[(pyqt.module_installs(), opt_pyqtmoddir)]
  
--    if opt_api or os.path.isdir(scidir):
--        installs.append(("PyQt4.api", os.path.join(scidir, "api", "python")))
-+    #if opt_api or os.path.isdir(scidir):
-+    #    installs.append(("PyQt4.api", os.path.join(scidir, "api", "python")))
+-    if opt_api:
+-        installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python")))
++    #if opt_api:
++    #    installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python")))
  
      sipconfig.ParentMakefile(
          configuration=sipcfg,
diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile
index cb27f91b929c..8fa9836cff82 100644
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	svg
-PORTVERSION=	20070318
+PORTVERSION=	4.2
 CATEGORIES=	graphics devel python
-MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt4/ \
+MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME=	PyQt-x11-gpl-4-snapshot-${PORTVERSION}
+DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
 
 MAINTAINER=	danny@ricin.com
 COMMENT=	Python bindings for the Qt4 toolkit, QtSvg module
diff --git a/graphics/py-qt4-svg/distinfo b/graphics/py-qt4-svg/distinfo
index b42fc45ded6f..3317bc659e04 100644
--- a/graphics/py-qt4-svg/distinfo
+++ b/graphics/py-qt4-svg/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 538cd5167ccb14a6b6a3ee687432617a
-SHA256 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = d98516e20b02194264c199deddda2562845efca64315608522cc05a36c9210c7
-SIZE (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 1076275
+MD5 (PyQt-x11-gpl-4.2.tar.gz) = af4baa7f7441914f9a527ef3cf788fef
+SHA256 (PyQt-x11-gpl-4.2.tar.gz) = 6fa8a853a66ae500f36629793e7d4c54896c7ccf6337c2b90ea0175b28aa7ae6
+SIZE (PyQt-x11-gpl-4.2.tar.gz) = 5661258
diff --git a/graphics/py-qt4-svg/files/patch-configure.py b/graphics/py-qt4-svg/files/patch-configure.py
index c8746b48aa6f..2c4d340541a7 100644
--- a/graphics/py-qt4-svg/files/patch-configure.py
+++ b/graphics/py-qt4-svg/files/patch-configure.py
@@ -1,6 +1,6 @@
---- configure.py.orig	Mon Feb 19 04:39:13 2007
-+++ configure.py	Tue Feb 20 17:09:52 2007
-@@ -133,21 +133,21 @@
+--- configure.py.orig	Tue Apr 10 17:59:52 2007
++++ configure.py	Thu Apr 12 22:02:17 2007
+@@ -138,26 +138,26 @@
          }
  
      def check_modules(self):
@@ -19,12 +19,21 @@
 -        check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 -        check_module("QtXml", "qdom.h", "new QDomDocument()")
 -        check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
--        check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
--        check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
 +        #check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 +        #check_module("QtXml", "qdom.h", "new QDomDocument()")
 +        #check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
-+        #check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
++
++        #if sipcfg.universal:
++        #    sipconfig.inform("QtDesigner module disabled with universal binaries")
++        #else:
++        #    check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+ 
+-        if sipcfg.universal:
+-            sipconfig.inform("QtDesigner module disabled with universal binaries")
+-        else:
+-            check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+-
+-        check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
 +        #check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
  
 -        if os.path.isdir("dbus"):
@@ -34,7 +43,7 @@
  
      def code(self):
          # Note that the order of the dependent modules is important.
-@@ -201,31 +201,31 @@
+@@ -211,31 +211,31 @@
              generate_code("QAxContainer", ["QAxContainer", "QtGui", "QtCore"])
  
          # Generate the consolidated module.
@@ -81,7 +90,7 @@
  
      def qpylibs(self):
          # See which QPy libraries to build.
-@@ -278,7 +278,7 @@
+@@ -308,7 +308,7 @@
              tool.append("dbus")
  
          # Only include ElementTree for older versions of Python.
@@ -90,7 +99,7 @@
              sipconfig.inform("Creating elementtree Makefile...")
  
              makefile = sipconfig.PythonModuleMakefile(
-@@ -309,7 +309,7 @@
+@@ -339,7 +339,7 @@
          )
  
          makefile.generate()
@@ -99,7 +108,26 @@
  
          if "QtXml" in pyqt_modules:
              sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -428,7 +428,7 @@
+@@ -376,7 +376,8 @@
+             makefile.generate()
+             tool.append("pyrcc")
+         else:
+-            sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
++            #sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
++            pass
+ 
+         if "QtDesigner" in pyqt_modules:
+             enabled = True
+@@ -460,7 +461,7 @@
+     sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
+     sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
+     sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir)
+-    sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
++    #sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
+ 
+     if opt_api:
+         sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python"))
+@@ -470,7 +471,7 @@
  
      sipconfig.inform("The PyQt .sip files will be installed in %s." % opt_pyqtsipdir)
  
@@ -108,7 +136,7 @@
  
      if opt_vendorcheck:
          sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -761,7 +761,8 @@
+@@ -808,7 +809,8 @@
      sipfiles = []
  
      for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -118,7 +146,7 @@
  
      installs.append([sipfiles, os.path.join(opt_pyqtsipdir, mname)])
  
-@@ -825,7 +826,7 @@
+@@ -873,7 +875,7 @@
              sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qted)
  
      # Confirm the license.
@@ -127,7 +155,7 @@
      print "Type 'L' to view the license."
      print "Type 'yes' to accept the terms of the license."
      print "Type 'no' to decline the terms of the license."
-@@ -847,7 +848,7 @@
+@@ -895,7 +897,7 @@
  
          if resp == "l":
              os.system("more LICENSE")
@@ -136,12 +164,12 @@
      # If there should be a license file then check it is where it should be.
      if lfile:
          if os.access(os.path.join("sip", lfile), os.F_OK):
-@@ -1367,16 +1368,18 @@
-     scidir = os.path.join(qt_datadir, "qsci")
+@@ -1434,16 +1436,18 @@
+     installs=[(pyqt.module_installs(), opt_pyqtmoddir)]
  
-     if opt_api or os.path.isdir(scidir):
--        installs.append(("PyQt4.api", os.path.join(scidir, "api", "python")))
-+        installs.append(("QtSvg.api", os.path.join(scidir, "api", "python")))
+     if opt_api:
+-        installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python")))
++        installs.append(("QtSvg.api", os.path.join(opt_qscidir, "api", "python")))
 +
 +    pyqt_modules = ["QtSvg"]
  
diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile
index 6b04ebf9725e..311c61277ace 100644
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	demo
-PORTVERSION=	20070318
+PORTVERSION=	4.2
 CATEGORIES=	misc devel python
-MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt4/ \
+MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME=	PyQt-x11-gpl-4-snapshot-${PORTVERSION}
+DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
 
 MAINTAINER=	danny@ricin.com
 COMMENT=	Python bindings for the Qt4 toolkit, demo and examples
diff --git a/misc/py-qt4-demo/distinfo b/misc/py-qt4-demo/distinfo
index b42fc45ded6f..3317bc659e04 100644
--- a/misc/py-qt4-demo/distinfo
+++ b/misc/py-qt4-demo/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 538cd5167ccb14a6b6a3ee687432617a
-SHA256 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = d98516e20b02194264c199deddda2562845efca64315608522cc05a36c9210c7
-SIZE (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 1076275
+MD5 (PyQt-x11-gpl-4.2.tar.gz) = af4baa7f7441914f9a527ef3cf788fef
+SHA256 (PyQt-x11-gpl-4.2.tar.gz) = 6fa8a853a66ae500f36629793e7d4c54896c7ccf6337c2b90ea0175b28aa7ae6
+SIZE (PyQt-x11-gpl-4.2.tar.gz) = 5661258
diff --git a/misc/py-qt4-demo/pkg-plist b/misc/py-qt4-demo/pkg-plist
index 0fd6706f713c..937cb7749716 100644
--- a/misc/py-qt4-demo/pkg-plist
+++ b/misc/py-qt4-demo/pkg-plist
@@ -113,6 +113,8 @@
 %%EXAMPLESDIR%%/graphicsview/elasticnodes.py
 %%EXAMPLESDIR%%/graphicsview/elasticnodes.pyc
 %%EXAMPLESDIR%%/itemviews/README
+%%EXAMPLESDIR%%/itemviews/basicsortfiltermodel.py
+%%EXAMPLESDIR%%/itemviews/basicsortfiltermodel.pyc
 %%EXAMPLESDIR%%/itemviews/chart/chart.py
 %%EXAMPLESDIR%%/itemviews/chart/chart.pyc
 %%EXAMPLESDIR%%/itemviews/chart/chart.qrc
@@ -142,12 +144,6 @@
 %%EXAMPLESDIR%%/itemviews/simpletreemodel/simpletreemodel.qrc
 %%EXAMPLESDIR%%/itemviews/simpletreemodel/simpletreemodel_rc.py
 %%EXAMPLESDIR%%/itemviews/simpletreemodel/simpletreemodel_rc.pyc
-%%EXAMPLESDIR%%/itemviews/sortingmodel/default.txt
-%%EXAMPLESDIR%%/itemviews/sortingmodel/sortingmodel.py
-%%EXAMPLESDIR%%/itemviews/sortingmodel/sortingmodel.pyc
-%%EXAMPLESDIR%%/itemviews/sortingmodel/sortingmodel.qrc
-%%EXAMPLESDIR%%/itemviews/sortingmodel/sortingmodel_rc.py
-%%EXAMPLESDIR%%/itemviews/sortingmodel/sortingmodel_rc.pyc
 %%EXAMPLESDIR%%/itemviews/spinboxdelegate.py
 %%EXAMPLESDIR%%/itemviews/spinboxdelegate.pyc
 %%EXAMPLESDIR%%/layouts/README
diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile
index 904dfe1960db..0f6ec22625c9 100644
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	network
-PORTVERSION=	20070318
+PORTVERSION=	4.2
 CATEGORIES=	net devel python
-MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt4/ \
+MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME=	PyQt-x11-gpl-4-snapshot-${PORTVERSION}
+DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
 
 MAINTAINER=	danny@ricin.com
 COMMENT=	Python bindings for the Qt4 toolkit, QtNetwork module
diff --git a/net/py-qt4-network/distinfo b/net/py-qt4-network/distinfo
index b42fc45ded6f..3317bc659e04 100644
--- a/net/py-qt4-network/distinfo
+++ b/net/py-qt4-network/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 538cd5167ccb14a6b6a3ee687432617a
-SHA256 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = d98516e20b02194264c199deddda2562845efca64315608522cc05a36c9210c7
-SIZE (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 1076275
+MD5 (PyQt-x11-gpl-4.2.tar.gz) = af4baa7f7441914f9a527ef3cf788fef
+SHA256 (PyQt-x11-gpl-4.2.tar.gz) = 6fa8a853a66ae500f36629793e7d4c54896c7ccf6337c2b90ea0175b28aa7ae6
+SIZE (PyQt-x11-gpl-4.2.tar.gz) = 5661258
diff --git a/net/py-qt4-network/files/patch-configure.py b/net/py-qt4-network/files/patch-configure.py
index d0a72f84c8c9..f97f0a8e645d 100644
--- a/net/py-qt4-network/files/patch-configure.py
+++ b/net/py-qt4-network/files/patch-configure.py
@@ -1,6 +1,6 @@
---- configure.py.orig	Mon Feb 19 04:39:13 2007
-+++ configure.py	Tue Feb 20 16:24:03 2007
-@@ -133,21 +133,21 @@
+--- configure.py.orig	Tue Apr 10 17:59:52 2007
++++ configure.py	Thu Apr 12 22:01:38 2007
+@@ -138,26 +138,26 @@
          }
  
      def check_modules(self):
@@ -16,15 +16,24 @@
 -        check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 -        check_module("QtXml", "qdom.h", "new QDomDocument()")
 -        check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
--        check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
--        check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
 +        #check_module("QtOpenGL", "qgl.h", "new QGLWidget()")
 +        #check_module("QtSql", "qsqldatabase.h", "new QSqlDatabase()")
 +        #check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()")
 +        #check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 +        #check_module("QtXml", "qdom.h", "new QDomDocument()")
 +        #check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
-+        #check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
++
++        #if sipcfg.universal:
++        #    sipconfig.inform("QtDesigner module disabled with universal binaries")
++        #else:
++        #    check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+ 
+-        if sipcfg.universal:
+-            sipconfig.inform("QtDesigner module disabled with universal binaries")
+-        else:
+-            check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+-
+-        check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
 +        #check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
  
 -        if os.path.isdir("dbus"):
@@ -34,7 +43,7 @@
  
      def code(self):
          # Note that the order of the dependent modules is important.
-@@ -201,31 +201,31 @@
+@@ -211,31 +211,31 @@
              generate_code("QAxContainer", ["QAxContainer", "QtGui", "QtCore"])
  
          # Generate the consolidated module.
@@ -81,7 +90,7 @@
  
      def qpylibs(self):
          # See which QPy libraries to build.
-@@ -278,7 +278,7 @@
+@@ -308,7 +308,7 @@
              tool.append("dbus")
  
          # Only include ElementTree for older versions of Python.
@@ -90,7 +99,7 @@
              sipconfig.inform("Creating elementtree Makefile...")
  
              makefile = sipconfig.PythonModuleMakefile(
-@@ -309,7 +309,7 @@
+@@ -339,7 +339,7 @@
          )
  
          makefile.generate()
@@ -99,7 +108,26 @@
  
          if "QtXml" in pyqt_modules:
              sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -428,7 +428,7 @@
+@@ -376,7 +376,8 @@
+             makefile.generate()
+             tool.append("pyrcc")
+         else:
+-            sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
++            #sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
++            pass
+ 
+         if "QtDesigner" in pyqt_modules:
+             enabled = True
+@@ -460,7 +461,7 @@
+     sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
+     sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
+     sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir)
+-    sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
++    #sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
+ 
+     if opt_api:
+         sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python"))
+@@ -470,7 +471,7 @@
  
      sipconfig.inform("The PyQt .sip files will be installed in %s." % opt_pyqtsipdir)
  
@@ -108,7 +136,7 @@
  
      if opt_vendorcheck:
          sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -761,7 +761,8 @@
+@@ -808,7 +809,8 @@
      sipfiles = []
  
      for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -118,7 +146,7 @@
  
      installs.append([sipfiles, os.path.join(opt_pyqtsipdir, mname)])
  
-@@ -825,7 +826,7 @@
+@@ -873,7 +875,7 @@
              sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qted)
  
      # Confirm the license.
@@ -127,7 +155,7 @@
      print "Type 'L' to view the license."
      print "Type 'yes' to accept the terms of the license."
      print "Type 'no' to decline the terms of the license."
-@@ -847,7 +848,7 @@
+@@ -895,7 +897,7 @@
  
          if resp == "l":
              os.system("more LICENSE")
@@ -136,12 +164,12 @@
      # If there should be a license file then check it is where it should be.
      if lfile:
          if os.access(os.path.join("sip", lfile), os.F_OK):
-@@ -1367,16 +1368,18 @@
-     scidir = os.path.join(qt_datadir, "qsci")
+@@ -1434,16 +1436,18 @@
+     installs=[(pyqt.module_installs(), opt_pyqtmoddir)]
  
-     if opt_api or os.path.isdir(scidir):
--        installs.append(("PyQt4.api", os.path.join(scidir, "api", "python")))
-+        installs.append(("QtNetwork.api", os.path.join(scidir, "api", "python")))
+     if opt_api:
+-        installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python")))
++        installs.append(("QtNetwork.api", os.path.join(opt_qscidir, "api", "python")))
 +
 +    pyqt_modules = ["QtNetwork"]
  
diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile
index 5bd1bd32feb3..cc9902372879 100644
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	gui
-PORTVERSION=	20070318
+PORTVERSION=	4.2
 CATEGORIES=	x11-toolkits devel python
-MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt4/ \
+MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME=	PyQt-x11-gpl-4-snapshot-${PORTVERSION}
+DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
 
 MAINTAINER=	danny@ricin.com
 COMMENT=	Python bindings for the Qt4 toolkit, QtGui module
diff --git a/x11-toolkits/py-qt4-gui/distinfo b/x11-toolkits/py-qt4-gui/distinfo
index b42fc45ded6f..3317bc659e04 100644
--- a/x11-toolkits/py-qt4-gui/distinfo
+++ b/x11-toolkits/py-qt4-gui/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 538cd5167ccb14a6b6a3ee687432617a
-SHA256 (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = d98516e20b02194264c199deddda2562845efca64315608522cc05a36c9210c7
-SIZE (PyQt-x11-gpl-4-snapshot-20070318.tar.gz) = 1076275
+MD5 (PyQt-x11-gpl-4.2.tar.gz) = af4baa7f7441914f9a527ef3cf788fef
+SHA256 (PyQt-x11-gpl-4.2.tar.gz) = 6fa8a853a66ae500f36629793e7d4c54896c7ccf6337c2b90ea0175b28aa7ae6
+SIZE (PyQt-x11-gpl-4.2.tar.gz) = 5661258
diff --git a/x11-toolkits/py-qt4-gui/files/patch-configure.py b/x11-toolkits/py-qt4-gui/files/patch-configure.py
index 8d44b5014bc2..9990fe240fb2 100644
--- a/x11-toolkits/py-qt4-gui/files/patch-configure.py
+++ b/x11-toolkits/py-qt4-gui/files/patch-configure.py
@@ -1,6 +1,6 @@
---- configure.py.orig	Mon Feb 19 04:39:13 2007
-+++ configure.py	Tue Feb 20 16:07:52 2007
-@@ -133,21 +133,21 @@
+--- configure.py.orig	Tue Apr 10 17:59:52 2007
++++ configure.py	Thu Apr 12 22:14:40 2007
+@@ -138,26 +138,26 @@
          }
  
      def check_modules(self):
@@ -15,8 +15,6 @@
 -        check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 -        check_module("QtXml", "qdom.h", "new QDomDocument()")
 -        check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
--        check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
--        check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
 +        #check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
 +        #check_module("QtOpenGL", "qgl.h", "new QGLWidget()")
 +        #check_module("QtSql", "qsqldatabase.h", "new QSqlDatabase()")
@@ -24,7 +22,18 @@
 +        #check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 +        #check_module("QtXml", "qdom.h", "new QDomDocument()")
 +        #check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
-+        #check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
++
++        #if sipcfg.universal:
++        #    sipconfig.inform("QtDesigner module disabled with universal binaries")
++        #else:
++        #    check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+ 
+-        if sipcfg.universal:
+-            sipconfig.inform("QtDesigner module disabled with universal binaries")
+-        else:
+-            check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+-
+-        check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
 +        #check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
  
 -        if os.path.isdir("dbus"):
@@ -34,7 +43,7 @@
  
      def code(self):
          # Note that the order of the dependent modules is important.
-@@ -201,31 +201,31 @@
+@@ -211,31 +211,31 @@
              generate_code("QAxContainer", ["QAxContainer", "QtGui", "QtCore"])
  
          # Generate the consolidated module.
@@ -81,7 +90,7 @@
  
      def qpylibs(self):
          # See which QPy libraries to build.
-@@ -278,7 +278,7 @@
+@@ -308,7 +308,7 @@
              tool.append("dbus")
  
          # Only include ElementTree for older versions of Python.
@@ -90,7 +99,7 @@
              sipconfig.inform("Creating elementtree Makefile...")
  
              makefile = sipconfig.PythonModuleMakefile(
-@@ -309,7 +309,7 @@
+@@ -339,7 +339,7 @@
          )
  
          makefile.generate()
@@ -99,7 +108,26 @@
  
          if "QtXml" in pyqt_modules:
              sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -428,7 +428,7 @@
+@@ -376,7 +376,8 @@
+             makefile.generate()
+             tool.append("pyrcc")
+         else:
+-            sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
++            #sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
++            pass
+ 
+         if "QtDesigner" in pyqt_modules:
+             enabled = True
+@@ -460,7 +461,7 @@
+     sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
+     sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
+     sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir)
+-    sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
++    #sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
+ 
+     if opt_api:
+         sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python"))
+@@ -470,7 +471,7 @@
  
      sipconfig.inform("The PyQt .sip files will be installed in %s." % opt_pyqtsipdir)
  
@@ -108,7 +136,7 @@
  
      if opt_vendorcheck:
          sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -761,7 +761,8 @@
+@@ -808,7 +809,8 @@
      sipfiles = []
  
      for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -118,7 +146,7 @@
  
      installs.append([sipfiles, os.path.join(opt_pyqtsipdir, mname)])
  
-@@ -825,7 +826,7 @@
+@@ -873,7 +875,7 @@
              sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qted)
  
      # Confirm the license.
@@ -127,7 +155,7 @@
      print "Type 'L' to view the license."
      print "Type 'yes' to accept the terms of the license."
      print "Type 'no' to decline the terms of the license."
-@@ -847,7 +848,7 @@
+@@ -895,7 +897,7 @@
  
          if resp == "l":
              os.system("more LICENSE")
@@ -136,12 +164,12 @@
      # If there should be a license file then check it is where it should be.
      if lfile:
          if os.access(os.path.join("sip", lfile), os.F_OK):
-@@ -1367,16 +1368,18 @@
-     scidir = os.path.join(qt_datadir, "qsci")
+@@ -1434,16 +1436,18 @@
+     installs=[(pyqt.module_installs(), opt_pyqtmoddir)]
  
-     if opt_api or os.path.isdir(scidir):
--        installs.append(("PyQt4.api", os.path.join(scidir, "api", "python")))
-+        installs.append(("QtGui.api", os.path.join(scidir, "api", "python")))
+     if opt_api:
+-        installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python")))
++        installs.append(("QtGui.api", os.path.join(opt_qscidir, "api", "python")))
 +
 +    pyqt_modules = ["QtGui"]