update py-qt3-{base,modules,qscintilla} to 3.11 and bl3ify

v3.11 11th March 2004
	Added the QIconDragEvent and QLocale classes from Qt v3.3.0.  Updated
	all existing classes to Qt v3.3.1.  Added the missing QSocketDevice
	class.  Added the missing QString += operators.

v3.10 16th January 2004
	Added the QFtp, QHttp, QHttpHeader, QHttpRequestHeader,
	QHttpResponseHeader, QLocalFs classes.

v3.9 7th December 2003
	This version requires SIP v3.9 (or later) or SIP v4.0rc1 (or later).
	QLayoutIterator.next() is now documented.  Added the QImageIO and
	QListViewItemIterator classes.  Added the QDockArea << and >>
	operators.  Added QSettings.readBoolEntry().  Added qInstallPath(),
	qInstallPathDocs(), qInstallPathHeaders(), qInstallPathLibs(),
	qInstallPathBins(), qInstallPathPlugins(), qInstallPathData(),
	qInstallPathTranslations(), qInstallPathSysconf().  A new
	(configure.py) build system has been added which is independent of
	tmake and qmake and installs a pyqtconfig module.  The old (build.py)
	build system remains.  Added the -r flag to the build systems to enable
	tracing.  Added the -v flag to the build systems to specify the default
	location for .sip files.

v3.8.1 6th September 2003
	Added the missing QWMatrix.mapRect() * operators.  The supported
	educational version is now Qt v3.2.0.

12 files changed, 262 insertions, 346 deletions

diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index 07578571823..2f5ed387b37 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/03/28 20:54:49 recht Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/09 17:06:07 recht Exp $
 #
 
-DISTNAME=		PyQt-x11-gpl-3.8
-PKGNAME=		${PYPKGPREFIX}-qt3-modules-3.8
+DISTNAME=		PyQt-x11-gpl-3.11
+PKGNAME=		${PYPKGPREFIX}-qt3-modules-3.11
 CATEGORIES=		x11
 MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
 
@@ -10,45 +10,28 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.riverbankcomputing.co.uk/pyqt/
 COMMENT=		Python binding for qt3
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
 USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
 
-CONFIGURE_ARGS=		-q ${QTDIR} -m ${GMAKE} -p ${SIPBIN}
+CONFIGURE_ARGS=		-b ${PREFIX}/bin
+CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}
+CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
 
-PYTHON_VERSIONS_ACCEPTED=	22pth 23pth 21pth
+PYTHON_VERSIONS_ACCEPTED=	23pth 22pth 21pth
 PY_PATCHPLIST=	yes
-QTLIBDIR=	${QTDIR:S/${BUILDLINK_PREFIX.qt3-libs}\///}/lib
-PLIST_SUBST+=	QTLIBDIR=${QTLIBDIR}
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
-MAKE_ENV+=	QTPREFIX=${QTDIR}
+INSTALL_DIRS=	${WRKSRC}/qtcanvas ${WRKSRC}/qtgl ${WRKSRC}/qtnetwork
+INSTALL_DIRS+=	${WRKSRC}/qtsql ${WRKSRC}/qttable ${WRKSRC}/qtui
+INSTALL_DIRS+=	${WRKSRC}/qtxml
 
 do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${PYTHONBIN} build.py ${CONFIGURE_ARGS})
-
-PYQTMODULES=	qtcanvas qtgl qtnetwork qtsql qttable qtui qtxml
-
-# XXX - hack. Shouldn't need the symlinks as qmake should let us build
-# proper libraries that install outside of QTDIR more easily.
-do-install:
-	(for f in ${PYQTMODULES}; do \
-		(cd ${WRKSRC}/$${f} && ( \
-			${INSTALL_DATA} $${f}.py ${PREFIX}/${PYSITELIB}; \
-			${LIBTOOL} --mode=install ${INSTALL_DATA} \
-				lib$${f}cmodule.la ${PREFIX}/${QTLIBDIR} \
-			) \
-		); \
-	 done)
-	(for f in ${PYQTMODULES}; do \
-		(cd ${PREFIX}/${QTLIBDIR}; for i in lib$${f}cmodule.*; do \
-			${LN} -sf ${PREFIX}/${QTLIBDIR}/$$i \
-				${PREFIX}/${PYSITELIB}/$$i; done \
-		); \
-	done)
+		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
 
 .include "../../lang/python/extension.mk"
