Update to version Qt-2.1.0 beta4.

- Added support of X Session Management.
- MASTER_SITES and WWW changed. ( troll.no -> trolltech.com )

30 files changed, 114 insertions, 54 deletions

diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index daf839b9d882..4f1780aa2970 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	qt
-PORTVERSION= 	2.1.0b3
+PORTVERSION=	2.1.0b4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.troll.no/qt/source/
-DISTNAME=	qt-x11-2.1.0-beta3
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
+DISTNAME=	qt-x11-2.1.0-beta4
 
 MAINTAINER=	imura@FreeBSD.org
 
@@ -22,12 +22,12 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg \
+CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC}
 
-WRKSRC=		${WRKDIR}/qt-2.1.0-beta3
+WRKSRC=		${WRKDIR}/qt-2.1.0-beta4
 CONFIG=		${WRKSRC}/configs/freebsd-g++-shared
 
 .if defined(QT_GIF_AVAILABLE)
@@ -70,6 +70,7 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
+	${INSTALL_DATA} changes-2.1.0 ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
diff --git a/x11-toolkits/qt22/distinfo b/x11-toolkits/qt22/distinfo
index 16c809783cf3..3712e1612dee 100644
--- a/x11-toolkits/qt22/distinfo
+++ b/x11-toolkits/qt22/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.1.0-beta3.tar.gz) = 96d53e5db39627f75c9fdea60a8b2da1
+MD5 (qt-x11-2.1.0-beta4.tar.gz) = 67f67d809425a479f1033366af70673f
diff --git a/x11-toolkits/qt22/files/manpages b/x11-toolkits/qt22/files/manpages
index de362d100114..b03793533ffe 100644
--- a/x11-toolkits/qt22/files/manpages
+++ b/x11-toolkits/qt22/files/manpages
@@ -56,11 +56,13 @@ qdragobject.3qt \
 qdropevent.3qt \
 qdropsite.3qt \
 qeucjpcodec.3qt \
+qeuckrcodec.3qt \
 qevent.3qt \
 qfile.3qt \
 qfiledialog.3qt \
 qfileiconprovider.3qt \
 qfileinfo.3qt \
+qfilepreview.3qt \
 qfocusdata.3qt \
 qfocusevent.3qt \
 qfont.3qt \
@@ -243,6 +245,7 @@ qvaluelist.3qt \
 qvaluelistconstiterator.3qt \
 qvaluelistiterator.3qt \
 qvaluestack.3qt \
+qvariant.3qt \
 qvbox.3qt \
 qvboxlayout.3qt \
 qvbuttongroup.3qt \
@@ -256,5 +259,6 @@ qwidgetstack.3qt \
 qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
+qworkspace.3qt \
 qxtapplication.3qt \
 qxtwidget.3qt
diff --git a/x11-toolkits/qt22/pkg-descr b/x11-toolkits/qt22/pkg-descr
index 463b9e197a56..514320bf8aed 100644
--- a/x11-toolkits/qt22/pkg-descr
+++ b/x11-toolkits/qt22/pkg-descr
@@ -2,4 +2,4 @@ Qt is a toolkit for building a GUI for X in C++. The main
 documentation is in /usr/X11R6/share/doc/qt2 and is also available on
 the web.
 
-WWW: http://www.troll.no/qt/
+WWW: http://doc.trolltech.com/
diff --git a/x11-toolkits/qt22/pkg-plist b/x11-toolkits/qt22/pkg-plist
index 04a913716baf..f6636d108787 100644
--- a/x11-toolkits/qt22/pkg-plist
+++ b/x11-toolkits/qt22/pkg-plist
@@ -233,7 +233,6 @@ 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
@@ -274,6 +273,7 @@ share/doc/qt2/LICENSE.QPL
 share/doc/qt2/PORTING
 share/doc/qt2/README
 share/doc/qt2/README.QT
+share/doc/qt2/changes-2.1.0
 share/doc/qt2/html/aboutqt.html
 share/doc/qt2/html/abstractwidgets.html
 share/doc/qt2/html/accelerators.html
