Update to 3.17.4:

2007/12/06 14:27:50  phil
Operator related changes needed for SIP v4.7.2 and later.
Released as v3.17.4.


2007/07/30 16:51:02  phil
Released as v3.17.3.


2007/07/01 16:08:55  phil
Acquire the GIL before freeing a signal/slot connection.


2007/06/13 17:33:55  phil
Removed #includes of SIP generated files that, strictly speaking, were internal
and no longer generated.


2007/06/05  9:37:59  phil
Fix for an overflow bug in QImage from Ulli.


2007/05/14 15:00:02  phil
Updated progress.py example from Pete Jansen.


2007/04/25 12:28:47  phil
Updated the NEWS file.


2007/04/25 12:25:19  phil
Released as v3.17.2.


2007/04/21 14:13:36  phil
Backed out the recent change to remove the /ReleaseGIL/ from
QApplication.postEvent() as it turns out it avoids a potential deadlock.


2007/04/10 16:13:51  phil
Released as v3.17.1.


2007/04/02 15:27:03  phil
Updated the NEWS file.
SIP v4.6 is now required.
The QLayoutItem sub-class code no longer handles QLayout and leaves it to the
QObject sub-class code to deal with.


2007/02/20 10:58:40  phil
Removed the unneeded /ReleaseGIL/ from QApplication::postEvent().
Removed the GIL manipulation in QCustomEvent (in particular in the traverse
code).


2007/01/27 16:02:18  phil
Removed knowledge of the optional parts of the Qt support API so that it is no
longer necessary to update PyQt when new optional parts are added.


2007/01/27 15:37:47  phil
Updated the Qt support API for the latest SIP.


2007/01/21 16:29:15  phil
Implemented sipQtFindConnection() so that lambda slots can be handled by the
cyclic garbage collector.


2007/01/17 16:58:32  phil
Updated the copyright notices.


2006/11/30 20:58:48  phil
Fixed bug in QApplication ctor handwritten code that caused a crash if a
QApplication was created a second time with no arguments.


2006/11/04 22:08:33  phil
Released as v3.17.


2006/10/27 17:13:44  phil
Updated the news file.


2006/10/21 14:10:23  phil
Switched the internal build system to Qt v3.3.7.


2006/10/06 17:44:27  phil
Synched with the latest QScintilla1 API.


2006/09/09 17:59:52  phil
Added QextScintilla.setFont().
The internal build system now uses -j2.


2006/09/02 13:35:03  phil
Removed the use of -c in the internal build systems invocation of configure.py
as it causes problems for GCC v4.


2006/08/17  9:36:39  phil
Added the missing QListView.setSelectionAnchor().


2006/07/30 17:16:35  phil
Updated for the latest QScintilla v1 snapshot.


2006/07/19 23:30:28  phil
Some tweaks for Windows64 support based on patches from Gerard.


2006/07/16 12:38:36  phil
Adapted the handwritten code for Python v2.5.


2006/07/08 19:25:44  phil
Added QextScintilla.isCallTipActive().


2006/07/03 19:40:22  phil
Added pyqt_config_args to pyqtconfig.py.
Fixed QTextEdit.setAutoFormatting().


2006/07/02 14:28:05  phil
Added setWrapVisualFlags(), WrapMode::WrapCharacter, WrapVisualFlag to
QextScintilla.


2006/07/01 18:57:30  phil
Added cancelList(), firstVisibleLine(), isListActive(), showUserList(),
textHeight() and userListActivated() to QextScintilla.


2006/06/28 22:12:57  phil
QextScintilla.foldAll() can now optionally fold all child fold points.
Added autoCompleteFromAll() and setAutoCompletionStartCharacters() to
QextScintilla.
Added AcsAll as an auto-completion source.


2006/06/25 21:52:03  phil
Added defaultColor() and setDefaultColor() to QextScintillaLexer.
Added color() and setColor() to QextScintilla.
Renamed eraseColor() and setEraseColor() to paper() and setPaper() in
QextScintilla.


2006/06/25 16:21:32  phil
Added defaultPaper() and setDefaultPaper() to QextScintillaLexer.
Added eraseColor() and setEraseColor() to QextScintilla.


2006/06/22 19:29:38  phil
The mkfeatures helper is now always built without debugging.
configure.py now states that the -u flag on Windows needs a debug version of
Python.


2006/06/20 15:57:55  phil
Latest QScintilla updates.


2006/06/19 21:00:47  phil
Synced with the latest QScintilla snapshot - including the significantly
changed Ruby lexer.


2006/06/19 15:55:42  phil
Solaris warnings fixes from Ulli.


2006/06/18 23:51:34  phil
Sync with the latest QScintilla changes: highlighted identifiers and decorators
in the Python lexer.


2006/06/18 16:40:31  phil
Updated for the latest QScintilla snapshot.


2006/05/17  8:39:39  phil
Removed some inaccessable methods from QCString.


2006/05/11 19:04:27  phil
Another fix for Qt v3.1 in qnamespace.sip.


2006/04/28 20:47:46  phil
Replaced long long with PY_LONG_LONG for MSVC 6.


2006/04/07 23:29:54  phil
Tidy ups to the internal build system.


2006/04/06 12:26:09  phil
Fixed Qt::MacintoshVersion for Qt v3.0.x and v3.1.x.


2006/04/05 12:11:43  phil
Removed all functions that were hidden by overloads with the same Python
signature (ie. both of them).


2006/03/30  8:09:58  phil
Added QStringList::operator+=(const QString &).


2006/03/29 11:38:21  phil
Added the missing QImage.bitBlt() function.


2006/03/24 23:54:13  phil
Released as v3.16.


2006/03/23 21:34:09  phil
Added a missing /Transfer/ from QGLWidget().


2006/03/20 21:00:58  phil
Removed the "Filter" functions from the documentation.


2006/03/20 20:59:23  phil
Removed the "Filter" versions of the QFileDialog static methods as they aren't
necessary after all (just not obvious how to use them properly).


2006/03/14 22:45:09  phil
pyuic now specifies the Latin1 encoding when the -embed flag is used.


2006/03/13 11:55:09  phil
Build system changes so that PyQt builds on MacOS properly.


2006/03/11 19:16:56  phil
Removed some leftovers from when PyQt3 and 4 shared a single config.py.  PyQt3
no longer searches PATH for the Qt bin directory.


2006/03/11 15:15:15  phil
Fixed build problem with Qt v1.x.


