Update PyQt4 ports to 4.4.4, new ports:

devel/py-qt4-help multimedia/py-qt4-phonon textproc/py-qt4-xmlpatterns www/py-qt4-webkit Update QScintilla2 to 2.3.2, PyQt3 to 3.17.6, PyKDE3 to 3.16.2. Pass maintainership to kde@FreeBSD.org. Thanks Danny Ricin for his great work. PR: based on ports/130219 Submitted by: Dima Panov" <fluffy at fluffy.khv.ru>
author: Max Brazhnikov <makc@FreeBSD.org> 2009-02-14 22:58:55 +0000
committer: Max Brazhnikov <makc@FreeBSD.org> 2009-02-14 22:58:55 +0000
commit: 2d8b5de9c8741fee001355c270847ea6edebd952 (patch)
tree: 94cebcca98b96f7b4488709cf970696ac272c0e6 /devel
parent: de086ca81bb97192fb9cd50dba868f783132c321 (diff)
download: ports-2d8b5de9c8741fee001355c270847ea6edebd952.tar.gz
ports-2d8b5de9c8741fee001355c270847ea6edebd952.zip
41 files changed, 607 insertions, 605 deletions
diff --git a/devel/Makefile b/devel/Makefile
index 4a6b9140e5b8..6d996380ba59 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2294,6 +2294,7 @@
     SUBDIR += py-qt4-dbus
     SUBDIR += py-qt4-designer
     SUBDIR += py-qt4-designerplugin
+    SUBDIR += py-qt4-help
     SUBDIR += py-qt4-qscintilla2
     SUBDIR += py-qt4-script
     SUBDIR += py-qt4-test
diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index 7175b796714f..a40d83d9319c 100644
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@@ -6,15 +6,13 @@
 
 PORTNAME=	assistant
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
 DISTNAME=	${PYQT4_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, QtAssistant module
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
@@ -24,7 +22,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	assistantclient qmake
+QT_COMPONENTS=	assistantclient qmake_build
 
 OPTIONS=	API		"Install QtAssistant API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@@ -34,11 +32,14 @@ OPTIONS=	API		"Install QtAssistant API for QScintilla2" on \
 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 ${PYTHON_SITELIBDIR}\
-		-q ${QT_PREFIX}/bin/qmake-qt4\
-		--confirm-license
+		-d ${PYTHONPREFIX_SITELIBDIR}\
+		-p ${PREFIX}/${QT_PLUGINDIR_REL}\
+		-q ${QMAKE}\
+		--confirm-license\
+		--enable QtAssistant
 
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
@@ -49,26 +50,21 @@ ARGS+=		--debug
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
-PLIST_SUB+=	APIFILE="@comment "
 .else
-LIB_DEPENDS+=	qscintilla2.3:${PORTSDIR}/devel/qscintilla2
-ARGS+=		--qsci-api
+LIB_DEPENDS+=	qscintilla2.5:${PORTSDIR}/devel/qscintilla2
+ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
-PLIST_SUB+=	APIFILE="share/qt4/qsci/api/python/QtAssistant.api"
 .endif
 .if defined(WITHOUT_SIPFILES)
 ARGS+=		--no-sip-files
-PLIST_SUB+=	SIPFILES="@comment "
-PLIST_SUB+=	SIPDIR="@comment "
+PLIST_SUB+=	SIP="@comment "
 .else
 ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIPFILES=""
-PLIST_SUB+=	SIPDIR="share/py-sip"
+PLIST_SUB+=	SIP=""
 .endif
 .if defined(WITH_TRACING)
 ARGS+=		--trace
 .endif
-ARGS+=		--enable QtAssistant
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
diff --git a/devel/py-qt4-assistant/distinfo b/devel/py-qt4-assistant/distinfo
index 8c72753540f7..886226b81fb2 100644
--- a/devel/py-qt4-assistant/distinfo
+++ b/devel/py-qt4-assistant/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4
-SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55
-SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266
+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
diff --git a/devel/py-qt4-assistant/pkg-plist b/devel/py-qt4-assistant/pkg-plist
index 6f56ea0b84a0..0c2ecfd4c171 100644
--- a/devel/py-qt4-assistant/pkg-plist
+++ b/devel/py-qt4-assistant/pkg-plist
@@ -1,8 +1,6 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtAssistant.so
-%%SIPFILES%%%%SIPDIR%%/QtAssistant/QtAssistantmod.sip
-%%SIPFILES%%%%SIPDIR%%/QtAssistant/qassistantclient.sip
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtAssistant
-%%API%%%%APIFILE%%
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/QtAssistant/QtAssistantmod.sip
+%%SIP%%share/py-sip/QtAssistant/qassistantclient.sip
+%%API%%share/qt4/qsci/api/python/QtAssistant.api
+%%SIP%%@dirrmtry share/py-sip/QtAssistant
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index 1560478621f1..6ddf18f92472 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -6,15 +6,13 @@
 
 PORTNAME=	core
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
 DISTNAME=	${PYQT4_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, QtCore module
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
@@ -23,7 +21,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake
+QT_COMPONENTS=	corelib qmake_build
 
 OPTIONS=	API		"Install QtCore API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@@ -32,11 +30,14 @@ OPTIONS=	API		"Install QtCore API for QScintilla2" on \
 
 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 ${PYTHON_SITELIBDIR}\
-		-q ${QT_PREFIX}/bin/qmake-qt4\
-		--confirm-license
+		-d ${PYTHONPREFIX_SITELIBDIR}\
+		-p ${PREFIX}/${QT_PLUGINDIR_REL}\
+		-q ${QMAKE}\
+		--confirm-license\
+		--enable QtCore
 
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
@@ -47,26 +48,21 @@ ARGS+=		--debug
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
-PLIST_SUB+=	APIFILE="@comment "
 .else
-LIB_DEPENDS+=	qscintilla2.3:${PORTSDIR}/devel/qscintilla2
-ARGS+=		--qsci-api
+LIB_DEPENDS+=	qscintilla2.5:${PORTSDIR}/devel/qscintilla2
+ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
-PLIST_SUB+=	APIFILE="share/qt4/qsci/api/python/QtCore.api"
 .endif
 .if defined(WITHOUT_SIPFILES)
 ARGS+=		--no-sip-files
-PLIST_SUB+=	SIPFILES="@comment "
-PLIST_SUB+=	SIPDIR="@comment "
+PLIST_SUB+=	SIP="@comment "
 .else
 ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIPFILES=""
-PLIST_SUB+=	SIPDIR="share/py-sip"
+PLIST_SUB+=	SIP=""
 .endif
 .if defined(WITH_TRACING)
 ARGS+=		--trace
 .endif
-ARGS+=		--enable QtCore
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
@@ -80,8 +76,8 @@ post-configure:
 		${WRKSRC}/QtCore/Makefile
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/Qt.py ${PYTHON_SITELIBDIR}/PyQt4 &&\
-		cd ${PYTHON_SITELIBDIR}/PyQt4 &&\
+	${INSTALL_DATA} ${FILESDIR}/Qt.py ${PYTHONPREFIX_SITELIBDIR}/PyQt4 &&\
+		cd ${PYTHONPREFIX_SITELIBDIR}/PyQt4 &&\
 		${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py\
 		`ls *.py */*.py */*/*.py` &&\
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/py_compile.py\
diff --git a/devel/py-qt4-core/distinfo b/devel/py-qt4-core/distinfo
index 8c72753540f7..886226b81fb2 100644
--- a/devel/py-qt4-core/distinfo
+++ b/devel/py-qt4-core/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4
-SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55
-SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266
+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
diff --git a/devel/py-qt4-core/files/Qt.py b/devel/py-qt4-core/files/Qt.py
index 8239535019fb..538943a66d0c 100644
--- a/devel/py-qt4-core/files/Qt.py
+++ b/devel/py-qt4-core/files/Qt.py
@@ -12,6 +12,10 @@ try:
 except ImportError:
     pass
 try:
+    from PyQt4.QtXmlPatterns import *
+except ImportError:
+    pass
+try:
     from PyQt4.QtAssistant import *
 except ImportError:
     pass
@@ -44,6 +48,18 @@ try:
 except ImportError:
     pass
 try:
+    from PyQt4.QtHelp import *
+except ImportError:
+    pass
+try:
+    from PyQt4.QtWebKit import *
+except ImportError:
+    pass
+try:
+    from PyQt4.phonon import *
+except ImportError:
+    pass
+try:
     from PyQt4.Qsci import *
 except:
     pass
diff --git a/devel/py-qt4-core/files/patch-configure.py b/devel/py-qt4-core/files/patch-configure.py
index fc83a48e06ac..6b67dc9245ed 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	2007-12-05 18:36:11.000000000 +0100
-+++ configure.py	2007-12-06 21:12:28.000000000 +0100
-@@ -29,6 +29,10 @@
+--- 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 @@
  
  import sipconfig
  
@@ -10,8 +10,8 @@
 +if freebsd: freebsd_port = os.environ['PYQT4_COMPONENT']
  
  # Initialise the globals.
- pyqt_version = 0x040303
-@@ -61,7 +65,6 @@
+ pyqt_version = 0x040404
+@@ -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.
-@@ -288,14 +291,23 @@
+@@ -310,14 +313,23 @@
          elif sipcfg.universal:
              sipconfig.inform("QtDesigner module disabled with universal binaries.")
          else:
@@ -46,7 +46,7 @@
  
      def code(self):
          cons_xtra_incdirs = []
-@@ -316,6 +328,10 @@
+@@ -338,6 +350,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)
-@@ -487,19 +503,28 @@
+@@ -521,19 +537,28 @@
              sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins))
  
          # Generate the QScintilla API file.
