24 files changed, 48 insertions, 42 deletions

diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index add4d433e44a..f4d38f3f94da 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	qt
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	mng.0:${PORTSDIR}/graphics/libmng \
+		png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 YES?=		/usr/bin/yes
@@ -24,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
+		-system-libmng \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
diff --git a/x11-toolkits/qt22/distinfo b/x11-toolkits/qt22/distinfo
index 3d5ba8515875..ba0d2de41a17 100644
--- a/x11-toolkits/qt22/distinfo
+++ b/x11-toolkits/qt22/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.2.2.tar.gz) = 682e8f62af48770aea52036eb6329792
+MD5 (qt-x11-2.2.3.tar.gz) = 964ca0e7e641271a2f5706a0e4383fcf
diff --git a/x11-toolkits/qt22/files/manpages b/x11-toolkits/qt22/files/manpages
index 27329053a55a..66a8a3a98827 100644
--- a/x11-toolkits/qt22/files/manpages
+++ b/x11-toolkits/qt22/files/manpages
@@ -311,7 +311,6 @@ qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
 qworkspace.3qt \
-qwsdecoration.3qt \
 qxmlattributes.3qt \
 qxmlcontenthandler.3qt \
 qxmldeclhandler.3qt \
diff --git a/x11-toolkits/qt22/pkg-plist b/x11-toolkits/qt22/pkg-plist
index ff6704797bce..5b26f2baddfe 100644
--- a/x11-toolkits/qt22/pkg-plist
+++ b/x11-toolkits/qt22/pkg-plist
@@ -46,7 +46,6 @@ include/qt2/qconfig-dist.h
 include/qt2/qconfig-large.h
 include/qt2/qconfig-medium.h
 include/qt2/qconfig-minimal.h
-include/qt2/qconfig-qpe.h
 include/qt2/qconfig-small.h
 include/qt2/qconfig.h
 include/qt2/qconnect.h
@@ -268,6 +267,7 @@ include/qt2/qvariant.h
 include/qt2/qvbox.h
 include/qt2/qvbuttongroup.h
 include/qt2/qvector.h
+include/qt2/qvfbhdr.h
 include/qt2/qvgroupbox.h
 include/qt2/qwhatsthis.h
 include/qt2/qwidcoll.h
@@ -516,6 +516,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/gpl.html
 share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
@@ -824,6 +825,7 @@ share/doc/qt2/html/qdropevent.html
 share/doc/qt2/html/qdropsite-h.html
 share/doc/qt2/html/qdropsite-members.html
 share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qembed.html
 share/doc/qt2/html/qeucjpcodec-h.html
 share/doc/qt2/html/qeucjpcodec-members.html
 share/doc/qt2/html/qeucjpcodec.html
@@ -1515,8 +1517,6 @@ 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/qwsdecoration-members.html
-share/doc/qt2/html/qwsdecoration.html
 share/doc/qt2/html/qwsdisplay_qws-h.html
 share/doc/qt2/html/qwsmanager_qws-h.html
 share/doc/qt2/html/qxml-h.html
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index add4d433e44a..f4d38f3f94da 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	qt
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	mng.0:${PORTSDIR}/graphics/libmng \
+		png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 YES?=		/usr/bin/yes
@@ -24,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
+		-system-libmng \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
diff --git a/x11-toolkits/qt23/distinfo b/x11-toolkits/qt23/distinfo
index 3d5ba8515875..ba0d2de41a17 100644
--- a/x11-toolkits/qt23/distinfo
+++ b/x11-toolkits/qt23/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.2.2.tar.gz) = 682e8f62af48770aea52036eb6329792
+MD5 (qt-x11-2.2.3.tar.gz) = 964ca0e7e641271a2f5706a0e4383fcf
diff --git a/x11-toolkits/qt23/files/manpages b/x11-toolkits/qt23/files/manpages
index 27329053a55a..66a8a3a98827 100644
--- a/x11-toolkits/qt23/files/manpages
+++ b/x11-toolkits/qt23/files/manpages
@@ -311,7 +311,6 @@ qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
 qworkspace.3qt \
-qwsdecoration.3qt \
 qxmlattributes.3qt \
 qxmlcontenthandler.3qt \
 qxmldeclhandler.3qt \
diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist
index ff6704797bce..5b26f2baddfe 100644
--- a/x11-toolkits/qt23/pkg-plist
+++ b/x11-toolkits/qt23/pkg-plist
@@ -46,7 +46,6 @@ include/qt2/qconfig-dist.h
 include/qt2/qconfig-large.h
 include/qt2/qconfig-medium.h
 include/qt2/qconfig-minimal.h
-include/qt2/qconfig-qpe.h
 include/qt2/qconfig-small.h
 include/qt2/qconfig.h
 include/qt2/qconnect.h
@@ -268,6 +267,7 @@ include/qt2/qvariant.h
 include/qt2/qvbox.h
 include/qt2/qvbuttongroup.h
 include/qt2/qvector.h
+include/qt2/qvfbhdr.h
 include/qt2/qvgroupbox.h
 include/qt2/qwhatsthis.h
 include/qt2/qwidcoll.h
@@ -516,6 +516,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/gpl.html
 share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
@@ -824,6 +825,7 @@ share/doc/qt2/html/qdropevent.html
 share/doc/qt2/html/qdropsite-h.html
 share/doc/qt2/html/qdropsite-members.html
 share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qembed.html
 share/doc/qt2/html/qeucjpcodec-h.html
 share/doc/qt2/html/qeucjpcodec-members.html
 share/doc/qt2/html/qeucjpcodec.html
@@ -1515,8 +1517,6 @@ 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/qwsdecoration-members.html
-share/doc/qt2/html/qwsdecoration.html
 share/doc/qt2/html/qwsdisplay_qws-h.html
 share/doc/qt2/html/qwsmanager_qws-h.html
 share/doc/qt2/html/qxml-h.html
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index add4d433e44a..f4d38f3f94da 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	qt
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	mng.0:${PORTSDIR}/graphics/libmng \
+		png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 YES?=		/usr/bin/yes
@@ -24,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
+		-system-libmng \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
diff --git a/x11-toolkits/qt30/distinfo b/x11-toolkits/qt30/distinfo
index 3d5ba8515875..ba0d2de41a17 100644
--- a/x11-toolkits/qt30/distinfo
+++ b/x11-toolkits/qt30/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.2.2.tar.gz) = 682e8f62af48770aea52036eb6329792
+MD5 (qt-x11-2.2.3.tar.gz) = 964ca0e7e641271a2f5706a0e4383fcf
diff --git a/x11-toolkits/qt30/files/manpages b/x11-toolkits/qt30/files/manpages
index 27329053a55a..66a8a3a98827 100644
--- a/x11-toolkits/qt30/files/manpages
+++ b/x11-toolkits/qt30/files/manpages
@@ -311,7 +311,6 @@ qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
 qworkspace.3qt \
-qwsdecoration.3qt \
 qxmlattributes.3qt \
 qxmlcontenthandler.3qt \
 qxmldeclhandler.3qt \
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index ff6704797bce..5b26f2baddfe 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -46,7 +46,6 @@ include/qt2/qconfig-dist.h
 include/qt2/qconfig-large.h
 include/qt2/qconfig-medium.h
 include/qt2/qconfig-minimal.h
-include/qt2/qconfig-qpe.h
 include/qt2/qconfig-small.h
 include/qt2/qconfig.h
 include/qt2/qconnect.h
@@ -268,6 +267,7 @@ include/qt2/qvariant.h
 include/qt2/qvbox.h
 include/qt2/qvbuttongroup.h
 include/qt2/qvector.h
+include/qt2/qvfbhdr.h
 include/qt2/qvgroupbox.h
 include/qt2/qwhatsthis.h
 include/qt2/qwidcoll.h
@@ -516,6 +516,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/gpl.html
 share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
@@ -824,6 +825,7 @@ share/doc/qt2/html/qdropevent.html
 share/doc/qt2/html/qdropsite-h.html
 share/doc/qt2/html/qdropsite-members.html
 share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qembed.html
 share/doc/qt2/html/qeucjpcodec-h.html
 share/doc/qt2/html/qeucjpcodec-members.html
 share/doc/qt2/html/qeucjpcodec.html
