Update to KDE 3.5

Many new features and refinements.

Notable changes include:
* Konqueror is the second web browser to pass the Acid2 CSS test,
  ahead of Firefox and Internet Explorer
* Konqueror can also now free web pages from adverts with its
  ad-block feature
* SuperKaramba is included in KDE, providing well-integrated and
  easy-to-install widgets for the user's desktop
* Kopete has support for MSN and Yahoo! webcams
* The edutainment module has three new applications (KGeography,
  Kanagram and blinKen), and has seen huge improvements in Kalzium

5 files changed, 137 insertions, 234 deletions

diff --git a/misc/kdeartwork3/PLIST b/misc/kdeartwork3/PLIST
index 7b739bf0b98..348504ea4f5 100644
--- a/misc/kdeartwork3/PLIST
+++ b/misc/kdeartwork3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2005/10/13 13:02:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.19 2005/12/11 11:31:45 markd Exp $
 bin/kbanner.kss
 bin/kblob.kss
 bin/kclock.kss
@@ -30,16 +30,19 @@ lib/kde3/kwin3_kde1.la
 lib/kde3/kwin3_kstep.la
 lib/kde3/kwin3_openlook.la
 lib/kde3/kwin3_riscos.la
+lib/kde3/kwin3_smoothblend.la
 lib/kde3/kwin3_system.la
 lib/kde3/kwin_cde_config.la
 lib/kde3/kwin_glow_config.la
 lib/kde3/kwin_icewm_config.la
+lib/kde3/kwin_smoothblend_config.la
 lib/kde3/plugins/styles/dotnet.la
 lib/kde3/plugins/styles/phasestyle.la
 share/kde/applnk/System/ScreenSavers/KBanner.desktop
 share/kde/applnk/System/ScreenSavers/KBlob.desktop
 share/kde/applnk/System/ScreenSavers/KClock.desktop
 share/kde/applnk/System/ScreenSavers/KEuphoria.desktop
+share/kde/applnk/System/ScreenSavers/KFiresaver.desktop
 share/kde/applnk/System/ScreenSavers/KFlux.desktop
 share/kde/applnk/System/ScreenSavers/KFountain.desktop
 share/kde/applnk/System/ScreenSavers/KGravity.desktop
@@ -469,6 +472,7 @@ share/kde/apps/kwin/kde1.desktop
 share/kde/apps/kwin/kstep.desktop
 share/kde/apps/kwin/openlook.desktop
 share/kde/apps/kwin/riscos.desktop
+share/kde/apps/kwin/smoothblend.desktop
 share/kde/apps/kwin/system.desktop
 share/kde/apps/kworldclock/maps/alt/1200.jpg
 share/kde/apps/kworldclock/maps/alt/200.jpg
@@ -490,8 +494,6 @@ share/kde/apps/kworldclock/maps/caida_bw/200.jpg
 share/kde/apps/kworldclock/maps/caida_bw/400.jpg
 share/kde/apps/kworldclock/maps/caida_bw/800.jpg
 share/kde/apps/kworldclock/maps/caida_bw/caida_bw.desktop
-share/kde/apps/kworldclock/maps/depths/1440.jpg
-share/kde/apps/kworldclock/maps/depths/200.jpg
 share/kde/apps/kworldclock/maps/mggd/1440.jpg
 share/kde/apps/kworldclock/maps/mggd/200.jpg
 share/kde/apps/kworldclock/maps/mggd/400.jpg
@@ -1918,6 +1920,7 @@ share/kde/icons/kdeclassic/16x16/actions/abentry.png
 share/kde/icons/kdeclassic/16x16/actions/abottom.png
 share/kde/icons/kdeclassic/16x16/actions/about_kde.png
 share/kde/icons/kdeclassic/16x16/actions/abs.png
+share/kde/icons/kdeclassic/16x16/actions/addquestion.png
 share/kde/icons/kdeclassic/16x16/actions/adjustcol.png
 share/kde/icons/kdeclassic/16x16/actions/adjustrow.png
 share/kde/icons/kdeclassic/16x16/actions/ahcenter.png
@@ -1985,6 +1988,7 @@ share/kde/icons/kdeclassic/16x16/actions/connect_no.png
 share/kde/icons/kdeclassic/16x16/actions/contents.png
 share/kde/icons/kdeclassic/16x16/actions/contents2.png
 share/kde/icons/kdeclassic/16x16/actions/contexthelp.png
+share/kde/icons/kdeclassic/16x16/actions/control.png
 share/kde/icons/kdeclassic/16x16/actions/crop.png
 share/kde/icons/kdeclassic/16x16/actions/cssvalidator.png
 share/kde/icons/kdeclassic/16x16/actions/curfiledir.png
@@ -2000,6 +2004,7 @@ share/kde/icons/kdeclassic/16x16/actions/delete_table_col.png
 share/kde/icons/kdeclassic/16x16/actions/delete_table_row.png
 share/kde/icons/kdeclassic/16x16/actions/deletecell.png
 share/kde/icons/kdeclassic/16x16/actions/deletelayer.png
+share/kde/icons/kdeclassic/16x16/actions/delquestion.png
 share/kde/icons/kdeclassic/16x16/actions/dhcenter.png
 share/kde/icons/kdeclassic/16x16/actions/dhdist.png
 share/kde/icons/kdeclassic/16x16/actions/dissociatecell.png
@@ -2017,6 +2022,7 @@ share/kde/icons/kdeclassic/16x16/actions/editcopy.png
 share/kde/icons/kdeclassic/16x16/actions/editcut.png
 share/kde/icons/kdeclassic/16x16/actions/editdelete.png
 share/kde/icons/kdeclassic/16x16/actions/editpaste.png
+share/kde/icons/kdeclassic/16x16/actions/editquestion.png
 share/kde/icons/kdeclassic/16x16/actions/editshred.png
 share/kde/icons/kdeclassic/16x16/actions/edittrash.png
 share/kde/icons/kdeclassic/16x16/actions/effect.png
@@ -2396,6 +2402,7 @@ share/kde/icons/kdeclassic/16x16/actions/series.png
 share/kde/icons/kdeclassic/16x16/actions/servicenew_kdevelop.png
 share/kde/icons/kdeclassic/16x16/actions/share.png
 share/kde/icons/kdeclassic/16x16/actions/shear.png
+share/kde/icons/kdeclassic/16x16/actions/show_side_panel.png
 share/kde/icons/kdeclassic/16x16/actions/show_table_column.png
 share/kde/icons/kdeclassic/16x16/actions/show_table_row.png
 share/kde/icons/kdeclassic/16x16/actions/signature.png
@@ -2464,6 +2471,9 @@ share/kde/icons/kdeclassic/16x16/actions/vertical_text.png
 share/kde/icons/kdeclassic/16x16/actions/view_bottom.png
 share/kde/icons/kdeclassic/16x16/actions/view_choose.png
 share/kde/icons/kdeclassic/16x16/actions/view_detailed.png
+share/kde/icons/kdeclassic/16x16/actions/view_fit_height.png
+share/kde/icons/kdeclassic/16x16/actions/view_fit_width.png
+share/kde/icons/kdeclassic/16x16/actions/view_fit_window.png
 share/kde/icons/kdeclassic/16x16/actions/view_icon.png
 share/kde/icons/kdeclassic/16x16/actions/view_left_right.png
 share/kde/icons/kdeclassic/16x16/actions/view_multicolumn.png
@@ -2882,7 +2892,6 @@ share/kde/icons/kdeclassic/16x16/mimetypes/font_truetype.png
 share/kde/icons/kdeclassic/16x16/mimetypes/font_type1.png
 share/kde/icons/kdeclassic/16x16/mimetypes/gf.png
 share/kde/icons/kdeclassic/16x16/mimetypes/html.png
-share/kde/icons/kdeclassic/16x16/mimetypes/image.mng
 share/kde/icons/kdeclassic/16x16/mimetypes/image.png
 share/kde/icons/kdeclassic/16x16/mimetypes/info.png
 share/kde/icons/kdeclassic/16x16/mimetypes/karbon_karbon.png
@@ -2974,6 +2983,7 @@ share/kde/icons/kdeclassic/22x22/actions/about_kde.png
 share/kde/icons/kdeclassic/22x22/actions/abs.png
 share/kde/icons/kdeclassic/22x22/actions/add_group.png
 share/kde/icons/kdeclassic/22x22/actions/add_user.png
+share/kde/icons/kdeclassic/22x22/actions/addquestion.png
 share/kde/icons/kdeclassic/22x22/actions/adjustcol.png
 share/kde/icons/kdeclassic/22x22/actions/adjustrow.png
 share/kde/icons/kdeclassic/22x22/actions/agenda.png
@@ -3069,6 +3079,7 @@ share/kde/icons/kdeclassic/22x22/actions/connect_no.png
 share/kde/icons/kdeclassic/22x22/actions/contents.png
 share/kde/icons/kdeclassic/22x22/actions/contents2.png
 share/kde/icons/kdeclassic/22x22/actions/contexthelp.png
+share/kde/icons/kdeclassic/22x22/actions/control.png
 share/kde/icons/kdeclassic/22x22/actions/crop.png
 share/kde/icons/kdeclassic/22x22/actions/cssvalidator.png
 share/kde/icons/kdeclassic/22x22/actions/cubicbeziercurve.png
@@ -3094,6 +3105,7 @@ share/kde/icons/kdeclassic/22x22/actions/delete_table_col.png
 share/kde/icons/kdeclassic/22x22/actions/delete_table_row.png
 share/kde/icons/kdeclassic/22x22/actions/delete_user.png
 share/kde/icons/kdeclassic/22x22/actions/deletecell.png