@@ -95,7 +95,7 @@
  
      def _static_plugins(self, mname):
          """Return a tuple of the libraries (in platform neutral format) and the
-@@ -570,7 +595,13 @@
+@@ -604,7 +629,13 @@
          return libs, libdirs
  
      def module_installs(self):
@@ -110,7 +110,7 @@
  
      def qpylibs(self):
          # See which QPy libraries to build.
-@@ -656,23 +687,43 @@
+@@ -690,23 +721,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 +167,7 @@
  
          if "QtXml" in pyqt_modules:
              sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -709,7 +760,10 @@
+@@ -743,7 +794,10 @@
              makefile.generate()
              tool.append("pyrcc")
          else:
@@ -177,18 +177,18 @@
 +            else:
 +                sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
  
-         if "QtDesigner" in pyqt_modules:
-             enabled = True
-@@ -734,11 +788,17 @@
-                       glob.glob("%s/lib/libpython%d.%d*" % (ducfg["prefix"], py_major, py_minor))):
-                     lib_dir_flag = quote("-L%s/lib" % ducfg["prefix"])
+         if opts.designer_plugin and "QtDesigner" in pyqt_modules:
+             py_major = sipcfg.py_version >> 16
+@@ -766,11 +820,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)
 +                elif freebsd:
 +                    lib_dir_flag = quote("-L%s/lib" % ducfg["prefix"])
 +                    link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor)
                  else:
                      sipconfig.inform("Qt Designer plugin disabled because Python library is static")
-                     enabled = False
+                     opts.designer_plugin = False
  
 -                pysh_lib = ducfg["LDLIBRARY"]
 +                if freebsd:
@@ -196,15 +196,16 @@
 +                else:
 +                    pysh_lib = ducfg["LDLIBRARY"]
  
-             if enabled:
+             if opts.designer_plugin:
                  sipconfig.inform("Creating Qt Designer plugin Makefile...")
-@@ -806,19 +866,44 @@
+@@ -839,21 +899,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("The PyQt Python package will be installed in %s." % opts.pyqtmoddir)
--    sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opts.plugindir, "designer"))
+-
+-    if opts.designer_plugin:
 +    if freebsd:
 +        if not freebsd_port in ('dbus', 'demo', 'designerplugin'):
 +            sipconfig.inform("This PyQt module will be built: %s." % pyqt_modules[-1])
@@ -214,7 +215,7 @@
 +    else:
 +        sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
 +        sipconfig.inform("The PyQt Python package will be installed in %s." % opts.pyqtmoddir)
-+        sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opts.plugindir, "designer"))
+         sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opts.plugindir, "designer"))
  
      if opts.api:
 -        sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opts.qscidir, "api", "python"))
@@ -250,7 +251,7 @@
  
      if opts.vendorcheck:
          sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -1186,7 +1271,11 @@
+@@ -1253,7 +1336,11 @@
      of libraries.
      extra_sip_flags is an optional list of additional flags to pass to SIP.
      """
@@ -263,7 +264,7 @@
  
      mk_clean_dir(mname)
  
-@@ -1258,7 +1347,11 @@
+@@ -1325,7 +1412,11 @@
          sipconfig.error("Unable to create the C++ code.")
  
      # Generate the Makefile.
@@ -276,7 +277,7 @@
  
      installs = []
  
-@@ -1679,6 +1772,10 @@
+@@ -1764,6 +1855,10 @@
          p.print_help()
          sys.exit(2)
  
@@ -287,7 +288,7 @@
      sipcfg.set_build_macros(macros)
  
      # Check Qt is what we need.
-@@ -1686,7 +1783,7 @@
+@@ -1771,7 +1866,7 @@
  
      # Check the licenses are compatible.
      check_license()
@@ -296,7 +297,7 @@
      # Check which modules to build.
      pyqt.check_modules()
  
-@@ -1708,9 +1805,18 @@
+@@ -1793,9 +1888,18 @@
      installs=[(pyqt.module_installs(), pyqt_modroot)]
  
      if opts.api:
@@ -317,7 +318,7 @@
  
      if opts.bigqt:
          xtra_modules.append("_qt")
-@@ -1721,14 +1827,31 @@
+@@ -1806,14 +1910,31 @@
          if opts.mwg_qwt_dir:
              xtra_modules.append("Qwt5")
  
diff --git a/devel/py-qt4-core/pkg-plist b/devel/py-qt4-core/pkg-plist
index cc4f089415a3..4836bec71646 100644
--- a/devel/py-qt4-core/pkg-plist
+++ b/devel/py-qt4-core/pkg-plist
@@ -39,6 +39,9 @@ bin/pyuic4
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/exceptions.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/exceptions.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/icon_cache.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/icon_cache.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/icon_cache.pyo
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyo
@@ -57,82 +60,90 @@ bin/pyuic4
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qscintilla.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qscintilla.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qscintilla.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyo
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qwt.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qwt.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qwt.pyo
-%%SIPFILES%%%%SIPDIR%%/QtCore/QtCoremod.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qabstracteventdispatcher.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qabstractfileengine.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qabstractitemmodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qbasictimer.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qbitarray.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qbuffer.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qbytearray.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qbytearraymatcher.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qchar.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qcoreapplication.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qcoreevent.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qcryptographichash.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qdatastream.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qdatetime.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qdir.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qdiriterator.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qeventloop.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qfile.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qfileinfo.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qfilesystemwatcher.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qfsfileengine.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qglobal.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qiodevice.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qlibrary.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qlibraryinfo.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qline.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qlist.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qlocale.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qmap.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qmetaobject.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qmimedata.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qmutex.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qnamespace.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qnumeric.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qobject.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qobjectcleanuphandler.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qobjectdefs.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qpair.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qpluginloader.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qpoint.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qprocess.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qreadwritelock.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qrect.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qregexp.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qresource.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qsemaphore.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qsettings.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qsignalmapper.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qsize.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qsocketnotifier.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qstring.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qstringlist.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qstringmatcher.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qtemporaryfile.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qtextcodec.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qtextstream.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qthread.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qtimeline.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qtimer.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qtranslator.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qurl.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/quuid.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qvariant.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qvector.sip
-%%SIPFILES%%%%SIPDIR%%/QtCore/qwaitcondition.sip
-%%API%%%%APIFILE%%
-@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler
-@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Loader
+%%SIP%%share/py-sip/QtCore/QtCoremod.sip
+%%SIP%%share/py-sip/QtCore/qabstracteventdispatcher.sip
+%%SIP%%share/py-sip/QtCore/qabstractfileengine.sip
+%%SIP%%share/py-sip/QtCore/qabstractitemmodel.sip
+%%SIP%%share/py-sip/QtCore/qbasictimer.sip
+%%SIP%%share/py-sip/QtCore/qbitarray.sip
+%%SIP%%share/py-sip/QtCore/qbuffer.sip
+%%SIP%%share/py-sip/QtCore/qbytearray.sip
+%%SIP%%share/py-sip/QtCore/qbytearraymatcher.sip
+%%SIP%%share/py-sip/QtCore/qchar.sip
+%%SIP%%share/py-sip/QtCore/qcoreapplication.sip
+%%SIP%%share/py-sip/QtCore/qcoreevent.sip
+%%SIP%%share/py-sip/QtCore/qcryptographichash.sip
+%%SIP%%share/py-sip/QtCore/qdatastream.sip
+%%SIP%%share/py-sip/QtCore/qdatetime.sip
+%%SIP%%share/py-sip/QtCore/qdir.sip
+%%SIP%%share/py-sip/QtCore/qdiriterator.sip
+%%SIP%%share/py-sip/QtCore/qeventloop.sip
+%%SIP%%share/py-sip/QtCore/qfile.sip
+%%SIP%%share/py-sip/QtCore/qfileinfo.sip
+%%SIP%%share/py-sip/QtCore/qfilesystemwatcher.sip
+%%SIP%%share/py-sip/QtCore/qfsfileengine.sip
+%%SIP%%share/py-sip/QtCore/qglobal.sip
+%%SIP%%share/py-sip/QtCore/qhash.sip
+%%SIP%%share/py-sip/QtCore/qiodevice.sip
+%%SIP%%share/py-sip/QtCore/qlibrary.sip
+%%SIP%%share/py-sip/QtCore/qlibraryinfo.sip
+%%SIP%%share/py-sip/QtCore/qline.sip
+%%SIP%%share/py-sip/QtCore/qlist.sip
+%%SIP%%share/py-sip/QtCore/qlocale.sip
+%%SIP%%share/py-sip/QtCore/qmap.sip
+%%SIP%%share/py-sip/QtCore/qmetaobject.sip
+%%SIP%%share/py-sip/QtCore/qmetatype.sip
+%%SIP%%share/py-sip/QtCore/qmimedata.sip
+%%SIP%%share/py-sip/QtCore/qmutex.sip
+%%SIP%%share/py-sip/QtCore/qnamespace.sip
+%%SIP%%share/py-sip/QtCore/qnumeric.sip
+%%SIP%%share/py-sip/QtCore/qobject.sip
+%%SIP%%share/py-sip/QtCore/qobjectcleanuphandler.sip
+%%SIP%%share/py-sip/QtCore/qobjectdefs.sip
+%%SIP%%share/py-sip/QtCore/qpair.sip
+%%SIP%%share/py-sip/QtCore/qpluginloader.sip
+%%SIP%%share/py-sip/QtCore/qpoint.sip
+%%SIP%%share/py-sip/QtCore/qprocess.sip
+%%SIP%%share/py-sip/QtCore/qreadwritelock.sip
+%%SIP%%share/py-sip/QtCore/qrect.sip
+%%SIP%%share/py-sip/QtCore/qregexp.sip
+%%SIP%%share/py-sip/QtCore/qresource.sip
+%%SIP%%share/py-sip/QtCore/qrunnable.sip
+%%SIP%%share/py-sip/QtCore/qsemaphore.sip
+%%SIP%%share/py-sip/QtCore/qsettings.sip
+%%SIP%%share/py-sip/QtCore/qsharedmemory.sip
+%%SIP%%share/py-sip/QtCore/qsignalmapper.sip
+%%SIP%%share/py-sip/QtCore/qsize.sip
+%%SIP%%share/py-sip/QtCore/qsocketnotifier.sip
+%%SIP%%share/py-sip/QtCore/qstring.sip
+%%SIP%%share/py-sip/QtCore/qstringlist.sip
+%%SIP%%share/py-sip/QtCore/qstringmatcher.sip
+%%SIP%%share/py-sip/QtCore/qsystemsemaphore.sip
+%%SIP%%share/py-sip/QtCore/qtemporaryfile.sip
+%%SIP%%share/py-sip/QtCore/qtextboundaryfinder.sip
+%%SIP%%share/py-sip/QtCore/qtextcodec.sip
+%%SIP%%share/py-sip/QtCore/qtextstream.sip
+%%SIP%%share/py-sip/QtCore/qthread.sip
+%%SIP%%share/py-sip/QtCore/qthreadpool.sip
+%%SIP%%share/py-sip/QtCore/qtimeline.sip
+%%SIP%%share/py-sip/QtCore/qtimer.sip
+%%SIP%%share/py-sip/QtCore/qtranslator.sip
+%%SIP%%share/py-sip/QtCore/qurl.sip
+%%SIP%%share/py-sip/QtCore/quuid.sip
+%%SIP%%share/py-sip/QtCore/qvariant.sip
+%%SIP%%share/py-sip/QtCore/qvector.sip
+%%SIP%%share/py-sip/QtCore/qwaitcondition.sip
+%%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
+@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Loader
+@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler
 @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtCore
 @dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index fd8ad0817928..e5230e2dff97 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -6,15 +6,13 @@
 
 PORTNAME=	dbus
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	3
 PORTEPOCH=	1
