- The FreeBSD KDE team is pleased to announce SIP-4.10.2, PyQt-4.7.3

and QScintilla-2.4.3 for FreeBSD. With hat on: kde@
svn path=/head/; revision=254128
2010-05-11 10:43:10 +00:00 · 2010-05-11 10:43:10 +00:00 · 8406d1f1d4 · 2021-03-31 03:12:20 +00:00
commit 8406d1f1d4
parent 0a0091d287
60 changed files with 178 additions and 215 deletions
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	sql
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	databases devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -41,7 +40,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--confirm-license\

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -77,4 +76,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtSql/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/databases/py-qt4-sql/distinfo
+++ b/databases/py-qt4-sql/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	assistant
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -43,7 +42,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtAssistant

 .include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -78,4 +77,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtAssistant/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-qt4-assistant/distinfo
+++ b/devel/py-qt4-assistant/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	core
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -41,7 +40,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtCore

 .include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -87,4 +86,4 @@ post-install:
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/py_compile.py\
 		`ls *.py */*.py */*/*.py`

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-qt4-core/distinfo
+++ b/devel/py-qt4-core/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- 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	2010-01-01 13:43:51.000000000 +1000
-+++ configure.py	2010-01-09 22:35:34.688908243 +1000
+--- configure.py.orig	2010-03-18 04:29:19.000000000 +1000
+++ configure.py	2010-03-18 14:07:20.613873966 +1000
@@ -36,6 +36,10 @@
 
 import sipconfig
@ -10,7 +10,7 @@
 +if freebsd: freebsd_port = os.environ['PYQT4_COMPONENT']
 
 # Initialise the globals.
- pyqt_version = 0x040700
+ pyqt_version = 0x040702
@@ -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.
-@@ -371,14 +374,23 @@
+@@ -375,14 +378,23 @@
         elif sipcfg.universal:
             sipconfig.inform("QtDesigner module disabled with universal binaries.")
         else:
@ -36,7 +36,7 @@
         check_module("QAxContainer", "qaxobject.h", "new QAxObject()",
                 extra_libs=["QAxContainer"])
 
-         if os.path.isdir("dbus"):
+         if os.path.isdir(os.path.join(src_dir, "dbus")):
 -            check_dbus()
 +            if freebsd:
 +                if freebsd_port == 'dbus': 
@ -46,7 +46,7 @@
 
     def code(self):
         cons_xtra_incdirs = []
-@@ -404,6 +416,10 @@
+@@ -408,6 +420,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)
-@@ -589,19 +605,28 @@
+@@ -596,19 +612,28 @@
             sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins))
 
         # Generate the QScintilla API file.
@ -93,9 +93,9 @@
 -        f.close()
 +            f.close()
 
-     def _qpy_directories(self, mname):
-         """Return a tuple of the directories containing the header files and
-@@ -690,19 +715,25 @@
+     def _qpy_directories(self, mname, lib_name):
+         """Return a 3-tuple of the directories containing the header files, the
+@@ -700,19 +725,25 @@
         return libs, libdirs
 
     def module_installs(self):
@ -125,7 +125,7 @@
             qpylibs["QtDesigner"] = "qpydesigner.pro"
 
         # Run qmake to generate the Makefiles.
-@@ -812,30 +843,58 @@
+@@ -822,30 +853,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).
@ -202,7 +202,7 @@
 
         if "QtXml" in pyqt_modules:
             sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -863,7 +922,10 @@
+@@ -873,7 +932,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
-@@ -886,11 +948,17 @@
+@@ -896,11 +958,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,7 +233,7 @@
 
             if opts.designer_plugin:
                 sipconfig.inform("Creating Qt Designer plugin Makefile...")
-@@ -984,8 +1052,13 @@
+@@ -994,8 +1062,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)
@ -249,7 +249,7 @@
 
     if opts.no_docstrings:
         sipconfig.inform("PyQt is being built without generated docstrings.")
-@@ -995,18 +1068,36 @@
+@@ -1005,18 +1078,36 @@
     if opts.prot_is_public:
         sipconfig.inform("PyQt is being built with 'protected' redefined as 'public'.")
 