+share/kde/icons/kdeclassic/22x22/actions/delquestion.png
 share/kde/icons/kdeclassic/22x22/actions/delslide.png
 share/kde/icons/kdeclassic/22x22/actions/depth-.png
 share/kde/icons/kdeclassic/22x22/actions/dissociatecell.png
@@ -3113,6 +3125,7 @@ share/kde/icons/kdeclassic/22x22/actions/editcopy.png
 share/kde/icons/kdeclassic/22x22/actions/editcut.png
 share/kde/icons/kdeclassic/22x22/actions/editdelete.png
 share/kde/icons/kdeclassic/22x22/actions/editpaste.png
+share/kde/icons/kdeclassic/22x22/actions/editquestion.png
 share/kde/icons/kdeclassic/22x22/actions/editshred.png
 share/kde/icons/kdeclassic/22x22/actions/edittool.png
 share/kde/icons/kdeclassic/22x22/actions/edittrash.png
@@ -3172,6 +3185,7 @@ share/kde/icons/kdeclassic/22x22/actions/halfencrypted.png
 share/kde/icons/kdeclassic/22x22/actions/help.png
 share/kde/icons/kdeclassic/22x22/actions/hide_table_column.png
 share/kde/icons/kdeclassic/22x22/actions/hide_table_row.png
+share/kde/icons/kdeclassic/22x22/actions/higher.png
 share/kde/icons/kdeclassic/22x22/actions/hilo.png
 share/kde/icons/kdeclassic/22x22/actions/history.png
 share/kde/icons/kdeclassic/22x22/actions/htmlvalidator.png
@@ -3201,7 +3215,6 @@ share/kde/icons/kdeclassic/22x22/actions/kalarm_disabled.png
 share/kde/icons/kdeclassic/22x22/actions/kalarmdgui.png
 share/kde/icons/kdeclassic/22x22/actions/kalarmdgui_disabled.png
 share/kde/icons/kdeclassic/22x22/actions/kanjidic.png
-share/kde/icons/kdeclassic/22x22/actions/kde.png
 share/kde/icons/kdeclassic/22x22/actions/kdeprint_addprinter.png
 share/kde/icons/kdeclassic/22x22/actions/kdeprint_addpseudo.png
 share/kde/icons/kdeclassic/22x22/actions/kdeprint_configmgr.png
@@ -3517,6 +3530,7 @@ share/kde/icons/kdeclassic/22x22/actions/shadowR.png
 share/kde/icons/kdeclassic/22x22/actions/shadowRB.png
 share/kde/icons/kdeclassic/22x22/actions/shadowRU.png
 share/kde/icons/kdeclassic/22x22/actions/shadowU.png
+share/kde/icons/kdeclassic/22x22/actions/show_side_panel.png
 share/kde/icons/kdeclassic/22x22/actions/show_table_column.png
 share/kde/icons/kdeclassic/22x22/actions/show_table_row.png
 share/kde/icons/kdeclassic/22x22/actions/showmenu.png
@@ -3592,6 +3606,9 @@ share/kde/icons/kdeclassic/22x22/actions/vertical_text.png
 share/kde/icons/kdeclassic/22x22/actions/view_bottom.png
 share/kde/icons/kdeclassic/22x22/actions/view_choose.png
 share/kde/icons/kdeclassic/22x22/actions/view_detailed.png
+share/kde/icons/kdeclassic/22x22/actions/view_fit_height.png
+share/kde/icons/kdeclassic/22x22/actions/view_fit_width.png
+share/kde/icons/kdeclassic/22x22/actions/view_fit_window.png
 share/kde/icons/kdeclassic/22x22/actions/view_icon.png
 share/kde/icons/kdeclassic/22x22/actions/view_left_right.png
 share/kde/icons/kdeclassic/22x22/actions/view_multicolumn.png
@@ -3740,7 +3757,6 @@ share/kde/icons/kdeclassic/32x32/actions/insert_table_col.png
 share/kde/icons/kdeclassic/32x32/actions/insert_table_row.png
 share/kde/icons/kdeclassic/32x32/actions/int.png
 share/kde/icons/kdeclassic/32x32/actions/jail_pay.png
-share/kde/icons/kdeclassic/32x32/actions/kde.png
 share/kde/icons/kdeclassic/32x32/actions/kdeprint_inklevel.png
 share/kde/icons/kdeclassic/32x32/actions/krec_record.png
 share/kde/icons/kdeclassic/32x32/actions/ktip.png
@@ -3842,6 +3858,7 @@ share/kde/icons/kdeclassic/32x32/actions/rsub.png
 share/kde/icons/kdeclassic/32x32/actions/rsup.png
 share/kde/icons/kdeclassic/32x32/actions/run.png
 share/kde/icons/kdeclassic/32x32/actions/share.png
+share/kde/icons/kdeclassic/32x32/actions/show_side_panel.png
 share/kde/icons/kdeclassic/32x32/actions/signature.png
 share/kde/icons/kdeclassic/32x32/actions/sort_az.png
 share/kde/icons/kdeclassic/32x32/actions/spellcheck.png
@@ -3871,6 +3888,9 @@ share/kde/icons/kdeclassic/32x32/actions/up.png
 share/kde/icons/kdeclassic/32x32/actions/view_bottom.png
 share/kde/icons/kdeclassic/32x32/actions/view_choose.png
 share/kde/icons/kdeclassic/32x32/actions/view_detailed.png
+share/kde/icons/kdeclassic/32x32/actions/view_fit_height.png
+share/kde/icons/kdeclassic/32x32/actions/view_fit_width.png
+share/kde/icons/kdeclassic/32x32/actions/view_fit_window.png
 share/kde/icons/kdeclassic/32x32/actions/view_icon.png
 share/kde/icons/kdeclassic/32x32/actions/view_left_right.png
 share/kde/icons/kdeclassic/32x32/actions/view_multicolumn.png
@@ -4070,6 +4090,7 @@ share/kde/icons/kdeclassic/32x32/apps/ksirtet.png
 share/kde/icons/kdeclassic/32x32/apps/ksmiletris.png
 share/kde/icons/kdeclassic/32x32/apps/ksnake.png
 share/kde/icons/kdeclassic/32x32/apps/ksnapshot.png
+share/kde/icons/kdeclassic/32x32/apps/ksokoban.png
 share/kde/icons/kdeclassic/32x32/apps/kspaceduel.png
 share/kde/icons/kdeclassic/32x32/apps/kspread.png
 share/kde/icons/kdeclassic/32x32/apps/kstars.png
@@ -4102,6 +4123,7 @@ share/kde/icons/kdeclassic/32x32/apps/laptop_pcmcia.png
 share/kde/icons/kdeclassic/32x32/apps/licq.png
 share/kde/icons/kdeclassic/32x32/apps/locale.png
 share/kde/icons/kdeclassic/32x32/apps/looknfeel.png
+share/kde/icons/kdeclassic/32x32/apps/lskat.png
 share/kde/icons/kdeclassic/32x32/apps/lyx.png
 share/kde/icons/kdeclassic/32x32/apps/mac.png
 share/kde/icons/kdeclassic/32x32/apps/mathematica.png
@@ -4492,6 +4514,7 @@ share/kde/icons/kdeclassic/48x48/apps/laptop_pcmcia.png
 share/kde/icons/kdeclassic/48x48/apps/licq.png
 share/kde/icons/kdeclassic/48x48/apps/locale.png
 share/kde/icons/kdeclassic/48x48/apps/looknfeel.png
+share/kde/icons/kdeclassic/48x48/apps/lskat.png
 share/kde/icons/kdeclassic/48x48/apps/mouse.png
 share/kde/icons/kdeclassic/48x48/apps/mozilla.png
 share/kde/icons/kdeclassic/48x48/apps/multimedia.png
@@ -6041,6 +6064,7 @@ share/kde/icons/slick/16x16/actions/editdelete.png
 share/kde/icons/slick/16x16/actions/editpaste.png
 share/kde/icons/slick/16x16/actions/editshred.png
 share/kde/icons/slick/16x16/actions/edittrash.png
+share/kde/icons/slick/16x16/actions/emptytrash.png
 share/kde/icons/slick/16x16/actions/encrypted.png
 share/kde/icons/slick/16x16/actions/enhanced_browsing.png
 share/kde/icons/slick/16x16/actions/exec.png
@@ -6073,6 +6097,7 @@ share/kde/icons/slick/16x16/actions/history_clear.png
 share/kde/icons/slick/16x16/actions/hotlistadd.png
 share/kde/icons/slick/16x16/actions/hotlistdel.png
 share/kde/icons/slick/16x16/actions/idea.png
+share/kde/icons/slick/16x16/actions/identity.png
 share/kde/icons/slick/16x16/actions/imagegallery.png
 share/kde/icons/slick/16x16/actions/indicator_connect.png
 share/kde/icons/slick/16x16/actions/indicator_empty.png
@@ -6178,7 +6203,6 @@ share/kde/icons/slick/16x16/actions/webarchiver.png
 share/kde/icons/slick/16x16/actions/window_fullscreen.png
 share/kde/icons/slick/16x16/actions/window_new.png
 share/kde/icons/slick/16x16/actions/window_nofullscreen.png
-share/kde/icons/slick/16x16/actions/wizard.png
 share/kde/icons/slick/16x16/actions/yellowled.png
 share/kde/icons/slick/16x16/apps/ark.png
 share/kde/icons/slick/16x16/apps/background.png
@@ -6197,6 +6221,7 @@ share/kde/icons/slick/16x16/apps/gimp.png
 share/kde/icons/slick/16x16/apps/go.png
 share/kde/icons/slick/16x16/apps/help_index.png
 share/kde/icons/slick/16x16/apps/hwinfo.png
+share/kde/icons/slick/16x16/apps/icon-cartoon.png
 share/kde/icons/slick/16x16/apps/icons.png
 share/kde/icons/slick/16x16/apps/k3b.png
 share/kde/icons/slick/16x16/apps/kab.png