-.include "../../x11/py-qt3-base/buildlink2.mk"
+.include "../../x11/py-qt3-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt3-modules/PLIST b/x11/py-qt3-modules/PLIST
index cb90b76a0ea..c1873a598f4 100644
--- a/x11/py-qt3-modules/PLIST
+++ b/x11/py-qt3-modules/PLIST
@@ -1,78 +1,63 @@
-@comment $NetBSD: PLIST,v 1.2 2003/08/19 04:35:04 jmc Exp $
-${PYSITELIB}/libqtcanvascmodule.a
-${PYSITELIB}/libqtcanvascmodule.la
-${PYSITELIB}/libqtcanvascmodule.so
-${PYSITELIB}/libqtcanvascmodule.so.1
-${PYSITELIB}/libqtcanvascmodule.so.1.0
-${PYSITELIB}/libqtglcmodule.a
-${PYSITELIB}/libqtglcmodule.la
-${PYSITELIB}/libqtglcmodule.so
-${PYSITELIB}/libqtglcmodule.so.1
-${PYSITELIB}/libqtglcmodule.so.1.0
-${PYSITELIB}/libqtnetworkcmodule.a
-${PYSITELIB}/libqtnetworkcmodule.la
-${PYSITELIB}/libqtnetworkcmodule.so
-${PYSITELIB}/libqtnetworkcmodule.so.1
-${PYSITELIB}/libqtnetworkcmodule.so.1.0
-${PYSITELIB}/libqtsqlcmodule.a
-${PYSITELIB}/libqtsqlcmodule.la
-${PYSITELIB}/libqtsqlcmodule.so
-${PYSITELIB}/libqtsqlcmodule.so.1
-${PYSITELIB}/libqtsqlcmodule.so.1.0
-${PYSITELIB}/libqttablecmodule.a
-${PYSITELIB}/libqttablecmodule.la
-${PYSITELIB}/libqttablecmodule.so
-${PYSITELIB}/libqttablecmodule.so.1
-${PYSITELIB}/libqttablecmodule.so.1.0
-${PYSITELIB}/libqtuicmodule.a
-${PYSITELIB}/libqtuicmodule.la
-${PYSITELIB}/libqtuicmodule.so
-${PYSITELIB}/libqtuicmodule.so.1
-${PYSITELIB}/libqtuicmodule.so.1.0
-${PYSITELIB}/libqtxmlcmodule.a
-${PYSITELIB}/libqtxmlcmodule.la
-${PYSITELIB}/libqtxmlcmodule.so
-${PYSITELIB}/libqtxmlcmodule.so.1
-${PYSITELIB}/libqtxmlcmodule.so.1.0
-${QTLIBDIR}/libqtcanvascmodule.a
-${QTLIBDIR}/libqtcanvascmodule.la
-${QTLIBDIR}/libqtcanvascmodule.so
-${QTLIBDIR}/libqtcanvascmodule.so.1
-${QTLIBDIR}/libqtcanvascmodule.so.1.0
-${QTLIBDIR}/libqtglcmodule.a
-${QTLIBDIR}/libqtglcmodule.la
-${QTLIBDIR}/libqtglcmodule.so
-${QTLIBDIR}/libqtglcmodule.so.1
-${QTLIBDIR}/libqtglcmodule.so.1.0
-${QTLIBDIR}/libqtnetworkcmodule.a
-${QTLIBDIR}/libqtnetworkcmodule.la
-${QTLIBDIR}/libqtnetworkcmodule.so
-${QTLIBDIR}/libqtnetworkcmodule.so.1
-${QTLIBDIR}/libqtnetworkcmodule.so.1.0
-${QTLIBDIR}/libqtsqlcmodule.a
-${QTLIBDIR}/libqtsqlcmodule.la
-${QTLIBDIR}/libqtsqlcmodule.so
-${QTLIBDIR}/libqtsqlcmodule.so.1
-${QTLIBDIR}/libqtsqlcmodule.so.1.0
-${QTLIBDIR}/libqttablecmodule.a
-${QTLIBDIR}/libqttablecmodule.la
-${QTLIBDIR}/libqttablecmodule.so
-${QTLIBDIR}/libqttablecmodule.so.1
-${QTLIBDIR}/libqttablecmodule.so.1.0
-${QTLIBDIR}/libqtuicmodule.a
-${QTLIBDIR}/libqtuicmodule.la
-${QTLIBDIR}/libqtuicmodule.so
-${QTLIBDIR}/libqtuicmodule.so.1
-${QTLIBDIR}/libqtuicmodule.so.1.0
-${QTLIBDIR}/libqtxmlcmodule.a
-${QTLIBDIR}/libqtxmlcmodule.la
-${QTLIBDIR}/libqtxmlcmodule.so
-${QTLIBDIR}/libqtxmlcmodule.so.1
-${QTLIBDIR}/libqtxmlcmodule.so.1.0
-${PYSITELIB}/qtcanvas.py
-${PYSITELIB}/qtgl.py
-${PYSITELIB}/qtnetwork.py
-${PYSITELIB}/qtsql.py
-${PYSITELIB}/qttable.py
-${PYSITELIB}/qtui.py
-${PYSITELIB}/qtxml.py
+@comment $NetBSD: PLIST,v 1.3 2004/05/09 17:06:07 recht Exp $
+${PYSITELIB}/qtcanvas.so
+${PYSITELIB}/qtgl.so
+${PYSITELIB}/qtnetwork.so
+${PYSITELIB}/qtsql.so
+${PYSITELIB}/qttable.so
+${PYSITELIB}/qtui.so
+${PYSITELIB}/qtxml.so
+share/sip${PYVERSSUFFIX}/qtcanvas/copying.sip
+share/sip${PYVERSSUFFIX}/qtcanvas/qcanvas.sip
+share/sip${PYVERSSUFFIX}/qtcanvas/qtcanvasmod.sip
+share/sip${PYVERSSUFFIX}/qtgl/copying.sip
+share/sip${PYVERSSUFFIX}/qtgl/qgl.sip
+share/sip${PYVERSSUFFIX}/qtgl/qglcolormap.sip
+share/sip${PYVERSSUFFIX}/qtgl/qtglmod.sip
+share/sip${PYVERSSUFFIX}/qtnetwork/copying.sip
+share/sip${PYVERSSUFFIX}/qtnetwork/qdns.sip
+share/sip${PYVERSSUFFIX}/qtnetwork/qftp.sip
+share/sip${PYVERSSUFFIX}/qtnetwork/qhostaddress.sip
+share/sip${PYVERSSUFFIX}/qtnetwork/qhttp.sip
+share/sip${PYVERSSUFFIX}/qtnetwork/qlocalfs.sip
+share/sip${PYVERSSUFFIX}/qtnetwork/qnetwork.sip
+share/sip${PYVERSSUFFIX}/qtnetwork/qserversocket.sip
+share/sip${PYVERSSUFFIX}/qtnetwork/qsocket.sip
+share/sip${PYVERSSUFFIX}/qtnetwork/qsocketdevice.sip
+share/sip${PYVERSSUFFIX}/qtnetwork/qtnetworkmod.sip
+share/sip${PYVERSSUFFIX}/qtsql/copying.sip
+share/sip${PYVERSSUFFIX}/qtsql/qdatabrowser.sip
+share/sip${PYVERSSUFFIX}/qtsql/qdatatable.sip
+share/sip${PYVERSSUFFIX}/qtsql/qdataview.sip
+share/sip${PYVERSSUFFIX}/qtsql/qeditorfactory.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsql.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqlcursor.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqldatabase.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqldriver.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqleditorfactory.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqlerror.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqlfield.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqlform.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqlindex.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqlpropertymap.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqlquery.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqlrecord.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqlresult.sip
+share/sip${PYVERSSUFFIX}/qtsql/qsqlselectcursor.sip
+share/sip${PYVERSSUFFIX}/qtsql/qtsqlmod.sip
+share/sip${PYVERSSUFFIX}/qttable/copying.sip
+share/sip${PYVERSSUFFIX}/qttable/qtable.sip
+share/sip${PYVERSSUFFIX}/qttable/qttablemod.sip
+share/sip${PYVERSSUFFIX}/qtui/copying.sip
+share/sip${PYVERSSUFFIX}/qtui/qtuimod.sip
+share/sip${PYVERSSUFFIX}/qtui/qwidgetfactory.sip
+share/sip${PYVERSSUFFIX}/qtxml/copying.sip
+share/sip${PYVERSSUFFIX}/qtxml/qdom.sip
+share/sip${PYVERSSUFFIX}/qtxml/qtxmlmod.sip
+@dirrm share/sip${PYVERSSUFFIX}/qtxml
+@dirrm share/sip${PYVERSSUFFIX}/qtui
+@dirrm share/sip${PYVERSSUFFIX}/qttable
+@dirrm share/sip${PYVERSSUFFIX}/qtsql
+@dirrm share/sip${PYVERSSUFFIX}/qtnetwork
+@dirrm share/sip${PYVERSSUFFIX}/qtgl
+@dirrm share/sip${PYVERSSUFFIX}/qtcanvas
+@comment in py-qt3-base: @dirrm share/sip${PYVERSSUFFIX}
diff --git a/x11/py-qt3-modules/buildlink2.mk b/x11/py-qt3-modules/buildlink2.mk
deleted file mode 100644
index 0842ea91e9b..00000000000
--- a/x11/py-qt3-modules/buildlink2.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:50 jlam Exp $
-
-.if !defined(PY_QT3_MODULES_BUILDLINK2_MK)
-PY_QT3_MODULES_BUILDLINK2_MK=	# defined
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_PACKAGES+=		pyqt3modules
-BUILDLINK_PKGBASE.pyqt3modules?=	${PYPKGPREFIX}-qt3-modules
-BUILDLINK_DEPENDS.pyqt3modules?=	${PYPKGPREFIX}-qt3-modules>=3.7nb1
-BUILDLINK_PKGSRCDIR.pyqt3modules?=	../../x11/py-qt3-modules
-
-.include "../../x11/py-qt3-base/buildlink2.mk"
-
-.endif	# PY_QT3_MODULES_BUILDLINK2_MK
diff --git a/x11/py-qt3-modules/distinfo b/x11/py-qt3-modules/distinfo
index d2a7d52008e..aae072763c6 100644
--- a/x11/py-qt3-modules/distinfo
+++ b/x11/py-qt3-modules/distinfo
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/08/25 17:57:54 drochner Exp $
+$NetBSD: distinfo,v 1.4 2004/05/09 17:06:07 recht Exp $
 
