upgrade to Qt 3.3.2

ok MAINTAINER

x11/qt3/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2004/02/25 02:35:18 naddy Exp $
+# $OpenBSD: Makefile,v 1.35 2004/07/22 23:03:08 brad Exp $
 # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
 
 COMMENT=		"C++ X11 GUI toolkit"
@@ -15,7 +15,7 @@ PKGNAME-examples=	qt3-examples-${VERSION}
 FULLPKGNAME-base=	qt3-base-${VERSION}
 FULLPKGNAME-html=	qt3-html-${VERSION}
 
-VERSION=	2.3
+VERSION=	3.2
 DISTNAME=	qt-x11-free-3.${VERSION}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
@@ -164,7 +164,7 @@ NO_REGRESS=	Yes
 PROGRAMS3=designer findtr moc qt20fix qtrename140 uic
 PROGRAMS=assistant linguist lrelease lupdate qm2ts qmake qtconfig 
 
-LIBRARIES=qt${MT_SUFX}.so.3.23 qui${MT_SUFX}.so.1.0
+LIBRARIES=qt${MT_SUFX}.so.3.32 qui${MT_SUFX}.so.1.0
 
 .if ${FLAVOR:L:Mmt}
 MT_SUFX=-mt
@@ -205,8 +205,8 @@ pre-install:
 .else
 
 post-patch:
-	-rm -rf ${WRKSRC}/examples
-	-rm -rf ${WRKSRC}/tutorial
+	@rm -rf ${WRKSRC}/examples
+	@rm -rf ${WRKSRC}/tutorial
 
 .endif
 
@@ -216,9 +216,6 @@ do-install:
 	${INSTALL_MAN_DIR} ${QT_MANDIR}/man3
 	${INSTALL_DATA_DIR} ${QT_DOC}/html
 	# includes
