- Update SIP to 4.12.1.

- Update PyQt4 to 4.8.3. - Update QScintilla2 to 2.4.6.
svn path=/head/; revision=271642
2011-03-25 10:06:51 +00:00 · 2011-03-25 10:06:51 +00:00 · 59e8197604 · 2021-03-31 03:12:20 +00:00
commit 59e8197604
parent ad849b2e01
67 changed files with 353 additions and 358 deletions
--- a/databases/py-qt4-sql/distinfo
+++ b/databases/py-qt4-sql/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/databases/py-qt4-sql/pkg-descr
+++ b/databases/py-qt4-sql/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtSql module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-qt4-assistant/distinfo
+++ b/devel/py-qt4-assistant/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/devel/py-qt4-assistant/pkg-descr
+++ b/devel/py-qt4-assistant/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QAssistant module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-qt4-core/distinfo
+++ b/devel/py-qt4-core/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/devel/py-qt4-core/files/patch-configure.py
+++ b/devel/py-qt4-core/files/patch-configure.py
@ -1,5 +1,5 @@
--- ./configure.py.orig	2010-10-29 18:43:52.000000000 +0400
-+++ ./configure.py	2010-11-05 13:07:29.388903079 +0300
+--- ./configure.py.orig	2011-01-23 13:08:20.000000000 +0300
+++ ./configure.py	2011-01-30 01:10:04.772362127 +0300
@@ -36,6 +36,10 @@
 
 import sipconfig
@ -10,7 +10,7 @@
 +if freebsd: freebsd_port = os.environ['PYQT4_COMPONENT']
 
 # Initialise the globals.
- pyqt_version = 0x040801
+ pyqt_version = 0x040803
@@ -70,7 +74,6 @@
 dbuslibdirs = []
 dbuslibs = []
@ -19,7 +19,7 @@
 # Under Windows qmake and the Qt DLLs must be into the system PATH otherwise
 # the dynamic linker won't be able to resolve the symbols.  On other systems we
 # assume we can just run qmake by using its full pathname.
-@@ -382,14 +385,23 @@
+@@ -392,14 +395,23 @@
         elif sipcfg.universal:
             sipconfig.inform("QtDesigner module disabled with universal binaries.")
         else:
@ -46,7 +46,7 @@
 
     def code(self):
         cons_xtra_incdirs = []
-@@ -415,6 +427,10 @@
+@@ -425,6 +437,10 @@
             cons_xtra_libs.extend(sp_libs)
 
             generate_code("QtCore")
@ -57,7 +57,7 @@
         else:
             generate_code("QtCore", extra_include_dirs=sp_incdirs,
                         extra_lib_dirs=sp_libdirs, extra_libs=sp_libs)
-@@ -616,19 +632,28 @@
+@@ -626,19 +642,28 @@
             sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins))
 
         # Generate the QScintilla API file.
@ -95,7 +95,7 @@
 
     def _qpy_directories(self, mname, lib_name):
         """Return a 3-tuple of the directories containing the header files, the
-@@ -720,22 +745,28 @@
+@@ -730,22 +755,28 @@
         return libs, libdirs
 
     def module_installs(self):
@ -129,7 +129,7 @@
             qpylibs["QtDesigner"] = "qpydesigner.pro"
 
         # Run qmake to generate the Makefiles.
-@@ -845,30 +876,58 @@
+@@ -859,37 +890,58 @@
         # Create the pyuic4 wrapper.  Use the GUI version on MacOS (so that
         # previews work properly and normal console use will work anyway), but
         # not on Windows (so that normal console use will work).
@ -169,8 +169,12 @@
 -            use_arch = ''
 +            sipconfig.inform("Creating pyuic4 wrapper...")
 
-        uicdir=os.path.join(pyqt_modroot, "uic")
-        wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch)
+-        # The pyuic directory may not exist if we are building away from the
+-        # source directory.
+-        try:
+-            os.mkdir("pyuic")
+-        except OSError:
+-            pass
 +            if sys.platform == 'darwin':
 +                gui = True
 +                use_arch = opts.use_arch
@ -178,10 +182,14 @@
 +                gui = False
 +                use_arch = ''
 
-        sipconfig.inform("Creating pyuic4 Makefile...")
+-        uicdir=os.path.join(pyqt_modroot, "uic")
+-        wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch)
 +            uicdir=os.path.join(pyqt_modroot, "uic")
 +            wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch)
 
+-        sipconfig.inform("Creating pyuic4 Makefile...")
+            sipconfig.inform("Creating pyuic4 Makefile...")
+ 
 -        makefile = sipconfig.PythonModuleMakefile(
 -            configuration=sipcfg,
 -            dstdir=uicdir,
@ -189,10 +197,6 @@
 -            dir="pyuic",
 -            installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
 -        )
-+            sipconfig.inform("Creating pyuic4 Makefile...")
- 
-        makefile.generate()
-        tool.append("pyuic")
 +            makefile = sipconfig.PythonModuleMakefile(
 +                configuration=sipcfg,
 +                dstdir=uicdir,
@ -200,13 +204,15 @@
 +                dir="pyuic",
 +                installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
 +            )
-+
+ 
+-        makefile.generate()
+-        tool.append("pyuic")
 +            makefile.generate()
 +            tool.append("pyuic")
 
         if "QtXml" in pyqt_modules:
             sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -896,7 +955,10 @@
+@@ -918,7 +970,10 @@
             makefile.generate()
             tool.append("pyrcc")
         else:
@ -218,26 +224,26 @@
 
         if opts.designer_plugin and "QtDesigner" in pyqt_modules:
             py_major = sipcfg.py_version >> 16
-@@ -919,11 +981,17 @@
+@@ -944,11 +999,17 @@
                       glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))):
                     lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
-                     link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor)
+                     link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
 +                elif freebsd:
 +                    lib_dir_flag = quote("-L%s/lib" % ducfg["prefix"])
-+                    link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor)
+                    link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
                 else:
                     sipconfig.inform("Qt Designer plugin disabled because Python library is static")
                     opts.designer_plugin = False
 
 -                pysh_lib = ducfg["LDLIBRARY"]
 +                if freebsd:
-+                    pysh_lib = "libpython%d.%d" % (py_major, py_minor)
+                    pysh_lib = "libpython%d.%d%s" % (py_major, py_minor, abi)
 +                else:
 +                    pysh_lib = ducfg["LDLIBRARY"]
 
             if opts.designer_plugin:
                 sipconfig.inform("Creating Qt Designer plugin Makefile...")
-@@ -1017,8 +1085,13 @@
+@@ -1045,8 +1106,13 @@
     sipconfig.inform("The %s Qt libraries are in %s." % (lib_type, qt_libdir))
     sipconfig.inform("The Qt binaries are in %s." % qt_bindir)
     sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
@ -253,7 +259,7 @@
 
     if opts.no_docstrings:
         sipconfig.inform("PyQt is being built without generated docstrings.")
-@@ -1028,18 +1101,36 @@
+@@ -1056,18 +1122,36 @@
     if opts.prot_is_public:
         sipconfig.inform("PyQt is being built with 'protected' redefined as 'public'.")
 
@ -295,7 +301,7 @@
 
     if opts.vendorcheck:
         sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -1520,7 +1611,11 @@
+@@ -1560,7 +1644,11 @@
     of libraries.
     extra_sip_flags is an optional list of additional flags to pass to SIP.
     """
