Update to version 1.31

PR:		4868
Submitted by:	Vanill I. Shu <vanilla@MinJe.com.TW>

21 files changed, 588 insertions, 252 deletions

diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index 4f890528ca5c..d784ff176757 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   qt
-# Version required:	1.2
+# Version required:	1.31
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.11 1997/05/14 08:58:01 tg Exp $
+# $Id: Makefile,v 1.12 1997/07/17 15:13:01 max Exp $
 #
 
-DISTNAME=	qt-1.2
+DISTNAME=	qt-1.31
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
@@ -24,32 +24,37 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
 		qcombobox.3qt qconnection.3qt qcursor.3qt \
 		qcustomevent.3qt qdatastream.3qt qdate.3qt \
 		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.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 \
+		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 qimage.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 qpopupmenu.3qt qprinter.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 qwidget.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 \
@@ -59,26 +64,31 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.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 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 \
+		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 QImage.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 \
+		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 \
@@ -90,15 +100,15 @@ post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.2/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/lib/libqt.so.1.2 $(X11BASE)/lib
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
 	${LDCONFIG} -m $(PREFIX)/lib
 	mkdir -p $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man3/* $(PREFIX)/man/man3
+	${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
 	mkdir -p ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README.QT ${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
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt145/distinfo b/x11-toolkits/qt145/distinfo
index 93f1b344a9e6..e712bdb4e580 100644
--- a/x11-toolkits/qt145/distinfo
+++ b/x11-toolkits/qt145/distinfo
@@ -1 +1 @@
-MD5 (qt-1.2.tar.gz) = 06afc46741a31e5b2e100bb622e75179
+MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
diff --git a/x11-toolkits/qt145/pkg-plist b/x11-toolkits/qt145/pkg-plist
index 4fa7d2e7c5a5..7d8d96fb263c 100644
--- a/x11-toolkits/qt145/pkg-plist
+++ b/x11-toolkits/qt145/pkg-plist
@@ -1,28 +1,33 @@
-lib/libqt.so.1.2
+lib/libqt.so.1.31
 @exec /sbin/ldconfig -m %B
 man/man1/moc.1.gz
 man/man3/QApplication.3qt.gz
-man/man3/QCloseEvent.3qt.gz
 man/man3/QArray.3qt.gz
 man/man3/QBitmap.3qt.gz
+man/man3/QBitVal.3qt.gz
 man/man3/QBrush.3qt.gz
-man/man3/QDir.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
 man/man3/QButtonGroup.3qt.gz
 man/man3/QByteArray.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
 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
@@ -36,52 +41,59 @@ man/man3/QGArray.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
-man/man3/QCustomEvent.3qt.gz
-man/man3/QDateTime.3qt.gz
 man/man3/QGList.3qt.gz
+man/man3/QGListIterator.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/QPen.3qt.gz
 man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QGListIterator.3qt.gz
 man/man3/QLNode.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
 man/man3/QMoveEvent.3qt.gz
+man/man3/QMovie.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
 man/man3/QPainter.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
-man/man3/QPushButton.3qt.gz
 man/man3/QRangeControl.3qt.gz
 man/man3/QRect.3qt.gz
 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/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -92,25 +104,25 @@ man/man3/QStrIList.3qt.gz
 man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
 man/man3/QTableView.3qt.gz
-man/man3/QWidget.3qt.gz
 man/man3/QTabDialog.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/QVBoxLayout.3qt.gz
+man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
 man/man3/QWMatrix.3qt.gz
-man/man3/QBitVal.3qt.gz
-man/man3/QDict.3qt.gz
 man/man3/qarray.3qt.gz
+man/man3/qapplication.3qt.gz
 man/man3/qbitmap.3qt.gz
 man/man3/qdir.3qt.gz
 man/man3/qbrush.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qapplication.3qt.gz
 man/man3/qbitarray.3qt.gz
 man/man3/qbitval.3qt.gz
 man/man3/qclipboard.3qt.gz
@@ -235,9 +247,23 @@ 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/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
@@ -279,9 +305,11 @@ 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
@@ -293,7 +321,9 @@ 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
@@ -306,12 +336,16 @@ 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
@@ -320,6 +354,7 @@ 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
@@ -335,6 +370,7 @@ 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
@@ -344,3 +380,5 @@ include/X11/qt/qwmatrix.h
 bin/moc
 share/doc/qt/README
 share/doc/qt/README.QT
+@dirrm include/X11/qt
+@dirrm share/doc/qt
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index 4f890528ca5c..d784ff176757 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   qt
-# Version required:	1.2
+# Version required:	1.31
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.11 1997/05/14 08:58:01 tg Exp $
+# $Id: Makefile,v 1.12 1997/07/17 15:13:01 max Exp $
 #
 
-DISTNAME=	qt-1.2
+DISTNAME=	qt-1.31
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
@@ -24,32 +24,37 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
 		qcombobox.3qt qconnection.3qt qcursor.3qt \
 		qcustomevent.3qt qdatastream.3qt qdate.3qt \
 		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.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 \
+		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 qimage.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 qpopupmenu.3qt qprinter.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 qwidget.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 \
@@ -59,26 +64,31 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.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 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 \
+		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 QImage.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 \
+		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 \
@@ -90,15 +100,15 @@ post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.2/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/lib/libqt.so.1.2 $(X11BASE)/lib
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
 	${LDCONFIG} -m $(PREFIX)/lib
 	mkdir -p $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man3/* $(PREFIX)/man/man3
+	${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
 	mkdir -p ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README.QT ${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
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt22/distinfo b/x11-toolkits/qt22/distinfo
index 93f1b344a9e6..e712bdb4e580 100644
--- a/x11-toolkits/qt22/distinfo
+++ b/x11-toolkits/qt22/distinfo
@@ -1 +1 @@
-MD5 (qt-1.2.tar.gz) = 06afc46741a31e5b2e100bb622e75179
+MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
diff --git a/x11-toolkits/qt22/pkg-plist b/x11-toolkits/qt22/pkg-plist
index 4fa7d2e7c5a5..7d8d96fb263c 100644
--- a/x11-toolkits/qt22/pkg-plist
+++ b/x11-toolkits/qt22/pkg-plist
@@ -1,28 +1,33 @@
-lib/libqt.so.1.2
+lib/libqt.so.1.31
 @exec /sbin/ldconfig -m %B
 man/man1/moc.1.gz
 man/man3/QApplication.3qt.gz
-man/man3/QCloseEvent.3qt.gz
 man/man3/QArray.3qt.gz
 man/man3/QBitmap.3qt.gz
+man/man3/QBitVal.3qt.gz
 man/man3/QBrush.3qt.gz
-man/man3/QDir.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
 man/man3/QButtonGroup.3qt.gz
 man/man3/QByteArray.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
 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
@@ -36,52 +41,59 @@ man/man3/QGArray.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
-man/man3/QCustomEvent.3qt.gz
-man/man3/QDateTime.3qt.gz
 man/man3/QGList.3qt.gz
+man/man3/QGListIterator.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/QPen.3qt.gz
 man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QGListIterator.3qt.gz
 man/man3/QLNode.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
 man/man3/QMoveEvent.3qt.gz
+man/man3/QMovie.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
 man/man3/QPainter.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
-man/man3/QPushButton.3qt.gz
 man/man3/QRangeControl.3qt.gz
 man/man3/QRect.3qt.gz
 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/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -92,25 +104,25 @@ man/man3/QStrIList.3qt.gz
 man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
 man/man3/QTableView.3qt.gz
-man/man3/QWidget.3qt.gz
 man/man3/QTabDialog.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/QVBoxLayout.3qt.gz
+man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
 man/man3/QWMatrix.3qt.gz
-man/man3/QBitVal.3qt.gz
-man/man3/QDict.3qt.gz
 man/man3/qarray.3qt.gz
+man/man3/qapplication.3qt.gz
 man/man3/qbitmap.3qt.gz
 man/man3/qdir.3qt.gz
 man/man3/qbrush.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qapplication.3qt.gz
 man/man3/qbitarray.3qt.gz
 man/man3/qbitval.3qt.gz
 man/man3/qclipboard.3qt.gz
@@ -235,9 +247,23 @@ 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/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
@@ -279,9 +305,11 @@ 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
@@ -293,7 +321,9 @@ 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
@@ -306,12 +336,16 @@ 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
@@ -320,6 +354,7 @@ 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
@@ -335,6 +370,7 @@ 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
@@ -344,3 +380,5 @@ include/X11/qt/qwmatrix.h
 bin/moc
 share/doc/qt/README
 share/doc/qt/README.QT
+@dirrm include/X11/qt
+@dirrm share/doc/qt
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 4f890528ca5c..d784ff176757 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   qt
-# Version required:	1.2
+# Version required:	1.31
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.11 1997/05/14 08:58:01 tg Exp $
+# $Id: Makefile,v 1.12 1997/07/17 15:13:01 max Exp $
 #
 
-DISTNAME=	qt-1.2
+DISTNAME=	qt-1.31
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
@@ -24,32 +24,37 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
 		qcombobox.3qt qconnection.3qt qcursor.3qt \
 		qcustomevent.3qt qdatastream.3qt qdate.3qt \
 		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.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 \
+		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 qimage.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 qpopupmenu.3qt qprinter.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 qwidget.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 \
@@ -59,26 +64,31 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.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 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 \
+		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 QImage.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 \
+		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 \
@@ -90,15 +100,15 @@ post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.2/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/lib/libqt.so.1.2 $(X11BASE)/lib
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
 	${LDCONFIG} -m $(PREFIX)/lib
 	mkdir -p $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man3/* $(PREFIX)/man/man3
+	${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
 	mkdir -p ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README.QT ${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
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt23/distinfo b/x11-toolkits/qt23/distinfo
index 93f1b344a9e6..e712bdb4e580 100644
--- a/x11-toolkits/qt23/distinfo
+++ b/x11-toolkits/qt23/distinfo
@@ -1 +1 @@
-MD5 (qt-1.2.tar.gz) = 06afc46741a31e5b2e100bb622e75179
+MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist
index 4fa7d2e7c5a5..7d8d96fb263c 100644
--- a/x11-toolkits/qt23/pkg-plist
+++ b/x11-toolkits/qt23/pkg-plist
@@ -1,28 +1,33 @@
-lib/libqt.so.1.2
+lib/libqt.so.1.31
 @exec /sbin/ldconfig -m %B
 man/man1/moc.1.gz
 man/man3/QApplication.3qt.gz
-man/man3/QCloseEvent.3qt.gz
 man/man3/QArray.3qt.gz
 man/man3/QBitmap.3qt.gz
+man/man3/QBitVal.3qt.gz
 man/man3/QBrush.3qt.gz
-man/man3/QDir.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
 man/man3/QButtonGroup.3qt.gz
 man/man3/QByteArray.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
 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
@@ -36,52 +41,59 @@ man/man3/QGArray.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
-man/man3/QCustomEvent.3qt.gz
-man/man3/QDateTime.3qt.gz
 man/man3/QGList.3qt.gz
+man/man3/QGListIterator.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/QPen.3qt.gz
 man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QGListIterator.3qt.gz
 man/man3/QLNode.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
 man/man3/QMoveEvent.3qt.gz
+man/man3/QMovie.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
 man/man3/QPainter.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
-man/man3/QPushButton.3qt.gz
 man/man3/QRangeControl.3qt.gz
 man/man3/QRect.3qt.gz
 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/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -92,25 +104,25 @@ man/man3/QStrIList.3qt.gz
 man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
 man/man3/QTableView.3qt.gz
-man/man3/QWidget.3qt.gz
 man/man3/QTabDialog.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/QVBoxLayout.3qt.gz
+man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
 man/man3/QWMatrix.3qt.gz
-man/man3/QBitVal.3qt.gz
-man/man3/QDict.3qt.gz
 man/man3/qarray.3qt.gz
+man/man3/qapplication.3qt.gz
 man/man3/qbitmap.3qt.gz
 man/man3/qdir.3qt.gz
 man/man3/qbrush.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qapplication.3qt.gz
 man/man3/qbitarray.3qt.gz
 man/man3/qbitval.3qt.gz
 man/man3/qclipboard.3qt.gz
@@ -235,9 +247,23 @@ 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/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
@@ -279,9 +305,11 @@ 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
@@ -293,7 +321,9 @@ 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
@@ -306,12 +336,16 @@ 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
@@ -320,6 +354,7 @@ 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
@@ -335,6 +370,7 @@ 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
@@ -344,3 +380,5 @@ include/X11/qt/qwmatrix.h
 bin/moc
 share/doc/qt/README
 share/doc/qt/README.QT
+@dirrm include/X11/qt
+@dirrm share/doc/qt
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 4f890528ca5c..d784ff176757 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   qt
-# Version required:	1.2
+# Version required:	1.31
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.11 1997/05/14 08:58:01 tg Exp $
+# $Id: Makefile,v 1.12 1997/07/17 15:13:01 max Exp $
 #
 
-DISTNAME=	qt-1.2
+DISTNAME=	qt-1.31
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
@@ -24,32 +24,37 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
 		qcombobox.3qt qconnection.3qt qcursor.3qt \
 		qcustomevent.3qt qdatastream.3qt qdate.3qt \
 		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.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 \
+		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 qimage.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 qpopupmenu.3qt qprinter.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 qwidget.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 \
@@ -59,26 +64,31 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.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 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 \
+		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 QImage.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 \
+		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 \
@@ -90,15 +100,15 @@ post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.2/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/lib/libqt.so.1.2 $(X11BASE)/lib
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
 	${LDCONFIG} -m $(PREFIX)/lib
 	mkdir -p $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man3/* $(PREFIX)/man/man3
+	${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
 	mkdir -p ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README.QT ${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
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt30/distinfo b/x11-toolkits/qt30/distinfo
index 93f1b344a9e6..e712bdb4e580 100644
--- a/x11-toolkits/qt30/distinfo
+++ b/x11-toolkits/qt30/distinfo
@@ -1 +1 @@
-MD5 (qt-1.2.tar.gz) = 06afc46741a31e5b2e100bb622e75179
+MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index 4fa7d2e7c5a5..7d8d96fb263c 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -1,28 +1,33 @@
-lib/libqt.so.1.2
+lib/libqt.so.1.31
 @exec /sbin/ldconfig -m %B
 man/man1/moc.1.gz
 man/man3/QApplication.3qt.gz
-man/man3/QCloseEvent.3qt.gz
 man/man3/QArray.3qt.gz
 man/man3/QBitmap.3qt.gz
+man/man3/QBitVal.3qt.gz
 man/man3/QBrush.3qt.gz
-man/man3/QDir.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
 man/man3/QButtonGroup.3qt.gz
 man/man3/QByteArray.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
 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
@@ -36,52 +41,59 @@ man/man3/QGArray.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
-man/man3/QCustomEvent.3qt.gz
-man/man3/QDateTime.3qt.gz
 man/man3/QGList.3qt.gz
+man/man3/QGListIterator.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/QPen.3qt.gz
 man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QGListIterator.3qt.gz
 man/man3/QLNode.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
 man/man3/QMoveEvent.3qt.gz
+man/man3/QMovie.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
 man/man3/QPainter.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
-man/man3/QPushButton.3qt.gz
 man/man3/QRangeControl.3qt.gz
 man/man3/QRect.3qt.gz
 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/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -92,25 +104,25 @@ man/man3/QStrIList.3qt.gz
 man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
 man/man3/QTableView.3qt.gz
-man/man3/QWidget.3qt.gz
 man/man3/QTabDialog.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/QVBoxLayout.3qt.gz
+man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
 man/man3/QWMatrix.3qt.gz
-man/man3/QBitVal.3qt.gz
-man/man3/QDict.3qt.gz
 man/man3/qarray.3qt.gz
+man/man3/qapplication.3qt.gz
 man/man3/qbitmap.3qt.gz
 man/man3/qdir.3qt.gz
 man/man3/qbrush.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qapplication.3qt.gz
 man/man3/qbitarray.3qt.gz
 man/man3/qbitval.3qt.gz
 man/man3/qclipboard.3qt.gz
@@ -235,9 +247,23 @@ 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/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
@@ -279,9 +305,11 @@ 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
@@ -293,7 +321,9 @@ 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
@@ -306,12 +336,16 @@ 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
@@ -320,6 +354,7 @@ 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
@@ -335,6 +370,7 @@ 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
@@ -344,3 +380,5 @@ include/X11/qt/qwmatrix.h
 bin/moc
 share/doc/qt/README
 share/doc/qt/README.QT
+@dirrm include/X11/qt
+@dirrm share/doc/qt
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 4f890528ca5c..d784ff176757 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   qt
-# Version required:	1.2
+# Version required:	1.31
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.11 1997/05/14 08:58:01 tg Exp $
+# $Id: Makefile,v 1.12 1997/07/17 15:13:01 max Exp $
 #
 
-DISTNAME=	qt-1.2
+DISTNAME=	qt-1.31
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
@@ -24,32 +24,37 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
 		qcombobox.3qt qconnection.3qt qcursor.3qt \
 		qcustomevent.3qt qdatastream.3qt qdate.3qt \
 		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.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 \
+		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 qimage.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 qpopupmenu.3qt qprinter.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 qwidget.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 \
@@ -59,26 +64,31 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.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 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 \
+		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 QImage.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 \
+		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 \
@@ -90,15 +100,15 @@ post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.2/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/lib/libqt.so.1.2 $(X11BASE)/lib
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
 	${LDCONFIG} -m $(PREFIX)/lib
 	mkdir -p $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man3/* $(PREFIX)/man/man3
+	${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
 	mkdir -p ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README.QT ${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
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt31/distinfo b/x11-toolkits/qt31/distinfo
index 93f1b344a9e6..e712bdb4e580 100644
--- a/x11-toolkits/qt31/distinfo
+++ b/x11-toolkits/qt31/distinfo
@@ -1 +1 @@
-MD5 (qt-1.2.tar.gz) = 06afc46741a31e5b2e100bb622e75179
+MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index 4fa7d2e7c5a5..7d8d96fb263c 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -1,28 +1,33 @@
-lib/libqt.so.1.2
+lib/libqt.so.1.31
 @exec /sbin/ldconfig -m %B
 man/man1/moc.1.gz
 man/man3/QApplication.3qt.gz
-man/man3/QCloseEvent.3qt.gz
 man/man3/QArray.3qt.gz
 man/man3/QBitmap.3qt.gz
+man/man3/QBitVal.3qt.gz
 man/man3/QBrush.3qt.gz
-man/man3/QDir.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
 man/man3/QButtonGroup.3qt.gz
 man/man3/QByteArray.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
 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
@@ -36,52 +41,59 @@ man/man3/QGArray.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
-man/man3/QCustomEvent.3qt.gz
-man/man3/QDateTime.3qt.gz
 man/man3/QGList.3qt.gz
+man/man3/QGListIterator.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/QPen.3qt.gz
 man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QGListIterator.3qt.gz
 man/man3/QLNode.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
 man/man3/QMoveEvent.3qt.gz
+man/man3/QMovie.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
 man/man3/QPainter.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
-man/man3/QPushButton.3qt.gz
 man/man3/QRangeControl.3qt.gz
 man/man3/QRect.3qt.gz
 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/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -92,25 +104,25 @@ man/man3/QStrIList.3qt.gz
 man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
 man/man3/QTableView.3qt.gz
-man/man3/QWidget.3qt.gz
 man/man3/QTabDialog.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/QVBoxLayout.3qt.gz
+man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
 man/man3/QWMatrix.3qt.gz
-man/man3/QBitVal.3qt.gz
-man/man3/QDict.3qt.gz
 man/man3/qarray.3qt.gz
+man/man3/qapplication.3qt.gz
 man/man3/qbitmap.3qt.gz
 man/man3/qdir.3qt.gz
 man/man3/qbrush.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qapplication.3qt.gz
 man/man3/qbitarray.3qt.gz
 man/man3/qbitval.3qt.gz
 man/man3/qclipboard.3qt.gz
@@ -235,9 +247,23 @@ 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/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
@@ -279,9 +305,11 @@ 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
@@ -293,7 +321,9 @@ 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
@@ -306,12 +336,16 @@ 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
@@ -320,6 +354,7 @@ 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
@@ -335,6 +370,7 @@ 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
@@ -344,3 +380,5 @@ include/X11/qt/qwmatrix.h
 bin/moc
 share/doc/qt/README
 share/doc/qt/README.QT
+@dirrm include/X11/qt
+@dirrm share/doc/qt
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 4f890528ca5c..d784ff176757 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   qt
-# Version required:	1.2
+# Version required:	1.31
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.11 1997/05/14 08:58:01 tg Exp $
+# $Id: Makefile,v 1.12 1997/07/17 15:13:01 max Exp $
 #
 
-DISTNAME=	qt-1.2
+DISTNAME=	qt-1.31
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
@@ -24,32 +24,37 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
 		qcombobox.3qt qconnection.3qt qcursor.3qt \
 		qcustomevent.3qt qdatastream.3qt qdate.3qt \
 		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.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 \
+		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 qimage.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 qpopupmenu.3qt qprinter.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 qwidget.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 \
@@ -59,26 +64,31 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.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 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 \
+		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 QImage.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 \
+		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 \
@@ -90,15 +100,15 @@ post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.2/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/lib/libqt.so.1.2 $(X11BASE)/lib
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
 	${LDCONFIG} -m $(PREFIX)/lib
 	mkdir -p $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man3/* $(PREFIX)/man/man3
+	${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
 	mkdir -p ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README.QT ${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
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt32/distinfo b/x11-toolkits/qt32/distinfo
index 93f1b344a9e6..e712bdb4e580 100644
--- a/x11-toolkits/qt32/distinfo
+++ b/x11-toolkits/qt32/distinfo
@@ -1 +1 @@
-MD5 (qt-1.2.tar.gz) = 06afc46741a31e5b2e100bb622e75179
+MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index 4fa7d2e7c5a5..7d8d96fb263c 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -1,28 +1,33 @@
-lib/libqt.so.1.2
+lib/libqt.so.1.31
 @exec /sbin/ldconfig -m %B
 man/man1/moc.1.gz
 man/man3/QApplication.3qt.gz
-man/man3/QCloseEvent.3qt.gz
 man/man3/QArray.3qt.gz
 man/man3/QBitmap.3qt.gz
+man/man3/QBitVal.3qt.gz
 man/man3/QBrush.3qt.gz
-man/man3/QDir.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
 man/man3/QButtonGroup.3qt.gz
 man/man3/QByteArray.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
 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
@@ -36,52 +41,59 @@ man/man3/QGArray.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
-man/man3/QCustomEvent.3qt.gz
-man/man3/QDateTime.3qt.gz
 man/man3/QGList.3qt.gz
+man/man3/QGListIterator.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/QPen.3qt.gz
 man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QGListIterator.3qt.gz
 man/man3/QLNode.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
 man/man3/QMoveEvent.3qt.gz
+man/man3/QMovie.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
 man/man3/QPainter.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
-man/man3/QPushButton.3qt.gz
 man/man3/QRangeControl.3qt.gz
 man/man3/QRect.3qt.gz
 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/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -92,25 +104,25 @@ man/man3/QStrIList.3qt.gz
 man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
 man/man3/QTableView.3qt.gz
-man/man3/QWidget.3qt.gz
 man/man3/QTabDialog.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/QVBoxLayout.3qt.gz
+man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
 man/man3/QWMatrix.3qt.gz
-man/man3/QBitVal.3qt.gz
-man/man3/QDict.3qt.gz
 man/man3/qarray.3qt.gz
+man/man3/qapplication.3qt.gz
 man/man3/qbitmap.3qt.gz
 man/man3/qdir.3qt.gz
 man/man3/qbrush.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qapplication.3qt.gz
 man/man3/qbitarray.3qt.gz
 man/man3/qbitval.3qt.gz
 man/man3/qclipboard.3qt.gz
@@ -235,9 +247,23 @@ 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/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
@@ -279,9 +305,11 @@ 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
@@ -293,7 +321,9 @@ 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
@@ -306,12 +336,16 @@ 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
@@ -320,6 +354,7 @@ 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
@@ -335,6 +370,7 @@ 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
@@ -344,3 +380,5 @@ include/X11/qt/qwmatrix.h
 bin/moc
 share/doc/qt/README
 share/doc/qt/README.QT
+@dirrm include/X11/qt
+@dirrm share/doc/qt
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 4f890528ca5c..d784ff176757 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   qt
-# Version required:	1.2
+# Version required:	1.31
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.11 1997/05/14 08:58:01 tg Exp $
+# $Id: Makefile,v 1.12 1997/07/17 15:13:01 max Exp $
 #
 
-DISTNAME=	qt-1.2
+DISTNAME=	qt-1.31
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
@@ -24,32 +24,37 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.3qt \
 		qcombobox.3qt qconnection.3qt qcursor.3qt \
 		qcustomevent.3qt qdatastream.3qt qdate.3qt \
 		qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \
-		qdir.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 \
+		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 qimage.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 qpopupmenu.3qt qprinter.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 qwidget.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 \
@@ -59,26 +64,31 @@ MAN3=		qaccel.3qt qapplication.3qt qarray.3qt qbitarray.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 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 \
+		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 QImage.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 \
+		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 \
@@ -90,15 +100,15 @@ post-configure:
 	cd ${WRKSRC} && make freebsd-gcc-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.2/bin/moc $(X11BASE)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/lib/libqt.so.1.2 $(X11BASE)/lib
+	${INSTALL_PROGRAM} $(WRKDIR)/qt-1.31/bin/moc $(X11BASE)/bin
+	${INSTALL_DATA} $(WRKDIR)/qt-1.31/lib/libqt.so.1.31 $(X11BASE)/lib
 	${LDCONFIG} -m $(PREFIX)/lib
 	mkdir -p $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-1.2/include/* $(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-1.2/man/man3/* $(PREFIX)/man/man3
+	${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
 	mkdir -p ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-1.2/README.QT ${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
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo
index 93f1b344a9e6..e712bdb4e580 100644
--- a/x11-toolkits/qt33/distinfo
+++ b/x11-toolkits/qt33/distinfo
@@ -1 +1 @@
-MD5 (qt-1.2.tar.gz) = 06afc46741a31e5b2e100bb622e75179
+MD5 (qt-1.31.tar.gz) = 5914872a1e260b56f5f683b5d37182f4
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 4fa7d2e7c5a5..7d8d96fb263c 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -1,28 +1,33 @@
-lib/libqt.so.1.2
+lib/libqt.so.1.31
 @exec /sbin/ldconfig -m %B
 man/man1/moc.1.gz
 man/man3/QApplication.3qt.gz
-man/man3/QCloseEvent.3qt.gz
 man/man3/QArray.3qt.gz
 man/man3/QBitmap.3qt.gz
+man/man3/QBitVal.3qt.gz
 man/man3/QBrush.3qt.gz
-man/man3/QDir.3qt.gz
 man/man3/QBuffer.3qt.gz
 man/man3/QButton.3qt.gz
 man/man3/QButtonGroup.3qt.gz
 man/man3/QByteArray.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
 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
@@ -36,52 +41,59 @@ man/man3/QGArray.3qt.gz
 man/man3/QGCacheIterator.3qt.gz
 man/man3/QGDict.3qt.gz
 man/man3/QGDictIterator.3qt.gz
-man/man3/QCustomEvent.3qt.gz
-man/man3/QDateTime.3qt.gz
 man/man3/QGList.3qt.gz
+man/man3/QGListIterator.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/QPen.3qt.gz
 man/man3/QLCDNumber.3qt.gz
 man/man3/QLineEdit.3qt.gz
 man/man3/QList.3qt.gz
 man/man3/QListBoxItem.3qt.gz
 man/man3/QListBoxPixmap.3qt.gz
 man/man3/QListBoxText.3qt.gz
-man/man3/QGListIterator.3qt.gz
 man/man3/QLNode.3qt.gz
 man/man3/QMenuBar.3qt.gz
 man/man3/QMenuData.3qt.gz
 man/man3/QMessageBox.3qt.gz
 man/man3/QMoveEvent.3qt.gz
+man/man3/QMovie.3qt.gz
 man/man3/QObject.3qt.gz
 man/man3/QPaintDevice.3qt.gz
 man/man3/QPaintDeviceMetrics.3qt.gz
 man/man3/QPainter.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
-man/man3/QPushButton.3qt.gz
 man/man3/QRangeControl.3qt.gz
 man/man3/QRect.3qt.gz
 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/QShared.3qt.gz
 man/man3/QSignal.3qt.gz
 man/man3/QSize.3qt.gz
@@ -92,25 +104,25 @@ man/man3/QStrIList.3qt.gz
 man/man3/QString.3qt.gz
 man/man3/QStrList.3qt.gz
 man/man3/QTableView.3qt.gz
-man/man3/QWidget.3qt.gz
 man/man3/QTabDialog.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/QVBoxLayout.3qt.gz
+man/man3/QWidget.3qt.gz
 man/man3/QWindow.3qt.gz
 man/man3/QWMatrix.3qt.gz
-man/man3/QBitVal.3qt.gz
-man/man3/QDict.3qt.gz
 man/man3/qarray.3qt.gz
+man/man3/qapplication.3qt.gz
 man/man3/qbitmap.3qt.gz
 man/man3/qdir.3qt.gz
 man/man3/qbrush.3qt.gz
 man/man3/qbutton.3qt.gz
 man/man3/qbuttongroup.3qt.gz
 man/man3/qbytearray.3qt.gz
-man/man3/qapplication.3qt.gz
 man/man3/qbitarray.3qt.gz
 man/man3/qbitval.3qt.gz
 man/man3/qclipboard.3qt.gz
@@ -235,9 +247,23 @@ 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/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
@@ -279,9 +305,11 @@ 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
@@ -293,7 +321,9 @@ 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
@@ -306,12 +336,16 @@ 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
@@ -320,6 +354,7 @@ 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
@@ -335,6 +370,7 @@ 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
@@ -344,3 +380,5 @@ include/X11/qt/qwmatrix.h
 bin/moc
 share/doc/qt/README
 share/doc/qt/README.QT
+@dirrm include/X11/qt
+@dirrm share/doc/qt