7 files changed, 59 insertions, 27 deletions
diff --git a/x11/qt2-docs/pkg/PLIST b/x11/qt2-docs/pkg/PLIST
index 3d756cd2281..40b9900257d 100644
--- a/x11/qt2-docs/pkg/PLIST
+++ b/x11/qt2-docs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/02/06 09:26:14 skrll Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/03/23 18:09:34 drochner Exp $
 qt2/doc/README
 qt2/doc/README.QT
 qt2/doc/html/HOWTO-framebuffer.html
@@ -31,6 +31,7 @@ qt2/doc/html/casestudy-qws.html
 qt2/doc/html/changes21.html
 qt2/doc/html/changes211.html
 qt2/doc/html/changes22.html
+qt2/doc/html/changes23.html
 qt2/doc/html/charinput-qws.html
 qt2/doc/html/checklists-main-cpp.html
 qt2/doc/html/classes.html
@@ -443,6 +444,7 @@ qt2/doc/html/qconststring-members.html
 qt2/doc/html/qconststring.html
 qt2/doc/html/qcopchannel-members.html
 qt2/doc/html/qcopchannel.html
+qt2/doc/html/qcopchannel_qws-h.html
 qt2/doc/html/qcstring-h.html
 qt2/doc/html/qcstring-members.html
 qt2/doc/html/qcstring.html
@@ -715,6 +717,9 @@ qt2/doc/html/qintdict-members.html
 qt2/doc/html/qintdict.html
 qt2/doc/html/qintdictiterator-members.html
 qt2/doc/html/qintdictiterator.html
+qt2/doc/html/qinterlacestyle-h.html
+qt2/doc/html/qinterlacestyle-members.html
+qt2/doc/html/qinterlacestyle.html
 qt2/doc/html/qintvalidator-members.html
 qt2/doc/html/qintvalidator.html
 qt2/doc/html/qiodevice-h.html
@@ -728,6 +733,7 @@ qt2/doc/html/qjiscodec.html
 qt2/doc/html/qjpunicode-h.html
 qt2/doc/html/qjpunicodeconv-members.html
 qt2/doc/html/qjpunicodeconv.html
+qt2/doc/html/qkeyboard_qws-h.html
 qt2/doc/html/qkeyevent-members.html
 qt2/doc/html/qkeyevent.html
 qt2/doc/html/qlabel-h.html
@@ -1232,6 +1238,7 @@ qt2/doc/html/qwindowdefs-h.html
 qt2/doc/html/qwindowsstyle-h.html
 qt2/doc/html/qwindowsstyle-members.html
 qt2/doc/html/qwindowsstyle.html
+qt2/doc/html/qwindowsystem_qws-h.html
 qt2/doc/html/qwizard-h.html
 qt2/doc/html/qwizard-members.html
 qt2/doc/html/qwizard.html
@@ -1241,8 +1248,16 @@ qt2/doc/html/qwmatrix.html
 qt2/doc/html/qworkspace-h.html
 qt2/doc/html/qworkspace-members.html
 qt2/doc/html/qworkspace.html
-qt2/doc/html/qwsdisplay_qws-h.html
-qt2/doc/html/qwsmanager_qws-h.html
+qt2/doc/html/qwsdecoration-members.html
+qt2/doc/html/qwsdecoration.html
+qt2/doc/html/qwsdecoration_qws-h.html
+qt2/doc/html/qwskeyboardhandler-members.html
+qt2/doc/html/qwskeyboardhandler.html
+qt2/doc/html/qwsmouse_qws-h.html
+qt2/doc/html/qwsmousehandler-members.html
+qt2/doc/html/qwsmousehandler.html
+qt2/doc/html/qwsserver-members.html
+qt2/doc/html/qwsserver.html
 qt2/doc/html/qxml-h.html
 qt2/doc/html/qxmlattributes-members.html
 qt2/doc/html/qxmlattributes.html
@@ -1566,6 +1581,7 @@ qt2/man/man3/QIntCacheIterator.3
 qt2/man/man3/QIntDict.3
 qt2/man/man3/QIntDictIterator.3
 qt2/man/man3/QIntValidator.3
+qt2/man/man3/QInterlaceStyle.3
 qt2/man/man3/QJisCodec.3
 qt2/man/man3/QJpUnicodeConv.3
 qt2/man/man3/QKeyEvent.3
@@ -1718,6 +1734,10 @@ qt2/man/man3/QValueStack.3
 qt2/man/man3/QVariant.3
 qt2/man/man3/QVector.3
 qt2/man/man3/QWMatrix.3