-	@rm -f ${WRKSRC}/include/qt_{mac,windows}.h
-	@rm -f ${WRKSRC}/include/qmotif{,dialog,widget}.h
-	@rm -f ${WRKSRC}/include/qxtwidget.h
 	${INSTALL_DATA_DIR} ${QT_INCDIR}/private
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${QT_INCDIR}
 	${INSTALL_DATA} ${WRKSRC}/include/private/*.h ${QT_INCDIR}/private

x11/qt3/distinfo

@@ -1,3 +1,3 @@
-MD5 (qt-x11-free-3.2.3.tar.gz) = 088573d44c5541e7c8b6e00e7e952047
-RMD160 (qt-x11-free-3.2.3.tar.gz) = f2e377fc1a36008b42d58615da8c6786e7fe51e4
-SHA1 (qt-x11-free-3.2.3.tar.gz) = bfe3af48a8b2738578227abe2e06805d910b1107
+MD5 (qt-x11-free-3.3.2.tar.gz) = 9ed9721eee18ffb50bb0f220ed24c1ec
+RMD160 (qt-x11-free-3.3.2.tar.gz) = 111808654c09b2f76e6837c0fed33d4087f06e5b
+SHA1 (qt-x11-free-3.3.2.tar.gz) = af44bddca5f1f421349f7e6e6fe64bafb0adff6d

x11/qt3/patches/patch-config_tests_x11_xcursor_test

@@ -1,14 +0,0 @@
-$OpenBSD: patch-config_tests_x11_xcursor_test,v 1.1 2004/01/19 22:46:03 espie Exp $
---- config.tests/x11/xcursor.test.orig	2004-01-19 23:40:18.000000000 +0100
-+++ config.tests/x11/xcursor.test	2004-01-19 23:40:32.000000000 +0100
-@@ -66,8 +66,8 @@ fi
- 
- # verify that we are using Xcursor 1.0
- if [ "$XCURSOR" = "yes" ]; then
--    XCURSOR_MAJOR=`grep 'XCURSOR\(_LIB\)\?_MAJOR' $XCURSOR_H | head -n 1 | awk '{ print \$3 }'`
--    XCURSOR_MINOR=`grep 'XCURSOR\(_LIB\)\?_MINOR' $XCURSOR_H | head -n 1 | awk '{ print \$3 }'`
-+    XCURSOR_MAJOR=`egrep 'XCURSOR(_LIB)?_MAJOR' $XCURSOR_H | head -n 1 | awk '{ print \$3 }'`
-+    XCURSOR_MINOR=`egrep 'XCURSOR(_LIB)?_MINOR' $XCURSOR_H | head -n 1 | awk '{ print \$3 }'`
-     if [ -z "$XCURSOR_MAJOR" -o -z "$XCURSOR_MINOR" ]; then
-         XCURSOR=no
- 	[ "$VERBOSE" = "yes" ] && \

x11/qt3/patches/patch-configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.8 2004/01/08 01:12:59 brad Exp $
---- configure.orig	2003-10-21 06:04:20.000000000 -0400
-+++ configure	2003-12-27 19:52:21.000000000 -0500
-@@ -913,7 +913,7 @@ while [ "$#" -gt 0 ]; do
+$OpenBSD: patch-configure,v 1.9 2004/07/22 23:03:09 brad Exp $
+--- configure.orig	2004-03-31 09:40:12.000000000 -0700
++++ configure	2004-06-19 19:37:34.000000000 -0600
+@@ -950,7 +950,7 @@ while [ "$#" -gt 0 ]; do
      v|verbose)
  	if [ "$VAL" = "yes" ]; then
  	    if [ "$OPT_VERBOSE" = "$VAL" ]; then 	    # takes two verboses to turn on qmake debugs
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.8 2004/01/08 01:12:59 brad Exp $
              else
  		OPT_VERBOSE=yes
  	    fi
-@@ -1537,7 +1537,7 @@ if echo $MODULES | grep sql >/dev/null; 
+@@ -1589,7 +1589,7 @@ if echo $MODULES | grep sql >/dev/null; 
      MYSQL_REQ="-lmysqlclient mysql.h"
      OCI_REQ="-lclntsh -lwtc8 oci.h"
      PSQL_REQ="-lpq postgres.h libpq/libpq-fs.h catalog/pg_type.h libpq-fe.h"
@@ -18,8 +18,8 @@ $OpenBSD: patch-configure,v 1.8 2004/01/08 01:12:59 brad Exp $
 +    ODBC_REQ="-liodbc sql.h sqlext.h"
      TDS_REQ="-lsybdb sybfront.h sybdb.h"
      DB2_REQ="-ldb2 sqlcli.h sqlcli1.h"
-     for _SQLDR in $CFG_SQL_AVAILABLE; do
-@@ -2177,7 +2177,7 @@ if [ "$Edition" = "free" ]; then
+     IBASE_REQ="-lgds ibase.h"
+@@ -2305,7 +2305,7 @@ if [ "$Edition" = "free" ]; then
  	else
  	    echo "Do you accept the terms of $affix license? \c"
  	fi
@@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.8 2004/01/08 01:12:59 brad Exp $
  	echo
  	if [ "$acceptance" = "yes" ]; then
  	    break
-@@ -2601,8 +2601,8 @@ fi
+@@ -2784,8 +2784,8 @@ fi
  if [ "$CFG_LIBMNG" = "system" ]; then
      QMAKE_CONFIG="$QMAKE_CONFIG system-mng"
      if [ "$CFG_MNG" = "yes" ]; then
@@ -39,7 +39,7 @@ $OpenBSD: patch-configure,v 1.8 2004/01/08 01:12:59 brad Exp $
      fi
  fi
  if [ "$CFG_MNG" = "no" ]; then
-@@ -2628,8 +2628,8 @@ fi
+@@ -2811,8 +2811,8 @@ fi
  if [ "$CFG_LIBPNG" = "system" ]; then
      QMAKE_CONFIG="$QMAKE_CONFIG system-png"
      if [ "$CFG_PNG" = "yes" ]; then

x11/qt3/patches/patch-mkspecs_openbsd-g++_qmake_conf

@@ -1,6 +1,6 @@
-$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.14 2004/01/08 01:12:59 brad Exp $
---- mkspecs/openbsd-g++/qmake.conf.orig	2003-10-09 21:48:53.000000000 -0400
-+++ mkspecs/openbsd-g++/qmake.conf	2003-11-08 03:08:50.000000000 -0500
+$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.15 2004/07/22 23:03:09 brad Exp $
+--- mkspecs/openbsd-g++/qmake.conf.orig	2004-04-19 03:36:43.000000000 -0600
++++ mkspecs/openbsd-g++/qmake.conf	2004-06-20 15:18:32.000000000 -0600
 @@ -8,6 +8,7 @@ MAKEFILE_GENERATOR	= UNIX
  TEMPLATE		= app
  CONFIG			+= qt warn_on release link_prl
@@ -20,3 +20,12 @@ $OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.14 2004/01/08 01:12:59 brad E
  QMAKE_INCDIR_X11	= /usr/X11R6/include
  QMAKE_LIBDIR_X11	= /usr/X11R6/lib
  QMAKE_INCDIR_QT		= $(QTDIR)/include
+@@ -53,7 +54,7 @@ QMAKE_LFLAGS_RELEASE	=
+ QMAKE_LFLAGS_DEBUG	=
+ QMAKE_LFLAGS_SHLIB	= -shared
+ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+-QMAKE_LFLAGS_SONAME	= -Wl,-soname,
++QMAKE_LFLAGS_SONAME	=
+ QMAKE_LFLAGS_THREAD	= -pthread
+ 
+ QMAKE_LIBS		=

x11/qt3/patches/patch-qmake_generators_unix_unixmake2_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.10 2004/01/08 01:12:59 brad Exp $
---- qmake/generators/unix/unixmake2.cpp.orig	2003-11-10 05:22:48.000000000 -0500
-+++ qmake/generators/unix/unixmake2.cpp	2003-12-29 04:35:25.000000000 -0500
-@@ -293,10 +293,14 @@ UnixMakefileGenerator::writeMakeParts(QT
+$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.11 2004/07/22 23:03:09 brad Exp $
+--- qmake/generators/unix/unixmake2.cpp.orig	2004-04-19 03:36:24.000000000 -0600
++++ qmake/generators/unix/unixmake2.cpp	2004-06-19 20:59:08.000000000 -0600
+@@ -295,10 +295,14 @@ UnixMakefileGenerator::writeMakeParts(QT
      } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
  	t << "TARGETA	= " << var("TARGETA") << endl;
  	if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
@@ -20,15 +20,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.10 2004/01/08 01:12:59 b
  	} else {
  	    t << "TARGETD	= " << var("TARGET_x") << endl;
  	    t << "TARGET0	= " << var("TARGET_") << endl;
-@@ -1238,6 +1242,7 @@ void UnixMakefileGenerator::init2()
- 							    project->first("VER_PAT"));
- 	    }
- 	    project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
-+
- 	} else {
- 	    project->variables()["TARGET_"].append("lib" + project->first("TARGET") + "." +
- 						   project->first("QMAKE_EXTENSION_SHLIB"));
-@@ -1258,10 +1263,19 @@ void UnixMakefileGenerator::init2()
+@@ -1290,10 +1294,19 @@ void UnixMakefileGenerator::init2()
  		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
  							project->first("QMAKE_EXTENSION_SHLIB") +
  							"." + project->first("VER_MAJ"));
@@ -52,7 +44,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.10 2004/01/08 01:12:59 b
  		project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") +
  							    "." +
  							    project->variables()[
-@@ -1270,7 +1284,10 @@ void UnixMakefileGenerator::init2()
+@@ -1302,7 +1315,10 @@ void UnixMakefileGenerator::init2()
  							    project->first("VER_MIN") +  "." +
  							    project->first("VER_PAT"));
  	    }
@@ -64,59 +56,3 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.10 2004/01/08 01:12:59 b
  	}
  	if(project->isEmpty("QMAKE_LN_SHLIB"))
  	    project->variables()["QMAKE_LN_SHLIB"].append("ln -s");
-@@ -1358,6 +1375,20 @@ void UnixMakefileGenerator::init2()
- }
- 
- QString
-+UnixMakefileGenerator::prefixedVariable( const QString &projectVariableName, const QString &defaultSuffix )
-+{
-+    QString prefix = qInstallPath();
-+
-+    QString value = var( projectVariableName );
-+    if ( value.isEmpty() )
-+	value = "${prefix}" + defaultSuffix;
-+    else if ( value.startsWith( prefix ) )
-+	value.replace( prefix, "${prefix}" );
-+
-+    return value;
-+}
-+
-+QString
- UnixMakefileGenerator::libtoolFileName()
- {
-     QString ret = var("TARGET");
-@@ -1476,13 +1507,13 @@ UnixMakefileGenerator::writePkgConfigFil
-     QTextStream t(&ft);
- 
-     QString prefix = qInstallPath();
--    QString libDir = prefix + "/lib";
--    QString includeDir = prefix + "/include";
-+    QString libDir = prefixedVariable( "libs.path", "/lib" );
-+    QString includeDir = prefixedVariable( "headers.path", "/include" );
- 
--    t << "prefix=" << libDir << endl;
-+    t << "prefix=" << prefix << endl;
-     t << "exec_prefix=${prefix}\n"
--      << "libdir=${exec_prefix}/lib\n"
--      << "includedir=${prefix}/include" << endl;
-+      << "libdir=" << libDir << endl
-+      << "includedir=" << includeDir << endl;
-     // non-standard entry. Provides useful info normally only
-     // contained in the internal .qmake.cache file
-     t << varGlue("CONFIG", "qt_config=", " ", "") << endl << endl;
-@@ -1499,7 +1530,7 @@ UnixMakefileGenerator::writePkgConfigFil
- 	libs << "QMAKE_LIBS"; //obvious one
-     if(project->isActiveConfig("thread"))
- 	libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
--    t << "Libs: -L" << libDir << " -l" << lname << " ";
-+    t << "Libs: -L${libdir} -l" << var( "QMAKE_ORIG_TARGET" ) << " ";
-     for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it)
- 	t << project->variables()[(*it)].join(" ") << " ";
-     t << endl;
-@@ -1511,5 +1542,5 @@ UnixMakefileGenerator::writePkgConfigFil
-       << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
-       << project->variables()["PRL_EXPORT_CXXFLAGS"].join(" ")
- 	//      << varGlue("DEFINES","-D"," -D"," ")
--      << " -I" << includeDir;
-+      << " -I${includedir}" << endl;
- }

x11/qt3/patches/patch-qmake_generators_unix_unixmake_h

@@ -1,11 +0,0 @@
-$OpenBSD: patch-qmake_generators_unix_unixmake_h,v 1.1 2004/01/08 01:12:59 brad Exp $
---- qmake/generators/unix/unixmake.h.orig	2003-12-29 04:29:44.000000000 -0500
-+++ qmake/generators/unix/unixmake.h	2003-12-29 04:30:15.000000000 -0500
-@@ -69,6 +69,7 @@ protected:
-     
- private:
-     void init2();
-+    QString prefixedVariable( const QString &projectVariableName, const QString &defaultSuffix );
- };
- 
- inline UnixMakefileGenerator::~UnixMakefileGenerator()

x11/qt3/patches/patch-src_canvas_qcanvas_cpp

@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_canvas_qcanvas_cpp,v 1.1 2004/01/08 01:12:59 brad Exp $
---- src/canvas/qcanvas.cpp.orig	2003-11-21 20:30:36.000000000 -0500
-+++ src/canvas/qcanvas.cpp	2003-11-21 20:31:18.000000000 -0500
-@@ -3045,6 +3045,7 @@ void QCanvasPixmapArray::reset()
- 	delete img[i];
-     delete [] img;
-     img = 0;
-+    framecount = 0;
- }
- 
- #ifndef QT_NO_IMAGEIO

x11/qt3/patches/patch-src_iconview_qiconview_cpp

@@ -1,39 +1,174 @@
-$OpenBSD: patch-src_iconview_qiconview_cpp,v 1.1 2004/01/08 01:12:59 brad Exp $
---- src/iconview/qiconview.cpp.orig	2003-12-29 04:26:24.000000000 -0500
-+++ src/iconview/qiconview.cpp	2003-12-29 05:12:33.000000000 -0500
-@@ -3264,9 +3264,11 @@ void QIconView::doAutoScroll()
- {
-     QRect oldRubber = QRect( *d->rubber );
+$OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $
+--- src/iconview/qiconview.cpp.orig	2004-06-23 23:56:48.000000000 -0600
++++ src/iconview/qiconview.cpp	2004-06-23 23:56:34.000000000 -0600
+@@ -236,6 +236,7 @@ public:
+     QPoint dragStartPos;
+     QFontMetrics *fm;
+     int minLeftBearing, minRightBearing;
++    int rubberStartX, rubberStartY;
  
--    QPoint pos = QCursor::pos();
--    pos = viewport()->mapFromGlobal( pos );
--    pos = viewportToContents( pos );
-+    QPoint vp = viewport()->mapFromGlobal( QCursor::pos() );
-+    QPoint pos = viewportToContents( vp );
-+
-+    if ( pos == d->rubber->bottomRight() )
-+	return;
+     uint mousePressed		:1;
+     uint cleared		:1;
+@@ -255,9 +256,11 @@ public:
+     uint firstSizeHint : 1;
+     uint showTips		:1;
+     uint pressedSelected	:1;
++    uint canStartRubber		:1;
+     uint dragging		:1;
+     uint drawActiveSelection	:1;
+     uint inMenuMode		:1;
++    uint controlPressed         :1;
  
-     d->rubber->setRight( pos.x() );
-     d->rubber->setBottom( pos.y() );
-@@ -3360,14 +3362,14 @@ void QIconView::doAutoScroll()
- 	    emit selectionChanged( d->currentItem );
+     QIconViewToolTip *toolTip;
+     QPixmapCache maskCache;
+@@ -1060,7 +1063,7 @@ void QIconViewItem::setText( const QStri
+ 
+     if ( view ) {
+ 	if ( QRect( view->contentsX(), view->contentsY(),
+-		    view->visibleWidth(), view->visibleHeight() ).
++		    view->visibleWidthSB(), view->visibleHeightSB() ).
+ 	     intersects( oR ) )
+ 	    view->repaintContents( oR.x() - 1, oR.y() - 1,
+ 				   oR.width() + 2, oR.height() + 2, FALSE );
+@@ -1104,7 +1107,7 @@ void QIconViewItem::setPixmap( const QPi
+ 
+     if ( view ) {
+ 	if ( QRect( view->contentsX(), view->contentsY(),
+-		    view->visibleWidth(), view->visibleHeight() ).
++		    view->visibleWidthSB(), view->visibleHeightSB() ).
+ 	     intersects( oR ) )
+ 	    view->repaintContents( oR.x() - 1, oR.y() - 1,
+ 				   oR.width() + 2, oR.height() + 2, FALSE );
+@@ -1140,7 +1143,7 @@ void QIconViewItem::setPicture( const QP
+ 
+     if ( view ) {
+ 	if ( QRect( view->contentsX(), view->contentsY(),
+-		    view->visibleWidth(), view->visibleHeight() ).
++		    view->visibleWidthSB(), view->visibleHeightSB() ).
+ 	     intersects( oR ) )
+ 	    view->repaintContents( oR.x() - 1, oR.y() - 1,
+ 				   oR.width() + 2, oR.height() + 2, FALSE );
+@@ -1200,7 +1203,7 @@ void QIconViewItem::setPixmap( const QPi
+ 
+ 	    if ( view ) {
+ 		if ( QRect( view->contentsX(), view->contentsY(),
+-			    view->visibleWidth(), view->visibleHeight() ).
++			    view->visibleWidthSB(), view->visibleHeightSB() ).
+ 		     intersects( oR ) )
+ 		    view->repaintContents( oR.x() - 1, oR.y() - 1,
+ 					   oR.width() + 2, oR.height() + 2, FALSE );
+@@ -2727,10 +2730,12 @@ QIconView::QIconView( QWidget *parent, c
+     d->lastItem = 0;
+     d->count = 0;
+     d->mousePressed = FALSE;
++    d->controlPressed = FALSE;
+     d->selectionMode = Single;
+     d->currentItem = 0;
+     d->highlightedItem = 0;
+     d->rubber = 0;
++    d->canStartRubber = FALSE;
+     d->scrollTimer = 0;
+     d->startDragItem = 0;
+     d->tmpCurrentItem = 0;
+@@ -3292,9 +3297,18 @@ void QIconView::doAutoScroll()
+ 	    alreadyIntersected = TRUE;
+ 	    QIconViewItem *item = c->items.first();
+ 	    for ( ; item; item = c->items.next() ) {
+-		if ( d->selectedItems.find( item ) )
+-		    continue;
+-		if ( !item->intersects( nr ) ) {
++               if ( d->selectedItems.find( item ) ) {
++                   if ( item->intersects( nr ) && item->isSelected() && d->controlPressed ) {
++                       item->setSelected( FALSE );
++                       changed = TRUE;
++                       rr = rr.unite( item->rect() );
++                   } else if ( !item->intersects( nr ) && !item->isSelected() && d->controlPressed ) {
++                       item->setSelected( TRUE, TRUE );
++                       changed = TRUE;
++                       rr = rr.unite( item->rect() );
++                   } else
++                       continue;
++               } else if ( !item->intersects( nr ) ) {
+ 		    if ( item->isSelected() ) {
+ 			item->setSelected( FALSE );
+ 			changed = TRUE;
+@@ -4485,34 +4499,25 @@ void QIconView::contentsMousePressEventE
+ 	    }
+ 	}
+     } else if ( ( d->selectionMode != Single || e->button() == RightButton )
+-		&& !( e->state() & ControlButton ) )
++		&& !( e->state() & ControlButton ) && !( e->state() & ShiftButton ) )
+ 	selectAll( FALSE );
+ 
+     setCurrentItem( item );
+ 
++    d->canStartRubber = FALSE;
+     if ( e->button() == LeftButton ) {
+-	if ( !item && ( d->selectionMode == Multi ||
+-				  d->selectionMode == Extended ) ) {
+-	    d->tmpCurrentItem = d->currentItem;
+-	    d->currentItem = 0;
+-	    repaintItem( d->tmpCurrentItem );
+-	    if ( d->rubber )
+-		delete d->rubber;
+-	    d->rubber = 0;
+-	    d->rubber = new QRect( e->x(), e->y(), 0, 0 );
+-	    d->selectedItems.clear();
+-	    if ( ( e->state() & ControlButton ) == ControlButton ) {
+-		for ( QIconViewItem *i = firstItem(); i; i = i->nextItem() )
+-		    if ( i->isSelected() )
+-			d->selectedItems.insert( i, i );
+-	    }
++	if ( !item && ( d->selectionMode == Multi || d->selectionMode == Extended ) )
++	{
++	    d->canStartRubber = TRUE;
++	    d->rubberStartX = e->x();
++	    d->rubberStartY = e->y();
+ 	}
+-
+ 	d->mousePressed = TRUE;
++	d->controlPressed = ( ( e->state() & ControlButton ) == ControlButton );
      }
  
--    if ( !QRect( 0, 0, viewport()->width(), viewport()->height() ).contains( pos ) &&
-+    if ( !QRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).contains( vp ) &&
- 	 !d->scrollTimer ) {
- 	d->scrollTimer = new QTimer( this );
+  emit_signals:
+-    if ( !d->rubber ) {
++    if ( !d->canStartRubber ) {
+ 	emit mouseButtonPressed( e->button(), item, e->globalPos() );
+ 	emit pressed( item );
+ 	emit pressed( item, e->globalPos() );
+@@ -4556,6 +4561,7 @@ void QIconView::contentsMouseReleaseEven
+     d->mousePressed = FALSE;
+     d->startDragItem = 0;
  
- 	connect( d->scrollTimer, SIGNAL( timeout() ),
- 		 this, SLOT( doAutoScroll() ) );
- 	d->scrollTimer->start( 100, FALSE );
--    } else if ( QRect( 0, 0, viewport()->width(), viewport()->height() ).contains( pos ) &&
-+    } else if ( QRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).contains( vp ) &&
- 		d->scrollTimer ) {
- 	disconnect( d->scrollTimer, SIGNAL( timeout() ),
- 		    this, SLOT( doAutoScroll() ) );
-@@ -4773,7 +4775,7 @@ void QIconView::contentsDropEvent( QDrop
++    d->canStartRubber = FALSE;
+     if ( d->rubber ) {
+ 	QPainter p;
+ 	p.begin( viewport() );
+@@ -4645,7 +4651,22 @@ void QIconView::contentsMouseMoveEvent( 
+ 	    if ( d->tmpCurrentItem )
+ 		repaintItem( d->tmpCurrentItem );
+ 	}
+-    } else if ( d->mousePressed && !d->currentItem && d->rubber ) {
++    } else if ( d->mousePressed && ((!d->currentItem && d->rubber) || d->canStartRubber) ) {
++	if ( d->canStartRubber ) {
++	    d->canStartRubber = FALSE;
++	    d->tmpCurrentItem = d->currentItem;
++	    d->currentItem = 0;
++	    repaintItem( d->tmpCurrentItem );
++	    delete d->rubber;
++	    d->rubber = new QRect( d->rubberStartX, d->rubberStartY, 0, 0 );
++	    d->selectedItems.clear();
++	    if ( ( e->state() & ControlButton ) == ControlButton ||
++	         ( e->state() & ShiftButton ) == ShiftButton ) {
++		for ( QIconViewItem *i = firstItem(); i; i = i->nextItem() )
++		    if ( i->isSelected() )
++			d->selectedItems.insert( i, i );
++	    }
++	}
+ 	doAutoScroll();
+     }
+ }
+@@ -4775,7 +4796,7 @@ void QIconView::contentsDropEvent( QDrop
  
      QIconViewItem *i = findItem( e->pos() );
  
@@ -42,7 +177,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.1 2004/01/08 01:12:59 brad Exp $
  	if ( !d->rearrangeEnabled )
  	    return;
  	QRect r = d->currentItem->rect();
-@@ -5216,11 +5218,11 @@ QIconViewItem* QIconView::findItem( Dire
+@@ -5222,11 +5243,11 @@ QIconViewItem* QIconView::findItem( Dire
  	d->findContainers( dir, relativeTo, searchRect);
  
      cList->first();
@@ -56,7 +191,54 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.1 2004/01/08 01:12:59 brad Exp $
  		 item != currentItem() ) {
   		int ml = (relativeTo - item->rect().center()).manhattanLength();
  		if ( centerMatch ) {
-@@ -6148,7 +6150,9 @@ void QIconView::rebuildContainers()
+@@ -5448,8 +5469,8 @@ void QIconView::insertInGrid( QIconViewI
+ 	}
+ 	item->dirty = FALSE;
+     } else {
+-	QRegion r( QRect( 0, 0, QMAX( contentsWidth(), visibleWidth() ),
+-			  QMAX( contentsHeight(), visibleHeight() ) ) );
++	QRegion r( QRect( 0, 0, QMAX( contentsWidth(), visibleWidthSB() ),
++			  QMAX( contentsHeight(), visibleHeightSB() ) ) );
+ 
+ 	QIconViewItem *i = d->firstItem;
+ 	int y = -1;
+@@ -5707,7 +5728,7 @@ QIconViewItem *QIconView::makeRowLayout(
+ 	    QIconViewItem *item = begin;
+ 	    for (;;) {
+ 		x += d->spacing + item->width();
+-		if ( x > visibleWidth() && item != begin ) {
++		if ( x > visibleWidthSB() && item != begin ) {
+ 		    item = item->prev;
+ 		    break;
+ 		}
+@@ -5732,7 +5753,7 @@ QIconViewItem *QIconView::makeRowLayout(
+ 		int x;
+ 		if ( item == begin ) {
+ 		    if ( reverse )
+-			x = visibleWidth() - d->spacing - item->width();
++			x = visibleWidthSB() - d->spacing - item->width();
+ 		    else
+ 			x = d->spacing;
+ 		} else {
+@@ -5768,7 +5789,7 @@ QIconViewItem *QIconView::makeRowLayout(
+ 		    i += r;
+ 		    x = i * d->rastX + sp * d->spacing;
+ 		}
+-		if ( x > visibleWidth() && item != begin ) {
++		if ( x > visibleWidthSB() && item != begin ) {
+ 		    item = item->prev;
+ 		    break;
+ 		}
+@@ -5831,7 +5852,7 @@ QIconViewItem *QIconView::makeRowLayout(
+ 	    QIconViewItem *item = begin;
+ 	    for (;;) {
+ 		y += d->spacing + item->height();
+-		if ( y > visibleHeight() && item != begin ) {
++		if ( y > visibleHeightSB() && item != begin ) {
+ 		    item = item->prev;
+ 		    break;
+ 		}
+@@ -6145,7 +6166,9 @@ void QIconView::rebuildContainers()
  	    item->d->container2 = 0;
  	    c->items.append( item );
  	    item = item->next;
@@ -67,12 +249,28 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.1 2004/01/08 01:12:59 brad Exp $
  	    item->d->container1 = c;
  	    c->items.append( item );
  	    c = c->n;
-@@ -6292,7 +6296,7 @@ void QIconView::handleItemChange( QIconV
- 			    item->selected = TRUE;
- 			    selectedRect = selectedRect.unite( item->rect() );
- 			}
--		    } else if ( item->selected ) {
-+		    } else if ( item->selected && !control ) {
- 			item->selected = FALSE;
- 			unselectedRect = unselectedRect.unite( item->rect() );
- 			changed = TRUE;
+@@ -6378,4 +6401,24 @@ bool QIconView::isRenaming() const
+ #endif
+ }
+ 
++int QIconView::visibleWidthSB() const
++{
++    if ( vScrollBarMode() != Auto )
++        return visibleWidth();
++    
++    int offset = verticalScrollBar()->isVisible() ? 0
++        : style().pixelMetric( QStyle::PM_ScrollBarExtent, verticalScrollBar() );
++    return QMAX( 0, visibleWidth() - offset );
++}
++
++int QIconView::visibleHeightSB() const
++{
++    if ( hScrollBarMode() != Auto )
++        return visibleHeight();
++    
++    int offset = horizontalScrollBar()->isVisible() ? 0
++        : style().pixelMetric( QStyle::PM_ScrollBarExtent, horizontalScrollBar() );
++    return QMAX( 0, visibleHeight() - offset );
++}
++        
+ #endif // QT_NO_ICONVIEW

x11/qt3/patches/patch-src_iconview_qiconview_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_iconview_qiconview_h,v 1.1 2004/07/22 23:03:09 brad Exp $
+--- src/iconview/qiconview.h.orig	2004-04-19 03:35:59.000000000 -0600
++++ src/iconview/qiconview.h	2004-06-23 23:55:34.000000000 -0600
+@@ -496,6 +496,8 @@ private:
+ 			const QPoint &relativeTo,
+ 			const QIconViewItem *item ) const;
+     QBitmap mask( QPixmap *pix ) const;
++    int visibleWidthSB() const;
++    int visibleHeightSB() const;
+ 
+     QIconViewPrivate *d;
+ 

x11/qt3/patches/patch-src_kernel_qdnd_x11_cpp

@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_kernel_qdnd_x11_cpp,v 1.4 2004/01/08 01:23:57 brad Exp $
---- src/kernel/qdnd_x11.cpp.orig	2003-12-29 04:22:45.000000000 -0500
-+++ src/kernel/qdnd_x11.cpp	2003-12-29 04:24:13.000000000 -0500
-@@ -433,6 +433,7 @@ void qt_xdnd_cleanup()
-     qt_xdnd_atom_numbers = 0;
-     delete qt_xdnd_target_data;
-     qt_xdnd_target_data = 0;
-+    delete noDropCursor;
-     noDropCursor = 0;
-     delete copyCursor;
-     copyCursor = 0;

x11/qt3/patches/patch-src_kernel_qdragobject_cpp

@@ -0,0 +1,20 @@
+$OpenBSD: patch-src_kernel_qdragobject_cpp,v 1.1 2004/07/22 23:03:09 brad Exp $
+--- src/kernel/qdragobject.cpp.orig	2004-04-19 03:36:04.000000000 -0600
++++ src/kernel/qdragobject.cpp	2004-06-24 00:02:04.000000000 -0600
+@@ -890,6 +890,16 @@ bool QTextDrag::decode( const QMimeSourc
+ {
+     if(!e)
+ 	return FALSE;
++        
++    // when subtype is not specified, try text/plain first, otherwise this may read
++    // things like text/x-moz-url even though better targets are available
++    if( subtype.isNull()) {
++        QCString subtmp = "plain";
++        if( decode( e, str, subtmp )) {
++            subtype = subtmp;
++            return true;
++        }
++    }
+ 
+     if ( e->cacheType == QMimeSource::Text ) {
+ 	str = *e->cache.txt.str;

x11/qt3/patches/patch-src_tools_qvaluelist_h

@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_tools_qvaluelist_h,v 1.1 2004/07/22 23:03:09 brad Exp $
+--- src/tools/qvaluelist.h.orig	2004-04-19 03:35:56.000000000 -0600
++++ src/tools/qvaluelist.h	2004-06-23 23:59:27.000000000 -0600
+@@ -636,13 +636,11 @@ Q_INLINE_TEMPLATES QDataStream& operator
+     l.clear();
+     Q_UINT32 c;
+     s >> c;
+-    for( Q_UINT32 i = 0; i < c; ++i )
++    for( Q_UINT32 i = 0; i < c && !s.atEnd(); ++i )
+     {
+ 	T t;
+ 	s >> t;
+ 	l.append( t );
+-	if ( s.atEnd() )
+-	    break;
+     }
+     return s;
+ }

x11/qt3/patches/patch-src_widgets_qlistbox_cpp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_widgets_qlistbox_cpp,v 1.1 2004/01/08 01:23:57 brad Exp $
---- src/widgets/qlistbox.cpp.orig	2003-12-29 04:38:10.000000000 -0500
-+++ src/widgets/qlistbox.cpp	2003-12-29 04:39:30.000000000 -0500
-@@ -4547,7 +4547,7 @@ void QListBox::handleItemChange( QListBo
-     } else if ( d->selectionMode == Extended ) {
- 	if ( shift ) {
- 	    selectRange( d->selectAnchor ? d->selectAnchor : old,
--			 d->current, FALSE, TRUE, d->selectAnchor ? TRUE : FALSE );
-+			 d->current, FALSE, TRUE, d->selectAnchor && !control ? TRUE : FALSE ); 
- 	} else if ( !control ) {
- 	    bool block = signalsBlocked();
- 	    blockSignals( TRUE );

x11/qt3/patches/patch-src_widgets_qlistview_cpp

@@ -1,64 +0,0 @@
-$OpenBSD: patch-src_widgets_qlistview_cpp,v 1.1 2004/01/08 01:23:57 brad Exp $
---- src/widgets/qlistview.cpp.orig	2003-12-29 04:39:39.000000000 -0500
-+++ src/widgets/qlistview.cpp	2003-12-29 04:59:41.000000000 -0500
-@@ -2012,7 +2012,7 @@ void QListViewItem::paintCell( QPainter 
- 	    ci->truncated = FALSE;
- 	    // if we have to do the ellipsis thingy calc the truncated text
- 	    int pw = pixmap( column ) ? pixmap( column )->width() + lv->itemMargin() : lv->itemMargin();
--	    if ( !mlenabled && fm.width( t ) + pw > width ) {
-+	    if ( !mlenabled && this->width( fm, lv, column ) > width ) {
- 		// take care of arabic shaping in width calculation (lars)
- 		ci->truncated = TRUE;
- 		ci->tmpText = "...";
-@@ -2849,7 +2849,7 @@ void QListView::drawContentsOffset( QPai
- 	int cs;
- 
- 	// need to paint current?
--	if ( ih > 0 && current->y < cy+ch && current->y+ih >= cy ) {
-+	if ( ih > 0 && current->y < cy+ch && current->y+ih > cy ) {
- 	    if ( fx < 0 ) {
- 		// find first interesting column, once
- 		x = 0;
-@@ -4974,10 +4974,10 @@ void QListView::keyPressEvent( QKeyEvent
- 		QString keyItemKey;
- 		QString prefix;
- 		while( keyItem ) {
--		    // Look for text in column 0, then left-to-right
--		    keyItemKey = keyItem->text(0);
--		    for (int col = 0; col < d->h->count() && !keyItemKey; col++ )
--			keyItemKey = keyItem->text( d->h->mapToLogical(col) );
-+		    // Look first in the sort column, then the leftmost column, then left to right
-+		    keyItemKey = keyItem->text( d->sortcolumn );
-+		    for ( int col = 0; col < d->h->count() && !keyItemKey; col++ )
-+			keyItemKey = keyItem->text( d->h->mapToSection(col) );
- 		    if ( !keyItemKey.isEmpty() ) {
- 			prefix = keyItemKey;
- 			prefix.truncate( input.length() );
-@@ -7772,7 +7772,7 @@ void QListView::handleItemChange( QListV
-     } else if ( d->selectionMode == Extended ) {
- 	if ( shift ) {
- 	    selectRange( d->selectAnchor ? d->selectAnchor : old,
--			 d->focusItem, FALSE, TRUE, d->selectAnchor ? TRUE : FALSE );
-+			 d->focusItem, FALSE, TRUE, d->selectAnchor && !control ? TRUE : FALSE );
- 	} else if ( !control ) {
- 	    bool block = signalsBlocked();
- 	    blockSignals( TRUE );
-@@ -8049,15 +8049,14 @@ void QListView::adjustColumn( int col )
- 	w += d->h->iconSet( col )->pixmap().width();
-     w = QMAX( w, 20 );
-     QFontMetrics fm( fontMetrics() );
--    QListViewItemIterator it( this );
-+    QListViewItem* item = firstChild();
-     int rootDepth = rootIsDecorated() ? treeStepSize() : 0;
--    while ( it.current() ) {
--	QListViewItem *item = it.current();
--	++it;
-+    while ( item ) {
- 	int iw = item->width( fm, this, col );
- 	if ( 0 == col )
- 	    iw += itemMargin() + rootDepth + item->depth()*treeStepSize() - 1;
- 	w = QMAX( w, iw );
-+	item = item->itemBelow();
-     }
-     w = QMAX( w, QApplication::globalStrut().width() );
- 

x11/qt3/patches/patch-src_widgets_qpopupmenu_cpp

@@ -0,0 +1,20 @@
+$OpenBSD: patch-src_widgets_qpopupmenu_cpp,v 1.1 2004/07/22 23:03:09 brad Exp $
+--- src/widgets/qpopupmenu.cpp.orig	2004-04-19 03:36:18.000000000 -0600
++++ src/widgets/qpopupmenu.cpp	2004-06-24 00:04:24.000000000 -0600
+@@ -1200,6 +1200,7 @@ QSize QPopupMenu::updateSize(bool force_
+ 
+     if( do_resize && size() != d->calcSize ) {
+ 	setMaximumSize( d->calcSize );
++	d->calcSize = maximumSize();
+ 	resize( d->calcSize );
+     }
+     return d->calcSize;
+@@ -2531,7 +2532,7 @@ QSize QPopupMenu::sizeHint() const
+ 
+     QPopupMenu* that = (QPopupMenu*) this;
+     //We do not need a resize here, just the sizeHint..
+-    return that->updateSize(FALSE, FALSE).expandedTo( QApplication::globalStrut() );
++    return that->updateSize(FALSE).expandedTo( QApplication::globalStrut() );
+ }
+ 
+ 

x11/qt3/patches/patch-src_widgets_qprogressbar_cpp

@@ -0,0 +1,99 @@
+$OpenBSD: patch-src_widgets_qprogressbar_cpp,v 1.1 2004/07/22 23:03:09 brad Exp $
+--- src/widgets/qprogressbar.cpp.orig	2004-04-19 03:36:18.000000000 -0600
++++ src/widgets/qprogressbar.cpp	2004-06-24 00:00:06.000000000 -0600
+@@ -47,6 +47,14 @@
+ #endif
+ #include <limits.h>
+ 
++class QProgressBarPrivate
++{
++    public:
++	QProgressBarPrivate() : last_painted_progress( 0 ) { }
++
++    int last_painted_progress;
++};
++
+ /*!
+     \class QProgressBar qprogressbar.h
+     \brief The QProgressBar widget provides a horizontal progress bar.
+@@ -99,7 +107,7 @@ QProgressBar::QProgressBar( QWidget *par
+       center_indicator( TRUE ),
+       auto_indicator( TRUE ),
+       percentage_visible( TRUE ),
+-      d( 0 )
++      d( new QProgressBarPrivate )
+ {
+     setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+     initFrame();
+@@ -130,12 +138,20 @@ QProgressBar::QProgressBar( int totalSte
+       center_indicator( TRUE ),
+       auto_indicator( TRUE ),
+       percentage_visible( TRUE ),
+-      d( 0 )
++      d( new QProgressBarPrivate )
+ {
+     setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+     initFrame();
+ }
+ 
++/*!
++    Destroys the object and frees any allocated ressources.
++*/
++
++QProgressBar::~QProgressBar()
++{
++    delete d;
++}
+ 
+ /*!
+     Reset the progress bar. The progress bar "rewinds" and shows no
+@@ -188,11 +204,16 @@ void QProgressBar::setProgress( int prog
+ 	 progress < 0 || ( ( progress > total_steps ) && total_steps ) )
+ 	return;
+ 
++    const bool needRepaint = isVisible() && requireRepaint( progress );
++
+     progress_val = progress;
+ 
+     setIndicator( progress_str, progress_val, total_steps );
+ 
+-    repaint( FALSE );
++    if ( needRepaint ) {
++	repaint( FALSE );
++	d->last_painted_progress = progress;
++    }
+ 
+ #if defined(QT_ACCESSIBILITY_SUPPORT)
+     QAccessible::updateAccessibility( this, 0, QAccessible::ValueChanged );
+@@ -318,6 +339,31 @@ void QProgressBar::styleChange( QStyle& 
+     QFrame::styleChange( old );
+ }
+ 
++/*!
++    This method returns whether changing the progress to the \a newValue
++    would require a repaint of the progress bar. This allows efficient
++    repainting.
++*/
++bool QProgressBar::requireRepaint( int newProgress ) const
++{
++    if ( newProgress == progress_val ||
++	 newProgress == d->last_painted_progress ) {
++	return false;
++    }
++
++    const int width = contentsRect().width();
++    if ( width == 0 ) {
++	return false;
++    }
++
++    float progressPerPixel = 1.0;
++    if ( total_steps > width ) {
++	progressPerPixel = float( total_steps ) / float( width );
++    }
++
++    const int delta = d->last_painted_progress - newProgress;
++    return QABS( delta ) >= progressPerPixel;
++}
+ 
+ /*!
+     This method is called to generate the text displayed in the center

x11/qt3/patches/patch-src_widgets_qprogressbar_h

@@ -0,0 +1,19 @@
+$OpenBSD: patch-src_widgets_qprogressbar_h,v 1.1 2004/07/22 23:03:09 brad Exp $
+--- src/widgets/qprogressbar.h.orig	2004-04-19 03:36:18.000000000 -0600
++++ src/widgets/qprogressbar.h	2004-06-24 00:00:06.000000000 -0600
+@@ -61,6 +61,7 @@ class Q_EXPORT QProgressBar : public QFr
+ public:
+     QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 );
+     QProgressBar( int totalSteps, QWidget* parent=0, const char* name=0, WFlags f=0 );
++    virtual ~QProgressBar();
+ 
+     int		totalSteps() const;
+     int		progress()   const;
+@@ -91,6 +92,7 @@ protected:
+     virtual bool setIndicator( QString & progress_str, int progress,
+ 			       int totalSteps );
+     void styleChange( QStyle& );
++    bool	requireRepaint( int newProgress ) const;
+ 
+ private:
+     int		total_steps;

x11/qt3/patches/patch-src_widgets_qscrollview_cpp

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_widgets_qscrollview_cpp,v 1.1 2004/07/22 23:03:09 brad Exp $
+--- src/widgets/qscrollview.cpp.orig	2004-04-19 03:36:18.000000000 -0600
++++ src/widgets/qscrollview.cpp	2004-06-24 00:03:23.000000000 -0600
+@@ -1551,6 +1551,9 @@ bool QScrollView::eventFilter( QObject *
+         case QEvent::LayoutHint:
+             d->autoResizeHint(this);
+             break;
++        case QEvent::WindowActivate:
++        case QEvent::WindowDeactivate:
++            return TRUE;
+         default:
+             break;
+         }

x11/qt3/patches/patch-tools_designer_app_app_pro

@@ -1,7 +1,7 @@
-$OpenBSD: patch-tools_designer_app_app_pro,v 1.2 2004/01/08 01:23:57 brad Exp $
---- tools/designer/app/app.pro.orig	2003-10-03 03:46:16.000000000 -0400
-+++ tools/designer/app/app.pro	2003-11-11 18:14:26.000000000 -0500
-@@ -5,7 +5,8 @@ CONFIG 		-= moc
+$OpenBSD: patch-tools_designer_app_app_pro,v 1.3 2004/07/22 23:03:09 brad Exp $
+--- tools/designer/app/app.pro.orig	2004-01-16 17:51:08.000000000 -0700
++++ tools/designer/app/app.pro	2004-06-19 19:37:35.000000000 -0600
+@@ -6,7 +6,8 @@ DESTDIR		= $$QT_BUILD_TREE/bin
  
  SOURCES		+= main.cpp
  INCLUDEPATH	+= ../designer
@@ -10,4 +10,4 @@ $OpenBSD: patch-tools_designer_app_app_pro,v 1.2 2004/01/08 01:23:57 brad Exp $
 +!thread:LIBS	+= -ldesignercore -lqui -lqassistantclient -L$$QT_BUILD_TREE/lib
  win32 {
     RC_FILE	= designer.rc
- }
+    win32-g++ {

x11/qt3/patches/patch-tools_designer_designer_designer_pro

@@ -1,7 +1,7 @@
-$OpenBSD: patch-tools_designer_designer_designer_pro,v 1.4 2004/01/08 01:23:57 brad Exp $
---- tools/designer/designer/designer.pro.orig	2003-08-18 05:43:30.000000000 -0400
-+++ tools/designer/designer/designer.pro	2003-11-11 18:19:39.000000000 -0500
-@@ -418,7 +418,8 @@ table {
+$OpenBSD: patch-tools_designer_designer_designer_pro,v 1.5 2004/07/22 23:03:09 brad Exp $
+--- tools/designer/designer/designer.pro.orig	2004-03-31 00:21:33.000000000 -0700
++++ tools/designer/designer/designer.pro	2004-06-19 19:37:35.000000000 -0600
+@@ -419,7 +419,8 @@ table {
  }
  
  INCLUDEPATH	+= ../shared ../uilib
@@ -9,5 +9,5 @@ $OpenBSD: patch-tools_designer_designer_designer_pro,v 1.4 2004/01/08 01:23:57 b
 +thread:LIBS            += -L$$QT_BUILD_TREE/lib -lqui-mt
 +!thread:LIBS		+= -L$$QT_BUILD_TREE/lib -lqui
  
- hpux-acc {
+ hpux-acc* {
  	LIBS            += $$QT_BUILD_TREE/lib/libqassistantclient.a

x11/qt3/patches/patch-tools_designer_examples_receiver1_receiver_pro

@@ -1,12 +1,13 @@
-$OpenBSD: patch-tools_designer_examples_receiver1_receiver_pro,v 1.2 2004/01/08 01:23:57 brad Exp $
---- tools/designer/examples/receiver1/receiver.pro.orig	2003-05-15 03:41:39.000000000 -0400
-+++ tools/designer/examples/receiver1/receiver.pro	2003-11-11 18:21:09.000000000 -0500
-@@ -5,6 +5,7 @@ FORMS	= mainform.ui 
- TEMPLATE	=app
+$OpenBSD: patch-tools_designer_examples_receiver1_receiver_pro,v 1.3 2004/07/22 23:03:09 brad Exp $
+--- tools/designer/examples/receiver1/receiver.pro.orig	2003-10-31 07:36:28.000000000 -0700
++++ tools/designer/examples/receiver1/receiver.pro	2004-06-19 19:37:35.000000000 -0600
+@@ -4,7 +4,8 @@ TARGET   = receiver
+ 
  CONFIG	+= qt warn_on release
  INCLUDEPATH	+= $$QT_SOURCE_TREE/tools/designer/uilib
 -LIBS	+= -lqui
 +thread:LIBS	+= -lqui-mt
 +!thread:LIBS	+= -lqui
- DBFILE	= receiver.db
- LANGUAGE	= C++
+ SOURCES	+= main.cpp
+ IMAGEFILE	= images.cpp
+ FORMS	= mainform.ui

x11/qt3/patches/patch-tools_designer_examples_receiver2_receiver_pro

@@ -1,13 +1,13 @@
-$OpenBSD: patch-tools_designer_examples_receiver2_receiver_pro,v 1.2 2004/01/08 01:23:57 brad Exp $
---- tools/designer/examples/receiver2/receiver.pro.orig	2003-05-15 03:41:42.000000000 -0400
-+++ tools/designer/examples/receiver2/receiver.pro	2003-11-11 18:21:47.000000000 -0500
-@@ -5,7 +5,8 @@ FORMS	= mainform.ui 
- TEMPLATE	=app
+$OpenBSD: patch-tools_designer_examples_receiver2_receiver_pro,v 1.3 2004/07/22 23:03:09 brad Exp $
+--- tools/designer/examples/receiver2/receiver.pro.orig	Fri Oct 31 07:36:28 2003
++++ tools/designer/examples/receiver2/receiver.pro	Sat Jun 19 19:33:29 2004
+@@ -4,7 +4,8 @@ TARGET   = receiver
+ 
  CONFIG	+= qt warn_on release
  INCLUDEPATH	+= $$QT_SOURCE_TREE/tools/designer/uilib
 -LIBS	+= -lqui
 +thread:LIBS	+= -lqui-mt
 +!thread:LIBS	+= -lqui
- DBFILE	= receiver.db
- IMAGEFILE	= images.cpp
- LANGUAGE	= C++
+ SOURCES	+= main.cpp  receiver.cpp
+ HEADERS	+= receiver.h
+ FORMS	= mainform.ui

x11/qt3/pkg/PFRAG.shared

@@ -1,7 +1,7 @@
-@comment $OpenBSD: PFRAG.shared,v 1.11 2004/01/22 21:03:59 espie Exp $
-lib/libqt${MT_SUFX}.so.3.23
+@comment $OpenBSD: PFRAG.shared,v 1.12 2004/07/22 23:03:09 brad Exp $
+lib/libqt${MT_SUFX}.so.3.32
 lib/libqui${MT_SUFX}.so.1.0
-lib/qt3/libqt${MT_SUFX}.so.3.23
+lib/qt3/libqt${MT_SUFX}.so.3.32
 lib/qt3/libqui${MT_SUFX}.so.1.0
 lib/qt3/plugins${MT_SUFX}/designer/libcppeditor.so
 lib/qt3/plugins${MT_SUFX}/designer/libdlgplugin.so

x11/qt3/pkg/PLIST-base

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-base,v 1.6 2004/01/08 01:20:13 brad Exp $
+@comment $OpenBSD: PLIST-base,v 1.7 2004/07/22 23:03:09 brad Exp $
 @pkgcfl qt3-0.*
 @pkgcfl qt3-1.0
 @pkgcfl qt3-1.1
@@ -11,7 +11,6 @@ include/X11/qt3/private/qapplication_p.h
 include/X11/qt3/private/qcolor_p.h
 include/X11/qt3/private/qcom_p.h
 include/X11/qt3/private/qcomlibrary_p.h
-include/X11/qt3/private/qcomplextext_p.h
 include/X11/qt3/private/qcomponentfactory_p.h
 include/X11/qt3/private/qcriticalsection_p.h
 include/X11/qt3/private/qdialogbuttons_p.h
@@ -23,13 +22,16 @@ include/X11/qt3/private/qfontcodecs_p.h
 include/X11/qt3/private/qfontdata_p.h
 include/X11/qt3/private/qfontengine_p.h
 include/X11/qt3/private/qgfxdriverinterface_p.h
+include/X11/qt3/private/qgl_x11_p.h
 include/X11/qt3/private/qgpluginmanager_p.h
 include/X11/qt3/private/qimageformatinterface_p.h
 include/X11/qt3/private/qinputcontext_p.h
 include/X11/qt3/private/qinternal_p.h
+include/X11/qt3/private/qisciicodec_p.h
 include/X11/qt3/private/qkbddriverinterface_p.h
 include/X11/qt3/private/qlayoutengine_p.h
 include/X11/qt3/private/qlibrary_p.h
+include/X11/qt3/private/qlocale_p.h
 include/X11/qt3/private/qlock_p.h
 include/X11/qt3/private/qmousedriverinterface_p.h
 include/X11/qt3/private/qmutex_p.h
@@ -47,6 +49,7 @@ include/X11/qt3/private/qsqlextension_p.h
 include/X11/qt3/private/qsqlmanager_p.h
 include/X11/qt3/private/qstyleinterface_p.h
 include/X11/qt3/private/qsvgdevice_p.h
+include/X11/qt3/private/qsyntaxhighlighter_p.h
 include/X11/qt3/private/qt_x11_p.h
 include/X11/qt3/private/qtextcodecinterface_p.h
 include/X11/qt3/private/qtextengine_p.h
@@ -202,6 +205,7 @@ include/X11/qt3/qlineedit.h
 include/X11/qt3/qlist.h
 include/X11/qt3/qlistbox.h
 include/X11/qt3/qlistview.h
+include/X11/qt3/qlocale.h
 include/X11/qt3/qlocalfs.h
 include/X11/qt3/qmainwindow.h
 include/X11/qt3/qmap.h
@@ -415,6 +419,9 @@ lib/qt3/man/man3/QAxBase.3
 lib/qt3/man/man3/QAxBindable.3
 lib/qt3/man/man3/QAxFactory.3
 lib/qt3/man/man3/QAxObject.3
+lib/qt3/man/man3/QAxScript.3
+lib/qt3/man/man3/QAxScriptEngine.3
+lib/qt3/man/man3/QAxScriptManager.3
 lib/qt3/man/man3/QAxWidget.3
 lib/qt3/man/man3/QBig5Codec.3
 lib/qt3/man/man3/QBig5hkscsCodec.3
@@ -561,6 +568,7 @@ lib/qt3/man/man3/QHttpResponseHeader.3
 lib/qt3/man/man3/QIMEvent.3
 lib/qt3/man/man3/QIODevice.3
 lib/qt3/man/man3/QIconDrag.3
+lib/qt3/man/man3/QIconDragEvent.3
 lib/qt3/man/man3/QIconDragItem.3
 lib/qt3/man/man3/QIconFactory.3
 lib/qt3/man/man3/QIconSet.3
@@ -600,6 +608,7 @@ lib/qt3/man/man3/QListView.3
 lib/qt3/man/man3/QListViewItem.3
 lib/qt3/man/man3/QListViewItemIterator.3
 lib/qt3/man/man3/QLocalFs.3
+lib/qt3/man/man3/QLocale.3
 lib/qt3/man/man3/QMacMime.3
 lib/qt3/man/man3/QMacStyle.3
 lib/qt3/man/man3/QMainWindow.3
@@ -648,6 +657,7 @@ lib/qt3/man/man3/QPicture.3
 lib/qt3/man/man3/QPixmap.3
 lib/qt3/man/man3/QPixmapCache.3
 lib/qt3/man/man3/QPlatinumStyle.3
+lib/qt3/man/man3/QPocketPCStyle.3
 lib/qt3/man/man3/QPoint.3
 lib/qt3/man/man3/QPointArray.3
 lib/qt3/man/man3/QPopupMenu.3
@@ -826,6 +836,9 @@ lib/qt3/man/man3/qaxbase.3
 lib/qt3/man/man3/qaxbindable.3
 lib/qt3/man/man3/qaxfactory.3
 lib/qt3/man/man3/qaxobject.3
+lib/qt3/man/man3/qaxscript.3
+lib/qt3/man/man3/qaxscriptengine.3
+lib/qt3/man/man3/qaxscriptmanager.3
 lib/qt3/man/man3/qaxwidget.3
 lib/qt3/man/man3/qbig5codec.3
 lib/qt3/man/man3/qbig5hkscscodec.3
@@ -970,6 +983,7 @@ lib/qt3/man/man3/qhttpheader.3
 lib/qt3/man/man3/qhttprequestheader.3
 lib/qt3/man/man3/qhttpresponseheader.3
 lib/qt3/man/man3/qicondrag.3
+lib/qt3/man/man3/qicondragevent.3
 lib/qt3/man/man3/qicondragitem.3
 lib/qt3/man/man3/qiconfactory.3
 lib/qt3/man/man3/qiconset.3
@@ -1010,6 +1024,7 @@ lib/qt3/man/man3/qlistboxtext.3
 lib/qt3/man/man3/qlistview.3
 lib/qt3/man/man3/qlistviewitem.3
 lib/qt3/man/man3/qlistviewitemiterator.3
+lib/qt3/man/man3/qlocale.3
 lib/qt3/man/man3/qlocalfs.3
 lib/qt3/man/man3/qmacmime.3
 lib/qt3/man/man3/qmacstyle.3
@@ -1059,6 +1074,7 @@ lib/qt3/man/man3/qpixmap.3
 lib/qt3/man/man3/qpixmapcache.3
 lib/qt3/man/man3/qplatinumstyle.3
 lib/qt3/man/man3/qpngimagepacker.3
+lib/qt3/man/man3/qpocketpcstyle.3
 lib/qt3/man/man3/qpoint.3
 lib/qt3/man/man3/qpointarray.3
 lib/qt3/man/man3/qpopupmenu.3
@@ -1220,6 +1236,8 @@ lib/qt3/man/man3/qxmlnamespacesupport.3
 lib/qt3/man/man3/qxmlparseexception.3
 lib/qt3/man/man3/qxmlreader.3
 lib/qt3/man/man3/qxmlsimplereader.3
+lib/qt3/mkspecs/aix-g++-64/qmake.conf
+lib/qt3/mkspecs/aix-g++-64/qplatformdefs.h
 lib/qt3/mkspecs/aix-g++/qmake.conf
 lib/qt3/mkspecs/aix-g++/qplatformdefs.h
 lib/qt3/mkspecs/aix-xlc-64/qmake.conf
@@ -1237,6 +1255,8 @@ lib/qt3/mkspecs/dgux-g++/qmake.conf
 lib/qt3/mkspecs/dgux-g++/qplatformdefs.h
 lib/qt3/mkspecs/freebsd-g++/qmake.conf
 lib/qt3/mkspecs/freebsd-g++/qplatformdefs.h
+lib/qt3/mkspecs/freebsd-icc/qmake.conf
+lib/qt3/mkspecs/freebsd-icc/qplatformdefs.h
 lib/qt3/mkspecs/hpux-acc-64/qmake.conf
 lib/qt3/mkspecs/hpux-acc-64/qplatformdefs.h
 lib/qt3/mkspecs/hpux-acc-o64/qmake.conf
@@ -1265,6 +1285,10 @@ lib/qt3/mkspecs/irix-g++/qmake.conf
 lib/qt3/mkspecs/irix-g++/qplatformdefs.h
 lib/qt3/mkspecs/linux-cxx/qmake.conf
 lib/qt3/mkspecs/linux-cxx/qplatformdefs.h
+lib/qt3/mkspecs/linux-ecc-64/qmake.conf
+lib/qt3/mkspecs/linux-ecc-64/qplatformdefs.h
+lib/qt3/mkspecs/linux-g++-64/qmake.conf
+lib/qt3/mkspecs/linux-g++-64/qplatformdefs.h
 lib/qt3/mkspecs/linux-g++/qmake.conf
 lib/qt3/mkspecs/linux-g++/qplatformdefs.h
 lib/qt3/mkspecs/linux-icc/qmake.conf
@@ -1321,6 +1345,7 @@ lib/qt3/mkspecs/win32-borland/qmake.conf
 lib/qt3/mkspecs/win32-borland/qplatformdefs.h
 lib/qt3/mkspecs/win32-g++/qmake.conf
 lib/qt3/mkspecs/win32-g++/qplatformdefs.h
+lib/qt3/mkspecs/win32-g++/qtcrtentrypoint.cpp
 lib/qt3/mkspecs/win32-icc/qmake.conf
 lib/qt3/mkspecs/win32-icc/qplatformdefs.h
 lib/qt3/mkspecs/win32-icc/win32app.dsp
@@ -1369,6 +1394,8 @@ share/doc/qt3/changes-3.${VERSION}
 @dirrm lib/qt3/mkspecs/linux-kcc
 @dirrm lib/qt3/mkspecs/linux-icc
 @dirrm lib/qt3/mkspecs/linux-g++
+@dirrm lib/qt3/mkspecs/linux-g++-64
+@dirrm lib/qt3/mkspecs/linux-ecc-64
 @dirrm lib/qt3/mkspecs/linux-cxx
 @dirrm lib/qt3/mkspecs/irix-g++
 @dirrm lib/qt3/mkspecs/irix-cc-o32
@@ -1383,6 +1410,7 @@ share/doc/qt3/changes-3.${VERSION}
 @dirrm lib/qt3/mkspecs/hpux-acc-o64
 @dirrm lib/qt3/mkspecs/hpux-acc-64
 @dirrm lib/qt3/mkspecs/hpux-acc
+@dirrm lib/qt3/mkspecs/freebsd-icc
 @dirrm lib/qt3/mkspecs/freebsd-g++
 @dirrm lib/qt3/mkspecs/dgux-g++
 @dirrm lib/qt3/mkspecs/darwin-g++
@@ -1391,6 +1419,7 @@ share/doc/qt3/changes-3.${VERSION}
 @dirrm lib/qt3/mkspecs/aix-xlc-64
 @dirrm lib/qt3/mkspecs/aix-xlc
 @dirrm lib/qt3/mkspecs/aix-g++
+@dirrm lib/qt3/mkspecs/aix-g++-64
 @dirrm lib/qt3/mkspecs
 @dirrm lib/qt3/man/man3
 @dirrm lib/qt3/man/man1

x11/qt3/pkg/PLIST-examples

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-examples,v 1.5 2003/04/05 14:45:19 espie Exp $
+@comment $OpenBSD: PLIST-examples,v 1.6 2004/07/22 23:03:09 brad Exp $
 lib/qt3/examples/Makefile
 lib/qt3/examples/README
 lib/qt3/examples/aclock/Makefile
@@ -47,6 +47,7 @@ lib/qt3/examples/application/fileprint.xpm
 lib/qt3/examples/application/filesave.xpm
 lib/qt3/examples/application/main.cpp
 lib/qt3/examples/biff/Makefile
+lib/qt3/examples/biff/biff
 lib/qt3/examples/biff/biff.cpp
 lib/qt3/examples/biff/biff.doc
 lib/qt3/examples/biff/biff.h
@@ -150,9 +151,11 @@ lib/qt3/examples/dclock/dclock.h
 lib/qt3/examples/dclock/dclock.pro
 lib/qt3/examples/dclock/main.cpp
 lib/qt3/examples/demo/Makefile
+lib/qt3/examples/demo/categoryinterface.h
 lib/qt3/examples/demo/demo
 lib/qt3/examples/demo/demo.doc
 lib/qt3/examples/demo/demo.pro
+lib/qt3/examples/demo/demo_pch.h
 lib/qt3/examples/demo/display.cpp
 lib/qt3/examples/demo/display.h
 lib/qt3/examples/demo/dnd/dnd.cpp
@@ -190,6 +193,9 @@ lib/qt3/examples/demo/opengl/glcontrolwidget.cpp
 lib/qt3/examples/demo/opengl/glcontrolwidget.h
 lib/qt3/examples/demo/opengl/glgear.cpp
 lib/qt3/examples/demo/opengl/glgear.h
+lib/qt3/examples/demo/opengl/glinfo.h
+lib/qt3/examples/demo/opengl/glinfo_x11.cpp
+lib/qt3/examples/demo/opengl/glinfotext.h
 lib/qt3/examples/demo/opengl/gllandscape.cpp
 lib/qt3/examples/demo/opengl/gllandscape.h
 lib/qt3/examples/demo/opengl/gllandscapeviewer.ui
@@ -203,6 +209,7 @@ lib/qt3/examples/demo/opengl/nurbs.xpm
 lib/qt3/examples/demo/opengl/printpreview.ui
 lib/qt3/examples/demo/opengl/printpreview.ui.h
 lib/qt3/examples/demo/opengl/qtlogo.bmp
+lib/qt3/examples/demo/opengl/qtlogo.png
 lib/qt3/examples/demo/opengl/snapshot.xpm
 lib/qt3/examples/demo/opengl/texture.xpm
 lib/qt3/examples/demo/opengl/wirebox.xpm
@@ -420,6 +427,8 @@ lib/qt3/examples/demo/textdrawing/textleft.png
 lib/qt3/examples/demo/textdrawing/textright.png
 lib/qt3/examples/demo/textdrawing/textunderline.png
 lib/qt3/examples/demo/textdrawing/undo.png
+lib/qt3/examples/demo/translations/demo_ar.qm
+lib/qt3/examples/demo/translations/demo_ar.ts
 lib/qt3/examples/demo/translations/demo_de.qm
 lib/qt3/examples/demo/translations/demo_de.ts
 lib/qt3/examples/demo/translations/demo_fr.qm
@@ -432,6 +441,7 @@ lib/qt3/examples/demo/widgets/widgetsbase_pro.ui
 lib/qt3/examples/demo/widgets/widgetsbase_pro.ui.h
 lib/qt3/examples/desktop/Makefile
 lib/qt3/examples/desktop/README
+lib/qt3/examples/desktop/desktop
 lib/qt3/examples/desktop/desktop.cpp
 lib/qt3/examples/desktop/desktop.doc
 lib/qt3/examples/desktop/desktop.pro
@@ -442,6 +452,13 @@ lib/qt3/examples/dirview/dirview.doc
 lib/qt3/examples/dirview/dirview.h
 lib/qt3/examples/dirview/dirview.pro
 lib/qt3/examples/dirview/main.cpp
+lib/qt3/examples/distributor/Makefile
+lib/qt3/examples/distributor/distributor
+lib/qt3/examples/distributor/distributor.doc
+lib/qt3/examples/distributor/distributor.pro
+lib/qt3/examples/distributor/distributor.ui
+lib/qt3/examples/distributor/distributor.ui.h
+lib/qt3/examples/distributor/main.cpp
 lib/qt3/examples/dragdrop/Makefile
 lib/qt3/examples/dragdrop/dragdrop
 lib/qt3/examples/dragdrop/dragdrop.doc
@@ -513,6 +530,31 @@ lib/qt3/examples/hello/hello.doc
 lib/qt3/examples/hello/hello.h
 lib/qt3/examples/hello/hello.pro
 lib/qt3/examples/hello/main.cpp
+lib/qt3/examples/helpdemo/Makefile
+lib/qt3/examples/helpdemo/about.txt
+lib/qt3/examples/helpdemo/doc/handbook.png
+lib/qt3/examples/helpdemo/doc/helpdemo.adp
+lib/qt3/examples/helpdemo/doc/index.html
+lib/qt3/examples/helpdemo/doc/logo.png
+lib/qt3/examples/helpdemo/doc/manual.html
+lib/qt3/examples/helpdemo/helpdemo
+lib/qt3/examples/helpdemo/helpdemo.cpp
+lib/qt3/examples/helpdemo/helpdemo.h
+lib/qt3/examples/helpdemo/helpdemo.pro
+lib/qt3/examples/helpdemo/helpdemobase.ui
+lib/qt3/examples/helpdemo/main.cpp
+lib/qt3/examples/helpsystem/Makefile
+lib/qt3/examples/helpsystem/appicon.png
+lib/qt3/examples/helpsystem/helpsystem
+lib/qt3/examples/helpsystem/helpsystem.doc
+lib/qt3/examples/helpsystem/helpsystem.pro
+lib/qt3/examples/helpsystem/main.cpp
+lib/qt3/examples/helpsystem/mainwindow.cpp
+lib/qt3/examples/helpsystem/mainwindow.h
+lib/qt3/examples/helpsystem/tooltip.cpp
+lib/qt3/examples/helpsystem/tooltip.h
+lib/qt3/examples/helpsystem/whatsthis.cpp
+lib/qt3/examples/helpsystem/whatsthis.h
 lib/qt3/examples/helpviewer/Makefile
 lib/qt3/examples/helpviewer/back.xpm
 lib/qt3/examples/helpviewer/forward.xpm
@@ -531,6 +573,8 @@ lib/qt3/examples/i18n/i18n.pro
 lib/qt3/examples/i18n/main.cpp
 lib/qt3/examples/i18n/mywidget.cpp
 lib/qt3/examples/i18n/mywidget.h
+lib/qt3/examples/i18n/mywidget_ar.qm
+lib/qt3/examples/i18n/mywidget_ar.ts
 lib/qt3/examples/i18n/mywidget_cs.qm
 lib/qt3/examples/i18n/mywidget_cs.ts
 lib/qt3/examples/i18n/mywidget_de.qm
@@ -628,13 +672,18 @@ lib/qt3/examples/menu/menu.doc
 lib/qt3/examples/menu/menu.h
 lib/qt3/examples/menu/menu.pro
 lib/qt3/examples/movies/Makefile
-lib/qt3/examples/movies/README
 lib/qt3/examples/movies/fire.mng
 lib/qt3/examples/movies/main.cpp
 lib/qt3/examples/movies/movies
 lib/qt3/examples/movies/movies.doc
 lib/qt3/examples/movies/movies.pro
 lib/qt3/examples/movies/trolltech.gif
+lib/qt3/examples/network/archivesearch/Makefile
+lib/qt3/examples/network/archivesearch/archivedialog.ui
+lib/qt3/examples/network/archivesearch/archivedialog.ui.h
+lib/qt3/examples/network/archivesearch/archivesearch.doc
+lib/qt3/examples/network/archivesearch/archivesearch.pro
+lib/qt3/examples/network/archivesearch/main.cpp
 lib/qt3/examples/network/clientserver/client/Makefile
 lib/qt3/examples/network/clientserver/client/client.cpp
 lib/qt3/examples/network/clientserver/client/client.pro
@@ -861,6 +910,13 @@ lib/qt3/examples/rangecontrols/rangecontrols.cpp
 lib/qt3/examples/rangecontrols/rangecontrols.doc
 lib/qt3/examples/rangecontrols/rangecontrols.h
 lib/qt3/examples/rangecontrols/rangecontrols.pro
+lib/qt3/examples/regexptester/Makefile
+lib/qt3/examples/regexptester/main.cpp
+lib/qt3/examples/regexptester/regexptester
+lib/qt3/examples/regexptester/regexptester.cpp
+lib/qt3/examples/regexptester/regexptester.doc
+lib/qt3/examples/regexptester/regexptester.h
+lib/qt3/examples/regexptester/regexptester.pro
 lib/qt3/examples/richtext/Makefile
 lib/qt3/examples/richtext/main.cpp
 lib/qt3/examples/richtext/marble.png
@@ -1147,6 +1203,13 @@ lib/qt3/examples/tooltip/tooltip.cpp
 lib/qt3/examples/tooltip/tooltip.doc
 lib/qt3/examples/tooltip/tooltip.h
 lib/qt3/examples/tooltip/tooltip.pro
+lib/qt3/examples/toplevel/Makefile
+lib/qt3/examples/toplevel/main.cpp
+lib/qt3/examples/toplevel/options.ui
+lib/qt3/examples/toplevel/options.ui.h
+lib/qt3/examples/toplevel/toplevel
+lib/qt3/examples/toplevel/toplevel.doc
+lib/qt3/examples/toplevel/toplevel.pro
 lib/qt3/examples/tux/Makefile
 lib/qt3/examples/tux/tux
 lib/qt3/examples/tux/tux.cpp
@@ -1316,6 +1379,7 @@ lib/qt3/tutorial/tutorial.pro
 @dirrm lib/qt3/examples/wizard
 @dirrm lib/qt3/examples/widgets
 @dirrm lib/qt3/examples/tux
+@dirrm lib/qt3/examples/toplevel
 @dirrm lib/qt3/examples/tooltip
 @dirrm lib/qt3/examples/tictac
 @dirrm lib/qt3/examples/thread/semaphores
@@ -1369,6 +1433,7 @@ lib/qt3/tutorial/tutorial.pro
 @dirrm lib/qt3/examples/scribble
 @dirrm lib/qt3/examples/rot13
 @dirrm lib/qt3/examples/richtext
+@dirrm lib/qt3/examples/regexptester
 @dirrm lib/qt3/examples/rangecontrols
 @dirrm lib/qt3/examples/qwerty
 @dirrm lib/qt3/examples/qtl
@@ -1404,6 +1469,7 @@ lib/qt3/tutorial/tutorial.pro
 @dirrm lib/qt3/examples/network/clientserver/server
 @dirrm lib/qt3/examples/network/clientserver/client
 @dirrm lib/qt3/examples/network/clientserver
+@dirrm lib/qt3/examples/network/archivesearch
 @dirrm lib/qt3/examples/network
 @dirrm lib/qt3/examples/movies
 @dirrm lib/qt3/examples/menu
@@ -1418,6 +1484,8 @@ lib/qt3/tutorial/tutorial.pro
 @dirrm lib/qt3/examples/iconview
 @dirrm lib/qt3/examples/i18n
 @dirrm lib/qt3/examples/helpviewer
+@dirrm lib/qt3/examples/helpsystem
+@dirrm lib/qt3/examples/helpdemo
 @dirrm lib/qt3/examples/hello
 @dirrm lib/qt3/examples/gridview
 @dirrm lib/qt3/examples/forever
@@ -1428,6 +1496,7 @@ lib/qt3/tutorial/tutorial.pro
 @dirrm lib/qt3/examples/drawlines
 @dirrm lib/qt3/examples/drawdemo
 @dirrm lib/qt3/examples/dragdrop
+@dirrm lib/qt3/examples/distributor
 @dirrm lib/qt3/examples/dirview
 @dirrm lib/qt3/examples/desktop
 @dirrm lib/qt3/examples/demo/widgets

x11/qt3/pkg/PLIST-html

@@ -1,11 +1,16 @@
-@comment $OpenBSD: PLIST-html,v 1.9 2004/01/08 01:20:13 brad Exp $
+@comment $OpenBSD: PLIST-html,v 1.10 2004/07/22 23:03:10 brad Exp $
 share/doc/qt3/html/3rdparty.html
 share/doc/qt3/html/aboutqt.html
 share/doc/qt3/html/abstract-connections.png
 share/doc/qt3/html/abstractwidgets.html
 share/doc/qt3/html/accelerators.html
 share/doc/qt3/html/aclock-example.html
+share/doc/qt3/html/activeqt-dotnet.html
 share/doc/qt3/html/activeqt-examples.html
+share/doc/qt3/html/activeqt-tools-dumpdoc.html
+share/doc/qt3/html/activeqt-tools-idc.html
+share/doc/qt3/html/activeqt-tools-testcon.html
+share/doc/qt3/html/activeqt-tools.html
 share/doc/qt3/html/activeqt.html
 share/doc/qt3/html/addressbook-example.html
 share/doc/qt3/html/advanced.html
@@ -385,10 +390,8 @@ share/doc/qt3/html/qaxbindable-h.html
 share/doc/qt3/html/qaxbindable-members.html
 share/doc/qt3/html/qaxbindable.html
 share/doc/qt3/html/qaxcontainer-example-qutlook.html
-share/doc/qt3/html/qaxcontainer-example-testcon.html
 share/doc/qt3/html/qaxcontainer-example-webbrowser.html
 share/doc/qt3/html/qaxcontainer-examples.html
-share/doc/qt3/html/qaxcontainer-faq.html
 share/doc/qt3/html/qaxcontainer.html
 share/doc/qt3/html/qaxfactory-h.html
 share/doc/qt3/html/qaxfactory-members.html
@@ -396,6 +399,13 @@ share/doc/qt3/html/qaxfactory.html
 share/doc/qt3/html/qaxobject-h.html
 share/doc/qt3/html/qaxobject-members.html
 share/doc/qt3/html/qaxobject.html
+share/doc/qt3/html/qaxscript-h.html
+share/doc/qt3/html/qaxscript-members.html
+share/doc/qt3/html/qaxscript.html
+share/doc/qt3/html/qaxscriptengine-members.html
+share/doc/qt3/html/qaxscriptengine.html
+share/doc/qt3/html/qaxscriptmanager-members.html
+share/doc/qt3/html/qaxscriptmanager.html
 share/doc/qt3/html/qaxserver-demo-hierarchy.html
 share/doc/qt3/html/qaxserver-demo-menus.html
 share/doc/qt3/html/qaxserver-demo-multiple.html
@@ -411,7 +421,6 @@ share/doc/qt3/html/qaxserver-example-simple.html
 share/doc/qt3/html/qaxserver-example-tetrax.html
 share/doc/qt3/html/qaxserver-example-wrapper.html
 share/doc/qt3/html/qaxserver-examples.html
-share/doc/qt3/html/qaxserver-faq.html
 share/doc/qt3/html/qaxserver.html
 share/doc/qt3/html/qaxwidget-h.html
 share/doc/qt3/html/qaxwidget-members.html
@@ -570,6 +579,7 @@ share/doc/qt3/html/qd-helptoolbuttons3.png
 share/doc/qt3/html/qd-mainwinwzd.png
 share/doc/qt3/html/qd-mainwinwzdpage2.png
 share/doc/qt3/html/qd-preface.png
+share/doc/qt3/html/qd-preferences-dlg.png
 share/doc/qt3/html/qdatabrowser-h.html
 share/doc/qt3/html/qdatabrowser-members.html
 share/doc/qt3/html/qdatabrowser.html
@@ -838,6 +848,8 @@ share/doc/qt3/html/qhttpresponseheader-members.html
 share/doc/qt3/html/qhttpresponseheader.html
 share/doc/qt3/html/qicondrag-members.html
 share/doc/qt3/html/qicondrag.html
+share/doc/qt3/html/qicondragevent-members.html
+share/doc/qt3/html/qicondragevent.html
 share/doc/qt3/html/qicondragitem-members.html
 share/doc/qt3/html/qicondragitem.html
 share/doc/qt3/html/qiconfactory-members.html
@@ -955,6 +967,9 @@ share/doc/qt3/html/qlistviewitem.html
 share/doc/qt3/html/qlistviewitemiterator-members.html
 share/doc/qt3/html/qlistviewitemiterator.html
 share/doc/qt3/html/qlistviewitems.png
+share/doc/qt3/html/qlocale-h.html
+share/doc/qt3/html/qlocale-members.html
+share/doc/qt3/html/qlocale.html
 share/doc/qt3/html/qlocalfs-h.html
 share/doc/qt3/html/qlocalfs-members.html
 share/doc/qt3/html/qlocalfs.html
@@ -977,6 +992,7 @@ share/doc/qt3/html/qmake-manual-4.html
 share/doc/qt3/html/qmake-manual-5.html
 share/doc/qt3/html/qmake-manual-6.html
 share/doc/qt3/html/qmake-manual-7.html
+share/doc/qt3/html/qmake-manual-8.html
 share/doc/qt3/html/qmake-manual.html
 share/doc/qt3/html/qmake.dcf
 share/doc/qt3/html/qmap-h.html
@@ -1118,6 +1134,9 @@ share/doc/qt3/html/qplatinumstyle.html
 share/doc/qt3/html/qpngimagepacker-members.html
 share/doc/qt3/html/qpngimagepacker.html
 share/doc/qt3/html/qpngio-h.html
+share/doc/qt3/html/qpocketpcstyle-members.html
+share/doc/qt3/html/qpocketpcstyle.html
+share/doc/qt3/html/qpocketpcstyle_wce-h.html
 share/doc/qt3/html/qpoint-h.html
 share/doc/qt3/html/qpoint-members.html
 share/doc/qt3/html/qpoint.html
@@ -1397,7 +1416,7 @@ share/doc/qt3/html/qt-members.html
 share/doc/qt3/html/qt-template-lib.html
 share/doc/qt3/html/qt.dcf
 share/doc/qt3/html/qt.html
-share/doc/qt3/html/qt32-class-chart.png
+share/doc/qt3/html/qt33-class-chart.png
 share/doc/qt3/html/qtab-members.html
 share/doc/qt3/html/qtab.html
 share/doc/qt3/html/qtabbar-h.html
@@ -1473,6 +1492,7 @@ share/doc/qt3/html/qtimerevent-members.html
 share/doc/qt3/html/qtimerevent.html
 share/doc/qt3/html/qtl-qvaluelist-example.html
 share/doc/qt3/html/qtl.html
+share/doc/qt3/html/qtmac-as-native.html
 share/doc/qt3/html/qtoolbar-h.html
 share/doc/qt3/html/qtoolbar-members.html
 share/doc/qt3/html/qtoolbar.html
@@ -1656,7 +1676,6 @@ share/doc/qt3/html/rd-image.png
 share/doc/qt3/html/rd-open.png
 share/doc/qt3/html/rd-pagetitle.png
 share/doc/qt3/html/rd-prefedit1.png
-share/doc/qt3/html/rd-prefgen1.png
 share/doc/qt3/html/rd-projset.png
 share/doc/qt3/html/rd-projset2.png
 share/doc/qt3/html/rd-replace.png
@@ -1671,6 +1690,7 @@ share/doc/qt3/html/rd-template.png
 share/doc/qt3/html/rd-text.png
 share/doc/qt3/html/rd-title.png
 share/doc/qt3/html/rd-tunepalette.png
+share/doc/qt3/html/regexptester-example.html
 share/doc/qt3/html/removed20.html
 share/doc/qt3/html/richtext-example.html
 share/doc/qt3/html/rintersect.png