@@ -557,6 +557,9 @@ 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/qeuckrcodec-h.html
+share/doc/qt2/html/qeuckrcodec-members.html
+share/doc/qt2/html/qeuckrcodec.html
 share/doc/qt2/html/qevent-h.html
 share/doc/qt2/html/qevent-members.html
 share/doc/qt2/html/qevent.html
@@ -1188,6 +1191,9 @@ share/doc/qt2/html/qwizard.html
 share/doc/qt2/html/qwmatrix-h.html
 share/doc/qt2/html/qwmatrix-members.html
 share/doc/qt2/html/qwmatrix.html
+share/doc/qt2/html/qworkspace-h.html
+share/doc/qt2/html/qworkspace-members.html
+share/doc/qt2/html/qworkspace.html
 share/doc/qt2/html/qxt-h.html
 share/doc/qt2/html/qxtapplication-members.html
 share/doc/qt2/html/qxtapplication.html
@@ -1209,7 +1215,6 @@ 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
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index daf839b9d882..4f1780aa2970 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	qt
-PORTVERSION= 	2.1.0b3
+PORTVERSION=	2.1.0b4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.troll.no/qt/source/
-DISTNAME=	qt-x11-2.1.0-beta3
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
+DISTNAME=	qt-x11-2.1.0-beta4
 
 MAINTAINER=	imura@FreeBSD.org
 
@@ -22,12 +22,12 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg \
+CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC}
 
-WRKSRC=		${WRKDIR}/qt-2.1.0-beta3
+WRKSRC=		${WRKDIR}/qt-2.1.0-beta4
 CONFIG=		${WRKSRC}/configs/freebsd-g++-shared
 
 .if defined(QT_GIF_AVAILABLE)
@@ -70,6 +70,7 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
+	${INSTALL_DATA} changes-2.1.0 ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
diff --git a/x11-toolkits/qt23/distinfo b/x11-toolkits/qt23/distinfo
index 16c809783cf3..3712e1612dee 100644
--- a/x11-toolkits/qt23/distinfo
+++ b/x11-toolkits/qt23/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.1.0-beta3.tar.gz) = 96d53e5db39627f75c9fdea60a8b2da1
+MD5 (qt-x11-2.1.0-beta4.tar.gz) = 67f67d809425a479f1033366af70673f
diff --git a/x11-toolkits/qt23/files/manpages b/x11-toolkits/qt23/files/manpages
index de362d100114..b03793533ffe 100644
--- a/x11-toolkits/qt23/files/manpages
+++ b/x11-toolkits/qt23/files/manpages
@@ -56,11 +56,13 @@ qdragobject.3qt \
 qdropevent.3qt \
 qdropsite.3qt \
 qeucjpcodec.3qt \
+qeuckrcodec.3qt \
 qevent.3qt \
 qfile.3qt \
 qfiledialog.3qt \
 qfileiconprovider.3qt \
 qfileinfo.3qt \
+qfilepreview.3qt \
 qfocusdata.3qt \
 qfocusevent.3qt \
 qfont.3qt \
@@ -243,6 +245,7 @@ qvaluelist.3qt \
 qvaluelistconstiterator.3qt \
 qvaluelistiterator.3qt \
 qvaluestack.3qt \
+qvariant.3qt \
 qvbox.3qt \
 qvboxlayout.3qt \
 qvbuttongroup.3qt \
@@ -256,5 +259,6 @@ qwidgetstack.3qt \
 qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
+qworkspace.3qt \
 qxtapplication.3qt \
 qxtwidget.3qt
diff --git a/x11-toolkits/qt23/pkg-descr b/x11-toolkits/qt23/pkg-descr
index 463b9e197a56..514320bf8aed 100644
--- a/x11-toolkits/qt23/pkg-descr
+++ b/x11-toolkits/qt23/pkg-descr
@@ -2,4 +2,4 @@ Qt is a toolkit for building a GUI for X in C++. The main
 documentation is in /usr/X11R6/share/doc/qt2 and is also available on
 the web.
 
