upgrade to latest libqt version 1.33 (after repository copy)

21 files changed, 1813 insertions, 1925 deletions

diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index f882e252ca8c..bacad02d2115 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -3,115 +3,99 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.15 1998/04/11 17:45:40 andreas Exp $
+# $Id: Makefile,v 1.16 1998/04/28 02:07:56 asami Exp $
 #
 
-DISTNAME=	qt-1.31
+DISTNAME=	qt-${MAJ}.${MIN}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
-MAINTAINER=	searle@longacre.demon.co.uk
-
-BROKEN=		repository copied, awaiting upgrade to 1.33
+MAINTAINER=	andreas@FreeBSD.ORG
 
+MAJ=		1
+MIN=		33
 USE_GMAKE=	yes
 USE_X11=	yes
 
-MAN1=		moc.1
-MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
-		qbitmap.3qt qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt \
-		qbutton.3qt qbuttongroup.3qt qbytearray.3qt \
-		qcheckbox.3qt qclipboard.3qt qcloseevent.3qt \
-		qcollection.3qt qcolor.3qt qcolorgroup.3qt \
-		qcombobox.3qt qconnection.3qt qcursor.3qt \
-		qcustomevent.3qt qdatastream.3qt qdate.3qt \
-		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.3qt qdoublevalidator.3qt qevent.3qt qfile.3qt \
-		qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
-		qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt \
-		qgcache.3qt qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt \
-		qglist.3qt qglistiterator.3qt qgmanager.3qt qgridlayout.3qt \
-		qgroupbox.3qt qhboxlayout.3qt qimage.3qt \
-		qimageio.3qt qintdict.3qt qintdictiterator.3qt \
-		qintvalidator.3qt \
-		qiodevice.3qt qkeyevent.3qt qlabel.3qt qlayout.3qt \
-		qlcdnumber.3qt \
-		qlineedit.3qt qlist.3qt qlistbox.3qt qlistboxitem.3qt \
-		qlistboxpixmap.3qt qlistboxtext.3qt qlistiterator.3qt \
-		qlnode.3qt qmenubar.3qt qmenudata.3qt qmessagebox.3qt \
-		qmouseevent.3qt qmoveevent.3qt qmultilineedit.3qt qobject.3qt \
-		qmovie.3qt \
-		qpaintdevice.3qt qpaintdevicemetrics.3qt qpainter.3qt \
-		qpaintevent.3qt qpalette.3qt qpen.3qt qpicture.3qt \
-		qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
-		qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
-		qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
-		qptrdictiterator.3qt \
-		qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
-		qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt \
-		qresizeevent.3qt qscrollbar.3qt qsenderobject.3qt \
-		qsemimodal.3qt \
-		qshared.3qt qsignal.3qt qsize.3qt qslider.3qt \
-		qsocketnotifier.3qt qstack.3qt qstrilist.3qt qstring.3qt \
-		qstrlist.3qt qtabbar.3qt qtabdialog.3qt qtableview.3qt \
-		qtextstream.3qt qtime.3qt \
-		qtimer.3qt qtimerevent.3qt qtooltip.3qt qtooltipgroup.3qt \
-		qtsmanip.3qt qvalidator.3qt qvboxlayout.3qt qwidget.3qt \
-		qwindow.3qt qwmatrix.3qt QAccel.3qt QApplication.3qt \
-		QArray.3qt QBitArray.3qt QBitmap.3qt QBitVal.3qt \
-		QBoxLayout.3qt QBrush.3qt \
-		QBuffer.3qt QButton.3qt QButtonGroup.3qt \
-		QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
-		QCloseEvent.3qt QCollection.3qt QColor.3qt \
-		QColorGroup.3qt QComboBox.3qt QConnection.3qt \
-		QCursor.3qt QCustomEvent.3qt QDataStream.3qt QDate.3qt \
-		QDateTime.3qt QDialog.3qt QDict.3qt QDictIterator.3qt \
-		QDir.3qt QDoubleValidator.3qt QEvent.3qt QFile.3qt \
-		QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
-		QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt \
-		QGCache.3qt QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt \
-		QGList.3qt QGListIterator.3qt QGManager.3qt \
-		QGridLayout.3qt QGroupBox.3qt QHBoxLayout.3qt QImage.3qt \
-		QImageIO.3qt QIntDict.3qt QIntDictIterator.3qt \
-		QIntValidator.3qt \
-		QIODevice.3qt QKeyEvent.3qt QLCDNumber.3qt QLabel.3qt \
-		QLayout.3qt \
-		QLineEdit.3qt QList.3qt QListBox.3qt QListBoxItem.3qt \
-		QListBoxPixmap.3qt QListBoxText.3qt QListIterator.3qt \
-		QLNode.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
-		QMovie.3qt \
-		QMouseEvent.3qt QMoveEvent.3qt QMultiLineEdit.3qt QObject.3qt \
-		QPaintDevice.3qt QPaintDeviceMetrics.3qt QPainter.3qt \
-		QPaintEvent.3qt QPalette.3qt QPen.3qt QPicture.3qt \
-		QPixmap.3qt QPixmapCache.3qt QPoint.3qt QPointVal.3qt\
-		QPointArray.3qt QPopupMenu.3qt QPrinter.3qt \
-		QProgressBar.3qt QProgressDialog.3qt \
-		QPtrDict.3qt QPtrDictIterator.3qt \
-		QPushButton.3qt QQueue.3qt QRadioButton.3qt \
-		QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
-		QResizeEvent.3qt QScrollBar.3qt QSenderObject.3qt \
-		QSemiModal.3qt QVBoxLayout.3qt QValidator.3qt \
-		QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt \
-		QSocketNotifier.3qt QStack.3qt QStrIList.3qt QString.3qt \
-		QStrList.3qt QTabBar.3qt QTabDialog.3qt QTableView.3qt \
-		QTextStream.3qt QTime.3qt \
-		QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
-		QTSManip.3qt QWidget.3qt QWindow.3qt QWMatrix.3qt
+MAN1=	moc.1
+MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QBitArray.3qt QBitVal.3qt \
+	QBitmap.3qt QBoxLayout.3qt QBrush.3qt QBuffer.3qt QButton.3qt \
+	QButtonGroup.3qt QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
+	QCloseEvent.3qt QCollection.3qt QColor.3qt QColorGroup.3qt \
+	QComboBox.3qt QConnection.3qt QCursor.3qt QCustomEvent.3qt \
+	QDataStream.3qt QDate.3qt QDateTime.3qt QDialog.3qt QDict.3qt \
+	QDictIterator.3qt QDir.3qt QDoubleValidator.3qt QEvent.3qt \
+	QFile.3qt QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
+	QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt QGCache.3qt \
+	QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt QGList.3qt \
+	QGListIterator.3qt QGManager.3qt QGridLayout.3qt QGroupBox.3qt \
+	QHBoxLayout.3qt QIODevice.3qt QImage.3qt QImageIO.3qt QIntDict.3qt \
+	QIntDictIterator.3qt QIntValidator.3qt QKeyEvent.3qt QLCDNumber.3qt \
+	QLNode.3qt QLabel.3qt QLayout.3qt QLineEdit.3qt QList.3qt \
+	QListBox.3qt QListBoxItem.3qt QListBoxPixmap.3qt QListBoxText.3qt \
+	QListIterator.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
+	QMouseEvent.3qt QMoveEvent.3qt QMovie.3qt QMultiLineEdit.3qt \
+	QObject.3qt QPaintDevice.3qt QPaintDeviceMetrics.3qt QPaintEvent.3qt \
+	QPainter.3qt QPalette.3qt QPen.3qt QPicture.3qt QPixmap.3qt \
+	QPixmapCache.3qt QPoint.3qt QPointArray.3qt QPointVal.3qt \
+	QPopupMenu.3qt QPrinter.3qt QProgressBar.3qt QProgressDialog.3qt \
+	QPtrDict.3qt QPtrDictIterator.3qt QPushButton.3qt QQueue.3qt \
+	QRadioButton.3qt QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
+	QResizeEvent.3qt QScrollBar.3qt QSemiModal.3qt QSenderObject.3qt \
+	QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt QSocketNotifier.3qt \
+	QStack.3qt QStrIList.3qt QStrList.3qt QString.3qt QTSManip.3qt \
+	QTabBar.3qt QTabDialog.3qt QTableView.3qt QTextStream.3qt QTime.3qt \
+	QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
+	QVBoxLayout.3qt QValidator.3qt QWMatrix.3qt QWidget.3qt QWindow.3qt \
+	qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt qbitmap.3qt \
+	qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt qbutton.3qt \
+	qbuttongroup.3qt qbytearray.3qt qcheckbox.3qt qclipboard.3qt \
+	qcloseevent.3qt qcollection.3qt qcolor.3qt qcolorgroup.3qt \
+	qcombobox.3qt qconnection.3qt qcursor.3qt qcustomevent.3qt \
+	qdatastream.3qt qdate.3qt qdatetime.3qt qdialog.3qt qdict.3qt \
+	qdictiterator.3qt qdir.3qt qdoublevalidator.3qt qevent.3qt \
+	qfile.3qt qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
+	qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt qgcache.3qt \
+	qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt qglist.3qt \
+	qglistiterator.3qt qgmanager.3qt qgridlayout.3qt qgroupbox.3qt \
+	qhboxlayout.3qt qimage.3qt qimageio.3qt qintdict.3qt \
+	qintdictiterator.3qt qintvalidator.3qt qiodevice.3qt qkeyevent.3qt \
+	qlabel.3qt qlayout.3qt qlcdnumber.3qt qlineedit.3qt qlist.3qt \
+	qlistbox.3qt qlistboxitem.3qt qlistboxpixmap.3qt qlistboxtext.3qt \
+	qlistiterator.3qt qlnode.3qt qmenubar.3qt qmenudata.3qt \
+	qmessagebox.3qt qmouseevent.3qt qmoveevent.3qt qmovie.3qt \
+	qmultilineedit.3qt qobject.3qt qpaintdevice.3qt \
+	qpaintdevicemetrics.3qt qpainter.3qt qpaintevent.3qt qpalette.3qt \
+	qpen.3qt qpicture.3qt qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
+	qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
+	qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
+	qptrdictiterator.3qt qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
+	qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt qresizeevent.3qt \
+	qscrollbar.3qt qsemimodal.3qt qsenderobject.3qt qshared.3qt \
+	qsignal.3qt qsize.3qt qslider.3qt qsocketnotifier.3qt qstack.3qt \
+	qstrilist.3qt qstring.3qt qstrlist.3qt qtabbar.3qt qtabdialog.3qt \
+	qtableview.3qt qtextstream.3qt qtime.3qt qtimer.3qt qtimerevent.3qt \
+	qtooltip.3qt qtooltipgroup.3qt qtsmanip.3qt qvalidator.3qt \
+	qvboxlayout.3qt qwidget.3qt qwindow.3qt qwmatrix.3qt
 
 post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
