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.

8 files changed, 294 insertions, 127 deletions

diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index 3233ce3984d..8051f9ed2b7 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/09 17:06:07 recht Exp $
 #
 
-DISTNAME=		PyQt-x11-gpl-3.8
-PKGNAME=		${PYPKGPREFIX}-qt3-base-3.8
+DISTNAME=		PyQt-x11-gpl-3.11
+PKGNAME=		${PYPKGPREFIX}-qt3-base-3.11
 CATEGORIES=		x11
 MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
 
@@ -10,41 +10,32 @@ 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++
 BUILDLINK_DEPENDS.qt3-tools=	qt3-tools>=3.1.2nb2
 
-CONFIGURE_ARGS=		-q ${QTDIR} -m ${GMAKE} -p ${SIPBIN} -b ""
+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+=	PYVERSSUFFIX=${PYVERSSUFFIX} QTLIBDIR=${QTLIBDIR}
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
-MAKE_ENV+=	QTPREFIX=${QTDIR}
+SUBST_CLASSES+=		pyversfx
+SUBST_STAGE.pyversfx=	pre-configure
+SUBST_FILES.pyversfx=	pyuic3/pyuic.sbf pylupdate3/pylupdate.sbf
+SUBST_SED.pyversfx=	-e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
 
 do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${PYTHONBIN} build.py ${CONFIGURE_ARGS})
-
-# XXX - hack. Shouldn't need the symlinks as qmake should let us build
-# proper libraries that install outside of QTDIR more easily.
-do-install:
-	(cd ${WRKSRC}/qt && ${INSTALL_DATA} qt.py ${PREFIX}/${PYSITELIB})
-	(cd ${WRKSRC}/qt && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
-		libqtcmodule.la ${PREFIX}/${PYSITELIB})
-	(cd ${PREFIX}/${PYSITELIB}; for i in libqtcmodule.*; do \
-		${LN} -sf ${PREFIX}/${PYSITELIB}/$$i \
-			${PREFIX}/${QTLIBDIR}/$$i; done)
-	(cd ${WRKSRC}/pylupdate3 && ${INSTALL_PROGRAM} pylupdate \
-		${PREFIX}/bin/pylupdate${PYVERSSUFFIX})
-	(cd ${WRKSRC}/pyuic3 && ${INSTALL_PROGRAM} pyuic \
-		${PREFIX}/bin/pyuic${PYVERSSUFFIX})
+		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
 
 .include "../../lang/python/extension.mk"
-.include "../../x11/py-qt3-sip/buildlink2.mk"
-.include "../../x11/qt3-libs/buildlink2.mk"
-.include "../../x11/qt3-tools/buildlink2.mk"
+.include "../../x11/py-qt3-sip/buildlink3.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt3-base/PLIST b/x11/py-qt3-base/PLIST
index 0b645003e5a..515b26cf42b 100644
--- a/x11/py-qt3-base/PLIST
+++ b/x11/py-qt3-base/PLIST
@@ -1,14 +1,186 @@
-@comment $NetBSD: PLIST,v 1.2 2003/08/19 04:35:03 jmc Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/09 17:06:07 recht Exp $
 bin/pylupdate${PYVERSSUFFIX}
 bin/pyuic${PYVERSSUFFIX}
