The place to install header files is changed.

 include/X11/qt2 -> include/qt2

Suggested by:	Andrey Zakhvatov <andy@cgu.chel.su>

12 files changed, 1476 insertions, 1476 deletions

diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index 154f467a8475..1b9f0ba65257 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -50,8 +50,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so.${VERSION}
 	${LN} -sf ${PREFIX}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/include/X11/qt2
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/X11/qt2
+	${MKDIR} ${PREFIX}/include/qt2
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_MAN} ${WRKSRC}/man/man1/moc.1 ${PREFIX}/man/man1/moc2.1
 	${INSTALL_MAN} ${WRKSRC}/man/man3/q* ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/qt22/pkg-plist b/x11-toolkits/qt22/pkg-plist
index e69b128f85dd..80793e5b031e 100644
--- a/x11-toolkits/qt22/pkg-plist
+++ b/x11-toolkits/qt22/pkg-plist
@@ -4,249 +4,249 @@ bin/moc2
 bin/msg2qm
 bin/qt20fix
 bin/qtrename140
-include/X11/qt2/jri.h
-include/X11/qt2/jritypes.h
-include/X11/qt2/npapi.h
-include/X11/qt2/npupp.h
-include/X11/qt2/q1xcompatibility.h
-include/X11/qt2/qabstractlayout.h
-include/X11/qt2/qaccel.h
-include/X11/qt2/qapp.h
-include/X11/qt2/qapplication.h
-include/X11/qt2/qarray.h
-include/X11/qt2/qasciicache.h
-include/X11/qt2/qasciidict.h
-include/X11/qt2/qasyncimageio.h
-include/X11/qt2/qasyncio.h
-include/X11/qt2/qbitarray.h
-include/X11/qt2/qbitarry.h
-include/X11/qt2/qbitmap.h
-include/X11/qt2/qbrush.h
-include/X11/qt2/qbttngrp.h
-include/X11/qt2/qbuffer.h
-include/X11/qt2/qbutton.h
-include/X11/qt2/qbuttongroup.h
-include/X11/qt2/qcache.h
-include/X11/qt2/qcdestyle.h
-include/X11/qt2/qcheckbox.h
-include/X11/qt2/qchkbox.h
-include/X11/qt2/qclipboard.h
-include/X11/qt2/qclipbrd.h
-include/X11/qt2/qcollect.h
-include/X11/qt2/qcollection.h
-include/X11/qt2/qcolor.h
-include/X11/qt2/qcolordialog.h
-include/X11/qt2/qcombo.h
-include/X11/qt2/qcombobox.h
-include/X11/qt2/qcommonstyle.h
-include/X11/qt2/qconnect.h
-include/X11/qt2/qconnection.h
-include/X11/qt2/qcstring.h
-include/X11/qt2/qcursor.h
-include/X11/qt2/qdatastream.h
-include/X11/qt2/qdatetime.h
-include/X11/qt2/qdatetm.h
-include/X11/qt2/qdialog.h
-include/X11/qt2/qdict.h
-include/X11/qt2/qdir.h
-include/X11/qt2/qdragobject.h
-include/X11/qt2/qdrawutil.h
-include/X11/qt2/qdrawutl.h
-include/X11/qt2/qdropsite.h
-include/X11/qt2/qdstream.h
-include/X11/qt2/qeucjpcodec.h
-include/X11/qt2/qeuckrcodec.h
-include/X11/qt2/qevent.h
-include/X11/qt2/qfile.h
-include/X11/qt2/qfiledef.h
-include/X11/qt2/qfiledefs.h
-include/X11/qt2/qfiledialog.h
-include/X11/qt2/qfiledlg.h
-include/X11/qt2/qfileinf.h
-include/X11/qt2/qfileinfo.h
-include/X11/qt2/qfocusdata.h
-include/X11/qt2/qfont.h
-include/X11/qt2/qfontdata.h
-include/X11/qt2/qfontdatabase.h
-include/X11/qt2/qfontdialog.h
-include/X11/qt2/qfontdta.h
-include/X11/qt2/qfontinf.h
-include/X11/qt2/qfontinfo.h
-include/X11/qt2/qfontmet.h
-include/X11/qt2/qfontmetrics.h
-include/X11/qt2/qframe.h
-include/X11/qt2/qgarray.h
-include/X11/qt2/qgcache.h
-include/X11/qt2/qgdict.h
-include/X11/qt2/qgeneric.h
-include/X11/qt2/qgif.h
-include/X11/qt2/qgl.h
-include/X11/qt2/qglist.h
-include/X11/qt2/qglobal.h
-include/X11/qt2/qgmanagr.h
-include/X11/qt2/qgrid.h
-include/X11/qt2/qgroupbox.h
-include/X11/qt2/qgrpbox.h
-include/X11/qt2/qgvector.h
-include/X11/qt2/qhbox.h
-include/X11/qt2/qhbuttongroup.h
-include/X11/qt2/qheader.h
-include/X11/qt2/qhgroupbox.h
-include/X11/qt2/qiconset.h
-include/X11/qt2/qimage.h
-include/X11/qt2/qimageio.h
-include/X11/qt2/qintcach.h
-include/X11/qt2/qintcache.h
-include/X11/qt2/qintdict.h
-include/X11/qt2/qiodev.h
-include/X11/qt2/qiodevice.h
-include/X11/qt2/qjiscodec.h
-include/X11/qt2/qjpegio.h
-include/X11/qt2/qjpunicode.h
-include/X11/qt2/qkeycode.h
-include/X11/qt2/qkoi8codec.h
-include/X11/qt2/qlabel.h
-include/X11/qt2/qlayout.h
-include/X11/qt2/qlayoutengine.h
-include/X11/qt2/qlcdnum.h
-include/X11/qt2/qlcdnumber.h
-include/X11/qt2/qlined.h
-include/X11/qt2/qlineedit.h
-include/X11/qt2/qlist.h
-include/X11/qt2/qlistbox.h
-include/X11/qt2/qlistview.h
-include/X11/qt2/qmainwindow.h
-include/X11/qt2/qmap.h
-include/X11/qt2/qmenubar.h
-include/X11/qt2/qmenudata.h
-include/X11/qt2/qmenudta.h
-include/X11/qt2/qmessagebox.h
-include/X11/qt2/qmetaobj.h
-include/X11/qt2/qmetaobject.h
-include/X11/qt2/qmime.h
-include/X11/qt2/qmlined.h
-include/X11/qt2/qmotifstyle.h
-include/X11/qt2/qmovie.h
-include/X11/qt2/qmsgbox.h
-include/X11/qt2/qmultilinedit.h
-include/X11/qt2/qmultilineedit.h
-include/X11/qt2/qnamespace.h
-include/X11/qt2/qnp.h
-include/X11/qt2/qobjcoll.h
-include/X11/qt2/qobjdefs.h
-include/X11/qt2/qobject.h
-include/X11/qt2/qobjectdefs.h
-include/X11/qt2/qobjectdict.h
-include/X11/qt2/qobjectlist.h
-include/X11/qt2/qpaintd.h
-include/X11/qt2/qpaintdc.h
-include/X11/qt2/qpaintdevice.h
-include/X11/qt2/qpaintdevicedefs.h
-include/X11/qt2/qpaintdevicemetrics.h
-include/X11/qt2/qpainter.h
-include/X11/qt2/qpalette.h
-include/X11/qt2/qpdevmet.h
-include/X11/qt2/qpen.h
-include/X11/qt2/qpicture.h
-include/X11/qt2/qpixmap.h
-include/X11/qt2/qpixmapcache.h
-include/X11/qt2/qplatinumstyle.h
-include/X11/qt2/qpmcache.h
-include/X11/qt2/qpngio.h
-include/X11/qt2/qpntarry.h
-include/X11/qt2/qpoint.h
-include/X11/qt2/qpointarray.h
-include/X11/qt2/qpopmenu.h
-include/X11/qt2/qpopupmenu.h
-include/X11/qt2/qprintdialog.h
-include/X11/qt2/qprinter.h
-include/X11/qt2/qprndlg.h
-include/X11/qt2/qprogbar.h
-include/X11/qt2/qprogdlg.h
-include/X11/qt2/qprogressbar.h
-include/X11/qt2/qprogressdialog.h
-include/X11/qt2/qpsprinter.h
-include/X11/qt2/qpsprn.h
-include/X11/qt2/qptrdict.h
-include/X11/qt2/qpushbt.h
-include/X11/qt2/qpushbutton.h
-include/X11/qt2/qqueue.h
-include/X11/qt2/qradiobt.h
-include/X11/qt2/qradiobutton.h
-include/X11/qt2/qrangecontrol.h
-include/X11/qt2/qrangect.h
-include/X11/qt2/qrect.h
-include/X11/qt2/qregexp.h
-include/X11/qt2/qregion.h
-include/X11/qt2/qrtlcodec.h
-include/X11/qt2/qscrbar.h
-include/X11/qt2/qscrollbar.h
-include/X11/qt2/qscrollview.h
-include/X11/qt2/qsemimodal.h
-include/X11/qt2/qsession.h
-include/X11/qt2/qsessionmanager.h
-include/X11/qt2/qshared.h
-include/X11/qt2/qsignal.h
-include/X11/qt2/qsignalmapper.h
-include/X11/qt2/qsignalslotimp.h
-include/X11/qt2/qsimplerichtext.h
-include/X11/qt2/qsize.h
-include/X11/qt2/qsizegrip.h
-include/X11/qt2/qsizepolicy.h
-include/X11/qt2/qsjiscodec.h
-include/X11/qt2/qslider.h
-include/X11/qt2/qsmartptr.h
-include/X11/qt2/qsocketnotifier.h
-include/X11/qt2/qsocknot.h
-include/X11/qt2/qsortedlist.h
-include/X11/qt2/qspinbox.h
-include/X11/qt2/qsplitter.h
-include/X11/qt2/qstack.h
-include/X11/qt2/qstatusbar.h
-include/X11/qt2/qstring.h
-include/X11/qt2/qstringlist.h
-include/X11/qt2/qstrlist.h
-include/X11/qt2/qstrvec.h
-include/X11/qt2/qstyle.h
-include/X11/qt2/qstylesheet.h
-include/X11/qt2/qtabbar.h
-include/X11/qt2/qtabdialog.h
-include/X11/qt2/qtabdlg.h
-include/X11/qt2/qtableview.h
-include/X11/qt2/qtablevw.h
-include/X11/qt2/qtabwidget.h
-include/X11/qt2/qtextbrowser.h
-include/X11/qt2/qtextcodec.h
-include/X11/qt2/qtextstream.h
-include/X11/qt2/qtextview.h
-include/X11/qt2/qtimer.h
-include/X11/qt2/qtl.h
-include/X11/qt2/qtoolbar.h
-include/X11/qt2/qtoolbutton.h
-include/X11/qt2/qtooltip.h
-include/X11/qt2/qtranslator.h
-include/X11/qt2/qtstream.h
-include/X11/qt2/qutfcodec.h
-include/X11/qt2/qvalidator.h
-include/X11/qt2/qvaluelist.h
-include/X11/qt2/qvbox.h
-include/X11/qt2/qvbuttongroup.h
-include/X11/qt2/qvector.h
-include/X11/qt2/qvgroupbox.h
-include/X11/qt2/qwellarray.h
-include/X11/qt2/qwhatsthis.h
-include/X11/qt2/qwidcoll.h
-include/X11/qt2/qwidget.h
-include/X11/qt2/qwidgetintdict.h
-include/X11/qt2/qwidgetlist.h
-include/X11/qt2/qwidgetstack.h
-include/X11/qt2/qwindefs.h
-include/X11/qt2/qwindow.h
-include/X11/qt2/qwindowdefs.h
-include/X11/qt2/qwindowsstyle.h
-include/X11/qt2/qwizard.h
-include/X11/qt2/qwmatrix.h
-include/X11/qt2/qxt.h
+include/qt2/jri.h
+include/qt2/jritypes.h
+include/qt2/npapi.h
+include/qt2/npupp.h
+include/qt2/q1xcompatibility.h
+include/qt2/qabstractlayout.h
+include/qt2/qaccel.h
+include/qt2/qapp.h
+include/qt2/qapplication.h
+include/qt2/qarray.h
+include/qt2/qasciicache.h
+include/qt2/qasciidict.h
+include/qt2/qasyncimageio.h
+include/qt2/qasyncio.h
+include/qt2/qbitarray.h
+include/qt2/qbitarry.h
+include/qt2/qbitmap.h
+include/qt2/qbrush.h
+include/qt2/qbttngrp.h
+include/qt2/qbuffer.h
+include/qt2/qbutton.h
+include/qt2/qbuttongroup.h
+include/qt2/qcache.h
+include/qt2/qcdestyle.h
+include/qt2/qcheckbox.h
+include/qt2/qchkbox.h
+include/qt2/qclipboard.h
+include/qt2/qclipbrd.h
+include/qt2/qcollect.h
+include/qt2/qcollection.h
+include/qt2/qcolor.h
+include/qt2/qcolordialog.h
+include/qt2/qcombo.h
+include/qt2/qcombobox.h
+include/qt2/qcommonstyle.h
+include/qt2/qconnect.h
+include/qt2/qconnection.h
+include/qt2/qcstring.h
+include/qt2/qcursor.h
+include/qt2/qdatastream.h
+include/qt2/qdatetime.h
+include/qt2/qdatetm.h
+include/qt2/qdialog.h
+include/qt2/qdict.h
+include/qt2/qdir.h
+include/qt2/qdragobject.h
+include/qt2/qdrawutil.h
+include/qt2/qdrawutl.h
+include/qt2/qdropsite.h
+include/qt2/qdstream.h
+include/qt2/qeucjpcodec.h
+include/qt2/qeuckrcodec.h
+include/qt2/qevent.h
+include/qt2/qfile.h
+include/qt2/qfiledef.h
+include/qt2/qfiledefs.h
+include/qt2/qfiledialog.h
+include/qt2/qfiledlg.h
+include/qt2/qfileinf.h
+include/qt2/qfileinfo.h
+include/qt2/qfocusdata.h
+include/qt2/qfont.h
+include/qt2/qfontdata.h
+include/qt2/qfontdatabase.h
+include/qt2/qfontdialog.h
+include/qt2/qfontdta.h
+include/qt2/qfontinf.h
+include/qt2/qfontinfo.h
+include/qt2/qfontmet.h
+include/qt2/qfontmetrics.h
+include/qt2/qframe.h
+include/qt2/qgarray.h
+include/qt2/qgcache.h
+include/qt2/qgdict.h
+include/qt2/qgeneric.h
+include/qt2/qgif.h
+include/qt2/qgl.h
+include/qt2/qglist.h
+include/qt2/qglobal.h
+include/qt2/qgmanagr.h
+include/qt2/qgrid.h
+include/qt2/qgroupbox.h
+include/qt2/qgrpbox.h
+include/qt2/qgvector.h
+include/qt2/qhbox.h
+include/qt2/qhbuttongroup.h
+include/qt2/qheader.h
+include/qt2/qhgroupbox.h
+include/qt2/qiconset.h
+include/qt2/qimage.h
+include/qt2/qimageio.h
+include/qt2/qintcach.h
+include/qt2/qintcache.h
+include/qt2/qintdict.h
+include/qt2/qiodev.h
+include/qt2/qiodevice.h
+include/qt2/qjiscodec.h
+include/qt2/qjpegio.h
+include/qt2/qjpunicode.h
+include/qt2/qkeycode.h
+include/qt2/qkoi8codec.h
+include/qt2/qlabel.h
+include/qt2/qlayout.h
+include/qt2/qlayoutengine.h
+include/qt2/qlcdnum.h
+include/qt2/qlcdnumber.h
+include/qt2/qlined.h
+include/qt2/qlineedit.h
+include/qt2/qlist.h
+include/qt2/qlistbox.h
+include/qt2/qlistview.h
+include/qt2/qmainwindow.h
+include/qt2/qmap.h
+include/qt2/qmenubar.h
+include/qt2/qmenudata.h
+include/qt2/qmenudta.h
+include/qt2/qmessagebox.h
+include/qt2/qmetaobj.h
+include/qt2/qmetaobject.h
+include/qt2/qmime.h
+include/qt2/qmlined.h
+include/qt2/qmotifstyle.h
+include/qt2/qmovie.h
+include/qt2/qmsgbox.h
+include/qt2/qmultilinedit.h
+include/qt2/qmultilineedit.h
+include/qt2/qnamespace.h
+include/qt2/qnp.h
+include/qt2/qobjcoll.h
+include/qt2/qobjdefs.h
+include/qt2/qobject.h
+include/qt2/qobjectdefs.h
+include/qt2/qobjectdict.h
+include/qt2/qobjectlist.h
+include/qt2/qpaintd.h
+include/qt2/qpaintdc.h
+include/qt2/qpaintdevice.h
+include/qt2/qpaintdevicedefs.h
+include/qt2/qpaintdevicemetrics.h
+include/qt2/qpainter.h
+include/qt2/qpalette.h
+include/qt2/qpdevmet.h
+include/qt2/qpen.h
+include/qt2/qpicture.h
+include/qt2/qpixmap.h
+include/qt2/qpixmapcache.h
+include/qt2/qplatinumstyle.h
+include/qt2/qpmcache.h
+include/qt2/qpngio.h
+include/qt2/qpntarry.h
+include/qt2/qpoint.h
+include/qt2/qpointarray.h
+include/qt2/qpopmenu.h
+include/qt2/qpopupmenu.h
+include/qt2/qprintdialog.h
+include/qt2/qprinter.h
+include/qt2/qprndlg.h
+include/qt2/qprogbar.h
+include/qt2/qprogdlg.h
+include/qt2/qprogressbar.h
+include/qt2/qprogressdialog.h
+include/qt2/qpsprinter.h
+include/qt2/qpsprn.h
+include/qt2/qptrdict.h
+include/qt2/qpushbt.h
+include/qt2/qpushbutton.h
+include/qt2/qqueue.h
+include/qt2/qradiobt.h
+include/qt2/qradiobutton.h
+include/qt2/qrangecontrol.h
+include/qt2/qrangect.h
+include/qt2/qrect.h
+include/qt2/qregexp.h
+include/qt2/qregion.h
+include/qt2/qrtlcodec.h
+include/qt2/qscrbar.h
+include/qt2/qscrollbar.h
+include/qt2/qscrollview.h
+include/qt2/qsemimodal.h
+include/qt2/qsession.h
+include/qt2/qsessionmanager.h
+include/qt2/qshared.h
+include/qt2/qsignal.h
+include/qt2/qsignalmapper.h
+include/qt2/qsignalslotimp.h
+include/qt2/qsimplerichtext.h
+include/qt2/qsize.h
+include/qt2/qsizegrip.h
+include/qt2/qsizepolicy.h
+include/qt2/qsjiscodec.h
+include/qt2/qslider.h
+include/qt2/qsmartptr.h
+include/qt2/qsocketnotifier.h
+include/qt2/qsocknot.h
+include/qt2/qsortedlist.h
+include/qt2/qspinbox.h
+include/qt2/qsplitter.h
+include/qt2/qstack.h
+include/qt2/qstatusbar.h
+include/qt2/qstring.h
+include/qt2/qstringlist.h
+include/qt2/qstrlist.h
+include/qt2/qstrvec.h
+include/qt2/qstyle.h
+include/qt2/qstylesheet.h
+include/qt2/qtabbar.h
+include/qt2/qtabdialog.h
+include/qt2/qtabdlg.h
+include/qt2/qtableview.h
+include/qt2/qtablevw.h
+include/qt2/qtabwidget.h
+include/qt2/qtextbrowser.h
+include/qt2/qtextcodec.h
+include/qt2/qtextstream.h
+include/qt2/qtextview.h
+include/qt2/qtimer.h
+include/qt2/qtl.h
+include/qt2/qtoolbar.h
+include/qt2/qtoolbutton.h
+include/qt2/qtooltip.h
+include/qt2/qtranslator.h
+include/qt2/qtstream.h
+include/qt2/qutfcodec.h
+include/qt2/qvalidator.h
+include/qt2/qvaluelist.h
+include/qt2/qvbox.h
+include/qt2/qvbuttongroup.h
+include/qt2/qvector.h
+include/qt2/qvgroupbox.h
+include/qt2/qwellarray.h
+include/qt2/qwhatsthis.h
+include/qt2/qwidcoll.h
+include/qt2/qwidget.h
+include/qt2/qwidgetintdict.h
+include/qt2/qwidgetlist.h
+include/qt2/qwidgetstack.h
+include/qt2/qwindefs.h
+include/qt2/qwindow.h
+include/qt2/qwindowdefs.h
+include/qt2/qwindowsstyle.h
+include/qt2/qwizard.h
+include/qt2/qwmatrix.h
+include/qt2/qxt.h
 lib/libqt2.so
 lib/libqt2.so.%%VERSION%%
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@@ -1164,6 +1164,6 @@ share/doc/qt2/html/wizard-main-cpp.html
 share/doc/qt2/html/xform-xform-cpp.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm include/X11/qt2
