- Update SIP to 4.12.1.

- Update PyQt4 to 4.8.3.
- Update QScintilla2 to 2.4.6.

36 files changed, 91 insertions, 302 deletions

diff --git a/devel/py-qt4-assistant/distinfo b/devel/py-qt4-assistant/distinfo
index 6c04995bffe2..55e47142c1e4 100644
--- 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
diff --git a/devel/py-qt4-assistant/pkg-descr b/devel/py-qt4-assistant/pkg-descr
index 4c6820acb7d2..0671520bdfb9 100644
--- 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/
diff --git a/devel/py-qt4-core/distinfo b/devel/py-qt4-core/distinfo
index 6c04995bffe2..55e47142c1e4 100644
--- 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
diff --git a/devel/py-qt4-core/files/patch-configure.py b/devel/py-qt4-core/files/patch-configure.py
index 371548abd2a8..a0820cfd2dad 100644
--- 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")
  
diff --git a/devel/py-qt4-core/pkg-descr b/devel/py-qt4-core/pkg-descr
index 3cdaf892efaf..af60bf0c66c4 100644
--- 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/
diff --git a/devel/py-qt4-core/pkg-plist b/devel/py-qt4-core/pkg-plist
index 8db0e5d8144d..3ced2b829f97 100644
--- 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
diff --git a/devel/py-qt4-dbus/distinfo b/devel/py-qt4-dbus/distinfo
index 6c04995bffe2..55e47142c1e4 100644
--- 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
diff --git a/devel/py-qt4-dbus/pkg-descr b/devel/py-qt4-dbus/pkg-descr
index 54d7cc620f16..07ba4e90a344 100644
--- 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/
diff --git a/devel/py-qt4-declarative/distinfo b/devel/py-qt4-declarative/distinfo
index 6c04995bffe2..55e47142c1e4 100644
--- 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
diff --git a/devel/py-qt4-declarative/pkg-descr b/devel/py-qt4-declarative/pkg-descr
index 0c4c52eb8921..f4a4a8192eca 100644
--- 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/
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index c43a74ae5e46..8cd7bead1bd6 100644
--- 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
diff --git a/devel/py-qt4-designer/distinfo b/devel/py-qt4-designer/distinfo
index 6c04995bffe2..55e47142c1e4 100644
--- 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
diff --git a/devel/py-qt4-designer/pkg-descr b/devel/py-qt4-designer/pkg-descr
index 69af166e4953..a2bc673fcfac 100644
--- 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/
diff --git a/devel/py-qt4-designerplugin/distinfo b/devel/py-qt4-designerplugin/distinfo
index 6c04995bffe2..55e47142c1e4 100644
--- 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
diff --git a/devel/py-qt4-designerplugin/pkg-descr b/devel/py-qt4-designerplugin/pkg-descr
index 423666c7ab5c..6e7082d1a6ea 100644
--- 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/
diff --git a/devel/py-qt4-help/distinfo b/devel/py-qt4-help/distinfo
index 6c04995bffe2..55e47142c1e4 100644
--- 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
diff --git a/devel/py-qt4-help/pkg-descr b/devel/py-qt4-help/pkg-descr
index 8ab0c05e518e..8e54216e540a 100644
--- 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/
diff --git a/devel/py-qt4-qscintilla2/distinfo b/devel/py-qt4-qscintilla2/distinfo
index fe240e107657..a46c77e54d2a 100644
--- 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
diff --git a/devel/py-qt4-qscintilla2/pkg-descr b/devel/py-qt4-qscintilla2/pkg-descr
index 2f02c5cc6212..68708c23c9f3 100644
--- 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/
diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile
index d4ebce61f87c..b373f634bd68 100644
--- 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}
diff --git a/devel/py-qt4-script/distinfo b/devel/py-qt4-script/distinfo
index 6c04995bffe2..55e47142c1e4 100644
--- 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
diff --git a/devel/py-qt4-script/pkg-descr b/devel/py-qt4-script/pkg-descr
index 7746c223c3df..44eb9e4ef27b 100644
--- 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/
diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile
index a592783251e6..c898fb7d0c57 100644
--- 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}
diff --git a/devel/py-qt4-scripttools/distinfo b/devel/py-qt4-scripttools/distinfo
index 6c04995bffe2..55e47142c1e4 100644
--- 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
diff --git a/devel/py-qt4-scripttools/pkg-descr b/devel/py-qt4-scripttools/pkg-descr
index 7746c223c3df..44eb9e4ef27b 100644
--- 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/
diff --git a/devel/py-qt4-test/distinfo b/devel/py-qt4-test/distinfo
index 6c04995bffe2..55e47142c1e4 100644
--- 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
diff --git a/devel/py-qt4-test/pkg-descr b/devel/py-qt4-test/pkg-descr
index d0455f6f47ba..7811606cc9ae 100644
--- 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/
diff --git a/devel/py-qt4/pkg-descr b/devel/py-qt4/pkg-descr
index 608efccf2058..42b6bd7c8e0a 100644
--- 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/
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index ed80d7ea1c65..55f0e2b9ef74 100644
--- 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
diff --git a/devel/py-sip/files/bsd.pyqt.mk b/devel/py-sip/files/bsd.pyqt.mk
index 3a062b948717..1dd79f42fc0e 100644
--- 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}
diff --git a/devel/qscintilla2-designerplugin/distinfo b/devel/qscintilla2-designerplugin/distinfo
index fe240e107657..a46c77e54d2a 100644
--- 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
diff --git a/devel/qscintilla2-designerplugin/pkg-descr b/devel/qscintilla2-designerplugin/pkg-descr
index a416a86cca6e..65aea44802b0 100644
--- 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/
diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile
index 330fb16e9cab..d7447037d385 100644
--- 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 \
diff --git a/devel/qscintilla2/distinfo b/devel/qscintilla2/distinfo
index fe240e107657..a46c77e54d2a 100644
--- 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
diff --git a/devel/qscintilla2/pkg-descr b/devel/qscintilla2/pkg-descr
index 4594c6db0176..e59aa66c2cad 100644
--- 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/
diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist
index b10b3054afd0..815eba4cec8a 100644
--- 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%%