Update qt to 1.40. Use libtool to generate the shared and static library.

For dependent pkgs, find qt in ${PREFIX} instead of ${X11BASE}
(xpkgwedge-portlint), as all of them are also USE_X11.

12 files changed, 461 insertions, 303 deletions

diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index 38e2310dbdc..032d5c6616d 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/07/14 22:56:40 tron Exp $
+# $NetBSD: Makefile,v 1.10 1998/07/19 21:09:22 tv Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.us.kde.org/pub/kde/stable/1.0/distribution/tar/generic/s
 
 MAINTAINER=	tron@netbsd.org
 
-DEPENDS+=	qt-1.33:../../x11/qt
+DEPENDS+=	qt-1.40:../../x11/qt
 
 CONFLICTS=	kdesupport-2.1b kdesupport-3.1b kdesupport-4.1b
 
@@ -17,8 +17,8 @@ USE_X11=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=${PREFIX}" \
 		"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-includes=${X11BASE}/include/qt" \
-		"--with-qt-libraries=${X11BASE}/lib" \
+		"--with-qt-includes=${PREFIX}/include/qt" \
+		"--with-qt-libraries=${PREFIX}/lib" \
 		"--without-gnu-ld" \
 		"--without-libjpeg" \
 		"--without-libgif" \
diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile
index d8f00b85107..3a75a73bdbe 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1998/07/14 22:56:52 tron Exp $
+# $NetBSD: Makefile,v 1.18 1998/07/19 21:09:22 tv Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=	tron@netbsd.org
 
 DEPENDS+=	giflib-3.0:../../graphics/giflib
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	qt-1.33:../../x11/qt
+DEPENDS+=	qt-1.40:../../x11/qt
 DEPENDS+=	kdelibs-1.0:../../x11/kdelibs
 DEPENDS+=	kdebase-1.0:../../x11/kdebase
 DEPENDS+=	kdesupport-1.0:../../converters/kdesupport
diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile
index 896f3524033..fe9eed3e983 100644
--- a/graphics/kdegraphics/Makefile
+++ b/graphics/kdegraphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/07/14 22:57:01 tron Exp $
+# $NetBSD: Makefile,v 1.6 1998/07/19 21:09:22 tv Exp $
 #
 
 DISTNAME=	kdegraphics-1.0
@@ -10,7 +10,7 @@ MAINTAINER=	tron@netbsd.org
 
 DEPENDS+=	giflib-3.0:../../graphics/giflib
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	qt-1.33:../../x11/qt
+DEPENDS+=	qt-1.40:../../x11/qt
 DEPENDS+=	kdelibs-1.0:../../x11/kdelibs
 DEPENDS+=	kdebase-1.0:../../x11/kdebase
 
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index 05166aa5e05..1234a87a3cb 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1998/07/14 22:57:13 tron Exp $
+# $NetBSD: Makefile,v 1.17 1998/07/19 21:09:22 tv Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=	tron@netbsd.org
 
 DEPENDS+=	giflib-3.0:../../graphics/giflib
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	qt-1.33:../../x11/qt
+DEPENDS+=	qt-1.40:../../x11/qt
 DEPENDS+=	kdelibs-1.0:../../x11/kdelibs
 DEPENDS+=	kdebase-1.0:../../x11/kdebase
 