+@dirrm include/qt2
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 154f467a8475..1b9f0ba65257 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -50,8 +50,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so.${VERSION}
 	${LN} -sf ${PREFIX}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/include/X11/qt2
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/X11/qt2
+	${MKDIR} ${PREFIX}/include/qt2
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_MAN} ${WRKSRC}/man/man1/moc.1 ${PREFIX}/man/man1/moc2.1
 	${INSTALL_MAN} ${WRKSRC}/man/man3/q* ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist
index e69b128f85dd..80793e5b031e 100644
--- a/x11-toolkits/qt23/pkg-plist
+++ b/x11-toolkits/qt23/pkg-plist
@@ -4,249 +4,249 @@ bin/moc2
 bin/msg2qm
 bin/qt20fix
 bin/qtrename140
-include/X11/qt2/jri.h
-include/X11/qt2/jritypes.h
-include/X11/qt2/npapi.h
-include/X11/qt2/npupp.h
-include/X11/qt2/q1xcompatibility.h
-include/X11/qt2/qabstractlayout.h
-include/X11/qt2/qaccel.h
-include/X11/qt2/qapp.h
-include/X11/qt2/qapplication.h
-include/X11/qt2/qarray.h
-include/X11/qt2/qasciicache.h
-include/X11/qt2/qasciidict.h
-include/X11/qt2/qasyncimageio.h
-include/X11/qt2/qasyncio.h
-include/X11/qt2/qbitarray.h
-include/X11/qt2/qbitarry.h
-include/X11/qt2/qbitmap.h
-include/X11/qt2/qbrush.h
-include/X11/qt2/qbttngrp.h
-include/X11/qt2/qbuffer.h
-include/X11/qt2/qbutton.h
-include/X11/qt2/qbuttongroup.h
-include/X11/qt2/qcache.h
-include/X11/qt2/qcdestyle.h
-include/X11/qt2/qcheckbox.h
-include/X11/qt2/qchkbox.h
-include/X11/qt2/qclipboard.h
-include/X11/qt2/qclipbrd.h
-include/X11/qt2/qcollect.h
-include/X11/qt2/qcollection.h
-include/X11/qt2/qcolor.h
-include/X11/qt2/qcolordialog.h
-include/X11/qt2/qcombo.h
-include/X11/qt2/qcombobox.h
-include/X11/qt2/qcommonstyle.h
-include/X11/qt2/qconnect.h
-include/X11/qt2/qconnection.h
-include/X11/qt2/qcstring.h
-include/X11/qt2/qcursor.h
-include/X11/qt2/qdatastream.h
-include/X11/qt2/qdatetime.h
-include/X11/qt2/qdatetm.h
-include/X11/qt2/qdialog.h
-include/X11/qt2/qdict.h
-include/X11/qt2/qdir.h
-include/X11/qt2/qdragobject.h
-include/X11/qt2/qdrawutil.h
-include/X11/qt2/qdrawutl.h
-include/X11/qt2/qdropsite.h
-include/X11/qt2/qdstream.h
-include/X11/qt2/qeucjpcodec.h
-include/X11/qt2/qeuckrcodec.h
-include/X11/qt2/qevent.h
-include/X11/qt2/qfile.h
-include/X11/qt2/qfiledef.h
-include/X11/qt2/qfiledefs.h
-include/X11/qt2/qfiledialog.h
-include/X11/qt2/qfiledlg.h
-include/X11/qt2/qfileinf.h
-include/X11/qt2/qfileinfo.h
-include/X11/qt2/qfocusdata.h
-include/X11/qt2/qfont.h
-include/X11/qt2/qfontdata.h
-include/X11/qt2/qfontdatabase.h
-include/X11/qt2/qfontdialog.h
-include/X11/qt2/qfontdta.h
-include/X11/qt2/qfontinf.h
-include/X11/qt2/qfontinfo.h
-include/X11/qt2/qfontmet.h
-include/X11/qt2/qfontmetrics.h
-include/X11/qt2/qframe.h
-include/X11/qt2/qgarray.h
-include/X11/qt2/qgcache.h
-include/X11/qt2/qgdict.h
-include/X11/qt2/qgeneric.h
-include/X11/qt2/qgif.h
-include/X11/qt2/qgl.h
-include/X11/qt2/qglist.h
-include/X11/qt2/qglobal.h
-include/X11/qt2/qgmanagr.h
-include/X11/qt2/qgrid.h
-include/X11/qt2/qgroupbox.h
-include/X11/qt2/qgrpbox.h
-include/X11/qt2/qgvector.h
-include/X11/qt2/qhbox.h
-include/X11/qt2/qhbuttongroup.h
-include/X11/qt2/qheader.h
-include/X11/qt2/qhgroupbox.h
-include/X11/qt2/qiconset.h
-include/X11/qt2/qimage.h
-include/X11/qt2/qimageio.h
-include/X11/qt2/qintcach.h
-include/X11/qt2/qintcache.h
-include/X11/qt2/qintdict.h
-include/X11/qt2/qiodev.h
-include/X11/qt2/qiodevice.h
-include/X11/qt2/qjiscodec.h
-include/X11/qt2/qjpegio.h
-include/X11/qt2/qjpunicode.h
-include/X11/qt2/qkeycode.h
-include/X11/qt2/qkoi8codec.h
-include/X11/qt2/qlabel.h
-include/X11/qt2/qlayout.h
-include/X11/qt2/qlayoutengine.h
-include/X11/qt2/qlcdnum.h
-include/X11/qt2/qlcdnumber.h
-include/X11/qt2/qlined.h
-include/X11/qt2/qlineedit.h
-include/X11/qt2/qlist.h
-include/X11/qt2/qlistbox.h
-include/X11/qt2/qlistview.h
-include/X11/qt2/qmainwindow.h
-include/X11/qt2/qmap.h
-include/X11/qt2/qmenubar.h
-include/X11/qt2/qmenudata.h
-include/X11/qt2/qmenudta.h
-include/X11/qt2/qmessagebox.h
-include/X11/qt2/qmetaobj.h
-include/X11/qt2/qmetaobject.h
-include/X11/qt2/qmime.h
-include/X11/qt2/qmlined.h
-include/X11/qt2/qmotifstyle.h
-include/X11/qt2/qmovie.h
-include/X11/qt2/qmsgbox.h
-include/X11/qt2/qmultilinedit.h
-include/X11/qt2/qmultilineedit.h
-include/X11/qt2/qnamespace.h
-include/X11/qt2/qnp.h
-include/X11/qt2/qobjcoll.h
-include/X11/qt2/qobjdefs.h
-include/X11/qt2/qobject.h
-include/X11/qt2/qobjectdefs.h
-include/X11/qt2/qobjectdict.h
-include/X11/qt2/qobjectlist.h
-include/X11/qt2/qpaintd.h
-include/X11/qt2/qpaintdc.h
-include/X11/qt2/qpaintdevice.h
-include/X11/qt2/qpaintdevicedefs.h
-include/X11/qt2/qpaintdevicemetrics.h
-include/X11/qt2/qpainter.h
-include/X11/qt2/qpalette.h
-include/X11/qt2/qpdevmet.h
-include/X11/qt2/qpen.h
-include/X11/qt2/qpicture.h
-include/X11/qt2/qpixmap.h
-include/X11/qt2/qpixmapcache.h
-include/X11/qt2/qplatinumstyle.h
-include/X11/qt2/qpmcache.h
-include/X11/qt2/qpngio.h
-include/X11/qt2/qpntarry.h
-include/X11/qt2/qpoint.h
-include/X11/qt2/qpointarray.h
-include/X11/qt2/qpopmenu.h
-include/X11/qt2/qpopupmenu.h
-include/X11/qt2/qprintdialog.h
-include/X11/qt2/qprinter.h
-include/X11/qt2/qprndlg.h
-include/X11/qt2/qprogbar.h
-include/X11/qt2/qprogdlg.h
-include/X11/qt2/qprogressbar.h
-include/X11/qt2/qprogressdialog.h
-include/X11/qt2/qpsprinter.h
-include/X11/qt2/qpsprn.h
-include/X11/qt2/qptrdict.h
-include/X11/qt2/qpushbt.h
-include/X11/qt2/qpushbutton.h
-include/X11/qt2/qqueue.h
-include/X11/qt2/qradiobt.h
-include/X11/qt2/qradiobutton.h
-include/X11/qt2/qrangecontrol.h
-include/X11/qt2/qrangect.h
-include/X11/qt2/qrect.h
-include/X11/qt2/qregexp.h
-include/X11/qt2/qregion.h
-include/X11/qt2/qrtlcodec.h
-include/X11/qt2/qscrbar.h
-include/X11/qt2/qscrollbar.h
-include/X11/qt2/qscrollview.h
-include/X11/qt2/qsemimodal.h
-include/X11/qt2/qsession.h
-include/X11/qt2/qsessionmanager.h
-include/X11/qt2/qshared.h
-include/X11/qt2/qsignal.h
-include/X11/qt2/qsignalmapper.h
-include/X11/qt2/qsignalslotimp.h
-include/X11/qt2/qsimplerichtext.h
-include/X11/qt2/qsize.h
-include/X11/qt2/qsizegrip.h
-include/X11/qt2/qsizepolicy.h
-include/X11/qt2/qsjiscodec.h
-include/X11/qt2/qslider.h
-include/X11/qt2/qsmartptr.h
-include/X11/qt2/qsocketnotifier.h
-include/X11/qt2/qsocknot.h
-include/X11/qt2/qsortedlist.h
-include/X11/qt2/qspinbox.h
-include/X11/qt2/qsplitter.h
-include/X11/qt2/qstack.h
-include/X11/qt2/qstatusbar.h
-include/X11/qt2/qstring.h
-include/X11/qt2/qstringlist.h
-include/X11/qt2/qstrlist.h
-include/X11/qt2/qstrvec.h
-include/X11/qt2/qstyle.h
-include/X11/qt2/qstylesheet.h
-include/X11/qt2/qtabbar.h
-include/X11/qt2/qtabdialog.h
-include/X11/qt2/qtabdlg.h
-include/X11/qt2/qtableview.h
-include/X11/qt2/qtablevw.h
-include/X11/qt2/qtabwidget.h
-include/X11/qt2/qtextbrowser.h
-include/X11/qt2/qtextcodec.h
-include/X11/qt2/qtextstream.h
-include/X11/qt2/qtextview.h
-include/X11/qt2/qtimer.h
-include/X11/qt2/qtl.h
-include/X11/qt2/qtoolbar.h
-include/X11/qt2/qtoolbutton.h
-include/X11/qt2/qtooltip.h
-include/X11/qt2/qtranslator.h
-include/X11/qt2/qtstream.h
-include/X11/qt2/qutfcodec.h
-include/X11/qt2/qvalidator.h
-include/X11/qt2/qvaluelist.h
-include/X11/qt2/qvbox.h
-include/X11/qt2/qvbuttongroup.h
-include/X11/qt2/qvector.h
-include/X11/qt2/qvgroupbox.h
-include/X11/qt2/qwellarray.h
-include/X11/qt2/qwhatsthis.h
-include/X11/qt2/qwidcoll.h
-include/X11/qt2/qwidget.h
-include/X11/qt2/qwidgetintdict.h
-include/X11/qt2/qwidgetlist.h
-include/X11/qt2/qwidgetstack.h
-include/X11/qt2/qwindefs.h
-include/X11/qt2/qwindow.h
-include/X11/qt2/qwindowdefs.h
-include/X11/qt2/qwindowsstyle.h
-include/X11/qt2/qwizard.h
-include/X11/qt2/qwmatrix.h
-include/X11/qt2/qxt.h
+include/qt2/jri.h
+include/qt2/jritypes.h
+include/qt2/npapi.h
+include/qt2/npupp.h
+include/qt2/q1xcompatibility.h
+include/qt2/qabstractlayout.h
+include/qt2/qaccel.h
+include/qt2/qapp.h
+include/qt2/qapplication.h
+include/qt2/qarray.h
+include/qt2/qasciicache.h
+include/qt2/qasciidict.h
+include/qt2/qasyncimageio.h
+include/qt2/qasyncio.h
+include/qt2/qbitarray.h
+include/qt2/qbitarry.h
+include/qt2/qbitmap.h
+include/qt2/qbrush.h
+include/qt2/qbttngrp.h
+include/qt2/qbuffer.h
+include/qt2/qbutton.h
+include/qt2/qbuttongroup.h
+include/qt2/qcache.h
+include/qt2/qcdestyle.h
+include/qt2/qcheckbox.h
+include/qt2/qchkbox.h
+include/qt2/qclipboard.h
+include/qt2/qclipbrd.h
+include/qt2/qcollect.h
+include/qt2/qcollection.h
+include/qt2/qcolor.h
+include/qt2/qcolordialog.h
+include/qt2/qcombo.h
+include/qt2/qcombobox.h
+include/qt2/qcommonstyle.h
+include/qt2/qconnect.h
+include/qt2/qconnection.h
+include/qt2/qcstring.h
+include/qt2/qcursor.h
+include/qt2/qdatastream.h
+include/qt2/qdatetime.h
+include/qt2/qdatetm.h
+include/qt2/qdialog.h
+include/qt2/qdict.h
+include/qt2/qdir.h
+include/qt2/qdragobject.h
+include/qt2/qdrawutil.h
+include/qt2/qdrawutl.h
+include/qt2/qdropsite.h
+include/qt2/qdstream.h
+include/qt2/qeucjpcodec.h
+include/qt2/qeuckrcodec.h
+include/qt2/qevent.h
+include/qt2/qfile.h
+include/qt2/qfiledef.h
+include/qt2/qfiledefs.h
+include/qt2/qfiledialog.h
+include/qt2/qfiledlg.h
+include/qt2/qfileinf.h
+include/qt2/qfileinfo.h
+include/qt2/qfocusdata.h
+include/qt2/qfont.h
+include/qt2/qfontdata.h
+include/qt2/qfontdatabase.h
+include/qt2/qfontdialog.h
+include/qt2/qfontdta.h
+include/qt2/qfontinf.h
+include/qt2/qfontinfo.h
+include/qt2/qfontmet.h
+include/qt2/qfontmetrics.h
+include/qt2/qframe.h
+include/qt2/qgarray.h
+include/qt2/qgcache.h
+include/qt2/qgdict.h
+include/qt2/qgeneric.h
+include/qt2/qgif.h
+include/qt2/qgl.h
+include/qt2/qglist.h
+include/qt2/qglobal.h
+include/qt2/qgmanagr.h
+include/qt2/qgrid.h
+include/qt2/qgroupbox.h
+include/qt2/qgrpbox.h
+include/qt2/qgvector.h
+include/qt2/qhbox.h
+include/qt2/qhbuttongroup.h
+include/qt2/qheader.h
+include/qt2/qhgroupbox.h
+include/qt2/qiconset.h
+include/qt2/qimage.h
+include/qt2/qimageio.h
+include/qt2/qintcach.h
+include/qt2/qintcache.h
+include/qt2/qintdict.h
+include/qt2/qiodev.h
+include/qt2/qiodevice.h
+include/qt2/qjiscodec.h
+include/qt2/qjpegio.h
+include/qt2/qjpunicode.h
+include/qt2/qkeycode.h
+include/qt2/qkoi8codec.h
+include/qt2/qlabel.h
+include/qt2/qlayout.h
+include/qt2/qlayoutengine.h
+include/qt2/qlcdnum.h
+include/qt2/qlcdnumber.h
+include/qt2/qlined.h
+include/qt2/qlineedit.h
+include/qt2/qlist.h
+include/qt2/qlistbox.h
+include/qt2/qlistview.h
+include/qt2/qmainwindow.h
+include/qt2/qmap.h
+include/qt2/qmenubar.h
+include/qt2/qmenudata.h
+include/qt2/qmenudta.h
+include/qt2/qmessagebox.h
+include/qt2/qmetaobj.h
+include/qt2/qmetaobject.h
+include/qt2/qmime.h
+include/qt2/qmlined.h
+include/qt2/qmotifstyle.h
+include/qt2/qmovie.h
+include/qt2/qmsgbox.h
+include/qt2/qmultilinedit.h
+include/qt2/qmultilineedit.h
+include/qt2/qnamespace.h
+include/qt2/qnp.h
+include/qt2/qobjcoll.h
+include/qt2/qobjdefs.h
+include/qt2/qobject.h
+include/qt2/qobjectdefs.h
+include/qt2/qobjectdict.h
+include/qt2/qobjectlist.h
+include/qt2/qpaintd.h
+include/qt2/qpaintdc.h
+include/qt2/qpaintdevice.h
+include/qt2/qpaintdevicedefs.h
+include/qt2/qpaintdevicemetrics.h
+include/qt2/qpainter.h
+include/qt2/qpalette.h
+include/qt2/qpdevmet.h
+include/qt2/qpen.h
+include/qt2/qpicture.h
+include/qt2/qpixmap.h
+include/qt2/qpixmapcache.h
+include/qt2/qplatinumstyle.h
+include/qt2/qpmcache.h
+include/qt2/qpngio.h
+include/qt2/qpntarry.h
+include/qt2/qpoint.h
+include/qt2/qpointarray.h
+include/qt2/qpopmenu.h
+include/qt2/qpopupmenu.h
+include/qt2/qprintdialog.h
+include/qt2/qprinter.h
+include/qt2/qprndlg.h
+include/qt2/qprogbar.h
+include/qt2/qprogdlg.h
+include/qt2/qprogressbar.h
+include/qt2/qprogressdialog.h
+include/qt2/qpsprinter.h
+include/qt2/qpsprn.h
+include/qt2/qptrdict.h
+include/qt2/qpushbt.h
+include/qt2/qpushbutton.h
+include/qt2/qqueue.h
+include/qt2/qradiobt.h
+include/qt2/qradiobutton.h
+include/qt2/qrangecontrol.h
+include/qt2/qrangect.h
+include/qt2/qrect.h
+include/qt2/qregexp.h
+include/qt2/qregion.h
+include/qt2/qrtlcodec.h
+include/qt2/qscrbar.h
+include/qt2/qscrollbar.h
+include/qt2/qscrollview.h
+include/qt2/qsemimodal.h
+include/qt2/qsession.h
+include/qt2/qsessionmanager.h
+include/qt2/qshared.h
+include/qt2/qsignal.h
+include/qt2/qsignalmapper.h
+include/qt2/qsignalslotimp.h
+include/qt2/qsimplerichtext.h
+include/qt2/qsize.h
+include/qt2/qsizegrip.h
+include/qt2/qsizepolicy.h
+include/qt2/qsjiscodec.h
+include/qt2/qslider.h
+include/qt2/qsmartptr.h
+include/qt2/qsocketnotifier.h
+include/qt2/qsocknot.h
+include/qt2/qsortedlist.h
+include/qt2/qspinbox.h
+include/qt2/qsplitter.h
+include/qt2/qstack.h
+include/qt2/qstatusbar.h
+include/qt2/qstring.h
+include/qt2/qstringlist.h
+include/qt2/qstrlist.h
+include/qt2/qstrvec.h
+include/qt2/qstyle.h
+include/qt2/qstylesheet.h
+include/qt2/qtabbar.h
+include/qt2/qtabdialog.h
+include/qt2/qtabdlg.h
+include/qt2/qtableview.h
+include/qt2/qtablevw.h
+include/qt2/qtabwidget.h
+include/qt2/qtextbrowser.h
+include/qt2/qtextcodec.h
+include/qt2/qtextstream.h
+include/qt2/qtextview.h
+include/qt2/qtimer.h
+include/qt2/qtl.h
+include/qt2/qtoolbar.h
+include/qt2/qtoolbutton.h
+include/qt2/qtooltip.h
+include/qt2/qtranslator.h
+include/qt2/qtstream.h
+include/qt2/qutfcodec.h
+include/qt2/qvalidator.h
+include/qt2/qvaluelist.h
+include/qt2/qvbox.h
+include/qt2/qvbuttongroup.h
+include/qt2/qvector.h
+include/qt2/qvgroupbox.h
+include/qt2/qwellarray.h
+include/qt2/qwhatsthis.h
+include/qt2/qwidcoll.h
+include/qt2/qwidget.h
+include/qt2/qwidgetintdict.h
+include/qt2/qwidgetlist.h
+include/qt2/qwidgetstack.h
+include/qt2/qwindefs.h
+include/qt2/qwindow.h
+include/qt2/qwindowdefs.h
+include/qt2/qwindowsstyle.h
+include/qt2/qwizard.h
+include/qt2/qwmatrix.h
+include/qt2/qxt.h
 lib/libqt2.so
 lib/libqt2.so.%%VERSION%%
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@@ -1164,6 +1164,6 @@ share/doc/qt2/html/wizard-main-cpp.html
 share/doc/qt2/html/xform-xform-cpp.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm include/X11/qt2
