diff --git a/x11/kde/addons3/Makefile b/x11/kde/addons3/Makefile
index 0c288bcf4e7..ae0668d47ab 100644
--- a/x11/kde/addons3/Makefile
+++ b/x11/kde/addons3/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.2 2002/04/02 17:06:23 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2002/04/04 12:13:01 espie Exp $
 
 COMMENT=		"X11 toolkit, addons"
 CATEGORIES=		x11 x11/kde
 NEED_VERSION=		1.504
-VERSION=		3.0rc3
+VERSION=		3.0
 DISTNAME=		kdeaddons-${VERSION}
 DIST_SUBDIR=		kde
 
 HOMEPAGE=		http://www.kde.org
-MASTER_SITES= http://gd.tuwien.ac.at/pub/kde/%SUBDIR%/
-MASTER_SITE_SUBDIR=	unstable/kde-${VERSION}/src
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${VERSION}/src
 EXTRACT_SUFX=		.tar.bz2
 
 # Parts of kde want shared libraries to work, as some symbols are
diff --git a/x11/kde/addons3/distinfo b/x11/kde/addons3/distinfo
index d42c973ee88..91a4c250d99 100644
--- a/x11/kde/addons3/distinfo
+++ b/x11/kde/addons3/distinfo
@@ -1,3 +1,3 @@
-MD5 (kde/kdeaddons-3.0rc3.tar.bz2) = 87b806dc331965f384bb71ebcfa736f8
-RMD160 (kde/kdeaddons-3.0rc3.tar.bz2) = 51389166c0123f85eafc9019325eed30ac4f89be
-SHA1 (kde/kdeaddons-3.0rc3.tar.bz2) = 054a8cf7fad6fb2012a10d4d2be02297c259d802
+MD5 (kde/kdeaddons-3.0.tar.bz2) = 18a7ce6b8b1b4577152ecbbf26a44d82
+RMD160 (kde/kdeaddons-3.0.tar.bz2) = b6d0253801cd52b04434d72f20d03bd63248e9bb
+SHA1 (kde/kdeaddons-3.0.tar.bz2) = be0dcf25dafd66131d2cfe523187e6aca2632dd8
diff --git a/x11/kde/addons3/pkg/PFRAG.shared b/x11/kde/addons3/pkg/PFRAG.shared
index 67446a0b771..9de7f24755c 100644
--- a/x11/kde/addons3/pkg/PFRAG.shared
+++ b/x11/kde/addons3/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/03/23 16:26:56 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2002/04/04 12:13:01 espie Exp $
 lib/kde3/libbabelfishplugin.so.0.0
 lib/kde3/libdirfilterplugin.so.0.0
 lib/kde3/libdomtreeviewerplugin.so.0.0
@@ -19,4 +19,4 @@ lib/kde3/libuachangerplugin.so.0.0
 lib/kde3/libvalidatorsplugin.so.0.0
 lib/kde3/libwebarchiverplugin.so.0.0
 lib/kde3/libwebarchivethumbnail.so.0.0
-NEWDYNLIBDIR(%D/lib/kde3)
+DYNLIBDIR(%D/lib/kde3)
diff --git a/x11/kde/addons3/pkg/PLIST b/x11/kde/addons3/pkg/PLIST
index 05338347cdd..86bcc9d4778 100644
--- a/x11/kde/addons3/pkg/PLIST
+++ b/x11/kde/addons3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/04/02 16:55:05 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2002/04/04 12:13:01 espie Exp $
 bin/dcop_kate
 bin/testor
 lib/kde3/katehtmltoolsplugin.la
@@ -119,44 +119,13 @@ share/mimelnk/application/x-webarchive.desktop
 share/services/kuickplugin.desktop
 share/services/webarchivethumbnail.desktop
 %%SHARED%%
-@dirrm share/services
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
 @dirrm share/icons/hicolor/22x22/apps
-@dirrm share/icons/hicolor/22x22/actions
-@dirrm share/icons/hicolor/22x22
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16/actions
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/icons
 @dirrm share/doc/HTML/en/konq-plugins
 @dirrm share/doc/HTML/en/kicker-applets
 @dirrm share/doc/HTML/en/kate-plugins
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/apps/konqsidebartng/entries
-@dirrm share/apps/konqsidebartng/add
-@dirrm share/apps/konqsidebartng
-@dirrm share/apps/konqlistview/kpartplugins
-@dirrm share/apps/konqlistview
-@dirrm share/apps/konqiconview/kpartplugins
-@dirrm share/apps/konqiconview
 @dirrm share/apps/knewsticker/scripts
 @dirrm share/apps/knewsticker
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
 @dirrm share/apps/khtml/kpartplugins