-SHA1 (PyQt-x11-gpl-3.8.tar.gz) = 626efd00304fb4a23c7af2a5248ced14c1421475
-Size (PyQt-x11-gpl-3.8.tar.gz) = 743487 bytes
-SHA1 (patch-aa) = 12591c485bc40951e0110e96de7ea3df1cf99827
-SHA1 (patch-ab) = df819b1cef8fa6d51ba054e2c2604aabea80040b
-SHA1 (patch-ac) = 910d407bf809b8575dd7ff6899e126296ce75beb
-SHA1 (patch-ad) = c24e3e0d3774637fd17337c7b736a81668101105
-SHA1 (patch-ae) = 263e7784ddd66a1d7cf473c06ae540ca31f6c30e
-SHA1 (patch-af) = 0e3f558578b239c339f99cd7aca7ab5cf1b3cbc2
-SHA1 (patch-ag) = cc42028d82369b93f0ea8c49ad7a17c2ba2c7de5
-SHA1 (patch-ah) = 45ba3d3b0cf9b284af3563041fd35f8161436ef9
+SHA1 (PyQt-x11-gpl-3.11.tar.gz) = 7b4949d97cdf989119681d34f8c30fede2d04e82
+Size (PyQt-x11-gpl-3.11.tar.gz) = 757652 bytes
+SHA1 (patch-aa) = cdf9fcfb3ef1c90a4864a6415edd58e42bbc6292
diff --git a/x11/py-qt3-modules/patches/patch-aa b/x11/py-qt3-modules/patches/patch-aa
index 1db256c5786..60c006e56df 100644
--- a/x11/py-qt3-modules/patches/patch-aa
+++ b/x11/py-qt3-modules/patches/patch-aa
@@ -1,42 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
 
