aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorR. Imura <imura@FreeBSD.org>2000-03-07 02:24:03 +0800
committerR. Imura <imura@FreeBSD.org>2000-03-07 02:24:03 +0800
commitff061bc917123a755aded89a2bf15f394e0ac744 (patch)
tree868e4aaf963ada24a70cd02bc49da6bb3266515e /x11-toolkits
parent1890c7ff558e099789a42effa9c6f405c7adefaf (diff)
downloadfreebsd-ports-ff061bc917123a755aded89a2bf15f394e0ac744.tar.gz
freebsd-ports-ff061bc917123a755aded89a2bf15f394e0ac744.tar.zst
freebsd-ports-ff061bc917123a755aded89a2bf15f394e0ac744.zip
Update to Qt Free Edition version 2.1.0 Beta 2.
1) Bump lib's version, since qt-2.1.0 loses lower compatibility with qt-2.0.2 but has only upper compatibility. (new qt binary does not work with old qt library) 2) Install libqgl.a (it works with its examples) in addition to libqt, so added LIB_DEPENDS to MesaGL. 3) JPEG support from extension had been included to the main library. 4) 'examples' and 'tutorials' are no longer built with port building, since they are never installed. If you want them, set QTDIR=/usr/ports/x11-toolkits/qt21/work and just type 'gmake' in each directories. Some ideas obtained from qt145. :)
Notes
Notes: svn path=/head/; revision=26591
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/qt22/Makefile67
-rw-r--r--x11-toolkits/qt22/distinfo2
-rw-r--r--x11-toolkits/qt22/files/manpages31
-rw-r--r--x11-toolkits/qt22/files/patch-aa54
-rw-r--r--x11-toolkits/qt22/pkg-plist208
-rw-r--r--x11-toolkits/qt23/Makefile67
-rw-r--r--x11-toolkits/qt23/distinfo2
-rw-r--r--x11-toolkits/qt23/files/manpages31
-rw-r--r--x11-toolkits/qt23/files/patch-aa54
-rw-r--r--x11-toolkits/qt23/pkg-plist208
-rw-r--r--x11-toolkits/qt30/Makefile67
-rw-r--r--x11-toolkits/qt30/distinfo2
-rw-r--r--x11-toolkits/qt30/files/manpages31
-rw-r--r--x11-toolkits/qt30/files/patch-aa54
-rw-r--r--x11-toolkits/qt30/pkg-plist208
-rw-r--r--x11-toolkits/qt31/Makefile67
-rw-r--r--x11-toolkits/qt31/distinfo2
-rw-r--r--x11-toolkits/qt31/files/manpages31
-rw-r--r--x11-toolkits/qt31/files/patch-aa54
-rw-r--r--x11-toolkits/qt31/pkg-plist208
-rw-r--r--x11-toolkits/qt32/Makefile67
-rw-r--r--x11-toolkits/qt32/distinfo2
-rw-r--r--x11-toolkits/qt32/files/manpages31
-rw-r--r--x11-toolkits/qt32/files/patch-aa54
-rw-r--r--x11-toolkits/qt32/pkg-plist208
-rw-r--r--x11-toolkits/qt33/Makefile67
-rw-r--r--x11-toolkits/qt33/distinfo2
-rw-r--r--x11-toolkits/qt33/files/manpages31
-rw-r--r--x11-toolkits/qt33/files/patch-aa54
-rw-r--r--x11-toolkits/qt33/pkg-plist208
30 files changed, 1470 insertions, 702 deletions
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index db92bfb31301..aab47b0ecd25 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -1,71 +1,78 @@
-# New ports collection makefile for: qt20
-# Version required: 2.0.2
+# New ports collection makefile for: qt21
+# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
-# Whom: imura@cs.titech.ac.jp
+# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-2.0.2
+DISTNAME= qt-x11-2.1.0-beta2
+PKGNAME= qt-2.1.0b2
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
-
-FORBIDDEN= repository copied, awaiting upgrade
+LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ MesaGL.14:${PORTSDIR}/graphics/Mesa3
NO_LATEST_LINK= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_NEWGCC= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -system-zlib -system-libpng \
- -I${LOCALBASE}/include -L${LOCALBASE}/lib -lxpg4
+CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg \
+ -I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= QTDIR=${WRKSRC}
-MAKE_ENV+= QTDIR=${WRKSRC} SYS_CXX=${CXX} SYS_CC=${CC} SYS_CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV= QTDIR=${WRKSRC}
-.include <bsd.port.pre.mk>
+WRKSRC= ${WRKDIR}/qt-2.1.0-beta2
+CONFIG= ${WRKSRC}/configs/freebsd-g++-shared
.if defined(QT_GIF_AVAILABLE)
CONFIGURE_ARGS+=-gif
RESTRICTED= 'Requires a license from UNISYS'
.endif
-USE_NEWGCC= YES
-
-.if ${PORTOBJFORMAT} == "elf"
-VERSION= 2
-.else
-VERSION= 2.02
+.if !defined(NOPORTDOCS)
+.include "files/manpages"
.endif
-PLIST_SUB= VERSION=${VERSION}
-.include "files/manpages"
+pre-configure:
+ @${PERL} -pi -e "s,gcc,${CC},g" ${CONFIG}
+ @${PERL} -pi -e "s,g\+\+,${CXX},g" ${CONFIG}
+ @${PERL} -pi -e "s,/usr/X11R6,${X11BASE},g" ${CONFIG}
+ @${PERL} -pi -e "s,-pipe -O2,${CXXFLAGS},g" ${CONFIG}
+
+post-configure:
+ @(cd ${WRKSRC} ; ${GMAKE} symlinks)
do-install:
- @(cd ${WRKSRC} ; \
+ ${MKDIR} ${PREFIX}/include/qt2
+ (cd ${WRKSRC} ; \
${INSTALL_PROGRAM} bin/mergetr ${PREFIX}/bin ; \
${INSTALL_PROGRAM} bin/moc ${PREFIX}/bin/moc2 ; \
${INSTALL_PROGRAM} bin/msg2qm ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/findtr ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qt20fix ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qtrename140 ${PREFIX}/bin ; \
- ${INSTALL_DATA} 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/qt2 ; \
${INSTALL_DATA} include/*.h ${PREFIX}/include/qt2 ; \
- ${INSTALL_MAN} man/man1/moc.1 ${PREFIX}/man/man1/moc2.1 ; \
- ${INSTALL_MAN} man/man3/q* ${PREFIX}/man/man3 )
+ ${INSTALL_DATA} lib/libqgl.a ${PREFIX}/lib ; \
+ ${INSTALL_DATA} lib/libqt2.so.3 ${PREFIX}/lib )
+ ${LN} -sf libqt2.so.3 ${PREFIX}/lib/libqt2.so
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.if !defined(NOPORTDOCS)
- @(cd ${WRKSRC} ; \
- ${MKDIR} ${PREFIX}/share/doc/qt2/html ; \
+ ${MKDIR} ${PREFIX}/share/doc/qt2/html
+ (cd ${WRKSRC} ; \
+ ${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} LICENSE.QPL ${PREFIX}/share/doc/qt2 ; \
+ ${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
- ${INSTALL_DATA} doc/* ${PREFIX}/share/doc/qt2/html )
+ ${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
+ ${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt22/distinfo b/x11-toolkits/qt22/distinfo
index 27fdd45446a6..790ea1c64f91 100644
--- a/x11-toolkits/qt22/distinfo
+++ b/x11-toolkits/qt22/distinfo
@@ -1 +1 @@
-MD5 (qt-2.0.2.tar.gz) = afeaf554f538b415a2f46ff6b36657f4
+MD5 (qt-x11-2.1.0-beta2.tar.gz) = 953df8b8c324c4723b2d0ee342e6526a
diff --git a/x11-toolkits/qt22/files/manpages b/x11-toolkits/qt22/files/manpages
index 6b77b5e17666..de362d100114 100644
--- a/x11-toolkits/qt22/files/manpages
+++ b/x11-toolkits/qt22/files/manpages
@@ -1,4 +1,3 @@
-MAN1= moc2.1
MAN3= \
qaccel.3qt \
qapplication.3qt \
@@ -16,10 +15,12 @@ qbrush.3qt \
qbuffer.3qt \
qbutton.3qt \
qbuttongroup.3qt \
+qbytearray.3qt \
qcache.3qt \
qcacheiterator.3qt \
qcdestyle.3qt \
qchar.3qt \
+qcharref.3qt \
qcheckbox.3qt \
qchecklistitem.3qt \
qchildevent.3qt \
@@ -28,14 +29,15 @@ qcloseevent.3qt \
qcollection.3qt \
qcolor.3qt \
qcolordialog.3qt \
+qcolordrag.3qt \
qcolorgroup.3qt \
qcombobox.3qt \
qcommonstyle.3qt \
-qconnection.3qt \
qconststring.3qt \
qcstring.3qt \
qcursor.3qt \
qcustomevent.3qt \
+qcustommenuitem.3qt \
qdatapump.3qt \
qdatasink.3qt \
qdatasource.3qt \
@@ -53,6 +55,7 @@ qdragmoveevent.3qt \
qdragobject.3qt \
qdropevent.3qt \
qdropsite.3qt \
+qeucjpcodec.3qt \
qevent.3qt \
qfile.3qt \
qfiledialog.3qt \
@@ -61,11 +64,13 @@ qfileinfo.3qt \
qfocusdata.3qt \
qfocusevent.3qt \
qfont.3qt \
+qfontdatabase.3qt \
qfontdialog.3qt \
qfontinfo.3qt \
qfontmetrics.3qt \
qframe.3qt \
qgarray.3qt \
+qgbkcodec.3qt \
qgcache.3qt \
qgcacheiterator.3qt \
qgdict.3qt \
@@ -80,13 +85,19 @@ qglwidget.3qt \
qgrid.3qt \
qgridlayout.3qt \
qgroupbox.3qt \
+qguardedptr.3qt \
+qgvector.3qt \
qhbox.3qt \
qhboxlayout.3qt \
qhbuttongroup.3qt \
qheader.3qt \
qhgroupbox.3qt \
qhideevent.3qt \
+qicondrag.3qt \
+qicondragitem.3qt \
qiconset.3qt \
+qiconview.3qt \
+qiconviewitem.3qt \
qimage.3qt \
qimageconsumer.3qt \
qimagedecoder.3qt \
@@ -94,6 +105,7 @@ qimagedrag.3qt \
qimageformat.3qt \
qimageformattype.3qt \
qimageio.3qt \
+qinputdialog.3qt \
qintcache.3qt \
qintcacheiterator.3qt \
qintdict.3qt \
@@ -101,6 +113,8 @@ qintdictiterator.3qt \
qintvalidator.3qt \
qiodevice.3qt \
qiodevicesource.3qt \
+qjiscodec.3qt \
+qjpunicodeconv.3qt \
qkeyevent.3qt \
qlabel.3qt \
qlayout.3qt \
@@ -118,6 +132,7 @@ qlistview.3qt \
qlistviewitem.3qt \
qlistviewitemiterator.3qt \
qlnode.3qt \
+qlocalfs.3qt \
qmainwindow.3qt \
qmap.3qt \
qmapconstiterator.3qt \
@@ -125,6 +140,8 @@ qmapiterator.3qt \
qmenubar.3qt \
qmenudata.3qt \
qmessagebox.3qt \
+qmetaobject.3qt \
+qmetaproperty.3qt \
qmimesource.3qt \
qmimesourcefactory.3qt \
qmotifstyle.3qt \
@@ -132,6 +149,8 @@ qmouseevent.3qt \
qmoveevent.3qt \
qmovie.3qt \
qmultilineedit.3qt \
+qnetworkoperation.3qt \
+qnetworkprotocol.3qt \
qnpinstance.3qt \
qnplugin.3qt \
qnpstream.3qt \
@@ -167,7 +186,6 @@ qresizeevent.3qt \
qscrollbar.3qt \
qscrollview.3qt \
qsemimodal.3qt \
-qserversocket.3qt \
qsessionmanager.3qt \
qshared.3qt \
qshowevent.3qt \
@@ -178,8 +196,6 @@ qsize.3qt \
qsizegrip.3qt \
qsizepolicy.3qt \
qslider.3qt \
-qsocket.3qt \
-qsocketaddress.3qt \
qsocketnotifier.3qt \
qsortedlist.3qt \
qspaceritem.3qt \
@@ -192,6 +208,7 @@ qstrilist.3qt \
qstring.3qt \
qstringlist.3qt \
qstrlist.3qt \
+qstrlistiterator.3qt \
qstyle.3qt \
qstylesheet.3qt \
qstylesheetitem.3qt \
@@ -219,13 +236,17 @@ qtooltip.3qt \
qtooltipgroup.3qt \
qtranslator.3qt \
quridrag.3qt \
+qurl.3qt \
+qurloperator.3qt \
qvalidator.3qt \
qvaluelist.3qt \
qvaluelistconstiterator.3qt \
qvaluelistiterator.3qt \
+qvaluestack.3qt \
qvbox.3qt \
qvboxlayout.3qt \
qvbuttongroup.3qt \
+qvector.3qt \
qvgroupbox.3qt \
qwhatsthis.3qt \
qwheelevent.3qt \
diff --git a/x11-toolkits/qt22/files/patch-aa b/x11-toolkits/qt22/files/patch-aa
index 4adebbfe81c8..a18a37d486c6 100644
--- a/x11-toolkits/qt22/files/patch-aa
+++ b/x11-toolkits/qt22/files/patch-aa
@@ -1,26 +1,6 @@
---- configs/freebsd-g++-shared.orig Fri Sep 24 18:21:55 1999
-+++ configs/freebsd-g++-shared Fri Oct 1 22:07:46 1999
-@@ -1,33 +1,33 @@
- # Compiling
--SYSCONF_CXX = g++
--SYSCONF_CC = gcc
-+SYSCONF_CXX = $(SYS_CXX)
-+SYSCONF_CC = $(SYS_CC)
-
- # Compiling with support libraries
--SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_X11 = -I$(X11BASE)/include
- SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
--SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL = -I$(X11BASE)/include
-
- # Compiline YACC output
- SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
-
- # Linking with support libraries
- # X11
--SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib
+--- configs/freebsd-g++-shared.orig Thu Feb 17 01:55:56 2000
++++ configs/freebsd-g++-shared Sat Feb 26 20:25:51 2000
+@@ -16,7 +16,7 @@
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
# Qt, Qt+OpenGL
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
@@ -28,28 +8,21 @@
+SYSCONF_LIBS_QT = -lqt2
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
--SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
- SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu
- # Yacc
- SYSCONF_LIBS_YACC =
-
+ SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+@@ -27,7 +27,7 @@
# Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = $(SYS_CXX)
+ SYSCONF_LINK = g++
SYSCONF_LFLAGS =
-SYSCONF_LIBS =
+SYSCONF_LIBS = -lxpg4
# Link flags shared objects
SYSCONF_LFLAGS_SHOBJ = -shared
-@@ -40,17 +40,27 @@
- # - Place target in $(DESTDIR) - which has a trailing /
+@@ -41,16 +41,26 @@
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
#
--SYSCONF_LINK_SHLIB = g++
+ SYSCONF_LINK_SHLIB = g++
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-+SYSCONF_LINK_SHLIB = $(SYS_CXX)
+ifeq ($(PORTOBJFORMAT),elf)
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
@@ -77,14 +50,3 @@
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -61,8 +71,8 @@
- SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
- # Compiling application source
--SYSCONF_CXXFLAGS = -pipe -O2
--SYSCONF_CFLAGS = -pipe -O2
-+SYSCONF_CXXFLAGS = $(SYS_CXXFLAGS)
-+SYSCONF_CFLAGS = $(SYS_CXXFLAGS)
- # Compiling library source
- SYSCONF_CXXFLAGS_LIB = -fPIC
- SYSCONF_CFLAGS_LIB = -fPIC
diff --git a/x11-toolkits/qt22/pkg-plist b/x11-toolkits/qt22/pkg-plist
index d3e52a97f33b..64d14c7bf881 100644
--- a/x11-toolkits/qt22/pkg-plist
+++ b/x11-toolkits/qt22/pkg-plist
@@ -5,6 +5,7 @@ bin/msg2qm
bin/qt20fix
bin/qtrename140
include/qt2/jri.h
+include/qt2/jri_md.h
include/qt2/jritypes.h
include/qt2/npapi.h
include/qt2/npupp.h
@@ -18,6 +19,7 @@ include/qt2/qasciicache.h
include/qt2/qasciidict.h
include/qt2/qasyncimageio.h
include/qt2/qasyncio.h
+include/qt2/qbig5codec.h
include/qt2/qbitarray.h
include/qt2/qbitarry.h
include/qt2/qbitmap.h
@@ -59,14 +61,14 @@ include/qt2/qeuckrcodec.h
include/qt2/qevent.h
include/qt2/qfile.h
include/qt2/qfiledef.h
-include/qt2/qfiledefs.h
+include/qt2/qfiledefs_p.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/qfontdata_p.h
include/qt2/qfontdatabase.h
include/qt2/qfontdialog.h
include/qt2/qfontdta.h
@@ -76,6 +78,7 @@ include/qt2/qfontmet.h
include/qt2/qfontmetrics.h
include/qt2/qframe.h
include/qt2/qgarray.h
+include/qt2/qgbkcodec.h
include/qt2/qgcache.h
include/qt2/qgdict.h
include/qt2/qgeneric.h
@@ -83,18 +86,19 @@ 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/qguardedptr.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/qiconview.h
include/qt2/qimage.h
-include/qt2/qimageio.h
+include/qt2/qinputdialog.h
include/qt2/qintcach.h
include/qt2/qintcache.h
include/qt2/qintdict.h
@@ -107,7 +111,7 @@ include/qt2/qkeycode.h
include/qt2/qkoi8codec.h
include/qt2/qlabel.h
include/qt2/qlayout.h
-include/qt2/qlayoutengine.h
+include/qt2/qlayoutengine_p.h
include/qt2/qlcdnum.h
include/qt2/qlcdnumber.h
include/qt2/qlined.h
@@ -115,6 +119,7 @@ include/qt2/qlineedit.h
include/qt2/qlist.h
include/qt2/qlistbox.h
include/qt2/qlistview.h
+include/qt2/qlocalfs.h
include/qt2/qmainwindow.h
include/qt2/qmap.h
include/qt2/qmenubar.h
@@ -131,6 +136,7 @@ include/qt2/qmsgbox.h
include/qt2/qmultilinedit.h
include/qt2/qmultilineedit.h
include/qt2/qnamespace.h
+include/qt2/qnetworkprotocol.h
include/qt2/qnp.h
include/qt2/qobjcoll.h
include/qt2/qobjdefs.h
@@ -165,7 +171,7 @@ include/qt2/qprogbar.h
include/qt2/qprogdlg.h
include/qt2/qprogressbar.h
include/qt2/qprogressdialog.h
-include/qt2/qpsprinter.h
+include/qt2/qpsprinter_p.h
include/qt2/qpsprn.h
include/qt2/qptrdict.h
include/qt2/qpushbt.h
@@ -178,12 +184,12 @@ include/qt2/qrangect.h
include/qt2/qrect.h
include/qt2/qregexp.h
include/qt2/qregion.h
+include/qt2/qrichtext_p.h
include/qt2/qrtlcodec.h
include/qt2/qscrbar.h
include/qt2/qscrollbar.h
include/qt2/qscrollview.h
include/qt2/qsemimodal.h
-include/qt2/qserversocket.h
include/qt2/qsession.h
include/qt2/qsessionmanager.h
include/qt2/qshared.h
@@ -197,8 +203,6 @@ include/qt2/qsizepolicy.h
include/qt2/qsjiscodec.h
include/qt2/qslider.h
include/qt2/qsmartptr.h
-include/qt2/qsocket.h
-include/qt2/qsocketdevice.h
include/qt2/qsocketnotifier.h
include/qt2/qsocknot.h
include/qt2/qsortedlist.h
@@ -212,6 +216,7 @@ include/qt2/qstrlist.h
include/qt2/qstrvec.h
include/qt2/qstyle.h
include/qt2/qstylesheet.h
+include/qt2/qt_x11.h
include/qt2/qtabbar.h
include/qt2/qtabdialog.h
include/qt2/qtabdlg.h
@@ -228,15 +233,21 @@ include/qt2/qtoolbar.h
include/qt2/qtoolbutton.h
include/qt2/qtooltip.h
include/qt2/qtranslator.h
+include/qt2/qtranslatordialog.h
include/qt2/qtstream.h
+include/qt2/qurl.h
+include/qt2/qurlinfo.h
+include/qt2/qurloperator.h
include/qt2/qutfcodec.h
include/qt2/qvalidator.h
include/qt2/qvaluelist.h
+include/qt2/qvaluestack.h
+include/qt2/qvariant.h
include/qt2/qvbox.h
include/qt2/qvbuttongroup.h
include/qt2/qvector.h
include/qt2/qvgroupbox.h
-include/qt2/qwellarray.h
+include/qt2/qwellarray_p.h
include/qt2/qwhatsthis.h
include/qt2/qwidcoll.h
include/qt2/qwidget.h
@@ -249,29 +260,44 @@ include/qt2/qwindowdefs.h
include/qt2/qwindowsstyle.h
include/qt2/qwizard.h
include/qt2/qwmatrix.h
+include/qt2/qworkspace.h
include/qt2/qxt.h
+lib/libqgl.a
lib/libqt2.so
-lib/libqt2.so.%%VERSION%%
+lib/libqt2.so.3
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/doc/qt2/ANNOUNCE
share/doc/qt2/FAQ
share/doc/qt2/LICENSE.QPL
+share/doc/qt2/PORTING
share/doc/qt2/README
share/doc/qt2/README.QT
+share/doc/qt2/html/aboutqt.html
share/doc/qt2/html/abstractwidgets.html
share/doc/qt2/html/accelerators.html
share/doc/qt2/html/aclock-main-cpp.html
share/doc/qt2/html/addressbook-main-cpp.html
+share/doc/qt2/html/advanced.html
share/doc/qt2/html/annotated.html
+share/doc/qt2/html/appearance.html
+share/doc/qt2/html/appicon.html
share/doc/qt2/html/application-main-cpp.html
share/doc/qt2/html/application.html
+share/doc/qt2/html/basic.html
share/doc/qt2/html/bearings.png
share/doc/qt2/html/biff-main-cpp.html
share/doc/qt2/html/book.png
-share/doc/qt2/html/buttons_groups-main-cpp.html
+share/doc/qt2/html/bughowto.html
+share/doc/qt2/html/buttongroup-m.png
+share/doc/qt2/html/buttongroup-w.png
+share/doc/qt2/html/buttongroups-main-cpp.html
+share/doc/qt2/html/buyhowto.html
+share/doc/qt2/html/changes21.html
share/doc/qt2/html/checklists-main-cpp.html
share/doc/qt2/html/classes.html
share/doc/qt2/html/collection.html
+share/doc/qt2/html/commonproblems.html
share/doc/qt2/html/coordsys.html
share/doc/qt2/html/coordsys.png
share/doc/qt2/html/credits.html
@@ -286,62 +312,82 @@ share/doc/qt2/html/dialogs.html
share/doc/qt2/html/dirview-main-cpp.html
share/doc/qt2/html/dnd.html
share/doc/qt2/html/dochead.png
+share/doc/qt2/html/draganddrop.html
share/doc/qt2/html/drawdemo-drawdemo-cpp.html
share/doc/qt2/html/drawing.html
share/doc/qt2/html/drawlines-connect-cpp.html
share/doc/qt2/html/easteregg.html
share/doc/qt2/html/easteregg2.html
+share/doc/qt2/html/environment.html
+share/doc/qt2/html/eventsandfilters.html
share/doc/qt2/html/examples.html
+share/doc/qt2/html/fileiconview-main-cpp.html
+share/doc/qt2/html/focus.html
share/doc/qt2/html/fontmatch.html
-share/doc/qt2/html/fonts.html
share/doc/qt2/html/forever-forever-cpp.html
share/doc/qt2/html/frames.png
share/doc/qt2/html/functions.html
share/doc/qt2/html/geomanagement.html
+share/doc/qt2/html/geometry.html
+share/doc/qt2/html/geometry.png
share/doc/qt2/html/graph.g1n
share/doc/qt2/html/grapher-grapher-cpp.html
share/doc/qt2/html/gridlayout.png
+share/doc/qt2/html/groupbox-m.png
+share/doc/qt2/html/groupbox-w.png
share/doc/qt2/html/guibooks.html
share/doc/qt2/html/headers.html
share/doc/qt2/html/hello-main-cpp.html
+share/doc/qt2/html/helpsystem.html
+share/doc/qt2/html/helpviewer-main-cpp.html
share/doc/qt2/html/hierarchy.html
share/doc/qt2/html/i18n-main-cpp.html
share/doc/qt2/html/i18n.html
-share/doc/qt2/html/imageio.html
+share/doc/qt2/html/iconview-main-cpp.html
share/doc/qt2/html/images.html
+share/doc/qt2/html/index
share/doc/qt2/html/index.html
share/doc/qt2/html/io.html
-share/doc/qt2/html/kernel.html
+share/doc/qt2/html/keyfeatures21.html
share/doc/qt2/html/layout-layout-cpp.html
share/doc/qt2/html/layout.html
share/doc/qt2/html/letter.png
share/doc/qt2/html/license.html
+share/doc/qt2/html/licenses.html
share/doc/qt2/html/life-main-cpp.html
share/doc/qt2/html/lineedits-main-cpp.html
share/doc/qt2/html/listbox-main-cpp.html
-share/doc/qt2/html/listbox_combo-main-cpp.html
-share/doc/qt2/html/listview.png
+share/doc/qt2/html/listboxcombo-main-cpp.html
share/doc/qt2/html/listviews-main-cpp.html
share/doc/qt2/html/mailinglists.html
share/doc/qt2/html/mainlyMotif-editor-cpp.html
share/doc/qt2/html/mainlyQt-editor-cpp.html
share/doc/qt2/html/mainlyXt-editor-cpp.html
+share/doc/qt2/html/mainwindow-m.png
+share/doc/qt2/html/mainwindow-w.png
+share/doc/qt2/html/mdi-main-cpp.html
share/doc/qt2/html/menu-menu-cpp.html
share/doc/qt2/html/metaobjects.html
share/doc/qt2/html/misc.html
share/doc/qt2/html/moc.html
share/doc/qt2/html/movies-main-cpp.html
+share/doc/qt2/html/network.html
share/doc/qt2/html/nsplugin.html
+share/doc/qt2/html/object.html
+share/doc/qt2/html/objectmodel.html
+share/doc/qt2/html/objecttrees.html
share/doc/qt2/html/opengl.html
+share/doc/qt2/html/organizers.html
+share/doc/qt2/html/palette.png
share/doc/qt2/html/picture-picture-cpp.html
share/doc/qt2/html/pictures.html
share/doc/qt2/html/pnglogo.png
share/doc/qt2/html/popup-popup-cpp.html
share/doc/qt2/html/porting.html
share/doc/qt2/html/primes.html
-share/doc/qt2/html/printerdialog.png
share/doc/qt2/html/progress-progress-cpp.html
share/doc/qt2/html/progressbar-main-cpp.html
+share/doc/qt2/html/properties.html
share/doc/qt2/html/qabstractlayout-h.html
share/doc/qt2/html/qaccel-h.html
share/doc/qt2/html/qaccel-members.html
@@ -376,7 +422,6 @@ share/doc/qt2/html/qbitval-members.html
share/doc/qt2/html/qbitval.html
share/doc/qt2/html/qboxlayout-members.html
share/doc/qt2/html/qboxlayout.html
-share/doc/qt2/html/qbrowser-main-cpp.html
share/doc/qt2/html/qbrush-h.html
share/doc/qt2/html/qbrush-members.html
share/doc/qt2/html/qbrush.html
@@ -391,6 +436,8 @@ share/doc/qt2/html/qbutton.html
share/doc/qt2/html/qbuttongroup-h.html
share/doc/qt2/html/qbuttongroup-members.html
share/doc/qt2/html/qbuttongroup.html
+share/doc/qt2/html/qbytearray-members.html
+share/doc/qt2/html/qbytearray.html
share/doc/qt2/html/qcache-h.html
share/doc/qt2/html/qcache-members.html
share/doc/qt2/html/qcache.html
@@ -401,6 +448,8 @@ share/doc/qt2/html/qcdestyle-members.html
share/doc/qt2/html/qcdestyle.html
share/doc/qt2/html/qchar-members.html
share/doc/qt2/html/qchar.html
+share/doc/qt2/html/qcharref-members.html
+share/doc/qt2/html/qcharref.html
share/doc/qt2/html/qcheckbox-h.html
share/doc/qt2/html/qcheckbox-m.png
share/doc/qt2/html/qcheckbox-members.html
@@ -412,6 +461,7 @@ share/doc/qt2/html/qchildevent-members.html
share/doc/qt2/html/qchildevent.html
share/doc/qt2/html/qchkbox-m.png
share/doc/qt2/html/qchkbox-w.png
+share/doc/qt2/html/qclassinfo-members.html
share/doc/qt2/html/qclipboard-h.html
share/doc/qt2/html/qclipboard-members.html
share/doc/qt2/html/qclipboard.html
@@ -426,6 +476,10 @@ share/doc/qt2/html/qcolor.html
share/doc/qt2/html/qcolordialog-h.html
share/doc/qt2/html/qcolordialog-members.html
share/doc/qt2/html/qcolordialog.html
+share/doc/qt2/html/qcolordlg-m.png
+share/doc/qt2/html/qcolordlg-w.png
+share/doc/qt2/html/qcolordrag-members.html
+share/doc/qt2/html/qcolordrag.html
share/doc/qt2/html/qcolorgroup-members.html
share/doc/qt2/html/qcolorgroup.html
share/doc/qt2/html/qcombo1-m.png
@@ -453,6 +507,8 @@ share/doc/qt2/html/qcursor-members.html
share/doc/qt2/html/qcursor.html
share/doc/qt2/html/qcustomevent-members.html
share/doc/qt2/html/qcustomevent.html
+share/doc/qt2/html/qcustommenuitem-members.html
+share/doc/qt2/html/qcustommenuitem.html
share/doc/qt2/html/qdatapump-members.html
share/doc/qt2/html/qdatapump.html
share/doc/qt2/html/qdatasink-members.html
@@ -467,6 +523,8 @@ share/doc/qt2/html/qdate.html
share/doc/qt2/html/qdatetime-h.html
share/doc/qt2/html/qdatetime-members.html
share/doc/qt2/html/qdatetime.html
+share/doc/qt2/html/qdial-m.png
+share/doc/qt2/html/qdial-w.png
share/doc/qt2/html/qdialog-h.html
share/doc/qt2/html/qdialog-members.html
share/doc/qt2/html/qdialog.html
@@ -477,7 +535,6 @@ share/doc/qt2/html/qdictiterator-members.html
share/doc/qt2/html/qdictiterator.html
share/doc/qt2/html/qdir-h.html
share/doc/qt2/html/qdir-members.html
-share/doc/qt2/html/qdir-qdir-cpp.html
share/doc/qt2/html/qdir.html
share/doc/qt2/html/qdoublevalidator-members.html
share/doc/qt2/html/qdoublevalidator.html
@@ -496,6 +553,9 @@ share/doc/qt2/html/qdropevent.html
share/doc/qt2/html/qdropsite-h.html
share/doc/qt2/html/qdropsite-members.html
share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qeucjpcodec-h.html
+share/doc/qt2/html/qeucjpcodec-members.html
+share/doc/qt2/html/qeucjpcodec.html
share/doc/qt2/html/qevent-h.html
share/doc/qt2/html/qevent-members.html
share/doc/qt2/html/qevent.html
@@ -510,7 +570,6 @@ share/doc/qt2/html/qfiledlg-m.png
share/doc/qt2/html/qfiledlg-w.png
share/doc/qt2/html/qfileiconprovider-members.html
share/doc/qt2/html/qfileiconprovider.html
-share/doc/qt2/html/qfileiconview-main-cpp.html
share/doc/qt2/html/qfileinfo-h.html
share/doc/qt2/html/qfileinfo-members.html
share/doc/qt2/html/qfileinfo.html
@@ -522,9 +581,14 @@ share/doc/qt2/html/qfocusevent.html
share/doc/qt2/html/qfont-h.html
share/doc/qt2/html/qfont-members.html
share/doc/qt2/html/qfont.html
+share/doc/qt2/html/qfontdatabase-h.html
+share/doc/qt2/html/qfontdatabase-members.html
+share/doc/qt2/html/qfontdatabase.html
share/doc/qt2/html/qfontdialog-h.html
share/doc/qt2/html/qfontdialog-members.html
share/doc/qt2/html/qfontdialog.html
+share/doc/qt2/html/qfontdlg-m.png
+share/doc/qt2/html/qfontdlg-w.png
share/doc/qt2/html/qfontinfo-h.html
share/doc/qt2/html/qfontinfo-members.html
share/doc/qt2/html/qfontinfo.html
@@ -537,6 +601,9 @@ share/doc/qt2/html/qframe.html
share/doc/qt2/html/qgarray-h.html
share/doc/qt2/html/qgarray-members.html
share/doc/qt2/html/qgarray.html
+share/doc/qt2/html/qgbkcodec-h.html
+share/doc/qt2/html/qgbkcodec-members.html
+share/doc/qt2/html/qgbkcodec.html
share/doc/qt2/html/qgcache-h.html
share/doc/qt2/html/qgcache-members.html
share/doc/qt2/html/qgcache.html
@@ -577,6 +644,12 @@ share/doc/qt2/html/qgroupbox-members.html
share/doc/qt2/html/qgroupbox.html
share/doc/qt2/html/qgrpbox-m.png
share/doc/qt2/html/qgrpbox-w.png
+share/doc/qt2/html/qguardedptr-h.html
+share/doc/qt2/html/qguardedptr-members.html
+share/doc/qt2/html/qguardedptr.html
+share/doc/qt2/html/qgvector-h.html
+share/doc/qt2/html/qgvector-members.html
+share/doc/qt2/html/qgvector.html
share/doc/qt2/html/qhbox-h.html
share/doc/qt2/html/qhbox-m.png
share/doc/qt2/html/qhbox-members.html
@@ -598,10 +671,20 @@ share/doc/qt2/html/qhgroupbox-members.html
share/doc/qt2/html/qhgroupbox.html
share/doc/qt2/html/qhideevent-members.html
share/doc/qt2/html/qhideevent.html
+share/doc/qt2/html/qicondrag-members.html
+share/doc/qt2/html/qicondrag.html
+share/doc/qt2/html/qicondragitem-members.html
+share/doc/qt2/html/qicondragitem.html
share/doc/qt2/html/qiconset-h.html
share/doc/qt2/html/qiconset-members.html
share/doc/qt2/html/qiconset.html
-share/doc/qt2/html/qiconview-main-cpp.html
+share/doc/qt2/html/qiconview-h.html
+share/doc/qt2/html/qiconview-m.png
+share/doc/qt2/html/qiconview-members.html
+share/doc/qt2/html/qiconview-w.png
+share/doc/qt2/html/qiconview.html
+share/doc/qt2/html/qiconviewitem-members.html
+share/doc/qt2/html/qiconviewitem.html
share/doc/qt2/html/qimage-h.html
share/doc/qt2/html/qimage-members.html
share/doc/qt2/html/qimage.html
@@ -617,6 +700,9 @@ share/doc/qt2/html/qimageformattype-members.html
share/doc/qt2/html/qimageformattype.html
share/doc/qt2/html/qimageio-members.html
share/doc/qt2/html/qimageio.html
+share/doc/qt2/html/qinputdialog-h.html
+share/doc/qt2/html/qinputdialog-members.html
+share/doc/qt2/html/qinputdialog.html
share/doc/qt2/html/qintcache-h.html
share/doc/qt2/html/qintcache-members.html
share/doc/qt2/html/qintcache.html
@@ -634,6 +720,12 @@ share/doc/qt2/html/qiodevice-members.html
share/doc/qt2/html/qiodevice.html
share/doc/qt2/html/qiodevicesource-members.html
share/doc/qt2/html/qiodevicesource.html
+share/doc/qt2/html/qjiscodec-h.html
+share/doc/qt2/html/qjiscodec-members.html
+share/doc/qt2/html/qjiscodec.html
+share/doc/qt2/html/qjpunicode-h.html
+share/doc/qt2/html/qjpunicodeconv-members.html
+share/doc/qt2/html/qjpunicodeconv.html
share/doc/qt2/html/qkeyevent-members.html
share/doc/qt2/html/qkeyevent.html
share/doc/qt2/html/qlabel-h.html
@@ -675,7 +767,9 @@ share/doc/qt2/html/qlistboxtext.html
share/doc/qt2/html/qlistiterator-members.html
share/doc/qt2/html/qlistiterator.html
share/doc/qt2/html/qlistview-h.html
+share/doc/qt2/html/qlistview-m.png
share/doc/qt2/html/qlistview-members.html
+share/doc/qt2/html/qlistview-w.png
share/doc/qt2/html/qlistview.html
share/doc/qt2/html/qlistviewitem-members.html
share/doc/qt2/html/qlistviewitem.html
@@ -683,6 +777,9 @@ share/doc/qt2/html/qlistviewitemiterator-members.html
share/doc/qt2/html/qlistviewitemiterator.html
share/doc/qt2/html/qlnode-members.html
share/doc/qt2/html/qlnode.html
+share/doc/qt2/html/qlocalfs-h.html
+share/doc/qt2/html/qlocalfs-members.html
+share/doc/qt2/html/qlocalfs.html
share/doc/qt2/html/qmag-qmag-cpp.html
share/doc/qt2/html/qmainwindow-h.html
share/doc/qt2/html/qmainwindow-m.png
@@ -707,6 +804,12 @@ share/doc/qt2/html/qmenudata.html
share/doc/qt2/html/qmessagebox-h.html
share/doc/qt2/html/qmessagebox-members.html
share/doc/qt2/html/qmessagebox.html
+share/doc/qt2/html/qmetadata-members.html
+share/doc/qt2/html/qmetaobject-h.html
+share/doc/qt2/html/qmetaobject-members.html
+share/doc/qt2/html/qmetaobject.html
+share/doc/qt2/html/qmetaproperty-members.html
+share/doc/qt2/html/qmetaproperty.html
share/doc/qt2/html/qmime-h.html
share/doc/qt2/html/qmimesource-members.html
share/doc/qt2/html/qmimesource.html
@@ -732,6 +835,11 @@ share/doc/qt2/html/qmultilineedit-members.html
share/doc/qt2/html/qmultilineedit.html
share/doc/qt2/html/qnamespace-h.html
share/doc/qt2/html/qnetworkegg.html
+share/doc/qt2/html/qnetworkoperation-members.html
+share/doc/qt2/html/qnetworkoperation.html
+share/doc/qt2/html/qnetworkprotocol-h.html
+share/doc/qt2/html/qnetworkprotocol-members.html
+share/doc/qt2/html/qnetworkprotocol.html
share/doc/qt2/html/qnp-h.html
share/doc/qt2/html/qnpinstance-members.html
share/doc/qt2/html/qnpinstance.html
@@ -782,11 +890,16 @@ share/doc/qt2/html/qpoint.html
share/doc/qt2/html/qpointarray-h.html
share/doc/qt2/html/qpointarray-members.html
share/doc/qt2/html/qpointarray.html
+share/doc/qt2/html/qpopmenu-fancy.png
share/doc/qt2/html/qpopmenu-m.png
share/doc/qt2/html/qpopmenu-w.png
share/doc/qt2/html/qpopupmenu-h.html
share/doc/qt2/html/qpopupmenu-members.html
share/doc/qt2/html/qpopupmenu.html
+share/doc/qt2/html/qprintdialog-h.html
+share/doc/qt2/html/qprintdialog-members.html
+share/doc/qt2/html/qprintdlg-m.png
+share/doc/qt2/html/qprintdlg-w.png
share/doc/qt2/html/qprinter-h.html
share/doc/qt2/html/qprinter-members.html
share/doc/qt2/html/qprinter.html
@@ -848,9 +961,6 @@ share/doc/qt2/html/qscrollview.html
share/doc/qt2/html/qsemimodal-h.html
share/doc/qt2/html/qsemimodal-members.html
share/doc/qt2/html/qsemimodal.html
-share/doc/qt2/html/qserversocket-h.html
-share/doc/qt2/html/qserversocket-members.html
-share/doc/qt2/html/qserversocket.html
share/doc/qt2/html/qsessionmanager-h.html
share/doc/qt2/html/qsessionmanager-members.html
share/doc/qt2/html/qsessionmanager.html
@@ -872,7 +982,9 @@ share/doc/qt2/html/qsize-h.html
share/doc/qt2/html/qsize-members.html
share/doc/qt2/html/qsize.html
share/doc/qt2/html/qsizegrip-h.html
+share/doc/qt2/html/qsizegrip-m.png
share/doc/qt2/html/qsizegrip-members.html
+share/doc/qt2/html/qsizegrip-w.png
share/doc/qt2/html/qsizegrip.html
share/doc/qt2/html/qsizepolicy-h.html
share/doc/qt2/html/qsizepolicy-members.html
@@ -882,12 +994,6 @@ share/doc/qt2/html/qslider-m.png
share/doc/qt2/html/qslider-members.html
share/doc/qt2/html/qslider-w.png
share/doc/qt2/html/qslider.html
-share/doc/qt2/html/qsocket-h.html
-share/doc/qt2/html/qsocket-members.html
-share/doc/qt2/html/qsocket.html
-share/doc/qt2/html/qsocketaddress-members.html
-share/doc/qt2/html/qsocketaddress.html
-share/doc/qt2/html/qsocketdevice-h.html
share/doc/qt2/html/qsocketnotifier-h.html
share/doc/qt2/html/qsocketnotifier-members.html
share/doc/qt2/html/qsocketnotifier.html
@@ -901,6 +1007,8 @@ share/doc/qt2/html/qspinbox-m.png
share/doc/qt2/html/qspinbox-members.html
share/doc/qt2/html/qspinbox-w.png
share/doc/qt2/html/qspinbox.html
+share/doc/qt2/html/qspinbox2-m.png
+share/doc/qt2/html/qspinbox2-w.png
share/doc/qt2/html/qsplitter-h.html
share/doc/qt2/html/qsplitter-m.png
share/doc/qt2/html/qsplitter-members.html
@@ -927,6 +1035,8 @@ share/doc/qt2/html/qstringlist.html
share/doc/qt2/html/qstrlist-h.html
share/doc/qt2/html/qstrlist-members.html
share/doc/qt2/html/qstrlist.html
+share/doc/qt2/html/qstrlistiterator-members.html
+share/doc/qt2/html/qstrlistiterator.html
share/doc/qt2/html/qstyle-h.html
share/doc/qt2/html/qstyle-members.html
share/doc/qt2/html/qstyle.html
@@ -955,10 +1065,14 @@ share/doc/qt2/html/qtableview.html
share/doc/qt2/html/qtablevw-m.png
share/doc/qt2/html/qtablevw-w.png
share/doc/qt2/html/qtabwidget-h.html
+share/doc/qt2/html/qtabwidget-m.png
share/doc/qt2/html/qtabwidget-members.html
+share/doc/qt2/html/qtabwidget-w.png
share/doc/qt2/html/qtabwidget.html
share/doc/qt2/html/qtextbrowser-h.html
+share/doc/qt2/html/qtextbrowser-m.png
share/doc/qt2/html/qtextbrowser-members.html
+share/doc/qt2/html/qtextbrowser-w.png
share/doc/qt2/html/qtextbrowser.html
share/doc/qt2/html/qtextcodec-h.html
share/doc/qt2/html/qtextcodec-members.html
@@ -1005,6 +1119,15 @@ share/doc/qt2/html/qtranslator-members.html
share/doc/qt2/html/qtranslator.html
share/doc/qt2/html/quridrag-members.html
share/doc/qt2/html/quridrag.html
+share/doc/qt2/html/qurl-h.html
+share/doc/qt2/html/qurl-members.html
+share/doc/qt2/html/qurl.html
+share/doc/qt2/html/qurlinfo-h.html
+share/doc/qt2/html/qurlinfo-members.html
+share/doc/qt2/html/qurlinfo.html
+share/doc/qt2/html/qurloperator-h.html
+share/doc/qt2/html/qurloperator-members.html
+share/doc/qt2/html/qurloperator.html
share/doc/qt2/html/qvalidator-h.html
share/doc/qt2/html/qvalidator-members.html
share/doc/qt2/html/qvalidator.html
@@ -1015,6 +1138,10 @@ share/doc/qt2/html/qvaluelistconstiterator-members.html
share/doc/qt2/html/qvaluelistconstiterator.html
share/doc/qt2/html/qvaluelistiterator-members.html
share/doc/qt2/html/qvaluelistiterator.html
+share/doc/qt2/html/qvaluestack-h.html
+share/doc/qt2/html/qvaluestack-members.html
+share/doc/qt2/html/qvaluestack.html
+share/doc/qt2/html/qvariant-h.html
share/doc/qt2/html/qvbox-h.html
share/doc/qt2/html/qvbox-m.png
share/doc/qt2/html/qvbox-members.html
@@ -1026,6 +1153,9 @@ share/doc/qt2/html/qvboxlayout.html
share/doc/qt2/html/qvbuttongroup-h.html
share/doc/qt2/html/qvbuttongroup-members.html
share/doc/qt2/html/qvbuttongroup.html
+share/doc/qt2/html/qvector-h.html
+share/doc/qt2/html/qvector-members.html
+share/doc/qt2/html/qvector.html
share/doc/qt2/html/qvgroupbox-h.html
share/doc/qt2/html/qvgroupbox-members.html
share/doc/qt2/html/qvgroupbox.html
@@ -1058,11 +1188,13 @@ share/doc/qt2/html/qxtapplication-members.html
share/doc/qt2/html/qxtapplication.html
share/doc/qt2/html/qxtwidget-members.html
share/doc/qt2/html/qxtwidget.html
-share/doc/qt2/html/rangecontrols-main-cpp.html
-share/doc/qt2/html/realwidgets.html
share/doc/qt2/html/removed20.html
share/doc/qt2/html/richtext-main-cpp.html
+share/doc/qt2/html/rintersect.png
share/doc/qt2/html/rot13-rot13-cpp.html
+share/doc/qt2/html/rsubtract.png
+share/doc/qt2/html/runion.png
+share/doc/qt2/html/rxor.png
share/doc/qt2/html/scribble-main-cpp.html
share/doc/qt2/html/scrollview-scrollview-cpp.html
share/doc/qt2/html/session.html
@@ -1070,8 +1202,12 @@ share/doc/qt2/html/session.png
share/doc/qt2/html/shared.html
share/doc/qt2/html/shclass.html
share/doc/qt2/html/showimg-main-cpp.html
+share/doc/qt2/html/signalsandslots.html
share/doc/qt2/html/simple-application.html
+share/doc/qt2/html/sound.html
share/doc/qt2/html/splitter-splitter-cpp.html
+share/doc/qt2/html/splitter-views-m.png
+share/doc/qt2/html/splitter-views-w.png
share/doc/qt2/html/t1.html
share/doc/qt2/html/t1.png
share/doc/qt2/html/t10-cannon-cpp.html
@@ -1152,23 +1288,25 @@ share/doc/qt2/html/t9.html
share/doc/qt2/html/t9.png
share/doc/qt2/html/t9_1.png
share/doc/qt2/html/t9_2.png
-share/doc/qt2/html/tabdialog-tabdialog-cpp.html
+share/doc/qt2/html/tabdialog-main-cpp.html
share/doc/qt2/html/table-main-cpp.html
share/doc/qt2/html/test.png
share/doc/qt2/html/tetrix-tetrix-cpp.html
share/doc/qt2/html/themes-main-cpp.html
share/doc/qt2/html/tictac-main-cpp.html
share/doc/qt2/html/time.html
+share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
share/doc/qt2/html/tools.html
share/doc/qt2/html/tooltip-main-cpp.html
share/doc/qt2/html/topicals.html
-share/doc/qt2/html/treeview.png
share/doc/qt2/html/trivial-trivial-cpp.html
share/doc/qt2/html/troll.html
share/doc/qt2/html/ttlogo-small.jpg
share/doc/qt2/html/ttlogo-small.png
share/doc/qt2/html/tutorial.html
share/doc/qt2/html/tutorial.png
+share/doc/qt2/html/unicode.html
share/doc/qt2/html/validator-main-cpp.html
share/doc/qt2/html/whatsthis.png
share/doc/qt2/html/wizard-main-cpp.html
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index db92bfb31301..aab47b0ecd25 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -1,71 +1,78 @@
-# New ports collection makefile for: qt20
-# Version required: 2.0.2
+# New ports collection makefile for: qt21
+# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
-# Whom: imura@cs.titech.ac.jp
+# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-2.0.2
+DISTNAME= qt-x11-2.1.0-beta2
+PKGNAME= qt-2.1.0b2
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
-
-FORBIDDEN= repository copied, awaiting upgrade
+LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ MesaGL.14:${PORTSDIR}/graphics/Mesa3
NO_LATEST_LINK= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_NEWGCC= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -system-zlib -system-libpng \
- -I${LOCALBASE}/include -L${LOCALBASE}/lib -lxpg4
+CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg \
+ -I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= QTDIR=${WRKSRC}
-MAKE_ENV+= QTDIR=${WRKSRC} SYS_CXX=${CXX} SYS_CC=${CC} SYS_CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV= QTDIR=${WRKSRC}
-.include <bsd.port.pre.mk>
+WRKSRC= ${WRKDIR}/qt-2.1.0-beta2
+CONFIG= ${WRKSRC}/configs/freebsd-g++-shared
.if defined(QT_GIF_AVAILABLE)
CONFIGURE_ARGS+=-gif
RESTRICTED= 'Requires a license from UNISYS'
.endif
-USE_NEWGCC= YES
-
-.if ${PORTOBJFORMAT} == "elf"
-VERSION= 2
-.else
-VERSION= 2.02
+.if !defined(NOPORTDOCS)
+.include "files/manpages"
.endif
-PLIST_SUB= VERSION=${VERSION}
-.include "files/manpages"
+pre-configure:
+ @${PERL} -pi -e "s,gcc,${CC},g" ${CONFIG}
+ @${PERL} -pi -e "s,g\+\+,${CXX},g" ${CONFIG}
+ @${PERL} -pi -e "s,/usr/X11R6,${X11BASE},g" ${CONFIG}
+ @${PERL} -pi -e "s,-pipe -O2,${CXXFLAGS},g" ${CONFIG}
+
+post-configure:
+ @(cd ${WRKSRC} ; ${GMAKE} symlinks)
do-install:
- @(cd ${WRKSRC} ; \
+ ${MKDIR} ${PREFIX}/include/qt2
+ (cd ${WRKSRC} ; \
${INSTALL_PROGRAM} bin/mergetr ${PREFIX}/bin ; \
${INSTALL_PROGRAM} bin/moc ${PREFIX}/bin/moc2 ; \
${INSTALL_PROGRAM} bin/msg2qm ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/findtr ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qt20fix ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qtrename140 ${PREFIX}/bin ; \
- ${INSTALL_DATA} 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/qt2 ; \
${INSTALL_DATA} include/*.h ${PREFIX}/include/qt2 ; \
- ${INSTALL_MAN} man/man1/moc.1 ${PREFIX}/man/man1/moc2.1 ; \
- ${INSTALL_MAN} man/man3/q* ${PREFIX}/man/man3 )
+ ${INSTALL_DATA} lib/libqgl.a ${PREFIX}/lib ; \
+ ${INSTALL_DATA} lib/libqt2.so.3 ${PREFIX}/lib )
+ ${LN} -sf libqt2.so.3 ${PREFIX}/lib/libqt2.so
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.if !defined(NOPORTDOCS)
- @(cd ${WRKSRC} ; \
- ${MKDIR} ${PREFIX}/share/doc/qt2/html ; \
+ ${MKDIR} ${PREFIX}/share/doc/qt2/html
+ (cd ${WRKSRC} ; \
+ ${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} LICENSE.QPL ${PREFIX}/share/doc/qt2 ; \
+ ${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
- ${INSTALL_DATA} doc/* ${PREFIX}/share/doc/qt2/html )
+ ${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
+ ${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt23/distinfo b/x11-toolkits/qt23/distinfo
index 27fdd45446a6..790ea1c64f91 100644
--- a/x11-toolkits/qt23/distinfo
+++ b/x11-toolkits/qt23/distinfo
@@ -1 +1 @@
-MD5 (qt-2.0.2.tar.gz) = afeaf554f538b415a2f46ff6b36657f4
+MD5 (qt-x11-2.1.0-beta2.tar.gz) = 953df8b8c324c4723b2d0ee342e6526a
diff --git a/x11-toolkits/qt23/files/manpages b/x11-toolkits/qt23/files/manpages
index 6b77b5e17666..de362d100114 100644
--- a/x11-toolkits/qt23/files/manpages
+++ b/x11-toolkits/qt23/files/manpages
@@ -1,4 +1,3 @@
-MAN1= moc2.1
MAN3= \
qaccel.3qt \
qapplication.3qt \
@@ -16,10 +15,12 @@ qbrush.3qt \
qbuffer.3qt \
qbutton.3qt \
qbuttongroup.3qt \
+qbytearray.3qt \
qcache.3qt \
qcacheiterator.3qt \
qcdestyle.3qt \
qchar.3qt \
+qcharref.3qt \
qcheckbox.3qt \
qchecklistitem.3qt \
qchildevent.3qt \
@@ -28,14 +29,15 @@ qcloseevent.3qt \
qcollection.3qt \
qcolor.3qt \
qcolordialog.3qt \
+qcolordrag.3qt \
qcolorgroup.3qt \
qcombobox.3qt \
qcommonstyle.3qt \
-qconnection.3qt \
qconststring.3qt \
qcstring.3qt \
qcursor.3qt \
qcustomevent.3qt \
+qcustommenuitem.3qt \
qdatapump.3qt \
qdatasink.3qt \
qdatasource.3qt \
@@ -53,6 +55,7 @@ qdragmoveevent.3qt \
qdragobject.3qt \
qdropevent.3qt \
qdropsite.3qt \
+qeucjpcodec.3qt \
qevent.3qt \
qfile.3qt \
qfiledialog.3qt \
@@ -61,11 +64,13 @@ qfileinfo.3qt \
qfocusdata.3qt \
qfocusevent.3qt \
qfont.3qt \
+qfontdatabase.3qt \
qfontdialog.3qt \
qfontinfo.3qt \
qfontmetrics.3qt \
qframe.3qt \
qgarray.3qt \
+qgbkcodec.3qt \
qgcache.3qt \
qgcacheiterator.3qt \
qgdict.3qt \
@@ -80,13 +85,19 @@ qglwidget.3qt \
qgrid.3qt \
qgridlayout.3qt \
qgroupbox.3qt \
+qguardedptr.3qt \
+qgvector.3qt \
qhbox.3qt \
qhboxlayout.3qt \
qhbuttongroup.3qt \
qheader.3qt \
qhgroupbox.3qt \
qhideevent.3qt \
+qicondrag.3qt \
+qicondragitem.3qt \
qiconset.3qt \
+qiconview.3qt \
+qiconviewitem.3qt \
qimage.3qt \
qimageconsumer.3qt \
qimagedecoder.3qt \
@@ -94,6 +105,7 @@ qimagedrag.3qt \
qimageformat.3qt \
qimageformattype.3qt \
qimageio.3qt \
+qinputdialog.3qt \
qintcache.3qt \
qintcacheiterator.3qt \
qintdict.3qt \
@@ -101,6 +113,8 @@ qintdictiterator.3qt \
qintvalidator.3qt \
qiodevice.3qt \
qiodevicesource.3qt \
+qjiscodec.3qt \
+qjpunicodeconv.3qt \
qkeyevent.3qt \
qlabel.3qt \
qlayout.3qt \
@@ -118,6 +132,7 @@ qlistview.3qt \
qlistviewitem.3qt \
qlistviewitemiterator.3qt \
qlnode.3qt \
+qlocalfs.3qt \
qmainwindow.3qt \
qmap.3qt \
qmapconstiterator.3qt \
@@ -125,6 +140,8 @@ qmapiterator.3qt \
qmenubar.3qt \
qmenudata.3qt \
qmessagebox.3qt \
+qmetaobject.3qt \
+qmetaproperty.3qt \
qmimesource.3qt \
qmimesourcefactory.3qt \
qmotifstyle.3qt \
@@ -132,6 +149,8 @@ qmouseevent.3qt \
qmoveevent.3qt \
qmovie.3qt \
qmultilineedit.3qt \
+qnetworkoperation.3qt \
+qnetworkprotocol.3qt \
qnpinstance.3qt \
qnplugin.3qt \
qnpstream.3qt \
@@ -167,7 +186,6 @@ qresizeevent.3qt \
qscrollbar.3qt \
qscrollview.3qt \
qsemimodal.3qt \
-qserversocket.3qt \
qsessionmanager.3qt \
qshared.3qt \
qshowevent.3qt \
@@ -178,8 +196,6 @@ qsize.3qt \
qsizegrip.3qt \
qsizepolicy.3qt \
qslider.3qt \
-qsocket.3qt \
-qsocketaddress.3qt \
qsocketnotifier.3qt \
qsortedlist.3qt \
qspaceritem.3qt \
@@ -192,6 +208,7 @@ qstrilist.3qt \
qstring.3qt \
qstringlist.3qt \
qstrlist.3qt \
+qstrlistiterator.3qt \
qstyle.3qt \
qstylesheet.3qt \
qstylesheetitem.3qt \
@@ -219,13 +236,17 @@ qtooltip.3qt \
qtooltipgroup.3qt \
qtranslator.3qt \
quridrag.3qt \
+qurl.3qt \
+qurloperator.3qt \
qvalidator.3qt \
qvaluelist.3qt \
qvaluelistconstiterator.3qt \
qvaluelistiterator.3qt \
+qvaluestack.3qt \
qvbox.3qt \
qvboxlayout.3qt \
qvbuttongroup.3qt \
+qvector.3qt \
qvgroupbox.3qt \
qwhatsthis.3qt \
qwheelevent.3qt \
diff --git a/x11-toolkits/qt23/files/patch-aa b/x11-toolkits/qt23/files/patch-aa
index 4adebbfe81c8..a18a37d486c6 100644
--- a/x11-toolkits/qt23/files/patch-aa
+++ b/x11-toolkits/qt23/files/patch-aa
@@ -1,26 +1,6 @@
---- configs/freebsd-g++-shared.orig Fri Sep 24 18:21:55 1999
-+++ configs/freebsd-g++-shared Fri Oct 1 22:07:46 1999
-@@ -1,33 +1,33 @@
- # Compiling
--SYSCONF_CXX = g++
--SYSCONF_CC = gcc
-+SYSCONF_CXX = $(SYS_CXX)
-+SYSCONF_CC = $(SYS_CC)
-
- # Compiling with support libraries
--SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_X11 = -I$(X11BASE)/include
- SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
--SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL = -I$(X11BASE)/include
-
- # Compiline YACC output
- SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
-
- # Linking with support libraries
- # X11
--SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib
+--- configs/freebsd-g++-shared.orig Thu Feb 17 01:55:56 2000
++++ configs/freebsd-g++-shared Sat Feb 26 20:25:51 2000
+@@ -16,7 +16,7 @@
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
# Qt, Qt+OpenGL
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
@@ -28,28 +8,21 @@
+SYSCONF_LIBS_QT = -lqt2
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
--SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
- SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu
- # Yacc
- SYSCONF_LIBS_YACC =
-
+ SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+@@ -27,7 +27,7 @@
# Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = $(SYS_CXX)
+ SYSCONF_LINK = g++
SYSCONF_LFLAGS =
-SYSCONF_LIBS =
+SYSCONF_LIBS = -lxpg4
# Link flags shared objects
SYSCONF_LFLAGS_SHOBJ = -shared
-@@ -40,17 +40,27 @@
- # - Place target in $(DESTDIR) - which has a trailing /
+@@ -41,16 +41,26 @@
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
#
--SYSCONF_LINK_SHLIB = g++
+ SYSCONF_LINK_SHLIB = g++
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-+SYSCONF_LINK_SHLIB = $(SYS_CXX)
+ifeq ($(PORTOBJFORMAT),elf)
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
@@ -77,14 +50,3 @@
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -61,8 +71,8 @@
- SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
- # Compiling application source
--SYSCONF_CXXFLAGS = -pipe -O2
--SYSCONF_CFLAGS = -pipe -O2
-+SYSCONF_CXXFLAGS = $(SYS_CXXFLAGS)
-+SYSCONF_CFLAGS = $(SYS_CXXFLAGS)
- # Compiling library source
- SYSCONF_CXXFLAGS_LIB = -fPIC
- SYSCONF_CFLAGS_LIB = -fPIC
diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist
index d3e52a97f33b..64d14c7bf881 100644
--- a/x11-toolkits/qt23/pkg-plist
+++ b/x11-toolkits/qt23/pkg-plist
@@ -5,6 +5,7 @@ bin/msg2qm
bin/qt20fix
bin/qtrename140
include/qt2/jri.h
+include/qt2/jri_md.h
include/qt2/jritypes.h
include/qt2/npapi.h
include/qt2/npupp.h
@@ -18,6 +19,7 @@ include/qt2/qasciicache.h
include/qt2/qasciidict.h
include/qt2/qasyncimageio.h
include/qt2/qasyncio.h
+include/qt2/qbig5codec.h
include/qt2/qbitarray.h
include/qt2/qbitarry.h
include/qt2/qbitmap.h
@@ -59,14 +61,14 @@ include/qt2/qeuckrcodec.h
include/qt2/qevent.h
include/qt2/qfile.h
include/qt2/qfiledef.h
-include/qt2/qfiledefs.h
+include/qt2/qfiledefs_p.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/qfontdata_p.h
include/qt2/qfontdatabase.h
include/qt2/qfontdialog.h
include/qt2/qfontdta.h
@@ -76,6 +78,7 @@ include/qt2/qfontmet.h
include/qt2/qfontmetrics.h
include/qt2/qframe.h
include/qt2/qgarray.h
+include/qt2/qgbkcodec.h
include/qt2/qgcache.h
include/qt2/qgdict.h
include/qt2/qgeneric.h
@@ -83,18 +86,19 @@ 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/qguardedptr.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/qiconview.h
include/qt2/qimage.h
-include/qt2/qimageio.h
+include/qt2/qinputdialog.h
include/qt2/qintcach.h
include/qt2/qintcache.h
include/qt2/qintdict.h
@@ -107,7 +111,7 @@ include/qt2/qkeycode.h
include/qt2/qkoi8codec.h
include/qt2/qlabel.h
include/qt2/qlayout.h
-include/qt2/qlayoutengine.h
+include/qt2/qlayoutengine_p.h
include/qt2/qlcdnum.h
include/qt2/qlcdnumber.h
include/qt2/qlined.h
@@ -115,6 +119,7 @@ include/qt2/qlineedit.h
include/qt2/qlist.h
include/qt2/qlistbox.h
include/qt2/qlistview.h
+include/qt2/qlocalfs.h
include/qt2/qmainwindow.h
include/qt2/qmap.h
include/qt2/qmenubar.h
@@ -131,6 +136,7 @@ include/qt2/qmsgbox.h
include/qt2/qmultilinedit.h
include/qt2/qmultilineedit.h
include/qt2/qnamespace.h
+include/qt2/qnetworkprotocol.h
include/qt2/qnp.h
include/qt2/qobjcoll.h
include/qt2/qobjdefs.h
@@ -165,7 +171,7 @@ include/qt2/qprogbar.h
include/qt2/qprogdlg.h
include/qt2/qprogressbar.h
include/qt2/qprogressdialog.h
-include/qt2/qpsprinter.h
+include/qt2/qpsprinter_p.h
include/qt2/qpsprn.h
include/qt2/qptrdict.h
include/qt2/qpushbt.h
@@ -178,12 +184,12 @@ include/qt2/qrangect.h
include/qt2/qrect.h
include/qt2/qregexp.h
include/qt2/qregion.h
+include/qt2/qrichtext_p.h
include/qt2/qrtlcodec.h
include/qt2/qscrbar.h
include/qt2/qscrollbar.h
include/qt2/qscrollview.h
include/qt2/qsemimodal.h
-include/qt2/qserversocket.h
include/qt2/qsession.h
include/qt2/qsessionmanager.h
include/qt2/qshared.h
@@ -197,8 +203,6 @@ include/qt2/qsizepolicy.h
include/qt2/qsjiscodec.h
include/qt2/qslider.h
include/qt2/qsmartptr.h
-include/qt2/qsocket.h
-include/qt2/qsocketdevice.h
include/qt2/qsocketnotifier.h
include/qt2/qsocknot.h
include/qt2/qsortedlist.h
@@ -212,6 +216,7 @@ include/qt2/qstrlist.h
include/qt2/qstrvec.h
include/qt2/qstyle.h
include/qt2/qstylesheet.h
+include/qt2/qt_x11.h
include/qt2/qtabbar.h
include/qt2/qtabdialog.h
include/qt2/qtabdlg.h
@@ -228,15 +233,21 @@ include/qt2/qtoolbar.h
include/qt2/qtoolbutton.h
include/qt2/qtooltip.h
include/qt2/qtranslator.h
+include/qt2/qtranslatordialog.h
include/qt2/qtstream.h
+include/qt2/qurl.h
+include/qt2/qurlinfo.h
+include/qt2/qurloperator.h
include/qt2/qutfcodec.h
include/qt2/qvalidator.h
include/qt2/qvaluelist.h
+include/qt2/qvaluestack.h
+include/qt2/qvariant.h
include/qt2/qvbox.h
include/qt2/qvbuttongroup.h
include/qt2/qvector.h
include/qt2/qvgroupbox.h
-include/qt2/qwellarray.h
+include/qt2/qwellarray_p.h
include/qt2/qwhatsthis.h
include/qt2/qwidcoll.h
include/qt2/qwidget.h
@@ -249,29 +260,44 @@ include/qt2/qwindowdefs.h
include/qt2/qwindowsstyle.h
include/qt2/qwizard.h
include/qt2/qwmatrix.h
+include/qt2/qworkspace.h
include/qt2/qxt.h
+lib/libqgl.a
lib/libqt2.so
-lib/libqt2.so.%%VERSION%%
+lib/libqt2.so.3
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/doc/qt2/ANNOUNCE
share/doc/qt2/FAQ
share/doc/qt2/LICENSE.QPL
+share/doc/qt2/PORTING
share/doc/qt2/README
share/doc/qt2/README.QT
+share/doc/qt2/html/aboutqt.html
share/doc/qt2/html/abstractwidgets.html
share/doc/qt2/html/accelerators.html
share/doc/qt2/html/aclock-main-cpp.html
share/doc/qt2/html/addressbook-main-cpp.html
+share/doc/qt2/html/advanced.html
share/doc/qt2/html/annotated.html
+share/doc/qt2/html/appearance.html
+share/doc/qt2/html/appicon.html
share/doc/qt2/html/application-main-cpp.html
share/doc/qt2/html/application.html
+share/doc/qt2/html/basic.html
share/doc/qt2/html/bearings.png
share/doc/qt2/html/biff-main-cpp.html
share/doc/qt2/html/book.png
-share/doc/qt2/html/buttons_groups-main-cpp.html
+share/doc/qt2/html/bughowto.html
+share/doc/qt2/html/buttongroup-m.png
+share/doc/qt2/html/buttongroup-w.png
+share/doc/qt2/html/buttongroups-main-cpp.html
+share/doc/qt2/html/buyhowto.html
+share/doc/qt2/html/changes21.html
share/doc/qt2/html/checklists-main-cpp.html
share/doc/qt2/html/classes.html
share/doc/qt2/html/collection.html
+share/doc/qt2/html/commonproblems.html
share/doc/qt2/html/coordsys.html
share/doc/qt2/html/coordsys.png
share/doc/qt2/html/credits.html
@@ -286,62 +312,82 @@ share/doc/qt2/html/dialogs.html
share/doc/qt2/html/dirview-main-cpp.html
share/doc/qt2/html/dnd.html
share/doc/qt2/html/dochead.png
+share/doc/qt2/html/draganddrop.html
share/doc/qt2/html/drawdemo-drawdemo-cpp.html
share/doc/qt2/html/drawing.html
share/doc/qt2/html/drawlines-connect-cpp.html
share/doc/qt2/html/easteregg.html
share/doc/qt2/html/easteregg2.html
+share/doc/qt2/html/environment.html
+share/doc/qt2/html/eventsandfilters.html
share/doc/qt2/html/examples.html
+share/doc/qt2/html/fileiconview-main-cpp.html
+share/doc/qt2/html/focus.html
share/doc/qt2/html/fontmatch.html
-share/doc/qt2/html/fonts.html
share/doc/qt2/html/forever-forever-cpp.html
share/doc/qt2/html/frames.png
share/doc/qt2/html/functions.html
share/doc/qt2/html/geomanagement.html
+share/doc/qt2/html/geometry.html
+share/doc/qt2/html/geometry.png
share/doc/qt2/html/graph.g1n
share/doc/qt2/html/grapher-grapher-cpp.html
share/doc/qt2/html/gridlayout.png
+share/doc/qt2/html/groupbox-m.png
+share/doc/qt2/html/groupbox-w.png
share/doc/qt2/html/guibooks.html
share/doc/qt2/html/headers.html
share/doc/qt2/html/hello-main-cpp.html
+share/doc/qt2/html/helpsystem.html
+share/doc/qt2/html/helpviewer-main-cpp.html
share/doc/qt2/html/hierarchy.html
share/doc/qt2/html/i18n-main-cpp.html
share/doc/qt2/html/i18n.html
-share/doc/qt2/html/imageio.html
+share/doc/qt2/html/iconview-main-cpp.html
share/doc/qt2/html/images.html
+share/doc/qt2/html/index
share/doc/qt2/html/index.html
share/doc/qt2/html/io.html
-share/doc/qt2/html/kernel.html
+share/doc/qt2/html/keyfeatures21.html
share/doc/qt2/html/layout-layout-cpp.html
share/doc/qt2/html/layout.html
share/doc/qt2/html/letter.png
share/doc/qt2/html/license.html
+share/doc/qt2/html/licenses.html
share/doc/qt2/html/life-main-cpp.html
share/doc/qt2/html/lineedits-main-cpp.html
share/doc/qt2/html/listbox-main-cpp.html
-share/doc/qt2/html/listbox_combo-main-cpp.html
-share/doc/qt2/html/listview.png
+share/doc/qt2/html/listboxcombo-main-cpp.html
share/doc/qt2/html/listviews-main-cpp.html
share/doc/qt2/html/mailinglists.html
share/doc/qt2/html/mainlyMotif-editor-cpp.html
share/doc/qt2/html/mainlyQt-editor-cpp.html
share/doc/qt2/html/mainlyXt-editor-cpp.html
+share/doc/qt2/html/mainwindow-m.png
+share/doc/qt2/html/mainwindow-w.png
+share/doc/qt2/html/mdi-main-cpp.html
share/doc/qt2/html/menu-menu-cpp.html
share/doc/qt2/html/metaobjects.html
share/doc/qt2/html/misc.html
share/doc/qt2/html/moc.html
share/doc/qt2/html/movies-main-cpp.html
+share/doc/qt2/html/network.html
share/doc/qt2/html/nsplugin.html
+share/doc/qt2/html/object.html
+share/doc/qt2/html/objectmodel.html
+share/doc/qt2/html/objecttrees.html
share/doc/qt2/html/opengl.html
+share/doc/qt2/html/organizers.html
+share/doc/qt2/html/palette.png
share/doc/qt2/html/picture-picture-cpp.html
share/doc/qt2/html/pictures.html
share/doc/qt2/html/pnglogo.png
share/doc/qt2/html/popup-popup-cpp.html
share/doc/qt2/html/porting.html
share/doc/qt2/html/primes.html
-share/doc/qt2/html/printerdialog.png
share/doc/qt2/html/progress-progress-cpp.html
share/doc/qt2/html/progressbar-main-cpp.html
+share/doc/qt2/html/properties.html
share/doc/qt2/html/qabstractlayout-h.html
share/doc/qt2/html/qaccel-h.html
share/doc/qt2/html/qaccel-members.html
@@ -376,7 +422,6 @@ share/doc/qt2/html/qbitval-members.html
share/doc/qt2/html/qbitval.html
share/doc/qt2/html/qboxlayout-members.html
share/doc/qt2/html/qboxlayout.html
-share/doc/qt2/html/qbrowser-main-cpp.html
share/doc/qt2/html/qbrush-h.html
share/doc/qt2/html/qbrush-members.html
share/doc/qt2/html/qbrush.html
@@ -391,6 +436,8 @@ share/doc/qt2/html/qbutton.html
share/doc/qt2/html/qbuttongroup-h.html
share/doc/qt2/html/qbuttongroup-members.html
share/doc/qt2/html/qbuttongroup.html
+share/doc/qt2/html/qbytearray-members.html
+share/doc/qt2/html/qbytearray.html
share/doc/qt2/html/qcache-h.html
share/doc/qt2/html/qcache-members.html
share/doc/qt2/html/qcache.html
@@ -401,6 +448,8 @@ share/doc/qt2/html/qcdestyle-members.html
share/doc/qt2/html/qcdestyle.html
share/doc/qt2/html/qchar-members.html
share/doc/qt2/html/qchar.html
+share/doc/qt2/html/qcharref-members.html
+share/doc/qt2/html/qcharref.html
share/doc/qt2/html/qcheckbox-h.html
share/doc/qt2/html/qcheckbox-m.png
share/doc/qt2/html/qcheckbox-members.html
@@ -412,6 +461,7 @@ share/doc/qt2/html/qchildevent-members.html
share/doc/qt2/html/qchildevent.html
share/doc/qt2/html/qchkbox-m.png
share/doc/qt2/html/qchkbox-w.png
+share/doc/qt2/html/qclassinfo-members.html
share/doc/qt2/html/qclipboard-h.html
share/doc/qt2/html/qclipboard-members.html
share/doc/qt2/html/qclipboard.html
@@ -426,6 +476,10 @@ share/doc/qt2/html/qcolor.html
share/doc/qt2/html/qcolordialog-h.html
share/doc/qt2/html/qcolordialog-members.html
share/doc/qt2/html/qcolordialog.html
+share/doc/qt2/html/qcolordlg-m.png
+share/doc/qt2/html/qcolordlg-w.png
+share/doc/qt2/html/qcolordrag-members.html
+share/doc/qt2/html/qcolordrag.html
share/doc/qt2/html/qcolorgroup-members.html
share/doc/qt2/html/qcolorgroup.html
share/doc/qt2/html/qcombo1-m.png
@@ -453,6 +507,8 @@ share/doc/qt2/html/qcursor-members.html
share/doc/qt2/html/qcursor.html
share/doc/qt2/html/qcustomevent-members.html
share/doc/qt2/html/qcustomevent.html
+share/doc/qt2/html/qcustommenuitem-members.html
+share/doc/qt2/html/qcustommenuitem.html
share/doc/qt2/html/qdatapump-members.html
share/doc/qt2/html/qdatapump.html
share/doc/qt2/html/qdatasink-members.html
@@ -467,6 +523,8 @@ share/doc/qt2/html/qdate.html
share/doc/qt2/html/qdatetime-h.html
share/doc/qt2/html/qdatetime-members.html
share/doc/qt2/html/qdatetime.html
+share/doc/qt2/html/qdial-m.png
+share/doc/qt2/html/qdial-w.png
share/doc/qt2/html/qdialog-h.html
share/doc/qt2/html/qdialog-members.html
share/doc/qt2/html/qdialog.html
@@ -477,7 +535,6 @@ share/doc/qt2/html/qdictiterator-members.html
share/doc/qt2/html/qdictiterator.html
share/doc/qt2/html/qdir-h.html
share/doc/qt2/html/qdir-members.html
-share/doc/qt2/html/qdir-qdir-cpp.html
share/doc/qt2/html/qdir.html
share/doc/qt2/html/qdoublevalidator-members.html
share/doc/qt2/html/qdoublevalidator.html
@@ -496,6 +553,9 @@ share/doc/qt2/html/qdropevent.html
share/doc/qt2/html/qdropsite-h.html
share/doc/qt2/html/qdropsite-members.html
share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qeucjpcodec-h.html
+share/doc/qt2/html/qeucjpcodec-members.html
+share/doc/qt2/html/qeucjpcodec.html
share/doc/qt2/html/qevent-h.html
share/doc/qt2/html/qevent-members.html
share/doc/qt2/html/qevent.html
@@ -510,7 +570,6 @@ share/doc/qt2/html/qfiledlg-m.png
share/doc/qt2/html/qfiledlg-w.png
share/doc/qt2/html/qfileiconprovider-members.html
share/doc/qt2/html/qfileiconprovider.html
-share/doc/qt2/html/qfileiconview-main-cpp.html
share/doc/qt2/html/qfileinfo-h.html
share/doc/qt2/html/qfileinfo-members.html
share/doc/qt2/html/qfileinfo.html
@@ -522,9 +581,14 @@ share/doc/qt2/html/qfocusevent.html
share/doc/qt2/html/qfont-h.html
share/doc/qt2/html/qfont-members.html
share/doc/qt2/html/qfont.html
+share/doc/qt2/html/qfontdatabase-h.html
+share/doc/qt2/html/qfontdatabase-members.html
+share/doc/qt2/html/qfontdatabase.html
share/doc/qt2/html/qfontdialog-h.html
share/doc/qt2/html/qfontdialog-members.html
share/doc/qt2/html/qfontdialog.html
+share/doc/qt2/html/qfontdlg-m.png
+share/doc/qt2/html/qfontdlg-w.png
share/doc/qt2/html/qfontinfo-h.html
share/doc/qt2/html/qfontinfo-members.html
share/doc/qt2/html/qfontinfo.html
@@ -537,6 +601,9 @@ share/doc/qt2/html/qframe.html
share/doc/qt2/html/qgarray-h.html
share/doc/qt2/html/qgarray-members.html
share/doc/qt2/html/qgarray.html
+share/doc/qt2/html/qgbkcodec-h.html
+share/doc/qt2/html/qgbkcodec-members.html
+share/doc/qt2/html/qgbkcodec.html
share/doc/qt2/html/qgcache-h.html
share/doc/qt2/html/qgcache-members.html
share/doc/qt2/html/qgcache.html
@@ -577,6 +644,12 @@ share/doc/qt2/html/qgroupbox-members.html
share/doc/qt2/html/qgroupbox.html
share/doc/qt2/html/qgrpbox-m.png
share/doc/qt2/html/qgrpbox-w.png
+share/doc/qt2/html/qguardedptr-h.html
+share/doc/qt2/html/qguardedptr-members.html
+share/doc/qt2/html/qguardedptr.html
+share/doc/qt2/html/qgvector-h.html
+share/doc/qt2/html/qgvector-members.html
+share/doc/qt2/html/qgvector.html
share/doc/qt2/html/qhbox-h.html
share/doc/qt2/html/qhbox-m.png
share/doc/qt2/html/qhbox-members.html
@@ -598,10 +671,20 @@ share/doc/qt2/html/qhgroupbox-members.html
share/doc/qt2/html/qhgroupbox.html
share/doc/qt2/html/qhideevent-members.html
share/doc/qt2/html/qhideevent.html
+share/doc/qt2/html/qicondrag-members.html
+share/doc/qt2/html/qicondrag.html
+share/doc/qt2/html/qicondragitem-members.html
+share/doc/qt2/html/qicondragitem.html
share/doc/qt2/html/qiconset-h.html
share/doc/qt2/html/qiconset-members.html
share/doc/qt2/html/qiconset.html
-share/doc/qt2/html/qiconview-main-cpp.html
+share/doc/qt2/html/qiconview-h.html
+share/doc/qt2/html/qiconview-m.png
+share/doc/qt2/html/qiconview-members.html
+share/doc/qt2/html/qiconview-w.png
+share/doc/qt2/html/qiconview.html
+share/doc/qt2/html/qiconviewitem-members.html
+share/doc/qt2/html/qiconviewitem.html
share/doc/qt2/html/qimage-h.html
share/doc/qt2/html/qimage-members.html
share/doc/qt2/html/qimage.html
@@ -617,6 +700,9 @@ share/doc/qt2/html/qimageformattype-members.html
share/doc/qt2/html/qimageformattype.html
share/doc/qt2/html/qimageio-members.html
share/doc/qt2/html/qimageio.html
+share/doc/qt2/html/qinputdialog-h.html
+share/doc/qt2/html/qinputdialog-members.html
+share/doc/qt2/html/qinputdialog.html
share/doc/qt2/html/qintcache-h.html
share/doc/qt2/html/qintcache-members.html
share/doc/qt2/html/qintcache.html
@@ -634,6 +720,12 @@ share/doc/qt2/html/qiodevice-members.html
share/doc/qt2/html/qiodevice.html
share/doc/qt2/html/qiodevicesource-members.html
share/doc/qt2/html/qiodevicesource.html
+share/doc/qt2/html/qjiscodec-h.html
+share/doc/qt2/html/qjiscodec-members.html
+share/doc/qt2/html/qjiscodec.html
+share/doc/qt2/html/qjpunicode-h.html
+share/doc/qt2/html/qjpunicodeconv-members.html
+share/doc/qt2/html/qjpunicodeconv.html
share/doc/qt2/html/qkeyevent-members.html
share/doc/qt2/html/qkeyevent.html
share/doc/qt2/html/qlabel-h.html
@@ -675,7 +767,9 @@ share/doc/qt2/html/qlistboxtext.html
share/doc/qt2/html/qlistiterator-members.html
share/doc/qt2/html/qlistiterator.html
share/doc/qt2/html/qlistview-h.html
+share/doc/qt2/html/qlistview-m.png
share/doc/qt2/html/qlistview-members.html
+share/doc/qt2/html/qlistview-w.png
share/doc/qt2/html/qlistview.html
share/doc/qt2/html/qlistviewitem-members.html
share/doc/qt2/html/qlistviewitem.html
@@ -683,6 +777,9 @@ share/doc/qt2/html/qlistviewitemiterator-members.html
share/doc/qt2/html/qlistviewitemiterator.html
share/doc/qt2/html/qlnode-members.html
share/doc/qt2/html/qlnode.html
+share/doc/qt2/html/qlocalfs-h.html
+share/doc/qt2/html/qlocalfs-members.html
+share/doc/qt2/html/qlocalfs.html
share/doc/qt2/html/qmag-qmag-cpp.html
share/doc/qt2/html/qmainwindow-h.html
share/doc/qt2/html/qmainwindow-m.png
@@ -707,6 +804,12 @@ share/doc/qt2/html/qmenudata.html
share/doc/qt2/html/qmessagebox-h.html
share/doc/qt2/html/qmessagebox-members.html
share/doc/qt2/html/qmessagebox.html
+share/doc/qt2/html/qmetadata-members.html
+share/doc/qt2/html/qmetaobject-h.html
+share/doc/qt2/html/qmetaobject-members.html
+share/doc/qt2/html/qmetaobject.html
+share/doc/qt2/html/qmetaproperty-members.html
+share/doc/qt2/html/qmetaproperty.html
share/doc/qt2/html/qmime-h.html
share/doc/qt2/html/qmimesource-members.html
share/doc/qt2/html/qmimesource.html
@@ -732,6 +835,11 @@ share/doc/qt2/html/qmultilineedit-members.html
share/doc/qt2/html/qmultilineedit.html
share/doc/qt2/html/qnamespace-h.html
share/doc/qt2/html/qnetworkegg.html
+share/doc/qt2/html/qnetworkoperation-members.html
+share/doc/qt2/html/qnetworkoperation.html
+share/doc/qt2/html/qnetworkprotocol-h.html
+share/doc/qt2/html/qnetworkprotocol-members.html
+share/doc/qt2/html/qnetworkprotocol.html
share/doc/qt2/html/qnp-h.html
share/doc/qt2/html/qnpinstance-members.html
share/doc/qt2/html/qnpinstance.html
@@ -782,11 +890,16 @@ share/doc/qt2/html/qpoint.html
share/doc/qt2/html/qpointarray-h.html
share/doc/qt2/html/qpointarray-members.html
share/doc/qt2/html/qpointarray.html
+share/doc/qt2/html/qpopmenu-fancy.png
share/doc/qt2/html/qpopmenu-m.png
share/doc/qt2/html/qpopmenu-w.png
share/doc/qt2/html/qpopupmenu-h.html
share/doc/qt2/html/qpopupmenu-members.html
share/doc/qt2/html/qpopupmenu.html
+share/doc/qt2/html/qprintdialog-h.html
+share/doc/qt2/html/qprintdialog-members.html
+share/doc/qt2/html/qprintdlg-m.png
+share/doc/qt2/html/qprintdlg-w.png
share/doc/qt2/html/qprinter-h.html
share/doc/qt2/html/qprinter-members.html
share/doc/qt2/html/qprinter.html
@@ -848,9 +961,6 @@ share/doc/qt2/html/qscrollview.html
share/doc/qt2/html/qsemimodal-h.html
share/doc/qt2/html/qsemimodal-members.html
share/doc/qt2/html/qsemimodal.html
-share/doc/qt2/html/qserversocket-h.html
-share/doc/qt2/html/qserversocket-members.html
-share/doc/qt2/html/qserversocket.html
share/doc/qt2/html/qsessionmanager-h.html
share/doc/qt2/html/qsessionmanager-members.html
share/doc/qt2/html/qsessionmanager.html
@@ -872,7 +982,9 @@ share/doc/qt2/html/qsize-h.html
share/doc/qt2/html/qsize-members.html
share/doc/qt2/html/qsize.html
share/doc/qt2/html/qsizegrip-h.html
+share/doc/qt2/html/qsizegrip-m.png
share/doc/qt2/html/qsizegrip-members.html
+share/doc/qt2/html/qsizegrip-w.png
share/doc/qt2/html/qsizegrip.html
share/doc/qt2/html/qsizepolicy-h.html
share/doc/qt2/html/qsizepolicy-members.html
@@ -882,12 +994,6 @@ share/doc/qt2/html/qslider-m.png
share/doc/qt2/html/qslider-members.html
share/doc/qt2/html/qslider-w.png
share/doc/qt2/html/qslider.html
-share/doc/qt2/html/qsocket-h.html
-share/doc/qt2/html/qsocket-members.html
-share/doc/qt2/html/qsocket.html
-share/doc/qt2/html/qsocketaddress-members.html
-share/doc/qt2/html/qsocketaddress.html
-share/doc/qt2/html/qsocketdevice-h.html
share/doc/qt2/html/qsocketnotifier-h.html
share/doc/qt2/html/qsocketnotifier-members.html
share/doc/qt2/html/qsocketnotifier.html
@@ -901,6 +1007,8 @@ share/doc/qt2/html/qspinbox-m.png
share/doc/qt2/html/qspinbox-members.html
share/doc/qt2/html/qspinbox-w.png
share/doc/qt2/html/qspinbox.html
+share/doc/qt2/html/qspinbox2-m.png
+share/doc/qt2/html/qspinbox2-w.png
share/doc/qt2/html/qsplitter-h.html
share/doc/qt2/html/qsplitter-m.png
share/doc/qt2/html/qsplitter-members.html
@@ -927,6 +1035,8 @@ share/doc/qt2/html/qstringlist.html
share/doc/qt2/html/qstrlist-h.html
share/doc/qt2/html/qstrlist-members.html
share/doc/qt2/html/qstrlist.html
+share/doc/qt2/html/qstrlistiterator-members.html
+share/doc/qt2/html/qstrlistiterator.html
share/doc/qt2/html/qstyle-h.html
share/doc/qt2/html/qstyle-members.html
share/doc/qt2/html/qstyle.html
@@ -955,10 +1065,14 @@ share/doc/qt2/html/qtableview.html
share/doc/qt2/html/qtablevw-m.png
share/doc/qt2/html/qtablevw-w.png
share/doc/qt2/html/qtabwidget-h.html
+share/doc/qt2/html/qtabwidget-m.png
share/doc/qt2/html/qtabwidget-members.html
+share/doc/qt2/html/qtabwidget-w.png
share/doc/qt2/html/qtabwidget.html
share/doc/qt2/html/qtextbrowser-h.html
+share/doc/qt2/html/qtextbrowser-m.png
share/doc/qt2/html/qtextbrowser-members.html
+share/doc/qt2/html/qtextbrowser-w.png
share/doc/qt2/html/qtextbrowser.html
share/doc/qt2/html/qtextcodec-h.html
share/doc/qt2/html/qtextcodec-members.html
@@ -1005,6 +1119,15 @@ share/doc/qt2/html/qtranslator-members.html
share/doc/qt2/html/qtranslator.html
share/doc/qt2/html/quridrag-members.html
share/doc/qt2/html/quridrag.html
+share/doc/qt2/html/qurl-h.html
+share/doc/qt2/html/qurl-members.html
+share/doc/qt2/html/qurl.html
+share/doc/qt2/html/qurlinfo-h.html
+share/doc/qt2/html/qurlinfo-members.html
+share/doc/qt2/html/qurlinfo.html
+share/doc/qt2/html/qurloperator-h.html
+share/doc/qt2/html/qurloperator-members.html
+share/doc/qt2/html/qurloperator.html
share/doc/qt2/html/qvalidator-h.html
share/doc/qt2/html/qvalidator-members.html
share/doc/qt2/html/qvalidator.html
@@ -1015,6 +1138,10 @@ share/doc/qt2/html/qvaluelistconstiterator-members.html
share/doc/qt2/html/qvaluelistconstiterator.html
share/doc/qt2/html/qvaluelistiterator-members.html
share/doc/qt2/html/qvaluelistiterator.html
+share/doc/qt2/html/qvaluestack-h.html
+share/doc/qt2/html/qvaluestack-members.html
+share/doc/qt2/html/qvaluestack.html
+share/doc/qt2/html/qvariant-h.html
share/doc/qt2/html/qvbox-h.html
share/doc/qt2/html/qvbox-m.png
share/doc/qt2/html/qvbox-members.html
@@ -1026,6 +1153,9 @@ share/doc/qt2/html/qvboxlayout.html
share/doc/qt2/html/qvbuttongroup-h.html
share/doc/qt2/html/qvbuttongroup-members.html
share/doc/qt2/html/qvbuttongroup.html
+share/doc/qt2/html/qvector-h.html
+share/doc/qt2/html/qvector-members.html
+share/doc/qt2/html/qvector.html
share/doc/qt2/html/qvgroupbox-h.html
share/doc/qt2/html/qvgroupbox-members.html
share/doc/qt2/html/qvgroupbox.html
@@ -1058,11 +1188,13 @@ share/doc/qt2/html/qxtapplication-members.html
share/doc/qt2/html/qxtapplication.html
share/doc/qt2/html/qxtwidget-members.html
share/doc/qt2/html/qxtwidget.html
-share/doc/qt2/html/rangecontrols-main-cpp.html
-share/doc/qt2/html/realwidgets.html
share/doc/qt2/html/removed20.html
share/doc/qt2/html/richtext-main-cpp.html
+share/doc/qt2/html/rintersect.png
share/doc/qt2/html/rot13-rot13-cpp.html
+share/doc/qt2/html/rsubtract.png
+share/doc/qt2/html/runion.png
+share/doc/qt2/html/rxor.png
share/doc/qt2/html/scribble-main-cpp.html
share/doc/qt2/html/scrollview-scrollview-cpp.html
share/doc/qt2/html/session.html
@@ -1070,8 +1202,12 @@ share/doc/qt2/html/session.png
share/doc/qt2/html/shared.html
share/doc/qt2/html/shclass.html
share/doc/qt2/html/showimg-main-cpp.html
+share/doc/qt2/html/signalsandslots.html
share/doc/qt2/html/simple-application.html
+share/doc/qt2/html/sound.html
share/doc/qt2/html/splitter-splitter-cpp.html
+share/doc/qt2/html/splitter-views-m.png
+share/doc/qt2/html/splitter-views-w.png
share/doc/qt2/html/t1.html
share/doc/qt2/html/t1.png
share/doc/qt2/html/t10-cannon-cpp.html
@@ -1152,23 +1288,25 @@ share/doc/qt2/html/t9.html
share/doc/qt2/html/t9.png
share/doc/qt2/html/t9_1.png
share/doc/qt2/html/t9_2.png
-share/doc/qt2/html/tabdialog-tabdialog-cpp.html
+share/doc/qt2/html/tabdialog-main-cpp.html
share/doc/qt2/html/table-main-cpp.html
share/doc/qt2/html/test.png
share/doc/qt2/html/tetrix-tetrix-cpp.html
share/doc/qt2/html/themes-main-cpp.html
share/doc/qt2/html/tictac-main-cpp.html
share/doc/qt2/html/time.html
+share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
share/doc/qt2/html/tools.html
share/doc/qt2/html/tooltip-main-cpp.html
share/doc/qt2/html/topicals.html
-share/doc/qt2/html/treeview.png
share/doc/qt2/html/trivial-trivial-cpp.html
share/doc/qt2/html/troll.html
share/doc/qt2/html/ttlogo-small.jpg
share/doc/qt2/html/ttlogo-small.png
share/doc/qt2/html/tutorial.html
share/doc/qt2/html/tutorial.png
+share/doc/qt2/html/unicode.html
share/doc/qt2/html/validator-main-cpp.html
share/doc/qt2/html/whatsthis.png
share/doc/qt2/html/wizard-main-cpp.html
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index db92bfb31301..aab47b0ecd25 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -1,71 +1,78 @@
-# New ports collection makefile for: qt20
-# Version required: 2.0.2
+# New ports collection makefile for: qt21
+# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
-# Whom: imura@cs.titech.ac.jp
+# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-2.0.2
+DISTNAME= qt-x11-2.1.0-beta2
+PKGNAME= qt-2.1.0b2
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
-
-FORBIDDEN= repository copied, awaiting upgrade
+LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ MesaGL.14:${PORTSDIR}/graphics/Mesa3
NO_LATEST_LINK= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_NEWGCC= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -system-zlib -system-libpng \
- -I${LOCALBASE}/include -L${LOCALBASE}/lib -lxpg4
+CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg \
+ -I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= QTDIR=${WRKSRC}
-MAKE_ENV+= QTDIR=${WRKSRC} SYS_CXX=${CXX} SYS_CC=${CC} SYS_CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV= QTDIR=${WRKSRC}
-.include <bsd.port.pre.mk>
+WRKSRC= ${WRKDIR}/qt-2.1.0-beta2
+CONFIG= ${WRKSRC}/configs/freebsd-g++-shared
.if defined(QT_GIF_AVAILABLE)
CONFIGURE_ARGS+=-gif
RESTRICTED= 'Requires a license from UNISYS'
.endif
-USE_NEWGCC= YES
-
-.if ${PORTOBJFORMAT} == "elf"
-VERSION= 2
-.else
-VERSION= 2.02
+.if !defined(NOPORTDOCS)
+.include "files/manpages"
.endif
-PLIST_SUB= VERSION=${VERSION}
-.include "files/manpages"
+pre-configure:
+ @${PERL} -pi -e "s,gcc,${CC},g" ${CONFIG}
+ @${PERL} -pi -e "s,g\+\+,${CXX},g" ${CONFIG}
+ @${PERL} -pi -e "s,/usr/X11R6,${X11BASE},g" ${CONFIG}
+ @${PERL} -pi -e "s,-pipe -O2,${CXXFLAGS},g" ${CONFIG}
+
+post-configure:
+ @(cd ${WRKSRC} ; ${GMAKE} symlinks)
do-install:
- @(cd ${WRKSRC} ; \
+ ${MKDIR} ${PREFIX}/include/qt2
+ (cd ${WRKSRC} ; \
${INSTALL_PROGRAM} bin/mergetr ${PREFIX}/bin ; \
${INSTALL_PROGRAM} bin/moc ${PREFIX}/bin/moc2 ; \
${INSTALL_PROGRAM} bin/msg2qm ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/findtr ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qt20fix ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qtrename140 ${PREFIX}/bin ; \
- ${INSTALL_DATA} 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/qt2 ; \
${INSTALL_DATA} include/*.h ${PREFIX}/include/qt2 ; \
- ${INSTALL_MAN} man/man1/moc.1 ${PREFIX}/man/man1/moc2.1 ; \
- ${INSTALL_MAN} man/man3/q* ${PREFIX}/man/man3 )
+ ${INSTALL_DATA} lib/libqgl.a ${PREFIX}/lib ; \
+ ${INSTALL_DATA} lib/libqt2.so.3 ${PREFIX}/lib )
+ ${LN} -sf libqt2.so.3 ${PREFIX}/lib/libqt2.so
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.if !defined(NOPORTDOCS)
- @(cd ${WRKSRC} ; \
- ${MKDIR} ${PREFIX}/share/doc/qt2/html ; \
+ ${MKDIR} ${PREFIX}/share/doc/qt2/html
+ (cd ${WRKSRC} ; \
+ ${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} LICENSE.QPL ${PREFIX}/share/doc/qt2 ; \
+ ${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
- ${INSTALL_DATA} doc/* ${PREFIX}/share/doc/qt2/html )
+ ${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
+ ${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt30/distinfo b/x11-toolkits/qt30/distinfo
index 27fdd45446a6..790ea1c64f91 100644
--- a/x11-toolkits/qt30/distinfo
+++ b/x11-toolkits/qt30/distinfo
@@ -1 +1 @@
-MD5 (qt-2.0.2.tar.gz) = afeaf554f538b415a2f46ff6b36657f4
+MD5 (qt-x11-2.1.0-beta2.tar.gz) = 953df8b8c324c4723b2d0ee342e6526a
diff --git a/x11-toolkits/qt30/files/manpages b/x11-toolkits/qt30/files/manpages
index 6b77b5e17666..de362d100114 100644
--- a/x11-toolkits/qt30/files/manpages
+++ b/x11-toolkits/qt30/files/manpages
@@ -1,4 +1,3 @@
-MAN1= moc2.1
MAN3= \
qaccel.3qt \
qapplication.3qt \
@@ -16,10 +15,12 @@ qbrush.3qt \
qbuffer.3qt \
qbutton.3qt \
qbuttongroup.3qt \
+qbytearray.3qt \
qcache.3qt \
qcacheiterator.3qt \
qcdestyle.3qt \
qchar.3qt \
+qcharref.3qt \
qcheckbox.3qt \
qchecklistitem.3qt \
qchildevent.3qt \
@@ -28,14 +29,15 @@ qcloseevent.3qt \
qcollection.3qt \
qcolor.3qt \
qcolordialog.3qt \
+qcolordrag.3qt \
qcolorgroup.3qt \
qcombobox.3qt \
qcommonstyle.3qt \
-qconnection.3qt \
qconststring.3qt \
qcstring.3qt \
qcursor.3qt \
qcustomevent.3qt \
+qcustommenuitem.3qt \
qdatapump.3qt \
qdatasink.3qt \
qdatasource.3qt \
@@ -53,6 +55,7 @@ qdragmoveevent.3qt \
qdragobject.3qt \
qdropevent.3qt \
qdropsite.3qt \
+qeucjpcodec.3qt \
qevent.3qt \
qfile.3qt \
qfiledialog.3qt \
@@ -61,11 +64,13 @@ qfileinfo.3qt \
qfocusdata.3qt \
qfocusevent.3qt \
qfont.3qt \
+qfontdatabase.3qt \
qfontdialog.3qt \
qfontinfo.3qt \
qfontmetrics.3qt \
qframe.3qt \
qgarray.3qt \
+qgbkcodec.3qt \
qgcache.3qt \
qgcacheiterator.3qt \
qgdict.3qt \
@@ -80,13 +85,19 @@ qglwidget.3qt \
qgrid.3qt \
qgridlayout.3qt \
qgroupbox.3qt \
+qguardedptr.3qt \
+qgvector.3qt \
qhbox.3qt \
qhboxlayout.3qt \
qhbuttongroup.3qt \
qheader.3qt \
qhgroupbox.3qt \
qhideevent.3qt \
+qicondrag.3qt \
+qicondragitem.3qt \
qiconset.3qt \
+qiconview.3qt \
+qiconviewitem.3qt \
qimage.3qt \
qimageconsumer.3qt \
qimagedecoder.3qt \
@@ -94,6 +105,7 @@ qimagedrag.3qt \
qimageformat.3qt \
qimageformattype.3qt \
qimageio.3qt \
+qinputdialog.3qt \
qintcache.3qt \
qintcacheiterator.3qt \
qintdict.3qt \
@@ -101,6 +113,8 @@ qintdictiterator.3qt \
qintvalidator.3qt \
qiodevice.3qt \
qiodevicesource.3qt \
+qjiscodec.3qt \
+qjpunicodeconv.3qt \
qkeyevent.3qt \
qlabel.3qt \
qlayout.3qt \
@@ -118,6 +132,7 @@ qlistview.3qt \
qlistviewitem.3qt \
qlistviewitemiterator.3qt \
qlnode.3qt \
+qlocalfs.3qt \
qmainwindow.3qt \
qmap.3qt \
qmapconstiterator.3qt \
@@ -125,6 +140,8 @@ qmapiterator.3qt \
qmenubar.3qt \
qmenudata.3qt \
qmessagebox.3qt \
+qmetaobject.3qt \
+qmetaproperty.3qt \
qmimesource.3qt \
qmimesourcefactory.3qt \
qmotifstyle.3qt \
@@ -132,6 +149,8 @@ qmouseevent.3qt \
qmoveevent.3qt \
qmovie.3qt \
qmultilineedit.3qt \
+qnetworkoperation.3qt \
+qnetworkprotocol.3qt \
qnpinstance.3qt \
qnplugin.3qt \
qnpstream.3qt \
@@ -167,7 +186,6 @@ qresizeevent.3qt \
qscrollbar.3qt \
qscrollview.3qt \
qsemimodal.3qt \
-qserversocket.3qt \
qsessionmanager.3qt \
qshared.3qt \
qshowevent.3qt \
@@ -178,8 +196,6 @@ qsize.3qt \
qsizegrip.3qt \
qsizepolicy.3qt \
qslider.3qt \
-qsocket.3qt \
-qsocketaddress.3qt \
qsocketnotifier.3qt \
qsortedlist.3qt \
qspaceritem.3qt \
@@ -192,6 +208,7 @@ qstrilist.3qt \
qstring.3qt \
qstringlist.3qt \
qstrlist.3qt \
+qstrlistiterator.3qt \
qstyle.3qt \
qstylesheet.3qt \
qstylesheetitem.3qt \
@@ -219,13 +236,17 @@ qtooltip.3qt \
qtooltipgroup.3qt \
qtranslator.3qt \
quridrag.3qt \
+qurl.3qt \
+qurloperator.3qt \
qvalidator.3qt \
qvaluelist.3qt \
qvaluelistconstiterator.3qt \
qvaluelistiterator.3qt \
+qvaluestack.3qt \
qvbox.3qt \
qvboxlayout.3qt \
qvbuttongroup.3qt \
+qvector.3qt \
qvgroupbox.3qt \
qwhatsthis.3qt \
qwheelevent.3qt \
diff --git a/x11-toolkits/qt30/files/patch-aa b/x11-toolkits/qt30/files/patch-aa
index 4adebbfe81c8..a18a37d486c6 100644
--- a/x11-toolkits/qt30/files/patch-aa
+++ b/x11-toolkits/qt30/files/patch-aa
@@ -1,26 +1,6 @@
---- configs/freebsd-g++-shared.orig Fri Sep 24 18:21:55 1999
-+++ configs/freebsd-g++-shared Fri Oct 1 22:07:46 1999
-@@ -1,33 +1,33 @@
- # Compiling
--SYSCONF_CXX = g++
--SYSCONF_CC = gcc
-+SYSCONF_CXX = $(SYS_CXX)
-+SYSCONF_CC = $(SYS_CC)
-
- # Compiling with support libraries
--SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_X11 = -I$(X11BASE)/include
- SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
--SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL = -I$(X11BASE)/include
-
- # Compiline YACC output
- SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
-
- # Linking with support libraries
- # X11
--SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib
+--- configs/freebsd-g++-shared.orig Thu Feb 17 01:55:56 2000
++++ configs/freebsd-g++-shared Sat Feb 26 20:25:51 2000
+@@ -16,7 +16,7 @@
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
# Qt, Qt+OpenGL
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
@@ -28,28 +8,21 @@
+SYSCONF_LIBS_QT = -lqt2
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
--SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
- SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu
- # Yacc
- SYSCONF_LIBS_YACC =
-
+ SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+@@ -27,7 +27,7 @@
# Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = $(SYS_CXX)
+ SYSCONF_LINK = g++
SYSCONF_LFLAGS =
-SYSCONF_LIBS =
+SYSCONF_LIBS = -lxpg4
# Link flags shared objects
SYSCONF_LFLAGS_SHOBJ = -shared
-@@ -40,17 +40,27 @@
- # - Place target in $(DESTDIR) - which has a trailing /
+@@ -41,16 +41,26 @@
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
#
--SYSCONF_LINK_SHLIB = g++
+ SYSCONF_LINK_SHLIB = g++
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-+SYSCONF_LINK_SHLIB = $(SYS_CXX)
+ifeq ($(PORTOBJFORMAT),elf)
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
@@ -77,14 +50,3 @@
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -61,8 +71,8 @@
- SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
- # Compiling application source
--SYSCONF_CXXFLAGS = -pipe -O2
--SYSCONF_CFLAGS = -pipe -O2
-+SYSCONF_CXXFLAGS = $(SYS_CXXFLAGS)
-+SYSCONF_CFLAGS = $(SYS_CXXFLAGS)
- # Compiling library source
- SYSCONF_CXXFLAGS_LIB = -fPIC
- SYSCONF_CFLAGS_LIB = -fPIC
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index d3e52a97f33b..64d14c7bf881 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -5,6 +5,7 @@ bin/msg2qm
bin/qt20fix
bin/qtrename140
include/qt2/jri.h
+include/qt2/jri_md.h
include/qt2/jritypes.h
include/qt2/npapi.h
include/qt2/npupp.h
@@ -18,6 +19,7 @@ include/qt2/qasciicache.h
include/qt2/qasciidict.h
include/qt2/qasyncimageio.h
include/qt2/qasyncio.h
+include/qt2/qbig5codec.h
include/qt2/qbitarray.h
include/qt2/qbitarry.h
include/qt2/qbitmap.h
@@ -59,14 +61,14 @@ include/qt2/qeuckrcodec.h
include/qt2/qevent.h
include/qt2/qfile.h
include/qt2/qfiledef.h
-include/qt2/qfiledefs.h
+include/qt2/qfiledefs_p.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/qfontdata_p.h
include/qt2/qfontdatabase.h
include/qt2/qfontdialog.h
include/qt2/qfontdta.h
@@ -76,6 +78,7 @@ include/qt2/qfontmet.h
include/qt2/qfontmetrics.h
include/qt2/qframe.h
include/qt2/qgarray.h
+include/qt2/qgbkcodec.h
include/qt2/qgcache.h
include/qt2/qgdict.h
include/qt2/qgeneric.h
@@ -83,18 +86,19 @@ 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/qguardedptr.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/qiconview.h
include/qt2/qimage.h
-include/qt2/qimageio.h
+include/qt2/qinputdialog.h
include/qt2/qintcach.h
include/qt2/qintcache.h
include/qt2/qintdict.h
@@ -107,7 +111,7 @@ include/qt2/qkeycode.h
include/qt2/qkoi8codec.h
include/qt2/qlabel.h
include/qt2/qlayout.h
-include/qt2/qlayoutengine.h
+include/qt2/qlayoutengine_p.h
include/qt2/qlcdnum.h
include/qt2/qlcdnumber.h
include/qt2/qlined.h
@@ -115,6 +119,7 @@ include/qt2/qlineedit.h
include/qt2/qlist.h
include/qt2/qlistbox.h
include/qt2/qlistview.h
+include/qt2/qlocalfs.h
include/qt2/qmainwindow.h
include/qt2/qmap.h
include/qt2/qmenubar.h
@@ -131,6 +136,7 @@ include/qt2/qmsgbox.h
include/qt2/qmultilinedit.h
include/qt2/qmultilineedit.h
include/qt2/qnamespace.h
+include/qt2/qnetworkprotocol.h
include/qt2/qnp.h
include/qt2/qobjcoll.h
include/qt2/qobjdefs.h
@@ -165,7 +171,7 @@ include/qt2/qprogbar.h
include/qt2/qprogdlg.h
include/qt2/qprogressbar.h
include/qt2/qprogressdialog.h
-include/qt2/qpsprinter.h
+include/qt2/qpsprinter_p.h
include/qt2/qpsprn.h
include/qt2/qptrdict.h
include/qt2/qpushbt.h
@@ -178,12 +184,12 @@ include/qt2/qrangect.h
include/qt2/qrect.h
include/qt2/qregexp.h
include/qt2/qregion.h
+include/qt2/qrichtext_p.h
include/qt2/qrtlcodec.h
include/qt2/qscrbar.h
include/qt2/qscrollbar.h
include/qt2/qscrollview.h
include/qt2/qsemimodal.h
-include/qt2/qserversocket.h
include/qt2/qsession.h
include/qt2/qsessionmanager.h
include/qt2/qshared.h
@@ -197,8 +203,6 @@ include/qt2/qsizepolicy.h
include/qt2/qsjiscodec.h
include/qt2/qslider.h
include/qt2/qsmartptr.h
-include/qt2/qsocket.h
-include/qt2/qsocketdevice.h
include/qt2/qsocketnotifier.h
include/qt2/qsocknot.h
include/qt2/qsortedlist.h
@@ -212,6 +216,7 @@ include/qt2/qstrlist.h
include/qt2/qstrvec.h
include/qt2/qstyle.h
include/qt2/qstylesheet.h
+include/qt2/qt_x11.h
include/qt2/qtabbar.h
include/qt2/qtabdialog.h
include/qt2/qtabdlg.h
@@ -228,15 +233,21 @@ include/qt2/qtoolbar.h
include/qt2/qtoolbutton.h
include/qt2/qtooltip.h
include/qt2/qtranslator.h
+include/qt2/qtranslatordialog.h
include/qt2/qtstream.h
+include/qt2/qurl.h
+include/qt2/qurlinfo.h
+include/qt2/qurloperator.h
include/qt2/qutfcodec.h
include/qt2/qvalidator.h
include/qt2/qvaluelist.h
+include/qt2/qvaluestack.h
+include/qt2/qvariant.h
include/qt2/qvbox.h
include/qt2/qvbuttongroup.h
include/qt2/qvector.h
include/qt2/qvgroupbox.h
-include/qt2/qwellarray.h
+include/qt2/qwellarray_p.h
include/qt2/qwhatsthis.h
include/qt2/qwidcoll.h
include/qt2/qwidget.h
@@ -249,29 +260,44 @@ include/qt2/qwindowdefs.h
include/qt2/qwindowsstyle.h
include/qt2/qwizard.h
include/qt2/qwmatrix.h
+include/qt2/qworkspace.h
include/qt2/qxt.h
+lib/libqgl.a
lib/libqt2.so
-lib/libqt2.so.%%VERSION%%
+lib/libqt2.so.3
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/doc/qt2/ANNOUNCE
share/doc/qt2/FAQ
share/doc/qt2/LICENSE.QPL
+share/doc/qt2/PORTING
share/doc/qt2/README
share/doc/qt2/README.QT
+share/doc/qt2/html/aboutqt.html
share/doc/qt2/html/abstractwidgets.html
share/doc/qt2/html/accelerators.html
share/doc/qt2/html/aclock-main-cpp.html
share/doc/qt2/html/addressbook-main-cpp.html
+share/doc/qt2/html/advanced.html
share/doc/qt2/html/annotated.html
+share/doc/qt2/html/appearance.html
+share/doc/qt2/html/appicon.html
share/doc/qt2/html/application-main-cpp.html
share/doc/qt2/html/application.html
+share/doc/qt2/html/basic.html
share/doc/qt2/html/bearings.png
share/doc/qt2/html/biff-main-cpp.html
share/doc/qt2/html/book.png
-share/doc/qt2/html/buttons_groups-main-cpp.html
+share/doc/qt2/html/bughowto.html
+share/doc/qt2/html/buttongroup-m.png
+share/doc/qt2/html/buttongroup-w.png
+share/doc/qt2/html/buttongroups-main-cpp.html
+share/doc/qt2/html/buyhowto.html
+share/doc/qt2/html/changes21.html
share/doc/qt2/html/checklists-main-cpp.html
share/doc/qt2/html/classes.html
share/doc/qt2/html/collection.html
+share/doc/qt2/html/commonproblems.html
share/doc/qt2/html/coordsys.html
share/doc/qt2/html/coordsys.png
share/doc/qt2/html/credits.html
@@ -286,62 +312,82 @@ share/doc/qt2/html/dialogs.html
share/doc/qt2/html/dirview-main-cpp.html
share/doc/qt2/html/dnd.html
share/doc/qt2/html/dochead.png
+share/doc/qt2/html/draganddrop.html
share/doc/qt2/html/drawdemo-drawdemo-cpp.html
share/doc/qt2/html/drawing.html
share/doc/qt2/html/drawlines-connect-cpp.html
share/doc/qt2/html/easteregg.html
share/doc/qt2/html/easteregg2.html
+share/doc/qt2/html/environment.html
+share/doc/qt2/html/eventsandfilters.html
share/doc/qt2/html/examples.html
+share/doc/qt2/html/fileiconview-main-cpp.html
+share/doc/qt2/html/focus.html
share/doc/qt2/html/fontmatch.html
-share/doc/qt2/html/fonts.html
share/doc/qt2/html/forever-forever-cpp.html
share/doc/qt2/html/frames.png
share/doc/qt2/html/functions.html
share/doc/qt2/html/geomanagement.html
+share/doc/qt2/html/geometry.html
+share/doc/qt2/html/geometry.png
share/doc/qt2/html/graph.g1n
share/doc/qt2/html/grapher-grapher-cpp.html
share/doc/qt2/html/gridlayout.png
+share/doc/qt2/html/groupbox-m.png
+share/doc/qt2/html/groupbox-w.png
share/doc/qt2/html/guibooks.html
share/doc/qt2/html/headers.html
share/doc/qt2/html/hello-main-cpp.html
+share/doc/qt2/html/helpsystem.html
+share/doc/qt2/html/helpviewer-main-cpp.html
share/doc/qt2/html/hierarchy.html
share/doc/qt2/html/i18n-main-cpp.html
share/doc/qt2/html/i18n.html
-share/doc/qt2/html/imageio.html
+share/doc/qt2/html/iconview-main-cpp.html
share/doc/qt2/html/images.html
+share/doc/qt2/html/index
share/doc/qt2/html/index.html
share/doc/qt2/html/io.html
-share/doc/qt2/html/kernel.html
+share/doc/qt2/html/keyfeatures21.html
share/doc/qt2/html/layout-layout-cpp.html
share/doc/qt2/html/layout.html
share/doc/qt2/html/letter.png
share/doc/qt2/html/license.html
+share/doc/qt2/html/licenses.html
share/doc/qt2/html/life-main-cpp.html
share/doc/qt2/html/lineedits-main-cpp.html
share/doc/qt2/html/listbox-main-cpp.html
-share/doc/qt2/html/listbox_combo-main-cpp.html
-share/doc/qt2/html/listview.png
+share/doc/qt2/html/listboxcombo-main-cpp.html
share/doc/qt2/html/listviews-main-cpp.html
share/doc/qt2/html/mailinglists.html
share/doc/qt2/html/mainlyMotif-editor-cpp.html
share/doc/qt2/html/mainlyQt-editor-cpp.html
share/doc/qt2/html/mainlyXt-editor-cpp.html
+share/doc/qt2/html/mainwindow-m.png
+share/doc/qt2/html/mainwindow-w.png
+share/doc/qt2/html/mdi-main-cpp.html
share/doc/qt2/html/menu-menu-cpp.html
share/doc/qt2/html/metaobjects.html
share/doc/qt2/html/misc.html
share/doc/qt2/html/moc.html
share/doc/qt2/html/movies-main-cpp.html
+share/doc/qt2/html/network.html
share/doc/qt2/html/nsplugin.html
+share/doc/qt2/html/object.html
+share/doc/qt2/html/objectmodel.html
+share/doc/qt2/html/objecttrees.html
share/doc/qt2/html/opengl.html
+share/doc/qt2/html/organizers.html
+share/doc/qt2/html/palette.png
share/doc/qt2/html/picture-picture-cpp.html
share/doc/qt2/html/pictures.html
share/doc/qt2/html/pnglogo.png
share/doc/qt2/html/popup-popup-cpp.html
share/doc/qt2/html/porting.html
share/doc/qt2/html/primes.html
-share/doc/qt2/html/printerdialog.png
share/doc/qt2/html/progress-progress-cpp.html
share/doc/qt2/html/progressbar-main-cpp.html
+share/doc/qt2/html/properties.html
share/doc/qt2/html/qabstractlayout-h.html
share/doc/qt2/html/qaccel-h.html
share/doc/qt2/html/qaccel-members.html
@@ -376,7 +422,6 @@ share/doc/qt2/html/qbitval-members.html
share/doc/qt2/html/qbitval.html
share/doc/qt2/html/qboxlayout-members.html
share/doc/qt2/html/qboxlayout.html
-share/doc/qt2/html/qbrowser-main-cpp.html
share/doc/qt2/html/qbrush-h.html
share/doc/qt2/html/qbrush-members.html
share/doc/qt2/html/qbrush.html
@@ -391,6 +436,8 @@ share/doc/qt2/html/qbutton.html
share/doc/qt2/html/qbuttongroup-h.html
share/doc/qt2/html/qbuttongroup-members.html
share/doc/qt2/html/qbuttongroup.html
+share/doc/qt2/html/qbytearray-members.html
+share/doc/qt2/html/qbytearray.html
share/doc/qt2/html/qcache-h.html
share/doc/qt2/html/qcache-members.html
share/doc/qt2/html/qcache.html
@@ -401,6 +448,8 @@ share/doc/qt2/html/qcdestyle-members.html
share/doc/qt2/html/qcdestyle.html
share/doc/qt2/html/qchar-members.html
share/doc/qt2/html/qchar.html
+share/doc/qt2/html/qcharref-members.html
+share/doc/qt2/html/qcharref.html
share/doc/qt2/html/qcheckbox-h.html
share/doc/qt2/html/qcheckbox-m.png
share/doc/qt2/html/qcheckbox-members.html
@@ -412,6 +461,7 @@ share/doc/qt2/html/qchildevent-members.html
share/doc/qt2/html/qchildevent.html
share/doc/qt2/html/qchkbox-m.png
share/doc/qt2/html/qchkbox-w.png
+share/doc/qt2/html/qclassinfo-members.html
share/doc/qt2/html/qclipboard-h.html
share/doc/qt2/html/qclipboard-members.html
share/doc/qt2/html/qclipboard.html
@@ -426,6 +476,10 @@ share/doc/qt2/html/qcolor.html
share/doc/qt2/html/qcolordialog-h.html
share/doc/qt2/html/qcolordialog-members.html
share/doc/qt2/html/qcolordialog.html
+share/doc/qt2/html/qcolordlg-m.png
+share/doc/qt2/html/qcolordlg-w.png
+share/doc/qt2/html/qcolordrag-members.html
+share/doc/qt2/html/qcolordrag.html
share/doc/qt2/html/qcolorgroup-members.html
share/doc/qt2/html/qcolorgroup.html
share/doc/qt2/html/qcombo1-m.png
@@ -453,6 +507,8 @@ share/doc/qt2/html/qcursor-members.html
share/doc/qt2/html/qcursor.html
share/doc/qt2/html/qcustomevent-members.html
share/doc/qt2/html/qcustomevent.html
+share/doc/qt2/html/qcustommenuitem-members.html
+share/doc/qt2/html/qcustommenuitem.html
share/doc/qt2/html/qdatapump-members.html
share/doc/qt2/html/qdatapump.html
share/doc/qt2/html/qdatasink-members.html
@@ -467,6 +523,8 @@ share/doc/qt2/html/qdate.html
share/doc/qt2/html/qdatetime-h.html
share/doc/qt2/html/qdatetime-members.html
share/doc/qt2/html/qdatetime.html
+share/doc/qt2/html/qdial-m.png
+share/doc/qt2/html/qdial-w.png
share/doc/qt2/html/qdialog-h.html
share/doc/qt2/html/qdialog-members.html
share/doc/qt2/html/qdialog.html
@@ -477,7 +535,6 @@ share/doc/qt2/html/qdictiterator-members.html
share/doc/qt2/html/qdictiterator.html
share/doc/qt2/html/qdir-h.html
share/doc/qt2/html/qdir-members.html
-share/doc/qt2/html/qdir-qdir-cpp.html
share/doc/qt2/html/qdir.html
share/doc/qt2/html/qdoublevalidator-members.html
share/doc/qt2/html/qdoublevalidator.html
@@ -496,6 +553,9 @@ share/doc/qt2/html/qdropevent.html
share/doc/qt2/html/qdropsite-h.html
share/doc/qt2/html/qdropsite-members.html
share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qeucjpcodec-h.html
+share/doc/qt2/html/qeucjpcodec-members.html
+share/doc/qt2/html/qeucjpcodec.html
share/doc/qt2/html/qevent-h.html
share/doc/qt2/html/qevent-members.html
share/doc/qt2/html/qevent.html
@@ -510,7 +570,6 @@ share/doc/qt2/html/qfiledlg-m.png
share/doc/qt2/html/qfiledlg-w.png
share/doc/qt2/html/qfileiconprovider-members.html
share/doc/qt2/html/qfileiconprovider.html
-share/doc/qt2/html/qfileiconview-main-cpp.html
share/doc/qt2/html/qfileinfo-h.html
share/doc/qt2/html/qfileinfo-members.html
share/doc/qt2/html/qfileinfo.html
@@ -522,9 +581,14 @@ share/doc/qt2/html/qfocusevent.html
share/doc/qt2/html/qfont-h.html
share/doc/qt2/html/qfont-members.html
share/doc/qt2/html/qfont.html
+share/doc/qt2/html/qfontdatabase-h.html
+share/doc/qt2/html/qfontdatabase-members.html
+share/doc/qt2/html/qfontdatabase.html
share/doc/qt2/html/qfontdialog-h.html
share/doc/qt2/html/qfontdialog-members.html
share/doc/qt2/html/qfontdialog.html
+share/doc/qt2/html/qfontdlg-m.png
+share/doc/qt2/html/qfontdlg-w.png
share/doc/qt2/html/qfontinfo-h.html
share/doc/qt2/html/qfontinfo-members.html
share/doc/qt2/html/qfontinfo.html
@@ -537,6 +601,9 @@ share/doc/qt2/html/qframe.html
share/doc/qt2/html/qgarray-h.html
share/doc/qt2/html/qgarray-members.html
share/doc/qt2/html/qgarray.html
+share/doc/qt2/html/qgbkcodec-h.html
+share/doc/qt2/html/qgbkcodec-members.html
+share/doc/qt2/html/qgbkcodec.html
share/doc/qt2/html/qgcache-h.html
share/doc/qt2/html/qgcache-members.html
share/doc/qt2/html/qgcache.html
@@ -577,6 +644,12 @@ share/doc/qt2/html/qgroupbox-members.html
share/doc/qt2/html/qgroupbox.html
share/doc/qt2/html/qgrpbox-m.png
share/doc/qt2/html/qgrpbox-w.png
+share/doc/qt2/html/qguardedptr-h.html
+share/doc/qt2/html/qguardedptr-members.html
+share/doc/qt2/html/qguardedptr.html
+share/doc/qt2/html/qgvector-h.html
+share/doc/qt2/html/qgvector-members.html
+share/doc/qt2/html/qgvector.html
share/doc/qt2/html/qhbox-h.html
share/doc/qt2/html/qhbox-m.png
share/doc/qt2/html/qhbox-members.html
@@ -598,10 +671,20 @@ share/doc/qt2/html/qhgroupbox-members.html
share/doc/qt2/html/qhgroupbox.html
share/doc/qt2/html/qhideevent-members.html
share/doc/qt2/html/qhideevent.html
+share/doc/qt2/html/qicondrag-members.html
+share/doc/qt2/html/qicondrag.html
+share/doc/qt2/html/qicondragitem-members.html
+share/doc/qt2/html/qicondragitem.html
share/doc/qt2/html/qiconset-h.html
share/doc/qt2/html/qiconset-members.html
share/doc/qt2/html/qiconset.html
-share/doc/qt2/html/qiconview-main-cpp.html
+share/doc/qt2/html/qiconview-h.html
+share/doc/qt2/html/qiconview-m.png
+share/doc/qt2/html/qiconview-members.html
+share/doc/qt2/html/qiconview-w.png
+share/doc/qt2/html/qiconview.html
+share/doc/qt2/html/qiconviewitem-members.html
+share/doc/qt2/html/qiconviewitem.html
share/doc/qt2/html/qimage-h.html
share/doc/qt2/html/qimage-members.html
share/doc/qt2/html/qimage.html
@@ -617,6 +700,9 @@ share/doc/qt2/html/qimageformattype-members.html
share/doc/qt2/html/qimageformattype.html
share/doc/qt2/html/qimageio-members.html
share/doc/qt2/html/qimageio.html
+share/doc/qt2/html/qinputdialog-h.html
+share/doc/qt2/html/qinputdialog-members.html
+share/doc/qt2/html/qinputdialog.html
share/doc/qt2/html/qintcache-h.html
share/doc/qt2/html/qintcache-members.html
share/doc/qt2/html/qintcache.html
@@ -634,6 +720,12 @@ share/doc/qt2/html/qiodevice-members.html
share/doc/qt2/html/qiodevice.html
share/doc/qt2/html/qiodevicesource-members.html
share/doc/qt2/html/qiodevicesource.html
+share/doc/qt2/html/qjiscodec-h.html
+share/doc/qt2/html/qjiscodec-members.html
+share/doc/qt2/html/qjiscodec.html
+share/doc/qt2/html/qjpunicode-h.html
+share/doc/qt2/html/qjpunicodeconv-members.html
+share/doc/qt2/html/qjpunicodeconv.html
share/doc/qt2/html/qkeyevent-members.html
share/doc/qt2/html/qkeyevent.html
share/doc/qt2/html/qlabel-h.html
@@ -675,7 +767,9 @@ share/doc/qt2/html/qlistboxtext.html
share/doc/qt2/html/qlistiterator-members.html
share/doc/qt2/html/qlistiterator.html
share/doc/qt2/html/qlistview-h.html
+share/doc/qt2/html/qlistview-m.png
share/doc/qt2/html/qlistview-members.html
+share/doc/qt2/html/qlistview-w.png
share/doc/qt2/html/qlistview.html
share/doc/qt2/html/qlistviewitem-members.html
share/doc/qt2/html/qlistviewitem.html
@@ -683,6 +777,9 @@ share/doc/qt2/html/qlistviewitemiterator-members.html
share/doc/qt2/html/qlistviewitemiterator.html
share/doc/qt2/html/qlnode-members.html
share/doc/qt2/html/qlnode.html
+share/doc/qt2/html/qlocalfs-h.html
+share/doc/qt2/html/qlocalfs-members.html
+share/doc/qt2/html/qlocalfs.html
share/doc/qt2/html/qmag-qmag-cpp.html
share/doc/qt2/html/qmainwindow-h.html
share/doc/qt2/html/qmainwindow-m.png
@@ -707,6 +804,12 @@ share/doc/qt2/html/qmenudata.html
share/doc/qt2/html/qmessagebox-h.html
share/doc/qt2/html/qmessagebox-members.html
share/doc/qt2/html/qmessagebox.html
+share/doc/qt2/html/qmetadata-members.html
+share/doc/qt2/html/qmetaobject-h.html
+share/doc/qt2/html/qmetaobject-members.html
+share/doc/qt2/html/qmetaobject.html
+share/doc/qt2/html/qmetaproperty-members.html
+share/doc/qt2/html/qmetaproperty.html
share/doc/qt2/html/qmime-h.html
share/doc/qt2/html/qmimesource-members.html
share/doc/qt2/html/qmimesource.html
@@ -732,6 +835,11 @@ share/doc/qt2/html/qmultilineedit-members.html
share/doc/qt2/html/qmultilineedit.html
share/doc/qt2/html/qnamespace-h.html
share/doc/qt2/html/qnetworkegg.html
+share/doc/qt2/html/qnetworkoperation-members.html
+share/doc/qt2/html/qnetworkoperation.html
+share/doc/qt2/html/qnetworkprotocol-h.html
+share/doc/qt2/html/qnetworkprotocol-members.html
+share/doc/qt2/html/qnetworkprotocol.html
share/doc/qt2/html/qnp-h.html
share/doc/qt2/html/qnpinstance-members.html
share/doc/qt2/html/qnpinstance.html
@@ -782,11 +890,16 @@ share/doc/qt2/html/qpoint.html
share/doc/qt2/html/qpointarray-h.html
share/doc/qt2/html/qpointarray-members.html
share/doc/qt2/html/qpointarray.html
+share/doc/qt2/html/qpopmenu-fancy.png
share/doc/qt2/html/qpopmenu-m.png
share/doc/qt2/html/qpopmenu-w.png
share/doc/qt2/html/qpopupmenu-h.html
share/doc/qt2/html/qpopupmenu-members.html
share/doc/qt2/html/qpopupmenu.html
+share/doc/qt2/html/qprintdialog-h.html
+share/doc/qt2/html/qprintdialog-members.html
+share/doc/qt2/html/qprintdlg-m.png
+share/doc/qt2/html/qprintdlg-w.png
share/doc/qt2/html/qprinter-h.html
share/doc/qt2/html/qprinter-members.html
share/doc/qt2/html/qprinter.html
@@ -848,9 +961,6 @@ share/doc/qt2/html/qscrollview.html
share/doc/qt2/html/qsemimodal-h.html
share/doc/qt2/html/qsemimodal-members.html
share/doc/qt2/html/qsemimodal.html
-share/doc/qt2/html/qserversocket-h.html
-share/doc/qt2/html/qserversocket-members.html
-share/doc/qt2/html/qserversocket.html
share/doc/qt2/html/qsessionmanager-h.html
share/doc/qt2/html/qsessionmanager-members.html
share/doc/qt2/html/qsessionmanager.html
@@ -872,7 +982,9 @@ share/doc/qt2/html/qsize-h.html
share/doc/qt2/html/qsize-members.html
share/doc/qt2/html/qsize.html
share/doc/qt2/html/qsizegrip-h.html
+share/doc/qt2/html/qsizegrip-m.png
share/doc/qt2/html/qsizegrip-members.html
+share/doc/qt2/html/qsizegrip-w.png
share/doc/qt2/html/qsizegrip.html
share/doc/qt2/html/qsizepolicy-h.html
share/doc/qt2/html/qsizepolicy-members.html
@@ -882,12 +994,6 @@ share/doc/qt2/html/qslider-m.png
share/doc/qt2/html/qslider-members.html
share/doc/qt2/html/qslider-w.png
share/doc/qt2/html/qslider.html
-share/doc/qt2/html/qsocket-h.html
-share/doc/qt2/html/qsocket-members.html
-share/doc/qt2/html/qsocket.html
-share/doc/qt2/html/qsocketaddress-members.html
-share/doc/qt2/html/qsocketaddress.html
-share/doc/qt2/html/qsocketdevice-h.html
share/doc/qt2/html/qsocketnotifier-h.html
share/doc/qt2/html/qsocketnotifier-members.html
share/doc/qt2/html/qsocketnotifier.html
@@ -901,6 +1007,8 @@ share/doc/qt2/html/qspinbox-m.png
share/doc/qt2/html/qspinbox-members.html
share/doc/qt2/html/qspinbox-w.png
share/doc/qt2/html/qspinbox.html
+share/doc/qt2/html/qspinbox2-m.png
+share/doc/qt2/html/qspinbox2-w.png
share/doc/qt2/html/qsplitter-h.html
share/doc/qt2/html/qsplitter-m.png
share/doc/qt2/html/qsplitter-members.html
@@ -927,6 +1035,8 @@ share/doc/qt2/html/qstringlist.html
share/doc/qt2/html/qstrlist-h.html
share/doc/qt2/html/qstrlist-members.html
share/doc/qt2/html/qstrlist.html
+share/doc/qt2/html/qstrlistiterator-members.html
+share/doc/qt2/html/qstrlistiterator.html
share/doc/qt2/html/qstyle-h.html
share/doc/qt2/html/qstyle-members.html
share/doc/qt2/html/qstyle.html
@@ -955,10 +1065,14 @@ share/doc/qt2/html/qtableview.html
share/doc/qt2/html/qtablevw-m.png
share/doc/qt2/html/qtablevw-w.png
share/doc/qt2/html/qtabwidget-h.html
+share/doc/qt2/html/qtabwidget-m.png
share/doc/qt2/html/qtabwidget-members.html
+share/doc/qt2/html/qtabwidget-w.png
share/doc/qt2/html/qtabwidget.html
share/doc/qt2/html/qtextbrowser-h.html
+share/doc/qt2/html/qtextbrowser-m.png
share/doc/qt2/html/qtextbrowser-members.html
+share/doc/qt2/html/qtextbrowser-w.png
share/doc/qt2/html/qtextbrowser.html
share/doc/qt2/html/qtextcodec-h.html
share/doc/qt2/html/qtextcodec-members.html
@@ -1005,6 +1119,15 @@ share/doc/qt2/html/qtranslator-members.html
share/doc/qt2/html/qtranslator.html
share/doc/qt2/html/quridrag-members.html
share/doc/qt2/html/quridrag.html
+share/doc/qt2/html/qurl-h.html
+share/doc/qt2/html/qurl-members.html
+share/doc/qt2/html/qurl.html
+share/doc/qt2/html/qurlinfo-h.html
+share/doc/qt2/html/qurlinfo-members.html
+share/doc/qt2/html/qurlinfo.html
+share/doc/qt2/html/qurloperator-h.html
+share/doc/qt2/html/qurloperator-members.html
+share/doc/qt2/html/qurloperator.html
share/doc/qt2/html/qvalidator-h.html
share/doc/qt2/html/qvalidator-members.html
share/doc/qt2/html/qvalidator.html
@@ -1015,6 +1138,10 @@ share/doc/qt2/html/qvaluelistconstiterator-members.html
share/doc/qt2/html/qvaluelistconstiterator.html
share/doc/qt2/html/qvaluelistiterator-members.html
share/doc/qt2/html/qvaluelistiterator.html
+share/doc/qt2/html/qvaluestack-h.html
+share/doc/qt2/html/qvaluestack-members.html
+share/doc/qt2/html/qvaluestack.html
+share/doc/qt2/html/qvariant-h.html
share/doc/qt2/html/qvbox-h.html
share/doc/qt2/html/qvbox-m.png
share/doc/qt2/html/qvbox-members.html
@@ -1026,6 +1153,9 @@ share/doc/qt2/html/qvboxlayout.html
share/doc/qt2/html/qvbuttongroup-h.html
share/doc/qt2/html/qvbuttongroup-members.html
share/doc/qt2/html/qvbuttongroup.html
+share/doc/qt2/html/qvector-h.html
+share/doc/qt2/html/qvector-members.html
+share/doc/qt2/html/qvector.html
share/doc/qt2/html/qvgroupbox-h.html
share/doc/qt2/html/qvgroupbox-members.html
share/doc/qt2/html/qvgroupbox.html
@@ -1058,11 +1188,13 @@ share/doc/qt2/html/qxtapplication-members.html
share/doc/qt2/html/qxtapplication.html
share/doc/qt2/html/qxtwidget-members.html
share/doc/qt2/html/qxtwidget.html
-share/doc/qt2/html/rangecontrols-main-cpp.html
-share/doc/qt2/html/realwidgets.html
share/doc/qt2/html/removed20.html
share/doc/qt2/html/richtext-main-cpp.html
+share/doc/qt2/html/rintersect.png
share/doc/qt2/html/rot13-rot13-cpp.html
+share/doc/qt2/html/rsubtract.png
+share/doc/qt2/html/runion.png
+share/doc/qt2/html/rxor.png
share/doc/qt2/html/scribble-main-cpp.html
share/doc/qt2/html/scrollview-scrollview-cpp.html
share/doc/qt2/html/session.html
@@ -1070,8 +1202,12 @@ share/doc/qt2/html/session.png
share/doc/qt2/html/shared.html
share/doc/qt2/html/shclass.html
share/doc/qt2/html/showimg-main-cpp.html
+share/doc/qt2/html/signalsandslots.html
share/doc/qt2/html/simple-application.html
+share/doc/qt2/html/sound.html
share/doc/qt2/html/splitter-splitter-cpp.html
+share/doc/qt2/html/splitter-views-m.png
+share/doc/qt2/html/splitter-views-w.png
share/doc/qt2/html/t1.html
share/doc/qt2/html/t1.png
share/doc/qt2/html/t10-cannon-cpp.html
@@ -1152,23 +1288,25 @@ share/doc/qt2/html/t9.html
share/doc/qt2/html/t9.png
share/doc/qt2/html/t9_1.png
share/doc/qt2/html/t9_2.png
-share/doc/qt2/html/tabdialog-tabdialog-cpp.html
+share/doc/qt2/html/tabdialog-main-cpp.html
share/doc/qt2/html/table-main-cpp.html
share/doc/qt2/html/test.png
share/doc/qt2/html/tetrix-tetrix-cpp.html
share/doc/qt2/html/themes-main-cpp.html
share/doc/qt2/html/tictac-main-cpp.html
share/doc/qt2/html/time.html
+share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
share/doc/qt2/html/tools.html
share/doc/qt2/html/tooltip-main-cpp.html
share/doc/qt2/html/topicals.html
-share/doc/qt2/html/treeview.png
share/doc/qt2/html/trivial-trivial-cpp.html
share/doc/qt2/html/troll.html
share/doc/qt2/html/ttlogo-small.jpg
share/doc/qt2/html/ttlogo-small.png
share/doc/qt2/html/tutorial.html
share/doc/qt2/html/tutorial.png
+share/doc/qt2/html/unicode.html
share/doc/qt2/html/validator-main-cpp.html
share/doc/qt2/html/whatsthis.png
share/doc/qt2/html/wizard-main-cpp.html
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index db92bfb31301..aab47b0ecd25 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -1,71 +1,78 @@
-# New ports collection makefile for: qt20
-# Version required: 2.0.2
+# New ports collection makefile for: qt21
+# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
-# Whom: imura@cs.titech.ac.jp
+# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-2.0.2
+DISTNAME= qt-x11-2.1.0-beta2
+PKGNAME= qt-2.1.0b2
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
-
-FORBIDDEN= repository copied, awaiting upgrade
+LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ MesaGL.14:${PORTSDIR}/graphics/Mesa3
NO_LATEST_LINK= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_NEWGCC= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -system-zlib -system-libpng \
- -I${LOCALBASE}/include -L${LOCALBASE}/lib -lxpg4
+CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg \
+ -I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= QTDIR=${WRKSRC}
-MAKE_ENV+= QTDIR=${WRKSRC} SYS_CXX=${CXX} SYS_CC=${CC} SYS_CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV= QTDIR=${WRKSRC}
-.include <bsd.port.pre.mk>
+WRKSRC= ${WRKDIR}/qt-2.1.0-beta2
+CONFIG= ${WRKSRC}/configs/freebsd-g++-shared
.if defined(QT_GIF_AVAILABLE)
CONFIGURE_ARGS+=-gif
RESTRICTED= 'Requires a license from UNISYS'
.endif
-USE_NEWGCC= YES
-
-.if ${PORTOBJFORMAT} == "elf"
-VERSION= 2
-.else
-VERSION= 2.02
+.if !defined(NOPORTDOCS)
+.include "files/manpages"
.endif
-PLIST_SUB= VERSION=${VERSION}
-.include "files/manpages"
+pre-configure:
+ @${PERL} -pi -e "s,gcc,${CC},g" ${CONFIG}
+ @${PERL} -pi -e "s,g\+\+,${CXX},g" ${CONFIG}
+ @${PERL} -pi -e "s,/usr/X11R6,${X11BASE},g" ${CONFIG}
+ @${PERL} -pi -e "s,-pipe -O2,${CXXFLAGS},g" ${CONFIG}
+
+post-configure:
+ @(cd ${WRKSRC} ; ${GMAKE} symlinks)
do-install:
- @(cd ${WRKSRC} ; \
+ ${MKDIR} ${PREFIX}/include/qt2
+ (cd ${WRKSRC} ; \
${INSTALL_PROGRAM} bin/mergetr ${PREFIX}/bin ; \
${INSTALL_PROGRAM} bin/moc ${PREFIX}/bin/moc2 ; \
${INSTALL_PROGRAM} bin/msg2qm ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/findtr ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qt20fix ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qtrename140 ${PREFIX}/bin ; \
- ${INSTALL_DATA} 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/qt2 ; \
${INSTALL_DATA} include/*.h ${PREFIX}/include/qt2 ; \
- ${INSTALL_MAN} man/man1/moc.1 ${PREFIX}/man/man1/moc2.1 ; \
- ${INSTALL_MAN} man/man3/q* ${PREFIX}/man/man3 )
+ ${INSTALL_DATA} lib/libqgl.a ${PREFIX}/lib ; \
+ ${INSTALL_DATA} lib/libqt2.so.3 ${PREFIX}/lib )
+ ${LN} -sf libqt2.so.3 ${PREFIX}/lib/libqt2.so
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.if !defined(NOPORTDOCS)
- @(cd ${WRKSRC} ; \
- ${MKDIR} ${PREFIX}/share/doc/qt2/html ; \
+ ${MKDIR} ${PREFIX}/share/doc/qt2/html
+ (cd ${WRKSRC} ; \
+ ${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} LICENSE.QPL ${PREFIX}/share/doc/qt2 ; \
+ ${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
- ${INSTALL_DATA} doc/* ${PREFIX}/share/doc/qt2/html )
+ ${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
+ ${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt31/distinfo b/x11-toolkits/qt31/distinfo
index 27fdd45446a6..790ea1c64f91 100644
--- a/x11-toolkits/qt31/distinfo
+++ b/x11-toolkits/qt31/distinfo
@@ -1 +1 @@
-MD5 (qt-2.0.2.tar.gz) = afeaf554f538b415a2f46ff6b36657f4
+MD5 (qt-x11-2.1.0-beta2.tar.gz) = 953df8b8c324c4723b2d0ee342e6526a
diff --git a/x11-toolkits/qt31/files/manpages b/x11-toolkits/qt31/files/manpages
index 6b77b5e17666..de362d100114 100644
--- a/x11-toolkits/qt31/files/manpages
+++ b/x11-toolkits/qt31/files/manpages
@@ -1,4 +1,3 @@
-MAN1= moc2.1
MAN3= \
qaccel.3qt \
qapplication.3qt \
@@ -16,10 +15,12 @@ qbrush.3qt \
qbuffer.3qt \
qbutton.3qt \
qbuttongroup.3qt \
+qbytearray.3qt \
qcache.3qt \
qcacheiterator.3qt \
qcdestyle.3qt \
qchar.3qt \
+qcharref.3qt \
qcheckbox.3qt \
qchecklistitem.3qt \
qchildevent.3qt \
@@ -28,14 +29,15 @@ qcloseevent.3qt \
qcollection.3qt \
qcolor.3qt \
qcolordialog.3qt \
+qcolordrag.3qt \
qcolorgroup.3qt \
qcombobox.3qt \
qcommonstyle.3qt \
-qconnection.3qt \
qconststring.3qt \
qcstring.3qt \
qcursor.3qt \
qcustomevent.3qt \
+qcustommenuitem.3qt \
qdatapump.3qt \
qdatasink.3qt \
qdatasource.3qt \
@@ -53,6 +55,7 @@ qdragmoveevent.3qt \
qdragobject.3qt \
qdropevent.3qt \
qdropsite.3qt \
+qeucjpcodec.3qt \
qevent.3qt \
qfile.3qt \
qfiledialog.3qt \
@@ -61,11 +64,13 @@ qfileinfo.3qt \
qfocusdata.3qt \
qfocusevent.3qt \
qfont.3qt \
+qfontdatabase.3qt \
qfontdialog.3qt \
qfontinfo.3qt \
qfontmetrics.3qt \
qframe.3qt \
qgarray.3qt \
+qgbkcodec.3qt \
qgcache.3qt \
qgcacheiterator.3qt \
qgdict.3qt \
@@ -80,13 +85,19 @@ qglwidget.3qt \
qgrid.3qt \
qgridlayout.3qt \
qgroupbox.3qt \
+qguardedptr.3qt \
+qgvector.3qt \
qhbox.3qt \
qhboxlayout.3qt \
qhbuttongroup.3qt \
qheader.3qt \
qhgroupbox.3qt \
qhideevent.3qt \
+qicondrag.3qt \
+qicondragitem.3qt \
qiconset.3qt \
+qiconview.3qt \
+qiconviewitem.3qt \
qimage.3qt \
qimageconsumer.3qt \
qimagedecoder.3qt \
@@ -94,6 +105,7 @@ qimagedrag.3qt \
qimageformat.3qt \
qimageformattype.3qt \
qimageio.3qt \
+qinputdialog.3qt \
qintcache.3qt \
qintcacheiterator.3qt \
qintdict.3qt \
@@ -101,6 +113,8 @@ qintdictiterator.3qt \
qintvalidator.3qt \
qiodevice.3qt \
qiodevicesource.3qt \
+qjiscodec.3qt \
+qjpunicodeconv.3qt \
qkeyevent.3qt \
qlabel.3qt \
qlayout.3qt \
@@ -118,6 +132,7 @@ qlistview.3qt \
qlistviewitem.3qt \
qlistviewitemiterator.3qt \
qlnode.3qt \
+qlocalfs.3qt \
qmainwindow.3qt \
qmap.3qt \
qmapconstiterator.3qt \
@@ -125,6 +140,8 @@ qmapiterator.3qt \
qmenubar.3qt \
qmenudata.3qt \
qmessagebox.3qt \
+qmetaobject.3qt \
+qmetaproperty.3qt \
qmimesource.3qt \
qmimesourcefactory.3qt \
qmotifstyle.3qt \
@@ -132,6 +149,8 @@ qmouseevent.3qt \
qmoveevent.3qt \
qmovie.3qt \
qmultilineedit.3qt \
+qnetworkoperation.3qt \
+qnetworkprotocol.3qt \
qnpinstance.3qt \
qnplugin.3qt \
qnpstream.3qt \
@@ -167,7 +186,6 @@ qresizeevent.3qt \
qscrollbar.3qt \
qscrollview.3qt \
qsemimodal.3qt \
-qserversocket.3qt \
qsessionmanager.3qt \
qshared.3qt \
qshowevent.3qt \
@@ -178,8 +196,6 @@ qsize.3qt \
qsizegrip.3qt \
qsizepolicy.3qt \
qslider.3qt \
-qsocket.3qt \
-qsocketaddress.3qt \
qsocketnotifier.3qt \
qsortedlist.3qt \
qspaceritem.3qt \
@@ -192,6 +208,7 @@ qstrilist.3qt \
qstring.3qt \
qstringlist.3qt \
qstrlist.3qt \
+qstrlistiterator.3qt \
qstyle.3qt \
qstylesheet.3qt \
qstylesheetitem.3qt \
@@ -219,13 +236,17 @@ qtooltip.3qt \
qtooltipgroup.3qt \
qtranslator.3qt \
quridrag.3qt \
+qurl.3qt \
+qurloperator.3qt \
qvalidator.3qt \
qvaluelist.3qt \
qvaluelistconstiterator.3qt \
qvaluelistiterator.3qt \
+qvaluestack.3qt \
qvbox.3qt \
qvboxlayout.3qt \
qvbuttongroup.3qt \
+qvector.3qt \
qvgroupbox.3qt \
qwhatsthis.3qt \
qwheelevent.3qt \
diff --git a/x11-toolkits/qt31/files/patch-aa b/x11-toolkits/qt31/files/patch-aa
index 4adebbfe81c8..a18a37d486c6 100644
--- a/x11-toolkits/qt31/files/patch-aa
+++ b/x11-toolkits/qt31/files/patch-aa
@@ -1,26 +1,6 @@
---- configs/freebsd-g++-shared.orig Fri Sep 24 18:21:55 1999
-+++ configs/freebsd-g++-shared Fri Oct 1 22:07:46 1999
-@@ -1,33 +1,33 @@
- # Compiling
--SYSCONF_CXX = g++
--SYSCONF_CC = gcc
-+SYSCONF_CXX = $(SYS_CXX)
-+SYSCONF_CC = $(SYS_CC)
-
- # Compiling with support libraries
--SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_X11 = -I$(X11BASE)/include
- SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
--SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL = -I$(X11BASE)/include
-
- # Compiline YACC output
- SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
-
- # Linking with support libraries
- # X11
--SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib
+--- configs/freebsd-g++-shared.orig Thu Feb 17 01:55:56 2000
++++ configs/freebsd-g++-shared Sat Feb 26 20:25:51 2000
+@@ -16,7 +16,7 @@
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
# Qt, Qt+OpenGL
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
@@ -28,28 +8,21 @@
+SYSCONF_LIBS_QT = -lqt2
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
--SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
- SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu
- # Yacc
- SYSCONF_LIBS_YACC =
-
+ SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+@@ -27,7 +27,7 @@
# Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = $(SYS_CXX)
+ SYSCONF_LINK = g++
SYSCONF_LFLAGS =
-SYSCONF_LIBS =
+SYSCONF_LIBS = -lxpg4
# Link flags shared objects
SYSCONF_LFLAGS_SHOBJ = -shared
-@@ -40,17 +40,27 @@
- # - Place target in $(DESTDIR) - which has a trailing /
+@@ -41,16 +41,26 @@
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
#
--SYSCONF_LINK_SHLIB = g++
+ SYSCONF_LINK_SHLIB = g++
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-+SYSCONF_LINK_SHLIB = $(SYS_CXX)
+ifeq ($(PORTOBJFORMAT),elf)
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
@@ -77,14 +50,3 @@
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -61,8 +71,8 @@
- SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
- # Compiling application source
--SYSCONF_CXXFLAGS = -pipe -O2
--SYSCONF_CFLAGS = -pipe -O2
-+SYSCONF_CXXFLAGS = $(SYS_CXXFLAGS)
-+SYSCONF_CFLAGS = $(SYS_CXXFLAGS)
- # Compiling library source
- SYSCONF_CXXFLAGS_LIB = -fPIC
- SYSCONF_CFLAGS_LIB = -fPIC
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index d3e52a97f33b..64d14c7bf881 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -5,6 +5,7 @@ bin/msg2qm
bin/qt20fix
bin/qtrename140
include/qt2/jri.h
+include/qt2/jri_md.h
include/qt2/jritypes.h
include/qt2/npapi.h
include/qt2/npupp.h
@@ -18,6 +19,7 @@ include/qt2/qasciicache.h
include/qt2/qasciidict.h
include/qt2/qasyncimageio.h
include/qt2/qasyncio.h
+include/qt2/qbig5codec.h
include/qt2/qbitarray.h
include/qt2/qbitarry.h
include/qt2/qbitmap.h
@@ -59,14 +61,14 @@ include/qt2/qeuckrcodec.h
include/qt2/qevent.h
include/qt2/qfile.h
include/qt2/qfiledef.h
-include/qt2/qfiledefs.h
+include/qt2/qfiledefs_p.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/qfontdata_p.h
include/qt2/qfontdatabase.h
include/qt2/qfontdialog.h
include/qt2/qfontdta.h
@@ -76,6 +78,7 @@ include/qt2/qfontmet.h
include/qt2/qfontmetrics.h
include/qt2/qframe.h
include/qt2/qgarray.h
+include/qt2/qgbkcodec.h
include/qt2/qgcache.h
include/qt2/qgdict.h
include/qt2/qgeneric.h
@@ -83,18 +86,19 @@ 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/qguardedptr.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/qiconview.h
include/qt2/qimage.h
-include/qt2/qimageio.h
+include/qt2/qinputdialog.h
include/qt2/qintcach.h
include/qt2/qintcache.h
include/qt2/qintdict.h
@@ -107,7 +111,7 @@ include/qt2/qkeycode.h
include/qt2/qkoi8codec.h
include/qt2/qlabel.h
include/qt2/qlayout.h
-include/qt2/qlayoutengine.h
+include/qt2/qlayoutengine_p.h
include/qt2/qlcdnum.h
include/qt2/qlcdnumber.h
include/qt2/qlined.h
@@ -115,6 +119,7 @@ include/qt2/qlineedit.h
include/qt2/qlist.h
include/qt2/qlistbox.h
include/qt2/qlistview.h
+include/qt2/qlocalfs.h
include/qt2/qmainwindow.h
include/qt2/qmap.h
include/qt2/qmenubar.h
@@ -131,6 +136,7 @@ include/qt2/qmsgbox.h
include/qt2/qmultilinedit.h
include/qt2/qmultilineedit.h
include/qt2/qnamespace.h
+include/qt2/qnetworkprotocol.h
include/qt2/qnp.h
include/qt2/qobjcoll.h
include/qt2/qobjdefs.h
@@ -165,7 +171,7 @@ include/qt2/qprogbar.h
include/qt2/qprogdlg.h
include/qt2/qprogressbar.h
include/qt2/qprogressdialog.h
-include/qt2/qpsprinter.h
+include/qt2/qpsprinter_p.h
include/qt2/qpsprn.h
include/qt2/qptrdict.h
include/qt2/qpushbt.h
@@ -178,12 +184,12 @@ include/qt2/qrangect.h
include/qt2/qrect.h
include/qt2/qregexp.h
include/qt2/qregion.h
+include/qt2/qrichtext_p.h
include/qt2/qrtlcodec.h
include/qt2/qscrbar.h
include/qt2/qscrollbar.h
include/qt2/qscrollview.h
include/qt2/qsemimodal.h
-include/qt2/qserversocket.h
include/qt2/qsession.h
include/qt2/qsessionmanager.h
include/qt2/qshared.h
@@ -197,8 +203,6 @@ include/qt2/qsizepolicy.h
include/qt2/qsjiscodec.h
include/qt2/qslider.h
include/qt2/qsmartptr.h
-include/qt2/qsocket.h
-include/qt2/qsocketdevice.h
include/qt2/qsocketnotifier.h
include/qt2/qsocknot.h
include/qt2/qsortedlist.h
@@ -212,6 +216,7 @@ include/qt2/qstrlist.h
include/qt2/qstrvec.h
include/qt2/qstyle.h
include/qt2/qstylesheet.h
+include/qt2/qt_x11.h
include/qt2/qtabbar.h
include/qt2/qtabdialog.h
include/qt2/qtabdlg.h
@@ -228,15 +233,21 @@ include/qt2/qtoolbar.h
include/qt2/qtoolbutton.h
include/qt2/qtooltip.h
include/qt2/qtranslator.h
+include/qt2/qtranslatordialog.h
include/qt2/qtstream.h
+include/qt2/qurl.h
+include/qt2/qurlinfo.h
+include/qt2/qurloperator.h
include/qt2/qutfcodec.h
include/qt2/qvalidator.h
include/qt2/qvaluelist.h
+include/qt2/qvaluestack.h
+include/qt2/qvariant.h
include/qt2/qvbox.h
include/qt2/qvbuttongroup.h
include/qt2/qvector.h
include/qt2/qvgroupbox.h
-include/qt2/qwellarray.h
+include/qt2/qwellarray_p.h
include/qt2/qwhatsthis.h
include/qt2/qwidcoll.h
include/qt2/qwidget.h
@@ -249,29 +260,44 @@ include/qt2/qwindowdefs.h
include/qt2/qwindowsstyle.h
include/qt2/qwizard.h
include/qt2/qwmatrix.h
+include/qt2/qworkspace.h
include/qt2/qxt.h
+lib/libqgl.a
lib/libqt2.so
-lib/libqt2.so.%%VERSION%%
+lib/libqt2.so.3
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/doc/qt2/ANNOUNCE
share/doc/qt2/FAQ
share/doc/qt2/LICENSE.QPL
+share/doc/qt2/PORTING
share/doc/qt2/README
share/doc/qt2/README.QT
+share/doc/qt2/html/aboutqt.html
share/doc/qt2/html/abstractwidgets.html
share/doc/qt2/html/accelerators.html
share/doc/qt2/html/aclock-main-cpp.html
share/doc/qt2/html/addressbook-main-cpp.html
+share/doc/qt2/html/advanced.html
share/doc/qt2/html/annotated.html
+share/doc/qt2/html/appearance.html
+share/doc/qt2/html/appicon.html
share/doc/qt2/html/application-main-cpp.html
share/doc/qt2/html/application.html
+share/doc/qt2/html/basic.html
share/doc/qt2/html/bearings.png
share/doc/qt2/html/biff-main-cpp.html
share/doc/qt2/html/book.png
-share/doc/qt2/html/buttons_groups-main-cpp.html
+share/doc/qt2/html/bughowto.html
+share/doc/qt2/html/buttongroup-m.png
+share/doc/qt2/html/buttongroup-w.png
+share/doc/qt2/html/buttongroups-main-cpp.html
+share/doc/qt2/html/buyhowto.html
+share/doc/qt2/html/changes21.html
share/doc/qt2/html/checklists-main-cpp.html
share/doc/qt2/html/classes.html
share/doc/qt2/html/collection.html
+share/doc/qt2/html/commonproblems.html
share/doc/qt2/html/coordsys.html
share/doc/qt2/html/coordsys.png
share/doc/qt2/html/credits.html
@@ -286,62 +312,82 @@ share/doc/qt2/html/dialogs.html
share/doc/qt2/html/dirview-main-cpp.html
share/doc/qt2/html/dnd.html
share/doc/qt2/html/dochead.png
+share/doc/qt2/html/draganddrop.html
share/doc/qt2/html/drawdemo-drawdemo-cpp.html
share/doc/qt2/html/drawing.html
share/doc/qt2/html/drawlines-connect-cpp.html
share/doc/qt2/html/easteregg.html
share/doc/qt2/html/easteregg2.html
+share/doc/qt2/html/environment.html
+share/doc/qt2/html/eventsandfilters.html
share/doc/qt2/html/examples.html
+share/doc/qt2/html/fileiconview-main-cpp.html
+share/doc/qt2/html/focus.html
share/doc/qt2/html/fontmatch.html
-share/doc/qt2/html/fonts.html
share/doc/qt2/html/forever-forever-cpp.html
share/doc/qt2/html/frames.png
share/doc/qt2/html/functions.html
share/doc/qt2/html/geomanagement.html
+share/doc/qt2/html/geometry.html
+share/doc/qt2/html/geometry.png
share/doc/qt2/html/graph.g1n
share/doc/qt2/html/grapher-grapher-cpp.html
share/doc/qt2/html/gridlayout.png
+share/doc/qt2/html/groupbox-m.png
+share/doc/qt2/html/groupbox-w.png
share/doc/qt2/html/guibooks.html
share/doc/qt2/html/headers.html
share/doc/qt2/html/hello-main-cpp.html
+share/doc/qt2/html/helpsystem.html
+share/doc/qt2/html/helpviewer-main-cpp.html
share/doc/qt2/html/hierarchy.html
share/doc/qt2/html/i18n-main-cpp.html
share/doc/qt2/html/i18n.html
-share/doc/qt2/html/imageio.html
+share/doc/qt2/html/iconview-main-cpp.html
share/doc/qt2/html/images.html
+share/doc/qt2/html/index
share/doc/qt2/html/index.html
share/doc/qt2/html/io.html
-share/doc/qt2/html/kernel.html
+share/doc/qt2/html/keyfeatures21.html
share/doc/qt2/html/layout-layout-cpp.html
share/doc/qt2/html/layout.html
share/doc/qt2/html/letter.png
share/doc/qt2/html/license.html
+share/doc/qt2/html/licenses.html
share/doc/qt2/html/life-main-cpp.html
share/doc/qt2/html/lineedits-main-cpp.html
share/doc/qt2/html/listbox-main-cpp.html
-share/doc/qt2/html/listbox_combo-main-cpp.html
-share/doc/qt2/html/listview.png
+share/doc/qt2/html/listboxcombo-main-cpp.html
share/doc/qt2/html/listviews-main-cpp.html
share/doc/qt2/html/mailinglists.html
share/doc/qt2/html/mainlyMotif-editor-cpp.html
share/doc/qt2/html/mainlyQt-editor-cpp.html
share/doc/qt2/html/mainlyXt-editor-cpp.html
+share/doc/qt2/html/mainwindow-m.png
+share/doc/qt2/html/mainwindow-w.png
+share/doc/qt2/html/mdi-main-cpp.html
share/doc/qt2/html/menu-menu-cpp.html
share/doc/qt2/html/metaobjects.html
share/doc/qt2/html/misc.html
share/doc/qt2/html/moc.html
share/doc/qt2/html/movies-main-cpp.html
+share/doc/qt2/html/network.html
share/doc/qt2/html/nsplugin.html
+share/doc/qt2/html/object.html
+share/doc/qt2/html/objectmodel.html
+share/doc/qt2/html/objecttrees.html
share/doc/qt2/html/opengl.html
+share/doc/qt2/html/organizers.html
+share/doc/qt2/html/palette.png
share/doc/qt2/html/picture-picture-cpp.html
share/doc/qt2/html/pictures.html
share/doc/qt2/html/pnglogo.png
share/doc/qt2/html/popup-popup-cpp.html
share/doc/qt2/html/porting.html
share/doc/qt2/html/primes.html
-share/doc/qt2/html/printerdialog.png
share/doc/qt2/html/progress-progress-cpp.html
share/doc/qt2/html/progressbar-main-cpp.html
+share/doc/qt2/html/properties.html
share/doc/qt2/html/qabstractlayout-h.html
share/doc/qt2/html/qaccel-h.html
share/doc/qt2/html/qaccel-members.html
@@ -376,7 +422,6 @@ share/doc/qt2/html/qbitval-members.html
share/doc/qt2/html/qbitval.html
share/doc/qt2/html/qboxlayout-members.html
share/doc/qt2/html/qboxlayout.html
-share/doc/qt2/html/qbrowser-main-cpp.html
share/doc/qt2/html/qbrush-h.html
share/doc/qt2/html/qbrush-members.html
share/doc/qt2/html/qbrush.html
@@ -391,6 +436,8 @@ share/doc/qt2/html/qbutton.html
share/doc/qt2/html/qbuttongroup-h.html
share/doc/qt2/html/qbuttongroup-members.html
share/doc/qt2/html/qbuttongroup.html
+share/doc/qt2/html/qbytearray-members.html
+share/doc/qt2/html/qbytearray.html
share/doc/qt2/html/qcache-h.html
share/doc/qt2/html/qcache-members.html
share/doc/qt2/html/qcache.html
@@ -401,6 +448,8 @@ share/doc/qt2/html/qcdestyle-members.html
share/doc/qt2/html/qcdestyle.html
share/doc/qt2/html/qchar-members.html
share/doc/qt2/html/qchar.html
+share/doc/qt2/html/qcharref-members.html
+share/doc/qt2/html/qcharref.html
share/doc/qt2/html/qcheckbox-h.html
share/doc/qt2/html/qcheckbox-m.png
share/doc/qt2/html/qcheckbox-members.html
@@ -412,6 +461,7 @@ share/doc/qt2/html/qchildevent-members.html
share/doc/qt2/html/qchildevent.html
share/doc/qt2/html/qchkbox-m.png
share/doc/qt2/html/qchkbox-w.png
+share/doc/qt2/html/qclassinfo-members.html
share/doc/qt2/html/qclipboard-h.html
share/doc/qt2/html/qclipboard-members.html
share/doc/qt2/html/qclipboard.html
@@ -426,6 +476,10 @@ share/doc/qt2/html/qcolor.html
share/doc/qt2/html/qcolordialog-h.html
share/doc/qt2/html/qcolordialog-members.html
share/doc/qt2/html/qcolordialog.html
+share/doc/qt2/html/qcolordlg-m.png
+share/doc/qt2/html/qcolordlg-w.png
+share/doc/qt2/html/qcolordrag-members.html
+share/doc/qt2/html/qcolordrag.html
share/doc/qt2/html/qcolorgroup-members.html
share/doc/qt2/html/qcolorgroup.html
share/doc/qt2/html/qcombo1-m.png
@@ -453,6 +507,8 @@ share/doc/qt2/html/qcursor-members.html
share/doc/qt2/html/qcursor.html
share/doc/qt2/html/qcustomevent-members.html
share/doc/qt2/html/qcustomevent.html
+share/doc/qt2/html/qcustommenuitem-members.html
+share/doc/qt2/html/qcustommenuitem.html
share/doc/qt2/html/qdatapump-members.html
share/doc/qt2/html/qdatapump.html
share/doc/qt2/html/qdatasink-members.html
@@ -467,6 +523,8 @@ share/doc/qt2/html/qdate.html
share/doc/qt2/html/qdatetime-h.html
share/doc/qt2/html/qdatetime-members.html
share/doc/qt2/html/qdatetime.html
+share/doc/qt2/html/qdial-m.png
+share/doc/qt2/html/qdial-w.png
share/doc/qt2/html/qdialog-h.html
share/doc/qt2/html/qdialog-members.html
share/doc/qt2/html/qdialog.html
@@ -477,7 +535,6 @@ share/doc/qt2/html/qdictiterator-members.html
share/doc/qt2/html/qdictiterator.html
share/doc/qt2/html/qdir-h.html
share/doc/qt2/html/qdir-members.html
-share/doc/qt2/html/qdir-qdir-cpp.html
share/doc/qt2/html/qdir.html
share/doc/qt2/html/qdoublevalidator-members.html
share/doc/qt2/html/qdoublevalidator.html
@@ -496,6 +553,9 @@ share/doc/qt2/html/qdropevent.html
share/doc/qt2/html/qdropsite-h.html
share/doc/qt2/html/qdropsite-members.html
share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qeucjpcodec-h.html
+share/doc/qt2/html/qeucjpcodec-members.html
+share/doc/qt2/html/qeucjpcodec.html
share/doc/qt2/html/qevent-h.html
share/doc/qt2/html/qevent-members.html
share/doc/qt2/html/qevent.html
@@ -510,7 +570,6 @@ share/doc/qt2/html/qfiledlg-m.png
share/doc/qt2/html/qfiledlg-w.png
share/doc/qt2/html/qfileiconprovider-members.html
share/doc/qt2/html/qfileiconprovider.html
-share/doc/qt2/html/qfileiconview-main-cpp.html
share/doc/qt2/html/qfileinfo-h.html
share/doc/qt2/html/qfileinfo-members.html
share/doc/qt2/html/qfileinfo.html
@@ -522,9 +581,14 @@ share/doc/qt2/html/qfocusevent.html
share/doc/qt2/html/qfont-h.html
share/doc/qt2/html/qfont-members.html
share/doc/qt2/html/qfont.html
+share/doc/qt2/html/qfontdatabase-h.html
+share/doc/qt2/html/qfontdatabase-members.html
+share/doc/qt2/html/qfontdatabase.html
share/doc/qt2/html/qfontdialog-h.html
share/doc/qt2/html/qfontdialog-members.html
share/doc/qt2/html/qfontdialog.html
+share/doc/qt2/html/qfontdlg-m.png
+share/doc/qt2/html/qfontdlg-w.png
share/doc/qt2/html/qfontinfo-h.html
share/doc/qt2/html/qfontinfo-members.html
share/doc/qt2/html/qfontinfo.html
@@ -537,6 +601,9 @@ share/doc/qt2/html/qframe.html
share/doc/qt2/html/qgarray-h.html
share/doc/qt2/html/qgarray-members.html
share/doc/qt2/html/qgarray.html
+share/doc/qt2/html/qgbkcodec-h.html
+share/doc/qt2/html/qgbkcodec-members.html
+share/doc/qt2/html/qgbkcodec.html
share/doc/qt2/html/qgcache-h.html
share/doc/qt2/html/qgcache-members.html
share/doc/qt2/html/qgcache.html
@@ -577,6 +644,12 @@ share/doc/qt2/html/qgroupbox-members.html
share/doc/qt2/html/qgroupbox.html
share/doc/qt2/html/qgrpbox-m.png
share/doc/qt2/html/qgrpbox-w.png
+share/doc/qt2/html/qguardedptr-h.html
+share/doc/qt2/html/qguardedptr-members.html
+share/doc/qt2/html/qguardedptr.html
+share/doc/qt2/html/qgvector-h.html
+share/doc/qt2/html/qgvector-members.html
+share/doc/qt2/html/qgvector.html
share/doc/qt2/html/qhbox-h.html
share/doc/qt2/html/qhbox-m.png
share/doc/qt2/html/qhbox-members.html
@@ -598,10 +671,20 @@ share/doc/qt2/html/qhgroupbox-members.html
share/doc/qt2/html/qhgroupbox.html
share/doc/qt2/html/qhideevent-members.html
share/doc/qt2/html/qhideevent.html
+share/doc/qt2/html/qicondrag-members.html
+share/doc/qt2/html/qicondrag.html
+share/doc/qt2/html/qicondragitem-members.html
+share/doc/qt2/html/qicondragitem.html
share/doc/qt2/html/qiconset-h.html
share/doc/qt2/html/qiconset-members.html
share/doc/qt2/html/qiconset.html
-share/doc/qt2/html/qiconview-main-cpp.html
+share/doc/qt2/html/qiconview-h.html
+share/doc/qt2/html/qiconview-m.png
+share/doc/qt2/html/qiconview-members.html
+share/doc/qt2/html/qiconview-w.png
+share/doc/qt2/html/qiconview.html
+share/doc/qt2/html/qiconviewitem-members.html
+share/doc/qt2/html/qiconviewitem.html
share/doc/qt2/html/qimage-h.html
share/doc/qt2/html/qimage-members.html
share/doc/qt2/html/qimage.html
@@ -617,6 +700,9 @@ share/doc/qt2/html/qimageformattype-members.html
share/doc/qt2/html/qimageformattype.html
share/doc/qt2/html/qimageio-members.html
share/doc/qt2/html/qimageio.html
+share/doc/qt2/html/qinputdialog-h.html
+share/doc/qt2/html/qinputdialog-members.html
+share/doc/qt2/html/qinputdialog.html
share/doc/qt2/html/qintcache-h.html
share/doc/qt2/html/qintcache-members.html
share/doc/qt2/html/qintcache.html
@@ -634,6 +720,12 @@ share/doc/qt2/html/qiodevice-members.html
share/doc/qt2/html/qiodevice.html
share/doc/qt2/html/qiodevicesource-members.html
share/doc/qt2/html/qiodevicesource.html
+share/doc/qt2/html/qjiscodec-h.html
+share/doc/qt2/html/qjiscodec-members.html
+share/doc/qt2/html/qjiscodec.html
+share/doc/qt2/html/qjpunicode-h.html
+share/doc/qt2/html/qjpunicodeconv-members.html
+share/doc/qt2/html/qjpunicodeconv.html
share/doc/qt2/html/qkeyevent-members.html
share/doc/qt2/html/qkeyevent.html
share/doc/qt2/html/qlabel-h.html
@@ -675,7 +767,9 @@ share/doc/qt2/html/qlistboxtext.html
share/doc/qt2/html/qlistiterator-members.html
share/doc/qt2/html/qlistiterator.html
share/doc/qt2/html/qlistview-h.html
+share/doc/qt2/html/qlistview-m.png
share/doc/qt2/html/qlistview-members.html
+share/doc/qt2/html/qlistview-w.png
share/doc/qt2/html/qlistview.html
share/doc/qt2/html/qlistviewitem-members.html
share/doc/qt2/html/qlistviewitem.html
@@ -683,6 +777,9 @@ share/doc/qt2/html/qlistviewitemiterator-members.html
share/doc/qt2/html/qlistviewitemiterator.html
share/doc/qt2/html/qlnode-members.html
share/doc/qt2/html/qlnode.html
+share/doc/qt2/html/qlocalfs-h.html
+share/doc/qt2/html/qlocalfs-members.html
+share/doc/qt2/html/qlocalfs.html
share/doc/qt2/html/qmag-qmag-cpp.html
share/doc/qt2/html/qmainwindow-h.html
share/doc/qt2/html/qmainwindow-m.png
@@ -707,6 +804,12 @@ share/doc/qt2/html/qmenudata.html
share/doc/qt2/html/qmessagebox-h.html
share/doc/qt2/html/qmessagebox-members.html
share/doc/qt2/html/qmessagebox.html
+share/doc/qt2/html/qmetadata-members.html
+share/doc/qt2/html/qmetaobject-h.html
+share/doc/qt2/html/qmetaobject-members.html
+share/doc/qt2/html/qmetaobject.html
+share/doc/qt2/html/qmetaproperty-members.html
+share/doc/qt2/html/qmetaproperty.html
share/doc/qt2/html/qmime-h.html
share/doc/qt2/html/qmimesource-members.html
share/doc/qt2/html/qmimesource.html
@@ -732,6 +835,11 @@ share/doc/qt2/html/qmultilineedit-members.html
share/doc/qt2/html/qmultilineedit.html
share/doc/qt2/html/qnamespace-h.html
share/doc/qt2/html/qnetworkegg.html
+share/doc/qt2/html/qnetworkoperation-members.html
+share/doc/qt2/html/qnetworkoperation.html
+share/doc/qt2/html/qnetworkprotocol-h.html
+share/doc/qt2/html/qnetworkprotocol-members.html
+share/doc/qt2/html/qnetworkprotocol.html
share/doc/qt2/html/qnp-h.html
share/doc/qt2/html/qnpinstance-members.html
share/doc/qt2/html/qnpinstance.html
@@ -782,11 +890,16 @@ share/doc/qt2/html/qpoint.html
share/doc/qt2/html/qpointarray-h.html
share/doc/qt2/html/qpointarray-members.html
share/doc/qt2/html/qpointarray.html
+share/doc/qt2/html/qpopmenu-fancy.png
share/doc/qt2/html/qpopmenu-m.png
share/doc/qt2/html/qpopmenu-w.png
share/doc/qt2/html/qpopupmenu-h.html
share/doc/qt2/html/qpopupmenu-members.html
share/doc/qt2/html/qpopupmenu.html
+share/doc/qt2/html/qprintdialog-h.html
+share/doc/qt2/html/qprintdialog-members.html
+share/doc/qt2/html/qprintdlg-m.png
+share/doc/qt2/html/qprintdlg-w.png
share/doc/qt2/html/qprinter-h.html
share/doc/qt2/html/qprinter-members.html
share/doc/qt2/html/qprinter.html
@@ -848,9 +961,6 @@ share/doc/qt2/html/qscrollview.html
share/doc/qt2/html/qsemimodal-h.html
share/doc/qt2/html/qsemimodal-members.html
share/doc/qt2/html/qsemimodal.html
-share/doc/qt2/html/qserversocket-h.html
-share/doc/qt2/html/qserversocket-members.html
-share/doc/qt2/html/qserversocket.html
share/doc/qt2/html/qsessionmanager-h.html
share/doc/qt2/html/qsessionmanager-members.html
share/doc/qt2/html/qsessionmanager.html
@@ -872,7 +982,9 @@ share/doc/qt2/html/qsize-h.html
share/doc/qt2/html/qsize-members.html
share/doc/qt2/html/qsize.html
share/doc/qt2/html/qsizegrip-h.html
+share/doc/qt2/html/qsizegrip-m.png
share/doc/qt2/html/qsizegrip-members.html
+share/doc/qt2/html/qsizegrip-w.png
share/doc/qt2/html/qsizegrip.html
share/doc/qt2/html/qsizepolicy-h.html
share/doc/qt2/html/qsizepolicy-members.html
@@ -882,12 +994,6 @@ share/doc/qt2/html/qslider-m.png
share/doc/qt2/html/qslider-members.html
share/doc/qt2/html/qslider-w.png
share/doc/qt2/html/qslider.html
-share/doc/qt2/html/qsocket-h.html
-share/doc/qt2/html/qsocket-members.html
-share/doc/qt2/html/qsocket.html
-share/doc/qt2/html/qsocketaddress-members.html
-share/doc/qt2/html/qsocketaddress.html
-share/doc/qt2/html/qsocketdevice-h.html
share/doc/qt2/html/qsocketnotifier-h.html
share/doc/qt2/html/qsocketnotifier-members.html
share/doc/qt2/html/qsocketnotifier.html
@@ -901,6 +1007,8 @@ share/doc/qt2/html/qspinbox-m.png
share/doc/qt2/html/qspinbox-members.html
share/doc/qt2/html/qspinbox-w.png
share/doc/qt2/html/qspinbox.html
+share/doc/qt2/html/qspinbox2-m.png
+share/doc/qt2/html/qspinbox2-w.png
share/doc/qt2/html/qsplitter-h.html
share/doc/qt2/html/qsplitter-m.png
share/doc/qt2/html/qsplitter-members.html
@@ -927,6 +1035,8 @@ share/doc/qt2/html/qstringlist.html
share/doc/qt2/html/qstrlist-h.html
share/doc/qt2/html/qstrlist-members.html
share/doc/qt2/html/qstrlist.html
+share/doc/qt2/html/qstrlistiterator-members.html
+share/doc/qt2/html/qstrlistiterator.html
share/doc/qt2/html/qstyle-h.html
share/doc/qt2/html/qstyle-members.html
share/doc/qt2/html/qstyle.html
@@ -955,10 +1065,14 @@ share/doc/qt2/html/qtableview.html
share/doc/qt2/html/qtablevw-m.png
share/doc/qt2/html/qtablevw-w.png
share/doc/qt2/html/qtabwidget-h.html
+share/doc/qt2/html/qtabwidget-m.png
share/doc/qt2/html/qtabwidget-members.html
+share/doc/qt2/html/qtabwidget-w.png
share/doc/qt2/html/qtabwidget.html
share/doc/qt2/html/qtextbrowser-h.html
+share/doc/qt2/html/qtextbrowser-m.png
share/doc/qt2/html/qtextbrowser-members.html
+share/doc/qt2/html/qtextbrowser-w.png
share/doc/qt2/html/qtextbrowser.html
share/doc/qt2/html/qtextcodec-h.html
share/doc/qt2/html/qtextcodec-members.html
@@ -1005,6 +1119,15 @@ share/doc/qt2/html/qtranslator-members.html
share/doc/qt2/html/qtranslator.html
share/doc/qt2/html/quridrag-members.html
share/doc/qt2/html/quridrag.html
+share/doc/qt2/html/qurl-h.html
+share/doc/qt2/html/qurl-members.html
+share/doc/qt2/html/qurl.html
+share/doc/qt2/html/qurlinfo-h.html
+share/doc/qt2/html/qurlinfo-members.html
+share/doc/qt2/html/qurlinfo.html
+share/doc/qt2/html/qurloperator-h.html
+share/doc/qt2/html/qurloperator-members.html
+share/doc/qt2/html/qurloperator.html
share/doc/qt2/html/qvalidator-h.html
share/doc/qt2/html/qvalidator-members.html
share/doc/qt2/html/qvalidator.html
@@ -1015,6 +1138,10 @@ share/doc/qt2/html/qvaluelistconstiterator-members.html
share/doc/qt2/html/qvaluelistconstiterator.html
share/doc/qt2/html/qvaluelistiterator-members.html
share/doc/qt2/html/qvaluelistiterator.html
+share/doc/qt2/html/qvaluestack-h.html
+share/doc/qt2/html/qvaluestack-members.html
+share/doc/qt2/html/qvaluestack.html
+share/doc/qt2/html/qvariant-h.html
share/doc/qt2/html/qvbox-h.html
share/doc/qt2/html/qvbox-m.png
share/doc/qt2/html/qvbox-members.html
@@ -1026,6 +1153,9 @@ share/doc/qt2/html/qvboxlayout.html
share/doc/qt2/html/qvbuttongroup-h.html
share/doc/qt2/html/qvbuttongroup-members.html
share/doc/qt2/html/qvbuttongroup.html
+share/doc/qt2/html/qvector-h.html
+share/doc/qt2/html/qvector-members.html
+share/doc/qt2/html/qvector.html
share/doc/qt2/html/qvgroupbox-h.html
share/doc/qt2/html/qvgroupbox-members.html
share/doc/qt2/html/qvgroupbox.html
@@ -1058,11 +1188,13 @@ share/doc/qt2/html/qxtapplication-members.html
share/doc/qt2/html/qxtapplication.html
share/doc/qt2/html/qxtwidget-members.html
share/doc/qt2/html/qxtwidget.html
-share/doc/qt2/html/rangecontrols-main-cpp.html
-share/doc/qt2/html/realwidgets.html
share/doc/qt2/html/removed20.html
share/doc/qt2/html/richtext-main-cpp.html
+share/doc/qt2/html/rintersect.png
share/doc/qt2/html/rot13-rot13-cpp.html
+share/doc/qt2/html/rsubtract.png
+share/doc/qt2/html/runion.png
+share/doc/qt2/html/rxor.png
share/doc/qt2/html/scribble-main-cpp.html
share/doc/qt2/html/scrollview-scrollview-cpp.html
share/doc/qt2/html/session.html
@@ -1070,8 +1202,12 @@ share/doc/qt2/html/session.png
share/doc/qt2/html/shared.html
share/doc/qt2/html/shclass.html
share/doc/qt2/html/showimg-main-cpp.html
+share/doc/qt2/html/signalsandslots.html
share/doc/qt2/html/simple-application.html
+share/doc/qt2/html/sound.html
share/doc/qt2/html/splitter-splitter-cpp.html
+share/doc/qt2/html/splitter-views-m.png
+share/doc/qt2/html/splitter-views-w.png
share/doc/qt2/html/t1.html
share/doc/qt2/html/t1.png
share/doc/qt2/html/t10-cannon-cpp.html
@@ -1152,23 +1288,25 @@ share/doc/qt2/html/t9.html
share/doc/qt2/html/t9.png
share/doc/qt2/html/t9_1.png
share/doc/qt2/html/t9_2.png
-share/doc/qt2/html/tabdialog-tabdialog-cpp.html
+share/doc/qt2/html/tabdialog-main-cpp.html
share/doc/qt2/html/table-main-cpp.html
share/doc/qt2/html/test.png
share/doc/qt2/html/tetrix-tetrix-cpp.html
share/doc/qt2/html/themes-main-cpp.html
share/doc/qt2/html/tictac-main-cpp.html
share/doc/qt2/html/time.html
+share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
share/doc/qt2/html/tools.html
share/doc/qt2/html/tooltip-main-cpp.html
share/doc/qt2/html/topicals.html
-share/doc/qt2/html/treeview.png
share/doc/qt2/html/trivial-trivial-cpp.html
share/doc/qt2/html/troll.html
share/doc/qt2/html/ttlogo-small.jpg
share/doc/qt2/html/ttlogo-small.png
share/doc/qt2/html/tutorial.html
share/doc/qt2/html/tutorial.png
+share/doc/qt2/html/unicode.html
share/doc/qt2/html/validator-main-cpp.html
share/doc/qt2/html/whatsthis.png
share/doc/qt2/html/wizard-main-cpp.html
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index db92bfb31301..aab47b0ecd25 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -1,71 +1,78 @@
-# New ports collection makefile for: qt20
-# Version required: 2.0.2
+# New ports collection makefile for: qt21
+# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
-# Whom: imura@cs.titech.ac.jp
+# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-2.0.2
+DISTNAME= qt-x11-2.1.0-beta2
+PKGNAME= qt-2.1.0b2
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
-
-FORBIDDEN= repository copied, awaiting upgrade
+LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ MesaGL.14:${PORTSDIR}/graphics/Mesa3
NO_LATEST_LINK= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_NEWGCC= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -system-zlib -system-libpng \
- -I${LOCALBASE}/include -L${LOCALBASE}/lib -lxpg4
+CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg \
+ -I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= QTDIR=${WRKSRC}
-MAKE_ENV+= QTDIR=${WRKSRC} SYS_CXX=${CXX} SYS_CC=${CC} SYS_CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV= QTDIR=${WRKSRC}
-.include <bsd.port.pre.mk>
+WRKSRC= ${WRKDIR}/qt-2.1.0-beta2
+CONFIG= ${WRKSRC}/configs/freebsd-g++-shared
.if defined(QT_GIF_AVAILABLE)
CONFIGURE_ARGS+=-gif
RESTRICTED= 'Requires a license from UNISYS'
.endif
-USE_NEWGCC= YES
-
-.if ${PORTOBJFORMAT} == "elf"
-VERSION= 2
-.else
-VERSION= 2.02
+.if !defined(NOPORTDOCS)
+.include "files/manpages"
.endif
-PLIST_SUB= VERSION=${VERSION}
-.include "files/manpages"
+pre-configure:
+ @${PERL} -pi -e "s,gcc,${CC},g" ${CONFIG}
+ @${PERL} -pi -e "s,g\+\+,${CXX},g" ${CONFIG}
+ @${PERL} -pi -e "s,/usr/X11R6,${X11BASE},g" ${CONFIG}
+ @${PERL} -pi -e "s,-pipe -O2,${CXXFLAGS},g" ${CONFIG}
+
+post-configure:
+ @(cd ${WRKSRC} ; ${GMAKE} symlinks)
do-install:
- @(cd ${WRKSRC} ; \
+ ${MKDIR} ${PREFIX}/include/qt2
+ (cd ${WRKSRC} ; \
${INSTALL_PROGRAM} bin/mergetr ${PREFIX}/bin ; \
${INSTALL_PROGRAM} bin/moc ${PREFIX}/bin/moc2 ; \
${INSTALL_PROGRAM} bin/msg2qm ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/findtr ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qt20fix ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qtrename140 ${PREFIX}/bin ; \
- ${INSTALL_DATA} 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/qt2 ; \
${INSTALL_DATA} include/*.h ${PREFIX}/include/qt2 ; \
- ${INSTALL_MAN} man/man1/moc.1 ${PREFIX}/man/man1/moc2.1 ; \
- ${INSTALL_MAN} man/man3/q* ${PREFIX}/man/man3 )
+ ${INSTALL_DATA} lib/libqgl.a ${PREFIX}/lib ; \
+ ${INSTALL_DATA} lib/libqt2.so.3 ${PREFIX}/lib )
+ ${LN} -sf libqt2.so.3 ${PREFIX}/lib/libqt2.so
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.if !defined(NOPORTDOCS)
- @(cd ${WRKSRC} ; \
- ${MKDIR} ${PREFIX}/share/doc/qt2/html ; \
+ ${MKDIR} ${PREFIX}/share/doc/qt2/html
+ (cd ${WRKSRC} ; \
+ ${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} LICENSE.QPL ${PREFIX}/share/doc/qt2 ; \
+ ${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
- ${INSTALL_DATA} doc/* ${PREFIX}/share/doc/qt2/html )
+ ${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
+ ${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt32/distinfo b/x11-toolkits/qt32/distinfo
index 27fdd45446a6..790ea1c64f91 100644
--- a/x11-toolkits/qt32/distinfo
+++ b/x11-toolkits/qt32/distinfo
@@ -1 +1 @@
-MD5 (qt-2.0.2.tar.gz) = afeaf554f538b415a2f46ff6b36657f4
+MD5 (qt-x11-2.1.0-beta2.tar.gz) = 953df8b8c324c4723b2d0ee342e6526a
diff --git a/x11-toolkits/qt32/files/manpages b/x11-toolkits/qt32/files/manpages
index 6b77b5e17666..de362d100114 100644
--- a/x11-toolkits/qt32/files/manpages
+++ b/x11-toolkits/qt32/files/manpages
@@ -1,4 +1,3 @@
-MAN1= moc2.1
MAN3= \
qaccel.3qt \
qapplication.3qt \
@@ -16,10 +15,12 @@ qbrush.3qt \
qbuffer.3qt \
qbutton.3qt \
qbuttongroup.3qt \
+qbytearray.3qt \
qcache.3qt \
qcacheiterator.3qt \
qcdestyle.3qt \
qchar.3qt \
+qcharref.3qt \
qcheckbox.3qt \
qchecklistitem.3qt \
qchildevent.3qt \
@@ -28,14 +29,15 @@ qcloseevent.3qt \
qcollection.3qt \
qcolor.3qt \
qcolordialog.3qt \
+qcolordrag.3qt \
qcolorgroup.3qt \
qcombobox.3qt \
qcommonstyle.3qt \
-qconnection.3qt \
qconststring.3qt \
qcstring.3qt \
qcursor.3qt \
qcustomevent.3qt \
+qcustommenuitem.3qt \
qdatapump.3qt \
qdatasink.3qt \
qdatasource.3qt \
@@ -53,6 +55,7 @@ qdragmoveevent.3qt \
qdragobject.3qt \
qdropevent.3qt \
qdropsite.3qt \
+qeucjpcodec.3qt \
qevent.3qt \
qfile.3qt \
qfiledialog.3qt \
@@ -61,11 +64,13 @@ qfileinfo.3qt \
qfocusdata.3qt \
qfocusevent.3qt \
qfont.3qt \
+qfontdatabase.3qt \
qfontdialog.3qt \
qfontinfo.3qt \
qfontmetrics.3qt \
qframe.3qt \
qgarray.3qt \
+qgbkcodec.3qt \
qgcache.3qt \
qgcacheiterator.3qt \
qgdict.3qt \
@@ -80,13 +85,19 @@ qglwidget.3qt \
qgrid.3qt \
qgridlayout.3qt \
qgroupbox.3qt \
+qguardedptr.3qt \
+qgvector.3qt \
qhbox.3qt \
qhboxlayout.3qt \
qhbuttongroup.3qt \
qheader.3qt \
qhgroupbox.3qt \
qhideevent.3qt \
+qicondrag.3qt \
+qicondragitem.3qt \
qiconset.3qt \
+qiconview.3qt \
+qiconviewitem.3qt \
qimage.3qt \
qimageconsumer.3qt \
qimagedecoder.3qt \
@@ -94,6 +105,7 @@ qimagedrag.3qt \
qimageformat.3qt \
qimageformattype.3qt \
qimageio.3qt \
+qinputdialog.3qt \
qintcache.3qt \
qintcacheiterator.3qt \
qintdict.3qt \
@@ -101,6 +113,8 @@ qintdictiterator.3qt \
qintvalidator.3qt \
qiodevice.3qt \
qiodevicesource.3qt \
+qjiscodec.3qt \
+qjpunicodeconv.3qt \
qkeyevent.3qt \
qlabel.3qt \
qlayout.3qt \
@@ -118,6 +132,7 @@ qlistview.3qt \
qlistviewitem.3qt \
qlistviewitemiterator.3qt \
qlnode.3qt \
+qlocalfs.3qt \
qmainwindow.3qt \
qmap.3qt \
qmapconstiterator.3qt \
@@ -125,6 +140,8 @@ qmapiterator.3qt \
qmenubar.3qt \
qmenudata.3qt \
qmessagebox.3qt \
+qmetaobject.3qt \
+qmetaproperty.3qt \
qmimesource.3qt \
qmimesourcefactory.3qt \
qmotifstyle.3qt \
@@ -132,6 +149,8 @@ qmouseevent.3qt \
qmoveevent.3qt \
qmovie.3qt \
qmultilineedit.3qt \
+qnetworkoperation.3qt \
+qnetworkprotocol.3qt \
qnpinstance.3qt \
qnplugin.3qt \
qnpstream.3qt \
@@ -167,7 +186,6 @@ qresizeevent.3qt \
qscrollbar.3qt \
qscrollview.3qt \
qsemimodal.3qt \
-qserversocket.3qt \
qsessionmanager.3qt \
qshared.3qt \
qshowevent.3qt \
@@ -178,8 +196,6 @@ qsize.3qt \
qsizegrip.3qt \
qsizepolicy.3qt \
qslider.3qt \
-qsocket.3qt \
-qsocketaddress.3qt \
qsocketnotifier.3qt \
qsortedlist.3qt \
qspaceritem.3qt \
@@ -192,6 +208,7 @@ qstrilist.3qt \
qstring.3qt \
qstringlist.3qt \
qstrlist.3qt \
+qstrlistiterator.3qt \
qstyle.3qt \
qstylesheet.3qt \
qstylesheetitem.3qt \
@@ -219,13 +236,17 @@ qtooltip.3qt \
qtooltipgroup.3qt \
qtranslator.3qt \
quridrag.3qt \
+qurl.3qt \
+qurloperator.3qt \
qvalidator.3qt \
qvaluelist.3qt \
qvaluelistconstiterator.3qt \
qvaluelistiterator.3qt \
+qvaluestack.3qt \
qvbox.3qt \
qvboxlayout.3qt \
qvbuttongroup.3qt \
+qvector.3qt \
qvgroupbox.3qt \
qwhatsthis.3qt \
qwheelevent.3qt \
diff --git a/x11-toolkits/qt32/files/patch-aa b/x11-toolkits/qt32/files/patch-aa
index 4adebbfe81c8..a18a37d486c6 100644
--- a/x11-toolkits/qt32/files/patch-aa
+++ b/x11-toolkits/qt32/files/patch-aa
@@ -1,26 +1,6 @@
---- configs/freebsd-g++-shared.orig Fri Sep 24 18:21:55 1999
-+++ configs/freebsd-g++-shared Fri Oct 1 22:07:46 1999
-@@ -1,33 +1,33 @@
- # Compiling
--SYSCONF_CXX = g++
--SYSCONF_CC = gcc
-+SYSCONF_CXX = $(SYS_CXX)
-+SYSCONF_CC = $(SYS_CC)
-
- # Compiling with support libraries
--SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_X11 = -I$(X11BASE)/include
- SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
--SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL = -I$(X11BASE)/include
-
- # Compiline YACC output
- SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
-
- # Linking with support libraries
- # X11
--SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib
+--- configs/freebsd-g++-shared.orig Thu Feb 17 01:55:56 2000
++++ configs/freebsd-g++-shared Sat Feb 26 20:25:51 2000
+@@ -16,7 +16,7 @@
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
# Qt, Qt+OpenGL
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
@@ -28,28 +8,21 @@
+SYSCONF_LIBS_QT = -lqt2
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
--SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
- SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu
- # Yacc
- SYSCONF_LIBS_YACC =
-
+ SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+@@ -27,7 +27,7 @@
# Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = $(SYS_CXX)
+ SYSCONF_LINK = g++
SYSCONF_LFLAGS =
-SYSCONF_LIBS =
+SYSCONF_LIBS = -lxpg4
# Link flags shared objects
SYSCONF_LFLAGS_SHOBJ = -shared
-@@ -40,17 +40,27 @@
- # - Place target in $(DESTDIR) - which has a trailing /
+@@ -41,16 +41,26 @@
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
#
--SYSCONF_LINK_SHLIB = g++
+ SYSCONF_LINK_SHLIB = g++
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-+SYSCONF_LINK_SHLIB = $(SYS_CXX)
+ifeq ($(PORTOBJFORMAT),elf)
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
@@ -77,14 +50,3 @@
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -61,8 +71,8 @@
- SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
- # Compiling application source
--SYSCONF_CXXFLAGS = -pipe -O2
--SYSCONF_CFLAGS = -pipe -O2
-+SYSCONF_CXXFLAGS = $(SYS_CXXFLAGS)
-+SYSCONF_CFLAGS = $(SYS_CXXFLAGS)
- # Compiling library source
- SYSCONF_CXXFLAGS_LIB = -fPIC
- SYSCONF_CFLAGS_LIB = -fPIC
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index d3e52a97f33b..64d14c7bf881 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -5,6 +5,7 @@ bin/msg2qm
bin/qt20fix
bin/qtrename140
include/qt2/jri.h
+include/qt2/jri_md.h
include/qt2/jritypes.h
include/qt2/npapi.h
include/qt2/npupp.h
@@ -18,6 +19,7 @@ include/qt2/qasciicache.h
include/qt2/qasciidict.h
include/qt2/qasyncimageio.h
include/qt2/qasyncio.h
+include/qt2/qbig5codec.h
include/qt2/qbitarray.h
include/qt2/qbitarry.h
include/qt2/qbitmap.h
@@ -59,14 +61,14 @@ include/qt2/qeuckrcodec.h
include/qt2/qevent.h
include/qt2/qfile.h
include/qt2/qfiledef.h
-include/qt2/qfiledefs.h
+include/qt2/qfiledefs_p.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/qfontdata_p.h
include/qt2/qfontdatabase.h
include/qt2/qfontdialog.h
include/qt2/qfontdta.h
@@ -76,6 +78,7 @@ include/qt2/qfontmet.h
include/qt2/qfontmetrics.h
include/qt2/qframe.h
include/qt2/qgarray.h
+include/qt2/qgbkcodec.h
include/qt2/qgcache.h
include/qt2/qgdict.h
include/qt2/qgeneric.h
@@ -83,18 +86,19 @@ 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/qguardedptr.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/qiconview.h
include/qt2/qimage.h
-include/qt2/qimageio.h
+include/qt2/qinputdialog.h
include/qt2/qintcach.h
include/qt2/qintcache.h
include/qt2/qintdict.h
@@ -107,7 +111,7 @@ include/qt2/qkeycode.h
include/qt2/qkoi8codec.h
include/qt2/qlabel.h
include/qt2/qlayout.h
-include/qt2/qlayoutengine.h
+include/qt2/qlayoutengine_p.h
include/qt2/qlcdnum.h
include/qt2/qlcdnumber.h
include/qt2/qlined.h
@@ -115,6 +119,7 @@ include/qt2/qlineedit.h
include/qt2/qlist.h
include/qt2/qlistbox.h
include/qt2/qlistview.h
+include/qt2/qlocalfs.h
include/qt2/qmainwindow.h
include/qt2/qmap.h
include/qt2/qmenubar.h
@@ -131,6 +136,7 @@ include/qt2/qmsgbox.h
include/qt2/qmultilinedit.h
include/qt2/qmultilineedit.h
include/qt2/qnamespace.h
+include/qt2/qnetworkprotocol.h
include/qt2/qnp.h
include/qt2/qobjcoll.h
include/qt2/qobjdefs.h
@@ -165,7 +171,7 @@ include/qt2/qprogbar.h
include/qt2/qprogdlg.h
include/qt2/qprogressbar.h
include/qt2/qprogressdialog.h
-include/qt2/qpsprinter.h
+include/qt2/qpsprinter_p.h
include/qt2/qpsprn.h
include/qt2/qptrdict.h
include/qt2/qpushbt.h
@@ -178,12 +184,12 @@ include/qt2/qrangect.h
include/qt2/qrect.h
include/qt2/qregexp.h
include/qt2/qregion.h
+include/qt2/qrichtext_p.h
include/qt2/qrtlcodec.h
include/qt2/qscrbar.h
include/qt2/qscrollbar.h
include/qt2/qscrollview.h
include/qt2/qsemimodal.h
-include/qt2/qserversocket.h
include/qt2/qsession.h
include/qt2/qsessionmanager.h
include/qt2/qshared.h
@@ -197,8 +203,6 @@ include/qt2/qsizepolicy.h
include/qt2/qsjiscodec.h
include/qt2/qslider.h
include/qt2/qsmartptr.h
-include/qt2/qsocket.h
-include/qt2/qsocketdevice.h
include/qt2/qsocketnotifier.h
include/qt2/qsocknot.h
include/qt2/qsortedlist.h
@@ -212,6 +216,7 @@ include/qt2/qstrlist.h
include/qt2/qstrvec.h
include/qt2/qstyle.h
include/qt2/qstylesheet.h
+include/qt2/qt_x11.h
include/qt2/qtabbar.h
include/qt2/qtabdialog.h
include/qt2/qtabdlg.h
@@ -228,15 +233,21 @@ include/qt2/qtoolbar.h
include/qt2/qtoolbutton.h
include/qt2/qtooltip.h
include/qt2/qtranslator.h
+include/qt2/qtranslatordialog.h
include/qt2/qtstream.h
+include/qt2/qurl.h
+include/qt2/qurlinfo.h
+include/qt2/qurloperator.h
include/qt2/qutfcodec.h
include/qt2/qvalidator.h
include/qt2/qvaluelist.h
+include/qt2/qvaluestack.h
+include/qt2/qvariant.h
include/qt2/qvbox.h
include/qt2/qvbuttongroup.h
include/qt2/qvector.h
include/qt2/qvgroupbox.h
-include/qt2/qwellarray.h
+include/qt2/qwellarray_p.h
include/qt2/qwhatsthis.h
include/qt2/qwidcoll.h
include/qt2/qwidget.h
@@ -249,29 +260,44 @@ include/qt2/qwindowdefs.h
include/qt2/qwindowsstyle.h
include/qt2/qwizard.h
include/qt2/qwmatrix.h
+include/qt2/qworkspace.h
include/qt2/qxt.h
+lib/libqgl.a
lib/libqt2.so
-lib/libqt2.so.%%VERSION%%
+lib/libqt2.so.3
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/doc/qt2/ANNOUNCE
share/doc/qt2/FAQ
share/doc/qt2/LICENSE.QPL
+share/doc/qt2/PORTING
share/doc/qt2/README
share/doc/qt2/README.QT
+share/doc/qt2/html/aboutqt.html
share/doc/qt2/html/abstractwidgets.html
share/doc/qt2/html/accelerators.html
share/doc/qt2/html/aclock-main-cpp.html
share/doc/qt2/html/addressbook-main-cpp.html
+share/doc/qt2/html/advanced.html
share/doc/qt2/html/annotated.html
+share/doc/qt2/html/appearance.html
+share/doc/qt2/html/appicon.html
share/doc/qt2/html/application-main-cpp.html
share/doc/qt2/html/application.html
+share/doc/qt2/html/basic.html
share/doc/qt2/html/bearings.png
share/doc/qt2/html/biff-main-cpp.html
share/doc/qt2/html/book.png
-share/doc/qt2/html/buttons_groups-main-cpp.html
+share/doc/qt2/html/bughowto.html
+share/doc/qt2/html/buttongroup-m.png
+share/doc/qt2/html/buttongroup-w.png
+share/doc/qt2/html/buttongroups-main-cpp.html
+share/doc/qt2/html/buyhowto.html
+share/doc/qt2/html/changes21.html
share/doc/qt2/html/checklists-main-cpp.html
share/doc/qt2/html/classes.html
share/doc/qt2/html/collection.html
+share/doc/qt2/html/commonproblems.html
share/doc/qt2/html/coordsys.html
share/doc/qt2/html/coordsys.png
share/doc/qt2/html/credits.html
@@ -286,62 +312,82 @@ share/doc/qt2/html/dialogs.html
share/doc/qt2/html/dirview-main-cpp.html
share/doc/qt2/html/dnd.html
share/doc/qt2/html/dochead.png
+share/doc/qt2/html/draganddrop.html
share/doc/qt2/html/drawdemo-drawdemo-cpp.html
share/doc/qt2/html/drawing.html
share/doc/qt2/html/drawlines-connect-cpp.html
share/doc/qt2/html/easteregg.html
share/doc/qt2/html/easteregg2.html
+share/doc/qt2/html/environment.html
+share/doc/qt2/html/eventsandfilters.html
share/doc/qt2/html/examples.html
+share/doc/qt2/html/fileiconview-main-cpp.html
+share/doc/qt2/html/focus.html
share/doc/qt2/html/fontmatch.html
-share/doc/qt2/html/fonts.html
share/doc/qt2/html/forever-forever-cpp.html
share/doc/qt2/html/frames.png
share/doc/qt2/html/functions.html
share/doc/qt2/html/geomanagement.html
+share/doc/qt2/html/geometry.html
+share/doc/qt2/html/geometry.png
share/doc/qt2/html/graph.g1n
share/doc/qt2/html/grapher-grapher-cpp.html
share/doc/qt2/html/gridlayout.png
+share/doc/qt2/html/groupbox-m.png
+share/doc/qt2/html/groupbox-w.png
share/doc/qt2/html/guibooks.html
share/doc/qt2/html/headers.html
share/doc/qt2/html/hello-main-cpp.html
+share/doc/qt2/html/helpsystem.html
+share/doc/qt2/html/helpviewer-main-cpp.html
share/doc/qt2/html/hierarchy.html
share/doc/qt2/html/i18n-main-cpp.html
share/doc/qt2/html/i18n.html
-share/doc/qt2/html/imageio.html
+share/doc/qt2/html/iconview-main-cpp.html
share/doc/qt2/html/images.html
+share/doc/qt2/html/index
share/doc/qt2/html/index.html
share/doc/qt2/html/io.html
-share/doc/qt2/html/kernel.html
+share/doc/qt2/html/keyfeatures21.html
share/doc/qt2/html/layout-layout-cpp.html
share/doc/qt2/html/layout.html
share/doc/qt2/html/letter.png
share/doc/qt2/html/license.html
+share/doc/qt2/html/licenses.html
share/doc/qt2/html/life-main-cpp.html
share/doc/qt2/html/lineedits-main-cpp.html
share/doc/qt2/html/listbox-main-cpp.html
-share/doc/qt2/html/listbox_combo-main-cpp.html
-share/doc/qt2/html/listview.png
+share/doc/qt2/html/listboxcombo-main-cpp.html
share/doc/qt2/html/listviews-main-cpp.html
share/doc/qt2/html/mailinglists.html
share/doc/qt2/html/mainlyMotif-editor-cpp.html
share/doc/qt2/html/mainlyQt-editor-cpp.html
share/doc/qt2/html/mainlyXt-editor-cpp.html
+share/doc/qt2/html/mainwindow-m.png
+share/doc/qt2/html/mainwindow-w.png
+share/doc/qt2/html/mdi-main-cpp.html
share/doc/qt2/html/menu-menu-cpp.html
share/doc/qt2/html/metaobjects.html
share/doc/qt2/html/misc.html
share/doc/qt2/html/moc.html
share/doc/qt2/html/movies-main-cpp.html
+share/doc/qt2/html/network.html
share/doc/qt2/html/nsplugin.html
+share/doc/qt2/html/object.html
+share/doc/qt2/html/objectmodel.html
+share/doc/qt2/html/objecttrees.html
share/doc/qt2/html/opengl.html
+share/doc/qt2/html/organizers.html
+share/doc/qt2/html/palette.png
share/doc/qt2/html/picture-picture-cpp.html
share/doc/qt2/html/pictures.html
share/doc/qt2/html/pnglogo.png
share/doc/qt2/html/popup-popup-cpp.html
share/doc/qt2/html/porting.html
share/doc/qt2/html/primes.html
-share/doc/qt2/html/printerdialog.png
share/doc/qt2/html/progress-progress-cpp.html
share/doc/qt2/html/progressbar-main-cpp.html
+share/doc/qt2/html/properties.html
share/doc/qt2/html/qabstractlayout-h.html
share/doc/qt2/html/qaccel-h.html
share/doc/qt2/html/qaccel-members.html
@@ -376,7 +422,6 @@ share/doc/qt2/html/qbitval-members.html
share/doc/qt2/html/qbitval.html
share/doc/qt2/html/qboxlayout-members.html
share/doc/qt2/html/qboxlayout.html
-share/doc/qt2/html/qbrowser-main-cpp.html
share/doc/qt2/html/qbrush-h.html
share/doc/qt2/html/qbrush-members.html
share/doc/qt2/html/qbrush.html
@@ -391,6 +436,8 @@ share/doc/qt2/html/qbutton.html
share/doc/qt2/html/qbuttongroup-h.html
share/doc/qt2/html/qbuttongroup-members.html
share/doc/qt2/html/qbuttongroup.html
+share/doc/qt2/html/qbytearray-members.html
+share/doc/qt2/html/qbytearray.html
share/doc/qt2/html/qcache-h.html
share/doc/qt2/html/qcache-members.html
share/doc/qt2/html/qcache.html
@@ -401,6 +448,8 @@ share/doc/qt2/html/qcdestyle-members.html
share/doc/qt2/html/qcdestyle.html
share/doc/qt2/html/qchar-members.html
share/doc/qt2/html/qchar.html
+share/doc/qt2/html/qcharref-members.html
+share/doc/qt2/html/qcharref.html
share/doc/qt2/html/qcheckbox-h.html
share/doc/qt2/html/qcheckbox-m.png
share/doc/qt2/html/qcheckbox-members.html
@@ -412,6 +461,7 @@ share/doc/qt2/html/qchildevent-members.html
share/doc/qt2/html/qchildevent.html
share/doc/qt2/html/qchkbox-m.png
share/doc/qt2/html/qchkbox-w.png
+share/doc/qt2/html/qclassinfo-members.html
share/doc/qt2/html/qclipboard-h.html
share/doc/qt2/html/qclipboard-members.html
share/doc/qt2/html/qclipboard.html
@@ -426,6 +476,10 @@ share/doc/qt2/html/qcolor.html
share/doc/qt2/html/qcolordialog-h.html
share/doc/qt2/html/qcolordialog-members.html
share/doc/qt2/html/qcolordialog.html
+share/doc/qt2/html/qcolordlg-m.png
+share/doc/qt2/html/qcolordlg-w.png
+share/doc/qt2/html/qcolordrag-members.html
+share/doc/qt2/html/qcolordrag.html
share/doc/qt2/html/qcolorgroup-members.html
share/doc/qt2/html/qcolorgroup.html
share/doc/qt2/html/qcombo1-m.png
@@ -453,6 +507,8 @@ share/doc/qt2/html/qcursor-members.html
share/doc/qt2/html/qcursor.html
share/doc/qt2/html/qcustomevent-members.html
share/doc/qt2/html/qcustomevent.html
+share/doc/qt2/html/qcustommenuitem-members.html
+share/doc/qt2/html/qcustommenuitem.html
share/doc/qt2/html/qdatapump-members.html
share/doc/qt2/html/qdatapump.html
share/doc/qt2/html/qdatasink-members.html
@@ -467,6 +523,8 @@ share/doc/qt2/html/qdate.html
share/doc/qt2/html/qdatetime-h.html
share/doc/qt2/html/qdatetime-members.html
share/doc/qt2/html/qdatetime.html
+share/doc/qt2/html/qdial-m.png
+share/doc/qt2/html/qdial-w.png
share/doc/qt2/html/qdialog-h.html
share/doc/qt2/html/qdialog-members.html
share/doc/qt2/html/qdialog.html
@@ -477,7 +535,6 @@ share/doc/qt2/html/qdictiterator-members.html
share/doc/qt2/html/qdictiterator.html
share/doc/qt2/html/qdir-h.html
share/doc/qt2/html/qdir-members.html
-share/doc/qt2/html/qdir-qdir-cpp.html
share/doc/qt2/html/qdir.html
share/doc/qt2/html/qdoublevalidator-members.html
share/doc/qt2/html/qdoublevalidator.html
@@ -496,6 +553,9 @@ share/doc/qt2/html/qdropevent.html
share/doc/qt2/html/qdropsite-h.html
share/doc/qt2/html/qdropsite-members.html
share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qeucjpcodec-h.html
+share/doc/qt2/html/qeucjpcodec-members.html
+share/doc/qt2/html/qeucjpcodec.html
share/doc/qt2/html/qevent-h.html
share/doc/qt2/html/qevent-members.html
share/doc/qt2/html/qevent.html
@@ -510,7 +570,6 @@ share/doc/qt2/html/qfiledlg-m.png
share/doc/qt2/html/qfiledlg-w.png
share/doc/qt2/html/qfileiconprovider-members.html
share/doc/qt2/html/qfileiconprovider.html
-share/doc/qt2/html/qfileiconview-main-cpp.html
share/doc/qt2/html/qfileinfo-h.html
share/doc/qt2/html/qfileinfo-members.html
share/doc/qt2/html/qfileinfo.html
@@ -522,9 +581,14 @@ share/doc/qt2/html/qfocusevent.html
share/doc/qt2/html/qfont-h.html
share/doc/qt2/html/qfont-members.html
share/doc/qt2/html/qfont.html
+share/doc/qt2/html/qfontdatabase-h.html
+share/doc/qt2/html/qfontdatabase-members.html
+share/doc/qt2/html/qfontdatabase.html
share/doc/qt2/html/qfontdialog-h.html
share/doc/qt2/html/qfontdialog-members.html
share/doc/qt2/html/qfontdialog.html
+share/doc/qt2/html/qfontdlg-m.png
+share/doc/qt2/html/qfontdlg-w.png
share/doc/qt2/html/qfontinfo-h.html
share/doc/qt2/html/qfontinfo-members.html
share/doc/qt2/html/qfontinfo.html
@@ -537,6 +601,9 @@ share/doc/qt2/html/qframe.html
share/doc/qt2/html/qgarray-h.html
share/doc/qt2/html/qgarray-members.html
share/doc/qt2/html/qgarray.html
+share/doc/qt2/html/qgbkcodec-h.html
+share/doc/qt2/html/qgbkcodec-members.html
+share/doc/qt2/html/qgbkcodec.html
share/doc/qt2/html/qgcache-h.html
share/doc/qt2/html/qgcache-members.html
share/doc/qt2/html/qgcache.html
@@ -577,6 +644,12 @@ share/doc/qt2/html/qgroupbox-members.html
share/doc/qt2/html/qgroupbox.html
share/doc/qt2/html/qgrpbox-m.png
share/doc/qt2/html/qgrpbox-w.png
+share/doc/qt2/html/qguardedptr-h.html
+share/doc/qt2/html/qguardedptr-members.html
+share/doc/qt2/html/qguardedptr.html
+share/doc/qt2/html/qgvector-h.html
+share/doc/qt2/html/qgvector-members.html
+share/doc/qt2/html/qgvector.html
share/doc/qt2/html/qhbox-h.html
share/doc/qt2/html/qhbox-m.png
share/doc/qt2/html/qhbox-members.html
@@ -598,10 +671,20 @@ share/doc/qt2/html/qhgroupbox-members.html
share/doc/qt2/html/qhgroupbox.html
share/doc/qt2/html/qhideevent-members.html
share/doc/qt2/html/qhideevent.html
+share/doc/qt2/html/qicondrag-members.html
+share/doc/qt2/html/qicondrag.html
+share/doc/qt2/html/qicondragitem-members.html
+share/doc/qt2/html/qicondragitem.html
share/doc/qt2/html/qiconset-h.html
share/doc/qt2/html/qiconset-members.html
share/doc/qt2/html/qiconset.html
-share/doc/qt2/html/qiconview-main-cpp.html
+share/doc/qt2/html/qiconview-h.html
+share/doc/qt2/html/qiconview-m.png
+share/doc/qt2/html/qiconview-members.html
+share/doc/qt2/html/qiconview-w.png
+share/doc/qt2/html/qiconview.html
+share/doc/qt2/html/qiconviewitem-members.html
+share/doc/qt2/html/qiconviewitem.html
share/doc/qt2/html/qimage-h.html
share/doc/qt2/html/qimage-members.html
share/doc/qt2/html/qimage.html
@@ -617,6 +700,9 @@ share/doc/qt2/html/qimageformattype-members.html
share/doc/qt2/html/qimageformattype.html
share/doc/qt2/html/qimageio-members.html
share/doc/qt2/html/qimageio.html
+share/doc/qt2/html/qinputdialog-h.html
+share/doc/qt2/html/qinputdialog-members.html
+share/doc/qt2/html/qinputdialog.html
share/doc/qt2/html/qintcache-h.html
share/doc/qt2/html/qintcache-members.html
share/doc/qt2/html/qintcache.html
@@ -634,6 +720,12 @@ share/doc/qt2/html/qiodevice-members.html
share/doc/qt2/html/qiodevice.html
share/doc/qt2/html/qiodevicesource-members.html
share/doc/qt2/html/qiodevicesource.html
+share/doc/qt2/html/qjiscodec-h.html
+share/doc/qt2/html/qjiscodec-members.html
+share/doc/qt2/html/qjiscodec.html
+share/doc/qt2/html/qjpunicode-h.html
+share/doc/qt2/html/qjpunicodeconv-members.html
+share/doc/qt2/html/qjpunicodeconv.html
share/doc/qt2/html/qkeyevent-members.html
share/doc/qt2/html/qkeyevent.html
share/doc/qt2/html/qlabel-h.html
@@ -675,7 +767,9 @@ share/doc/qt2/html/qlistboxtext.html
share/doc/qt2/html/qlistiterator-members.html
share/doc/qt2/html/qlistiterator.html
share/doc/qt2/html/qlistview-h.html
+share/doc/qt2/html/qlistview-m.png
share/doc/qt2/html/qlistview-members.html
+share/doc/qt2/html/qlistview-w.png
share/doc/qt2/html/qlistview.html
share/doc/qt2/html/qlistviewitem-members.html
share/doc/qt2/html/qlistviewitem.html
@@ -683,6 +777,9 @@ share/doc/qt2/html/qlistviewitemiterator-members.html
share/doc/qt2/html/qlistviewitemiterator.html
share/doc/qt2/html/qlnode-members.html
share/doc/qt2/html/qlnode.html
+share/doc/qt2/html/qlocalfs-h.html
+share/doc/qt2/html/qlocalfs-members.html
+share/doc/qt2/html/qlocalfs.html
share/doc/qt2/html/qmag-qmag-cpp.html
share/doc/qt2/html/qmainwindow-h.html
share/doc/qt2/html/qmainwindow-m.png
@@ -707,6 +804,12 @@ share/doc/qt2/html/qmenudata.html
share/doc/qt2/html/qmessagebox-h.html
share/doc/qt2/html/qmessagebox-members.html
share/doc/qt2/html/qmessagebox.html
+share/doc/qt2/html/qmetadata-members.html
+share/doc/qt2/html/qmetaobject-h.html
+share/doc/qt2/html/qmetaobject-members.html
+share/doc/qt2/html/qmetaobject.html
+share/doc/qt2/html/qmetaproperty-members.html
+share/doc/qt2/html/qmetaproperty.html
share/doc/qt2/html/qmime-h.html
share/doc/qt2/html/qmimesource-members.html
share/doc/qt2/html/qmimesource.html
@@ -732,6 +835,11 @@ share/doc/qt2/html/qmultilineedit-members.html
share/doc/qt2/html/qmultilineedit.html
share/doc/qt2/html/qnamespace-h.html
share/doc/qt2/html/qnetworkegg.html
+share/doc/qt2/html/qnetworkoperation-members.html
+share/doc/qt2/html/qnetworkoperation.html
+share/doc/qt2/html/qnetworkprotocol-h.html
+share/doc/qt2/html/qnetworkprotocol-members.html
+share/doc/qt2/html/qnetworkprotocol.html
share/doc/qt2/html/qnp-h.html
share/doc/qt2/html/qnpinstance-members.html
share/doc/qt2/html/qnpinstance.html
@@ -782,11 +890,16 @@ share/doc/qt2/html/qpoint.html
share/doc/qt2/html/qpointarray-h.html
share/doc/qt2/html/qpointarray-members.html
share/doc/qt2/html/qpointarray.html
+share/doc/qt2/html/qpopmenu-fancy.png
share/doc/qt2/html/qpopmenu-m.png
share/doc/qt2/html/qpopmenu-w.png
share/doc/qt2/html/qpopupmenu-h.html
share/doc/qt2/html/qpopupmenu-members.html
share/doc/qt2/html/qpopupmenu.html
+share/doc/qt2/html/qprintdialog-h.html
+share/doc/qt2/html/qprintdialog-members.html
+share/doc/qt2/html/qprintdlg-m.png
+share/doc/qt2/html/qprintdlg-w.png
share/doc/qt2/html/qprinter-h.html
share/doc/qt2/html/qprinter-members.html
share/doc/qt2/html/qprinter.html
@@ -848,9 +961,6 @@ share/doc/qt2/html/qscrollview.html
share/doc/qt2/html/qsemimodal-h.html
share/doc/qt2/html/qsemimodal-members.html
share/doc/qt2/html/qsemimodal.html
-share/doc/qt2/html/qserversocket-h.html
-share/doc/qt2/html/qserversocket-members.html
-share/doc/qt2/html/qserversocket.html
share/doc/qt2/html/qsessionmanager-h.html
share/doc/qt2/html/qsessionmanager-members.html
share/doc/qt2/html/qsessionmanager.html
@@ -872,7 +982,9 @@ share/doc/qt2/html/qsize-h.html
share/doc/qt2/html/qsize-members.html
share/doc/qt2/html/qsize.html
share/doc/qt2/html/qsizegrip-h.html
+share/doc/qt2/html/qsizegrip-m.png
share/doc/qt2/html/qsizegrip-members.html
+share/doc/qt2/html/qsizegrip-w.png
share/doc/qt2/html/qsizegrip.html
share/doc/qt2/html/qsizepolicy-h.html
share/doc/qt2/html/qsizepolicy-members.html
@@ -882,12 +994,6 @@ share/doc/qt2/html/qslider-m.png
share/doc/qt2/html/qslider-members.html
share/doc/qt2/html/qslider-w.png
share/doc/qt2/html/qslider.html
-share/doc/qt2/html/qsocket-h.html
-share/doc/qt2/html/qsocket-members.html
-share/doc/qt2/html/qsocket.html
-share/doc/qt2/html/qsocketaddress-members.html
-share/doc/qt2/html/qsocketaddress.html
-share/doc/qt2/html/qsocketdevice-h.html
share/doc/qt2/html/qsocketnotifier-h.html
share/doc/qt2/html/qsocketnotifier-members.html
share/doc/qt2/html/qsocketnotifier.html
@@ -901,6 +1007,8 @@ share/doc/qt2/html/qspinbox-m.png
share/doc/qt2/html/qspinbox-members.html
share/doc/qt2/html/qspinbox-w.png
share/doc/qt2/html/qspinbox.html
+share/doc/qt2/html/qspinbox2-m.png
+share/doc/qt2/html/qspinbox2-w.png
share/doc/qt2/html/qsplitter-h.html
share/doc/qt2/html/qsplitter-m.png
share/doc/qt2/html/qsplitter-members.html
@@ -927,6 +1035,8 @@ share/doc/qt2/html/qstringlist.html
share/doc/qt2/html/qstrlist-h.html
share/doc/qt2/html/qstrlist-members.html
share/doc/qt2/html/qstrlist.html
+share/doc/qt2/html/qstrlistiterator-members.html
+share/doc/qt2/html/qstrlistiterator.html
share/doc/qt2/html/qstyle-h.html
share/doc/qt2/html/qstyle-members.html
share/doc/qt2/html/qstyle.html
@@ -955,10 +1065,14 @@ share/doc/qt2/html/qtableview.html
share/doc/qt2/html/qtablevw-m.png
share/doc/qt2/html/qtablevw-w.png
share/doc/qt2/html/qtabwidget-h.html
+share/doc/qt2/html/qtabwidget-m.png
share/doc/qt2/html/qtabwidget-members.html
+share/doc/qt2/html/qtabwidget-w.png
share/doc/qt2/html/qtabwidget.html
share/doc/qt2/html/qtextbrowser-h.html
+share/doc/qt2/html/qtextbrowser-m.png
share/doc/qt2/html/qtextbrowser-members.html
+share/doc/qt2/html/qtextbrowser-w.png
share/doc/qt2/html/qtextbrowser.html
share/doc/qt2/html/qtextcodec-h.html
share/doc/qt2/html/qtextcodec-members.html
@@ -1005,6 +1119,15 @@ share/doc/qt2/html/qtranslator-members.html
share/doc/qt2/html/qtranslator.html
share/doc/qt2/html/quridrag-members.html
share/doc/qt2/html/quridrag.html
+share/doc/qt2/html/qurl-h.html
+share/doc/qt2/html/qurl-members.html
+share/doc/qt2/html/qurl.html
+share/doc/qt2/html/qurlinfo-h.html
+share/doc/qt2/html/qurlinfo-members.html
+share/doc/qt2/html/qurlinfo.html
+share/doc/qt2/html/qurloperator-h.html
+share/doc/qt2/html/qurloperator-members.html
+share/doc/qt2/html/qurloperator.html
share/doc/qt2/html/qvalidator-h.html
share/doc/qt2/html/qvalidator-members.html
share/doc/qt2/html/qvalidator.html
@@ -1015,6 +1138,10 @@ share/doc/qt2/html/qvaluelistconstiterator-members.html
share/doc/qt2/html/qvaluelistconstiterator.html
share/doc/qt2/html/qvaluelistiterator-members.html
share/doc/qt2/html/qvaluelistiterator.html
+share/doc/qt2/html/qvaluestack-h.html
+share/doc/qt2/html/qvaluestack-members.html
+share/doc/qt2/html/qvaluestack.html
+share/doc/qt2/html/qvariant-h.html
share/doc/qt2/html/qvbox-h.html
share/doc/qt2/html/qvbox-m.png
share/doc/qt2/html/qvbox-members.html
@@ -1026,6 +1153,9 @@ share/doc/qt2/html/qvboxlayout.html
share/doc/qt2/html/qvbuttongroup-h.html
share/doc/qt2/html/qvbuttongroup-members.html
share/doc/qt2/html/qvbuttongroup.html
+share/doc/qt2/html/qvector-h.html
+share/doc/qt2/html/qvector-members.html
+share/doc/qt2/html/qvector.html
share/doc/qt2/html/qvgroupbox-h.html
share/doc/qt2/html/qvgroupbox-members.html
share/doc/qt2/html/qvgroupbox.html
@@ -1058,11 +1188,13 @@ share/doc/qt2/html/qxtapplication-members.html
share/doc/qt2/html/qxtapplication.html
share/doc/qt2/html/qxtwidget-members.html
share/doc/qt2/html/qxtwidget.html
-share/doc/qt2/html/rangecontrols-main-cpp.html
-share/doc/qt2/html/realwidgets.html
share/doc/qt2/html/removed20.html
share/doc/qt2/html/richtext-main-cpp.html
+share/doc/qt2/html/rintersect.png
share/doc/qt2/html/rot13-rot13-cpp.html
+share/doc/qt2/html/rsubtract.png
+share/doc/qt2/html/runion.png
+share/doc/qt2/html/rxor.png
share/doc/qt2/html/scribble-main-cpp.html
share/doc/qt2/html/scrollview-scrollview-cpp.html
share/doc/qt2/html/session.html
@@ -1070,8 +1202,12 @@ share/doc/qt2/html/session.png
share/doc/qt2/html/shared.html
share/doc/qt2/html/shclass.html
share/doc/qt2/html/showimg-main-cpp.html
+share/doc/qt2/html/signalsandslots.html
share/doc/qt2/html/simple-application.html
+share/doc/qt2/html/sound.html
share/doc/qt2/html/splitter-splitter-cpp.html
+share/doc/qt2/html/splitter-views-m.png
+share/doc/qt2/html/splitter-views-w.png
share/doc/qt2/html/t1.html
share/doc/qt2/html/t1.png
share/doc/qt2/html/t10-cannon-cpp.html
@@ -1152,23 +1288,25 @@ share/doc/qt2/html/t9.html
share/doc/qt2/html/t9.png
share/doc/qt2/html/t9_1.png
share/doc/qt2/html/t9_2.png
-share/doc/qt2/html/tabdialog-tabdialog-cpp.html
+share/doc/qt2/html/tabdialog-main-cpp.html
share/doc/qt2/html/table-main-cpp.html
share/doc/qt2/html/test.png
share/doc/qt2/html/tetrix-tetrix-cpp.html
share/doc/qt2/html/themes-main-cpp.html
share/doc/qt2/html/tictac-main-cpp.html
share/doc/qt2/html/time.html
+share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
share/doc/qt2/html/tools.html
share/doc/qt2/html/tooltip-main-cpp.html
share/doc/qt2/html/topicals.html
-share/doc/qt2/html/treeview.png
share/doc/qt2/html/trivial-trivial-cpp.html
share/doc/qt2/html/troll.html
share/doc/qt2/html/ttlogo-small.jpg
share/doc/qt2/html/ttlogo-small.png
share/doc/qt2/html/tutorial.html
share/doc/qt2/html/tutorial.png
+share/doc/qt2/html/unicode.html
share/doc/qt2/html/validator-main-cpp.html
share/doc/qt2/html/whatsthis.png
share/doc/qt2/html/wizard-main-cpp.html
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index db92bfb31301..aab47b0ecd25 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -1,71 +1,78 @@
-# New ports collection makefile for: qt20
-# Version required: 2.0.2
+# New ports collection makefile for: qt21
+# Version required: 2.1.0 beta2
# Date created: 17 Jul 1999
-# Whom: imura@cs.titech.ac.jp
+# Whom: imura@kml.cs.titech.ac.jp
#
# $FreeBSD$
#
-DISTNAME= qt-2.0.2
+DISTNAME= qt-x11-2.1.0-beta2
+PKGNAME= qt-2.1.0b2
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
-
-FORBIDDEN= repository copied, awaiting upgrade
+LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ MesaGL.14:${PORTSDIR}/graphics/Mesa3
NO_LATEST_LINK= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_NEWGCC= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -system-zlib -system-libpng \
- -I${LOCALBASE}/include -L${LOCALBASE}/lib -lxpg4
+CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg \
+ -I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= QTDIR=${WRKSRC}
-MAKE_ENV+= QTDIR=${WRKSRC} SYS_CXX=${CXX} SYS_CC=${CC} SYS_CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV= QTDIR=${WRKSRC}
-.include <bsd.port.pre.mk>
+WRKSRC= ${WRKDIR}/qt-2.1.0-beta2
+CONFIG= ${WRKSRC}/configs/freebsd-g++-shared
.if defined(QT_GIF_AVAILABLE)
CONFIGURE_ARGS+=-gif
RESTRICTED= 'Requires a license from UNISYS'
.endif
-USE_NEWGCC= YES
-
-.if ${PORTOBJFORMAT} == "elf"
-VERSION= 2
-.else
-VERSION= 2.02
+.if !defined(NOPORTDOCS)
+.include "files/manpages"
.endif
-PLIST_SUB= VERSION=${VERSION}
-.include "files/manpages"
+pre-configure:
+ @${PERL} -pi -e "s,gcc,${CC},g" ${CONFIG}
+ @${PERL} -pi -e "s,g\+\+,${CXX},g" ${CONFIG}
+ @${PERL} -pi -e "s,/usr/X11R6,${X11BASE},g" ${CONFIG}
+ @${PERL} -pi -e "s,-pipe -O2,${CXXFLAGS},g" ${CONFIG}
+
+post-configure:
+ @(cd ${WRKSRC} ; ${GMAKE} symlinks)
do-install:
- @(cd ${WRKSRC} ; \
+ ${MKDIR} ${PREFIX}/include/qt2
+ (cd ${WRKSRC} ; \
${INSTALL_PROGRAM} bin/mergetr ${PREFIX}/bin ; \
${INSTALL_PROGRAM} bin/moc ${PREFIX}/bin/moc2 ; \
${INSTALL_PROGRAM} bin/msg2qm ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/findtr ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qt20fix ${PREFIX}/bin ; \
${INSTALL_SCRIPT} bin/qtrename140 ${PREFIX}/bin ; \
- ${INSTALL_DATA} 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/qt2 ; \
${INSTALL_DATA} include/*.h ${PREFIX}/include/qt2 ; \
- ${INSTALL_MAN} man/man1/moc.1 ${PREFIX}/man/man1/moc2.1 ; \
- ${INSTALL_MAN} man/man3/q* ${PREFIX}/man/man3 )
+ ${INSTALL_DATA} lib/libqgl.a ${PREFIX}/lib ; \
+ ${INSTALL_DATA} lib/libqt2.so.3 ${PREFIX}/lib )
+ ${LN} -sf libqt2.so.3 ${PREFIX}/lib/libqt2.so
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.if !defined(NOPORTDOCS)
- @(cd ${WRKSRC} ; \
- ${MKDIR} ${PREFIX}/share/doc/qt2/html ; \
+ ${MKDIR} ${PREFIX}/share/doc/qt2/html
+ (cd ${WRKSRC} ; \
+ ${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} LICENSE.QPL ${PREFIX}/share/doc/qt2 ; \
+ ${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
- ${INSTALL_DATA} doc/* ${PREFIX}/share/doc/qt2/html )
+ ${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
+ ${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo
index 27fdd45446a6..790ea1c64f91 100644
--- a/x11-toolkits/qt33/distinfo
+++ b/x11-toolkits/qt33/distinfo
@@ -1 +1 @@
-MD5 (qt-2.0.2.tar.gz) = afeaf554f538b415a2f46ff6b36657f4
+MD5 (qt-x11-2.1.0-beta2.tar.gz) = 953df8b8c324c4723b2d0ee342e6526a
diff --git a/x11-toolkits/qt33/files/manpages b/x11-toolkits/qt33/files/manpages
index 6b77b5e17666..de362d100114 100644
--- a/x11-toolkits/qt33/files/manpages
+++ b/x11-toolkits/qt33/files/manpages
@@ -1,4 +1,3 @@
-MAN1= moc2.1
MAN3= \
qaccel.3qt \
qapplication.3qt \
@@ -16,10 +15,12 @@ qbrush.3qt \
qbuffer.3qt \
qbutton.3qt \
qbuttongroup.3qt \
+qbytearray.3qt \
qcache.3qt \
qcacheiterator.3qt \
qcdestyle.3qt \
qchar.3qt \
+qcharref.3qt \
qcheckbox.3qt \
qchecklistitem.3qt \
qchildevent.3qt \
@@ -28,14 +29,15 @@ qcloseevent.3qt \
qcollection.3qt \
qcolor.3qt \
qcolordialog.3qt \
+qcolordrag.3qt \
qcolorgroup.3qt \
qcombobox.3qt \
qcommonstyle.3qt \
-qconnection.3qt \
qconststring.3qt \
qcstring.3qt \
qcursor.3qt \
qcustomevent.3qt \
+qcustommenuitem.3qt \
qdatapump.3qt \
qdatasink.3qt \
qdatasource.3qt \
@@ -53,6 +55,7 @@ qdragmoveevent.3qt \
qdragobject.3qt \
qdropevent.3qt \
qdropsite.3qt \
+qeucjpcodec.3qt \
qevent.3qt \
qfile.3qt \
qfiledialog.3qt \
@@ -61,11 +64,13 @@ qfileinfo.3qt \
qfocusdata.3qt \
qfocusevent.3qt \
qfont.3qt \
+qfontdatabase.3qt \
qfontdialog.3qt \
qfontinfo.3qt \
qfontmetrics.3qt \
qframe.3qt \
qgarray.3qt \
+qgbkcodec.3qt \
qgcache.3qt \
qgcacheiterator.3qt \
qgdict.3qt \
@@ -80,13 +85,19 @@ qglwidget.3qt \
qgrid.3qt \
qgridlayout.3qt \
qgroupbox.3qt \
+qguardedptr.3qt \
+qgvector.3qt \
qhbox.3qt \
qhboxlayout.3qt \
qhbuttongroup.3qt \
qheader.3qt \
qhgroupbox.3qt \
qhideevent.3qt \
+qicondrag.3qt \
+qicondragitem.3qt \
qiconset.3qt \
+qiconview.3qt \
+qiconviewitem.3qt \
qimage.3qt \
qimageconsumer.3qt \
qimagedecoder.3qt \
@@ -94,6 +105,7 @@ qimagedrag.3qt \
qimageformat.3qt \
qimageformattype.3qt \
qimageio.3qt \
+qinputdialog.3qt \
qintcache.3qt \
qintcacheiterator.3qt \
qintdict.3qt \
@@ -101,6 +113,8 @@ qintdictiterator.3qt \
qintvalidator.3qt \
qiodevice.3qt \
qiodevicesource.3qt \
+qjiscodec.3qt \
+qjpunicodeconv.3qt \
qkeyevent.3qt \
qlabel.3qt \
qlayout.3qt \
@@ -118,6 +132,7 @@ qlistview.3qt \
qlistviewitem.3qt \
qlistviewitemiterator.3qt \
qlnode.3qt \
+qlocalfs.3qt \
qmainwindow.3qt \
qmap.3qt \
qmapconstiterator.3qt \
@@ -125,6 +140,8 @@ qmapiterator.3qt \
qmenubar.3qt \
qmenudata.3qt \
qmessagebox.3qt \
+qmetaobject.3qt \
+qmetaproperty.3qt \
qmimesource.3qt \
qmimesourcefactory.3qt \
qmotifstyle.3qt \
@@ -132,6 +149,8 @@ qmouseevent.3qt \
qmoveevent.3qt \
qmovie.3qt \
qmultilineedit.3qt \
+qnetworkoperation.3qt \
+qnetworkprotocol.3qt \
qnpinstance.3qt \
qnplugin.3qt \
qnpstream.3qt \
@@ -167,7 +186,6 @@ qresizeevent.3qt \
qscrollbar.3qt \
qscrollview.3qt \
qsemimodal.3qt \
-qserversocket.3qt \
qsessionmanager.3qt \
qshared.3qt \
qshowevent.3qt \
@@ -178,8 +196,6 @@ qsize.3qt \
qsizegrip.3qt \
qsizepolicy.3qt \
qslider.3qt \
-qsocket.3qt \
-qsocketaddress.3qt \
qsocketnotifier.3qt \
qsortedlist.3qt \
qspaceritem.3qt \
@@ -192,6 +208,7 @@ qstrilist.3qt \
qstring.3qt \
qstringlist.3qt \
qstrlist.3qt \
+qstrlistiterator.3qt \
qstyle.3qt \
qstylesheet.3qt \
qstylesheetitem.3qt \
@@ -219,13 +236,17 @@ qtooltip.3qt \
qtooltipgroup.3qt \
qtranslator.3qt \
quridrag.3qt \
+qurl.3qt \
+qurloperator.3qt \
qvalidator.3qt \
qvaluelist.3qt \
qvaluelistconstiterator.3qt \
qvaluelistiterator.3qt \
+qvaluestack.3qt \
qvbox.3qt \
qvboxlayout.3qt \
qvbuttongroup.3qt \
+qvector.3qt \
qvgroupbox.3qt \
qwhatsthis.3qt \
qwheelevent.3qt \
diff --git a/x11-toolkits/qt33/files/patch-aa b/x11-toolkits/qt33/files/patch-aa
index 4adebbfe81c8..a18a37d486c6 100644
--- a/x11-toolkits/qt33/files/patch-aa
+++ b/x11-toolkits/qt33/files/patch-aa
@@ -1,26 +1,6 @@
---- configs/freebsd-g++-shared.orig Fri Sep 24 18:21:55 1999
-+++ configs/freebsd-g++-shared Fri Oct 1 22:07:46 1999
-@@ -1,33 +1,33 @@
- # Compiling
--SYSCONF_CXX = g++
--SYSCONF_CC = gcc
-+SYSCONF_CXX = $(SYS_CXX)
-+SYSCONF_CC = $(SYS_CC)
-
- # Compiling with support libraries
--SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_X11 = -I$(X11BASE)/include
- SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
--SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL = -I$(X11BASE)/include
-
- # Compiline YACC output
- SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
-
- # Linking with support libraries
- # X11
--SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib
+--- configs/freebsd-g++-shared.orig Thu Feb 17 01:55:56 2000
++++ configs/freebsd-g++-shared Sat Feb 26 20:25:51 2000
+@@ -16,7 +16,7 @@
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
# Qt, Qt+OpenGL
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
@@ -28,28 +8,21 @@
+SYSCONF_LIBS_QT = -lqt2
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
--SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
- SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu
- # Yacc
- SYSCONF_LIBS_YACC =
-
+ SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+@@ -27,7 +27,7 @@
# Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = $(SYS_CXX)
+ SYSCONF_LINK = g++
SYSCONF_LFLAGS =
-SYSCONF_LIBS =
+SYSCONF_LIBS = -lxpg4
# Link flags shared objects
SYSCONF_LFLAGS_SHOBJ = -shared
-@@ -40,17 +40,27 @@
- # - Place target in $(DESTDIR) - which has a trailing /
+@@ -41,16 +41,26 @@
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
#
--SYSCONF_LINK_SHLIB = g++
+ SYSCONF_LINK_SHLIB = g++
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-+SYSCONF_LINK_SHLIB = $(SYS_CXX)
+ifeq ($(PORTOBJFORMAT),elf)
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
@@ -77,14 +50,3 @@
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -61,8 +71,8 @@
- SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
- # Compiling application source
--SYSCONF_CXXFLAGS = -pipe -O2
--SYSCONF_CFLAGS = -pipe -O2
-+SYSCONF_CXXFLAGS = $(SYS_CXXFLAGS)
-+SYSCONF_CFLAGS = $(SYS_CXXFLAGS)
- # Compiling library source
- SYSCONF_CXXFLAGS_LIB = -fPIC
- SYSCONF_CFLAGS_LIB = -fPIC
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index d3e52a97f33b..64d14c7bf881 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -5,6 +5,7 @@ bin/msg2qm
bin/qt20fix
bin/qtrename140
include/qt2/jri.h
+include/qt2/jri_md.h
include/qt2/jritypes.h
include/qt2/npapi.h
include/qt2/npupp.h
@@ -18,6 +19,7 @@ include/qt2/qasciicache.h
include/qt2/qasciidict.h
include/qt2/qasyncimageio.h
include/qt2/qasyncio.h
+include/qt2/qbig5codec.h
include/qt2/qbitarray.h
include/qt2/qbitarry.h
include/qt2/qbitmap.h
@@ -59,14 +61,14 @@ include/qt2/qeuckrcodec.h
include/qt2/qevent.h
include/qt2/qfile.h
include/qt2/qfiledef.h
-include/qt2/qfiledefs.h
+include/qt2/qfiledefs_p.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/qfontdata_p.h
include/qt2/qfontdatabase.h
include/qt2/qfontdialog.h
include/qt2/qfontdta.h
@@ -76,6 +78,7 @@ include/qt2/qfontmet.h
include/qt2/qfontmetrics.h
include/qt2/qframe.h
include/qt2/qgarray.h
+include/qt2/qgbkcodec.h
include/qt2/qgcache.h
include/qt2/qgdict.h
include/qt2/qgeneric.h
@@ -83,18 +86,19 @@ 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/qguardedptr.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/qiconview.h
include/qt2/qimage.h
-include/qt2/qimageio.h
+include/qt2/qinputdialog.h
include/qt2/qintcach.h
include/qt2/qintcache.h
include/qt2/qintdict.h
@@ -107,7 +111,7 @@ include/qt2/qkeycode.h
include/qt2/qkoi8codec.h
include/qt2/qlabel.h
include/qt2/qlayout.h
-include/qt2/qlayoutengine.h
+include/qt2/qlayoutengine_p.h
include/qt2/qlcdnum.h
include/qt2/qlcdnumber.h
include/qt2/qlined.h
@@ -115,6 +119,7 @@ include/qt2/qlineedit.h
include/qt2/qlist.h
include/qt2/qlistbox.h
include/qt2/qlistview.h
+include/qt2/qlocalfs.h
include/qt2/qmainwindow.h
include/qt2/qmap.h
include/qt2/qmenubar.h
@@ -131,6 +136,7 @@ include/qt2/qmsgbox.h
include/qt2/qmultilinedit.h
include/qt2/qmultilineedit.h
include/qt2/qnamespace.h
+include/qt2/qnetworkprotocol.h
include/qt2/qnp.h
include/qt2/qobjcoll.h
include/qt2/qobjdefs.h
@@ -165,7 +171,7 @@ include/qt2/qprogbar.h
include/qt2/qprogdlg.h
include/qt2/qprogressbar.h
include/qt2/qprogressdialog.h
-include/qt2/qpsprinter.h
+include/qt2/qpsprinter_p.h
include/qt2/qpsprn.h
include/qt2/qptrdict.h
include/qt2/qpushbt.h
@@ -178,12 +184,12 @@ include/qt2/qrangect.h
include/qt2/qrect.h
include/qt2/qregexp.h
include/qt2/qregion.h
+include/qt2/qrichtext_p.h
include/qt2/qrtlcodec.h
include/qt2/qscrbar.h
include/qt2/qscrollbar.h
include/qt2/qscrollview.h
include/qt2/qsemimodal.h
-include/qt2/qserversocket.h
include/qt2/qsession.h
include/qt2/qsessionmanager.h
include/qt2/qshared.h
@@ -197,8 +203,6 @@ include/qt2/qsizepolicy.h
include/qt2/qsjiscodec.h
include/qt2/qslider.h
include/qt2/qsmartptr.h
-include/qt2/qsocket.h
-include/qt2/qsocketdevice.h
include/qt2/qsocketnotifier.h
include/qt2/qsocknot.h
include/qt2/qsortedlist.h
@@ -212,6 +216,7 @@ include/qt2/qstrlist.h
include/qt2/qstrvec.h
include/qt2/qstyle.h
include/qt2/qstylesheet.h
+include/qt2/qt_x11.h
include/qt2/qtabbar.h
include/qt2/qtabdialog.h
include/qt2/qtabdlg.h
@@ -228,15 +233,21 @@ include/qt2/qtoolbar.h
include/qt2/qtoolbutton.h
include/qt2/qtooltip.h
include/qt2/qtranslator.h
+include/qt2/qtranslatordialog.h
include/qt2/qtstream.h
+include/qt2/qurl.h
+include/qt2/qurlinfo.h
+include/qt2/qurloperator.h
include/qt2/qutfcodec.h
include/qt2/qvalidator.h
include/qt2/qvaluelist.h
+include/qt2/qvaluestack.h
+include/qt2/qvariant.h
include/qt2/qvbox.h
include/qt2/qvbuttongroup.h
include/qt2/qvector.h
include/qt2/qvgroupbox.h
-include/qt2/qwellarray.h
+include/qt2/qwellarray_p.h
include/qt2/qwhatsthis.h
include/qt2/qwidcoll.h
include/qt2/qwidget.h
@@ -249,29 +260,44 @@ include/qt2/qwindowdefs.h
include/qt2/qwindowsstyle.h
include/qt2/qwizard.h
include/qt2/qwmatrix.h
+include/qt2/qworkspace.h
include/qt2/qxt.h
+lib/libqgl.a
lib/libqt2.so
-lib/libqt2.so.%%VERSION%%
+lib/libqt2.so.3
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/doc/qt2/ANNOUNCE
share/doc/qt2/FAQ
share/doc/qt2/LICENSE.QPL
+share/doc/qt2/PORTING
share/doc/qt2/README
share/doc/qt2/README.QT
+share/doc/qt2/html/aboutqt.html
share/doc/qt2/html/abstractwidgets.html
share/doc/qt2/html/accelerators.html
share/doc/qt2/html/aclock-main-cpp.html
share/doc/qt2/html/addressbook-main-cpp.html
+share/doc/qt2/html/advanced.html
share/doc/qt2/html/annotated.html
+share/doc/qt2/html/appearance.html
+share/doc/qt2/html/appicon.html
share/doc/qt2/html/application-main-cpp.html
share/doc/qt2/html/application.html
+share/doc/qt2/html/basic.html
share/doc/qt2/html/bearings.png
share/doc/qt2/html/biff-main-cpp.html
share/doc/qt2/html/book.png
-share/doc/qt2/html/buttons_groups-main-cpp.html
+share/doc/qt2/html/bughowto.html
+share/doc/qt2/html/buttongroup-m.png
+share/doc/qt2/html/buttongroup-w.png
+share/doc/qt2/html/buttongroups-main-cpp.html
+share/doc/qt2/html/buyhowto.html
+share/doc/qt2/html/changes21.html
share/doc/qt2/html/checklists-main-cpp.html
share/doc/qt2/html/classes.html
share/doc/qt2/html/collection.html
+share/doc/qt2/html/commonproblems.html
share/doc/qt2/html/coordsys.html
share/doc/qt2/html/coordsys.png
share/doc/qt2/html/credits.html
@@ -286,62 +312,82 @@ share/doc/qt2/html/dialogs.html
share/doc/qt2/html/dirview-main-cpp.html
share/doc/qt2/html/dnd.html
share/doc/qt2/html/dochead.png
+share/doc/qt2/html/draganddrop.html
share/doc/qt2/html/drawdemo-drawdemo-cpp.html
share/doc/qt2/html/drawing.html
share/doc/qt2/html/drawlines-connect-cpp.html
share/doc/qt2/html/easteregg.html
share/doc/qt2/html/easteregg2.html
+share/doc/qt2/html/environment.html
+share/doc/qt2/html/eventsandfilters.html
share/doc/qt2/html/examples.html
+share/doc/qt2/html/fileiconview-main-cpp.html
+share/doc/qt2/html/focus.html
share/doc/qt2/html/fontmatch.html
-share/doc/qt2/html/fonts.html
share/doc/qt2/html/forever-forever-cpp.html
share/doc/qt2/html/frames.png
share/doc/qt2/html/functions.html
share/doc/qt2/html/geomanagement.html
+share/doc/qt2/html/geometry.html
+share/doc/qt2/html/geometry.png
share/doc/qt2/html/graph.g1n
share/doc/qt2/html/grapher-grapher-cpp.html
share/doc/qt2/html/gridlayout.png
+share/doc/qt2/html/groupbox-m.png
+share/doc/qt2/html/groupbox-w.png
share/doc/qt2/html/guibooks.html
share/doc/qt2/html/headers.html
share/doc/qt2/html/hello-main-cpp.html
+share/doc/qt2/html/helpsystem.html
+share/doc/qt2/html/helpviewer-main-cpp.html
share/doc/qt2/html/hierarchy.html
share/doc/qt2/html/i18n-main-cpp.html
share/doc/qt2/html/i18n.html
-share/doc/qt2/html/imageio.html
+share/doc/qt2/html/iconview-main-cpp.html
share/doc/qt2/html/images.html
+share/doc/qt2/html/index
share/doc/qt2/html/index.html
share/doc/qt2/html/io.html
-share/doc/qt2/html/kernel.html
+share/doc/qt2/html/keyfeatures21.html
share/doc/qt2/html/layout-layout-cpp.html
share/doc/qt2/html/layout.html
share/doc/qt2/html/letter.png
share/doc/qt2/html/license.html
+share/doc/qt2/html/licenses.html
share/doc/qt2/html/life-main-cpp.html
share/doc/qt2/html/lineedits-main-cpp.html
share/doc/qt2/html/listbox-main-cpp.html
-share/doc/qt2/html/listbox_combo-main-cpp.html
-share/doc/qt2/html/listview.png
+share/doc/qt2/html/listboxcombo-main-cpp.html
share/doc/qt2/html/listviews-main-cpp.html
share/doc/qt2/html/mailinglists.html
share/doc/qt2/html/mainlyMotif-editor-cpp.html
share/doc/qt2/html/mainlyQt-editor-cpp.html
share/doc/qt2/html/mainlyXt-editor-cpp.html
+share/doc/qt2/html/mainwindow-m.png
+share/doc/qt2/html/mainwindow-w.png
+share/doc/qt2/html/mdi-main-cpp.html
share/doc/qt2/html/menu-menu-cpp.html
share/doc/qt2/html/metaobjects.html
share/doc/qt2/html/misc.html
share/doc/qt2/html/moc.html
share/doc/qt2/html/movies-main-cpp.html
+share/doc/qt2/html/network.html
share/doc/qt2/html/nsplugin.html
+share/doc/qt2/html/object.html
+share/doc/qt2/html/objectmodel.html
+share/doc/qt2/html/objecttrees.html
share/doc/qt2/html/opengl.html
+share/doc/qt2/html/organizers.html
+share/doc/qt2/html/palette.png
share/doc/qt2/html/picture-picture-cpp.html
share/doc/qt2/html/pictures.html
share/doc/qt2/html/pnglogo.png
share/doc/qt2/html/popup-popup-cpp.html
share/doc/qt2/html/porting.html
share/doc/qt2/html/primes.html
-share/doc/qt2/html/printerdialog.png
share/doc/qt2/html/progress-progress-cpp.html
share/doc/qt2/html/progressbar-main-cpp.html
+share/doc/qt2/html/properties.html
share/doc/qt2/html/qabstractlayout-h.html
share/doc/qt2/html/qaccel-h.html
share/doc/qt2/html/qaccel-members.html
@@ -376,7 +422,6 @@ share/doc/qt2/html/qbitval-members.html
share/doc/qt2/html/qbitval.html
share/doc/qt2/html/qboxlayout-members.html
share/doc/qt2/html/qboxlayout.html
-share/doc/qt2/html/qbrowser-main-cpp.html
share/doc/qt2/html/qbrush-h.html
share/doc/qt2/html/qbrush-members.html
share/doc/qt2/html/qbrush.html
@@ -391,6 +436,8 @@ share/doc/qt2/html/qbutton.html
share/doc/qt2/html/qbuttongroup-h.html
share/doc/qt2/html/qbuttongroup-members.html
share/doc/qt2/html/qbuttongroup.html
+share/doc/qt2/html/qbytearray-members.html
+share/doc/qt2/html/qbytearray.html
share/doc/qt2/html/qcache-h.html
share/doc/qt2/html/qcache-members.html
share/doc/qt2/html/qcache.html
@@ -401,6 +448,8 @@ share/doc/qt2/html/qcdestyle-members.html
share/doc/qt2/html/qcdestyle.html
share/doc/qt2/html/qchar-members.html
share/doc/qt2/html/qchar.html
+share/doc/qt2/html/qcharref-members.html
+share/doc/qt2/html/qcharref.html
share/doc/qt2/html/qcheckbox-h.html
share/doc/qt2/html/qcheckbox-m.png
share/doc/qt2/html/qcheckbox-members.html
@@ -412,6 +461,7 @@ share/doc/qt2/html/qchildevent-members.html
share/doc/qt2/html/qchildevent.html
share/doc/qt2/html/qchkbox-m.png
share/doc/qt2/html/qchkbox-w.png
+share/doc/qt2/html/qclassinfo-members.html
share/doc/qt2/html/qclipboard-h.html
share/doc/qt2/html/qclipboard-members.html
share/doc/qt2/html/qclipboard.html
@@ -426,6 +476,10 @@ share/doc/qt2/html/qcolor.html
share/doc/qt2/html/qcolordialog-h.html
share/doc/qt2/html/qcolordialog-members.html
share/doc/qt2/html/qcolordialog.html
+share/doc/qt2/html/qcolordlg-m.png
+share/doc/qt2/html/qcolordlg-w.png
+share/doc/qt2/html/qcolordrag-members.html
+share/doc/qt2/html/qcolordrag.html
share/doc/qt2/html/qcolorgroup-members.html
share/doc/qt2/html/qcolorgroup.html
share/doc/qt2/html/qcombo1-m.png
@@ -453,6 +507,8 @@ share/doc/qt2/html/qcursor-members.html
share/doc/qt2/html/qcursor.html
share/doc/qt2/html/qcustomevent-members.html
share/doc/qt2/html/qcustomevent.html
+share/doc/qt2/html/qcustommenuitem-members.html
+share/doc/qt2/html/qcustommenuitem.html
share/doc/qt2/html/qdatapump-members.html
share/doc/qt2/html/qdatapump.html
share/doc/qt2/html/qdatasink-members.html
@@ -467,6 +523,8 @@ share/doc/qt2/html/qdate.html
share/doc/qt2/html/qdatetime-h.html
share/doc/qt2/html/qdatetime-members.html
share/doc/qt2/html/qdatetime.html
+share/doc/qt2/html/qdial-m.png
+share/doc/qt2/html/qdial-w.png
share/doc/qt2/html/qdialog-h.html
share/doc/qt2/html/qdialog-members.html
share/doc/qt2/html/qdialog.html
@@ -477,7 +535,6 @@ share/doc/qt2/html/qdictiterator-members.html
share/doc/qt2/html/qdictiterator.html
share/doc/qt2/html/qdir-h.html
share/doc/qt2/html/qdir-members.html
-share/doc/qt2/html/qdir-qdir-cpp.html
share/doc/qt2/html/qdir.html
share/doc/qt2/html/qdoublevalidator-members.html
share/doc/qt2/html/qdoublevalidator.html
@@ -496,6 +553,9 @@ share/doc/qt2/html/qdropevent.html
share/doc/qt2/html/qdropsite-h.html
share/doc/qt2/html/qdropsite-members.html
share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qeucjpcodec-h.html
+share/doc/qt2/html/qeucjpcodec-members.html
+share/doc/qt2/html/qeucjpcodec.html
share/doc/qt2/html/qevent-h.html
share/doc/qt2/html/qevent-members.html
share/doc/qt2/html/qevent.html
@@ -510,7 +570,6 @@ share/doc/qt2/html/qfiledlg-m.png
share/doc/qt2/html/qfiledlg-w.png
share/doc/qt2/html/qfileiconprovider-members.html
share/doc/qt2/html/qfileiconprovider.html
-share/doc/qt2/html/qfileiconview-main-cpp.html
share/doc/qt2/html/qfileinfo-h.html
share/doc/qt2/html/qfileinfo-members.html
share/doc/qt2/html/qfileinfo.html
@@ -522,9 +581,14 @@ share/doc/qt2/html/qfocusevent.html
share/doc/qt2/html/qfont-h.html
share/doc/qt2/html/qfont-members.html
share/doc/qt2/html/qfont.html
+share/doc/qt2/html/qfontdatabase-h.html
+share/doc/qt2/html/qfontdatabase-members.html
+share/doc/qt2/html/qfontdatabase.html
share/doc/qt2/html/qfontdialog-h.html
share/doc/qt2/html/qfontdialog-members.html
share/doc/qt2/html/qfontdialog.html
+share/doc/qt2/html/qfontdlg-m.png
+share/doc/qt2/html/qfontdlg-w.png
share/doc/qt2/html/qfontinfo-h.html
share/doc/qt2/html/qfontinfo-members.html
share/doc/qt2/html/qfontinfo.html
@@ -537,6 +601,9 @@ share/doc/qt2/html/qframe.html
share/doc/qt2/html/qgarray-h.html
share/doc/qt2/html/qgarray-members.html
share/doc/qt2/html/qgarray.html
+share/doc/qt2/html/qgbkcodec-h.html
+share/doc/qt2/html/qgbkcodec-members.html
+share/doc/qt2/html/qgbkcodec.html
share/doc/qt2/html/qgcache-h.html
share/doc/qt2/html/qgcache-members.html
share/doc/qt2/html/qgcache.html
@@ -577,6 +644,12 @@ share/doc/qt2/html/qgroupbox-members.html
share/doc/qt2/html/qgroupbox.html
share/doc/qt2/html/qgrpbox-m.png
share/doc/qt2/html/qgrpbox-w.png
+share/doc/qt2/html/qguardedptr-h.html
+share/doc/qt2/html/qguardedptr-members.html
+share/doc/qt2/html/qguardedptr.html
+share/doc/qt2/html/qgvector-h.html
+share/doc/qt2/html/qgvector-members.html
+share/doc/qt2/html/qgvector.html
share/doc/qt2/html/qhbox-h.html
share/doc/qt2/html/qhbox-m.png
share/doc/qt2/html/qhbox-members.html
@@ -598,10 +671,20 @@ share/doc/qt2/html/qhgroupbox-members.html
share/doc/qt2/html/qhgroupbox.html
share/doc/qt2/html/qhideevent-members.html
share/doc/qt2/html/qhideevent.html
+share/doc/qt2/html/qicondrag-members.html
+share/doc/qt2/html/qicondrag.html
+share/doc/qt2/html/qicondragitem-members.html
+share/doc/qt2/html/qicondragitem.html
share/doc/qt2/html/qiconset-h.html
share/doc/qt2/html/qiconset-members.html
share/doc/qt2/html/qiconset.html
-share/doc/qt2/html/qiconview-main-cpp.html
+share/doc/qt2/html/qiconview-h.html
+share/doc/qt2/html/qiconview-m.png
+share/doc/qt2/html/qiconview-members.html
+share/doc/qt2/html/qiconview-w.png
+share/doc/qt2/html/qiconview.html
+share/doc/qt2/html/qiconviewitem-members.html
+share/doc/qt2/html/qiconviewitem.html
share/doc/qt2/html/qimage-h.html
share/doc/qt2/html/qimage-members.html
share/doc/qt2/html/qimage.html
@@ -617,6 +700,9 @@ share/doc/qt2/html/qimageformattype-members.html
share/doc/qt2/html/qimageformattype.html
share/doc/qt2/html/qimageio-members.html
share/doc/qt2/html/qimageio.html
+share/doc/qt2/html/qinputdialog-h.html
+share/doc/qt2/html/qinputdialog-members.html
+share/doc/qt2/html/qinputdialog.html
share/doc/qt2/html/qintcache-h.html
share/doc/qt2/html/qintcache-members.html
share/doc/qt2/html/qintcache.html
@@ -634,6 +720,12 @@ share/doc/qt2/html/qiodevice-members.html
share/doc/qt2/html/qiodevice.html
share/doc/qt2/html/qiodevicesource-members.html
share/doc/qt2/html/qiodevicesource.html
+share/doc/qt2/html/qjiscodec-h.html
+share/doc/qt2/html/qjiscodec-members.html
+share/doc/qt2/html/qjiscodec.html
+share/doc/qt2/html/qjpunicode-h.html
+share/doc/qt2/html/qjpunicodeconv-members.html
+share/doc/qt2/html/qjpunicodeconv.html
share/doc/qt2/html/qkeyevent-members.html
share/doc/qt2/html/qkeyevent.html
share/doc/qt2/html/qlabel-h.html
@@ -675,7 +767,9 @@ share/doc/qt2/html/qlistboxtext.html
share/doc/qt2/html/qlistiterator-members.html
share/doc/qt2/html/qlistiterator.html
share/doc/qt2/html/qlistview-h.html
+share/doc/qt2/html/qlistview-m.png
share/doc/qt2/html/qlistview-members.html
+share/doc/qt2/html/qlistview-w.png
share/doc/qt2/html/qlistview.html
share/doc/qt2/html/qlistviewitem-members.html
share/doc/qt2/html/qlistviewitem.html
@@ -683,6 +777,9 @@ share/doc/qt2/html/qlistviewitemiterator-members.html
share/doc/qt2/html/qlistviewitemiterator.html
share/doc/qt2/html/qlnode-members.html
share/doc/qt2/html/qlnode.html
+share/doc/qt2/html/qlocalfs-h.html
+share/doc/qt2/html/qlocalfs-members.html
+share/doc/qt2/html/qlocalfs.html
share/doc/qt2/html/qmag-qmag-cpp.html
share/doc/qt2/html/qmainwindow-h.html
share/doc/qt2/html/qmainwindow-m.png
@@ -707,6 +804,12 @@ share/doc/qt2/html/qmenudata.html
share/doc/qt2/html/qmessagebox-h.html
share/doc/qt2/html/qmessagebox-members.html
share/doc/qt2/html/qmessagebox.html
+share/doc/qt2/html/qmetadata-members.html
+share/doc/qt2/html/qmetaobject-h.html
+share/doc/qt2/html/qmetaobject-members.html
+share/doc/qt2/html/qmetaobject.html
+share/doc/qt2/html/qmetaproperty-members.html
+share/doc/qt2/html/qmetaproperty.html
share/doc/qt2/html/qmime-h.html
share/doc/qt2/html/qmimesource-members.html
share/doc/qt2/html/qmimesource.html
@@ -732,6 +835,11 @@ share/doc/qt2/html/qmultilineedit-members.html
share/doc/qt2/html/qmultilineedit.html
share/doc/qt2/html/qnamespace-h.html
share/doc/qt2/html/qnetworkegg.html
+share/doc/qt2/html/qnetworkoperation-members.html
+share/doc/qt2/html/qnetworkoperation.html
+share/doc/qt2/html/qnetworkprotocol-h.html
+share/doc/qt2/html/qnetworkprotocol-members.html
+share/doc/qt2/html/qnetworkprotocol.html
share/doc/qt2/html/qnp-h.html
share/doc/qt2/html/qnpinstance-members.html
share/doc/qt2/html/qnpinstance.html
@@ -782,11 +890,16 @@ share/doc/qt2/html/qpoint.html
share/doc/qt2/html/qpointarray-h.html
share/doc/qt2/html/qpointarray-members.html
share/doc/qt2/html/qpointarray.html
+share/doc/qt2/html/qpopmenu-fancy.png
share/doc/qt2/html/qpopmenu-m.png
share/doc/qt2/html/qpopmenu-w.png
share/doc/qt2/html/qpopupmenu-h.html
share/doc/qt2/html/qpopupmenu-members.html
share/doc/qt2/html/qpopupmenu.html
+share/doc/qt2/html/qprintdialog-h.html
+share/doc/qt2/html/qprintdialog-members.html
+share/doc/qt2/html/qprintdlg-m.png
+share/doc/qt2/html/qprintdlg-w.png
share/doc/qt2/html/qprinter-h.html
share/doc/qt2/html/qprinter-members.html
share/doc/qt2/html/qprinter.html
@@ -848,9 +961,6 @@ share/doc/qt2/html/qscrollview.html
share/doc/qt2/html/qsemimodal-h.html
share/doc/qt2/html/qsemimodal-members.html
share/doc/qt2/html/qsemimodal.html
-share/doc/qt2/html/qserversocket-h.html
-share/doc/qt2/html/qserversocket-members.html
-share/doc/qt2/html/qserversocket.html
share/doc/qt2/html/qsessionmanager-h.html
share/doc/qt2/html/qsessionmanager-members.html
share/doc/qt2/html/qsessionmanager.html
@@ -872,7 +982,9 @@ share/doc/qt2/html/qsize-h.html
share/doc/qt2/html/qsize-members.html
share/doc/qt2/html/qsize.html
share/doc/qt2/html/qsizegrip-h.html
+share/doc/qt2/html/qsizegrip-m.png
share/doc/qt2/html/qsizegrip-members.html
+share/doc/qt2/html/qsizegrip-w.png
share/doc/qt2/html/qsizegrip.html
share/doc/qt2/html/qsizepolicy-h.html
share/doc/qt2/html/qsizepolicy-members.html
@@ -882,12 +994,6 @@ share/doc/qt2/html/qslider-m.png
share/doc/qt2/html/qslider-members.html
share/doc/qt2/html/qslider-w.png
share/doc/qt2/html/qslider.html
-share/doc/qt2/html/qsocket-h.html
-share/doc/qt2/html/qsocket-members.html
-share/doc/qt2/html/qsocket.html
-share/doc/qt2/html/qsocketaddress-members.html
-share/doc/qt2/html/qsocketaddress.html
-share/doc/qt2/html/qsocketdevice-h.html
share/doc/qt2/html/qsocketnotifier-h.html
share/doc/qt2/html/qsocketnotifier-members.html
share/doc/qt2/html/qsocketnotifier.html
@@ -901,6 +1007,8 @@ share/doc/qt2/html/qspinbox-m.png
share/doc/qt2/html/qspinbox-members.html
share/doc/qt2/html/qspinbox-w.png
share/doc/qt2/html/qspinbox.html
+share/doc/qt2/html/qspinbox2-m.png
+share/doc/qt2/html/qspinbox2-w.png
share/doc/qt2/html/qsplitter-h.html
share/doc/qt2/html/qsplitter-m.png
share/doc/qt2/html/qsplitter-members.html
@@ -927,6 +1035,8 @@ share/doc/qt2/html/qstringlist.html
share/doc/qt2/html/qstrlist-h.html
share/doc/qt2/html/qstrlist-members.html
share/doc/qt2/html/qstrlist.html
+share/doc/qt2/html/qstrlistiterator-members.html
+share/doc/qt2/html/qstrlistiterator.html
share/doc/qt2/html/qstyle-h.html
share/doc/qt2/html/qstyle-members.html
share/doc/qt2/html/qstyle.html
@@ -955,10 +1065,14 @@ share/doc/qt2/html/qtableview.html
share/doc/qt2/html/qtablevw-m.png
share/doc/qt2/html/qtablevw-w.png
share/doc/qt2/html/qtabwidget-h.html
+share/doc/qt2/html/qtabwidget-m.png
share/doc/qt2/html/qtabwidget-members.html
+share/doc/qt2/html/qtabwidget-w.png
share/doc/qt2/html/qtabwidget.html
share/doc/qt2/html/qtextbrowser-h.html
+share/doc/qt2/html/qtextbrowser-m.png
share/doc/qt2/html/qtextbrowser-members.html
+share/doc/qt2/html/qtextbrowser-w.png
share/doc/qt2/html/qtextbrowser.html
share/doc/qt2/html/qtextcodec-h.html
share/doc/qt2/html/qtextcodec-members.html
@@ -1005,6 +1119,15 @@ share/doc/qt2/html/qtranslator-members.html
share/doc/qt2/html/qtranslator.html
share/doc/qt2/html/quridrag-members.html
share/doc/qt2/html/quridrag.html
+share/doc/qt2/html/qurl-h.html
+share/doc/qt2/html/qurl-members.html
+share/doc/qt2/html/qurl.html
+share/doc/qt2/html/qurlinfo-h.html
+share/doc/qt2/html/qurlinfo-members.html
+share/doc/qt2/html/qurlinfo.html
+share/doc/qt2/html/qurloperator-h.html
+share/doc/qt2/html/qurloperator-members.html
+share/doc/qt2/html/qurloperator.html
share/doc/qt2/html/qvalidator-h.html
share/doc/qt2/html/qvalidator-members.html
share/doc/qt2/html/qvalidator.html
@@ -1015,6 +1138,10 @@ share/doc/qt2/html/qvaluelistconstiterator-members.html
share/doc/qt2/html/qvaluelistconstiterator.html
share/doc/qt2/html/qvaluelistiterator-members.html
share/doc/qt2/html/qvaluelistiterator.html
+share/doc/qt2/html/qvaluestack-h.html
+share/doc/qt2/html/qvaluestack-members.html
+share/doc/qt2/html/qvaluestack.html
+share/doc/qt2/html/qvariant-h.html
share/doc/qt2/html/qvbox-h.html
share/doc/qt2/html/qvbox-m.png
share/doc/qt2/html/qvbox-members.html
@@ -1026,6 +1153,9 @@ share/doc/qt2/html/qvboxlayout.html
share/doc/qt2/html/qvbuttongroup-h.html
share/doc/qt2/html/qvbuttongroup-members.html
share/doc/qt2/html/qvbuttongroup.html
+share/doc/qt2/html/qvector-h.html
+share/doc/qt2/html/qvector-members.html
+share/doc/qt2/html/qvector.html
share/doc/qt2/html/qvgroupbox-h.html
share/doc/qt2/html/qvgroupbox-members.html
share/doc/qt2/html/qvgroupbox.html
@@ -1058,11 +1188,13 @@ share/doc/qt2/html/qxtapplication-members.html
share/doc/qt2/html/qxtapplication.html
share/doc/qt2/html/qxtwidget-members.html
share/doc/qt2/html/qxtwidget.html
-share/doc/qt2/html/rangecontrols-main-cpp.html
-share/doc/qt2/html/realwidgets.html
share/doc/qt2/html/removed20.html
share/doc/qt2/html/richtext-main-cpp.html
+share/doc/qt2/html/rintersect.png
share/doc/qt2/html/rot13-rot13-cpp.html
+share/doc/qt2/html/rsubtract.png
+share/doc/qt2/html/runion.png
+share/doc/qt2/html/rxor.png
share/doc/qt2/html/scribble-main-cpp.html
share/doc/qt2/html/scrollview-scrollview-cpp.html
share/doc/qt2/html/session.html
@@ -1070,8 +1202,12 @@ share/doc/qt2/html/session.png
share/doc/qt2/html/shared.html
share/doc/qt2/html/shclass.html
share/doc/qt2/html/showimg-main-cpp.html
+share/doc/qt2/html/signalsandslots.html
share/doc/qt2/html/simple-application.html
+share/doc/qt2/html/sound.html
share/doc/qt2/html/splitter-splitter-cpp.html
+share/doc/qt2/html/splitter-views-m.png
+share/doc/qt2/html/splitter-views-w.png
share/doc/qt2/html/t1.html
share/doc/qt2/html/t1.png
share/doc/qt2/html/t10-cannon-cpp.html
@@ -1152,23 +1288,25 @@ share/doc/qt2/html/t9.html
share/doc/qt2/html/t9.png
share/doc/qt2/html/t9_1.png
share/doc/qt2/html/t9_2.png
-share/doc/qt2/html/tabdialog-tabdialog-cpp.html
+share/doc/qt2/html/tabdialog-main-cpp.html
share/doc/qt2/html/table-main-cpp.html
share/doc/qt2/html/test.png
share/doc/qt2/html/tetrix-tetrix-cpp.html
share/doc/qt2/html/themes-main-cpp.html
share/doc/qt2/html/tictac-main-cpp.html
share/doc/qt2/html/time.html
+share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
share/doc/qt2/html/tools.html
share/doc/qt2/html/tooltip-main-cpp.html
share/doc/qt2/html/topicals.html
-share/doc/qt2/html/treeview.png
share/doc/qt2/html/trivial-trivial-cpp.html
share/doc/qt2/html/troll.html
share/doc/qt2/html/ttlogo-small.jpg
share/doc/qt2/html/ttlogo-small.png
share/doc/qt2/html/tutorial.html
share/doc/qt2/html/tutorial.png
+share/doc/qt2/html/unicode.html
share/doc/qt2/html/validator-main-cpp.html
share/doc/qt2/html/whatsthis.png
share/doc/qt2/html/wizard-main-cpp.html