- Update PyQt4 to 4.8.5.

- Update SIP to 4.12.4.
- Use common DISTINFO_FILEs.

databases/py-qt4-sql/Makefile

@@ -18,6 +18,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtSql module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

databases/py-qt4-sql/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

devel/py-qt4-assistant/Makefile

@@ -19,6 +19,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-s
 RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
 		${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

devel/py-qt4-assistant/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

devel/py-qt4-core/Makefile

@@ -18,6 +18,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtCore module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

devel/py-qt4-core/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

devel/py-qt4-core/files/patch-configure.py

@@ -1,141 +1,65 @@
---- ./configure.py.orig	2011-01-23 13:08:20.000000000 +0300
+--- ./configure.py.orig	2011-08-02 06:18:51.000000000 -0300
-+++ ./configure.py	2011-01-30 01:10:04.772362127 +0300
++++ ./configure.py	2011-09-11 16:22:52.000000000 -0300
-@@ -36,6 +36,10 @@
+@@ -352,7 +352,7 @@
  
- import sipconfig
+         # Note that the order in which we check is important for the
+         # consolidated module - a module's dependencies must be checked first.
+-        pyqt_modules.append("QtCore")
++        check_module("QtCore", "qobject.h", "new QObject()")
  
-+# FreeBSD check and which component (port)
+         check_module("QtGui", "qwidget.h", "new QWidget()")
-+freebsd, freebsd_port = False, ''
+         check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
-+if sys.platform[:-1] == 'freebsd': freebsd = True
+@@ -627,21 +627,6 @@
-+if freebsd: freebsd_port = os.environ['PYQT4_COMPONENT']
+         if opts.staticplugins:
- 
- # Initialise the globals.
- pyqt_version = 0x040803
-@@ -70,7 +74,6 @@
- dbuslibdirs = []
- dbuslibs = []
- 
--
- # 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.
-@@ -392,14 +395,23 @@
-         elif sipcfg.universal:
-             sipconfig.inform("QtDesigner module disabled with universal binaries.")
-         else:
--            check_module("QtDesigner", "QExtensionFactory",
--                    "new QExtensionFactory()")
-+            if freebsd:
-+                if freebsd_port.startswith('designer'):
-+                    check_module("QtDesigner", "QExtensionFactory",
-+                            "new QExtensionFactory()")
-+            else:
-+                 check_module("QtDesigner", "QExtensionFactory",
-+                         "new QExtensionFactory()")
- 
-         check_module("QAxContainer", "qaxobject.h", "new QAxObject()",
-                 extra_libs=["QAxContainer"])
- 
-         if os.path.isdir(os.path.join(src_dir, "dbus")):
--            check_dbus()
-+            if freebsd:
-+                if freebsd_port == 'dbus': 
-+                    check_dbus()
-+            else: 
-+                check_dbus()
- 
-     def code(self):
-         cons_xtra_incdirs = []
-@@ -425,6 +437,10 @@
-             cons_xtra_libs.extend(sp_libs)
- 
-             generate_code("QtCore")
-+        elif freebsd:
-+            if freebsd_port == 'core':
-+                generate_code("QtCore", extra_include_dirs=sp_incdirs,
-+                            extra_lib_dirs=sp_libdirs, extra_libs=sp_libs)
-         else:
-             generate_code("QtCore", extra_include_dirs=sp_incdirs,
-                         extra_lib_dirs=sp_libdirs, extra_libs=sp_libs)
-@@ -626,19 +642,28 @@
              sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins))
  
-         # Generate the QScintilla API file.
+-        # Generate the QScintilla API file.
 -        sipconfig.inform("Creating QScintilla API file...")
 -        f = open("PyQt4.api", "w")
-+        if freebsd:
+-
-+            if not freebsd_port in ('dbus', 'designerplugin', 'demo', 'doc'):
-+                sipconfig.inform("Creating QScintilla API file...")
-+                
-+        else:
-+            sipconfig.inform("Creating QScintilla API file...")
- 
 -        for m in pyqt_modules:
 -            api = open(m + ".api")