+@dirrm include/qt2
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 154f467a8475..1b9f0ba65257 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -50,8 +50,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so.${VERSION}
 	${LN} -sf ${PREFIX}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/include/X11/qt2
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/X11/qt2
+	${MKDIR} ${PREFIX}/include/qt2
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_MAN} ${WRKSRC}/man/man1/moc.1 ${PREFIX}/man/man1/moc2.1
 	${INSTALL_MAN} ${WRKSRC}/man/man3/q* ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index e69b128f85dd..80793e5b031e 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -4,249 +4,249 @@ bin/moc2
 bin/msg2qm
 bin/qt20fix
 bin/qtrename140
-include/X11/qt2/jri.h
-include/X11/qt2/jritypes.h
-include/X11/qt2/npapi.h
-include/X11/qt2/npupp.h
-include/X11/qt2/q1xcompatibility.h
-include/X11/qt2/qabstractlayout.h
-include/X11/qt2/qaccel.h
-include/X11/qt2/qapp.h
-include/X11/qt2/qapplication.h
-include/X11/qt2/qarray.h
-include/X11/qt2/qasciicache.h
-include/X11/qt2/qasciidict.h
-include/X11/qt2/qasyncimageio.h
-include/X11/qt2/qasyncio.h
-include/X11/qt2/qbitarray.h
-include/X11/qt2/qbitarry.h
-include/X11/qt2/qbitmap.h
-include/X11/qt2/qbrush.h
-include/X11/qt2/qbttngrp.h
-include/X11/qt2/qbuffer.h
-include/X11/qt2/qbutton.h
-include/X11/qt2/qbuttongroup.h
-include/X11/qt2/qcache.h
-include/X11/qt2/qcdestyle.h
-include/X11/qt2/qcheckbox.h
-include/X11/qt2/qchkbox.h
-include/X11/qt2/qclipboard.h
-include/X11/qt2/qclipbrd.h
-include/X11/qt2/qcollect.h
-include/X11/qt2/qcollection.h
-include/X11/qt2/qcolor.h
-include/X11/qt2/qcolordialog.h
-include/X11/qt2/qcombo.h
-include/X11/qt2/qcombobox.h
-include/X11/qt2/qcommonstyle.h
-include/X11/qt2/qconnect.h
-include/X11/qt2/qconnection.h
-include/X11/qt2/qcstring.h
-include/X11/qt2/qcursor.h
-include/X11/qt2/qdatastream.h
-include/X11/qt2/qdatetime.h
-include/X11/qt2/qdatetm.h
-include/X11/qt2/qdialog.h
-include/X11/qt2/qdict.h
-include/X11/qt2/qdir.h
-include/X11/qt2/qdragobject.h
-include/X11/qt2/qdrawutil.h
-include/X11/qt2/qdrawutl.h
-include/X11/qt2/qdropsite.h
-include/X11/qt2/qdstream.h
-include/X11/qt2/qeucjpcodec.h
-include/X11/qt2/qeuckrcodec.h
-include/X11/qt2/qevent.h
-include/X11/qt2/qfile.h
-include/X11/qt2/qfiledef.h
-include/X11/qt2/qfiledefs.h
-include/X11/qt2/qfiledialog.h
-include/X11/qt2/qfiledlg.h
-include/X11/qt2/qfileinf.h
-include/X11/qt2/qfileinfo.h
-include/X11/qt2/qfocusdata.h
-include/X11/qt2/qfont.h
-include/X11/qt2/qfontdata.h
-include/X11/qt2/qfontdatabase.h
-include/X11/qt2/qfontdialog.h
-include/X11/qt2/qfontdta.h
-include/X11/qt2/qfontinf.h
-include/X11/qt2/qfontinfo.h
-include/X11/qt2/qfontmet.h
-include/X11/qt2/qfontmetrics.h
-include/X11/qt2/qframe.h
-include/X11/qt2/qgarray.h
-include/X11/qt2/qgcache.h
-include/X11/qt2/qgdict.h
-include/X11/qt2/qgeneric.h
-include/X11/qt2/qgif.h
-include/X11/qt2/qgl.h
-include/X11/qt2/qglist.h
-include/X11/qt2/qglobal.h
-include/X11/qt2/qgmanagr.h
-include/X11/qt2/qgrid.h
-include/X11/qt2/qgroupbox.h
-include/X11/qt2/qgrpbox.h
-include/X11/qt2/qgvector.h
-include/X11/qt2/qhbox.h
-include/X11/qt2/qhbuttongroup.h
-include/X11/qt2/qheader.h
-include/X11/qt2/qhgroupbox.h
-include/X11/qt2/qiconset.h
-include/X11/qt2/qimage.h
-include/X11/qt2/qimageio.h
-include/X11/qt2/qintcach.h
-include/X11/qt2/qintcache.h
-include/X11/qt2/qintdict.h
-include/X11/qt2/qiodev.h
-include/X11/qt2/qiodevice.h
-include/X11/qt2/qjiscodec.h
-include/X11/qt2/qjpegio.h
-include/X11/qt2/qjpunicode.h
-include/X11/qt2/qkeycode.h
-include/X11/qt2/qkoi8codec.h
-include/X11/qt2/qlabel.h
-include/X11/qt2/qlayout.h
-include/X11/qt2/qlayoutengine.h
-include/X11/qt2/qlcdnum.h
-include/X11/qt2/qlcdnumber.h
-include/X11/qt2/qlined.h
-include/X11/qt2/qlineedit.h
-include/X11/qt2/qlist.h
-include/X11/qt2/qlistbox.h
-include/X11/qt2/qlistview.h
-include/X11/qt2/qmainwindow.h
-include/X11/qt2/qmap.h
-include/X11/qt2/qmenubar.h
-include/X11/qt2/qmenudata.h
-include/X11/qt2/qmenudta.h
-include/X11/qt2/qmessagebox.h
-include/X11/qt2/qmetaobj.h
-include/X11/qt2/qmetaobject.h
-include/X11/qt2/qmime.h
-include/X11/qt2/qmlined.h
-include/X11/qt2/qmotifstyle.h
-include/X11/qt2/qmovie.h
-include/X11/qt2/qmsgbox.h
-include/X11/qt2/qmultilinedit.h
-include/X11/qt2/qmultilineedit.h
-include/X11/qt2/qnamespace.h
-include/X11/qt2/qnp.h
-include/X11/qt2/qobjcoll.h
-include/X11/qt2/qobjdefs.h
-include/X11/qt2/qobject.h
-include/X11/qt2/qobjectdefs.h
-include/X11/qt2/qobjectdict.h
-include/X11/qt2/qobjectlist.h
-include/X11/qt2/qpaintd.h
-include/X11/qt2/qpaintdc.h
-include/X11/qt2/qpaintdevice.h
-include/X11/qt2/qpaintdevicedefs.h
-include/X11/qt2/qpaintdevicemetrics.h
-include/X11/qt2/qpainter.h
-include/X11/qt2/qpalette.h
-include/X11/qt2/qpdevmet.h
-include/X11/qt2/qpen.h
-include/X11/qt2/qpicture.h
-include/X11/qt2/qpixmap.h
-include/X11/qt2/qpixmapcache.h
-include/X11/qt2/qplatinumstyle.h
-include/X11/qt2/qpmcache.h
-include/X11/qt2/qpngio.h
-include/X11/qt2/qpntarry.h
-include/X11/qt2/qpoint.h
-include/X11/qt2/qpointarray.h
-include/X11/qt2/qpopmenu.h
-include/X11/qt2/qpopupmenu.h
-include/X11/qt2/qprintdialog.h
-include/X11/qt2/qprinter.h
-include/X11/qt2/qprndlg.h
-include/X11/qt2/qprogbar.h
-include/X11/qt2/qprogdlg.h
-include/X11/qt2/qprogressbar.h
-include/X11/qt2/qprogressdialog.h
-include/X11/qt2/qpsprinter.h
-include/X11/qt2/qpsprn.h
-include/X11/qt2/qptrdict.h
-include/X11/qt2/qpushbt.h
-include/X11/qt2/qpushbutton.h
-include/X11/qt2/qqueue.h
-include/X11/qt2/qradiobt.h
-include/X11/qt2/qradiobutton.h
-include/X11/qt2/qrangecontrol.h
-include/X11/qt2/qrangect.h
-include/X11/qt2/qrect.h
-include/X11/qt2/qregexp.h
-include/X11/qt2/qregion.h
-include/X11/qt2/qrtlcodec.h
-include/X11/qt2/qscrbar.h
-include/X11/qt2/qscrollbar.h
-include/X11/qt2/qscrollview.h
-include/X11/qt2/qsemimodal.h
-include/X11/qt2/qsession.h
-include/X11/qt2/qsessionmanager.h
-include/X11/qt2/qshared.h
-include/X11/qt2/qsignal.h
-include/X11/qt2/qsignalmapper.h
-include/X11/qt2/qsignalslotimp.h
-include/X11/qt2/qsimplerichtext.h
-include/X11/qt2/qsize.h
-include/X11/qt2/qsizegrip.h
-include/X11/qt2/qsizepolicy.h
-include/X11/qt2/qsjiscodec.h
-include/X11/qt2/qslider.h
-include/X11/qt2/qsmartptr.h
-include/X11/qt2/qsocketnotifier.h
-include/X11/qt2/qsocknot.h
-include/X11/qt2/qsortedlist.h
-include/X11/qt2/qspinbox.h
-include/X11/qt2/qsplitter.h
-include/X11/qt2/qstack.h
-include/X11/qt2/qstatusbar.h
-include/X11/qt2/qstring.h
-include/X11/qt2/qstringlist.h
-include/X11/qt2/qstrlist.h
-include/X11/qt2/qstrvec.h
-include/X11/qt2/qstyle.h
-include/X11/qt2/qstylesheet.h
-include/X11/qt2/qtabbar.h
-include/X11/qt2/qtabdialog.h
-include/X11/qt2/qtabdlg.h
-include/X11/qt2/qtableview.h
-include/X11/qt2/qtablevw.h
-include/X11/qt2/qtabwidget.h
-include/X11/qt2/qtextbrowser.h
-include/X11/qt2/qtextcodec.h
-include/X11/qt2/qtextstream.h
-include/X11/qt2/qtextview.h
-include/X11/qt2/qtimer.h
-include/X11/qt2/qtl.h
-include/X11/qt2/qtoolbar.h
-include/X11/qt2/qtoolbutton.h
-include/X11/qt2/qtooltip.h
-include/X11/qt2/qtranslator.h
-include/X11/qt2/qtstream.h
-include/X11/qt2/qutfcodec.h
-include/X11/qt2/qvalidator.h
-include/X11/qt2/qvaluelist.h
-include/X11/qt2/qvbox.h
-include/X11/qt2/qvbuttongroup.h
-include/X11/qt2/qvector.h
-include/X11/qt2/qvgroupbox.h
-include/X11/qt2/qwellarray.h
-include/X11/qt2/qwhatsthis.h
-include/X11/qt2/qwidcoll.h
-include/X11/qt2/qwidget.h
-include/X11/qt2/qwidgetintdict.h
-include/X11/qt2/qwidgetlist.h
-include/X11/qt2/qwidgetstack.h
-include/X11/qt2/qwindefs.h
-include/X11/qt2/qwindow.h
-include/X11/qt2/qwindowdefs.h
-include/X11/qt2/qwindowsstyle.h
-include/X11/qt2/qwizard.h
-include/X11/qt2/qwmatrix.h
-include/X11/qt2/qxt.h
+include/qt2/jri.h
+include/qt2/jritypes.h
+include/qt2/npapi.h
+include/qt2/npupp.h
+include/qt2/q1xcompatibility.h
+include/qt2/qabstractlayout.h
+include/qt2/qaccel.h
+include/qt2/qapp.h
+include/qt2/qapplication.h
+include/qt2/qarray.h
+include/qt2/qasciicache.h
+include/qt2/qasciidict.h
+include/qt2/qasyncimageio.h
+include/qt2/qasyncio.h
+include/qt2/qbitarray.h
+include/qt2/qbitarry.h
+include/qt2/qbitmap.h
+include/qt2/qbrush.h
+include/qt2/qbttngrp.h
+include/qt2/qbuffer.h
+include/qt2/qbutton.h
+include/qt2/qbuttongroup.h
+include/qt2/qcache.h
+include/qt2/qcdestyle.h
+include/qt2/qcheckbox.h
+include/qt2/qchkbox.h
+include/qt2/qclipboard.h
+include/qt2/qclipbrd.h
+include/qt2/qcollect.h
+include/qt2/qcollection.h
+include/qt2/qcolor.h
+include/qt2/qcolordialog.h
+include/qt2/qcombo.h
+include/qt2/qcombobox.h
+include/qt2/qcommonstyle.h
+include/qt2/qconnect.h
+include/qt2/qconnection.h
+include/qt2/qcstring.h
+include/qt2/qcursor.h
+include/qt2/qdatastream.h
+include/qt2/qdatetime.h
+include/qt2/qdatetm.h
+include/qt2/qdialog.h
+include/qt2/qdict.h
+include/qt2/qdir.h
+include/qt2/qdragobject.h
+include/qt2/qdrawutil.h
+include/qt2/qdrawutl.h
+include/qt2/qdropsite.h
+include/qt2/qdstream.h
+include/qt2/qeucjpcodec.h
+include/qt2/qeuckrcodec.h
+include/qt2/qevent.h
+include/qt2/qfile.h
+include/qt2/qfiledef.h
+include/qt2/qfiledefs.h
+include/qt2/qfiledialog.h
+include/qt2/qfiledlg.h
+include/qt2/qfileinf.h
+include/qt2/qfileinfo.h
+include/qt2/qfocusdata.h
+include/qt2/qfont.h
+include/qt2/qfontdata.h
+include/qt2/qfontdatabase.h
+include/qt2/qfontdialog.h
+include/qt2/qfontdta.h
+include/qt2/qfontinf.h
+include/qt2/qfontinfo.h
+include/qt2/qfontmet.h
+include/qt2/qfontmetrics.h
+include/qt2/qframe.h
+include/qt2/qgarray.h
+include/qt2/qgcache.h
+include/qt2/qgdict.h
+include/qt2/qgeneric.h
+include/qt2/qgif.h
+include/qt2/qgl.h
+include/qt2/qglist.h
+include/qt2/qglobal.h
+include/qt2/qgmanagr.h
+include/qt2/qgrid.h
+include/qt2/qgroupbox.h
+include/qt2/qgrpbox.h
+include/qt2/qgvector.h
+include/qt2/qhbox.h
+include/qt2/qhbuttongroup.h
+include/qt2/qheader.h
+include/qt2/qhgroupbox.h
+include/qt2/qiconset.h
+include/qt2/qimage.h
+include/qt2/qimageio.h
+include/qt2/qintcach.h
+include/qt2/qintcache.h
+include/qt2/qintdict.h
+include/qt2/qiodev.h
+include/qt2/qiodevice.h
+include/qt2/qjiscodec.h
+include/qt2/qjpegio.h
+include/qt2/qjpunicode.h
+include/qt2/qkeycode.h
+include/qt2/qkoi8codec.h
+include/qt2/qlabel.h
+include/qt2/qlayout.h
+include/qt2/qlayoutengine.h
+include/qt2/qlcdnum.h
+include/qt2/qlcdnumber.h
+include/qt2/qlined.h
+include/qt2/qlineedit.h
+include/qt2/qlist.h
+include/qt2/qlistbox.h
+include/qt2/qlistview.h
+include/qt2/qmainwindow.h
+include/qt2/qmap.h
+include/qt2/qmenubar.h
+include/qt2/qmenudata.h
+include/qt2/qmenudta.h
+include/qt2/qmessagebox.h
+include/qt2/qmetaobj.h
+include/qt2/qmetaobject.h
+include/qt2/qmime.h
+include/qt2/qmlined.h
+include/qt2/qmotifstyle.h
+include/qt2/qmovie.h
+include/qt2/qmsgbox.h
+include/qt2/qmultilinedit.h
+include/qt2/qmultilineedit.h
+include/qt2/qnamespace.h
+include/qt2/qnp.h
+include/qt2/qobjcoll.h
+include/qt2/qobjdefs.h
+include/qt2/qobject.h
+include/qt2/qobjectdefs.h
+include/qt2/qobjectdict.h
+include/qt2/qobjectlist.h
+include/qt2/qpaintd.h
+include/qt2/qpaintdc.h
+include/qt2/qpaintdevice.h
+include/qt2/qpaintdevicedefs.h
+include/qt2/qpaintdevicemetrics.h
+include/qt2/qpainter.h
+include/qt2/qpalette.h
+include/qt2/qpdevmet.h
+include/qt2/qpen.h
+include/qt2/qpicture.h
+include/qt2/qpixmap.h
+include/qt2/qpixmapcache.h
+include/qt2/qplatinumstyle.h
+include/qt2/qpmcache.h
+include/qt2/qpngio.h
+include/qt2/qpntarry.h
+include/qt2/qpoint.h
+include/qt2/qpointarray.h
+include/qt2/qpopmenu.h
+include/qt2/qpopupmenu.h
+include/qt2/qprintdialog.h
+include/qt2/qprinter.h
+include/qt2/qprndlg.h
+include/qt2/qprogbar.h
+include/qt2/qprogdlg.h
+include/qt2/qprogressbar.h
+include/qt2/qprogressdialog.h
+include/qt2/qpsprinter.h
+include/qt2/qpsprn.h
+include/qt2/qptrdict.h
+include/qt2/qpushbt.h
+include/qt2/qpushbutton.h
+include/qt2/qqueue.h
+include/qt2/qradiobt.h
+include/qt2/qradiobutton.h
+include/qt2/qrangecontrol.h
+include/qt2/qrangect.h
+include/qt2/qrect.h
+include/qt2/qregexp.h
+include/qt2/qregion.h
+include/qt2/qrtlcodec.h
+include/qt2/qscrbar.h
+include/qt2/qscrollbar.h
+include/qt2/qscrollview.h
+include/qt2/qsemimodal.h
+include/qt2/qsession.h
+include/qt2/qsessionmanager.h
+include/qt2/qshared.h
+include/qt2/qsignal.h
+include/qt2/qsignalmapper.h
+include/qt2/qsignalslotimp.h
+include/qt2/qsimplerichtext.h
+include/qt2/qsize.h
+include/qt2/qsizegrip.h
+include/qt2/qsizepolicy.h
+include/qt2/qsjiscodec.h
+include/qt2/qslider.h
+include/qt2/qsmartptr.h
+include/qt2/qsocketnotifier.h
+include/qt2/qsocknot.h
+include/qt2/qsortedlist.h
+include/qt2/qspinbox.h
+include/qt2/qsplitter.h
+include/qt2/qstack.h
+include/qt2/qstatusbar.h
+include/qt2/qstring.h
+include/qt2/qstringlist.h
+include/qt2/qstrlist.h
+include/qt2/qstrvec.h
+include/qt2/qstyle.h
+include/qt2/qstylesheet.h
+include/qt2/qtabbar.h
+include/qt2/qtabdialog.h
+include/qt2/qtabdlg.h
+include/qt2/qtableview.h
+include/qt2/qtablevw.h
+include/qt2/qtabwidget.h
+include/qt2/qtextbrowser.h
+include/qt2/qtextcodec.h
+include/qt2/qtextstream.h
+include/qt2/qtextview.h
+include/qt2/qtimer.h
+include/qt2/qtl.h
+include/qt2/qtoolbar.h
+include/qt2/qtoolbutton.h
+include/qt2/qtooltip.h
+include/qt2/qtranslator.h
+include/qt2/qtstream.h
+include/qt2/qutfcodec.h
+include/qt2/qvalidator.h
+include/qt2/qvaluelist.h
+include/qt2/qvbox.h
+include/qt2/qvbuttongroup.h
+include/qt2/qvector.h
+include/qt2/qvgroupbox.h
+include/qt2/qwellarray.h
+include/qt2/qwhatsthis.h
+include/qt2/qwidcoll.h
+include/qt2/qwidget.h
+include/qt2/qwidgetintdict.h
+include/qt2/qwidgetlist.h
+include/qt2/qwidgetstack.h
+include/qt2/qwindefs.h
+include/qt2/qwindow.h
+include/qt2/qwindowdefs.h
+include/qt2/qwindowsstyle.h
+include/qt2/qwizard.h
+include/qt2/qwmatrix.h
+include/qt2/qxt.h
 lib/libqt2.so
 lib/libqt2.so.%%VERSION%%
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@@ -1164,6 +1164,6 @@ share/doc/qt2/html/wizard-main-cpp.html
 share/doc/qt2/html/xform-xform-cpp.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm include/X11/qt2