-@dirrm share/apps/khtml
 @dirrm share/apps/katexmltools
 @dirrm share/apps/kate/plugins/katexmltools
 @dirrm share/apps/kate/plugins/katetextfilter
@@ -165,7 +134,3 @@ share/services/webarchivethumbnail.desktop
 @dirrm share/apps/kate/plugins/kateinsertcommand
 @dirrm share/apps/kate/plugins/katehtmltools
 @dirrm share/apps/kate/plugins
-@dirrm share/apps
-@dirrm share/applnk/Settings/FileBrowsing
-@dirrm share/applnk/Settings
-@dirrm share/applnk
diff --git a/x11/kde/arts3/Makefile b/x11/kde/arts3/Makefile
index 29e15b723a1..e991c81c1a8 100644
--- a/x11/kde/arts3/Makefile
+++ b/x11/kde/arts3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2002/04/03 16:54:43 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2002/04/04 12:13:02 espie Exp $
 
 COMMENT=		"X11 toolkit, multimedia hub"
 CATEGORIES=		x11 x11/kde
@@ -9,7 +9,7 @@ DIST_SUBDIR=		kde
 
 HOMEPAGE=		http://www.kde.org
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/kde-${VERSION}/src
+MASTER_SITE_SUBDIR=	stable/${VERSION}/src
 EXTRACT_SUFX=	.tar.bz2
 
 # Parts of kde want shared libraries to work, as some symbols are
diff --git a/x11/kde/artwork3/Makefile b/x11/kde/artwork3/Makefile
index dfd4558b966..a32f3bcb005 100644
--- a/x11/kde/artwork3/Makefile
+++ b/x11/kde/artwork3/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.2 2002/04/02 17:06:23 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2002/04/04 12:13:02 espie Exp $
 
 COMMENT= 		"X11 toolkit, additional artwork"
 CATEGORIES=		x11 x11/kde
 NEED_VERSION=		1.504
-VERSION=		3.0rc3
+VERSION=		3.0
 DISTNAME=		kdeartwork-${VERSION}
 DIST_SUBDIR=		kde
 
 HOMEPAGE=		http://www.kde.org
-#MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITES= http://gd.tuwien.ac.at/pub/kde/%SUBDIR%/
-MASTER_SITE_SUBDIR=	unstable/kde-${VERSION}/src
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${VERSION}/src
 EXTRACT_SUFX=		.tar.bz2
 
 # Parts of kde want shared libraries to work, as some symbols are
diff --git a/x11/kde/artwork3/distinfo b/x11/kde/artwork3/distinfo
index 834bf1f8ec5..bc80f784549 100644
--- a/x11/kde/artwork3/distinfo
+++ b/x11/kde/artwork3/distinfo
@@ -1,3 +1,3 @@
-MD5 (kde/kdeartwork-3.0rc3.tar.bz2) = f560f282ef86b436accdb86c1ae0d146
-RMD160 (kde/kdeartwork-3.0rc3.tar.bz2) = dd14093f18c48ec98c5c5f5d345f63d8298bf363
-SHA1 (kde/kdeartwork-3.0rc3.tar.bz2) = 85385a2c32e65acdbb4083ee796cd9961c140507
+MD5 (kde/kdeartwork-3.0.tar.bz2) = 0ed66cfed5ce65a6fb54e37e8f232e44
+RMD160 (kde/kdeartwork-3.0.tar.bz2) = 319f95c5d68fb8038c154b68c5eb7544dcc2c908
+SHA1 (kde/kdeartwork-3.0.tar.bz2) = 6981b47bcc223c2b7bc2989acb82e9321679874d
diff --git a/x11/kde/artwork3/pkg/PFRAG.shared b/x11/kde/artwork3/pkg/PFRAG.shared
index b8f8a2f7c44..c8b7851d2ae 100644
--- a/x11/kde/artwork3/pkg/PFRAG.shared
+++ b/x11/kde/artwork3/pkg/PFRAG.shared
@@ -1,9 +1,9 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/03/23 15:09:35 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2002/04/04 12:13:02 espie Exp $
 lib/kde3/libkwin_cde.so.0.0
 lib/kde3/libkwin_cde_config.so.0.0
 lib/kde3/libkwin_glow.so.0.0
 lib/kde3/libkwin_glow_config.so.0.0
 lib/kde3/libkwin_openlook.so.0.0
 lib/kde3/plugins/styles/libdotnet.so.0.0