2006/03/10 22:37:30  phil
Updates for Qt v3.3.6.


2006/03/04 16:06:40  phil
Documentation updates.
Applied the same transfer rule to QPopupMenu.exec() as is applied to
QDialog.exec().
Added getOpenFileNameFilter(), getSaveFileNameFilter() and
getOpenFileNamesFilter() to QFileDialog that return a tuple of the selected
files and the current filter.


2006/02/26 13:56:28  phil
Added support for signed char to the Qt API.


2006/02/21 15:22:08  phil
Changed the signal/slot handling so that unsigned int and unsigned short are
implemented as long objects rather than integer objects.


2006/02/19 16:43:48  phil
Updates to the internal Qt API.


2006/02/18 21:05:56  phil
Added new stubs in the Qt support API (not used by PyQt3).


2006/02/14 19:16:05  phil
The destroyed() signal can now be received by a Python slot.


2006/02/13 20:02:22  phil
Fixed a typo in configure.py.


2006/02/13  0:24:55  phil
Updated the handwritten code to use the current SIP API.


2006/02/12  1:14:11  phil
Removed all calls sipForceConvertTo*().
Removed all uses of newly deprecated calls.


2006/01/26 16:40:38  phil
Changed the signal/slot support required by the latest SIP changes.


2006/01/16 18:58:26  phil
Removed PYQT_BUILD.


2006/01/10 19:13:07  phil
Fixed a typo in the last change.


2006/01/10 18:20:02  phil
Fixed the sipForceConvertToTransfer_*() calls.


2005/12/30 14:30:08  phil
More changes to handwritten code that should be handling sipSelfWasArg.


2005/12/28 19:35:10  phil
Updated all handwritten convertor code for the latest SIP changes.


2005/12/24 17:02:31  phil
Changes required by the introduction of sipSelfWasArg in the SIP snapshot.


2005/12/22 16:22:48  phil
Really fixed the QApplication argc bug this time.


2005/12/19 17:43:42  phil
Changes to the build system for the latest SIP snapshot.


2005/12/18 11:00:06  phil
Stripped the Qt4 specific stuff from configure.py.


2005/12/18 10:06:25  phil
Updated the internal build system not to include the .svn directory in
packages.


2005/12/17 19:43:36  phil
Changes to the internal build system for the CVS to SVN transfer.


2005/12/07 00:54:04  phil
Added a missing #include from qstring.sip in PyQt3.


2005/12/04 18:41:31  phil
Fixed the handling of horizontal and vertical stretch in QSizePolicy.


2005/11/29 13:06:37  phil
Fixed a long standing bug with QApplication ctors that only showed itself with
Qt4.


2005/11/24 17:45:09  phil
Added the missing /ReleaseGIL/ to QThread.exit().


2005/11/24 17:22:31  phil
Changes required for the modified mapped type template syntax.


2005/11/20 18:41:02  phil
The HTML documentation is now maintained manually rather than being
auto-generated.


2005/11/17 18:24:48  phil
Fixed bug in pyuic related to QKeySequence.


2005/11/12 10:29:13  phil
Added the missing ctor to QApplication.


2005/11/10 21:10:46  phil
Removed the /TransferThis/ annotations from the QTableItem (and sub-classes)
ctors. The Qt documentation is wrong.


2005/11/09 18:00:47  phil
Fixed the GIL bug in qInstallMsgHandler().


2005/11/01 22:08:32  phil
Implemented the PyQt3 changes for the new Qt support API.


2005/10/26 14:34:57  phil
Modified the QString buffer interface to be reentrant and to try and use the
default Python codec.


2005/10/23 16:02:47  phil
QObject.sender() now supports Python signals.


2005/10/22 22:38:54  phil
Implemented the buffer interface for QString.


2005/10/19 13:38:24  phil
Improved the fix to QClipboard.setData().


2005/10/16 16:09:29  phil
Used mapped type templates in PyQt3 where possible.


2005/10/13 18:52:02  phil
Fixed the handling of QClipboard.setMimeType() and a related memory leak.


2005/10/12 21:11:15  phil
Fixed bug in configure.py when the Qt bin directory isn't on the path.
Fixed compilation problem with QAxBase handwritten code and MinGW.
Added the * and *= operators to QString.
Removed some QString methods that were passing or returning arrays.


2005/10/11 21:13:48  phil
Added /Numeric/ to the QString + operator. The improved behaviour (being able
to write s = "foo" + QString("bar")) should now work in both PyQt3 and 4.


2005/10/07 18:15:37  phil
Changed the PyQt3 QString behaviour with long and ulong to match PyQt4.


2005/09/22 20:18:39  phil
Updated the build system now that all Qt specific configuration data has been
removed from sipconfig.


2005/09/10 21:33:59  phil
Fixed bug in configure.py when reporting an incorrect SIP version.


2005/09/08 20:16:33  phil
Updated the universal slot support to fit with the latest SIP snapshot.
Changed the way universal slots are implemented so they get destroyed when the
corresponding transmitter gets destroyed.


2005/09/07 20:53:52  phil
Removed support for SIP v3 in configure.py.
Minor pyuic fix taken from uic v3.3.5.
Added the missing MacintoshVersion enum.
Added the -f flag to configure to use any existing features file (by default it
is recreated).


2005/09/06 20:33:43  phil
Removed support for SIP v3 from configure.py.
Added the new Qt support code taken out of SIP.

13 files changed, 301 insertions, 421 deletions

diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index 47796047d91..6848f9d121f 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/06/12 02:14:57 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2008/10/08 14:23:24 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,7 +6,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../x11/py-qt3-base/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-qt3-base-${PYQT_VERSION}
-PKGREVISION=		3
 
 COMMENT=		Python binding for Qt3
 
@@ -25,7 +24,7 @@ SUBST_STAGE.pyversfx=	pre-configure
 SUBST_FILES.pyversfx=	pyuic3/pyuic.sbf pylupdate3/pylupdate.sbf
 SUBST_SED.pyversfx=	-e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
 
-.include "../../x11/py-qt3-sip/buildlink3.mk"
+.include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
 # ${PYSITELIB}/qt.so depends on libqassistantclient.so
