- Update py-qt4 to py-qt4.5.4

- Update qscintilla-2* to 2.4 - Update py-sip to 4.8.2 - Update py-kde to 1.16.3 - Update py-qt to 1.18.1 The KDE FreeBSD team would like to say thanks to all the helpers and submitters New Port: devel/py-qt4-scripttools
svn path=/head/; revision=238899
2025-07-18 01:39:16 -04:00 · 2009-08-04 19:18:49 +00:00 · 2009-08-04 19:18:49 +00:00 · f037f3f08c · 2021-03-31 03:12:20 +00:00
commit f037f3f08c
parent dfffa548f0
45 changed files with 437 additions and 257 deletions
--- a/databases/py-qt4-sql/distinfo
+++ b/databases/py-qt4-sql/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/devel/Makefile
+++ b/devel/Makefile
@ -2448,6 +2448,7 @@
    SUBDIR += py-qt4-help
    SUBDIR += py-qt4-qscintilla2
    SUBDIR += py-qt4-script
+    SUBDIR += py-qt4-scripttools
    SUBDIR += py-qt4-test
    SUBDIR += py-rbtree
    SUBDIR += py-repl
--- a/devel/py-qt4-assistant/distinfo
+++ b/devel/py-qt4-assistant/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	core
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -22,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build
+QT_COMPONENTS=	corelib qmake_build moc_build

 OPTIONS=	API		"Install QtCore API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@ -65,6 +64,9 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

+post-extract:
+	rm -rf ${WRKSRC}/pyuic/uic/port_v3
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
--- a/devel/py-qt4-core/distinfo
+++ b/devel/py-qt4-core/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/devel/py-qt4-core/files/patch-configure.py
+++ b/devel/py-qt4-core/files/patch-configure.py
@ -1,6 +1,6 @@
--- configure.py.orig	2008-11-08 21:55:49.000000000 +1000
-+++ configure.py	2009-01-03 23:09:03.000000000 +1000
-@@ -42,6 +42,10 @@
+--- configure.py.orig	2009-07-15 00:31:43.000000000 +1100
+++ configure.py	2009-07-21 16:44:53.000000000 +1100
+@@ -41,6 +41,10 @@
 
 import sipconfig
 
@ -10,7 +10,7 @@
 +if freebsd: freebsd_port = os.environ['PYQT4_COMPONENT']
 
 # Initialise the globals.
- pyqt_version = 0x040404
+ pyqt_version = 0x040502
@@ -74,7 +78,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.
-@@ -310,14 +313,23 @@
+@@ -347,14 +350,23 @@
         elif sipcfg.universal:
             sipconfig.inform("QtDesigner module disabled with universal binaries.")
         else:
@ -46,7 +46,7 @@
 
     def code(self):
         cons_xtra_incdirs = []
-@@ -338,6 +350,10 @@
+@@ -380,6 +392,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)
-@@ -521,19 +537,28 @@
+@@ -565,19 +581,28 @@
             sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins))
 
         # Generate the QScintilla API file.
@ -93,9 +93,9 @@
 +
 +            f.close()
 
-     def _static_plugins(self, mname):
-         """Return a tuple of the libraries (in platform neutral format) and the
-@@ -604,7 +629,13 @@
+     def _qpy_directories(self, mname):
+         """Return a tuple of the directories containing the header files and
+@@ -666,19 +691,25 @@
         return libs, libdirs
 
     def module_installs(self):
@ -108,9 +108,24 @@
 +        else:
 +            return ["__init__.py", "pyqtconfig.py"]
 
-     def qpylibs(self):
-         # See which QPy libraries to build.
-@@ -690,23 +721,43 @@
+     def qpy_libs(self):
+         # See which QPy support libraries to build.
+         qpylibs = {}
+ 
+-        if "QtCore" in pyqt_modules:
+        if freebsd_port == 'core':
+             qpylibs["QtCore"] = "qpycore.pro"
+ 
+-        if "QtGui" in pyqt_modules:
+        if freebsd_port == 'gui':
+             qpylibs["QtGui"] = "qpygui.pro"
+ 
+-        if "QtDesigner" in pyqt_modules:
+        if freebsd_port == 'designer':
+             qpylibs["QtDesigner"] = "qpydesigner.pro"
+ 
+         # Run qmake to generate the Makefiles.
+@@ -780,23 +811,43 @@
         # 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).
@ -167,7 +182,7 @@
 
         if "QtXml" in pyqt_modules:
             sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -743,7 +794,10 @@
+@@ -822,7 +873,10 @@
             makefile.generate()
             tool.append("pyrcc")
         else:
@ -179,7 +194,7 @@
 
         if opts.designer_plugin and "QtDesigner" in pyqt_modules:
             py_major = sipcfg.py_version >> 16
-@@ -766,11 +820,17 @@
+@@ -845,11 +899,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)
@ -198,11 +213,11 @@
 
             if opts.designer_plugin:
                 sipconfig.inform("Creating Qt Designer plugin Makefile...")
-@@ -839,21 +899,44 @@
+@@ -921,21 +981,44 @@
     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)
-    sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
+-    sipconfig.inform("These PyQt modules will be built: %s." % ", ".join(pyqt_modules))
 -    sipconfig.inform("The PyQt Python package will be installed in %s." % opts.pyqtmoddir)
 -
 -    if opts.designer_plugin:
@ -251,7 +266,7 @@
 
     if opts.vendorcheck:
         sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -1253,7 +1336,11 @@
