Update to Qt 3.3.4, introduce MASTER_SITE_QT.

Approved by:	maintainer (for qmake)

18 files changed, 43 insertions, 122 deletions

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index a95cce1e423d..287ae388c5fa 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -890,6 +890,16 @@ MASTER_SITE_PYTHON+= \
 	http://mirrors.ccs.neu.edu/Python/pub/www.python.org/%SUBDIR%/ \
 	http://shattered.teched.net/www.python.org/%SUBDIR%/
 
+MASTER_SITE_QT+= \
+	ftp://sunsite.rediris.es/mirror/Qt/source/%SUBDIR%/ \
+	ftp://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/sources/%SUBDIR%/ \
+	ftp://ftp.ntua.gr/pub/X11/Qt/qt/source/%SUBDIR%/ \
+	ftp://ftp.tu-chemnitz.de/pub/Qt/source/%SUBDIR%/ \
+	ftp://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/%SUBDIR%/ \
+	ftp://ftp.planetmirror.com.au/pub/trolltech/qt/source/%SUBDIR%/ \
+	ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/%SUBDIR%/ \
+	ftp://ftp.trolltech.com/qt/source/%SUBDIR%/
+
 MASTER_SITE_REDHAT_LINUX+= \
 	http://mirrors.usc.edu/pub/linux/distributions/redhat/redhat/linux/%SUBDIR%/ \
 	http://www.gtlib.cc.gatech.edu/pub/redhat/linux/%SUBDIR%/ \
diff --git a/databases/qt-ibase-plugin/Makefile b/databases/qt-ibase-plugin/Makefile
index 220313e03d23..0dbfe03c4bbd 100644
--- a/databases/qt-ibase-plugin/Makefile
+++ b/databases/qt-ibase-plugin/Makefile
@@ -7,12 +7,9 @@
 #
 
 PORTNAME=	qt-${DB}-plugin
-PORTVERSION=	3.3.3
+PORTVERSION=	3.3.4
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/      \
-		ftp://ftp.silug.org/pub/qt/             \
-		ftp://ftp.bero.org/pub/qt/              \
-		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
+MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
diff --git a/databases/qt-ibase-plugin/distinfo b/databases/qt-ibase-plugin/distinfo
index f04333a7557c..a75bf1962bb1 100644
--- a/databases/qt-ibase-plugin/distinfo
+++ b/databases/qt-ibase-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
-SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
+MD5 (KDE/qt-x11-free-3.3.4.tar.bz2) = 027f4e82fbe592b39d2f160bfb3a73af
+SIZE (KDE/qt-x11-free-3.3.4.tar.bz2) = 14439722
diff --git a/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile
index 32eac3aa6898..fb03151669d3 100644
--- a/databases/qt-mysql-plugin/Makefile
+++ b/databases/qt-mysql-plugin/Makefile
@@ -7,12 +7,9 @@
 #
 
 PORTNAME=	qt-${DB}-plugin
-PORTVERSION=	3.3.3
+PORTVERSION=	3.3.4
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/      \
-		ftp://ftp.silug.org/pub/qt/             \
-		ftp://ftp.bero.org/pub/qt/              \
-		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
+MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
diff --git a/databases/qt-mysql-plugin/distinfo b/databases/qt-mysql-plugin/distinfo
index f04333a7557c..a75bf1962bb1 100644
--- a/databases/qt-mysql-plugin/distinfo
+++ b/databases/qt-mysql-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
-SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
+MD5 (KDE/qt-x11-free-3.3.4.tar.bz2) = 027f4e82fbe592b39d2f160bfb3a73af
+SIZE (KDE/qt-x11-free-3.3.4.tar.bz2) = 14439722
diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile
index 66fcab25c591..64d07853460e 100644
--- a/databases/qt-odbc-plugin/Makefile
+++ b/databases/qt-odbc-plugin/Makefile
@@ -7,12 +7,9 @@
 #
 
 PORTNAME=	qt-${DB}-plugin
-PORTVERSION=	3.3.3
+PORTVERSION=	3.3.4
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/      \
-		ftp://ftp.silug.org/pub/qt/             \
-		ftp://ftp.bero.org/pub/qt/              \
-		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
+MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
diff --git a/databases/qt-odbc-plugin/distinfo b/databases/qt-odbc-plugin/distinfo
index f04333a7557c..a75bf1962bb1 100644
--- a/databases/qt-odbc-plugin/distinfo
+++ b/databases/qt-odbc-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
-SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
+MD5 (KDE/qt-x11-free-3.3.4.tar.bz2) = 027f4e82fbe592b39d2f160bfb3a73af
+SIZE (KDE/qt-x11-free-3.3.4.tar.bz2) = 14439722
diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile
index 5c01fa9e0bf1..f20b6a99e1d4 100644
--- a/databases/qt-pgsql-plugin/Makefile
+++ b/databases/qt-pgsql-plugin/Makefile
@@ -7,13 +7,9 @@
 #
 
 PORTNAME=	qt-${DB}-plugin