-+        if not freebsd:
+-
-+            # 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)
- 
 -        f.close()
-+                api.close()
+-
-+                os.remove(m + ".api")
-+
-+            f.close()
- 
      def _qpy_directories(self, mname, lib_name):
          """Return a 3-tuple of the directories containing the header files, the
-@@ -730,22 +755,28 @@
+         directory containing the library, and the name of the support library
+@@ -732,6 +717,9 @@
          return libs, libdirs
  
      def module_installs(self):
--        return [os.path.join(src_dir, "__init__.py"), "pyqtconfig.py"]
++        if "QtCore" not in pyqt_modules:
-+        if freebsd:
-+            if freebsd_port == 'core':
-+                return [os.path.join(src_dir, "__init__.py"), "pyqtconfig.py"]
-+            else:
 +            return []
-+        else:
++
-+            return [os.path.join(src_dir, "__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.
+@@ -861,40 +849,41 @@
-         qpylibs = {}
+             makefile.generate()
+             tool.append("elementtree")
  
--        if "QtCore" in pyqt_modules:
+-        # Create the pyuic4 wrapper.  Use the GUI version on MacOS (so that
-+        if freebsd_port == 'core':
+-        # previews work properly and normal console use will work anyway), but
-             qpylibs["QtCore"] = "qpycore.pro"
+-        # not on Windows (so that normal console use will work).
- 
--        if "QtGui" in pyqt_modules:
-+        if freebsd_port == 'gui':
-             qpylibs["QtGui"] = "qpygui.pro"
- 
--        if "QtDeclarative" in pyqt_modules:
-+        if freebsd_port == 'declarative':
-             qpylibs["QtDeclarative"] = "qpydeclarative.pro"
- 
--        if "QtDesigner" in pyqt_modules:
-+        if freebsd_port == 'designer':
-             qpylibs["QtDesigner"] = "qpydesigner.pro"
- 
-         # Run qmake to generate the Makefiles.
-@@ -859,37 +890,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).
 -        sipconfig.inform("Creating pyuic4 wrapper...")
-+        if freebsd:
+-
-+            if freebsd_port == 'core':
+-        if sys.platform == 'darwin':
+-            gui = True
+-            use_arch = opts.use_arch
+-        else:
+-            gui = False
+-            use_arch = ''
++        if "QtCore" in pyqt_modules:
++            # 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).
 +            sipconfig.inform("Creating pyuic4 wrapper...")
 +
 +            if sys.platform == 'darwin':
@@ -144,30 +68,6 @@
 +            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"), gui, use_arch)
-+
-+                sipconfig.inform("Creating pyuic4 Makefile...")
-+
-+                makefile = sipconfig.PythonModuleMakefile(
-+                    configuration=sipcfg,
-+                    dstdir=uicdir,
-+                    srcdir=os.path.join(src_dir, "pyuic", "uic"),
-+                    dir="pyuic",
-+                    installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
-+                )
-+
-+                makefile.generate()
-+                tool.append("pyuic")
- 
--        if sys.platform == 'darwin':
--            gui = True
--            use_arch = opts.use_arch
-         else:
--            gui = False
--            use_arch = ''
-+            sipconfig.inform("Creating pyuic4 wrapper...")
  
 -        # The pyuic directory may not exist if we are building away from the
 -        # source directory.
@@ -175,12 +75,12 @@
 -            os.mkdir("pyuic")
 -        except OSError:
 -            pass
-+            if sys.platform == 'darwin':
++            # The pyuic directory may not exist if we are building away from the
-+                gui = True
++            # source directory.
-+                use_arch = opts.use_arch
++            try:
-+            else:
++                os.mkdir("pyuic")
-+                gui = False
++            except OSError:
-+                use_arch = ''
++                pass
  
 -        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)
@@ -212,196 +112,53 @@
  
          if "QtXml" in pyqt_modules:
              sipconfig.inform("Creating pylupdate4 Makefile...")
-@@ -918,7 +970,10 @@
+@@ -945,7 +934,7 @@
-             makefile.generate()
+                     # We need to work out how to specify the right framework
-             tool.append("pyrcc")
+                     # version.
-         else:
+                     link = "-framework Python"
--            sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
+-                elif "--enable-shared" in ducfg.get("CONFIG_ARGS", ""):
-+            if freebsd:
-+                pass
 +                else:
-+                sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
+                     if glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)):
- 
-         if opts.designer_plugin and "QtDesigner" in pyqt_modules:
-             py_major = sipcfg.py_version >> 16
-@@ -944,11 +999,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%s" % (lib_dir_flag, py_major, py_minor, abi)
+                     elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)):
-+                elif freebsd:
+@@ -955,9 +944,6 @@
-+                    lib_dir_flag = quote("-L%s/lib" % ducfg["prefix"])
-+                    link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
-                 else:
-                     sipconfig.inform("Qt Designer plugin disabled because Python library is static")
                          opts.designer_plugin = False
  
--                pysh_lib = ducfg["LDLIBRARY"]
+                     link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
-+                if freebsd:
+-                else:
-+                    pysh_lib = "libpython%d.%d%s" % (py_major, py_minor, abi)
+-                    sipconfig.inform("Qt Designer plugin disabled because Python library is static")
-+                else:
+-                    opts.designer_plugin = False
-+                    pysh_lib = ducfg["LDLIBRARY"]
  
-             if opts.designer_plugin:
+                 pysh_lib = ducfg.get("LDLIBRARY", "")
-                 sipconfig.inform("Creating Qt Designer plugin Makefile...")
-@@ -1045,8 +1106,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 freebsd:
-+        if not freebsd_port in ('dbus', 'demo', 'designerplugin'):
-+            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)
-+    else:
-+        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:
+@@ -2205,6 +2191,9 @@
-         sipconfig.inform("PyQt is being built without generated docstrings.")
-@@ -1056,18 +1122,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:
--        sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opts.qscidir, "api", "python"))
-+        if freebsd:
-+            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"))
- 
-     if pydbusmoddir:
--        sipconfig.inform("The dbus support module will be installed in %s." % pydbusmoddir)
-+        if freebsd:
-+            if freebsd_port == 'dbus':
-+                sipconfig.inform("The dbus support module will be installed in %s." % pydbusmoddir)
-+        else:
-+            sipconfig.inform("The dbus support module will be installed in %s." % pydbusmoddir)
- 
--    sipconfig.inform("The PyQt .sip files will be installed in %s." % opts.pyqtsipdir)
-+    if freebsd:
-+        if not freebsd_port in ('dbus', 'demo', 'designerplugin'):
-+            sipconfig.inform("The PyQt .sip files will be installed in %s." % opts.pyqtsipdir)
-+    else:
-+        sipconfig.inform("The PyQt .sip files will be installed in %s." % opts.pyqtsipdir)
- 
--    sipconfig.inform("pyuic4, pyrcc4 and pylupdate4 will be installed in %s." % opts.pyqtbindir)
-+    if freebsd:
-+        if freebsd_port == 'core':
-+            sipconfig.inform("pyuic4 will be installed in %s." % opts.pyqtbindir)
-+        elif freebsd_port == 'xml':
-+            sipconfig.inform("pyrcc4 and pylupdate4 will be installed in %s." % opts.pyqtbindir)
-+    else:
-+        sipconfig.inform("pyuic4, pyrcc4 and pylupdate4 will be installed in %s." % opts.pyqtbindir)
- 
-     if opts.vendorcheck:
-         sipconfig.inform("PyQt will only be usable with signed interpreters.")
-@@ -1560,7 +1644,11 @@
-     of libraries.
-     extra_sip_flags is an optional list of additional flags to pass to SIP.
-     """
--    sipconfig.inform("Generating the C++ source for the %s module..." % mname)
-+    if freebsd:
-+        if mname != 'Qt':
-+            sipconfig.inform("Generating the C++ source for the %s module..." % mname)
-+    else:
-+        sipconfig.inform("Generating the C++ source for the %s module..." % mname)
- 
-     mk_clean_dir(mname)
- 
-@@ -1650,7 +1738,11 @@
-         sipconfig.error("Unable to create the C++ code.")
- 
-     # Generate the Makefile.
--    sipconfig.inform("Creating the Makefile for the %s module..." % mname)
-+    if freebsd:
-+        if mname != 'Qt':
-+            sipconfig.inform("Creating the Makefile for the %s module..." % mname)
-+    else:
-+        sipconfig.inform("Creating the Makefile for the %s module..." % mname)
- 
-     installs = []
- 
-@@ -2194,6 +2286,10 @@
          p.print_help()
          sys.exit(2)
  
