6 files changed, 21 insertions, 45 deletions
diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile
index 04570befdf0..f98fbe77b47 100644
--- a/misc/kdeadmin3/Makefile
+++ b/misc/kdeadmin3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2006/04/17 13:46:40 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2006/06/01 14:11:43 markd Exp $
 
 DISTNAME=	kdeadmin-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	System administration tools for the KDE integrated X11 desktop
 
diff --git a/misc/kdeadmin3/distinfo b/misc/kdeadmin3/distinfo
index dadc85ff0ba..7c66cc8e95b 100644
--- a/misc/kdeadmin3/distinfo
+++ b/misc/kdeadmin3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2006/05/29 13:31:58 joerg Exp $
+$NetBSD: distinfo,v 1.30 2006/06/01 14:11:43 markd Exp $
 
-SHA1 (kdeadmin-3.5.2.tar.bz2) = e7507312b7124ba60380354be98bb323e203d362
-RMD160 (kdeadmin-3.5.2.tar.bz2) = 8dc2dd10ece25152345b86c832ce631ebe0a9822
-Size (kdeadmin-3.5.2.tar.bz2) = 2110685 bytes
+SHA1 (kdeadmin-3.5.3.tar.bz2) = 1ddc33a75702aaf0c8e7a35eefe04aae2835971c
+RMD160 (kdeadmin-3.5.3.tar.bz2) = 4785dd89e8078da1b3f8b3e8b424dbb1c1eeb257
+Size (kdeadmin-3.5.3.tar.bz2) = 2114019 bytes
 SHA1 (patch-aa) = a61591d2400edb8cbcc764a1d5462ba0269abe03
diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile
index 0db3d6c3192..16829d0d3b1 100644
--- a/misc/kdeartwork3/Makefile
+++ b/misc/kdeartwork3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2006/05/16 14:57:06 tron Exp $
+# $NetBSD: Makefile,v 1.37 2006/06/01 14:09:09 markd Exp $
 
 DISTNAME=	kdeartwork-${_KDE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Artwork for the KDE integrated X11 desktop
 
diff --git a/misc/kdeartwork3/PLIST b/misc/kdeartwork3/PLIST
index 96cd3757135..a945b036fc2 100644
--- a/misc/kdeartwork3/PLIST
+++ b/misc/kdeartwork3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2006/05/16 14:57:06 tron Exp $
+@comment $NetBSD: PLIST,v 1.23 2006/06/01 14:09:09 markd Exp $
 bin/kbanner.kss
 bin/kblob.kss
 bin/kclock.kss
@@ -1471,20 +1471,6 @@ share/kde/icons/Locolor/32x32/mimetypes/vcalendar.png
 share/kde/icons/Locolor/32x32/mimetypes/vcard.png
 share/kde/icons/Locolor/32x32/mimetypes/video.png
 share/kde/icons/Locolor/index.theme
-share/kde/icons/hicolor/16x16/actions/show_side_panel.png
-share/kde/icons/hicolor/16x16/actions/view_fit_width.png
-share/kde/icons/hicolor/16x16/actions/view_fit_window.png
-share/kde/icons/hicolor/16x16/apps/kmenu.png
-share/kde/icons/hicolor/22x22/actions/show_side_panel.png
-share/kde/icons/hicolor/22x22/actions/view_fit_width.png
-share/kde/icons/hicolor/22x22/actions/view_fit_window.png
-share/kde/icons/hicolor/22x22/apps/kmenu.png
-share/kde/icons/hicolor/32x32/actions/show_side_panel.png
-share/kde/icons/hicolor/32x32/actions/view_fit_width.png
-share/kde/icons/hicolor/32x32/actions/view_fit_window.png
-share/kde/icons/hicolor/32x32/apps/kmenu.png
-share/kde/icons/hicolor/48x48/apps/kmenu.png
-share/kde/icons/hicolor/scalable/apps/kmenu.svgz
 share/kde/icons/ikons/16x16/actions/1day.png
 share/kde/icons/ikons/16x16/actions/1downarrow.png
 share/kde/icons/ikons/16x16/actions/1leftarrow.png
@@ -3548,6 +3534,11 @@ share/kde/icons/kdeclassic/22x22/actions/stop.png
 share/kde/icons/kdeclassic/22x22/actions/sub.png
 share/kde/icons/kdeclassic/22x22/actions/sum.png
 share/kde/icons/kdeclassic/22x22/actions/super.png
+share/kde/icons/kdeclassic/22x22/actions/tab_breakoff.png
+share/kde/icons/kdeclassic/22x22/actions/tab_duplicate.png
+share/kde/icons/kdeclassic/22x22/actions/tab_new.png
+share/kde/icons/kdeclassic/22x22/actions/tab_new_bg.png
+share/kde/icons/kdeclassic/22x22/actions/tab_remove.png
 share/kde/icons/kdeclassic/22x22/actions/text.png
 share/kde/icons/kdeclassic/22x22/actions/text_block.png
 share/kde/icons/kdeclassic/22x22/actions/text_bold.png
@@ -3860,6 +3851,11 @@ share/kde/icons/kdeclassic/32x32/actions/sqrt.png
 share/kde/icons/kdeclassic/32x32/actions/start.png
 share/kde/icons/kdeclassic/32x32/actions/stop.png
 share/kde/icons/kdeclassic/32x32/actions/sum.png
+share/kde/icons/kdeclassic/32x32/actions/tab_breakoff.png
+share/kde/icons/kdeclassic/32x32/actions/tab_duplicate.png
+share/kde/icons/kdeclassic/32x32/actions/tab_new.png
+share/kde/icons/kdeclassic/32x32/actions/tab_new_bg.png
+share/kde/icons/kdeclassic/32x32/actions/tab_remove.png
 share/kde/icons/kdeclassic/32x32/actions/text_block.png
 share/kde/icons/kdeclassic/32x32/actions/text_bold.png
 share/kde/icons/kdeclassic/32x32/actions/text_center.png
diff --git a/misc/kdeartwork3/distinfo b/misc/kdeartwork3/distinfo
index 2054bcd8548..0291aac1053 100644
--- a/misc/kdeartwork3/distinfo
+++ b/misc/kdeartwork3/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.27 2006/03/30 02:55:31 markd Exp $
+$NetBSD: distinfo,v 1.28 2006/06/01 14:09:09 markd Exp $
 
-SHA1 (kdeartwork-3.5.2.tar.bz2) = 12128d459cf26312769a66d3ec1935dd2cebc17d
-RMD160 (kdeartwork-3.5.2.tar.bz2) = 55c68134beb452c6316211f7a4fe1c0c4404a154
-Size (kdeartwork-3.5.2.tar.bz2) = 16620565 bytes
+SHA1 (kdeartwork-3.5.3.tar.bz2) = 5eb0aa93b9be182721918d1f81d8ebe41cc857bb
+RMD160 (kdeartwork-3.5.3.tar.bz2) = 1dad7543b60acf98f143364e1910c3c49a66f607
+Size (kdeartwork-3.5.3.tar.bz2) = 16599096 bytes
 SHA1 (patch-aa) = ea46c5b6fe3c7d57e3bb3fc68fadccde7855e764
-SHA1 (patch-ab) = ee7c837d1b75da34a358097bbc70832dc79700c3
diff --git a/misc/kdeartwork3/patches/patch-ab b/misc/kdeartwork3/patches/patch-ab
deleted file mode 100644
index ac6273deb2e..00000000000
--- a/misc/kdeartwork3/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/12/11 11:31:45 markd Exp $
-
---- kscreensaver/kdesavers/rotation.h.orig	2004-04-17 11:42:39.000000000 +1200
-+++ kscreensaver/kdesavers/rotation.h
-@@ -51,9 +51,9 @@ class EulerOdeSolver : public RkOdeSolve
-    EulerOdeSolver(
-       const double &t,
-       const double &dt,
--      const double &_A,
--      const double &_B,
--      const double &_C,
-+      const double &A_,
-+      const double &B_,
-+      const double &C_,
-       std::valarray<double> &_y,
-       const double &eps);
-