-WWW: http://www.troll.no/qt/
+WWW: http://doc.trolltech.com/
diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist
index 04a913716baf..f6636d108787 100644
--- a/x11-toolkits/qt23/pkg-plist
+++ b/x11-toolkits/qt23/pkg-plist
@@ -233,7 +233,6 @@ 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
@@ -274,6 +273,7 @@ share/doc/qt2/LICENSE.QPL
 share/doc/qt2/PORTING
 share/doc/qt2/README
 share/doc/qt2/README.QT
+share/doc/qt2/changes-2.1.0
 share/doc/qt2/html/aboutqt.html
 share/doc/qt2/html/abstractwidgets.html
 share/doc/qt2/html/accelerators.html
@@ -557,6 +557,9 @@ 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/qeuckrcodec-h.html
+share/doc/qt2/html/qeuckrcodec-members.html
+share/doc/qt2/html/qeuckrcodec.html
 share/doc/qt2/html/qevent-h.html
 share/doc/qt2/html/qevent-members.html
 share/doc/qt2/html/qevent.html
@@ -1188,6 +1191,9 @@ share/doc/qt2/html/qwizard.html
 share/doc/qt2/html/qwmatrix-h.html
 share/doc/qt2/html/qwmatrix-members.html
 share/doc/qt2/html/qwmatrix.html
+share/doc/qt2/html/qworkspace-h.html
+share/doc/qt2/html/qworkspace-members.html
+share/doc/qt2/html/qworkspace.html
 share/doc/qt2/html/qxt-h.html
 share/doc/qt2/html/qxtapplication-members.html
 share/doc/qt2/html/qxtapplication.html
@@ -1209,7 +1215,6 @@ 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
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index daf839b9d882..4f1780aa2970 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	qt
-PORTVERSION= 	2.1.0b3
+PORTVERSION=	2.1.0b4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.troll.no/qt/source/
-DISTNAME=	qt-x11-2.1.0-beta3
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
+DISTNAME=	qt-x11-2.1.0-beta4
 
 MAINTAINER=	imura@FreeBSD.org
 
@@ -22,12 +22,12 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg \
+CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC}
 
-WRKSRC=		${WRKDIR}/qt-2.1.0-beta3
+WRKSRC=		${WRKDIR}/qt-2.1.0-beta4
 CONFIG=		${WRKSRC}/configs/freebsd-g++-shared
 
 .if defined(QT_GIF_AVAILABLE)
@@ -70,6 +70,7 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
+	${INSTALL_DATA} changes-2.1.0 ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
diff --git a/x11-toolkits/qt30/distinfo b/x11-toolkits/qt30/distinfo
index 16c809783cf3..3712e1612dee 100644
--- a/x11-toolkits/qt30/distinfo
+++ b/x11-toolkits/qt30/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.1.0-beta3.tar.gz) = 96d53e5db39627f75c9fdea60a8b2da1
+MD5 (qt-x11-2.1.0-beta4.tar.gz) = 67f67d809425a479f1033366af70673f
diff --git a/x11-toolkits/qt30/files/manpages b/x11-toolkits/qt30/files/manpages
index de362d100114..b03793533ffe 100644
--- a/x11-toolkits/qt30/files/manpages
+++ b/x11-toolkits/qt30/files/manpages
@@ -56,11 +56,13 @@ qdragobject.3qt \
 qdropevent.3qt \
 qdropsite.3qt \
 qeucjpcodec.3qt \
+qeuckrcodec.3qt \
 qevent.3qt \
 qfile.3qt \
 qfiledialog.3qt \
 qfileiconprovider.3qt \
 qfileinfo.3qt \
+qfilepreview.3qt \
 qfocusdata.3qt \
 qfocusevent.3qt \
 qfont.3qt \
@@ -243,6 +245,7 @@ qvaluelist.3qt \
 qvaluelistconstiterator.3qt \
 qvaluelistiterator.3qt \
 qvaluestack.3qt \