-+    if freebsd:
++    # Avoid picking up the Qt3 headers instead
-+        # avoid picking up the Qt3 headers instead
 +    macros['INCDIR'] = '.'
 +
      sipcfg.set_build_macros(macros)
  
      # Check Qt is what we need.
-@@ -2201,7 +2297,7 @@
+@@ -2234,9 +2223,9 @@
- 
-     # Check the licenses are compatible.
-     check_license()
--
-+    
-     # Check which modules to build.
-     pyqt.check_modules()
- 
-@@ -2223,9 +2319,18 @@
      installs=[(pyqt.module_installs(), pyqt_modroot)]
  
      if opts.api:
 -        installs.append(("PyQt4.api", os.path.join(opts.qscidir, "api", "python")))
-+        if freebsd:
++        installs.append(("%s.api" % pyqt_modules[-1], os.path.join(opts.qscidir, "api", "python")))
-+            # Don't break package lists
-+            if not freebsd_port in ('dbus', 'designerplugin', 'demo', 'doc'):
-+                apifile = pyqt_modules[-1] + '.api'
-+                installs.append((apifile, os.path.join(opts.qscidir, "api", "python")))
-+        else:
-+            installs.append(("PyQt4.api", os.path.join(opts.qscidir, "api", "python")))
  
 -    xtra_modules = ["Qt"]