@ -308,7 +314,7 @@
 
     mk_clean_dir(mname)
 
-@@ -1606,7 +1701,11 @@
+@@ -1650,7 +1738,11 @@
         sipconfig.error("Unable to create the C++ code.")
 
     # Generate the Makefile.
@ -321,7 +327,7 @@
 
     installs = []
 
-@@ -2110,6 +2209,10 @@
+@@ -2194,6 +2286,10 @@
         p.print_help()
         sys.exit(2)
 
@ -332,7 +338,7 @@
     sipcfg.set_build_macros(macros)
 
     # Check Qt is what we need.
-@@ -2117,7 +2220,7 @@
+@@ -2201,7 +2297,7 @@
 
     # Check the licenses are compatible.
     check_license()
@ -341,7 +347,7 @@
     # Check which modules to build.
     pyqt.check_modules()
 
-@@ -2139,9 +2242,18 @@
+@@ -2223,9 +2319,18 @@
     installs=[(pyqt.module_installs(), pyqt_modroot)]
 
     if opts.api:
@ -362,7 +368,7 @@
 
     if opts.bigqt:
         xtra_modules.append("_qt")
-@@ -2152,15 +2264,33 @@
+@@ -2236,15 +2341,33 @@
         if opts.mwg_qwt_dir:
             xtra_modules.append("Qwt5")
 
--- a/devel/py-qt4-core/pkg-descr
+++ b/devel/py-qt4-core/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtCore module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-qt4-core/pkg-plist
+++ b/devel/py-qt4-core/pkg-plist
@ -156,6 +156,7 @@ bin/pyuic4
 %%SIP%%share/py-sip/QtCore/qpoint.sip
 %%SIP%%share/py-sip/QtCore/qprocess.sip
 %%SIP%%share/py-sip/QtCore/qpropertyanimation.sip
+%%SIP%%share/py-sip/QtCore/qpynullvariant.sip
 %%SIP%%share/py-sip/QtCore/qreadwritelock.sip
 %%SIP%%share/py-sip/QtCore/qrect.sip
 %%SIP%%share/py-sip/QtCore/qregexp.sip
@ -194,9 +195,9 @@ bin/pyuic4
 %%SIP%%share/py-sip/QtCore/qxmlstream.sip
 %%API%%share/qt4/qsci/api/python/QtCore.api
 %%SIP%%@dirrm share/py-sip/QtCore
-@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins
@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2
@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Loader
@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler
-@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-qt4-dbus/distinfo
+++ b/devel/py-qt4-dbus/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/devel/py-qt4-dbus/pkg-descr
+++ b/devel/py-qt4-dbus/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the D-BUS module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-qt4-declarative/distinfo
+++ b/devel/py-qt4-declarative/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/devel/py-qt4-declarative/pkg-descr
+++ b/devel/py-qt4-declarative/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtDeclarative module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@ -45,10 +45,6 @@ ARGS=		-b ${PREFIX}/bin\
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if ${OSVERSION} < 700000
-BROKEN=		does not build
-.endif
-
 .if defined(WITH_DEBUG)
 ARGS+=		--debug
 .endif