-PORTVERSION=	3.3.3
-PORTREVISION=	1
+PORTVERSION=	3.3.4
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/      \
-		ftp://ftp.silug.org/pub/qt/             \
-		ftp://ftp.bero.org/pub/qt/              \
-		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
+MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
diff --git a/databases/qt-pgsql-plugin/distinfo b/databases/qt-pgsql-plugin/distinfo
index f04333a7557c..a75bf1962bb1 100644
--- a/databases/qt-pgsql-plugin/distinfo
+++ b/databases/qt-pgsql-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
-SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
+MD5 (KDE/qt-x11-free-3.3.4.tar.bz2) = 027f4e82fbe592b39d2f160bfb3a73af
+SIZE (KDE/qt-x11-free-3.3.4.tar.bz2) = 14439722
diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile
index 17a9c386ba03..23e331fecf4c 100644
--- a/databases/qt-sqlite-plugin/Makefile
+++ b/databases/qt-sqlite-plugin/Makefile
@@ -7,13 +7,9 @@
 #
 
 PORTNAME=	qt-${DB}-plugin
-PORTVERSION=	3.3.3
-PORTREVISION=	1
+PORTVERSION=	3.3.4
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/      \
-		ftp://ftp.silug.org/pub/qt/             \
-		ftp://ftp.bero.org/pub/qt/              \
-		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
+MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
diff --git a/databases/qt-sqlite-plugin/distinfo b/databases/qt-sqlite-plugin/distinfo
index f04333a7557c..a75bf1962bb1 100644
--- a/databases/qt-sqlite-plugin/distinfo
+++ b/databases/qt-sqlite-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
-SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
+MD5 (KDE/qt-x11-free-3.3.4.tar.bz2) = 027f4e82fbe592b39d2f160bfb3a73af
+SIZE (KDE/qt-x11-free-3.3.4.tar.bz2) = 14439722
diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile
index bd9747f04073..60cc589cdd17 100644
--- a/devel/qmake/Makefile
+++ b/devel/qmake/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qmake
-PORTVERSION=	3.3.3
-PORTREVISION=	1
+PORTVERSION=	3.3.4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/	\
 		ftp://ftp.silug.org/pub/qt/		\
diff --git a/devel/qmake/distinfo b/devel/qmake/distinfo
index f04333a7557c..a75bf1962bb1 100644
--- a/devel/qmake/distinfo
+++ b/devel/qmake/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
-SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
+MD5 (KDE/qt-x11-free-3.3.4.tar.bz2) = 027f4e82fbe592b39d2f160bfb3a73af
+SIZE (KDE/qt-x11-free-3.3.4.tar.bz2) = 14439722
diff --git a/devel/qsa/Makefile b/devel/qsa/Makefile
index 250d55038c6e..a9989ffea773 100644
--- a/devel/qsa/Makefile
+++ b/devel/qsa/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	qsa
 PORTVERSION=	1.1.2
 CATEGORIES=	devel lang
-MASTER_SITES=	ftp://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qsa/source/  \
-		ftp://ftp.trolltech.com/qsa/source/
+MASTER_SITES=	${MASTER_SITE_QT}
+MASTER_SITE_SUBDIR=../../qsa/source
 DISTNAME=	${PORTNAME}-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 17089fe57cd0..411d6ac9915b 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -7,17 +7,9 @@
 #
 
 PORTNAME=	qt
-PORTVERSION=	3.3.3
-PORTREVISION=	3
+PORTVERSION=	3.3.4
 CATEGORIES?=	x11-toolkits ipv6