-+    if freebsd:
 +    xtra_modules = []
-+    else:
-+        xtra_modules = ["Qt"]
  
      if opts.bigqt:
          xtra_modules.append("_qt")
-@@ -2236,15 +2341,33 @@
+@@ -2249,7 +2238,7 @@
-         if opts.mwg_qwt_dir:
-             xtra_modules.append("Qwt5")
  
-+    if freebsd:
-+        if freebsd_port == 'dbus':
-+            s = pyqt.tools()
-+        elif freebsd_port in ('declarative', 'designer', 'gui'):
-+            s = pyqt.qpy_libs() + [pyqt_modules[-1]]
-+        elif freebsd_port == 'designerplugin':
-+            s = pyqt.tools()
-+        elif freebsd_port == 'xml':
-+            s = [pyqt_modules[-1]] + pyqt.tools()
-+        else:
-+            s = [pyqt_modules[-1]]
-+            if freebsd_port == 'core':
-+                s = pyqt.qpy_libs() + [pyqt_modules[-1]] + pyqt.tools()
-+    else: s = pyqt.qpy_libs() + pyqt_modules + xtra_modules + pyqt.tools()
-+
      sipconfig.ParentMakefile(
          configuration=sipcfg,
 -        subdirs=pyqt.qpy_libs() + pyqt_modules + xtra_modules + pyqt.tools(),
-+        subdirs=s,
++        subdirs=pyqt.qpy_libs() + [pyqt_modules[-1]] + xtra_modules + pyqt.tools(),
          installs=installs
      ).generate()
  
-     # Install the configuration module.
--    create_config("pyqtconfig.py", os.path.join(src_dir, "pyqtconfig.py.in"),
--            macros)
-+    if freebsd:
-+        if freebsd_port == 'core':
-+            create_config("pyqtconfig.py", os.path.join(src_dir, "pyqtconfig.py.in"), macros)
-+    else:
-+        create_config("pyqtconfig.py", os.path.join(src_dir, "pyqtconfig.py.in"), macros)
- 
- 
- ###############################################################################