--- a/devel/py-qt4-designer/distinfo
+++ b/devel/py-qt4-designer/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/devel/py-qt4-designer/pkg-descr
+++ b/devel/py-qt4-designer/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtDesigner module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-qt4-designerplugin/distinfo
+++ b/devel/py-qt4-designerplugin/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/devel/py-qt4-designerplugin/pkg-descr
+++ b/devel/py-qt4-designerplugin/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtDesigner plugin.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-qt4-help/distinfo
+++ b/devel/py-qt4-help/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/devel/py-qt4-help/pkg-descr
+++ b/devel/py-qt4-help/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtHelp module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-qt4-qscintilla2/distinfo
+++ b/devel/py-qt4-qscintilla2/distinfo
@ -1,2 +1,2 @@
-SHA256 (QScintilla-gpl-2.4.5.tar.gz) = cd73960e3c93e84b013cd5ec350f4a2810e3b95d9506083acf3608f7ccf43c09
-SIZE (QScintilla-gpl-2.4.5.tar.gz) = 2372380
+SHA256 (QScintilla-gpl-2.4.6.tar.gz) = ad4dcc34922358aab8b0ce643e38e12188b41d00a87513ebfd2d6186c5824eab
+SIZE (QScintilla-gpl-2.4.6.tar.gz) = 2442792
--- a/devel/py-qt4-qscintilla2/pkg-descr
+++ b/devel/py-qt4-qscintilla2/pkg-descr
@ -1,5 +1,5 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the Qsci module for the Qscintilla2 editor component.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
-     http://www.riverbankcomputing.co.uk/qscintilla/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
+	http://www.riverbankcomputing.co.uk/software/qscintilla/
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@ -65,10 +65,6 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not configure on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
--- a/devel/py-qt4-script/distinfo
+++ b/devel/py-qt4-script/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/devel/py-qt4-script/pkg-descr
+++ b/devel/py-qt4-script/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtScript module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@ -66,10 +66,6 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not configure on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
--- a/devel/py-qt4-scripttools/distinfo
+++ b/devel/py-qt4-scripttools/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/devel/py-qt4-scripttools/pkg-descr
+++ b/devel/py-qt4-scripttools/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtScript module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-qt4-test/distinfo
+++ b/devel/py-qt4-test/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/devel/py-qt4-test/pkg-descr
+++ b/devel/py-qt4-test/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QTest module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-qt4/pkg-descr
+++ b/devel/py-qt4/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the PyQt4 metaport.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@ -1,2 +1,2 @@
-SHA256 (sip-4.11.2.tar.gz) = ced00216488aa4dd0728d706a551c36c694a26c95e85103ccc21913a8090373c
-SIZE (sip-4.11.2.tar.gz) = 665000
+SHA256 (sip-4.12.1.tar.gz) = e9d66e8830c2a58e6c17b9952710f67d495ddb84ce6f3d89400c8b52913381b5
+SIZE (sip-4.12.1.tar.gz) = 724028
--- a/devel/py-sip/files/bsd.pyqt.mk
+++ b/devel/py-sip/files/bsd.pyqt.mk
@ -22,15 +22,15 @@ MASTER_SITES_QSCI2=	${MASTER_SITE_RIVERBANK}QScintilla2/ \
 			${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} \
 			${MASTER_SITE_FLUFFY}QScintilla2/

-SIP_VERSION=		4.11.2
+SIP_VERSION=		4.12.1
 #SIP_SNAP=		-snapshot-20100102
 PYQT3_VERSION=		3.18.2
 PYQT3_SNAP=		-snapshot-20091119
-PYQT4_VERSION=		4.8.1
+PYQT4_VERSION=		4.8.3
 #PYQT4_SNAP=		-snapshot-20100110
 PYKDE3_VERSION=		3.16.7
 QSCI1_VERSION=		1.7.1
-QSCI2_VERSION=		2.4.5
+QSCI2_VERSION=		2.4.6
 #QSCI2_SNAP=		-snapshot-20091222

 SIP_DISTNAME=		sip-${SIP_VERSION}${SIP_SNAP}
--- a/devel/qscintilla2-designerplugin/distinfo
+++ b/devel/qscintilla2-designerplugin/distinfo
@ -1,2 +1,2 @@
-SHA256 (QScintilla-gpl-2.4.5.tar.gz) = cd73960e3c93e84b013cd5ec350f4a2810e3b95d9506083acf3608f7ccf43c09
-SIZE (QScintilla-gpl-2.4.5.tar.gz) = 2372380
+SHA256 (QScintilla-gpl-2.4.6.tar.gz) = ad4dcc34922358aab8b0ce643e38e12188b41d00a87513ebfd2d6186c5824eab
+SIZE (QScintilla-gpl-2.4.6.tar.gz) = 2442792
--- a/devel/qscintilla2-designerplugin/pkg-descr
+++ b/devel/qscintilla2-designerplugin/pkg-descr
@ -1,4 +1,4 @@
 The Qt Designer plugin allows QScintilla2 instances to be included in GUI
 designs just like any other Qt4 widget.

-WWW: http://www.riverbankcomputing.co.uk/qscintilla/
+WWW:	http://www.riverbankcomputing.co.uk/software/qscintilla/
--- a/devel/qscintilla2/Makefile
+++ b/devel/qscintilla2/Makefile
@ -26,6 +26,9 @@ INSTALL_WRKSRC=		${BUILD_WRKSRC}

 QMAKE_ARGS=	-unix PREFIX=${PREFIX}

+PORTDOCS=	*
+PORTEXAMPLES=	*
+
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

@ -50,7 +53,7 @@ post-patch:

 do-configure:
 	cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKE_ARGS} qscintilla.pro
+		${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} qscintilla.pro

 post-configure:
 	${REINPLACE_CMD} -e \
--- a/devel/qscintilla2/distinfo
+++ b/devel/qscintilla2/distinfo
@ -1,2 +1,2 @@
-SHA256 (QScintilla-gpl-2.4.5.tar.gz) = cd73960e3c93e84b013cd5ec350f4a2810e3b95d9506083acf3608f7ccf43c09
-SIZE (QScintilla-gpl-2.4.5.tar.gz) = 2372380
+SHA256 (QScintilla-gpl-2.4.6.tar.gz) = ad4dcc34922358aab8b0ce643e38e12188b41d00a87513ebfd2d6186c5824eab
+SIZE (QScintilla-gpl-2.4.6.tar.gz) = 2442792
--- a/devel/qscintilla2/pkg-descr
+++ b/devel/qscintilla2/pkg-descr
@ -1,3 +1,3 @@
 QScintilla2 is a port to Qt4 of Neil Hodgson's Scintilla C++ editor class.