@@ -6263,7 +6288,6 @@ share/kde/icons/slick/16x16/apps/kprintfax.png
 share/kde/icons/slick/16x16/apps/kreatecd.png
 share/kde/icons/slick/16x16/apps/kscd.png
 share/kde/icons/slick/16x16/apps/kscreensaver.png
-share/kde/icons/slick/16x16/apps/kshowmail.png
 share/kde/icons/slick/16x16/apps/ksysguard.png
 share/kde/icons/slick/16x16/apps/ksysv.png
 share/kde/icons/slick/16x16/apps/kteatime.png
@@ -6272,6 +6296,7 @@ share/kde/icons/slick/16x16/apps/kuickshow.png
 share/kde/icons/slick/16x16/apps/kview.png
 share/kde/icons/slick/16x16/apps/kwikdisk.png
 share/kde/icons/slick/16x16/apps/kwin.png
+share/kde/icons/slick/16x16/apps/kword.png
 share/kde/icons/slick/16x16/apps/kwrite.png
 share/kde/icons/slick/16x16/apps/laptop_battery.png
 share/kde/icons/slick/16x16/apps/laptop_pcmcia.png
@@ -6302,6 +6327,7 @@ share/kde/icons/slick/16x16/apps/panel.png
 share/kde/icons/slick/16x16/apps/penguin.png
 share/kde/icons/slick/16x16/apps/personal.png
 share/kde/icons/slick/16x16/apps/printmgr.png
+share/kde/icons/slick/16x16/apps/randr.png
 share/kde/icons/slick/16x16/apps/remote.png
 share/kde/icons/slick/16x16/apps/samba.png
 share/kde/icons/slick/16x16/apps/showimg.png
@@ -6352,72 +6378,52 @@ share/kde/icons/slick/16x16/devices/nfs_unmount.png
 share/kde/icons/slick/16x16/devices/print_printer.png
 share/kde/icons/slick/16x16/devices/printer1.png
 share/kde/icons/slick/16x16/devices/printer2.png
+share/kde/icons/slick/16x16/devices/usbpendrive_mount.png
+share/kde/icons/slick/16x16/devices/usbpendrive_unmount.png
 share/kde/icons/slick/16x16/filesystems/blockdevice.png
 share/kde/icons/slick/16x16/filesystems/chardevice.png
-share/kde/icons/slick/16x16/filesystems/connecting.png
-share/kde/icons/slick/16x16/filesystems/connection_failed.png
 share/kde/icons/slick/16x16/filesystems/desktop.png
-share/kde/icons/slick/16x16/filesystems/dialup.png
-share/kde/icons/slick/16x16/filesystems/disconnect.png
 share/kde/icons/slick/16x16/filesystems/documents.png
 share/kde/icons/slick/16x16/filesystems/documents_3.png
 share/kde/icons/slick/16x16/filesystems/drawer.png
-share/kde/icons/slick/16x16/filesystems/drawer_documents.png
 share/kde/icons/slick/16x16/filesystems/drawer_green.png
-share/kde/icons/slick/16x16/filesystems/drawer_image.png
-share/kde/icons/slick/16x16/filesystems/drawer_locked.png
 share/kde/icons/slick/16x16/filesystems/drawer_metal.png
 share/kde/icons/slick/16x16/filesystems/drawer_open.png
 share/kde/icons/slick/16x16/filesystems/drawer_red.png
-share/kde/icons/slick/16x16/filesystems/drawer_sound.png
 share/kde/icons/slick/16x16/filesystems/exec.png
 share/kde/icons/slick/16x16/filesystems/exec_wine.png
 share/kde/icons/slick/16x16/filesystems/file_broken.png
 share/kde/icons/slick/16x16/filesystems/file_important.png
 share/kde/icons/slick/16x16/filesystems/file_locked.png
 share/kde/icons/slick/16x16/filesystems/folder.png
-share/kde/icons/slick/16x16/filesystems/folder_2.png
 share/kde/icons/slick/16x16/filesystems/folder_3.png
-share/kde/icons/slick/16x16/filesystems/folder_auto_3.png
 share/kde/icons/slick/16x16/filesystems/folder_blue.png
-share/kde/icons/slick/16x16/filesystems/folder_blue_2.png
 share/kde/icons/slick/16x16/filesystems/folder_blue_3.png
 share/kde/icons/slick/16x16/filesystems/folder_blue_open.png
 share/kde/icons/slick/16x16/filesystems/folder_dark.png
-share/kde/icons/slick/16x16/filesystems/folder_dark_2.png
 share/kde/icons/slick/16x16/filesystems/folder_develop.png
-share/kde/icons/slick/16x16/filesystems/folder_develop_2.png
 share/kde/icons/slick/16x16/filesystems/folder_develop_3.png
 share/kde/icons/slick/16x16/filesystems/folder_exec.png
-share/kde/icons/slick/16x16/filesystems/folder_exec_2.png
 share/kde/icons/slick/16x16/filesystems/folder_exec_3.png
 share/kde/icons/slick/16x16/filesystems/folder_find_3.png
 share/kde/icons/slick/16x16/filesystems/folder_green.png
-share/kde/icons/slick/16x16/filesystems/folder_green_2.png
 share/kde/icons/slick/16x16/filesystems/folder_green_3.png
 share/kde/icons/slick/16x16/filesystems/folder_green_open.png
 share/kde/icons/slick/16x16/filesystems/folder_grey.png
-share/kde/icons/slick/16x16/filesystems/folder_grey_2.png
 share/kde/icons/slick/16x16/filesystems/folder_grey_3.png
 share/kde/icons/slick/16x16/filesystems/folder_grey_open.png
 share/kde/icons/slick/16x16/filesystems/folder_grey_open_3.png
 share/kde/icons/slick/16x16/filesystems/folder_home.png
-share/kde/icons/slick/16x16/filesystems/folder_home_2.png
 share/kde/icons/slick/16x16/filesystems/folder_home_3.png
 share/kde/icons/slick/16x16/filesystems/folder_html.png
-share/kde/icons/slick/16x16/filesystems/folder_html_2.png
 share/kde/icons/slick/16x16/filesystems/folder_html_3.png
 share/kde/icons/slick/16x16/filesystems/folder_image.png
-share/kde/icons/slick/16x16/filesystems/folder_image_2.png
 share/kde/icons/slick/16x16/filesystems/folder_image_3.png
 share/kde/icons/slick/16x16/filesystems/folder_important.png
-share/kde/icons/slick/16x16/filesystems/folder_important_2.png
 share/kde/icons/slick/16x16/filesystems/folder_important_3.png
 share/kde/icons/slick/16x16/filesystems/folder_inbox.png
 share/kde/icons/slick/16x16/filesystems/folder_light.png
-share/kde/icons/slick/16x16/filesystems/folder_light_2.png
 share/kde/icons/slick/16x16/filesystems/folder_locked.png
-share/kde/icons/slick/16x16/filesystems/folder_locked_2.png
 share/kde/icons/slick/16x16/filesystems/folder_locked_3.png
 share/kde/icons/slick/16x16/filesystems/folder_mail.png
 share/kde/icons/slick/16x16/filesystems/folder_metallic_3.png
@@ -6425,7 +6431,6 @@ share/kde/icons/slick/16x16/filesystems/folder_news.png
 share/kde/icons/slick/16x16/filesystems/folder_open.png
 share/kde/icons/slick/16x16/filesystems/folder_open_3.png
 share/kde/icons/slick/16x16/filesystems/folder_orange.png
-share/kde/icons/slick/16x16/filesystems/folder_orange_2.png
 share/kde/icons/slick/16x16/filesystems/folder_orange_3.png
 share/kde/icons/slick/16x16/filesystems/folder_outbox.png
 share/kde/icons/slick/16x16/filesystems/folder_prefs.png
@@ -6433,33 +6438,23 @@ share/kde/icons/slick/16x16/filesystems/folder_prefs_3.png
 share/kde/icons/slick/16x16/filesystems/folder_print.png
 share/kde/icons/slick/16x16/filesystems/folder_print2.png
 share/kde/icons/slick/16x16/filesystems/folder_purple.png
-share/kde/icons/slick/16x16/filesystems/folder_purple_2.png
 share/kde/icons/slick/16x16/filesystems/folder_purple_3.png
 share/kde/icons/slick/16x16/filesystems/folder_purple_open.png
 share/kde/icons/slick/16x16/filesystems/folder_recycle.png
 share/kde/icons/slick/16x16/filesystems/folder_red.png
-share/kde/icons/slick/16x16/filesystems/folder_red_2.png
 share/kde/icons/slick/16x16/filesystems/folder_red_3.png
 share/kde/icons/slick/16x16/filesystems/folder_sent_mail.png
 share/kde/icons/slick/16x16/filesystems/folder_sound.png
-share/kde/icons/slick/16x16/filesystems/folder_sound_2.png
 share/kde/icons/slick/16x16/filesystems/folder_sound_3.png
 share/kde/icons/slick/16x16/filesystems/folder_src.png
-share/kde/icons/slick/16x16/filesystems/folder_src_2.png
 share/kde/icons/slick/16x16/filesystems/folder_tar.png
-share/kde/icons/slick/16x16/filesystems/folder_tar_2.png
 share/kde/icons/slick/16x16/filesystems/folder_tar_3.png
-share/kde/icons/slick/16x16/filesystems/folder_tux_2.png
 share/kde/icons/slick/16x16/filesystems/folder_txt.png
-share/kde/icons/slick/16x16/filesystems/folder_txt_2.png
 share/kde/icons/slick/16x16/filesystems/folder_txt_3.png
 share/kde/icons/slick/16x16/filesystems/folder_video.png