+@dirrm include/qt2
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 154f467a8475..1b9f0ba65257 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -50,8 +50,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so.${VERSION}
 	${LN} -sf ${PREFIX}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/include/X11/qt2
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/X11/qt2
+	${MKDIR} ${PREFIX}/include/qt2
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_MAN} ${WRKSRC}/man/man1/moc.1 ${PREFIX}/man/man1/moc2.1
 	${INSTALL_MAN} ${WRKSRC}/man/man3/q* ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index e69b128f85dd..80793e5b031e 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -4,249 +4,249 @@ bin/moc2
 bin/msg2qm
 bin/qt20fix
 bin/qtrename140
-include/X11/qt2/jri.h
-include/X11/qt2/jritypes.h
-include/X11/qt2/npapi.h
-include/X11/qt2/npupp.h
-include/X11/qt2/q1xcompatibility.h
-include/X11/qt2/qabstractlayout.h
-include/X11/qt2/qaccel.h
-include/X11/qt2/qapp.h
-include/X11/qt2/qapplication.h
-include/X11/qt2/qarray.h
-include/X11/qt2/qasciicache.h
-include/X11/qt2/qasciidict.h
-include/X11/qt2/qasyncimageio.h
-include/X11/qt2/qasyncio.h
-include/X11/qt2/qbitarray.h
-include/X11/qt2/qbitarry.h
-include/X11/qt2/qbitmap.h
-include/X11/qt2/qbrush.h
-include/X11/qt2/qbttngrp.h
-include/X11/qt2/qbuffer.h
-include/X11/qt2/qbutton.h
-include/X11/qt2/qbuttongroup.h
-include/X11/qt2/qcache.h
-include/X11/qt2/qcdestyle.h
-include/X11/qt2/qcheckbox.h
-include/X11/qt2/qchkbox.h
-include/X11/qt2/qclipboard.h
-include/X11/qt2/qclipbrd.h
-include/X11/qt2/qcollect.h
-include/X11/qt2/qcollection.h
-include/X11/qt2/qcolor.h
-include/X11/qt2/qcolordialog.h
-include/X11/qt2/qcombo.h
-include/X11/qt2/qcombobox.h
-include/X11/qt2/qcommonstyle.h
-include/X11/qt2/qconnect.h
-include/X11/qt2/qconnection.h
-include/X11/qt2/qcstring.h
-include/X11/qt2/qcursor.h
-include/X11/qt2/qdatastream.h
-include/X11/qt2/qdatetime.h
-include/X11/qt2/qdatetm.h
-include/X11/qt2/qdialog.h
-include/X11/qt2/qdict.h
-include/X11/qt2/qdir.h
-include/X11/qt2/qdragobject.h
-include/X11/qt2/qdrawutil.h
-include/X11/qt2/qdrawutl.h
-include/X11/qt2/qdropsite.h
-include/X11/qt2/qdstream.h
-include/X11/qt2/qeucjpcodec.h
-include/X11/qt2/qeuckrcodec.h
-include/X11/qt2/qevent.h
-include/X11/qt2/qfile.h
-include/X11/qt2/qfiledef.h
-include/X11/qt2/qfiledefs.h
-include/X11/qt2/qfiledialog.h
-include/X11/qt2/qfiledlg.h
-include/X11/qt2/qfileinf.h
-include/X11/qt2/qfileinfo.h
-include/X11/qt2/qfocusdata.h
-include/X11/qt2/qfont.h
-include/X11/qt2/qfontdata.h
-include/X11/qt2/qfontdatabase.h
-include/X11/qt2/qfontdialog.h
-include/X11/qt2/qfontdta.h
-include/X11/qt2/qfontinf.h
-include/X11/qt2/qfontinfo.h
-include/X11/qt2/qfontmet.h
-include/X11/qt2/qfontmetrics.h
-include/X11/qt2/qframe.h
-include/X11/qt2/qgarray.h
-include/X11/qt2/qgcache.h
-include/X11/qt2/qgdict.h
-include/X11/qt2/qgeneric.h
-include/X11/qt2/qgif.h
-include/X11/qt2/qgl.h
-include/X11/qt2/qglist.h
-include/X11/qt2/qglobal.h
-include/X11/qt2/qgmanagr.h
-include/X11/qt2/qgrid.h
-include/X11/qt2/qgroupbox.h
-include/X11/qt2/qgrpbox.h
-include/X11/qt2/qgvector.h
-include/X11/qt2/qhbox.h
-include/X11/qt2/qhbuttongroup.h
-include/X11/qt2/qheader.h
-include/X11/qt2/qhgroupbox.h
-include/X11/qt2/qiconset.h
-include/X11/qt2/qimage.h
-include/X11/qt2/qimageio.h
-include/X11/qt2/qintcach.h
-include/X11/qt2/qintcache.h
-include/X11/qt2/qintdict.h
-include/X11/qt2/qiodev.h
-include/X11/qt2/qiodevice.h
-include/X11/qt2/qjiscodec.h
-include/X11/qt2/qjpegio.h
-include/X11/qt2/qjpunicode.h
-include/X11/qt2/qkeycode.h
-include/X11/qt2/qkoi8codec.h
-include/X11/qt2/qlabel.h
-include/X11/qt2/qlayout.h
-include/X11/qt2/qlayoutengine.h
-include/X11/qt2/qlcdnum.h
-include/X11/qt2/qlcdnumber.h
-include/X11/qt2/qlined.h
-include/X11/qt2/qlineedit.h
-include/X11/qt2/qlist.h
-include/X11/qt2/qlistbox.h
-include/X11/qt2/qlistview.h
-include/X11/qt2/qmainwindow.h
-include/X11/qt2/qmap.h
-include/X11/qt2/qmenubar.h
-include/X11/qt2/qmenudata.h
-include/X11/qt2/qmenudta.h
-include/X11/qt2/qmessagebox.h
-include/X11/qt2/qmetaobj.h
-include/X11/qt2/qmetaobject.h
-include/X11/qt2/qmime.h
-include/X11/qt2/qmlined.h
-include/X11/qt2/qmotifstyle.h
-include/X11/qt2/qmovie.h
-include/X11/qt2/qmsgbox.h
-include/X11/qt2/qmultilinedit.h
-include/X11/qt2/qmultilineedit.h
-include/X11/qt2/qnamespace.h
-include/X11/qt2/qnp.h
-include/X11/qt2/qobjcoll.h
-include/X11/qt2/qobjdefs.h
-include/X11/qt2/qobject.h
-include/X11/qt2/qobjectdefs.h
-include/X11/qt2/qobjectdict.h
-include/X11/qt2/qobjectlist.h
-include/X11/qt2/qpaintd.h
-include/X11/qt2/qpaintdc.h
-include/X11/qt2/qpaintdevice.h
-include/X11/qt2/qpaintdevicedefs.h
-include/X11/qt2/qpaintdevicemetrics.h
-include/X11/qt2/qpainter.h
-include/X11/qt2/qpalette.h
-include/X11/qt2/qpdevmet.h
-include/X11/qt2/qpen.h
-include/X11/qt2/qpicture.h
-include/X11/qt2/qpixmap.h
-include/X11/qt2/qpixmapcache.h
-include/X11/qt2/qplatinumstyle.h
-include/X11/qt2/qpmcache.h
-include/X11/qt2/qpngio.h
-include/X11/qt2/qpntarry.h
-include/X11/qt2/qpoint.h
-include/X11/qt2/qpointarray.h
-include/X11/qt2/qpopmenu.h
-include/X11/qt2/qpopupmenu.h
-include/X11/qt2/qprintdialog.h
-include/X11/qt2/qprinter.h
-include/X11/qt2/qprndlg.h
-include/X11/qt2/qprogbar.h
-include/X11/qt2/qprogdlg.h
-include/X11/qt2/qprogressbar.h
-include/X11/qt2/qprogressdialog.h
-include/X11/qt2/qpsprinter.h
-include/X11/qt2/qpsprn.h
-include/X11/qt2/qptrdict.h
-include/X11/qt2/qpushbt.h
-include/X11/qt2/qpushbutton.h
-include/X11/qt2/qqueue.h
-include/X11/qt2/qradiobt.h
-include/X11/qt2/qradiobutton.h
-include/X11/qt2/qrangecontrol.h
-include/X11/qt2/qrangect.h
-include/X11/qt2/qrect.h
-include/X11/qt2/qregexp.h
-include/X11/qt2/qregion.h
-include/X11/qt2/qrtlcodec.h
-include/X11/qt2/qscrbar.h
-include/X11/qt2/qscrollbar.h
-include/X11/qt2/qscrollview.h
-include/X11/qt2/qsemimodal.h
-include/X11/qt2/qsession.h
-include/X11/qt2/qsessionmanager.h
-include/X11/qt2/qshared.h
-include/X11/qt2/qsignal.h
-include/X11/qt2/qsignalmapper.h
-include/X11/qt2/qsignalslotimp.h
-include/X11/qt2/qsimplerichtext.h
-include/X11/qt2/qsize.h
-include/X11/qt2/qsizegrip.h
-include/X11/qt2/qsizepolicy.h
-include/X11/qt2/qsjiscodec.h
-include/X11/qt2/qslider.h
-include/X11/qt2/qsmartptr.h
-include/X11/qt2/qsocketnotifier.h
-include/X11/qt2/qsocknot.h
-include/X11/qt2/qsortedlist.h
-include/X11/qt2/qspinbox.h
-include/X11/qt2/qsplitter.h
-include/X11/qt2/qstack.h
-include/X11/qt2/qstatusbar.h
-include/X11/qt2/qstring.h
-include/X11/qt2/qstringlist.h
-include/X11/qt2/qstrlist.h
-include/X11/qt2/qstrvec.h
-include/X11/qt2/qstyle.h
-include/X11/qt2/qstylesheet.h
-include/X11/qt2/qtabbar.h
-include/X11/qt2/qtabdialog.h
-include/X11/qt2/qtabdlg.h
-include/X11/qt2/qtableview.h
-include/X11/qt2/qtablevw.h
-include/X11/qt2/qtabwidget.h
-include/X11/qt2/qtextbrowser.h
-include/X11/qt2/qtextcodec.h
-include/X11/qt2/qtextstream.h
-include/X11/qt2/qtextview.h
-include/X11/qt2/qtimer.h
-include/X11/qt2/qtl.h
-include/X11/qt2/qtoolbar.h
-include/X11/qt2/qtoolbutton.h
-include/X11/qt2/qtooltip.h
-include/X11/qt2/qtranslator.h
-include/X11/qt2/qtstream.h
-include/X11/qt2/qutfcodec.h
-include/X11/qt2/qvalidator.h
-include/X11/qt2/qvaluelist.h
-include/X11/qt2/qvbox.h
-include/X11/qt2/qvbuttongroup.h
-include/X11/qt2/qvector.h
-include/X11/qt2/qvgroupbox.h
-include/X11/qt2/qwellarray.h
-include/X11/qt2/qwhatsthis.h
-include/X11/qt2/qwidcoll.h
-include/X11/qt2/qwidget.h
-include/X11/qt2/qwidgetintdict.h
-include/X11/qt2/qwidgetlist.h
-include/X11/qt2/qwidgetstack.h
-include/X11/qt2/qwindefs.h
-include/X11/qt2/qwindow.h
-include/X11/qt2/qwindowdefs.h
-include/X11/qt2/qwindowsstyle.h
-include/X11/qt2/qwizard.h
-include/X11/qt2/qwmatrix.h
-include/X11/qt2/qxt.h
+include/qt2/jri.h
+include/qt2/jritypes.h
+include/qt2/npapi.h
+include/qt2/npupp.h
+include/qt2/q1xcompatibility.h
+include/qt2/qabstractlayout.h
+include/qt2/qaccel.h
+include/qt2/qapp.h
+include/qt2/qapplication.h
+include/qt2/qarray.h
+include/qt2/qasciicache.h
+include/qt2/qasciidict.h
+include/qt2/qasyncimageio.h
+include/qt2/qasyncio.h
+include/qt2/qbitarray.h
+include/qt2/qbitarry.h
+include/qt2/qbitmap.h
+include/qt2/qbrush.h
+include/qt2/qbttngrp.h
+include/qt2/qbuffer.h
+include/qt2/qbutton.h
+include/qt2/qbuttongroup.h
+include/qt2/qcache.h
+include/qt2/qcdestyle.h
+include/qt2/qcheckbox.h
+include/qt2/qchkbox.h
+include/qt2/qclipboard.h
+include/qt2/qclipbrd.h
+include/qt2/qcollect.h
+include/qt2/qcollection.h
+include/qt2/qcolor.h
+include/qt2/qcolordialog.h
+include/qt2/qcombo.h
+include/qt2/qcombobox.h
+include/qt2/qcommonstyle.h
+include/qt2/qconnect.h
+include/qt2/qconnection.h
+include/qt2/qcstring.h
+include/qt2/qcursor.h
+include/qt2/qdatastream.h
+include/qt2/qdatetime.h
+include/qt2/qdatetm.h
+include/qt2/qdialog.h
+include/qt2/qdict.h
+include/qt2/qdir.h
+include/qt2/qdragobject.h
+include/qt2/qdrawutil.h
+include/qt2/qdrawutl.h
+include/qt2/qdropsite.h
+include/qt2/qdstream.h
+include/qt2/qeucjpcodec.h
+include/qt2/qeuckrcodec.h
+include/qt2/qevent.h
+include/qt2/qfile.h
+include/qt2/qfiledef.h
+include/qt2/qfiledefs.h
+include/qt2/qfiledialog.h
+include/qt2/qfiledlg.h
+include/qt2/qfileinf.h
+include/qt2/qfileinfo.h
+include/qt2/qfocusdata.h
+include/qt2/qfont.h
+include/qt2/qfontdata.h
+include/qt2/qfontdatabase.h
+include/qt2/qfontdialog.h
+include/qt2/qfontdta.h
+include/qt2/qfontinf.h
+include/qt2/qfontinfo.h
+include/qt2/qfontmet.h
+include/qt2/qfontmetrics.h
+include/qt2/qframe.h
+include/qt2/qgarray.h
+include/qt2/qgcache.h
+include/qt2/qgdict.h
+include/qt2/qgeneric.h
+include/qt2/qgif.h
+include/qt2/qgl.h
+include/qt2/qglist.h
+include/qt2/qglobal.h
+include/qt2/qgmanagr.h
+include/qt2/qgrid.h
+include/qt2/qgroupbox.h
+include/qt2/qgrpbox.h
+include/qt2/qgvector.h
+include/qt2/qhbox.h
+include/qt2/qhbuttongroup.h
+include/qt2/qheader.h
+include/qt2/qhgroupbox.h
+include/qt2/qiconset.h
+include/qt2/qimage.h
+include/qt2/qimageio.h
+include/qt2/qintcach.h
+include/qt2/qintcache.h
+include/qt2/qintdict.h
+include/qt2/qiodev.h
+include/qt2/qiodevice.h
+include/qt2/qjiscodec.h
+include/qt2/qjpegio.h
+include/qt2/qjpunicode.h
+include/qt2/qkeycode.h
+include/qt2/qkoi8codec.h
+include/qt2/qlabel.h
+include/qt2/qlayout.h
+include/qt2/qlayoutengine.h
+include/qt2/qlcdnum.h
+include/qt2/qlcdnumber.h
+include/qt2/qlined.h
+include/qt2/qlineedit.h
+include/qt2/qlist.h
+include/qt2/qlistbox.h
+include/qt2/qlistview.h
+include/qt2/qmainwindow.h
+include/qt2/qmap.h
+include/qt2/qmenubar.h
+include/qt2/qmenudata.h
+include/qt2/qmenudta.h
+include/qt2/qmessagebox.h
+include/qt2/qmetaobj.h
+include/qt2/qmetaobject.h
+include/qt2/qmime.h
+include/qt2/qmlined.h
+include/qt2/qmotifstyle.h
+include/qt2/qmovie.h
+include/qt2/qmsgbox.h
+include/qt2/qmultilinedit.h
+include/qt2/qmultilineedit.h
+include/qt2/qnamespace.h
+include/qt2/qnp.h
+include/qt2/qobjcoll.h
+include/qt2/qobjdefs.h
+include/qt2/qobject.h
+include/qt2/qobjectdefs.h
+include/qt2/qobjectdict.h
+include/qt2/qobjectlist.h
+include/qt2/qpaintd.h
+include/qt2/qpaintdc.h
+include/qt2/qpaintdevice.h
+include/qt2/qpaintdevicedefs.h
+include/qt2/qpaintdevicemetrics.h
+include/qt2/qpainter.h
+include/qt2/qpalette.h
+include/qt2/qpdevmet.h
+include/qt2/qpen.h
+include/qt2/qpicture.h
+include/qt2/qpixmap.h
+include/qt2/qpixmapcache.h
+include/qt2/qplatinumstyle.h
+include/qt2/qpmcache.h
+include/qt2/qpngio.h
+include/qt2/qpntarry.h
+include/qt2/qpoint.h
+include/qt2/qpointarray.h
+include/qt2/qpopmenu.h
+include/qt2/qpopupmenu.h
+include/qt2/qprintdialog.h
+include/qt2/qprinter.h
+include/qt2/qprndlg.h
+include/qt2/qprogbar.h
+include/qt2/qprogdlg.h
+include/qt2/qprogressbar.h
+include/qt2/qprogressdialog.h
+include/qt2/qpsprinter.h
+include/qt2/qpsprn.h
+include/qt2/qptrdict.h
+include/qt2/qpushbt.h
+include/qt2/qpushbutton.h
+include/qt2/qqueue.h
+include/qt2/qradiobt.h
+include/qt2/qradiobutton.h
+include/qt2/qrangecontrol.h
+include/qt2/qrangect.h
+include/qt2/qrect.h
+include/qt2/qregexp.h
+include/qt2/qregion.h
+include/qt2/qrtlcodec.h
+include/qt2/qscrbar.h
+include/qt2/qscrollbar.h
+include/qt2/qscrollview.h
+include/qt2/qsemimodal.h
+include/qt2/qsession.h
+include/qt2/qsessionmanager.h
+include/qt2/qshared.h
+include/qt2/qsignal.h
+include/qt2/qsignalmapper.h
+include/qt2/qsignalslotimp.h
+include/qt2/qsimplerichtext.h
+include/qt2/qsize.h
+include/qt2/qsizegrip.h
+include/qt2/qsizepolicy.h
+include/qt2/qsjiscodec.h
+include/qt2/qslider.h
+include/qt2/qsmartptr.h
+include/qt2/qsocketnotifier.h
+include/qt2/qsocknot.h
+include/qt2/qsortedlist.h
+include/qt2/qspinbox.h
+include/qt2/qsplitter.h
+include/qt2/qstack.h
+include/qt2/qstatusbar.h
+include/qt2/qstring.h
+include/qt2/qstringlist.h
+include/qt2/qstrlist.h
+include/qt2/qstrvec.h
+include/qt2/qstyle.h
+include/qt2/qstylesheet.h
+include/qt2/qtabbar.h
+include/qt2/qtabdialog.h
+include/qt2/qtabdlg.h
+include/qt2/qtableview.h
+include/qt2/qtablevw.h
+include/qt2/qtabwidget.h
+include/qt2/qtextbrowser.h
+include/qt2/qtextcodec.h
+include/qt2/qtextstream.h
+include/qt2/qtextview.h
+include/qt2/qtimer.h
+include/qt2/qtl.h
+include/qt2/qtoolbar.h
+include/qt2/qtoolbutton.h
+include/qt2/qtooltip.h
+include/qt2/qtranslator.h
+include/qt2/qtstream.h
+include/qt2/qutfcodec.h
+include/qt2/qvalidator.h
+include/qt2/qvaluelist.h
+include/qt2/qvbox.h
+include/qt2/qvbuttongroup.h
+include/qt2/qvector.h
+include/qt2/qvgroupbox.h
+include/qt2/qwellarray.h
+include/qt2/qwhatsthis.h
+include/qt2/qwidcoll.h
+include/qt2/qwidget.h
+include/qt2/qwidgetintdict.h
+include/qt2/qwidgetlist.h
+include/qt2/qwidgetstack.h
+include/qt2/qwindefs.h
+include/qt2/qwindow.h
+include/qt2/qwindowdefs.h
+include/qt2/qwindowsstyle.h
+include/qt2/qwizard.h
+include/qt2/qwmatrix.h
+include/qt2/qxt.h
 lib/libqt2.so
 lib/libqt2.so.%%VERSION%%
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@@ -1164,6 +1164,6 @@ share/doc/qt2/html/wizard-main-cpp.html
 share/doc/qt2/html/xform-xform-cpp.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm include/X11/qt2