-WWW: http://www.riverbankcomputing.co.uk/qscintilla/
+WWW:	http://www.riverbankcomputing.co.uk/software/qscintilla/
--- a/devel/qscintilla2/pkg-plist
+++ b/devel/qscintilla2/pkg-plist
@ -45,216 +45,12 @@
 %%QT_INCDIR_REL%%/Qsci/qscistyledtext.h
 %%QT_LIBDIR_REL%%/libqscintilla2.so
 %%QT_LIBDIR_REL%%/libqscintilla2.so.5
-%%QT_LIBDIR_REL%%/libqscintilla2.so.5.4
-%%QT_LIBDIR_REL%%/libqscintilla2.so.5.4.1
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/Design.html
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/Icons.html
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/Lexer.txt
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/SciBreak.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/SciCoding.html
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/SciRest.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/SciTEIco.png
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/SciWord.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/ScintillaDoc.html
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/ScintillaDownload.html
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/ScintillaHistory.html
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/ScintillaRelated.html
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/ScintillaToDo.html
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/ScintillaUsage.html
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/Steps.html
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/annotations.png
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/index.html
-%%PORTDOCS%%%%DOCSDIR%%/Scintilla/styledmargin.png
-%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciAPIs-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciAPIs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciAbstractAPIs-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciAbstractAPIs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciCommand-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciCommand.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciCommandSet-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciCommandSet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciDocument-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciDocument.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexer-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerBash-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerBash.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerBatch-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerBatch.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCMake-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCMake.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCPP-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCPP.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCSS-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCSS.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCSharp-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCSharp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCustom-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCustom.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerD-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerD.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerDiff-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerDiff.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerFortran-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerFortran.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerFortran77-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerFortran77.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerHTML-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerHTML.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerIDL-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerIDL.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerJava-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerJava.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerJavaScript-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerJavaScript.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerLua-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerLua.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerMakefile-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerMakefile.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPOV-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPOV.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPascal-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPascal.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPerl-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPerl.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPostScript-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPostScript.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerProperties-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerProperties.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPython-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPython.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerRuby-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerRuby.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSQL-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSQL.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSpice-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSpice.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTCL-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTCL.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTeX-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTeX.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVHDL-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVHDL.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVerilog-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVerilog.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerXML-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerXML.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerYAML-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerYAML.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciMacro-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciMacro.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciPrinter-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciPrinter.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintilla-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintilla.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintillaBase-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintillaBase.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyle-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyle.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyledText-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyledText.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_932a03c217234c6de0e43dd88967b856.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_f096b17edcc96dd7c2d14ba22ae31afc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dirs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x62.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x6a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x6b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x71.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x75.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x76.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x77.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x78.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x7a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_0x7e.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_enum.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x62.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x6a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x6b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x71.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x75.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x76.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x77.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval_0x78.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x62.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x6b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x71.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x75.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x76.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x77.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x7a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_func_0x7e.html
-%%PORTDOCS%%%%DOCSDIR%%/html/hierarchy.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_r.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/tabs.css
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/application.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/application.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/copy.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/cut.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/new.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/open.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/paste.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/save.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindow.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindow.h
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.5
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.5.0
 share/qt4/qsci/api/python/Python-2.4.api
 share/qt4/qsci/api/python/Python-2.5.api
 share/qt4/qsci/api/python/Python-2.6.api
+share/qt4/qsci/api/python/Python-2.7.api
 share/qt4/qsci/api/python/Python-3.1.api
 %%NLS%%share/qt4/translations/qscintilla_cs.qm
 %%NLS%%share/qt4/translations/qscintilla_de.qm
@ -267,11 +63,6 @@ share/qt4/qsci/api/python/Python-3.1.api
@dirrmtry share/qt4/qsci/api
@dirrmtry share/qt4/qsci
@dirrmtry share/qt4
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Scintilla
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry %%QT_LIBDIR_REL%%
@dirrm %%QT_INCDIR_REL%%/Qsci
@dirrmtry %%QT_INCDIR_REL%%
--- a/graphics/py-qt4-svg/distinfo
+++ b/graphics/py-qt4-svg/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/graphics/py-qt4-svg/pkg-descr
+++ b/graphics/py-qt4-svg/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtSvg module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/misc/py-qt4-demo/distinfo
+++ b/misc/py-qt4-demo/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/misc/py-qt4-demo/pkg-descr
+++ b/misc/py-qt4-demo/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the PyQt4 demo and examples.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/misc/py-qt4-demo/pkg-plist
+++ b/misc/py-qt4-demo/pkg-plist
@ -226,6 +226,50 @@
 %%EXAMPLESDIR%%/demos/qtdemo/textbutton.py
 %%EXAMPLESDIR%%/demos/qtdemo/textbutton.pyc
 %%EXAMPLESDIR%%/demos/qtdemo/xml/examples.xml
+%%EXAMPLESDIR%%/demos/textedit/example.html
+%%EXAMPLESDIR%%/demos/textedit/images/logo.png
+%%EXAMPLESDIR%%/demos/textedit/images/logo32.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/editcopy.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/editcut.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/editpaste.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/editredo.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/editundo.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/exportpdf.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/filenew.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/fileopen.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/fileprint.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/filesave.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/textbold.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/textcenter.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/textitalic.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/textjustify.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/textleft.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/textright.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/textunder.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/zoomin.png
+%%EXAMPLESDIR%%/demos/textedit/images/mac/zoomout.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/editcopy.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/editcut.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/editpaste.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/editredo.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/editundo.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/exportpdf.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/filenew.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/fileopen.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/fileprint.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/filesave.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/textbold.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/textcenter.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/textitalic.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/textjustify.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/textleft.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/textright.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/textunder.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/zoomin.png
+%%EXAMPLESDIR%%/demos/textedit/images/win/zoomout.png
+%%EXAMPLESDIR%%/demos/textedit/textedit.py
+%%EXAMPLESDIR%%/demos/textedit/textedit.pyc
+%%EXAMPLESDIR%%/demos/textedit/textedit.qrc
 %%EXAMPLESDIR%%/designer/README
 %%EXAMPLESDIR%%/designer/calculatorform/calculatorform.py
 %%EXAMPLESDIR%%/designer/calculatorform/calculatorform.pyc