-${PYSITELIB}/libqtcmodule.a
-${PYSITELIB}/libqtcmodule.la
-${PYSITELIB}/libqtcmodule.so
-${PYSITELIB}/libqtcmodule.so.1
-${PYSITELIB}/libqtcmodule.so.1.0
-${PYSITELIB}/qt.py
-${QTLIBDIR}/libqtcmodule.a
-${QTLIBDIR}/libqtcmodule.la
-${QTLIBDIR}/libqtcmodule.so
-${QTLIBDIR}/libqtcmodule.so.1
-${QTLIBDIR}/libqtcmodule.so.1.0
+${PYSITELIB}/pyqtconfig.py
+${PYSITELIB}/qt.so
+share/sip${PYVERSSUFFIX}/qt/copying.sip
+share/sip${PYVERSSUFFIX}/qt/qaccel.sip
+share/sip${PYVERSSUFFIX}/qt/qaction.sip
+share/sip${PYVERSSUFFIX}/qt/qapplication.sip
+share/sip${PYVERSSUFFIX}/qt/qarray.sip
+share/sip${PYVERSSUFFIX}/qt/qassistantclient.sip
+share/sip${PYVERSSUFFIX}/qt/qbitmap.sip
+share/sip${PYVERSSUFFIX}/qt/qbrush.sip
+share/sip${PYVERSSUFFIX}/qt/qbutton.sip
+share/sip${PYVERSSUFFIX}/qt/qbuttongroup.sip
+share/sip${PYVERSSUFFIX}/qt/qbytearray.sip
+share/sip${PYVERSSUFFIX}/qt/qcdestyle.sip
+share/sip${PYVERSSUFFIX}/qt/qcheckbox.sip
+share/sip${PYVERSSUFFIX}/qt/qclipboard.sip
+share/sip${PYVERSSUFFIX}/qt/qcolor.sip
+share/sip${PYVERSSUFFIX}/qt/qcolordialog.sip
+share/sip${PYVERSSUFFIX}/qt/qcolorgroup.sip
+share/sip${PYVERSSUFFIX}/qt/qcombobox.sip
+share/sip${PYVERSSUFFIX}/qt/qcommonstyle.sip
+share/sip${PYVERSSUFFIX}/qt/qcstring.sip
+share/sip${PYVERSSUFFIX}/qt/qcursor.sip
+share/sip${PYVERSSUFFIX}/qt/qdatastream.sip
+share/sip${PYVERSSUFFIX}/qt/qdatetime.sip
+share/sip${PYVERSSUFFIX}/qt/qdatetimeedit.sip
+share/sip${PYVERSSUFFIX}/qt/qdesktopwidget.sip
+share/sip${PYVERSSUFFIX}/qt/qdial.sip
+share/sip${PYVERSSUFFIX}/qt/qdialog.sip
+share/sip${PYVERSSUFFIX}/qt/qdir.sip
+share/sip${PYVERSSUFFIX}/qt/qdockarea.sip
+share/sip${PYVERSSUFFIX}/qt/qdockwindow.sip
+share/sip${PYVERSSUFFIX}/qt/qdragobject.sip
+share/sip${PYVERSSUFFIX}/qt/qdrawutil.sip
+share/sip${PYVERSSUFFIX}/qt/qdropsite.sip
+share/sip${PYVERSSUFFIX}/qt/qerrormessage.sip
+share/sip${PYVERSSUFFIX}/qt/qevent.sip
+share/sip${PYVERSSUFFIX}/qt/qeventloop.sip
+share/sip${PYVERSSUFFIX}/qt/qfile.sip
+share/sip${PYVERSSUFFIX}/qt/qfiledialog.sip
+share/sip${PYVERSSUFFIX}/qt/qfileinfo.sip
+share/sip${PYVERSSUFFIX}/qt/qfont.sip
+share/sip${PYVERSSUFFIX}/qt/qfontdatabase.sip
+share/sip${PYVERSSUFFIX}/qt/qfontdialog.sip
+share/sip${PYVERSSUFFIX}/qt/qfontinfo.sip
+share/sip${PYVERSSUFFIX}/qt/qfontmetrics.sip
+share/sip${PYVERSSUFFIX}/qt/qframe.sip
+share/sip${PYVERSSUFFIX}/qt/qglobal.sip
+share/sip${PYVERSSUFFIX}/qt/qgmanager.sip
+share/sip${PYVERSSUFFIX}/qt/qgrid.sip
+share/sip${PYVERSSUFFIX}/qt/qgridview.sip
+share/sip${PYVERSSUFFIX}/qt/qgroupbox.sip
+share/sip${PYVERSSUFFIX}/qt/qhbox.sip
+share/sip${PYVERSSUFFIX}/qt/qhbuttongroup.sip
+share/sip${PYVERSSUFFIX}/qt/qheader.sip
+share/sip${PYVERSSUFFIX}/qt/qhgroupbox.sip
+share/sip${PYVERSSUFFIX}/qt/qiconset.sip
+share/sip${PYVERSSUFFIX}/qt/qiconview.sip
+share/sip${PYVERSSUFFIX}/qt/qimage.sip
+share/sip${PYVERSSUFFIX}/qt/qinputdialog.sip
+share/sip${PYVERSSUFFIX}/qt/qinterlacestyle.sip
+share/sip${PYVERSSUFFIX}/qt/qiodevice.sip
+share/sip${PYVERSSUFFIX}/qt/qkeycode.sip
+share/sip${PYVERSSUFFIX}/qt/qkeysequence.sip
+share/sip${PYVERSSUFFIX}/qt/qlabel.sip
+share/sip${PYVERSSUFFIX}/qt/qlayout.sip
+share/sip${PYVERSSUFFIX}/qt/qlcdnumber.sip
+share/sip${PYVERSSUFFIX}/qt/qlibrary.sip
+share/sip${PYVERSSUFFIX}/qt/qlineedit.sip
+share/sip${PYVERSSUFFIX}/qt/qlist.sip
+share/sip${PYVERSSUFFIX}/qt/qlistbox.sip
+share/sip${PYVERSSUFFIX}/qt/qlistview.sip
+share/sip${PYVERSSUFFIX}/qt/qlocale.sip
+share/sip${PYVERSSUFFIX}/qt/qmainwindow.sip
+share/sip${PYVERSSUFFIX}/qt/qmemarray.sip
+share/sip${PYVERSSUFFIX}/qt/qmenubar.sip
+share/sip${PYVERSSUFFIX}/qt/qmenudata.sip
+share/sip${PYVERSSUFFIX}/qt/qmessagebox.sip
+share/sip${PYVERSSUFFIX}/qt/qmime.sip
+share/sip${PYVERSSUFFIX}/qt/qmotifplusstyle.sip
+share/sip${PYVERSSUFFIX}/qt/qmotifstyle.sip
+share/sip${PYVERSSUFFIX}/qt/qmovie.sip
+share/sip${PYVERSSUFFIX}/qt/qmultilinedit.sip
+share/sip${PYVERSSUFFIX}/qt/qmutex.sip
+share/sip${PYVERSSUFFIX}/qt/qnamespace.sip
+share/sip${PYVERSSUFFIX}/qt/qnetworkprotocol.sip
+share/sip${PYVERSSUFFIX}/qt/qobject.sip
+share/sip${PYVERSSUFFIX}/qt/qobjectcleanuphandler.sip
+share/sip${PYVERSSUFFIX}/qt/qobjectlist.sip
+share/sip${PYVERSSUFFIX}/qt/qpaintdevice.sip
+share/sip${PYVERSSUFFIX}/qt/qpaintdevicemetrics.sip
+share/sip${PYVERSSUFFIX}/qt/qpainter.sip
+share/sip${PYVERSSUFFIX}/qt/qpair.sip
+share/sip${PYVERSSUFFIX}/qt/qpalette.sip
+share/sip${PYVERSSUFFIX}/qt/qpen.sip
+share/sip${PYVERSSUFFIX}/qt/qpicture.sip
+share/sip${PYVERSSUFFIX}/qt/qpixmap.sip
+share/sip${PYVERSSUFFIX}/qt/qpixmapcache.sip
+share/sip${PYVERSSUFFIX}/qt/qplatinumstyle.sip
+share/sip${PYVERSSUFFIX}/qt/qpoint.sip
+share/sip${PYVERSSUFFIX}/qt/qpointarray.sip
+share/sip${PYVERSSUFFIX}/qt/qpopupmenu.sip
+share/sip${PYVERSSUFFIX}/qt/qprintdialog.sip
+share/sip${PYVERSSUFFIX}/qt/qprinter.sip
+share/sip${PYVERSSUFFIX}/qt/qprocess.sip
+share/sip${PYVERSSUFFIX}/qt/qprogressbar.sip
+share/sip${PYVERSSUFFIX}/qt/qprogressdialog.sip
+share/sip${PYVERSSUFFIX}/qt/qptrlist.sip
+share/sip${PYVERSSUFFIX}/qt/qpushbutton.sip
+share/sip${PYVERSSUFFIX}/qt/qradiobutton.sip
+share/sip${PYVERSSUFFIX}/qt/qrangecontrol.sip
+share/sip${PYVERSSUFFIX}/qt/qrect.sip
+share/sip${PYVERSSUFFIX}/qt/qregexp.sip
+share/sip${PYVERSSUFFIX}/qt/qregion.sip
+share/sip${PYVERSSUFFIX}/qt/qscrollbar.sip
+share/sip${PYVERSSUFFIX}/qt/qscrollview.sip
+share/sip${PYVERSSUFFIX}/qt/qsemaphore.sip
+share/sip${PYVERSSUFFIX}/qt/qsemimodal.sip
+share/sip${PYVERSSUFFIX}/qt/qsessionmanager.sip
+share/sip${PYVERSSUFFIX}/qt/qsettings.sip
+share/sip${PYVERSSUFFIX}/qt/qsgistyle.sip
+share/sip${PYVERSSUFFIX}/qt/qsignalmapper.sip
+share/sip${PYVERSSUFFIX}/qt/qsimplerichtext.sip
+share/sip${PYVERSSUFFIX}/qt/qsize.sip
+share/sip${PYVERSSUFFIX}/qt/qsizegrip.sip
+share/sip${PYVERSSUFFIX}/qt/qsizepolicy.sip
+share/sip${PYVERSSUFFIX}/qt/qslider.sip
+share/sip${PYVERSSUFFIX}/qt/qsocketnotifier.sip
+share/sip${PYVERSSUFFIX}/qt/qsound.sip
+share/sip${PYVERSSUFFIX}/qt/qspinbox.sip
+share/sip${PYVERSSUFFIX}/qt/qsplashscreen.sip
+share/sip${PYVERSSUFFIX}/qt/qsplitter.sip
+share/sip${PYVERSSUFFIX}/qt/qstatusbar.sip
+share/sip${PYVERSSUFFIX}/qt/qstring.sip
+share/sip${PYVERSSUFFIX}/qt/qstringlist.sip
+share/sip${PYVERSSUFFIX}/qt/qstrlist.sip
+share/sip${PYVERSSUFFIX}/qt/qstyle.sip
+share/sip${PYVERSSUFFIX}/qt/qstylefactory.sip
+share/sip${PYVERSSUFFIX}/qt/qstylesheet.sip
+share/sip${PYVERSSUFFIX}/qt/qsyntaxhighlighter.sip
+share/sip${PYVERSSUFFIX}/qt/qtabbar.sip
+share/sip${PYVERSSUFFIX}/qt/qtabdialog.sip
+share/sip${PYVERSSUFFIX}/qt/qtableview.sip
+share/sip${PYVERSSUFFIX}/qt/qtabwidget.sip
+share/sip${PYVERSSUFFIX}/qt/qtextbrowser.sip
+share/sip${PYVERSSUFFIX}/qt/qtextcodec.sip
+share/sip${PYVERSSUFFIX}/qt/qtextedit.sip
+share/sip${PYVERSSUFFIX}/qt/qtextstream.sip
+share/sip${PYVERSSUFFIX}/qt/qtextview.sip
+share/sip${PYVERSSUFFIX}/qt/qthread.sip
+share/sip${PYVERSSUFFIX}/qt/qtimer.sip
+share/sip${PYVERSSUFFIX}/qt/qtmod.sip
+share/sip${PYVERSSUFFIX}/qt/qtoolbar.sip
+share/sip${PYVERSSUFFIX}/qt/qtoolbox.sip
+share/sip${PYVERSSUFFIX}/qt/qtoolbutton.sip
+share/sip${PYVERSSUFFIX}/qt/qtooltip.sip
+share/sip${PYVERSSUFFIX}/qt/qtranslator.sip
+share/sip${PYVERSSUFFIX}/qt/qurl.sip
+share/sip${PYVERSSUFFIX}/qt/qurlinfo.sip
+share/sip${PYVERSSUFFIX}/qt/qurloperator.sip
+share/sip${PYVERSSUFFIX}/qt/qvalidator.sip
+share/sip${PYVERSSUFFIX}/qt/qvaluelist.sip
+share/sip${PYVERSSUFFIX}/qt/qvariant.sip
+share/sip${PYVERSSUFFIX}/qt/qvbox.sip
+share/sip${PYVERSSUFFIX}/qt/qvbuttongroup.sip
+share/sip${PYVERSSUFFIX}/qt/qvgroupbox.sip
+share/sip${PYVERSSUFFIX}/qt/qwaitcondition.sip
+share/sip${PYVERSSUFFIX}/qt/qwhatsthis.sip
+share/sip${PYVERSSUFFIX}/qt/qwidget.sip
+share/sip${PYVERSSUFFIX}/qt/qwidgetlist.sip
+share/sip${PYVERSSUFFIX}/qt/qwidgetstack.sip
+share/sip${PYVERSSUFFIX}/qt/qwindow.sip
+share/sip${PYVERSSUFFIX}/qt/qwindowdefs.sip
+share/sip${PYVERSSUFFIX}/qt/qwindowdefs_qws.sip
+share/sip${PYVERSSUFFIX}/qt/qwindowdefs_x11.sip
+share/sip${PYVERSSUFFIX}/qt/qwindowsstyle.sip
+share/sip${PYVERSSUFFIX}/qt/qwindowsxpstyle.sip
+share/sip${PYVERSSUFFIX}/qt/qwizard.sip
+share/sip${PYVERSSUFFIX}/qt/qwmatrix.sip
+share/sip${PYVERSSUFFIX}/qt/qworkspace.sip
+share/sip${PYVERSSUFFIX}/qt/versions.sip
+@dirrm share/sip${PYVERSSUFFIX}/qt
+@dirrm share/sip${PYVERSSUFFIX}
diff --git a/x11/py-qt3-base/buildlink2.mk b/x11/py-qt3-base/buildlink2.mk
deleted file mode 100644
index c8a940c2134..00000000000
--- a/x11/py-qt3-base/buildlink2.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:50 jlam Exp $
-
-.if !defined(PY_QT3_BASE_BUILDLINK2_MK)
-PY_QT3_BASE_BUILDLINK2_MK=	# defined
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_PACKAGES+=		pyqt3base
-BUILDLINK_PKGBASE.pyqt3base?=	${PYPKGPREFIX}-qt3-base
-BUILDLINK_DEPENDS.pyqt3base?=	${PYPKGPREFIX}-qt3-base>=3.7nb1
-BUILDLINK_PKGSRCDIR.pyqt3base?=	../../x11/py-qt3-base
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.pyqt3base=pyqt3base
-BUILDLINK_PREFIX.pyqt3base_DEFAULT=	${LOCALBASE}
-
-# LDFLAGS for this are inherited from py-qt3-sip
-BUILDLINK_FILES.pyqt3base+=	${PYSITELIB}/libqtcmodule.*
-
-BUILDLINK_TARGETS+=	pyqt3base-buildlink
-
-pyqt3base-buildlink: _BUILDLINK_USE
-
-.include "../../x11/py-qt3-sip/buildlink2.mk"
-.include "../../x11/qt3-libs/buildlink2.mk"
-BUILDLINK_DEPENDS.qt3-tools=	qt3-tools>=3.1.2nb2
-.include "../../x11/qt3-tools/buildlink2.mk"
-
-.endif	# PY_QT3_BASE_BUILDLINK2_MK
diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk
new file mode 100644
index 00000000000..94dd60d248a
--- /dev/null
+++ b/x11/py-qt3-base/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/09 17:06:07 recht Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+PYQT3_BASE_BUILDLINK3_MK:=	${PYQT3_BASE_BUILDLINK3_MK}+
+
+.include "../../lang/python/pyversion.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	pyqt3-base
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt3-base}
+BUILDLINK_PACKAGES+=	pyqt3-base
+
+.if !empty(PYQT3_BASE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pyqt3-base+=	${PYPKGPREFIX}-qt3-base>=3.11
+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/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/py-qt3-base/distinfo b/x11/py-qt3-base/distinfo
index b94e78d10de..e09c5ca335c 100644
--- a/x11/py-qt3-base/distinfo
+++ b/x11/py-qt3-base/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2003/08/23 15:02:26 drochner Exp $
+$NetBSD: distinfo,v 1.3 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) = 29287952965dc9d5d75fcb450f615148d6dc06cf
-SHA1 (patch-ab) = 993500d8cc3d66aaa337ac7724ad79f63d8677e7
+SHA1 (PyQt-x11-gpl-3.11.tar.gz) = 7b4949d97cdf989119681d34f8c30fede2d04e82
+Size (PyQt-x11-gpl-3.11.tar.gz) = 757652 bytes
+SHA1 (patch-aa) = 1d16293b66739d2d4fbfd45b4ad850c6c2842863
+SHA1 (patch-ab) = 46cf5b2eb3481a9f5a1264f11abc57421c4d47a0
+SHA1 (patch-ac) = c3cd88ef6119f224920c0b8e6852b35052e6751a
diff --git a/x11/py-qt3-base/patches/patch-aa b/x11/py-qt3-base/patches/patch-aa
index 90938b081bd..83b94ddacfb 100644
--- a/x11/py-qt3-base/patches/patch-aa
+++ b/x11/py-qt3-base/patches/patch-aa
@@ -1,33 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:22:48 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 11:44:51.000000000 +0200
-@@ -162,12 +162,13 @@
-     global pyFullVers, pyVersNr
- 
-     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 @@
+--- configure.py.orig	2004-03-11 20:23:30.000000000 +0100
++++ configure.py	2004-05-09 11:30:42.000000000 +0200
+@@ -663,7 +663,7 @@
      print "Type 'no' to decline the terms of the license."
      print
  
