aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--databases/py-qt4-sql/distinfo6
-rw-r--r--devel/py-qt4-assistant/distinfo6
-rw-r--r--devel/py-qt4-core/distinfo6
-rw-r--r--devel/py-qt4-core/files/patch-configure.py84
-rw-r--r--devel/py-qt4-core/pkg-plist3
-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/Makefile1
-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-sip/distinfo6
-rw-r--r--devel/py-sip/files/bsd.pyqt.mk4
-rw-r--r--devel/qscintilla2-designerplugin/Makefile1
-rw-r--r--devel/qscintilla2/Makefile1
-rw-r--r--graphics/py-qt4-svg/distinfo6
-rw-r--r--misc/py-qt4-demo/Makefile1
-rw-r--r--misc/py-qt4-demo/distinfo6
-rw-r--r--misc/py-qt4-demo/files/patch-examples__designer__plugins__plugins.py12
-rw-r--r--misc/py-qt4-demo/pkg-plist4
-rw-r--r--misc/py-qt4-doc/distinfo6
-rw-r--r--multimedia/py-qt4-phonon/distinfo6
-rw-r--r--net/py-qt4-network/distinfo6
-rw-r--r--textproc/py-qt4-xml/distinfo6
-rw-r--r--textproc/py-qt4-xmlpatterns/distinfo6
-rw-r--r--www/py-qt4-webkit/distinfo6
-rw-r--r--x11-toolkits/py-qt4-gui/distinfo6
-rw-r--r--x11/py-qt4-opengl/distinfo6
30 files changed, 129 insertions, 108 deletions
diff --git a/databases/py-qt4-sql/distinfo b/databases/py-qt4-sql/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/databases/py-qt4-sql/distinfo
+++ b/databases/py-qt4-sql/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/devel/py-qt4-assistant/distinfo b/devel/py-qt4-assistant/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/devel/py-qt4-assistant/distinfo
+++ b/devel/py-qt4-assistant/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/devel/py-qt4-core/distinfo b/devel/py-qt4-core/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/devel/py-qt4-core/distinfo
+++ b/devel/py-qt4-core/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/devel/py-qt4-core/files/patch-configure.py b/devel/py-qt4-core/files/patch-configure.py
index 2c32cb941c5b..3faf89d84351 100644
--- a/devel/py-qt4-core/files/patch-configure.py
+++ b/devel/py-qt4-core/files/patch-configure.py
@@ -1,6 +1,6 @@
---- configure.py.orig 2009-07-15 00:31:43.000000000 +1100
-+++ configure.py 2009-07-21 16:44:53.000000000 +1100
-@@ -41,6 +41,10 @@
+--- configure.py.orig 2009-09-24 13:41:15.000000000 +1100
++++ configure.py 2009-09-24 23:32:33.000000000 +1100
+@@ -36,6 +36,10 @@
import sipconfig
@@ -10,8 +10,8 @@
+if freebsd: freebsd_port = os.environ['PYQT4_COMPONENT']
# Initialise the globals.
- pyqt_version = 0x040502
-@@ -74,7 +78,6 @@
+ pyqt_version = 0x040600
+@@ -69,7 +73,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.
-@@ -347,14 +350,23 @@
+@@ -351,14 +354,23 @@
elif sipcfg.universal:
sipconfig.inform("QtDesigner module disabled with universal binaries.")
else:
@@ -46,7 +46,7 @@
def code(self):
cons_xtra_incdirs = []
-@@ -380,6 +392,10 @@
+@@ -384,6 +396,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)
-@@ -565,19 +581,28 @@
+@@ -569,19 +585,28 @@
sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins))
# Generate the QScintilla API file.
@@ -95,7 +95,7 @@
def _qpy_directories(self, mname):
"""Return a tuple of the directories containing the header files and
-@@ -666,19 +691,25 @@
+@@ -670,19 +695,25 @@
return libs, libdirs
def module_installs(self):
@@ -125,7 +125,7 @@
qpylibs["QtDesigner"] = "qpydesigner.pro"
# Run qmake to generate the Makefiles.
-@@ -780,23 +811,43 @@
+@@ -783,30 +814,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).
@@ -133,12 +133,19 @@
+ if freebsd:
+ if freebsd_port == 'core':
+ sipconfig.inform("Creating pyuic4 wrapper...")
-+
++
++ if sys.platform == 'darwin':
++ gui = True
++ use_arch = opts.use_arch
++ else:
++ gui = False
++ use_arch = ''
++
+ uicdir=os.path.join(pyqt_modroot, "uic")
-+ wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), (sys.platform == "darwin"))
-+
++ wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch)
++
+ sipconfig.inform("Creating pyuic4 Makefile...")
-+
++
+ makefile = sipconfig.PythonModuleMakefile(
+ configuration=sipcfg,
+ dstdir=uicdir,
@@ -146,19 +153,30 @@
+ dir="pyuic",
+ installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
+ )
-+
++
+ makefile.generate()
+ tool.append("pyuic")
-+ else:
+
+- if sys.platform == 'darwin':
+- gui = True
+- use_arch = opts.use_arch
+ else:
+- gui = False
+- use_arch = ''
+ sipconfig.inform("Creating pyuic4 wrapper...")
- uicdir=os.path.join(pyqt_modroot, "uic")
-- wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), (sys.platform == "darwin"))
-+ uicdir=os.path.join(pyqt_modroot, "uic")
-+ wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), (sys.platform == "darwin"))
+- wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch)
++ if sys.platform == 'darwin':
++ gui = True
++ use_arch = opts.use_arch
++ else:
++ gui = False
++ use_arch = ''
- sipconfig.inform("Creating pyuic4 Makefile...")
-+ sipconfig.inform("Creating pyuic4 Makefile...")
++ uicdir=os.path.join(pyqt_modroot, "uic")
++ wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch)
- makefile = sipconfig.PythonModuleMakefile(
- configuration=sipcfg,
@@ -167,6 +185,10 @@
- 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,
@@ -174,15 +196,13 @@
+ 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...")
-@@ -822,7 +873,10 @@
+@@ -833,7 +892,10 @@
makefile.generate()
tool.append("pyrcc")
else:
@@ -194,7 +214,7 @@
if opts.designer_plugin and "QtDesigner" in pyqt_modules:
py_major = sipcfg.py_version >> 16
-@@ -845,11 +899,17 @@
+@@ -856,11 +918,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)
@@ -213,7 +233,7 @@
if opts.designer_plugin:
sipconfig.inform("Creating Qt Designer plugin Makefile...")
-@@ -921,21 +981,44 @@
+@@ -947,21 +1015,44 @@
sipconfig.inform("The %s Qt libraries are in %s." % (lib_type, qt_libdir))
sipconfig.inform("The Qt binaries are in %s." % qt_bindir)
sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
@@ -266,7 +286,7 @@
if opts.vendorcheck:
sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -1341,7 +1424,11 @@
+@@ -1368,7 +1459,11 @@
of libraries.
extra_sip_flags is an optional list of additional flags to pass to SIP.
"""
@@ -279,7 +299,7 @@
mk_clean_dir(mname)
-@@ -1413,7 +1500,11 @@
+@@ -1440,7 +1535,11 @@
sipconfig.error("Unable to create the C++ code.")
# Generate the Makefile.
@@ -292,7 +312,7 @@
installs = []
-@@ -1868,6 +1959,10 @@
+@@ -1899,6 +1998,10 @@
p.print_help()
sys.exit(2)
@@ -303,7 +323,7 @@
sipcfg.set_build_macros(macros)
# Check Qt is what we need.
-@@ -1875,7 +1970,7 @@
+@@ -1906,7 +2009,7 @@
# Check the licenses are compatible.
check_license()
@@ -312,7 +332,7 @@
# Check which modules to build.
pyqt.check_modules()
-@@ -1897,9 +1992,18 @@
+@@ -1928,9 +2031,18 @@
installs=[(pyqt.module_installs(), pyqt_modroot)]
if opts.api:
@@ -333,7 +353,7 @@
if opts.bigqt:
xtra_modules.append("_qt")
-@@ -1910,14 +2014,33 @@
+@@ -1941,14 +2053,33 @@
if opts.mwg_qwt_dir:
xtra_modules.append("Qwt5")
diff --git a/devel/py-qt4-core/pkg-plist b/devel/py-qt4-core/pkg-plist
index eca4defd52ca..d42cea27ed48 100644
--- a/devel/py-qt4-core/pkg-plist
+++ b/devel/py-qt4-core/pkg-plist
@@ -96,9 +96,6 @@ bin/pyuic4
%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.py
%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyo
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qwt.py
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qwt.pyc
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qwt.pyo
%%SIP%%share/py-sip/QtCore/QtCoremod.sip
%%SIP%%share/py-sip/QtCore/qabstracteventdispatcher.sip
%%SIP%%share/py-sip/QtCore/qabstractfileengine.sip
diff --git a/devel/py-qt4-dbus/distinfo b/devel/py-qt4-dbus/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/devel/py-qt4-dbus/distinfo
+++ b/devel/py-qt4-dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/devel/py-qt4-designer/distinfo b/devel/py-qt4-designer/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/devel/py-qt4-designer/distinfo
+++ b/devel/py-qt4-designer/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/devel/py-qt4-designerplugin/distinfo b/devel/py-qt4-designerplugin/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/devel/py-qt4-designerplugin/distinfo
+++ b/devel/py-qt4-designerplugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/devel/py-qt4-help/distinfo b/devel/py-qt4-help/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/devel/py-qt4-help/distinfo
+++ b/devel/py-qt4-help/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index a603c48ae2b2..06c2a9409317 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -6,6 +6,7 @@
PORTNAME= qscintilla2
PORTVERSION= ${QSCI2_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_QSCI2}
diff --git a/devel/py-qt4-script/distinfo b/devel/py-qt4-script/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/devel/py-qt4-script/distinfo
+++ b/devel/py-qt4-script/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/devel/py-qt4-scripttools/distinfo b/devel/py-qt4-scripttools/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/devel/py-qt4-scripttools/distinfo
+++ b/devel/py-qt4-scripttools/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/devel/py-qt4-test/distinfo b/devel/py-qt4-test/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/devel/py-qt4-test/distinfo
+++ b/devel/py-qt4-test/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index 5b01d541f352..44c22ca3d91b 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,3 +1,3 @@
-MD5 (sip-4.8.2.tar.gz) = 7ae60712aa6b4095a8cdab11b437f8f0
-SHA256 (sip-4.8.2.tar.gz) = 2ebb29deb2bbcdb99f47866e59deea7c6d98be0c835547b043eefd151516d9a9
-SIZE (sip-4.8.2.tar.gz) = 615394
+MD5 (sip-4.9.3.tar.gz) = d60ec6e87c0155df779fd8b529e80706
+SHA256 (sip-4.9.3.tar.gz) = de93d68f367955725817dd68e9d028fe62ea5fb2ae6755acf0a592ebd223fd83
+SIZE (sip-4.9.3.tar.gz) = 661144
diff --git a/devel/py-sip/files/bsd.pyqt.mk b/devel/py-sip/files/bsd.pyqt.mk
index 5b9153722a89..06059fe88f37 100644
--- a/devel/py-sip/files/bsd.pyqt.mk
+++ b/devel/py-sip/files/bsd.pyqt.mk
@@ -13,9 +13,9 @@ MASTER_SITES_PYKDE4= ${MASTER_SITE_RIVERBANK}PyKDE4/
MASTER_SITES_QSCI1= ${MASTER_SITE_RIVERBANK}QScintilla1/
MASTER_SITES_QSCI2= ${MASTER_SITE_RIVERBANK}QScintilla2/
-SIP_VERSION= 4.8.2
+SIP_VERSION= 4.9.3
PYQT3_VERSION= 3.18.1
-PYQT4_VERSION= 4.5.4
+PYQT4_VERSION= 4.6.2
PYKDE3_VERSION= 3.16.3
QSCI1_VERSION= 1.7.1
QSCI2_VERSION= 2.4
diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile
index fc3ab0f24b8f..06dd462b0e40 100644
--- a/devel/qscintilla2-designerplugin/Makefile
+++ b/devel/qscintilla2-designerplugin/Makefile
@@ -6,6 +6,7 @@
PORTNAME= designerplugin
PORTVERSION= ${QSCI2_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}
diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile
index ed7f6a04e4a4..afb7cc161285 100644
--- a/devel/qscintilla2/Makefile
+++ b/devel/qscintilla2/Makefile
@@ -6,6 +6,7 @@
PORTNAME= qscintilla2
PORTVERSION= ${QSCI2_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}
diff --git a/graphics/py-qt4-svg/distinfo b/graphics/py-qt4-svg/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/graphics/py-qt4-svg/distinfo
+++ b/graphics/py-qt4-svg/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile
index 7638c2715a1b..57ba4d5978d9 100644
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@@ -58,6 +58,7 @@ do-build:
do-install:
.if !defined(NOPORTEXAMPLES)
${RM} -f ${WRKSRC}/examples/designer/plugins/plugins.py.orig
+ ${RM} -f ${WRKSRC}/examples/activeqt/webbrowser/webbrowser.py.orig
${MKDIR} ${EXAMPLESDIR}
cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
.else
diff --git a/misc/py-qt4-demo/distinfo b/misc/py-qt4-demo/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/misc/py-qt4-demo/distinfo
+++ b/misc/py-qt4-demo/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/misc/py-qt4-demo/files/patch-examples__designer__plugins__plugins.py b/misc/py-qt4-demo/files/patch-examples__designer__plugins__plugins.py
index f0a5ae585442..44d36d762b54 100644
--- a/misc/py-qt4-demo/files/patch-examples__designer__plugins__plugins.py
+++ b/misc/py-qt4-demo/files/patch-examples__designer__plugins__plugins.py
@@ -9,14 +9,14 @@
+if sys.platform[:-1] == 'freebsd': freebsd = True
+
- # Set a specified environment variable with a directory name.
- def setEnvironment(env, var_name, dir_name):
-@@ -56,6 +60,8 @@
+ app = QtGui.QApplication(sys.argv)
- if sys.platform == "darwin":
- designer_bin.append("/Designer.app/Contents/MacOS/Designer")
+@@ -43,6 +47,8 @@
+
+ if sys.platform == 'darwin':
+ designer_bin += '/Designer.app/Contents/MacOS/Designer'
+elif freebsd:
+ designer_bin.append("/designer-qt4")
else:
- designer_bin.append("/designer")
+ designer_bin += '/designer'
diff --git a/misc/py-qt4-demo/pkg-plist b/misc/py-qt4-demo/pkg-plist
index fb6a5f34585e..d21a30a11b97 100644
--- a/misc/py-qt4-demo/pkg-plist
+++ b/misc/py-qt4-demo/pkg-plist
@@ -390,8 +390,8 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql/connection.pyc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql/querymodel.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql/querymodel.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql/relationaltablemode.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql/relationaltablemode.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql/relationaltablemodel.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql/relationaltablemodel.pyc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql/tablemodel.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql/tablemodel.pyc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threads/README
diff --git a/misc/py-qt4-doc/distinfo b/misc/py-qt4-doc/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/misc/py-qt4-doc/distinfo
+++ b/misc/py-qt4-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/multimedia/py-qt4-phonon/distinfo b/multimedia/py-qt4-phonon/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/multimedia/py-qt4-phonon/distinfo
+++ b/multimedia/py-qt4-phonon/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/net/py-qt4-network/distinfo b/net/py-qt4-network/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/net/py-qt4-network/distinfo
+++ b/net/py-qt4-network/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/textproc/py-qt4-xml/distinfo b/textproc/py-qt4-xml/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/textproc/py-qt4-xml/distinfo
+++ b/textproc/py-qt4-xml/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/textproc/py-qt4-xmlpatterns/distinfo b/textproc/py-qt4-xmlpatterns/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/textproc/py-qt4-xmlpatterns/distinfo
+++ b/textproc/py-qt4-xmlpatterns/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/www/py-qt4-webkit/distinfo b/www/py-qt4-webkit/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/www/py-qt4-webkit/distinfo
+++ b/www/py-qt4-webkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/x11-toolkits/py-qt4-gui/distinfo b/x11-toolkits/py-qt4-gui/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/x11-toolkits/py-qt4-gui/distinfo
+++ b/x11-toolkits/py-qt4-gui/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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
diff --git a/x11/py-qt4-opengl/distinfo b/x11/py-qt4-opengl/distinfo
index a312fab4a870..f6a298a5be54 100644
--- a/x11/py-qt4-opengl/distinfo
+++ b/x11/py-qt4-opengl/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec
-SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
-SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552
+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