@ -385,6 +429,18 @@
 %%EXAMPLESDIR%%/graphicsview/padnavigator/padnavigator.qrc
 %%EXAMPLESDIR%%/graphicsview/padnavigator/ui_backside.py
 %%EXAMPLESDIR%%/graphicsview/padnavigator/ui_backside.pyc
+%%EXAMPLESDIR%%/ipc/README
+%%EXAMPLESDIR%%/ipc/localfortuneclient.py
+%%EXAMPLESDIR%%/ipc/localfortuneclient.pyc
+%%EXAMPLESDIR%%/ipc/localfortuneserver.py
+%%EXAMPLESDIR%%/ipc/localfortuneserver.pyc
+%%EXAMPLESDIR%%/ipc/sharedmemory/dialog.py
+%%EXAMPLESDIR%%/ipc/sharedmemory/dialog.pyc
+%%EXAMPLESDIR%%/ipc/sharedmemory/dialog.ui
+%%EXAMPLESDIR%%/ipc/sharedmemory/image.png
+%%EXAMPLESDIR%%/ipc/sharedmemory/qt.png
+%%EXAMPLESDIR%%/ipc/sharedmemory/sharedmemory.py
+%%EXAMPLESDIR%%/ipc/sharedmemory/sharedmemory.pyc
 %%EXAMPLESDIR%%/itemviews/README
 %%EXAMPLESDIR%%/itemviews/basicsortfiltermodel.py
 %%EXAMPLESDIR%%/itemviews/basicsortfiltermodel.pyc
@ -393,6 +449,12 @@
 %%EXAMPLESDIR%%/itemviews/chart/chart.qrc
 %%EXAMPLESDIR%%/itemviews/chart/mydata.cht
 %%EXAMPLESDIR%%/itemviews/chart/qtdata.cht
+%%EXAMPLESDIR%%/itemviews/coloreditorfactory.py
+%%EXAMPLESDIR%%/itemviews/coloreditorfactory.pyc
+%%EXAMPLESDIR%%/itemviews/combowidgetmapper.py
+%%EXAMPLESDIR%%/itemviews/combowidgetmapper.pyc
+%%EXAMPLESDIR%%/itemviews/customsortfiltermodel.py
+%%EXAMPLESDIR%%/itemviews/customsortfiltermodel.pyc
 %%EXAMPLESDIR%%/itemviews/dirview.py
 %%EXAMPLESDIR%%/itemviews/dirview.pyc
 %%EXAMPLESDIR%%/itemviews/editabletreemodel/default.txt
@ -418,6 +480,8 @@
 %%EXAMPLESDIR%%/itemviews/simpletreemodel/simpletreemodel.py
 %%EXAMPLESDIR%%/itemviews/simpletreemodel/simpletreemodel.pyc
 %%EXAMPLESDIR%%/itemviews/simpletreemodel/simpletreemodel.qrc
+%%EXAMPLESDIR%%/itemviews/simplewidgetmapper.py
+%%EXAMPLESDIR%%/itemviews/simplewidgetmapper.pyc
 %%EXAMPLESDIR%%/itemviews/spinboxdelegate.py
 %%EXAMPLESDIR%%/itemviews/spinboxdelegate.pyc
 %%EXAMPLESDIR%%/itemviews/stardelegate.py
@ -638,11 +702,46 @@
 %%EXAMPLESDIR%%/tutorials/addressbook/part6.pyc
 %%EXAMPLESDIR%%/tutorials/addressbook/part7.py
 %%EXAMPLESDIR%%/tutorials/addressbook/part7.pyc
+%%EXAMPLESDIR%%/webkit/domtraversal/domtraversal.py
+%%EXAMPLESDIR%%/webkit/domtraversal/domtraversal.pyc
+%%EXAMPLESDIR%%/webkit/domtraversal/ui_window.py
+%%EXAMPLESDIR%%/webkit/domtraversal/ui_window.pyc
+%%EXAMPLESDIR%%/webkit/domtraversal/window.ui
+%%EXAMPLESDIR%%/webkit/fancybrowser/fancybrowser.py
+%%EXAMPLESDIR%%/webkit/fancybrowser/fancybrowser.pyc
+%%EXAMPLESDIR%%/webkit/fancybrowser/jquery.min.js
+%%EXAMPLESDIR%%/webkit/fancybrowser/jquery.qrc
+%%EXAMPLESDIR%%/webkit/formextractor/form.html
+%%EXAMPLESDIR%%/webkit/formextractor/formextractor.py
+%%EXAMPLESDIR%%/webkit/formextractor/formextractor.pyc
+%%EXAMPLESDIR%%/webkit/formextractor/formextractor.qrc
+%%EXAMPLESDIR%%/webkit/formextractor/formextractor.ui
+%%EXAMPLESDIR%%/webkit/formextractor/ui_formextractor.py
+%%EXAMPLESDIR%%/webkit/formextractor/ui_formextractor.pyc
+%%EXAMPLESDIR%%/webkit/framecapture.py
+%%EXAMPLESDIR%%/webkit/framecapture.pyc
+%%EXAMPLESDIR%%/webkit/googlechat/form.ui
+%%EXAMPLESDIR%%/webkit/googlechat/googlechat.py
+%%EXAMPLESDIR%%/webkit/googlechat/googlechat.pyc
+%%EXAMPLESDIR%%/webkit/googlechat/ui_form.py
+%%EXAMPLESDIR%%/webkit/googlechat/ui_form.pyc
+%%EXAMPLESDIR%%/webkit/previewer/previewer.py
+%%EXAMPLESDIR%%/webkit/previewer/previewer.pyc
+%%EXAMPLESDIR%%/webkit/previewer/previewer.ui
+%%EXAMPLESDIR%%/webkit/previewer/ui_previewer.py
+%%EXAMPLESDIR%%/webkit/previewer/ui_previewer.pyc
+%%EXAMPLESDIR%%/webkit/simpleselector/simpleselector.py
+%%EXAMPLESDIR%%/webkit/simpleselector/simpleselector.pyc
+%%EXAMPLESDIR%%/webkit/simpleselector/ui_window.py
+%%EXAMPLESDIR%%/webkit/simpleselector/ui_window.pyc
+%%EXAMPLESDIR%%/webkit/simpleselector/window.ui
 %%EXAMPLESDIR%%/widgets/README
 %%EXAMPLESDIR%%/widgets/analogclock.py
 %%EXAMPLESDIR%%/widgets/analogclock.pyc
 %%EXAMPLESDIR%%/widgets/calculator.py
 %%EXAMPLESDIR%%/widgets/calculator.pyc