-
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
 DISTNAME=	${PYQT4_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, D-BUS module
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \
@@ -25,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus \
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake moc
+QT_COMPONENTS=	corelib qmake_build moc_build
 USE_XORG=	x11 xext
 
 OPTIONS=	DEBUG	"Enable debugging in generated code" off \
@@ -35,9 +33,11 @@ PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
 OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
 ARGS=		-b ${PREFIX}/bin\
-		-d ${PYTHON_SITELIBDIR}\
-		-q ${QT_PREFIX}/bin/qmake-qt4\
-		--confirm-license
+		-d ${PYTHONPREFIX_SITELIBDIR}\
+		-p ${PREFIX}/${QT_PLUGINDIR_REL}\
+		-q ${QMAKE}\
+		--confirm-license\
+		--enable QtCore
 
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
@@ -48,7 +48,6 @@ ARGS+=		--debug
 .if defined(WITH_TRACING)
 ARGS+=		--trace
 .endif
-ARGS+=		--enable QtCore
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
diff --git a/devel/py-qt4-dbus/distinfo b/devel/py-qt4-dbus/distinfo
index 8c72753540f7..886226b81fb2 100644
--- a/devel/py-qt4-dbus/distinfo
+++ b/devel/py-qt4-dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4
-SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55
-SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266
+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
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index 9c30b3dda3e5..8239311ffb72 100644
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@@ -6,17 +6,16 @@
 
 PORTNAME=	designer
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
-
+PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
 DISTNAME=	${PYQT4_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, QtDesigner module
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
 		${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml \
 		${PKGNAMEPREFIX}script>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-script
@@ -24,7 +23,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	designer moc gui xml qmake
+QT_COMPONENTS=	gui xml designer moc_build qmake_build
 
 OPTIONS=	API		"Install QtDesigner API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@@ -34,11 +33,14 @@ OPTIONS=	API		"Install QtDesigner API for QScintilla2" on \
 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 ${PYTHON_SITELIBDIR}\
-		-q ${QT_PREFIX}/bin/qmake-qt4\
-		--confirm-license
+		-d ${PYTHONPREFIX_SITELIBDIR}\
+		-p ${PREFIX}/${QT_PLUGINDIR_REL}\
+		-q ${QMAKE}\
+		--confirm-license\
+		--enable QtDesigner
 
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
@@ -49,26 +51,21 @@ ARGS+=		--debug
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
-PLIST_SUB+=	APIFILE="@comment "
 .else
-LIB_DEPENDS+=	qscintilla2.3:${PORTSDIR}/devel/qscintilla2
-ARGS+=		--qsci-api
+LIB_DEPENDS+=	qscintilla2.5:${PORTSDIR}/devel/qscintilla2
+ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
-PLIST_SUB+=	APIFILE="share/qt4/qsci/api/python/QtDesigner.api"
 .endif
 .if defined(WITHOUT_SIPFILES)
 ARGS+=		--no-sip-files
-PLIST_SUB+=	SIPFILES="@comment "
-PLIST_SUB+=	SIPDIR="@comment "
+PLIST_SUB+=	SIP="@comment "
 .else
 ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIPFILES=""
-PLIST_SUB+=	SIPDIR="share/py-sip"
+PLIST_SUB+=	SIP=""
 .endif
 .if defined(WITH_TRACING)
 ARGS+=		--trace
 .endif
-ARGS+=		--enable QtDesigner
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
diff --git a/devel/py-qt4-designer/distinfo b/devel/py-qt4-designer/distinfo
index 8c72753540f7..886226b81fb2 100644
--- a/devel/py-qt4-designer/distinfo
+++ b/devel/py-qt4-designer/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4
-SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55
-SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266
+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
diff --git a/devel/py-qt4-designer/pkg-plist b/devel/py-qt4-designer/pkg-plist
index 69a27ea7f1a9..b687068186f7 100644
--- a/devel/py-qt4-designer/pkg-plist
+++ b/devel/py-qt4-designer/pkg-plist
@@ -1,31 +1,29 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtDesigner.so
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/QtDesignermod.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/abstractactioneditor.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/abstractformbuilder.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/abstractformeditor.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/abstractformwindow.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/abstractformwindowcursor.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/abstractformwindowmanager.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/abstractobjectinspector.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/abstractpropertyeditor.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/abstractwidgetbox.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/container.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/customwidget.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/default_extensionfactory.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/extension.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/formbuilder.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/membersheet.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/propertysheet.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/qextensionmanager.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/qpydesignercontainerextension.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/qpydesignercustomwidgetcollectionplugin.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/qpydesignercustomwidgetplugin.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/qpydesignermembersheetextension.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/qpydesignerpropertysheetextension.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/qpydesignertaskmenuextension.sip
-%%SIPFILES%%%%SIPDIR%%/QtDesigner/taskmenu.sip
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtDesigner
-%%API%%%%APIFILE%%
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/QtDesigner/QtDesignermod.sip
+%%SIP%%share/py-sip/QtDesigner/abstractactioneditor.sip
+%%SIP%%share/py-sip/QtDesigner/abstractformbuilder.sip
+%%SIP%%share/py-sip/QtDesigner/abstractformeditor.sip
+%%SIP%%share/py-sip/QtDesigner/abstractformwindow.sip
+%%SIP%%share/py-sip/QtDesigner/abstractformwindowcursor.sip
+%%SIP%%share/py-sip/QtDesigner/abstractformwindowmanager.sip
+%%SIP%%share/py-sip/QtDesigner/abstractobjectinspector.sip
+%%SIP%%share/py-sip/QtDesigner/abstractpropertyeditor.sip
+%%SIP%%share/py-sip/QtDesigner/abstractwidgetbox.sip
+%%SIP%%share/py-sip/QtDesigner/container.sip
+%%SIP%%share/py-sip/QtDesigner/customwidget.sip
+%%SIP%%share/py-sip/QtDesigner/default_extensionfactory.sip
+%%SIP%%share/py-sip/QtDesigner/extension.sip
+%%SIP%%share/py-sip/QtDesigner/formbuilder.sip
+%%SIP%%share/py-sip/QtDesigner/membersheet.sip
+%%SIP%%share/py-sip/QtDesigner/propertysheet.sip
+%%SIP%%share/py-sip/QtDesigner/qextensionmanager.sip
+%%SIP%%share/py-sip/QtDesigner/qpydesignercontainerextension.sip
+%%SIP%%share/py-sip/QtDesigner/qpydesignercustomwidgetcollectionplugin.sip
+%%SIP%%share/py-sip/QtDesigner/qpydesignercustomwidgetplugin.sip
+%%SIP%%share/py-sip/QtDesigner/qpydesignermembersheetextension.sip
+%%SIP%%share/py-sip/QtDesigner/qpydesignerpropertysheetextension.sip
+%%SIP%%share/py-sip/QtDesigner/qpydesignertaskmenuextension.sip
+%%SIP%%share/py-sip/QtDesigner/taskmenu.sip
+%%API%%share/qt4/qsci/api/python/QtDesigner.api
+%%SIP%%@dirrm share/py-sip/QtDesigner
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile
index f1d15be60be4..9910a2929817 100644
--- a/devel/py-qt4-designerplugin/Makefile
+++ b/devel/py-qt4-designerplugin/Makefile
@@ -6,15 +6,13 @@
 
 PORTNAME=	designerplugin
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
 DISTNAME=	${PYQT4_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, QtDesigner plugin
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
@@ -23,7 +21,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	designer moc gui xml qmake
+QT_COMPONENTS=	gui xml designer moc_build qmake_build
 
 OPTIONS=	DEBUG		"Enable debugging in generated code" off \
 		TRACING		"Enable tracing in generated code" off
@@ -32,9 +30,11 @@ PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
 OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
 ARGS=		-b ${PREFIX}/bin\
-		-d ${PYTHON_SITELIBDIR}\
-		-q ${QT_PREFIX}/bin/qmake-qt4\
-		--confirm-license
+		-d ${PYTHONPREFIX_SITELIBDIR}\
+		-p ${PREFIX}/${QT_PLUGINDIR_REL}\
+		-q ${QMAKE}\
+		--confirm-license\
+		--enable QtDesigner
 
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
@@ -45,16 +45,15 @@ ARGS+=		--debug
 .if defined(WITH_TRACING)
 ARGS+=		--trace
 .endif
-ARGS+=		--enable QtDesigner
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
 
 post-configure:
-	${REINPLACE_CMD} -e 's|CC = cc|CC = ${CC}|'\
-		-e 's|CXX = c++|CXX = ${CXX}|'\
-		-e 's|LINK = c++|LINK = ${CXX}|'\
+	${REINPLACE_CMD} -e 's|CC .*|CC = ${CC}|'\
+		-e 's|CXX .*|CXX = ${CXX}|'\
+		-e 's|LINK .*|LINK = ${CXX}|'\
 		${WRKSRC}/designer/Makefile
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-qt4-designerplugin/distinfo b/devel/py-qt4-designerplugin/distinfo
index 8c72753540f7..886226b81fb2 100644
--- a/devel/py-qt4-designerplugin/distinfo
+++ b/devel/py-qt4-designerplugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4
-SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55
-SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266
+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
diff --git a/devel/py-qt4-designerplugin/pkg-plist b/devel/py-qt4-designerplugin/pkg-plist
index ca9111d0f20f..7b5a3ea9ab53 100644
--- a/devel/py-qt4-designerplugin/pkg-plist
+++ b/devel/py-qt4-designerplugin/pkg-plist
@@ -1,4 +1,4 @@
-lib/qt4/plugins/designer/libpythonplugin.so
-@exec mkdir -p %D/lib/qt4/plugins/designer/python
-@dirrmtry lib/qt4/plugins/designer/python
-@dirrmtry lib/qt4/plugins/designer
+%%QT_PLUGINDIR_REL%%/designer/libpythonplugin.so
+@exec mkdir -p %D/%%QT_PLUGINDIR_REL%%/designer/python
+@dirrmtry %%QT_PLUGINDIR_REL%%/designer/python
+@dirrmtry %%QT_PLUGINDIR_REL%%/designer
diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile
new file mode 100644
index 000000000000..38270599f225
--- /dev/null
+++ b/devel/py-qt4-help/Makefile
@@ -0,0 +1,79 @@
+# New ports collection makefile for:	py-qt4-help
+# Date created:		2009-02-13
+# Whom:			Max Brazhnikov <makc@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	help
+PORTVERSION=	${PYQT4_VERSION}
+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, QtHelp module
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
+RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
+
+HAS_CONFIGURE=	yes
+USE_PYTHON=	2.5+
+USE_QT_VER=	4
+QT_COMPONENTS=	help qmake_build
+
+OPTIONS=	API		"Install QtHelp API for QScintilla2" on \
+		DEBUG		"Enable debugging in generated code" off \
+		SIPFILES	"Install the QtHelp 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 QtHelp
+
+.include "../../devel/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}/QtHelp/Makefile
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-qt4-help/distinfo b/devel/py-qt4-help/distinfo
new file mode 100644
index 000000000000..886226b81fb2
--- /dev/null
+++ b/devel/py-qt4-help/distinfo
@@ -0,0 +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
diff --git a/devel/py-qt4-help/pkg-descr b/devel/py-qt4-help/pkg-descr
new file mode 100644
index 000000000000..8ab0c05e518e
--- /dev/null
+++ b/devel/py-qt4-help/pkg-descr
@@ -0,0 +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/
diff --git a/devel/py-qt4-help/pkg-plist b/devel/py-qt4-help/pkg-plist
new file mode 100644
index 000000000000..308c7d9abf14
--- /dev/null
+++ b/devel/py-qt4-help/pkg-plist
@@ -0,0 +1,12 @@
+%%PYTHON_SITELIBDIR%%/PyQt4/QtHelp.so
+%%SIP%%share/py-sip/QtHelp/QtHelpmod.sip
+%%SIP%%share/py-sip/QtHelp/qhelpcontentwidget.sip
+%%SIP%%share/py-sip/QtHelp/qhelpengine.sip
+%%SIP%%share/py-sip/QtHelp/qhelpenginecore.sip
+%%SIP%%share/py-sip/QtHelp/qhelpindexwidget.sip
+%%SIP%%share/py-sip/QtHelp/qhelpsearchengine.sip
+%%SIP%%share/py-sip/QtHelp/qhelpsearchquerywidget.sip
+%%SIP%%share/py-sip/QtHelp/qhelpsearchresultwidget.sip
+%%API%%share/qt4/qsci/api/python/QtHelp.api
+@dirrm %%SIP%%share/py-sip/QtHelp
+@dirrm %%PYTHON_SITELIBDIR%%/PyQt4
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index 84a7c21ea810..4cff3c2c0552 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -6,19 +6,16 @@
 
 PORTNAME=	qscintilla2
 PORTVERSION=	${QSCI2_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_QSCI2}
-
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
 DISTNAME=	${QSCI2_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for QScintilla2 (PyQt4), QSci module
 
-LIB_DEPENDS=	qscintilla2.3:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS=	qscintilla2.5:${PORTSDIR}/devel/qscintilla2
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \
 		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:${PORTSDIR}/devel/py-qt4-core \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
@@ -36,8 +33,10 @@ OPTIONS=	API		"Install binding API for QScintilla2" on \
 
 OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
-ARGS=		-p 4 -d ${PYTHON_SITELIBDIR}/PyQt4
+QSCIDIR=	${PREFIX}/share/qt4/qsci
+ARGS=		-p 4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4
 WRKSRC=		${WRKDIR}/${DISTNAME}/Python
+ALL_TARGET=	#empty
 
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
@@ -50,19 +49,16 @@ ARGS+=		-u
 .if defined(WITHOUT_API)
 ARGS+=		-a /dev/null
 PLIST_SUB+=	API="@comment "
-PLIST_SUB+=	APIFILE="@comment "
 .else
+ARGS+=		-a ${QSCIDIR}
 PLIST_SUB+=	API=""
-PLIST_SUB+=	APIFILE="share/qt4/qsci/api/python/QScintilla2.api"
 .endif
 .if defined(WITHOUT_SIPFILES)
 ARGS+=		-v /dev/null
-PLIST_SUB+=	SIPFILES="@comment "
-PLIST_SUB+=	SIPDIR="@comment "
+PLIST_SUB+=	SIP="@comment "
 .else
 ARGS+=		-v ${SIPDIR}
-PLIST_SUB+=	SIPFILES=""
-PLIST_SUB+=	SIPDIR="share/py-sip"
+PLIST_SUB+=	SIP=""
 .endif
 .if defined(WITH_TRACING)
 ARGS+=		-r
@@ -73,17 +69,10 @@ do-configure:
 		${PYTHON_CMD} configure.py ${ARGS}
 
 post-configure:
-	${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile &&\
-		${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g'\
-			-e 's|%%QT_INCDIR%%|${QT_INCDIR}|g'\
-			-e 's|%%QT_LIBDIR%%|${QT_LIBDIR}|g'\
-			-e 's|%%PYVER%%|${PYVER}|g'\
+		${REINPLACE_CMD} \
 			-e 's|CC = cc|CC = ${CC}|'\
 			-e 's|CXX = c++|CXX = ${CXX}|'\
 			-e 's|LINK = c++|LINK = ${CXX}|'\
 			${WRKSRC}/Makefile
 
-do-build:
-	cd ${WRKSRC} && ${MAKE}
-
 .include <bsd.port.post.mk>
diff --git a/devel/py-qt4-qscintilla2/distinfo b/devel/py-qt4-qscintilla2/distinfo
index 08d8cdb3e0d0..c8b01acb0103 100644
--- a/devel/py-qt4-qscintilla2/distinfo
+++ b/devel/py-qt4-qscintilla2/distinfo
@@ -1,3 +1,3 @@
-MD5 (QScintilla-gpl-2.2.tar.gz) = a6056c444494f3f849020d241f86c286
-SHA256 (QScintilla-gpl-2.2.tar.gz) = 307eef42f0f4910956f7260ab1f28752956b17af9014696a65660115cf3e7d37
-SIZE (QScintilla-gpl-2.2.tar.gz) = 1873664
+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
diff --git a/devel/py-qt4-qscintilla2/files/Makefile.in b/devel/py-qt4-qscintilla2/files/Makefile.in
deleted file mode 100644
index 803ee3682314..000000000000
--- a/devel/py-qt4-qscintilla2/files/Makefile.in
+++ /dev/null
@@ -1,122 +0,0 @@
-TARGET = Qsci.so
-OFILES = sipQscicmodule.o sipQsciQList.o sipQsciQsciPrinter.o sipQsciQsciMacro.o sipQsciQsciLexerVHDL.o sipQsciQsciLexerTeX.o sipQsciQsciLexerSQL.o sipQsciQsciLexerRuby.o sipQsciQsciLexerPython.o sipQsciQsciLexerProperties.o sipQsciQsciLexerPOV.o sipQsciQsciLexerPerl.o sipQsciQsciLexerMakefile.o sipQsciQsciLexerLua.o sipQsciQsciLexerJavaScript.o sipQsciQsciLexerJava.o sipQsciQsciLexerIDL.o sipQsciQsciLexerHTML.o sipQsciQsciLexerDiff.o sipQsciQsciLexerD.o sipQsciQsciLexerCSS.o sipQsciQsciLexerCSharp.o sipQsciQsciLexerCPP.o sipQsciQsciLexerCMake.o sipQsciQsciLexerBatch.o sipQsciQsciLexerBash.o sipQsciQsciLexer.o sipQsciQsciDocument.o sipQsciQsciCommandSet.o sipQsciQsciCommand.o sipQsciQsciAPIs.o sipQsciQsciScintillaBase.o sipQsciQsciScintilla.o
-HFILES = sipAPIQsci.h 
-
-CC = cc
-CXX = c++
-LINK = c++
-CPPFLAGS = -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_GUI_LIB\
-		-I%%LOCALBASE%%/include/python%%PYVER%%\
-		-I%%LOCALBASE%%/share/qt4/mkspecs/freebsd-g++\
-		-I%%QT_INCDIR%%/QtCore\
-		-I%%QT_INCDIR%%/QtGui\
-		-I%%QT_INCDIR%%\
-		-I. -I%%LOCALBASE%%/include
-CFLAGS = -pipe -fPIC -O2 -fno-strict-aliasing -Wall -W
-CXXFLAGS = -pipe -fPIC -O2 -fno-strict-aliasing -Wall -W
-LFLAGS = -shared -pthread -Wl,-rpath,%%LOCALBASE%%/lib
-LIBS = -L%%QT_LIBDIR%% -L%%LOCALBASE%%/lib -lqscintilla2 -lQtCore -lz -lm -pthread\
-	-lgthread-2.0 -lglib-2.0 -liconv -lQtGui -lXt -lpng -lSM -lICE\
-	-lXi -lXrender -lXrandr -lXfixes -lXcursor -lXinerama -lfreetype\
-	-lfontconfig -lXext -lX11
-MOC = %%LOCALBASE%%/bin/moc-qt4
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
-
-$(TARGET): $(OFILES)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
-
-$(OFILES): $(HFILES)
-
-install: $(TARGET)
-	@test -d $(DESTDIR)%%LOCALBASE%%/lib/python%%PYVER%%/site-packages/PyQt4 || mkdir -p $(DESTDIR)%%LOCALBASE%%/lib/python%%PYVER%%/site-packages/PyQt4
-	cp -f $(TARGET) $(DESTDIR)%%LOCALBASE%%/lib/python%%PYVER%%/site-packages/PyQt4/$(TARGET)
-	@test -d $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci || mkdir -p $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci
-	cp -f sip/qscilexermakefile.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexermakefile.sip
-	cp -f sip/qscilexerperl.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerperl.sip
-	cp -f sip/qscicommand.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscicommand.sip
-	cp -f sip/qscilexercmake.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexercmake.sip
-	cp -f sip/qscilexercpp.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexercpp.sip
-	cp -f sip/qscilexerproperties.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerproperties.sip
-	cp -f sip/qscilexercss.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexercss.sip
-	cp -f sip/qscilexer.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexer.sip
-	cp -f sip/qscilexerdiff.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerdiff.sip
-	cp -f sip/qscicommandset.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscicommandset.sip
-	cp -f sip/qscilexerhtml.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerhtml.sip
-	cp -f sip/qsciprinter.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qsciprinter.sip
-	cp -f sip/qscilexerruby.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerruby.sip
-	cp -f sip/qscimod3.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscimod3.sip
-	cp -f sip/qscimod4.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscimod4.sip
-	cp -f sip/qscilexersql.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexersql.sip
-	cp -f sip/qscilexertex.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexertex.sip
-	cp -f sip/qscimacro.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscimacro.sip
-	cp -f sip/qscilexerlua.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerlua.sip
-	cp -f sip/qsciapis.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qsciapis.sip
-	cp -f sip/qsciscintilla.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qsciscintilla.sip
-	cp -f sip/qscidocument.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscidocument.sip
-	cp -f sip/qscimodcommon.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscimodcommon.sip
-	cp -f sip/qscilexeridl.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexeridl.sip
-	cp -f sip/qscilexerjava.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerjava.sip
-	cp -f sip/qscilexerd.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerd.sip
-	cp -f sip/qscilexervhdl.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexervhdl.sip
-	cp -f sip/qscilexerpython.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerpython.sip
-	cp -f sip/qscilexerjavascript.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerjavascript.sip
-	cp -f sip/qscilexercsharp.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexercsharp.sip
-	cp -f sip/qscilexerpov.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerpov.sip
-	cp -f sip/qscilexerbatch.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerbatch.sip
-	cp -f sip/qsciscintillabase3.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qsciscintillabase3.sip
-	cp -f sip/qsciscintillabase4.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qsciscintillabase4.sip
-	cp -f sip/qscilexerbash.sip $(DESTDIR)%%LOCALBASE%%/share/py-sip/Qsci/qscilexerbash.sip
-	@test -d $(DESTDIR)%%LOCALBASE%%/share/qt4/qsci/api/python || mkdir -p $(DESTDIR)%%LOCALBASE%%/share/qt4/qsci/api/python
-	cp -f QScintilla2.api $(DESTDIR)%%LOCALBASE%%/share/qt4/qsci/api/python/QScintilla2.api
-
-clean:
-	-rm -f $(TARGET)
-	-rm -f sipQscicmodule.o
-	-rm -f sipQsciQList.o
-	-rm -f sipQsciQsciPrinter.o
-	-rm -f sipQsciQsciMacro.o
-	-rm -f sipQsciQsciLexerVHDL.o
-	-rm -f sipQsciQsciLexerTeX.o
-	-rm -f sipQsciQsciLexerSQL.o
-	-rm -f sipQsciQsciLexerRuby.o
-	-rm -f sipQsciQsciLexerPython.o
-	-rm -f sipQsciQsciLexerProperties.o
-	-rm -f sipQsciQsciLexerPOV.o
-	-rm -f sipQsciQsciLexerPerl.o
-	-rm -f sipQsciQsciLexerMakefile.o
-	-rm -f sipQsciQsciLexerLua.o
-	-rm -f sipQsciQsciLexerJavaScript.o
-	-rm -f sipQsciQsciLexerJava.o
-	-rm -f sipQsciQsciLexerIDL.o
-	-rm -f sipQsciQsciLexerHTML.o
-	-rm -f sipQsciQsciLexerDiff.o
-	-rm -f sipQsciQsciLexerD.o
-	-rm -f sipQsciQsciLexerCSS.o
-	-rm -f sipQsciQsciLexerCSharp.o
-	-rm -f sipQsciQsciLexerCPP.o
-	-rm -f sipQsciQsciLexerCMake.o
-	-rm -f sipQsciQsciLexerBatch.o
-	-rm -f sipQsciQsciLexerBash.o
-	-rm -f sipQsciQsciLexer.o
-	-rm -f sipQsciQsciDocument.o
-	-rm -f sipQsciQsciCommandSet.o
-	-rm -f sipQsciQsciCommand.o
-	-rm -f sipQsciQsciAPIs.o
-	-rm -f sipQsciQsciScintillaBase.o
-	-rm -f sipQsciQsciScintilla.o
diff --git a/devel/py-qt4-qscintilla2/pkg-plist b/devel/py-qt4-qscintilla2/pkg-plist
index 4daf1237b21c..73b30296c2ff 100644
--- a/devel/py-qt4-qscintilla2/pkg-plist
+++ b/devel/py-qt4-qscintilla2/pkg-plist
@@ -1,41 +1,47 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/Qsci.so
-%%SIPFILES%%%%SIPDIR%%/Qsci/qsciapis.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscicommand.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscicommandset.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscidocument.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexer.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerbash.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerbatch.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexercpp.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexercsharp.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexercss.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerd.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerdiff.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerhtml.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexeridl.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerjava.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerjavascript.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerlua.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexermakefile.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerperl.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerpov.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerproperties.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerpython.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexerruby.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexersql.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexertex.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscimacro.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscimod3.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscimod4.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscimodcommon.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qsciprinter.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexercmake.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qscilexervhdl.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qsciscintilla.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qsciscintillabase3.sip
-%%SIPFILES%%%%SIPDIR%%/Qsci/qsciscintillabase4.sip
-%%SIPFILES%%@dirrm %%SIPDIR%%/Qsci
-share/qt4/qsci/api/python/QScintilla2.api
-@dirrmtry share/qt4/qsci/api/python
-@dirrmtry share/qt4/qsci/api
-@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/Qsci/qsciabstractapis.sip
+%%SIP%%share/py-sip/Qsci/qsciapis.sip
+%%SIP%%share/py-sip/Qsci/qscicommand.sip
+%%SIP%%share/py-sip/Qsci/qscicommandset.sip
+%%SIP%%share/py-sip/Qsci/qscidocument.sip
+%%SIP%%share/py-sip/Qsci/qscilexer.sip
+%%SIP%%share/py-sip/Qsci/qscilexerbash.sip
+%%SIP%%share/py-sip/Qsci/qscilexerbatch.sip
+%%SIP%%share/py-sip/Qsci/qscilexercmake.sip
+%%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/qscilexerd.sip
+%%SIP%%share/py-sip/Qsci/qscilexerdiff.sip
+%%SIP%%share/py-sip/Qsci/qscilexerfortran.sip
+%%SIP%%share/py-sip/Qsci/qscilexerfortran77.sip
+%%SIP%%share/py-sip/Qsci/qscilexerhtml.sip
+%%SIP%%share/py-sip/Qsci/qscilexeridl.sip
+%%SIP%%share/py-sip/Qsci/qscilexerjava.sip
+%%SIP%%share/py-sip/Qsci/qscilexerjavascript.sip
+%%SIP%%share/py-sip/Qsci/qscilexerlua.sip
+%%SIP%%share/py-sip/Qsci/qscilexermakefile.sip
+%%SIP%%share/py-sip/Qsci/qscilexerpascal.sip
+%%SIP%%share/py-sip/Qsci/qscilexerperl.sip
+%%SIP%%share/py-sip/Qsci/qscilexerpostscript.sip
+%%SIP%%share/py-sip/Qsci/qscilexerpov.sip
+%%SIP%%share/py-sip/Qsci/qscilexerproperties.sip
+%%SIP%%share/py-sip/Qsci/qscilexerpython.sip
+%%SIP%%share/py-sip/Qsci/qscilexerruby.sip
+%%SIP%%share/py-sip/Qsci/qscilexersql.sip
+%%SIP%%share/py-sip/Qsci/qscilexertcl.sip
+%%SIP%%share/py-sip/Qsci/qscilexertex.sip
+%%SIP%%share/py-sip/Qsci/qscilexervhdl.sip
+%%SIP%%share/py-sip/Qsci/qscilexerxml.sip
+%%SIP%%share/py-sip/Qsci/qscilexeryaml.sip
+%%SIP%%share/py-sip/Qsci/qscimacro.sip
+%%SIP%%share/py-sip/Qsci/qscimod3.sip
+%%SIP%%share/py-sip/Qsci/qscimod4.sip
+%%SIP%%share/py-sip/Qsci/qscimodcommon.sip
+%%SIP%%share/py-sip/Qsci/qsciprinter.sip
+%%SIP%%share/py-sip/Qsci/qsciscintilla.sip
+%%SIP%%share/py-sip/Qsci/qsciscintillabase3.sip
+%%SIP%%share/py-sip/Qsci/qsciscintillabase4.sip
+%%API%%share/qt4/qsci/api/python/QScintilla2.api
+%%SIP%%@dirrm share/py-sip/Qsci
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile
index c73d476c22fb..80d1ffdc5a7f 100644
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@@ -6,15 +6,13 @@
 
 PORTNAME=	script
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
 DISTNAME=	${PYQT4_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, QtScript module
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
@@ -23,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=	script qmake
+QT_COMPONENTS=	script qmake_build
 
 OPTIONS=	API		"Install QtScript API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@@ -33,11 +31,14 @@ OPTIONS=	API		"Install QtScript API for QScintilla2" on \
 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 ${PYTHON_SITELIBDIR}\
-		-q ${QT_PREFIX}/bin/qmake-qt4\
-		--confirm-license
+		-d ${PYTHONPREFIX_SITELIBDIR}\
+		-p ${PREFIX}/${QT_PLUGINDIR_REL}\
+		-q ${QMAKE}\
+		--confirm-license\
+		--enable QtScript
 
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
@@ -48,26 +49,21 @@ ARGS+=		--debug
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
-PLIST_SUB+=	APIFILE="@comment "
 .else
-LIB_DEPENDS+=	qscintilla2.3:${PORTSDIR}/devel/qscintilla2
-ARGS+=		--qsci-api
+LIB_DEPENDS+=	qscintilla2.5:${PORTSDIR}/devel/qscintilla2
+ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
-PLIST_SUB+=	APIFILE="share/qt4/qsci/api/python/QtScript.api"
 .endif
 .if defined(WITHOUT_SIPFILES)
 ARGS+=		--no-sip-files
-PLIST_SUB+=	SIPFILES="@comment "
-PLIST_SUB+=	SIPDIR="@comment "
+PLIST_SUB+=	SIP="@comment "
 .else
 ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIPFILES=""
-PLIST_SUB+=	SIPDIR="share/py-sip"
+PLIST_SUB+=	SIP=""
 .endif
 .if defined(WITH_TRACING)
 ARGS+=		--trace
 .endif
-ARGS+=		--enable QtScript
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
diff --git a/devel/py-qt4-script/distinfo b/devel/py-qt4-script/distinfo
index 8c72753540f7..886226b81fb2 100644
--- a/devel/py-qt4-script/distinfo
+++ b/devel/py-qt4-script/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4
-SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55
-SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266
+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
diff --git a/devel/py-qt4-script/pkg-plist b/devel/py-qt4-script/pkg-plist
index bda6cb63f5fd..f44cecf29393 100644
--- a/devel/py-qt4-script/pkg-plist
+++ b/devel/py-qt4-script/pkg-plist
@@ -1,11 +1,14 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtScript.so
-%%SIPFILES%%%%SIPDIR%%/QtScript/QtScriptmod.sip
-%%SIPFILES%%%%SIPDIR%%/QtScript/qscriptcontext.sip
-%%SIPFILES%%%%SIPDIR%%/QtScript/qscriptengine.sip
-%%SIPFILES%%%%SIPDIR%%/QtScript/qscriptvalue.sip
-%%SIPFILES%%%%SIPDIR%%/QtScript/qscriptvalueiterator.sip
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtScript
-%%API%%%%APIFILE%%
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/QtScript/QtScriptmod.sip
+%%SIP%%share/py-sip/QtScript/qscriptclass.sip
+%%SIP%%share/py-sip/QtScript/qscriptclasspropertyiterator.sip
+%%SIP%%share/py-sip/QtScript/qscriptcontext.sip
+%%SIP%%share/py-sip/QtScript/qscriptcontextinfo.sip
+%%SIP%%share/py-sip/QtScript/qscriptengine.sip
+%%SIP%%share/py-sip/QtScript/qscriptengineagent.sip
+%%SIP%%share/py-sip/QtScript/qscriptstring.sip
+%%SIP%%share/py-sip/QtScript/qscriptvalue.sip
+%%SIP%%share/py-sip/QtScript/qscriptvalueiterator.sip
+%%API%%share/qt4/qsci/api/python/QtScript.api
+%%SIP%%@dirrm share/py-sip/QtScript
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile
index 3968c10b36ff..9d8e48ccad7c 100644
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@@ -6,15 +6,13 @@
 
 PORTNAME=	test
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
 DISTNAME=	${PYQT4_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, QtTest module
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
@@ -23,7 +21,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	qtestlib qmake
+QT_COMPONENTS=	qtestlib qmake_build
 
 OPTIONS=	API		"Install QtTest API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@@ -33,11 +31,14 @@ OPTIONS=	API		"Install QtTest API for QScintilla2" on \
 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 ${PYTHON_SITELIBDIR}\
-		-q ${QT_PREFIX}/bin/qmake-qt4\
-		--confirm-license
+		-d ${PYTHONPREFIX_SITELIBDIR}\
+		-p ${PREFIX}/${QT_PLUGINDIR_REL}\
+		-q ${QMAKE}\
+		--confirm-license\
+		--enable QtTest
 
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
@@ -48,26 +49,21 @@ ARGS+=		--debug
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
-PLIST_SUB+=	APIFILE="@comment "
 .else
-LIB_DEPENDS+=	qscintilla2.3:${PORTSDIR}/devel/qscintilla2
-ARGS+=		--qsci-api
+LIB_DEPENDS+=	qscintilla2.5:${PORTSDIR}/devel/qscintilla2
+ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
-PLIST_SUB+=	APIFILE="share/qt4/qsci/api/python/QtTest.api"
 .endif
 .if defined(WITHOUT_SIPFILES)
 ARGS+=		--no-sip-files
-PLIST_SUB+=	SIPFILES="@comment "
-PLIST_SUB+=	SIPDIR="@comment "
+PLIST_SUB+=	SIP="@comment "
 .else
 ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIPFILES=""
-PLIST_SUB+=	SIPDIR="share/py-sip"
+PLIST_SUB+=	SIP=""
 .endif
 .if defined(WITH_TRACING)
 ARGS+=		--trace
 .endif
-ARGS+=		--enable QtTest
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
diff --git a/devel/py-qt4-test/distinfo b/devel/py-qt4-test/distinfo
index 8c72753540f7..886226b81fb2 100644
--- a/devel/py-qt4-test/distinfo
+++ b/devel/py-qt4-test/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4
-SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55
-SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266
+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
diff --git a/devel/py-qt4-test/pkg-plist b/devel/py-qt4-test/pkg-plist
index 150b4debefbd..5e153ba9f2f5 100644
--- a/devel/py-qt4-test/pkg-plist
+++ b/devel/py-qt4-test/pkg-plist
@@ -1,12 +1,9 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtTest.so
-%%SIPFILES%%%%SIPDIR%%/QtTest/QtTestmod.sip
-%%SIPFILES%%%%SIPDIR%%/QtTest/qtestcase.sip
-%%SIPFILES%%%%SIPDIR%%/QtTest/qtestkeyboard.sip
-%%SIPFILES%%%%SIPDIR%%/QtTest/qtestmouse.sip
-%%SIPFILES%%%%SIPDIR%%/QtTest/qtestsystem.sip
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtTest
-@cwd %%LOCALBASE%%
-%%API%%%%APIFILE%%
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/QtTest/QtTestmod.sip
+%%SIP%%share/py-sip/QtTest/qtestcase.sip
+%%SIP%%share/py-sip/QtTest/qtestkeyboard.sip
+%%SIP%%share/py-sip/QtTest/qtestmouse.sip
+%%SIP%%share/py-sip/QtTest/qtestsystem.sip
+%%API%%share/qt4/qsci/api/python/QtTest.api
+%%SIP%%@dirrm share/py-sip/QtTest
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index b32b61b09506..93a3127aff03 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITES_SIP} ${MASTER_SITE_LOCAL}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${SIP_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python to C and C++ bindings generator
 
 USE_PYTHON=	2.5+
@@ -22,8 +22,8 @@ OPTIONS=	DEBUG "Build with debugging symbols" off
 DATADIR=	${PREFIX}/share/py-${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-ARGS=		-b ${PREFIX}/bin -d ${PYTHON_SITELIBDIR}\
-		-e ${PYTHON_INCLUDEDIR} -v ${DATADIR}
+ARGS=		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR}\
+		-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR}
 
 .include "files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
@@ -46,11 +46,11 @@ post-configure:
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR} && cd ${WRKSRC} && ${INSTALL_DATA}\
-		doc/default.css doc/sipref.txt doc/sipref.html\
+		doc/sipref.txt doc/sipref.html\
 		NEWS LICENSE ${DOCSDIR}
 .endif
 	${MKDIR} ${DATADIR} &&\
-		cd ${PYTHON_SITELIBDIR} &&\
+		cd ${PYTHONPREFIX_SITELIBDIR} &&\
 		${PYTHON_CMD} -c "import sipconfig" &&\
 		${PYTHON_CMD} -O -c "import sipconfig" &&\
 		${PYTHON_CMD} -c "import sipdistutils" &&\
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index da1223c1f954..1dfe3d8c44ba 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,3 +1,3 @@
-MD5 (sip-4.7.4.tar.gz) = 3bae6d0fb931fe2ddcd6f6c1da245afa
-SHA256 (sip-4.7.4.tar.gz) = 85921cbfe97c2aea13106e493f99259904bcdad379844ac14ad89061c442a13c
-SIZE (sip-4.7.4.tar.gz) = 447300
+MD5 (sip-4.7.9.tar.gz) = 597d7ff7edb42a18421c806ffd18a136
+SHA256 (sip-4.7.9.tar.gz) = 7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
+SIZE (sip-4.7.9.tar.gz) = 471372
diff --git a/devel/py-sip/files/bsd.pyqt.mk b/devel/py-sip/files/bsd.pyqt.mk
index 758b16468a37..9f79aafa79cf 100644
--- a/devel/py-sip/files/bsd.pyqt.mk
+++ b/devel/py-sip/files/bsd.pyqt.mk
@@ -1,30 +1,28 @@
 BSD_PYQT_MK_VERSION=	20080504
 
-PYQT_MAINTAINER=	danny@ricin.com
+PYQT_MAINTAINER=	kde@FreeBSD.org
 
 MASTER_SITE_RIVERBANK=	http://www.riverbankcomputing.com/static/Downloads/
 MASTER_SITE_RICIN=	http://freebsd.ricin.com/ports/distfiles/
 
-MASTER_SITES_SIP=	${MASTER_SITE_RIVERBANK}sip4/ ${MASTER_SITE_RICIN}
-MASTER_SITES_PYQT3=	${MASTER_SITE_RIVERBANK}PyQt3/ ${MASTER_SITE_RICIN}
-MASTER_SITES_PYQT4=	${MASTER_SITE_RIVERBANK}PyQt4/ ${MASTER_SITE_RICIN}
-MASTER_SITES_PYKDE3=	${MASTER_SITE_RIVERBANK}PyKDE3/ ${MASTER_SITE_RICIN}
-MASTER_SITES_PYKDE4=	${MASTER_SITE_RIVERBANK}PyKDE4/ ${MASTER_SITE_RICIN}
-MASTER_SITES_QSCI1=	${MASTER_SITE_RIVERBANK}QScintilla1/ ${MASTER_SITE_RICIN}
-MASTER_SITES_QSCI2=	${MASTER_SITE_RIVERBANK}QScintilla2/ ${MASTER_SITE_RICIN}
+MASTER_SITES_SIP=	${MASTER_SITE_RIVERBANK}sip4/
+MASTER_SITES_PYQT3=	${MASTER_SITE_RIVERBANK}PyQt3/
+MASTER_SITES_PYQT4=	${MASTER_SITE_RIVERBANK}PyQt4/
+MASTER_SITES_PYKDE3=	${MASTER_SITE_RIVERBANK}PyKDE3/
+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.4
-PYQT3_VERSION=		3.17.4
-PYQT4_VERSION=		4.3.3
-PYKDE3_VERSION=		3.16.1
-PYKDE4_VERSION=		4.0.2-1
+SIP_VERSION=		4.7.9
+PYQT3_VERSION=		3.17.6
+PYQT4_VERSION=		4.4.4
+PYKDE3_VERSION=		3.16.2
 QSCI1_VERSION=		1.7.1
-QSCI2_VERSION=		2.2
+QSCI2_VERSION=		2.3.2
 
 SIP_DISTNAME=		sip-${SIP_VERSION}
 PYQT3_DISTNAME=		PyQt-x11-gpl-${PYQT3_VERSION}
 PYQT4_DISTNAME=		PyQt-x11-gpl-${PYQT4_VERSION}
 PYKDE3_DISTNAME=	PyKDE-${PYKDE3_VERSION}
-PYKDE4_DISTNAME=	PyKDE4-${PYKDE4_VERSION}
 QSCI1_DISTNAME=		QScintilla-1.71-gpl-${QSCI1_VERSION}
 QSCI2_DISTNAME=		QScintilla-gpl-${QSCI2_VERSION}
diff --git a/devel/py-sip/pkg-plist b/devel/py-sip/pkg-plist
index 9db269c6add9..65f3f38b4aa4 100644
--- a/devel/py-sip/pkg-plist
+++ b/devel/py-sip/pkg-plist
@@ -1,9 +1,4 @@
 bin/sip
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/default.css
-%%PORTDOCS%%%%DOCSDIR%%/sipref.html
-%%PORTDOCS%%%%DOCSDIR%%/sipref.txt
 %%PYTHON_INCLUDEDIR%%/sip.h
 %%PYTHON_SITELIBDIR%%/sip.so
 %%PYTHON_SITELIBDIR%%/sipconfig.py
@@ -12,6 +7,10 @@ bin/sip
 %%PYTHON_SITELIBDIR%%/sipdistutils.py
 %%PYTHON_SITELIBDIR%%/sipdistutils.pyc
 %%PYTHON_SITELIBDIR%%/sipdistutils.pyo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/sipref.html
+%%PORTDOCS%%%%DOCSDIR%%/sipref.txt
 @exec mkdir -p %D/%%DATADIR%%
 @dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile
index dc2420cf18ef..fc3ab0f24b8f 100644
--- a/devel/qscintilla2-designerplugin/Makefile
+++ b/devel/qscintilla2-designerplugin/Makefile
@@ -6,32 +6,42 @@
 
 PORTNAME=	designerplugin
 PORTVERSION=	${QSCI2_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
-
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITES_QSCI2}
-
 PKGNAMEPREFIX=	qscintilla2-
 DISTNAME=	${QSCI2_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt Designer plugin for QScintilla2 (Qt4)
 
-LIB_DEPENDS=	qscintilla2.3:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS=	qscintilla2.5:${PORTSDIR}/devel/qscintilla2
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc gui xml designer
+QT_COMPONENTS=	qmake_build moc_build gui xml designer
 HAS_CONFIGURE=	yes
-USE_LDCONFIG=	${PREFIX}/lib/qt4/plugins/designer
+
+QMAKE_ARGS=	-unix PREFIX=${PREFIX}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/designer-Qt4
 
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
 
+pre-configure:
+	${REINPLACE_CMD} -e \
+		's|$$$$\[QT_INSTALL_PLUGINS\]|${PREFIX}/${QT_PLUGINDIR_REL}|' \
+		${WRKSRC}/designer.pro
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -unix PREFIX=${PREFIX} designer.pro
+		${QMAKE} ${QMAKE_ARGS} designer.pro
+
+post-configure:
+	${REINPLACE_CMD} -e \
+		's|^CC .*|CC=${CC}|; \
+		s|^CXX .*|CXX=${CXX}|; \
+		s|^LINK .*|LINK=${CXX}|' \
+		${WRKSRC}/Makefile
 
 .include <bsd.port.post.mk>
diff --git a/devel/qscintilla2-designerplugin/distinfo b/devel/qscintilla2-designerplugin/distinfo
index 08d8cdb3e0d0..c8b01acb0103 100644
--- a/devel/qscintilla2-designerplugin/distinfo
+++ b/devel/qscintilla2-designerplugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (QScintilla-gpl-2.2.tar.gz) = a6056c444494f3f849020d241f86c286
-SHA256 (QScintilla-gpl-2.2.tar.gz) = 307eef42f0f4910956f7260ab1f28752956b17af9014696a65660115cf3e7d37
-SIZE (QScintilla-gpl-2.2.tar.gz) = 1873664
+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
diff --git a/devel/qscintilla2-designerplugin/pkg-plist b/devel/qscintilla2-designerplugin/pkg-plist
index 24e871230bec..ab10d8248458 100644
--- a/devel/qscintilla2-designerplugin/pkg-plist
+++ b/devel/qscintilla2-designerplugin/pkg-plist
@@ -1,3 +1,3 @@
-lib/qt4/plugins/designer/libqscintillaplugin.so
-@dirrmtry lib/qt4/plugins/designer
-@dirrmtry lib/qt4/plugins
+%%QT_PLUGINDIR_REL%%/designer/libqscintillaplugin.so
+@dirrmtry %%QT_PLUGINDIR_REL%%/designer
+@dirrmtry %%QT_PLUGINDIR_REL%%
diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile
index c14df226ae71..3da8e3a0b9b4 100644
--- a/devel/qscintilla2/Makefile
+++ b/devel/qscintilla2/Makefile
@@ -6,68 +6,56 @@
 
 PORTNAME=	qscintilla2
 PORTVERSION=	${QSCI2_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
-
 MASTER_SITES=	${MASTER_SITES_QSCI2}
 DISTNAME=	${QSCI2_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt4 port of the Scintilla C++ editor class
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc gui xml designer
+QT_COMPONENTS=	qmake_build moc_build gui xml designer
 HAS_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
-OPTIONS=	HEADERS		"Install Qsci headers" on \
-		TRANSLATIONS	"Install translations (de, fr, pt_br, ru)" off
+BUILD_WRKSRC=		${WRKSRC}/Qt4
+INSTALL_WRKSRC=		${BUILD_WRKSRC}
 
-PLIST_SUB+=	QT_LIBDIR_REL=${QT_LIBDIR_REL}
+QMAKE_ARGS=	-unix PREFIX=${PREFIX}
 
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_HEADERS)
-PLIST_SUB+=	HEADERS="@comment "
-.else
-PLIST_SUB+=	HEADERS=""
-PLIST_SUB+=	QT_INCDIR_REL=${QT_INCDIR_REL}
-.endif
-.if defined(WITH_TRANSLATIONS)
-PLIST_SUB+=	TRANSLATIONS=""
+.if !defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS=""
 .else
-PLIST_SUB+=	TRANSLATIONS="@comment "
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	cd ${WRKSRC}/Qt4 && ${REINPLACE_CMD} -e \
-		's|$$$$\[QT_INSTALL_LIBS\]|${WRKSRC}/lib|' qscintilla.pro
-.if defined(WITHOUT_HEADERS)
-	cd ${WRKSRC}/Qt4 && ${REINPLACE_CMD} -e \
-		's|header trans qsci|trans qsci|' qscintilla.pro
-.endif
-.if !defined(WITH_TRANSLATIONS)
-	cd ${WRKSRC}/Qt4 && ${REINPLACE_CMD} -e \
+	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e \
+		's|$$$$\[QT_INSTALL_HEADERS\]|${PREFIX}/${QT_INCDIR_REL}|; \
+		s|$$$$\[QT_INSTALL_LIBS\]|${PREFIX}/${QT_LIBDIR_REL}|; \
+		s|$$$$\[QT_INSTALL_TRANSLATIONS\]|${PREFIX}/share/qt4/translations|; \
+		s|$$$$\[QT_INSTALL_DATA\]|${PREFIX}/share/qt4|' \
+		qscintilla.pro
+
+.if defined(WITHOUT_NLS)
+	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e \
 		's|trans qsci|qsci|' qscintilla.pro
 .endif
 
 do-configure:
-	cd ${WRKSRC}/Qt4 && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -unix PREFIX=${PREFIX} qscintilla.pro
-
-do-build:
-	cd ${WRKSRC}/Qt4 && ${MAKE}
+	cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+		${QMAKE} ${QMAKE_ARGS} qscintilla.pro
 
-do-install:
-	cd ${WRKSRC}/Qt4 && ${MAKE} install
-	cd ${WRKSRC}/lib &&\
-		${MV} libqscintilla2.so.3.0.0 libqscintilla2.so.3 &&\
-		${INSTALL_DATA} libqscintilla2.so.3 ${PREFIX}/${QT_LIBDIR_REL} &&\
-		cd ${PREFIX}/${QT_LIBDIR_REL} &&\
-		${LN} -sf libqscintilla2.so.3 libqscintilla2.so &&\
-		${RM} ${PREFIX}/share/qt4/qsci/api/python/Python-2.4.api
+post-configure:
+	${REINPLACE_CMD} -e \
+		's|^CC .*|CC=${CC}|; \
+		s|^CXX .*|CXX=${CXX}|; \
+		s|^LINK .*|LINK=${CXX}|' \
+		${BUILD_WRKSRC}/Makefile
 
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC} &&\
diff --git a/devel/qscintilla2/distinfo b/devel/qscintilla2/distinfo
index 08d8cdb3e0d0..c8b01acb0103 100644
--- a/devel/qscintilla2/distinfo
+++ b/devel/qscintilla2/distinfo
@@ -1,3 +1,3 @@
-MD5 (QScintilla-gpl-2.2.tar.gz) = a6056c444494f3f849020d241f86c286
-SHA256 (QScintilla-gpl-2.2.tar.gz) = 307eef42f0f4910956f7260ab1f28752956b17af9014696a65660115cf3e7d37
-SIZE (QScintilla-gpl-2.2.tar.gz) = 1873664
+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
diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist
index e1870692eac8..8b25f052d08e 100644
--- a/devel/qscintilla2/pkg-plist
+++ b/devel/qscintilla2/pkg-plist
@@ -1,6 +1,47 @@
+%%QT_INCDIR_REL%%/Qsci/qsciabstractapis.h
+%%QT_INCDIR_REL%%/Qsci/qsciapis.h
+%%QT_INCDIR_REL%%/Qsci/qscicommand.h
+%%QT_INCDIR_REL%%/Qsci/qscicommandset.h
+%%QT_INCDIR_REL%%/Qsci/qscidocument.h
+%%QT_INCDIR_REL%%/Qsci/qsciglobal.h
+%%QT_INCDIR_REL%%/Qsci/qscilexer.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerbash.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerbatch.h
+%%QT_INCDIR_REL%%/Qsci/qscilexercmake.h
+%%QT_INCDIR_REL%%/Qsci/qscilexercpp.h
+%%QT_INCDIR_REL%%/Qsci/qscilexercsharp.h
+%%QT_INCDIR_REL%%/Qsci/qscilexercss.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerd.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerdiff.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerfortran.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerfortran77.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerhtml.h
+%%QT_INCDIR_REL%%/Qsci/qscilexeridl.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerjava.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerjavascript.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerlua.h
+%%QT_INCDIR_REL%%/Qsci/qscilexermakefile.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerpascal.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerperl.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerpostscript.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerpov.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerproperties.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerpython.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerruby.h
+%%QT_INCDIR_REL%%/Qsci/qscilexersql.h
+%%QT_INCDIR_REL%%/Qsci/qscilexertcl.h
+%%QT_INCDIR_REL%%/Qsci/qscilexertex.h
+%%QT_INCDIR_REL%%/Qsci/qscilexervhdl.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerxml.h
+%%QT_INCDIR_REL%%/Qsci/qscilexeryaml.h
+%%QT_INCDIR_REL%%/Qsci/qscimacro.h
+%%QT_INCDIR_REL%%/Qsci/qsciprinter.h
+%%QT_INCDIR_REL%%/Qsci/qsciscintilla.h
+%%QT_INCDIR_REL%%/Qsci/qsciscintillabase.h
 %%QT_LIBDIR_REL%%/libqscintilla2.so
-%%QT_LIBDIR_REL%%/libqscintilla2.so.3
-share/qt4/qsci/api/python/Python-2.5.api
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.0
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.0.1
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -23,6 +64,8 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%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
@@ -35,20 +78,22 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerBash.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerBatch-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerBatch.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCMake.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCMake-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVHDL.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVHDL-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/classQsciLexerD.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
@@ -63,8 +108,12 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%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
@@ -73,8 +122,16 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerRuby.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSQL-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSQL.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/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
@@ -83,8 +140,8 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintilla.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintillaBase-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintillaBase.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_944256396c06c0295aa2eca7dcfea282.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_d32dfe2bcddd0b2d894b9fb13d6bdd4d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_556434f8084a0975d5f9aa83df897544.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_e71f21f8efaf379e3645c15d5d7e326c.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dirs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
@@ -167,60 +224,35 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%PORTDOCS%%%%DOCSDIR%%/html/tab_l.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/tab_r.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/tabs.css
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciapis.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscicommand.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscicommandset.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscidocument.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciglobal.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexer.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerbash.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerbatch.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercpp.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercsharp.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercmake.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercss.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerd.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerdiff.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerhtml.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexeridl.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerjava.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerjavascript.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerlua.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexermakefile.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerperl.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerpov.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerproperties.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerpython.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerruby.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexersql.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexertex.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexervhdl.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscimacro.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciprinter.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciscintilla.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciscintillabase.h
+%%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%%/application.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/application.qrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindow.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindow.h
-%%TRANSLATIONS%%share/qt4/translations/qscintilla_de.qm
-%%TRANSLATIONS%%share/qt4/translations/qscintilla_fr.qm
-%%TRANSLATIONS%%share/qt4/translations/qscintilla_pt_br.qm
-%%TRANSLATIONS%%share/qt4/translations/qscintilla_ru.qm
+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
+%%NLS%%share/qt4/translations/qscintilla_cs.qm
+%%NLS%%share/qt4/translations/qscintilla_de.qm
+%%NLS%%share/qt4/translations/qscintilla_fr.qm
+%%NLS%%share/qt4/translations/qscintilla_pt_br.qm
+%%NLS%%share/qt4/translations/qscintilla_ru.qm
+%%NLS%%@dirrmtry share/qt4/translations
 @dirrmtry share/qt4/qsci/api/python
 @dirrmtry share/qt4/qsci/api
 @dirrmtry share/qt4/qsci
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Scintilla
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/qt4
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%HEADERS%%@dirrm %%QT_INCDIR_REL%%/Qsci
-%%TRANSLATIONS%%@dirrmtry share/qt4/translations
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Scintilla
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry %%QT_LIBDIR_REL%%
+@dirrm %%QT_INCDIR_REL%%/Qsci
+@dirrmtry %%QT_INCDIR_REL%%
author	Max Brazhnikov <makc@FreeBSD.org>	2009-02-14 22:58:55 +0000
committer	Max Brazhnikov <makc@FreeBSD.org>	2009-02-14 22:58:55 +0000
commit	2d8b5de9c8741fee001355c270847ea6edebd952 (patch)
tree	94cebcca98b96f7b4488709cf970696ac272c0e6 /devel
parent	de086ca81bb97192fb9cd50dba868f783132c321 (diff)
download	ports-2d8b5de9c8741fee001355c270847ea6edebd952.tar.gz ports-2d8b5de9c8741fee001355c270847ea6edebd952.zip