-share/kde/icons/slick/16x16/filesystems/folder_video_2.png
-share/kde/icons/slick/16x16/filesystems/folder_video_3.png
 share/kde/icons/slick/16x16/filesystems/folder_violet.png
 share/kde/icons/slick/16x16/filesystems/folder_www.png
 share/kde/icons/slick/16x16/filesystems/folder_yellow.png
-share/kde/icons/slick/16x16/filesystems/folder_yellow_2.png
 share/kde/icons/slick/16x16/filesystems/folder_yellow_3.png
 share/kde/icons/slick/16x16/filesystems/folder_yellow_open.png
 share/kde/icons/slick/16x16/filesystems/ftp.png
@@ -6471,6 +6466,7 @@ share/kde/icons/slick/16x16/filesystems/network_local.png
 share/kde/icons/slick/16x16/filesystems/openterm.png
 share/kde/icons/slick/16x16/filesystems/pipe.png
 share/kde/icons/slick/16x16/filesystems/server.png
+share/kde/icons/slick/16x16/filesystems/server2.png
 share/kde/icons/slick/16x16/filesystems/services.png
 share/kde/icons/slick/16x16/filesystems/shredder.png
 share/kde/icons/slick/16x16/filesystems/socket.png
@@ -6582,6 +6578,13 @@ share/kde/icons/slick/22x22/actions/arrowforward.png
 share/kde/icons/slick/22x22/actions/attach.png
 share/kde/icons/slick/22x22/actions/babelfish.png
 share/kde/icons/slick/22x22/actions/back.png
+share/kde/icons/slick/22x22/actions/bar0.png
+share/kde/icons/slick/22x22/actions/bar1.png
+share/kde/icons/slick/22x22/actions/bar2.png
+share/kde/icons/slick/22x22/actions/bar3.png
+share/kde/icons/slick/22x22/actions/bar4.png
+share/kde/icons/slick/22x22/actions/bar5.png
+share/kde/icons/slick/22x22/actions/bar6.png
 share/kde/icons/slick/22x22/actions/bookmark.png
 share/kde/icons/slick/22x22/actions/bookmark_add.png
 share/kde/icons/slick/22x22/actions/bookmark_folder.png
@@ -6645,7 +6648,13 @@ share/kde/icons/slick/22x22/actions/imagegallery.png
 share/kde/icons/slick/22x22/actions/kalarmdgui.png
 share/kde/icons/slick/22x22/actions/kalarmdgui_disabled.png
 share/kde/icons/slick/22x22/actions/kde.png
-share/kde/icons/slick/22x22/actions/key_enter.png
+share/kde/icons/slick/22x22/actions/kde1.png
+share/kde/icons/slick/22x22/actions/kde2.png
+share/kde/icons/slick/22x22/actions/kde3.png
+share/kde/icons/slick/22x22/actions/kde4.png
+share/kde/icons/slick/22x22/actions/kde5.png
+share/kde/icons/slick/22x22/actions/kde6.png
+share/kde/icons/slick/22x22/actions/kde7.png
 share/kde/icons/slick/22x22/actions/khtml_kget.png
 share/kde/icons/slick/22x22/actions/klipper_dock.png
 share/kde/icons/slick/22x22/actions/korgac.png
@@ -6665,6 +6674,10 @@ share/kde/icons/slick/22x22/actions/mail_send.png
 share/kde/icons/slick/22x22/actions/mime_empty.png
 share/kde/icons/slick/22x22/actions/misc.png
 share/kde/icons/slick/22x22/actions/move.png
+share/kde/icons/slick/22x22/actions/network_connected.png
+share/kde/icons/slick/22x22/actions/network_disconnected.png
+share/kde/icons/slick/22x22/actions/network_incoming.png
+share/kde/icons/slick/22x22/actions/network_outgoing.png
 share/kde/icons/slick/22x22/actions/next.png
 share/kde/icons/slick/22x22/actions/noatunback.png
 share/kde/icons/slick/22x22/actions/noatunforward.png
@@ -6685,14 +6698,19 @@ share/kde/icons/slick/22x22/actions/player_eject.png
 share/kde/icons/slick/22x22/actions/player_end.png
 share/kde/icons/slick/22x22/actions/player_pause.png
 share/kde/icons/slick/22x22/actions/player_play.png
+share/kde/icons/slick/22x22/actions/player_playlist_2.png
 share/kde/icons/slick/22x22/actions/player_start.png
 share/kde/icons/slick/22x22/actions/player_stop.png
 share/kde/icons/slick/22x22/actions/previous.png
 share/kde/icons/slick/22x22/actions/query_erase.png
 share/kde/icons/slick/22x22/actions/queue.png
+share/kde/icons/slick/22x22/actions/random.png
+share/kde/icons/slick/22x22/actions/rebuild.png
 share/kde/icons/slick/22x22/actions/redo.png
 share/kde/icons/slick/22x22/actions/reload.png
 share/kde/icons/slick/22x22/actions/reload1.png
+share/kde/icons/slick/22x22/actions/repeat_playlist.png
+share/kde/icons/slick/22x22/actions/repeat_track.png
 share/kde/icons/slick/22x22/actions/revert.png
 share/kde/icons/slick/22x22/actions/rotate.png
 share/kde/icons/slick/22x22/actions/rotate_ccw.png
@@ -6710,6 +6728,7 @@ share/kde/icons/slick/22x22/actions/tab_new.png
 share/kde/icons/slick/22x22/actions/tab_new_bg.png
 share/kde/icons/slick/22x22/actions/tab_remove.png
 share/kde/icons/slick/22x22/actions/thumbnail.png
+share/kde/icons/slick/22x22/actions/toggle_log.png
 share/kde/icons/slick/22x22/actions/tool_clipboard.png
 share/kde/icons/slick/22x22/actions/tool_delete.png
 share/kde/icons/slick/22x22/actions/tool_disconnect.png
@@ -6746,6 +6765,7 @@ share/kde/icons/slick/22x22/actions/viewmag+.png
 share/kde/icons/slick/22x22/actions/viewmag-.png
 share/kde/icons/slick/22x22/actions/viewmag.png
 share/kde/icons/slick/22x22/actions/viewmagfit.png
+share/kde/icons/slick/22x22/actions/wallet_closed.png
 share/kde/icons/slick/22x22/actions/wallet_open.png
 share/kde/icons/slick/22x22/actions/webarchiver.png
 share/kde/icons/slick/22x22/actions/window_fullscreen.png
@@ -6758,6 +6778,7 @@ share/kde/icons/slick/22x22/apps/cervisia.png
 share/kde/icons/slick/22x22/apps/date.png
 share/kde/icons/slick/22x22/apps/fonts.png
 share/kde/icons/slick/22x22/apps/go.png
+share/kde/icons/slick/22x22/apps/icon-cartoon.png
 share/kde/icons/slick/22x22/apps/k3b.png
 share/kde/icons/slick/22x22/apps/kcmdf.png
 share/kde/icons/slick/22x22/apps/kcmsystem.png
@@ -6782,6 +6803,9 @@ share/kde/icons/slick/22x22/apps/konsole.png
 share/kde/icons/slick/22x22/apps/kopete.png
 share/kde/icons/slick/22x22/apps/kwalletmanager.png
 share/kde/icons/slick/22x22/apps/kwin.png
+share/kde/icons/slick/22x22/apps/mix_cd.png
+share/kde/icons/slick/22x22/apps/mix_ext.png
+share/kde/icons/slick/22x22/apps/mix_microphone.png
 share/kde/icons/slick/22x22/apps/noatun.png
 share/kde/icons/slick/22x22/apps/package.png
 share/kde/icons/slick/22x22/apps/package_network.png
@@ -6790,9 +6814,12 @@ share/kde/icons/slick/22x22/apps/package_system.png
 share/kde/icons/slick/22x22/apps/personal.png
 share/kde/icons/slick/22x22/apps/printmgr.png
 share/kde/icons/slick/22x22/apps/randr.png
-share/kde/icons/slick/22x22/apps/wallet_closed.png
 share/kde/icons/slick/22x22/apps/window_list.png
 share/kde/icons/slick/22x22/apps/xmms.png
+share/kde/icons/slick/22x22/devices/3floppy_mount.png
+share/kde/icons/slick/22x22/devices/3floppy_unmount.png
+share/kde/icons/slick/22x22/devices/cdaudio_mount.png
+share/kde/icons/slick/22x22/devices/cdaudio_unmount.png
 share/kde/icons/slick/22x22/devices/cdrom_mount.png
 share/kde/icons/slick/22x22/devices/cdrom_unmount.png
 share/kde/icons/slick/22x22/devices/cdwriter_mount.png
@@ -6804,10 +6831,14 @@ share/kde/icons/slick/22x22/devices/floppy_unmount.png
 share/kde/icons/slick/22x22/devices/hdd.png
 share/kde/icons/slick/22x22/devices/hdd_mount.png
 share/kde/icons/slick/22x22/devices/hdd_unmount.png
+share/kde/icons/slick/22x22/devices/lan.png
 share/kde/icons/slick/22x22/devices/nfs_mount.png
 share/kde/icons/slick/22x22/devices/nfs_unmount.png
+share/kde/icons/slick/22x22/devices/usbpendrive_mount.png
+share/kde/icons/slick/22x22/devices/usbpendrive_unmount.png
 share/kde/icons/slick/22x22/filesystems/chardevice.png
 share/kde/icons/slick/22x22/filesystems/desktop.png
+share/kde/icons/slick/22x22/filesystems/drawer_metal.png
 share/kde/icons/slick/22x22/filesystems/file_broken.png
 share/kde/icons/slick/22x22/filesystems/file_important.png
 share/kde/icons/slick/22x22/filesystems/file_locked.png