@@ -1515,8 +1517,6 @@ 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/qwsdecoration-members.html
-share/doc/qt2/html/qwsdecoration.html
 share/doc/qt2/html/qwsdisplay_qws-h.html
 share/doc/qt2/html/qwsmanager_qws-h.html
 share/doc/qt2/html/qxml-h.html
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index add4d433e44a..f4d38f3f94da 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	qt
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	mng.0:${PORTSDIR}/graphics/libmng \
+		png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 YES?=		/usr/bin/yes
@@ -24,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
+		-system-libmng \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
diff --git a/x11-toolkits/qt31/distinfo b/x11-toolkits/qt31/distinfo
index 3d5ba8515875..ba0d2de41a17 100644
--- a/x11-toolkits/qt31/distinfo
+++ b/x11-toolkits/qt31/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.2.2.tar.gz) = 682e8f62af48770aea52036eb6329792
+MD5 (qt-x11-2.2.3.tar.gz) = 964ca0e7e641271a2f5706a0e4383fcf
diff --git a/x11-toolkits/qt31/files/manpages b/x11-toolkits/qt31/files/manpages
index 27329053a55a..66a8a3a98827 100644
--- a/x11-toolkits/qt31/files/manpages
+++ b/x11-toolkits/qt31/files/manpages
@@ -311,7 +311,6 @@ qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
 qworkspace.3qt \
-qwsdecoration.3qt \
 qxmlattributes.3qt \
 qxmlcontenthandler.3qt \
 qxmldeclhandler.3qt \
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index ff6704797bce..5b26f2baddfe 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -46,7 +46,6 @@ include/qt2/qconfig-dist.h
 include/qt2/qconfig-large.h
 include/qt2/qconfig-medium.h
 include/qt2/qconfig-minimal.h
-include/qt2/qconfig-qpe.h
 include/qt2/qconfig-small.h
 include/qt2/qconfig.h
 include/qt2/qconnect.h
@@ -268,6 +267,7 @@ include/qt2/qvariant.h
 include/qt2/qvbox.h
 include/qt2/qvbuttongroup.h
 include/qt2/qvector.h
+include/qt2/qvfbhdr.h
 include/qt2/qvgroupbox.h
 include/qt2/qwhatsthis.h
 include/qt2/qwidcoll.h
@@ -516,6 +516,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/gpl.html
 share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
@@ -824,6 +825,7 @@ share/doc/qt2/html/qdropevent.html
 share/doc/qt2/html/qdropsite-h.html
 share/doc/qt2/html/qdropsite-members.html
 share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qembed.html
 share/doc/qt2/html/qeucjpcodec-h.html
 share/doc/qt2/html/qeucjpcodec-members.html
 share/doc/qt2/html/qeucjpcodec.html
@@ -1515,8 +1517,6 @@ 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/qwsdecoration-members.html
-share/doc/qt2/html/qwsdecoration.html
 share/doc/qt2/html/qwsdisplay_qws-h.html
 share/doc/qt2/html/qwsmanager_qws-h.html
 share/doc/qt2/html/qxml-h.html
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index add4d433e44a..f4d38f3f94da 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	qt
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	mng.0:${PORTSDIR}/graphics/libmng \
+		png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 YES?=		/usr/bin/yes
@@ -24,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
+		-system-libmng \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
diff --git a/x11-toolkits/qt32/distinfo b/x11-toolkits/qt32/distinfo
index 3d5ba8515875..ba0d2de41a17 100644
--- a/x11-toolkits/qt32/distinfo
+++ b/x11-toolkits/qt32/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.2.2.tar.gz) = 682e8f62af48770aea52036eb6329792
+MD5 (qt-x11-2.2.3.tar.gz) = 964ca0e7e641271a2f5706a0e4383fcf
diff --git a/x11-toolkits/qt32/files/manpages b/x11-toolkits/qt32/files/manpages
index 27329053a55a..66a8a3a98827 100644
--- a/x11-toolkits/qt32/files/manpages
+++ b/x11-toolkits/qt32/files/manpages
@@ -311,7 +311,6 @@ qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
 qworkspace.3qt \
-qwsdecoration.3qt \
 qxmlattributes.3qt \
 qxmlcontenthandler.3qt \
 qxmldeclhandler.3qt \
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index ff6704797bce..5b26f2baddfe 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -46,7 +46,6 @@ include/qt2/qconfig-dist.h
 include/qt2/qconfig-large.h
 include/qt2/qconfig-medium.h
 include/qt2/qconfig-minimal.h