+%%EXAMPLESDIR%%/widgets/calendarwidget.py
+%%EXAMPLESDIR%%/widgets/calendarwidget.pyc
 %%EXAMPLESDIR%%/widgets/charactermap.py
 %%EXAMPLESDIR%%/widgets/charactermap.pyc
 %%EXAMPLESDIR%%/widgets/digitalclock.py
@ -682,6 +781,50 @@
 %%EXAMPLESDIR%%/widgets/spinboxes.pyc
 %%EXAMPLESDIR%%/widgets/styles.py
 %%EXAMPLESDIR%%/widgets/styles.pyc
+%%EXAMPLESDIR%%/widgets/stylesheet/images/checkbox_checked.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/checkbox_checked_hover.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/checkbox_checked_pressed.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/checkbox_unchecked.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/checkbox_unchecked_hover.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/checkbox_unchecked_pressed.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/down_arrow.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/down_arrow_disabled.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/frame.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/pagefold.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/pushbutton.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/pushbutton_hover.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/pushbutton_pressed.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/radiobutton_checked.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/radiobutton_checked_hover.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/radiobutton_checked_pressed.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/radiobutton_unchecked.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/radiobutton_unchecked_hover.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/radiobutton_unchecked_pressed.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/sizegrip.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/spindown.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/spindown_hover.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/spindown_off.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/spindown_pressed.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/spinup.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/spinup_hover.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/spinup_off.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/spinup_pressed.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/up_arrow.png
+%%EXAMPLESDIR%%/widgets/stylesheet/images/up_arrow_disabled.png
+%%EXAMPLESDIR%%/widgets/stylesheet/mainwindow.ui
+%%EXAMPLESDIR%%/widgets/stylesheet/qss/coffee.qss
+%%EXAMPLESDIR%%/widgets/stylesheet/qss/default.qss
+%%EXAMPLESDIR%%/widgets/stylesheet/qss/pagefold.qss
+%%EXAMPLESDIR%%/widgets/stylesheet/stylesheet.py
+%%EXAMPLESDIR%%/widgets/stylesheet/stylesheet.pyc
+%%EXAMPLESDIR%%/widgets/stylesheet/stylesheet.qrc
+%%EXAMPLESDIR%%/widgets/stylesheet/stylesheeteditor.py
+%%EXAMPLESDIR%%/widgets/stylesheet/stylesheeteditor.pyc
+%%EXAMPLESDIR%%/widgets/stylesheet/stylesheeteditor.ui
+%%EXAMPLESDIR%%/widgets/stylesheet/ui_mainwindow.py
+%%EXAMPLESDIR%%/widgets/stylesheet/ui_mainwindow.pyc
+%%EXAMPLESDIR%%/widgets/stylesheet/ui_stylesheeteditor.py
+%%EXAMPLESDIR%%/widgets/stylesheet/ui_stylesheeteditor.pyc
 %%EXAMPLESDIR%%/widgets/tetrix.py
 %%EXAMPLESDIR%%/widgets/tetrix.pyc
 %%EXAMPLESDIR%%/widgets/tooltips/images/circle.png