-	${LN} -sf $(X11BASE)/lib/libqt.so.1.31 $(X11BASE)/lib/libqt.so
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-${MAJ}.${MIN}/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${MAJ}.${MIN} \
+		$(X11BASE)/lib
+	${LN} -sf $(X11BASE)/lib/libqt.so.${MAJ}.${MIN} $(X11BASE)/lib/libqt.so
 	${LDCONFIG} -m $(PREFIX)/lib
 	${MKDIR} $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man3/* $(PREFIX)/man/man3
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/include/* \
+		$(PREFIX)/include/X11/qt
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man1/* $(PREFIX)/man/man1
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man3/* $(PREFIX)/man/man3
 	${MKDIR} ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README.QT ${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README \
+		${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README.QT \
+		${PREFIX}/share/doc/qt
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt145/distinfo b/x11-toolkits/qt145/distinfo
index e712bdb4e580..004f1c20b643 100644
--- a/x11-toolkits/qt145/distinfo
+++ b/x11-toolkits/qt145/distinfo
@@ -1 +1 @@
-MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
+MD5 (qt-1.33.tar.gz) = 6136b589c0d611f55deae45bc8ee2af7
diff --git a/x11-toolkits/qt145/pkg-plist b/x11-toolkits/qt145/pkg-plist
index 695c9a3a7f8e..20cc37259181 100644
--- a/x11-toolkits/qt145/pkg-plist
+++ b/x11-toolkits/qt145/pkg-plist
@@ -1,11 +1,133 @@
-lib/libqt.so.1.31
 lib/libqt.so
+lib/libqt.so.1.33
 @exec /sbin/ldconfig -m %B
+bin/moc
+include/X11/qt/qaccel.h
+include/X11/qt/qapp.h
+include/X11/qt/qarray.h
+include/X11/qt/qasyncimageio.h
+include/X11/qt/qasyncio.h
+include/X11/qt/qbitarry.h
+include/X11/qt/qbitmap.h
+include/X11/qt/qbrush.h
+include/X11/qt/qbttngrp.h
+include/X11/qt/qbuffer.h
+include/X11/qt/qbutton.h
+include/X11/qt/qcache.h
+include/X11/qt/qchkbox.h
+include/X11/qt/qclipbrd.h
+include/X11/qt/qcollect.h
+include/X11/qt/qcolor.h
+include/X11/qt/qcombo.h
+include/X11/qt/qconnect.h
+include/X11/qt/qcursor.h
+include/X11/qt/qdatetm.h
+include/X11/qt/qdialog.h
+include/X11/qt/qdict.h
+include/X11/qt/qdir.h
+include/X11/qt/qdrawutl.h
+include/X11/qt/qdstream.h
+include/X11/qt/qevent.h
+include/X11/qt/qfile.h
+include/X11/qt/qfiledef.h
+include/X11/qt/qfiledlg.h
+include/X11/qt/qfileinf.h
+include/X11/qt/qfont.h
+include/X11/qt/qfontdta.h
+include/X11/qt/qfontinf.h
+include/X11/qt/qfontmet.h
+include/X11/qt/qframe.h
+include/X11/qt/qgarray.h
+include/X11/qt/qgcache.h
+include/X11/qt/qgdict.h
+include/X11/qt/qgeneric.h
+include/X11/qt/qgl.h
+include/X11/qt/qglist.h
+include/X11/qt/qglobal.h
+include/X11/qt/qgmanagr.h
+include/X11/qt/qgrpbox.h
+include/X11/qt/qgvector.h
+include/X11/qt/qimage.h
+include/X11/qt/qimageio.h
+include/X11/qt/qintcach.h
+include/X11/qt/qintdict.h
+include/X11/qt/qiodev.h
+include/X11/qt/qjpegio.h
+include/X11/qt/qkeycode.h
+include/X11/qt/qlabel.h
+include/X11/qt/qlayout.h
+include/X11/qt/qlcdnum.h
+include/X11/qt/qlined.h
+include/X11/qt/qlist.h
+include/X11/qt/qlistbox.h
+include/X11/qt/qmenubar.h
+include/X11/qt/qmenudta.h
+include/X11/qt/qmetaobj.h
+include/X11/qt/qmlined.h
+include/X11/qt/qmovie.h
+include/X11/qt/qmsgbox.h
+include/X11/qt/qnp.h
+include/X11/qt/qobjcoll.h
+include/X11/qt/qobjdefs.h
+include/X11/qt/qobject.h
+include/X11/qt/qpaintd.h
+include/X11/qt/qpaintdc.h
+include/X11/qt/qpainter.h
+include/X11/qt/qpalette.h
+include/X11/qt/qpdevmet.h
+include/X11/qt/qpen.h
+include/X11/qt/qpicture.h
+include/X11/qt/qpixmap.h
+include/X11/qt/qpmcache.h
+include/X11/qt/qpngio.h
+include/X11/qt/qpntarry.h
+include/X11/qt/qpoint.h
+include/X11/qt/qpopmenu.h
+include/X11/qt/qprinter.h
+include/X11/qt/qprndlg.h
+include/X11/qt/qprogbar.h
+include/X11/qt/qprogdlg.h
+include/X11/qt/qpsprn.h
+include/X11/qt/qptrdict.h
+include/X11/qt/qpushbt.h
+include/X11/qt/qqueue.h
+include/X11/qt/qradiobt.h
+include/X11/qt/qrangect.h
+include/X11/qt/qrect.h
+include/X11/qt/qregexp.h
+include/X11/qt/qregion.h
+include/X11/qt/qscrbar.h
+include/X11/qt/qsemimodal.h
+include/X11/qt/qshared.h
+include/X11/qt/qsignal.h
+include/X11/qt/qsize.h
+include/X11/qt/qslider.h
+include/X11/qt/qsocknot.h
+include/X11/qt/qstack.h
+include/X11/qt/qstring.h
+include/X11/qt/qstrlist.h
+include/X11/qt/qstrvec.h
+include/X11/qt/qtabbar.h
+include/X11/qt/qtabdlg.h
+include/X11/qt/qtablevw.h
+include/X11/qt/qtimer.h
+include/X11/qt/qtooltip.h
+include/X11/qt/qtstream.h
+include/X11/qt/qvalidator.h
+include/X11/qt/qvector.h
+include/X11/qt/qwidcoll.h
+include/X11/qt/qwidget.h
+include/X11/qt/qwindefs.h
+include/X11/qt/qwindow.h
+include/X11/qt/qwmatrix.h
 man/man1/moc.1.gz
+man/man3/QAccel.3qt.gz
 man/man3/QApplication.3qt.gz
 man/man3/QArray.3qt.gz
-man/man3/QBitmap.3qt.gz
+man/man3/QBitArray.3qt.gz
 man/man3/QBitVal.3qt.gz
+man/man3/QBitmap.3qt.gz
+man/man3/QBoxLayout.3qt.gz
 man/man3/QBrush.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
@@ -39,37 +161,45 @@ man/man3/QFontInfo.3qt.gz
 man/man3/QFontMetrics.3qt.gz
 man/man3/QFrame.3qt.gz
 man/man3/QGArray.3qt.gz
+man/man3/QGCache.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
 man/man3/QGList.3qt.gz
 man/man3/QGListIterator.3qt.gz
+man/man3/QGManager.3qt.gz
+man/man3/QGridLayout.3qt.gz
 man/man3/QGroupBox.3qt.gz
 man/man3/QHBoxLayout.3qt.gz
+man/man3/QIODevice.3qt.gz
 man/man3/QImage.3qt.gz
 man/man3/QImageIO.3qt.gz
 man/man3/QIntDict.3qt.gz
 man/man3/QIntDictIterator.3qt.gz
 man/man3/QIntValidator.3qt.gz
-man/man3/QIODevice.3qt.gz
 man/man3/QKeyEvent.3qt.gz
+man/man3/QLCDNumber.3qt.gz
+man/man3/QLNode.3qt.gz
 man/man3/QLabel.3qt.gz
 man/man3/QLayout.3qt.gz
-man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
+man/man3/QListBox.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QLNode.3qt.gz
+man/man3/QListIterator.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
+man/man3/QMouseEvent.3qt.gz
 man/man3/QMoveEvent.3qt.gz
 man/man3/QMovie.3qt.gz
+man/man3/QMultiLineEdit.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
+man/man3/QPaintEvent.3qt.gz
 man/man3/QPainter.3qt.gz
 man/man3/QPalette.3qt.gz
 man/man3/QPen.3qt.gz
@@ -95,6 +225,7 @@ man/man3/QRegion.3qt.gz
 man/man3/QResizeEvent.3qt.gz
 man/man3/QScrollBar.3qt.gz
 man/man3/QSemiModal.3qt.gz
+man/man3/QSenderObject.3qt.gz
 man/man3/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -102,36 +233,43 @@ man/man3/QSlider.3qt.gz
 man/man3/QSocketNotifier.3qt.gz
 man/man3/QStack.3qt.gz
 man/man3/QStrIList.3qt.gz
-man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
-man/man3/QTableView.3qt.gz
+man/man3/QString.3qt.gz
+man/man3/QTSManip.3qt.gz
+man/man3/QTabBar.3qt.gz
 man/man3/QTabDialog.3qt.gz
+man/man3/QTableView.3qt.gz
+man/man3/QTextStream.3qt.gz
 man/man3/QTime.3qt.gz
 man/man3/QTimer.3qt.gz
 man/man3/QTimerEvent.3qt.gz
 man/man3/QToolTip.3qt.gz
-man/man3/QTSManip.3qt.gz
-man/man3/QValidator.3qt.gz
+man/man3/QToolTipGroup.3qt.gz
 man/man3/QVBoxLayout.3qt.gz
+man/man3/QValidator.3qt.gz
+man/man3/QWMatrix.3qt.gz
 man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
-man/man3/QWMatrix.3qt.gz
-man/man3/qarray.3qt.gz
+man/man3/qaccel.3qt.gz
 man/man3/qapplication.3qt.gz
+man/man3/qarray.3qt.gz
+man/man3/qbitarray.3qt.gz
 man/man3/qbitmap.3qt.gz
-man/man3/qdir.3qt.gz
+man/man3/qbitval.3qt.gz
+man/man3/qboxlayout.3qt.gz
 man/man3/qbrush.3qt.gz
+man/man3/qbuffer.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qbitarray.3qt.gz
-man/man3/qbitval.3qt.gz
+man/man3/qcheckbox.3qt.gz
 man/man3/qclipboard.3qt.gz
 man/man3/qcloseevent.3qt.gz
 man/man3/qcollection.3qt.gz
 man/man3/qcolor.3qt.gz
 man/man3/qcolorgroup.3qt.gz
 man/man3/qcombobox.3qt.gz
+man/man3/qconnection.3qt.gz
 man/man3/qcursor.3qt.gz
 man/man3/qcustomevent.3qt.gz
 man/man3/qdatastream.3qt.gz
@@ -139,6 +277,9 @@ man/man3/qdate.3qt.gz
 man/man3/qdatetime.3qt.gz
 man/man3/qdialog.3qt.gz
 man/man3/qdict.3qt.gz
+man/man3/qdictiterator.3qt.gz
+man/man3/qdir.3qt.gz
+man/man3/qdoublevalidator.3qt.gz
 man/man3/qevent.3qt.gz
 man/man3/qfile.3qt.gz
 man/man3/qfiledialog.3qt.gz
@@ -150,21 +291,27 @@ man/man3/qfontmetrics.3qt.gz
 man/man3/qframe.3qt.gz
 man/man3/qgarray.3qt.gz
 man/man3/qgcache.3qt.gz
+man/man3/qgcacheiterator.3qt.gz
 man/man3/qgdict.3qt.gz
 man/man3/qgdictiterator.3qt.gz
 man/man3/qglist.3qt.gz
 man/man3/qglistiterator.3qt.gz
+man/man3/qgmanager.3qt.gz
+man/man3/qgridlayout.3qt.gz
 man/man3/qgroupbox.3qt.gz
+man/man3/qhboxlayout.3qt.gz
 man/man3/qimage.3qt.gz
 man/man3/qimageio.3qt.gz
 man/man3/qintdict.3qt.gz
 man/man3/qintdictiterator.3qt.gz
+man/man3/qintvalidator.3qt.gz
 man/man3/qiodevice.3qt.gz
 man/man3/qkeyevent.3qt.gz
 man/man3/qlabel.3qt.gz
 man/man3/qlayout.3qt.gz
+man/man3/qlcdnumber.3qt.gz
+man/man3/qlineedit.3qt.gz
 man/man3/qlist.3qt.gz
-man/man3/qpen.3qt.gz
 man/man3/qlistbox.3qt.gz
 man/man3/qlistboxitem.3qt.gz
 man/man3/qlistboxpixmap.3qt.gz
@@ -176,20 +323,27 @@ man/man3/qmenudata.3qt.gz
 man/man3/qmessagebox.3qt.gz
 man/man3/qmouseevent.3qt.gz
 man/man3/qmoveevent.3qt.gz
+man/man3/qmovie.3qt.gz
+man/man3/qmultilineedit.3qt.gz
 man/man3/qobject.3qt.gz
 man/man3/qpaintdevice.3qt.gz
 man/man3/qpaintdevicemetrics.3qt.gz
 man/man3/qpainter.3qt.gz
-man/man3/qpicture.3qt.gz
-man/man3/QGCache.3qt.gz
-man/man3/QGManager.3qt.gz
+man/man3/qpaintevent.3qt.gz
 man/man3/qpalette.3qt.gz
+man/man3/qpen.3qt.gz
+man/man3/qpicture.3qt.gz
 man/man3/qpixmap.3qt.gz
 man/man3/qpixmapcache.3qt.gz
 man/man3/qpoint.3qt.gz
 man/man3/qpointarray.3qt.gz
+man/man3/qpointval.3qt.gz
 man/man3/qpopupmenu.3qt.gz
 man/man3/qprinter.3qt.gz
+man/man3/qprogressbar.3qt.gz
+man/man3/qprogressdialog.3qt.gz
+man/man3/qptrdict.3qt.gz
+man/man3/qptrdictiterator.3qt.gz
 man/man3/qpushbutton.3qt.gz
 man/man3/qqueue.3qt.gz
 man/man3/qradiobutton.3qt.gz
@@ -199,6 +353,8 @@ man/man3/qregexp.3qt.gz
 man/man3/qregion.3qt.gz
 man/man3/qresizeevent.3qt.gz
 man/man3/qscrollbar.3qt.gz
+man/man3/qsemimodal.3qt.gz
+man/man3/qsenderobject.3qt.gz
 man/man3/qshared.3qt.gz
 man/man3/qsignal.3qt.gz
 man/man3/qsize.3qt.gz
@@ -207,178 +363,22 @@ man/man3/qsocketnotifier.3qt.gz
 man/man3/qstack.3qt.gz
 man/man3/qstrilist.3qt.gz
 man/man3/qstring.3qt.gz
+man/man3/qstrlist.3qt.gz
+man/man3/qtabbar.3qt.gz
+man/man3/qtabdialog.3qt.gz
 man/man3/qtableview.3qt.gz
 man/man3/qtextstream.3qt.gz
 man/man3/qtime.3qt.gz
 man/man3/qtimer.3qt.gz
 man/man3/qtimerevent.3qt.gz
-man/man3/qtsmanip.3qt.gz
-man/man3/QListBox.3qt.gz
-man/man3/qwidget.3qt.gz
-man/man3/qwindow.3qt.gz
-man/man3/qwmatrix.3qt.gz
-man/man3/QAccel.3qt.gz
-man/man3/QBitArray.3qt.gz
-man/man3/qaccel.3qt.gz
-man/man3/QListIterator.3qt.gz
-man/man3/qbuffer.3qt.gz
-man/man3/qcheckbox.3qt.gz
-man/man3/qconnection.3qt.gz
-man/man3/qdictiterator.3qt.gz
-man/man3/qgcacheiterator.3qt.gz
-man/man3/qlcdnumber.3qt.gz
-man/man3/qlineedit.3qt.gz
-man/man3/qmultilineedit.3qt.gz
-man/man3/qpaintevent.3qt.gz
-man/man3/qsenderobject.3qt.gz
-man/man3/qstrlist.3qt.gz
-man/man3/qtabbar.3qt.gz
 man/man3/qtooltip.3qt.gz
-man/man3/QBoxLayout.3qt.gz
-man/man3/QGridLayout.3qt.gz
-man/man3/QMouseEvent.3qt.gz
-man/man3/QMultiLineEdit.3qt.gz
-man/man3/QPaintEvent.3qt.gz
-man/man3/QSenderObject.3qt.gz
-man/man3/QTabBar.3qt.gz
-man/man3/QTextStream.3qt.gz
-man/man3/QToolTipGroup.3qt.gz
-man/man3/qboxlayout.3qt.gz
-man/man3/qgmanager.3qt.gz
-man/man3/qgridlayout.3qt.gz
-man/man3/qtabdialog.3qt.gz
 man/man3/qtooltipgroup.3qt.gz
-man/man3/qdoublevalidator.3qt.gz
-man/man3/qhboxlayout.3qt.gz
-man/man3/qintvalidator.3qt.gz
-man/man3/qmovie.3qt.gz
-man/man3/qpointval.3qt.gz
-man/man3/qprogressbar.3qt.gz
-man/man3/qprogressdialog.3qt.gz
-man/man3/qptrdict.3qt.gz
-man/man3/qptrdictiterator.3qt.gz
-man/man3/qsemimodal.3qt.gz
+man/man3/qtsmanip.3qt.gz
 man/man3/qvalidator.3qt.gz
 man/man3/qvboxlayout.3qt.gz
-include/X11/qt/qaccel.h
-include/X11/qt/qapp.h
-include/X11/qt/qarray.h
-include/X11/qt/qasyncimageio.h
-include/X11/qt/qasyncio.h
-include/X11/qt/qbitarry.h
-include/X11/qt/qbitmap.h
-include/X11/qt/qbrush.h
-include/X11/qt/qbttngrp.h
-include/X11/qt/qbuffer.h
-include/X11/qt/qbutton.h
-include/X11/qt/qcache.h
-include/X11/qt/qchkbox.h
-include/X11/qt/qclipbrd.h
-include/X11/qt/qcollect.h
-include/X11/qt/qcolor.h
-include/X11/qt/qcombo.h
-include/X11/qt/qconnect.h
-include/X11/qt/qcursor.h
-include/X11/qt/qdatetm.h
-include/X11/qt/qdialog.h
-include/X11/qt/qdict.h
-include/X11/qt/qdir.h
-include/X11/qt/qdrawutl.h
-include/X11/qt/qdstream.h
-include/X11/qt/qevent.h
-include/X11/qt/qfile.h
-include/X11/qt/qfiledef.h
-include/X11/qt/qfiledlg.h
-include/X11/qt/qfileinf.h
-include/X11/qt/qfont.h
-include/X11/qt/qfontdta.h
-include/X11/qt/qfontinf.h
-include/X11/qt/qfontmet.h
-include/X11/qt/qframe.h
-include/X11/qt/qgarray.h
-include/X11/qt/qgcache.h
-include/X11/qt/qgdict.h
-include/X11/qt/qgeneric.h
-include/X11/qt/qgl.h
-include/X11/qt/qglist.h
-include/X11/qt/qglobal.h
-include/X11/qt/qgmanagr.h
-include/X11/qt/qgrpbox.h
-include/X11/qt/qgvector.h
-include/X11/qt/qimage.h
-include/X11/qt/qimageio.h
-include/X11/qt/qintcach.h
-include/X11/qt/qintdict.h
-include/X11/qt/qiodev.h
-include/X11/qt/qjpegio.h
-include/X11/qt/qkeycode.h
-include/X11/qt/qlabel.h
-include/X11/qt/qlayout.h
-include/X11/qt/qlcdnum.h
-include/X11/qt/qlined.h
-include/X11/qt/qlist.h
-include/X11/qt/qlistbox.h
-include/X11/qt/qmenubar.h
-include/X11/qt/qmenudta.h
-include/X11/qt/qmetaobj.h
-include/X11/qt/qmlined.h
-include/X11/qt/qmovie.h
-include/X11/qt/qmsgbox.h
-include/X11/qt/qnp.h
-include/X11/qt/qobjcoll.h
-include/X11/qt/qobjdefs.h
-include/X11/qt/qobject.h
-include/X11/qt/qpaintd.h
-include/X11/qt/qpaintdc.h
-include/X11/qt/qpainter.h
-include/X11/qt/qpalette.h
-include/X11/qt/qpdevmet.h
-include/X11/qt/qpen.h
-include/X11/qt/qpicture.h
-include/X11/qt/qpixmap.h
-include/X11/qt/qpmcache.h
-include/X11/qt/qpngio.h
-include/X11/qt/qpntarry.h
-include/X11/qt/qpoint.h
-include/X11/qt/qpopmenu.h
-include/X11/qt/qprinter.h
-include/X11/qt/qprndlg.h
-include/X11/qt/qprogbar.h
-include/X11/qt/qprogdlg.h
-include/X11/qt/qpsprn.h
-include/X11/qt/qptrdict.h
-include/X11/qt/qpushbt.h
-include/X11/qt/qqueue.h
-include/X11/qt/qradiobt.h
-include/X11/qt/qrangect.h
-include/X11/qt/qrect.h
-include/X11/qt/qregexp.h
-include/X11/qt/qregion.h
-include/X11/qt/qscrbar.h
-include/X11/qt/qsemimodal.h
-include/X11/qt/qshared.h
-include/X11/qt/qsignal.h
-include/X11/qt/qsize.h
-include/X11/qt/qslider.h
-include/X11/qt/qsocknot.h
-include/X11/qt/qstack.h
-include/X11/qt/qstring.h
-include/X11/qt/qstrlist.h
-include/X11/qt/qstrvec.h
-include/X11/qt/qtabbar.h
-include/X11/qt/qtabdlg.h
-include/X11/qt/qtablevw.h
-include/X11/qt/qtimer.h
-include/X11/qt/qtooltip.h
-include/X11/qt/qtstream.h
-include/X11/qt/qvalidator.h
-include/X11/qt/qvector.h
-include/X11/qt/qwidcoll.h
-include/X11/qt/qwidget.h
-include/X11/qt/qwindefs.h
-include/X11/qt/qwindow.h
-include/X11/qt/qwmatrix.h
-bin/moc
+man/man3/qwidget.3qt.gz
+man/man3/qwindow.3qt.gz
+man/man3/qwmatrix.3qt.gz
 share/doc/qt/README
 share/doc/qt/README.QT
 @dirrm include/X11/qt
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index f882e252ca8c..bacad02d2115 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -3,115 +3,99 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.15 1998/04/11 17:45:40 andreas Exp $
+# $Id: Makefile,v 1.16 1998/04/28 02:07:56 asami Exp $
 #
 
-DISTNAME=	qt-1.31
+DISTNAME=	qt-${MAJ}.${MIN}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
-MAINTAINER=	searle@longacre.demon.co.uk
-
-BROKEN=		repository copied, awaiting upgrade to 1.33
+MAINTAINER=	andreas@FreeBSD.ORG
 
+MAJ=		1
+MIN=		33
 USE_GMAKE=	yes
 USE_X11=	yes
 
-MAN1=		moc.1
-MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
-		qbitmap.3qt qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt \
-		qbutton.3qt qbuttongroup.3qt qbytearray.3qt \
-		qcheckbox.3qt qclipboard.3qt qcloseevent.3qt \
-		qcollection.3qt qcolor.3qt qcolorgroup.3qt \
-		qcombobox.3qt qconnection.3qt qcursor.3qt \
-		qcustomevent.3qt qdatastream.3qt qdate.3qt \
-		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.3qt qdoublevalidator.3qt qevent.3qt qfile.3qt \
-		qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
-		qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt \
-		qgcache.3qt qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt \
-		qglist.3qt qglistiterator.3qt qgmanager.3qt qgridlayout.3qt \
-		qgroupbox.3qt qhboxlayout.3qt qimage.3qt \
-		qimageio.3qt qintdict.3qt qintdictiterator.3qt \
-		qintvalidator.3qt \
-		qiodevice.3qt qkeyevent.3qt qlabel.3qt qlayout.3qt \
-		qlcdnumber.3qt \
-		qlineedit.3qt qlist.3qt qlistbox.3qt qlistboxitem.3qt \
-		qlistboxpixmap.3qt qlistboxtext.3qt qlistiterator.3qt \
-		qlnode.3qt qmenubar.3qt qmenudata.3qt qmessagebox.3qt \
-		qmouseevent.3qt qmoveevent.3qt qmultilineedit.3qt qobject.3qt \
-		qmovie.3qt \
-		qpaintdevice.3qt qpaintdevicemetrics.3qt qpainter.3qt \
-		qpaintevent.3qt qpalette.3qt qpen.3qt qpicture.3qt \
-		qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
-		qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
-		qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
-		qptrdictiterator.3qt \
-		qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
-		qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt \
-		qresizeevent.3qt qscrollbar.3qt qsenderobject.3qt \
-		qsemimodal.3qt \
-		qshared.3qt qsignal.3qt qsize.3qt qslider.3qt \
-		qsocketnotifier.3qt qstack.3qt qstrilist.3qt qstring.3qt \
-		qstrlist.3qt qtabbar.3qt qtabdialog.3qt qtableview.3qt \
-		qtextstream.3qt qtime.3qt \
-		qtimer.3qt qtimerevent.3qt qtooltip.3qt qtooltipgroup.3qt \
-		qtsmanip.3qt qvalidator.3qt qvboxlayout.3qt qwidget.3qt \
-		qwindow.3qt qwmatrix.3qt QAccel.3qt QApplication.3qt \
-		QArray.3qt QBitArray.3qt QBitmap.3qt QBitVal.3qt \
-		QBoxLayout.3qt QBrush.3qt \
-		QBuffer.3qt QButton.3qt QButtonGroup.3qt \
-		QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
-		QCloseEvent.3qt QCollection.3qt QColor.3qt \
-		QColorGroup.3qt QComboBox.3qt QConnection.3qt \
-		QCursor.3qt QCustomEvent.3qt QDataStream.3qt QDate.3qt \
-		QDateTime.3qt QDialog.3qt QDict.3qt QDictIterator.3qt \
-		QDir.3qt QDoubleValidator.3qt QEvent.3qt QFile.3qt \
-		QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
-		QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt \
-		QGCache.3qt QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt \
-		QGList.3qt QGListIterator.3qt QGManager.3qt \
-		QGridLayout.3qt QGroupBox.3qt QHBoxLayout.3qt QImage.3qt \
-		QImageIO.3qt QIntDict.3qt QIntDictIterator.3qt \
-		QIntValidator.3qt \
-		QIODevice.3qt QKeyEvent.3qt QLCDNumber.3qt QLabel.3qt \
-		QLayout.3qt \
-		QLineEdit.3qt QList.3qt QListBox.3qt QListBoxItem.3qt \
-		QListBoxPixmap.3qt QListBoxText.3qt QListIterator.3qt \
-		QLNode.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
-		QMovie.3qt \
-		QMouseEvent.3qt QMoveEvent.3qt QMultiLineEdit.3qt QObject.3qt \
-		QPaintDevice.3qt QPaintDeviceMetrics.3qt QPainter.3qt \
-		QPaintEvent.3qt QPalette.3qt QPen.3qt QPicture.3qt \
-		QPixmap.3qt QPixmapCache.3qt QPoint.3qt QPointVal.3qt\
-		QPointArray.3qt QPopupMenu.3qt QPrinter.3qt \
-		QProgressBar.3qt QProgressDialog.3qt \
-		QPtrDict.3qt QPtrDictIterator.3qt \
-		QPushButton.3qt QQueue.3qt QRadioButton.3qt \
-		QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
-		QResizeEvent.3qt QScrollBar.3qt QSenderObject.3qt \
-		QSemiModal.3qt QVBoxLayout.3qt QValidator.3qt \
-		QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt \
-		QSocketNotifier.3qt QStack.3qt QStrIList.3qt QString.3qt \
-		QStrList.3qt QTabBar.3qt QTabDialog.3qt QTableView.3qt \
-		QTextStream.3qt QTime.3qt \
-		QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
-		QTSManip.3qt QWidget.3qt QWindow.3qt QWMatrix.3qt
+MAN1=	moc.1
+MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QBitArray.3qt QBitVal.3qt \
+	QBitmap.3qt QBoxLayout.3qt QBrush.3qt QBuffer.3qt QButton.3qt \
+	QButtonGroup.3qt QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
+	QCloseEvent.3qt QCollection.3qt QColor.3qt QColorGroup.3qt \
+	QComboBox.3qt QConnection.3qt QCursor.3qt QCustomEvent.3qt \
+	QDataStream.3qt QDate.3qt QDateTime.3qt QDialog.3qt QDict.3qt \
+	QDictIterator.3qt QDir.3qt QDoubleValidator.3qt QEvent.3qt \
+	QFile.3qt QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
+	QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt QGCache.3qt \
+	QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt QGList.3qt \
+	QGListIterator.3qt QGManager.3qt QGridLayout.3qt QGroupBox.3qt \
+	QHBoxLayout.3qt QIODevice.3qt QImage.3qt QImageIO.3qt QIntDict.3qt \
+	QIntDictIterator.3qt QIntValidator.3qt QKeyEvent.3qt QLCDNumber.3qt \
+	QLNode.3qt QLabel.3qt QLayout.3qt QLineEdit.3qt QList.3qt \
+	QListBox.3qt QListBoxItem.3qt QListBoxPixmap.3qt QListBoxText.3qt \
+	QListIterator.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
+	QMouseEvent.3qt QMoveEvent.3qt QMovie.3qt QMultiLineEdit.3qt \
+	QObject.3qt QPaintDevice.3qt QPaintDeviceMetrics.3qt QPaintEvent.3qt \
+	QPainter.3qt QPalette.3qt QPen.3qt QPicture.3qt QPixmap.3qt \
+	QPixmapCache.3qt QPoint.3qt QPointArray.3qt QPointVal.3qt \
+	QPopupMenu.3qt QPrinter.3qt QProgressBar.3qt QProgressDialog.3qt \
+	QPtrDict.3qt QPtrDictIterator.3qt QPushButton.3qt QQueue.3qt \
+	QRadioButton.3qt QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
+	QResizeEvent.3qt QScrollBar.3qt QSemiModal.3qt QSenderObject.3qt \
+	QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt QSocketNotifier.3qt \
+	QStack.3qt QStrIList.3qt QStrList.3qt QString.3qt QTSManip.3qt \
+	QTabBar.3qt QTabDialog.3qt QTableView.3qt QTextStream.3qt QTime.3qt \
+	QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
+	QVBoxLayout.3qt QValidator.3qt QWMatrix.3qt QWidget.3qt QWindow.3qt \
+	qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt qbitmap.3qt \
+	qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt qbutton.3qt \
+	qbuttongroup.3qt qbytearray.3qt qcheckbox.3qt qclipboard.3qt \
+	qcloseevent.3qt qcollection.3qt qcolor.3qt qcolorgroup.3qt \
+	qcombobox.3qt qconnection.3qt qcursor.3qt qcustomevent.3qt \
+	qdatastream.3qt qdate.3qt qdatetime.3qt qdialog.3qt qdict.3qt \
+	qdictiterator.3qt qdir.3qt qdoublevalidator.3qt qevent.3qt \
+	qfile.3qt qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
+	qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt qgcache.3qt \
+	qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt qglist.3qt \
+	qglistiterator.3qt qgmanager.3qt qgridlayout.3qt qgroupbox.3qt \
+	qhboxlayout.3qt qimage.3qt qimageio.3qt qintdict.3qt \
+	qintdictiterator.3qt qintvalidator.3qt qiodevice.3qt qkeyevent.3qt \
+	qlabel.3qt qlayout.3qt qlcdnumber.3qt qlineedit.3qt qlist.3qt \
+	qlistbox.3qt qlistboxitem.3qt qlistboxpixmap.3qt qlistboxtext.3qt \
+	qlistiterator.3qt qlnode.3qt qmenubar.3qt qmenudata.3qt \
+	qmessagebox.3qt qmouseevent.3qt qmoveevent.3qt qmovie.3qt \
+	qmultilineedit.3qt qobject.3qt qpaintdevice.3qt \
+	qpaintdevicemetrics.3qt qpainter.3qt qpaintevent.3qt qpalette.3qt \
+	qpen.3qt qpicture.3qt qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
+	qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
+	qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
+	qptrdictiterator.3qt qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
+	qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt qresizeevent.3qt \
+	qscrollbar.3qt qsemimodal.3qt qsenderobject.3qt qshared.3qt \
+	qsignal.3qt qsize.3qt qslider.3qt qsocketnotifier.3qt qstack.3qt \
+	qstrilist.3qt qstring.3qt qstrlist.3qt qtabbar.3qt qtabdialog.3qt \
+	qtableview.3qt qtextstream.3qt qtime.3qt qtimer.3qt qtimerevent.3qt \
+	qtooltip.3qt qtooltipgroup.3qt qtsmanip.3qt qvalidator.3qt \
+	qvboxlayout.3qt qwidget.3qt qwindow.3qt qwmatrix.3qt
 
 post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
-	${LN} -sf $(X11BASE)/lib/libqt.so.1.31 $(X11BASE)/lib/libqt.so
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-${MAJ}.${MIN}/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${MAJ}.${MIN} \
+		$(X11BASE)/lib
+	${LN} -sf $(X11BASE)/lib/libqt.so.${MAJ}.${MIN} $(X11BASE)/lib/libqt.so
 	${LDCONFIG} -m $(PREFIX)/lib
 	${MKDIR} $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man3/* $(PREFIX)/man/man3
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/include/* \
+		$(PREFIX)/include/X11/qt
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man1/* $(PREFIX)/man/man1
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man3/* $(PREFIX)/man/man3
 	${MKDIR} ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README.QT ${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README \
+		${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README.QT \
+		${PREFIX}/share/doc/qt
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt22/distinfo b/x11-toolkits/qt22/distinfo
index e712bdb4e580..004f1c20b643 100644
--- a/x11-toolkits/qt22/distinfo
+++ b/x11-toolkits/qt22/distinfo
@@ -1 +1 @@
-MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
+MD5 (qt-1.33.tar.gz) = 6136b589c0d611f55deae45bc8ee2af7
diff --git a/x11-toolkits/qt22/pkg-plist b/x11-toolkits/qt22/pkg-plist
index 695c9a3a7f8e..20cc37259181 100644
--- a/x11-toolkits/qt22/pkg-plist
+++ b/x11-toolkits/qt22/pkg-plist
@@ -1,11 +1,133 @@
-lib/libqt.so.1.31
 lib/libqt.so
+lib/libqt.so.1.33
 @exec /sbin/ldconfig -m %B
+bin/moc
+include/X11/qt/qaccel.h
+include/X11/qt/qapp.h
+include/X11/qt/qarray.h
+include/X11/qt/qasyncimageio.h
+include/X11/qt/qasyncio.h
+include/X11/qt/qbitarry.h
+include/X11/qt/qbitmap.h
+include/X11/qt/qbrush.h
+include/X11/qt/qbttngrp.h
+include/X11/qt/qbuffer.h
+include/X11/qt/qbutton.h
+include/X11/qt/qcache.h
+include/X11/qt/qchkbox.h
+include/X11/qt/qclipbrd.h
+include/X11/qt/qcollect.h
+include/X11/qt/qcolor.h
+include/X11/qt/qcombo.h
+include/X11/qt/qconnect.h
+include/X11/qt/qcursor.h
+include/X11/qt/qdatetm.h
+include/X11/qt/qdialog.h
+include/X11/qt/qdict.h
+include/X11/qt/qdir.h
+include/X11/qt/qdrawutl.h
+include/X11/qt/qdstream.h
+include/X11/qt/qevent.h
+include/X11/qt/qfile.h
+include/X11/qt/qfiledef.h
+include/X11/qt/qfiledlg.h
+include/X11/qt/qfileinf.h
+include/X11/qt/qfont.h
+include/X11/qt/qfontdta.h
+include/X11/qt/qfontinf.h
+include/X11/qt/qfontmet.h
+include/X11/qt/qframe.h
+include/X11/qt/qgarray.h
+include/X11/qt/qgcache.h
+include/X11/qt/qgdict.h
+include/X11/qt/qgeneric.h
+include/X11/qt/qgl.h
+include/X11/qt/qglist.h
+include/X11/qt/qglobal.h
+include/X11/qt/qgmanagr.h
+include/X11/qt/qgrpbox.h
+include/X11/qt/qgvector.h
+include/X11/qt/qimage.h
+include/X11/qt/qimageio.h
+include/X11/qt/qintcach.h
+include/X11/qt/qintdict.h
+include/X11/qt/qiodev.h
+include/X11/qt/qjpegio.h
+include/X11/qt/qkeycode.h
+include/X11/qt/qlabel.h
+include/X11/qt/qlayout.h
+include/X11/qt/qlcdnum.h
+include/X11/qt/qlined.h
+include/X11/qt/qlist.h
+include/X11/qt/qlistbox.h
+include/X11/qt/qmenubar.h
+include/X11/qt/qmenudta.h
+include/X11/qt/qmetaobj.h
+include/X11/qt/qmlined.h
+include/X11/qt/qmovie.h
+include/X11/qt/qmsgbox.h
+include/X11/qt/qnp.h
+include/X11/qt/qobjcoll.h
+include/X11/qt/qobjdefs.h
+include/X11/qt/qobject.h
+include/X11/qt/qpaintd.h
+include/X11/qt/qpaintdc.h
+include/X11/qt/qpainter.h
+include/X11/qt/qpalette.h
+include/X11/qt/qpdevmet.h
+include/X11/qt/qpen.h
+include/X11/qt/qpicture.h
+include/X11/qt/qpixmap.h
+include/X11/qt/qpmcache.h
+include/X11/qt/qpngio.h
+include/X11/qt/qpntarry.h
+include/X11/qt/qpoint.h
+include/X11/qt/qpopmenu.h
+include/X11/qt/qprinter.h
+include/X11/qt/qprndlg.h
+include/X11/qt/qprogbar.h
+include/X11/qt/qprogdlg.h
+include/X11/qt/qpsprn.h
+include/X11/qt/qptrdict.h
+include/X11/qt/qpushbt.h
+include/X11/qt/qqueue.h
+include/X11/qt/qradiobt.h
+include/X11/qt/qrangect.h
+include/X11/qt/qrect.h
+include/X11/qt/qregexp.h
+include/X11/qt/qregion.h
+include/X11/qt/qscrbar.h
+include/X11/qt/qsemimodal.h
+include/X11/qt/qshared.h
+include/X11/qt/qsignal.h
+include/X11/qt/qsize.h
+include/X11/qt/qslider.h
+include/X11/qt/qsocknot.h
+include/X11/qt/qstack.h
+include/X11/qt/qstring.h
+include/X11/qt/qstrlist.h
+include/X11/qt/qstrvec.h
+include/X11/qt/qtabbar.h
+include/X11/qt/qtabdlg.h
+include/X11/qt/qtablevw.h
+include/X11/qt/qtimer.h
+include/X11/qt/qtooltip.h
+include/X11/qt/qtstream.h
+include/X11/qt/qvalidator.h
+include/X11/qt/qvector.h
+include/X11/qt/qwidcoll.h
+include/X11/qt/qwidget.h
+include/X11/qt/qwindefs.h
+include/X11/qt/qwindow.h
+include/X11/qt/qwmatrix.h
 man/man1/moc.1.gz
+man/man3/QAccel.3qt.gz
 man/man3/QApplication.3qt.gz
 man/man3/QArray.3qt.gz
-man/man3/QBitmap.3qt.gz
+man/man3/QBitArray.3qt.gz
 man/man3/QBitVal.3qt.gz
+man/man3/QBitmap.3qt.gz
+man/man3/QBoxLayout.3qt.gz
 man/man3/QBrush.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
@@ -39,37 +161,45 @@ man/man3/QFontInfo.3qt.gz
 man/man3/QFontMetrics.3qt.gz
 man/man3/QFrame.3qt.gz
 man/man3/QGArray.3qt.gz
+man/man3/QGCache.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
 man/man3/QGList.3qt.gz
 man/man3/QGListIterator.3qt.gz
+man/man3/QGManager.3qt.gz
+man/man3/QGridLayout.3qt.gz
 man/man3/QGroupBox.3qt.gz
 man/man3/QHBoxLayout.3qt.gz
+man/man3/QIODevice.3qt.gz
 man/man3/QImage.3qt.gz
 man/man3/QImageIO.3qt.gz
 man/man3/QIntDict.3qt.gz
 man/man3/QIntDictIterator.3qt.gz
 man/man3/QIntValidator.3qt.gz
-man/man3/QIODevice.3qt.gz
 man/man3/QKeyEvent.3qt.gz
+man/man3/QLCDNumber.3qt.gz
+man/man3/QLNode.3qt.gz
 man/man3/QLabel.3qt.gz
 man/man3/QLayout.3qt.gz
-man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
+man/man3/QListBox.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QLNode.3qt.gz
+man/man3/QListIterator.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
+man/man3/QMouseEvent.3qt.gz
 man/man3/QMoveEvent.3qt.gz
 man/man3/QMovie.3qt.gz
+man/man3/QMultiLineEdit.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
+man/man3/QPaintEvent.3qt.gz
 man/man3/QPainter.3qt.gz
 man/man3/QPalette.3qt.gz
 man/man3/QPen.3qt.gz
@@ -95,6 +225,7 @@ man/man3/QRegion.3qt.gz
 man/man3/QResizeEvent.3qt.gz
 man/man3/QScrollBar.3qt.gz
 man/man3/QSemiModal.3qt.gz
+man/man3/QSenderObject.3qt.gz
 man/man3/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -102,36 +233,43 @@ man/man3/QSlider.3qt.gz
 man/man3/QSocketNotifier.3qt.gz
 man/man3/QStack.3qt.gz
 man/man3/QStrIList.3qt.gz
-man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
-man/man3/QTableView.3qt.gz
+man/man3/QString.3qt.gz
+man/man3/QTSManip.3qt.gz
+man/man3/QTabBar.3qt.gz
 man/man3/QTabDialog.3qt.gz
+man/man3/QTableView.3qt.gz
+man/man3/QTextStream.3qt.gz
 man/man3/QTime.3qt.gz
 man/man3/QTimer.3qt.gz
 man/man3/QTimerEvent.3qt.gz
 man/man3/QToolTip.3qt.gz
-man/man3/QTSManip.3qt.gz
-man/man3/QValidator.3qt.gz
+man/man3/QToolTipGroup.3qt.gz
 man/man3/QVBoxLayout.3qt.gz
+man/man3/QValidator.3qt.gz
+man/man3/QWMatrix.3qt.gz
 man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
-man/man3/QWMatrix.3qt.gz
-man/man3/qarray.3qt.gz
+man/man3/qaccel.3qt.gz
 man/man3/qapplication.3qt.gz
+man/man3/qarray.3qt.gz
+man/man3/qbitarray.3qt.gz
 man/man3/qbitmap.3qt.gz
-man/man3/qdir.3qt.gz
+man/man3/qbitval.3qt.gz
+man/man3/qboxlayout.3qt.gz
 man/man3/qbrush.3qt.gz
+man/man3/qbuffer.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qbitarray.3qt.gz
-man/man3/qbitval.3qt.gz
+man/man3/qcheckbox.3qt.gz
 man/man3/qclipboard.3qt.gz
 man/man3/qcloseevent.3qt.gz
 man/man3/qcollection.3qt.gz
 man/man3/qcolor.3qt.gz
 man/man3/qcolorgroup.3qt.gz
 man/man3/qcombobox.3qt.gz
+man/man3/qconnection.3qt.gz
 man/man3/qcursor.3qt.gz
 man/man3/qcustomevent.3qt.gz
 man/man3/qdatastream.3qt.gz
@@ -139,6 +277,9 @@ man/man3/qdate.3qt.gz
 man/man3/qdatetime.3qt.gz
 man/man3/qdialog.3qt.gz
 man/man3/qdict.3qt.gz
+man/man3/qdictiterator.3qt.gz
+man/man3/qdir.3qt.gz
+man/man3/qdoublevalidator.3qt.gz
 man/man3/qevent.3qt.gz
 man/man3/qfile.3qt.gz
 man/man3/qfiledialog.3qt.gz
@@ -150,21 +291,27 @@ man/man3/qfontmetrics.3qt.gz
 man/man3/qframe.3qt.gz
 man/man3/qgarray.3qt.gz
 man/man3/qgcache.3qt.gz
+man/man3/qgcacheiterator.3qt.gz
 man/man3/qgdict.3qt.gz
 man/man3/qgdictiterator.3qt.gz
 man/man3/qglist.3qt.gz
 man/man3/qglistiterator.3qt.gz
+man/man3/qgmanager.3qt.gz
+man/man3/qgridlayout.3qt.gz
 man/man3/qgroupbox.3qt.gz
+man/man3/qhboxlayout.3qt.gz
 man/man3/qimage.3qt.gz
 man/man3/qimageio.3qt.gz
 man/man3/qintdict.3qt.gz
 man/man3/qintdictiterator.3qt.gz
+man/man3/qintvalidator.3qt.gz
 man/man3/qiodevice.3qt.gz
 man/man3/qkeyevent.3qt.gz
 man/man3/qlabel.3qt.gz
 man/man3/qlayout.3qt.gz
+man/man3/qlcdnumber.3qt.gz
+man/man3/qlineedit.3qt.gz
 man/man3/qlist.3qt.gz
-man/man3/qpen.3qt.gz
 man/man3/qlistbox.3qt.gz
 man/man3/qlistboxitem.3qt.gz
 man/man3/qlistboxpixmap.3qt.gz
@@ -176,20 +323,27 @@ man/man3/qmenudata.3qt.gz
 man/man3/qmessagebox.3qt.gz
 man/man3/qmouseevent.3qt.gz
 man/man3/qmoveevent.3qt.gz
+man/man3/qmovie.3qt.gz
+man/man3/qmultilineedit.3qt.gz
 man/man3/qobject.3qt.gz
 man/man3/qpaintdevice.3qt.gz
 man/man3/qpaintdevicemetrics.3qt.gz
 man/man3/qpainter.3qt.gz
-man/man3/qpicture.3qt.gz
-man/man3/QGCache.3qt.gz
-man/man3/QGManager.3qt.gz
+man/man3/qpaintevent.3qt.gz
 man/man3/qpalette.3qt.gz
+man/man3/qpen.3qt.gz
+man/man3/qpicture.3qt.gz
 man/man3/qpixmap.3qt.gz
 man/man3/qpixmapcache.3qt.gz
 man/man3/qpoint.3qt.gz
 man/man3/qpointarray.3qt.gz
+man/man3/qpointval.3qt.gz
 man/man3/qpopupmenu.3qt.gz
 man/man3/qprinter.3qt.gz
+man/man3/qprogressbar.3qt.gz
+man/man3/qprogressdialog.3qt.gz
+man/man3/qptrdict.3qt.gz
+man/man3/qptrdictiterator.3qt.gz
 man/man3/qpushbutton.3qt.gz
 man/man3/qqueue.3qt.gz
 man/man3/qradiobutton.3qt.gz
@@ -199,6 +353,8 @@ man/man3/qregexp.3qt.gz
 man/man3/qregion.3qt.gz
 man/man3/qresizeevent.3qt.gz
 man/man3/qscrollbar.3qt.gz
+man/man3/qsemimodal.3qt.gz
+man/man3/qsenderobject.3qt.gz
 man/man3/qshared.3qt.gz
 man/man3/qsignal.3qt.gz
 man/man3/qsize.3qt.gz
@@ -207,178 +363,22 @@ man/man3/qsocketnotifier.3qt.gz
 man/man3/qstack.3qt.gz
 man/man3/qstrilist.3qt.gz
 man/man3/qstring.3qt.gz
+man/man3/qstrlist.3qt.gz
+man/man3/qtabbar.3qt.gz
+man/man3/qtabdialog.3qt.gz
 man/man3/qtableview.3qt.gz
 man/man3/qtextstream.3qt.gz
 man/man3/qtime.3qt.gz
 man/man3/qtimer.3qt.gz
 man/man3/qtimerevent.3qt.gz
-man/man3/qtsmanip.3qt.gz
-man/man3/QListBox.3qt.gz
-man/man3/qwidget.3qt.gz
-man/man3/qwindow.3qt.gz
-man/man3/qwmatrix.3qt.gz
-man/man3/QAccel.3qt.gz
-man/man3/QBitArray.3qt.gz
-man/man3/qaccel.3qt.gz
-man/man3/QListIterator.3qt.gz
-man/man3/qbuffer.3qt.gz
-man/man3/qcheckbox.3qt.gz
-man/man3/qconnection.3qt.gz
-man/man3/qdictiterator.3qt.gz
-man/man3/qgcacheiterator.3qt.gz
-man/man3/qlcdnumber.3qt.gz
-man/man3/qlineedit.3qt.gz
-man/man3/qmultilineedit.3qt.gz
-man/man3/qpaintevent.3qt.gz
-man/man3/qsenderobject.3qt.gz
-man/man3/qstrlist.3qt.gz
-man/man3/qtabbar.3qt.gz
 man/man3/qtooltip.3qt.gz
-man/man3/QBoxLayout.3qt.gz
-man/man3/QGridLayout.3qt.gz
-man/man3/QMouseEvent.3qt.gz
-man/man3/QMultiLineEdit.3qt.gz
-man/man3/QPaintEvent.3qt.gz
-man/man3/QSenderObject.3qt.gz
-man/man3/QTabBar.3qt.gz
-man/man3/QTextStream.3qt.gz
-man/man3/QToolTipGroup.3qt.gz
-man/man3/qboxlayout.3qt.gz
-man/man3/qgmanager.3qt.gz
-man/man3/qgridlayout.3qt.gz
-man/man3/qtabdialog.3qt.gz
 man/man3/qtooltipgroup.3qt.gz
-man/man3/qdoublevalidator.3qt.gz
-man/man3/qhboxlayout.3qt.gz
-man/man3/qintvalidator.3qt.gz
-man/man3/qmovie.3qt.gz
-man/man3/qpointval.3qt.gz
-man/man3/qprogressbar.3qt.gz
-man/man3/qprogressdialog.3qt.gz
-man/man3/qptrdict.3qt.gz
-man/man3/qptrdictiterator.3qt.gz
-man/man3/qsemimodal.3qt.gz
+man/man3/qtsmanip.3qt.gz
 man/man3/qvalidator.3qt.gz
 man/man3/qvboxlayout.3qt.gz
-include/X11/qt/qaccel.h
-include/X11/qt/qapp.h
-include/X11/qt/qarray.h
-include/X11/qt/qasyncimageio.h
-include/X11/qt/qasyncio.h
-include/X11/qt/qbitarry.h
-include/X11/qt/qbitmap.h
-include/X11/qt/qbrush.h
-include/X11/qt/qbttngrp.h
-include/X11/qt/qbuffer.h
-include/X11/qt/qbutton.h
-include/X11/qt/qcache.h
-include/X11/qt/qchkbox.h
-include/X11/qt/qclipbrd.h
-include/X11/qt/qcollect.h
-include/X11/qt/qcolor.h
-include/X11/qt/qcombo.h
-include/X11/qt/qconnect.h
-include/X11/qt/qcursor.h
-include/X11/qt/qdatetm.h
-include/X11/qt/qdialog.h
-include/X11/qt/qdict.h
-include/X11/qt/qdir.h
-include/X11/qt/qdrawutl.h
-include/X11/qt/qdstream.h
-include/X11/qt/qevent.h
-include/X11/qt/qfile.h
-include/X11/qt/qfiledef.h
-include/X11/qt/qfiledlg.h
-include/X11/qt/qfileinf.h
-include/X11/qt/qfont.h
-include/X11/qt/qfontdta.h
-include/X11/qt/qfontinf.h
-include/X11/qt/qfontmet.h
-include/X11/qt/qframe.h
-include/X11/qt/qgarray.h
-include/X11/qt/qgcache.h
-include/X11/qt/qgdict.h
-include/X11/qt/qgeneric.h
-include/X11/qt/qgl.h
-include/X11/qt/qglist.h
-include/X11/qt/qglobal.h
-include/X11/qt/qgmanagr.h
-include/X11/qt/qgrpbox.h
-include/X11/qt/qgvector.h
-include/X11/qt/qimage.h
-include/X11/qt/qimageio.h
-include/X11/qt/qintcach.h
-include/X11/qt/qintdict.h
-include/X11/qt/qiodev.h
-include/X11/qt/qjpegio.h
-include/X11/qt/qkeycode.h
-include/X11/qt/qlabel.h
-include/X11/qt/qlayout.h
-include/X11/qt/qlcdnum.h
-include/X11/qt/qlined.h
-include/X11/qt/qlist.h
-include/X11/qt/qlistbox.h
-include/X11/qt/qmenubar.h
-include/X11/qt/qmenudta.h
-include/X11/qt/qmetaobj.h
-include/X11/qt/qmlined.h
-include/X11/qt/qmovie.h
-include/X11/qt/qmsgbox.h
-include/X11/qt/qnp.h
-include/X11/qt/qobjcoll.h
-include/X11/qt/qobjdefs.h
-include/X11/qt/qobject.h
-include/X11/qt/qpaintd.h
-include/X11/qt/qpaintdc.h
-include/X11/qt/qpainter.h
-include/X11/qt/qpalette.h
-include/X11/qt/qpdevmet.h
-include/X11/qt/qpen.h
-include/X11/qt/qpicture.h
-include/X11/qt/qpixmap.h
-include/X11/qt/qpmcache.h
-include/X11/qt/qpngio.h
-include/X11/qt/qpntarry.h
-include/X11/qt/qpoint.h
-include/X11/qt/qpopmenu.h
-include/X11/qt/qprinter.h
-include/X11/qt/qprndlg.h
-include/X11/qt/qprogbar.h
-include/X11/qt/qprogdlg.h
-include/X11/qt/qpsprn.h
-include/X11/qt/qptrdict.h
-include/X11/qt/qpushbt.h
-include/X11/qt/qqueue.h
-include/X11/qt/qradiobt.h
-include/X11/qt/qrangect.h
-include/X11/qt/qrect.h
-include/X11/qt/qregexp.h
-include/X11/qt/qregion.h
-include/X11/qt/qscrbar.h
-include/X11/qt/qsemimodal.h
-include/X11/qt/qshared.h
-include/X11/qt/qsignal.h
-include/X11/qt/qsize.h
-include/X11/qt/qslider.h
-include/X11/qt/qsocknot.h
-include/X11/qt/qstack.h
-include/X11/qt/qstring.h
-include/X11/qt/qstrlist.h
-include/X11/qt/qstrvec.h
-include/X11/qt/qtabbar.h
-include/X11/qt/qtabdlg.h
-include/X11/qt/qtablevw.h
-include/X11/qt/qtimer.h
-include/X11/qt/qtooltip.h
-include/X11/qt/qtstream.h
-include/X11/qt/qvalidator.h
-include/X11/qt/qvector.h
-include/X11/qt/qwidcoll.h
-include/X11/qt/qwidget.h
-include/X11/qt/qwindefs.h
-include/X11/qt/qwindow.h
-include/X11/qt/qwmatrix.h
-bin/moc
+man/man3/qwidget.3qt.gz
+man/man3/qwindow.3qt.gz
+man/man3/qwmatrix.3qt.gz
 share/doc/qt/README
 share/doc/qt/README.QT
 @dirrm include/X11/qt
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index f882e252ca8c..bacad02d2115 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -3,115 +3,99 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.15 1998/04/11 17:45:40 andreas Exp $
+# $Id: Makefile,v 1.16 1998/04/28 02:07:56 asami Exp $
 #
 
-DISTNAME=	qt-1.31
+DISTNAME=	qt-${MAJ}.${MIN}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
-MAINTAINER=	searle@longacre.demon.co.uk
-
-BROKEN=		repository copied, awaiting upgrade to 1.33
+MAINTAINER=	andreas@FreeBSD.ORG
 
+MAJ=		1
+MIN=		33
 USE_GMAKE=	yes
 USE_X11=	yes
 
-MAN1=		moc.1
-MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
-		qbitmap.3qt qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt \
-		qbutton.3qt qbuttongroup.3qt qbytearray.3qt \
-		qcheckbox.3qt qclipboard.3qt qcloseevent.3qt \
-		qcollection.3qt qcolor.3qt qcolorgroup.3qt \
-		qcombobox.3qt qconnection.3qt qcursor.3qt \
-		qcustomevent.3qt qdatastream.3qt qdate.3qt \
-		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.3qt qdoublevalidator.3qt qevent.3qt qfile.3qt \
-		qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
-		qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt \
-		qgcache.3qt qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt \
-		qglist.3qt qglistiterator.3qt qgmanager.3qt qgridlayout.3qt \
-		qgroupbox.3qt qhboxlayout.3qt qimage.3qt \
-		qimageio.3qt qintdict.3qt qintdictiterator.3qt \
-		qintvalidator.3qt \
-		qiodevice.3qt qkeyevent.3qt qlabel.3qt qlayout.3qt \
-		qlcdnumber.3qt \
-		qlineedit.3qt qlist.3qt qlistbox.3qt qlistboxitem.3qt \
-		qlistboxpixmap.3qt qlistboxtext.3qt qlistiterator.3qt \
-		qlnode.3qt qmenubar.3qt qmenudata.3qt qmessagebox.3qt \
-		qmouseevent.3qt qmoveevent.3qt qmultilineedit.3qt qobject.3qt \
-		qmovie.3qt \
-		qpaintdevice.3qt qpaintdevicemetrics.3qt qpainter.3qt \
-		qpaintevent.3qt qpalette.3qt qpen.3qt qpicture.3qt \
-		qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
-		qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
-		qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
-		qptrdictiterator.3qt \
-		qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
-		qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt \
-		qresizeevent.3qt qscrollbar.3qt qsenderobject.3qt \
-		qsemimodal.3qt \
-		qshared.3qt qsignal.3qt qsize.3qt qslider.3qt \
-		qsocketnotifier.3qt qstack.3qt qstrilist.3qt qstring.3qt \
-		qstrlist.3qt qtabbar.3qt qtabdialog.3qt qtableview.3qt \
-		qtextstream.3qt qtime.3qt \
-		qtimer.3qt qtimerevent.3qt qtooltip.3qt qtooltipgroup.3qt \
-		qtsmanip.3qt qvalidator.3qt qvboxlayout.3qt qwidget.3qt \
-		qwindow.3qt qwmatrix.3qt QAccel.3qt QApplication.3qt \
-		QArray.3qt QBitArray.3qt QBitmap.3qt QBitVal.3qt \
-		QBoxLayout.3qt QBrush.3qt \
-		QBuffer.3qt QButton.3qt QButtonGroup.3qt \
-		QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
-		QCloseEvent.3qt QCollection.3qt QColor.3qt \
-		QColorGroup.3qt QComboBox.3qt QConnection.3qt \
-		QCursor.3qt QCustomEvent.3qt QDataStream.3qt QDate.3qt \
-		QDateTime.3qt QDialog.3qt QDict.3qt QDictIterator.3qt \
-		QDir.3qt QDoubleValidator.3qt QEvent.3qt QFile.3qt \
-		QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
-		QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt \
-		QGCache.3qt QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt \
-		QGList.3qt QGListIterator.3qt QGManager.3qt \
-		QGridLayout.3qt QGroupBox.3qt QHBoxLayout.3qt QImage.3qt \
-		QImageIO.3qt QIntDict.3qt QIntDictIterator.3qt \
-		QIntValidator.3qt \
-		QIODevice.3qt QKeyEvent.3qt QLCDNumber.3qt QLabel.3qt \
-		QLayout.3qt \
-		QLineEdit.3qt QList.3qt QListBox.3qt QListBoxItem.3qt \
-		QListBoxPixmap.3qt QListBoxText.3qt QListIterator.3qt \
-		QLNode.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
-		QMovie.3qt \
-		QMouseEvent.3qt QMoveEvent.3qt QMultiLineEdit.3qt QObject.3qt \
-		QPaintDevice.3qt QPaintDeviceMetrics.3qt QPainter.3qt \
-		QPaintEvent.3qt QPalette.3qt QPen.3qt QPicture.3qt \
-		QPixmap.3qt QPixmapCache.3qt QPoint.3qt QPointVal.3qt\
-		QPointArray.3qt QPopupMenu.3qt QPrinter.3qt \
-		QProgressBar.3qt QProgressDialog.3qt \
-		QPtrDict.3qt QPtrDictIterator.3qt \
-		QPushButton.3qt QQueue.3qt QRadioButton.3qt \
-		QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
-		QResizeEvent.3qt QScrollBar.3qt QSenderObject.3qt \
-		QSemiModal.3qt QVBoxLayout.3qt QValidator.3qt \
-		QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt \
-		QSocketNotifier.3qt QStack.3qt QStrIList.3qt QString.3qt \
-		QStrList.3qt QTabBar.3qt QTabDialog.3qt QTableView.3qt \
-		QTextStream.3qt QTime.3qt \
-		QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
-		QTSManip.3qt QWidget.3qt QWindow.3qt QWMatrix.3qt
+MAN1=	moc.1
+MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QBitArray.3qt QBitVal.3qt \
+	QBitmap.3qt QBoxLayout.3qt QBrush.3qt QBuffer.3qt QButton.3qt \
+	QButtonGroup.3qt QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
+	QCloseEvent.3qt QCollection.3qt QColor.3qt QColorGroup.3qt \
+	QComboBox.3qt QConnection.3qt QCursor.3qt QCustomEvent.3qt \
+	QDataStream.3qt QDate.3qt QDateTime.3qt QDialog.3qt QDict.3qt \
+	QDictIterator.3qt QDir.3qt QDoubleValidator.3qt QEvent.3qt \
+	QFile.3qt QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
+	QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt QGCache.3qt \
+	QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt QGList.3qt \
+	QGListIterator.3qt QGManager.3qt QGridLayout.3qt QGroupBox.3qt \
+	QHBoxLayout.3qt QIODevice.3qt QImage.3qt QImageIO.3qt QIntDict.3qt \
+	QIntDictIterator.3qt QIntValidator.3qt QKeyEvent.3qt QLCDNumber.3qt \
+	QLNode.3qt QLabel.3qt QLayout.3qt QLineEdit.3qt QList.3qt \
+	QListBox.3qt QListBoxItem.3qt QListBoxPixmap.3qt QListBoxText.3qt \
+	QListIterator.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
+	QMouseEvent.3qt QMoveEvent.3qt QMovie.3qt QMultiLineEdit.3qt \
+	QObject.3qt QPaintDevice.3qt QPaintDeviceMetrics.3qt QPaintEvent.3qt \
+	QPainter.3qt QPalette.3qt QPen.3qt QPicture.3qt QPixmap.3qt \
+	QPixmapCache.3qt QPoint.3qt QPointArray.3qt QPointVal.3qt \
+	QPopupMenu.3qt QPrinter.3qt QProgressBar.3qt QProgressDialog.3qt \
+	QPtrDict.3qt QPtrDictIterator.3qt QPushButton.3qt QQueue.3qt \
+	QRadioButton.3qt QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
+	QResizeEvent.3qt QScrollBar.3qt QSemiModal.3qt QSenderObject.3qt \
+	QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt QSocketNotifier.3qt \
+	QStack.3qt QStrIList.3qt QStrList.3qt QString.3qt QTSManip.3qt \
+	QTabBar.3qt QTabDialog.3qt QTableView.3qt QTextStream.3qt QTime.3qt \
+	QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
+	QVBoxLayout.3qt QValidator.3qt QWMatrix.3qt QWidget.3qt QWindow.3qt \
+	qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt qbitmap.3qt \
+	qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt qbutton.3qt \
+	qbuttongroup.3qt qbytearray.3qt qcheckbox.3qt qclipboard.3qt \
+	qcloseevent.3qt qcollection.3qt qcolor.3qt qcolorgroup.3qt \
+	qcombobox.3qt qconnection.3qt qcursor.3qt qcustomevent.3qt \
+	qdatastream.3qt qdate.3qt qdatetime.3qt qdialog.3qt qdict.3qt \
+	qdictiterator.3qt qdir.3qt qdoublevalidator.3qt qevent.3qt \
+	qfile.3qt qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
+	qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt qgcache.3qt \
+	qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt qglist.3qt \
+	qglistiterator.3qt qgmanager.3qt qgridlayout.3qt qgroupbox.3qt \
+	qhboxlayout.3qt qimage.3qt qimageio.3qt qintdict.3qt \
+	qintdictiterator.3qt qintvalidator.3qt qiodevice.3qt qkeyevent.3qt \
+	qlabel.3qt qlayout.3qt qlcdnumber.3qt qlineedit.3qt qlist.3qt \
+	qlistbox.3qt qlistboxitem.3qt qlistboxpixmap.3qt qlistboxtext.3qt \
+	qlistiterator.3qt qlnode.3qt qmenubar.3qt qmenudata.3qt \
+	qmessagebox.3qt qmouseevent.3qt qmoveevent.3qt qmovie.3qt \
+	qmultilineedit.3qt qobject.3qt qpaintdevice.3qt \
+	qpaintdevicemetrics.3qt qpainter.3qt qpaintevent.3qt qpalette.3qt \
+	qpen.3qt qpicture.3qt qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
+	qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
+	qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
+	qptrdictiterator.3qt qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
+	qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt qresizeevent.3qt \
+	qscrollbar.3qt qsemimodal.3qt qsenderobject.3qt qshared.3qt \
+	qsignal.3qt qsize.3qt qslider.3qt qsocketnotifier.3qt qstack.3qt \
+	qstrilist.3qt qstring.3qt qstrlist.3qt qtabbar.3qt qtabdialog.3qt \
+	qtableview.3qt qtextstream.3qt qtime.3qt qtimer.3qt qtimerevent.3qt \
+	qtooltip.3qt qtooltipgroup.3qt qtsmanip.3qt qvalidator.3qt \
+	qvboxlayout.3qt qwidget.3qt qwindow.3qt qwmatrix.3qt
 
 post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
-	${LN} -sf $(X11BASE)/lib/libqt.so.1.31 $(X11BASE)/lib/libqt.so
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-${MAJ}.${MIN}/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${MAJ}.${MIN} \
+		$(X11BASE)/lib
+	${LN} -sf $(X11BASE)/lib/libqt.so.${MAJ}.${MIN} $(X11BASE)/lib/libqt.so
 	${LDCONFIG} -m $(PREFIX)/lib
 	${MKDIR} $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man3/* $(PREFIX)/man/man3
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/include/* \
+		$(PREFIX)/include/X11/qt
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man1/* $(PREFIX)/man/man1
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man3/* $(PREFIX)/man/man3
 	${MKDIR} ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README.QT ${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README \
+		${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README.QT \
+		${PREFIX}/share/doc/qt
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt23/distinfo b/x11-toolkits/qt23/distinfo
index e712bdb4e580..004f1c20b643 100644
--- a/x11-toolkits/qt23/distinfo
+++ b/x11-toolkits/qt23/distinfo
@@ -1 +1 @@
-MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
+MD5 (qt-1.33.tar.gz) = 6136b589c0d611f55deae45bc8ee2af7
diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist
index 695c9a3a7f8e..20cc37259181 100644
--- a/x11-toolkits/qt23/pkg-plist
+++ b/x11-toolkits/qt23/pkg-plist
@@ -1,11 +1,133 @@
-lib/libqt.so.1.31
 lib/libqt.so
+lib/libqt.so.1.33
 @exec /sbin/ldconfig -m %B
+bin/moc
+include/X11/qt/qaccel.h
+include/X11/qt/qapp.h
+include/X11/qt/qarray.h
+include/X11/qt/qasyncimageio.h
+include/X11/qt/qasyncio.h
+include/X11/qt/qbitarry.h
+include/X11/qt/qbitmap.h
+include/X11/qt/qbrush.h
+include/X11/qt/qbttngrp.h
+include/X11/qt/qbuffer.h
+include/X11/qt/qbutton.h
+include/X11/qt/qcache.h
+include/X11/qt/qchkbox.h
+include/X11/qt/qclipbrd.h
+include/X11/qt/qcollect.h
+include/X11/qt/qcolor.h
+include/X11/qt/qcombo.h
+include/X11/qt/qconnect.h
+include/X11/qt/qcursor.h
+include/X11/qt/qdatetm.h
+include/X11/qt/qdialog.h
+include/X11/qt/qdict.h
+include/X11/qt/qdir.h
+include/X11/qt/qdrawutl.h
+include/X11/qt/qdstream.h
+include/X11/qt/qevent.h
+include/X11/qt/qfile.h
+include/X11/qt/qfiledef.h
+include/X11/qt/qfiledlg.h
+include/X11/qt/qfileinf.h
+include/X11/qt/qfont.h
+include/X11/qt/qfontdta.h
+include/X11/qt/qfontinf.h
+include/X11/qt/qfontmet.h
+include/X11/qt/qframe.h
+include/X11/qt/qgarray.h
+include/X11/qt/qgcache.h
+include/X11/qt/qgdict.h
+include/X11/qt/qgeneric.h
+include/X11/qt/qgl.h
+include/X11/qt/qglist.h
+include/X11/qt/qglobal.h
+include/X11/qt/qgmanagr.h
+include/X11/qt/qgrpbox.h
+include/X11/qt/qgvector.h
+include/X11/qt/qimage.h
+include/X11/qt/qimageio.h
+include/X11/qt/qintcach.h
+include/X11/qt/qintdict.h
+include/X11/qt/qiodev.h
+include/X11/qt/qjpegio.h
+include/X11/qt/qkeycode.h
+include/X11/qt/qlabel.h
+include/X11/qt/qlayout.h
+include/X11/qt/qlcdnum.h
+include/X11/qt/qlined.h
+include/X11/qt/qlist.h
+include/X11/qt/qlistbox.h
+include/X11/qt/qmenubar.h
+include/X11/qt/qmenudta.h
+include/X11/qt/qmetaobj.h
+include/X11/qt/qmlined.h
+include/X11/qt/qmovie.h
+include/X11/qt/qmsgbox.h
+include/X11/qt/qnp.h
+include/X11/qt/qobjcoll.h
+include/X11/qt/qobjdefs.h
+include/X11/qt/qobject.h
+include/X11/qt/qpaintd.h
+include/X11/qt/qpaintdc.h
+include/X11/qt/qpainter.h
+include/X11/qt/qpalette.h
+include/X11/qt/qpdevmet.h
+include/X11/qt/qpen.h
+include/X11/qt/qpicture.h
+include/X11/qt/qpixmap.h
+include/X11/qt/qpmcache.h
+include/X11/qt/qpngio.h
+include/X11/qt/qpntarry.h
+include/X11/qt/qpoint.h
+include/X11/qt/qpopmenu.h
+include/X11/qt/qprinter.h
+include/X11/qt/qprndlg.h
+include/X11/qt/qprogbar.h
+include/X11/qt/qprogdlg.h
+include/X11/qt/qpsprn.h
+include/X11/qt/qptrdict.h
+include/X11/qt/qpushbt.h
+include/X11/qt/qqueue.h
+include/X11/qt/qradiobt.h
+include/X11/qt/qrangect.h
+include/X11/qt/qrect.h
+include/X11/qt/qregexp.h
+include/X11/qt/qregion.h
+include/X11/qt/qscrbar.h
+include/X11/qt/qsemimodal.h
+include/X11/qt/qshared.h
+include/X11/qt/qsignal.h
+include/X11/qt/qsize.h
+include/X11/qt/qslider.h
+include/X11/qt/qsocknot.h
+include/X11/qt/qstack.h
+include/X11/qt/qstring.h
+include/X11/qt/qstrlist.h
+include/X11/qt/qstrvec.h
+include/X11/qt/qtabbar.h
+include/X11/qt/qtabdlg.h
+include/X11/qt/qtablevw.h
+include/X11/qt/qtimer.h
+include/X11/qt/qtooltip.h
+include/X11/qt/qtstream.h
+include/X11/qt/qvalidator.h
+include/X11/qt/qvector.h
+include/X11/qt/qwidcoll.h
+include/X11/qt/qwidget.h
+include/X11/qt/qwindefs.h
+include/X11/qt/qwindow.h
+include/X11/qt/qwmatrix.h
 man/man1/moc.1.gz
+man/man3/QAccel.3qt.gz
 man/man3/QApplication.3qt.gz
 man/man3/QArray.3qt.gz
-man/man3/QBitmap.3qt.gz
+man/man3/QBitArray.3qt.gz
 man/man3/QBitVal.3qt.gz
+man/man3/QBitmap.3qt.gz
+man/man3/QBoxLayout.3qt.gz
 man/man3/QBrush.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
@@ -39,37 +161,45 @@ man/man3/QFontInfo.3qt.gz
 man/man3/QFontMetrics.3qt.gz
 man/man3/QFrame.3qt.gz
 man/man3/QGArray.3qt.gz
+man/man3/QGCache.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
 man/man3/QGList.3qt.gz
 man/man3/QGListIterator.3qt.gz
+man/man3/QGManager.3qt.gz
+man/man3/QGridLayout.3qt.gz
 man/man3/QGroupBox.3qt.gz
 man/man3/QHBoxLayout.3qt.gz
+man/man3/QIODevice.3qt.gz
 man/man3/QImage.3qt.gz
 man/man3/QImageIO.3qt.gz
 man/man3/QIntDict.3qt.gz
 man/man3/QIntDictIterator.3qt.gz
 man/man3/QIntValidator.3qt.gz
-man/man3/QIODevice.3qt.gz
 man/man3/QKeyEvent.3qt.gz
+man/man3/QLCDNumber.3qt.gz
+man/man3/QLNode.3qt.gz
 man/man3/QLabel.3qt.gz
 man/man3/QLayout.3qt.gz
-man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
+man/man3/QListBox.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QLNode.3qt.gz
+man/man3/QListIterator.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
+man/man3/QMouseEvent.3qt.gz
 man/man3/QMoveEvent.3qt.gz
 man/man3/QMovie.3qt.gz
+man/man3/QMultiLineEdit.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
+man/man3/QPaintEvent.3qt.gz
 man/man3/QPainter.3qt.gz
 man/man3/QPalette.3qt.gz
 man/man3/QPen.3qt.gz
@@ -95,6 +225,7 @@ man/man3/QRegion.3qt.gz
 man/man3/QResizeEvent.3qt.gz
 man/man3/QScrollBar.3qt.gz
 man/man3/QSemiModal.3qt.gz
+man/man3/QSenderObject.3qt.gz
 man/man3/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -102,36 +233,43 @@ man/man3/QSlider.3qt.gz
 man/man3/QSocketNotifier.3qt.gz
 man/man3/QStack.3qt.gz
 man/man3/QStrIList.3qt.gz
-man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
-man/man3/QTableView.3qt.gz
+man/man3/QString.3qt.gz
+man/man3/QTSManip.3qt.gz
+man/man3/QTabBar.3qt.gz
 man/man3/QTabDialog.3qt.gz
+man/man3/QTableView.3qt.gz
+man/man3/QTextStream.3qt.gz
 man/man3/QTime.3qt.gz
 man/man3/QTimer.3qt.gz
 man/man3/QTimerEvent.3qt.gz
 man/man3/QToolTip.3qt.gz
-man/man3/QTSManip.3qt.gz
-man/man3/QValidator.3qt.gz
+man/man3/QToolTipGroup.3qt.gz
 man/man3/QVBoxLayout.3qt.gz
+man/man3/QValidator.3qt.gz
+man/man3/QWMatrix.3qt.gz
 man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
-man/man3/QWMatrix.3qt.gz
-man/man3/qarray.3qt.gz
+man/man3/qaccel.3qt.gz
 man/man3/qapplication.3qt.gz
+man/man3/qarray.3qt.gz
+man/man3/qbitarray.3qt.gz
 man/man3/qbitmap.3qt.gz
-man/man3/qdir.3qt.gz
+man/man3/qbitval.3qt.gz
+man/man3/qboxlayout.3qt.gz
 man/man3/qbrush.3qt.gz
+man/man3/qbuffer.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qbitarray.3qt.gz
-man/man3/qbitval.3qt.gz
+man/man3/qcheckbox.3qt.gz
 man/man3/qclipboard.3qt.gz
 man/man3/qcloseevent.3qt.gz
 man/man3/qcollection.3qt.gz
 man/man3/qcolor.3qt.gz
 man/man3/qcolorgroup.3qt.gz
 man/man3/qcombobox.3qt.gz
+man/man3/qconnection.3qt.gz
 man/man3/qcursor.3qt.gz
 man/man3/qcustomevent.3qt.gz
 man/man3/qdatastream.3qt.gz
@@ -139,6 +277,9 @@ man/man3/qdate.3qt.gz
 man/man3/qdatetime.3qt.gz
 man/man3/qdialog.3qt.gz
 man/man3/qdict.3qt.gz
+man/man3/qdictiterator.3qt.gz
+man/man3/qdir.3qt.gz
+man/man3/qdoublevalidator.3qt.gz
 man/man3/qevent.3qt.gz
 man/man3/qfile.3qt.gz
 man/man3/qfiledialog.3qt.gz
@@ -150,21 +291,27 @@ man/man3/qfontmetrics.3qt.gz
 man/man3/qframe.3qt.gz
 man/man3/qgarray.3qt.gz
 man/man3/qgcache.3qt.gz
+man/man3/qgcacheiterator.3qt.gz
 man/man3/qgdict.3qt.gz
 man/man3/qgdictiterator.3qt.gz
 man/man3/qglist.3qt.gz
 man/man3/qglistiterator.3qt.gz
+man/man3/qgmanager.3qt.gz
+man/man3/qgridlayout.3qt.gz
 man/man3/qgroupbox.3qt.gz
+man/man3/qhboxlayout.3qt.gz
 man/man3/qimage.3qt.gz
 man/man3/qimageio.3qt.gz
 man/man3/qintdict.3qt.gz
 man/man3/qintdictiterator.3qt.gz
+man/man3/qintvalidator.3qt.gz
 man/man3/qiodevice.3qt.gz
 man/man3/qkeyevent.3qt.gz
 man/man3/qlabel.3qt.gz
 man/man3/qlayout.3qt.gz
+man/man3/qlcdnumber.3qt.gz
+man/man3/qlineedit.3qt.gz
 man/man3/qlist.3qt.gz
-man/man3/qpen.3qt.gz
 man/man3/qlistbox.3qt.gz
 man/man3/qlistboxitem.3qt.gz
 man/man3/qlistboxpixmap.3qt.gz
@@ -176,20 +323,27 @@ man/man3/qmenudata.3qt.gz
 man/man3/qmessagebox.3qt.gz
 man/man3/qmouseevent.3qt.gz
 man/man3/qmoveevent.3qt.gz
+man/man3/qmovie.3qt.gz
+man/man3/qmultilineedit.3qt.gz
 man/man3/qobject.3qt.gz
 man/man3/qpaintdevice.3qt.gz
 man/man3/qpaintdevicemetrics.3qt.gz
 man/man3/qpainter.3qt.gz
-man/man3/qpicture.3qt.gz
-man/man3/QGCache.3qt.gz
-man/man3/QGManager.3qt.gz
+man/man3/qpaintevent.3qt.gz
 man/man3/qpalette.3qt.gz
+man/man3/qpen.3qt.gz
+man/man3/qpicture.3qt.gz
 man/man3/qpixmap.3qt.gz
 man/man3/qpixmapcache.3qt.gz
 man/man3/qpoint.3qt.gz
 man/man3/qpointarray.3qt.gz
+man/man3/qpointval.3qt.gz
 man/man3/qpopupmenu.3qt.gz
 man/man3/qprinter.3qt.gz
+man/man3/qprogressbar.3qt.gz
+man/man3/qprogressdialog.3qt.gz
+man/man3/qptrdict.3qt.gz
+man/man3/qptrdictiterator.3qt.gz
 man/man3/qpushbutton.3qt.gz
 man/man3/qqueue.3qt.gz
 man/man3/qradiobutton.3qt.gz
@@ -199,6 +353,8 @@ man/man3/qregexp.3qt.gz
 man/man3/qregion.3qt.gz
 man/man3/qresizeevent.3qt.gz
 man/man3/qscrollbar.3qt.gz
+man/man3/qsemimodal.3qt.gz
+man/man3/qsenderobject.3qt.gz
 man/man3/qshared.3qt.gz
 man/man3/qsignal.3qt.gz
 man/man3/qsize.3qt.gz
@@ -207,178 +363,22 @@ man/man3/qsocketnotifier.3qt.gz
 man/man3/qstack.3qt.gz
 man/man3/qstrilist.3qt.gz
 man/man3/qstring.3qt.gz
+man/man3/qstrlist.3qt.gz
+man/man3/qtabbar.3qt.gz
+man/man3/qtabdialog.3qt.gz
 man/man3/qtableview.3qt.gz
 man/man3/qtextstream.3qt.gz
 man/man3/qtime.3qt.gz
 man/man3/qtimer.3qt.gz
 man/man3/qtimerevent.3qt.gz
-man/man3/qtsmanip.3qt.gz
-man/man3/QListBox.3qt.gz
-man/man3/qwidget.3qt.gz
-man/man3/qwindow.3qt.gz
-man/man3/qwmatrix.3qt.gz
-man/man3/QAccel.3qt.gz
-man/man3/QBitArray.3qt.gz
-man/man3/qaccel.3qt.gz
-man/man3/QListIterator.3qt.gz
-man/man3/qbuffer.3qt.gz
-man/man3/qcheckbox.3qt.gz
-man/man3/qconnection.3qt.gz
-man/man3/qdictiterator.3qt.gz
-man/man3/qgcacheiterator.3qt.gz
-man/man3/qlcdnumber.3qt.gz
-man/man3/qlineedit.3qt.gz
-man/man3/qmultilineedit.3qt.gz
-man/man3/qpaintevent.3qt.gz
-man/man3/qsenderobject.3qt.gz
-man/man3/qstrlist.3qt.gz
-man/man3/qtabbar.3qt.gz
 man/man3/qtooltip.3qt.gz
-man/man3/QBoxLayout.3qt.gz
-man/man3/QGridLayout.3qt.gz
-man/man3/QMouseEvent.3qt.gz
-man/man3/QMultiLineEdit.3qt.gz
-man/man3/QPaintEvent.3qt.gz
-man/man3/QSenderObject.3qt.gz
-man/man3/QTabBar.3qt.gz
-man/man3/QTextStream.3qt.gz
-man/man3/QToolTipGroup.3qt.gz
-man/man3/qboxlayout.3qt.gz
-man/man3/qgmanager.3qt.gz
-man/man3/qgridlayout.3qt.gz
-man/man3/qtabdialog.3qt.gz
 man/man3/qtooltipgroup.3qt.gz
-man/man3/qdoublevalidator.3qt.gz
-man/man3/qhboxlayout.3qt.gz
-man/man3/qintvalidator.3qt.gz
-man/man3/qmovie.3qt.gz
-man/man3/qpointval.3qt.gz
-man/man3/qprogressbar.3qt.gz
-man/man3/qprogressdialog.3qt.gz
-man/man3/qptrdict.3qt.gz
-man/man3/qptrdictiterator.3qt.gz
-man/man3/qsemimodal.3qt.gz
+man/man3/qtsmanip.3qt.gz
 man/man3/qvalidator.3qt.gz
 man/man3/qvboxlayout.3qt.gz
-include/X11/qt/qaccel.h
-include/X11/qt/qapp.h
-include/X11/qt/qarray.h
-include/X11/qt/qasyncimageio.h
-include/X11/qt/qasyncio.h
-include/X11/qt/qbitarry.h
-include/X11/qt/qbitmap.h
-include/X11/qt/qbrush.h
-include/X11/qt/qbttngrp.h
-include/X11/qt/qbuffer.h
-include/X11/qt/qbutton.h
-include/X11/qt/qcache.h
-include/X11/qt/qchkbox.h
-include/X11/qt/qclipbrd.h
-include/X11/qt/qcollect.h
-include/X11/qt/qcolor.h
-include/X11/qt/qcombo.h
-include/X11/qt/qconnect.h
-include/X11/qt/qcursor.h
-include/X11/qt/qdatetm.h
-include/X11/qt/qdialog.h
-include/X11/qt/qdict.h
-include/X11/qt/qdir.h
-include/X11/qt/qdrawutl.h
-include/X11/qt/qdstream.h
-include/X11/qt/qevent.h
-include/X11/qt/qfile.h
-include/X11/qt/qfiledef.h
-include/X11/qt/qfiledlg.h
-include/X11/qt/qfileinf.h
-include/X11/qt/qfont.h
-include/X11/qt/qfontdta.h
-include/X11/qt/qfontinf.h
-include/X11/qt/qfontmet.h
-include/X11/qt/qframe.h
-include/X11/qt/qgarray.h
-include/X11/qt/qgcache.h
-include/X11/qt/qgdict.h
-include/X11/qt/qgeneric.h
-include/X11/qt/qgl.h
-include/X11/qt/qglist.h
-include/X11/qt/qglobal.h
-include/X11/qt/qgmanagr.h
-include/X11/qt/qgrpbox.h
-include/X11/qt/qgvector.h
-include/X11/qt/qimage.h
-include/X11/qt/qimageio.h
-include/X11/qt/qintcach.h
-include/X11/qt/qintdict.h
-include/X11/qt/qiodev.h
-include/X11/qt/qjpegio.h
-include/X11/qt/qkeycode.h
-include/X11/qt/qlabel.h
-include/X11/qt/qlayout.h
-include/X11/qt/qlcdnum.h
-include/X11/qt/qlined.h
-include/X11/qt/qlist.h
-include/X11/qt/qlistbox.h
-include/X11/qt/qmenubar.h
-include/X11/qt/qmenudta.h
-include/X11/qt/qmetaobj.h
-include/X11/qt/qmlined.h
-include/X11/qt/qmovie.h
-include/X11/qt/qmsgbox.h
-include/X11/qt/qnp.h
-include/X11/qt/qobjcoll.h
-include/X11/qt/qobjdefs.h
-include/X11/qt/qobject.h
-include/X11/qt/qpaintd.h
-include/X11/qt/qpaintdc.h
-include/X11/qt/qpainter.h
-include/X11/qt/qpalette.h
-include/X11/qt/qpdevmet.h
-include/X11/qt/qpen.h
-include/X11/qt/qpicture.h
-include/X11/qt/qpixmap.h
-include/X11/qt/qpmcache.h
-include/X11/qt/qpngio.h
-include/X11/qt/qpntarry.h
-include/X11/qt/qpoint.h
-include/X11/qt/qpopmenu.h
-include/X11/qt/qprinter.h
-include/X11/qt/qprndlg.h
-include/X11/qt/qprogbar.h
-include/X11/qt/qprogdlg.h
-include/X11/qt/qpsprn.h
-include/X11/qt/qptrdict.h
-include/X11/qt/qpushbt.h
-include/X11/qt/qqueue.h
-include/X11/qt/qradiobt.h
-include/X11/qt/qrangect.h
-include/X11/qt/qrect.h
-include/X11/qt/qregexp.h
-include/X11/qt/qregion.h
-include/X11/qt/qscrbar.h
-include/X11/qt/qsemimodal.h
-include/X11/qt/qshared.h
-include/X11/qt/qsignal.h
-include/X11/qt/qsize.h
-include/X11/qt/qslider.h
-include/X11/qt/qsocknot.h
-include/X11/qt/qstack.h
-include/X11/qt/qstring.h
-include/X11/qt/qstrlist.h
-include/X11/qt/qstrvec.h
-include/X11/qt/qtabbar.h
-include/X11/qt/qtabdlg.h
-include/X11/qt/qtablevw.h
-include/X11/qt/qtimer.h
-include/X11/qt/qtooltip.h
-include/X11/qt/qtstream.h
-include/X11/qt/qvalidator.h
-include/X11/qt/qvector.h
-include/X11/qt/qwidcoll.h
-include/X11/qt/qwidget.h
-include/X11/qt/qwindefs.h
-include/X11/qt/qwindow.h
-include/X11/qt/qwmatrix.h
-bin/moc
+man/man3/qwidget.3qt.gz
+man/man3/qwindow.3qt.gz
+man/man3/qwmatrix.3qt.gz
 share/doc/qt/README
 share/doc/qt/README.QT
 @dirrm include/X11/qt
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index f882e252ca8c..bacad02d2115 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -3,115 +3,99 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.15 1998/04/11 17:45:40 andreas Exp $
+# $Id: Makefile,v 1.16 1998/04/28 02:07:56 asami Exp $
 #
 
-DISTNAME=	qt-1.31
+DISTNAME=	qt-${MAJ}.${MIN}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
-MAINTAINER=	searle@longacre.demon.co.uk
-
-BROKEN=		repository copied, awaiting upgrade to 1.33
+MAINTAINER=	andreas@FreeBSD.ORG
 
+MAJ=		1
+MIN=		33
 USE_GMAKE=	yes
 USE_X11=	yes
 
-MAN1=		moc.1
-MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
-		qbitmap.3qt qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt \
-		qbutton.3qt qbuttongroup.3qt qbytearray.3qt \
-		qcheckbox.3qt qclipboard.3qt qcloseevent.3qt \
-		qcollection.3qt qcolor.3qt qcolorgroup.3qt \
-		qcombobox.3qt qconnection.3qt qcursor.3qt \
-		qcustomevent.3qt qdatastream.3qt qdate.3qt \
-		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.3qt qdoublevalidator.3qt qevent.3qt qfile.3qt \
-		qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
-		qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt \
-		qgcache.3qt qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt \
-		qglist.3qt qglistiterator.3qt qgmanager.3qt qgridlayout.3qt \
-		qgroupbox.3qt qhboxlayout.3qt qimage.3qt \
-		qimageio.3qt qintdict.3qt qintdictiterator.3qt \
-		qintvalidator.3qt \
-		qiodevice.3qt qkeyevent.3qt qlabel.3qt qlayout.3qt \
-		qlcdnumber.3qt \
-		qlineedit.3qt qlist.3qt qlistbox.3qt qlistboxitem.3qt \
-		qlistboxpixmap.3qt qlistboxtext.3qt qlistiterator.3qt \
-		qlnode.3qt qmenubar.3qt qmenudata.3qt qmessagebox.3qt \
-		qmouseevent.3qt qmoveevent.3qt qmultilineedit.3qt qobject.3qt \
-		qmovie.3qt \
-		qpaintdevice.3qt qpaintdevicemetrics.3qt qpainter.3qt \
-		qpaintevent.3qt qpalette.3qt qpen.3qt qpicture.3qt \
-		qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
-		qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
-		qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
-		qptrdictiterator.3qt \
-		qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
-		qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt \
-		qresizeevent.3qt qscrollbar.3qt qsenderobject.3qt \
-		qsemimodal.3qt \
-		qshared.3qt qsignal.3qt qsize.3qt qslider.3qt \
-		qsocketnotifier.3qt qstack.3qt qstrilist.3qt qstring.3qt \
-		qstrlist.3qt qtabbar.3qt qtabdialog.3qt qtableview.3qt \
-		qtextstream.3qt qtime.3qt \
-		qtimer.3qt qtimerevent.3qt qtooltip.3qt qtooltipgroup.3qt \
-		qtsmanip.3qt qvalidator.3qt qvboxlayout.3qt qwidget.3qt \
-		qwindow.3qt qwmatrix.3qt QAccel.3qt QApplication.3qt \
-		QArray.3qt QBitArray.3qt QBitmap.3qt QBitVal.3qt \
-		QBoxLayout.3qt QBrush.3qt \
-		QBuffer.3qt QButton.3qt QButtonGroup.3qt \
-		QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
-		QCloseEvent.3qt QCollection.3qt QColor.3qt \
-		QColorGroup.3qt QComboBox.3qt QConnection.3qt \
-		QCursor.3qt QCustomEvent.3qt QDataStream.3qt QDate.3qt \
-		QDateTime.3qt QDialog.3qt QDict.3qt QDictIterator.3qt \
-		QDir.3qt QDoubleValidator.3qt QEvent.3qt QFile.3qt \
-		QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
-		QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt \
-		QGCache.3qt QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt \
-		QGList.3qt QGListIterator.3qt QGManager.3qt \
-		QGridLayout.3qt QGroupBox.3qt QHBoxLayout.3qt QImage.3qt \
-		QImageIO.3qt QIntDict.3qt QIntDictIterator.3qt \
-		QIntValidator.3qt \
-		QIODevice.3qt QKeyEvent.3qt QLCDNumber.3qt QLabel.3qt \
-		QLayout.3qt \
-		QLineEdit.3qt QList.3qt QListBox.3qt QListBoxItem.3qt \
-		QListBoxPixmap.3qt QListBoxText.3qt QListIterator.3qt \
-		QLNode.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
-		QMovie.3qt \
-		QMouseEvent.3qt QMoveEvent.3qt QMultiLineEdit.3qt QObject.3qt \
-		QPaintDevice.3qt QPaintDeviceMetrics.3qt QPainter.3qt \
-		QPaintEvent.3qt QPalette.3qt QPen.3qt QPicture.3qt \
-		QPixmap.3qt QPixmapCache.3qt QPoint.3qt QPointVal.3qt\
-		QPointArray.3qt QPopupMenu.3qt QPrinter.3qt \
-		QProgressBar.3qt QProgressDialog.3qt \
-		QPtrDict.3qt QPtrDictIterator.3qt \
-		QPushButton.3qt QQueue.3qt QRadioButton.3qt \
-		QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
-		QResizeEvent.3qt QScrollBar.3qt QSenderObject.3qt \
-		QSemiModal.3qt QVBoxLayout.3qt QValidator.3qt \
-		QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt \
-		QSocketNotifier.3qt QStack.3qt QStrIList.3qt QString.3qt \
-		QStrList.3qt QTabBar.3qt QTabDialog.3qt QTableView.3qt \
-		QTextStream.3qt QTime.3qt \
-		QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
-		QTSManip.3qt QWidget.3qt QWindow.3qt QWMatrix.3qt
+MAN1=	moc.1
+MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QBitArray.3qt QBitVal.3qt \
+	QBitmap.3qt QBoxLayout.3qt QBrush.3qt QBuffer.3qt QButton.3qt \
+	QButtonGroup.3qt QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
+	QCloseEvent.3qt QCollection.3qt QColor.3qt QColorGroup.3qt \
+	QComboBox.3qt QConnection.3qt QCursor.3qt QCustomEvent.3qt \
+	QDataStream.3qt QDate.3qt QDateTime.3qt QDialog.3qt QDict.3qt \
+	QDictIterator.3qt QDir.3qt QDoubleValidator.3qt QEvent.3qt \
+	QFile.3qt QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
+	QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt QGCache.3qt \
+	QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt QGList.3qt \
+	QGListIterator.3qt QGManager.3qt QGridLayout.3qt QGroupBox.3qt \
+	QHBoxLayout.3qt QIODevice.3qt QImage.3qt QImageIO.3qt QIntDict.3qt \
+	QIntDictIterator.3qt QIntValidator.3qt QKeyEvent.3qt QLCDNumber.3qt \
+	QLNode.3qt QLabel.3qt QLayout.3qt QLineEdit.3qt QList.3qt \
+	QListBox.3qt QListBoxItem.3qt QListBoxPixmap.3qt QListBoxText.3qt \
+	QListIterator.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
+	QMouseEvent.3qt QMoveEvent.3qt QMovie.3qt QMultiLineEdit.3qt \
+	QObject.3qt QPaintDevice.3qt QPaintDeviceMetrics.3qt QPaintEvent.3qt \
+	QPainter.3qt QPalette.3qt QPen.3qt QPicture.3qt QPixmap.3qt \
+	QPixmapCache.3qt QPoint.3qt QPointArray.3qt QPointVal.3qt \
+	QPopupMenu.3qt QPrinter.3qt QProgressBar.3qt QProgressDialog.3qt \
+	QPtrDict.3qt QPtrDictIterator.3qt QPushButton.3qt QQueue.3qt \
+	QRadioButton.3qt QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
+	QResizeEvent.3qt QScrollBar.3qt QSemiModal.3qt QSenderObject.3qt \
+	QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt QSocketNotifier.3qt \
+	QStack.3qt QStrIList.3qt QStrList.3qt QString.3qt QTSManip.3qt \
+	QTabBar.3qt QTabDialog.3qt QTableView.3qt QTextStream.3qt QTime.3qt \
+	QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
+	QVBoxLayout.3qt QValidator.3qt QWMatrix.3qt QWidget.3qt QWindow.3qt \
+	qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt qbitmap.3qt \
+	qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt qbutton.3qt \
+	qbuttongroup.3qt qbytearray.3qt qcheckbox.3qt qclipboard.3qt \
+	qcloseevent.3qt qcollection.3qt qcolor.3qt qcolorgroup.3qt \
+	qcombobox.3qt qconnection.3qt qcursor.3qt qcustomevent.3qt \
+	qdatastream.3qt qdate.3qt qdatetime.3qt qdialog.3qt qdict.3qt \
+	qdictiterator.3qt qdir.3qt qdoublevalidator.3qt qevent.3qt \
+	qfile.3qt qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
+	qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt qgcache.3qt \
+	qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt qglist.3qt \
+	qglistiterator.3qt qgmanager.3qt qgridlayout.3qt qgroupbox.3qt \
+	qhboxlayout.3qt qimage.3qt qimageio.3qt qintdict.3qt \
+	qintdictiterator.3qt qintvalidator.3qt qiodevice.3qt qkeyevent.3qt \
+	qlabel.3qt qlayout.3qt qlcdnumber.3qt qlineedit.3qt qlist.3qt \
+	qlistbox.3qt qlistboxitem.3qt qlistboxpixmap.3qt qlistboxtext.3qt \
+	qlistiterator.3qt qlnode.3qt qmenubar.3qt qmenudata.3qt \
+	qmessagebox.3qt qmouseevent.3qt qmoveevent.3qt qmovie.3qt \
+	qmultilineedit.3qt qobject.3qt qpaintdevice.3qt \
+	qpaintdevicemetrics.3qt qpainter.3qt qpaintevent.3qt qpalette.3qt \
+	qpen.3qt qpicture.3qt qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
+	qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
+	qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
+	qptrdictiterator.3qt qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
+	qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt qresizeevent.3qt \
+	qscrollbar.3qt qsemimodal.3qt qsenderobject.3qt qshared.3qt \
+	qsignal.3qt qsize.3qt qslider.3qt qsocketnotifier.3qt qstack.3qt \
+	qstrilist.3qt qstring.3qt qstrlist.3qt qtabbar.3qt qtabdialog.3qt \
+	qtableview.3qt qtextstream.3qt qtime.3qt qtimer.3qt qtimerevent.3qt \
+	qtooltip.3qt qtooltipgroup.3qt qtsmanip.3qt qvalidator.3qt \
+	qvboxlayout.3qt qwidget.3qt qwindow.3qt qwmatrix.3qt
 
 post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
-	${LN} -sf $(X11BASE)/lib/libqt.so.1.31 $(X11BASE)/lib/libqt.so
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-${MAJ}.${MIN}/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${MAJ}.${MIN} \
+		$(X11BASE)/lib
+	${LN} -sf $(X11BASE)/lib/libqt.so.${MAJ}.${MIN} $(X11BASE)/lib/libqt.so
 	${LDCONFIG} -m $(PREFIX)/lib
 	${MKDIR} $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man3/* $(PREFIX)/man/man3
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/include/* \
+		$(PREFIX)/include/X11/qt
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man1/* $(PREFIX)/man/man1
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man3/* $(PREFIX)/man/man3
 	${MKDIR} ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README.QT ${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README \
+		${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README.QT \
+		${PREFIX}/share/doc/qt
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt30/distinfo b/x11-toolkits/qt30/distinfo
index e712bdb4e580..004f1c20b643 100644
--- a/x11-toolkits/qt30/distinfo
+++ b/x11-toolkits/qt30/distinfo
@@ -1 +1 @@
-MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
+MD5 (qt-1.33.tar.gz) = 6136b589c0d611f55deae45bc8ee2af7
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index 695c9a3a7f8e..20cc37259181 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -1,11 +1,133 @@
-lib/libqt.so.1.31
 lib/libqt.so
+lib/libqt.so.1.33
 @exec /sbin/ldconfig -m %B
+bin/moc
+include/X11/qt/qaccel.h
+include/X11/qt/qapp.h
+include/X11/qt/qarray.h
+include/X11/qt/qasyncimageio.h
+include/X11/qt/qasyncio.h
+include/X11/qt/qbitarry.h
+include/X11/qt/qbitmap.h
+include/X11/qt/qbrush.h
+include/X11/qt/qbttngrp.h
+include/X11/qt/qbuffer.h
+include/X11/qt/qbutton.h
+include/X11/qt/qcache.h
+include/X11/qt/qchkbox.h
+include/X11/qt/qclipbrd.h
+include/X11/qt/qcollect.h
+include/X11/qt/qcolor.h
+include/X11/qt/qcombo.h
+include/X11/qt/qconnect.h
+include/X11/qt/qcursor.h
+include/X11/qt/qdatetm.h
+include/X11/qt/qdialog.h
+include/X11/qt/qdict.h
+include/X11/qt/qdir.h
+include/X11/qt/qdrawutl.h
+include/X11/qt/qdstream.h
+include/X11/qt/qevent.h
+include/X11/qt/qfile.h
+include/X11/qt/qfiledef.h
+include/X11/qt/qfiledlg.h
+include/X11/qt/qfileinf.h
+include/X11/qt/qfont.h
+include/X11/qt/qfontdta.h
+include/X11/qt/qfontinf.h
+include/X11/qt/qfontmet.h
+include/X11/qt/qframe.h
+include/X11/qt/qgarray.h
+include/X11/qt/qgcache.h
+include/X11/qt/qgdict.h
+include/X11/qt/qgeneric.h
+include/X11/qt/qgl.h
+include/X11/qt/qglist.h
+include/X11/qt/qglobal.h
+include/X11/qt/qgmanagr.h
+include/X11/qt/qgrpbox.h
+include/X11/qt/qgvector.h
+include/X11/qt/qimage.h
+include/X11/qt/qimageio.h
+include/X11/qt/qintcach.h
+include/X11/qt/qintdict.h
+include/X11/qt/qiodev.h
+include/X11/qt/qjpegio.h
+include/X11/qt/qkeycode.h
+include/X11/qt/qlabel.h
+include/X11/qt/qlayout.h
+include/X11/qt/qlcdnum.h
+include/X11/qt/qlined.h
+include/X11/qt/qlist.h
+include/X11/qt/qlistbox.h
+include/X11/qt/qmenubar.h
+include/X11/qt/qmenudta.h
+include/X11/qt/qmetaobj.h
+include/X11/qt/qmlined.h
+include/X11/qt/qmovie.h
+include/X11/qt/qmsgbox.h
+include/X11/qt/qnp.h
+include/X11/qt/qobjcoll.h
+include/X11/qt/qobjdefs.h
+include/X11/qt/qobject.h
+include/X11/qt/qpaintd.h
+include/X11/qt/qpaintdc.h
+include/X11/qt/qpainter.h
+include/X11/qt/qpalette.h
+include/X11/qt/qpdevmet.h
+include/X11/qt/qpen.h
+include/X11/qt/qpicture.h
+include/X11/qt/qpixmap.h
+include/X11/qt/qpmcache.h
+include/X11/qt/qpngio.h
+include/X11/qt/qpntarry.h
+include/X11/qt/qpoint.h
+include/X11/qt/qpopmenu.h
+include/X11/qt/qprinter.h
+include/X11/qt/qprndlg.h
+include/X11/qt/qprogbar.h
+include/X11/qt/qprogdlg.h
+include/X11/qt/qpsprn.h
+include/X11/qt/qptrdict.h
+include/X11/qt/qpushbt.h
+include/X11/qt/qqueue.h
+include/X11/qt/qradiobt.h
+include/X11/qt/qrangect.h
+include/X11/qt/qrect.h
+include/X11/qt/qregexp.h
+include/X11/qt/qregion.h
+include/X11/qt/qscrbar.h
+include/X11/qt/qsemimodal.h
+include/X11/qt/qshared.h
+include/X11/qt/qsignal.h
+include/X11/qt/qsize.h
+include/X11/qt/qslider.h
+include/X11/qt/qsocknot.h
+include/X11/qt/qstack.h
+include/X11/qt/qstring.h
+include/X11/qt/qstrlist.h
+include/X11/qt/qstrvec.h
+include/X11/qt/qtabbar.h
+include/X11/qt/qtabdlg.h
+include/X11/qt/qtablevw.h
+include/X11/qt/qtimer.h
+include/X11/qt/qtooltip.h
+include/X11/qt/qtstream.h
+include/X11/qt/qvalidator.h
+include/X11/qt/qvector.h
+include/X11/qt/qwidcoll.h
+include/X11/qt/qwidget.h
+include/X11/qt/qwindefs.h
+include/X11/qt/qwindow.h
+include/X11/qt/qwmatrix.h
 man/man1/moc.1.gz
+man/man3/QAccel.3qt.gz
 man/man3/QApplication.3qt.gz
 man/man3/QArray.3qt.gz
-man/man3/QBitmap.3qt.gz
+man/man3/QBitArray.3qt.gz
 man/man3/QBitVal.3qt.gz
+man/man3/QBitmap.3qt.gz
+man/man3/QBoxLayout.3qt.gz
 man/man3/QBrush.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
@@ -39,37 +161,45 @@ man/man3/QFontInfo.3qt.gz
 man/man3/QFontMetrics.3qt.gz
 man/man3/QFrame.3qt.gz
 man/man3/QGArray.3qt.gz
+man/man3/QGCache.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
 man/man3/QGList.3qt.gz
 man/man3/QGListIterator.3qt.gz
+man/man3/QGManager.3qt.gz
+man/man3/QGridLayout.3qt.gz
 man/man3/QGroupBox.3qt.gz
 man/man3/QHBoxLayout.3qt.gz
+man/man3/QIODevice.3qt.gz
 man/man3/QImage.3qt.gz
 man/man3/QImageIO.3qt.gz
 man/man3/QIntDict.3qt.gz
 man/man3/QIntDictIterator.3qt.gz
 man/man3/QIntValidator.3qt.gz
-man/man3/QIODevice.3qt.gz
 man/man3/QKeyEvent.3qt.gz
+man/man3/QLCDNumber.3qt.gz
+man/man3/QLNode.3qt.gz
 man/man3/QLabel.3qt.gz
 man/man3/QLayout.3qt.gz
-man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
+man/man3/QListBox.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QLNode.3qt.gz
+man/man3/QListIterator.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
+man/man3/QMouseEvent.3qt.gz
 man/man3/QMoveEvent.3qt.gz
 man/man3/QMovie.3qt.gz
+man/man3/QMultiLineEdit.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
+man/man3/QPaintEvent.3qt.gz
 man/man3/QPainter.3qt.gz
 man/man3/QPalette.3qt.gz
 man/man3/QPen.3qt.gz
@@ -95,6 +225,7 @@ man/man3/QRegion.3qt.gz
 man/man3/QResizeEvent.3qt.gz
 man/man3/QScrollBar.3qt.gz
 man/man3/QSemiModal.3qt.gz
+man/man3/QSenderObject.3qt.gz
 man/man3/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -102,36 +233,43 @@ man/man3/QSlider.3qt.gz
 man/man3/QSocketNotifier.3qt.gz
 man/man3/QStack.3qt.gz
 man/man3/QStrIList.3qt.gz
-man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
-man/man3/QTableView.3qt.gz
+man/man3/QString.3qt.gz
+man/man3/QTSManip.3qt.gz
+man/man3/QTabBar.3qt.gz
 man/man3/QTabDialog.3qt.gz
+man/man3/QTableView.3qt.gz
+man/man3/QTextStream.3qt.gz
 man/man3/QTime.3qt.gz
 man/man3/QTimer.3qt.gz
 man/man3/QTimerEvent.3qt.gz
 man/man3/QToolTip.3qt.gz
-man/man3/QTSManip.3qt.gz
-man/man3/QValidator.3qt.gz
+man/man3/QToolTipGroup.3qt.gz
 man/man3/QVBoxLayout.3qt.gz
+man/man3/QValidator.3qt.gz
+man/man3/QWMatrix.3qt.gz
 man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
-man/man3/QWMatrix.3qt.gz
-man/man3/qarray.3qt.gz
+man/man3/qaccel.3qt.gz
 man/man3/qapplication.3qt.gz
+man/man3/qarray.3qt.gz
+man/man3/qbitarray.3qt.gz
 man/man3/qbitmap.3qt.gz
-man/man3/qdir.3qt.gz
+man/man3/qbitval.3qt.gz
+man/man3/qboxlayout.3qt.gz
 man/man3/qbrush.3qt.gz
+man/man3/qbuffer.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qbitarray.3qt.gz
-man/man3/qbitval.3qt.gz
+man/man3/qcheckbox.3qt.gz
 man/man3/qclipboard.3qt.gz
 man/man3/qcloseevent.3qt.gz
 man/man3/qcollection.3qt.gz
 man/man3/qcolor.3qt.gz
 man/man3/qcolorgroup.3qt.gz
 man/man3/qcombobox.3qt.gz
+man/man3/qconnection.3qt.gz
 man/man3/qcursor.3qt.gz
 man/man3/qcustomevent.3qt.gz
 man/man3/qdatastream.3qt.gz
@@ -139,6 +277,9 @@ man/man3/qdate.3qt.gz
 man/man3/qdatetime.3qt.gz
 man/man3/qdialog.3qt.gz
 man/man3/qdict.3qt.gz
+man/man3/qdictiterator.3qt.gz
+man/man3/qdir.3qt.gz
+man/man3/qdoublevalidator.3qt.gz
 man/man3/qevent.3qt.gz
 man/man3/qfile.3qt.gz
 man/man3/qfiledialog.3qt.gz
@@ -150,21 +291,27 @@ man/man3/qfontmetrics.3qt.gz
 man/man3/qframe.3qt.gz
 man/man3/qgarray.3qt.gz
 man/man3/qgcache.3qt.gz
+man/man3/qgcacheiterator.3qt.gz
 man/man3/qgdict.3qt.gz
 man/man3/qgdictiterator.3qt.gz
 man/man3/qglist.3qt.gz
 man/man3/qglistiterator.3qt.gz
+man/man3/qgmanager.3qt.gz
+man/man3/qgridlayout.3qt.gz
 man/man3/qgroupbox.3qt.gz
+man/man3/qhboxlayout.3qt.gz
 man/man3/qimage.3qt.gz
 man/man3/qimageio.3qt.gz
 man/man3/qintdict.3qt.gz
 man/man3/qintdictiterator.3qt.gz
+man/man3/qintvalidator.3qt.gz
 man/man3/qiodevice.3qt.gz
 man/man3/qkeyevent.3qt.gz
 man/man3/qlabel.3qt.gz
 man/man3/qlayout.3qt.gz
+man/man3/qlcdnumber.3qt.gz
+man/man3/qlineedit.3qt.gz
 man/man3/qlist.3qt.gz
-man/man3/qpen.3qt.gz
 man/man3/qlistbox.3qt.gz
 man/man3/qlistboxitem.3qt.gz
 man/man3/qlistboxpixmap.3qt.gz
@@ -176,20 +323,27 @@ man/man3/qmenudata.3qt.gz
 man/man3/qmessagebox.3qt.gz
 man/man3/qmouseevent.3qt.gz
 man/man3/qmoveevent.3qt.gz
+man/man3/qmovie.3qt.gz
+man/man3/qmultilineedit.3qt.gz
 man/man3/qobject.3qt.gz
 man/man3/qpaintdevice.3qt.gz
 man/man3/qpaintdevicemetrics.3qt.gz
 man/man3/qpainter.3qt.gz
-man/man3/qpicture.3qt.gz
-man/man3/QGCache.3qt.gz
-man/man3/QGManager.3qt.gz
+man/man3/qpaintevent.3qt.gz
 man/man3/qpalette.3qt.gz
+man/man3/qpen.3qt.gz
+man/man3/qpicture.3qt.gz
 man/man3/qpixmap.3qt.gz
 man/man3/qpixmapcache.3qt.gz
 man/man3/qpoint.3qt.gz
 man/man3/qpointarray.3qt.gz
+man/man3/qpointval.3qt.gz
 man/man3/qpopupmenu.3qt.gz
 man/man3/qprinter.3qt.gz
+man/man3/qprogressbar.3qt.gz
+man/man3/qprogressdialog.3qt.gz
+man/man3/qptrdict.3qt.gz
+man/man3/qptrdictiterator.3qt.gz
 man/man3/qpushbutton.3qt.gz
 man/man3/qqueue.3qt.gz
 man/man3/qradiobutton.3qt.gz
@@ -199,6 +353,8 @@ man/man3/qregexp.3qt.gz
 man/man3/qregion.3qt.gz
 man/man3/qresizeevent.3qt.gz
 man/man3/qscrollbar.3qt.gz
+man/man3/qsemimodal.3qt.gz
+man/man3/qsenderobject.3qt.gz
 man/man3/qshared.3qt.gz
 man/man3/qsignal.3qt.gz
 man/man3/qsize.3qt.gz
@@ -207,178 +363,22 @@ man/man3/qsocketnotifier.3qt.gz
 man/man3/qstack.3qt.gz
 man/man3/qstrilist.3qt.gz
 man/man3/qstring.3qt.gz
+man/man3/qstrlist.3qt.gz
+man/man3/qtabbar.3qt.gz
+man/man3/qtabdialog.3qt.gz
 man/man3/qtableview.3qt.gz
 man/man3/qtextstream.3qt.gz
 man/man3/qtime.3qt.gz
 man/man3/qtimer.3qt.gz
 man/man3/qtimerevent.3qt.gz
-man/man3/qtsmanip.3qt.gz
-man/man3/QListBox.3qt.gz
-man/man3/qwidget.3qt.gz
-man/man3/qwindow.3qt.gz
-man/man3/qwmatrix.3qt.gz
-man/man3/QAccel.3qt.gz
-man/man3/QBitArray.3qt.gz
-man/man3/qaccel.3qt.gz
-man/man3/QListIterator.3qt.gz
-man/man3/qbuffer.3qt.gz
-man/man3/qcheckbox.3qt.gz
-man/man3/qconnection.3qt.gz
-man/man3/qdictiterator.3qt.gz
-man/man3/qgcacheiterator.3qt.gz
-man/man3/qlcdnumber.3qt.gz
-man/man3/qlineedit.3qt.gz
-man/man3/qmultilineedit.3qt.gz
-man/man3/qpaintevent.3qt.gz
-man/man3/qsenderobject.3qt.gz
-man/man3/qstrlist.3qt.gz
-man/man3/qtabbar.3qt.gz
 man/man3/qtooltip.3qt.gz
-man/man3/QBoxLayout.3qt.gz
-man/man3/QGridLayout.3qt.gz
-man/man3/QMouseEvent.3qt.gz
-man/man3/QMultiLineEdit.3qt.gz
-man/man3/QPaintEvent.3qt.gz
-man/man3/QSenderObject.3qt.gz
-man/man3/QTabBar.3qt.gz
-man/man3/QTextStream.3qt.gz
-man/man3/QToolTipGroup.3qt.gz
-man/man3/qboxlayout.3qt.gz
-man/man3/qgmanager.3qt.gz
-man/man3/qgridlayout.3qt.gz
-man/man3/qtabdialog.3qt.gz
 man/man3/qtooltipgroup.3qt.gz
-man/man3/qdoublevalidator.3qt.gz
-man/man3/qhboxlayout.3qt.gz
-man/man3/qintvalidator.3qt.gz
-man/man3/qmovie.3qt.gz
-man/man3/qpointval.3qt.gz
-man/man3/qprogressbar.3qt.gz
-man/man3/qprogressdialog.3qt.gz
-man/man3/qptrdict.3qt.gz
-man/man3/qptrdictiterator.3qt.gz
-man/man3/qsemimodal.3qt.gz
+man/man3/qtsmanip.3qt.gz
 man/man3/qvalidator.3qt.gz
 man/man3/qvboxlayout.3qt.gz
-include/X11/qt/qaccel.h
-include/X11/qt/qapp.h
-include/X11/qt/qarray.h
-include/X11/qt/qasyncimageio.h
-include/X11/qt/qasyncio.h
-include/X11/qt/qbitarry.h
-include/X11/qt/qbitmap.h
-include/X11/qt/qbrush.h
-include/X11/qt/qbttngrp.h
-include/X11/qt/qbuffer.h
-include/X11/qt/qbutton.h
-include/X11/qt/qcache.h
-include/X11/qt/qchkbox.h
-include/X11/qt/qclipbrd.h
-include/X11/qt/qcollect.h
-include/X11/qt/qcolor.h
-include/X11/qt/qcombo.h
-include/X11/qt/qconnect.h
-include/X11/qt/qcursor.h
-include/X11/qt/qdatetm.h
-include/X11/qt/qdialog.h
-include/X11/qt/qdict.h
-include/X11/qt/qdir.h
-include/X11/qt/qdrawutl.h
-include/X11/qt/qdstream.h
-include/X11/qt/qevent.h
-include/X11/qt/qfile.h
-include/X11/qt/qfiledef.h
-include/X11/qt/qfiledlg.h
-include/X11/qt/qfileinf.h
-include/X11/qt/qfont.h
-include/X11/qt/qfontdta.h
-include/X11/qt/qfontinf.h
-include/X11/qt/qfontmet.h
-include/X11/qt/qframe.h
-include/X11/qt/qgarray.h
-include/X11/qt/qgcache.h
-include/X11/qt/qgdict.h
-include/X11/qt/qgeneric.h
-include/X11/qt/qgl.h
-include/X11/qt/qglist.h
-include/X11/qt/qglobal.h
-include/X11/qt/qgmanagr.h
-include/X11/qt/qgrpbox.h
-include/X11/qt/qgvector.h
-include/X11/qt/qimage.h
-include/X11/qt/qimageio.h
-include/X11/qt/qintcach.h
-include/X11/qt/qintdict.h
-include/X11/qt/qiodev.h
-include/X11/qt/qjpegio.h
-include/X11/qt/qkeycode.h
-include/X11/qt/qlabel.h
-include/X11/qt/qlayout.h
-include/X11/qt/qlcdnum.h
-include/X11/qt/qlined.h
-include/X11/qt/qlist.h
-include/X11/qt/qlistbox.h
-include/X11/qt/qmenubar.h
-include/X11/qt/qmenudta.h
-include/X11/qt/qmetaobj.h
-include/X11/qt/qmlined.h
-include/X11/qt/qmovie.h
-include/X11/qt/qmsgbox.h
-include/X11/qt/qnp.h
-include/X11/qt/qobjcoll.h
-include/X11/qt/qobjdefs.h
-include/X11/qt/qobject.h
-include/X11/qt/qpaintd.h
-include/X11/qt/qpaintdc.h
-include/X11/qt/qpainter.h
-include/X11/qt/qpalette.h
-include/X11/qt/qpdevmet.h
-include/X11/qt/qpen.h
-include/X11/qt/qpicture.h
-include/X11/qt/qpixmap.h
-include/X11/qt/qpmcache.h
-include/X11/qt/qpngio.h
-include/X11/qt/qpntarry.h
-include/X11/qt/qpoint.h
-include/X11/qt/qpopmenu.h
-include/X11/qt/qprinter.h
-include/X11/qt/qprndlg.h
-include/X11/qt/qprogbar.h
-include/X11/qt/qprogdlg.h
-include/X11/qt/qpsprn.h
-include/X11/qt/qptrdict.h
-include/X11/qt/qpushbt.h
-include/X11/qt/qqueue.h
-include/X11/qt/qradiobt.h
-include/X11/qt/qrangect.h
-include/X11/qt/qrect.h
-include/X11/qt/qregexp.h
-include/X11/qt/qregion.h
-include/X11/qt/qscrbar.h
-include/X11/qt/qsemimodal.h
-include/X11/qt/qshared.h
-include/X11/qt/qsignal.h
-include/X11/qt/qsize.h
-include/X11/qt/qslider.h
-include/X11/qt/qsocknot.h
-include/X11/qt/qstack.h
-include/X11/qt/qstring.h
-include/X11/qt/qstrlist.h
-include/X11/qt/qstrvec.h
-include/X11/qt/qtabbar.h
-include/X11/qt/qtabdlg.h
-include/X11/qt/qtablevw.h
-include/X11/qt/qtimer.h
-include/X11/qt/qtooltip.h
-include/X11/qt/qtstream.h
-include/X11/qt/qvalidator.h
-include/X11/qt/qvector.h
-include/X11/qt/qwidcoll.h
-include/X11/qt/qwidget.h
-include/X11/qt/qwindefs.h
-include/X11/qt/qwindow.h
-include/X11/qt/qwmatrix.h
-bin/moc
+man/man3/qwidget.3qt.gz
+man/man3/qwindow.3qt.gz
+man/man3/qwmatrix.3qt.gz
 share/doc/qt/README
 share/doc/qt/README.QT
 @dirrm include/X11/qt
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index f882e252ca8c..bacad02d2115 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -3,115 +3,99 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.15 1998/04/11 17:45:40 andreas Exp $
+# $Id: Makefile,v 1.16 1998/04/28 02:07:56 asami Exp $
 #
 
-DISTNAME=	qt-1.31
+DISTNAME=	qt-${MAJ}.${MIN}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
-MAINTAINER=	searle@longacre.demon.co.uk
-
-BROKEN=		repository copied, awaiting upgrade to 1.33
+MAINTAINER=	andreas@FreeBSD.ORG
 
+MAJ=		1
+MIN=		33
 USE_GMAKE=	yes
 USE_X11=	yes
 
-MAN1=		moc.1
-MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
-		qbitmap.3qt qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt \
-		qbutton.3qt qbuttongroup.3qt qbytearray.3qt \
-		qcheckbox.3qt qclipboard.3qt qcloseevent.3qt \
-		qcollection.3qt qcolor.3qt qcolorgroup.3qt \
-		qcombobox.3qt qconnection.3qt qcursor.3qt \
-		qcustomevent.3qt qdatastream.3qt qdate.3qt \
-		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.3qt qdoublevalidator.3qt qevent.3qt qfile.3qt \
-		qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
-		qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt \
-		qgcache.3qt qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt \
-		qglist.3qt qglistiterator.3qt qgmanager.3qt qgridlayout.3qt \
-		qgroupbox.3qt qhboxlayout.3qt qimage.3qt \
-		qimageio.3qt qintdict.3qt qintdictiterator.3qt \
-		qintvalidator.3qt \
-		qiodevice.3qt qkeyevent.3qt qlabel.3qt qlayout.3qt \
-		qlcdnumber.3qt \
-		qlineedit.3qt qlist.3qt qlistbox.3qt qlistboxitem.3qt \
-		qlistboxpixmap.3qt qlistboxtext.3qt qlistiterator.3qt \
-		qlnode.3qt qmenubar.3qt qmenudata.3qt qmessagebox.3qt \
-		qmouseevent.3qt qmoveevent.3qt qmultilineedit.3qt qobject.3qt \
-		qmovie.3qt \
-		qpaintdevice.3qt qpaintdevicemetrics.3qt qpainter.3qt \
-		qpaintevent.3qt qpalette.3qt qpen.3qt qpicture.3qt \
-		qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
-		qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
-		qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
-		qptrdictiterator.3qt \
-		qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
-		qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt \
-		qresizeevent.3qt qscrollbar.3qt qsenderobject.3qt \
-		qsemimodal.3qt \
-		qshared.3qt qsignal.3qt qsize.3qt qslider.3qt \
-		qsocketnotifier.3qt qstack.3qt qstrilist.3qt qstring.3qt \
-		qstrlist.3qt qtabbar.3qt qtabdialog.3qt qtableview.3qt \
-		qtextstream.3qt qtime.3qt \
-		qtimer.3qt qtimerevent.3qt qtooltip.3qt qtooltipgroup.3qt \
-		qtsmanip.3qt qvalidator.3qt qvboxlayout.3qt qwidget.3qt \
-		qwindow.3qt qwmatrix.3qt QAccel.3qt QApplication.3qt \
-		QArray.3qt QBitArray.3qt QBitmap.3qt QBitVal.3qt \
-		QBoxLayout.3qt QBrush.3qt \
-		QBuffer.3qt QButton.3qt QButtonGroup.3qt \
-		QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
-		QCloseEvent.3qt QCollection.3qt QColor.3qt \
-		QColorGroup.3qt QComboBox.3qt QConnection.3qt \
-		QCursor.3qt QCustomEvent.3qt QDataStream.3qt QDate.3qt \
-		QDateTime.3qt QDialog.3qt QDict.3qt QDictIterator.3qt \
-		QDir.3qt QDoubleValidator.3qt QEvent.3qt QFile.3qt \
-		QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
-		QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt \
-		QGCache.3qt QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt \
-		QGList.3qt QGListIterator.3qt QGManager.3qt \
-		QGridLayout.3qt QGroupBox.3qt QHBoxLayout.3qt QImage.3qt \
-		QImageIO.3qt QIntDict.3qt QIntDictIterator.3qt \
-		QIntValidator.3qt \
-		QIODevice.3qt QKeyEvent.3qt QLCDNumber.3qt QLabel.3qt \
-		QLayout.3qt \
-		QLineEdit.3qt QList.3qt QListBox.3qt QListBoxItem.3qt \
-		QListBoxPixmap.3qt QListBoxText.3qt QListIterator.3qt \
-		QLNode.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
-		QMovie.3qt \
-		QMouseEvent.3qt QMoveEvent.3qt QMultiLineEdit.3qt QObject.3qt \
-		QPaintDevice.3qt QPaintDeviceMetrics.3qt QPainter.3qt \
-		QPaintEvent.3qt QPalette.3qt QPen.3qt QPicture.3qt \
-		QPixmap.3qt QPixmapCache.3qt QPoint.3qt QPointVal.3qt\
-		QPointArray.3qt QPopupMenu.3qt QPrinter.3qt \
-		QProgressBar.3qt QProgressDialog.3qt \
-		QPtrDict.3qt QPtrDictIterator.3qt \
-		QPushButton.3qt QQueue.3qt QRadioButton.3qt \
-		QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
-		QResizeEvent.3qt QScrollBar.3qt QSenderObject.3qt \
-		QSemiModal.3qt QVBoxLayout.3qt QValidator.3qt \
-		QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt \
-		QSocketNotifier.3qt QStack.3qt QStrIList.3qt QString.3qt \
-		QStrList.3qt QTabBar.3qt QTabDialog.3qt QTableView.3qt \
-		QTextStream.3qt QTime.3qt \
-		QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
-		QTSManip.3qt QWidget.3qt QWindow.3qt QWMatrix.3qt
+MAN1=	moc.1
+MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QBitArray.3qt QBitVal.3qt \
+	QBitmap.3qt QBoxLayout.3qt QBrush.3qt QBuffer.3qt QButton.3qt \
+	QButtonGroup.3qt QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
+	QCloseEvent.3qt QCollection.3qt QColor.3qt QColorGroup.3qt \
+	QComboBox.3qt QConnection.3qt QCursor.3qt QCustomEvent.3qt \
+	QDataStream.3qt QDate.3qt QDateTime.3qt QDialog.3qt QDict.3qt \
+	QDictIterator.3qt QDir.3qt QDoubleValidator.3qt QEvent.3qt \
+	QFile.3qt QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
+	QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt QGCache.3qt \
+	QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt QGList.3qt \
+	QGListIterator.3qt QGManager.3qt QGridLayout.3qt QGroupBox.3qt \
+	QHBoxLayout.3qt QIODevice.3qt QImage.3qt QImageIO.3qt QIntDict.3qt \
+	QIntDictIterator.3qt QIntValidator.3qt QKeyEvent.3qt QLCDNumber.3qt \
+	QLNode.3qt QLabel.3qt QLayout.3qt QLineEdit.3qt QList.3qt \
+	QListBox.3qt QListBoxItem.3qt QListBoxPixmap.3qt QListBoxText.3qt \
+	QListIterator.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
+	QMouseEvent.3qt QMoveEvent.3qt QMovie.3qt QMultiLineEdit.3qt \
+	QObject.3qt QPaintDevice.3qt QPaintDeviceMetrics.3qt QPaintEvent.3qt \
+	QPainter.3qt QPalette.3qt QPen.3qt QPicture.3qt QPixmap.3qt \
+	QPixmapCache.3qt QPoint.3qt QPointArray.3qt QPointVal.3qt \
+	QPopupMenu.3qt QPrinter.3qt QProgressBar.3qt QProgressDialog.3qt \
+	QPtrDict.3qt QPtrDictIterator.3qt QPushButton.3qt QQueue.3qt \
+	QRadioButton.3qt QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
+	QResizeEvent.3qt QScrollBar.3qt QSemiModal.3qt QSenderObject.3qt \
+	QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt QSocketNotifier.3qt \
+	QStack.3qt QStrIList.3qt QStrList.3qt QString.3qt QTSManip.3qt \
+	QTabBar.3qt QTabDialog.3qt QTableView.3qt QTextStream.3qt QTime.3qt \
+	QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
+	QVBoxLayout.3qt QValidator.3qt QWMatrix.3qt QWidget.3qt QWindow.3qt \
+	qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt qbitmap.3qt \
+	qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt qbutton.3qt \
+	qbuttongroup.3qt qbytearray.3qt qcheckbox.3qt qclipboard.3qt \
+	qcloseevent.3qt qcollection.3qt qcolor.3qt qcolorgroup.3qt \
+	qcombobox.3qt qconnection.3qt qcursor.3qt qcustomevent.3qt \
+	qdatastream.3qt qdate.3qt qdatetime.3qt qdialog.3qt qdict.3qt \
+	qdictiterator.3qt qdir.3qt qdoublevalidator.3qt qevent.3qt \
+	qfile.3qt qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
+	qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt qgcache.3qt \
+	qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt qglist.3qt \
+	qglistiterator.3qt qgmanager.3qt qgridlayout.3qt qgroupbox.3qt \
+	qhboxlayout.3qt qimage.3qt qimageio.3qt qintdict.3qt \
+	qintdictiterator.3qt qintvalidator.3qt qiodevice.3qt qkeyevent.3qt \
+	qlabel.3qt qlayout.3qt qlcdnumber.3qt qlineedit.3qt qlist.3qt \
+	qlistbox.3qt qlistboxitem.3qt qlistboxpixmap.3qt qlistboxtext.3qt \
+	qlistiterator.3qt qlnode.3qt qmenubar.3qt qmenudata.3qt \
+	qmessagebox.3qt qmouseevent.3qt qmoveevent.3qt qmovie.3qt \
+	qmultilineedit.3qt qobject.3qt qpaintdevice.3qt \
+	qpaintdevicemetrics.3qt qpainter.3qt qpaintevent.3qt qpalette.3qt \
+	qpen.3qt qpicture.3qt qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
+	qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
+	qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
+	qptrdictiterator.3qt qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
+	qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt qresizeevent.3qt \
+	qscrollbar.3qt qsemimodal.3qt qsenderobject.3qt qshared.3qt \
+	qsignal.3qt qsize.3qt qslider.3qt qsocketnotifier.3qt qstack.3qt \
+	qstrilist.3qt qstring.3qt qstrlist.3qt qtabbar.3qt qtabdialog.3qt \
+	qtableview.3qt qtextstream.3qt qtime.3qt qtimer.3qt qtimerevent.3qt \
+	qtooltip.3qt qtooltipgroup.3qt qtsmanip.3qt qvalidator.3qt \
+	qvboxlayout.3qt qwidget.3qt qwindow.3qt qwmatrix.3qt
 
 post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
-	${LN} -sf $(X11BASE)/lib/libqt.so.1.31 $(X11BASE)/lib/libqt.so
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-${MAJ}.${MIN}/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${MAJ}.${MIN} \
+		$(X11BASE)/lib
+	${LN} -sf $(X11BASE)/lib/libqt.so.${MAJ}.${MIN} $(X11BASE)/lib/libqt.so
 	${LDCONFIG} -m $(PREFIX)/lib
 	${MKDIR} $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man3/* $(PREFIX)/man/man3
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/include/* \
+		$(PREFIX)/include/X11/qt
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man1/* $(PREFIX)/man/man1
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man3/* $(PREFIX)/man/man3
 	${MKDIR} ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README.QT ${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README \
+		${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README.QT \
+		${PREFIX}/share/doc/qt
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt31/distinfo b/x11-toolkits/qt31/distinfo
index e712bdb4e580..004f1c20b643 100644
--- a/x11-toolkits/qt31/distinfo
+++ b/x11-toolkits/qt31/distinfo
@@ -1 +1 @@
-MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
+MD5 (qt-1.33.tar.gz) = 6136b589c0d611f55deae45bc8ee2af7
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index 695c9a3a7f8e..20cc37259181 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -1,11 +1,133 @@
-lib/libqt.so.1.31
 lib/libqt.so
+lib/libqt.so.1.33
 @exec /sbin/ldconfig -m %B
+bin/moc
+include/X11/qt/qaccel.h
+include/X11/qt/qapp.h
+include/X11/qt/qarray.h
+include/X11/qt/qasyncimageio.h
+include/X11/qt/qasyncio.h
+include/X11/qt/qbitarry.h
+include/X11/qt/qbitmap.h
+include/X11/qt/qbrush.h
+include/X11/qt/qbttngrp.h
+include/X11/qt/qbuffer.h
+include/X11/qt/qbutton.h
+include/X11/qt/qcache.h
+include/X11/qt/qchkbox.h
+include/X11/qt/qclipbrd.h
+include/X11/qt/qcollect.h
+include/X11/qt/qcolor.h
+include/X11/qt/qcombo.h
+include/X11/qt/qconnect.h
+include/X11/qt/qcursor.h
+include/X11/qt/qdatetm.h
+include/X11/qt/qdialog.h
+include/X11/qt/qdict.h
+include/X11/qt/qdir.h
+include/X11/qt/qdrawutl.h
+include/X11/qt/qdstream.h
+include/X11/qt/qevent.h
+include/X11/qt/qfile.h
+include/X11/qt/qfiledef.h
+include/X11/qt/qfiledlg.h
+include/X11/qt/qfileinf.h
+include/X11/qt/qfont.h
+include/X11/qt/qfontdta.h
+include/X11/qt/qfontinf.h
+include/X11/qt/qfontmet.h
+include/X11/qt/qframe.h
+include/X11/qt/qgarray.h
+include/X11/qt/qgcache.h
+include/X11/qt/qgdict.h
+include/X11/qt/qgeneric.h
+include/X11/qt/qgl.h
+include/X11/qt/qglist.h
+include/X11/qt/qglobal.h
+include/X11/qt/qgmanagr.h
+include/X11/qt/qgrpbox.h
+include/X11/qt/qgvector.h
+include/X11/qt/qimage.h
+include/X11/qt/qimageio.h
+include/X11/qt/qintcach.h
+include/X11/qt/qintdict.h
+include/X11/qt/qiodev.h
+include/X11/qt/qjpegio.h
+include/X11/qt/qkeycode.h
+include/X11/qt/qlabel.h
+include/X11/qt/qlayout.h
+include/X11/qt/qlcdnum.h
+include/X11/qt/qlined.h
+include/X11/qt/qlist.h
+include/X11/qt/qlistbox.h
+include/X11/qt/qmenubar.h
+include/X11/qt/qmenudta.h
+include/X11/qt/qmetaobj.h
+include/X11/qt/qmlined.h
+include/X11/qt/qmovie.h
+include/X11/qt/qmsgbox.h
+include/X11/qt/qnp.h
+include/X11/qt/qobjcoll.h
+include/X11/qt/qobjdefs.h
+include/X11/qt/qobject.h
+include/X11/qt/qpaintd.h
+include/X11/qt/qpaintdc.h
+include/X11/qt/qpainter.h
+include/X11/qt/qpalette.h
+include/X11/qt/qpdevmet.h
+include/X11/qt/qpen.h
+include/X11/qt/qpicture.h
+include/X11/qt/qpixmap.h
+include/X11/qt/qpmcache.h
+include/X11/qt/qpngio.h
+include/X11/qt/qpntarry.h
+include/X11/qt/qpoint.h
+include/X11/qt/qpopmenu.h
+include/X11/qt/qprinter.h
+include/X11/qt/qprndlg.h
+include/X11/qt/qprogbar.h
+include/X11/qt/qprogdlg.h
+include/X11/qt/qpsprn.h
+include/X11/qt/qptrdict.h
+include/X11/qt/qpushbt.h
+include/X11/qt/qqueue.h
+include/X11/qt/qradiobt.h
+include/X11/qt/qrangect.h
+include/X11/qt/qrect.h
+include/X11/qt/qregexp.h
+include/X11/qt/qregion.h
+include/X11/qt/qscrbar.h
+include/X11/qt/qsemimodal.h
+include/X11/qt/qshared.h
+include/X11/qt/qsignal.h
+include/X11/qt/qsize.h
+include/X11/qt/qslider.h
+include/X11/qt/qsocknot.h
+include/X11/qt/qstack.h
+include/X11/qt/qstring.h
+include/X11/qt/qstrlist.h
+include/X11/qt/qstrvec.h
+include/X11/qt/qtabbar.h
+include/X11/qt/qtabdlg.h
+include/X11/qt/qtablevw.h
+include/X11/qt/qtimer.h
+include/X11/qt/qtooltip.h
+include/X11/qt/qtstream.h
+include/X11/qt/qvalidator.h
+include/X11/qt/qvector.h
+include/X11/qt/qwidcoll.h
+include/X11/qt/qwidget.h
+include/X11/qt/qwindefs.h
+include/X11/qt/qwindow.h
+include/X11/qt/qwmatrix.h
 man/man1/moc.1.gz
+man/man3/QAccel.3qt.gz
 man/man3/QApplication.3qt.gz
 man/man3/QArray.3qt.gz
-man/man3/QBitmap.3qt.gz
+man/man3/QBitArray.3qt.gz
 man/man3/QBitVal.3qt.gz
+man/man3/QBitmap.3qt.gz
+man/man3/QBoxLayout.3qt.gz
 man/man3/QBrush.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
@@ -39,37 +161,45 @@ man/man3/QFontInfo.3qt.gz
 man/man3/QFontMetrics.3qt.gz
 man/man3/QFrame.3qt.gz
 man/man3/QGArray.3qt.gz
+man/man3/QGCache.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
 man/man3/QGList.3qt.gz
 man/man3/QGListIterator.3qt.gz
+man/man3/QGManager.3qt.gz
+man/man3/QGridLayout.3qt.gz
 man/man3/QGroupBox.3qt.gz
 man/man3/QHBoxLayout.3qt.gz
+man/man3/QIODevice.3qt.gz
 man/man3/QImage.3qt.gz
 man/man3/QImageIO.3qt.gz
 man/man3/QIntDict.3qt.gz
 man/man3/QIntDictIterator.3qt.gz
 man/man3/QIntValidator.3qt.gz
-man/man3/QIODevice.3qt.gz
 man/man3/QKeyEvent.3qt.gz
+man/man3/QLCDNumber.3qt.gz
+man/man3/QLNode.3qt.gz
 man/man3/QLabel.3qt.gz
 man/man3/QLayout.3qt.gz
-man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
+man/man3/QListBox.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QLNode.3qt.gz
+man/man3/QListIterator.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
+man/man3/QMouseEvent.3qt.gz
 man/man3/QMoveEvent.3qt.gz
 man/man3/QMovie.3qt.gz
+man/man3/QMultiLineEdit.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
+man/man3/QPaintEvent.3qt.gz
 man/man3/QPainter.3qt.gz
 man/man3/QPalette.3qt.gz
 man/man3/QPen.3qt.gz
@@ -95,6 +225,7 @@ man/man3/QRegion.3qt.gz
 man/man3/QResizeEvent.3qt.gz
 man/man3/QScrollBar.3qt.gz
 man/man3/QSemiModal.3qt.gz
+man/man3/QSenderObject.3qt.gz
 man/man3/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -102,36 +233,43 @@ man/man3/QSlider.3qt.gz
 man/man3/QSocketNotifier.3qt.gz
 man/man3/QStack.3qt.gz
 man/man3/QStrIList.3qt.gz
-man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
-man/man3/QTableView.3qt.gz
+man/man3/QString.3qt.gz
+man/man3/QTSManip.3qt.gz
+man/man3/QTabBar.3qt.gz
 man/man3/QTabDialog.3qt.gz
+man/man3/QTableView.3qt.gz
+man/man3/QTextStream.3qt.gz
 man/man3/QTime.3qt.gz
 man/man3/QTimer.3qt.gz
 man/man3/QTimerEvent.3qt.gz
 man/man3/QToolTip.3qt.gz
-man/man3/QTSManip.3qt.gz
-man/man3/QValidator.3qt.gz
+man/man3/QToolTipGroup.3qt.gz
 man/man3/QVBoxLayout.3qt.gz
+man/man3/QValidator.3qt.gz
+man/man3/QWMatrix.3qt.gz
 man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
-man/man3/QWMatrix.3qt.gz
-man/man3/qarray.3qt.gz
+man/man3/qaccel.3qt.gz
 man/man3/qapplication.3qt.gz
+man/man3/qarray.3qt.gz
+man/man3/qbitarray.3qt.gz
 man/man3/qbitmap.3qt.gz
-man/man3/qdir.3qt.gz
+man/man3/qbitval.3qt.gz
+man/man3/qboxlayout.3qt.gz
 man/man3/qbrush.3qt.gz
+man/man3/qbuffer.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qbitarray.3qt.gz
-man/man3/qbitval.3qt.gz
+man/man3/qcheckbox.3qt.gz
 man/man3/qclipboard.3qt.gz
 man/man3/qcloseevent.3qt.gz
 man/man3/qcollection.3qt.gz
 man/man3/qcolor.3qt.gz
 man/man3/qcolorgroup.3qt.gz
 man/man3/qcombobox.3qt.gz
+man/man3/qconnection.3qt.gz
 man/man3/qcursor.3qt.gz
 man/man3/qcustomevent.3qt.gz
 man/man3/qdatastream.3qt.gz
@@ -139,6 +277,9 @@ man/man3/qdate.3qt.gz
 man/man3/qdatetime.3qt.gz
 man/man3/qdialog.3qt.gz
 man/man3/qdict.3qt.gz
+man/man3/qdictiterator.3qt.gz
+man/man3/qdir.3qt.gz
+man/man3/qdoublevalidator.3qt.gz
 man/man3/qevent.3qt.gz
 man/man3/qfile.3qt.gz
 man/man3/qfiledialog.3qt.gz
@@ -150,21 +291,27 @@ man/man3/qfontmetrics.3qt.gz
 man/man3/qframe.3qt.gz
 man/man3/qgarray.3qt.gz
 man/man3/qgcache.3qt.gz
+man/man3/qgcacheiterator.3qt.gz
 man/man3/qgdict.3qt.gz
 man/man3/qgdictiterator.3qt.gz
 man/man3/qglist.3qt.gz
 man/man3/qglistiterator.3qt.gz
+man/man3/qgmanager.3qt.gz
+man/man3/qgridlayout.3qt.gz
 man/man3/qgroupbox.3qt.gz
+man/man3/qhboxlayout.3qt.gz
 man/man3/qimage.3qt.gz
 man/man3/qimageio.3qt.gz
 man/man3/qintdict.3qt.gz
 man/man3/qintdictiterator.3qt.gz
+man/man3/qintvalidator.3qt.gz
 man/man3/qiodevice.3qt.gz
 man/man3/qkeyevent.3qt.gz
 man/man3/qlabel.3qt.gz
 man/man3/qlayout.3qt.gz
+man/man3/qlcdnumber.3qt.gz
+man/man3/qlineedit.3qt.gz
 man/man3/qlist.3qt.gz
-man/man3/qpen.3qt.gz
 man/man3/qlistbox.3qt.gz
 man/man3/qlistboxitem.3qt.gz
 man/man3/qlistboxpixmap.3qt.gz
@@ -176,20 +323,27 @@ man/man3/qmenudata.3qt.gz
 man/man3/qmessagebox.3qt.gz
 man/man3/qmouseevent.3qt.gz
 man/man3/qmoveevent.3qt.gz
+man/man3/qmovie.3qt.gz
+man/man3/qmultilineedit.3qt.gz
 man/man3/qobject.3qt.gz
 man/man3/qpaintdevice.3qt.gz
 man/man3/qpaintdevicemetrics.3qt.gz
 man/man3/qpainter.3qt.gz
-man/man3/qpicture.3qt.gz
-man/man3/QGCache.3qt.gz
-man/man3/QGManager.3qt.gz
+man/man3/qpaintevent.3qt.gz
 man/man3/qpalette.3qt.gz
+man/man3/qpen.3qt.gz
+man/man3/qpicture.3qt.gz
 man/man3/qpixmap.3qt.gz
 man/man3/qpixmapcache.3qt.gz
 man/man3/qpoint.3qt.gz
 man/man3/qpointarray.3qt.gz
+man/man3/qpointval.3qt.gz
 man/man3/qpopupmenu.3qt.gz
 man/man3/qprinter.3qt.gz
+man/man3/qprogressbar.3qt.gz
+man/man3/qprogressdialog.3qt.gz
+man/man3/qptrdict.3qt.gz
+man/man3/qptrdictiterator.3qt.gz
 man/man3/qpushbutton.3qt.gz
 man/man3/qqueue.3qt.gz
 man/man3/qradiobutton.3qt.gz
@@ -199,6 +353,8 @@ man/man3/qregexp.3qt.gz
 man/man3/qregion.3qt.gz
 man/man3/qresizeevent.3qt.gz
 man/man3/qscrollbar.3qt.gz
+man/man3/qsemimodal.3qt.gz
+man/man3/qsenderobject.3qt.gz
 man/man3/qshared.3qt.gz
 man/man3/qsignal.3qt.gz
 man/man3/qsize.3qt.gz
@@ -207,178 +363,22 @@ man/man3/qsocketnotifier.3qt.gz
 man/man3/qstack.3qt.gz
 man/man3/qstrilist.3qt.gz
 man/man3/qstring.3qt.gz
+man/man3/qstrlist.3qt.gz
+man/man3/qtabbar.3qt.gz
+man/man3/qtabdialog.3qt.gz
 man/man3/qtableview.3qt.gz
 man/man3/qtextstream.3qt.gz
 man/man3/qtime.3qt.gz
 man/man3/qtimer.3qt.gz
 man/man3/qtimerevent.3qt.gz
-man/man3/qtsmanip.3qt.gz
-man/man3/QListBox.3qt.gz
-man/man3/qwidget.3qt.gz
-man/man3/qwindow.3qt.gz
-man/man3/qwmatrix.3qt.gz
-man/man3/QAccel.3qt.gz
-man/man3/QBitArray.3qt.gz
-man/man3/qaccel.3qt.gz
-man/man3/QListIterator.3qt.gz
-man/man3/qbuffer.3qt.gz
-man/man3/qcheckbox.3qt.gz
-man/man3/qconnection.3qt.gz
-man/man3/qdictiterator.3qt.gz
-man/man3/qgcacheiterator.3qt.gz
-man/man3/qlcdnumber.3qt.gz
-man/man3/qlineedit.3qt.gz
-man/man3/qmultilineedit.3qt.gz
-man/man3/qpaintevent.3qt.gz
-man/man3/qsenderobject.3qt.gz
-man/man3/qstrlist.3qt.gz
-man/man3/qtabbar.3qt.gz
 man/man3/qtooltip.3qt.gz
-man/man3/QBoxLayout.3qt.gz
-man/man3/QGridLayout.3qt.gz
-man/man3/QMouseEvent.3qt.gz
-man/man3/QMultiLineEdit.3qt.gz
-man/man3/QPaintEvent.3qt.gz
-man/man3/QSenderObject.3qt.gz
-man/man3/QTabBar.3qt.gz
-man/man3/QTextStream.3qt.gz
-man/man3/QToolTipGroup.3qt.gz
-man/man3/qboxlayout.3qt.gz
-man/man3/qgmanager.3qt.gz
-man/man3/qgridlayout.3qt.gz
-man/man3/qtabdialog.3qt.gz
 man/man3/qtooltipgroup.3qt.gz
-man/man3/qdoublevalidator.3qt.gz
-man/man3/qhboxlayout.3qt.gz
-man/man3/qintvalidator.3qt.gz
-man/man3/qmovie.3qt.gz
-man/man3/qpointval.3qt.gz
-man/man3/qprogressbar.3qt.gz
-man/man3/qprogressdialog.3qt.gz
-man/man3/qptrdict.3qt.gz
-man/man3/qptrdictiterator.3qt.gz
-man/man3/qsemimodal.3qt.gz
+man/man3/qtsmanip.3qt.gz
 man/man3/qvalidator.3qt.gz
 man/man3/qvboxlayout.3qt.gz
-include/X11/qt/qaccel.h
-include/X11/qt/qapp.h
-include/X11/qt/qarray.h
-include/X11/qt/qasyncimageio.h
-include/X11/qt/qasyncio.h
-include/X11/qt/qbitarry.h
-include/X11/qt/qbitmap.h
-include/X11/qt/qbrush.h
-include/X11/qt/qbttngrp.h
-include/X11/qt/qbuffer.h
-include/X11/qt/qbutton.h
-include/X11/qt/qcache.h
-include/X11/qt/qchkbox.h
-include/X11/qt/qclipbrd.h
-include/X11/qt/qcollect.h
-include/X11/qt/qcolor.h
-include/X11/qt/qcombo.h
-include/X11/qt/qconnect.h
-include/X11/qt/qcursor.h
-include/X11/qt/qdatetm.h
-include/X11/qt/qdialog.h
-include/X11/qt/qdict.h
-include/X11/qt/qdir.h
-include/X11/qt/qdrawutl.h
-include/X11/qt/qdstream.h
-include/X11/qt/qevent.h
-include/X11/qt/qfile.h
-include/X11/qt/qfiledef.h
-include/X11/qt/qfiledlg.h
-include/X11/qt/qfileinf.h
-include/X11/qt/qfont.h
-include/X11/qt/qfontdta.h
-include/X11/qt/qfontinf.h
-include/X11/qt/qfontmet.h
-include/X11/qt/qframe.h
-include/X11/qt/qgarray.h
-include/X11/qt/qgcache.h
-include/X11/qt/qgdict.h
-include/X11/qt/qgeneric.h
-include/X11/qt/qgl.h
-include/X11/qt/qglist.h
-include/X11/qt/qglobal.h
-include/X11/qt/qgmanagr.h
-include/X11/qt/qgrpbox.h
-include/X11/qt/qgvector.h
-include/X11/qt/qimage.h
-include/X11/qt/qimageio.h
-include/X11/qt/qintcach.h
-include/X11/qt/qintdict.h
-include/X11/qt/qiodev.h
-include/X11/qt/qjpegio.h
-include/X11/qt/qkeycode.h
-include/X11/qt/qlabel.h
-include/X11/qt/qlayout.h
-include/X11/qt/qlcdnum.h
-include/X11/qt/qlined.h
-include/X11/qt/qlist.h
-include/X11/qt/qlistbox.h
-include/X11/qt/qmenubar.h
-include/X11/qt/qmenudta.h
-include/X11/qt/qmetaobj.h
-include/X11/qt/qmlined.h
-include/X11/qt/qmovie.h
-include/X11/qt/qmsgbox.h
-include/X11/qt/qnp.h
-include/X11/qt/qobjcoll.h
-include/X11/qt/qobjdefs.h
-include/X11/qt/qobject.h
-include/X11/qt/qpaintd.h
-include/X11/qt/qpaintdc.h
-include/X11/qt/qpainter.h
-include/X11/qt/qpalette.h
-include/X11/qt/qpdevmet.h
-include/X11/qt/qpen.h
-include/X11/qt/qpicture.h
-include/X11/qt/qpixmap.h
-include/X11/qt/qpmcache.h
-include/X11/qt/qpngio.h
-include/X11/qt/qpntarry.h
-include/X11/qt/qpoint.h
-include/X11/qt/qpopmenu.h
-include/X11/qt/qprinter.h
-include/X11/qt/qprndlg.h
-include/X11/qt/qprogbar.h
-include/X11/qt/qprogdlg.h
-include/X11/qt/qpsprn.h
-include/X11/qt/qptrdict.h
-include/X11/qt/qpushbt.h
-include/X11/qt/qqueue.h
-include/X11/qt/qradiobt.h
-include/X11/qt/qrangect.h
-include/X11/qt/qrect.h
-include/X11/qt/qregexp.h
-include/X11/qt/qregion.h
-include/X11/qt/qscrbar.h
-include/X11/qt/qsemimodal.h
-include/X11/qt/qshared.h
-include/X11/qt/qsignal.h
-include/X11/qt/qsize.h
-include/X11/qt/qslider.h
-include/X11/qt/qsocknot.h
-include/X11/qt/qstack.h
-include/X11/qt/qstring.h
-include/X11/qt/qstrlist.h
-include/X11/qt/qstrvec.h
-include/X11/qt/qtabbar.h
-include/X11/qt/qtabdlg.h
-include/X11/qt/qtablevw.h
-include/X11/qt/qtimer.h
-include/X11/qt/qtooltip.h
-include/X11/qt/qtstream.h
-include/X11/qt/qvalidator.h
-include/X11/qt/qvector.h
-include/X11/qt/qwidcoll.h
-include/X11/qt/qwidget.h
-include/X11/qt/qwindefs.h
-include/X11/qt/qwindow.h
-include/X11/qt/qwmatrix.h
-bin/moc
+man/man3/qwidget.3qt.gz
+man/man3/qwindow.3qt.gz
+man/man3/qwmatrix.3qt.gz
 share/doc/qt/README
 share/doc/qt/README.QT
 @dirrm include/X11/qt
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index f882e252ca8c..bacad02d2115 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -3,115 +3,99 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.15 1998/04/11 17:45:40 andreas Exp $
+# $Id: Makefile,v 1.16 1998/04/28 02:07:56 asami Exp $
 #
 
-DISTNAME=	qt-1.31
+DISTNAME=	qt-${MAJ}.${MIN}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
-MAINTAINER=	searle@longacre.demon.co.uk
-
-BROKEN=		repository copied, awaiting upgrade to 1.33
+MAINTAINER=	andreas@FreeBSD.ORG
 
+MAJ=		1
+MIN=		33
 USE_GMAKE=	yes
 USE_X11=	yes
 
-MAN1=		moc.1
-MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
-		qbitmap.3qt qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt \
-		qbutton.3qt qbuttongroup.3qt qbytearray.3qt \
-		qcheckbox.3qt qclipboard.3qt qcloseevent.3qt \
-		qcollection.3qt qcolor.3qt qcolorgroup.3qt \
-		qcombobox.3qt qconnection.3qt qcursor.3qt \
-		qcustomevent.3qt qdatastream.3qt qdate.3qt \
-		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.3qt qdoublevalidator.3qt qevent.3qt qfile.3qt \
-		qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
-		qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt \
-		qgcache.3qt qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt \
-		qglist.3qt qglistiterator.3qt qgmanager.3qt qgridlayout.3qt \
-		qgroupbox.3qt qhboxlayout.3qt qimage.3qt \
-		qimageio.3qt qintdict.3qt qintdictiterator.3qt \
-		qintvalidator.3qt \
-		qiodevice.3qt qkeyevent.3qt qlabel.3qt qlayout.3qt \
-		qlcdnumber.3qt \
-		qlineedit.3qt qlist.3qt qlistbox.3qt qlistboxitem.3qt \
-		qlistboxpixmap.3qt qlistboxtext.3qt qlistiterator.3qt \
-		qlnode.3qt qmenubar.3qt qmenudata.3qt qmessagebox.3qt \
-		qmouseevent.3qt qmoveevent.3qt qmultilineedit.3qt qobject.3qt \
-		qmovie.3qt \
-		qpaintdevice.3qt qpaintdevicemetrics.3qt qpainter.3qt \
-		qpaintevent.3qt qpalette.3qt qpen.3qt qpicture.3qt \
-		qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
-		qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
-		qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
-		qptrdictiterator.3qt \
-		qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
-		qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt \
-		qresizeevent.3qt qscrollbar.3qt qsenderobject.3qt \
-		qsemimodal.3qt \
-		qshared.3qt qsignal.3qt qsize.3qt qslider.3qt \
-		qsocketnotifier.3qt qstack.3qt qstrilist.3qt qstring.3qt \
-		qstrlist.3qt qtabbar.3qt qtabdialog.3qt qtableview.3qt \
-		qtextstream.3qt qtime.3qt \
-		qtimer.3qt qtimerevent.3qt qtooltip.3qt qtooltipgroup.3qt \
-		qtsmanip.3qt qvalidator.3qt qvboxlayout.3qt qwidget.3qt \
-		qwindow.3qt qwmatrix.3qt QAccel.3qt QApplication.3qt \
-		QArray.3qt QBitArray.3qt QBitmap.3qt QBitVal.3qt \
-		QBoxLayout.3qt QBrush.3qt \
-		QBuffer.3qt QButton.3qt QButtonGroup.3qt \
-		QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
-		QCloseEvent.3qt QCollection.3qt QColor.3qt \
-		QColorGroup.3qt QComboBox.3qt QConnection.3qt \
-		QCursor.3qt QCustomEvent.3qt QDataStream.3qt QDate.3qt \
-		QDateTime.3qt QDialog.3qt QDict.3qt QDictIterator.3qt \
-		QDir.3qt QDoubleValidator.3qt QEvent.3qt QFile.3qt \
-		QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
-		QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt \
-		QGCache.3qt QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt \
-		QGList.3qt QGListIterator.3qt QGManager.3qt \
-		QGridLayout.3qt QGroupBox.3qt QHBoxLayout.3qt QImage.3qt \
-		QImageIO.3qt QIntDict.3qt QIntDictIterator.3qt \
-		QIntValidator.3qt \
-		QIODevice.3qt QKeyEvent.3qt QLCDNumber.3qt QLabel.3qt \
-		QLayout.3qt \
-		QLineEdit.3qt QList.3qt QListBox.3qt QListBoxItem.3qt \
-		QListBoxPixmap.3qt QListBoxText.3qt QListIterator.3qt \
-		QLNode.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
-		QMovie.3qt \
-		QMouseEvent.3qt QMoveEvent.3qt QMultiLineEdit.3qt QObject.3qt \
-		QPaintDevice.3qt QPaintDeviceMetrics.3qt QPainter.3qt \
-		QPaintEvent.3qt QPalette.3qt QPen.3qt QPicture.3qt \
-		QPixmap.3qt QPixmapCache.3qt QPoint.3qt QPointVal.3qt\
-		QPointArray.3qt QPopupMenu.3qt QPrinter.3qt \
-		QProgressBar.3qt QProgressDialog.3qt \
-		QPtrDict.3qt QPtrDictIterator.3qt \
-		QPushButton.3qt QQueue.3qt QRadioButton.3qt \
-		QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
-		QResizeEvent.3qt QScrollBar.3qt QSenderObject.3qt \
-		QSemiModal.3qt QVBoxLayout.3qt QValidator.3qt \
-		QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt \
-		QSocketNotifier.3qt QStack.3qt QStrIList.3qt QString.3qt \
-		QStrList.3qt QTabBar.3qt QTabDialog.3qt QTableView.3qt \
-		QTextStream.3qt QTime.3qt \
-		QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
-		QTSManip.3qt QWidget.3qt QWindow.3qt QWMatrix.3qt
+MAN1=	moc.1
+MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QBitArray.3qt QBitVal.3qt \
+	QBitmap.3qt QBoxLayout.3qt QBrush.3qt QBuffer.3qt QButton.3qt \
+	QButtonGroup.3qt QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
+	QCloseEvent.3qt QCollection.3qt QColor.3qt QColorGroup.3qt \
+	QComboBox.3qt QConnection.3qt QCursor.3qt QCustomEvent.3qt \
+	QDataStream.3qt QDate.3qt QDateTime.3qt QDialog.3qt QDict.3qt \
+	QDictIterator.3qt QDir.3qt QDoubleValidator.3qt QEvent.3qt \
+	QFile.3qt QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
+	QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt QGCache.3qt \
+	QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt QGList.3qt \
+	QGListIterator.3qt QGManager.3qt QGridLayout.3qt QGroupBox.3qt \
+	QHBoxLayout.3qt QIODevice.3qt QImage.3qt QImageIO.3qt QIntDict.3qt \
+	QIntDictIterator.3qt QIntValidator.3qt QKeyEvent.3qt QLCDNumber.3qt \
+	QLNode.3qt QLabel.3qt QLayout.3qt QLineEdit.3qt QList.3qt \
+	QListBox.3qt QListBoxItem.3qt QListBoxPixmap.3qt QListBoxText.3qt \
+	QListIterator.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
+	QMouseEvent.3qt QMoveEvent.3qt QMovie.3qt QMultiLineEdit.3qt \
+	QObject.3qt QPaintDevice.3qt QPaintDeviceMetrics.3qt QPaintEvent.3qt \
+	QPainter.3qt QPalette.3qt QPen.3qt QPicture.3qt QPixmap.3qt \
+	QPixmapCache.3qt QPoint.3qt QPointArray.3qt QPointVal.3qt \
+	QPopupMenu.3qt QPrinter.3qt QProgressBar.3qt QProgressDialog.3qt \
+	QPtrDict.3qt QPtrDictIterator.3qt QPushButton.3qt QQueue.3qt \
+	QRadioButton.3qt QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
+	QResizeEvent.3qt QScrollBar.3qt QSemiModal.3qt QSenderObject.3qt \
+	QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt QSocketNotifier.3qt \
+	QStack.3qt QStrIList.3qt QStrList.3qt QString.3qt QTSManip.3qt \
+	QTabBar.3qt QTabDialog.3qt QTableView.3qt QTextStream.3qt QTime.3qt \
+	QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
+	QVBoxLayout.3qt QValidator.3qt QWMatrix.3qt QWidget.3qt QWindow.3qt \
+	qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt qbitmap.3qt \
+	qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt qbutton.3qt \
+	qbuttongroup.3qt qbytearray.3qt qcheckbox.3qt qclipboard.3qt \
+	qcloseevent.3qt qcollection.3qt qcolor.3qt qcolorgroup.3qt \
+	qcombobox.3qt qconnection.3qt qcursor.3qt qcustomevent.3qt \
+	qdatastream.3qt qdate.3qt qdatetime.3qt qdialog.3qt qdict.3qt \
+	qdictiterator.3qt qdir.3qt qdoublevalidator.3qt qevent.3qt \
+	qfile.3qt qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
+	qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt qgcache.3qt \
+	qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt qglist.3qt \
+	qglistiterator.3qt qgmanager.3qt qgridlayout.3qt qgroupbox.3qt \
+	qhboxlayout.3qt qimage.3qt qimageio.3qt qintdict.3qt \
+	qintdictiterator.3qt qintvalidator.3qt qiodevice.3qt qkeyevent.3qt \
+	qlabel.3qt qlayout.3qt qlcdnumber.3qt qlineedit.3qt qlist.3qt \
+	qlistbox.3qt qlistboxitem.3qt qlistboxpixmap.3qt qlistboxtext.3qt \
+	qlistiterator.3qt qlnode.3qt qmenubar.3qt qmenudata.3qt \
+	qmessagebox.3qt qmouseevent.3qt qmoveevent.3qt qmovie.3qt \
+	qmultilineedit.3qt qobject.3qt qpaintdevice.3qt \
+	qpaintdevicemetrics.3qt qpainter.3qt qpaintevent.3qt qpalette.3qt \
+	qpen.3qt qpicture.3qt qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
+	qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
+	qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
+	qptrdictiterator.3qt qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
+	qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt qresizeevent.3qt \
+	qscrollbar.3qt qsemimodal.3qt qsenderobject.3qt qshared.3qt \
+	qsignal.3qt qsize.3qt qslider.3qt qsocketnotifier.3qt qstack.3qt \
+	qstrilist.3qt qstring.3qt qstrlist.3qt qtabbar.3qt qtabdialog.3qt \
+	qtableview.3qt qtextstream.3qt qtime.3qt qtimer.3qt qtimerevent.3qt \
+	qtooltip.3qt qtooltipgroup.3qt qtsmanip.3qt qvalidator.3qt \
+	qvboxlayout.3qt qwidget.3qt qwindow.3qt qwmatrix.3qt
 
 post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
-	${LN} -sf $(X11BASE)/lib/libqt.so.1.31 $(X11BASE)/lib/libqt.so
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-${MAJ}.${MIN}/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${MAJ}.${MIN} \
+		$(X11BASE)/lib
+	${LN} -sf $(X11BASE)/lib/libqt.so.${MAJ}.${MIN} $(X11BASE)/lib/libqt.so
 	${LDCONFIG} -m $(PREFIX)/lib
 	${MKDIR} $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man3/* $(PREFIX)/man/man3
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/include/* \
+		$(PREFIX)/include/X11/qt
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man1/* $(PREFIX)/man/man1
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man3/* $(PREFIX)/man/man3
 	${MKDIR} ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README.QT ${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README \
+		${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README.QT \
+		${PREFIX}/share/doc/qt
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt32/distinfo b/x11-toolkits/qt32/distinfo
index e712bdb4e580..004f1c20b643 100644
--- a/x11-toolkits/qt32/distinfo
+++ b/x11-toolkits/qt32/distinfo
@@ -1 +1 @@
-MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
+MD5 (qt-1.33.tar.gz) = 6136b589c0d611f55deae45bc8ee2af7
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index 695c9a3a7f8e..20cc37259181 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -1,11 +1,133 @@
-lib/libqt.so.1.31
 lib/libqt.so
+lib/libqt.so.1.33
 @exec /sbin/ldconfig -m %B
+bin/moc
+include/X11/qt/qaccel.h
+include/X11/qt/qapp.h
+include/X11/qt/qarray.h
+include/X11/qt/qasyncimageio.h
+include/X11/qt/qasyncio.h
+include/X11/qt/qbitarry.h
+include/X11/qt/qbitmap.h
+include/X11/qt/qbrush.h
+include/X11/qt/qbttngrp.h
+include/X11/qt/qbuffer.h
+include/X11/qt/qbutton.h
+include/X11/qt/qcache.h
+include/X11/qt/qchkbox.h
+include/X11/qt/qclipbrd.h
+include/X11/qt/qcollect.h
+include/X11/qt/qcolor.h
+include/X11/qt/qcombo.h
+include/X11/qt/qconnect.h
+include/X11/qt/qcursor.h
+include/X11/qt/qdatetm.h
+include/X11/qt/qdialog.h
+include/X11/qt/qdict.h
+include/X11/qt/qdir.h
+include/X11/qt/qdrawutl.h
+include/X11/qt/qdstream.h
+include/X11/qt/qevent.h
+include/X11/qt/qfile.h
+include/X11/qt/qfiledef.h
+include/X11/qt/qfiledlg.h
+include/X11/qt/qfileinf.h
+include/X11/qt/qfont.h
+include/X11/qt/qfontdta.h
+include/X11/qt/qfontinf.h
+include/X11/qt/qfontmet.h
+include/X11/qt/qframe.h
+include/X11/qt/qgarray.h
+include/X11/qt/qgcache.h
+include/X11/qt/qgdict.h
+include/X11/qt/qgeneric.h
+include/X11/qt/qgl.h
+include/X11/qt/qglist.h
+include/X11/qt/qglobal.h
+include/X11/qt/qgmanagr.h
+include/X11/qt/qgrpbox.h
+include/X11/qt/qgvector.h
+include/X11/qt/qimage.h
+include/X11/qt/qimageio.h
+include/X11/qt/qintcach.h
+include/X11/qt/qintdict.h
+include/X11/qt/qiodev.h
+include/X11/qt/qjpegio.h
+include/X11/qt/qkeycode.h
+include/X11/qt/qlabel.h
+include/X11/qt/qlayout.h
+include/X11/qt/qlcdnum.h
+include/X11/qt/qlined.h
+include/X11/qt/qlist.h
+include/X11/qt/qlistbox.h
+include/X11/qt/qmenubar.h
+include/X11/qt/qmenudta.h
+include/X11/qt/qmetaobj.h
+include/X11/qt/qmlined.h
+include/X11/qt/qmovie.h
+include/X11/qt/qmsgbox.h
+include/X11/qt/qnp.h
+include/X11/qt/qobjcoll.h
+include/X11/qt/qobjdefs.h
+include/X11/qt/qobject.h
+include/X11/qt/qpaintd.h
+include/X11/qt/qpaintdc.h
+include/X11/qt/qpainter.h
+include/X11/qt/qpalette.h
+include/X11/qt/qpdevmet.h
+include/X11/qt/qpen.h
+include/X11/qt/qpicture.h
+include/X11/qt/qpixmap.h
+include/X11/qt/qpmcache.h
+include/X11/qt/qpngio.h
+include/X11/qt/qpntarry.h
+include/X11/qt/qpoint.h
+include/X11/qt/qpopmenu.h
+include/X11/qt/qprinter.h
+include/X11/qt/qprndlg.h
+include/X11/qt/qprogbar.h
+include/X11/qt/qprogdlg.h
+include/X11/qt/qpsprn.h
+include/X11/qt/qptrdict.h
+include/X11/qt/qpushbt.h
+include/X11/qt/qqueue.h
+include/X11/qt/qradiobt.h
+include/X11/qt/qrangect.h
+include/X11/qt/qrect.h
+include/X11/qt/qregexp.h
+include/X11/qt/qregion.h
+include/X11/qt/qscrbar.h
+include/X11/qt/qsemimodal.h
+include/X11/qt/qshared.h
+include/X11/qt/qsignal.h
+include/X11/qt/qsize.h
+include/X11/qt/qslider.h
+include/X11/qt/qsocknot.h
+include/X11/qt/qstack.h
+include/X11/qt/qstring.h
+include/X11/qt/qstrlist.h
+include/X11/qt/qstrvec.h
+include/X11/qt/qtabbar.h
+include/X11/qt/qtabdlg.h
+include/X11/qt/qtablevw.h
+include/X11/qt/qtimer.h
+include/X11/qt/qtooltip.h
+include/X11/qt/qtstream.h
+include/X11/qt/qvalidator.h
+include/X11/qt/qvector.h
+include/X11/qt/qwidcoll.h
+include/X11/qt/qwidget.h
+include/X11/qt/qwindefs.h
+include/X11/qt/qwindow.h
+include/X11/qt/qwmatrix.h
 man/man1/moc.1.gz
+man/man3/QAccel.3qt.gz
 man/man3/QApplication.3qt.gz
 man/man3/QArray.3qt.gz
-man/man3/QBitmap.3qt.gz
+man/man3/QBitArray.3qt.gz
 man/man3/QBitVal.3qt.gz
+man/man3/QBitmap.3qt.gz
+man/man3/QBoxLayout.3qt.gz
 man/man3/QBrush.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
@@ -39,37 +161,45 @@ man/man3/QFontInfo.3qt.gz
 man/man3/QFontMetrics.3qt.gz
 man/man3/QFrame.3qt.gz
 man/man3/QGArray.3qt.gz
+man/man3/QGCache.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
 man/man3/QGList.3qt.gz
 man/man3/QGListIterator.3qt.gz
+man/man3/QGManager.3qt.gz
+man/man3/QGridLayout.3qt.gz
 man/man3/QGroupBox.3qt.gz
 man/man3/QHBoxLayout.3qt.gz
+man/man3/QIODevice.3qt.gz
 man/man3/QImage.3qt.gz
 man/man3/QImageIO.3qt.gz
 man/man3/QIntDict.3qt.gz
 man/man3/QIntDictIterator.3qt.gz
 man/man3/QIntValidator.3qt.gz
-man/man3/QIODevice.3qt.gz
 man/man3/QKeyEvent.3qt.gz
+man/man3/QLCDNumber.3qt.gz
+man/man3/QLNode.3qt.gz
 man/man3/QLabel.3qt.gz
 man/man3/QLayout.3qt.gz
-man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
+man/man3/QListBox.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QLNode.3qt.gz
+man/man3/QListIterator.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
+man/man3/QMouseEvent.3qt.gz
 man/man3/QMoveEvent.3qt.gz
 man/man3/QMovie.3qt.gz
+man/man3/QMultiLineEdit.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
+man/man3/QPaintEvent.3qt.gz
 man/man3/QPainter.3qt.gz
 man/man3/QPalette.3qt.gz
 man/man3/QPen.3qt.gz
@@ -95,6 +225,7 @@ man/man3/QRegion.3qt.gz
 man/man3/QResizeEvent.3qt.gz
 man/man3/QScrollBar.3qt.gz
 man/man3/QSemiModal.3qt.gz
+man/man3/QSenderObject.3qt.gz
 man/man3/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -102,36 +233,43 @@ man/man3/QSlider.3qt.gz
 man/man3/QSocketNotifier.3qt.gz
 man/man3/QStack.3qt.gz
 man/man3/QStrIList.3qt.gz
-man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
-man/man3/QTableView.3qt.gz
+man/man3/QString.3qt.gz
+man/man3/QTSManip.3qt.gz
+man/man3/QTabBar.3qt.gz
 man/man3/QTabDialog.3qt.gz
+man/man3/QTableView.3qt.gz
+man/man3/QTextStream.3qt.gz
 man/man3/QTime.3qt.gz
 man/man3/QTimer.3qt.gz
 man/man3/QTimerEvent.3qt.gz
 man/man3/QToolTip.3qt.gz
-man/man3/QTSManip.3qt.gz
-man/man3/QValidator.3qt.gz
+man/man3/QToolTipGroup.3qt.gz
 man/man3/QVBoxLayout.3qt.gz
+man/man3/QValidator.3qt.gz
+man/man3/QWMatrix.3qt.gz
 man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
-man/man3/QWMatrix.3qt.gz
-man/man3/qarray.3qt.gz
+man/man3/qaccel.3qt.gz
 man/man3/qapplication.3qt.gz
+man/man3/qarray.3qt.gz
+man/man3/qbitarray.3qt.gz
 man/man3/qbitmap.3qt.gz
-man/man3/qdir.3qt.gz
+man/man3/qbitval.3qt.gz
+man/man3/qboxlayout.3qt.gz
 man/man3/qbrush.3qt.gz
+man/man3/qbuffer.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qbitarray.3qt.gz
-man/man3/qbitval.3qt.gz
+man/man3/qcheckbox.3qt.gz
 man/man3/qclipboard.3qt.gz
 man/man3/qcloseevent.3qt.gz
 man/man3/qcollection.3qt.gz
 man/man3/qcolor.3qt.gz
 man/man3/qcolorgroup.3qt.gz
 man/man3/qcombobox.3qt.gz
+man/man3/qconnection.3qt.gz
 man/man3/qcursor.3qt.gz
 man/man3/qcustomevent.3qt.gz
 man/man3/qdatastream.3qt.gz
@@ -139,6 +277,9 @@ man/man3/qdate.3qt.gz
 man/man3/qdatetime.3qt.gz
 man/man3/qdialog.3qt.gz
 man/man3/qdict.3qt.gz
+man/man3/qdictiterator.3qt.gz
+man/man3/qdir.3qt.gz
+man/man3/qdoublevalidator.3qt.gz
 man/man3/qevent.3qt.gz
 man/man3/qfile.3qt.gz
 man/man3/qfiledialog.3qt.gz
@@ -150,21 +291,27 @@ man/man3/qfontmetrics.3qt.gz
 man/man3/qframe.3qt.gz
 man/man3/qgarray.3qt.gz
 man/man3/qgcache.3qt.gz
+man/man3/qgcacheiterator.3qt.gz
 man/man3/qgdict.3qt.gz
 man/man3/qgdictiterator.3qt.gz
 man/man3/qglist.3qt.gz
 man/man3/qglistiterator.3qt.gz
+man/man3/qgmanager.3qt.gz
+man/man3/qgridlayout.3qt.gz
 man/man3/qgroupbox.3qt.gz
+man/man3/qhboxlayout.3qt.gz
 man/man3/qimage.3qt.gz
 man/man3/qimageio.3qt.gz
 man/man3/qintdict.3qt.gz
 man/man3/qintdictiterator.3qt.gz
+man/man3/qintvalidator.3qt.gz
 man/man3/qiodevice.3qt.gz
 man/man3/qkeyevent.3qt.gz
 man/man3/qlabel.3qt.gz
 man/man3/qlayout.3qt.gz
+man/man3/qlcdnumber.3qt.gz
+man/man3/qlineedit.3qt.gz
 man/man3/qlist.3qt.gz
-man/man3/qpen.3qt.gz
 man/man3/qlistbox.3qt.gz
 man/man3/qlistboxitem.3qt.gz
 man/man3/qlistboxpixmap.3qt.gz
@@ -176,20 +323,27 @@ man/man3/qmenudata.3qt.gz
 man/man3/qmessagebox.3qt.gz
 man/man3/qmouseevent.3qt.gz
 man/man3/qmoveevent.3qt.gz
+man/man3/qmovie.3qt.gz
+man/man3/qmultilineedit.3qt.gz
 man/man3/qobject.3qt.gz
 man/man3/qpaintdevice.3qt.gz
 man/man3/qpaintdevicemetrics.3qt.gz
 man/man3/qpainter.3qt.gz
-man/man3/qpicture.3qt.gz
-man/man3/QGCache.3qt.gz
-man/man3/QGManager.3qt.gz
+man/man3/qpaintevent.3qt.gz
 man/man3/qpalette.3qt.gz
+man/man3/qpen.3qt.gz
+man/man3/qpicture.3qt.gz
 man/man3/qpixmap.3qt.gz
 man/man3/qpixmapcache.3qt.gz
 man/man3/qpoint.3qt.gz
 man/man3/qpointarray.3qt.gz
+man/man3/qpointval.3qt.gz
 man/man3/qpopupmenu.3qt.gz
 man/man3/qprinter.3qt.gz
+man/man3/qprogressbar.3qt.gz
+man/man3/qprogressdialog.3qt.gz
+man/man3/qptrdict.3qt.gz
+man/man3/qptrdictiterator.3qt.gz
 man/man3/qpushbutton.3qt.gz
 man/man3/qqueue.3qt.gz
 man/man3/qradiobutton.3qt.gz
@@ -199,6 +353,8 @@ man/man3/qregexp.3qt.gz
 man/man3/qregion.3qt.gz
 man/man3/qresizeevent.3qt.gz
 man/man3/qscrollbar.3qt.gz
+man/man3/qsemimodal.3qt.gz
+man/man3/qsenderobject.3qt.gz
 man/man3/qshared.3qt.gz
 man/man3/qsignal.3qt.gz
 man/man3/qsize.3qt.gz
@@ -207,178 +363,22 @@ man/man3/qsocketnotifier.3qt.gz
 man/man3/qstack.3qt.gz
 man/man3/qstrilist.3qt.gz
 man/man3/qstring.3qt.gz
+man/man3/qstrlist.3qt.gz
+man/man3/qtabbar.3qt.gz
+man/man3/qtabdialog.3qt.gz
 man/man3/qtableview.3qt.gz
 man/man3/qtextstream.3qt.gz
 man/man3/qtime.3qt.gz
 man/man3/qtimer.3qt.gz
 man/man3/qtimerevent.3qt.gz
-man/man3/qtsmanip.3qt.gz
-man/man3/QListBox.3qt.gz
-man/man3/qwidget.3qt.gz
-man/man3/qwindow.3qt.gz
-man/man3/qwmatrix.3qt.gz
-man/man3/QAccel.3qt.gz
-man/man3/QBitArray.3qt.gz
-man/man3/qaccel.3qt.gz
-man/man3/QListIterator.3qt.gz
-man/man3/qbuffer.3qt.gz
-man/man3/qcheckbox.3qt.gz
-man/man3/qconnection.3qt.gz
-man/man3/qdictiterator.3qt.gz
-man/man3/qgcacheiterator.3qt.gz
-man/man3/qlcdnumber.3qt.gz
-man/man3/qlineedit.3qt.gz
-man/man3/qmultilineedit.3qt.gz
-man/man3/qpaintevent.3qt.gz
-man/man3/qsenderobject.3qt.gz
-man/man3/qstrlist.3qt.gz
-man/man3/qtabbar.3qt.gz
 man/man3/qtooltip.3qt.gz
-man/man3/QBoxLayout.3qt.gz
-man/man3/QGridLayout.3qt.gz
-man/man3/QMouseEvent.3qt.gz
-man/man3/QMultiLineEdit.3qt.gz
-man/man3/QPaintEvent.3qt.gz
-man/man3/QSenderObject.3qt.gz
-man/man3/QTabBar.3qt.gz
-man/man3/QTextStream.3qt.gz
-man/man3/QToolTipGroup.3qt.gz
-man/man3/qboxlayout.3qt.gz
-man/man3/qgmanager.3qt.gz
-man/man3/qgridlayout.3qt.gz
-man/man3/qtabdialog.3qt.gz
 man/man3/qtooltipgroup.3qt.gz
-man/man3/qdoublevalidator.3qt.gz
-man/man3/qhboxlayout.3qt.gz
-man/man3/qintvalidator.3qt.gz
-man/man3/qmovie.3qt.gz
-man/man3/qpointval.3qt.gz
-man/man3/qprogressbar.3qt.gz
-man/man3/qprogressdialog.3qt.gz
-man/man3/qptrdict.3qt.gz
-man/man3/qptrdictiterator.3qt.gz
-man/man3/qsemimodal.3qt.gz
+man/man3/qtsmanip.3qt.gz
 man/man3/qvalidator.3qt.gz
 man/man3/qvboxlayout.3qt.gz
-include/X11/qt/qaccel.h
-include/X11/qt/qapp.h
-include/X11/qt/qarray.h
-include/X11/qt/qasyncimageio.h
-include/X11/qt/qasyncio.h
-include/X11/qt/qbitarry.h
-include/X11/qt/qbitmap.h
-include/X11/qt/qbrush.h
-include/X11/qt/qbttngrp.h
-include/X11/qt/qbuffer.h
-include/X11/qt/qbutton.h
-include/X11/qt/qcache.h
-include/X11/qt/qchkbox.h
-include/X11/qt/qclipbrd.h
-include/X11/qt/qcollect.h
-include/X11/qt/qcolor.h
-include/X11/qt/qcombo.h
-include/X11/qt/qconnect.h
-include/X11/qt/qcursor.h
-include/X11/qt/qdatetm.h
-include/X11/qt/qdialog.h
-include/X11/qt/qdict.h
-include/X11/qt/qdir.h
-include/X11/qt/qdrawutl.h
-include/X11/qt/qdstream.h
-include/X11/qt/qevent.h
-include/X11/qt/qfile.h
-include/X11/qt/qfiledef.h
-include/X11/qt/qfiledlg.h
-include/X11/qt/qfileinf.h
-include/X11/qt/qfont.h
-include/X11/qt/qfontdta.h
-include/X11/qt/qfontinf.h
-include/X11/qt/qfontmet.h
-include/X11/qt/qframe.h
-include/X11/qt/qgarray.h
-include/X11/qt/qgcache.h
-include/X11/qt/qgdict.h
-include/X11/qt/qgeneric.h
-include/X11/qt/qgl.h
-include/X11/qt/qglist.h
-include/X11/qt/qglobal.h
-include/X11/qt/qgmanagr.h
-include/X11/qt/qgrpbox.h
-include/X11/qt/qgvector.h
-include/X11/qt/qimage.h
-include/X11/qt/qimageio.h
-include/X11/qt/qintcach.h
-include/X11/qt/qintdict.h
-include/X11/qt/qiodev.h
-include/X11/qt/qjpegio.h
-include/X11/qt/qkeycode.h
-include/X11/qt/qlabel.h
-include/X11/qt/qlayout.h
-include/X11/qt/qlcdnum.h
-include/X11/qt/qlined.h
-include/X11/qt/qlist.h
-include/X11/qt/qlistbox.h
-include/X11/qt/qmenubar.h
-include/X11/qt/qmenudta.h
-include/X11/qt/qmetaobj.h
-include/X11/qt/qmlined.h
-include/X11/qt/qmovie.h
-include/X11/qt/qmsgbox.h
-include/X11/qt/qnp.h
-include/X11/qt/qobjcoll.h
-include/X11/qt/qobjdefs.h
-include/X11/qt/qobject.h
-include/X11/qt/qpaintd.h
-include/X11/qt/qpaintdc.h
-include/X11/qt/qpainter.h
-include/X11/qt/qpalette.h
-include/X11/qt/qpdevmet.h
-include/X11/qt/qpen.h
-include/X11/qt/qpicture.h
-include/X11/qt/qpixmap.h
-include/X11/qt/qpmcache.h
-include/X11/qt/qpngio.h
-include/X11/qt/qpntarry.h
-include/X11/qt/qpoint.h
-include/X11/qt/qpopmenu.h
-include/X11/qt/qprinter.h
-include/X11/qt/qprndlg.h
-include/X11/qt/qprogbar.h
-include/X11/qt/qprogdlg.h
-include/X11/qt/qpsprn.h
-include/X11/qt/qptrdict.h
-include/X11/qt/qpushbt.h
-include/X11/qt/qqueue.h
-include/X11/qt/qradiobt.h
-include/X11/qt/qrangect.h
-include/X11/qt/qrect.h
-include/X11/qt/qregexp.h
-include/X11/qt/qregion.h
-include/X11/qt/qscrbar.h
-include/X11/qt/qsemimodal.h
-include/X11/qt/qshared.h
-include/X11/qt/qsignal.h
-include/X11/qt/qsize.h
-include/X11/qt/qslider.h
-include/X11/qt/qsocknot.h
-include/X11/qt/qstack.h
-include/X11/qt/qstring.h
-include/X11/qt/qstrlist.h
-include/X11/qt/qstrvec.h
-include/X11/qt/qtabbar.h
-include/X11/qt/qtabdlg.h
-include/X11/qt/qtablevw.h
-include/X11/qt/qtimer.h
-include/X11/qt/qtooltip.h
-include/X11/qt/qtstream.h
-include/X11/qt/qvalidator.h
-include/X11/qt/qvector.h
-include/X11/qt/qwidcoll.h
-include/X11/qt/qwidget.h
-include/X11/qt/qwindefs.h
-include/X11/qt/qwindow.h
-include/X11/qt/qwmatrix.h
-bin/moc
+man/man3/qwidget.3qt.gz
+man/man3/qwindow.3qt.gz
+man/man3/qwmatrix.3qt.gz
 share/doc/qt/README
 share/doc/qt/README.QT
 @dirrm include/X11/qt
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index f882e252ca8c..bacad02d2115 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -3,115 +3,99 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.15 1998/04/11 17:45:40 andreas Exp $
+# $Id: Makefile,v 1.16 1998/04/28 02:07:56 asami Exp $
 #
 
-DISTNAME=	qt-1.31
+DISTNAME=	qt-${MAJ}.${MIN}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
-MAINTAINER=	searle@longacre.demon.co.uk
-
-BROKEN=		repository copied, awaiting upgrade to 1.33
+MAINTAINER=	andreas@FreeBSD.ORG
 
+MAJ=		1
+MIN=		33
 USE_GMAKE=	yes
 USE_X11=	yes
 
-MAN1=		moc.1
-MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
-		qbitmap.3qt qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt \
-		qbutton.3qt qbuttongroup.3qt qbytearray.3qt \
-		qcheckbox.3qt qclipboard.3qt qcloseevent.3qt \
-		qcollection.3qt qcolor.3qt qcolorgroup.3qt \
-		qcombobox.3qt qconnection.3qt qcursor.3qt \
-		qcustomevent.3qt qdatastream.3qt qdate.3qt \
-		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.3qt qdoublevalidator.3qt qevent.3qt qfile.3qt \
-		qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
-		qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt \
-		qgcache.3qt qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt \
-		qglist.3qt qglistiterator.3qt qgmanager.3qt qgridlayout.3qt \
-		qgroupbox.3qt qhboxlayout.3qt qimage.3qt \
-		qimageio.3qt qintdict.3qt qintdictiterator.3qt \
-		qintvalidator.3qt \
-		qiodevice.3qt qkeyevent.3qt qlabel.3qt qlayout.3qt \
-		qlcdnumber.3qt \
-		qlineedit.3qt qlist.3qt qlistbox.3qt qlistboxitem.3qt \
-		qlistboxpixmap.3qt qlistboxtext.3qt qlistiterator.3qt \
-		qlnode.3qt qmenubar.3qt qmenudata.3qt qmessagebox.3qt \
-		qmouseevent.3qt qmoveevent.3qt qmultilineedit.3qt qobject.3qt \
-		qmovie.3qt \
-		qpaintdevice.3qt qpaintdevicemetrics.3qt qpainter.3qt \
-		qpaintevent.3qt qpalette.3qt qpen.3qt qpicture.3qt \
-		qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
-		qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
-		qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
-		qptrdictiterator.3qt \
-		qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
-		qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt \
-		qresizeevent.3qt qscrollbar.3qt qsenderobject.3qt \
-		qsemimodal.3qt \
-		qshared.3qt qsignal.3qt qsize.3qt qslider.3qt \
-		qsocketnotifier.3qt qstack.3qt qstrilist.3qt qstring.3qt \
-		qstrlist.3qt qtabbar.3qt qtabdialog.3qt qtableview.3qt \
-		qtextstream.3qt qtime.3qt \
-		qtimer.3qt qtimerevent.3qt qtooltip.3qt qtooltipgroup.3qt \
-		qtsmanip.3qt qvalidator.3qt qvboxlayout.3qt qwidget.3qt \
-		qwindow.3qt qwmatrix.3qt QAccel.3qt QApplication.3qt \
-		QArray.3qt QBitArray.3qt QBitmap.3qt QBitVal.3qt \
-		QBoxLayout.3qt QBrush.3qt \
-		QBuffer.3qt QButton.3qt QButtonGroup.3qt \
-		QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
-		QCloseEvent.3qt QCollection.3qt QColor.3qt \
-		QColorGroup.3qt QComboBox.3qt QConnection.3qt \
-		QCursor.3qt QCustomEvent.3qt QDataStream.3qt QDate.3qt \
-		QDateTime.3qt QDialog.3qt QDict.3qt QDictIterator.3qt \
-		QDir.3qt QDoubleValidator.3qt QEvent.3qt QFile.3qt \
-		QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
-		QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt \
-		QGCache.3qt QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt \
-		QGList.3qt QGListIterator.3qt QGManager.3qt \
-		QGridLayout.3qt QGroupBox.3qt QHBoxLayout.3qt QImage.3qt \
-		QImageIO.3qt QIntDict.3qt QIntDictIterator.3qt \
-		QIntValidator.3qt \
-		QIODevice.3qt QKeyEvent.3qt QLCDNumber.3qt QLabel.3qt \
-		QLayout.3qt \
-		QLineEdit.3qt QList.3qt QListBox.3qt QListBoxItem.3qt \
-		QListBoxPixmap.3qt QListBoxText.3qt QListIterator.3qt \
-		QLNode.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
-		QMovie.3qt \
-		QMouseEvent.3qt QMoveEvent.3qt QMultiLineEdit.3qt QObject.3qt \
-		QPaintDevice.3qt QPaintDeviceMetrics.3qt QPainter.3qt \
-		QPaintEvent.3qt QPalette.3qt QPen.3qt QPicture.3qt \
-		QPixmap.3qt QPixmapCache.3qt QPoint.3qt QPointVal.3qt\
-		QPointArray.3qt QPopupMenu.3qt QPrinter.3qt \
-		QProgressBar.3qt QProgressDialog.3qt \
-		QPtrDict.3qt QPtrDictIterator.3qt \
-		QPushButton.3qt QQueue.3qt QRadioButton.3qt \
-		QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
-		QResizeEvent.3qt QScrollBar.3qt QSenderObject.3qt \
-		QSemiModal.3qt QVBoxLayout.3qt QValidator.3qt \
-		QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt \
-		QSocketNotifier.3qt QStack.3qt QStrIList.3qt QString.3qt \
-		QStrList.3qt QTabBar.3qt QTabDialog.3qt QTableView.3qt \
-		QTextStream.3qt QTime.3qt \
-		QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
-		QTSManip.3qt QWidget.3qt QWindow.3qt QWMatrix.3qt
+MAN1=	moc.1
+MAN3=	QAccel.3qt QApplication.3qt QArray.3qt QBitArray.3qt QBitVal.3qt \
+	QBitmap.3qt QBoxLayout.3qt QBrush.3qt QBuffer.3qt QButton.3qt \
+	QButtonGroup.3qt QByteArray.3qt QCheckBox.3qt QClipboard.3qt \
+	QCloseEvent.3qt QCollection.3qt QColor.3qt QColorGroup.3qt \
+	QComboBox.3qt QConnection.3qt QCursor.3qt QCustomEvent.3qt \
+	QDataStream.3qt QDate.3qt QDateTime.3qt QDialog.3qt QDict.3qt \
+	QDictIterator.3qt QDir.3qt QDoubleValidator.3qt QEvent.3qt \
+	QFile.3qt QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
+	QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt QGCache.3qt \
+	QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt QGList.3qt \
+	QGListIterator.3qt QGManager.3qt QGridLayout.3qt QGroupBox.3qt \
+	QHBoxLayout.3qt QIODevice.3qt QImage.3qt QImageIO.3qt QIntDict.3qt \
+	QIntDictIterator.3qt QIntValidator.3qt QKeyEvent.3qt QLCDNumber.3qt \
+	QLNode.3qt QLabel.3qt QLayout.3qt QLineEdit.3qt QList.3qt \
+	QListBox.3qt QListBoxItem.3qt QListBoxPixmap.3qt QListBoxText.3qt \
+	QListIterator.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
+	QMouseEvent.3qt QMoveEvent.3qt QMovie.3qt QMultiLineEdit.3qt \
+	QObject.3qt QPaintDevice.3qt QPaintDeviceMetrics.3qt QPaintEvent.3qt \
+	QPainter.3qt QPalette.3qt QPen.3qt QPicture.3qt QPixmap.3qt \
+	QPixmapCache.3qt QPoint.3qt QPointArray.3qt QPointVal.3qt \
+	QPopupMenu.3qt QPrinter.3qt QProgressBar.3qt QProgressDialog.3qt \
+	QPtrDict.3qt QPtrDictIterator.3qt QPushButton.3qt QQueue.3qt \
+	QRadioButton.3qt QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
+	QResizeEvent.3qt QScrollBar.3qt QSemiModal.3qt QSenderObject.3qt \
+	QShared.3qt QSignal.3qt QSize.3qt QSlider.3qt QSocketNotifier.3qt \
+	QStack.3qt QStrIList.3qt QStrList.3qt QString.3qt QTSManip.3qt \
+	QTabBar.3qt QTabDialog.3qt QTableView.3qt QTextStream.3qt QTime.3qt \
+	QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
+	QVBoxLayout.3qt QValidator.3qt QWMatrix.3qt QWidget.3qt QWindow.3qt \
+	qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt qbitmap.3qt \
+	qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt qbutton.3qt \
+	qbuttongroup.3qt qbytearray.3qt qcheckbox.3qt qclipboard.3qt \
+	qcloseevent.3qt qcollection.3qt qcolor.3qt qcolorgroup.3qt \
+	qcombobox.3qt qconnection.3qt qcursor.3qt qcustomevent.3qt \
+	qdatastream.3qt qdate.3qt qdatetime.3qt qdialog.3qt qdict.3qt \
+	qdictiterator.3qt qdir.3qt qdoublevalidator.3qt qevent.3qt \
+	qfile.3qt qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt qfont.3qt \
+	qfontinfo.3qt qfontmetrics.3qt qframe.3qt qgarray.3qt qgcache.3qt \
+	qgcacheiterator.3qt qgdict.3qt qgdictiterator.3qt qglist.3qt \
+	qglistiterator.3qt qgmanager.3qt qgridlayout.3qt qgroupbox.3qt \
+	qhboxlayout.3qt qimage.3qt qimageio.3qt qintdict.3qt \
+	qintdictiterator.3qt qintvalidator.3qt qiodevice.3qt qkeyevent.3qt \
+	qlabel.3qt qlayout.3qt qlcdnumber.3qt qlineedit.3qt qlist.3qt \
+	qlistbox.3qt qlistboxitem.3qt qlistboxpixmap.3qt qlistboxtext.3qt \
+	qlistiterator.3qt qlnode.3qt qmenubar.3qt qmenudata.3qt \
+	qmessagebox.3qt qmouseevent.3qt qmoveevent.3qt qmovie.3qt \
+	qmultilineedit.3qt qobject.3qt qpaintdevice.3qt \
+	qpaintdevicemetrics.3qt qpainter.3qt qpaintevent.3qt qpalette.3qt \
+	qpen.3qt qpicture.3qt qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
+	qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
+	qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
+	qptrdictiterator.3qt qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
+	qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt qresizeevent.3qt \
+	qscrollbar.3qt qsemimodal.3qt qsenderobject.3qt qshared.3qt \
+	qsignal.3qt qsize.3qt qslider.3qt qsocketnotifier.3qt qstack.3qt \
+	qstrilist.3qt qstring.3qt qstrlist.3qt qtabbar.3qt qtabdialog.3qt \
+	qtableview.3qt qtextstream.3qt qtime.3qt qtimer.3qt qtimerevent.3qt \
+	qtooltip.3qt qtooltipgroup.3qt qtsmanip.3qt qvalidator.3qt \
+	qvboxlayout.3qt qwidget.3qt qwindow.3qt qwmatrix.3qt
 
 post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
-	${LN} -sf $(X11BASE)/lib/libqt.so.1.31 $(X11BASE)/lib/libqt.so
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-${MAJ}.${MIN}/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${MAJ}.${MIN} \
+		$(X11BASE)/lib
+	${LN} -sf $(X11BASE)/lib/libqt.so.${MAJ}.${MIN} $(X11BASE)/lib/libqt.so
 	${LDCONFIG} -m $(PREFIX)/lib
 	${MKDIR} $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.31/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.31/man/man3/* $(PREFIX)/man/man3
+	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/include/* \
+		$(PREFIX)/include/X11/qt
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man1/* $(PREFIX)/man/man1
+	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man3/* $(PREFIX)/man/man3
 	${MKDIR} ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.31/README.QT ${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README \
+		${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README.QT \
+		${PREFIX}/share/doc/qt
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo
index e712bdb4e580..004f1c20b643 100644
--- a/x11-toolkits/qt33/distinfo
+++ b/x11-toolkits/qt33/distinfo
@@ -1 +1 @@
-MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
+MD5 (qt-1.33.tar.gz) = 6136b589c0d611f55deae45bc8ee2af7
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 695c9a3a7f8e..20cc37259181 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -1,11 +1,133 @@
-lib/libqt.so.1.31
 lib/libqt.so
+lib/libqt.so.1.33
 @exec /sbin/ldconfig -m %B
+bin/moc
+include/X11/qt/qaccel.h
+include/X11/qt/qapp.h
+include/X11/qt/qarray.h
+include/X11/qt/qasyncimageio.h
+include/X11/qt/qasyncio.h
+include/X11/qt/qbitarry.h
+include/X11/qt/qbitmap.h
+include/X11/qt/qbrush.h
+include/X11/qt/qbttngrp.h
+include/X11/qt/qbuffer.h
+include/X11/qt/qbutton.h
+include/X11/qt/qcache.h
+include/X11/qt/qchkbox.h
+include/X11/qt/qclipbrd.h
+include/X11/qt/qcollect.h
+include/X11/qt/qcolor.h
+include/X11/qt/qcombo.h
+include/X11/qt/qconnect.h
+include/X11/qt/qcursor.h
+include/X11/qt/qdatetm.h
+include/X11/qt/qdialog.h
+include/X11/qt/qdict.h
+include/X11/qt/qdir.h
+include/X11/qt/qdrawutl.h
+include/X11/qt/qdstream.h
+include/X11/qt/qevent.h
+include/X11/qt/qfile.h
+include/X11/qt/qfiledef.h
+include/X11/qt/qfiledlg.h
+include/X11/qt/qfileinf.h
+include/X11/qt/qfont.h
+include/X11/qt/qfontdta.h
+include/X11/qt/qfontinf.h
+include/X11/qt/qfontmet.h
+include/X11/qt/qframe.h
+include/X11/qt/qgarray.h
+include/X11/qt/qgcache.h
+include/X11/qt/qgdict.h
+include/X11/qt/qgeneric.h
+include/X11/qt/qgl.h
+include/X11/qt/qglist.h
+include/X11/qt/qglobal.h
+include/X11/qt/qgmanagr.h
+include/X11/qt/qgrpbox.h
+include/X11/qt/qgvector.h
+include/X11/qt/qimage.h
+include/X11/qt/qimageio.h
+include/X11/qt/qintcach.h
+include/X11/qt/qintdict.h
+include/X11/qt/qiodev.h
+include/X11/qt/qjpegio.h
+include/X11/qt/qkeycode.h
+include/X11/qt/qlabel.h
+include/X11/qt/qlayout.h
+include/X11/qt/qlcdnum.h
+include/X11/qt/qlined.h
+include/X11/qt/qlist.h
+include/X11/qt/qlistbox.h
+include/X11/qt/qmenubar.h
+include/X11/qt/qmenudta.h
+include/X11/qt/qmetaobj.h
+include/X11/qt/qmlined.h
+include/X11/qt/qmovie.h
+include/X11/qt/qmsgbox.h
+include/X11/qt/qnp.h
+include/X11/qt/qobjcoll.h
+include/X11/qt/qobjdefs.h
+include/X11/qt/qobject.h
+include/X11/qt/qpaintd.h
+include/X11/qt/qpaintdc.h
+include/X11/qt/qpainter.h
+include/X11/qt/qpalette.h
+include/X11/qt/qpdevmet.h
+include/X11/qt/qpen.h
+include/X11/qt/qpicture.h
+include/X11/qt/qpixmap.h
+include/X11/qt/qpmcache.h
+include/X11/qt/qpngio.h
+include/X11/qt/qpntarry.h
+include/X11/qt/qpoint.h
+include/X11/qt/qpopmenu.h
+include/X11/qt/qprinter.h
+include/X11/qt/qprndlg.h
+include/X11/qt/qprogbar.h
+include/X11/qt/qprogdlg.h
+include/X11/qt/qpsprn.h
+include/X11/qt/qptrdict.h
+include/X11/qt/qpushbt.h
+include/X11/qt/qqueue.h
+include/X11/qt/qradiobt.h
+include/X11/qt/qrangect.h
+include/X11/qt/qrect.h
+include/X11/qt/qregexp.h
+include/X11/qt/qregion.h
+include/X11/qt/qscrbar.h
+include/X11/qt/qsemimodal.h
+include/X11/qt/qshared.h
+include/X11/qt/qsignal.h
+include/X11/qt/qsize.h
+include/X11/qt/qslider.h
+include/X11/qt/qsocknot.h
+include/X11/qt/qstack.h
+include/X11/qt/qstring.h
+include/X11/qt/qstrlist.h
+include/X11/qt/qstrvec.h
+include/X11/qt/qtabbar.h
+include/X11/qt/qtabdlg.h
+include/X11/qt/qtablevw.h
+include/X11/qt/qtimer.h
+include/X11/qt/qtooltip.h
+include/X11/qt/qtstream.h
+include/X11/qt/qvalidator.h
+include/X11/qt/qvector.h
+include/X11/qt/qwidcoll.h
+include/X11/qt/qwidget.h
+include/X11/qt/qwindefs.h
+include/X11/qt/qwindow.h
+include/X11/qt/qwmatrix.h
 man/man1/moc.1.gz
+man/man3/QAccel.3qt.gz
 man/man3/QApplication.3qt.gz
 man/man3/QArray.3qt.gz
-man/man3/QBitmap.3qt.gz
+man/man3/QBitArray.3qt.gz
 man/man3/QBitVal.3qt.gz
+man/man3/QBitmap.3qt.gz
+man/man3/QBoxLayout.3qt.gz
 man/man3/QBrush.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
@@ -39,37 +161,45 @@ man/man3/QFontInfo.3qt.gz
 man/man3/QFontMetrics.3qt.gz
 man/man3/QFrame.3qt.gz
 man/man3/QGArray.3qt.gz
+man/man3/QGCache.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
 man/man3/QGList.3qt.gz
 man/man3/QGListIterator.3qt.gz
+man/man3/QGManager.3qt.gz
+man/man3/QGridLayout.3qt.gz
 man/man3/QGroupBox.3qt.gz
 man/man3/QHBoxLayout.3qt.gz
+man/man3/QIODevice.3qt.gz
 man/man3/QImage.3qt.gz
 man/man3/QImageIO.3qt.gz
 man/man3/QIntDict.3qt.gz
 man/man3/QIntDictIterator.3qt.gz
 man/man3/QIntValidator.3qt.gz
-man/man3/QIODevice.3qt.gz
 man/man3/QKeyEvent.3qt.gz
+man/man3/QLCDNumber.3qt.gz
+man/man3/QLNode.3qt.gz
 man/man3/QLabel.3qt.gz
 man/man3/QLayout.3qt.gz
-man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
+man/man3/QListBox.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QLNode.3qt.gz
+man/man3/QListIterator.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
+man/man3/QMouseEvent.3qt.gz
 man/man3/QMoveEvent.3qt.gz
 man/man3/QMovie.3qt.gz
+man/man3/QMultiLineEdit.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
+man/man3/QPaintEvent.3qt.gz
 man/man3/QPainter.3qt.gz
 man/man3/QPalette.3qt.gz
 man/man3/QPen.3qt.gz
@@ -95,6 +225,7 @@ man/man3/QRegion.3qt.gz
 man/man3/QResizeEvent.3qt.gz
 man/man3/QScrollBar.3qt.gz
 man/man3/QSemiModal.3qt.gz
+man/man3/QSenderObject.3qt.gz
 man/man3/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -102,36 +233,43 @@ man/man3/QSlider.3qt.gz
 man/man3/QSocketNotifier.3qt.gz
 man/man3/QStack.3qt.gz
 man/man3/QStrIList.3qt.gz
-man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
-man/man3/QTableView.3qt.gz
+man/man3/QString.3qt.gz
+man/man3/QTSManip.3qt.gz
+man/man3/QTabBar.3qt.gz
 man/man3/QTabDialog.3qt.gz
+man/man3/QTableView.3qt.gz
+man/man3/QTextStream.3qt.gz
 man/man3/QTime.3qt.gz
 man/man3/QTimer.3qt.gz
 man/man3/QTimerEvent.3qt.gz
 man/man3/QToolTip.3qt.gz
-man/man3/QTSManip.3qt.gz
-man/man3/QValidator.3qt.gz
+man/man3/QToolTipGroup.3qt.gz
 man/man3/QVBoxLayout.3qt.gz
+man/man3/QValidator.3qt.gz
+man/man3/QWMatrix.3qt.gz
 man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
-man/man3/QWMatrix.3qt.gz
-man/man3/qarray.3qt.gz
+man/man3/qaccel.3qt.gz
 man/man3/qapplication.3qt.gz
+man/man3/qarray.3qt.gz
+man/man3/qbitarray.3qt.gz
 man/man3/qbitmap.3qt.gz
-man/man3/qdir.3qt.gz
+man/man3/qbitval.3qt.gz
+man/man3/qboxlayout.3qt.gz
 man/man3/qbrush.3qt.gz
+man/man3/qbuffer.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qbitarray.3qt.gz
-man/man3/qbitval.3qt.gz
+man/man3/qcheckbox.3qt.gz
 man/man3/qclipboard.3qt.gz
 man/man3/qcloseevent.3qt.gz
 man/man3/qcollection.3qt.gz
 man/man3/qcolor.3qt.gz
 man/man3/qcolorgroup.3qt.gz
 man/man3/qcombobox.3qt.gz
+man/man3/qconnection.3qt.gz
 man/man3/qcursor.3qt.gz
 man/man3/qcustomevent.3qt.gz
 man/man3/qdatastream.3qt.gz
@@ -139,6 +277,9 @@ man/man3/qdate.3qt.gz
 man/man3/qdatetime.3qt.gz
 man/man3/qdialog.3qt.gz
 man/man3/qdict.3qt.gz
+man/man3/qdictiterator.3qt.gz
+man/man3/qdir.3qt.gz
+man/man3/qdoublevalidator.3qt.gz
 man/man3/qevent.3qt.gz
 man/man3/qfile.3qt.gz
 man/man3/qfiledialog.3qt.gz
@@ -150,21 +291,27 @@ man/man3/qfontmetrics.3qt.gz
 man/man3/qframe.3qt.gz
 man/man3/qgarray.3qt.gz
 man/man3/qgcache.3qt.gz
+man/man3/qgcacheiterator.3qt.gz
 man/man3/qgdict.3qt.gz
 man/man3/qgdictiterator.3qt.gz
 man/man3/qglist.3qt.gz
 man/man3/qglistiterator.3qt.gz
+man/man3/qgmanager.3qt.gz
+man/man3/qgridlayout.3qt.gz
 man/man3/qgroupbox.3qt.gz
+man/man3/qhboxlayout.3qt.gz
 man/man3/qimage.3qt.gz
 man/man3/qimageio.3qt.gz
 man/man3/qintdict.3qt.gz
 man/man3/qintdictiterator.3qt.gz
+man/man3/qintvalidator.3qt.gz
 man/man3/qiodevice.3qt.gz
 man/man3/qkeyevent.3qt.gz
 man/man3/qlabel.3qt.gz
 man/man3/qlayout.3qt.gz
+man/man3/qlcdnumber.3qt.gz
+man/man3/qlineedit.3qt.gz
 man/man3/qlist.3qt.gz
-man/man3/qpen.3qt.gz
 man/man3/qlistbox.3qt.gz
 man/man3/qlistboxitem.3qt.gz
 man/man3/qlistboxpixmap.3qt.gz
@@ -176,20 +323,27 @@ man/man3/qmenudata.3qt.gz
 man/man3/qmessagebox.3qt.gz
 man/man3/qmouseevent.3qt.gz
 man/man3/qmoveevent.3qt.gz
+man/man3/qmovie.3qt.gz
+man/man3/qmultilineedit.3qt.gz
 man/man3/qobject.3qt.gz
 man/man3/qpaintdevice.3qt.gz
 man/man3/qpaintdevicemetrics.3qt.gz
 man/man3/qpainter.3qt.gz
-man/man3/qpicture.3qt.gz
-man/man3/QGCache.3qt.gz
-man/man3/QGManager.3qt.gz
+man/man3/qpaintevent.3qt.gz
 man/man3/qpalette.3qt.gz
+man/man3/qpen.3qt.gz
+man/man3/qpicture.3qt.gz
 man/man3/qpixmap.3qt.gz
 man/man3/qpixmapcache.3qt.gz
 man/man3/qpoint.3qt.gz
 man/man3/qpointarray.3qt.gz
+man/man3/qpointval.3qt.gz
 man/man3/qpopupmenu.3qt.gz
 man/man3/qprinter.3qt.gz
+man/man3/qprogressbar.3qt.gz
+man/man3/qprogressdialog.3qt.gz
+man/man3/qptrdict.3qt.gz
+man/man3/qptrdictiterator.3qt.gz
 man/man3/qpushbutton.3qt.gz
 man/man3/qqueue.3qt.gz
 man/man3/qradiobutton.3qt.gz
@@ -199,6 +353,8 @@ man/man3/qregexp.3qt.gz
 man/man3/qregion.3qt.gz
 man/man3/qresizeevent.3qt.gz
 man/man3/qscrollbar.3qt.gz
+man/man3/qsemimodal.3qt.gz
+man/man3/qsenderobject.3qt.gz
 man/man3/qshared.3qt.gz
 man/man3/qsignal.3qt.gz
 man/man3/qsize.3qt.gz
@@ -207,178 +363,22 @@ man/man3/qsocketnotifier.3qt.gz
 man/man3/qstack.3qt.gz
 man/man3/qstrilist.3qt.gz
 man/man3/qstring.3qt.gz
+man/man3/qstrlist.3qt.gz
+man/man3/qtabbar.3qt.gz
+man/man3/qtabdialog.3qt.gz
 man/man3/qtableview.3qt.gz
 man/man3/qtextstream.3qt.gz
 man/man3/qtime.3qt.gz
 man/man3/qtimer.3qt.gz
 man/man3/qtimerevent.3qt.gz
-man/man3/qtsmanip.3qt.gz
-man/man3/QListBox.3qt.gz
-man/man3/qwidget.3qt.gz
-man/man3/qwindow.3qt.gz
-man/man3/qwmatrix.3qt.gz
-man/man3/QAccel.3qt.gz
-man/man3/QBitArray.3qt.gz
-man/man3/qaccel.3qt.gz
-man/man3/QListIterator.3qt.gz
-man/man3/qbuffer.3qt.gz
-man/man3/qcheckbox.3qt.gz
-man/man3/qconnection.3qt.gz
-man/man3/qdictiterator.3qt.gz
-man/man3/qgcacheiterator.3qt.gz
-man/man3/qlcdnumber.3qt.gz
-man/man3/qlineedit.3qt.gz
-man/man3/qmultilineedit.3qt.gz
-man/man3/qpaintevent.3qt.gz
-man/man3/qsenderobject.3qt.gz
-man/man3/qstrlist.3qt.gz
-man/man3/qtabbar.3qt.gz
 man/man3/qtooltip.3qt.gz
-man/man3/QBoxLayout.3qt.gz
-man/man3/QGridLayout.3qt.gz
-man/man3/QMouseEvent.3qt.gz
-man/man3/QMultiLineEdit.3qt.gz
-man/man3/QPaintEvent.3qt.gz
-man/man3/QSenderObject.3qt.gz
-man/man3/QTabBar.3qt.gz
-man/man3/QTextStream.3qt.gz
-man/man3/QToolTipGroup.3qt.gz
-man/man3/qboxlayout.3qt.gz
-man/man3/qgmanager.3qt.gz
-man/man3/qgridlayout.3qt.gz
-man/man3/qtabdialog.3qt.gz
 man/man3/qtooltipgroup.3qt.gz
-man/man3/qdoublevalidator.3qt.gz
-man/man3/qhboxlayout.3qt.gz
-man/man3/qintvalidator.3qt.gz
-man/man3/qmovie.3qt.gz
-man/man3/qpointval.3qt.gz
-man/man3/qprogressbar.3qt.gz
-man/man3/qprogressdialog.3qt.gz
-man/man3/qptrdict.3qt.gz
-man/man3/qptrdictiterator.3qt.gz
-man/man3/qsemimodal.3qt.gz
+man/man3/qtsmanip.3qt.gz
 man/man3/qvalidator.3qt.gz
 man/man3/qvboxlayout.3qt.gz
-include/X11/qt/qaccel.h
-include/X11/qt/qapp.h
-include/X11/qt/qarray.h
-include/X11/qt/qasyncimageio.h
-include/X11/qt/qasyncio.h
-include/X11/qt/qbitarry.h
-include/X11/qt/qbitmap.h
-include/X11/qt/qbrush.h
-include/X11/qt/qbttngrp.h
-include/X11/qt/qbuffer.h
-include/X11/qt/qbutton.h
-include/X11/qt/qcache.h
-include/X11/qt/qchkbox.h
-include/X11/qt/qclipbrd.h
-include/X11/qt/qcollect.h
-include/X11/qt/qcolor.h
-include/X11/qt/qcombo.h
-include/X11/qt/qconnect.h
-include/X11/qt/qcursor.h
-include/X11/qt/qdatetm.h
-include/X11/qt/qdialog.h
-include/X11/qt/qdict.h
-include/X11/qt/qdir.h
-include/X11/qt/qdrawutl.h
-include/X11/qt/qdstream.h
-include/X11/qt/qevent.h
-include/X11/qt/qfile.h
-include/X11/qt/qfiledef.h
-include/X11/qt/qfiledlg.h
-include/X11/qt/qfileinf.h
-include/X11/qt/qfont.h
-include/X11/qt/qfontdta.h
-include/X11/qt/qfontinf.h
-include/X11/qt/qfontmet.h
-include/X11/qt/qframe.h
-include/X11/qt/qgarray.h
-include/X11/qt/qgcache.h
-include/X11/qt/qgdict.h
-include/X11/qt/qgeneric.h
-include/X11/qt/qgl.h
-include/X11/qt/qglist.h
-include/X11/qt/qglobal.h
-include/X11/qt/qgmanagr.h
-include/X11/qt/qgrpbox.h
-include/X11/qt/qgvector.h
-include/X11/qt/qimage.h
-include/X11/qt/qimageio.h
-include/X11/qt/qintcach.h
-include/X11/qt/qintdict.h
-include/X11/qt/qiodev.h
-include/X11/qt/qjpegio.h
-include/X11/qt/qkeycode.h
-include/X11/qt/qlabel.h
-include/X11/qt/qlayout.h
-include/X11/qt/qlcdnum.h
-include/X11/qt/qlined.h
-include/X11/qt/qlist.h
-include/X11/qt/qlistbox.h
-include/X11/qt/qmenubar.h
-include/X11/qt/qmenudta.h
-include/X11/qt/qmetaobj.h
-include/X11/qt/qmlined.h
-include/X11/qt/qmovie.h
-include/X11/qt/qmsgbox.h
-include/X11/qt/qnp.h
-include/X11/qt/qobjcoll.h
-include/X11/qt/qobjdefs.h
-include/X11/qt/qobject.h
-include/X11/qt/qpaintd.h
-include/X11/qt/qpaintdc.h
-include/X11/qt/qpainter.h
-include/X11/qt/qpalette.h
-include/X11/qt/qpdevmet.h
-include/X11/qt/qpen.h
-include/X11/qt/qpicture.h
-include/X11/qt/qpixmap.h
-include/X11/qt/qpmcache.h
-include/X11/qt/qpngio.h
-include/X11/qt/qpntarry.h
-include/X11/qt/qpoint.h
-include/X11/qt/qpopmenu.h
-include/X11/qt/qprinter.h
-include/X11/qt/qprndlg.h
-include/X11/qt/qprogbar.h
-include/X11/qt/qprogdlg.h
-include/X11/qt/qpsprn.h
-include/X11/qt/qptrdict.h
-include/X11/qt/qpushbt.h
-include/X11/qt/qqueue.h
-include/X11/qt/qradiobt.h
-include/X11/qt/qrangect.h
-include/X11/qt/qrect.h
-include/X11/qt/qregexp.h
-include/X11/qt/qregion.h
-include/X11/qt/qscrbar.h
-include/X11/qt/qsemimodal.h
-include/X11/qt/qshared.h
-include/X11/qt/qsignal.h
-include/X11/qt/qsize.h
-include/X11/qt/qslider.h
-include/X11/qt/qsocknot.h
-include/X11/qt/qstack.h
-include/X11/qt/qstring.h
-include/X11/qt/qstrlist.h
-include/X11/qt/qstrvec.h
-include/X11/qt/qtabbar.h
-include/X11/qt/qtabdlg.h
-include/X11/qt/qtablevw.h
-include/X11/qt/qtimer.h
-include/X11/qt/qtooltip.h
-include/X11/qt/qtstream.h
-include/X11/qt/qvalidator.h
-include/X11/qt/qvector.h
-include/X11/qt/qwidcoll.h
-include/X11/qt/qwidget.h
-include/X11/qt/qwindefs.h
-include/X11/qt/qwindow.h
-include/X11/qt/qwmatrix.h
-bin/moc
+man/man3/qwidget.3qt.gz
+man/man3/qwindow.3qt.gz
+man/man3/qwmatrix.3qt.gz
 share/doc/qt/README
 share/doc/qt/README.QT
 @dirrm include/X11/qt