+qvariant.3qt \
 qvbox.3qt \
 qvboxlayout.3qt \
 qvbuttongroup.3qt \
@@ -256,5 +259,6 @@ qwidgetstack.3qt \
 qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
+qworkspace.3qt \
 qxtapplication.3qt \
 qxtwidget.3qt
diff --git a/x11-toolkits/qt30/pkg-descr b/x11-toolkits/qt30/pkg-descr
index 463b9e197a56..514320bf8aed 100644
--- a/x11-toolkits/qt30/pkg-descr
+++ b/x11-toolkits/qt30/pkg-descr
@@ -2,4 +2,4 @@ Qt is a toolkit for building a GUI for X in C++. The main
 documentation is in /usr/X11R6/share/doc/qt2 and is also available on
 the web.
 
-WWW: http://www.troll.no/qt/
+WWW: http://doc.trolltech.com/
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index 04a913716baf..f6636d108787 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -233,7 +233,6 @@ 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
@@ -274,6 +273,7 @@ share/doc/qt2/LICENSE.QPL
 share/doc/qt2/PORTING
 share/doc/qt2/README
 share/doc/qt2/README.QT
+share/doc/qt2/changes-2.1.0
 share/doc/qt2/html/aboutqt.html
 share/doc/qt2/html/abstractwidgets.html
 share/doc/qt2/html/accelerators.html
@@ -557,6 +557,9 @@ 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/qeuckrcodec-h.html
+share/doc/qt2/html/qeuckrcodec-members.html
+share/doc/qt2/html/qeuckrcodec.html
 share/doc/qt2/html/qevent-h.html
 share/doc/qt2/html/qevent-members.html
 share/doc/qt2/html/qevent.html
@@ -1188,6 +1191,9 @@ share/doc/qt2/html/qwizard.html
 share/doc/qt2/html/qwmatrix-h.html
 share/doc/qt2/html/qwmatrix-members.html
 share/doc/qt2/html/qwmatrix.html
+share/doc/qt2/html/qworkspace-h.html
+share/doc/qt2/html/qworkspace-members.html
+share/doc/qt2/html/qworkspace.html
 share/doc/qt2/html/qxt-h.html
 share/doc/qt2/html/qxtapplication-members.html
 share/doc/qt2/html/qxtapplication.html
@@ -1209,7 +1215,6 @@ 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
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index daf839b9d882..4f1780aa2970 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	qt
-PORTVERSION= 	2.1.0b3
+PORTVERSION=	2.1.0b4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.troll.no/qt/source/
-DISTNAME=	qt-x11-2.1.0-beta3
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
+DISTNAME=	qt-x11-2.1.0-beta4
 
 MAINTAINER=	imura@FreeBSD.org
 
@@ -22,12 +22,12 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg \
+CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC}
 
-WRKSRC=		${WRKDIR}/qt-2.1.0-beta3
+WRKSRC=		${WRKDIR}/qt-2.1.0-beta4
 CONFIG=		${WRKSRC}/configs/freebsd-g++-shared
 
 .if defined(QT_GIF_AVAILABLE)
@@ -70,6 +70,7 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
+	${INSTALL_DATA} changes-2.1.0 ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
diff --git a/x11-toolkits/qt31/distinfo b/x11-toolkits/qt31/distinfo
index 16c809783cf3..3712e1612dee 100644
--- a/x11-toolkits/qt31/distinfo
+++ b/x11-toolkits/qt31/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.1.0-beta3.tar.gz) = 96d53e5db39627f75c9fdea60a8b2da1
+MD5 (qt-x11-2.1.0-beta4.tar.gz) = 67f67d809425a479f1033366af70673f
diff --git a/x11-toolkits/qt31/files/manpages b/x11-toolkits/qt31/files/manpages
index de362d100114..b03793533ffe 100644
--- a/x11-toolkits/qt31/files/manpages
+++ b/x11-toolkits/qt31/files/manpages
@@ -56,11 +56,13 @@ qdragobject.3qt \
 qdropevent.3qt \
 qdropsite.3qt \
 qeucjpcodec.3qt \
