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>
2009-02-14 22:58:55 +00:00 · 2009-02-14 22:58:55 +00:00 · 2d8b5de9c8
commit 2d8b5de9c8
parent de086ca81b
86 changed files with 1591 additions and 1086 deletions
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@ -31,7 +31,7 @@ CONFIGURE_ARGS+=-fast ${CUPS} -platform ${QMAKESPEC} \
 		-libdir ${PREFIX}/${QT_LIBDIR_REL} \
 		-docdir ${PREFIX}/share/doc/qt4 \
 		-headerdir ${PREFIX}/${QT_INCDIR_REL} \
-		-plugindir ${PREFIX}/lib/qt4/plugins \
+		-plugindir ${PREFIX}/${QT_PLUGINDIR_REL} \
 		-datadir ${PREFIX}/share/qt4 \
 		-translationdir ${PREFIX}/share/qt4/translations \
 		-sysconfdir ${PREFIX}/etc/xdg \
@ -61,10 +61,16 @@ CONFIGURE_ARGS+=-verbose

 QT_INCDIR_REL=	include/qt4
 QT_LIBDIR_REL=	lib/qt4
+QT_PLUGINDIR_REL=	lib/qt4/plugins
+
+PLIST_SUB+=	QT_INCDIR_REL=${QT_INCDIR_REL} \
+		QT_LIBDIR_REL=${QT_LIBDIR_REL} \
+		QT_PLUGINDIR_REL=${QT_PLUGINDIR_REL}

 QT_PREFIX?=	${LOCALBASE}
 QT_INCDIR?=	${QT_PREFIX}/${QT_INCDIR_REL}
 QT_LIBDIR?=	${QT_PREFIX}/${QT_LIBDIR_REL}
+QT_PLUGINDIR?=	${QT_PREFIX}/${QT_PLUGINDIR_REL}
 MOC?=		${QT_PREFIX}/bin/moc-qt4
 UIC?=		${QT_PREFIX}/bin/uic-qt4
 QMAKE?=		${QT_PREFIX}/bin/qmake-qt4
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@ -6,15 +6,13 @@

 PORTNAME=	sql
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	databases 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, QtSql 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=	sql qmake
+QT_COMPONENTS=	sql qmake_build

 OPTIONS=	API		"Install QtSql API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@ -33,11 +31,13 @@ OPTIONS=	API		"Install QtSql 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\

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
@ -48,21 +48,17 @@ 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/QtSql.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
--- a/databases/py-qt4-sql/distinfo
+++ b/databases/py-qt4-sql/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
--- a/databases/py-qt4-sql/pkg-plist
+++ b/databases/py-qt4-sql/pkg-plist
@ -1,20 +1,18 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtSql.so
-%%SIPFILES%%%%SIPDIR%%/QtSql/QtSqlmod.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsql.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqldatabase.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqldriver.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlerror.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlfield.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlindex.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlquery.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlquerymodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlrecord.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlrelationaldelegate.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlrelationaltablemodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqlresult.sip
-%%SIPFILES%%%%SIPDIR%%/QtSql/qsqltablemodel.sip
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtSql
-%%API%%%%APIFILE%%
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/QtSql/QtSqlmod.sip
+%%SIP%%share/py-sip/QtSql/qsql.sip
+%%SIP%%share/py-sip/QtSql/qsqldatabase.sip
+%%SIP%%share/py-sip/QtSql/qsqldriver.sip
+%%SIP%%share/py-sip/QtSql/qsqlerror.sip
+%%SIP%%share/py-sip/QtSql/qsqlfield.sip
+%%SIP%%share/py-sip/QtSql/qsqlindex.sip
+%%SIP%%share/py-sip/QtSql/qsqlquery.sip
+%%SIP%%share/py-sip/QtSql/qsqlquerymodel.sip
+%%SIP%%share/py-sip/QtSql/qsqlrecord.sip
+%%SIP%%share/py-sip/QtSql/qsqlrelationaldelegate.sip
+%%SIP%%share/py-sip/QtSql/qsqlrelationaltablemodel.sip
+%%SIP%%share/py-sip/QtSql/qsqlresult.sip
+%%SIP%%share/py-sip/QtSql/qsqltablemodel.sip
+%%API%%share/qt4/qsci/api/python/QtSql.api
+%%SIP%%@dirrmtry share/py-sip/QtSql
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- 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
--- 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}\
--- 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
--- 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
--- 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\
--- 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
--- a/devel/py-qt4-core/files/Qt.py
+++ b/devel/py-qt4-core/files/Qt.py
@ -11,6 +11,10 @@ try:
    from PyQt4.QtXml import *
 except ImportError:
    pass
+try:
+    from PyQt4.QtXmlPatterns import *
+except ImportError:
+    pass
 try:
    from PyQt4.QtAssistant import *
 except ImportError:
@ -43,6 +47,18 @@ try:
    from PyQt4.QtTest import *
 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:
--- 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")
 
--- 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
--- 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}\
--- 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
--- 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}\
--- 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
--- 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
--- 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>
--- 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
--- 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
--- a/devel/py-qt4-help/Makefile
+++ 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>
--- a/devel/py-qt4-help/distinfo
+++ 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
--- a/devel/py-qt4-help/pkg-descr
+++ 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/
--- a/devel/py-qt4-help/pkg-plist
+++ 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
--- 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>
--- 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
--- a/devel/py-qt4-qscintilla2/files/Makefile.in
+++ b/devel/py-qt4-qscintilla2/files/Makefile.in
@ -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
--- 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
--- 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}\
--- 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
--- 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
--- 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} \
--- 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
--- 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
--- 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" &&\
--- 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
--- 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}
--- 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%%
--- 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>
--- 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
--- 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%%
--- 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 "
+.if !defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS=""
 .else
-PLIST_SUB+=	HEADERS=""
-PLIST_SUB+=	QT_INCDIR_REL=${QT_INCDIR_REL}
-.endif
-.if defined(WITH_TRANSLATIONS)
-PLIST_SUB+=	TRANSLATIONS=""
-.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
+	cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+		${QMAKE} ${QMAKE_ARGS} qscintilla.pro

-do-build:
-	cd ${WRKSRC}/Qt4 && ${MAKE}
-
-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} &&\
--- 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
--- 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%%
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@ -6,15 +6,13 @@

 PORTNAME=	svg
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	graphics 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, QtSvg 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=	svg qmake
+QT_COMPONENTS=	svg qmake_build

 OPTIONS=	API		"Install QtSvg API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@ -33,11 +31,14 @@ OPTIONS=	API		"Install QtSvg 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 QtSvg

 .include "../../devel/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/QtSvg.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 QtSvg

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/graphics/py-qt4-svg/distinfo
+++ b/graphics/py-qt4-svg/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
--- a/graphics/py-qt4-svg/pkg-plist
+++ b/graphics/py-qt4-svg/pkg-plist
@ -1,11 +1,9 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtSvg.so
-%%SIPFILES%%%%SIPDIR%%/QtSvg/QtSvgmod.sip
-%%SIPFILES%%%%SIPDIR%%/QtSvg/qgraphicssvgitem.sip
-%%SIPFILES%%%%SIPDIR%%/QtSvg/qsvggenerator.sip
-%%SIPFILES%%%%SIPDIR%%/QtSvg/qsvgrenderer.sip
-%%SIPFILES%%%%SIPDIR%%/QtSvg/qsvgwidget.sip
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtSvg
-%%API%%%%APIFILE%%
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/QtSvg/QtSvgmod.sip
+%%SIP%%share/py-sip/QtSvg/qgraphicssvgitem.sip
+%%SIP%%share/py-sip/QtSvg/qsvggenerator.sip
+%%SIP%%share/py-sip/QtSvg/qsvgrenderer.sip
+%%SIP%%share/py-sip/QtSvg/qsvgwidget.sip
+%%API%%share/qt4/qsci/api/python/QtSvg.api
+%%SIP%%@dirrm share/py-sip/QtSvg
+@dirrm %%PYTHON_SITELIBDIR%%/PyQt4
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@ -6,15 +6,13 @@

 PORTNAME=	demo
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	misc 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, Qt demo and examples

 USE_PYTHON=	yes