@@ -36,12 +11,37 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:22:48 drochner Exp $
          try:
              resp = raw_input("Do you accept the terms of the license? ")
          except:
-@@ -959,7 +960,7 @@
-     tuneCompiler()
- 
-     # Check which PyQt modules will build.
--    if qtVersion >= 0x020000:
-+    if 0:
-         inform("Checking which additional PyQt modules to build.");
- 
-         tryModule("qtcanvas","qcanvas.h","QCanvas()")
+@@ -853,21 +853,21 @@
+             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()")
+-    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("qtsql", "qsql.h", "QSql()")
++    #    check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
+ 
+-    if sipcfg.qt_version >= 0x030000:
+-        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")
+ 
+     if opt_qtpetag:
+         pyqt_modules.append("qtpe")
diff --git a/x11/py-qt3-base/patches/patch-ab b/x11/py-qt3-base/patches/patch-ab
index 4a5802181df..97d1713c124 100644
--- a/x11/py-qt3-base/patches/patch-ab
+++ b/x11/py-qt3-base/patches/patch-ab
@@ -1,19 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2003/08/23 15:02:27 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2004/05/09 17:06:07 recht Exp $
 
---- sip/qtmod.sip.orig	2003-08-17 14:27:46.000000000 +0200
-+++ sip/qtmod.sip	2003-08-22 18:32:46.000000000 +0200
-@@ -248,12 +248,12 @@
+--- pyuic3/pyuic.sbf.orig	2004-05-09 02:45:24.000000000 +0200
++++ pyuic3/pyuic.sbf	2004-05-09 02:45:49.000000000 +0200
+@@ -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.
  