-NEWDYNLIBDIR(%D/lib/kde3)
-NEWDYNLIBDIR(%D/lib/kde3/plugins/styles)
+DYNLIBDIR(%D/lib/kde3)
+DYNLIBDIR(%D/lib/kde3/plugins/styles)
diff --git a/x11/kde/artwork3/pkg/PLIST b/x11/kde/artwork3/pkg/PLIST
index 832d195c970..bea87b2f2fe 100644
--- a/x11/kde/artwork3/pkg/PLIST
+++ b/x11/kde/artwork3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/04/02 16:45:05 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2002/04/04 12:13:02 espie Exp $
 bin/kbanner.kss
 bin/kblob.kss
 bin/kbouboule.kss
@@ -2857,8 +2857,6 @@ share/wallpapers/winter_theme_1.jpg
 @dirrm share/icons/Locolor/16x16/actions
 @dirrm share/icons/Locolor/16x16
 @dirrm share/icons/Locolor
-@dirrm share/icons
-@dirrm share/config
 @dirrm share/apps/kworldclock/maps/rainfall
 @dirrm share/apps/kworldclock/maps/mggd
 @dirrm share/apps/kworldclock/maps/depths
@@ -2874,10 +2872,7 @@ share/wallpapers/winter_theme_1.jpg
 @dirrm share/apps/kwin
 @dirrm share/apps/kthememgr/Themes
 @dirrm share/apps/kthememgr
-@dirrm share/apps/kstyle/themes
-@dirrm share/apps/kstyle
 @dirrm share/apps/kscreensaver
-@dirrm share/apps
 @dirrm share/applnk/System/ScreenSavers
 @dirrm share/applnk/System
 @dirrm share/applnk
diff --git a/x11/kde/base3/Makefile b/x11/kde/base3/Makefile
index 36431db511a..9290dcbef54 100644
--- a/x11/kde/base3/Makefile
+++ b/x11/kde/base3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2002/04/04 09:31:01 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2002/04/04 12:13:02 espie Exp $
 
 COMMENT= 		"X11 toolkit, basic applications"
 CATEGORIES=		x11 x11/kde
@@ -9,7 +9,7 @@ DIST_SUBDIR=		kde
 
 HOMEPAGE=		http://www.kde.org
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/kde-${VERSION}/src
+MASTER_SITE_SUBDIR=	stable/${VERSION}/src
 EXTRACT_SUFX=		.tar.bz2
 
 # Parts of kde want shared libraries to work, as some symbols are
diff --git a/x11/kde/games3/Makefile b/x11/kde/games3/Makefile
index d402afa72db..9aa42a6871f 100644
--- a/x11/kde/games3/Makefile
+++ b/x11/kde/games3/Makefile
@@ -1,17 +1,16 @@
-# $OpenBSD: Makefile,v 1.3 2002/04/02 17:06:23 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2002/04/04 12:13:02 espie Exp $
 
 COMMENT=		games for KDE
 
 CATEGORIES=		x11 x11/kde games
 NEED_VERSION=		1.504
-VERSION=		3.0rc3
+VERSION=		3.0
 DISTNAME=		kdegames-${VERSION}
 DIST_SUBDIR=		kde
 MODULES=qt3
 
-#MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITES= http://gd.tuwien.ac.at/pub/kde/%SUBDIR%/
-MASTER_SITE_SUBDIR=	unstable/kde-${VERSION}/src
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${VERSION}/src
 EXTRACT_SUFX=		.tar.bz2
 
 # Parts of kde want shared libraries to work, as some symbols are
diff --git a/x11/kde/games3/distinfo b/x11/kde/games3/distinfo
index a8f2d257c82..cadef232744 100644
--- a/x11/kde/games3/distinfo
+++ b/x11/kde/games3/distinfo
@@ -1,3 +1,3 @@
-MD5 (kde/kdegames-3.0rc3.tar.bz2) = 9ebcdfa9ab5dc19538fc24c85c955d5a
-RMD160 (kde/kdegames-3.0rc3.tar.bz2) = 330d5d7dc027a6351c0a09fb986643cc62a79ad5
-SHA1 (kde/kdegames-3.0rc3.tar.bz2) = a5a46e50080e97fc16b5fe3ba0d9dab2db6a5d93
+MD5 (kde/kdegames-3.0.tar.bz2) = e24b97b667212ccc2405aed8742ade16
+RMD160 (kde/kdegames-3.0.tar.bz2) = 13cd1987501206d9a927e31c215dfcc67a25c4c3
+SHA1 (kde/kdegames-3.0.tar.bz2) = 1f5145bb2df7924a707bd3a0b491071ee391dfde
diff --git a/x11/kde/games3/pkg/PFRAG.shared b/x11/kde/games3/pkg/PFRAG.shared
index a75ac4e916d..66a08248fe9 100644
--- a/x11/kde/games3/pkg/PFRAG.shared
+++ b/x11/kde/games3/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/03/23 15:04:48 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2002/04/04 12:13:02 espie Exp $
 lib/libkbackgammon.so.0.0
 lib/libkdegames.so.1.1
 lib/libkdehighscores.so.0.1