@ -28,7 +26,7 @@ EXAMPLESDIR=	${PREFIX}/share/examples/py-qt4
 .include <bsd.port.pre.mk>

 .if !defined(WITHOUT_PYQT4)
-RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
+RUN_DEPENDS+=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
 		${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
 		${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network \
 		${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml \
@ -40,7 +38,11 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor
 		${PKGNAMEPREFIX}test>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-test \
 		${PKGNAMEPREFIX}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designer \
 		${PKGNAMEPREFIX}designerplugin>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designerplugin \
-		${PKGNAMEPREFIX}dbus>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-dbus
+		${PKGNAMEPREFIX}dbus>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-dbus \
+		${PKGNAMEPREFIX}xmlpatterns>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xmlpatterns \
+		${PKGNAMEPREFIX}help>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-help \
+		${PKGNAMEPREFIX}webkit>=${PYQT4_VERSION}:${PORTSDIR}/www/py-qt4-webkit \
+		${PKGNAMEPREFIX}phonon>=${PYQT4_VERSION}:${PORTSDIR}/multimedia/py-qt4-phonon
 .if !defined(NOPORTDOCS)
 RUN_DEPENDS+=	${PKGNAMEPREFIX}doc>=${PYQT4_VERSION}:${PORTSDIR}/misc/py-qt4-doc
 .endif
@ -55,10 +57,9 @@ do-build:

 do-install:
 .if !defined(NOPORTEXAMPLES)
-	cd ${WRKSRC} &&\
-		${RM} -f examples/designer/plugins/plugins.py.orig &&\
-		${MKDIR} ${EXAMPLESDIR} &&\
-		${CP} -R examples/ ${EXAMPLESDIR}
+	${RM} -f ${WRKSRC}/examples/designer/plugins/plugins.py.orig
+	${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 .else
 	@${ECHO} "NOPORTEXAMPLES is set -- installing nothing."
 .endif
--- a/misc/py-qt4-demo/distinfo
+++ b/misc/py-qt4-demo/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
--- a/misc/py-qt4-demo/pkg-plist
+++ b/misc/py-qt4-demo/pkg-plist
@ -15,6 +15,16 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/ui_mainwindow.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/webbrowser.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/webbrowser.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/No-Ones-Laughing-3.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialog.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialog.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs_rc.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/calculatorform/calculatorform.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/calculatorform/calculatorform.pyc
@ -29,10 +39,14 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/bubbleswidgetplugin.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/counterlabelplugin.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/counterlabelplugin.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/datetimeeditplugin.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/datetimeeditplugin.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/helloglwidgetplugin.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/helloglwidgetplugin.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/highlightedtexteditplugin.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/highlightedtexteditplugin.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/multipagewidgetplugin.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/multipagewidgetplugin.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/polygonwidgetplugin.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/polygonwidgetplugin.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python/pydemoplugin.py
@ -45,16 +59,29 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/bubbleswidget.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/counterlabel.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/counterlabel.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/datetimeedit.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/datetimeedit.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/helloglwidget.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/helloglwidget.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/highlightedtextedit.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/highlightedtextedit.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/multipagewidget.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/multipagewidget.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/polygonwidget.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/polygonwidget.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/pydemo.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/pydemo.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/pythonconsolewidget.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets/pythonconsolewidget.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/images/bad.svg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/images/heart.svg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/images/trash.svg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/systray.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/systray.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/systray.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/systray_rc.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop/systray/systray_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/complexwizard.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/complexwizard.pyc
@ -110,14 +137,51 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/mice.qrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/mice_rc.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/mice_rc.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/images/head.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot_rc.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/diagramscene.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/diagramscene.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/diagramscene.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/diagramscene_rc.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/diagramscene_rc.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/background1.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/background2.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/background3.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/background4.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/bold.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/bringtofront.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/delete.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/floodfill.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/italic.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/linecolor.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/linepointer.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/pointer.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/sendtoback.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/textpointer.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/diagramscene/images/underline.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot_rc.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/dragdroprobot_rc.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/images/head.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/elasticnodes.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/elasticnodes.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/backside.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/images/artsfftscope.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/images/blue_angle_swirl.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/images/kontact_contacts.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/images/kontact_journal.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/images/kontact_mail.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/images/kontact_notes.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/images/kopeteavailable.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/images/metacontact_online.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/images/minitools.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/padnavigator.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/padnavigator.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/padnavigator.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/padnavigator_rc.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/padnavigator_rc.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/ui_backside.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/padnavigator/ui_backside.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/basicsortfiltermodel.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/basicsortfiltermodel.pyc
@ -130,8 +194,8 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/chart/qtdata.cht
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/dirview.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/dirview.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/images/qt.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/images.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/images/qt.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/pixelator.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/pixelator.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/pixelator_rc.py
@ -274,6 +338,11 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/svgviewer/svgviewer_rc.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/transformations.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/transformations.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/phonon/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/phonon/capabilities.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/phonon/capabilities.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/phonon/musicplayer.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/phonon/musicplayer.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pyuic/compile-on-the-fly.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pyuic/compile-on-the-fly.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pyuic/demo.ui
@ -482,80 +551,90 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/saxbookmarks/jennifer.xbel
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/saxbookmarks/saxbookmarks.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/saxbookmarks/saxbookmarks.pyc
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/icons
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/calculatorform
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/python
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins/widgets
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer/plugins
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/designer
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/configdialog/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs/configdialog
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialogs
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggableicons/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggableicons
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/draggabletext
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/fridgemagnets
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/puzzle
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/images/
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/chart
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/pixelator
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/puzzle
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/simpletreemodel
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/layouts
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/application/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/application
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/dockwidgets/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/dockwidgets
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/mdi/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/mdi
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/sdi/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows/sdi
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindows
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/ftp/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network/ftp
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/network
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/textures/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/textures
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/basicdrawing/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/basicdrawing
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/svgviewer/files
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting/svgviewer
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/painting
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pyuic
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/syntaxhighlighter/examples
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext/syntaxhighlighter
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/script
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/threads
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/codecs/encodedfiles
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/codecs
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n/translations
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/i18n
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/qtdemo
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/settingseditor/inifiles/
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools/settingseditor
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tools
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/icons/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/icons
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie/icons
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/movie
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/tooltips/images
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets/tooltips
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/dombookmarks
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/saxbookmarks
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml
-@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml/saxbookmarks
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml/dombookmarks
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/tooltips/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/tooltips
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/movie/icons
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/movie
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/icons/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets/icons
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/widgets
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tutorial
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/settingseditor/inifiles
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/settingseditor
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/qtdemo/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/qtdemo
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/i18n/translations
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/i18n
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/codecs/encodedfiles
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools/codecs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tools
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/threads
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sql
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/script
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/richtext/syntaxhighlighter/examples
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/richtext/syntaxhighlighter
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/richtext
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pyuic
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/phonon
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/painting/svgviewer/files
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/painting/svgviewer
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/painting/basicdrawing/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/painting/basicdrawing
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/painting
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/opengl/textures/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/opengl/textures
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/opengl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/network/ftp/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/network/ftp
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/network
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mainwindows/sdi/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mainwindows/sdi
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mainwindows/mdi/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mainwindows/mdi
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mainwindows/dockwidgets/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mainwindows/dockwidgets
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mainwindows/application/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mainwindows/application
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mainwindows
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/layouts
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews/simpletreemodel
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews/puzzle
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews/pixelator/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews/pixelator
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews/chart
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/itemviews
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview/padnavigator/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview/padnavigator
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview/dragdroprobot/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview/dragdroprobot
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview/diagramscene/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview/diagramscene
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview/collidingmice/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview/collidingmice
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/draganddrop/puzzle
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/draganddrop/fridgemagnets
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/draganddrop/draggabletext
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/draganddrop/draggableicons/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/draganddrop/draggableicons
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/draganddrop
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dialogs/configdialog/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dialogs/configdialog
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dialogs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/desktop/systray/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/desktop/systray
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/desktop
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/designer/plugins/widgets
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/designer/plugins/python
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/designer/plugins
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/designer/calculatorform
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/designer
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos/embeddeddialogs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/activeqt/webbrowser/icons
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/activeqt/webbrowser
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/activeqt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
--- a/misc/py-qt4-doc/Makefile
+++ b/misc/py-qt4-doc/Makefile
@ -6,15 +6,13 @@

 PORTNAME=	doc
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
-
 CATEGORIES=	misc 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, documentation

 NO_BUILD=	yes
@ -27,10 +25,11 @@ do-install:
 	cd ${WRKSRC} &&\
 		${MKDIR} ${DOCSDIR} &&\
 		${INSTALL_DATA} ChangeLog GPL_EXCEPTION.TXT\
-				GPL_EXCEPTION_ADDENDUM.TXT LICENSE NEWS\
+				GPL_EXCEPTION_ADDENDUM.TXT NEWS\
+				LICENSE.GPL2 LICENSE.GPL3\
 				OPENSOURCE-NOTICE.TXT README THANKS\
-			${DOCSDIR} &&\
-		${CP} -R doc/ ${DOCSDIR}
+			${DOCSDIR}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}
 .else
 	@${ECHO} "NOPORTDOCS is set -- installing nothing."
 .endif
--- a/misc/py-qt4-doc/distinfo
+++ b/misc/py-qt4-doc/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
--- a/misc/py-qt4-doc/pkg-plist
+++ b/misc/py-qt4-doc/pkg-plist
@ -1,21 +1,17 @@
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/GPL_EXCEPTION.TXT
 %%PORTDOCS%%%%DOCSDIR%%/GPL_EXCEPTION_ADDENDUM.TXT
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.GPL2
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.GPL3
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/OPENSOURCE-NOTICE.TXT
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/default.css
 %%PORTDOCS%%%%DOCSDIR%%/html/assistant-manual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/images/alphachannelimage.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/alphafill.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/assistant-assistant.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/assistant-docwindow.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/assistant-search.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/assistant-sidebar.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/assistant-toolbar1.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/assistant-toolbar.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/bearings.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/brush-outline.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/brush-styles.png
@ -32,6 +28,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cde-lcdnumber.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cleanlooks-calendarwidget.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cleanlooks-pushbutton-menu.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/conceptaudio.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/conceptvideo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/containerextension-example.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cursor-arrow.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cursor-busy.png
@ -51,6 +49,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cursor-vsplit.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cursor-wait.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cursor-whatsthis.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/effectwidget.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/foreignkeys.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/frames.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/graphicsview-ellipseitem-pie.png
@ -103,9 +102,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/modelview-begin-remove-rows.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/motif-lcdnumber.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/motif-menubar.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/msgbox1.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/msgbox2.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/msgbox3.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/msgbox4.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/noforeignkeys.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/palette.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/parent-child-widgets.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/patternist-wordProcessor.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/plastique-checkbox.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/plastique-colordialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/plastique-dateedit.png
@ -151,9 +155,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qconicalgradient.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qdesktopwidget.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qerrormessage.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qformlayout-kde.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qformlayout-mac.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qformlayout-qpe.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qformlayout-win.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qgradient-conical.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qgradient-linear.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qgradient-radial.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qgraphicsproxywidget-embed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qhboxlayout-with-5-children.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qimage-32bit_scaled.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qimage-8bit_scaled.png
@ -163,8 +172,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qlineargradient-pad.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qlineargradient-reflect.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qlineargradient-repeat.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/qlinef-angle-identicaldirection.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/qlinef-angle-oppositedirection.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qlinef-bounded.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qlinef-normalvector.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qlinef-unbounded.png
@ -253,13 +260,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qt-fillrule-oddeven.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qt-fillrule-winding.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtabletevent-tilt.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qtableview-resized.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtextblock-sequence.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtextfragment-split.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtextframe-style.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtexttableformat-cell.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/qtransform-simpletransformation.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/qtransform-combinedtransformation2.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtransform-combinedtransformation.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qtransform-combinedtransformation2.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qtransform-simpletransformation.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtwizard-aero1.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtwizard-aero2.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qtwizard-classic1.png
@ -279,6 +287,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qurl-mailtopath.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qurl-querystring.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qvboxlayout-with-5-children.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qwebview-diagram.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qwebview-url.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/qworkspace-arrange.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/rb-logo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/relationaltable.png
@ -294,6 +304,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/threadsandobjects.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/udppackets.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/whatsthis.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/widgetdelegate.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/windows-checkbox.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/windows-lcdnumber.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/windows-lineedit.png
@ -317,6 +328,31 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/windowsxp-timeedit.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/windowsxp-treeview.png
 %%PORTDOCS%%%%DOCSDIR%%/html/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-abstractaudiooutput.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-abstractvideooutput.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-audiooutput.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-audiooutputdevice.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-audiooutputdevicemodel.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-backendcapabilities-notifier.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-backendcapabilities.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-effect.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-effectdescription.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-effectdescriptionmodel.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-effectparameter-hints.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-effectparameter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-effectwidget.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-mediacontroller-features.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-mediacontroller.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-medianode.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-mediaobject.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-mediasource.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-path.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-seekslider.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-videoplayer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-videowidget.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon-volumeslider.html
+%%PORTDOCS%%%%DOCSDIR%%/html/phonon.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractbutton.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstracteventdispatcher.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractextensionfactory.html
@ -332,6 +368,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractitemview-edittriggers.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractitemview.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractlistmodel.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qabstractmessagehandler.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractprintdialog-printdialogoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractprintdialog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstractproxymodel.html
@ -344,6 +381,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstracttextdocumentlayout-paintcontext.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstracttextdocumentlayout-selection.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qabstracttextdocumentlayout.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qabstracturiresolver.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qabstractxmlnodemodel.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qabstractxmlreceiver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qaction.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qactionevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qactiongroup.html
@ -370,6 +410,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qcolordialog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qcolumnview.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qcombobox.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qcommandlinkbutton.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qcompleter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qconicalgradient.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qcontextmenuevent.html
@ -450,6 +491,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qfileiconprovider.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfileinfo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfileopenevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qfilesystemmodel.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfilesystemwatcher.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfocusevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfocusframe.html
@ -462,9 +504,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qfontmetrics.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfontmetricsf.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qformbuilder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qformlayout.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qframe.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qfsfileengine.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qftp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgenericargument.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgenericreturnargument.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgl-formatoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgl.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qglcolormap.html
@ -476,14 +521,19 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qglwidget.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgradient.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsellipseitem.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsgridlayout.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsitem-graphicsitemflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsitem.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsitemanimation.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsitemgroup.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicslayout.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicslayoutitem.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicslinearlayout.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicslineitem.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicspathitem.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicspixmapitem.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicspolygonitem.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsproxywidget.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsrectitem.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsscene-scenelayers.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsscene.html
@ -493,6 +543,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsscenehelpevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsscenehoverevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsscenemouseevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsscenemoveevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicssceneresizeevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsscenewheelevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicssimpletextitem.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicssvgitem.html
@ -500,11 +552,23 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsview-cachemode.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsview-optimizationflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsview.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicswidget.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgridlayout.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qgroupbox.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qhboxlayout.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qheaderview.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhelpcontentitem.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhelpcontentmodel.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhelpcontentwidget.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhelpengine.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhelpenginecore.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qhelpevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhelpindexmodel.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhelpindexwidget.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhelpsearchengine.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhelpsearchquery.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhelpsearchquerywidget.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhelpsearchresultwidget.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qhideevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qhostaddress.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qhostinfo.html
@ -556,6 +620,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qlistwidgetitem.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qlocale-numberoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qlocale.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qlocalserver.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qlocalsocket.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmainwindow-dockoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmainwindow.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmatrix.html
@ -572,6 +638,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qmetamethod.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmetaobject.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmetaproperty.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmetatype.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmimedata.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmimesource.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmodelindex.html
@ -580,12 +647,18 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qmovie.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmutex.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmutexlocker.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qnetworkaccessmanager.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkaddressentry.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qnetworkcookie.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qnetworkcookiejar.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkinterface-interfaceflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkinterface.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qnetworkproxy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qnetworkreply.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qnetworkrequest.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qobject.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qobjectcleanuphandler.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qpagesetupdialog-pagesetupdialogoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qpagesetupdialog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qpaintdevice.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qpaintengine-dirtyflags.html
@ -605,6 +678,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qpictureio.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qpixmap.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qpixmapcache.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qplaintextdocumentlayout.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qplaintextedit.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qpluginloader.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qpoint.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qpointf.html
@ -613,6 +688,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qprintdialog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qprintengine.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qprinter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qprinterinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qprintpreviewdialog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qprintpreviewwidget.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qprocess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qprogressbar.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qprogressdialog.html
@ -636,9 +714,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qresizeevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qresource.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qrubberband.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qrunnable.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qscriptclass-queryflags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qscriptclass.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qscriptclasspropertyiterator.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptcontext.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qscriptcontextinfo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptengine-qobjectwrapoptions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptengine.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qscriptengineagent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qscriptstring.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptvalue-propertyflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptvalue-resolveflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qscriptvalue.html
@ -648,10 +733,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qsemaphore.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsessionmanager.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsettings.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qsharedmemory.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qshortcut.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qshortcutevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qshowevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsignalmapper.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qsimplexmlnodemodel.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsize.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsizef.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsizegrip.html
@ -661,6 +748,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qsocketnotifier.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsortfilterproxymodel.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsound.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qsourcelocation.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qspaceritem.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qspinbox.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsplashscreen.html
@ -685,6 +773,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qssl.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsslcertificate.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsslcipher.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qsslconfiguration.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsslerror.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsslkey.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsslsocket.html
@ -703,6 +792,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyle-state.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyle-subcontrols.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyle.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qstyleditemdelegate.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstylefactory.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstylehintreturn.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstylehintreturnmask.html
@ -744,6 +834,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptionviewitemv2-viewitemfeatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptionviewitemv2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptionviewitemv3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptionviewitemv4.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qstylepainter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsvggenerator.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsvgrenderer.html
@ -751,6 +842,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qsyntaxhighlighter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsysinfo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsystemlocale.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qsystemsemaphore.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qsystemtrayicon.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qt-alignment.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qt-dockwidgetareas.html
@ -785,6 +877,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextblockformat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextblockgroup.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextblockuserdata.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtextboundaryfinder-boundaryreasons.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtextboundaryfinder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextbrowser.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextcharformat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextcodec-conversionflags.html
@ -817,14 +911,18 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextlistformat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextobject.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextoption-flags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtextoption-tab.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextoption.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextstream-numberflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtextstream.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtexttable.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtexttablecell.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtexttablecellformat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtexttableformat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtgui.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qthelp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qthread.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qthreadpool.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtime.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtimeedit.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtimeline.html
@ -847,7 +945,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qtsql.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtsvg.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qttest.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtwebkit.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qtxml.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtxmlpatterns.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qudpsocket-bindmode.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qudpsocket.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qundocommand.html
@ -862,6 +962,22 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qvariant.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qvboxlayout.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwaitcondition.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebframe.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebhistory.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebhistoryinterface.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebhistoryitem.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebhittestresult.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebpage-extensionoption.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebpage-extensionreturn.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebpage-findflags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebpage.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebpluginfactory-extensionoption.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebpluginfactory-extensionreturn.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebpluginfactory-mimetype.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebpluginfactory-plugin.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebpluginfactory.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebsettings.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebview.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwhatsthis.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwhatsthisclickedevent.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qwheelevent.html
@ -885,16 +1001,25 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmldtdhandler.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlentityresolver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlerrorhandler.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qxmlformatter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlinputsource.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qxmlitem.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmllexicalhandler.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmllocator.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qxmlname.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qxmlnamepool.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlnamespacesupport.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qxmlnodemodelindex.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlparseexception.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qxmlquery.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlreader.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qxmlresultitems.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qxmlserializer.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlsimplereader.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlstreamattribute.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlstreamattributes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlstreamentitydeclaration.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qxmlstreamentityresolver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlstreamnamespacedeclaration.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlstreamnotationdeclaration.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qxmlstreamreader.html
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@ -215,6 +215,7 @@
    SUBDIR += py-kaa-imlib2
    SUBDIR += py-kaa-metadata
    SUBDIR += py-pybmp
+    SUBDIR += py-qt4-phonon
    SUBDIR += qdvdauthor
    SUBDIR += qt4-phonon
    SUBDIR += qt4-phonon-gst
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@ -0,0 +1,79 @@
+# New ports collection makefile for:	py-qt4-phonon
+# Date created:		2009-02-13
+# Whom:			Max Brazhnikov <makc@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	phonon
+PORTVERSION=	${PYQT4_VERSION}
+CATEGORIES=	multimedia 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, Phonon module
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
+RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
+
+HAS_CONFIGURE=	yes
+USE_PYTHON=	2.5+
+USE_QT_VER=	4
+QT_COMPONENTS=	phonon qmake_build
+
+OPTIONS=	API		"Install Phonon API for QScintilla2" on \
+		DEBUG		"Enable debugging in generated code" off \
+		SIPFILES	"Install the Phonon 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 phonon
+
+.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}/phonon/Makefile
+
+.include <bsd.port.post.mk>
--- a/multimedia/py-qt4-phonon/distinfo
+++ b/multimedia/py-qt4-phonon/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
--- a/multimedia/py-qt4-phonon/pkg-descr
+++ b/multimedia/py-qt4-phonon/pkg-descr
@ -0,0 +1,4 @@
+PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
+This package provides the Phonon module.
+
+WWW: http://www.riverbankcomputing.co.uk/pyqt/
--- a/multimedia/py-qt4-phonon/pkg-plist
+++ b/multimedia/py-qt4-phonon/pkg-plist
@ -0,0 +1,23 @@
+%%PYTHON_SITELIBDIR%%/PyQt4/phonon.so
+%%SIP%%share/py-sip/phonon/abstractaudiooutput.sip
+%%SIP%%share/py-sip/phonon/abstractvideooutput.sip
+%%SIP%%share/py-sip/phonon/audiooutput.sip
+%%SIP%%share/py-sip/phonon/backendcapabilities.sip
+%%SIP%%share/py-sip/phonon/effect.sip
+%%SIP%%share/py-sip/phonon/effectparameter.sip
+%%SIP%%share/py-sip/phonon/effectwidget.sip
+%%SIP%%share/py-sip/phonon/mediacontroller.sip
+%%SIP%%share/py-sip/phonon/medianode.sip
+%%SIP%%share/py-sip/phonon/mediaobject.sip
+%%SIP%%share/py-sip/phonon/mediasource.sip
+%%SIP%%share/py-sip/phonon/objectdescription.sip
+%%SIP%%share/py-sip/phonon/path.sip
+%%SIP%%share/py-sip/phonon/phononmod.sip
+%%SIP%%share/py-sip/phonon/phononnamespace.sip
+%%SIP%%share/py-sip/phonon/seekslider.sip
+%%SIP%%share/py-sip/phonon/videoplayer.sip
+%%SIP%%share/py-sip/phonon/videowidget.sip
+%%SIP%%share/py-sip/phonon/volumeslider.sip
+%%API%%share/qt4/qsci/api/python/phonon.api
+%%SIP%%@dirrm share/py-sip/phonon
+@dirrm %%PYTHON_SITELIBDIR%%/PyQt4
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@ -6,15 +6,13 @@

 PORTNAME=	network
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	net 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, QtNetwork 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=	network qmake
+QT_COMPONENTS=	network qmake_build

 OPTIONS=	API		"Install QtNetwork API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@ -33,11 +31,14 @@ OPTIONS=	API		"Install QtNetwork 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 QtNetwork

 .include "../../devel/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/QtNetwork.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 QtNetwork

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/net/py-qt4-network/distinfo
+++ b/net/py-qt4-network/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
--- a/net/py-qt4-network/pkg-plist
+++ b/net/py-qt4-network/pkg-plist
@ -1,25 +1,30 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtNetwork.so
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/QtNetworkmod.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qabstractsocket.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qauthenticator.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qftp.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qhostaddress.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qhostinfo.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qhttp.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qnetworkinterface.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qnetworkproxy.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qssl.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qsslcertificate.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qsslcipher.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qsslerror.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qsslkey.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qsslsocket.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qtcpserver.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qtcpsocket.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qudpsocket.sip
-%%SIPFILES%%%%SIPDIR%%/QtNetwork/qurlinfo.sip
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtNetwork
-%%API%%%%APIFILE%%
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/QtNetwork/QtNetworkmod.sip
+%%SIP%%share/py-sip/QtNetwork/qabstractsocket.sip
+%%SIP%%share/py-sip/QtNetwork/qauthenticator.sip
+%%SIP%%share/py-sip/QtNetwork/qftp.sip
+%%SIP%%share/py-sip/QtNetwork/qhostaddress.sip
+%%SIP%%share/py-sip/QtNetwork/qhostinfo.sip
+%%SIP%%share/py-sip/QtNetwork/qhttp.sip
+%%SIP%%share/py-sip/QtNetwork/qlocalserver.sip
+%%SIP%%share/py-sip/QtNetwork/qlocalsocket.sip
+%%SIP%%share/py-sip/QtNetwork/qnetworkaccessmanager.sip
+%%SIP%%share/py-sip/QtNetwork/qnetworkcookie.sip
+%%SIP%%share/py-sip/QtNetwork/qnetworkinterface.sip
+%%SIP%%share/py-sip/QtNetwork/qnetworkproxy.sip
+%%SIP%%share/py-sip/QtNetwork/qnetworkreply.sip
+%%SIP%%share/py-sip/QtNetwork/qnetworkrequest.sip
+%%SIP%%share/py-sip/QtNetwork/qssl.sip
+%%SIP%%share/py-sip/QtNetwork/qsslcertificate.sip
+%%SIP%%share/py-sip/QtNetwork/qsslcipher.sip
+%%SIP%%share/py-sip/QtNetwork/qsslconfiguration.sip
+%%SIP%%share/py-sip/QtNetwork/qsslerror.sip
+%%SIP%%share/py-sip/QtNetwork/qsslkey.sip
+%%SIP%%share/py-sip/QtNetwork/qsslsocket.sip
+%%SIP%%share/py-sip/QtNetwork/qtcpserver.sip
+%%SIP%%share/py-sip/QtNetwork/qtcpsocket.sip
+%%SIP%%share/py-sip/QtNetwork/qudpsocket.sip
+%%SIP%%share/py-sip/QtNetwork/qurlinfo.sip
+%%API%%share/qt4/qsci/api/python/QtNetwork.api
+%%SIP%%@dirrm share/py-sip/QtNetwork
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/textproc/Makefile
+++ b/textproc/Makefile
@ -874,6 +874,7 @@
    SUBDIR += py-pygments
    SUBDIR += py-pyx12
    SUBDIR += py-qt4-xml
+    SUBDIR += py-qt4-xmlpatterns
    SUBDIR += py-rdflib
    SUBDIR += py-reverend
    SUBDIR += py-rss2gen
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@ -6,15 +6,13 @@

 PORTNAME=	xml
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	textproc 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, QtXml 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=	xml qmake
+QT_COMPONENTS=	xml qmake_build moc_build

 OPTIONS=	API		"Install QtXml API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@ -33,11 +31,14 @@ OPTIONS=	API		"Install QtXml 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 QtXml

 .include "../../devel/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/QtXml.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 QtXml

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/textproc/py-qt4-xml/distinfo
+++ b/textproc/py-qt4-xml/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
--- a/textproc/py-qt4-xml/pkg-plist
+++ b/textproc/py-qt4-xml/pkg-plist
@ -1,12 +1,10 @@
 bin/pylupdate4
 bin/pyrcc4
 %%PYTHON_SITELIBDIR%%/PyQt4/QtXml.so
-%%SIPFILES%%%%SIPDIR%%/QtXml/QtXmlmod.sip
-%%SIPFILES%%%%SIPDIR%%/QtXml/qdom.sip
-%%SIPFILES%%%%SIPDIR%%/QtXml/qxml.sip
-%%SIPFILES%%%%SIPDIR%%/QtXml/qxmlstream.sip
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtXml
-%%API%%%%APIFILE%%
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/QtXml/QtXmlmod.sip
+%%SIP%%share/py-sip/QtXml/qdom.sip
+%%SIP%%share/py-sip/QtXml/qxml.sip
+%%SIP%%share/py-sip/QtXml/qxmlstream.sip
+%%API%%share/qt4/qsci/api/python/QtXml.api
+%%SIP%%@dirrm share/py-sip/QtXml
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@ -0,0 +1,78 @@
+# New ports collection makefile for:	py-qt4-xml
+# Date created:				2009-01-03
+# Whom:					Dima Panv <fluffy@fluffy.khv.ru>
+#
+# $FreeBSD$
+
+PORTNAME=	xmlpatterns
+PORTVERSION=	${PYQT4_VERSION}
+CATEGORIES=	textproc 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, QtXmlPatterns module
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
+RUN_DEPENDS=	${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml
+
+HAS_CONFIGURE=	yes
+USE_PYTHON=	2.5+
+USE_QT_VER=	4
+QT_COMPONENTS=	xmlpatterns qmake_build
+
+OPTIONS=	API		"Install QtXml API for QScintilla2" on \
+		DEBUG		"Enable debugging in generated code" off \
+		SIPFILES	"Install the QtXml 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 QtXmlPatterns
+
+.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}/QtXmlPatterns/Makefile
+
+.include <bsd.port.post.mk>
--- a/textproc/py-qt4-xmlpatterns/distinfo
+++ b/textproc/py-qt4-xmlpatterns/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
--- a/textproc/py-qt4-xmlpatterns/pkg-descr
+++ b/textproc/py-qt4-xmlpatterns/pkg-descr
@ -0,0 +1,4 @@
+PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
+This package provides the QtXmlPatterns module.
+
+WWW: http://www.riverbankcomputing.co.uk/pyqt/
--- a/textproc/py-qt4-xmlpatterns/pkg-plist
+++ b/textproc/py-qt4-xmlpatterns/pkg-plist
@ -0,0 +1,17 @@
+%%PYTHON_SITELIBDIR%%/PyQt4/QtXmlPatterns.so
+%%SIP%%share/py-sip/QtXmlPatterns/QtXmlPatternsmod.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qabstractmessagehandler.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qabstracturiresolver.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qabstractxmlnodemodel.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qabstractxmlreceiver.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qsimplexmlnodemodel.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qsourcelocation.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qxmlformatter.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qxmlname.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qxmlnamepool.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qxmlquery.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qxmlresultitems.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qxmlserializer.sip
+%%API%%share/qt4/qsci/api/python/QtXmlPatterns.api
+%%SIP%%@dirrm share/py-sip/QtXmlPatterns
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/www/Makefile
+++ b/www/Makefile
@ -1255,6 +1255,7 @@
    SUBDIR += py-pywebdav
    SUBDIR += py-qp
    SUBDIR += py-qpy
+    SUBDIR += py-qt4-webkit
    SUBDIR += py-restclient
    SUBDIR += py-routes
    SUBDIR += py-scgi
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@ -0,0 +1,78 @@
+# New ports collection makefile for:	py-qt4-webkit
+# Date created:				2009-01-04
+# Whom:					Dima Panov <fluffy@fluffy.khv.ru>
+#
+# $FreeBSD$
+
+PORTNAME=	webkit
+PORTVERSION=	${PYQT4_VERSION}
+CATEGORIES=	www 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, QtWebKit 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=	qmake_build gui network webkit
+
+OPTIONS=	API		"Install QtXml API for QScintilla2" on \
+		DEBUG		"Enable debugging in generated code" off \
+		SIPFILES	"Install the QtXml 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 QtWebKit
+
+.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}/QtWebKit/Makefile
+
+.include <bsd.port.post.mk>
--- a/www/py-qt4-webkit/distinfo
+++ b/www/py-qt4-webkit/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
--- a/www/py-qt4-webkit/pkg-descr
+++ b/www/py-qt4-webkit/pkg-descr
@ -0,0 +1,4 @@
+PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
+This package provides the QtWebKit module.
+
+WWW: http://www.riverbankcomputing.co.uk/pyqt/
--- a/www/py-qt4-webkit/pkg-plist
+++ b/www/py-qt4-webkit/pkg-plist
@ -0,0 +1,12 @@
+%%PYTHON_SITELIBDIR%%/PyQt4/QtWebKit.so
+%%SIP%%share/py-sip/QtWebKit/QtWebKitmod.sip
+%%SIP%%share/py-sip/QtWebKit/qwebframe.sip
+%%SIP%%share/py-sip/QtWebKit/qwebhistory.sip
+%%SIP%%share/py-sip/QtWebKit/qwebhistoryinterface.sip
+%%SIP%%share/py-sip/QtWebKit/qwebpage.sip
+%%SIP%%share/py-sip/QtWebKit/qwebpluginfactory.sip
+%%SIP%%share/py-sip/QtWebKit/qwebsettings.sip
+%%SIP%%share/py-sip/QtWebKit/qwebview.sip
+%%API%%share/qt4/qsci/api/python/QtWebKit.api
+%%SIP%%@dirrm share/py-sip/QtWebKit
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/x11-toolkits/py-kde/Makefile
+++ b/x11-toolkits/py-kde/Makefile
@ -7,16 +7,14 @@

 PORTNAME=	kde
 PORTVERSION=	${PYKDE3_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	x11-toolkits python kde
 MASTER_SITES=	${MASTER_SITES_PYKDE3} ${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=lofi
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PYKDE3_DISTNAME}

-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for KDE3

 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \
--- a/x11-toolkits/py-kde/distinfo
+++ b/x11-toolkits/py-kde/distinfo
@ -1,3 +1,3 @@
-MD5 (PyKDE-3.16.1.tar.bz2) = 986e67ced4753cac5a4b7be8031ad64e
-SHA256 (PyKDE-3.16.1.tar.bz2) = b07350e1873c35ed794d0cab9d9def086dba65f4e86ef160e7cf138a06eb51b7
-SIZE (PyKDE-3.16.1.tar.bz2) = 954035
+MD5 (PyKDE-3.16.2.tar.bz2) = 5f5e13ce3c9ca78f7c214b5399e7b81d
+SHA256 (PyKDE-3.16.2.tar.bz2) = 0a3aa6c29f474d9909d6d2e4037bddf21ed6db56e1a80fb446c82833204f4edd
+SIZE (PyKDE-3.16.2.tar.bz2) = 960870
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@ -6,14 +6,13 @@

 PORTNAME=	qt
 PORTVERSION=	${PYQT3_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITES_PYQT3}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PYQT3_DISTNAME}

-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt toolkit

 LIB_DEPENDS=	qscintilla.7:${PORTSDIR}/x11-toolkits/qscintilla
--- a/x11-toolkits/py-qt/distinfo
+++ b/x11-toolkits/py-qt/distinfo
@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-3.17.4.tar.gz) = 0dffe4bc87a1102d61ee972bb868c65a
-SHA256 (PyQt-x11-gpl-3.17.4.tar.gz) = 1931400062d432af229a6862e5fbd6554e7b16b70a5ea87478d026ce8979e65c
-SIZE (PyQt-x11-gpl-3.17.4.tar.gz) = 803925
+MD5 (PyQt-x11-gpl-3.17.6.tar.gz) = 89b7c46d6db4a2916fc6ab5a82b0d08a
+SHA256 (PyQt-x11-gpl-3.17.6.tar.gz) = 9c8a51d296510a400ec82c64ac582b4adce30811e33b2222194c405217bca1a8
+SIZE (PyQt-x11-gpl-3.17.6.tar.gz) = 813192
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@ -6,15 +6,13 @@

 PORTNAME=	gui
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	x11-toolkits 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, QtGui 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=	gui imageformats inputmethods iconengines qmake
+QT_COMPONENTS=	gui imageformats inputmethods iconengines qmake_build

 OPTIONS=	API		"Install QtGui API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@ -33,11 +31,14 @@ OPTIONS=	API		"Install QtGui 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 QtGui

 .include "../../devel/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/QtGui.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 QtGui

 .if ${ARCH} == "sparc64" && ${OSVERSION} >= 700000
 BROKEN=		Does not compile on sparc64