+qt2/man/man3/QWSDecoration.3
+qt2/man/man3/QWSKeyboardHandler.3
+qt2/man/man3/QWSMouseHandler.3
+qt2/man/man3/QWSServer.3
 qt2/man/man3/QWaitCondition.3
 qt2/man/man3/QWhatsThis.3
 qt2/man/man3/QWheelEvent.3
@@ -1893,6 +1913,7 @@ qt2/man/man3/qintcache.3
 qt2/man/man3/qintcacheiterator.3
 qt2/man/man3/qintdict.3
 qt2/man/man3/qintdictiterator.3
+qt2/man/man3/qinterlacestyle.3
 qt2/man/man3/qintvalidator.3
 qt2/man/man3/qiodevice.3
 qt2/man/man3/qiodevicesource.3
@@ -2058,6 +2079,10 @@ qt2/man/man3/qwindowsstyle.3
 qt2/man/man3/qwizard.3
 qt2/man/man3/qwmatrix.3
 qt2/man/man3/qworkspace.3
+qt2/man/man3/qwsdecoration.3
+qt2/man/man3/qwskeyboardhandler.3
+qt2/man/man3/qwsmousehandler.3
+qt2/man/man3/qwsserver.3
 qt2/man/man3/qxmlattributes.3
 qt2/man/man3/qxmlcontenthandler.3
 qt2/man/man3/qxmldeclhandler.3
diff --git a/x11/qt2-examples/pkg/PLIST b/x11/qt2-examples/pkg/PLIST
index 6eb0db7e20b..6f2f4de5918 100644
--- a/x11/qt2-examples/pkg/PLIST
+++ b/x11/qt2-examples/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/02/06 09:26:16 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/03/23 18:09:34 drochner Exp $
 qt2/examples/Makefile
 qt2/examples/README
 qt2/examples/aclock/Makefile
@@ -458,6 +458,11 @@ qt2/examples/tooltip/main.cpp
 qt2/examples/tooltip/tooltip.cpp
 qt2/examples/tooltip/tooltip.h
 qt2/examples/tooltip/tooltip.pro
+qt2/examples/trayicon/Makefile
+qt2/examples/trayicon/main.cpp
+qt2/examples/trayicon/trayicon.cpp
+qt2/examples/trayicon/trayicon.h
+qt2/examples/trayicon/trayicon.pro
 qt2/examples/validator/Makefile
 qt2/examples/validator/main.cpp
 qt2/examples/validator/motor.cpp
@@ -611,6 +616,7 @@ qt2/tutorial/tutorial.pro
 @dirrm qt2/examples/wizard
 @dirrm qt2/examples/widgets
 @dirrm qt2/examples/validator
+@dirrm qt2/examples/trayicon
 @dirrm qt2/examples/tooltip
 @dirrm qt2/examples/tictac
 @dirrm qt2/examples/themes
diff --git a/x11/qt2-libs/files/md5 b/x11/qt2-libs/files/md5
index ba7f81c6416..aa647af4920 100644
--- a/x11/qt2-libs/files/md5
+++ b/x11/qt2-libs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2001/02/06 09:26:16 skrll Exp $
+$NetBSD: md5,v 1.5 2001/03/23 18:09:34 drochner Exp $
 
-MD5 (qt-x11-2.2.4.tar.gz) = 0a5cb173ded05c6b6ea620396d16889d
+SHA1 (qt-x11-2.3.0.tar.gz) = 6ab5ff4f648bbe20c957f9124fc4e025385112ce
diff --git a/x11/qt2-libs/files/patch-sum b/x11/qt2-libs/files/patch-sum
index 3caa5cb9213..efb71afc37e 100644
--- a/x11/qt2-libs/files/patch-sum
+++ b/x11/qt2-libs/files/patch-sum
@@ -1,11 +1,11 @@
-$NetBSD: patch-sum,v 1.8 2001/02/06 09:26:16 skrll Exp $
+$NetBSD: patch-sum,v 1.9 2001/03/23 18:09:34 drochner Exp $
 