+@@ -1341,7 +1424,11 @@
     of libraries.
     extra_sip_flags is an optional list of additional flags to pass to SIP.
     """
@ -264,7 +279,7 @@
 
     mk_clean_dir(mname)
 
-@@ -1325,7 +1412,11 @@
+@@ -1413,7 +1500,11 @@
         sipconfig.error("Unable to create the C++ code.")
 
     # Generate the Makefile.
@ -277,7 +292,7 @@
 
     installs = []
 
-@@ -1764,6 +1855,10 @@
+@@ -1868,6 +1959,10 @@
         p.print_help()
         sys.exit(2)
 
@ -288,7 +303,7 @@
     sipcfg.set_build_macros(macros)
 
     # Check Qt is what we need.
-@@ -1771,7 +1866,7 @@
+@@ -1875,7 +1970,7 @@
 
     # Check the licenses are compatible.
     check_license()
@ -297,7 +312,7 @@
     # Check which modules to build.
     pyqt.check_modules()
 
-@@ -1793,9 +1888,18 @@
+@@ -1897,9 +1992,18 @@
     installs=[(pyqt.module_installs(), pyqt_modroot)]
 
     if opts.api:
@ -318,26 +333,28 @@
 
     if opts.bigqt:
         xtra_modules.append("_qt")
-@@ -1806,14 +1910,31 @@
+@@ -1910,14 +2014,33 @@
         if opts.mwg_qwt_dir:
             xtra_modules.append("Qwt5")
 
 +    if freebsd:
 +        if freebsd_port == 'dbus':
 +            s = pyqt.tools()
-+        elif freebsd_port == 'designer':
-+            s = pyqt.qpylibs() + [pyqt_modules[-1]]
+        elif freebsd_port in ('designer', 'gui'):
+            s = pyqt.qpy_libs() + [pyqt_modules[-1]]
 +        elif freebsd_port == 'designerplugin':
 +            s = pyqt.tools()
+        elif freebsd_port == 'xml':
+            s = [pyqt_modules[-1]] + pyqt.tools()
 +        else:
 +            s = [pyqt_modules[-1]]
-+            if freebsd_port in ('core', 'xml'):
-+                s += pyqt.tools()
-+    else: s = pyqt.qpylibs() + pyqt_modules + xtra_modules + pyqt.tools()
+            if freebsd_port == 'core':
+                s = pyqt.qpy_libs() + [pyqt_modules[-1]] + pyqt.tools()
+    else: s = pyqt.qpy_libs() + pyqt_modules + xtra_modules + pyqt.tools()
 +
     sipconfig.ParentMakefile(
         configuration=sipcfg,
-        subdirs=pyqt.qpylibs() + pyqt_modules + xtra_modules + pyqt.tools(),
+-        subdirs=pyqt.qpy_libs() + pyqt_modules + xtra_modules + pyqt.tools(),
 +        subdirs=s,
         installs=installs
     ).generate()
--- a/devel/py-qt4-core/pkg-plist
+++ b/devel/py-qt4-core/pkg-plist
@ -18,6 +18,12 @@ bin/pyuic4
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/indenter.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/indenter.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/indenter.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/misc.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/misc.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/misc.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_type.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_type.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_type.pyo
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/qobjectcreator.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/qobjectcreator.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/qobjectcreator.pyo
@ -36,6 +42,9 @@ bin/pyuic4
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/__init__.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/__init__.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/__init__.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/driver.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/driver.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/driver.pyo
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/exceptions.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/exceptions.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/exceptions.pyo
@ -45,6 +54,27 @@ bin/pyuic4
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/encode_utf8.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/encode_utf8.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/encode_utf8.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.pyo
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyo
@ -54,6 +84,9 @@ bin/pyuic4
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/uiparser.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/uiparser.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/uiparser.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/phonon.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/phonon.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/phonon.pyo
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qaxcontainer.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qaxcontainer.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qaxcontainer.pyo
@ -143,6 +176,7 @@ bin/pyuic4
 %%API%%share/qt4/qsci/api/python/QtCore.api
 %%SIP%%@dirrm share/py-sip/QtCore
@dirrm %%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
--- a/devel/py-qt4-dbus/distinfo
+++ b/devel/py-qt4-dbus/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/devel/py-qt4-designer/distinfo
+++ b/devel/py-qt4-designer/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/devel/py-qt4-designerplugin/distinfo
+++ b/devel/py-qt4-designerplugin/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/devel/py-qt4-help/distinfo
+++ b/devel/py-qt4-help/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	qscintilla2
 PORTVERSION=	${QSCI2_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_QSCI2}
--- a/devel/py-qt4-qscintilla2/distinfo
+++ b/devel/py-qt4-qscintilla2/distinfo
@ -1,3 +1,3 @@
-MD5 (QScintilla-gpl-2.3.2.tar.gz) = 2e112d01988f2e044c43a1e7f5e1dd87
-SHA256 (QScintilla-gpl-2.3.2.tar.gz) = 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749
-SIZE (QScintilla-gpl-2.3.2.tar.gz) = 2146902
+MD5 (QScintilla-gpl-2.4.tar.gz) = dd69520ec91f1acb97a4eb74ddde37c9
+SHA256 (QScintilla-gpl-2.4.tar.gz) = 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
+SIZE (QScintilla-gpl-2.4.tar.gz) = 2304554
--- a/devel/py-qt4-qscintilla2/pkg-plist
+++ b/devel/py-qt4-qscintilla2/pkg-plist
@ -11,6 +11,7 @@
 %%SIP%%share/py-sip/Qsci/qscilexercpp.sip
 %%SIP%%share/py-sip/Qsci/qscilexercsharp.sip
 %%SIP%%share/py-sip/Qsci/qscilexercss.sip
+%%SIP%%share/py-sip/Qsci/qscilexercustom.sip
 %%SIP%%share/py-sip/Qsci/qscilexerd.sip
 %%SIP%%share/py-sip/Qsci/qscilexerdiff.sip
 %%SIP%%share/py-sip/Qsci/qscilexerfortran.sip
@ -42,6 +43,8 @@
 %%SIP%%share/py-sip/Qsci/qsciscintilla.sip
 %%SIP%%share/py-sip/Qsci/qsciscintillabase3.sip
 %%SIP%%share/py-sip/Qsci/qsciscintillabase4.sip
+%%SIP%%share/py-sip/Qsci/qscistyle.sip
+%%SIP%%share/py-sip/Qsci/qscistyledtext.sip
 %%API%%share/qt4/qsci/api/python/QScintilla2.api
 %%SIP%%@dirrm share/py-sip/Qsci
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-qt4-script/distinfo
+++ b/devel/py-qt4-script/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@ -0,0 +1,80 @@
+# New ports collection makefile for:	py-qt4-scripttools
+# Date created:		2009-07-12
+# Whom:			Max Brazhnikov <makc@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	scripttools
+PORTVERSION=	${PYQT4_VERSION}
+PORTEPOCH=	1
+CATEGORIES=	devel python
+MASTER_SITES=	${MASTER_SITES_PYQT4}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
+DISTNAME=	${PYQT4_DISTNAME}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Python bindings for the Qt4 toolkit, QtScriptTools module
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
+RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
+
+HAS_CONFIGURE=	yes
+USE_PYTHON=	2.5+
+USE_QT_VER=	4
+QT_COMPONENTS=	scripttools qmake_build
+
+OPTIONS=	API		"Install QtScript API for QScintilla2" on \
+		DEBUG		"Enable debugging in generated code" off \
+		SIPFILES	"Install the QtScript SIP files" on \
+		TRACING		"Enable tracing in generated code" off
+
+PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
+OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+SIPDIR=		${PREFIX}/share/py-sip
+QSCIDIR=	${PREFIX}/share/qt4/qsci
+CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
+ARGS=		-b ${PREFIX}/bin\
+		-d ${PYTHONPREFIX_SITELIBDIR}\
+		-p ${PREFIX}/${QT_PLUGINDIR_REL}\
+		-q ${QMAKE}\
+		--confirm-license\
+		--enable QtScriptTools
+
+.include "../py-sip/files/bsd.pyqt.mk"
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_DEBUG)
+ARGS+=		--debug
+.endif
+.if defined(WITHOUT_API)
+ARGS+=		--no-qsci-api
+PLIST_SUB+=	API="@comment "
+.else
+LIB_DEPENDS+=	qscintilla2.5:${PORTSDIR}/devel/qscintilla2
+ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
+PLIST_SUB+=	API=""
+.endif
+.if defined(WITHOUT_SIPFILES)
+ARGS+=		--no-sip-files
+PLIST_SUB+=	SIP="@comment "
+.else
+ARGS+=		--sipdir ${SIPDIR}
+PLIST_SUB+=	SIP=""
+.endif
+.if defined(WITH_TRACING)
+ARGS+=		--trace
+.endif
+
+do-configure:
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
+		${PYTHON_CMD} configure.py ${ARGS}
+
+post-configure:
+	${REINPLACE_CMD} -e 's|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\
+		-e 's|CC = cc|CC = ${CC}|'\
+		-e 's|CXX = c++|CXX = ${CXX}|'\
+		-e 's|LINK = c++|LINK = ${CXX}|'\
+		${WRKSRC}/QtScriptTools/Makefile
+
+.include <bsd.port.post.mk>
--- a/devel/py-qt4-scripttools/distinfo
+++ b/devel/py-qt4-scripttools/distinfo
@ -0,0 +1,3 @@
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/devel/py-qt4-scripttools/pkg-descr
+++ b/devel/py-qt4-scripttools/pkg-descr
@ -0,0 +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/
--- a/devel/py-qt4-scripttools/pkg-plist
+++ b/devel/py-qt4-scripttools/pkg-plist
@ -0,0 +1,6 @@
+%%PYTHON_SITELIBDIR%%/PyQt4/QtScriptTools.so
+%%SIP%%share/py-sip/QtScriptTools/QtScriptToolsmod.sip
+%%SIP%%share/py-sip/QtScriptTools/qscriptenginedebugger.sip
+%%API%%share/qt4/qsci/api/python/QtScriptTools.api
+%%SIP%%@dirrm share/py-sip/QtScriptTools
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-qt4-test/distinfo
+++ b/devel/py-qt4-test/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@ -25,6 +25,8 @@ OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 ARGS=		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR}\
 		-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR}

+PORTDOCS=	*
+
 .include "files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>

@ -45,9 +47,8 @@ post-configure:

 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} && cd ${WRKSRC} && ${INSTALL_DATA}\
-		doc/sipref.txt doc/sipref.html\
-		NEWS LICENSE ${DOCSDIR}
+	${MKDIR} ${DOCSDIR} && cd ${WRKSRC}/doc/html && \
+		${COPYTREE_SHARE} \. ${DOCSDIR}
 .endif
 	${MKDIR} ${DATADIR} &&\
 		cd ${PYTHONPREFIX_SITELIBDIR} &&\
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@ -1,3 +1,3 @@
-MD5 (sip-4.7.9.tar.gz) = 597d7ff7edb42a18421c806ffd18a136
-SHA256 (sip-4.7.9.tar.gz) = 7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
-SIZE (sip-4.7.9.tar.gz) = 471372
+MD5 (sip-4.8.2.tar.gz) = 7ae60712aa6b4095a8cdab11b437f8f0
+SHA256 (sip-4.8.2.tar.gz) = 2ebb29deb2bbcdb99f47866e59deea7c6d98be0c835547b043eefd151516d9a9
+SIZE (sip-4.8.2.tar.gz) = 615394
--- a/devel/py-sip/files/bsd.pyqt.mk
+++ b/devel/py-sip/files/bsd.pyqt.mk
@ -13,12 +13,12 @@ MASTER_SITES_PYKDE4=	${MASTER_SITE_RIVERBANK}PyKDE4/
 MASTER_SITES_QSCI1=	${MASTER_SITE_RIVERBANK}QScintilla1/
 MASTER_SITES_QSCI2=	${MASTER_SITE_RIVERBANK}QScintilla2/

-SIP_VERSION=		4.7.9
-PYQT3_VERSION=		3.17.6
-PYQT4_VERSION=		4.4.4
-PYKDE3_VERSION=		3.16.2
+SIP_VERSION=		4.8.2
+PYQT3_VERSION=		3.18.1
+PYQT4_VERSION=		4.5.4
+PYKDE3_VERSION=		3.16.3
 QSCI1_VERSION=		1.7.1
-QSCI2_VERSION=		2.3.2
+QSCI2_VERSION=		2.4

 SIP_DISTNAME=		sip-${SIP_VERSION}
 PYQT3_DISTNAME=		PyQt-x11-gpl-${PYQT3_VERSION}
--- a/devel/py-sip/pkg-plist
+++ b/devel/py-sip/pkg-plist
@ -7,10 +7,5 @@ bin/sip
 %%PYTHON_SITELIBDIR%%/sipdistutils.py
 %%PYTHON_SITELIBDIR%%/sipdistutils.pyc
 %%PYTHON_SITELIBDIR%%/sipdistutils.pyo
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/sipref.html
-%%PORTDOCS%%%%DOCSDIR%%/sipref.txt
@exec mkdir -p %D/%%DATADIR%%
@dirrmtry %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- a/devel/qscintilla2-designerplugin/distinfo
+++ b/devel/qscintilla2-designerplugin/distinfo
@ -1,3 +1,3 @@
-MD5 (QScintilla-gpl-2.3.2.tar.gz) = 2e112d01988f2e044c43a1e7f5e1dd87
-SHA256 (QScintilla-gpl-2.3.2.tar.gz) = 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749
-SIZE (QScintilla-gpl-2.3.2.tar.gz) = 2146902
+MD5 (QScintilla-gpl-2.4.tar.gz) = dd69520ec91f1acb97a4eb74ddde37c9
+SHA256 (QScintilla-gpl-2.4.tar.gz) = 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
+SIZE (QScintilla-gpl-2.4.tar.gz) = 2304554
--- a/devel/qscintilla2/distinfo
+++ b/devel/qscintilla2/distinfo
@ -1,3 +1,3 @@
-MD5 (QScintilla-gpl-2.3.2.tar.gz) = 2e112d01988f2e044c43a1e7f5e1dd87
-SHA256 (QScintilla-gpl-2.3.2.tar.gz) = 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749
-SIZE (QScintilla-gpl-2.3.2.tar.gz) = 2146902
+MD5 (QScintilla-gpl-2.4.tar.gz) = dd69520ec91f1acb97a4eb74ddde37c9
+SHA256 (QScintilla-gpl-2.4.tar.gz) = 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
+SIZE (QScintilla-gpl-2.4.tar.gz) = 2304554
--- a/devel/qscintilla2/pkg-plist
+++ b/devel/qscintilla2/pkg-plist
@ -11,6 +11,7 @@
 %%QT_INCDIR_REL%%/Qsci/qscilexercpp.h
 %%QT_INCDIR_REL%%/Qsci/qscilexercsharp.h
 %%QT_INCDIR_REL%%/Qsci/qscilexercss.h
+%%QT_INCDIR_REL%%/Qsci/qscilexercustom.h
 %%QT_INCDIR_REL%%/Qsci/qscilexerd.h
 %%QT_INCDIR_REL%%/Qsci/qscilexerdiff.h
 %%QT_INCDIR_REL%%/Qsci/qscilexerfortran.h
@ -38,10 +39,12 @@
 %%QT_INCDIR_REL%%/Qsci/qsciprinter.h
 %%QT_INCDIR_REL%%/Qsci/qsciscintilla.h
 %%QT_INCDIR_REL%%/Qsci/qsciscintillabase.h
+%%QT_INCDIR_REL%%/Qsci/qscistyle.h
+%%QT_INCDIR_REL%%/Qsci/qscistyledtext.h
 %%QT_LIBDIR_REL%%/libqscintilla2.so
 %%QT_LIBDIR_REL%%/libqscintilla2.so.5
-%%QT_LIBDIR_REL%%/libqscintilla2.so.5.0
-%%QT_LIBDIR_REL%%/libqscintilla2.so.5.0.1
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.1
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.1.0
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
@ -60,7 +63,9 @@
 %%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
@ -86,6 +91,8 @@
 %%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
@ -140,8 +147,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintilla.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintillaBase-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintillaBase.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_556434f8084a0975d5f9aa83df897544.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_e71f21f8efaf379e3645c15d5d7e326c.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_944256396c06c0295aa2eca7dcfea282.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_d32dfe2bcddd0b2d894b9fb13d6bdd4d.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dirs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
@ -240,6 +252,7 @@ share/qt4/qsci/api/python/Python-2.5.api
 share/qt4/qsci/api/python/Python-2.6.api
 %%NLS%%share/qt4/translations/qscintilla_cs.qm
 %%NLS%%share/qt4/translations/qscintilla_de.qm
+%%NLS%%share/qt4/translations/qscintilla_es.qm
 %%NLS%%share/qt4/translations/qscintilla_fr.qm
 %%NLS%%share/qt4/translations/qscintilla_pt_br.qm
 %%NLS%%share/qt4/translations/qscintilla_ru.qm
--- a/graphics/py-qt4-svg/distinfo
+++ b/graphics/py-qt4-svg/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/misc/py-qt4-demo/distinfo
+++ b/misc/py-qt4-demo/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/misc/py-qt4-demo/pkg-plist
+++ b/misc/py-qt4-demo/pkg-plist
@ -9,8 +9,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/icons/image6.xpm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/mainwindow.qrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/mainwindow.ui
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/mainwindow_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/mainwindow_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/ui_mainwindow.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/ui_mainwindow.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/webbrowser.py
@ -23,8 +21,53 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs_rc.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/colors.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/colors.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/demoitem.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/demoitem.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/demoitemanimation.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/demoitemanimation.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/demoscene.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/demoscene.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/demotextitem.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/demotextitem.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/dockitem.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/dockitem.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/examplecontent.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/examplecontent.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/guide.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/guide.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/guidecircle.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/guidecircle.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/guideline.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/guideline.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/headingitem.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/headingitem.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/imageitem.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/imageitem.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/images/demobg.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/images/qtlogo_small.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/images/trolltech-logo.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/itemcircleanimation.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/itemcircleanimation.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/letteritem.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/letteritem.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/mainwindow.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/mainwindow.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/menucontent.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/menucontent.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/menumanager.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/menumanager.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/qtdemo.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/qtdemo.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/qtdemo.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/scanitem.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/scanitem.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/score.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/score.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/textbutton.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/textbutton.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/qtdemo/xml/examples.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/calculatorform/calculatorform.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/calculatorform/calculatorform.pyc
@ -74,22 +117,28 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/pythonconsolewidget.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/pythonconsolewidget.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/screenshot.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/screenshot.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/images/bad.svg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/images/heart.svg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/images/trash.svg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/systray.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/systray.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/systray.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/systray_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/systray_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/complexwizard.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/complexwizard.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/classwizard/classwizard.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/classwizard/classwizard.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/classwizard/classwizard.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/classwizard/images/background.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/classwizard/images/banner.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/classwizard/images/logo1.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/classwizard/images/logo2.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/classwizard/images/logo3.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/classwizard/images/watermark1.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/classwizard/images/watermark2.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/configdialog/configdialog.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/configdialog/configdialog.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/configdialog/configdialog.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/configdialog/configdialog_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/configdialog/configdialog_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/configdialog/images/config.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/configdialog/images/query.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/configdialog/images/update.png
@ -97,51 +146,39 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/extension.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/findfiles.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/findfiles.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/simplewizard.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/simplewizard.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/standarddialogs.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/standarddialogs.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/tabdialog.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/tabdialog.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/trivialwizard.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/trivialwizard.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggableicons/draggableicons.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggableicons/draggableicons.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggableicons/draggableicons.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggableicons/draggableicons_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggableicons/draggableicons_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggableicons/images/boat.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggableicons/images/car.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggableicons/images/house.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggabletext/draggabletext.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggabletext/draggabletext.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggabletext/draggabletext.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggabletext/draggabletext_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggabletext/draggabletext_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggabletext/words.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/fridgemagnets/fridgemagnets.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/fridgemagnets/fridgemagnets.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/fridgemagnets/fridgemagnets.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/fridgemagnets/fridgemagnets_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/fridgemagnets/fridgemagnets_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/fridgemagnets/words.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/puzzle/example.jpg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/puzzle/puzzle.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/puzzle/puzzle.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/puzzle/puzzle.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/puzzle/puzzle_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/puzzle/puzzle_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/collidingmice.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/collidingmice.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/images/cheese.jpg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/mice.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/mice_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/mice_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/diagramscene.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/diagramscene.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/diagramscene.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/diagramscene_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/diagramscene_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/background1.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/background2.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/background3.png
@ -160,8 +197,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/images/head.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/elasticnodes.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/elasticnodes.pyc
@ -178,8 +213,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/padnavigator.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/padnavigator.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/padnavigator.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/padnavigator_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/padnavigator_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/ui_backside.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/ui_backside.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/README
@ -188,37 +221,38 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/chart/chart.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/chart/chart.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/chart/chart.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/chart/chart_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/chart/chart_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/chart/mydata.cht
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/chart/qtdata.cht
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/dirview.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/dirview.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/images.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/editabletreemodel/default.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/editabletreemodel/editabletreemodel.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/editabletreemodel/editabletreemodel.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/editabletreemodel/editabletreemodel.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/editabletreemodel/mainwindow.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/editabletreemodel/ui_mainwindow.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/editabletreemodel/ui_mainwindow.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/fetchmore.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/fetchmore.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/images/qt.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/pixelator.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/pixelator.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/pixelator_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/pixelator_rc.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/pixelator.qrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/puzzle/example.jpg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/puzzle/puzzle.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/puzzle/puzzle.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/puzzle/puzzle.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/puzzle/puzzle_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/puzzle/puzzle_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/simpledommodel.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/simpledommodel.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/simpletreemodel/default.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/simpletreemodel/simpletreemodel.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/simpletreemodel/simpletreemodel.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/simpletreemodel/simpletreemodel.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/simpletreemodel/simpletreemodel_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/simpletreemodel/simpletreemodel_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/spinboxdelegate.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/spinboxdelegate.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/layouts/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layouts/basiclayout.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layouts/basiclayout.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layouts/basiclayouts.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layouts/basiclayouts.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/layouts/borderlayout.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/layouts/borderlayout.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/layouts/flowlayout.py
@ -227,8 +261,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/application/application.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/application/application.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/application/application.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/application/application_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/application/application_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/application/images/copy.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/application/images/cut.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/application/images/new.png
@ -238,8 +270,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/dockwidgets/dockwidgets.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/dockwidgets/dockwidgets.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/dockwidgets/dockwidgets.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/dockwidgets/dockwidgets_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/dockwidgets/dockwidgets_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/dockwidgets/images/new.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/dockwidgets/images/print.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/dockwidgets/images/save.png
@ -253,8 +283,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/mdi/mdi.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/mdi/mdi.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/mdi/mdi.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/mdi/mdi_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/mdi/mdi_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/menus.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/menus.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/recentfiles.py
@ -268,8 +296,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/sdi/sdi.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/sdi/sdi.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/sdi/sdi.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/sdi/sdi_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/sdi/sdi_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/blockingfortuneclient.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/blockingfortuneclient.pyc
@ -284,13 +310,12 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/ftp/ftp.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/ftp/ftp.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/ftp/ftp.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/ftp/ftp_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/ftp/ftp_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/ftp/images/cdtoparent.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/ftp/images/dir.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/ftp/images/file.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/http.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/http.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/http/authenticationdialog.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/http/http.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/http/http.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/loopback.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/loopback.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/threadedfortuneserver.py
@ -315,27 +340,22 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/textures/textures.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/textures/textures.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/textures/textures.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/textures/textures_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/textures/textures_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/basicdrawing/basicdrawing.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/basicdrawing/basicdrawing.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/basicdrawing/basicdrawing.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/basicdrawing/basicdrawing_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/basicdrawing/basicdrawing_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/basicdrawing/images/brick.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/basicdrawing/images/qt-logo.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/concentriccircles.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/concentriccircles.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/painterpaths.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/painterpaths.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/svgviewer/files/bubbles.svg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/svgviewer/files/cubic.svg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/svgviewer/files/spheres.svg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/svgviewer/svgviewer.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/svgviewer/svgviewer.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/svgviewer/svgviewer.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/svgviewer/svgviewer_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/svgviewer/svgviewer_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/transformations.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/transformations.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/phonon/README
@ -355,12 +375,11 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/calendar.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/orderform.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/orderform.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/syntaxhighlighter/examples/example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/syntaxhighlighter/syntaxhighlighter.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/syntaxhighlighter/syntaxhighlighter.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/syntaxhighlighter/syntaxhighlighter.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/syntaxhighlighter/syntaxhighlighter_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/syntaxhighlighter/syntaxhighlighter_rc.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/syntaxhighlighter.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/syntaxhighlighter.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/textobject/files/heart.svg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/textobject/textobject.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/textobject/textobject.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/script/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/script/helloscript.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/script/helloscript.pyc
@ -394,8 +413,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/i18n.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/i18n.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/i18n.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/i18n_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/i18n_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/translations/i18n_ar.qm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/translations/i18n_ar.ts
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/translations/i18n_cs.qm
@ -426,56 +443,27 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/translations/i18n_sv.ts
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/translations/i18n_zh.qm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/translations/i18n_zh.ts
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/demos.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/displayshape.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/displayshape.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/displaywidget.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/displaywidget.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/examples.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/images/qt4-logo.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/images/rb-logo.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/launcher.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/launcher.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/qtdemo.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/qtdemo.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/qtdemo.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/qtdemo.rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/qtdemo_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/qtdemo_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/regexp.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/regexp.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/settingseditor/inifiles/troll.ini
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/settingseditor/inifiles/licensepage.ini
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/settingseditor/inifiles/qsa.ini
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/settingseditor/settingseditor.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/settingseditor/settingseditor.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t1.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t1.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t10.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t10.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t11.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t11.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t12.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t12.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t13.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t13.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t14.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t14.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t2.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t2.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t3.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t3.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t4.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t4.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t5.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t5.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t6.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t6.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t7.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t7.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t8.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t8.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t9.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/t9.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part1.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part1.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part2.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part3.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part3.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part4.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part4.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part5.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part5.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part6.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part6.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part7.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorials/addressbook/part7.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/analogclock.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/analogclock.pyc
@ -500,24 +488,16 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/icons/images/monkey_on_16x16.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/icons/images/monkey_on_32x32.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/icons/images/monkey_on_64x64.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/icons/images/qtopia_16x16.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/icons/images/qtopia_32x32.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/icons/images/qtopia_48x48.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/icons/images/qt_extended_16x16.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/icons/images/qt_extended_32x32.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/icons/images/qt_extended_48x48.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/imageviewer.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/imageviewer.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/lineedits.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/lineedits.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie/icons/eject.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie/icons/play-pause.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie/icons/quit.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie/icons/stop.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie/animation.mng
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie/movie.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie/movie.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie/movie.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie/movie_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie/movie_rc.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/screenshot.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/screenshot.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/scribble.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/scribble.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/shapedclock.py
@ -536,8 +516,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/tooltips/tooltips.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/tooltips/tooltips.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/tooltips/tooltips.qrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/tooltips/tooltips_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/tooltips/tooltips_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/wiggly.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/wiggly.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/windowflags.py
@ -556,16 +534,14 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/tooltips/images
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/tooltips
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/movie/icons
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/movie
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/icons/images
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/icons
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tutorial
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tutorials/addressbook
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tutorials
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/settingseditor/inifiles
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/settingseditor
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/qtdemo/images
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/qtdemo
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/i18n/translations
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/i18n
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/codecs/encodedfiles
@ -574,8 +550,8 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/threads
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sql
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/script
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/richtext/syntaxhighlighter/examples
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/richtext/syntaxhighlighter
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/richtext/textobject/files
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/richtext/textobject
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/richtext
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pyuic
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/phonon
@ -587,6 +563,7 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/opengl/textures/images
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/opengl/textures
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/opengl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/network/http
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/network/ftp/images
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/network/ftp
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/network
@ -604,6 +581,7 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews/puzzle
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews/pixelator/images
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews/pixelator
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews/editabletreemodel
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews/chart
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview/padnavigator/images
@ -623,6 +601,8 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/draganddrop
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dialogs/configdialog/images
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dialogs/configdialog
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dialogs/classwizard/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dialogs/classwizard
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dialogs
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/desktop/systray/images
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/desktop/systray
@ -632,6 +612,9 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/designer/plugins
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/designer/calculatorform
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/designer
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos/qtdemo/xml
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos/qtdemo/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos/qtdemo
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos/embeddeddialogs
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/activeqt/webbrowser/icons
--- a/misc/py-qt4-doc/distinfo
+++ b/misc/py-qt4-doc/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/misc/py-qt4-doc/pkg-plist
+++ b/misc/py-qt4-doc/pkg-plist
@ -50,6 +50,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cursor-wait.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cursor-whatsthis.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/effectwidget.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/filedialogurls.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/foreignkeys.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/frames.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/graphicsview-ellipseitem-pie.png
@ -93,6 +94,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/macintosh-treeview.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/mainwindow-docks.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/mainwindowlayout.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/mdi-cascade.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/mdi-tile.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/modelindex-no-parent.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/modelview-begin-append-columns.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/modelview-begin-append-rows.png
@ -178,7 +181,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qmatrix-combinedtransformation.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qmatrix-representation.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qmatrix-simpletransformation.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/qmdiarea-arrange.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qmdisubwindowlayout.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qmessagebox-crit.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qmessagebox-info.png
@ -221,6 +223,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qpen-dash.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qpen-dashdot.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qpen-dashdotdot.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qpen-dashpattern.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qpen-demo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qpen-dot.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qpen-flat.png
@ -267,6 +270,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtexttableformat-cell.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtransform-combinedtransformation.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtransform-combinedtransformation2.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qtransform-representation.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtransform-simpletransformation.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtwizard-aero1.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtwizard-aero2.png
@ -289,7 +293,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qvboxlayout-with-5-children.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qwebview-diagram.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qwebview-url.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/qworkspace-arrange.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/rb-logo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/relationaltable.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/rintersect.png
@ -330,6 +333,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/modules.html
 %%PORTDOCS%%%%DOCSDIR%%/html/phonon-abstractaudiooutput.html
 %%PORTDOCS%%%%DOCSDIR%%/html/phonon-abstractvideooutput.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-audiocapturedevice.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-audiochanneldescription.html
 %%PORTDOCS%%%%DOCSDIR%%/html/phonon-audiooutput.html
 %%PORTDOCS%%%%DOCSDIR%%/html/phonon-audiooutputdevice.html
 %%PORTDOCS%%%%DOCSDIR%%/html/phonon-audiooutputdevicemodel.html
@ -349,6 +354,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/phonon-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/phonon-path.html
 %%PORTDOCS%%%%DOCSDIR%%/html/phonon-seekslider.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-subtitledescription.html
 %%PORTDOCS%%%%DOCSDIR%%/html/phonon-videoplayer.html
 %%PORTDOCS%%%%DOCSDIR%%/html/phonon-videowidget.html
 %%PORTDOCS%%%%DOCSDIR%%/html/phonon-volumeslider.html
@ -369,6 +375,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractitemview.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractlistmodel.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractmessagehandler.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qabstractnetworkcache.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractprintdialog-printdialogoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractprintdialog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractproxymodel.html
@ -407,6 +414,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qclipboard.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qcloseevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qcolor.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qcolordialog-colordialogoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qcolordialog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qcolumnview.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qcombobox.html
@ -499,6 +507,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qfontcombobox-fontfilters.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfontcombobox.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfontdatabase.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qfontdialog-fontdialogoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfontdialog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfontinfo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfontmetrics.html
@ -580,12 +589,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qicon.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qicondragevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qiconengine.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qiconenginev2-availablesizesargument.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qiconenginev2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qimage.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qimageiohandler.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qimagereader.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qimagewriter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qinputcontext.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qinputcontextfactory.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qinputdialog-inputdialogoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qinputdialog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qinputevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qinputmethodevent-attribute.html
@ -649,11 +661,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qmutexlocker.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkaccessmanager.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkaddressentry.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qnetworkcachemetadata.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkcookie.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkcookiejar.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qnetworkdiskcache.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkinterface-interfaceflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkinterface.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qnetworkproxy-capabilities.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkproxy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qnetworkproxyfactory.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qnetworkproxyquery.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkreply.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkrequest.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qobject.html
@ -702,6 +719,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qpydesignermembersheetextension.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qpydesignerpropertysheetextension.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qpydesignertaskmenuextension.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qpytextobject.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qradialgradient.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qradiobutton.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qreadlocker.html
@ -723,7 +741,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptengine-qobjectwrapoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptengine.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptengineagent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qscriptenginedebugger.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptstring.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qscriptsyntaxcheckresult.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptvalue-propertyflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptvalue-resolveflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptvalue.html
@ -808,6 +828,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptionframe.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptionframev2-framefeatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptionframev2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptionframev3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiongraphicsitem.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiongroupbox.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptionheader.html
@ -821,7 +842,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontab-cornerwidgets.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontab.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontabbarbase.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontabbarbasev2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontabv2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontabv3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontabwidgetframe.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontitlebar.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontoolbar-toolbarfeatures.html
@ -889,6 +912,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextdocument-findflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextdocument.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextdocumentfragment.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtextdocumentwriter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextedit-autoformatting.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextedit-extraselection.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextedit.html
@ -910,6 +934,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextlist.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextlistformat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextobject.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtextobjectinterface.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextoption-flags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextoption-tab.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextoption.html
@ -942,6 +967,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qtreewidgetitemiterator-iteratorflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtreewidgetitemiterator.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtscript.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtscripttools.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtsql.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtsvg.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qttest.html
@ -962,11 +988,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qvariant.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qvboxlayout.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwaitcondition.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebdatabase.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebframe.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebhistory.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebhistoryinterface.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebhistoryitem.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebhittestresult.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebpage-choosemultiplefilesextensionoption.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebpage-choosemultiplefilesextensionreturn.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebpage-extensionoption.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebpage-extensionreturn.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebpage-findflags.html
@ -976,6 +1005,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebpluginfactory-mimetype.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebpluginfactory-plugin.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebpluginfactory.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebsecurityorigin.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebsettings.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwebview.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwhatsthis.html
--- a/multimedia/py-qt4-phonon/distinfo
+++ b/multimedia/py-qt4-phonon/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/net/py-qt4-network/distinfo
+++ b/net/py-qt4-network/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/net/py-qt4-network/pkg-plist
+++ b/net/py-qt4-network/pkg-plist
@ -1,5 +1,6 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtNetwork.so
 %%SIP%%share/py-sip/QtNetwork/QtNetworkmod.sip
+%%SIP%%share/py-sip/QtNetwork/qabstractnetworkcache.sip
 %%SIP%%share/py-sip/QtNetwork/qabstractsocket.sip
 %%SIP%%share/py-sip/QtNetwork/qauthenticator.sip
 %%SIP%%share/py-sip/QtNetwork/qftp.sip
@ -10,6 +11,7 @@
 %%SIP%%share/py-sip/QtNetwork/qlocalsocket.sip
 %%SIP%%share/py-sip/QtNetwork/qnetworkaccessmanager.sip
 %%SIP%%share/py-sip/QtNetwork/qnetworkcookie.sip
+%%SIP%%share/py-sip/QtNetwork/qnetworkdiskcache.sip
 %%SIP%%share/py-sip/QtNetwork/qnetworkinterface.sip
 %%SIP%%share/py-sip/QtNetwork/qnetworkproxy.sip
 %%SIP%%share/py-sip/QtNetwork/qnetworkreply.sip
--- a/textproc/py-qt4-xml/distinfo
+++ b/textproc/py-qt4-xml/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/textproc/py-qt4-xmlpatterns/distinfo
+++ b/textproc/py-qt4-xmlpatterns/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/www/py-qt4-webkit/distinfo
+++ b/www/py-qt4-webkit/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/www/py-qt4-webkit/pkg-plist
+++ b/www/py-qt4-webkit/pkg-plist
@ -1,10 +1,12 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtWebKit.so
 %%SIP%%share/py-sip/QtWebKit/QtWebKitmod.sip
+%%SIP%%share/py-sip/QtWebKit/qwebdatabase.sip
 %%SIP%%share/py-sip/QtWebKit/qwebframe.sip
 %%SIP%%share/py-sip/QtWebKit/qwebhistory.sip
 %%SIP%%share/py-sip/QtWebKit/qwebhistoryinterface.sip
 %%SIP%%share/py-sip/QtWebKit/qwebpage.sip
 %%SIP%%share/py-sip/QtWebKit/qwebpluginfactory.sip
+%%SIP%%share/py-sip/QtWebKit/qwebsecurityorigin.sip
 %%SIP%%share/py-sip/QtWebKit/qwebsettings.sip
 %%SIP%%share/py-sip/QtWebKit/qwebview.sip
 %%API%%share/qt4/qsci/api/python/QtWebKit.api
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	qt
 PORTVERSION=	${PYQT3_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITES_PYQT3}
--- a/x11-toolkits/py-qt/distinfo
+++ b/x11-toolkits/py-qt/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-3.17.6.tar.gz) = 89b7c46d6db4a2916fc6ab5a82b0d08a
-SHA256 (PyQt-x11-gpl-3.17.6.tar.gz) = 9c8a51d296510a400ec82c64ac582b4adce30811e33b2222194c405217bca1a8
-SIZE (PyQt-x11-gpl-3.17.6.tar.gz) = 813192
+MD5 (PyQt-x11-gpl-3.18.1.tar.gz) = f1d120495d1aaf393819e988c0a7bb7e
+SHA256 (PyQt-x11-gpl-3.18.1.tar.gz) = 7eb635f04f9b1853b6e9f969ddd9392d677083f462a27ec19285e1487c72c061
+SIZE (PyQt-x11-gpl-3.18.1.tar.gz) = 819441
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	gui
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -22,7 +21,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	gui imageformats inputmethods iconengines qmake_build
+QT_COMPONENTS=	gui imageformats inputmethods iconengines qmake_build moc_build

 OPTIONS=	API		"Install QtGui API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@ -66,6 +65,10 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

+.if ${ARCH} == "sparc64" && ${OSVERSION} >= 700000
+BROKEN=		Does not compile on sparc64
+.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,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
--- a/x11-toolkits/py-qt4-gui/pkg-plist
+++ b/x11-toolkits/py-qt4-gui/pkg-plist
@ -72,6 +72,7 @@
 %%SIP%%share/py-sip/QtGui/qimagereader.sip
 %%SIP%%share/py-sip/QtGui/qimagewriter.sip
 %%SIP%%share/py-sip/QtGui/qinputcontext.sip
+%%SIP%%share/py-sip/QtGui/qinputcontextfactory.sip
 %%SIP%%share/py-sip/QtGui/qinputdialog.sip
 %%SIP%%share/py-sip/QtGui/qitemdelegate.sip
 %%SIP%%share/py-sip/QtGui/qitemeditorfactory.sip
@ -115,6 +116,7 @@
 %%SIP%%share/py-sip/QtGui/qprogressdialog.sip
 %%SIP%%share/py-sip/QtGui/qproxymodel.sip
 %%SIP%%share/py-sip/QtGui/qpushbutton.sip
+%%SIP%%share/py-sip/QtGui/qpytextobject.sip
 %%SIP%%share/py-sip/QtGui/qradiobutton.sip
 %%SIP%%share/py-sip/QtGui/qregion.sip
 %%SIP%%share/py-sip/QtGui/qrgb.sip
@ -151,6 +153,7 @@
 %%SIP%%share/py-sip/QtGui/qtextcursor.sip
 %%SIP%%share/py-sip/QtGui/qtextdocument.sip
 %%SIP%%share/py-sip/QtGui/qtextdocumentfragment.sip
+%%SIP%%share/py-sip/QtGui/qtextdocumentwriter.sip
 %%SIP%%share/py-sip/QtGui/qtextedit.sip
 %%SIP%%share/py-sip/QtGui/qtextformat.sip
 %%SIP%%share/py-sip/QtGui/qtextlayout.sip
--- a/x11/py-qt4-opengl/distinfo
+++ b/x11/py-qt4-opengl/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229
-SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
-SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063
+MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
+SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
+SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552