@@ -6828,8 +6859,12 @@ share/kde/icons/slick/22x22/filesystems/link.png
 share/kde/icons/slick/22x22/filesystems/lockoverlay.png
 share/kde/icons/slick/22x22/filesystems/mime_empty.png
 share/kde/icons/slick/22x22/filesystems/network.png
+share/kde/icons/slick/22x22/filesystems/network_local.png
 share/kde/icons/slick/22x22/filesystems/pipe.png
+share/kde/icons/slick/22x22/filesystems/server.png
+share/kde/icons/slick/22x22/filesystems/server2.png
 share/kde/icons/slick/22x22/filesystems/socket.png
+share/kde/icons/slick/22x22/filesystems/system.png
 share/kde/icons/slick/22x22/filesystems/trashcan_empty.png
 share/kde/icons/slick/22x22/filesystems/trashcan_full.png
 share/kde/icons/slick/22x22/filesystems/www.png
@@ -6848,6 +6883,7 @@ share/kde/icons/slick/22x22/mimetypes/html.png
 share/kde/icons/slick/22x22/mimetypes/image.png
 share/kde/icons/slick/22x22/mimetypes/info.png
 share/kde/icons/slick/22x22/mimetypes/kmultiple.png
+share/kde/icons/slick/22x22/mimetypes/kword_kwd.png
 share/kde/icons/slick/22x22/mimetypes/log.png
 share/kde/icons/slick/22x22/mimetypes/message.png
 share/kde/icons/slick/22x22/mimetypes/mime_empty.png
@@ -6866,8 +6902,10 @@ share/kde/icons/slick/22x22/mimetypes/text.png
 share/kde/icons/slick/22x22/mimetypes/text1.png
 share/kde/icons/slick/22x22/mimetypes/tgz.png
 share/kde/icons/slick/22x22/mimetypes/unknown.png
+share/kde/icons/slick/22x22/mimetypes/vectorgfx.png
 share/kde/icons/slick/22x22/mimetypes/video.png
 share/kde/icons/slick/22x22/mimetypes/webarchiver.png
+share/kde/icons/slick/22x22/mimetypes/wordprocessing.png
 share/kde/icons/slick/22x22/mimetypes/workprocessing.png
 share/kde/icons/slick/32x32/actions/1downarrow.png
 share/kde/icons/slick/32x32/actions/1leftarrow.png
@@ -6941,6 +6979,14 @@ share/kde/icons/slick/32x32/actions/kde.png
 share/kde/icons/slick/32x32/actions/kde1.png
 share/kde/icons/slick/32x32/actions/khtml_kget.png
 share/kde/icons/slick/32x32/actions/klipper_dock.png
+share/kde/icons/slick/32x32/actions/kontact_contacts.png
+share/kde/icons/slick/32x32/actions/kontact_date.png
+share/kde/icons/slick/32x32/actions/kontact_journal.png
+share/kde/icons/slick/32x32/actions/kontact_mail.png
+share/kde/icons/slick/32x32/actions/kontact_news.png
+share/kde/icons/slick/32x32/actions/kontact_notes.png
+share/kde/icons/slick/32x32/actions/kontact_summary.png
+share/kde/icons/slick/32x32/actions/kontact_todo.png
 share/kde/icons/slick/32x32/actions/lock.png
 share/kde/icons/slick/32x32/actions/mag.png
 share/kde/icons/slick/32x32/actions/mail_find.png
@@ -6960,6 +7006,7 @@ share/kde/icons/slick/32x32/actions/messagebox_warning2.png
 share/kde/icons/slick/32x32/actions/miror.png
 share/kde/icons/slick/32x32/actions/misc.png
 share/kde/icons/slick/32x32/actions/move.png
+share/kde/icons/slick/32x32/actions/multisynk.png
 share/kde/icons/slick/32x32/actions/news.png
 share/kde/icons/slick/32x32/actions/news_subscribe.png
 share/kde/icons/slick/32x32/actions/news_unsubscribe.png
@@ -7023,6 +7070,7 @@ share/kde/icons/slick/32x32/actions/window_fullscreen.png
 share/kde/icons/slick/32x32/actions/window_new.png
 share/kde/icons/slick/32x32/actions/window_nofullscreen.png
 share/kde/icons/slick/32x32/actions/wizard.png
+share/kde/icons/slick/32x32/apps/akregator.png
 share/kde/icons/slick/32x32/apps/ark.png
 share/kde/icons/slick/32x32/apps/bell.png
 share/kde/icons/slick/32x32/apps/camera.png
@@ -7034,6 +7082,7 @@ share/kde/icons/slick/32x32/apps/fonts.png
 share/kde/icons/slick/32x32/apps/gimp.png
 share/kde/icons/slick/32x32/apps/go.png
 share/kde/icons/slick/32x32/apps/help_index.png
+share/kde/icons/slick/32x32/apps/icon-cartoon.png
 share/kde/icons/slick/32x32/apps/icons.png
 share/kde/icons/slick/32x32/apps/k3b.png
 share/kde/icons/slick/32x32/apps/kab.png
@@ -7090,14 +7139,19 @@ share/kde/icons/slick/32x32/apps/noatun2.png
 share/kde/icons/slick/32x32/apps/opera.png
 share/kde/icons/slick/32x32/apps/package.png
 share/kde/icons/slick/32x32/apps/package_development.png
+share/kde/icons/slick/32x32/apps/package_editors.png
 share/kde/icons/slick/32x32/apps/package_games.png
 share/kde/icons/slick/32x32/apps/package_games1.png
 share/kde/icons/slick/32x32/apps/package_graphics.png
 share/kde/icons/slick/32x32/apps/package_graphics1.png
+share/kde/icons/slick/32x32/apps/package_graphics2.png
 share/kde/icons/slick/32x32/apps/package_multimedia.png
 share/kde/icons/slick/32x32/apps/package_network.png
+share/kde/icons/slick/32x32/apps/package_office.png
 share/kde/icons/slick/32x32/apps/package_settings.png
 share/kde/icons/slick/32x32/apps/package_system.png
+share/kde/icons/slick/32x32/apps/package_toys.png
+share/kde/icons/slick/32x32/apps/package_utilities.png
 share/kde/icons/slick/32x32/apps/penguin.png
 share/kde/icons/slick/32x32/apps/remote.png
 share/kde/icons/slick/32x32/apps/samba.png
@@ -7106,7 +7160,6 @@ share/kde/icons/slick/32x32/apps/smb4k.png
 share/kde/icons/slick/32x32/apps/speaker.png
 share/kde/icons/slick/32x32/apps/trees.png
 share/kde/icons/slick/32x32/apps/tux.png
-share/kde/icons/slick/32x32/apps/ut.png
 share/kde/icons/slick/32x32/apps/vmware.png
 share/kde/icons/slick/32x32/apps/window_list.png
 share/kde/icons/slick/32x32/apps/xapp.png
@@ -7136,31 +7189,24 @@ share/kde/icons/slick/32x32/devices/nfs_unmount.png
 share/kde/icons/slick/32x32/devices/print_printer.png
 share/kde/icons/slick/32x32/devices/printer1.png
 share/kde/icons/slick/32x32/devices/printer2.png
+share/kde/icons/slick/32x32/devices/usbpendrive_mount.png
+share/kde/icons/slick/32x32/devices/usbpendrive_unmount.png
 share/kde/icons/slick/32x32/filesystems/blockdevice.png
 share/kde/icons/slick/32x32/filesystems/chardevice.png
-share/kde/icons/slick/32x32/filesystems/connecting.png
-share/kde/icons/slick/32x32/filesystems/connection_failed.png
 share/kde/icons/slick/32x32/filesystems/desktop.png
-share/kde/icons/slick/32x32/filesystems/dialup.png
-share/kde/icons/slick/32x32/filesystems/disconnect.png
 share/kde/icons/slick/32x32/filesystems/documents.png
 share/kde/icons/slick/32x32/filesystems/documents_3.png
 share/kde/icons/slick/32x32/filesystems/drawer.png
-share/kde/icons/slick/32x32/filesystems/drawer_documents.png
 share/kde/icons/slick/32x32/filesystems/drawer_green.png
-share/kde/icons/slick/32x32/filesystems/drawer_image.png
-share/kde/icons/slick/32x32/filesystems/drawer_locked.png
 share/kde/icons/slick/32x32/filesystems/drawer_metal.png
 share/kde/icons/slick/32x32/filesystems/drawer_open.png
 share/kde/icons/slick/32x32/filesystems/drawer_red.png
-share/kde/icons/slick/32x32/filesystems/drawer_sound.png
 share/kde/icons/slick/32x32/filesystems/exec.png
 share/kde/icons/slick/32x32/filesystems/file_broken.png
 share/kde/icons/slick/32x32/filesystems/file_important.png
 share/kde/icons/slick/32x32/filesystems/file_locked.png
 share/kde/icons/slick/32x32/filesystems/file_temporary.png
 share/kde/icons/slick/32x32/filesystems/folder.png
-share/kde/icons/slick/32x32/filesystems/folder_2.png
 share/kde/icons/slick/32x32/filesystems/folder_3.png
 share/kde/icons/slick/32x32/filesystems/folder_blue.png
 share/kde/icons/slick/32x32/filesystems/folder_blue_3.png
@@ -7168,75 +7214,53 @@ share/kde/icons/slick/32x32/filesystems/folder_blue_open.png
 share/kde/icons/slick/32x32/filesystems/folder_blue_open_3.png
 share/kde/icons/slick/32x32/filesystems/folder_configure.png
 share/kde/icons/slick/32x32/filesystems/folder_dark.png
-share/kde/icons/slick/32x32/filesystems/folder_dark_2.png
 share/kde/icons/slick/32x32/filesystems/folder_develop.png
