- 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

4 files changed, 87 insertions, 34 deletions

diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index 9b88b9746cb8..1fb9b452c2a1 100644
--- 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}
diff --git a/devel/py-qt4-core/distinfo b/devel/py-qt4-core/distinfo
index 886226b81fb2..a312fab4a870 100644
--- 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
diff --git a/devel/py-qt4-core/files/patch-configure.py b/devel/py-qt4-core/files/patch-configure.py
index 6b67dc9245ed..2c32cb941c5b 100644
--- 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()
diff --git a/devel/py-qt4-core/pkg-plist b/devel/py-qt4-core/pkg-plist
index 4836bec71646..eca4defd52ca 100644
--- 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