+qeuckrcodec.3qt \
 qevent.3qt \
 qfile.3qt \
 qfiledialog.3qt \
 qfileiconprovider.3qt \
 qfileinfo.3qt \
+qfilepreview.3qt \
 qfocusdata.3qt \
 qfocusevent.3qt \
 qfont.3qt \
@@ -243,6 +245,7 @@ qvaluelist.3qt \
 qvaluelistconstiterator.3qt \
 qvaluelistiterator.3qt \
 qvaluestack.3qt \
+qvariant.3qt \
 qvbox.3qt \
 qvboxlayout.3qt \
 qvbuttongroup.3qt \
@@ -256,5 +259,6 @@ qwidgetstack.3qt \
 qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
+qworkspace.3qt \
 qxtapplication.3qt \
 qxtwidget.3qt
diff --git a/x11-toolkits/qt31/pkg-descr b/x11-toolkits/qt31/pkg-descr
index 463b9e197a56..514320bf8aed 100644
--- a/x11-toolkits/qt31/pkg-descr
+++ b/x11-toolkits/qt31/pkg-descr
@@ -2,4 +2,4 @@ Qt is a toolkit for building a GUI for X in C++. The main
 documentation is in /usr/X11R6/share/doc/qt2 and is also available on
 the web.
 
-WWW: http://www.troll.no/qt/
+WWW: http://doc.trolltech.com/
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index 04a913716baf..f6636d108787 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -233,7 +233,6 @@ 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
@@ -274,6 +273,7 @@ share/doc/qt2/LICENSE.QPL
 share/doc/qt2/PORTING
 share/doc/qt2/README
 share/doc/qt2/README.QT
+share/doc/qt2/changes-2.1.0
 share/doc/qt2/html/aboutqt.html
 share/doc/qt2/html/abstractwidgets.html
 share/doc/qt2/html/accelerators.html
@@ -557,6 +557,9 @@ 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/qeuckrcodec-h.html
+share/doc/qt2/html/qeuckrcodec-members.html
+share/doc/qt2/html/qeuckrcodec.html
 share/doc/qt2/html/qevent-h.html
 share/doc/qt2/html/qevent-members.html
 share/doc/qt2/html/qevent.html
@@ -1188,6 +1191,9 @@ share/doc/qt2/html/qwizard.html
 share/doc/qt2/html/qwmatrix-h.html
 share/doc/qt2/html/qwmatrix-members.html
 share/doc/qt2/html/qwmatrix.html
+share/doc/qt2/html/qworkspace-h.html
+share/doc/qt2/html/qworkspace-members.html
+share/doc/qt2/html/qworkspace.html
 share/doc/qt2/html/qxt-h.html
 share/doc/qt2/html/qxtapplication-members.html
 share/doc/qt2/html/qxtapplication.html
@@ -1209,7 +1215,6 @@ 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
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index daf839b9d882..4f1780aa2970 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	qt
-PORTVERSION= 	2.1.0b3
+PORTVERSION=	2.1.0b4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.troll.no/qt/source/
-DISTNAME=	qt-x11-2.1.0-beta3
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
+DISTNAME=	qt-x11-2.1.0-beta4
 
 MAINTAINER=	imura@FreeBSD.org
 
@@ -22,12 +22,12 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg \
+CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC}
 
-WRKSRC=		${WRKDIR}/qt-2.1.0-beta3
+WRKSRC=		${WRKDIR}/qt-2.1.0-beta4
 CONFIG=		${WRKSRC}/configs/freebsd-g++-shared
 
 .if defined(QT_GIF_AVAILABLE)