- 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 += @BL_QASSISTANTCLIENT@ -L@BL_SIPMODDIR@ -lsip
-+sip3:unix:LIBS += @BL_QASSISTANTCLIENT@ -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
- sip3:win32:LIBS += @BL_QASSISTANTCLIENT@ @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
- 
- sip4:unix:LIBS += @BL_QASSISTANTCLIENT@
+-target = pyuic
++target = pyuic@PYVERSSUFFIX@
+ sources = main.cpp uic.cpp form.cpp object.cpp subclassing.cpp embed.cpp widgetdatabase.cpp domtool.cpp parser.cpp
+ headers = domtool.h globaldefs.h parser.h uic.h widgetdatabase.h widgetinterface.h
diff --git a/x11/py-qt3-base/patches/patch-ac b/x11/py-qt3-base/patches/patch-ac
new file mode 100644
index 00000000000..a0a67d70a97
--- /dev/null
+++ b/x11/py-qt3-base/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2004/05/09 17:06:07 recht Exp $
+
+--- pylupdate3/pylupdate.sbf.orig	2004-05-09 02:46:28.000000000 +0200
++++ pylupdate3/pylupdate.sbf	2004-05-09 02:46:45.000000000 +0200
+@@ -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.
+ 
+-target = pylupdate
++target = pylupdate@PYVERSSUFFIX@
+ sources = fetchtr.cpp main.cpp merge.cpp numberh.cpp sametexth.cpp metatranslator.cpp proparser.cpp
+ headers = metatranslator.h proparser.h