-include/qt2/qconfig-qpe.h
 include/qt2/qconfig-small.h
 include/qt2/qconfig.h
 include/qt2/qconnect.h
@@ -268,6 +267,7 @@ include/qt2/qvariant.h
 include/qt2/qvbox.h
 include/qt2/qvbuttongroup.h
 include/qt2/qvector.h
+include/qt2/qvfbhdr.h
 include/qt2/qvgroupbox.h
 include/qt2/qwhatsthis.h
 include/qt2/qwidcoll.h
@@ -516,6 +516,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/gpl.html
 share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
@@ -824,6 +825,7 @@ share/doc/qt2/html/qdropevent.html
 share/doc/qt2/html/qdropsite-h.html
 share/doc/qt2/html/qdropsite-members.html
 share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qembed.html
 share/doc/qt2/html/qeucjpcodec-h.html
 share/doc/qt2/html/qeucjpcodec-members.html
 share/doc/qt2/html/qeucjpcodec.html
@@ -1515,8 +1517,6 @@ 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/qwsdecoration-members.html
-share/doc/qt2/html/qwsdecoration.html
 share/doc/qt2/html/qwsdisplay_qws-h.html
 share/doc/qt2/html/qwsmanager_qws-h.html
 share/doc/qt2/html/qxml-h.html
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index add4d433e44a..f4d38f3f94da 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	qt
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	mng.0:${PORTSDIR}/graphics/libmng \
+		png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 YES?=		/usr/bin/yes
@@ -24,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
+		-system-libmng \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo
index 3d5ba8515875..ba0d2de41a17 100644
--- a/x11-toolkits/qt33/distinfo
+++ b/x11-toolkits/qt33/distinfo
@@ -1 +1 @@
-MD5 (qt-x11-2.2.2.tar.gz) = 682e8f62af48770aea52036eb6329792
+MD5 (qt-x11-2.2.3.tar.gz) = 964ca0e7e641271a2f5706a0e4383fcf
diff --git a/x11-toolkits/qt33/files/manpages b/x11-toolkits/qt33/files/manpages
index 27329053a55a..66a8a3a98827 100644
--- a/x11-toolkits/qt33/files/manpages
+++ b/x11-toolkits/qt33/files/manpages
@@ -311,7 +311,6 @@ qwindowsstyle.3qt \
 qwizard.3qt \
 qwmatrix.3qt \
 qworkspace.3qt \
-qwsdecoration.3qt \
 qxmlattributes.3qt \
 qxmlcontenthandler.3qt \
 qxmldeclhandler.3qt \
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index ff6704797bce..5b26f2baddfe 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -46,7 +46,6 @@ include/qt2/qconfig-dist.h
 include/qt2/qconfig-large.h
 include/qt2/qconfig-medium.h
 include/qt2/qconfig-minimal.h
-include/qt2/qconfig-qpe.h
 include/qt2/qconfig-small.h
 include/qt2/qconfig.h
 include/qt2/qconnect.h
@@ -268,6 +267,7 @@ include/qt2/qvariant.h
 include/qt2/qvbox.h
 include/qt2/qvbuttongroup.h
 include/qt2/qvector.h
+include/qt2/qvfbhdr.h
 include/qt2/qvgroupbox.h
 include/qt2/qwhatsthis.h
 include/qt2/qwidcoll.h
@@ -516,6 +516,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/gpl.html
 share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
@@ -824,6 +825,7 @@ share/doc/qt2/html/qdropevent.html
 share/doc/qt2/html/qdropsite-h.html
 share/doc/qt2/html/qdropsite-members.html
 share/doc/qt2/html/qdropsite.html
+share/doc/qt2/html/qembed.html
 share/doc/qt2/html/qeucjpcodec-h.html
 share/doc/qt2/html/qeucjpcodec-members.html
 share/doc/qt2/html/qeucjpcodec.html
@@ -1515,8 +1517,6 @@ 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/qwsdecoration-members.html
-share/doc/qt2/html/qwsdecoration.html
 share/doc/qt2/html/qwsdisplay_qws-h.html
 share/doc/qt2/html/qwsmanager_qws-h.html
 share/doc/qt2/html/qxml-h.html