---- build.py.orig	2003-07-05 12:52:49.000000000 +0200
-+++ build.py	2003-07-22 15:42:01.000000000 +0200
-@@ -50,7 +50,7 @@
- pyVersNr = None
- makefileGen = None
- makeBin = None
--buildModules = ["qt"]
-+buildModules = []
- proPatches = {}
- makefilePatches = {}
- tempBuildDir = None
-@@ -162,12 +162,13 @@
-     global pyFullVers, pyVersNr
+--- configure.py.orig	2004-03-11 20:23:30.000000000 +0100
++++ configure.py	2004-05-09 17:37:45.000000000 +0200
+@@ -38,7 +38,7 @@
+ sip_min_v3_version = 0x030a01
+ sip_min_v4_version = 0x040000
  
-     pyFullVers = string.split(sys.version)[0]
-+    pyFullVersn = string.replace(pyFullVers, 'p', '.');
- 
--    vl = string.split(re.findall("[0-9.]*",pyFullVers)[0],".")
-+    vl = string.split(re.findall("[0-9.]*",pyFullVersn)[0],".")
-     major = vl[0]
-     minor = vl[1]
- 
--    pyVers = major + "." + minor
-+    pyVers = sys.version[0:3]
-     pyVersNr = int(major) * 10 + int(minor)
- 
-     global platMake, platCopy, platMkdir, platRmdir
-@@ -592,7 +593,7 @@
-         incdirs = incdirs + " " + escape(qtIncDir)
- 
-     # Find the QScintilla header files.
--    if qtVersion >= 0x030000:
-+    if 0:
-         global sciIncDir
- 
-         if not sciIncDir:
-@@ -717,7 +718,7 @@
+-pyqt_modules = ["qt"]
++pyqt_modules = []
+ qt_sip_flags = []
+ qtext_sip_flags = []
+ qtpe_sip_flags = []
+@@ -663,7 +663,7 @@
      print "Type 'no' to decline the terms of the license."
      print
  