-MASTER_SITES=	ftp://sunsite.rediris.es/mirror/Qt/source/ \
-		ftp://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/sources/	\
-		ftp://ftp.ntua.gr/pub/X11/Qt/qt/source/		\
-		ftp://ftp.tu-chemnitz.de/pub/Qt/source/ \
-		ftp://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/ \
-		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/source/ \
-		ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/ \
-		ftp://ftp.trolltech.com/qt/source/
+MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo
index f04333a7557c..a75bf1962bb1 100644
--- a/x11-toolkits/qt33/distinfo
+++ b/x11-toolkits/qt33/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
-SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
+MD5 (KDE/qt-x11-free-3.3.4.tar.bz2) = 027f4e82fbe592b39d2f160bfb3a73af
+SIZE (KDE/qt-x11-free-3.3.4.tar.bz2) = 14439722
diff --git a/x11-toolkits/qt33/files/patch-src-kernel-qrichtext.cpp b/x11-toolkits/qt33/files/patch-src-kernel-qrichtext.cpp
deleted file mode 100644
index 336b0c18a417..000000000000
--- a/x11-toolkits/qt33/files/patch-src-kernel-qrichtext.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/kernel/qrichtext.cpp	2004/08/11 14:21:12	1.68
-+++ src/kernel/qrichtext.cpp	2004/09/07 09:10:27	1.71
-@@ -3801,6 +3801,7 @@ void QTextString::checkBidi() const
- 
-     // determines the properties we need for layouting
-     QTextEngine textEngine( toString(), 0 );
-+    textEngine.direction = (QChar::Direction) dir;
-     textEngine.itemize(QTextEngine::SingleLine);
-     const QCharAttributes *ca = textEngine.attributes() + length-1;
-     QTextStringChar *ch = (QTextStringChar *)end - 1;
-@@ -3835,7 +3836,7 @@ void QTextString::checkBidi() const
-     } else if ( dir == QChar::DirL ) {
- 	that->rightToLeft = FALSE;
-     } else {
--	that->rightToLeft = (textEngine.items[0].analysis.bidiLevel % 2);
-+	that->rightToLeft = (textEngine.direction == QChar::DirR);
-     }
- }
- 
-@@ -4510,6 +4510,8 @@ void QTextParagraph::paint( QPainter &pa
- 	fullSelectionWidth = (hasdoc ? document()->width() : r.width());
- 
-     QString qstr = str->toString();
-+    // detach string
-+    qstr.setLength(qstr.length());
-     // ### workaround so that \n are not drawn, actually this should
-     // be fixed in QFont somewhere (under Windows you get ugly boxes
-     // otherwise)
-@@ -5310,7 +5312,7 @@ QTextLineStart *QTextFormatter::formatLi
- #endif
- 
- // collects one line of the paragraph and transforms it to visual order
--QTextLineStart *QTextFormatter::bidiReorderLine( QTextParagraph * /*parag*/, QTextString *text, QTextLineStart *line,
-+QTextLineStart *QTextFormatter::bidiReorderLine( QTextParagraph * parag, QTextString *text, QTextLineStart *line,
- 							QTextStringChar *startChar, QTextStringChar *lastChar, int align, int space )
- {
-     // ignore white space at the end of the line.
-@@ -5404,6 +5406,7 @@ QTextLineStart *QTextFormatter::bidiReor
- 	}
- 
-  	ch->x = x + toAdd;
-+	ch->rightToLeft = ch->bidiLevel % 2;
- 	//qDebug("visual: %d (%p) placed at %d rightToLeft=%d", visual[i], ch, x +toAdd, ch->rightToLeft  );
- 	int ww = 0;
- 	if ( ch->c.unicode() >= 32 || ch->c == '\t' || ch->c == '\n' || ch->isCustom() ) {
-@@ -5419,12 +5422,14 @@ QTextLineStart *QTextFormatter::bidiReor
-     while ( endSpaces-- ) {
- 	++lastChar;
- 	int sw = lastChar->format()->width( ' ' );
--	if ( lastChar->rightToLeft ) {
-+	if ( text->isRightToLeft() ) {
- 	    xorig -= sw;
- 	    lastChar->x = xorig;
-+	    ch->rightToLeft = TRUE;
- 	} else {
- 	    lastChar->x = x;
- 	    x += sw;
-+	    ch->rightToLeft = FALSE;
- 	}
-     }
- 
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 3349196acff9..2bd917f9b021 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -415,7 +415,7 @@ lib/libqt-mt.prl
 lib/libqt-mt.so
 lib/libqt-mt.so.3
 lib/libqt-mt.so.3.3
-lib/libqt-mt.so.3.3.3
+lib/libqt-mt.so.3.3.4
 lib/libqui.prl
 lib/libqui.so
 lib/libqui.so.1
@@ -600,7 +600,6 @@ share/doc/qt/html/finddialog.png
 share/doc/qt/html/focus.html
 share/doc/qt/html/forever-example.html
 share/doc/qt/html/frames.png
-share/doc/qt/html/freeeditions.html
 share/doc/qt/html/ftpclient-example.html
 share/doc/qt/html/functions.html
 share/doc/qt/html/general.png
@@ -740,6 +739,7 @@ share/doc/qt/html/opengl-sharedbox-example.html
 share/doc/qt/html/opengl-texture-example.html
 share/doc/qt/html/opengl-x11-overlays.html
 share/doc/qt/html/opengl.html
+share/doc/qt/html/opensourceedition.html
 share/doc/qt/html/organizers.html
 share/doc/qt/html/outliner-example.html
 share/doc/qt/html/overviews-list.html
@@ -1563,9 +1563,6 @@ share/doc/qt/html/qplatinumstyle.html
 share/doc/qt/html/qpngimagepacker-members.html
 share/doc/qt/html/qpngimagepacker.html
 share/doc/qt/html/qpngio-h.html
-share/doc/qt/html/qpocketpcstyle-members.html
-share/doc/qt/html/qpocketpcstyle.html
-share/doc/qt/html/qpocketpcstyle_wce-h.html
 share/doc/qt/html/qpoint-h.html
 share/doc/qt/html/qpoint-members.html
 share/doc/qt/html/qpoint.html
@@ -2380,8 +2377,9 @@ translations/assistant_de.qm
 translations/qt_ar.qm
 translations/qt_cs.qm
 translations/qt_de.qm
+translations/qt_es.qm
 translations/qt_fr.qm
-translations/qt_iw.qm
+translations/qt_he.qm
 translations/qt_ru.qm
 translations/qt_sk.qm
 @dirrm translations