@ -291,7 +291,7 @@
 
     if opts.vendorcheck:
         sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -1415,7 +1506,11 @@
+@@ -1493,7 +1584,11 @@
     of libraries.
     extra_sip_flags is an optional list of additional flags to pass to SIP.
     """
@ -304,7 +304,7 @@
 
     mk_clean_dir(mname)
 
-@@ -1501,7 +1596,11 @@
+@@ -1579,7 +1674,11 @@
         sipconfig.error("Unable to create the C++ code.")
 
     # Generate the Makefile.
@ -317,7 +317,7 @@
 
     installs = []
 
-@@ -1990,6 +2089,10 @@
+@@ -2072,6 +2171,10 @@
         p.print_help()
         sys.exit(2)
 
@ -328,7 +328,7 @@
     sipcfg.set_build_macros(macros)
 
     # Check Qt is what we need.
-@@ -1997,7 +2100,7 @@
+@@ -2079,7 +2182,7 @@
 
     # Check the licenses are compatible.
     check_license()
@ -337,7 +337,7 @@
     # Check which modules to build.
     pyqt.check_modules()
 
-@@ -2019,9 +2122,18 @@
+@@ -2101,9 +2204,18 @@
     installs=[(pyqt.module_installs(), pyqt_modroot)]
 
     if opts.api:
@ -358,7 +358,7 @@
 
     if opts.bigqt:
         xtra_modules.append("_qt")
-@@ -2032,15 +2144,33 @@
+@@ -2114,15 +2226,33 @@
         if opts.mwg_qwt_dir:
             xtra_modules.append("Qwt5")
 
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	dbus
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -41,7 +40,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtCore

 .include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -61,4 +60,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/dbus/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-qt4-dbus/distinfo
+++ b/devel/py-qt4-dbus/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	designer
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -44,7 +43,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtDesigner

 .include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if ${OSVERSION} < 700000
 BROKEN=		does not build
@ -83,4 +82,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtDesigner/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-qt4-designer/distinfo
+++ b/devel/py-qt4-designer/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/devel/py-qt4-designerplugin/Makefile
+++ b/devel/py-qt4-designerplugin/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	designerplugin
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -38,7 +37,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtDesigner

 .include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -57,4 +56,4 @@ post-configure:
 		-e 's|LINK .*|LINK = ${CXX}|'\
 		${WRKSRC}/designer/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-qt4-designerplugin/distinfo
+++ b/devel/py-qt4-designerplugin/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/devel/py-qt4-help/Makefile
+++ b/devel/py-qt4-help/Makefile
@ -7,7 +7,6 @@

 PORTNAME=	help
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
@ -42,7 +41,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtHelp

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -77,4 +76,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtHelp/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-qt4-help/distinfo
+++ b/devel/py-qt4-help/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	qscintilla2
 PORTVERSION=	${QSCI2_VERSION}
-PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_QSCI2}
@ -40,7 +39,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 ALL_TARGET=	#empty

 .include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 PYVER=		${PYTHON_VER}

@ -76,4 +75,4 @@ post-configure:
 			-e 's|LINK = c++|LINK = ${CXX}|'\
 			${WRKSRC}/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-qt4-qscintilla2/distinfo
+++ b/devel/py-qt4-qscintilla2/distinfo
@ -1,3 +1,3 @@
-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
+MD5 (QScintilla-gpl-2.4.3.tar.gz) = b1c83d42398493bedb22f4df1868627d
+SHA256 (QScintilla-gpl-2.4.3.tar.gz) = a61deeded122ba83e8fea53fefad2f18b4d6a32d8b04ea28e3699ea3b6b60aa9
+SIZE (QScintilla-gpl-2.4.3.tar.gz) = 2368919
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	script
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -42,7 +41,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtScript

 .include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -66,10 +65,6 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not compile on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
@ -81,4 +76,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtScript/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-qt4-script/distinfo
+++ b/devel/py-qt4-script/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@ -7,7 +7,6 @@

 PORTNAME=	scripttools
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -43,7 +42,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtScriptTools

 .include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -67,10 +66,6 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not compile on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
@ -82,4 +77,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtScriptTools/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-qt4-scripttools/distinfo
+++ b/devel/py-qt4-scripttools/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	test
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -42,7 +41,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtTest

 .include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -77,4 +76,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtTest/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-qt4-test/distinfo
+++ b/devel/py-qt4-test/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/devel/py-qt4/Makefile
+++ b/devel/py-qt4/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	qt4
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	# empty
 DISTFILES=	# none
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@ -28,7 +28,7 @@ ARGS=		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR}\
 PORTDOCS=	*

 .include "files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		-u
@ -57,4 +57,4 @@ post-install:
 		${PYTHON_CMD} -c "import sipdistutils" &&\
 		${PYTHON_CMD} -O -c "import sipdistutils"

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@ -1,3 +1,3 @@
-MD5 (sip-4.10.tar.gz) = 4b8f7361839b33868dd3cc576509ba8e
-SHA256 (sip-4.10.tar.gz) = d08a764a69e41f37d81b456d628947d114da37a6cd8456e02e3f8ad481e5d696
-SIZE (sip-4.10.tar.gz) = 702403
+MD5 (sip-4.10.2.tar.gz) = 52d11ca9c1a0d0cddc9b89268bff5929
+SHA256 (sip-4.10.2.tar.gz) = 38d9f6d07f3a9fa967e60c1da11ffb04bd76f0f4fd4767d9c8a9bca11c0888ef
+SIZE (sip-4.10.2.tar.gz) = 646683
--- 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.10
+SIP_VERSION=		4.10.2
 PYQT3_VERSION=		3.18.1
-PYQT4_VERSION=		4.7
+PYQT4_VERSION=		4.7.3
 PYKDE3_VERSION=		3.16.6
 QSCI1_VERSION=		1.7.1
-QSCI2_VERSION=		2.4.2
+QSCI2_VERSION=		2.4.3

 SIP_DISTNAME=		sip-${SIP_VERSION}
 PYQT3_DISTNAME=		PyQt-x11-gpl-${PYQT3_VERSION}
--- a/devel/qscintilla2-designerplugin/Makefile
+++ b/devel/qscintilla2-designerplugin/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	designerplugin
 PORTVERSION=	${QSCI2_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITES_QSCI2}
--- a/devel/qscintilla2-designerplugin/distinfo
+++ b/devel/qscintilla2-designerplugin/distinfo
@ -1,3 +1,3 @@
-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
+MD5 (QScintilla-gpl-2.4.3.tar.gz) = b1c83d42398493bedb22f4df1868627d
+SHA256 (QScintilla-gpl-2.4.3.tar.gz) = a61deeded122ba83e8fea53fefad2f18b4d6a32d8b04ea28e3699ea3b6b60aa9
+SIZE (QScintilla-gpl-2.4.3.tar.gz) = 2368919
--- a/devel/qscintilla2/Makefile
+++ b/devel/qscintilla2/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	qscintilla2
 PORTVERSION=	${QSCI2_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITES_QSCI2}
@ -20,13 +19,15 @@ QT_COMPONENTS=	qmake_build moc_build gui xml designer
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}

+OPTIONS=	NLS "Build with NLS support" on
+
 BUILD_WRKSRC=		${WRKSRC}/Qt4
 INSTALL_WRKSRC=		${BUILD_WRKSRC}

 QMAKE_ARGS=	-unix PREFIX=${PREFIX}

 .include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if !defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS=""
@ -62,7 +63,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC} &&\
 		${MKDIR} ${DOCSDIR}/html ${DOCSDIR}/Scintilla &&\
-		${INSTALL_DATA} ChangeLog NEWS README ${DOCSDIR} &&\
+		${INSTALL_DATA} NEWS README ${DOCSDIR} &&\
 		${INSTALL_DATA} doc/html-Qt4/* ${DOCSDIR}/html &&\
 		${INSTALL_DATA} doc/Scintilla/* ${DOCSDIR}/Scintilla
 .endif
@ -72,4 +73,4 @@ post-install:
 		${INSTALL_DATA} *.* ${EXAMPLESDIR} &&\
 		${INSTALL_DATA} images/* ${EXAMPLESDIR}/images
 .endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/qscintilla2/distinfo
+++ b/devel/qscintilla2/distinfo
@ -1,3 +1,3 @@
-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
+MD5 (QScintilla-gpl-2.4.3.tar.gz) = b1c83d42398493bedb22f4df1868627d
+SHA256 (QScintilla-gpl-2.4.3.tar.gz) = a61deeded122ba83e8fea53fefad2f18b4d6a32d8b04ea28e3699ea3b6b60aa9
+SIZE (QScintilla-gpl-2.4.3.tar.gz) = 2368919
--- a/devel/qscintilla2/pkg-plist
+++ b/devel/qscintilla2/pkg-plist
@ -45,9 +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.2
-%%QT_LIBDIR_REL%%/libqscintilla2.so.5.2.0
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.3
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.3.0
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/Scintilla/Design.html
@ -158,8 +157,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyledText-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyledText.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_8c570a21573c8a34f02ad16af33f26f5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_f2bfa0da14ade1666984a0b363f1bed0.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_2b8548572807eceec6720569394e58d6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_247b66aa290261b71b593aa2827bed18.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dirs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	svg
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -42,7 +41,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtSvg

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -77,4 +76,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtSvg/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/graphics/py-qt4-svg/distinfo
+++ b/graphics/py-qt4-svg/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	demo
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	misc devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -24,7 +23,7 @@ OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 EXAMPLESDIR=	${PREFIX}/share/examples/py-qt4

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if !defined(WITHOUT_PYQT4)
 RUN_DEPENDS+=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
@ -43,7 +42,6 @@ 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
@ -67,4 +65,4 @@ do-install:
 	@${ECHO} "NOPORTEXAMPLES is set -- installing nothing."
 .endif

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/misc/py-qt4-demo/distinfo
+++ b/misc/py-qt4-demo/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/misc/py-qt4-demo/pkg-plist
+++ b/misc/py-qt4-demo/pkg-plist
@ -577,6 +577,25 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/saxbookmarks/jennifer.xbel
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/saxbookmarks/saxbookmarks.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/saxbookmarks/saxbookmarks.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/files/contact.xsd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/files/invalid_contact.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/files/invalid_order.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/files/invalid_recipe.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/files/order.xsd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/files/recipe.xsd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/files/valid_contact.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/files/valid_order.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/files/valid_recipe.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/schema.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/schema.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/schema.qrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/schema.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/ui_schema.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlpatterns/schema/ui_schema.pyc
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xmlpatterns/schema/files
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xmlpatterns/schema
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xmlpatterns
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml/saxbookmarks
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml/dombookmarks
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml
--- a/misc/py-qt4-doc/Makefile
+++ b/misc/py-qt4-doc/Makefile
@ -24,7 +24,7 @@ do-install:
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC} &&\
 		${MKDIR} ${DOCSDIR} &&\
-		${INSTALL_DATA} ChangeLog GPL_EXCEPTION.TXT\
+		${INSTALL_DATA} GPL_EXCEPTION.TXT\
 				GPL_EXCEPTION_ADDENDUM.TXT NEWS\
 				LICENSE.GPL2 LICENSE.GPL3\
 				OPENSOURCE-NOTICE.TXT README THANKS\
--- a/misc/py-qt4-doc/distinfo
+++ b/misc/py-qt4-doc/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/misc/py-qt4-doc/pkg-plist
+++ b/misc/py-qt4-doc/pkg-plist
@ -1,4 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/GPL_EXCEPTION.TXT
 %%PORTDOCS%%%%DOCSDIR%%/GPL_EXCEPTION_ADDENDUM.TXT
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.GPL2
@ -74,6 +73,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/images/graphicsview-view.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/graphicsview-zorder.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/gridlayout.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hoverevents.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/httpstack.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/icon.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/inputdialogs.png
--- a/multimedia/py-qt4-multimedia/Makefile
+++ b/multimedia/py-qt4-multimedia/Makefile
@ -7,7 +7,6 @@

 PORTNAME=	multimedia
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	multimedia devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
@ -42,7 +41,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtMultimedia

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -77,4 +76,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtMultimedia/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/multimedia/py-qt4-multimedia/distinfo
+++ b/multimedia/py-qt4-multimedia/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@ -7,7 +7,6 @@

 PORTNAME=	phonon
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	multimedia devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
@ -42,7 +41,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable phonon

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -66,10 +65,6 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not compile on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
@ -81,4 +76,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/phonon/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/multimedia/py-qt4-phonon/distinfo
+++ b/multimedia/py-qt4-phonon/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	network
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -42,7 +41,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtNetwork

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -66,10 +65,6 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not compile on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
@ -81,4 +76,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtNetwork/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/net/py-qt4-network/distinfo
+++ b/net/py-qt4-network/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	xml
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -42,7 +41,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtXml

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -66,10 +65,6 @@ PLIST_SUB+=	SIP=""
 ARGS+=		--trace
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not compile on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
@ -81,4 +76,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtXml/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/textproc/py-qt4-xml/distinfo
+++ b/textproc/py-qt4-xml/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	xmlpatterns
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	textproc devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
@ -41,7 +40,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtXmlPatterns

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -76,4 +75,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtXmlPatterns/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/textproc/py-qt4-xmlpatterns/distinfo
+++ b/textproc/py-qt4-xmlpatterns/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	webkit
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
@ -41,7 +40,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtWebKit

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -76,4 +75,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtWebKit/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/www/py-qt4-webkit/distinfo
+++ b/www/py-qt4-webkit/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/x11-toolkits/py-kde/Makefile
+++ b/x11-toolkits/py-kde/Makefile
@ -35,7 +35,7 @@ OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 ARGS=		-i -k ${LOCALBASE} -v ${DATADIR} -d ${PYTHON_SITELIBDIR}

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		-u
@ -98,4 +98,4 @@ post-install:
 		${INSTALL_DATA} basic/* ${EXAMPLESDIR}/templates/basic
 .endif

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@ -38,7 +38,7 @@ ARGS=		-b ${PREFIX}/bin -d ${PYTHON_SITELIBDIR}\
 MODULES=	qt qtcanvas qtnetwork qttable qtxml qtui qtsql qtext

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		-u
@ -98,4 +98,4 @@ post-install:
 		${INSTALL_DATA} webbrowser/* ${EXAMPLESDIR}/webbrowser
 .endif

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/x11-toolkits/py-qt/files/patch-configure.py
+++ b/x11-toolkits/py-qt/files/patch-configure.py
@ -1,14 +1,5 @@
 --- 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
 
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	gui
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -42,7 +41,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtGui

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -70,10 +69,6 @@ ARGS+=		--trace
 BROKEN=		Does not compile on sparc64
 .endif

-.if ${OSVERSION} < 700000
-BROKEN=		does not compile on 6.X
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
@ -85,4 +80,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtGui/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/x11-toolkits/py-qt4-gui/distinfo
+++ b/x11-toolkits/py-qt4-gui/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@ -6,7 +6,6 @@

 PORTNAME=	opengl
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11 devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
@ -42,7 +41,7 @@ ARGS=		-b ${PREFIX}/bin\
 		--enable QtOpenGL

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(WITH_DEBUG)
 ARGS+=		--debug
@ -77,4 +76,4 @@ post-configure:
 		-e 's|LINK = c++|LINK = ${CXX}|'\
 		${WRKSRC}/QtOpenGL/Makefile

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/x11/py-qt4-opengl/distinfo
+++ b/x11/py-qt4-opengl/distinfo
@ -1,3 +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
+MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
+SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
+SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
--- a/x11/py-qt4-opengl/pkg-plist
+++ b/x11/py-qt4-opengl/pkg-plist
@ -1,5 +1,6 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtOpenGL.so
 %%SIP%%share/py-sip/QtOpenGL/QtOpenGLmod.sip
+%%SIP%%share/py-sip/QtOpenGL/opengl_types.sip
 %%SIP%%share/py-sip/QtOpenGL/qgl.sip
 %%SIP%%share/py-sip/QtOpenGL/qglcolormap.sip
 %%SIP%%share/py-sip/QtOpenGL/qglframebufferobject.sip