@@ -45,50 +20,178 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
          try:
              resp = raw_input("Do you accept the terms of the license? ")
          except:
-@@ -997,7 +998,7 @@
-         buildMakefile("qttest.pro")
+@@ -697,82 +697,82 @@
+         # The Professional Edition needs special handling.
+         prof = (sipcfg.qt_edition == "professional")
  
-         # Check the location of the QScintilla library.
--        if sciVersion >= 0:
-+        if 0:
-             global sciLibDir
+-        sipconfig.inform("Creating pyuic Makefile...")
++#        sipconfig.inform("Creating pyuic Makefile...")
  
-             if not sciLibDir:
-@@ -1551,23 +1552,23 @@
-         subdirs = subdirs + " qtpe"
+-        if prof:
+-            buildfile= "pyuic-prof.sbf"
++#        if prof:
++#            buildfile= "pyuic-prof.sbf"
  
-     # See which version of pyuic to build.
--    proPatches["BINDIR"] = [re.compile("@BL_BINDIR@",re.M), escape(platBinDir)]
-+#    proPatches["BINDIR"] = [re.compile("@BL_BINDIR@",re.M), escape(platBinDir)]
- 
--    if qtVersion >= 0x030000:
--        inform("Creating Makefile for pyuic3.")
--        subdirs = subdirs + " pyuic3"
--        olddir = pushDir("pyuic3")
--    elif qtVersion >= 0x020000:
--        inform("Creating Makefile for pyuic2.")
--        subdirs = subdirs + " pyuic2"
--        olddir = pushDir("pyuic2")
+-            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:
+-            makefile.extra_defines.append("QT_MODULE_XML")
+-
+-        if sipcfg.qt_version < 0x030100:
+-            makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
 -