diff --git a/x11/py-qt3-base/Makefile.common b/x11/py-qt3-base/Makefile.common
index a07cbddb114..677fddf28ce 100644
--- a/x11/py-qt3-base/Makefile.common
+++ b/x11/py-qt3-base/Makefile.common
@@ -1,18 +1,21 @@
-# $NetBSD: Makefile.common,v 1.9 2008/07/14 16:30:26 joerg Exp $
+# $NetBSD: Makefile.common,v 1.10 2008/10/08 14:23:24 wiz Exp $
+#
+# used by x11/py-qt3-base/Makefile
+# used by x11/py-qt3-modules/Makefile
+# used by x11/py-qt3-qscintilla/Makefile
 #
-
 # XXX: when updating version, be sure to update distinfo for both
 # XXX: PyQt-mac-gpl and PyQt-x11-gpl in py-qt3-qscintilla,
 # XXX: py-qt3-base, and py-qt3-modules.
 
-PYQT_VERSION=		3.15.1
+PYQT_VERSION=		3.17.4
 CATEGORIES=		x11 python
-MASTER_SITES=		http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/
+MASTER_SITES=		http://www.riverbankcomputing.com/static/Downloads/PyQt3/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.riverbankcomputing.co.uk/pyqt/
+HOMEPAGE=		http://www.riverbankcomputing.com/software/pyqt/intro
 
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24 23
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk
index 91a118d8b28..5d2d04b0d3c 100644
--- a/x11/py-qt3-base/buildlink3.mk
+++ b/x11/py-qt3-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/26 17:56:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2008/10/08 14:23:24 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PYQT3_BASE_BUILDLINK3_MK:=	${PYQT3_BASE_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.pyqt3-base?=	../../x11/py-qt3-base
 BUILDLINK_LIBDIRS.pyqt3-base+=	${PYSITELIB}
 .endif	# PYQT3_BASE_BUILDLINK3_MK
 
-.include "../../x11/py-qt3-sip/buildlink3.mk"
+.include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
 
diff --git a/x11/py-qt3-base/distinfo b/x11/py-qt3-base/distinfo
index adb505cf7e3..8303cde722f 100644
--- a/x11/py-qt3-base/distinfo
+++ b/x11/py-qt3-base/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2006/03/23 00:28:21 minskim Exp $
+$NetBSD: distinfo,v 1.14 2008/10/08 14:23:24 wiz Exp $
 
-SHA1 (PyQt-mac-gpl-3.15.1.tar.gz) = 6e3afafd93b89e571da94401c4c16e0c09fe7431
-RMD160 (PyQt-mac-gpl-3.15.1.tar.gz) = 663907b22fb245dc0472d7462e278b9d5564aa80
-Size (PyQt-mac-gpl-3.15.1.tar.gz) = 783454 bytes
-SHA1 (PyQt-x11-gpl-3.15.1.tar.gz) = 28ee34300e73b60f5f9f1dbdbb0bd051497a19ac
-RMD160 (PyQt-x11-gpl-3.15.1.tar.gz) = 56492774a425d3ca4175f02dd45d396f4322ec13
-Size (PyQt-x11-gpl-3.15.1.tar.gz) = 790366 bytes
-SHA1 (patch-aa) = 425ff917b8dd3c345bf86e49ccf7f91c5688e77a
-SHA1 (patch-ab) = 46cf5b2eb3481a9f5a1264f11abc57421c4d47a0
-SHA1 (patch-ac) = c3cd88ef6119f224920c0b8e6852b35052e6751a
+SHA1 (PyQt-mac-gpl-3.17.4.tar.gz) = e5b1c7ca98a8366db46a9d5d4be7b43f14b2349e
+RMD160 (PyQt-mac-gpl-3.17.4.tar.gz) = f5f6e7be5475b91a71473a2352a2cba3a5b403dc
+Size (PyQt-mac-gpl-3.17.4.tar.gz) = 796354 bytes
+SHA1 (PyQt-x11-gpl-3.17.4.tar.gz) = caa0130606f28594a09b402675dc3bc239a0a658
+RMD160 (PyQt-x11-gpl-3.17.4.tar.gz) = 77b1ca96465ae737545fbdd1f63bd06bb089a74b
+Size (PyQt-x11-gpl-3.17.4.tar.gz) = 803925 bytes
+SHA1 (patch-aa) = e6ed02bf68c487ca356d16185766842f9203718e
+SHA1 (patch-ab) = 4f4476e7f6f81fa1eb458a5dcdbaed3d13330f91
+SHA1 (patch-ac) = 94cc4e24179d6557de35a8a019e37e5d35eca68d
diff --git a/x11/py-qt3-base/patches/patch-aa b/x11/py-qt3-base/patches/patch-aa
index f0a26b9b338..2c7d44db9cd 100644
--- a/x11/py-qt3-base/patches/patch-aa
+++ b/x11/py-qt3-base/patches/patch-aa
@@ -1,91 +1,96 @@
-$NetBSD: patch-aa,v 1.5 2005/11/22 18:52:45 drochner Exp $
+$NetBSD: patch-aa,v 1.6 2008/10/08 14:23:24 wiz Exp $
 
---- configure.py.orig	2005-11-14 18:31:26.000000000 +0100
+--- configure.py.orig	2007-12-06 15:28:06.000000000 +0100
 +++ configure.py
-@@ -736,7 +736,7 @@ def check_license():
-     print "Type 'no' to decline the terms of the license."
-     print
+@@ -197,23 +197,23 @@ class ConfigurePyQt3(ConfigureBase):
+     def check_modules(self):
+         pyqt_modules.append("qt")
+ 
+-        check_module("qtcanvas", "qcanvas.h", "QCanvas()")
+-        check_module("qtnetwork", "qsocket.h", "QSocket()")
+-        check_module("qttable", "qtable.h", "QTable()")
+-        check_module("qtxml", "qdom.h", "QDomImplementation()")
+-        check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
++        #check_module("qtcanvas", "qcanvas.h", "QCanvas()")
++        #check_module("qtnetwork", "qsocket.h", "QSocket()")
++        #check_module("qttable", "qtable.h", "QTable()")
++        #check_module("qtxml", "qdom.h", "QDomImplementation()")
++        #check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
++
++        #if qt_version >= 0x030000:
++        #    check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
  
--    while 1:
-+    while 0:
-         try:
-             resp = raw_input("Do you accept the terms of the license? ")
-         except:
-@@ -772,7 +772,7 @@ def create_makefiles():
+-        if qt_version >= 0x030000:
+-            check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
+-
+-            if qt_edition in ("enterprise", "free"):
+-                check_module("qtsql", "qsql.h", "QSql()")
++        #    if qt_edition in ("enterprise", "free"):
++        #        check_module("qtsql", "qsql.h", "QSql()")
  
-         sipconfig.inform("Creating pyuic Makefile...")
+-                if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
+-                    check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
++        #        if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
++        #            check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
  
--        if prof or "qtxml" not in pyqt_modules:
-+        if prof: #or "qtxml" not in pyqt_modules:
-             buildfile= "pyuic-prof.sbf"
+-        if qsci_version:
+-            check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
++        #if qsci_version:
++        #    check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
  
-             for xml in ("qdom.cpp", "qxml.cpp"):
-@@ -793,7 +793,7 @@ def create_makefiles():
-         makefile.extra_defines.append("UIC")
-         makefile.extra_defines.append("QT_INTERNAL_XML")
+         if opt_qtpetag:
+             pyqt_modules.append("qtpe")
+@@ -289,7 +289,7 @@ class ConfigurePyQt3(ConfigureBase):
  
--        if prof or "qtxml" not in pyqt_modules:
-+        if prof: #or "qtxml" not in pyqt_modules:
-             makefile.extra_defines.append("QT_MODULE_XML")
+             sipconfig.inform("Creating pyuic Makefile...")
  
-         if sipcfg.qt_version < 0x030100:
-@@ -804,7 +804,7 @@ def create_makefiles():
+-            if prof or "qtxml" not in pyqt_modules:
++            if prof: # or "qtxml" not in pyqt_modules:
+                 buildfile= "pyuic-prof.sbf"
  
-         sipconfig.inform("Creating pylupdate Makefile...")
+                 for xml in ("qdom.cpp", "qxml.cpp"):
+@@ -310,7 +310,7 @@ class ConfigurePyQt3(ConfigureBase):
+             makefile.extra_defines.append("UIC")
+             makefile.extra_defines.append("QT_INTERNAL_XML")
  
--        if prof or "qtxml" not in pyqt_modules:
-+        if prof: #or "qtxml" not in pyqt_modules:
-             buildfile= "pylupdate-prof.sbf"
+-            if prof or "qtxml" not in pyqt_modules:
++            if prof: # or "qtxml" not in pyqt_modules:
+                 makefile.extra_defines.append("QT_MODULE_XML")
  
-             shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
-@@ -823,7 +823,7 @@ def create_makefiles():
+             if qt_version < 0x030100:
+@@ -321,7 +321,7 @@ class ConfigurePyQt3(ConfigureBase):
  
-         makefile.extra_defines.append("QT_INTERNAL_XML")
+             sipconfig.inform("Creating pylupdate Makefile...")
  
--        if prof or "qtxml" not in pyqt_modules:
-+        if prof: #or "qtxml" not in pyqt_modules:
-             makefile.extra_defines.append("QT_MODULE_XML")
+-            if prof or "qtxml" not in pyqt_modules:
++            if prof: # or "qtxml" not in pyqt_modules:
+                 buildfile= "pylupdate-prof.sbf"
  
-         makefile.generate()
-@@ -942,26 +942,26 @@ def main(argv):
-             sipconfig.error("This version of PyQt requires SIP v%s or later" % sipconfig.version_to_string(minv))
+                 shutil.copyfile(qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
+@@ -340,7 +340,7 @@ class ConfigurePyQt3(ConfigureBase):
+ 
+             makefile.extra_defines.append("QT_INTERNAL_XML")
+ 
+-            if prof or "qtxml" not in pyqt_modules:
++            if prof: # or "qtxml" not in pyqt_modules:
+                 makefile.extra_defines.append("QT_MODULE_XML")
+ 
+             makefile.generate()
+@@ -1002,7 +1002,7 @@ def check_license():
+     print "Type 'no' to decline the terms of the license."
+     print
+ 
+-    while 1:
++    while 0:
+         try:
+             resp = raw_input("Do you accept the terms of the license? ")
+         except:
+@@ -1380,7 +1380,7 @@ def main(argv):
+     check_license()
  
      # Check for QScintilla.
 -    check_qscintilla()
-+#    check_qscintilla()
++    #check_qscintilla()
  
      # Check which modules to build.
--    check_module("qtcanvas", "qcanvas.h", "QCanvas()")
--    check_module("qtnetwork", "qsocket.h", "QSocket()")
--    check_module("qttable", "qtable.h", "QTable()")
--    check_module("qtxml", "qdom.h", "QDomImplementation()")
--    check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
-+#    check_module("qtcanvas", "qcanvas.h", "QCanvas()")
-+#    check_module("qtnetwork", "qsocket.h", "QSocket()")
-+#    check_module("qttable", "qtable.h", "QTable()")
-+#    check_module("qtxml", "qdom.h", "QDomImplementation()")
-+#    check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
-+
-+#    if sipcfg.qt_version >= 0x030000:
-+#        check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
- 
--    if sipcfg.qt_version >= 0x030000:
--        check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
--
--        if sipcfg.qt_edition in ("enterprise", "free"):
--            check_module("qtsql", "qsql.h", "QSql()")
-+#        if sipcfg.qt_edition in ("enterprise", "free"):
-+#            check_module("qtsql", "qsql.h", "QSql()")
- 
--            if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
--                check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
-+#            if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
-+#                check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
- 
--    if qsci_version:
--        check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
-+#    if qsci_version:
-+#        check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
- 
-     if opt_qtpetag:
-         pyqt_modules.append("qtpe")
+     qtmod_lib = pyqt.check_modules()
diff --git a/x11/py-qt3-base/patches/patch-ab b/x11/py-qt3-base/patches/patch-ab
index 97d1713c124..dd88daa3e0f 100644
--- a/x11/py-qt3-base/patches/patch-ab
+++ b/x11/py-qt3-base/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2004/05/09 17:06:07 recht Exp $
+$NetBSD: patch-ab,v 1.4 2008/10/08 14:23:24 wiz Exp $
 
---- pyuic3/pyuic.sbf.orig	2004-05-09 02:45:24.000000000 +0200
-+++ pyuic3/pyuic.sbf	2004-05-09 02:45:49.000000000 +0200
+--- pyuic3/pyuic.sbf.orig	2007-12-06 15:28:06.000000000 +0100
++++ pyuic3/pyuic.sbf
 @@ -19,6 +19,6 @@
  # PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
  # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/x11/py-qt3-base/patches/patch-ac b/x11/py-qt3-base/patches/patch-ac
index a0a67d70a97..cb0c72ae569 100644
--- a/x11/py-qt3-base/patches/patch-ac
+++ b/x11/py-qt3-base/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2004/05/09 17:06:07 recht Exp $
+$NetBSD: patch-ac,v 1.2 2008/10/08 14:23:24 wiz Exp $
 
---- pylupdate3/pylupdate.sbf.orig	2004-05-09 02:46:28.000000000 +0200
-+++ pylupdate3/pylupdate.sbf	2004-05-09 02:46:45.000000000 +0200
+--- pylupdate3/pylupdate.sbf.orig	2007-12-06 15:28:06.000000000 +0100
++++ pylupdate3/pylupdate.sbf
 @@ -19,6 +19,6 @@
  # PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
  # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index 93a25d1456c..a215c2dd442 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/06/12 02:14:57 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2008/10/08 14:23:24 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,7 +6,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../x11/py-qt3-base/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-qt3-modules-${PYQT_VERSION}
-PKGREVISION=		3
 
 COMMENT=		Various Python modules for Qt3
 
diff --git a/x11/py-qt3-modules/distinfo b/x11/py-qt3-modules/distinfo
index 772509b52d1..203f5a0c4a7 100644
--- a/x11/py-qt3-modules/distinfo
+++ b/x11/py-qt3-modules/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2006/03/03 16:33:51 reed Exp $
+$NetBSD: distinfo,v 1.13 2008/10/08 14:23:24 wiz Exp $
 
-SHA1 (PyQt-mac-gpl-3.15.1.tar.gz) = 6e3afafd93b89e571da94401c4c16e0c09fe7431
-RMD160 (PyQt-mac-gpl-3.15.1.tar.gz) = 663907b22fb245dc0472d7462e278b9d5564aa80
-Size (PyQt-mac-gpl-3.15.1.tar.gz) = 783454 bytes
-SHA1 (PyQt-x11-gpl-3.15.1.tar.gz) = 28ee34300e73b60f5f9f1dbdbb0bd051497a19ac
-RMD160 (PyQt-x11-gpl-3.15.1.tar.gz) = 56492774a425d3ca4175f02dd45d396f4322ec13
-Size (PyQt-x11-gpl-3.15.1.tar.gz) = 790366 bytes
-SHA1 (patch-aa) = e7d4fb83c8a374b99cd7f3076ef95647c88bb66b
+SHA1 (PyQt-mac-gpl-3.17.4.tar.gz) = e5b1c7ca98a8366db46a9d5d4be7b43f14b2349e
+RMD160 (PyQt-mac-gpl-3.17.4.tar.gz) = f5f6e7be5475b91a71473a2352a2cba3a5b403dc
+Size (PyQt-mac-gpl-3.17.4.tar.gz) = 796354 bytes
+SHA1 (PyQt-x11-gpl-3.17.4.tar.gz) = caa0130606f28594a09b402675dc3bc239a0a658
+RMD160 (PyQt-x11-gpl-3.17.4.tar.gz) = 77b1ca96465ae737545fbdd1f63bd06bb089a74b
+Size (PyQt-x11-gpl-3.17.4.tar.gz) = 803925 bytes
+SHA1 (patch-aa) = ae6f1d601d7d37ec5e30d96249fade6563aced9a
diff --git a/x11/py-qt3-modules/patches/patch-aa b/x11/py-qt3-modules/patches/patch-aa
index 75b5f81eb7a..d5db5df09a3 100644
--- a/x11/py-qt3-modules/patches/patch-aa
+++ b/x11/py-qt3-modules/patches/patch-aa
@@ -1,160 +1,106 @@
-$NetBSD: patch-aa,v 1.5 2005/11/22 18:52:45 drochner Exp $
+$NetBSD: patch-aa,v 1.6 2008/10/08 14:23:24 wiz Exp $
 
---- configure.py.orig	2005-11-14 18:31:26.000000000 +0100
+--- configure.py.orig	2007-12-06 14:28:06.000000000 +0000
 +++ configure.py
-@@ -38,7 +38,7 @@ pyqt_version_str = "3.15.1"
- sip_min_v3_version = 0x030c00
- sip_min_v4_version = 0x040300
+@@ -195,7 +195,7 @@ class ConfigurePyQt3(ConfigureBase):
+     """This class defines the methods to configure PyQt v3.
+     """
+     def check_modules(self):
+-        pyqt_modules.append("qt")
++        #pyqt_modules.append("qt")
  
--pyqt_modules = ["qt"]
-+pyqt_modules = []
- qt_sip_flags = []
- qtext_sip_flags = []
- qtpe_sip_flags = []
-@@ -736,7 +736,7 @@ def check_license():
-     print "Type 'no' to decline the terms of the license."
-     print
+         check_module("qtcanvas", "qcanvas.h", "QCanvas()")
+         check_module("qtnetwork", "qsocket.h", "QSocket()")
+@@ -212,8 +212,6 @@ class ConfigurePyQt3(ConfigureBase):
+                 if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
+                     check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
  
--    while 1:
-+    while 0:
-         try:
-             resp = raw_input("Do you accept the terms of the license? ")
-         except:
-@@ -770,64 +770,64 @@ def create_makefiles():
-         # The Professional Edition needs special handling.
-         prof = (sipcfg.qt_edition == "professional")
+-        if qsci_version:
+-            check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
  
--        sipconfig.inform("Creating pyuic Makefile...")
+         if opt_qtpetag:
+             pyqt_modules.append("qtpe")
+@@ -286,65 +284,6 @@ class ConfigurePyQt3(ConfigureBase):
+         if qt_version >= 0x030000:
+             # The Professional Edition needs special handling.
+             prof = (qt_edition == "professional")
 -
--        if prof or "qtxml" not in pyqt_modules:
--            buildfile= "pyuic-prof.sbf"
+-            sipconfig.inform("Creating pyuic Makefile...")
 -
--            for xml in ("qdom.cpp", "qxml.cpp"):
--                shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
--        else:
--            buildfile= "pyuic.sbf"
+-            if prof or "qtxml" not in pyqt_modules:
+-                buildfile= "pyuic-prof.sbf"
 -
--        makefile = sipconfig.ProgramMakefile(
--            configuration=sipcfg,
--            build_file=buildfile,
--            dir="pyuic3",
--            install_dir=opt_pyqtbindir,
--            console=1,
--            qt=1,
--            warnings=1
--        )
+-                for xml in ("qdom.cpp", "qxml.cpp"):
+-                    shutil.copyfile(qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
+-            else:
+-                buildfile= "pyuic.sbf"
 -
--        makefile.extra_defines.append("UIC")
--        makefile.extra_defines.append("QT_INTERNAL_XML")
+-            makefile = sipconfig.ProgramMakefile(
+-                configuration=sipcfg,
+-                build_file=buildfile,
+-                dir="pyuic3",
+-                install_dir=opt_pyqtbindir,
+-                console=1,
+-                qt=1,
+-                warnings=1
+-            )
 -
--        if prof or "qtxml" not in pyqt_modules:
--            makefile.extra_defines.append("QT_MODULE_XML")
-+#        sipconfig.inform("Creating pyuic Makefile...")
- 
--        if sipcfg.qt_version < 0x030100:
--            makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
-+#        if prof or "qtxml" not in pyqt_modules:
-+#            buildfile= "pyuic-prof.sbf"
- 
--        makefile.generate()
--        subdirs.append("pyuic3")
+-            makefile.extra_defines.append("UIC")
+-            makefile.extra_defines.append("QT_INTERNAL_XML")
 -
--        sipconfig.inform("Creating pylupdate Makefile...")
-+#            for xml in ("qdom.cpp", "qxml.cpp"):
-+#                shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
-+#        else:
-+#            buildfile= "pyuic.sbf"
-+
-+#        makefile = sipconfig.ProgramMakefile(
-+#            configuration=sipcfg,
-+#            build_file=buildfile,
-+#            dir="pyuic3",
-+#            install_dir=opt_pyqtbindir,
-+#            console=1,
-+#            qt=1,
-+#            warnings=1
-+#        )
-+
-+#        makefile.extra_defines.append("UIC")
-+#        makefile.extra_defines.append("QT_INTERNAL_XML")
-+
-+#        if prof or "qtxml" not in pyqt_modules:
-+#            makefile.extra_defines.append("QT_MODULE_XML")
-+
-+#        if sipcfg.qt_version < 0x030100:
-+#            makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
-+
-+#        makefile.generate()
-+#        subdirs.append("pyuic3")
-+
-+#        sipconfig.inform("Creating pylupdate Makefile...")
-+
-+#        if prof or "qtxml" not in pyqt_modules:
-+#            buildfile= "pylupdate-prof.sbf"
-+
-+#            shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
-+#        else:
-+#            buildfile= "pylupdate.sbf"
-+
-+#        makefile = sipconfig.ProgramMakefile(
-+#            configuration=sipcfg,
-+#            build_file=buildfile,
-+#            dir="pylupdate3",
-+#            install_dir=opt_pyqtbindir,
-+#            console=1,
-+#            qt=1,
-+#            warnings=1
-+#        )
- 
--        if prof or "qtxml" not in pyqt_modules:
--            buildfile= "pylupdate-prof.sbf"
-+#        makefile.extra_defines.append("QT_INTERNAL_XML")
- 
--            shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
--        else:
--            buildfile= "pylupdate.sbf"
-+#        if prof or "qtxml" not in pyqt_modules:
-+#            makefile.extra_defines.append("QT_MODULE_XML")
- 
--        makefile = sipconfig.ProgramMakefile(
--            configuration=sipcfg,
--            build_file=buildfile,
--            dir="pylupdate3",
--            install_dir=opt_pyqtbindir,
--            console=1,
--            qt=1,
--            warnings=1
--        )
+-            if prof or "qtxml" not in pyqt_modules:
+-                makefile.extra_defines.append("QT_MODULE_XML")
+-
+-            if qt_version < 0x030100:
+-                makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib")
+-
+-            makefile.generate()
+-            tool_dirs.append("pyuic3")
 -
--        makefile.extra_defines.append("QT_INTERNAL_XML")
+-            sipconfig.inform("Creating pylupdate Makefile...")
 -
--        if prof or "qtxml" not in pyqt_modules:
--            makefile.extra_defines.append("QT_MODULE_XML")
+-            if prof or "qtxml" not in pyqt_modules:
+-                buildfile= "pylupdate-prof.sbf"
 -
--        makefile.generate()
--        subdirs.append("pylupdate3")
-+#        makefile.generate()
-+#        subdirs.append("pylupdate3")
-     elif sipcfg.qt_version >= 0x020000:
-         sipconfig.inform("Creating pyuic Makefile...")
+-                shutil.copyfile(qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
+-            else:
+-                buildfile= "pylupdate.sbf"
+-
+-            makefile = sipconfig.ProgramMakefile(
+-                configuration=sipcfg,
+-                build_file=buildfile,
+-                dir="pylupdate3",
+-                install_dir=opt_pyqtbindir,
+-                console=1,
+-                qt=1,
+-                warnings=1
+-            )
+-
+-            makefile.extra_defines.append("QT_INTERNAL_XML")
+-
+-            if prof or "qtxml" not in pyqt_modules:
+-                makefile.extra_defines.append("QT_MODULE_XML")
+-
+-            makefile.generate()
+-            tool_dirs.append("pylupdate3")
+         elif qt_version >= 0x020000:
+             sipconfig.inform("Creating pyuic Makefile...")
+ 
+@@ -1002,7 +941,7 @@ def check_license():
+     print "Type 'no' to decline the terms of the license."
+     print
  
-@@ -942,7 +942,7 @@ def main(argv):
-             sipconfig.error("This version of PyQt requires SIP v%s or later" % sipconfig.version_to_string(minv))
+-    while 1:
++    while 0:
+         try:
+             resp = raw_input("Do you accept the terms of the license? ")
+         except:
+@@ -1380,7 +1319,7 @@ def main(argv):
+     check_license()
  
      # Check for QScintilla.
 -    check_qscintilla()
-+#    check_qscintilla()
++    #check_qscintilla()
  
      # Check which modules to build.
-     check_module("qtcanvas", "qcanvas.h", "QCanvas()")
-@@ -960,8 +960,8 @@ def main(argv):
-             if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
-                 check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
- 
--    if qsci_version:
--        check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
-+#    if qsci_version:
-+#        check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
- 
-     if opt_qtpetag:
-         pyqt_modules.append("qtpe")
+     qtmod_lib = pyqt.check_modules()
diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile
index 9f60b7c364f..ad2f2a54c03 100644
--- a/x11/py-qt3-qscintilla/Makefile
+++ b/x11/py-qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/06/12 02:14:57 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2008/10/08 14:23:24 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,14 +6,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../x11/py-qt3-base/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-qt3-qscintilla-${PYQT_VERSION}
-PKGREVISION=		3
 
 COMMENT=		Python binding for QScintilla
 
 CONFIGURE_ARGS+=	-n ${QTDIR}/include
 CONFIGURE_ARGS+=	-o ${QTDIR}/lib
 
-INSTALL_DIRS=	${WRKSRC}/qtext
+INSTALL_DIRS=	qtext
 
 .include "../../x11/py-qt3-base/buildlink3.mk"
 .include "../../x11/qt3-qscintilla/buildlink3.mk"
diff --git a/x11/py-qt3-qscintilla/distinfo b/x11/py-qt3-qscintilla/distinfo
index c7fde5503e0..ca4930b3333 100644
--- a/x11/py-qt3-qscintilla/distinfo
+++ b/x11/py-qt3-qscintilla/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2006/03/03 16:33:51 reed Exp $
+$NetBSD: distinfo,v 1.12 2008/10/08 14:23:24 wiz Exp $
 
-SHA1 (PyQt-mac-gpl-3.15.1.tar.gz) = 6e3afafd93b89e571da94401c4c16e0c09fe7431
-RMD160 (PyQt-mac-gpl-3.15.1.tar.gz) = 663907b22fb245dc0472d7462e278b9d5564aa80
-Size (PyQt-mac-gpl-3.15.1.tar.gz) = 783454 bytes
-SHA1 (PyQt-x11-gpl-3.15.1.tar.gz) = 28ee34300e73b60f5f9f1dbdbb0bd051497a19ac
-RMD160 (PyQt-x11-gpl-3.15.1.tar.gz) = 56492774a425d3ca4175f02dd45d396f4322ec13
-Size (PyQt-x11-gpl-3.15.1.tar.gz) = 790366 bytes
-SHA1 (patch-aa) = 390a4651ebc7545bb75f230addb892828a0203f8
+SHA1 (PyQt-mac-gpl-3.17.4.tar.gz) = e5b1c7ca98a8366db46a9d5d4be7b43f14b2349e
+RMD160 (PyQt-mac-gpl-3.17.4.tar.gz) = f5f6e7be5475b91a71473a2352a2cba3a5b403dc
+Size (PyQt-mac-gpl-3.17.4.tar.gz) = 796354 bytes
+SHA1 (PyQt-x11-gpl-3.17.4.tar.gz) = caa0130606f28594a09b402675dc3bc239a0a658
+RMD160 (PyQt-x11-gpl-3.17.4.tar.gz) = 77b1ca96465ae737545fbdd1f63bd06bb089a74b
+Size (PyQt-x11-gpl-3.17.4.tar.gz) = 803925 bytes
+SHA1 (patch-aa) = d4fa6f3eb1f48be0694795a9bd9cd86541e7dc88
diff --git a/x11/py-qt3-qscintilla/patches/patch-aa b/x11/py-qt3-qscintilla/patches/patch-aa
index 29f1a1d7b31..132bb6a6fdd 100644
--- a/x11/py-qt3-qscintilla/patches/patch-aa
+++ b/x11/py-qt3-qscintilla/patches/patch-aa
@@ -1,17 +1,96 @@
-$NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2008/10/08 14:23:24 wiz Exp $
 
---- configure.py.orig	2005-08-30 19:42:52.000000000 +0200
+--- configure.py.orig	2007-12-06 14:28:06.000000000 +0000
 +++ configure.py
-@@ -38,7 +38,7 @@ pyqt_version_str = "3.15"
- sip_min_v3_version = 0x030c00
- sip_min_v4_version = 0x040300
+@@ -195,22 +195,6 @@ class ConfigurePyQt3(ConfigureBase):
+     """This class defines the methods to configure PyQt v3.
+     """
+     def check_modules(self):
+-        pyqt_modules.append("qt")
+-
+-        check_module("qtcanvas", "qcanvas.h", "QCanvas()")
+-        check_module("qtnetwork", "qsocket.h", "QSocket()")
+-        check_module("qttable", "qtable.h", "QTable()")
+-        check_module("qtxml", "qdom.h", "QDomImplementation()")
+-        check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
+-
+-        if qt_version >= 0x030000:
+-            check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
+-
+-            if qt_edition in ("enterprise", "free"):
+-                check_module("qtsql", "qsql.h", "QSql()")
+-
+-                if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
+-                    check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
+ 
+         if qsci_version:
+             check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
+@@ -287,64 +271,6 @@ class ConfigurePyQt3(ConfigureBase):
+             # The Professional Edition needs special handling.
+             prof = (qt_edition == "professional")
+ 
+-            sipconfig.inform("Creating pyuic Makefile...")
+-
+-            if prof or "qtxml" not in pyqt_modules:
+-                buildfile= "pyuic-prof.sbf"
+-
+-                for xml in ("qdom.cpp", "qxml.cpp"):
+-                    shutil.copyfile(qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
+-            else:
+-                buildfile= "pyuic.sbf"
+-
+-            makefile = sipconfig.ProgramMakefile(
+-                configuration=sipcfg,
+-                build_file=buildfile,
+-                dir="pyuic3",
+-                install_dir=opt_pyqtbindir,
+-                console=1,
+-                qt=1,
+-                warnings=1
+-            )
+-
+-            makefile.extra_defines.append("UIC")
+-            makefile.extra_defines.append("QT_INTERNAL_XML")
+-
+-            if prof or "qtxml" not in pyqt_modules:
+-                makefile.extra_defines.append("QT_MODULE_XML")
+-
+-            if qt_version < 0x030100:
+-                makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib")
+-
+-            makefile.generate()
+-            tool_dirs.append("pyuic3")
+-
+-            sipconfig.inform("Creating pylupdate Makefile...")
+-
+-            if prof or "qtxml" not in pyqt_modules:
+-                buildfile= "pylupdate-prof.sbf"
+-
+-                shutil.copyfile(qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
+-            else:
+-                buildfile= "pylupdate.sbf"
+-
+-            makefile = sipconfig.ProgramMakefile(
+-                configuration=sipcfg,
+-                build_file=buildfile,
+-                dir="pylupdate3",
+-                install_dir=opt_pyqtbindir,
+-                console=1,
+-                qt=1,
+-                warnings=1
+-            )
+-
+-            makefile.extra_defines.append("QT_INTERNAL_XML")
+-
+-            if prof or "qtxml" not in pyqt_modules:
+-                makefile.extra_defines.append("QT_MODULE_XML")
+-
+-            makefile.generate()
+-            tool_dirs.append("pylupdate3")
+         elif qt_version >= 0x020000:
+             sipconfig.inform("Creating pyuic Makefile...")
  
--pyqt_modules = ["qt"]
-+pyqt_modules = []
- qt_sip_flags = []
- qtext_sip_flags = []
- qtpe_sip_flags = []
-@@ -733,7 +733,7 @@ def check_license():
+@@ -1002,7 +928,7 @@ def check_license():
      print "Type 'no' to decline the terms of the license."
      print
  
@@ -20,153 +99,3 @@ $NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
          try:
              resp = raw_input("Do you accept the terms of the license? ")
          except:
-@@ -767,64 +767,64 @@ def create_makefiles():
-         # The Professional Edition needs special handling.
-         prof = (sipcfg.qt_edition == "professional")
- 
--        sipconfig.inform("Creating pyuic Makefile...")
--
--        if prof or "qtxml" not in pyqt_modules:
--            buildfile= "pyuic-prof.sbf"
--
--            for xml in ("qdom.cpp", "qxml.cpp"):
--                shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
--        else:
--            buildfile= "pyuic.sbf"
--
--        makefile = sipconfig.ProgramMakefile(
--            configuration=sipcfg,
--            build_file=buildfile,
--            dir="pyuic3",
--            install_dir=opt_pyqtbindir,
--            console=1,
--            qt=1,
--            warnings=1
--        )
--
--        makefile.extra_defines.append("UIC")
--        makefile.extra_defines.append("QT_INTERNAL_XML")
--
--        if prof or "qtxml" not in pyqt_modules:
--            makefile.extra_defines.append("QT_MODULE_XML")
-+#        sipconfig.inform("Creating pyuic Makefile...")
- 
--        if sipcfg.qt_version < 0x030100:
--            makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
-+#        if prof or "qtxml" not in pyqt_modules:
-+#            buildfile= "pyuic-prof.sbf"
- 
--        makefile.generate()
--        subdirs.append("pyuic3")
--
--        sipconfig.inform("Creating pylupdate Makefile...")
-+#            for xml in ("qdom.cpp", "qxml.cpp"):
-+#                shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
-+#        else:
-+#            buildfile= "pyuic.sbf"
-+
-+#        makefile = sipconfig.ProgramMakefile(
-+#            configuration=sipcfg,
-+#            build_file=buildfile,
-+#            dir="pyuic3",
-+#            install_dir=opt_pyqtbindir,
-+#            console=1,
-+#            qt=1,
-+#            warnings=1
-+#        )
-+
-+#        makefile.extra_defines.append("UIC")
-+#        makefile.extra_defines.append("QT_INTERNAL_XML")
-+
-+#        if prof or "qtxml" not in pyqt_modules:
-+#            makefile.extra_defines.append("QT_MODULE_XML")
-+
-+#        if sipcfg.qt_version < 0x030100:
-+#            makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
-+
-+#        makefile.generate()
-+#        subdirs.append("pyuic3")
-+
-+#        sipconfig.inform("Creating pylupdate Makefile...")
-+
-+#        if prof or "qtxml" not in pyqt_modules:
-+#            buildfile= "pylupdate-prof.sbf"
-+
-+#            shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
-+#        else:
-+#            buildfile= "pylupdate.sbf"
-+
-+#        makefile = sipconfig.ProgramMakefile(
-+#            configuration=sipcfg,
-+#            build_file=buildfile,
-+#            dir="pylupdate3",
-+#            install_dir=opt_pyqtbindir,
-+#            console=1,
-+#            qt=1,
-+#            warnings=1
-+#        )
- 
--        if prof or "qtxml" not in pyqt_modules:
--            buildfile= "pylupdate-prof.sbf"
-+#        makefile.extra_defines.append("QT_INTERNAL_XML")
- 
--            shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
--        else:
--            buildfile= "pylupdate.sbf"
-+#        if prof or "qtxml" not in pyqt_modules:
-+#            makefile.extra_defines.append("QT_MODULE_XML")
- 
--        makefile = sipconfig.ProgramMakefile(
--            configuration=sipcfg,
--            build_file=buildfile,
--            dir="pylupdate3",
--            install_dir=opt_pyqtbindir,
--            console=1,
--            qt=1,
--            warnings=1
--        )
--
--        makefile.extra_defines.append("QT_INTERNAL_XML")
--
--        if prof or "qtxml" not in pyqt_modules:
--            makefile.extra_defines.append("QT_MODULE_XML")
--
--        makefile.generate()
--        subdirs.append("pylupdate3")
-+#        makefile.generate()
-+#        subdirs.append("pylupdate3")
-     elif sipcfg.qt_version >= 0x020000:
-         sipconfig.inform("Creating pyuic Makefile...")
- 
-@@ -940,20 +940,20 @@ def main(argv):
-     check_qscintilla()
- 
-     # Check which modules to build.
--    check_module("qtcanvas", "qcanvas.h", "QCanvas()")
--    check_module("qtnetwork", "qsocket.h", "QSocket()")
--    check_module("qttable", "qtable.h", "QTable()")
--    check_module("qtxml", "qdom.h", "QDomImplementation()")
--    check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
-+#    check_module("qtcanvas", "qcanvas.h", "QCanvas()")
-+#    check_module("qtnetwork", "qsocket.h", "QSocket()")
-+#    check_module("qttable", "qtable.h", "QTable()")
-+#    check_module("qtxml", "qdom.h", "QDomImplementation()")
-+#    check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
- 
--    if sipcfg.qt_version >= 0x030000:
--        check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
-+#    if sipcfg.qt_version >= 0x030000:
-+#        check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
- 
--        if sipcfg.qt_edition in ("enterprise", "free"):
--            check_module("qtsql", "qsql.h", "QSql()")
-+#        if sipcfg.qt_edition in ("enterprise", "free"):
-+#            check_module("qtsql", "qsql.h", "QSql()")
- 
--            if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
--                check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
-+#            if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
-+#                check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
- 
-     if qsci_version:
-         check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")