--- a/x11-toolkits/py-qt4-gui/distinfo
+++ b/x11-toolkits/py-qt4-gui/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
--- a/x11-toolkits/py-qt4-gui/pkg-plist
+++ b/x11-toolkits/py-qt4-gui/pkg-plist
@ -1,171 +1,183 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtGui.so
-%%SIPFILES%%%%SIPDIR%%/QtGui/QtGuimod.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qabstractbutton.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qabstractitemdelegate.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qabstractitemview.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qabstractprintdialog.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qabstractproxymodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qabstractscrollarea.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qabstractslider.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qabstractspinbox.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qabstracttextdocumentlayout.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qaction.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qactiongroup.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qapplication.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qbitmap.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qboxlayout.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qbrush.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qbuttongroup.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qcalendarwidget.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qcheckbox.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qclipboard.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qcolor.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qcolordialog.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qcolumnview.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qcombobox.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qcompleter.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qcursor.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qdatawidgetmapper.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qdatetimeedit.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qdesktopservices.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qdesktopwidget.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qdial.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qdialog.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qdialogbuttonbox.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qdirmodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qdockwidget.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qdrag.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qdrawutil.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qerrormessage.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qevent.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qfiledialog.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qfileiconprovider.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qfocusframe.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qfont.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qfontcombobox.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qfontdatabase.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qfontdialog.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qfontinfo.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qfontmetrics.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qframe.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qgraphicsitem.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qgraphicsitemanimation.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qgraphicsscene.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qgraphicssceneevent.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qgraphicsview.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qgridlayout.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qgroupbox.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qheaderview.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qicon.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qiconengine.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qimage.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qimageiohandler.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qimagereader.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qimagewriter.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qinputcontext.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qinputdialog.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qitemdelegate.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qitemeditorfactory.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qitemselectionmodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qkeysequence.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qlabel.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qlayout.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qlayoutitem.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qlcdnumber.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qlineedit.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qlistview.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qlistwidget.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qmainwindow.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qmatrix.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qmdiarea.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qmdisubwindow.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qmenu.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qmenubar.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qmessagebox.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qmime.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qmovie.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpagesetupdialog.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpaintdevice.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpaintengine.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpainter.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpainterpath.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpalette.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpen.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpicture.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpixmap.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpixmapcache.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpolygon.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qprintdialog.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qprintengine.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qprinter.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qprogressbar.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qprogressdialog.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qproxymodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qpushbutton.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qradiobutton.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qregion.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qrgb.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qrubberband.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qscrollarea.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qscrollbar.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qsessionmanager.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qshortcut.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qsizegrip.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qsizepolicy.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qslider.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qsortfilterproxymodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qsound.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qspinbox.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qsplashscreen.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qsplitter.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qstackedlayout.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qstackedwidget.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qstandarditemmodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qstatusbar.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qstringlistmodel.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qstyle.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qstylefactory.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qstyleoption.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qstylepainter.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qsyntaxhighlighter.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qsystemtrayicon.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtabbar.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtableview.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtablewidget.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtabwidget.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtextbrowser.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtextcursor.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtextdocument.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtextdocumentfragment.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtextedit.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtextformat.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtextlayout.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtextlist.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtextobject.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtextoption.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtexttable.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtoolbar.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtoolbox.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtoolbutton.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtooltip.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtransform.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtreeview.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtreewidget.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qtreewidgetitemiterator.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qundogroup.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qundostack.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qundoview.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qvalidator.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qwhatsthis.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qwidget.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qwidgetaction.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qwindowdefs.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qwizard.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qworkspace.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qx11embed_x11.sip
-%%SIPFILES%%%%SIPDIR%%/QtGui/qx11info_x11.sip
-%%API%%%%APIFILE%%
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtGui
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/QtGui/QtGuimod.sip
+%%SIP%%share/py-sip/QtGui/qabstractbutton.sip
+%%SIP%%share/py-sip/QtGui/qabstractitemdelegate.sip
+%%SIP%%share/py-sip/QtGui/qabstractitemview.sip
+%%SIP%%share/py-sip/QtGui/qabstractprintdialog.sip
+%%SIP%%share/py-sip/QtGui/qabstractproxymodel.sip
+%%SIP%%share/py-sip/QtGui/qabstractscrollarea.sip
+%%SIP%%share/py-sip/QtGui/qabstractslider.sip
+%%SIP%%share/py-sip/QtGui/qabstractspinbox.sip
+%%SIP%%share/py-sip/QtGui/qabstracttextdocumentlayout.sip
+%%SIP%%share/py-sip/QtGui/qaction.sip
+%%SIP%%share/py-sip/QtGui/qactiongroup.sip
+%%SIP%%share/py-sip/QtGui/qapplication.sip
+%%SIP%%share/py-sip/QtGui/qbitmap.sip
+%%SIP%%share/py-sip/QtGui/qboxlayout.sip
+%%SIP%%share/py-sip/QtGui/qbrush.sip
+%%SIP%%share/py-sip/QtGui/qbuttongroup.sip
+%%SIP%%share/py-sip/QtGui/qcalendarwidget.sip
+%%SIP%%share/py-sip/QtGui/qcheckbox.sip
+%%SIP%%share/py-sip/QtGui/qclipboard.sip
+%%SIP%%share/py-sip/QtGui/qcolor.sip
+%%SIP%%share/py-sip/QtGui/qcolordialog.sip
+%%SIP%%share/py-sip/QtGui/qcolumnview.sip
+%%SIP%%share/py-sip/QtGui/qcombobox.sip
+%%SIP%%share/py-sip/QtGui/qcommandlinkbutton.sip
+%%SIP%%share/py-sip/QtGui/qcompleter.sip
+%%SIP%%share/py-sip/QtGui/qcursor.sip
+%%SIP%%share/py-sip/QtGui/qdatawidgetmapper.sip
+%%SIP%%share/py-sip/QtGui/qdatetimeedit.sip
+%%SIP%%share/py-sip/QtGui/qdesktopservices.sip
+%%SIP%%share/py-sip/QtGui/qdesktopwidget.sip
+%%SIP%%share/py-sip/QtGui/qdial.sip
+%%SIP%%share/py-sip/QtGui/qdialog.sip
+%%SIP%%share/py-sip/QtGui/qdialogbuttonbox.sip
+%%SIP%%share/py-sip/QtGui/qdirmodel.sip
+%%SIP%%share/py-sip/QtGui/qdockwidget.sip
+%%SIP%%share/py-sip/QtGui/qdrag.sip
+%%SIP%%share/py-sip/QtGui/qdrawutil.sip
+%%SIP%%share/py-sip/QtGui/qerrormessage.sip
+%%SIP%%share/py-sip/QtGui/qevent.sip
+%%SIP%%share/py-sip/QtGui/qfiledialog.sip
+%%SIP%%share/py-sip/QtGui/qfileiconprovider.sip
+%%SIP%%share/py-sip/QtGui/qfilesystemmodel.sip
+%%SIP%%share/py-sip/QtGui/qfocusframe.sip
+%%SIP%%share/py-sip/QtGui/qfont.sip
+%%SIP%%share/py-sip/QtGui/qfontcombobox.sip
+%%SIP%%share/py-sip/QtGui/qfontdatabase.sip
+%%SIP%%share/py-sip/QtGui/qfontdialog.sip
+%%SIP%%share/py-sip/QtGui/qfontinfo.sip
+%%SIP%%share/py-sip/QtGui/qfontmetrics.sip
+%%SIP%%share/py-sip/QtGui/qformlayout.sip
+%%SIP%%share/py-sip/QtGui/qframe.sip
+%%SIP%%share/py-sip/QtGui/qgraphicsgridlayout.sip
+%%SIP%%share/py-sip/QtGui/qgraphicsitem.sip
+%%SIP%%share/py-sip/QtGui/qgraphicsitemanimation.sip
+%%SIP%%share/py-sip/QtGui/qgraphicslayout.sip
+%%SIP%%share/py-sip/QtGui/qgraphicslayoutitem.sip
+%%SIP%%share/py-sip/QtGui/qgraphicslinearlayout.sip
+%%SIP%%share/py-sip/QtGui/qgraphicsproxywidget.sip
+%%SIP%%share/py-sip/QtGui/qgraphicsscene.sip
+%%SIP%%share/py-sip/QtGui/qgraphicssceneevent.sip
+%%SIP%%share/py-sip/QtGui/qgraphicsview.sip
+%%SIP%%share/py-sip/QtGui/qgraphicswidget.sip
+%%SIP%%share/py-sip/QtGui/qgridlayout.sip
+%%SIP%%share/py-sip/QtGui/qgroupbox.sip
+%%SIP%%share/py-sip/QtGui/qheaderview.sip
+%%SIP%%share/py-sip/QtGui/qicon.sip
+%%SIP%%share/py-sip/QtGui/qiconengine.sip
+%%SIP%%share/py-sip/QtGui/qimage.sip
+%%SIP%%share/py-sip/QtGui/qimageiohandler.sip
+%%SIP%%share/py-sip/QtGui/qimagereader.sip
+%%SIP%%share/py-sip/QtGui/qimagewriter.sip
+%%SIP%%share/py-sip/QtGui/qinputcontext.sip
+%%SIP%%share/py-sip/QtGui/qinputdialog.sip
+%%SIP%%share/py-sip/QtGui/qitemdelegate.sip
+%%SIP%%share/py-sip/QtGui/qitemeditorfactory.sip
+%%SIP%%share/py-sip/QtGui/qitemselectionmodel.sip
+%%SIP%%share/py-sip/QtGui/qkeysequence.sip
+%%SIP%%share/py-sip/QtGui/qlabel.sip
+%%SIP%%share/py-sip/QtGui/qlayout.sip
+%%SIP%%share/py-sip/QtGui/qlayoutitem.sip
+%%SIP%%share/py-sip/QtGui/qlcdnumber.sip
+%%SIP%%share/py-sip/QtGui/qlineedit.sip
+%%SIP%%share/py-sip/QtGui/qlistview.sip
+%%SIP%%share/py-sip/QtGui/qlistwidget.sip
+%%SIP%%share/py-sip/QtGui/qmainwindow.sip
+%%SIP%%share/py-sip/QtGui/qmatrix.sip
+%%SIP%%share/py-sip/QtGui/qmdiarea.sip
+%%SIP%%share/py-sip/QtGui/qmdisubwindow.sip
+%%SIP%%share/py-sip/QtGui/qmenu.sip
+%%SIP%%share/py-sip/QtGui/qmenubar.sip
+%%SIP%%share/py-sip/QtGui/qmessagebox.sip
+%%SIP%%share/py-sip/QtGui/qmime.sip
+%%SIP%%share/py-sip/QtGui/qmovie.sip
+%%SIP%%share/py-sip/QtGui/qpagesetupdialog.sip
+%%SIP%%share/py-sip/QtGui/qpaintdevice.sip
+%%SIP%%share/py-sip/QtGui/qpaintengine.sip
+%%SIP%%share/py-sip/QtGui/qpainter.sip
+%%SIP%%share/py-sip/QtGui/qpainterpath.sip
+%%SIP%%share/py-sip/QtGui/qpalette.sip
+%%SIP%%share/py-sip/QtGui/qpen.sip
+%%SIP%%share/py-sip/QtGui/qpicture.sip
+%%SIP%%share/py-sip/QtGui/qpixmap.sip
+%%SIP%%share/py-sip/QtGui/qpixmapcache.sip
+%%SIP%%share/py-sip/QtGui/qplaintextedit.sip
+%%SIP%%share/py-sip/QtGui/qpolygon.sip
+%%SIP%%share/py-sip/QtGui/qprintdialog.sip
+%%SIP%%share/py-sip/QtGui/qprintengine.sip
+%%SIP%%share/py-sip/QtGui/qprinter.sip
+%%SIP%%share/py-sip/QtGui/qprinterinfo.sip
+%%SIP%%share/py-sip/QtGui/qprintpreviewdialog.sip
+%%SIP%%share/py-sip/QtGui/qprintpreviewwidget.sip
+%%SIP%%share/py-sip/QtGui/qprogressbar.sip
+%%SIP%%share/py-sip/QtGui/qprogressdialog.sip
+%%SIP%%share/py-sip/QtGui/qproxymodel.sip
+%%SIP%%share/py-sip/QtGui/qpushbutton.sip
+%%SIP%%share/py-sip/QtGui/qradiobutton.sip
+%%SIP%%share/py-sip/QtGui/qregion.sip
+%%SIP%%share/py-sip/QtGui/qrgb.sip
+%%SIP%%share/py-sip/QtGui/qrubberband.sip
+%%SIP%%share/py-sip/QtGui/qscrollarea.sip
+%%SIP%%share/py-sip/QtGui/qscrollbar.sip
+%%SIP%%share/py-sip/QtGui/qsessionmanager.sip
+%%SIP%%share/py-sip/QtGui/qshortcut.sip
+%%SIP%%share/py-sip/QtGui/qsizegrip.sip
+%%SIP%%share/py-sip/QtGui/qsizepolicy.sip
+%%SIP%%share/py-sip/QtGui/qslider.sip
+%%SIP%%share/py-sip/QtGui/qsortfilterproxymodel.sip
+%%SIP%%share/py-sip/QtGui/qsound.sip
+%%SIP%%share/py-sip/QtGui/qspinbox.sip
+%%SIP%%share/py-sip/QtGui/qsplashscreen.sip
+%%SIP%%share/py-sip/QtGui/qsplitter.sip
+%%SIP%%share/py-sip/QtGui/qstackedlayout.sip
+%%SIP%%share/py-sip/QtGui/qstackedwidget.sip
+%%SIP%%share/py-sip/QtGui/qstandarditemmodel.sip
+%%SIP%%share/py-sip/QtGui/qstatusbar.sip
+%%SIP%%share/py-sip/QtGui/qstringlistmodel.sip
+%%SIP%%share/py-sip/QtGui/qstyle.sip
+%%SIP%%share/py-sip/QtGui/qstyleditemdelegate.sip
+%%SIP%%share/py-sip/QtGui/qstylefactory.sip
+%%SIP%%share/py-sip/QtGui/qstyleoption.sip
+%%SIP%%share/py-sip/QtGui/qstylepainter.sip
+%%SIP%%share/py-sip/QtGui/qsyntaxhighlighter.sip
+%%SIP%%share/py-sip/QtGui/qsystemtrayicon.sip
+%%SIP%%share/py-sip/QtGui/qtabbar.sip
+%%SIP%%share/py-sip/QtGui/qtableview.sip
+%%SIP%%share/py-sip/QtGui/qtablewidget.sip
+%%SIP%%share/py-sip/QtGui/qtabwidget.sip
+%%SIP%%share/py-sip/QtGui/qtextbrowser.sip
+%%SIP%%share/py-sip/QtGui/qtextcursor.sip
+%%SIP%%share/py-sip/QtGui/qtextdocument.sip
+%%SIP%%share/py-sip/QtGui/qtextdocumentfragment.sip
+%%SIP%%share/py-sip/QtGui/qtextedit.sip
+%%SIP%%share/py-sip/QtGui/qtextformat.sip
+%%SIP%%share/py-sip/QtGui/qtextlayout.sip
+%%SIP%%share/py-sip/QtGui/qtextlist.sip
+%%SIP%%share/py-sip/QtGui/qtextobject.sip
+%%SIP%%share/py-sip/QtGui/qtextoption.sip
+%%SIP%%share/py-sip/QtGui/qtexttable.sip
+%%SIP%%share/py-sip/QtGui/qtoolbar.sip
+%%SIP%%share/py-sip/QtGui/qtoolbox.sip
+%%SIP%%share/py-sip/QtGui/qtoolbutton.sip
+%%SIP%%share/py-sip/QtGui/qtooltip.sip
+%%SIP%%share/py-sip/QtGui/qtransform.sip
+%%SIP%%share/py-sip/QtGui/qtreeview.sip
+%%SIP%%share/py-sip/QtGui/qtreewidget.sip
+%%SIP%%share/py-sip/QtGui/qtreewidgetitemiterator.sip
+%%SIP%%share/py-sip/QtGui/qundogroup.sip
+%%SIP%%share/py-sip/QtGui/qundostack.sip
+%%SIP%%share/py-sip/QtGui/qundoview.sip
+%%SIP%%share/py-sip/QtGui/qvalidator.sip
+%%SIP%%share/py-sip/QtGui/qwhatsthis.sip
+%%SIP%%share/py-sip/QtGui/qwidget.sip
+%%SIP%%share/py-sip/QtGui/qwidgetaction.sip
+%%SIP%%share/py-sip/QtGui/qwindowdefs.sip
+%%SIP%%share/py-sip/QtGui/qwizard.sip
+%%SIP%%share/py-sip/QtGui/qworkspace.sip
+%%SIP%%share/py-sip/QtGui/qx11embed_x11.sip
+%%SIP%%share/py-sip/QtGui/qx11info_x11.sip
+%%API%%share/qt4/qsci/api/python/QtGui.api
+%%SIP%%@dirrm share/py-sip/QtGui
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/x11-toolkits/qscintilla/Makefile
+++ b/x11-toolkits/qscintilla/Makefile
@ -11,7 +11,7 @@ CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITES_QSCI1}
 DISTNAME=	${QSCI1_DISTNAME}