@@ -70,6 +70,7 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
+	${INSTALL_DATA} changes-2.1.0 ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
diff --git a/x11-toolkits/qt32/distinfo b/x11-toolkits/qt32/distinfo
index 16c809783cf3..3712e1612dee 100644
--- a/x11-toolkits/qt32/distinfo
+++ b/x11-toolkits/qt32/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.1.0-beta3.tar.gz) = 96d53e5db39627f75c9fdea60a8b2da1
+MD5 (qt-x11-2.1.0-beta4.tar.gz) = 67f67d809425a479f1033366af70673f
diff --git a/x11-toolkits/qt32/files/manpages b/x11-toolkits/qt32/files/manpages
index de362d100114..b03793533ffe 100644
--- a/x11-toolkits/qt32/files/manpages
+++ b/x11-toolkits/qt32/files/manpages
@@ -56,11 +56,13 @@ qdragobject.3qt \
 qdropevent.3qt \
 qdropsite.3qt \
 qeucjpcodec.3qt \
+qeuckrcodec.3qt \
 qevent.3qt \
 qfile.3qt \
 qfiledialog.3qt \
 qfileiconprovider.3qt \
 qfileinfo.3qt \
+qfilepreview.3qt \
 qfocusdata.3qt \
 qfocusevent.3qt \
 qfont.3qt \
@@ -243,6 +245,7 @@ qvaluelist.3qt \
 qvaluelistconstiterator.3qt \
 qvaluelistiterator.3qt \
 qvaluestack.3qt \
+qvariant.3qt \
 qvbox.3qt \
 qvboxlayout.3qt \
 qvbuttongroup.3qt \
@@ -256,5 +259,6 @@ qwidgetstack.3qt \
 qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
+qworkspace.3qt \
 qxtapplication.3qt \
 qxtwidget.3qt
diff --git a/x11-toolkits/qt32/pkg-descr b/x11-toolkits/qt32/pkg-descr
index 463b9e197a56..514320bf8aed 100644
--- a/x11-toolkits/qt32/pkg-descr
+++ b/x11-toolkits/qt32/pkg-descr
@@ -2,4 +2,4 @@ Qt is a toolkit for building a GUI for X in C++. The main
 documentation is in /usr/X11R6/share/doc/qt2 and is also available on
 the web.
 
-WWW: http://www.troll.no/qt/
+WWW: http://doc.trolltech.com/
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index 04a913716baf..f6636d108787 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -233,7 +233,6 @@ 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
@@ -274,6 +273,7 @@ share/doc/qt2/LICENSE.QPL
 share/doc/qt2/PORTING
 share/doc/qt2/README
 share/doc/qt2/README.QT
+share/doc/qt2/changes-2.1.0
 share/doc/qt2/html/aboutqt.html
 share/doc/qt2/html/abstractwidgets.html
 share/doc/qt2/html/accelerators.html
@@ -557,6 +557,9 @@ 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/qeuckrcodec-h.html
+share/doc/qt2/html/qeuckrcodec-members.html
+share/doc/qt2/html/qeuckrcodec.html
 share/doc/qt2/html/qevent-h.html
 share/doc/qt2/html/qevent-members.html
 share/doc/qt2/html/qevent.html
@@ -1188,6 +1191,9 @@ share/doc/qt2/html/qwizard.html
 share/doc/qt2/html/qwmatrix-h.html
 share/doc/qt2/html/qwmatrix-members.html
 share/doc/qt2/html/qwmatrix.html
+share/doc/qt2/html/qworkspace-h.html
+share/doc/qt2/html/qworkspace-members.html
+share/doc/qt2/html/qworkspace.html
 share/doc/qt2/html/qxt-h.html
 share/doc/qt2/html/qxtapplication-members.html
 share/doc/qt2/html/qxtapplication.html
@@ -1209,7 +1215,6 @@ 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
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index daf839b9d882..4f1780aa2970 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	qt
-PORTVERSION= 	2.1.0b3
+PORTVERSION=	2.1.0b4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.troll.no/qt/source/
-DISTNAME=	qt-x11-2.1.0-beta3
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
+DISTNAME=	qt-x11-2.1.0-beta4
 
 MAINTAINER=	imura@FreeBSD.org
 
@@ -22,12 +22,12 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg \
+CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC}
 