+@dirrm include/qt2
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 154f467a8475..1b9f0ba65257 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -50,8 +50,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so.${VERSION}
 	${LN} -sf ${PREFIX}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/include/X11/qt2
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/X11/qt2
+	${MKDIR} ${PREFIX}/include/qt2
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_MAN} ${WRKSRC}/man/man1/moc.1 ${PREFIX}/man/man1/moc2.1
 	${INSTALL_MAN} ${WRKSRC}/man/man3/q* ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index e69b128f85dd..80793e5b031e 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -4,249 +4,249 @@ bin/moc2
 bin/msg2qm
 bin/qt20fix
 bin/qtrename140
-include/X11/qt2/jri.h
-include/X11/qt2/jritypes.h
-include/X11/qt2/npapi.h
-include/X11/qt2/npupp.h
-include/X11/qt2/q1xcompatibility.h
-include/X11/qt2/qabstractlayout.h
-include/X11/qt2/qaccel.h
-include/X11/qt2/qapp.h
-include/X11/qt2/qapplication.h
-include/X11/qt2/qarray.h
-include/X11/qt2/qasciicache.h
-include/X11/qt2/qasciidict.h
-include/X11/qt2/qasyncimageio.h
-include/X11/qt2/qasyncio.h
-include/X11/qt2/qbitarray.h
-include/X11/qt2/qbitarry.h
-include/X11/qt2/qbitmap.h
-include/X11/qt2/qbrush.h
-include/X11/qt2/qbttngrp.h
-include/X11/qt2/qbuffer.h
-include/X11/qt2/qbutton.h
-include/X11/qt2/qbuttongroup.h
-include/X11/qt2/qcache.h
-include/X11/qt2/qcdestyle.h
-include/X11/qt2/qcheckbox.h
-include/X11/qt2/qchkbox.h
-include/X11/qt2/qclipboard.h
-include/X11/qt2/qclipbrd.h
-include/X11/qt2/qcollect.h
-include/X11/qt2/qcollection.h
-include/X11/qt2/qcolor.h
-include/X11/qt2/qcolordialog.h
-include/X11/qt2/qcombo.h
-include/X11/qt2/qcombobox.h
-include/X11/qt2/qcommonstyle.h
-include/X11/qt2/qconnect.h
-include/X11/qt2/qconnection.h
-include/X11/qt2/qcstring.h
-include/X11/qt2/qcursor.h
-include/X11/qt2/qdatastream.h
-include/X11/qt2/qdatetime.h
-include/X11/qt2/qdatetm.h
-include/X11/qt2/qdialog.h
-include/X11/qt2/qdict.h
-include/X11/qt2/qdir.h
-include/X11/qt2/qdragobject.h
-include/X11/qt2/qdrawutil.h
-include/X11/qt2/qdrawutl.h
-include/X11/qt2/qdropsite.h
-include/X11/qt2/qdstream.h
-include/X11/qt2/qeucjpcodec.h
-include/X11/qt2/qeuckrcodec.h
-include/X11/qt2/qevent.h
-include/X11/qt2/qfile.h
-include/X11/qt2/qfiledef.h
-include/X11/qt2/qfiledefs.h
-include/X11/qt2/qfiledialog.h
-include/X11/qt2/qfiledlg.h
-include/X11/qt2/qfileinf.h
-include/X11/qt2/qfileinfo.h
-include/X11/qt2/qfocusdata.h
-include/X11/qt2/qfont.h
-include/X11/qt2/qfontdata.h
-include/X11/qt2/qfontdatabase.h
-include/X11/qt2/qfontdialog.h
-include/X11/qt2/qfontdta.h
-include/X11/qt2/qfontinf.h
-include/X11/qt2/qfontinfo.h
-include/X11/qt2/qfontmet.h
-include/X11/qt2/qfontmetrics.h
-include/X11/qt2/qframe.h
-include/X11/qt2/qgarray.h
-include/X11/qt2/qgcache.h
-include/X11/qt2/qgdict.h
-include/X11/qt2/qgeneric.h
-include/X11/qt2/qgif.h
-include/X11/qt2/qgl.h
-include/X11/qt2/qglist.h
-include/X11/qt2/qglobal.h
-include/X11/qt2/qgmanagr.h
-include/X11/qt2/qgrid.h
-include/X11/qt2/qgroupbox.h
-include/X11/qt2/qgrpbox.h
-include/X11/qt2/qgvector.h
-include/X11/qt2/qhbox.h
-include/X11/qt2/qhbuttongroup.h
-include/X11/qt2/qheader.h
-include/X11/qt2/qhgroupbox.h
-include/X11/qt2/qiconset.h
-include/X11/qt2/qimage.h
-include/X11/qt2/qimageio.h
-include/X11/qt2/qintcach.h
-include/X11/qt2/qintcache.h
-include/X11/qt2/qintdict.h
-include/X11/qt2/qiodev.h
-include/X11/qt2/qiodevice.h
-include/X11/qt2/qjiscodec.h
-include/X11/qt2/qjpegio.h
-include/X11/qt2/qjpunicode.h
-include/X11/qt2/qkeycode.h
-include/X11/qt2/qkoi8codec.h
-include/X11/qt2/qlabel.h
-include/X11/qt2/qlayout.h
-include/X11/qt2/qlayoutengine.h
-include/X11/qt2/qlcdnum.h
-include/X11/qt2/qlcdnumber.h
-include/X11/qt2/qlined.h
-include/X11/qt2/qlineedit.h
-include/X11/qt2/qlist.h
-include/X11/qt2/qlistbox.h
-include/X11/qt2/qlistview.h
-include/X11/qt2/qmainwindow.h
-include/X11/qt2/qmap.h
-include/X11/qt2/qmenubar.h
-include/X11/qt2/qmenudata.h
-include/X11/qt2/qmenudta.h
-include/X11/qt2/qmessagebox.h
-include/X11/qt2/qmetaobj.h
-include/X11/qt2/qmetaobject.h
-include/X11/qt2/qmime.h
-include/X11/qt2/qmlined.h
-include/X11/qt2/qmotifstyle.h
-include/X11/qt2/qmovie.h
-include/X11/qt2/qmsgbox.h
-include/X11/qt2/qmultilinedit.h
-include/X11/qt2/qmultilineedit.h
-include/X11/qt2/qnamespace.h
-include/X11/qt2/qnp.h
-include/X11/qt2/qobjcoll.h
-include/X11/qt2/qobjdefs.h
-include/X11/qt2/qobject.h
-include/X11/qt2/qobjectdefs.h
-include/X11/qt2/qobjectdict.h
-include/X11/qt2/qobjectlist.h
-include/X11/qt2/qpaintd.h
-include/X11/qt2/qpaintdc.h
-include/X11/qt2/qpaintdevice.h
-include/X11/qt2/qpaintdevicedefs.h
-include/X11/qt2/qpaintdevicemetrics.h
-include/X11/qt2/qpainter.h
-include/X11/qt2/qpalette.h
-include/X11/qt2/qpdevmet.h
-include/X11/qt2/qpen.h
-include/X11/qt2/qpicture.h
-include/X11/qt2/qpixmap.h
-include/X11/qt2/qpixmapcache.h
-include/X11/qt2/qplatinumstyle.h
-include/X11/qt2/qpmcache.h
-include/X11/qt2/qpngio.h
-include/X11/qt2/qpntarry.h
-include/X11/qt2/qpoint.h
-include/X11/qt2/qpointarray.h
-include/X11/qt2/qpopmenu.h
-include/X11/qt2/qpopupmenu.h
-include/X11/qt2/qprintdialog.h
-include/X11/qt2/qprinter.h
-include/X11/qt2/qprndlg.h
-include/X11/qt2/qprogbar.h
-include/X11/qt2/qprogdlg.h
-include/X11/qt2/qprogressbar.h
-include/X11/qt2/qprogressdialog.h
-include/X11/qt2/qpsprinter.h
-include/X11/qt2/qpsprn.h
-include/X11/qt2/qptrdict.h
-include/X11/qt2/qpushbt.h
-include/X11/qt2/qpushbutton.h
-include/X11/qt2/qqueue.h
-include/X11/qt2/qradiobt.h
-include/X11/qt2/qradiobutton.h
-include/X11/qt2/qrangecontrol.h
-include/X11/qt2/qrangect.h
-include/X11/qt2/qrect.h
-include/X11/qt2/qregexp.h
-include/X11/qt2/qregion.h
-include/X11/qt2/qrtlcodec.h
-include/X11/qt2/qscrbar.h
-include/X11/qt2/qscrollbar.h
-include/X11/qt2/qscrollview.h
-include/X11/qt2/qsemimodal.h
-include/X11/qt2/qsession.h
-include/X11/qt2/qsessionmanager.h
-include/X11/qt2/qshared.h
-include/X11/qt2/qsignal.h
-include/X11/qt2/qsignalmapper.h
-include/X11/qt2/qsignalslotimp.h
-include/X11/qt2/qsimplerichtext.h
-include/X11/qt2/qsize.h
-include/X11/qt2/qsizegrip.h
-include/X11/qt2/qsizepolicy.h
-include/X11/qt2/qsjiscodec.h
-include/X11/qt2/qslider.h
-include/X11/qt2/qsmartptr.h
-include/X11/qt2/qsocketnotifier.h
-include/X11/qt2/qsocknot.h
-include/X11/qt2/qsortedlist.h
-include/X11/qt2/qspinbox.h
-include/X11/qt2/qsplitter.h
-include/X11/qt2/qstack.h
-include/X11/qt2/qstatusbar.h
-include/X11/qt2/qstring.h
-include/X11/qt2/qstringlist.h
-include/X11/qt2/qstrlist.h
-include/X11/qt2/qstrvec.h
-include/X11/qt2/qstyle.h
-include/X11/qt2/qstylesheet.h
-include/X11/qt2/qtabbar.h
-include/X11/qt2/qtabdialog.h
-include/X11/qt2/qtabdlg.h
-include/X11/qt2/qtableview.h
-include/X11/qt2/qtablevw.h
-include/X11/qt2/qtabwidget.h
-include/X11/qt2/qtextbrowser.h
-include/X11/qt2/qtextcodec.h
-include/X11/qt2/qtextstream.h
-include/X11/qt2/qtextview.h
-include/X11/qt2/qtimer.h
-include/X11/qt2/qtl.h
-include/X11/qt2/qtoolbar.h
-include/X11/qt2/qtoolbutton.h
-include/X11/qt2/qtooltip.h
-include/X11/qt2/qtranslator.h
-include/X11/qt2/qtstream.h
-include/X11/qt2/qutfcodec.h
-include/X11/qt2/qvalidator.h
-include/X11/qt2/qvaluelist.h
-include/X11/qt2/qvbox.h
-include/X11/qt2/qvbuttongroup.h
-include/X11/qt2/qvector.h
-include/X11/qt2/qvgroupbox.h
-include/X11/qt2/qwellarray.h
-include/X11/qt2/qwhatsthis.h
-include/X11/qt2/qwidcoll.h
-include/X11/qt2/qwidget.h
-include/X11/qt2/qwidgetintdict.h
-include/X11/qt2/qwidgetlist.h
-include/X11/qt2/qwidgetstack.h
-include/X11/qt2/qwindefs.h
-include/X11/qt2/qwindow.h
-include/X11/qt2/qwindowdefs.h
-include/X11/qt2/qwindowsstyle.h
-include/X11/qt2/qwizard.h
-include/X11/qt2/qwmatrix.h
-include/X11/qt2/qxt.h
+include/qt2/jri.h
+include/qt2/jritypes.h
+include/qt2/npapi.h
+include/qt2/npupp.h
+include/qt2/q1xcompatibility.h
+include/qt2/qabstractlayout.h
+include/qt2/qaccel.h
+include/qt2/qapp.h
+include/qt2/qapplication.h
+include/qt2/qarray.h
+include/qt2/qasciicache.h
+include/qt2/qasciidict.h
+include/qt2/qasyncimageio.h
+include/qt2/qasyncio.h
+include/qt2/qbitarray.h
+include/qt2/qbitarry.h
+include/qt2/qbitmap.h
+include/qt2/qbrush.h
+include/qt2/qbttngrp.h
+include/qt2/qbuffer.h
+include/qt2/qbutton.h
+include/qt2/qbuttongroup.h
+include/qt2/qcache.h
+include/qt2/qcdestyle.h
+include/qt2/qcheckbox.h
+include/qt2/qchkbox.h
+include/qt2/qclipboard.h
+include/qt2/qclipbrd.h
+include/qt2/qcollect.h
+include/qt2/qcollection.h
+include/qt2/qcolor.h
+include/qt2/qcolordialog.h
+include/qt2/qcombo.h
+include/qt2/qcombobox.h
+include/qt2/qcommonstyle.h
+include/qt2/qconnect.h
+include/qt2/qconnection.h
+include/qt2/qcstring.h
+include/qt2/qcursor.h
+include/qt2/qdatastream.h
+include/qt2/qdatetime.h
+include/qt2/qdatetm.h
+include/qt2/qdialog.h
+include/qt2/qdict.h
+include/qt2/qdir.h
+include/qt2/qdragobject.h
+include/qt2/qdrawutil.h
+include/qt2/qdrawutl.h
+include/qt2/qdropsite.h
+include/qt2/qdstream.h
+include/qt2/qeucjpcodec.h
+include/qt2/qeuckrcodec.h
+include/qt2/qevent.h
+include/qt2/qfile.h
+include/qt2/qfiledef.h
+include/qt2/qfiledefs.h
+include/qt2/qfiledialog.h
+include/qt2/qfiledlg.h
+include/qt2/qfileinf.h
+include/qt2/qfileinfo.h
+include/qt2/qfocusdata.h
+include/qt2/qfont.h
+include/qt2/qfontdata.h
+include/qt2/qfontdatabase.h
+include/qt2/qfontdialog.h
+include/qt2/qfontdta.h
+include/qt2/qfontinf.h
+include/qt2/qfontinfo.h
+include/qt2/qfontmet.h
+include/qt2/qfontmetrics.h
+include/qt2/qframe.h
+include/qt2/qgarray.h
+include/qt2/qgcache.h
+include/qt2/qgdict.h
+include/qt2/qgeneric.h
+include/qt2/qgif.h
+include/qt2/qgl.h
+include/qt2/qglist.h
+include/qt2/qglobal.h
+include/qt2/qgmanagr.h
+include/qt2/qgrid.h
+include/qt2/qgroupbox.h
+include/qt2/qgrpbox.h
+include/qt2/qgvector.h
+include/qt2/qhbox.h
+include/qt2/qhbuttongroup.h
+include/qt2/qheader.h
+include/qt2/qhgroupbox.h
+include/qt2/qiconset.h
+include/qt2/qimage.h
+include/qt2/qimageio.h
+include/qt2/qintcach.h
+include/qt2/qintcache.h
+include/qt2/qintdict.h
+include/qt2/qiodev.h
+include/qt2/qiodevice.h
+include/qt2/qjiscodec.h
+include/qt2/qjpegio.h
+include/qt2/qjpunicode.h
+include/qt2/qkeycode.h
+include/qt2/qkoi8codec.h
+include/qt2/qlabel.h
+include/qt2/qlayout.h
+include/qt2/qlayoutengine.h
+include/qt2/qlcdnum.h
+include/qt2/qlcdnumber.h
+include/qt2/qlined.h
+include/qt2/qlineedit.h
+include/qt2/qlist.h
+include/qt2/qlistbox.h
+include/qt2/qlistview.h
+include/qt2/qmainwindow.h
+include/qt2/qmap.h
+include/qt2/qmenubar.h
+include/qt2/qmenudata.h
+include/qt2/qmenudta.h
+include/qt2/qmessagebox.h
+include/qt2/qmetaobj.h
+include/qt2/qmetaobject.h
+include/qt2/qmime.h
+include/qt2/qmlined.h
+include/qt2/qmotifstyle.h
+include/qt2/qmovie.h
+include/qt2/qmsgbox.h
+include/qt2/qmultilinedit.h
+include/qt2/qmultilineedit.h
+include/qt2/qnamespace.h
+include/qt2/qnp.h
+include/qt2/qobjcoll.h
+include/qt2/qobjdefs.h
+include/qt2/qobject.h
+include/qt2/qobjectdefs.h
+include/qt2/qobjectdict.h
+include/qt2/qobjectlist.h
+include/qt2/qpaintd.h
+include/qt2/qpaintdc.h
+include/qt2/qpaintdevice.h
+include/qt2/qpaintdevicedefs.h
+include/qt2/qpaintdevicemetrics.h
+include/qt2/qpainter.h
+include/qt2/qpalette.h
+include/qt2/qpdevmet.h
+include/qt2/qpen.h
+include/qt2/qpicture.h
+include/qt2/qpixmap.h
+include/qt2/qpixmapcache.h
+include/qt2/qplatinumstyle.h
+include/qt2/qpmcache.h
+include/qt2/qpngio.h
+include/qt2/qpntarry.h
+include/qt2/qpoint.h
+include/qt2/qpointarray.h
+include/qt2/qpopmenu.h
+include/qt2/qpopupmenu.h
+include/qt2/qprintdialog.h
+include/qt2/qprinter.h
+include/qt2/qprndlg.h
+include/qt2/qprogbar.h
+include/qt2/qprogdlg.h
+include/qt2/qprogressbar.h
+include/qt2/qprogressdialog.h
+include/qt2/qpsprinter.h
+include/qt2/qpsprn.h
+include/qt2/qptrdict.h
+include/qt2/qpushbt.h
+include/qt2/qpushbutton.h
+include/qt2/qqueue.h
+include/qt2/qradiobt.h
+include/qt2/qradiobutton.h
+include/qt2/qrangecontrol.h
+include/qt2/qrangect.h
+include/qt2/qrect.h
+include/qt2/qregexp.h
+include/qt2/qregion.h
+include/qt2/qrtlcodec.h
+include/qt2/qscrbar.h
+include/qt2/qscrollbar.h
+include/qt2/qscrollview.h
+include/qt2/qsemimodal.h
+include/qt2/qsession.h
+include/qt2/qsessionmanager.h
+include/qt2/qshared.h
+include/qt2/qsignal.h
+include/qt2/qsignalmapper.h
+include/qt2/qsignalslotimp.h
+include/qt2/qsimplerichtext.h
+include/qt2/qsize.h
+include/qt2/qsizegrip.h
+include/qt2/qsizepolicy.h
+include/qt2/qsjiscodec.h
+include/qt2/qslider.h
+include/qt2/qsmartptr.h
+include/qt2/qsocketnotifier.h
+include/qt2/qsocknot.h
+include/qt2/qsortedlist.h
+include/qt2/qspinbox.h
+include/qt2/qsplitter.h
+include/qt2/qstack.h
+include/qt2/qstatusbar.h
+include/qt2/qstring.h
+include/qt2/qstringlist.h
+include/qt2/qstrlist.h
+include/qt2/qstrvec.h
+include/qt2/qstyle.h
+include/qt2/qstylesheet.h
+include/qt2/qtabbar.h
+include/qt2/qtabdialog.h
+include/qt2/qtabdlg.h
+include/qt2/qtableview.h
+include/qt2/qtablevw.h
+include/qt2/qtabwidget.h
+include/qt2/qtextbrowser.h
+include/qt2/qtextcodec.h
+include/qt2/qtextstream.h
+include/qt2/qtextview.h
+include/qt2/qtimer.h
+include/qt2/qtl.h
+include/qt2/qtoolbar.h
+include/qt2/qtoolbutton.h
+include/qt2/qtooltip.h
+include/qt2/qtranslator.h
+include/qt2/qtstream.h
+include/qt2/qutfcodec.h
+include/qt2/qvalidator.h
+include/qt2/qvaluelist.h
+include/qt2/qvbox.h
+include/qt2/qvbuttongroup.h
+include/qt2/qvector.h
+include/qt2/qvgroupbox.h
+include/qt2/qwellarray.h
+include/qt2/qwhatsthis.h
+include/qt2/qwidcoll.h
+include/qt2/qwidget.h
+include/qt2/qwidgetintdict.h
+include/qt2/qwidgetlist.h
+include/qt2/qwidgetstack.h
+include/qt2/qwindefs.h
+include/qt2/qwindow.h
+include/qt2/qwindowdefs.h
+include/qt2/qwindowsstyle.h
+include/qt2/qwizard.h
+include/qt2/qwmatrix.h
+include/qt2/qxt.h
 lib/libqt2.so
 lib/libqt2.so.%%VERSION%%
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@@ -1164,6 +1164,6 @@ share/doc/qt2/html/wizard-main-cpp.html
 share/doc/qt2/html/xform-xform-cpp.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm include/X11/qt2