--    buildMakefile("pyuic.pro")
--    fixInstallTarget()
--    popDir(olddir)
-+#    if qtVersion >= 0x030000:
-+#        inform("Creating Makefile for pyuic3.")
-+#        subdirs = subdirs + " pyuic3"
-+#        olddir = pushDir("pyuic3")
-+#    elif qtVersion >= 0x020000:
-+#        inform("Creating Makefile for pyuic2.")
-+#        subdirs = subdirs + " pyuic2"
-+#        olddir = pushDir("pyuic2")
+-        makefile.generate()
+-        subdirs.append("pyuic3")
++#            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:
++#            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:
++#            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
++#        )
 +
-+#    buildMakefile("pyuic.pro")
-+#    fixInstallTarget()
-+#    popDir(olddir)
++#        makefile.extra_defines.append("QT_INTERNAL_XML")
++
++#        if prof:
++#            makefile.extra_defines.append("QT_MODULE_XML")
++
++#        makefile.generate()
++#        subdirs.append("pylupdate3")
++#    elif sipcfg.qt_version >= 0x020000:
++#        sipconfig.inform("Creating pyuic Makefile...")
++
++#        makefile = sipconfig.ProgramMakefile(
++#            configuration=sipcfg,
++#            build_file="pyuic.sbf",
++#            dir="pyuic2",
++#            install_dir=opt_pyqtbindir,
++#            console=1,
++#            qt=1,
++#            warnings=1
++#        )
+ 
+-        sipconfig.inform("Creating pylupdate Makefile...")
++#        makefile.extra_defines.append("UIC")
++#        makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
+ 
+-        if prof:
+-            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
+-        )
+-
+-        makefile.extra_defines.append("QT_INTERNAL_XML")
+-
+-        if prof:
+-            makefile.extra_defines.append("QT_MODULE_XML")
+-
+-        makefile.generate()
+-        subdirs.append("pylupdate3")
+-    elif sipcfg.qt_version >= 0x020000:
+-        sipconfig.inform("Creating pyuic Makefile...")
+-
+-        makefile = sipconfig.ProgramMakefile(
+-            configuration=sipcfg,
+-            build_file="pyuic.sbf",
+-            dir="pyuic2",
+-            install_dir=opt_pyqtbindir,
+-            console=1,
+-            qt=1,
+-            warnings=1
+-        )
+-
+-        makefile.extra_defines.append("UIC")
+-        makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
+-
+-        makefile.generate()
+-        subdirs.append("pyuic2")
++#        makefile.generate()
++#        subdirs.append("pyuic2")
+ 
+     sipconfig.inform("Creating top level Makefile...")
+ 
+@@ -853,7 +853,7 @@
+             sipcfg.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv))
+ 
+     # Check for QScintilla.
+-    check_qscintilla()
++    #check_qscintilla()
+ 
+     # Check which modules to build.
+     check_module("qtcanvas", "qcanvas.h", "QCanvas()")
+@@ -866,8 +866,8 @@
+         check_module("qtsql", "qsql.h", "QSql()")
+         check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
+ 
+-    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")
  