diff --git a/x11/kde/games3/pkg/PLIST b/x11/kde/games3/pkg/PLIST
index 39aaf62e5ff..a3d710aa82a 100644
--- a/x11/kde/games3/pkg/PLIST
+++ b/x11/kde/games3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/03/23 15:04:48 espie Exp $
+@comment $OpenBSD: PLIST,v 1.2 2002/04/04 12:13:02 espie Exp $
 bin/kasteroids
 bin/katomic
 bin/kbackgammon
@@ -1880,6 +1880,7 @@ share/icons/hicolor/16x16/apps/kbackgammon.png
 share/icons/hicolor/16x16/apps/kbackgammon_engine.png
 share/icons/hicolor/16x16/apps/kbattleship.png
 share/icons/hicolor/16x16/apps/kblackbox.png
+share/icons/hicolor/16x16/apps/kbounce.png
 share/icons/hicolor/16x16/apps/kenolaba.png
 share/icons/hicolor/16x16/apps/kjumpingcube.png
 share/icons/hicolor/16x16/apps/klines.png
@@ -1907,6 +1908,7 @@ share/icons/hicolor/32x32/apps/kbackgammon.png
 share/icons/hicolor/32x32/apps/kbackgammon_engine.png
 share/icons/hicolor/32x32/apps/kbattleship.png
 share/icons/hicolor/32x32/apps/kblackbox.png
+share/icons/hicolor/32x32/apps/kbounce.png
 share/icons/hicolor/32x32/apps/kenolaba.png
 share/icons/hicolor/32x32/apps/kjumpingcube.png
 share/icons/hicolor/32x32/apps/klines.png
@@ -1946,8 +1948,10 @@ share/icons/hicolor/48x48/apps/ksnake.png
 share/icons/hicolor/48x48/apps/ksokoban.png
 share/icons/hicolor/48x48/apps/kwin4.png
 share/icons/hicolor/48x48/apps/lskat.png
+share/icons/locolor/16x16/apps/kbounce.png
 share/icons/locolor/16x16/apps/kspaceduel.png
 share/icons/locolor/16x16/apps/lskat.png
+share/icons/locolor/32x32/apps/kbounce.png
 share/icons/locolor/32x32/apps/kspaceduel.png
 share/icons/locolor/32x32/apps/lskat.png
 %%SHARED%%
@@ -1957,17 +1961,7 @@ share/icons/locolor/32x32/apps/lskat.png
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
 @dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32/actions
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/22x22/actions
-@dirrm share/icons/hicolor/22x22
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16/actions
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/icons
 @dirrm share/doc/HTML/en/lskat
 @dirrm share/doc/HTML/en/kwin4
 @dirrm share/doc/HTML/en/ktuberling
@@ -1993,8 +1987,6 @@ share/icons/locolor/32x32/apps/lskat.png
 @dirrm share/doc/HTML/en/kbackgammon
 @dirrm share/doc/HTML/en/katomic
 @dirrm share/doc/HTML/en/kasteroids
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
 @dirrm share/apps/lskat/grafix
 @dirrm share/apps/lskat
 @dirrm share/apps/kwin4/grafix/default
@@ -2093,7 +2085,6 @@ share/icons/locolor/32x32/apps/lskat.png
 @dirrm share/apps/carddecks/cards-default
 @dirrm share/apps/carddecks/cards-aisleriot
 @dirrm share/apps/carddecks
-@dirrm share/apps
 @dirrm share/applnk/Toys
 @dirrm share/applnk/Games/TacticStrategy
 @dirrm share/applnk/Games/Card
diff --git a/x11/kde/graphics3/Makefile b/x11/kde/graphics3/Makefile
index 00f88f71b41..6c3cd216ad7 100644
--- a/x11/kde/graphics3/Makefile
+++ b/x11/kde/graphics3/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.3 2002/04/02 17:06:23 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2002/04/04 12:13:02 espie Exp $
 
 COMMENT=		"X11 toolkit, graphic applications"
 CATEGORIES=		x11 x11/kde
 NEED_VERSION=		1.504
-VERSION=		3.0rc3
+VERSION=		3.0
 DISTNAME=		kdegraphics-${VERSION}
 DIST_SUBDIR=		kde
 
 HOMEPAGE=		http://www.kde.org