@ -727,10 +870,20 @@
@dirrm %%EXAMPLESDIR%%/xml
@dirrm %%EXAMPLESDIR%%/widgets/tooltips/images
@dirrm %%EXAMPLESDIR%%/widgets/tooltips
+@dirrm %%EXAMPLESDIR%%/widgets/stylesheet/qss
+@dirrm %%EXAMPLESDIR%%/widgets/stylesheet/images
+@dirrm %%EXAMPLESDIR%%/widgets/stylesheet
@dirrm %%EXAMPLESDIR%%/widgets/movie
@dirrm %%EXAMPLESDIR%%/widgets/icons/images
@dirrm %%EXAMPLESDIR%%/widgets/icons
@dirrm %%EXAMPLESDIR%%/widgets
+@dirrm %%EXAMPLESDIR%%/webkit/simpleselector
+@dirrm %%EXAMPLESDIR%%/webkit/previewer
+@dirrm %%EXAMPLESDIR%%/webkit/googlechat
+@dirrm %%EXAMPLESDIR%%/webkit/formextractor
+@dirrm %%EXAMPLESDIR%%/webkit/fancybrowser
+@dirrm %%EXAMPLESDIR%%/webkit/domtraversal
+@dirrm %%EXAMPLESDIR%%/webkit
@dirrm %%EXAMPLESDIR%%/tutorials/addressbook
@dirrm %%EXAMPLESDIR%%/tutorials
@dirrm %%EXAMPLESDIR%%/tools/settingseditor/inifiles
@ -777,6 +930,8 @@
@dirrm %%EXAMPLESDIR%%/itemviews/editabletreemodel
@dirrm %%EXAMPLESDIR%%/itemviews/chart
@dirrm %%EXAMPLESDIR%%/itemviews
+@dirrm %%EXAMPLESDIR%%/ipc/sharedmemory
+@dirrm %%EXAMPLESDIR%%/ipc
@dirrm %%EXAMPLESDIR%%/graphicsview/padnavigator/images
@dirrm %%EXAMPLESDIR%%/graphicsview/padnavigator
@dirrm %%EXAMPLESDIR%%/graphicsview/dragdroprobot/images
@ -808,6 +963,10 @@
@dirrm %%EXAMPLESDIR%%/designer/plugins
@dirrm %%EXAMPLESDIR%%/designer/calculatorform
@dirrm %%EXAMPLESDIR%%/designer
+@dirrm %%EXAMPLESDIR%%/demos/textedit/images/win
+@dirrm %%EXAMPLESDIR%%/demos/textedit/images/mac
+@dirrm %%EXAMPLESDIR%%/demos/textedit/images
+@dirrm %%EXAMPLESDIR%%/demos/textedit
@dirrm %%EXAMPLESDIR%%/demos/qtdemo/xml
@dirrm %%EXAMPLESDIR%%/demos/qtdemo/images
@dirrm %%EXAMPLESDIR%%/demos/qtdemo
--- a/misc/py-qt4-doc/Makefile
+++ b/misc/py-qt4-doc/Makefile
@ -28,7 +28,7 @@ do-install:
 				LICENSE.GPL2 LICENSE.GPL3\
 				OPENSOURCE-NOTICE.TXT README THANKS\
 			${DOCSDIR}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR}

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.mk>
--- a/misc/py-qt4-doc/distinfo
+++ b/misc/py-qt4-doc/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/misc/py-qt4-doc/pkg-descr
+++ b/misc/py-qt4-doc/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the PyQt4 documentation.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/misc/py-qt4-doc/pkg-plist
+++ b/misc/py-qt4-doc/pkg-plist
@ -6,8 +6,51 @@
 %%DOCSDIR%%/OPENSOURCE-NOTICE.TXT
 %%DOCSDIR%%/README
 %%DOCSDIR%%/THANKS
+%%DOCSDIR%%/html/_sources/buffer_interface.txt
+%%DOCSDIR%%/html/_sources/build_system.txt
+%%DOCSDIR%%/html/_sources/dbus.txt
+%%DOCSDIR%%/html/_sources/deploy_commercial.txt
+%%DOCSDIR%%/html/_sources/designer.txt
+%%DOCSDIR%%/html/_sources/gotchas.txt
+%%DOCSDIR%%/html/_sources/i18n.txt
+%%DOCSDIR%%/html/_sources/incompatibilities.txt
+%%DOCSDIR%%/html/_sources/incompatible_apis.txt
+%%DOCSDIR%%/html/_sources/index.txt
+%%DOCSDIR%%/html/_sources/installation.txt
+%%DOCSDIR%%/html/_sources/introduction.txt
+%%DOCSDIR%%/html/_sources/keyword_arguments.txt
+%%DOCSDIR%%/html/_sources/new_style_signals_slots.txt
+%%DOCSDIR%%/html/_sources/old_style_signals_slots.txt
+%%DOCSDIR%%/html/_sources/pickle.txt
+%%DOCSDIR%%/html/_sources/python_shell.txt
+%%DOCSDIR%%/html/_sources/python_v3.txt
+%%DOCSDIR%%/html/_sources/qml.txt
+%%DOCSDIR%%/html/_sources/qsettings.txt
+%%DOCSDIR%%/html/_sources/qt_properties.txt
+%%DOCSDIR%%/html/_sources/qvariant.txt
+%%DOCSDIR%%/html/_sources/resources.txt
+%%DOCSDIR%%/html/_sources/webkit.txt
+%%DOCSDIR%%/html/_static/basic.css
+%%DOCSDIR%%/html/_static/default.css
+%%DOCSDIR%%/html/_static/doctools.js
+%%DOCSDIR%%/html/_static/file.png
+%%DOCSDIR%%/html/_static/jquery.js
+%%DOCSDIR%%/html/_static/logo.png
+%%DOCSDIR%%/html/_static/logo_tn.ico
+%%DOCSDIR%%/html/_static/minus.png
+%%DOCSDIR%%/html/_static/plus.png
+%%DOCSDIR%%/html/_static/pygments.css
+%%DOCSDIR%%/html/_static/searchtools.js
 %%DOCSDIR%%/html/assistant-manual.html
+%%DOCSDIR%%/html/buffer_interface.html
+%%DOCSDIR%%/html/build_system.html
 %%DOCSDIR%%/html/classes.html
+%%DOCSDIR%%/html/dbus.html
+%%DOCSDIR%%/html/deploy_commercial.html
+%%DOCSDIR%%/html/designer.html
+%%DOCSDIR%%/html/genindex.html
+%%DOCSDIR%%/html/gotchas.html
+%%DOCSDIR%%/html/i18n.html
 %%DOCSDIR%%/html/images/alphafill.png
 %%DOCSDIR%%/html/images/assistant-toolbar.png
 %%DOCSDIR%%/html/images/bearings.png
@ -385,7 +428,17 @@
 %%DOCSDIR%%/html/images/windowsxp-tabwidget.png
 %%DOCSDIR%%/html/images/windowsxp-timeedit.png
 %%DOCSDIR%%/html/images/windowsxp-treeview.png