devel/py-qt4-dbus/Makefile

@@ -20,12 +20,16 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-s
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus \
 		${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib qmake_build moc_build
 USE_XORG=	x11 xext
 
+BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
+INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}
+
 OPTIONS=	DEBUG	"Enable debugging in generated code" off \
 		TRACING	"Enable tracing in generated code" off
 

devel/py-qt4-dbus/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

devel/py-qt4-declarative/Makefile

@@ -18,6 +18,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-s
 RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
 		${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

devel/py-qt4-declarative/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

devel/py-qt4-designer/Makefile

@@ -20,6 +20,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q
 		${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml \
 		${PKGNAMEPREFIX}script>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-script
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
@@ -40,6 +41,7 @@ ARGS=		-b ${PREFIX}/bin\
 		-p ${PREFIX}/${QT_PLUGINDIR_REL}\
 		-q ${QMAKE}\
 		--confirm-license\
+		--no-designer-plugin\
 		--enable QtDesigner
 
 .include "../py-sip/files/bsd.pyqt.mk"

devel/py-qt4-designer/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

devel/py-qt4-designerplugin/Makefile

@@ -18,6 +18,10 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtDesigner plugin
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designer
 
+BUILD_WRKSRC=	${WRKSRC}/designer
+INSTALL_WRKSRC=	${WRKSRC}/designer
+
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

devel/py-qt4-designerplugin/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

devel/py-qt4-help/Makefile

@@ -18,6 +18,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtHelp module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

devel/py-qt4-help/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

devel/py-qt4-qscintilla2/Makefile

@@ -21,6 +21,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-s
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+DISTINFO_FILE=	${QSCI2_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

devel/py-qt4-qscintilla2/distinfo

@@ -1,2 +0,0 @@
-SHA256 (QScintilla-gpl-2.4.6.tar.gz) = ad4dcc34922358aab8b0ce643e38e12188b41d00a87513ebfd2d6186c5824eab
-SIZE (QScintilla-gpl-2.4.6.tar.gz) = 2442792

devel/py-qt4-script/Makefile

@@ -18,6 +18,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtScript module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

devel/py-qt4-script/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

devel/py-qt4-scripttools/Makefile

@@ -19,6 +19,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtScriptTools module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

devel/py-qt4-scripttools/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

devel/py-qt4-test/Makefile

@@ -18,6 +18,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtTest module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

devel/py-qt4-test/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

devel/py-qt4-test/pkg-plist

@@ -4,7 +4,6 @@
 %%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

devel/py-qt4/distinfo

@@ -0,0 +1,2 @@
+SHA256 (PyQt-x11-gpl-4.8.5.tar.gz) = c9e2df3a2fc7cba2f0c93e957bfaa8ee454f823c3032f688154976a3a3b36820
+SIZE (PyQt-x11-gpl-4.8.5.tar.gz) = 9798545

devel/py-sip/distinfo

@@ -1,2 +1,2 @@
-SHA256 (sip-4.12.1.tar.gz) = e9d66e8830c2a58e6c17b9952710f67d495ddb84ce6f3d89400c8b52913381b5
+SHA256 (sip-4.12.4.tar.gz) = 768c1f0ae7ccdc2a75cb4ca6dfd22a46832e06b3c96b1f0e8d3e955cbec047b3
-SIZE (sip-4.12.1.tar.gz) = 724028
+SIZE (sip-4.12.4.tar.gz) = 753270

devel/py-sip/files/bsd.pyqt.mk

@@ -22,11 +22,11 @@ MASTER_SITES_QSCI2=	${MASTER_SITE_RIVERBANK}QScintilla2/ \
 			${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} \
 			${MASTER_SITE_FLUFFY}QScintilla2/
 
-SIP_VERSION=		4.12.1
+SIP_VERSION=		4.12.4
 #SIP_SNAP=		-snapshot-20100102
 PYQT3_VERSION=		3.18.2
 PYQT3_SNAP=		-snapshot-20091119
-PYQT4_VERSION=		4.8.3
+PYQT4_VERSION=		4.8.5
 #PYQT4_SNAP=		-snapshot-20100110
 PYKDE3_VERSION=		3.16.7
 QSCI1_VERSION=		1.7.1
@@ -36,6 +36,8 @@ QSCI2_VERSION=		2.4.6
 SIP_DISTNAME=		sip-${SIP_VERSION}${SIP_SNAP}
 PYQT3_DISTNAME=		PyQt-x11-gpl-${PYQT3_VERSION}${PYQT3_SNAP}
 PYQT4_DISTNAME=		PyQt-x11-gpl-${PYQT4_VERSION}${PYQT4_SNAP}
+PYQT4_DISTINFO_FILE=	${PORTSDIR}/devel/py-qt4/distinfo
 PYKDE3_DISTNAME=	PyKDE-${PYKDE3_VERSION}
 QSCI1_DISTNAME=		QScintilla-1.71-gpl-${QSCI1_VERSION}
 QSCI2_DISTNAME=		QScintilla-gpl-${QSCI2_VERSION}${QSCI2_SNAP}
+QSCI2_DISTINFO_FILE=	${PORTSDIR}/devel/qscintilla2/distinfo

devel/qscintilla2-designerplugin/Makefile

@@ -17,6 +17,7 @@ COMMENT=	Qt Designer plugin for QScintilla2 (Qt4)
 
 LIB_DEPENDS=	qscintilla2.5:${PORTSDIR}/devel/qscintilla2
 
+DISTINFO_FILE=	${QSCI2_DISTINFO_FILE}
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build gui xml designer
 HAS_CONFIGURE=	yes

devel/qscintilla2-designerplugin/distinfo

@@ -1,2 +0,0 @@
-SHA256 (QScintilla-gpl-2.4.6.tar.gz) = ad4dcc34922358aab8b0ce643e38e12188b41d00a87513ebfd2d6186c5824eab
-SIZE (QScintilla-gpl-2.4.6.tar.gz) = 2442792

graphics/py-qt4-svg/Makefile

@@ -18,6 +18,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtSvg module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

graphics/py-qt4-svg/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

misc/py-qt4-demo/Makefile

@@ -15,6 +15,7 @@ DISTNAME=	${PYQT4_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, Qt demo and examples
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 USE_PYTHON=	yes
 
 OPTIONS=	PYQT4	"Install any missing PyQt4 components" off

misc/py-qt4-demo/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

misc/py-qt4-demo/files/patch-examples__activeqt__webbrowser__webbrowser.py

@@ -1,11 +0,0 @@
---- examples/activeqt/webbrowser/webbrowser.py.orig	2009-10-29 13:37:30.000000000 +1000
-+++ examples/activeqt/webbrowser/webbrowser.py	2009-10-31 18:03:38.000000000 +1000
-@@ -115,7 +115,7 @@
-         QtGui.QMessageBox.about(self, "About WebBrowser",
-                 "This Example has been created using the ActiveQt integration into Qt Designer.\n"
-                 "It demonstrates the use of QAxWidget to embed the Internet Explorer ActiveX\n"
--                "control into a Qt application."))
-+                "control into a Qt application.")
- 
-     @QtCore.pyqtSlot()
-     def on_actionAboutQt_triggered(self):

misc/py-qt4-doc/Makefile

@@ -15,6 +15,7 @@ DISTNAME=	${PYQT4_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, documentation
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 NO_BUILD=	yes
 USE_PYTHON=	2.5+
 

misc/py-qt4-doc/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

misc/py-qt4-doc/pkg-plist

@@ -41,6 +41,8 @@
 %%DOCSDIR%%/html/_static/plus.png
 %%DOCSDIR%%/html/_static/pygments.css
 %%DOCSDIR%%/html/_static/searchtools.js
+%%DOCSDIR%%/html/_static/sidebar.js
+%%DOCSDIR%%/html/_static/underscore.js
 %%DOCSDIR%%/html/assistant-manual.html
 %%DOCSDIR%%/html/buffer_interface.html
 %%DOCSDIR%%/html/build_system.html
@@ -434,7 +436,6 @@
 %%DOCSDIR%%/html/installation.html
 %%DOCSDIR%%/html/introduction.html
 %%DOCSDIR%%/html/keyword_arguments.html
-%%DOCSDIR%%/html/modindex.html
 %%DOCSDIR%%/html/modules.html
 %%DOCSDIR%%/html/new_style_signals_slots.html
 %%DOCSDIR%%/html/objects.inv
@@ -468,6 +469,7 @@
 %%DOCSDIR%%/html/phonon-volumeslider.html
 %%DOCSDIR%%/html/phonon.html
 %%DOCSDIR%%/html/pickle.html
+%%DOCSDIR%%/html/py-modindex.html
 %%DOCSDIR%%/html/python_shell.html
 %%DOCSDIR%%/html/python_v3.html
 %%DOCSDIR%%/html/qabstractanimation.html
@@ -541,6 +543,7 @@
 %%DOCSDIR%%/html/qcolumnview.html
 %%DOCSDIR%%/html/qcombobox.html
 %%DOCSDIR%%/html/qcommandlinkbutton.html
+%%DOCSDIR%%/html/qcommonstyle.html
 %%DOCSDIR%%/html/qcompleter.html
 %%DOCSDIR%%/html/qconicalgradient.html
 %%DOCSDIR%%/html/qcontextmenuevent.html
@@ -1108,7 +1111,6 @@
 %%DOCSDIR%%/html/qtdeclarative.html
 %%DOCSDIR%%/html/qtdesigner.html
 %%DOCSDIR%%/html/qtemporaryfile.html
-%%DOCSDIR%%/html/qtest-qtoucheventsequence.html
 %%DOCSDIR%%/html/qtest.html
 %%DOCSDIR%%/html/qtextblock-iterator.html
 %%DOCSDIR%%/html/qtextblock.html

multimedia/py-qt4-multimedia/Makefile

@@ -18,6 +18,7 @@ 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
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

multimedia/py-qt4-multimedia/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

multimedia/py-qt4-phonon/Makefile

@@ -18,6 +18,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, Phonon module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

multimedia/py-qt4-phonon/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

net/py-qt4-network/Makefile

@@ -18,6 +18,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtNetwork module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

net/py-qt4-network/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

textproc/py-qt4-xml/Makefile

@@ -18,6 +18,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtXml module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

textproc/py-qt4-xml/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

textproc/py-qt4-xmlpatterns/Makefile

@@ -17,6 +17,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtXmlPatterns module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

textproc/py-qt4-xmlpatterns/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

www/py-qt4-webkit/Makefile

@@ -17,6 +17,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtWebKit module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

www/py-qt4-webkit/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

x11-toolkits/py-qt4-gui/Makefile

@@ -18,6 +18,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtGui module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

x11-toolkits/py-qt4-gui/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929

x11-toolkits/py-qt4-gui/pkg-plist

@@ -24,6 +24,7 @@
 %%SIP%%share/py-sip/QtGui/qcolumnview.sip
 %%SIP%%share/py-sip/QtGui/qcombobox.sip
 %%SIP%%share/py-sip/QtGui/qcommandlinkbutton.sip
+%%SIP%%share/py-sip/QtGui/qcommonstyle.sip
 %%SIP%%share/py-sip/QtGui/qcompleter.sip
 %%SIP%%share/py-sip/QtGui/qcursor.sip
 %%SIP%%share/py-sip/QtGui/qdatawidgetmapper.sip

x11/py-qt4-opengl/Makefile

@@ -18,6 +18,7 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtOpenGL module
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
 RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
+DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4

x11/py-qt4-opengl/distinfo

@@ -1,2 +0,0 @@
-SHA256 (PyQt-x11-gpl-4.8.3.tar.gz) = 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
-SIZE (PyQt-x11-gpl-4.8.3.tar.gz) = 9770929