-MASTER_SITES= http://gd.tuwien.ac.at/pub/kde/%SUBDIR%/
-MASTER_SITE_SUBDIR=	unstable/kde-${VERSION}/src
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${VERSION}/src
 EXTRACT_SUFX=		.tar.bz2
 
 # Parts of kde want shared libraries to work, as some symbols are
diff --git a/x11/kde/graphics3/distinfo b/x11/kde/graphics3/distinfo
index ede6d8bc818..b2297a0942a 100644
--- a/x11/kde/graphics3/distinfo
+++ b/x11/kde/graphics3/distinfo
@@ -1,3 +1,3 @@
-MD5 (kde/kdegraphics-3.0rc3.tar.bz2) = 2b610d55c72c0b6d171300d1297ee096
-RMD160 (kde/kdegraphics-3.0rc3.tar.bz2) = fcd59e47fff4ec10344d431360b22b187bf73c48
-SHA1 (kde/kdegraphics-3.0rc3.tar.bz2) = 24a136c2aae427ae097ff6d89356aae633b2e8c6
+MD5 (kde/kdegraphics-3.0.tar.bz2) = e90e7df47c51c10355b4f034f5e74788
+RMD160 (kde/kdegraphics-3.0.tar.bz2) = 066b0b75951dc65d7ef7a5bc811867a7f7bd68c4
+SHA1 (kde/kdegraphics-3.0.tar.bz2) = eb331acbd2bd00db7db7cca20941983037517cac
diff --git a/x11/kde/graphics3/pkg/PFRAG.shared b/x11/kde/graphics3/pkg/PFRAG.shared
index 1de79986f8c..8851b044cd4 100644
--- a/x11/kde/graphics3/pkg/PFRAG.shared
+++ b/x11/kde/graphics3/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/03/23 17:00:12 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2002/04/04 12:13:02 espie Exp $
 lib/kde3/libkfile_pdf.so.0.0
 lib/kde3/libkfile_png.so.0.0
 lib/kde3/libkfile_ps.so.0.0
@@ -13,4 +13,4 @@ lib/libkview.so.0.0
 lib/libkviewerpart.so.0.0
 lib/libkviewpart.so.0.0
 DYNLIBDIR(%D/lib)
-NEWDYNLIBDIR(%D/lib/kde3)
+DYNLIBDIR(%D/lib/kde3)
diff --git a/x11/kde/graphics3/pkg/PLIST b/x11/kde/graphics3/pkg/PLIST
index a4bfa3f577b..ccece83999d 100644
--- a/x11/kde/graphics3/pkg/PLIST
+++ b/x11/kde/graphics3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/04/02 16:45:05 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2002/04/04 12:13:02 espie Exp $
 bin/kcolorchooser
 bin/kcoloredit
 bin/kdvi
@@ -211,20 +211,13 @@ share/services/kfile_pdf.desktop
 share/services/kfile_png.desktop
 share/services/kfile_ps.desktop
 %%SHARED%%
-@dirrm share/services
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
 @dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/icons
 @dirrm share/doc/HTML/en/kview
 @dirrm share/doc/HTML/en/kuickshow
 @dirrm share/doc/HTML/en/ksnapshot
@@ -236,8 +229,6 @@ share/services/kfile_ps.desktop
 @dirrm share/doc/HTML/en/kfract
 @dirrm share/doc/HTML/en/kdvi
 @dirrm share/doc/HTML/en/kcoloredit
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
 @dirrm share/apps/kviewshell
 @dirrm share/apps/kviewerpart
 @dirrm share/apps/kview/toolbar
@@ -256,6 +247,5 @@ share/services/kfile_ps.desktop
 @dirrm share/apps/kfax
 @dirrm share/apps/kdvi/toolbar
 @dirrm share/apps/kdvi
-@dirrm share/apps
 @dirrm share/applnk/Graphics
 @dirrm share/applnk
diff --git a/x11/kde/libs3/Makefile b/x11/kde/libs3/Makefile
index 6890e9eaad8..75938a95c0f 100644
--- a/x11/kde/libs3/Makefile
+++ b/x11/kde/libs3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2002/04/04 09:31:01 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2002/04/04 12:13:02 espie Exp $
 
 COMMENT=		"X11 toolkit, libraries"
 CATEGORIES=		x11 x11/kde
@@ -9,7 +9,7 @@ DIST_SUBDIR=		kde
 
 HOMEPAGE=		http://www.kde.org
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/kde-${VERSION}/src
+MASTER_SITE_SUBDIR=	stable/${VERSION}/src
 EXTRACT_SUFX=		.tar.bz2
 
 # Parts of kde want shared libraries to work, as some symbols are