+%%DOCSDIR%%/html/incompatibilities.html
+%%DOCSDIR%%/html/incompatible_apis.html
+%%DOCSDIR%%/html/index.html
+%%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
+%%DOCSDIR%%/html/old_style_signals_slots.html
 %%DOCSDIR%%/html/phonon-abstractaudiooutput.html
 %%DOCSDIR%%/html/phonon-abstractvideooutput.html
 %%DOCSDIR%%/html/phonon-audiocapturedevice.html
@ -414,6 +467,9 @@
 %%DOCSDIR%%/html/phonon-videowidget.html
 %%DOCSDIR%%/html/phonon-volumeslider.html
 %%DOCSDIR%%/html/phonon.html
+%%DOCSDIR%%/html/pickle.html
+%%DOCSDIR%%/html/python_shell.html
+%%DOCSDIR%%/html/python_v3.html
 %%DOCSDIR%%/html/qabstractanimation.html
 %%DOCSDIR%%/html/qabstractbutton.html
 %%DOCSDIR%%/html/qabstracteventdispatcher.html
@ -775,6 +831,7 @@
 %%DOCSDIR%%/html/qmetatype.html
 %%DOCSDIR%%/html/qmimedata.html
 %%DOCSDIR%%/html/qmimesource.html
+%%DOCSDIR%%/html/qml.html
 %%DOCSDIR%%/html/qmodelindex.html
 %%DOCSDIR%%/html/qmouseevent.html
 %%DOCSDIR%%/html/qmouseeventtransition.html
@ -858,6 +915,7 @@
 %%DOCSDIR%%/html/qpydesignermembersheetextension.html
 %%DOCSDIR%%/html/qpydesignerpropertysheetextension.html
 %%DOCSDIR%%/html/qpydesignertaskmenuextension.html
+%%DOCSDIR%%/html/qpynullvariant.html
 %%DOCSDIR%%/html/qpytextobject.html
 %%DOCSDIR%%/html/qquaternion.html
 %%DOCSDIR%%/html/qradialgradient.html
@ -1033,6 +1091,7 @@
 %%DOCSDIR%%/html/qt-windowflags.html
 %%DOCSDIR%%/html/qt-windowstates.html
 %%DOCSDIR%%/html/qt.html
+%%DOCSDIR%%/html/qt_properties.html
 %%DOCSDIR%%/html/qtabbar.html
 %%DOCSDIR%%/html/qtabletevent.html
 %%DOCSDIR%%/html/qtableview.html
@ -1226,9 +1285,13 @@
 %%DOCSDIR%%/html/qxmlstreamnotationdeclaration.html
 %%DOCSDIR%%/html/qxmlstreamreader.html
 %%DOCSDIR%%/html/qxmlstreamwriter.html
+%%DOCSDIR%%/html/resources.html
+%%DOCSDIR%%/html/search.html
+%%DOCSDIR%%/html/searchindex.js
 %%DOCSDIR%%/html/threads.html
-%%DOCSDIR%%/pyqt4ref.html
-%%DOCSDIR%%/pyqt4ref.txt
+%%DOCSDIR%%/html/webkit.html
@dirrm %%DOCSDIR%%/html/images
+@dirrm %%DOCSDIR%%/html/_static
+@dirrm %%DOCSDIR%%/html/_sources
@dirrm %%DOCSDIR%%/html
@dirrm %%DOCSDIR%%
--- a/multimedia/py-qt4-multimedia/distinfo
+++ b/multimedia/py-qt4-multimedia/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/multimedia/py-qt4-multimedia/pkg-descr
+++ b/multimedia/py-qt4-multimedia/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtMultimedia module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@ -65,10 +65,6 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not configure on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
--- a/multimedia/py-qt4-phonon/distinfo
+++ b/multimedia/py-qt4-phonon/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/multimedia/py-qt4-phonon/pkg-descr
+++ b/multimedia/py-qt4-phonon/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the Phonon module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@ -65,10 +65,6 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not configure on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
--- a/net/py-qt4-network/distinfo
+++ b/net/py-qt4-network/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/net/py-qt4-network/pkg-descr
+++ b/net/py-qt4-network/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtNetwork module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@ -65,10 +65,6 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not configure on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
--- a/textproc/py-qt4-xml/distinfo
+++ b/textproc/py-qt4-xml/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/textproc/py-qt4-xml/pkg-descr
+++ b/textproc/py-qt4-xml/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtXml module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/textproc/py-qt4-xmlpatterns/distinfo
+++ b/textproc/py-qt4-xmlpatterns/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/textproc/py-qt4-xmlpatterns/pkg-descr
+++ b/textproc/py-qt4-xmlpatterns/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtXmlPatterns module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/www/py-qt4-webkit/distinfo
+++ b/www/py-qt4-webkit/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/www/py-qt4-webkit/pkg-descr
+++ b/www/py-qt4-webkit/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtWebKit module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@ -66,14 +66,10 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

-.if ${ARCH} == "sparc64" && ${OSVERSION} >= 700000
+.if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not configure on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
--- a/x11-toolkits/py-qt4-gui/distinfo
+++ b/x11-toolkits/py-qt4-gui/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/x11-toolkits/py-qt4-gui/pkg-descr
+++ b/x11-toolkits/py-qt4-gui/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtGui module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
--- a/x11/py-qt4-opengl/distinfo
+++ b/x11/py-qt4-opengl/distinfo
@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
-SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
+SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
+SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929
--- a/x11/py-qt4-opengl/pkg-descr
+++ b/x11/py-qt4-opengl/pkg-descr
@ -1,4 +1,4 @@
 PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
 This package provides the QtOpenGL module.

-WWW: http://www.riverbankcomputing.co.uk/pyqt/
+WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/