-share/kde/icons/slick/32x32/filesystems/folder_develop_2.png
 share/kde/icons/slick/32x32/filesystems/folder_develop_3.png
 share/kde/icons/slick/32x32/filesystems/folder_exec.png
-share/kde/icons/slick/32x32/filesystems/folder_exec_2.png
 share/kde/icons/slick/32x32/filesystems/folder_exec_3.png
 share/kde/icons/slick/32x32/filesystems/folder_green.png
-share/kde/icons/slick/32x32/filesystems/folder_green_2.png
 share/kde/icons/slick/32x32/filesystems/folder_green_3.png
 share/kde/icons/slick/32x32/filesystems/folder_green_open.png
 share/kde/icons/slick/32x32/filesystems/folder_green_open_3.png
 share/kde/icons/slick/32x32/filesystems/folder_grey.png
-share/kde/icons/slick/32x32/filesystems/folder_grey_2.png
 share/kde/icons/slick/32x32/filesystems/folder_grey_3.png
 share/kde/icons/slick/32x32/filesystems/folder_grey_open_3.png
 share/kde/icons/slick/32x32/filesystems/folder_home.png
-share/kde/icons/slick/32x32/filesystems/folder_home_2.png
 share/kde/icons/slick/32x32/filesystems/folder_home_3.png
 share/kde/icons/slick/32x32/filesystems/folder_html.png
-share/kde/icons/slick/32x32/filesystems/folder_html_2.png
 share/kde/icons/slick/32x32/filesystems/folder_html_3.png
 share/kde/icons/slick/32x32/filesystems/folder_image.png
-share/kde/icons/slick/32x32/filesystems/folder_image_2.png
 share/kde/icons/slick/32x32/filesystems/folder_image_3.png
 share/kde/icons/slick/32x32/filesystems/folder_important.png
-share/kde/icons/slick/32x32/filesystems/folder_important_2.png
 share/kde/icons/slick/32x32/filesystems/folder_important_3.png
 share/kde/icons/slick/32x32/filesystems/folder_light.png
-share/kde/icons/slick/32x32/filesystems/folder_light_2.png
 share/kde/icons/slick/32x32/filesystems/folder_locked.png
 share/kde/icons/slick/32x32/filesystems/folder_locked_3.png
 share/kde/icons/slick/32x32/filesystems/folder_mag.png
 share/kde/icons/slick/32x32/filesystems/folder_mail.png
 share/kde/icons/slick/32x32/filesystems/folder_metallic_3.png
 share/kde/icons/slick/32x32/filesystems/folder_news.png
-share/kde/icons/slick/32x32/filesystems/folder_news_2.png
 share/kde/icons/slick/32x32/filesystems/folder_open.png
-share/kde/icons/slick/32x32/filesystems/folder_open_2.png
 share/kde/icons/slick/32x32/filesystems/folder_open_3.png
 share/kde/icons/slick/32x32/filesystems/folder_orange.png
-share/kde/icons/slick/32x32/filesystems/folder_orange_2.png
 share/kde/icons/slick/32x32/filesystems/folder_orange_3.png
 share/kde/icons/slick/32x32/filesystems/folder_orange_open_3.png
 share/kde/icons/slick/32x32/filesystems/folder_prefs.png
 share/kde/icons/slick/32x32/filesystems/folder_purple.png
-share/kde/icons/slick/32x32/filesystems/folder_purple_2.png
 share/kde/icons/slick/32x32/filesystems/folder_recycle.png
 share/kde/icons/slick/32x32/filesystems/folder_red.png
-share/kde/icons/slick/32x32/filesystems/folder_red_2.png
 share/kde/icons/slick/32x32/filesystems/folder_red_3.png
 share/kde/icons/slick/32x32/filesystems/folder_shells.png
-share/kde/icons/slick/32x32/filesystems/folder_shells_2.png
 share/kde/icons/slick/32x32/filesystems/folder_sound.png
-share/kde/icons/slick/32x32/filesystems/folder_sound_2.png
 share/kde/icons/slick/32x32/filesystems/folder_sound_3.png
 share/kde/icons/slick/32x32/filesystems/folder_src.png
 share/kde/icons/slick/32x32/filesystems/folder_tar.png
-share/kde/icons/slick/32x32/filesystems/folder_tar_2.png
 share/kde/icons/slick/32x32/filesystems/folder_trash.png
 share/kde/icons/slick/32x32/filesystems/folder_tux.png
-share/kde/icons/slick/32x32/filesystems/folder_tux_2.png
 share/kde/icons/slick/32x32/filesystems/folder_txt.png
-share/kde/icons/slick/32x32/filesystems/folder_txt_2.png
 share/kde/icons/slick/32x32/filesystems/folder_video.png
-share/kde/icons/slick/32x32/filesystems/folder_video_2.png
 share/kde/icons/slick/32x32/filesystems/folder_video_3.png
 share/kde/icons/slick/32x32/filesystems/folder_yellow.png
-share/kde/icons/slick/32x32/filesystems/folder_yellow_2.png
 share/kde/icons/slick/32x32/filesystems/folder_yellow_3.png
 share/kde/icons/slick/32x32/filesystems/folder_yellow_open.png
 share/kde/icons/slick/32x32/filesystems/link.png
@@ -7245,6 +7269,7 @@ share/kde/icons/slick/32x32/filesystems/network.png
 share/kde/icons/slick/32x32/filesystems/network_local.png
 share/kde/icons/slick/32x32/filesystems/pipe.png
 share/kde/icons/slick/32x32/filesystems/server.png
+share/kde/icons/slick/32x32/filesystems/server2.png
 share/kde/icons/slick/32x32/filesystems/socket.png
 share/kde/icons/slick/32x32/filesystems/system.png
 share/kde/icons/slick/32x32/filesystems/trashcan_empty.png
@@ -7324,14 +7349,27 @@ share/kde/icons/slick/32x32/mimetypes/widget_doc.png
 share/kde/icons/slick/32x32/mimetypes/wordprocessing.png
 share/kde/icons/slick/32x32/mimetypes/xcf.png
 share/kde/icons/slick/48x48/actions/cdcopy.png
+share/kde/icons/slick/48x48/actions/configure.png
+share/kde/icons/slick/48x48/actions/fileopen.png
 share/kde/icons/slick/48x48/actions/fork.png
 share/kde/icons/slick/48x48/actions/gear.png
 share/kde/icons/slick/48x48/actions/gohome.png
+share/kde/icons/slick/48x48/actions/help.png
+share/kde/icons/slick/48x48/actions/kontact_calender.png
+share/kde/icons/slick/48x48/actions/kontact_contacts.png
+share/kde/icons/slick/48x48/actions/kontact_date.png
+share/kde/icons/slick/48x48/actions/kontact_journal.png
+share/kde/icons/slick/48x48/actions/kontact_mail.png
+share/kde/icons/slick/48x48/actions/kontact_notes.png
+share/kde/icons/slick/48x48/actions/kontact_summary.png
+share/kde/icons/slick/48x48/actions/kontact_todo.png
 share/kde/icons/slick/48x48/actions/launch.png
 share/kde/icons/slick/48x48/actions/lock.png
 share/kde/icons/slick/48x48/actions/messagebox_critical.png
 share/kde/icons/slick/48x48/actions/messagebox_info.png
 share/kde/icons/slick/48x48/actions/messagebox_warning.png
+share/kde/icons/slick/48x48/actions/multisynk.png
+share/kde/icons/slick/48x48/actions/player_play.png
 share/kde/icons/slick/48x48/actions/share.png
 share/kde/icons/slick/48x48/apps/ark.png
 share/kde/icons/slick/48x48/apps/background.png
@@ -7458,20 +7496,15 @@ share/kde/icons/slick/48x48/devices/nfs_mount.png
 share/kde/icons/slick/48x48/devices/nfs_unmount.png
 share/kde/icons/slick/48x48/devices/print_printer.png
 share/kde/icons/slick/48x48/devices/printer1.png
+share/kde/icons/slick/48x48/devices/usbpendrive_mount.png
+share/kde/icons/slick/48x48/devices/usbpendrive_unmount.png
 share/kde/icons/slick/48x48/filesystems/blockdevice.png
 share/kde/icons/slick/48x48/filesystems/chardevice.png
-share/kde/icons/slick/48x48/filesystems/connecting.png
-share/kde/icons/slick/48x48/filesystems/connection_failed.png
 share/kde/icons/slick/48x48/filesystems/desktop.png
-share/kde/icons/slick/48x48/filesystems/dialup.png
-share/kde/icons/slick/48x48/filesystems/disconnect.png
 share/kde/icons/slick/48x48/filesystems/documents.png
 share/kde/icons/slick/48x48/filesystems/documents_3.png
 share/kde/icons/slick/48x48/filesystems/drawer.png
-share/kde/icons/slick/48x48/filesystems/drawer_autosave.png
-share/kde/icons/slick/48x48/filesystems/drawer_documents.png
 share/kde/icons/slick/48x48/filesystems/drawer_green.png
-share/kde/icons/slick/48x48/filesystems/drawer_locked.png
 share/kde/icons/slick/48x48/filesystems/drawer_metal.png
 share/kde/icons/slick/48x48/filesystems/drawer_open.png
 share/kde/icons/slick/48x48/filesystems/drawer_red.png
@@ -7480,98 +7513,71 @@ share/kde/icons/slick/48x48/filesystems/file_broken.png
 share/kde/icons/slick/48x48/filesystems/file_important.png
 share/kde/icons/slick/48x48/filesystems/file_locked.png
 share/kde/icons/slick/48x48/filesystems/folder.png
-share/kde/icons/slick/48x48/filesystems/folder_2.png
 share/kde/icons/slick/48x48/filesystems/folder_3.png
 share/kde/icons/slick/48x48/filesystems/folder_auto.png
 share/kde/icons/slick/48x48/filesystems/folder_blue.png