@@ -22,7 +22,7 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--x-inc=${PREFX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
 		"--x-lib=${PREFIX}/lib -L${LOCALBASE}/lib" \
 		"--with-qt-dir=${PREFIX}" \
-		"--with-qt-includes=${X11BASE}/include/qt"
+		"--with-qt-includes=${PREFIX}/include/qt"
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 29774e43f3a..666c35b3b81 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/07/14 22:57:28 tron Exp $
+# $NetBSD: Makefile,v 1.16 1998/07/19 21:09:23 tv Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=	tron@netbsd.org
 DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
 DEPENDS+=	giflib-3.0:../../graphics/giflib
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	qt-1.33:../../x11/qt
+DEPENDS+=	qt-1.40:../../x11/qt
 DEPENDS+=	uulib-0.5.13:../../converters/uulib
 DEPENDS+=	kdelibs-1.0:../../x11/kdelibs
 DEPENDS+=	kdesupport-1.0:../../converters/kdesupport
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 4c27960636f..850036620a2 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1998/07/14 22:57:56 tron Exp $
+# $NetBSD: Makefile,v 1.18 1998/07/19 21:09:23 tv Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=	tron@netbsd.org
 DEPENDS+=	Mesa-2.6:../../graphics/Mesa
 DEPENDS+=	giflib-3.0:../../graphics/giflib
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	qt-1.33:../../x11/qt
+DEPENDS+=	qt-1.40:../../x11/qt
 DEPENDS+=	kdelibs-1.0:../../x11/kdelibs
 
 CONFLICTS=	kdebase-2.1b kdebase-3.1b kdebase-4.1b
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index 01d31779c36..28af4d72623 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/07/14 22:58:13 tron Exp $
+# $NetBSD: Makefile,v 1.15 1998/07/19 21:09:23 tv Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.us.kde.org/pub/kde/stable/1.0/distribution/tar/generic/s
 MAINTAINER=	tron@netbsd.org
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	qt-1.33:../../x11/qt
+DEPENDS+=	qt-1.40:../../x11/qt
 DEPENDS+=	giflib-3.0:../../graphics/giflib
 
 CONFLICTS=	kdelibs-2.1b kdelibs-3.1b kdelibs-4.1b
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	"--prefix=${PREFIX}" \
 		"--x-lib=${X11BASE}/lib -L${LOCALBASE}/lib" \
 		"--datadir=${PREFIX}/share/kde" \
 		"--with-qt-dir=${PREFIX}" \
-		"--with-qt-includes=${X11BASE}/include/qt"
+		"--with-qt-includes=${PREFIX}/include/qt"
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt/Makefile b/x11/qt/Makefile
index 4336f9657d4..29cd1e5faa2 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 1998/07/15 10:54:03 agc Exp $
+# $NetBSD: Makefile,v 1.15 1998/07/19 21:09:23 tv Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/10/30 05:15:19 jkh Exp
 #
 
-DISTNAME=	qt-1.33
+DISTNAME=	qt-1.40
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/linux/sunsite/Incoming/ \
 		ftp://ftp.kde.org/pub/qt/TGZ/ \
@@ -10,115 +10,35 @@ MASTER_SITES=	ftp://ftp.cdrom.com/pub/linux/sunsite/Incoming/ \
 
 MAINTAINER=	tron@netbsd.org
 
-USE_X11=	yes
+BUILD_DEPENDS=	${LOCALBASE}/bin/libtool:../../devel/libtool
 
-QTDIR=	${PREFIX}
+USE_X11=	yes
 
-MAN_PAGES=	qaccel.3 qapplication.3 qarray.3 qbitarray.3 \
-		qbitmap.3 qbitval.3 qboxlayout.3 qbrush.3 qbuffer.3 \
-		qbutton.3 qbuttongroup.3 qbytearray.3 \
-		qcheckbox.3 qclipboard.3 qcloseevent.3 \
-		qcollection.3 qcolor.3 qcolorgroup.3 \
-		qcombobox.3 qconnection.3 qcursor.3 \
-		qcustomevent.3 qdatastream.3 qdate.3 \
-		qdatetime.3 qdialog.3 qdict.3 qdictiterator.3 \
-		qdir.3 qdoublevalidator.3 qevent.3 qfile.3 \
-		qfiledialog.3 qfileinfo.3 qfocusevent.3 qfont.3 \
-		qfontinfo.3 qfontmetrics.3 qframe.3 qgarray.3 \
-		qgcache.3 qgcacheiterator.3 qgdict.3 qgdictiterator.3 \
-		qglist.3 qglistiterator.3 qgmanager.3 qgridlayout.3 \
-		qgroupbox.3 qhboxlayout.3 qimage.3 \
-		qimageio.3 qintdict.3 qintdictiterator.3 \
-		qintvalidator.3 \
-		qiodevice.3 qkeyevent.3 qlabel.3 qlayout.3 \
-		qlcdnumber.3 \
-		qlineedit.3 qlist.3 qlistbox.3 qlistboxitem.3 \
-		qlistboxpixmap.3 qlistboxtext.3 qlistiterator.3 \
-		qlnode.3 qmenubar.3 qmenudata.3 qmessagebox.3 \
-		qmouseevent.3 qmoveevent.3 qmultilineedit.3 qobject.3 \
-		qmovie.3 \
-		qpaintdevice.3 qpaintdevicemetrics.3 qpainter.3 \
-		qpaintevent.3 qpalette.3 qpen.3 qpicture.3 \
-		qpixmap.3 qpixmapcache.3 qpoint.3 \
-		qpointarray.3 qpointval.3 qpopupmenu.3 qprinter.3 \
-		qprogressbar.3 qprogressdialog.3 qptrdict.3 \
-		qptrdictiterator.3 \
-		qpushbutton.3 qqueue.3 qradiobutton.3 \
-		qrangecontrol.3 qrect.3 qregexp.3 qregion.3 \
-		qresizeevent.3 qscrollbar.3 qsenderobject.3 \
-		qsemimodal.3 \
-		qshared.3 qsignal.3 qsize.3 qslider.3 \
-		qsocketnotifier.3 qstack.3 qstrilist.3 qstring.3 \
-		qstrlist.3 qtabbar.3 qtabdialog.3 qtableview.3 \
-		qtextstream.3 qtime.3 \
-		qtimer.3 qtimerevent.3 qtooltip.3 qtooltipgroup.3 \
-		qtsmanip.3 qvalidator.3 qvboxlayout.3 qwidget.3 \
-		qwindow.3 qwmatrix.3 QAccel.3 QApplication.3 \
-		QArray.3 QBitArray.3 QBitmap.3 QBitVal.3 \
-		QBoxLayout.3 QBrush.3 \
-		QBuffer.3 QButton.3 QButtonGroup.3 \
-		QByteArray.3 QCheckBox.3 QClipboard.3 \
-		QCloseEvent.3 QCollection.3 QColor.3 \
-		QColorGroup.3 QComboBox.3 QConnection.3 \
-		QCursor.3 QCustomEvent.3 QDataStream.3 QDate.3 \
-		QDateTime.3 QDialog.3 QDict.3 QDictIterator.3 \
-		QDir.3 QDoubleValidator.3 QEvent.3 QFile.3 \
-		QFileDialog.3 QFileInfo.3 QFocusEvent.3 QFont.3 \
-		QFontInfo.3 QFontMetrics.3 QFrame.3 QGArray.3 \
-		QGCache.3 QGCacheIterator.3 QGDict.3 QGDictIterator.3 \
-		QGList.3 QGListIterator.3 QGManager.3 \
-		QGridLayout.3 QGroupBox.3 QHBoxLayout.3 QImage.3 \
-		QImageIO.3 QIntDict.3 QIntDictIterator.3 \
-		QIntValidator.3 \
-		QIODevice.3 QKeyEvent.3 QLCDNumber.3 QLabel.3 \
-		QLayout.3 \
-		QLineEdit.3 QList.3 QListBox.3 QListBoxItem.3 \
-		QListBoxPixmap.3 QListBoxText.3 QListIterator.3 \
-		QLNode.3 QMenuBar.3 QMenuData.3 QMessageBox.3 \
-		QMovie.3 \
-		QMouseEvent.3 QMoveEvent.3 QMultiLineEdit.3 QObject.3 \
-		QPaintDevice.3 QPaintDeviceMetrics.3 QPainter.3 \
-		QPaintEvent.3 QPalette.3 QPen.3 QPicture.3 \
-		QPixmap.3 QPixmapCache.3 QPoint.3 QPointVal.3\
-		QPointArray.3 QPopupMenu.3 QPrinter.3 \
-		QProgressBar.3 QProgressDialog.3 \
-		QPtrDict.3 QPtrDictIterator.3 \
-		QPushButton.3 QQueue.3 QRadioButton.3 \
-		QRangeControl.3 QRect.3 QRegExp.3 QRegion.3 \
-		QResizeEvent.3 QScrollBar.3 QSenderObject.3 \
-		QSemiModal.3 QVBoxLayout.3 QValidator.3 \
-		QShared.3 QSignal.3 QSize.3 QSlider.3 \
-		QSocketNotifier.3 QStack.3 QStrIList.3 QString.3 \
-		QStrList.3 QTabBar.3 QTabDialog.3 QTableView.3 \
-		QTextStream.3 QTime.3 \
-		QTimer.3 QTimerEvent.3 QToolTip.3 QToolTipGroup.3 \
-		QTSManip.3 QWidget.3 QWindow.3 QWMatrix.3
+MAKE_ENV=	QTDIR=${WRKSRC}
+ALL_TARGET=	src
 
 do-configure:
-	cd ${WRKSRC} && make netbsd-gcc-shared
+	@cd ${WRKSRC} && ${MAKE} QTDIR=${WRKSRC} netbsd-g++-static
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTDIR}/bin
-	${INSTALL_DATA} ${WRKSRC}/lib/libqt.so.1.33 ${QTDIR}/lib
-	${MKDIR} ${QTDIR}/include/qt
-	${INSTALL_DATA} ${WRKSRC}/include/* ${QTDIR}/include/qt
-	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${QTDIR}/man/man1
-	@(for PAGE in ${MAN_PAGES}; do \
-	    set - X `head -1 ${WRKSRC}/man/man3/$${PAGE}qt`; \
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${PREFIX}/bin/
+	@${LOCALBASE}/bin/libtool ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${PREFIX}/lib/
+	${INSTALL_DATA_DIR} ${PREFIX}/include/qt
+	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/qt/
+	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/man/man1/
+	@cd ${WRKSRC}/man/man3; PAGES="`ls -1 | ${SED} -e 's,3qt$$,3,'`"; \
+	(for PAGE in $$PAGES; do \
+	    ${ECHO} installing ${PREFIX}/man/man3/$${PAGE}; \
+	    set - X `head -1 $${PAGE}qt`; \
 	    if [ $$# -eq 3 ] && [ "$$2" = .so ]; then \
-		${ECHO} ${LN} -s `basename $$3 | ${SED} s/qt$$//` \
-		${QTDIR}/man/man3/$${PAGE}; \
-		${LN} -s `basename $$3 | ${SED} s/qt$$//` \
-		${QTDIR}/man/man3/$${PAGE}; \
+		${LN} -sf `basename $$3 | ${SED} s/qt$$//` \
+		${PREFIX}/man/man3/$${PAGE}; \
 	    else \
-		${ECHO} ${INSTALL_MAN} ${WRKSRC}/man/man3/$${PAGE}qt \
-		${QTDIR}/man/man3/$${PAGE}; \
-		${INSTALL_MAN} ${WRKSRC}/man/man3/$${PAGE}qt \
-		${QTDIR}/man/man3/$${PAGE}; \
+		${INSTALL_MAN} $${PAGE}qt \
+		${PREFIX}/man/man3/$${PAGE}; \
 	    fi; \
 	 done)
-	${MKDIR} ${QTDIR}/share/doc/qt
-	${INSTALL_DATA} ${WRKSRC}/README ${QTDIR}/share/doc/qt
-	${INSTALL_DATA} ${WRKSRC}/README.QT ${QTDIR}/share/doc/qt
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README.QT ${PREFIX}/share/doc/qt/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt/files/md5 b/x11/qt/files/md5
index 004f1c20b64..e9aa161d308 100644
--- a/x11/qt/files/md5
+++ b/x11/qt/files/md5
@@ -1 +1 @@
-MD5 (qt-1.33.tar.gz) = 6136b589c0d611f55deae45bc8ee2af7
+MD5 (qt-1.40.tar.gz) = 4881987d831c9e285637eb9b23dad934
diff --git a/x11/qt/patches/patch-aa b/x11/qt/patches/patch-aa
new file mode 100644
index 00000000000..7ff63ad5015
--- /dev/null
+++ b/x11/qt/patches/patch-aa
@@ -0,0 +1,33 @@
+--- configs/netbsd-g++-static.orig	Sun Jul 19 14:18:04 1998
++++ configs/netbsd-g++-static	Sun Jul 19 16:51:29 1998
+@@ -2,9 +2,9 @@
+ SYSCONF_CC		= g++
+ 
+ # Compiling with support libraries
+-SYSCONF_CFLAGS_X11	= -I/usr/X11R6/include
++SYSCONF_CFLAGS_X11	= -I$(X11BASE)/include
+ SYSCONF_CFLAGS_QT	= -I$(QTDIR)/include
+-SYSCONF_CFLAGS_OPENGL	= -I/usr/X11R6/include
++SYSCONF_CFLAGS_OPENGL	= -I$(X11BASE)/include
+ 
+ # Compiline YACC output
+ SYSCONF_CFLAGS_YACC     = -Wno-unused -Wno-parentheses
+@@ -45,14 +45,14 @@
+ #   - Build the $(TARGET) library, eg. lib$(TARGET).a
+ #   - Place target in $(DESTDIR) - which has a trailing /
+ #
+-SYSCONF_AR		= ar cqs
+-SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
++SYSCONF_AR		= $(LOCALBASE)/bin/libtool $(SYSCONF_CC) -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o
++SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).la
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC);  \
+-				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
++				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo)
+ # Compiling application source
+ SYSCONF_CFLAGS		= -O2 -fno-strength-reduce
+ # Compiling library source
+-SYSCONF_CFLAGS_LIB	= -O2 -fno-strength-reduce -fPIC
++SYSCONF_CFLAGS_LIB	= 
+ # Compiling shared-object source
+ SYSCONF_CFLAGS_SHOBJ	= -O2 -fno-strength-reduce -fPIC
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
diff --git a/x11/qt/patches/patch-ab b/x11/qt/patches/patch-ab
new file mode 100644
index 00000000000..d5e708fa9d4
--- /dev/null
+++ b/x11/qt/patches/patch-ab
@@ -0,0 +1,43 @@
+--- src/Makefile.in.orig	Sun Jul 19 14:30:55 1998
++++ src/Makefile.in	Sun Jul 19 16:51:42 1998
+@@ -14,7 +14,7 @@
+ 
+ ####### Compiler, tools and options
+ 
+-CC	=	$(SYSCONF_CC)
++CC	=	$(LOCALBASE)/bin/libtool $(SYSCONF_CC)
+ CFLAGS	=	$(SYSCONF_CFLAGS_QT) $(SYSCONF_CFLAGS_X11) $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
+ LFLAGS	=	$(SYSCONF_LFLAGS_X11) $(SYSCONF_LFLAGS)
+ LIBS	=	$(SYSCONF_LIBS_X11)
+@@ -23,7 +23,7 @@
+ ####### Target
+ 
+ TARGET	= qt
+-DESTDIR = ../lib/
++DESTDIR = 
+ VER_MAJ = 1
+ VER_MIN = 40
+ 
+@@ -506,20 +506,8 @@
+ 
+ .SUFFIXES: .cpp .cxx .cc .C .c
+ 
+-.cpp.o:
+-	$(CC) -c $(CFLAGS) -o $@ $<
+-
+-.cxx.o:
+-	$(CC) -c $(CFLAGS) -o $@ $<
+-
+-.cc.o:
+-	$(CC) -c $(CFLAGS) -o $@ $<
+-
+-.C.o:
+-	$(CC) -c $(CFLAGS) -o $@ $<
+-
+-.c.o:
+-	$(CC) -c $(CFLAGS) -o $@ $<
++.cpp.o .cxx.o .cc.o .C.o .c.o:
++	@cd `dirname $@` && $(CC) -c $(CFLAGS) `basename $<`
+ 
+ ####### Build rules
+ 
diff --git a/x11/qt/pkg/PLIST b/x11/qt/pkg/PLIST
index 3bd9d7c017f..639a3bc455d 100644
--- a/x11/qt/pkg/PLIST
+++ b/x11/qt/pkg/PLIST
@@ -1,16 +1,217 @@
-@comment $NetBSD: PLIST,v 1.7 1998/07/15 10:54:03 agc Exp $
-lib/libqt.so.1.33
+@comment $NetBSD: PLIST,v 1.8 1998/07/19 21:09:23 tv Exp $
+bin/moc
+include/qt/jri.h
+include/qt/jri_md.h
+include/qt/jritypes.h
+include/qt/npapi.h
+include/qt/npupp.h
+include/qt/qaccel.h
+include/qt/qapp.h
+include/qt/qapplication.h
+include/qt/qarray.h
+include/qt/qasyncimageio.h
+include/qt/qasyncio.h
+include/qt/qbitarray.h
+include/qt/qbitarry.h
+include/qt/qbitmap.h
+include/qt/qbrush.h
+include/qt/qbttngrp.h
+include/qt/qbuffer.h
+include/qt/qbutton.h
+include/qt/qbuttongroup.h
+include/qt/qcache.h
+include/qt/qcheckbox.h
+include/qt/qchkbox.h
+include/qt/qclipboard.h
+include/qt/qclipbrd.h
+include/qt/qcollect.h
+include/qt/qcollection.h
+include/qt/qcolor.h
+include/qt/qcombo.h
+include/qt/qcombobox.h
+include/qt/qconnect.h
+include/qt/qconnection.h
+include/qt/qcursor.h
+include/qt/qdatastream.h
+include/qt/qdatetime.h
+include/qt/qdatetm.h
+include/qt/qdialog.h
+include/qt/qdict.h
+include/qt/qdir.h
+include/qt/qdragobject.h
+include/qt/qdrawutil.h
+include/qt/qdrawutl.h
+include/qt/qdropsite.h
+include/qt/qdstream.h
+include/qt/qevent.h
+include/qt/qfile.h
+include/qt/qfiledef.h
+include/qt/qfiledefs.h
+include/qt/qfiledialog.h
+include/qt/qfiledlg.h
+include/qt/qfileinf.h
+include/qt/qfileinfo.h
+include/qt/qfocusdata.h
+include/qt/qfont.h
+include/qt/qfontdata.h
+include/qt/qfontdta.h
+include/qt/qfontinf.h
+include/qt/qfontinfo.h
+include/qt/qfontmet.h
+include/qt/qfontmetrics.h
+include/qt/qframe.h
+include/qt/qgarray.h
+include/qt/qgcache.h
+include/qt/qgdict.h
+include/qt/qgeneric.h
+include/qt/qgl.h
+include/qt/qglist.h
+include/qt/qglobal.h
+include/qt/qgmanager.h
+include/qt/qgmanagr.h
+include/qt/qgroupbox.h
+include/qt/qgrpbox.h
+include/qt/qgvector.h
+include/qt/qheader.h
+include/qt/qiconset.h
+include/qt/qimage.h
+include/qt/qimageio.h
+include/qt/qintcach.h
+include/qt/qintcache.h
+include/qt/qintdict.h
+include/qt/qiodev.h
+include/qt/qiodevice.h
+include/qt/qjpegio.h
+include/qt/qkeycode.h
+include/qt/qlabel.h
+include/qt/qlayout.h
+include/qt/qlcdnum.h
+include/qt/qlcdnumber.h
+include/qt/qlined.h
+include/qt/qlineedit.h
+include/qt/qlist.h
+include/qt/qlistbox.h
+include/qt/qlistview.h
+include/qt/qmainwindow.h
+include/qt/qmenubar.h
+include/qt/qmenudata.h
+include/qt/qmenudta.h
+include/qt/qmessagebox.h
+include/qt/qmetaobj.h
+include/qt/qmetaobject.h
+include/qt/qmlined.h
+include/qt/qmovie.h
+include/qt/qmsgbox.h
+include/qt/qmultilinedit.h
+include/qt/qnp.h
+include/qt/qobjcoll.h
+include/qt/qobjdefs.h
+include/qt/qobject.h
+include/qt/qobjectdefs.h
+include/qt/qobjectdict.h
+include/qt/qobjectlist.h
+include/qt/qpaintd.h
+include/qt/qpaintdc.h
+include/qt/qpaintdevice.h
+include/qt/qpaintdevicedefs.h
+include/qt/qpaintdevicemetrics.h
+include/qt/qpainter.h
+include/qt/qpalette.h
+include/qt/qpdevmet.h
+include/qt/qpen.h
+include/qt/qpicture.h
+include/qt/qpixmap.h
+include/qt/qpixmapcache.h
+include/qt/qpmcache.h
+include/qt/qpngio.h
+include/qt/qpntarry.h
+include/qt/qpoint.h
+include/qt/qpointarray.h
+include/qt/qpopmenu.h
+include/qt/qpopupmenu.h
+include/qt/qprintdialog.h
+include/qt/qprinter.h
+include/qt/qprndlg.h
+include/qt/qprogbar.h
+include/qt/qprogdlg.h
+include/qt/qprogressbar.h
+include/qt/qprogressdialog.h
+include/qt/qpsprinter.h
+include/qt/qpsprn.h
+include/qt/qptrdict.h
+include/qt/qpushbt.h
+include/qt/qpushbutton.h
+include/qt/qqueue.h
+include/qt/qradiobt.h
+include/qt/qradiobutton.h
+include/qt/qrangecontrol.h
+include/qt/qrangect.h
+include/qt/qrect.h
+include/qt/qregexp.h
+include/qt/qregion.h
+include/qt/qscrbar.h
+include/qt/qscrollbar.h
+include/qt/qscrollview.h
+include/qt/qsemimodal.h
+include/qt/qshared.h
+include/qt/qsignal.h
+include/qt/qsignalmapper.h
+include/qt/qsize.h
+include/qt/qslider.h
+include/qt/qsocketnotifier.h
+include/qt/qsocknot.h
+include/qt/qspinbox.h
+include/qt/qsplitter.h
+include/qt/qstack.h
+include/qt/qstatusbar.h
+include/qt/qstring.h
+include/qt/qstrlist.h
+include/qt/qstrvec.h
+include/qt/qtabbar.h
+include/qt/qtabdialog.h
+include/qt/qtabdlg.h
+include/qt/qtableview.h
+include/qt/qtablevw.h
+include/qt/qtextstream.h
+include/qt/qtimer.h
+include/qt/qtoolbar.h
+include/qt/qtoolbutton.h
+include/qt/qtooltip.h
+include/qt/qtstream.h
+include/qt/qvalidator.h
+include/qt/qvector.h
+include/qt/qwellarray.h
+include/qt/qwhatsthis.h
+include/qt/qwidcoll.h
+include/qt/qwidget.h
+include/qt/qwidgetintdict.h
+include/qt/qwidgetlist.h
+include/qt/qwidgetstack.h
+include/qt/qwindefs.h
+include/qt/qwindow.h
+include/qt/qwindowdefs.h
+include/qt/qwmatrix.h
+lib/libqt.a
+lib/libqt.so.1.40
 man/man1/moc.1
+man/man3/QAccel.3
 man/man3/QApplication.3
 man/man3/QArray.3
-man/man3/QBitmap.3
+man/man3/QAsyncIO.3
+man/man3/QBitArray.3
 man/man3/QBitVal.3
+man/man3/QBitmap.3
+man/man3/QBoxLayout.3
 man/man3/QBrush.3
 man/man3/QBuffer.3
 man/man3/QButton.3
 man/man3/QButtonGroup.3
 man/man3/QByteArray.3
+man/man3/QCache.3
+man/man3/QCacheIterator.3
 man/man3/QCheckBox.3
+man/man3/QCheckListItem.3
+man/man3/QChildEvent.3
 man/man3/QClipboard.3
 man/man3/QCloseEvent.3
 man/man3/QCollection.3
@@ -20,6 +221,9 @@ man/man3/QComboBox.3
 man/man3/QConnection.3
 man/man3/QCursor.3
 man/man3/QCustomEvent.3
+man/man3/QDataPump.3
+man/man3/QDataSink.3
+man/man3/QDataSource.3
 man/man3/QDataStream.3
 man/man3/QDate.3
 man/man3/QDateTime.3
@@ -31,44 +235,76 @@ man/man3/QDoubleValidator.3
 man/man3/QEvent.3
 man/man3/QFile.3
 man/man3/QFileDialog.3
+man/man3/QFileIconProvider.3
 man/man3/QFileInfo.3
+man/man3/QFocusData.3
 man/man3/QFocusEvent.3
 man/man3/QFont.3
 man/man3/QFontInfo.3
 man/man3/QFontMetrics.3
 man/man3/QFrame.3
 man/man3/QGArray.3
+man/man3/QGCache.3
 man/man3/QGCacheIterator.3
 man/man3/QGDict.3
 man/man3/QGDictIterator.3
+man/man3/QGIFFormat.3
+man/man3/QGIFFormatType.3
+man/man3/QGLContext.3
+man/man3/QGLFormat.3
+man/man3/QGLWidget.3
 man/man3/QGList.3
 man/man3/QGListIterator.3
+man/man3/QGManager.3
+man/man3/QGridLayout.3
 man/man3/QGroupBox.3
 man/man3/QHBoxLayout.3
+man/man3/QHeader.3
+man/man3/QIODevice.3
+man/man3/QIODeviceSource.3
+man/man3/QIconSet.3
 man/man3/QImage.3
+man/man3/QImageConsumer.3
+man/man3/QImageDecoder.3
+man/man3/QImageDrag.3
+man/man3/QImageFormat.3
+man/man3/QImageFormatType.3
 man/man3/QImageIO.3
+man/man3/QIntCache.3
+man/man3/QIntCacheIterator.3
 man/man3/QIntDict.3
 man/man3/QIntDictIterator.3
 man/man3/QIntValidator.3
-man/man3/QIODevice.3
 man/man3/QKeyEvent.3
+man/man3/QLCDNumber.3
+man/man3/QLNode.3
 man/man3/QLabel.3
 man/man3/QLayout.3
-man/man3/QLCDNumber.3
 man/man3/QLineEdit.3
 man/man3/QList.3
+man/man3/QListBox.3
 man/man3/QListBoxItem.3
 man/man3/QListBoxPixmap.3
 man/man3/QListBoxText.3
-man/man3/QLNode.3
+man/man3/QListIterator.3
+man/man3/QListView.3
+man/man3/QListViewItem.3
+man/man3/QMainWindow.3
 man/man3/QMenuBar.3
 man/man3/QMenuData.3
 man/man3/QMessageBox.3
+man/man3/QMouseEvent.3
 man/man3/QMoveEvent.3
 man/man3/QMovie.3
+man/man3/QMultiLineEdit.3
+man/man3/QNPInstance.3
+man/man3/QNPStream.3
+man/man3/QNPWidget.3
+man/man3/QNPlugin.3
 man/man3/QObject.3
 man/man3/QPaintDevice.3
 man/man3/QPaintDeviceMetrics.3
+man/man3/QPaintEvent.3
 man/man3/QPainter.3
 man/man3/QPalette.3
 man/man3/QPen.3
@@ -79,6 +315,7 @@ man/man3/QPoint.3
 man/man3/QPointArray.3
 man/man3/QPointVal.3
 man/man3/QPopupMenu.3
+man/man3/QPrintDialog.3
 man/man3/QPrinter.3
 man/man3/QProgressBar.3
 man/man3/QProgressDialog.3
@@ -93,55 +330,87 @@ man/man3/QRegExp.3
 man/man3/QRegion.3
 man/man3/QResizeEvent.3
 man/man3/QScrollBar.3
+man/man3/QScrollView.3
 man/man3/QSemiModal.3
 man/man3/QShared.3
 man/man3/QSignal.3
+man/man3/QSignalMapper.3
 man/man3/QSize.3
 man/man3/QSlider.3
 man/man3/QSocketNotifier.3
+man/man3/QSpinBox.3
+man/man3/QSplitter.3
 man/man3/QStack.3
+man/man3/QStatusBar.3
+man/man3/QStoredDrag.3
 man/man3/QStrIList.3
-man/man3/QString.3
 man/man3/QStrList.3
-man/man3/QTableView.3
+man/man3/QString.3
+man/man3/QTabBar.3
 man/man3/QTabDialog.3
+man/man3/QTableView.3
+man/man3/QTextDrag.3
+man/man3/QTextStream.3
 man/man3/QTime.3
 man/man3/QTimer.3
 man/man3/QTimerEvent.3
+man/man3/QToolBar.3
+man/man3/QToolButton.3
 man/man3/QToolTip.3
-man/man3/QTSManip.3
-man/man3/QValidator.3
+man/man3/QToolTipGroup.3
 man/man3/QVBoxLayout.3
+man/man3/QValidator.3
+man/man3/QWMatrix.3
+man/man3/QWhatsThis.3
 man/man3/QWidget.3
+man/man3/QWidgetStack.3
 man/man3/QWindow.3
-man/man3/QWMatrix.3
-man/man3/qarray.3
+man/man3/QXtApplication.3
+man/man3/QXtWidget.3
+man/man3/qaccel.3
 man/man3/qapplication.3
+man/man3/qarray.3
+man/man3/qasyncio.3
+man/man3/qbitarray.3
 man/man3/qbitmap.3
-man/man3/qdir.3
+man/man3/qbitval.3
+man/man3/qboxlayout.3
 man/man3/qbrush.3
+man/man3/qbuffer.3
 man/man3/qbutton.3
 man/man3/qbuttongroup.3
 man/man3/qbytearray.3
-man/man3/qbitarray.3
-man/man3/qbitval.3
+man/man3/qcache.3
+man/man3/qcacheiterator.3
+man/man3/qcheckbox.3
+man/man3/qchecklistitem.3
+man/man3/qchildevent.3
 man/man3/qclipboard.3
 man/man3/qcloseevent.3
 man/man3/qcollection.3
 man/man3/qcolor.3
 man/man3/qcolorgroup.3
 man/man3/qcombobox.3
+man/man3/qconnection.3
 man/man3/qcursor.3
 man/man3/qcustomevent.3
+man/man3/qdatapump.3
+man/man3/qdatasink.3
+man/man3/qdatasource.3
 man/man3/qdatastream.3
 man/man3/qdate.3
 man/man3/qdatetime.3
 man/man3/qdialog.3
 man/man3/qdict.3
+man/man3/qdictiterator.3
+man/man3/qdir.3
+man/man3/qdoublevalidator.3
 man/man3/qevent.3
 man/man3/qfile.3
 man/man3/qfiledialog.3
+man/man3/qfileiconprovider.3
 man/man3/qfileinfo.3
+man/man3/qfocusdata.3
 man/man3/qfocusevent.3
 man/man3/qfont.3
 man/man3/qfontinfo.3
@@ -149,46 +418,82 @@ man/man3/qfontmetrics.3
 man/man3/qframe.3
 man/man3/qgarray.3
 man/man3/qgcache.3
+man/man3/qgcacheiterator.3
 man/man3/qgdict.3
 man/man3/qgdictiterator.3
+man/man3/qgifformat.3
+man/man3/qgifformattype.3
+man/man3/qglcontext.3
+man/man3/qglformat.3
 man/man3/qglist.3
 man/man3/qglistiterator.3
+man/man3/qglwidget.3
+man/man3/qgmanager.3
+man/man3/qgridlayout.3
 man/man3/qgroupbox.3
+man/man3/qhboxlayout.3
+man/man3/qheader.3
+man/man3/qiconset.3
 man/man3/qimage.3
+man/man3/qimageconsumer.3
+man/man3/qimagedecoder.3
+man/man3/qimagedrag.3
+man/man3/qimageformat.3
+man/man3/qimageformattype.3
 man/man3/qimageio.3
+man/man3/qintcache.3
+man/man3/qintcacheiterator.3
 man/man3/qintdict.3
 man/man3/qintdictiterator.3
+man/man3/qintvalidator.3
 man/man3/qiodevice.3
+man/man3/qiodevicesource.3
 man/man3/qkeyevent.3
 man/man3/qlabel.3
 man/man3/qlayout.3
+man/man3/qlcdnumber.3
+man/man3/qlineedit.3
 man/man3/qlist.3
-man/man3/qpen.3
 man/man3/qlistbox.3
 man/man3/qlistboxitem.3
 man/man3/qlistboxpixmap.3
 man/man3/qlistboxtext.3
 man/man3/qlistiterator.3
+man/man3/qlistview.3
+man/man3/qlistviewitem.3
 man/man3/qlnode.3
+man/man3/qmainwindow.3
 man/man3/qmenubar.3
 man/man3/qmenudata.3
 man/man3/qmessagebox.3
 man/man3/qmouseevent.3
 man/man3/qmoveevent.3
+man/man3/qmovie.3
+man/man3/qmultilineedit.3
+man/man3/qnpinstance.3
+man/man3/qnplugin.3
+man/man3/qnpstream.3
+man/man3/qnpwidget.3
 man/man3/qobject.3
 man/man3/qpaintdevice.3
 man/man3/qpaintdevicemetrics.3
 man/man3/qpainter.3
-man/man3/qpicture.3
-man/man3/QGCache.3
-man/man3/QGManager.3
+man/man3/qpaintevent.3
 man/man3/qpalette.3
+man/man3/qpen.3
+man/man3/qpicture.3
 man/man3/qpixmap.3
 man/man3/qpixmapcache.3
 man/man3/qpoint.3
 man/man3/qpointarray.3
+man/man3/qpointval.3
 man/man3/qpopupmenu.3
+man/man3/qprintdialog.3
 man/man3/qprinter.3
+man/man3/qprogressbar.3
+man/man3/qprogressdialog.3
+man/man3/qptrdict.3
+man/man3/qptrdictiterator.3
 man/man3/qpushbutton.3
 man/man3/qqueue.3
 man/man3/qradiobutton.3
@@ -198,186 +503,43 @@ man/man3/qregexp.3
 man/man3/qregion.3
 man/man3/qresizeevent.3
 man/man3/qscrollbar.3
+man/man3/qscrollview.3
+man/man3/qsemimodal.3
 man/man3/qshared.3
 man/man3/qsignal.3
+man/man3/qsignalmapper.3
 man/man3/qsize.3
 man/man3/qslider.3
 man/man3/qsocketnotifier.3
+man/man3/qspinbox.3
+man/man3/qsplitter.3
 man/man3/qstack.3
+man/man3/qstatusbar.3
+man/man3/qstoreddrag.3
 man/man3/qstrilist.3
 man/man3/qstring.3
+man/man3/qstrlist.3
+man/man3/qtabbar.3
+man/man3/qtabdialog.3
 man/man3/qtableview.3
+man/man3/qtextdrag.3
 man/man3/qtextstream.3
 man/man3/qtime.3
 man/man3/qtimer.3
 man/man3/qtimerevent.3
-man/man3/qtsmanip.3
-man/man3/QListBox.3
-man/man3/qwidget.3
-man/man3/qwindow.3
-man/man3/qwmatrix.3
-man/man3/QAccel.3
-man/man3/QBitArray.3
-man/man3/qaccel.3
-man/man3/QListIterator.3
-man/man3/qbuffer.3
-man/man3/qcheckbox.3
-man/man3/qconnection.3
-man/man3/qdictiterator.3
-man/man3/qgcacheiterator.3
-man/man3/qlcdnumber.3
-man/man3/qlineedit.3
-man/man3/qmultilineedit.3
-man/man3/qpaintevent.3
-man/man3/qsenderobject.3
-man/man3/qstrlist.3
-man/man3/qtabbar.3
+man/man3/qtoolbar.3
+man/man3/qtoolbutton.3
 man/man3/qtooltip.3
-man/man3/QBoxLayout.3
-man/man3/QGridLayout.3
-man/man3/QMouseEvent.3
-man/man3/QMultiLineEdit.3
-man/man3/QPaintEvent.3
-man/man3/QSenderObject.3
-man/man3/QTabBar.3
-man/man3/QTextStream.3
-man/man3/QToolTipGroup.3
-man/man3/qboxlayout.3
-man/man3/qgmanager.3
-man/man3/qgridlayout.3
-man/man3/qtabdialog.3
 man/man3/qtooltipgroup.3
-man/man3/qdoublevalidator.3
-man/man3/qhboxlayout.3
-man/man3/qintvalidator.3
-man/man3/qmovie.3
-man/man3/qpointval.3
-man/man3/qprogressbar.3
-man/man3/qprogressdialog.3
-man/man3/qptrdict.3
-man/man3/qptrdictiterator.3
-man/man3/qsemimodal.3
 man/man3/qvalidator.3
 man/man3/qvboxlayout.3
-include/qt/qaccel.h
-include/qt/qapp.h
-include/qt/qarray.h
-include/qt/qasyncimageio.h
-include/qt/qasyncio.h
-include/qt/qbitarry.h
-include/qt/qbitmap.h
-include/qt/qbrush.h
-include/qt/qbttngrp.h
-include/qt/qbuffer.h
-include/qt/qbutton.h
-include/qt/qcache.h
-include/qt/qchkbox.h
-include/qt/qclipbrd.h
-include/qt/qcollect.h
-include/qt/qcolor.h
-include/qt/qcombo.h
-include/qt/qconnect.h
-include/qt/qcursor.h
-include/qt/qdatetm.h
-include/qt/qdialog.h
-include/qt/qdict.h
-include/qt/qdir.h
-include/qt/qdrawutl.h
-include/qt/qdstream.h
-include/qt/qevent.h
-include/qt/qfile.h
-include/qt/qfiledef.h
-include/qt/qfiledlg.h
-include/qt/qfileinf.h
-include/qt/qfont.h
-include/qt/qfontdta.h
-include/qt/qfontinf.h
-include/qt/qfontmet.h
-include/qt/qframe.h
-include/qt/qgarray.h
-include/qt/qgcache.h
-include/qt/qgdict.h
-include/qt/qgeneric.h
-include/qt/qgl.h
-include/qt/qglist.h
-include/qt/qglobal.h
-include/qt/qgmanagr.h
-include/qt/qgrpbox.h
-include/qt/qgvector.h
-include/qt/qimage.h
-include/qt/qimageio.h
-include/qt/qintcach.h
-include/qt/qintdict.h
-include/qt/qiodev.h
-include/qt/qjpegio.h
-include/qt/qkeycode.h
-include/qt/qlabel.h
-include/qt/qlayout.h
-include/qt/qlcdnum.h
-include/qt/qlined.h
-include/qt/qlist.h
-include/qt/qlistbox.h
-include/qt/qmenubar.h
-include/qt/qmenudta.h
-include/qt/qmetaobj.h
-include/qt/qmlined.h
-include/qt/qmovie.h
-include/qt/qmsgbox.h
-include/qt/qnp.h
-include/qt/qobjcoll.h
-include/qt/qobjdefs.h
-include/qt/qobject.h
-include/qt/qpaintd.h
-include/qt/qpaintdc.h
-include/qt/qpainter.h
-include/qt/qpalette.h
-include/qt/qpdevmet.h
-include/qt/qpen.h
-include/qt/qpicture.h
-include/qt/qpixmap.h
-include/qt/qpmcache.h
-include/qt/qpngio.h
-include/qt/qpntarry.h
-include/qt/qpoint.h
-include/qt/qpopmenu.h
-include/qt/qprinter.h
-include/qt/qprndlg.h
-include/qt/qprogbar.h
-include/qt/qprogdlg.h
-include/qt/qpsprn.h
-include/qt/qptrdict.h
-include/qt/qpushbt.h
-include/qt/qqueue.h
-include/qt/qradiobt.h
-include/qt/qrangect.h
-include/qt/qrect.h
-include/qt/qregexp.h
-include/qt/qregion.h
-include/qt/qscrbar.h
-include/qt/qsemimodal.h
-include/qt/qshared.h
-include/qt/qsignal.h
-include/qt/qsize.h
-include/qt/qslider.h
-include/qt/qsocknot.h
-include/qt/qstack.h
-include/qt/qstring.h
-include/qt/qstrlist.h
-include/qt/qstrvec.h
-include/qt/qtabbar.h
-include/qt/qtabdlg.h
-include/qt/qtablevw.h
-include/qt/qtimer.h
-include/qt/qtooltip.h
-include/qt/qtstream.h
-include/qt/qvalidator.h
-include/qt/qvector.h
-include/qt/qwidcoll.h
-include/qt/qwidget.h
-include/qt/qwindefs.h
-include/qt/qwindow.h
-include/qt/qwmatrix.h
-bin/moc
+man/man3/qwhatsthis.3
+man/man3/qwidget.3
+man/man3/qwidgetstack.3
+man/man3/qwindow.3
+man/man3/qwmatrix.3
+man/man3/qxtapplication.3
+man/man3/qxtwidget.3
 share/doc/qt/README
 share/doc/qt/README.QT
 @dirrm include/qt