-WRKSRC=		${WRKDIR}/qt-2.1.0-beta3
+WRKSRC=		${WRKDIR}/qt-2.1.0-beta4
 CONFIG=		${WRKSRC}/configs/freebsd-g++-shared
 
 .if defined(QT_GIF_AVAILABLE)
@@ -70,6 +70,7 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
+	${INSTALL_DATA} changes-2.1.0 ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} doc/html/* ${PREFIX}/share/doc/qt2/html ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo
index 16c809783cf3..3712e1612dee 100644
--- a/x11-toolkits/qt33/distinfo
+++ b/x11-toolkits/qt33/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.1.0-beta3.tar.gz) = 96d53e5db39627f75c9fdea60a8b2da1
+MD5 (qt-x11-2.1.0-beta4.tar.gz) = 67f67d809425a479f1033366af70673f
diff --git a/x11-toolkits/qt33/files/manpages b/x11-toolkits/qt33/files/manpages
index de362d100114..b03793533ffe 100644
--- a/x11-toolkits/qt33/files/manpages
+++ b/x11-toolkits/qt33/files/manpages
@@ -56,11 +56,13 @@ qdragobject.3qt \
 qdropevent.3qt \
 qdropsite.3qt \
 qeucjpcodec.3qt \
+qeuckrcodec.3qt \
 qevent.3qt \
 qfile.3qt \
 qfiledialog.3qt \
 qfileiconprovider.3qt \
 qfileinfo.3qt \
+qfilepreview.3qt \
 qfocusdata.3qt \
 qfocusevent.3qt \
 qfont.3qt \
@@ -243,6 +245,7 @@ qvaluelist.3qt \
 qvaluelistconstiterator.3qt \
 qvaluelistiterator.3qt \
 qvaluestack.3qt \
+qvariant.3qt \
 qvbox.3qt \
 qvboxlayout.3qt \
 qvbuttongroup.3qt \
@@ -256,5 +259,6 @@ qwidgetstack.3qt \
 qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
+qworkspace.3qt \
 qxtapplication.3qt \
 qxtwidget.3qt
diff --git a/x11-toolkits/qt33/pkg-descr b/x11-toolkits/qt33/pkg-descr
index 463b9e197a56..514320bf8aed 100644
--- a/x11-toolkits/qt33/pkg-descr
+++ b/x11-toolkits/qt33/pkg-descr
@@ -2,4 +2,4 @@ Qt is a toolkit for building a GUI for X in C++. The main
 documentation is in /usr/X11R6/share/doc/qt2 and is also available on
 the web.
 
-WWW: http://www.troll.no/qt/
+WWW: http://doc.trolltech.com/
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 04a913716baf..f6636d108787 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -233,7 +233,6 @@ 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
@@ -274,6 +273,7 @@ share/doc/qt2/LICENSE.QPL
 share/doc/qt2/PORTING
 share/doc/qt2/README
 share/doc/qt2/README.QT
+share/doc/qt2/changes-2.1.0
 share/doc/qt2/html/aboutqt.html
 share/doc/qt2/html/abstractwidgets.html
 share/doc/qt2/html/accelerators.html
@@ -557,6 +557,9 @@ 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/qeuckrcodec-h.html
+share/doc/qt2/html/qeuckrcodec-members.html
+share/doc/qt2/html/qeuckrcodec.html
 share/doc/qt2/html/qevent-h.html
 share/doc/qt2/html/qevent-members.html
 share/doc/qt2/html/qevent.html
@@ -1188,6 +1191,9 @@ share/doc/qt2/html/qwizard.html
 share/doc/qt2/html/qwmatrix-h.html
 share/doc/qt2/html/qwmatrix-members.html
 share/doc/qt2/html/qwmatrix.html
+share/doc/qt2/html/qworkspace-h.html
+share/doc/qt2/html/qworkspace-members.html
+share/doc/qt2/html/qworkspace.html
 share/doc/qt2/html/qxt-h.html
 share/doc/qt2/html/qxtapplication-members.html
 share/doc/qt2/html/qxtapplication.html
@@ -1209,7 +1215,6 @@ 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