-     # Build pylupdate if Qt v3.0 or later.
--    if qtVersion >= 0x030000:
-+    if 0:
-         inform("Creating Makefile for pylupdate3.")
-         subdirs = subdirs + " pylupdate3"
-         olddir = pushDir("pylupdate3")
+     if opt_qtpetag:
+         pyqt_modules.append("qtpe")
diff --git a/x11/py-qt3-modules/patches/patch-ab b/x11/py-qt3-modules/patches/patch-ab
deleted file mode 100644
index acee16a49cf..00000000000
--- a/x11/py-qt3-modules/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/08/23 15:02:28 drochner Exp $
-
---- sip/qtcanvasmod.sip.orig	2003-08-17 14:27:48.000000000 +0200
-+++ sip/qtcanvasmod.sip	2003-08-22 21:06:56.000000000 +0200
-@@ -57,12 +57,12 @@
- 
- TEMPLATE = lib
- TARGET = @BL_TARGET@
--DESTDIR = @BL_DESTDIR@
-+#DESTDIR = @BL_DESTDIR@
- CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
- INCLUDEPATH = @BL_INCLUDEPATH@
- DEFINES = @BL_DEFINES@
- 
--sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip
-+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
- sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
- 
- sip4:win32:LIBS += @BL_PYLIB@
diff --git a/x11/py-qt3-modules/patches/patch-ac b/x11/py-qt3-modules/patches/patch-ac
deleted file mode 100644
index fb846c74b08..00000000000
--- a/x11/py-qt3-modules/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/08/23 15:02:28 drochner Exp $
-
---- sip/qtglmod.sip.orig	2003-08-17 14:27:48.000000000 +0200
-+++ sip/qtglmod.sip	2003-08-22 19:59:53.000000000 +0200
-@@ -58,12 +58,12 @@
- 
- TEMPLATE = lib
- TARGET = @BL_TARGET@
--DESTDIR = @BL_DESTDIR@
-+#DESTDIR = @BL_DESTDIR@
- CONFIG += qt opengl warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
- INCLUDEPATH = @BL_INCLUDEPATH@
- DEFINES = @BL_DEFINES@
- 
--sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip
-+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
- sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
- 
- sip4:win32:LIBS += @BL_PYLIB@
diff --git a/x11/py-qt3-modules/patches/patch-ad b/x11/py-qt3-modules/patches/patch-ad
deleted file mode 100644
index 30a6f8e8837..00000000000
--- a/x11/py-qt3-modules/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/08/23 15:02:28 drochner Exp $
-
---- sip/qtnetworkmod.sip.orig	2003-08-17 14:27:48.000000000 +0200
-+++ sip/qtnetworkmod.sip	2003-08-22 20:00:49.000000000 +0200
-@@ -61,12 +61,12 @@
- 
- TEMPLATE = lib
- TARGET = @BL_TARGET@
--DESTDIR = @BL_DESTDIR@
-+#DESTDIR = @BL_DESTDIR@
- CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
- INCLUDEPATH = @BL_INCLUDEPATH@
- DEFINES = @BL_DEFINES@
- 
--sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip
-+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
- sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
- 
- sip4:win32:LIBS += @BL_PYLIB@
diff --git a/x11/py-qt3-modules/patches/patch-ae b/x11/py-qt3-modules/patches/patch-ae
deleted file mode 100644
index b7963106cb6..00000000000
--- a/x11/py-qt3-modules/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/08/25 17:57:54 drochner Exp $
-
---- sip/qtsqlmod.sip.orig	2003-08-17 14:27:48.000000000 +0200
-+++ sip/qtsqlmod.sip	2003-08-22 20:01:46.000000000 +0200
-@@ -75,12 +75,12 @@
- 
- TEMPLATE = lib
- TARGET = @BL_TARGET@
--DESTDIR = @BL_DESTDIR@
-+#DESTDIR = @BL_DESTDIR@
- CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
- INCLUDEPATH = @BL_INCLUDEPATH@
- DEFINES = @BL_DEFINES@
- 
--sip3:unix:LIBS += -L@BL_DESTDIR@ -lqttablecmodule -lqtcmodule -L@BL_SIPMODDIR@ -lsip
-+sip3:unix:LIBS += -L@BL_DESTDIR@ ../qttable/libqttablecmodule.la -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
- sip3:win32:LIBS += @BL_DESTDIR@\libqttablec.lib @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
- 
- sip4:win32:LIBS += @BL_PYLIB@
diff --git a/x11/py-qt3-modules/patches/patch-af b/x11/py-qt3-modules/patches/patch-af
deleted file mode 100644
index 14b41a3480a..00000000000
--- a/x11/py-qt3-modules/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/08/23 15:02:29 drochner Exp $
-
---- sip/qttablemod.sip.orig	2003-08-17 14:27:48.000000000 +0200
-+++ sip/qttablemod.sip	2003-08-22 20:02:34.000000000 +0200
-@@ -57,12 +57,12 @@
- 
- TEMPLATE = lib
- TARGET = @BL_TARGET@
--DESTDIR = @BL_DESTDIR@
-+#DESTDIR = @BL_DESTDIR@
- CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
- INCLUDEPATH = @BL_INCLUDEPATH@
- DEFINES = @BL_DEFINES@
- 
--sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip
-+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
- sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
- 
- sip4:win32:LIBS += @BL_PYLIB@
diff --git a/x11/py-qt3-modules/patches/patch-ag b/x11/py-qt3-modules/patches/patch-ag
deleted file mode 100644
index 03eebe3f372..00000000000
--- a/x11/py-qt3-modules/patches/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2003/08/23 15:02:29 drochner Exp $
-
---- sip/qtuimod.sip.orig	2003-08-17 14:27:48.000000000 +0200
-+++ sip/qtuimod.sip	2003-08-22 20:03:35.000000000 +0200
-@@ -58,12 +58,12 @@
- 
- TEMPLATE = lib
- TARGET = @BL_TARGET@
--DESTDIR = @BL_DESTDIR@
-+#DESTDIR = @BL_DESTDIR@
- CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
- INCLUDEPATH = @BL_INCLUDEPATH@
- DEFINES = @BL_DEFINES@
- 
--sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip -lqui
-+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip -lqui
- sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@ $$(QTDIR)\lib\qui.lib
- 
- sip4:unix:LIBS += -lqui
diff --git a/x11/py-qt3-modules/patches/patch-ah b/x11/py-qt3-modules/patches/patch-ah
deleted file mode 100644
index b05869a3d4c..00000000000
--- a/x11/py-qt3-modules/patches/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2003/08/23 15:02:29 drochner Exp $
-
---- sip/qtxmlmod.sip.orig	2003-08-17 14:27:48.000000000 +0200
-+++ sip/qtxmlmod.sip	2003-08-22 21:02:49.000000000 +0200
-@@ -67,12 +67,12 @@
- 
- TEMPLATE = lib
- TARGET = @BL_TARGET@
--DESTDIR = @BL_DESTDIR@
-+#DESTDIR = @BL_DESTDIR@
- CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
- INCLUDEPATH = @BL_INCLUDEPATH@
- DEFINES = @BL_DEFINES@
- 
--sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip
-+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
- sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
- 
- sip4:win32:LIBS += @BL_PYLIB@