-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QT port of the Scintilla C++ editor class

 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@ -6,15 +6,13 @@

 PORTNAME=	opengl
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
-
 CATEGORIES=	x11 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, QtOpenGL 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=	opengl qmake
+QT_COMPONENTS=	opengl qmake_build

 OPTIONS=	API		"Install QtOpenGL API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
@ -33,11 +31,14 @@ OPTIONS=	API		"Install QtOpenGL 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 QtOpenGL

 .include "../../devel/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/QtOpenGL.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 QtOpenGL

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/x11/py-qt4-opengl/distinfo
+++ b/x11/py-qt4-opengl/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
--- a/x11/py-qt4-opengl/pkg-plist
+++ b/x11/py-qt4-opengl/pkg-plist
@ -1,11 +1,9 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtOpenGL.so
-%%SIPFILES%%%%SIPDIR%%/QtOpenGL/QtOpenGLmod.sip
-%%SIPFILES%%%%SIPDIR%%/QtOpenGL/qgl.sip
-%%SIPFILES%%%%SIPDIR%%/QtOpenGL/qglcolormap.sip
-%%SIPFILES%%%%SIPDIR%%/QtOpenGL/qglframebufferobject.sip
-%%SIPFILES%%%%SIPDIR%%/QtOpenGL/qglpixelbuffer.sip
-%%SIPFILES%%@dirrm %%SIPDIR%%/QtOpenGL
-%%API%%%%APIFILE%%
-%%API%%@dirrmtry share/qt4/qsci/api/python
-%%API%%@dirrmtry share/qt4/qsci/api
-%%API%%@dirrmtry share/qt4/qsci
+%%SIP%%share/py-sip/QtOpenGL/QtOpenGLmod.sip
+%%SIP%%share/py-sip/QtOpenGL/qgl.sip
+%%SIP%%share/py-sip/QtOpenGL/qglcolormap.sip
+%%SIP%%share/py-sip/QtOpenGL/qglframebufferobject.sip
+%%SIP%%share/py-sip/QtOpenGL/qglpixelbuffer.sip
+%%API%%share/qt4/qsci/api/python/QtOpenGL.api
+@dirrm %%SIP%%share/py-sip/QtOpenGL
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4