-share/kde/icons/slick/48x48/filesystems/folder_blue_2.png
 share/kde/icons/slick/48x48/filesystems/folder_blue_3.png
 share/kde/icons/slick/48x48/filesystems/folder_blue_open.png
 share/kde/icons/slick/48x48/filesystems/folder_blue_open_3.png
 share/kde/icons/slick/48x48/filesystems/folder_configure.png
-share/kde/icons/slick/48x48/filesystems/folder_configure_2.png
 share/kde/icons/slick/48x48/filesystems/folder_dark.png
-share/kde/icons/slick/48x48/filesystems/folder_dark_2.png
 share/kde/icons/slick/48x48/filesystems/folder_dark_3.png
 share/kde/icons/slick/48x48/filesystems/folder_develop.png
-share/kde/icons/slick/48x48/filesystems/folder_develop_2.png
 share/kde/icons/slick/48x48/filesystems/folder_develop_3.png
-share/kde/icons/slick/48x48/filesystems/folder_exec_2.png
 share/kde/icons/slick/48x48/filesystems/folder_exec_3.png
 share/kde/icons/slick/48x48/filesystems/folder_find_3.png
 share/kde/icons/slick/48x48/filesystems/folder_green.png
-share/kde/icons/slick/48x48/filesystems/folder_green_2.png
 share/kde/icons/slick/48x48/filesystems/folder_green_3.png
 share/kde/icons/slick/48x48/filesystems/folder_green_open.png
 share/kde/icons/slick/48x48/filesystems/folder_grey.png
 share/kde/icons/slick/48x48/filesystems/folder_grey_2.png
 share/kde/icons/slick/48x48/filesystems/folder_grey_3.png
 share/kde/icons/slick/48x48/filesystems/folder_grey_open.png
-share/kde/icons/slick/48x48/filesystems/folder_grey_open_2.png
 share/kde/icons/slick/48x48/filesystems/folder_grey_open_3.png
 share/kde/icons/slick/48x48/filesystems/folder_home.png
-share/kde/icons/slick/48x48/filesystems/folder_home_2.png
 share/kde/icons/slick/48x48/filesystems/folder_home_3.png
 share/kde/icons/slick/48x48/filesystems/folder_html.png
-share/kde/icons/slick/48x48/filesystems/folder_html_2.png
 share/kde/icons/slick/48x48/filesystems/folder_html_3.png
 share/kde/icons/slick/48x48/filesystems/folder_image.png
-share/kde/icons/slick/48x48/filesystems/folder_image_2.png
 share/kde/icons/slick/48x48/filesystems/folder_image_3.png
 share/kde/icons/slick/48x48/filesystems/folder_important.png
-share/kde/icons/slick/48x48/filesystems/folder_important_2.png
 share/kde/icons/slick/48x48/filesystems/folder_important_3.png
 share/kde/icons/slick/48x48/filesystems/folder_light.png
-share/kde/icons/slick/48x48/filesystems/folder_light_2.png
 share/kde/icons/slick/48x48/filesystems/folder_light_3.png
 share/kde/icons/slick/48x48/filesystems/folder_locked.png
-share/kde/icons/slick/48x48/filesystems/folder_locked_2.png
 share/kde/icons/slick/48x48/filesystems/folder_locked_3.png
 share/kde/icons/slick/48x48/filesystems/folder_mag.png
 share/kde/icons/slick/48x48/filesystems/folder_mail.png
 share/kde/icons/slick/48x48/filesystems/folder_metallic_3.png
 share/kde/icons/slick/48x48/filesystems/folder_metallic_open_3.png
 share/kde/icons/slick/48x48/filesystems/folder_news.png
-share/kde/icons/slick/48x48/filesystems/folder_news_2.png
 share/kde/icons/slick/48x48/filesystems/folder_open.png
-share/kde/icons/slick/48x48/filesystems/folder_open_2.png
 share/kde/icons/slick/48x48/filesystems/folder_open_3.png
-share/kde/icons/slick/48x48/filesystems/folder_open_mag_3.png
 share/kde/icons/slick/48x48/filesystems/folder_orange.png
-share/kde/icons/slick/48x48/filesystems/folder_orange_2.png
 share/kde/icons/slick/48x48/filesystems/folder_orange_3.png
 share/kde/icons/slick/48x48/filesystems/folder_prefs.png
 share/kde/icons/slick/48x48/filesystems/folder_prefs_3.png
 share/kde/icons/slick/48x48/filesystems/folder_purple.png
-share/kde/icons/slick/48x48/filesystems/folder_purple_2.png
 share/kde/icons/slick/48x48/filesystems/folder_purple_3.png
 share/kde/icons/slick/48x48/filesystems/folder_purple_open.png
 share/kde/icons/slick/48x48/filesystems/folder_purple_open_3.png
 share/kde/icons/slick/48x48/filesystems/folder_recycle.png
 share/kde/icons/slick/48x48/filesystems/folder_red.png
-share/kde/icons/slick/48x48/filesystems/folder_red_2.png
 share/kde/icons/slick/48x48/filesystems/folder_red_3.png
 share/kde/icons/slick/48x48/filesystems/folder_shells.png
-share/kde/icons/slick/48x48/filesystems/folder_shells_2.png
 share/kde/icons/slick/48x48/filesystems/folder_sound.png
-share/kde/icons/slick/48x48/filesystems/folder_sound_2.png
 share/kde/icons/slick/48x48/filesystems/folder_sound_3.png
 share/kde/icons/slick/48x48/filesystems/folder_src.png
 share/kde/icons/slick/48x48/filesystems/folder_src_3.png
 share/kde/icons/slick/48x48/filesystems/folder_tar.png
-share/kde/icons/slick/48x48/filesystems/folder_tar_2.png
 share/kde/icons/slick/48x48/filesystems/folder_tar_3.png
 share/kde/icons/slick/48x48/filesystems/folder_trash.png
 share/kde/icons/slick/48x48/filesystems/folder_tux.png
-share/kde/icons/slick/48x48/filesystems/folder_tux_2.png
 share/kde/icons/slick/48x48/filesystems/folder_txt.png
-share/kde/icons/slick/48x48/filesystems/folder_txt_2.png
 share/kde/icons/slick/48x48/filesystems/folder_txt_3.png
 share/kde/icons/slick/48x48/filesystems/folder_video.png
-share/kde/icons/slick/48x48/filesystems/folder_video_2.png
 share/kde/icons/slick/48x48/filesystems/folder_video_3.png
 share/kde/icons/slick/48x48/filesystems/folder_yellow.png
-share/kde/icons/slick/48x48/filesystems/folder_yellow_2.png
 share/kde/icons/slick/48x48/filesystems/folder_yellow_3.png
 share/kde/icons/slick/48x48/filesystems/folder_yellow_open.png
 share/kde/icons/slick/48x48/filesystems/ftp.png
@@ -7582,6 +7588,7 @@ share/kde/icons/slick/48x48/filesystems/network.png
 share/kde/icons/slick/48x48/filesystems/network_local.png
 share/kde/icons/slick/48x48/filesystems/pipe.png
 share/kde/icons/slick/48x48/filesystems/server.png
+share/kde/icons/slick/48x48/filesystems/server2.png
 share/kde/icons/slick/48x48/filesystems/shredder.png
 share/kde/icons/slick/48x48/filesystems/socket.png
 share/kde/icons/slick/48x48/filesystems/system.png
@@ -7720,6 +7727,8 @@ share/kde/icons/slick/64x64/devices/nfs_mount.png
 share/kde/icons/slick/64x64/devices/nfs_unmount.png
 share/kde/icons/slick/64x64/devices/print_printer.png
 share/kde/icons/slick/64x64/devices/printer1.png
+share/kde/icons/slick/64x64/devices/usbpendrive_mount.png
+share/kde/icons/slick/64x64/devices/usbpendrive_unmount.png
 share/kde/icons/slick/64x64/filesystems/chardevice.png
 share/kde/icons/slick/64x64/filesystems/desktop.png
 share/kde/icons/slick/64x64/filesystems/exec.png
@@ -7766,6 +7775,7 @@ share/kde/icons/slick/64x64/filesystems/network.png
 share/kde/icons/slick/64x64/filesystems/network_local.png
 share/kde/icons/slick/64x64/filesystems/pipe.png
 share/kde/icons/slick/64x64/filesystems/server.png
+share/kde/icons/slick/64x64/filesystems/server2.png
 share/kde/icons/slick/64x64/filesystems/share.png
 share/kde/icons/slick/64x64/filesystems/shredder.png
 share/kde/icons/slick/64x64/filesystems/socket.png
@@ -7866,31 +7876,22 @@ share/kde/icons/slick/64x64/mimetypes/zip.png
 share/kde/icons/slick/index.theme
 share/kde/sounds/KDE_Logout_new.wav
 share/kde/sounds/KDE_Startup_new.wav
-share/kde/wallpapers/Ancient_Glyphs.jpg
 share/kde/wallpapers/Appropriately-Left-Handed-2.jpg
-share/kde/wallpapers/Dasding.jpg
-share/kde/wallpapers/Prpbumps.jpg
 share/kde/wallpapers/Superfluous-Organ-1.jpg
 share/kde/wallpapers/The-Good-Times-1.jpg
 share/kde/wallpapers/Water01.jpg
-share/kde/wallpapers/Whirling_Spirit.jpg
 share/kde/wallpapers/alien-night.jpg
 share/kde/wallpapers/blue_angle_swirl.jpg
 share/kde/wallpapers/bluegreencrisscross.jpg
+share/kde/wallpapers/fulmine.jpg
+share/kde/wallpapers/fulmine.jpg.desktop
+share/kde/wallpapers/gear-flowers.svgz
+share/kde/wallpapers/gear-flowers.svgz.desktop
 share/kde/wallpapers/gold_crinkle.jpg