-MD5 (patch-aa) = f6bc4ea34dfacad75eef177acf72ce2d
-MD5 (patch-ab) = aa1df5b080b35d1d26f89ea8d593b571
-MD5 (patch-ac) = 04de629d6d27a0030c190b175940d9ef
-MD5 (patch-ad) = 6bb4068dfa73008cefd6a860391caaf9
-MD5 (patch-ae) = ccc502865ed75424a3949b5105e940db
-MD5 (patch-af) = eabc3b9b2a37d3b278ef9781305d4c93
-MD5 (patch-ag) = 8020cf4ecf96d264a35f3dd6cd0ab7a2
-MD5 (patch-ah) = 9ee8e4d6970cce23a80a816b0ff7afd2
-MD5 (patch-ai) = 36d97df8c8ba47f7303403b267f0ebc6
+SHA1 (patch-aa) = dc1e3bfee83a8f6b19a4ce78eaec709ac562ad51
+SHA1 (patch-ab) = 0b8657fc5b28e4ffb58584988758fdc4a9900a34
+SHA1 (patch-ac) = a85cb26d5cdcaa9ef61021d105d56a3a78cf5389
+SHA1 (patch-ad) = 416b001554e93cc8fa7c91f4876abc7e4aad392c
+SHA1 (patch-ae) = 47c46c62ef8114aa707430145ee42c6658e557a9
+SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b
+SHA1 (patch-ag) = 410c4c67a0a0651c2dbe15372a2112da471a0d62
+SHA1 (patch-ah) = ae572066db03cfdf5a3f33c702405d3a55dd3bfd
+SHA1 (patch-ai) = 20a61cefe445fdc8cac90da9800d0836ac57caf8
diff --git a/x11/qt2-libs/patches/patch-ae b/x11/qt2-libs/patches/patch-ae
index 4fe89f57fad..31aa69a683f 100644
--- a/x11/qt2-libs/patches/patch-ae
+++ b/x11/qt2-libs/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.6 2001/02/06 09:26:17 skrll Exp $
+$NetBSD: patch-ae,v 1.7 2001/03/23 18:09:34 drochner Exp $
 
---- src/Makefile.in.orig	Thu Feb  1 02:29:46 2001
+--- src/Makefile.in.orig	Mon Mar  5 19:12:49 2001
 +++ src/Makefile.in
 @@ -2,7 +2,7 @@
  
@@ -16,11 +16,11 @@ $NetBSD: patch-ae,v 1.6 2001/02/06 09:26:17 skrll Exp $
  ####### Target
  
 -DESTDIR = ../lib/
-+DESTDIR = 
++DESTDIR =
  VER_MAJ = 2
- VER_MIN = 2
- VER_PATCH = 4
-@@ -377,19 +377,7 @@
+ VER_MIN = 3
+ VER_PATCH = 0
+@@ -378,19 +378,7 @@
  .SUFFIXES: .cpp .cxx .cc .C .c
  
  .cpp.o:
@@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.6 2001/02/06 09:26:17 skrll Exp $
  
  ####### Build rules
  
-@@ -397,7 +385,7 @@
+@@ -398,7 +386,7 @@
  all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
  
  $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
diff --git a/x11/qt2-libs/pkg/PLIST b/x11/qt2-libs/pkg/PLIST
index 5b2ebebb795..4b1ecb0a068 100644
--- a/x11/qt2-libs/pkg/PLIST
+++ b/x11/qt2-libs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:11:03 agc Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/03/23 18:09:35 drochner Exp $
 qt2/bin/moc
 qt2/include/jri.h
 qt2/include/jritypes.h
@@ -109,6 +109,7 @@ qt2/include/qinputdialog.h
 qt2/include/qintcach.h
 qt2/include/qintcache.h
 qt2/include/qintdict.h
+qt2/include/qinterlacestyle.h
 qt2/include/qiodev.h
 qt2/include/qiodevice.h
 qt2/include/qjiscodec.h
@@ -284,7 +285,7 @@ qt2/lib/libqt.a
 qt2/lib/libqt.la
 qt2/lib/libqt.so
 qt2/lib/libqt.so.2
-qt2/lib/libqt.so.2.2
+qt2/lib/libqt.so.2.3
 @dirrm qt2/lib
 @dirrm qt2/include
 @dirrm qt2/bin
diff --git a/x11/qt2/Makefile.common b/x11/qt2/Makefile.common
index fc4e9f1256b..4fe14a31a4b 100644
--- a/x11/qt2/Makefile.common
+++ b/x11/qt2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.3 2001/02/06 09:26:11 skrll Exp $
+# $NetBSD: Makefile.common,v 1.4 2001/03/23 18:09:33 drochner Exp $
 #
 
-QTVERSION=	2.2.4
+QTVERSION=	2.3.0
 
 MAINTAINER=	skrll@netbsd.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html