aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/albumart/Makefile1
-rw-r--r--audio/picard/Makefile1
-rw-r--r--databases/py-qt4-sql/distinfo6
-rw-r--r--deskutils/calibre/Makefile1
-rw-r--r--deskutils/superkaramba-lwp/Makefile2
-rw-r--r--deskutils/treeline/Makefile1
-rw-r--r--devel/eric4/Makefile2
-rw-r--r--devel/hgview/Makefile1
-rw-r--r--devel/kdebindings4-python-pykde4/Makefile1
-rw-r--r--devel/kdebindings4-python-pykde4/files/patch-python__pykde4__CMakeLists.txt10
-rw-r--r--devel/kdebindings4-python-pykde4/files/patch-python__pykde4__sip__kdecore__typedefs.sip93
-rw-r--r--devel/kodos/Makefile2
-rw-r--r--devel/py-qt4-assistant/distinfo6
-rw-r--r--devel/py-qt4-core/distinfo6
-rw-r--r--devel/py-qt4-core/files/Qt.py4
-rw-r--r--devel/py-qt4-core/files/patch-configure.py96
-rw-r--r--devel/py-qt4-core/pkg-plist18
-rw-r--r--devel/py-qt4-dbus/distinfo6
-rw-r--r--devel/py-qt4-designer/distinfo6
-rw-r--r--devel/py-qt4-designerplugin/distinfo6
-rw-r--r--devel/py-qt4-help/distinfo6
-rw-r--r--devel/py-qt4-qscintilla2/distinfo6
-rw-r--r--devel/py-qt4-qscintilla2/pkg-plist2
-rw-r--r--devel/py-qt4-script/distinfo6
-rw-r--r--devel/py-qt4-scripttools/distinfo6
-rw-r--r--devel/py-qt4-test/distinfo6
-rw-r--r--devel/py-qt4-test/pkg-plist1
-rw-r--r--devel/py-qt4/Makefile54
-rw-r--r--devel/py-qt4/pkg-descr4
-rw-r--r--devel/py-sip/distinfo6
-rw-r--r--devel/py-sip/files/bsd.pyqt.mk6
-rw-r--r--devel/qct/Makefile2
-rw-r--r--devel/qscintilla2-designerplugin/distinfo6
-rw-r--r--devel/qscintilla2/distinfo6
-rw-r--r--devel/qscintilla2/pkg-plist15
-rw-r--r--emulators/gns3/Makefile1
-rw-r--r--french/eficas/Makefile1
-rw-r--r--games/py-anki/Makefile1
-rw-r--r--games/py-mnemosyne/Makefile1
-rw-r--r--graphics/imgseek/Makefile2
-rw-r--r--graphics/lphoto/Makefile4
-rw-r--r--graphics/py-qt4-svg/distinfo6
-rw-r--r--graphics/qgis/Makefile6
-rw-r--r--math/convertall/Makefile1
-rw-r--r--math/qtiplot/Makefile1
-rw-r--r--math/scilab-toolbox-sivp/Makefile4
-rw-r--r--misc/flyway/Makefile2
-rw-r--r--misc/py-qt4-demo/Makefile1
-rw-r--r--misc/py-qt4-demo/distinfo6
-rw-r--r--misc/py-qt4-demo/pkg-plist59
-rw-r--r--misc/py-qt4-doc/distinfo6
-rw-r--r--misc/py-qt4-doc/pkg-plist142
-rw-r--r--multimedia/Makefile1
-rw-r--r--multimedia/py-qt4-multimedia/Makefile79
-rw-r--r--multimedia/py-qt4-multimedia/distinfo3
-rw-r--r--multimedia/py-qt4-multimedia/pkg-descr4
-rw-r--r--multimedia/py-qt4-multimedia/pkg-plist14
-rw-r--r--multimedia/py-qt4-phonon/distinfo6
-rw-r--r--net-p2p/qtorrent/Makefile2
-rw-r--r--net/py-qt4-network/distinfo6
-rw-r--r--net/py-qt4-network/pkg-plist1
-rw-r--r--print/hplip/Makefile2
-rw-r--r--print/hplip3/Makefile1
-rw-r--r--print/kdeutils4-printer-applet/Makefile1
-rw-r--r--print/system-config-printer-kde/Makefile1
-rw-r--r--science/avogadro/Makefile38
-rw-r--r--science/avogadro/pkg-plist14
-rw-r--r--sysutils/luma/Makefile2
-rw-r--r--textproc/py-qt4-xml/distinfo6
-rw-r--r--textproc/py-qt4-xmlpatterns/distinfo6
-rw-r--r--textproc/py-qt4-xmlpatterns/pkg-plist2
-rw-r--r--www/py-qt4-webkit/distinfo6
-rw-r--r--www/py-qt4-webkit/pkg-plist4
-rw-r--r--x11-toolkits/py-kde/Makefile7
-rw-r--r--x11-toolkits/py-kde/files/patch-sip__kio__global.sip25
-rw-r--r--x11-toolkits/py-pyqwt/Makefile1
-rw-r--r--x11-toolkits/py-qt/Makefile1
-rw-r--r--x11-toolkits/py-qt/files/patch-configure.py9
-rw-r--r--x11-toolkits/py-qt4-gui/distinfo6
-rw-r--r--x11-toolkits/py-qt4-gui/pkg-plist13
-rw-r--r--x11/py-qt4-opengl/distinfo6
-rw-r--r--x11/py-qt4-opengl/pkg-plist1
82 files changed, 752 insertions, 161 deletions
diff --git a/audio/albumart/Makefile b/audio/albumart/Makefile
index 532e5a52c68e..891fa73e552b 100644
--- a/audio/albumart/Makefile
+++ b/audio/albumart/Makefile
@@ -7,6 +7,7 @@
PORTNAME= albumart
PORTVERSION= 1.6.6
+PORTREVISION= 1
CATEGORIES= audio python
MASTER_SITES= http://muksuluuri.ath.cx/~skyostil/projects/albumart/dist/
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 38edaad96eba..b8bfadde5d8c 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -7,6 +7,7 @@
PORTNAME= picard
PORTVERSION= 0.12.1
+PORTREVISION= 1
CATEGORIES= audio python
MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
diff --git a/databases/py-qt4-sql/distinfo b/databases/py-qt4-sql/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/databases/py-qt4-sql/distinfo
+++ b/databases/py-qt4-sql/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 9e19cb1ed1ae..5e595b6bb3e1 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -7,6 +7,7 @@
PORTNAME= calibre
PORTVERSION= 0.6.27
+PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/ \
http://calibre-ebook.googlecode.com/files/
diff --git a/deskutils/superkaramba-lwp/Makefile b/deskutils/superkaramba-lwp/Makefile
index dcb8760abdf2..d6387d8dc347 100644
--- a/deskutils/superkaramba-lwp/Makefile
+++ b/deskutils/superkaramba-lwp/Makefile
@@ -6,7 +6,7 @@
PORTNAME= lwp
PORTVERSION= 15.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils kde
MASTER_SITES= http://www.message.co.nz/~matt-sarah/ \
http://liquidweather.net/
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index 1e04c4ec213d..7c7389eb1c26 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -7,6 +7,7 @@
PORTNAME= treeline
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= ${MASTER_SITE_BERLIOS}:treeline \
http://treeline.bellz.org/plugins/:plugins \
diff --git a/devel/eric4/Makefile b/devel/eric4/Makefile
index 5b8b131c0c97..4c3cac9ac695 100644
--- a/devel/eric4/Makefile
+++ b/devel/eric4/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel python
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/devel/hgview/Makefile b/devel/hgview/Makefile
index c4563fb74907..5b5249a8edbe 100644
--- a/devel/hgview/Makefile
+++ b/devel/hgview/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hgview
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= LOGILAB
diff --git a/devel/kdebindings4-python-pykde4/Makefile b/devel/kdebindings4-python-pykde4/Makefile
index 289f815ba6db..a5641ec7ea69 100644
--- a/devel/kdebindings4-python-pykde4/Makefile
+++ b/devel/kdebindings4-python-pykde4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kdebindings
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde python
PKGNAMESUFFIX= -kde
diff --git a/devel/kdebindings4-python-pykde4/files/patch-python__pykde4__CMakeLists.txt b/devel/kdebindings4-python-pykde4/files/patch-python__pykde4__CMakeLists.txt
new file mode 100644
index 000000000000..582596d7bbd9
--- /dev/null
+++ b/devel/kdebindings4-python-pykde4/files/patch-python__pykde4__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./python/pykde4/CMakeLists.txt.orig 2010-01-28 00:00:42.991544204 +0300
++++ ./python/pykde4/CMakeLists.txt 2010-01-28 00:01:04.122014998 +0300
+@@ -211,6 +211,7 @@
+ # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
+ # (Don't forget the / at the end of sip/.)
+ INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
++ PATTERN "*.orig" EXCLUDE
+ PATTERN "*~" EXCLUDE # This sucks, why can't I just whitelist what I _do_ want?
+ PATTERN ".svn" EXCLUDE
+ PATTERN "*.in" EXCLUDE)
diff --git a/devel/kdebindings4-python-pykde4/files/patch-python__pykde4__sip__kdecore__typedefs.sip b/devel/kdebindings4-python-pykde4/files/patch-python__pykde4__sip__kdecore__typedefs.sip
new file mode 100644
index 000000000000..e3670005e402
--- /dev/null
+++ b/devel/kdebindings4-python-pykde4/files/patch-python__pykde4__sip__kdecore__typedefs.sip
@@ -0,0 +1,93 @@
+--- ./python/pykde4/sip/kdecore/typedefs.sip.orig 2009-10-02 12:21:29.000000000 +0400
++++ ./python/pykde4/sip/kdecore/typedefs.sip 2010-01-27 23:01:34.003236927 +0300
+@@ -467,90 +467,6 @@
+ };
+
+
+-template <TYPE*>
+-%MappedType QSet<TYPE*>
+-{
+-%TypeHeaderCode
+-#include <qset.h>
+-%End
+-
+-%ConvertFromTypeCode
+- // Create the list.
+- PyObject *l;
+-
+- if ((l = PyList_New(sipCpp->size())) == NULL)
+- return NULL;
+-
+- // Set the list elements.
+- QSet<TYPE*> set = *sipCpp;
+- int i = 0;
+- foreach ((TYPE *)value, set)
+- {
+- PyObject *obj = sipConvertFromNewType(value, sipType_TYPE, sipTransferObj);
+- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
+- {
+- Py_DECREF(l);
+-
+- if (obj)
+- Py_DECREF(obj);
+-
+- return NULL;
+- }
+-
+- Py_DECREF(obj);
+- i++;
+- }
+-
+- return l;
+-%End
+-
+-%ConvertToTypeCode
+- // Check the type if that is all that is required.
+- if (sipIsErr == NULL)
+- {
+- if (!PyList_Check(sipPy))
+- return 0;
+- }
+-
+- // Check the type if that is all that is required.
+- if (sipIsErr == NULL)
+- {
+- if (!PyList_Check(sipPy))
+- return 0;
+-
+- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+- if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE))
+- return 0;
+- }
+-
+- QSet<TYPE*> *qs = new QSet<TYPE*>;
+-
+- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+- {
+- int state;
+-
+- TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (l, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+-
+- if (*sipIsErr)
+- {
+- sipReleaseType(t, sipType_TYPE, state);
+-
+- delete qs;
+- return 0;
+- }
+-
+- *qs << t;
+-
+- sipReleaseType(t, sipType_TYPE, state);
+- }
+-
+- *sipCppPtr = qs;
+-
+- return sipGetState(sipTransferObj);
+-%End
+-};
+-
+-
+ template <TYPE>
+ %MappedType QSet<TYPE>
+ {
diff --git a/devel/kodos/Makefile b/devel/kodos/Makefile
index 5a078cbec4b0..85214f29a176 100644
--- a/devel/kodos/Makefile
+++ b/devel/kodos/Makefile
@@ -9,7 +9,7 @@
PORTNAME= kodos
PORTVERSION= 2.4.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MASTER_SITES= SF \
http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/devel/py-qt4-assistant/distinfo b/devel/py-qt4-assistant/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/devel/py-qt4-assistant/distinfo
+++ b/devel/py-qt4-assistant/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/devel/py-qt4-core/distinfo b/devel/py-qt4-core/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/devel/py-qt4-core/distinfo
+++ b/devel/py-qt4-core/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/devel/py-qt4-core/files/Qt.py b/devel/py-qt4-core/files/Qt.py
index 538943a66d0c..f792582184d0 100644
--- a/devel/py-qt4-core/files/Qt.py
+++ b/devel/py-qt4-core/files/Qt.py
@@ -56,6 +56,10 @@ try:
except ImportError:
pass
try:
+ from PyQt4.QtMultimedia import *
+except ImportError:
+ pass
+try:
from PyQt4.phonon import *
except ImportError:
pass
diff --git a/devel/py-qt4-core/files/patch-configure.py b/devel/py-qt4-core/files/patch-configure.py
index 3faf89d84351..f7a56b8f6a94 100644
--- a/devel/py-qt4-core/files/patch-configure.py
+++ b/devel/py-qt4-core/files/patch-configure.py
@@ -1,5 +1,5 @@
---- configure.py.orig 2009-09-24 13:41:15.000000000 +1100
-+++ configure.py 2009-09-24 23:32:33.000000000 +1100
+--- configure.py.orig 2010-01-01 13:43:51.000000000 +1000
++++ configure.py 2010-01-09 22:35:34.688908243 +1000
@@ -36,6 +36,10 @@
import sipconfig
@@ -10,8 +10,8 @@
+if freebsd: freebsd_port = os.environ['PYQT4_COMPONENT']
# Initialise the globals.
- pyqt_version = 0x040600
-@@ -69,7 +73,6 @@
+ pyqt_version = 0x040700
+@@ -70,7 +74,6 @@
dbuslibdirs = []
dbuslibs = []
@@ -19,7 +19,7 @@
# Under Windows qmake and the Qt DLLs must be into the system PATH otherwise
# the dynamic linker won't be able to resolve the symbols. On other systems we
# assume we can just run qmake by using its full pathname.
-@@ -351,14 +354,23 @@
+@@ -371,14 +374,23 @@
elif sipcfg.universal:
sipconfig.inform("QtDesigner module disabled with universal binaries.")
else:
@@ -46,7 +46,7 @@
def code(self):
cons_xtra_incdirs = []
-@@ -384,6 +396,10 @@
+@@ -404,6 +416,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)
-@@ -569,19 +585,28 @@
+@@ -589,19 +605,28 @@
sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins))
# Generate the QScintilla API file.
@@ -76,37 +76,37 @@
+ # aggregating like below would kill packaging
+ # instead the port installs the seperate module APIs
+ f = open("PyQt4.api", "w")
-
-- for l in api:
-- f.write("PyQt4." + l)
++
+ for m in pyqt_modules:
+ api = open(m + ".api")
-- api.close()
-- os.remove(m + ".api")
+- for l in api:
+- f.write("PyQt4." + l)
+ for l in api:
+ f.write("PyQt4." + l)
-- f.close()
+- api.close()
+- os.remove(m + ".api")
+ api.close()
+ os.remove(m + ".api")
-+
+
+- f.close()
+ f.close()
def _qpy_directories(self, mname):
"""Return a tuple of the directories containing the header files and
-@@ -670,19 +695,25 @@
+@@ -690,19 +715,25 @@
return libs, libdirs
def module_installs(self):
-- return ["__init__.py", "pyqtconfig.py"]
+- return [os.path.join(src_dir, "__init__.py"), "pyqtconfig.py"]
+ if freebsd:
+ if freebsd_port == 'core':
-+ return ["__init__.py", "pyqtconfig.py"]
++ return [os.path.join(src_dir, "__init__.py"), "pyqtconfig.py"]
+ else:
+ return []
+ else:
-+ return ["__init__.py", "pyqtconfig.py"]
++ return [os.path.join(src_dir, "__init__.py"), "pyqtconfig.py"]
def qpy_libs(self):
# See which QPy support libraries to build.
@@ -125,7 +125,7 @@
qpylibs["QtDesigner"] = "qpydesigner.pro"
# Run qmake to generate the Makefiles.
-@@ -783,30 +814,58 @@
+@@ -812,30 +843,58 @@
# Create the pyuic4 wrapper. Use the GUI version on MacOS (so that
# previews work properly and normal console use will work anyway), but
# not on Windows (so that normal console use will work).
@@ -149,7 +149,7 @@
+ makefile = sipconfig.PythonModuleMakefile(
+ configuration=sipcfg,
+ dstdir=uicdir,
-+ srcdir="uic",
++ srcdir=os.path.join(src_dir, "pyuic", "uic"),
+ dir="pyuic",
+ installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
+ )
@@ -181,28 +181,28 @@
- makefile = sipconfig.PythonModuleMakefile(
- configuration=sipcfg,
- dstdir=uicdir,
-- srcdir="uic",
+- srcdir=os.path.join(src_dir, "pyuic", "uic"),
- dir="pyuic",
- installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
- )
+ sipconfig.inform("Creating pyuic4 Makefile...")
-
-- makefile.generate()
-- tool.append("pyuic")
++
+ makefile = sipconfig.PythonModuleMakefile(
+ configuration=sipcfg,
+ dstdir=uicdir,
-+ srcdir="uic",
++ srcdir=os.path.join(src_dir, "pyuic", "uic"),
+ dir="pyuic",
+ installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
+ )
-+
+
+- makefile.generate()
+- tool.append("pyuic")
+ makefile.generate()
+ tool.append("pyuic")
if "QtXml" in pyqt_modules:
sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -833,7 +892,10 @@
+@@ -863,7 +922,10 @@
makefile.generate()
tool.append("pyrcc")
else:
@@ -214,7 +214,7 @@
if opts.designer_plugin and "QtDesigner" in pyqt_modules:
py_major = sipcfg.py_version >> 16
-@@ -856,11 +918,17 @@
+@@ -886,11 +948,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)
@@ -233,23 +233,28 @@
if opts.designer_plugin:
sipconfig.inform("Creating Qt Designer plugin Makefile...")
-@@ -947,21 +1015,44 @@
+@@ -984,8 +1052,13 @@
sipconfig.inform("The %s Qt libraries are in %s." % (lib_type, qt_libdir))
sipconfig.inform("The Qt binaries are in %s." % qt_bindir)
sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
- sipconfig.inform("These PyQt modules will be built: %s." % ", ".join(pyqt_modules))
- sipconfig.inform("The PyQt Python package will be installed in %s." % opts.pyqtmoddir)
--
-- if opts.designer_plugin:
+ if freebsd:
+ if not freebsd_port in ('dbus', 'demo', 'designerplugin'):
-+ sipconfig.inform("This PyQt module will be built: %s." % pyqt_modules[-1])
++ sipconfig.inform("These PyQt modules will be built: %s." % ", ".join(pyqt_modules))
+ sipconfig.inform("The PyQt Python package will be installed in %s." % opts.pyqtmoddir)
-+ if freebsd_port == 'designerplugin':
-+ sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opts.plugindir, "designer"))
+ else:
-+ sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
++ sipconfig.inform("These PyQt modules will be built: %s." % ", ".join(pyqt_modules))
+ sipconfig.inform("The PyQt Python package will be installed in %s." % opts.pyqtmoddir)
+
+ if opts.no_docstrings:
+ sipconfig.inform("PyQt is being built without generated docstrings.")
+@@ -995,18 +1068,36 @@
+ if opts.prot_is_public:
+ sipconfig.inform("PyQt is being built with 'protected' redefined as 'public'.")
+
+- if opts.designer_plugin:
++ if freebsd_port == 'designerplugin':
sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opts.plugindir, "designer"))
if opts.api:
@@ -258,7 +263,7 @@
+ if not freebsd_port in ('dbus', 'demo', 'doc', 'designerplugin'):
+ sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opts.qscidir, "api", "python"))
+ else:
-+ sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opts.qscidir, "api", "python"))
++ sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opts.qscidir, "api", "python"))
if pydbusmoddir:
- sipconfig.inform("The dbus support module will be installed in %s." % pydbusmoddir)
@@ -286,7 +291,7 @@
if opts.vendorcheck:
sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -1368,7 +1459,11 @@
+@@ -1415,7 +1506,11 @@
of libraries.
extra_sip_flags is an optional list of additional flags to pass to SIP.
"""
@@ -299,7 +304,7 @@
mk_clean_dir(mname)
-@@ -1440,7 +1535,11 @@
+@@ -1501,7 +1596,11 @@
sipconfig.error("Unable to create the C++ code.")
# Generate the Makefile.
@@ -312,7 +317,7 @@
installs = []
-@@ -1899,6 +1998,10 @@
+@@ -1990,6 +2089,10 @@
p.print_help()
sys.exit(2)
@@ -323,7 +328,7 @@
sipcfg.set_build_macros(macros)
# Check Qt is what we need.
-@@ -1906,7 +2009,7 @@
+@@ -1997,7 +2100,7 @@
# Check the licenses are compatible.
check_license()
@@ -332,7 +337,7 @@
# Check which modules to build.
pyqt.check_modules()
-@@ -1928,9 +2031,18 @@
+@@ -2019,9 +2122,18 @@
installs=[(pyqt.module_installs(), pyqt_modroot)]
if opts.api:
@@ -353,7 +358,7 @@
if opts.bigqt:
xtra_modules.append("_qt")
-@@ -1941,14 +2053,33 @@
+@@ -2032,15 +2144,33 @@
if opts.mwg_qwt_dir:
xtra_modules.append("Qwt5")
@@ -380,12 +385,13 @@
).generate()
# Install the configuration module.
-- create_config("pyqtconfig.py", "pyqtconfig.py.in", macros)
+- create_config("pyqtconfig.py", os.path.join(src_dir, "pyqtconfig.py.in"),
+- macros)
+ if freebsd:
+ if freebsd_port == 'core':
-+ create_config("pyqtconfig.py", "pyqtconfig.py.in", macros)
++ create_config("pyqtconfig.py", os.path.join(src_dir, "pyqtconfig.py.in"), macros)
+ else:
-+ create_config("pyqtconfig.py", "pyqtconfig.py.in", macros)
++ create_config("pyqtconfig.py", os.path.join(src_dir, "pyqtconfig.py.in"), macros)
###############################################################################
diff --git a/devel/py-qt4-core/pkg-plist b/devel/py-qt4-core/pkg-plist
index d42cea27ed48..9c0d800275d4 100644
--- a/devel/py-qt4-core/pkg-plist
+++ b/devel/py-qt4-core/pkg-plist
@@ -97,9 +97,13 @@ bin/pyuic4
%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyo
%%SIP%%share/py-sip/QtCore/QtCoremod.sip
+%%SIP%%share/py-sip/QtCore/qabstractanimation.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/qabstractstate.sip
+%%SIP%%share/py-sip/QtCore/qabstracttransition.sip
+%%SIP%%share/py-sip/QtCore/qanimationgroup.sip
%%SIP%%share/py-sip/QtCore/qbasictimer.sip
%%SIP%%share/py-sip/QtCore/qbitarray.sip
%%SIP%%share/py-sip/QtCore/qbuffer.sip
@@ -113,13 +117,17 @@ bin/pyuic4
%%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/qeasingcurve.sip
%%SIP%%share/py-sip/QtCore/qeventloop.sip
+%%SIP%%share/py-sip/QtCore/qeventtransition.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/qfinalstate.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/qhistorystate.sip
%%SIP%%share/py-sip/QtCore/qiodevice.sip
%%SIP%%share/py-sip/QtCore/qlibrary.sip
%%SIP%%share/py-sip/QtCore/qlibraryinfo.sip
@@ -127,6 +135,7 @@ bin/pyuic4
%%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/qmargins.sip
%%SIP%%share/py-sip/QtCore/qmetaobject.sip
%%SIP%%share/py-sip/QtCore/qmetatype.sip
%%SIP%%share/py-sip/QtCore/qmimedata.sip
@@ -137,20 +146,28 @@ bin/pyuic4
%%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/qparallelanimationgroup.sip
+%%SIP%%share/py-sip/QtCore/qpauseanimation.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/qpropertyanimation.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/qsequentialanimationgroup.sip
+%%SIP%%share/py-sip/QtCore/qset.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/qsignaltransition.sip
%%SIP%%share/py-sip/QtCore/qsize.sip
%%SIP%%share/py-sip/QtCore/qsocketnotifier.sip
+%%SIP%%share/py-sip/QtCore/qstate.sip
+%%SIP%%share/py-sip/QtCore/qstatemachine.sip
%%SIP%%share/py-sip/QtCore/qstring.sip
%%SIP%%share/py-sip/QtCore/qstringlist.sip
%%SIP%%share/py-sip/QtCore/qstringmatcher.sip
@@ -167,6 +184,7 @@ bin/pyuic4
%%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/qvariantanimation.sip
%%SIP%%share/py-sip/QtCore/qvector.sip
%%SIP%%share/py-sip/QtCore/qwaitcondition.sip
%%SIP%%share/py-sip/QtCore/qxmlstream.sip
diff --git a/devel/py-qt4-dbus/distinfo b/devel/py-qt4-dbus/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/devel/py-qt4-dbus/distinfo
+++ b/devel/py-qt4-dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/devel/py-qt4-designer/distinfo b/devel/py-qt4-designer/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/devel/py-qt4-designer/distinfo
+++ b/devel/py-qt4-designer/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/devel/py-qt4-designerplugin/distinfo b/devel/py-qt4-designerplugin/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/devel/py-qt4-designerplugin/distinfo
+++ b/devel/py-qt4-designerplugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/devel/py-qt4-help/distinfo b/devel/py-qt4-help/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/devel/py-qt4-help/distinfo
+++ b/devel/py-qt4-help/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/devel/py-qt4-qscintilla2/distinfo b/devel/py-qt4-qscintilla2/distinfo
index 34a0b49d5da6..84df49a185c3 100644
--- a/devel/py-qt4-qscintilla2/distinfo
+++ b/devel/py-qt4-qscintilla2/distinfo
@@ -1,3 +1,3 @@
-MD5 (QScintilla-gpl-2.4.tar.gz) = dd69520ec91f1acb97a4eb74ddde37c9
-SHA256 (QScintilla-gpl-2.4.tar.gz) = 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
-SIZE (QScintilla-gpl-2.4.tar.gz) = 2304554
+MD5 (QScintilla-gpl-2.4.2.tar.gz) = 316dc8b53ec02548cae1c0d5acfa8ace
+SHA256 (QScintilla-gpl-2.4.2.tar.gz) = 42c9868c355a8feab5e404353693cabc11ec5fa1e0b306c714d893f21e495d73
+SIZE (QScintilla-gpl-2.4.2.tar.gz) = 2367724
diff --git a/devel/py-qt4-qscintilla2/pkg-plist b/devel/py-qt4-qscintilla2/pkg-plist
index edf0f1391824..fe0de158eeec 100644
--- a/devel/py-qt4-qscintilla2/pkg-plist
+++ b/devel/py-qt4-qscintilla2/pkg-plist
@@ -29,9 +29,11 @@
%%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/qscilexerspice.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/qscilexerverilog.sip
%%SIP%%share/py-sip/Qsci/qscilexervhdl.sip
%%SIP%%share/py-sip/Qsci/qscilexerxml.sip
%%SIP%%share/py-sip/Qsci/qscilexeryaml.sip
diff --git a/devel/py-qt4-script/distinfo b/devel/py-qt4-script/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/devel/py-qt4-script/distinfo
+++ b/devel/py-qt4-script/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/devel/py-qt4-scripttools/distinfo b/devel/py-qt4-scripttools/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/devel/py-qt4-scripttools/distinfo
+++ b/devel/py-qt4-scripttools/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/devel/py-qt4-test/distinfo b/devel/py-qt4-test/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/devel/py-qt4-test/distinfo
+++ b/devel/py-qt4-test/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/devel/py-qt4-test/pkg-plist b/devel/py-qt4-test/pkg-plist
index 5e153ba9f2f5..6ca8b457b030 100644
--- a/devel/py-qt4-test/pkg-plist
+++ b/devel/py-qt4-test/pkg-plist
@@ -4,6 +4,7 @@
%%SIP%%share/py-sip/QtTest/qtestkeyboard.sip
%%SIP%%share/py-sip/QtTest/qtestmouse.sip
%%SIP%%share/py-sip/QtTest/qtestsystem.sip
+%%SIP%%share/py-sip/QtTest/qtesttouch.sip
%%API%%share/qt4/qsci/api/python/QtTest.api
%%SIP%%@dirrm share/py-sip/QtTest
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
diff --git a/devel/py-qt4/Makefile b/devel/py-qt4/Makefile
new file mode 100644
index 000000000000..91417b9805b4
--- /dev/null
+++ b/devel/py-qt4/Makefile
@@ -0,0 +1,54 @@
+# New ports collection makefile for: py-qt4
+# Date created: 2009-06-30
+# Whom: Dima Panov <Fluffy@FreeBSD.org>
+#
+# $FreeBSD$
+
+PORTNAME= qt4
+PORTVERSION= ${PYQT4_VERSION}
+CATEGORIES= devel python
+MASTER_SITES= # empty
+DISTFILES= # none
+EXTRACT_ONLY= # empty
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+PKGNAMEPREFIX2= ${PYTHON_PKGNAMEPREFIX}${PORTNAME}-
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT?= The "meta-port" for PyQt4
+
+USE_PYTHON= yes
+
+EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4
+
+NO_BUILD= yes
+.include "../../devel/py-sip/files/bsd.pyqt.mk"
+
+RUN_DEPENDS+= ${PKGNAMEPREFIX2}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
+ ${PKGNAMEPREFIX2}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+ ${PKGNAMEPREFIX2}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network \
+ ${PKGNAMEPREFIX2}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml \
+ ${PKGNAMEPREFIX2}assistant>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-assistant \
+ ${PKGNAMEPREFIX2}opengl>=${PYQT4_VERSION}:${PORTSDIR}/x11/py-qt4-opengl \
+ ${PKGNAMEPREFIX2}script>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-script \
+ ${PKGNAMEPREFIX2}scripttools>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-scripttools \
+ ${PKGNAMEPREFIX2}sql>=${PYQT4_VERSION}:${PORTSDIR}/databases/py-qt4-sql \
+ ${PKGNAMEPREFIX2}svg>=${PYQT4_VERSION}:${PORTSDIR}/graphics/py-qt4-svg \
+ ${PKGNAMEPREFIX2}test>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-test \
+ ${PKGNAMEPREFIX2}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designer \
+ ${PKGNAMEPREFIX2}designerplugin>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designerplugin \
+ ${PKGNAMEPREFIX2}dbus>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-dbus \
+ ${PKGNAMEPREFIX2}xmlpatterns>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xmlpatterns \
+ ${PKGNAMEPREFIX2}help>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-help \
+ ${PKGNAMEPREFIX2}webkit>=${PYQT4_VERSION}:${PORTSDIR}/www/py-qt4-webkit \
+ ${PKGNAMEPREFIX2}multimedia>=${PYQT4_VERSION}:${PORTSDIR}/multimedia/py-qt4-multimedia \
+ ${PKGNAMEPREFIX2}phonon>=${PYQT4_VERSION}:${PORTSDIR}/multimedia/py-qt4-phonon \
+ ${PKGNAMEPREFIX2}qscintilla2>=${QSCI2_VERSION}:${PORTSDIR}/devel/py-qt4-qscintilla2 \
+ ${EXAMPLESDIR}/README:${PORTSDIR}/misc/py-qt4-demo
+.if !defined(NOPORTDOCS)
+RUN_DEPENDS+= ${PKGNAMEPREFIX2}doc>=${PYQT4_VERSION}:${PORTSDIR}/misc/py-qt4-doc
+.endif
+
+do-install:
+ ${DO_NADA}
+
+.include <bsd.port.mk>
diff --git a/devel/py-qt4/pkg-descr b/devel/py-qt4/pkg-descr
new file mode 100644
index 000000000000..608efccf2058
--- /dev/null
+++ b/devel/py-qt4/pkg-descr
@@ -0,0 +1,4 @@
+PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
+This package provides the PyQt4 metaport.
+
+WWW: http://www.riverbankcomputing.co.uk/pyqt/
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index 44c22ca3d91b..7e6fdda7f438 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,3 +1,3 @@
-MD5 (sip-4.9.3.tar.gz) = d60ec6e87c0155df779fd8b529e80706
-SHA256 (sip-4.9.3.tar.gz) = de93d68f367955725817dd68e9d028fe62ea5fb2ae6755acf0a592ebd223fd83
-SIZE (sip-4.9.3.tar.gz) = 661144
+MD5 (sip-4.10.tar.gz) = 4b8f7361839b33868dd3cc576509ba8e
+SHA256 (sip-4.10.tar.gz) = d08a764a69e41f37d81b456d628947d114da37a6cd8456e02e3f8ad481e5d696
+SIZE (sip-4.10.tar.gz) = 702403
diff --git a/devel/py-sip/files/bsd.pyqt.mk b/devel/py-sip/files/bsd.pyqt.mk
index a3e412081407..2775efad332a 100644
--- a/devel/py-sip/files/bsd.pyqt.mk
+++ b/devel/py-sip/files/bsd.pyqt.mk
@@ -13,12 +13,12 @@ MASTER_SITES_PYKDE4= ${MASTER_SITE_RIVERBANK}PyKDE4/
MASTER_SITES_QSCI1= ${MASTER_SITE_RIVERBANK}QScintilla1/
MASTER_SITES_QSCI2= ${MASTER_SITE_RIVERBANK}QScintilla2/
-SIP_VERSION= 4.9.3
+SIP_VERSION= 4.10
PYQT3_VERSION= 3.18.1
-PYQT4_VERSION= 4.6.2
+PYQT4_VERSION= 4.7
PYKDE3_VERSION= 3.16.6
QSCI1_VERSION= 1.7.1
-QSCI2_VERSION= 2.4
+QSCI2_VERSION= 2.4.2
SIP_DISTNAME= sip-${SIP_VERSION}
PYQT3_DISTNAME= PyQt-x11-gpl-${PYQT3_VERSION}
diff --git a/devel/qct/Makefile b/devel/qct/Makefile
index 341cc8eae631..90ebde70ff41 100644
--- a/devel/qct/Makefile
+++ b/devel/qct/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qct
PORTVERSION= 1.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel python
MASTER_SITES= http://qct.sourceforge.net/ \
ftp://ftp.ipt.ru/pub/download/${PORTNAME}/
diff --git a/devel/qscintilla2-designerplugin/distinfo b/devel/qscintilla2-designerplugin/distinfo
index 34a0b49d5da6..84df49a185c3 100644
--- a/devel/qscintilla2-designerplugin/distinfo
+++ b/devel/qscintilla2-designerplugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (QScintilla-gpl-2.4.tar.gz) = dd69520ec91f1acb97a4eb74ddde37c9
-SHA256 (QScintilla-gpl-2.4.tar.gz) = 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
-SIZE (QScintilla-gpl-2.4.tar.gz) = 2304554
+MD5 (QScintilla-gpl-2.4.2.tar.gz) = 316dc8b53ec02548cae1c0d5acfa8ace
+SHA256 (QScintilla-gpl-2.4.2.tar.gz) = 42c9868c355a8feab5e404353693cabc11ec5fa1e0b306c714d893f21e495d73
+SIZE (QScintilla-gpl-2.4.2.tar.gz) = 2367724
diff --git a/devel/qscintilla2/distinfo b/devel/qscintilla2/distinfo
index 34a0b49d5da6..84df49a185c3 100644
--- a/devel/qscintilla2/distinfo
+++ b/devel/qscintilla2/distinfo
@@ -1,3 +1,3 @@
-MD5 (QScintilla-gpl-2.4.tar.gz) = dd69520ec91f1acb97a4eb74ddde37c9
-SHA256 (QScintilla-gpl-2.4.tar.gz) = 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
-SIZE (QScintilla-gpl-2.4.tar.gz) = 2304554
+MD5 (QScintilla-gpl-2.4.2.tar.gz) = 316dc8b53ec02548cae1c0d5acfa8ace
+SHA256 (QScintilla-gpl-2.4.2.tar.gz) = 42c9868c355a8feab5e404353693cabc11ec5fa1e0b306c714d893f21e495d73
+SIZE (QScintilla-gpl-2.4.2.tar.gz) = 2367724
diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist
index c222be54b14c..df47e5075223 100644
--- a/devel/qscintilla2/pkg-plist
+++ b/devel/qscintilla2/pkg-plist
@@ -29,9 +29,11 @@
%%QT_INCDIR_REL%%/Qsci/qscilexerproperties.h
%%QT_INCDIR_REL%%/Qsci/qscilexerpython.h
%%QT_INCDIR_REL%%/Qsci/qscilexerruby.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerspice.h
%%QT_INCDIR_REL%%/Qsci/qscilexersql.h
%%QT_INCDIR_REL%%/Qsci/qscilexertcl.h
%%QT_INCDIR_REL%%/Qsci/qscilexertex.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerverilog.h
%%QT_INCDIR_REL%%/Qsci/qscilexervhdl.h
%%QT_INCDIR_REL%%/Qsci/qscilexerxml.h
%%QT_INCDIR_REL%%/Qsci/qscilexeryaml.h
@@ -43,8 +45,8 @@
%%QT_INCDIR_REL%%/Qsci/qscistyledtext.h
%%QT_LIBDIR_REL%%/libqscintilla2.so
%%QT_LIBDIR_REL%%/libqscintilla2.so.5
-%%QT_LIBDIR_REL%%/libqscintilla2.so.5.1
-%%QT_LIBDIR_REL%%/libqscintilla2.so.5.1.0
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.2
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.2.0
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
@@ -129,12 +131,16 @@
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerRuby.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSQL-members.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSQL.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSpice-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSpice.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTCL-members.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTCL.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTeX-members.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTeX.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVHDL-members.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVHDL.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVerilog-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVerilog.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerXML-members.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerXML.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerYAML-members.html
@@ -152,8 +158,8 @@
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyledText-members.html
%%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyledText.html
%%PORTDOCS%%%%DOCSDIR%%/html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_944256396c06c0295aa2eca7dcfea282.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_d32dfe2bcddd0b2d894b9fb13d6bdd4d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_8c570a21573c8a34f02ad16af33f26f5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_f2bfa0da14ade1666984a0b363f1bed0.html
%%PORTDOCS%%%%DOCSDIR%%/html/dirs.html
%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
@@ -250,6 +256,7 @@
share/qt4/qsci/api/python/Python-2.4.api
share/qt4/qsci/api/python/Python-2.5.api
share/qt4/qsci/api/python/Python-2.6.api
+share/qt4/qsci/api/python/Python-3.1.api
%%NLS%%share/qt4/translations/qscintilla_cs.qm
%%NLS%%share/qt4/translations/qscintilla_de.qm
%%NLS%%share/qt4/translations/qscintilla_es.qm
diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
index 47fbb170214c..10d6731df266 100644
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gns3
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF/gns-3/GNS3/${PORTVERSION}
DISTNAME= GNS3-${PORTVERSION}-src
diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index 46f969045b00..0764ee49cfbe 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -9,6 +9,7 @@ PORTNAME= eficas
DISTVERSIONPREFIX= full-src-
DISTVERSION= 1.16.0-1
DISTVERSIONSUFFIX= .noarch
+PORTREVISION= 1
CATEGORIES= french cad
MASTER_SITES= http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
DISTNAME= aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/games/py-anki/Makefile b/games/py-anki/Makefile
index 3bf8645b241e..88891a48ff15 100644
--- a/games/py-anki/Makefile
+++ b/games/py-anki/Makefile
@@ -7,6 +7,7 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Spaced-repetition memory training library
+PORTREVISION= 1
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MASTERDIR= ${.CURDIR}/../anki
diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile
index 34451017a29c..c68893d46a45 100644
--- a/games/py-mnemosyne/Makefile
+++ b/games/py-mnemosyne/Makefile
@@ -8,6 +8,7 @@
PORTNAME= mnemosyne
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= games python
MASTER_SITES= SF/${PORTNAME}-proj/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile
index a62ea383f8c5..4b29c05024ca 100644
--- a/graphics/imgseek/Makefile
+++ b/graphics/imgseek/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imgSeek
PORTVERSION= 0.8.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/lphoto/Makefile b/graphics/lphoto/Makefile
index 964474531a61..b6387aa562d4 100644
--- a/graphics/lphoto/Makefile
+++ b/graphics/lphoto/Makefile
@@ -25,6 +25,10 @@ RUN_DEPENDS= gphoto2:${PORTSDIR}/graphics/gphoto2 \
${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
#USE_CDRTOOLS= yes
+IGNORE= does not compile with devel/py-sip>=4.10
+DEPRECATED= broken
+EXPIRATION_DATE=2010-03-30
+
USE_PYTHON= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/py-qt4-svg/distinfo b/graphics/py-qt4-svg/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/graphics/py-qt4-svg/distinfo
+++ b/graphics/py-qt4-svg/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index e1fd096bb751..0964eb67bb92 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qgis
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= graphics geography
MASTER_SITES= http://download.osgeo.org/qgis/src/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -26,7 +27,7 @@ USE_QT_VER= 4
USE_SQLITE= yes
CMAKE_USE_PTHREAD= yes
CMAKE_ENV+= QMAKESPEC=${QMAKESPEC}
-QT_COMPONENTS= gui svg xml network sql linguist \
+QT_COMPONENTS= gui svg xml network sql designer linguist_build \
qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -36,7 +37,7 @@ USE_LDCONFIG= yes
OPTIONS= GRASS "Enable GRASS support" Off \
POSTGIS "Enable PostGIS support" Off \
- PYTHON "Enable Python support" On
+ PYTHON "Enable Python (broken with sip-4.10)" Off
.include <bsd.port.pre.mk>
@@ -65,6 +66,7 @@ PLIST_SUB+= PGSQL="@comment "
.if defined(WITHOUT_PYTHON)
PLIST_SUB+= QGIS_PYTHON="@comment "
.else
+IGNORE= doesn't compile with devel/py-sip>=4.10
PLIST_SUB+= QGIS_PYTHON=""
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sip>=4.8.2:${PORTSDIR}/devel/py-sip \
${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.5.4:${PORTSDIR}/x11-toolkits/py-qt4-gui \
diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index fa67ee61d597..a9af501d0e1c 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -7,6 +7,7 @@
PORTNAME= convertall
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= BERLIOS
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index 88d48b60647f..db32946eae10 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qtiplot
DISTVERSION= 0.9.7.11
+PORTREVISION= 1
CATEGORIES= math science
MASTER_SITES= BERLIOS http://soft.proindependent.com/src/
diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile
index afaaa465fea4..f88b6d47512f 100644
--- a/math/scilab-toolbox-sivp/Makefile
+++ b/math/scilab-toolbox-sivp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sivp
DISTVERSION= 0.4.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math graphics multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
PKGNAMEPREFIX= scilab-toolbox-
@@ -17,7 +17,7 @@ COMMENT= Scilab Image and Video Processing Toolbox
BUILD_DEPENDS= ${LOCALBASE}/bin/scilab:${PORTSDIR}/math/scilab \
${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS= cv.1:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS= cv.2:${PORTSDIR}/graphics/opencv
RUN_DEPENDS= ${LOCALBASE}/bin/scilab:${PORTSDIR}/math/scilab
SCILABDIR?= lib/scilab
diff --git a/misc/flyway/Makefile b/misc/flyway/Makefile
index 7bc5b83940c8..208cab66867e 100644
--- a/misc/flyway/Makefile
+++ b/misc/flyway/Makefile
@@ -8,7 +8,7 @@
PORTNAME= flyway
PORTVERSION= 0.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= misc python geography
MASTER_SITES= http://www.bellz.org/flyway/
diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile
index 57ba4d5978d9..a2a28779e31f 100644
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@@ -42,6 +42,7 @@ RUN_DEPENDS+= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-co
${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}multimedia>=${PYQT4_VERSION}:${PORTSDIR}/multimedia/py-qt4-multimedia \
${PKGNAMEPREFIX}phonon>=${PYQT4_VERSION}:${PORTSDIR}/multimedia/py-qt4-phonon
.if !defined(NOPORTDOCS)
RUN_DEPENDS+= ${PKGNAMEPREFIX}doc>=${PYQT4_VERSION}:${PORTSDIR}/misc/py-qt4-doc
diff --git a/misc/py-qt4-demo/distinfo b/misc/py-qt4-demo/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/misc/py-qt4-demo/distinfo
+++ b/misc/py-qt4-demo/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/misc/py-qt4-demo/pkg-plist b/misc/py-qt4-demo/pkg-plist
index d21a30a11b97..6e5944a3455a 100644
--- a/misc/py-qt4-demo/pkg-plist
+++ b/misc/py-qt4-demo/pkg-plist
@@ -13,6 +13,49 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/ui_mainwindow.pyc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/webbrowser.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/activeqt/webbrowser/webbrowser.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/animatedtiles/animatedtiles.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/animatedtiles/animatedtiles.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/animatedtiles/animatedtiles.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/animatedtiles/images/Time-For-Lunch-2.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/animatedtiles/images/centered.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/animatedtiles/images/ellipse.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/animatedtiles/images/figure8.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/animatedtiles/images/kinetic.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/animatedtiles/images/random.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/animatedtiles/images/tile.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/appchooser/accessories-dictionary.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/appchooser/akregator.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/appchooser/appchooser.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/appchooser/appchooser.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/appchooser/appchooser.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/appchooser/digikam.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/appchooser/k3b.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/easing/easing.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/easing/easing.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/easing/easing.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/easing/form.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/easing/images/qt-logo.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/easing/ui_form.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/easing/ui_form.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/moveblocks.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/moveblocks.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/states/accessories-dictionary.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/states/akregator.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/states/digikam.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/states/help-browser.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/states/k3b.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/states/kchart.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/states/states.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/states/states.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/states/states.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/stickman/animations/chilling
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/stickman/animations/dancing
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/stickman/animations/dead
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/stickman/animations/jumping
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/stickman/stickman.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/stickman/stickman.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animation/stickman/stickman.qrc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/No-Ones-Laughing-3.jpg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialog.py
@@ -171,7 +214,12 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/puzzle/puzzle.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/puzzle/puzzle.pyc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop/puzzle/puzzle.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/effects/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/effects/lighting.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/effects/lighting.pyc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/anchorlayout.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/anchorlayout.pyc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/collidingmice.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/collidingmice.pyc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/images/cheese.jpg
@@ -593,6 +641,7 @@
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview/collidingmice/images
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview/collidingmice
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphicsview
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/effects
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/draganddrop/puzzle
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/draganddrop/fridgemagnets
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/draganddrop/draggabletext
@@ -617,7 +666,17 @@
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos/qtdemo
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos/embeddeddialogs
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/animation/stickman/animations
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/animation/stickman
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/animation/states
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/animation/easing/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/animation/easing
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/animation/appchooser
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/animation/animatedtiles/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/animation/animatedtiles
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/animation
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/activeqt/webbrowser/icons
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/activeqt/webbrowser
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/activeqt
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+
diff --git a/misc/py-qt4-doc/distinfo b/misc/py-qt4-doc/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/misc/py-qt4-doc/distinfo
+++ b/misc/py-qt4-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/misc/py-qt4-doc/pkg-plist b/misc/py-qt4-doc/pkg-plist
index c2247979f1d0..9e92dc1df858 100644
--- a/misc/py-qt4-doc/pkg-plist
+++ b/misc/py-qt4-doc/pkg-plist
@@ -9,7 +9,6 @@
%%PORTDOCS%%%%DOCSDIR%%/THANKS
%%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-toolbar.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/bearings.png
@@ -26,6 +25,8 @@
%%PORTDOCS%%%%DOCSDIR%%/html/images/buttonbox-winlayout-horizontal.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/buttonbox-winlayout-vertical.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/cde-lcdnumber.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/checkboxes-exclusive.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/checkboxes-non-exclusive.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/cleanlooks-calendarwidget.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/cleanlooks-pushbutton-menu.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/conceptaudio.png
@@ -53,6 +54,12 @@
%%PORTDOCS%%%%DOCSDIR%%/html/images/filedialogurls.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/foreignkeys.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/frames.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/graphicseffect-blur.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/graphicseffect-colorize.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/graphicseffect-drop-shadow.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/graphicseffect-opacity.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/graphicseffect-plain.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/graphicseffect-widget.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/graphicsview-ellipseitem-pie.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/graphicsview-ellipseitem.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/graphicsview-items.png
@@ -111,8 +118,10 @@
%%PORTDOCS%%%%DOCSDIR%%/html/images/msgbox4.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/noforeignkeys.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/palette.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pangesture.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/parent-child-widgets.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/patternist-wordProcessor.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pinchgesture.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/plastique-checkbox.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/plastique-colordialog.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/plastique-dateedit.png
@@ -157,6 +166,47 @@
%%PORTDOCS%%%%DOCSDIR%%/html/images/qcolumnview.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/qconicalgradient.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/qdesktopwidget.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inback.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inbounce.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-incirc.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-incubic.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inelastic.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inexpo.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inoutback.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inoutbounce.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inoutcirc.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inoutcubic.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inoutelastic.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inoutexpo.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inoutquad.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inoutquart.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inoutquint.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inoutsine.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inquad.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inquart.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-inquint.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-insine.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-linear.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outback.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outbounce.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outcirc.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outcubic.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outelastic.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outexpo.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outinback.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outinbounce.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outincirc.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outincubic.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outinelastic.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outinexpo.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outinquad.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outinquart.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outinquint.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outinsine.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outquad.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outquart.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outquint.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/qeasingcurve-outsine.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/qerrormessage.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/qformlayout-kde.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/qformlayout-mac.png
@@ -299,12 +349,13 @@
%%PORTDOCS%%%%DOCSDIR%%/html/images/rsubtract.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/runion.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/rxor.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/simpleanchorlayout-example.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/swipegesture.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/system-tray.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/taskmenuextension-example-faded.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/tcpstream.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/texttable-merge.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/texttable-split.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/threadsandobjects.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/udppackets.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/whatsthis.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/widgetdelegate.png
@@ -359,6 +410,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/phonon-videowidget.html
%%PORTDOCS%%%%DOCSDIR%%/html/phonon-volumeslider.html
%%PORTDOCS%%%%DOCSDIR%%/html/phonon.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qabstractanimation.html
%%PORTDOCS%%%%DOCSDIR%%/html/qabstractbutton.html
%%PORTDOCS%%%%DOCSDIR%%/html/qabstracteventdispatcher.html
%%PORTDOCS%%%%DOCSDIR%%/html/qabstractextensionfactory.html
@@ -384,18 +436,28 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qabstractsocket.html
%%PORTDOCS%%%%DOCSDIR%%/html/qabstractspinbox-stepenabled.html
%%PORTDOCS%%%%DOCSDIR%%/html/qabstractspinbox.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qabstractstate.html
%%PORTDOCS%%%%DOCSDIR%%/html/qabstracttablemodel.html
%%PORTDOCS%%%%DOCSDIR%%/html/qabstracttextdocumentlayout-paintcontext.html
%%PORTDOCS%%%%DOCSDIR%%/html/qabstracttextdocumentlayout-selection.html
%%PORTDOCS%%%%DOCSDIR%%/html/qabstracttextdocumentlayout.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qabstracttransition.html
%%PORTDOCS%%%%DOCSDIR%%/html/qabstracturiresolver.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qabstractvideobuffer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qabstractvideosurface.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
+%%PORTDOCS%%%%DOCSDIR%%/html/qanimationgroup.html
%%PORTDOCS%%%%DOCSDIR%%/html/qapplication.html
%%PORTDOCS%%%%DOCSDIR%%/html/qassistantclient.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qaudiodeviceinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qaudioformat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qaudioinput.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qaudiooutput.html
%%PORTDOCS%%%%DOCSDIR%%/html/qauthenticator.html
%%PORTDOCS%%%%DOCSDIR%%/html/qaxcontainer.html
%%PORTDOCS%%%%DOCSDIR%%/html/qbasictimer.html
@@ -486,10 +548,12 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qdragmoveevent.html
%%PORTDOCS%%%%DOCSDIR%%/html/qdropevent.html
%%PORTDOCS%%%%DOCSDIR%%/html/qdynamicpropertychangeevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qeasingcurve.html
%%PORTDOCS%%%%DOCSDIR%%/html/qerrormessage.html
%%PORTDOCS%%%%DOCSDIR%%/html/qevent.html
%%PORTDOCS%%%%DOCSDIR%%/html/qeventloop-processeventsflags.html
%%PORTDOCS%%%%DOCSDIR%%/html/qeventloop.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qeventtransition.html
%%PORTDOCS%%%%DOCSDIR%%/html/qextensionfactory.html
%%PORTDOCS%%%%DOCSDIR%%/html/qextensionmanager.html
%%PORTDOCS%%%%DOCSDIR%%/html/qfile-permissions.html
@@ -501,6 +565,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qfileopenevent.html
%%PORTDOCS%%%%DOCSDIR%%/html/qfilesystemmodel.html
%%PORTDOCS%%%%DOCSDIR%%/html/qfilesystemwatcher.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qfinalstate.html
%%PORTDOCS%%%%DOCSDIR%%/html/qfocusevent.html
%%PORTDOCS%%%%DOCSDIR%%/html/qfocusframe.html
%%PORTDOCS%%%%DOCSDIR%%/html/qfont.html
@@ -519,16 +584,33 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qftp.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgenericargument.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgenericreturnargument.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgesture.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgestureevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgesturerecognizer-result.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgesturerecognizer.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgl-formatoptions.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgl.html
%%PORTDOCS%%%%DOCSDIR%%/html/qglcolormap.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qglcontext-bindoptions.html
%%PORTDOCS%%%%DOCSDIR%%/html/qglcontext.html
%%PORTDOCS%%%%DOCSDIR%%/html/qglformat-openglversionflags.html
%%PORTDOCS%%%%DOCSDIR%%/html/qglformat.html
%%PORTDOCS%%%%DOCSDIR%%/html/qglframebufferobject.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qglframebufferobjectformat.html
%%PORTDOCS%%%%DOCSDIR%%/html/qglpixelbuffer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qglshader-shadertype.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qglshader.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qglshaderprogram.html
%%PORTDOCS%%%%DOCSDIR%%/html/qglwidget.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgradient.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsanchor.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsanchorlayout.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsblureffect-blurhints.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsblureffect.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicscolorizeeffect.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsdropshadoweffect.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicseffect-changeflags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicseffect.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsellipseitem.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsgridlayout.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsitem-graphicsitemflags.html
@@ -539,11 +621,15 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicslayoutitem.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicslinearlayout.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicslineitem.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsobject.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsopacityeffect.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/qgraphicsrotation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsscale.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsscene-scenelayers.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsscene.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsscenecontextmenuevent.html
@@ -558,9 +644,11 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicssimpletextitem.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicssvgitem.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicstextitem.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicstransform.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsview-cachemode.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsview-optimizationflags.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicsview.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicswebview.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgraphicswidget.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgridlayout.html
%%PORTDOCS%%%%DOCSDIR%%/html/qgroupbox.html
@@ -579,6 +667,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qhelpsearchquerywidget.html
%%PORTDOCS%%%%DOCSDIR%%/html/qhelpsearchresultwidget.html
%%PORTDOCS%%%%DOCSDIR%%/html/qhideevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qhistorystate.html
%%PORTDOCS%%%%DOCSDIR%%/html/qhostaddress.html
%%PORTDOCS%%%%DOCSDIR%%/html/qhostinfo.html
%%PORTDOCS%%%%DOCSDIR%%/html/qhoverevent.html
@@ -613,6 +702,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qitemselectionmodel.html
%%PORTDOCS%%%%DOCSDIR%%/html/qitemselectionrange.html
%%PORTDOCS%%%%DOCSDIR%%/html/qkeyevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qkeyeventtransition.html
%%PORTDOCS%%%%DOCSDIR%%/html/qkeysequence.html
%%PORTDOCS%%%%DOCSDIR%%/html/qlabel.html
%%PORTDOCS%%%%DOCSDIR%%/html/qlatin1char.html
@@ -636,7 +726,17 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qlocalsocket.html
%%PORTDOCS%%%%DOCSDIR%%/html/qmainwindow-dockoptions.html
%%PORTDOCS%%%%DOCSDIR%%/html/qmainwindow.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmargins.html
%%PORTDOCS%%%%DOCSDIR%%/html/qmatrix.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmatrix2x2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmatrix2x3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmatrix2x4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmatrix3x2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmatrix3x3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmatrix3x4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmatrix4x2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmatrix4x3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmatrix4x4.html
%%PORTDOCS%%%%DOCSDIR%%/html/qmdiarea-areaoptions.html
%%PORTDOCS%%%%DOCSDIR%%/html/qmdiarea.html
%%PORTDOCS%%%%DOCSDIR%%/html/qmdisubwindow-subwindowoptions.html
@@ -655,6 +755,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qmimesource.html
%%PORTDOCS%%%%DOCSDIR%%/html/qmodelindex.html
%%PORTDOCS%%%%DOCSDIR%%/html/qmouseevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmouseeventtransition.html
%%PORTDOCS%%%%DOCSDIR%%/html/qmoveevent.html
%%PORTDOCS%%%%DOCSDIR%%/html/qmovie.html
%%PORTDOCS%%%%DOCSDIR%%/html/qmutex.html
@@ -689,11 +790,17 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qpainterpathstroker.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpaintevent.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpalette.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qpangesture.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qparallelanimationgroup.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qpauseanimation.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpen.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpersistentmodelindex.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpicture.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpictureio.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qpinchgesture-changeflags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qpinchgesture.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpixmap.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qpixmapcache-key.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpixmapcache.html
%%PORTDOCS%%%%DOCSDIR%%/html/qplaintextdocumentlayout.html
%%PORTDOCS%%%%DOCSDIR%%/html/qplaintextedit.html
@@ -709,8 +816,10 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qprintpreviewdialog.html
%%PORTDOCS%%%%DOCSDIR%%/html/qprintpreviewwidget.html
%%PORTDOCS%%%%DOCSDIR%%/html/qprocess.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qprocessenvironment.html
%%PORTDOCS%%%%DOCSDIR%%/html/qprogressbar.html
%%PORTDOCS%%%%DOCSDIR%%/html/qprogressdialog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qpropertyanimation.html
%%PORTDOCS%%%%DOCSDIR%%/html/qproxymodel.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpushbutton.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpydesignercontainerextension.html
@@ -720,6 +829,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qpydesignerpropertysheetextension.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpydesignertaskmenuextension.html
%%PORTDOCS%%%%DOCSDIR%%/html/qpytextobject.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qquaternion.html
%%PORTDOCS%%%%DOCSDIR%%/html/qradialgradient.html
%%PORTDOCS%%%%DOCSDIR%%/html/qradiobutton.html
%%PORTDOCS%%%%DOCSDIR%%/html/qreadlocker.html
@@ -751,6 +861,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qscrollarea.html
%%PORTDOCS%%%%DOCSDIR%%/html/qscrollbar.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsemaphore.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qsequentialanimationgroup.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsessionmanager.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsettings.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsharedmemory.html
@@ -758,6 +869,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qshortcutevent.html
%%PORTDOCS%%%%DOCSDIR%%/html/qshowevent.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsignalmapper.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qsignaltransition.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsimplexmlnodemodel.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsize.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsizef.html
@@ -801,6 +913,10 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qstackedwidget.html
%%PORTDOCS%%%%DOCSDIR%%/html/qstandarditem.html
%%PORTDOCS%%%%DOCSDIR%%/html/qstandarditemmodel.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qstate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qstatemachine-signalevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qstatemachine-wrappedevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qstatemachine.html
%%PORTDOCS%%%%DOCSDIR%%/html/qstatusbar.html
%%PORTDOCS%%%%DOCSDIR%%/html/qstatustipevent.html
%%PORTDOCS%%%%DOCSDIR%%/html/qstring-sectionflags.html
@@ -846,6 +962,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontabv2.html
%%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontabv3.html
%%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontabwidgetframe.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontabwidgetframev2.html
%%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontitlebar.html
%%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontoolbar-toolbarfeatures.html
%%PORTDOCS%%%%DOCSDIR%%/html/qstyleoptiontoolbar.html
@@ -862,6 +979,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qsvggenerator.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsvgrenderer.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsvgwidget.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qswipegesture.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsyntaxhighlighter.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsysinfo.html
%%PORTDOCS%%%%DOCSDIR%%/html/qsystemlocale.html
@@ -870,7 +988,9 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qt-alignment.html
%%PORTDOCS%%%%DOCSDIR%%/html/qt-dockwidgetareas.html
%%PORTDOCS%%%%DOCSDIR%%/html/qt-dropactions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qt-gestureflags.html
%%PORTDOCS%%%%DOCSDIR%%/html/qt-imageconversionflags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qt-inputmethodhints.html
%%PORTDOCS%%%%DOCSDIR%%/html/qt-itemflags.html
%%PORTDOCS%%%%DOCSDIR%%/html/qt-keyboardmodifiers.html
%%PORTDOCS%%%%DOCSDIR%%/html/qt-matchflags.html
@@ -878,6 +998,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qt-orientations.html
%%PORTDOCS%%%%DOCSDIR%%/html/qt-textinteractionflags.html
%%PORTDOCS%%%%DOCSDIR%%/html/qt-toolbarareas.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qt-touchpointstates.html
%%PORTDOCS%%%%DOCSDIR%%/html/qt-windowflags.html
%%PORTDOCS%%%%DOCSDIR%%/html/qt-windowstates.html
%%PORTDOCS%%%%DOCSDIR%%/html/qt.html
@@ -888,12 +1009,15 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qtablewidgetitem.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtablewidgetselectionrange.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtabwidget.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtapandholdgesture.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtapgesture.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtassistant.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtcore.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtcpserver.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtcpsocket.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtdesigner.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtemporaryfile.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtest-qtoucheventsequence.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtest.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtextblock-iterator.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtextblock.html
@@ -953,12 +1077,15 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qtimeline.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtimer.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtimerevent.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtmultimedia.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtnetwork.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtoolbar.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtoolbox.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtoolbutton.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtooltip.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtopengl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtouchevent-touchpoint.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qtouchevent.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtransform.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtranslator.html
%%PORTDOCS%%%%DOCSDIR%%/html/qtreeview.html
@@ -986,14 +1113,23 @@
%%PORTDOCS%%%%DOCSDIR%%/html/quuid.html
%%PORTDOCS%%%%DOCSDIR%%/html/qvalidator.html
%%PORTDOCS%%%%DOCSDIR%%/html/qvariant.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qvariantanimation.html
%%PORTDOCS%%%%DOCSDIR%%/html/qvboxlayout.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qvector2d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qvector3d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qvector4d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qvideoframe.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qvideosurfaceformat.html
%%PORTDOCS%%%%DOCSDIR%%/html/qwaitcondition.html
%%PORTDOCS%%%%DOCSDIR%%/html/qwebdatabase.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebelement.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qwebelementcollection.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/qwebinspector.html
%%PORTDOCS%%%%DOCSDIR%%/html/qwebpage-choosemultiplefilesextensionoption.html
%%PORTDOCS%%%%DOCSDIR%%/html/qwebpage-choosemultiplefilesextensionreturn.html
%%PORTDOCS%%%%DOCSDIR%%/html/qwebpage-extensionoption.html
@@ -1044,6 +1180,8 @@
%%PORTDOCS%%%%DOCSDIR%%/html/qxmlquery.html
%%PORTDOCS%%%%DOCSDIR%%/html/qxmlreader.html
%%PORTDOCS%%%%DOCSDIR%%/html/qxmlresultitems.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qxmlschema.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qxmlschemavalidator.html
%%PORTDOCS%%%%DOCSDIR%%/html/qxmlserializer.html
%%PORTDOCS%%%%DOCSDIR%%/html/qxmlsimplereader.html
%%PORTDOCS%%%%DOCSDIR%%/html/qxmlstreamattribute.html
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 91c7980ba6dd..d97d39f1ec47 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -240,6 +240,7 @@
SUBDIR += py-kaa-imlib2
SUBDIR += py-kaa-metadata
SUBDIR += py-pybmp
+ SUBDIR += py-qt4-multimedia
SUBDIR += py-qt4-phonon
SUBDIR += pyjama
SUBDIR += qdvdauthor
diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile
new file mode 100644
index 000000000000..30c56054eb76
--- /dev/null
+++ b/multimedia/py-qt4-multimedia/Makefile
@@ -0,0 +1,79 @@
+# New ports collection makefile for: py-qt4-multimedia
+# Date created: 2010-01-10
+# Whom: Dima Panov <fluffy@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= multimedia
+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, Multimedia 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= multimedia 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 QtMultimedia
+
+.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}/QtMultimedia/Makefile
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/py-qt4-multimedia/distinfo b/multimedia/py-qt4-multimedia/distinfo
new file mode 100644
index 000000000000..a5eccc57a770
--- /dev/null
+++ b/multimedia/py-qt4-multimedia/distinfo
@@ -0,0 +1,3 @@
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/multimedia/py-qt4-multimedia/pkg-descr b/multimedia/py-qt4-multimedia/pkg-descr
new file mode 100644
index 000000000000..99bad60998c8
--- /dev/null
+++ b/multimedia/py-qt4-multimedia/pkg-descr
@@ -0,0 +1,4 @@
+PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
+This package provides the QtMultimedia module.
+
+WWW: http://www.riverbankcomputing.co.uk/pyqt/
diff --git a/multimedia/py-qt4-multimedia/pkg-plist b/multimedia/py-qt4-multimedia/pkg-plist
new file mode 100644
index 000000000000..7f5b5e6761f5
--- /dev/null
+++ b/multimedia/py-qt4-multimedia/pkg-plist
@@ -0,0 +1,14 @@
+%%PYTHON_SITELIBDIR%%/PyQt4/QtMultimedia.so
+%%SIP%%share/py-sip/QtMultimedia/QtMultimediamod.sip
+%%SIP%%share/py-sip/QtMultimedia/qabstractvideobuffer.sip
+%%SIP%%share/py-sip/QtMultimedia/qabstractvideosurface.sip
+%%SIP%%share/py-sip/QtMultimedia/qaudio.sip
+%%SIP%%share/py-sip/QtMultimedia/qaudiodeviceinfo.sip
+%%SIP%%share/py-sip/QtMultimedia/qaudioformat.sip
+%%SIP%%share/py-sip/QtMultimedia/qaudioinput.sip
+%%SIP%%share/py-sip/QtMultimedia/qaudiooutput.sip
+%%SIP%%share/py-sip/QtMultimedia/qvideoframe.sip
+%%SIP%%share/py-sip/QtMultimedia/qvideosurfaceformat.sip
+%%API%%share/qt4/qsci/api/python/QtMultimedia.api
+%%SIP%%@dirrm share/py-sip/QtMultimedia
+@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
diff --git a/multimedia/py-qt4-phonon/distinfo b/multimedia/py-qt4-phonon/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/multimedia/py-qt4-phonon/distinfo
+++ b/multimedia/py-qt4-phonon/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/net-p2p/qtorrent/Makefile b/net-p2p/qtorrent/Makefile
index dfa185185cd9..1e9c47247809 100644
--- a/net-p2p/qtorrent/Makefile
+++ b/net-p2p/qtorrent/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qtorrent
PORTVERSION= 0.9.6.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net-p2p python
MASTER_SITES= http://thegraveyard.org/files/
diff --git a/net/py-qt4-network/distinfo b/net/py-qt4-network/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/net/py-qt4-network/distinfo
+++ b/net/py-qt4-network/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/net/py-qt4-network/pkg-plist b/net/py-qt4-network/pkg-plist
index 8474d3417d60..85b2311a7201 100644
--- a/net/py-qt4-network/pkg-plist
+++ b/net/py-qt4-network/pkg-plist
@@ -11,6 +11,7 @@
%%SIP%%share/py-sip/QtNetwork/qlocalsocket.sip
%%SIP%%share/py-sip/QtNetwork/qnetworkaccessmanager.sip
%%SIP%%share/py-sip/QtNetwork/qnetworkcookie.sip
+%%SIP%%share/py-sip/QtNetwork/qnetworkcookiejar.sip
%%SIP%%share/py-sip/QtNetwork/qnetworkdiskcache.sip
%%SIP%%share/py-sip/QtNetwork/qnetworkinterface.sip
%%SIP%%share/py-sip/QtNetwork/qnetworkproxy.sip
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 3d0e2c49c2e0..d32a979cf869 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hplip
PORTVERSION= 2.8.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= SF
diff --git a/print/hplip3/Makefile b/print/hplip3/Makefile
index 14ee97d0fdc7..03ea19106a07 100644
--- a/print/hplip3/Makefile
+++ b/print/hplip3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hplip
PORTVERSION= 3.9.8
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= SF
diff --git a/print/kdeutils4-printer-applet/Makefile b/print/kdeutils4-printer-applet/Makefile
index 3c85dafb1928..a85d2e83e36d 100644
--- a/print/kdeutils4-printer-applet/Makefile
+++ b/print/kdeutils4-printer-applet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= printer-applet
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= print kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/print/system-config-printer-kde/Makefile b/print/system-config-printer-kde/Makefile
index 86f749c4e3fd..1c8428c4ea86 100644
--- a/print/system-config-printer-kde/Makefile
+++ b/print/system-config-printer-kde/Makefile
@@ -7,6 +7,7 @@
PORTNAME= system-config-printer-kde
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= print kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile
index e39569055775..23631bdd5c4f 100644
--- a/science/avogadro/Makefile
+++ b/science/avogadro/Makefile
@@ -7,31 +7,47 @@
PORTNAME= avogadro
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= science
MASTER_SITES= SF
MAINTAINER= tkjacobsen@gmail.com
COMMENT= An advanced molecular editor and viewer
-BUILD_DEPENDS= eigen>=2.0.3:${PORTSDIR}/math/eigen2 \
- ${PYNUMPY} \
- sip:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS= ${PYNUMPY} \
- sip:${PORTSDIR}/devel/py-sip
-LIB_DEPENDS= openbabel.3:${PORTSDIR}/science/openbabel \
- boost_python:${PORTSDIR}/devel/boost-python-libs
+BUILD_DEPENDS= eigen>=2.0.3:${PORTSDIR}/math/eigen2
+LIB_DEPENDS= openbabel.3:${PORTSDIR}/science/openbabel
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_QT_VER= 4
-QT_COMPONENTS= gui opengl linguist qmake_build moc_build rcc_build uic_build
+QT_COMPONENTS= gui opengl network linguist_build \
+ qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
-CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DLIB_INSTALL_DIR="${LOCALBASE}/lib" \
- -DENABLE_GLSL=OFF -DENABLE_PYTHON=ON
+CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+ -DLIB_INSTALL_DIR="${LOCALBASE}/lib" \
+ -DENABLE_GLSL=OFF
USE_GCC= 4.3+
-USE_PYTHON= 2.5+
MAKE_JOBS_SAFE= yes
+OPTIONS= PYTHON "Enable python support (broken with sip-4.10)" off
+
+.include <bsd.port.options.mk>
+
+.if defined (WITH_PYTHON)
+IGNORE= doesn't compile with devel/py-sip>=4.10
+CMAKE_ARGS+= -DENABLE_PYTHON=ON
+USE_PYTHON= 2.5+
+BUILD_DEPENDS+= ${PYNUMPY} \
+ sip:${PORTSDIR}/devel/py-sip
+RUN_DEPENDS+= ${PYNUMPY} \
+ sip:${PORTSDIR}/devel/py-sip
+LIB_DEPENDS+= boost_python:${PORTSDIR}/devel/boost-python-libs
+PLIST_SUB+= PYTHON=""
+.else
+CMAKE_ARGS+= -DENABLE_PYTHON=OFF
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 700013
diff --git a/science/avogadro/pkg-plist b/science/avogadro/pkg-plist
index e36127740b7f..dcd1c33cb32d 100644
--- a/science/avogadro/pkg-plist
+++ b/science/avogadro/pkg-plist
@@ -33,9 +33,9 @@ include/avogadro/pluginmanager.h
include/avogadro/primitive.h
include/avogadro/primitivelist.h
include/avogadro/protein.h
-include/avogadro/pythonerror.h
-include/avogadro/pythoninterpreter.h
-include/avogadro/pythonscript.h
+%%PYTHON%%include/avogadro/pythonerror.h
+%%PYTHON%%include/avogadro/pythoninterpreter.h
+%%PYTHON%%include/avogadro/pythonscript.h
include/avogadro/residue.h
include/avogadro/tool.h
include/avogadro/toolgroup.h
@@ -81,7 +81,7 @@ lib/avogadro/1_0/extensions/molecularpropextension.so
lib/avogadro/1_0/extensions/networkfetchextension.so
lib/avogadro/1_0/extensions/povrayextension.so
lib/avogadro/1_0/extensions/propextension.so
-lib/avogadro/1_0/extensions/pythonterminal.so
+%%PYTHON%%lib/avogadro/1_0/extensions/pythonterminal.so
lib/avogadro/1_0/extensions/selectextension.so
lib/avogadro/1_0/extensions/spectraextension.so
lib/avogadro/1_0/extensions/supercellextension.so
@@ -100,7 +100,7 @@ lib/avogadro/1_0/tools/selectrotatetool.so
lib/libavogadro.so
lib/libavogadro.so.1
lib/libavogadro.so.1.0.0
-%%PYTHON_SITELIBDIR%%/Avogadro.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/Avogadro.so
%%DATADIR%%/builder/amino/d-ala.zmat
%%DATADIR%%/builder/amino/d-arg.zmat
%%DATADIR%%/builder/amino/d-asn.zmat
@@ -420,8 +420,8 @@ lib/libavogadro.so.1.0.0
%%DATADIR%%/i18n/libavogadro_uk.qm
%%DATADIR%%/i18n/libavogadro_zh_CN.qm
%%DATADIR%%/i18n/libavogadro_zh_TW.qm
-share/libavogadro/engineScripts/wireframe.py
-share/libavogadro/extensionScripts/example.py
+%%PYTHON%%share/libavogadro/engineScripts/wireframe.py
+%%PYTHON%%share/libavogadro/extensionScripts/example.py
@dirrm share/libavogadro/extensionScripts
@dirrm share/libavogadro/engineScripts
@dirrm share/libavogadro
diff --git a/sysutils/luma/Makefile b/sysutils/luma/Makefile
index d7c94222ff47..1e60fe63aef9 100644
--- a/sysutils/luma/Makefile
+++ b/sysutils/luma/Makefile
@@ -7,7 +7,7 @@
PORTNAME= luma
PORTVERSION= 2.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils net-mgmt
MASTER_SITES= SF
# MASTER_SITES= http://home.tu-clausthal.de/~ifwd/luma/
diff --git a/textproc/py-qt4-xml/distinfo b/textproc/py-qt4-xml/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/textproc/py-qt4-xml/distinfo
+++ b/textproc/py-qt4-xml/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/textproc/py-qt4-xmlpatterns/distinfo b/textproc/py-qt4-xmlpatterns/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/textproc/py-qt4-xmlpatterns/distinfo
+++ b/textproc/py-qt4-xmlpatterns/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/textproc/py-qt4-xmlpatterns/pkg-plist b/textproc/py-qt4-xmlpatterns/pkg-plist
index 95b871342db6..aecc7b4a2380 100644
--- a/textproc/py-qt4-xmlpatterns/pkg-plist
+++ b/textproc/py-qt4-xmlpatterns/pkg-plist
@@ -11,6 +11,8 @@
%%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/qxmlschema.sip
+%%SIP%%share/py-sip/QtXmlPatterns/qxmlschemavalidator.sip
%%SIP%%share/py-sip/QtXmlPatterns/qxmlserializer.sip
%%API%%share/qt4/qsci/api/python/QtXmlPatterns.api
%%SIP%%@dirrm share/py-sip/QtXmlPatterns
diff --git a/www/py-qt4-webkit/distinfo b/www/py-qt4-webkit/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/www/py-qt4-webkit/distinfo
+++ b/www/py-qt4-webkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/www/py-qt4-webkit/pkg-plist b/www/py-qt4-webkit/pkg-plist
index fa533e578f47..278fc537ecce 100644
--- a/www/py-qt4-webkit/pkg-plist
+++ b/www/py-qt4-webkit/pkg-plist
@@ -1,9 +1,13 @@
%%PYTHON_SITELIBDIR%%/PyQt4/QtWebKit.so
%%SIP%%share/py-sip/QtWebKit/QtWebKitmod.sip
+%%SIP%%share/py-sip/QtWebKit/qgraphicswebview.sip
%%SIP%%share/py-sip/QtWebKit/qwebdatabase.sip
+%%SIP%%share/py-sip/QtWebKit/qwebelement.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/qwebinspector.sip
+%%SIP%%share/py-sip/QtWebKit/qwebkitversion.sip
%%SIP%%share/py-sip/QtWebKit/qwebpage.sip
%%SIP%%share/py-sip/QtWebKit/qwebpluginfactory.sip
%%SIP%%share/py-sip/QtWebKit/qwebsecurityorigin.sip
diff --git a/x11-toolkits/py-kde/Makefile b/x11-toolkits/py-kde/Makefile
index cdea82fbbe91..46fe2f574524 100644
--- a/x11-toolkits/py-kde/Makefile
+++ b/x11-toolkits/py-kde/Makefile
@@ -7,11 +7,10 @@
PORTNAME= kde
PORTVERSION= ${PYKDE3_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-toolkits python kde
-MASTER_SITES= ${MASTER_SITES_PYKDE3} ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=lofi
+MASTER_SITES= ${MASTER_SITES_PYKDE3}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PYKDE3_DISTNAME}
@@ -20,7 +19,7 @@ COMMENT= Python bindings for KDE3
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \
${PYTHON_PKGNAMEPREFIX}qt>=${PYQT3_VERSION}:${PORTSDIR}/x11-toolkits/py-qt
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_KDEBASE_VER=3
USE_PYTHON= 2.5+
diff --git a/x11-toolkits/py-kde/files/patch-sip__kio__global.sip b/x11-toolkits/py-kde/files/patch-sip__kio__global.sip
new file mode 100644
index 000000000000..502a8327bfbb
--- /dev/null
+++ b/x11-toolkits/py-kde/files/patch-sip__kio__global.sip
@@ -0,0 +1,25 @@
+diff -ru PyKDE-3.16.6/sip/kio/global.sip PyKDE-3.16.7/sip/kio/global.sip
+--- sip/kio/global.sip 2009-06-10 22:44:48.000000000 +0100
++++ sip/kio/global.sip 2010-01-25 09:47:39.410088826 +0000
+@@ -477,20 +477,7 @@
+ %MethodCode
+ //takes dict | (KIO.MetaData)
+ //returns (KIO.MetaData)
+-
+-
+- PyObject *dict;
+- if (sipParseArgs(&sipArgsParsed,sipArgs,"T", &PyDict_Type, &dict))
+- {
+- int isErr = 0;
+- KIO::MetaData *map = (KIO::MetaData *)sipForceConvertToType(dict, sipType_KIO_MetaData, NULL, SIP_NO_CONVERTORS, NULL, &isErr);
+- if (isErr)
+- {
+- Py_INCREF (Py_None);
+- return Py_None;
+- }
+- return sipConvertFromType(map, sipType_KIO_MetaData, NULL);
+- }
++ sipRes = a0;
+ %End
+
+ //end
diff --git a/x11-toolkits/py-pyqwt/Makefile b/x11-toolkits/py-pyqwt/Makefile
index 5b3522611bf9..2093e1784278 100644
--- a/x11-toolkits/py-pyqwt/Makefile
+++ b/x11-toolkits/py-pyqwt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pyqwt
PORTVERSION= 5.2.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits python
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}5/PyQwt-${PORTVERSION}
diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index f13895820d56..7598cab7ec1c 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -6,6 +6,7 @@
PORTNAME= qt
PORTVERSION= ${PYQT3_VERSION}
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITES_PYQT3}
diff --git a/x11-toolkits/py-qt/files/patch-configure.py b/x11-toolkits/py-qt/files/patch-configure.py
index f42fc0938f36..b0489c79e591 100644
--- a/x11-toolkits/py-qt/files/patch-configure.py
+++ b/x11-toolkits/py-qt/files/patch-configure.py
@@ -1,5 +1,14 @@
--- configure.py.orig Sun May 13 20:08:01 2007
+++ configure.py Sun May 13 20:14:01 2007
+@@ -107,7 +107,7 @@
+ sys.stdout.write(" -a tag explicitly enable the qtpe module\n")
+ sys.stdout.write(" -b dir where pyuic and pylupdate will be installed [default %s]\n" % opt_pyqtbindir)
+ sys.stdout.write(" -c concatenate each module's C/C++ source files\n")
+- sys.stdout.write(" -d dir where the PyQt modules will be installed [default %\ns]" % opt_pyqtmoddir)
++ sys.stdout.write(" -d dir where the PyQt modules will be installed [default %s]\n" % opt_pyqtmoddir)
+ sys.stdout.write(" -f keep any existing features file (when cross-compiling) [default remove]\n")
+ sys.stdout.write(" -g dir where the Qt qconfig.h file can be found [default Qt include directory]\n")
+ sys.stdout.write(" -i enable checking of signed interpreters using the VendorID package [default disabled]\n")
@@ -1081,15 +1081,12 @@
macros["LIBDIR_QT"] = qt_libdir
diff --git a/x11-toolkits/py-qt4-gui/distinfo b/x11-toolkits/py-qt4-gui/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/x11-toolkits/py-qt4-gui/distinfo
+++ b/x11-toolkits/py-qt4-gui/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/x11-toolkits/py-qt4-gui/pkg-plist b/x11-toolkits/py-qt4-gui/pkg-plist
index 743a7234ba0a..03648e900b98 100644
--- a/x11-toolkits/py-qt4-gui/pkg-plist
+++ b/x11-toolkits/py-qt4-gui/pkg-plist
@@ -51,6 +51,11 @@
%%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/qgenericmatrix.sip
+%%SIP%%share/py-sip/QtGui/qgesture.sip
+%%SIP%%share/py-sip/QtGui/qgesturerecognizer.sip
+%%SIP%%share/py-sip/QtGui/qgraphicsanchorlayout.sip
+%%SIP%%share/py-sip/QtGui/qgraphicseffect.sip
%%SIP%%share/py-sip/QtGui/qgraphicsgridlayout.sip
%%SIP%%share/py-sip/QtGui/qgraphicsitem.sip
%%SIP%%share/py-sip/QtGui/qgraphicsitemanimation.sip
@@ -60,6 +65,7 @@
%%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/qgraphicstransform.sip
%%SIP%%share/py-sip/QtGui/qgraphicsview.sip
%%SIP%%share/py-sip/QtGui/qgraphicswidget.sip
%%SIP%%share/py-sip/QtGui/qgridlayout.sip
@@ -77,6 +83,7 @@
%%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/qkeyeventtransition.sip
%%SIP%%share/py-sip/QtGui/qkeysequence.sip
%%SIP%%share/py-sip/QtGui/qlabel.sip
%%SIP%%share/py-sip/QtGui/qlayout.sip
@@ -87,12 +94,14 @@
%%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/qmatrix4x4.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/qmouseeventtransition.sip
%%SIP%%share/py-sip/QtGui/qmovie.sip
%%SIP%%share/py-sip/QtGui/qpagesetupdialog.sip
%%SIP%%share/py-sip/QtGui/qpaintdevice.sip
@@ -117,6 +126,7 @@
%%SIP%%share/py-sip/QtGui/qproxymodel.sip
%%SIP%%share/py-sip/QtGui/qpushbutton.sip
%%SIP%%share/py-sip/QtGui/qpytextobject.sip
+%%SIP%%share/py-sip/QtGui/qquaternion.sip
%%SIP%%share/py-sip/QtGui/qradiobutton.sip
%%SIP%%share/py-sip/QtGui/qregion.sip
%%SIP%%share/py-sip/QtGui/qrgb.sip
@@ -173,6 +183,9 @@
%%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/qvector2d.sip
+%%SIP%%share/py-sip/QtGui/qvector3d.sip
+%%SIP%%share/py-sip/QtGui/qvector4d.sip
%%SIP%%share/py-sip/QtGui/qwhatsthis.sip
%%SIP%%share/py-sip/QtGui/qwidget.sip
%%SIP%%share/py-sip/QtGui/qwidgetaction.sip
diff --git a/x11/py-qt4-opengl/distinfo b/x11/py-qt4-opengl/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/x11/py-qt4-opengl/distinfo
+++ b/x11/py-qt4-opengl/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/x11/py-qt4-opengl/pkg-plist b/x11/py-qt4-opengl/pkg-plist
index c92f697dfa06..0eb4d63b9d25 100644
--- a/x11/py-qt4-opengl/pkg-plist
+++ b/x11/py-qt4-opengl/pkg-plist
@@ -4,6 +4,7 @@
%%SIP%%share/py-sip/QtOpenGL/qglcolormap.sip
%%SIP%%share/py-sip/QtOpenGL/qglframebufferobject.sip
%%SIP%%share/py-sip/QtOpenGL/qglpixelbuffer.sip
+%%SIP%%share/py-sip/QtOpenGL/qglshaderprogram.sip
%%API%%share/qt4/qsci/api/python/QtOpenGL.api
@dirrm %%SIP%%share/py-sip/QtOpenGL
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4