-share/kde/wallpapers/kde3blue.jpg
-share/kde/wallpapers/kdemagic.jpg
-share/kde/wallpapers/kiagara.jpg
 share/kde/wallpapers/kraftwurm.jpg
-share/kde/wallpapers/kroller.png
 share/kde/wallpapers/kubical.png
-share/kde/wallpapers/linux_addict.jpg
 share/kde/wallpapers/mystical_rightturn.jpg
-share/kde/wallpapers/northbeach.jpg
-share/kde/wallpapers/simple_wallpaper.jpg
-share/kde/wallpapers/sunday_brunch.jpg
 share/kde/wallpapers/vegetative_fog.jpg
-share/kde/wallpapers/winter_theme_1.jpg
 @comment in kde: @dirrm share/kde/wallpapers
 @comment in kde: @dirrm share/kde/sounds
 @dirrm share/kde/icons/slick/64x64/mimetypes
@@ -8035,7 +8036,6 @@ share/kde/wallpapers/winter_theme_1.jpg
 @comment in kde: @dirrm share/kde/emoticons
 @dirrm share/kde/apps/kworldclock/maps/rainfall
 @dirrm share/kde/apps/kworldclock/maps/mggd
-@unexec ${RMDIR} %D/share/kde/apps/kworldclock/maps/depths 2>/dev/null || ${TRUE}
 @dirrm share/kde/apps/kworldclock/maps/caida_bw
 @dirrm share/kde/apps/kworldclock/maps/caida
 @dirrm share/kde/apps/kworldclock/maps/bio
diff --git a/misc/kdeartwork3/distinfo b/misc/kdeartwork3/distinfo
index 99447305b48..e5f1a2d80f9 100644
--- a/misc/kdeartwork3/distinfo
+++ b/misc/kdeartwork3/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.24 2005/10/13 13:02:41 markd Exp $
+$NetBSD: distinfo,v 1.25 2005/12/11 11:31:45 markd Exp $
 
-SHA1 (kdeartwork-3.4.3.tar.bz2) = c4cda9abc2d07bdfc9a3039d2720b7fa7b9cdc12
-RMD160 (kdeartwork-3.4.3.tar.bz2) = d83c67eed8190c46b57682f5f8a96e083616fea9
-Size (kdeartwork-3.4.3.tar.bz2) = 18022458 bytes
-SHA1 (patch-aa) = 6733ecd8a03d124389e79da5df79e9df32569500
-SHA1 (patch-ab) = 907c5cd430b9170e41a2023231cbdaebb05da397
-SHA1 (patch-ac) = bd213b3b9cc2409e6c9a79206a60f37e3d8ed12c
+SHA1 (kdeartwork-3.5.0.tar.bz2) = 62052ec019384b70973ea8ace4491e0da7163e7c
+RMD160 (kdeartwork-3.5.0.tar.bz2) = 17a34a34446f14054df5b2fddd88a098eb65cf45
+Size (kdeartwork-3.5.0.tar.bz2) = 16610564 bytes
+SHA1 (patch-aa) = ea46c5b6fe3c7d57e3bb3fc68fadccde7855e764
+SHA1 (patch-ab) = ee7c837d1b75da34a358097bbc70832dc79700c3
diff --git a/misc/kdeartwork3/patches/patch-aa b/misc/kdeartwork3/patches/patch-aa
index 11db39f5d7e..b9684671a87 100644
--- a/misc/kdeartwork3/patches/patch-aa
+++ b/misc/kdeartwork3/patches/patch-aa
@@ -1,82 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/06/29 13:10:17 markd Exp $
+$NetBSD: patch-aa,v 1.5 2005/12/11 11:31:45 markd Exp $
 
---- configure.orig	2005-05-24 03:46:46.000000000 +1200
+--- configure.orig	2005-11-21 09:01:00.000000000 +1300
 +++ configure
-@@ -33095,12 +33095,12 @@ done
- IFS=$old_IFS
- 
- 
--   echo "$as_me:$LINENO: checking for lib$kdelibsuff/xscreensaver/flame" >&5
--echo $ECHO_N "checking for lib$kdelibsuff/xscreensaver/flame... $ECHO_C" >&6
-+   echo "$as_me:$LINENO: checking for libexec$kdelibsuff/xscreensaver/flame" >&5
-+echo $ECHO_N "checking for libexec$kdelibsuff/xscreensaver/flame... $ECHO_C" >&6
-    if test -n "$XSCREENSAVER"; then
-         kde_cv_path="$XSCREENSAVER";
-    else
--        kde_cache=`echo lib$kdelibsuff/xscreensaver/flame | sed 'y%./+-%__p_%'`
-+        kde_cache=`echo libexec$kdelibsuff/xscreensaver/flame | sed 'y%./+-%__p_%'`
- 
-         if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -33119,16 +33119,16 @@ else
- 	IFS=$kde_save_IFS
- 
-         for dir in $dirs; do
--	  if test -x "$dir/lib$kdelibsuff/xscreensaver/flame"; then
-+	  if test -x "$dir/libexec$kdelibsuff/xscreensaver/flame"; then
- 	    if test -n ""
- 	    then
--              evalstr="$dir/lib$kdelibsuff/xscreensaver/flame  2>&1 "
-+              evalstr="$dir/libexec$kdelibsuff/xscreensaver/flame  2>&1 "
- 	      if eval $evalstr; then
--                kde_cv_path="$dir/lib$kdelibsuff/xscreensaver/flame"
-+                kde_cv_path="$dir/libexec$kdelibsuff/xscreensaver/flame"
-                 break
- 	      fi
-             else
--		kde_cv_path="$dir/lib$kdelibsuff/xscreensaver/flame"
-+		kde_cv_path="$dir/libexec$kdelibsuff/xscreensaver/flame"
-                 break
- 	    fi
-           fi
-@@ -33149,12 +33149,12 @@ fi
- echo "${ECHO_T}not found" >&6
- 
- 
--   echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
--echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
-+   echo "$as_me:$LINENO: checking for libexec/xscreensaver/flame" >&5
-+echo $ECHO_N "checking for libexec/xscreensaver/flame... $ECHO_C" >&6
-    if test -n "$XSCREENSAVER"; then
-         kde_cv_path="$XSCREENSAVER";
-    else
--        kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
-+        kde_cache=`echo libexec/xscreensaver/flame | sed 'y%./+-%__p_%'`
- 
-         if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -33173,16 +33173,16 @@ else
- 	IFS=$kde_save_IFS
- 
-         for dir in $dirs; do
--	  if test -x "$dir/lib/xscreensaver/flame"; then
-+	  if test -x "$dir/libexec/xscreensaver/flame"; then
- 	    if test -n ""
- 	    then
--              evalstr="$dir/lib/xscreensaver/flame  2>&1 "
-+              evalstr="$dir/libexec/xscreensaver/flame  2>&1 "
- 	      if eval $evalstr; then
--                kde_cv_path="$dir/lib/xscreensaver/flame"
-+                kde_cv_path="$dir/libexec/xscreensaver/flame"
-                 break
- 	      fi
-             else
--		kde_cv_path="$dir/lib/xscreensaver/flame"
-+		kde_cv_path="$dir/libexec/xscreensaver/flame"
-                 break
- 	    fi
-           fi
-@@ -33356,7 +33356,7 @@ _ACEOF
+@@ -33333,7 +33333,7 @@ _ACEOF
  
       echo "$as_me:$LINENO: checking for flame.xml" >&5
  echo $ECHO_N "checking for flame.xml... $ECHO_C" >&6
@@ -84,4 +10,4 @@ $NetBSD: patch-aa,v 1.4 2005/06/29 13:10:17 markd Exp $
 +     for subdir in libexec/xscreensaver/config \
  		   lib/X11/xscreensaver/config \
  		   share/control-center/screensavers \
- 		   share/control-center/screensavers \
+ 		   share/xscreensaver/config \
diff --git a/misc/kdeartwork3/patches/patch-ab b/misc/kdeartwork3/patches/patch-ab
index fa73fdfa710..ac6273deb2e 100644
--- a/misc/kdeartwork3/patches/patch-ab
+++ b/misc/kdeartwork3/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2004/08/21 13:01:33 markd Exp $
+$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
@@ -9,9 +9,9 @@ $NetBSD: patch-ab,v 1.1 2004/08/21 13:01:33 markd Exp $
 -      const double &_A,
 -      const double &_B,
 -      const double &_C,
-+      const double &_AA,
-+      const double &_BB,
-+      const double &_CC,
++      const double &A_,
++      const double &B_,
++      const double &C_,
        std::valarray<double> &_y,
        const double &eps);
  
diff --git a/misc/kdeartwork3/patches/patch-ac b/misc/kdeartwork3/patches/patch-ac
deleted file mode 100644
index 1e45d348a24..00000000000
--- a/misc/kdeartwork3/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/08/21 13:01:33 markd Exp $
-
---- kscreensaver/kdesavers/rotation.cpp.orig	2004-05-15 18:05:30.000000000 +1200
-+++ kscreensaver/kdesavers/rotation.cpp
-@@ -83,13 +83,13 @@ extern "C"
- EulerOdeSolver::EulerOdeSolver(
-    const double &_t,
-    const double &_dt,
--   const double &_A,
--   const double &_B,
--   const double &_C,
-+   const double &_AA,
-+   const double &_BB,
-+   const double &_CC,
-    std::valarray<double> &_y,
-    const double &_eps)
-    : RkOdeSolver<double>(_t,_y,_dt,_eps),
--     A(_A), B(_B), C(_C)
-+     A(_AA), B(_BB), C(_CC)
- {
- }
-