+@dirrm include/qt2
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 154f467a8475..1b9f0ba65257 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -50,8 +50,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so.${VERSION}
 	${LN} -sf ${PREFIX}/lib/libqt2.so.${VERSION} ${PREFIX}/lib/libqt2.so
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/include/X11/qt2
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/X11/qt2
+	${MKDIR} ${PREFIX}/include/qt2
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_MAN} ${WRKSRC}/man/man1/moc.1 ${PREFIX}/man/man1/moc2.1
 	${INSTALL_MAN} ${WRKSRC}/man/man3/q* ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index e69b128f85dd..80793e5b031e 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -4,249 +4,249 @@ bin/moc2
 bin/msg2qm
 bin/qt20fix
 bin/qtrename140
-include/X11/qt2/jri.h
-include/X11/qt2/jritypes.h
-include/X11/qt2/npapi.h
-include/X11/qt2/npupp.h
-include/X11/qt2/q1xcompatibility.h
-include/X11/qt2/qabstractlayout.h
-include/X11/qt2/qaccel.h
-include/X11/qt2/qapp.h
-include/X11/qt2/qapplication.h
-include/X11/qt2/qarray.h
-include/X11/qt2/qasciicache.h
-include/X11/qt2/qasciidict.h
-include/X11/qt2/qasyncimageio.h
-include/X11/qt2/qasyncio.h
-include/X11/qt2/qbitarray.h
-include/X11/qt2/qbitarry.h
-include/X11/qt2/qbitmap.h
-include/X11/qt2/qbrush.h
-include/X11/qt2/qbttngrp.h
-include/X11/qt2/qbuffer.h
-include/X11/qt2/qbutton.h
-include/X11/qt2/qbuttongroup.h
-include/X11/qt2/qcache.h
-include/X11/qt2/qcdestyle.h
-include/X11/qt2/qcheckbox.h
-include/X11/qt2/qchkbox.h
-include/X11/qt2/qclipboard.h
-include/X11/qt2/qclipbrd.h
-include/X11/qt2/qcollect.h
-include/X11/qt2/qcollection.h
-include/X11/qt2/qcolor.h
-include/X11/qt2/qcolordialog.h
-include/X11/qt2/qcombo.h
-include/X11/qt2/qcombobox.h
-include/X11/qt2/qcommonstyle.h
-include/X11/qt2/qconnect.h
-include/X11/qt2/qconnection.h
-include/X11/qt2/qcstring.h
-include/X11/qt2/qcursor.h
-include/X11/qt2/qdatastream.h
-include/X11/qt2/qdatetime.h
-include/X11/qt2/qdatetm.h
-include/X11/qt2/qdialog.h
-include/X11/qt2/qdict.h
-include/X11/qt2/qdir.h
-include/X11/qt2/qdragobject.h
-include/X11/qt2/qdrawutil.h
-include/X11/qt2/qdrawutl.h
-include/X11/qt2/qdropsite.h
-include/X11/qt2/qdstream.h
-include/X11/qt2/qeucjpcodec.h
-include/X11/qt2/qeuckrcodec.h
-include/X11/qt2/qevent.h
-include/X11/qt2/qfile.h
-include/X11/qt2/qfiledef.h
-include/X11/qt2/qfiledefs.h
-include/X11/qt2/qfiledialog.h
-include/X11/qt2/qfiledlg.h
-include/X11/qt2/qfileinf.h
-include/X11/qt2/qfileinfo.h
-include/X11/qt2/qfocusdata.h
-include/X11/qt2/qfont.h
-include/X11/qt2/qfontdata.h
-include/X11/qt2/qfontdatabase.h
-include/X11/qt2/qfontdialog.h
-include/X11/qt2/qfontdta.h
-include/X11/qt2/qfontinf.h
-include/X11/qt2/qfontinfo.h
-include/X11/qt2/qfontmet.h
-include/X11/qt2/qfontmetrics.h
-include/X11/qt2/qframe.h
-include/X11/qt2/qgarray.h
-include/X11/qt2/qgcache.h
-include/X11/qt2/qgdict.h
-include/X11/qt2/qgeneric.h
-include/X11/qt2/qgif.h
-include/X11/qt2/qgl.h
-include/X11/qt2/qglist.h
-include/X11/qt2/qglobal.h
-include/X11/qt2/qgmanagr.h
-include/X11/qt2/qgrid.h
-include/X11/qt2/qgroupbox.h
-include/X11/qt2/qgrpbox.h
-include/X11/qt2/qgvector.h
-include/X11/qt2/qhbox.h
-include/X11/qt2/qhbuttongroup.h
-include/X11/qt2/qheader.h
-include/X11/qt2/qhgroupbox.h
-include/X11/qt2/qiconset.h
-include/X11/qt2/qimage.h
-include/X11/qt2/qimageio.h
-include/X11/qt2/qintcach.h
-include/X11/qt2/qintcache.h
-include/X11/qt2/qintdict.h
-include/X11/qt2/qiodev.h
-include/X11/qt2/qiodevice.h
-include/X11/qt2/qjiscodec.h
-include/X11/qt2/qjpegio.h
-include/X11/qt2/qjpunicode.h
-include/X11/qt2/qkeycode.h
-include/X11/qt2/qkoi8codec.h
-include/X11/qt2/qlabel.h
-include/X11/qt2/qlayout.h
-include/X11/qt2/qlayoutengine.h
-include/X11/qt2/qlcdnum.h
-include/X11/qt2/qlcdnumber.h
-include/X11/qt2/qlined.h
-include/X11/qt2/qlineedit.h
-include/X11/qt2/qlist.h
-include/X11/qt2/qlistbox.h
-include/X11/qt2/qlistview.h
-include/X11/qt2/qmainwindow.h
-include/X11/qt2/qmap.h
-include/X11/qt2/qmenubar.h
-include/X11/qt2/qmenudata.h
-include/X11/qt2/qmenudta.h
-include/X11/qt2/qmessagebox.h
-include/X11/qt2/qmetaobj.h
-include/X11/qt2/qmetaobject.h
-include/X11/qt2/qmime.h
-include/X11/qt2/qmlined.h
-include/X11/qt2/qmotifstyle.h
-include/X11/qt2/qmovie.h
-include/X11/qt2/qmsgbox.h
-include/X11/qt2/qmultilinedit.h
-include/X11/qt2/qmultilineedit.h
-include/X11/qt2/qnamespace.h
-include/X11/qt2/qnp.h
-include/X11/qt2/qobjcoll.h
-include/X11/qt2/qobjdefs.h
-include/X11/qt2/qobject.h
-include/X11/qt2/qobjectdefs.h
-include/X11/qt2/qobjectdict.h
-include/X11/qt2/qobjectlist.h
-include/X11/qt2/qpaintd.h
-include/X11/qt2/qpaintdc.h
-include/X11/qt2/qpaintdevice.h
-include/X11/qt2/qpaintdevicedefs.h
-include/X11/qt2/qpaintdevicemetrics.h
-include/X11/qt2/qpainter.h
-include/X11/qt2/qpalette.h
-include/X11/qt2/qpdevmet.h
-include/X11/qt2/qpen.h
-include/X11/qt2/qpicture.h
-include/X11/qt2/qpixmap.h
-include/X11/qt2/qpixmapcache.h
-include/X11/qt2/qplatinumstyle.h
-include/X11/qt2/qpmcache.h
-include/X11/qt2/qpngio.h
-include/X11/qt2/qpntarry.h
-include/X11/qt2/qpoint.h
-include/X11/qt2/qpointarray.h
-include/X11/qt2/qpopmenu.h
-include/X11/qt2/qpopupmenu.h
-include/X11/qt2/qprintdialog.h
-include/X11/qt2/qprinter.h
-include/X11/qt2/qprndlg.h
-include/X11/qt2/qprogbar.h
-include/X11/qt2/qprogdlg.h
-include/X11/qt2/qprogressbar.h
-include/X11/qt2/qprogressdialog.h
-include/X11/qt2/qpsprinter.h
-include/X11/qt2/qpsprn.h
-include/X11/qt2/qptrdict.h
-include/X11/qt2/qpushbt.h
-include/X11/qt2/qpushbutton.h
-include/X11/qt2/qqueue.h
-include/X11/qt2/qradiobt.h
-include/X11/qt2/qradiobutton.h
-include/X11/qt2/qrangecontrol.h
-include/X11/qt2/qrangect.h
-include/X11/qt2/qrect.h
-include/X11/qt2/qregexp.h
-include/X11/qt2/qregion.h
-include/X11/qt2/qrtlcodec.h
-include/X11/qt2/qscrbar.h
-include/X11/qt2/qscrollbar.h
-include/X11/qt2/qscrollview.h
-include/X11/qt2/qsemimodal.h
-include/X11/qt2/qsession.h
-include/X11/qt2/qsessionmanager.h
-include/X11/qt2/qshared.h
-include/X11/qt2/qsignal.h
-include/X11/qt2/qsignalmapper.h
-include/X11/qt2/qsignalslotimp.h
-include/X11/qt2/qsimplerichtext.h
-include/X11/qt2/qsize.h
-include/X11/qt2/qsizegrip.h
-include/X11/qt2/qsizepolicy.h
-include/X11/qt2/qsjiscodec.h
-include/X11/qt2/qslider.h
-include/X11/qt2/qsmartptr.h
-include/X11/qt2/qsocketnotifier.h
-include/X11/qt2/qsocknot.h
-include/X11/qt2/qsortedlist.h
-include/X11/qt2/qspinbox.h
-include/X11/qt2/qsplitter.h
-include/X11/qt2/qstack.h
-include/X11/qt2/qstatusbar.h
-include/X11/qt2/qstring.h
-include/X11/qt2/qstringlist.h
-include/X11/qt2/qstrlist.h
-include/X11/qt2/qstrvec.h
-include/X11/qt2/qstyle.h
-include/X11/qt2/qstylesheet.h
-include/X11/qt2/qtabbar.h
-include/X11/qt2/qtabdialog.h
-include/X11/qt2/qtabdlg.h
-include/X11/qt2/qtableview.h
-include/X11/qt2/qtablevw.h
-include/X11/qt2/qtabwidget.h
-include/X11/qt2/qtextbrowser.h
-include/X11/qt2/qtextcodec.h
-include/X11/qt2/qtextstream.h
-include/X11/qt2/qtextview.h
-include/X11/qt2/qtimer.h
-include/X11/qt2/qtl.h
-include/X11/qt2/qtoolbar.h
-include/X11/qt2/qtoolbutton.h
-include/X11/qt2/qtooltip.h
-include/X11/qt2/qtranslator.h
-include/X11/qt2/qtstream.h
-include/X11/qt2/qutfcodec.h
-include/X11/qt2/qvalidator.h
-include/X11/qt2/qvaluelist.h
-include/X11/qt2/qvbox.h
-include/X11/qt2/qvbuttongroup.h
-include/X11/qt2/qvector.h
-include/X11/qt2/qvgroupbox.h
-include/X11/qt2/qwellarray.h
-include/X11/qt2/qwhatsthis.h
-include/X11/qt2/qwidcoll.h
-include/X11/qt2/qwidget.h
-include/X11/qt2/qwidgetintdict.h
-include/X11/qt2/qwidgetlist.h
-include/X11/qt2/qwidgetstack.h
-include/X11/qt2/qwindefs.h
-include/X11/qt2/qwindow.h
-include/X11/qt2/qwindowdefs.h
-include/X11/qt2/qwindowsstyle.h
-include/X11/qt2/qwizard.h
-include/X11/qt2/qwmatrix.h
-include/X11/qt2/qxt.h
+include/qt2/jri.h
+include/qt2/jritypes.h
+include/qt2/npapi.h
+include/qt2/npupp.h
+include/qt2/q1xcompatibility.h
+include/qt2/qabstractlayout.h
+include/qt2/qaccel.h
+include/qt2/qapp.h
+include/qt2/qapplication.h
+include/qt2/qarray.h
+include/qt2/qasciicache.h
+include/qt2/qasciidict.h
+include/qt2/qasyncimageio.h
+include/qt2/qasyncio.h
+include/qt2/qbitarray.h
+include/qt2/qbitarry.h
+include/qt2/qbitmap.h
+include/qt2/qbrush.h
+include/qt2/qbttngrp.h
+include/qt2/qbuffer.h
+include/qt2/qbutton.h
+include/qt2/qbuttongroup.h
+include/qt2/qcache.h
+include/qt2/qcdestyle.h
+include/qt2/qcheckbox.h
+include/qt2/qchkbox.h
+include/qt2/qclipboard.h
+include/qt2/qclipbrd.h
+include/qt2/qcollect.h
+include/qt2/qcollection.h
+include/qt2/qcolor.h
+include/qt2/qcolordialog.h
+include/qt2/qcombo.h
+include/qt2/qcombobox.h
+include/qt2/qcommonstyle.h
+include/qt2/qconnect.h
+include/qt2/qconnection.h
+include/qt2/qcstring.h
+include/qt2/qcursor.h
+include/qt2/qdatastream.h
+include/qt2/qdatetime.h
+include/qt2/qdatetm.h
+include/qt2/qdialog.h
+include/qt2/qdict.h
+include/qt2/qdir.h
+include/qt2/qdragobject.h
+include/qt2/qdrawutil.h
+include/qt2/qdrawutl.h
+include/qt2/qdropsite.h
+include/qt2/qdstream.h
+include/qt2/qeucjpcodec.h
+include/qt2/qeuckrcodec.h
+include/qt2/qevent.h
+include/qt2/qfile.h
+include/qt2/qfiledef.h
+include/qt2/qfiledefs.h
+include/qt2/qfiledialog.h
+include/qt2/qfiledlg.h
+include/qt2/qfileinf.h
+include/qt2/qfileinfo.h
+include/qt2/qfocusdata.h
+include/qt2/qfont.h
+include/qt2/qfontdata.h
+include/qt2/qfontdatabase.h
+include/qt2/qfontdialog.h
+include/qt2/qfontdta.h
+include/qt2/qfontinf.h
+include/qt2/qfontinfo.h
+include/qt2/qfontmet.h
+include/qt2/qfontmetrics.h
+include/qt2/qframe.h
+include/qt2/qgarray.h
+include/qt2/qgcache.h
+include/qt2/qgdict.h
+include/qt2/qgeneric.h
+include/qt2/qgif.h
+include/qt2/qgl.h
+include/qt2/qglist.h
+include/qt2/qglobal.h
+include/qt2/qgmanagr.h
+include/qt2/qgrid.h
+include/qt2/qgroupbox.h
+include/qt2/qgrpbox.h
+include/qt2/qgvector.h
+include/qt2/qhbox.h
+include/qt2/qhbuttongroup.h
+include/qt2/qheader.h
+include/qt2/qhgroupbox.h
+include/qt2/qiconset.h
+include/qt2/qimage.h
+include/qt2/qimageio.h
+include/qt2/qintcach.h
+include/qt2/qintcache.h
+include/qt2/qintdict.h
+include/qt2/qiodev.h
+include/qt2/qiodevice.h
+include/qt2/qjiscodec.h
+include/qt2/qjpegio.h
+include/qt2/qjpunicode.h
+include/qt2/qkeycode.h
+include/qt2/qkoi8codec.h
+include/qt2/qlabel.h
+include/qt2/qlayout.h
+include/qt2/qlayoutengine.h
+include/qt2/qlcdnum.h
+include/qt2/qlcdnumber.h
+include/qt2/qlined.h
+include/qt2/qlineedit.h
+include/qt2/qlist.h
+include/qt2/qlistbox.h
+include/qt2/qlistview.h
+include/qt2/qmainwindow.h
+include/qt2/qmap.h
+include/qt2/qmenubar.h
+include/qt2/qmenudata.h
+include/qt2/qmenudta.h
+include/qt2/qmessagebox.h
+include/qt2/qmetaobj.h
+include/qt2/qmetaobject.h
+include/qt2/qmime.h
+include/qt2/qmlined.h
+include/qt2/qmotifstyle.h
+include/qt2/qmovie.h
+include/qt2/qmsgbox.h
+include/qt2/qmultilinedit.h
+include/qt2/qmultilineedit.h
+include/qt2/qnamespace.h
+include/qt2/qnp.h
+include/qt2/qobjcoll.h
+include/qt2/qobjdefs.h
+include/qt2/qobject.h
+include/qt2/qobjectdefs.h
+include/qt2/qobjectdict.h
+include/qt2/qobjectlist.h
+include/qt2/qpaintd.h
+include/qt2/qpaintdc.h
+include/qt2/qpaintdevice.h
+include/qt2/qpaintdevicedefs.h
+include/qt2/qpaintdevicemetrics.h
+include/qt2/qpainter.h
+include/qt2/qpalette.h
+include/qt2/qpdevmet.h
+include/qt2/qpen.h
+include/qt2/qpicture.h
+include/qt2/qpixmap.h
+include/qt2/qpixmapcache.h
+include/qt2/qplatinumstyle.h
+include/qt2/qpmcache.h
+include/qt2/qpngio.h
+include/qt2/qpntarry.h
+include/qt2/qpoint.h
+include/qt2/qpointarray.h
+include/qt2/qpopmenu.h
+include/qt2/qpopupmenu.h
+include/qt2/qprintdialog.h
+include/qt2/qprinter.h
+include/qt2/qprndlg.h
+include/qt2/qprogbar.h
+include/qt2/qprogdlg.h
+include/qt2/qprogressbar.h
+include/qt2/qprogressdialog.h
+include/qt2/qpsprinter.h
+include/qt2/qpsprn.h
+include/qt2/qptrdict.h
+include/qt2/qpushbt.h
+include/qt2/qpushbutton.h
+include/qt2/qqueue.h
+include/qt2/qradiobt.h
+include/qt2/qradiobutton.h
+include/qt2/qrangecontrol.h
+include/qt2/qrangect.h
+include/qt2/qrect.h
+include/qt2/qregexp.h
+include/qt2/qregion.h
+include/qt2/qrtlcodec.h
+include/qt2/qscrbar.h
+include/qt2/qscrollbar.h
+include/qt2/qscrollview.h
+include/qt2/qsemimodal.h
+include/qt2/qsession.h
+include/qt2/qsessionmanager.h
+include/qt2/qshared.h
+include/qt2/qsignal.h
+include/qt2/qsignalmapper.h
+include/qt2/qsignalslotimp.h
+include/qt2/qsimplerichtext.h
+include/qt2/qsize.h
+include/qt2/qsizegrip.h
+include/qt2/qsizepolicy.h
+include/qt2/qsjiscodec.h
+include/qt2/qslider.h
+include/qt2/qsmartptr.h
+include/qt2/qsocketnotifier.h
+include/qt2/qsocknot.h
+include/qt2/qsortedlist.h
+include/qt2/qspinbox.h
+include/qt2/qsplitter.h
+include/qt2/qstack.h
+include/qt2/qstatusbar.h
+include/qt2/qstring.h
+include/qt2/qstringlist.h
+include/qt2/qstrlist.h
+include/qt2/qstrvec.h
+include/qt2/qstyle.h
+include/qt2/qstylesheet.h
+include/qt2/qtabbar.h
+include/qt2/qtabdialog.h
+include/qt2/qtabdlg.h
+include/qt2/qtableview.h
+include/qt2/qtablevw.h
+include/qt2/qtabwidget.h
+include/qt2/qtextbrowser.h
+include/qt2/qtextcodec.h
+include/qt2/qtextstream.h
+include/qt2/qtextview.h
+include/qt2/qtimer.h
+include/qt2/qtl.h
+include/qt2/qtoolbar.h
+include/qt2/qtoolbutton.h
+include/qt2/qtooltip.h
+include/qt2/qtranslator.h
+include/qt2/qtstream.h
+include/qt2/qutfcodec.h
+include/qt2/qvalidator.h
+include/qt2/qvaluelist.h
+include/qt2/qvbox.h
+include/qt2/qvbuttongroup.h
+include/qt2/qvector.h
+include/qt2/qvgroupbox.h
+include/qt2/qwellarray.h
+include/qt2/qwhatsthis.h
+include/qt2/qwidcoll.h
+include/qt2/qwidget.h
+include/qt2/qwidgetintdict.h
+include/qt2/qwidgetlist.h
+include/qt2/qwidgetstack.h
+include/qt2/qwindefs.h
+include/qt2/qwindow.h
+include/qt2/qwindowdefs.h
+include/qt2/qwindowsstyle.h
+include/qt2/qwizard.h
+include/qt2/qwmatrix.h
+include/qt2/qxt.h
 lib/libqt2.so
 lib/libqt2.so.%%VERSION%%
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@@ -1164,6 +1164,6 @@ share/doc/qt2/html/wizard-main-cpp.html
 share/doc/qt2/html/xform-xform-cpp.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm include/X11/qt2
+@dirrm include/qt2
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2