summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2004-06-09 16:58:30 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2004-06-09 16:58:30 +0000
commit9774b282738ac937305fa2209b7ad1e372abe715 (patch)
treee5e37e7a03f81167570fc8abd2d5e64828d8163a /x11
parentUpdate to 1.2.1. (diff)
Update to version 3.2.3
Notes
Notes: svn path=/head/; revision=111165
Diffstat (limited to 'x11')
-rw-r--r--x11/kde4-baseapps/Makefile1
-rw-r--r--x11/kde4-baseapps/distinfo4
-rw-r--r--x11/kde4-baseapps/files/patch-startkde12
-rw-r--r--x11/kde4-baseapps/files/plist.base56
-rw-r--r--x11/kde4-runtime/Makefile1
-rw-r--r--x11/kde4-runtime/distinfo4
-rw-r--r--x11/kde4-runtime/files/patch-startkde12
-rw-r--r--x11/kde4-runtime/files/plist.base56
-rw-r--r--x11/kde4-workspace/Makefile1
-rw-r--r--x11/kde4-workspace/distinfo4
-rw-r--r--x11/kde4-workspace/files/patch-startkde12
-rw-r--r--x11/kde4-workspace/files/plist.base56
-rw-r--r--x11/kdebase3/Makefile1
-rw-r--r--x11/kdebase3/distinfo4
-rw-r--r--x11/kdebase3/files/patch-startkde12
-rw-r--r--x11/kdebase3/files/plist.base56
-rw-r--r--x11/kdebase4-runtime/Makefile1
-rw-r--r--x11/kdebase4-runtime/distinfo4
-rw-r--r--x11/kdebase4-runtime/files/patch-startkde12
-rw-r--r--x11/kdebase4-runtime/files/plist.base56
-rw-r--r--x11/kdebase4-workspace/Makefile1
-rw-r--r--x11/kdebase4-workspace/distinfo4
-rw-r--r--x11/kdebase4-workspace/files/patch-startkde12
-rw-r--r--x11/kdebase4-workspace/files/plist.base56
-rw-r--r--x11/kdebase4/Makefile1
-rw-r--r--x11/kdebase4/distinfo4
-rw-r--r--x11/kdebase4/files/patch-startkde12
-rw-r--r--x11/kdebase4/files/plist.base56
-rw-r--r--x11/kdelibs3/Makefile3
-rw-r--r--x11/kdelibs3/distinfo4
-rw-r--r--x11/kdelibs3/files/patch-kdecore_kapplication.cpp11
-rw-r--r--x11/kdelibs3/files/patch-kdesu-su.cpp13
-rw-r--r--x11/kdelibs3/files/patch-khtml-rendering-render_block.cpp22
-rw-r--r--x11/kdelibs3/files/patch-khtml_khtml_part.cpp47
-rw-r--r--x11/kdelibs3/files/patch-kio_misc_ktelnetservice.cpp24
-rw-r--r--x11/kdelibs4/Makefile3
-rw-r--r--x11/kdelibs4/distinfo4
-rw-r--r--x11/kdelibs4/files/patch-kdecore_kapplication.cpp11
-rw-r--r--x11/kdelibs4/files/patch-kdesu-su.cpp13
-rw-r--r--x11/kdelibs4/files/patch-khtml-rendering-render_block.cpp22
-rw-r--r--x11/kdelibs4/files/patch-khtml_khtml_part.cpp47
-rw-r--r--x11/kdelibs4/files/patch-kio_misc_ktelnetservice.cpp24
42 files changed, 412 insertions, 347 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 41c7153a8621..67c989a40513 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index d19b2bea5dec..25dba8c07361 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85
-SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476
+MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117
+SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422
diff --git a/x11/kde4-baseapps/files/patch-startkde b/x11/kde4-baseapps/files/patch-startkde
deleted file mode 100644
index 07c59a384354..000000000000
--- a/x11/kde4-baseapps/files/patch-startkde
+++ /dev/null
@@ -1,12 +0,0 @@
---- patch-startkde begins here ---
---- startkde.orig Sun Oct 26 11:45:35 2003
-+++ startkde Thu Apr 8 12:20:47 2004
-@@ -59,7 +59,7 @@
- do_usr_odir=1
- if test -r "$kde_fontpaths" ; then
- savifs=$IFS
-- IFS=$'\n'
-+ IFS=${IFS#??}
- for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do
- rfpath=`echo $fpath | sed s:\~:$HOME:g`
- if test -s "$rfpath"/fonts.dir; then
diff --git a/x11/kde4-baseapps/files/plist.base b/x11/kde4-baseapps/files/plist.base
index 6eb17215bba7..7866bcb8d6af 100644
--- a/x11/kde4-baseapps/files/plist.base
+++ b/x11/kde4-baseapps/files/plist.base
@@ -2212,15 +2212,18 @@ share/icons/crystalsvg/128x128/apps/xclock.png
share/icons/crystalsvg/128x128/apps/xfmail.png
share/icons/crystalsvg/128x128/apps/xmag.png
share/icons/crystalsvg/16x16/actions/newfont.png
+share/icons/crystalsvg/16x16/apps/abiword.png
share/icons/crystalsvg/16x16/apps/access.png
share/icons/crystalsvg/16x16/apps/acroread.png
share/icons/crystalsvg/16x16/apps/agent.png
share/icons/crystalsvg/16x16/apps/alevt.png
share/icons/crystalsvg/16x16/apps/applixware.png
share/icons/crystalsvg/16x16/apps/arts.png
+share/icons/crystalsvg/16x16/apps/assistant.png
share/icons/crystalsvg/16x16/apps/background.png
share/icons/crystalsvg/16x16/apps/bell.png
share/icons/crystalsvg/16x16/apps/blender.png
+share/icons/crystalsvg/16x16/apps/bluefish.png
share/icons/crystalsvg/16x16/apps/cache.png
share/icons/crystalsvg/16x16/apps/clanbomber.png
share/icons/crystalsvg/16x16/apps/clock.png
@@ -2228,16 +2231,25 @@ share/icons/crystalsvg/16x16/apps/colors.png
share/icons/crystalsvg/16x16/apps/cookie.png
share/icons/crystalsvg/16x16/apps/date.png
share/icons/crystalsvg/16x16/apps/designer.png
+share/icons/crystalsvg/16x16/apps/dia.png
share/icons/crystalsvg/16x16/apps/dlgedit.png
+share/icons/crystalsvg/16x16/apps/eclipse.png
share/icons/crystalsvg/16x16/apps/emacs.png
share/icons/crystalsvg/16x16/apps/email.png
share/icons/crystalsvg/16x16/apps/energy.png
share/icons/crystalsvg/16x16/apps/energy_star.png
share/icons/crystalsvg/16x16/apps/enhanced_browsing.png
+share/icons/crystalsvg/16x16/apps/evolution.png
share/icons/crystalsvg/16x16/apps/filetypes.png
+share/icons/crystalsvg/16x16/apps/firefox.png
share/icons/crystalsvg/16x16/apps/fonts.png
+share/icons/crystalsvg/16x16/apps/gabber.png
+share/icons/crystalsvg/16x16/apps/gaim.png
share/icons/crystalsvg/16x16/apps/gimp.png
share/icons/crystalsvg/16x16/apps/gnome_apps.png
+share/icons/crystalsvg/16x16/apps/gnomemeeting.png
+share/icons/crystalsvg/16x16/apps/gnucash.png
+share/icons/crystalsvg/16x16/apps/gnumeric.png
share/icons/crystalsvg/16x16/apps/go.png
share/icons/crystalsvg/16x16/apps/gv.png
share/icons/crystalsvg/16x16/apps/gvim.png
@@ -2292,6 +2304,7 @@ share/icons/crystalsvg/16x16/apps/kwin.png
share/icons/crystalsvg/16x16/apps/kwrite.png
share/icons/crystalsvg/16x16/apps/kxkb.png
share/icons/crystalsvg/16x16/apps/licq.png
+share/icons/crystalsvg/16x16/apps/linguist.png
share/icons/crystalsvg/16x16/apps/linuxconf.png
share/icons/crystalsvg/16x16/apps/locale.png
share/icons/crystalsvg/16x16/apps/looknfeel.png
@@ -2325,6 +2338,7 @@ share/icons/crystalsvg/16x16/apps/package_system.png
share/icons/crystalsvg/16x16/apps/package_toys.png
share/icons/crystalsvg/16x16/apps/package_utilities.png
share/icons/crystalsvg/16x16/apps/package_wordprocessing.png
+share/icons/crystalsvg/16x16/apps/pan.png
share/icons/crystalsvg/16x16/apps/panel.png
share/icons/crystalsvg/16x16/apps/panel_settings.png
share/icons/crystalsvg/16x16/apps/password.png
@@ -2332,6 +2346,7 @@ share/icons/crystalsvg/16x16/apps/penguin.png
share/icons/crystalsvg/16x16/apps/personal.png
share/icons/crystalsvg/16x16/apps/phppg.png
share/icons/crystalsvg/16x16/apps/plan.png
+share/icons/crystalsvg/16x16/apps/planner.png
share/icons/crystalsvg/16x16/apps/printmgr.png
share/icons/crystalsvg/16x16/apps/proxy.png
share/icons/crystalsvg/16x16/apps/pybliographic.png
@@ -2339,15 +2354,19 @@ share/icons/crystalsvg/16x16/apps/randr.png
share/icons/crystalsvg/16x16/apps/realplayer.png
share/icons/crystalsvg/16x16/apps/remote.png
share/icons/crystalsvg/16x16/apps/samba.png
+share/icons/crystalsvg/16x16/apps/scribus.png
+share/icons/crystalsvg/16x16/apps/sodipodi.png
share/icons/crystalsvg/16x16/apps/soffice.png
share/icons/crystalsvg/16x16/apps/style.png
share/icons/crystalsvg/16x16/apps/stylesheet.png
share/icons/crystalsvg/16x16/apps/terminal.png
+share/icons/crystalsvg/16x16/apps/thunderbird.png
share/icons/crystalsvg/16x16/apps/tux.png
share/icons/crystalsvg/16x16/apps/usb.png
share/icons/crystalsvg/16x16/apps/vnc.png
share/icons/crystalsvg/16x16/apps/wabi.png
share/icons/crystalsvg/16x16/apps/window_list.png
+share/icons/crystalsvg/16x16/apps/wine.png
share/icons/crystalsvg/16x16/apps/winprops.png
share/icons/crystalsvg/16x16/apps/wp.png
share/icons/crystalsvg/16x16/apps/xcalc.png
@@ -2376,15 +2395,18 @@ share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/22x22/apps/randr.png
share/icons/crystalsvg/32x32/actions/newfont.png
+share/icons/crystalsvg/32x32/apps/abiword.png
share/icons/crystalsvg/32x32/apps/access.png
share/icons/crystalsvg/32x32/apps/acroread.png
share/icons/crystalsvg/32x32/apps/agent.png
share/icons/crystalsvg/32x32/apps/alevt.png
share/icons/crystalsvg/32x32/apps/applixware.png
share/icons/crystalsvg/32x32/apps/arts.png
+share/icons/crystalsvg/32x32/apps/assistant.png
share/icons/crystalsvg/32x32/apps/background.png
share/icons/crystalsvg/32x32/apps/bell.png
share/icons/crystalsvg/32x32/apps/blender.png
+share/icons/crystalsvg/32x32/apps/bluefish.png
share/icons/crystalsvg/32x32/apps/cache.png
share/icons/crystalsvg/32x32/apps/clanbomber.png
share/icons/crystalsvg/32x32/apps/clock.png
@@ -2392,18 +2414,27 @@ share/icons/crystalsvg/32x32/apps/colors.png
share/icons/crystalsvg/32x32/apps/cookie.png
share/icons/crystalsvg/32x32/apps/date.png
share/icons/crystalsvg/32x32/apps/designer.png
+share/icons/crystalsvg/32x32/apps/dia.png
share/icons/crystalsvg/32x32/apps/dlgedit.png
+share/icons/crystalsvg/32x32/apps/eclipse.png
share/icons/crystalsvg/32x32/apps/emacs.png
share/icons/crystalsvg/32x32/apps/email.png
share/icons/crystalsvg/32x32/apps/energy.png
share/icons/crystalsvg/32x32/apps/energy_star.png
share/icons/crystalsvg/32x32/apps/enhanced_browsing.png
share/icons/crystalsvg/32x32/apps/error.png
+share/icons/crystalsvg/32x32/apps/evolution.png
share/icons/crystalsvg/32x32/apps/filetypes.png
+share/icons/crystalsvg/32x32/apps/firefox.png
share/icons/crystalsvg/32x32/apps/fonts.png
+share/icons/crystalsvg/32x32/apps/gabber.png
+share/icons/crystalsvg/32x32/apps/gaim.png
share/icons/crystalsvg/32x32/apps/galeon.png
share/icons/crystalsvg/32x32/apps/gimp.png
share/icons/crystalsvg/32x32/apps/gnome_apps.png
+share/icons/crystalsvg/32x32/apps/gnomemeeting.png
+share/icons/crystalsvg/32x32/apps/gnucash.png
+share/icons/crystalsvg/32x32/apps/gnumeric.png
share/icons/crystalsvg/32x32/apps/go.png
share/icons/crystalsvg/32x32/apps/gv.png
share/icons/crystalsvg/32x32/apps/gvim.png
@@ -2459,6 +2490,7 @@ share/icons/crystalsvg/32x32/apps/kwin.png
share/icons/crystalsvg/32x32/apps/kwrite.png
share/icons/crystalsvg/32x32/apps/kxkb.png
share/icons/crystalsvg/32x32/apps/licq.png
+share/icons/crystalsvg/32x32/apps/linguist.png
share/icons/crystalsvg/32x32/apps/linuxconf.png
share/icons/crystalsvg/32x32/apps/locale.png
share/icons/crystalsvg/32x32/apps/looknfeel.png
@@ -2490,11 +2522,13 @@ share/icons/crystalsvg/32x32/apps/package_system.png
share/icons/crystalsvg/32x32/apps/package_toys.png
share/icons/crystalsvg/32x32/apps/package_utilities.png
share/icons/crystalsvg/32x32/apps/package_wordprocessing.png
+share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/password.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
share/icons/crystalsvg/32x32/apps/plan.png
+share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/printmgr.png
share/icons/crystalsvg/32x32/apps/proxy.png
share/icons/crystalsvg/32x32/apps/pybliographic.png
@@ -2502,21 +2536,26 @@ share/icons/crystalsvg/32x32/apps/pysol.png
share/icons/crystalsvg/32x32/apps/randr.png
share/icons/crystalsvg/32x32/apps/realplayer.png
share/icons/crystalsvg/32x32/apps/samba.png
+share/icons/crystalsvg/32x32/apps/scribus.png
+share/icons/crystalsvg/32x32/apps/sodipodi.png
share/icons/crystalsvg/32x32/apps/soffice.png
share/icons/crystalsvg/32x32/apps/style.png
share/icons/crystalsvg/32x32/apps/stylesheet.png
share/icons/crystalsvg/32x32/apps/terminal.png
+share/icons/crystalsvg/32x32/apps/thunderbird.png
share/icons/crystalsvg/32x32/apps/tux.png
share/icons/crystalsvg/32x32/apps/usb.png
share/icons/crystalsvg/32x32/apps/vnc.png
share/icons/crystalsvg/32x32/apps/wabi.png
share/icons/crystalsvg/32x32/apps/window_list.png
+share/icons/crystalsvg/32x32/apps/wine.png
share/icons/crystalsvg/32x32/apps/winprops.png
share/icons/crystalsvg/32x32/apps/wp.png
share/icons/crystalsvg/32x32/apps/x.png
share/icons/crystalsvg/32x32/apps/xapp.png
share/icons/crystalsvg/32x32/apps/xawtv.png
share/icons/crystalsvg/32x32/apps/xcalc.png
+share/icons/crystalsvg/32x32/apps/xchat.png
share/icons/crystalsvg/32x32/apps/xclipboard.png
share/icons/crystalsvg/32x32/apps/xclock.png
share/icons/crystalsvg/32x32/apps/xconsole.png
@@ -2533,6 +2572,7 @@ share/icons/crystalsvg/32x32/apps/xpaint.png
share/icons/crystalsvg/32x32/apps/xv.png
share/icons/crystalsvg/32x32/devices/print_printer.png
share/icons/crystalsvg/32x32/filesystems/folder_print2.png
+share/icons/crystalsvg/48x48/apps/abiword.png
share/icons/crystalsvg/48x48/apps/access.png
share/icons/crystalsvg/48x48/apps/acroread.png
share/icons/crystalsvg/48x48/apps/agent.png
@@ -2541,6 +2581,7 @@ share/icons/crystalsvg/48x48/apps/arts.png
share/icons/crystalsvg/48x48/apps/background.png
share/icons/crystalsvg/48x48/apps/bell.png
share/icons/crystalsvg/48x48/apps/blender.png
+share/icons/crystalsvg/48x48/apps/bluefish.png
share/icons/crystalsvg/48x48/apps/cache.png
share/icons/crystalsvg/48x48/apps/clanbomber.png
share/icons/crystalsvg/48x48/apps/clock.png
@@ -2548,16 +2589,25 @@ share/icons/crystalsvg/48x48/apps/colors.png
share/icons/crystalsvg/48x48/apps/cookie.png
share/icons/crystalsvg/48x48/apps/date.png
share/icons/crystalsvg/48x48/apps/designer.png
+share/icons/crystalsvg/48x48/apps/dia.png
+share/icons/crystalsvg/48x48/apps/eclipse.png
share/icons/crystalsvg/48x48/apps/emacs.png
share/icons/crystalsvg/48x48/apps/email.png
share/icons/crystalsvg/48x48/apps/energy.png
share/icons/crystalsvg/48x48/apps/energy_star.png
share/icons/crystalsvg/48x48/apps/enhanced_browsing.png
+share/icons/crystalsvg/48x48/apps/evolution.png
share/icons/crystalsvg/48x48/apps/filetypes.png
+share/icons/crystalsvg/48x48/apps/firefox.png
share/icons/crystalsvg/48x48/apps/fonts.png
+share/icons/crystalsvg/48x48/apps/gabber.png
+share/icons/crystalsvg/48x48/apps/gaim.png
share/icons/crystalsvg/48x48/apps/galeon.png
share/icons/crystalsvg/48x48/apps/gimp.png
share/icons/crystalsvg/48x48/apps/gnome_apps.png
+share/icons/crystalsvg/48x48/apps/gnomemeeting.png
+share/icons/crystalsvg/48x48/apps/gnucash.png
+share/icons/crystalsvg/48x48/apps/gnumeric.png
share/icons/crystalsvg/48x48/apps/go.png
share/icons/crystalsvg/48x48/apps/gvim.png
share/icons/crystalsvg/48x48/apps/help_index.png
@@ -2638,16 +2688,20 @@ share/icons/crystalsvg/48x48/apps/package_system.png
share/icons/crystalsvg/48x48/apps/package_toys.png
share/icons/crystalsvg/48x48/apps/package_utilities.png
share/icons/crystalsvg/48x48/apps/package_wordprocessing.png
+share/icons/crystalsvg/48x48/apps/pan.png
share/icons/crystalsvg/48x48/apps/password.png
share/icons/crystalsvg/48x48/apps/penguin.png
share/icons/crystalsvg/48x48/apps/personal.png
share/icons/crystalsvg/48x48/apps/phppg.png
+share/icons/crystalsvg/48x48/apps/planner.png
share/icons/crystalsvg/48x48/apps/printmgr.png
share/icons/crystalsvg/48x48/apps/proxy.png
share/icons/crystalsvg/48x48/apps/pysol.png
share/icons/crystalsvg/48x48/apps/randr.png
share/icons/crystalsvg/48x48/apps/remote.png
share/icons/crystalsvg/48x48/apps/samba.png
+share/icons/crystalsvg/48x48/apps/scribus.png
+share/icons/crystalsvg/48x48/apps/sodipodi.png
share/icons/crystalsvg/48x48/apps/soffice.png
share/icons/crystalsvg/48x48/apps/staroffice.png
share/icons/crystalsvg/48x48/apps/style.png
@@ -2657,9 +2711,11 @@ share/icons/crystalsvg/48x48/apps/tux.png
share/icons/crystalsvg/48x48/apps/usb.png
share/icons/crystalsvg/48x48/apps/vnc.png
share/icons/crystalsvg/48x48/apps/window_list.png
+share/icons/crystalsvg/48x48/apps/wine.png
share/icons/crystalsvg/48x48/apps/winprops.png
share/icons/crystalsvg/48x48/apps/wmaker_apps.png
share/icons/crystalsvg/48x48/apps/wp.png
+share/icons/crystalsvg/48x48/apps/xchat.png
share/icons/crystalsvg/48x48/apps/xclock.png
share/icons/crystalsvg/48x48/apps/xedit.png
share/icons/crystalsvg/48x48/apps/xemacs.png
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 41c7153a8621..67c989a40513 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index d19b2bea5dec..25dba8c07361 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85
-SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476
+MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117
+SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422
diff --git a/x11/kde4-runtime/files/patch-startkde b/x11/kde4-runtime/files/patch-startkde
deleted file mode 100644
index 07c59a384354..000000000000
--- a/x11/kde4-runtime/files/patch-startkde
+++ /dev/null
@@ -1,12 +0,0 @@
---- patch-startkde begins here ---
---- startkde.orig Sun Oct 26 11:45:35 2003
-+++ startkde Thu Apr 8 12:20:47 2004
-@@ -59,7 +59,7 @@
- do_usr_odir=1
- if test -r "$kde_fontpaths" ; then
- savifs=$IFS
-- IFS=$'\n'
-+ IFS=${IFS#??}
- for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do
- rfpath=`echo $fpath | sed s:\~:$HOME:g`
- if test -s "$rfpath"/fonts.dir; then
diff --git a/x11/kde4-runtime/files/plist.base b/x11/kde4-runtime/files/plist.base
index 6eb17215bba7..7866bcb8d6af 100644
--- a/x11/kde4-runtime/files/plist.base
+++ b/x11/kde4-runtime/files/plist.base
@@ -2212,15 +2212,18 @@ share/icons/crystalsvg/128x128/apps/xclock.png
share/icons/crystalsvg/128x128/apps/xfmail.png
share/icons/crystalsvg/128x128/apps/xmag.png
share/icons/crystalsvg/16x16/actions/newfont.png
+share/icons/crystalsvg/16x16/apps/abiword.png
share/icons/crystalsvg/16x16/apps/access.png
share/icons/crystalsvg/16x16/apps/acroread.png
share/icons/crystalsvg/16x16/apps/agent.png
share/icons/crystalsvg/16x16/apps/alevt.png
share/icons/crystalsvg/16x16/apps/applixware.png
share/icons/crystalsvg/16x16/apps/arts.png
+share/icons/crystalsvg/16x16/apps/assistant.png
share/icons/crystalsvg/16x16/apps/background.png
share/icons/crystalsvg/16x16/apps/bell.png
share/icons/crystalsvg/16x16/apps/blender.png
+share/icons/crystalsvg/16x16/apps/bluefish.png
share/icons/crystalsvg/16x16/apps/cache.png
share/icons/crystalsvg/16x16/apps/clanbomber.png
share/icons/crystalsvg/16x16/apps/clock.png
@@ -2228,16 +2231,25 @@ share/icons/crystalsvg/16x16/apps/colors.png
share/icons/crystalsvg/16x16/apps/cookie.png
share/icons/crystalsvg/16x16/apps/date.png
share/icons/crystalsvg/16x16/apps/designer.png
+share/icons/crystalsvg/16x16/apps/dia.png
share/icons/crystalsvg/16x16/apps/dlgedit.png
+share/icons/crystalsvg/16x16/apps/eclipse.png
share/icons/crystalsvg/16x16/apps/emacs.png
share/icons/crystalsvg/16x16/apps/email.png
share/icons/crystalsvg/16x16/apps/energy.png
share/icons/crystalsvg/16x16/apps/energy_star.png
share/icons/crystalsvg/16x16/apps/enhanced_browsing.png
+share/icons/crystalsvg/16x16/apps/evolution.png
share/icons/crystalsvg/16x16/apps/filetypes.png
+share/icons/crystalsvg/16x16/apps/firefox.png
share/icons/crystalsvg/16x16/apps/fonts.png
+share/icons/crystalsvg/16x16/apps/gabber.png
+share/icons/crystalsvg/16x16/apps/gaim.png
share/icons/crystalsvg/16x16/apps/gimp.png
share/icons/crystalsvg/16x16/apps/gnome_apps.png
+share/icons/crystalsvg/16x16/apps/gnomemeeting.png
+share/icons/crystalsvg/16x16/apps/gnucash.png
+share/icons/crystalsvg/16x16/apps/gnumeric.png
share/icons/crystalsvg/16x16/apps/go.png
share/icons/crystalsvg/16x16/apps/gv.png
share/icons/crystalsvg/16x16/apps/gvim.png
@@ -2292,6 +2304,7 @@ share/icons/crystalsvg/16x16/apps/kwin.png
share/icons/crystalsvg/16x16/apps/kwrite.png
share/icons/crystalsvg/16x16/apps/kxkb.png
share/icons/crystalsvg/16x16/apps/licq.png
+share/icons/crystalsvg/16x16/apps/linguist.png
share/icons/crystalsvg/16x16/apps/linuxconf.png
share/icons/crystalsvg/16x16/apps/locale.png
share/icons/crystalsvg/16x16/apps/looknfeel.png
@@ -2325,6 +2338,7 @@ share/icons/crystalsvg/16x16/apps/package_system.png
share/icons/crystalsvg/16x16/apps/package_toys.png
share/icons/crystalsvg/16x16/apps/package_utilities.png
share/icons/crystalsvg/16x16/apps/package_wordprocessing.png
+share/icons/crystalsvg/16x16/apps/pan.png
share/icons/crystalsvg/16x16/apps/panel.png
share/icons/crystalsvg/16x16/apps/panel_settings.png
share/icons/crystalsvg/16x16/apps/password.png
@@ -2332,6 +2346,7 @@ share/icons/crystalsvg/16x16/apps/penguin.png
share/icons/crystalsvg/16x16/apps/personal.png
share/icons/crystalsvg/16x16/apps/phppg.png
share/icons/crystalsvg/16x16/apps/plan.png
+share/icons/crystalsvg/16x16/apps/planner.png
share/icons/crystalsvg/16x16/apps/printmgr.png
share/icons/crystalsvg/16x16/apps/proxy.png
share/icons/crystalsvg/16x16/apps/pybliographic.png
@@ -2339,15 +2354,19 @@ share/icons/crystalsvg/16x16/apps/randr.png
share/icons/crystalsvg/16x16/apps/realplayer.png
share/icons/crystalsvg/16x16/apps/remote.png
share/icons/crystalsvg/16x16/apps/samba.png
+share/icons/crystalsvg/16x16/apps/scribus.png
+share/icons/crystalsvg/16x16/apps/sodipodi.png
share/icons/crystalsvg/16x16/apps/soffice.png
share/icons/crystalsvg/16x16/apps/style.png
share/icons/crystalsvg/16x16/apps/stylesheet.png
share/icons/crystalsvg/16x16/apps/terminal.png
+share/icons/crystalsvg/16x16/apps/thunderbird.png
share/icons/crystalsvg/16x16/apps/tux.png
share/icons/crystalsvg/16x16/apps/usb.png
share/icons/crystalsvg/16x16/apps/vnc.png
share/icons/crystalsvg/16x16/apps/wabi.png
share/icons/crystalsvg/16x16/apps/window_list.png
+share/icons/crystalsvg/16x16/apps/wine.png
share/icons/crystalsvg/16x16/apps/winprops.png
share/icons/crystalsvg/16x16/apps/wp.png
share/icons/crystalsvg/16x16/apps/xcalc.png
@@ -2376,15 +2395,18 @@ share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/22x22/apps/randr.png
share/icons/crystalsvg/32x32/actions/newfont.png
+share/icons/crystalsvg/32x32/apps/abiword.png
share/icons/crystalsvg/32x32/apps/access.png
share/icons/crystalsvg/32x32/apps/acroread.png
share/icons/crystalsvg/32x32/apps/agent.png
share/icons/crystalsvg/32x32/apps/alevt.png
share/icons/crystalsvg/32x32/apps/applixware.png
share/icons/crystalsvg/32x32/apps/arts.png
+share/icons/crystalsvg/32x32/apps/assistant.png
share/icons/crystalsvg/32x32/apps/background.png
share/icons/crystalsvg/32x32/apps/bell.png
share/icons/crystalsvg/32x32/apps/blender.png
+share/icons/crystalsvg/32x32/apps/bluefish.png
share/icons/crystalsvg/32x32/apps/cache.png
share/icons/crystalsvg/32x32/apps/clanbomber.png
share/icons/crystalsvg/32x32/apps/clock.png
@@ -2392,18 +2414,27 @@ share/icons/crystalsvg/32x32/apps/colors.png
share/icons/crystalsvg/32x32/apps/cookie.png
share/icons/crystalsvg/32x32/apps/date.png
share/icons/crystalsvg/32x32/apps/designer.png
+share/icons/crystalsvg/32x32/apps/dia.png
share/icons/crystalsvg/32x32/apps/dlgedit.png
+share/icons/crystalsvg/32x32/apps/eclipse.png
share/icons/crystalsvg/32x32/apps/emacs.png
share/icons/crystalsvg/32x32/apps/email.png
share/icons/crystalsvg/32x32/apps/energy.png
share/icons/crystalsvg/32x32/apps/energy_star.png
share/icons/crystalsvg/32x32/apps/enhanced_browsing.png
share/icons/crystalsvg/32x32/apps/error.png
+share/icons/crystalsvg/32x32/apps/evolution.png
share/icons/crystalsvg/32x32/apps/filetypes.png
+share/icons/crystalsvg/32x32/apps/firefox.png
share/icons/crystalsvg/32x32/apps/fonts.png
+share/icons/crystalsvg/32x32/apps/gabber.png
+share/icons/crystalsvg/32x32/apps/gaim.png
share/icons/crystalsvg/32x32/apps/galeon.png
share/icons/crystalsvg/32x32/apps/gimp.png
share/icons/crystalsvg/32x32/apps/gnome_apps.png
+share/icons/crystalsvg/32x32/apps/gnomemeeting.png
+share/icons/crystalsvg/32x32/apps/gnucash.png
+share/icons/crystalsvg/32x32/apps/gnumeric.png
share/icons/crystalsvg/32x32/apps/go.png
share/icons/crystalsvg/32x32/apps/gv.png
share/icons/crystalsvg/32x32/apps/gvim.png
@@ -2459,6 +2490,7 @@ share/icons/crystalsvg/32x32/apps/kwin.png
share/icons/crystalsvg/32x32/apps/kwrite.png
share/icons/crystalsvg/32x32/apps/kxkb.png
share/icons/crystalsvg/32x32/apps/licq.png
+share/icons/crystalsvg/32x32/apps/linguist.png
share/icons/crystalsvg/32x32/apps/linuxconf.png
share/icons/crystalsvg/32x32/apps/locale.png
share/icons/crystalsvg/32x32/apps/looknfeel.png
@@ -2490,11 +2522,13 @@ share/icons/crystalsvg/32x32/apps/package_system.png
share/icons/crystalsvg/32x32/apps/package_toys.png
share/icons/crystalsvg/32x32/apps/package_utilities.png
share/icons/crystalsvg/32x32/apps/package_wordprocessing.png
+share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/password.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
share/icons/crystalsvg/32x32/apps/plan.png
+share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/printmgr.png
share/icons/crystalsvg/32x32/apps/proxy.png
share/icons/crystalsvg/32x32/apps/pybliographic.png
@@ -2502,21 +2536,26 @@ share/icons/crystalsvg/32x32/apps/pysol.png
share/icons/crystalsvg/32x32/apps/randr.png
share/icons/crystalsvg/32x32/apps/realplayer.png
share/icons/crystalsvg/32x32/apps/samba.png
+share/icons/crystalsvg/32x32/apps/scribus.png
+share/icons/crystalsvg/32x32/apps/sodipodi.png
share/icons/crystalsvg/32x32/apps/soffice.png
share/icons/crystalsvg/32x32/apps/style.png
share/icons/crystalsvg/32x32/apps/stylesheet.png
share/icons/crystalsvg/32x32/apps/terminal.png
+share/icons/crystalsvg/32x32/apps/thunderbird.png
share/icons/crystalsvg/32x32/apps/tux.png
share/icons/crystalsvg/32x32/apps/usb.png
share/icons/crystalsvg/32x32/apps/vnc.png
share/icons/crystalsvg/32x32/apps/wabi.png
share/icons/crystalsvg/32x32/apps/window_list.png
+share/icons/crystalsvg/32x32/apps/wine.png
share/icons/crystalsvg/32x32/apps/winprops.png
share/icons/crystalsvg/32x32/apps/wp.png
share/icons/crystalsvg/32x32/apps/x.png
share/icons/crystalsvg/32x32/apps/xapp.png
share/icons/crystalsvg/32x32/apps/xawtv.png
share/icons/crystalsvg/32x32/apps/xcalc.png
+share/icons/crystalsvg/32x32/apps/xchat.png
share/icons/crystalsvg/32x32/apps/xclipboard.png
share/icons/crystalsvg/32x32/apps/xclock.png
share/icons/crystalsvg/32x32/apps/xconsole.png
@@ -2533,6 +2572,7 @@ share/icons/crystalsvg/32x32/apps/xpaint.png
share/icons/crystalsvg/32x32/apps/xv.png
share/icons/crystalsvg/32x32/devices/print_printer.png
share/icons/crystalsvg/32x32/filesystems/folder_print2.png
+share/icons/crystalsvg/48x48/apps/abiword.png
share/icons/crystalsvg/48x48/apps/access.png
share/icons/crystalsvg/48x48/apps/acroread.png
share/icons/crystalsvg/48x48/apps/agent.png
@@ -2541,6 +2581,7 @@ share/icons/crystalsvg/48x48/apps/arts.png
share/icons/crystalsvg/48x48/apps/background.png
share/icons/crystalsvg/48x48/apps/bell.png
share/icons/crystalsvg/48x48/apps/blender.png
+share/icons/crystalsvg/48x48/apps/bluefish.png
share/icons/crystalsvg/48x48/apps/cache.png
share/icons/crystalsvg/48x48/apps/clanbomber.png
share/icons/crystalsvg/48x48/apps/clock.png
@@ -2548,16 +2589,25 @@ share/icons/crystalsvg/48x48/apps/colors.png
share/icons/crystalsvg/48x48/apps/cookie.png
share/icons/crystalsvg/48x48/apps/date.png
share/icons/crystalsvg/48x48/apps/designer.png
+share/icons/crystalsvg/48x48/apps/dia.png
+share/icons/crystalsvg/48x48/apps/eclipse.png
share/icons/crystalsvg/48x48/apps/emacs.png
share/icons/crystalsvg/48x48/apps/email.png
share/icons/crystalsvg/48x48/apps/energy.png
share/icons/crystalsvg/48x48/apps/energy_star.png
share/icons/crystalsvg/48x48/apps/enhanced_browsing.png
+share/icons/crystalsvg/48x48/apps/evolution.png
share/icons/crystalsvg/48x48/apps/filetypes.png
+share/icons/crystalsvg/48x48/apps/firefox.png
share/icons/crystalsvg/48x48/apps/fonts.png
+share/icons/crystalsvg/48x48/apps/gabber.png
+share/icons/crystalsvg/48x48/apps/gaim.png
share/icons/crystalsvg/48x48/apps/galeon.png
share/icons/crystalsvg/48x48/apps/gimp.png
share/icons/crystalsvg/48x48/apps/gnome_apps.png
+share/icons/crystalsvg/48x48/apps/gnomemeeting.png
+share/icons/crystalsvg/48x48/apps/gnucash.png
+share/icons/crystalsvg/48x48/apps/gnumeric.png
share/icons/crystalsvg/48x48/apps/go.png
share/icons/crystalsvg/48x48/apps/gvim.png
share/icons/crystalsvg/48x48/apps/help_index.png
@@ -2638,16 +2688,20 @@ share/icons/crystalsvg/48x48/apps/package_system.png
share/icons/crystalsvg/48x48/apps/package_toys.png
share/icons/crystalsvg/48x48/apps/package_utilities.png
share/icons/crystalsvg/48x48/apps/package_wordprocessing.png
+share/icons/crystalsvg/48x48/apps/pan.png
share/icons/crystalsvg/48x48/apps/password.png
share/icons/crystalsvg/48x48/apps/penguin.png
share/icons/crystalsvg/48x48/apps/personal.png
share/icons/crystalsvg/48x48/apps/phppg.png
+share/icons/crystalsvg/48x48/apps/planner.png
share/icons/crystalsvg/48x48/apps/printmgr.png
share/icons/crystalsvg/48x48/apps/proxy.png
share/icons/crystalsvg/48x48/apps/pysol.png
share/icons/crystalsvg/48x48/apps/randr.png
share/icons/crystalsvg/48x48/apps/remote.png
share/icons/crystalsvg/48x48/apps/samba.png
+share/icons/crystalsvg/48x48/apps/scribus.png
+share/icons/crystalsvg/48x48/apps/sodipodi.png
share/icons/crystalsvg/48x48/apps/soffice.png
share/icons/crystalsvg/48x48/apps/staroffice.png
share/icons/crystalsvg/48x48/apps/style.png
@@ -2657,9 +2711,11 @@ share/icons/crystalsvg/48x48/apps/tux.png
share/icons/crystalsvg/48x48/apps/usb.png
share/icons/crystalsvg/48x48/apps/vnc.png
share/icons/crystalsvg/48x48/apps/window_list.png
+share/icons/crystalsvg/48x48/apps/wine.png
share/icons/crystalsvg/48x48/apps/winprops.png
share/icons/crystalsvg/48x48/apps/wmaker_apps.png
share/icons/crystalsvg/48x48/apps/wp.png
+share/icons/crystalsvg/48x48/apps/xchat.png
share/icons/crystalsvg/48x48/apps/xclock.png
share/icons/crystalsvg/48x48/apps/xedit.png
share/icons/crystalsvg/48x48/apps/xemacs.png
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 41c7153a8621..67c989a40513 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index d19b2bea5dec..25dba8c07361 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85
-SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476
+MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117
+SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422
diff --git a/x11/kde4-workspace/files/patch-startkde b/x11/kde4-workspace/files/patch-startkde
deleted file mode 100644
index 07c59a384354..000000000000
--- a/x11/kde4-workspace/files/patch-startkde
+++ /dev/null
@@ -1,12 +0,0 @@
---- patch-startkde begins here ---
---- startkde.orig Sun Oct 26 11:45:35 2003
-+++ startkde Thu Apr 8 12:20:47 2004
-@@ -59,7 +59,7 @@
- do_usr_odir=1
- if test -r "$kde_fontpaths" ; then
- savifs=$IFS
-- IFS=$'\n'
-+ IFS=${IFS#??}
- for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do
- rfpath=`echo $fpath | sed s:\~:$HOME:g`
- if test -s "$rfpath"/fonts.dir; then
diff --git a/x11/kde4-workspace/files/plist.base b/x11/kde4-workspace/files/plist.base
index 6eb17215bba7..7866bcb8d6af 100644
--- a/x11/kde4-workspace/files/plist.base
+++ b/x11/kde4-workspace/files/plist.base
@@ -2212,15 +2212,18 @@ share/icons/crystalsvg/128x128/apps/xclock.png
share/icons/crystalsvg/128x128/apps/xfmail.png
share/icons/crystalsvg/128x128/apps/xmag.png
share/icons/crystalsvg/16x16/actions/newfont.png
+share/icons/crystalsvg/16x16/apps/abiword.png
share/icons/crystalsvg/16x16/apps/access.png
share/icons/crystalsvg/16x16/apps/acroread.png
share/icons/crystalsvg/16x16/apps/agent.png
share/icons/crystalsvg/16x16/apps/alevt.png
share/icons/crystalsvg/16x16/apps/applixware.png
share/icons/crystalsvg/16x16/apps/arts.png
+share/icons/crystalsvg/16x16/apps/assistant.png
share/icons/crystalsvg/16x16/apps/background.png
share/icons/crystalsvg/16x16/apps/bell.png
share/icons/crystalsvg/16x16/apps/blender.png
+share/icons/crystalsvg/16x16/apps/bluefish.png
share/icons/crystalsvg/16x16/apps/cache.png
share/icons/crystalsvg/16x16/apps/clanbomber.png
share/icons/crystalsvg/16x16/apps/clock.png
@@ -2228,16 +2231,25 @@ share/icons/crystalsvg/16x16/apps/colors.png
share/icons/crystalsvg/16x16/apps/cookie.png
share/icons/crystalsvg/16x16/apps/date.png
share/icons/crystalsvg/16x16/apps/designer.png
+share/icons/crystalsvg/16x16/apps/dia.png
share/icons/crystalsvg/16x16/apps/dlgedit.png
+share/icons/crystalsvg/16x16/apps/eclipse.png
share/icons/crystalsvg/16x16/apps/emacs.png
share/icons/crystalsvg/16x16/apps/email.png
share/icons/crystalsvg/16x16/apps/energy.png
share/icons/crystalsvg/16x16/apps/energy_star.png
share/icons/crystalsvg/16x16/apps/enhanced_browsing.png
+share/icons/crystalsvg/16x16/apps/evolution.png
share/icons/crystalsvg/16x16/apps/filetypes.png
+share/icons/crystalsvg/16x16/apps/firefox.png
share/icons/crystalsvg/16x16/apps/fonts.png
+share/icons/crystalsvg/16x16/apps/gabber.png
+share/icons/crystalsvg/16x16/apps/gaim.png
share/icons/crystalsvg/16x16/apps/gimp.png
share/icons/crystalsvg/16x16/apps/gnome_apps.png
+share/icons/crystalsvg/16x16/apps/gnomemeeting.png
+share/icons/crystalsvg/16x16/apps/gnucash.png
+share/icons/crystalsvg/16x16/apps/gnumeric.png
share/icons/crystalsvg/16x16/apps/go.png
share/icons/crystalsvg/16x16/apps/gv.png
share/icons/crystalsvg/16x16/apps/gvim.png
@@ -2292,6 +2304,7 @@ share/icons/crystalsvg/16x16/apps/kwin.png
share/icons/crystalsvg/16x16/apps/kwrite.png
share/icons/crystalsvg/16x16/apps/kxkb.png
share/icons/crystalsvg/16x16/apps/licq.png
+share/icons/crystalsvg/16x16/apps/linguist.png
share/icons/crystalsvg/16x16/apps/linuxconf.png
share/icons/crystalsvg/16x16/apps/locale.png
share/icons/crystalsvg/16x16/apps/looknfeel.png
@@ -2325,6 +2338,7 @@ share/icons/crystalsvg/16x16/apps/package_system.png
share/icons/crystalsvg/16x16/apps/package_toys.png
share/icons/crystalsvg/16x16/apps/package_utilities.png
share/icons/crystalsvg/16x16/apps/package_wordprocessing.png
+share/icons/crystalsvg/16x16/apps/pan.png
share/icons/crystalsvg/16x16/apps/panel.png
share/icons/crystalsvg/16x16/apps/panel_settings.png
share/icons/crystalsvg/16x16/apps/password.png
@@ -2332,6 +2346,7 @@ share/icons/crystalsvg/16x16/apps/penguin.png
share/icons/crystalsvg/16x16/apps/personal.png
share/icons/crystalsvg/16x16/apps/phppg.png
share/icons/crystalsvg/16x16/apps/plan.png
+share/icons/crystalsvg/16x16/apps/planner.png
share/icons/crystalsvg/16x16/apps/printmgr.png
share/icons/crystalsvg/16x16/apps/proxy.png
share/icons/crystalsvg/16x16/apps/pybliographic.png
@@ -2339,15 +2354,19 @@ share/icons/crystalsvg/16x16/apps/randr.png
share/icons/crystalsvg/16x16/apps/realplayer.png
share/icons/crystalsvg/16x16/apps/remote.png
share/icons/crystalsvg/16x16/apps/samba.png
+share/icons/crystalsvg/16x16/apps/scribus.png
+share/icons/crystalsvg/16x16/apps/sodipodi.png
share/icons/crystalsvg/16x16/apps/soffice.png
share/icons/crystalsvg/16x16/apps/style.png
share/icons/crystalsvg/16x16/apps/stylesheet.png
share/icons/crystalsvg/16x16/apps/terminal.png
+share/icons/crystalsvg/16x16/apps/thunderbird.png
share/icons/crystalsvg/16x16/apps/tux.png
share/icons/crystalsvg/16x16/apps/usb.png
share/icons/crystalsvg/16x16/apps/vnc.png
share/icons/crystalsvg/16x16/apps/wabi.png
share/icons/crystalsvg/16x16/apps/window_list.png
+share/icons/crystalsvg/16x16/apps/wine.png
share/icons/crystalsvg/16x16/apps/winprops.png
share/icons/crystalsvg/16x16/apps/wp.png
share/icons/crystalsvg/16x16/apps/xcalc.png
@@ -2376,15 +2395,18 @@ share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/22x22/apps/randr.png
share/icons/crystalsvg/32x32/actions/newfont.png
+share/icons/crystalsvg/32x32/apps/abiword.png
share/icons/crystalsvg/32x32/apps/access.png
share/icons/crystalsvg/32x32/apps/acroread.png
share/icons/crystalsvg/32x32/apps/agent.png
share/icons/crystalsvg/32x32/apps/alevt.png
share/icons/crystalsvg/32x32/apps/applixware.png
share/icons/crystalsvg/32x32/apps/arts.png
+share/icons/crystalsvg/32x32/apps/assistant.png
share/icons/crystalsvg/32x32/apps/background.png
share/icons/crystalsvg/32x32/apps/bell.png
share/icons/crystalsvg/32x32/apps/blender.png
+share/icons/crystalsvg/32x32/apps/bluefish.png
share/icons/crystalsvg/32x32/apps/cache.png
share/icons/crystalsvg/32x32/apps/clanbomber.png
share/icons/crystalsvg/32x32/apps/clock.png
@@ -2392,18 +2414,27 @@ share/icons/crystalsvg/32x32/apps/colors.png
share/icons/crystalsvg/32x32/apps/cookie.png
share/icons/crystalsvg/32x32/apps/date.png
share/icons/crystalsvg/32x32/apps/designer.png
+share/icons/crystalsvg/32x32/apps/dia.png
share/icons/crystalsvg/32x32/apps/dlgedit.png
+share/icons/crystalsvg/32x32/apps/eclipse.png
share/icons/crystalsvg/32x32/apps/emacs.png
share/icons/crystalsvg/32x32/apps/email.png
share/icons/crystalsvg/32x32/apps/energy.png
share/icons/crystalsvg/32x32/apps/energy_star.png
share/icons/crystalsvg/32x32/apps/enhanced_browsing.png
share/icons/crystalsvg/32x32/apps/error.png
+share/icons/crystalsvg/32x32/apps/evolution.png
share/icons/crystalsvg/32x32/apps/filetypes.png
+share/icons/crystalsvg/32x32/apps/firefox.png
share/icons/crystalsvg/32x32/apps/fonts.png
+share/icons/crystalsvg/32x32/apps/gabber.png
+share/icons/crystalsvg/32x32/apps/gaim.png
share/icons/crystalsvg/32x32/apps/galeon.png
share/icons/crystalsvg/32x32/apps/gimp.png
share/icons/crystalsvg/32x32/apps/gnome_apps.png
+share/icons/crystalsvg/32x32/apps/gnomemeeting.png
+share/icons/crystalsvg/32x32/apps/gnucash.png
+share/icons/crystalsvg/32x32/apps/gnumeric.png
share/icons/crystalsvg/32x32/apps/go.png
share/icons/crystalsvg/32x32/apps/gv.png
share/icons/crystalsvg/32x32/apps/gvim.png
@@ -2459,6 +2490,7 @@ share/icons/crystalsvg/32x32/apps/kwin.png
share/icons/crystalsvg/32x32/apps/kwrite.png
share/icons/crystalsvg/32x32/apps/kxkb.png
share/icons/crystalsvg/32x32/apps/licq.png
+share/icons/crystalsvg/32x32/apps/linguist.png
share/icons/crystalsvg/32x32/apps/linuxconf.png
share/icons/crystalsvg/32x32/apps/locale.png
share/icons/crystalsvg/32x32/apps/looknfeel.png
@@ -2490,11 +2522,13 @@ share/icons/crystalsvg/32x32/apps/package_system.png
share/icons/crystalsvg/32x32/apps/package_toys.png
share/icons/crystalsvg/32x32/apps/package_utilities.png
share/icons/crystalsvg/32x32/apps/package_wordprocessing.png
+share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/password.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
share/icons/crystalsvg/32x32/apps/plan.png
+share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/printmgr.png
share/icons/crystalsvg/32x32/apps/proxy.png
share/icons/crystalsvg/32x32/apps/pybliographic.png
@@ -2502,21 +2536,26 @@ share/icons/crystalsvg/32x32/apps/pysol.png
share/icons/crystalsvg/32x32/apps/randr.png
share/icons/crystalsvg/32x32/apps/realplayer.png
share/icons/crystalsvg/32x32/apps/samba.png
+share/icons/crystalsvg/32x32/apps/scribus.png
+share/icons/crystalsvg/32x32/apps/sodipodi.png
share/icons/crystalsvg/32x32/apps/soffice.png
share/icons/crystalsvg/32x32/apps/style.png
share/icons/crystalsvg/32x32/apps/stylesheet.png
share/icons/crystalsvg/32x32/apps/terminal.png
+share/icons/crystalsvg/32x32/apps/thunderbird.png
share/icons/crystalsvg/32x32/apps/tux.png
share/icons/crystalsvg/32x32/apps/usb.png
share/icons/crystalsvg/32x32/apps/vnc.png
share/icons/crystalsvg/32x32/apps/wabi.png
share/icons/crystalsvg/32x32/apps/window_list.png
+share/icons/crystalsvg/32x32/apps/wine.png
share/icons/crystalsvg/32x32/apps/winprops.png
share/icons/crystalsvg/32x32/apps/wp.png
share/icons/crystalsvg/32x32/apps/x.png
share/icons/crystalsvg/32x32/apps/xapp.png
share/icons/crystalsvg/32x32/apps/xawtv.png
share/icons/crystalsvg/32x32/apps/xcalc.png
+share/icons/crystalsvg/32x32/apps/xchat.png
share/icons/crystalsvg/32x32/apps/xclipboard.png
share/icons/crystalsvg/32x32/apps/xclock.png
share/icons/crystalsvg/32x32/apps/xconsole.png
@@ -2533,6 +2572,7 @@ share/icons/crystalsvg/32x32/apps/xpaint.png
share/icons/crystalsvg/32x32/apps/xv.png
share/icons/crystalsvg/32x32/devices/print_printer.png
share/icons/crystalsvg/32x32/filesystems/folder_print2.png
+share/icons/crystalsvg/48x48/apps/abiword.png
share/icons/crystalsvg/48x48/apps/access.png
share/icons/crystalsvg/48x48/apps/acroread.png
share/icons/crystalsvg/48x48/apps/agent.png
@@ -2541,6 +2581,7 @@ share/icons/crystalsvg/48x48/apps/arts.png
share/icons/crystalsvg/48x48/apps/background.png
share/icons/crystalsvg/48x48/apps/bell.png
share/icons/crystalsvg/48x48/apps/blender.png
+share/icons/crystalsvg/48x48/apps/bluefish.png
share/icons/crystalsvg/48x48/apps/cache.png
share/icons/crystalsvg/48x48/apps/clanbomber.png
share/icons/crystalsvg/48x48/apps/clock.png
@@ -2548,16 +2589,25 @@ share/icons/crystalsvg/48x48/apps/colors.png
share/icons/crystalsvg/48x48/apps/cookie.png
share/icons/crystalsvg/48x48/apps/date.png
share/icons/crystalsvg/48x48/apps/designer.png
+share/icons/crystalsvg/48x48/apps/dia.png
+share/icons/crystalsvg/48x48/apps/eclipse.png
share/icons/crystalsvg/48x48/apps/emacs.png
share/icons/crystalsvg/48x48/apps/email.png
share/icons/crystalsvg/48x48/apps/energy.png
share/icons/crystalsvg/48x48/apps/energy_star.png
share/icons/crystalsvg/48x48/apps/enhanced_browsing.png
+share/icons/crystalsvg/48x48/apps/evolution.png
share/icons/crystalsvg/48x48/apps/filetypes.png
+share/icons/crystalsvg/48x48/apps/firefox.png
share/icons/crystalsvg/48x48/apps/fonts.png
+share/icons/crystalsvg/48x48/apps/gabber.png
+share/icons/crystalsvg/48x48/apps/gaim.png
share/icons/crystalsvg/48x48/apps/galeon.png
share/icons/crystalsvg/48x48/apps/gimp.png
share/icons/crystalsvg/48x48/apps/gnome_apps.png
+share/icons/crystalsvg/48x48/apps/gnomemeeting.png
+share/icons/crystalsvg/48x48/apps/gnucash.png
+share/icons/crystalsvg/48x48/apps/gnumeric.png
share/icons/crystalsvg/48x48/apps/go.png
share/icons/crystalsvg/48x48/apps/gvim.png
share/icons/crystalsvg/48x48/apps/help_index.png
@@ -2638,16 +2688,20 @@ share/icons/crystalsvg/48x48/apps/package_system.png
share/icons/crystalsvg/48x48/apps/package_toys.png
share/icons/crystalsvg/48x48/apps/package_utilities.png
share/icons/crystalsvg/48x48/apps/package_wordprocessing.png
+share/icons/crystalsvg/48x48/apps/pan.png
share/icons/crystalsvg/48x48/apps/password.png
share/icons/crystalsvg/48x48/apps/penguin.png
share/icons/crystalsvg/48x48/apps/personal.png
share/icons/crystalsvg/48x48/apps/phppg.png
+share/icons/crystalsvg/48x48/apps/planner.png
share/icons/crystalsvg/48x48/apps/printmgr.png
share/icons/crystalsvg/48x48/apps/proxy.png
share/icons/crystalsvg/48x48/apps/pysol.png
share/icons/crystalsvg/48x48/apps/randr.png
share/icons/crystalsvg/48x48/apps/remote.png
share/icons/crystalsvg/48x48/apps/samba.png
+share/icons/crystalsvg/48x48/apps/scribus.png
+share/icons/crystalsvg/48x48/apps/sodipodi.png
share/icons/crystalsvg/48x48/apps/soffice.png
share/icons/crystalsvg/48x48/apps/staroffice.png
share/icons/crystalsvg/48x48/apps/style.png
@@ -2657,9 +2711,11 @@ share/icons/crystalsvg/48x48/apps/tux.png
share/icons/crystalsvg/48x48/apps/usb.png
share/icons/crystalsvg/48x48/apps/vnc.png
share/icons/crystalsvg/48x48/apps/window_list.png
+share/icons/crystalsvg/48x48/apps/wine.png
share/icons/crystalsvg/48x48/apps/winprops.png
share/icons/crystalsvg/48x48/apps/wmaker_apps.png
share/icons/crystalsvg/48x48/apps/wp.png
+share/icons/crystalsvg/48x48/apps/xchat.png
share/icons/crystalsvg/48x48/apps/xclock.png
share/icons/crystalsvg/48x48/apps/xedit.png
share/icons/crystalsvg/48x48/apps/xemacs.png
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 41c7153a8621..67c989a40513 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index d19b2bea5dec..25dba8c07361 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85
-SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476
+MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117
+SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422
diff --git a/x11/kdebase3/files/patch-startkde b/x11/kdebase3/files/patch-startkde
deleted file mode 100644
index 07c59a384354..000000000000
--- a/x11/kdebase3/files/patch-startkde
+++ /dev/null
@@ -1,12 +0,0 @@
---- patch-startkde begins here ---
---- startkde.orig Sun Oct 26 11:45:35 2003
-+++ startkde Thu Apr 8 12:20:47 2004
-@@ -59,7 +59,7 @@
- do_usr_odir=1
- if test -r "$kde_fontpaths" ; then
- savifs=$IFS
-- IFS=$'\n'
-+ IFS=${IFS#??}
- for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do
- rfpath=`echo $fpath | sed s:\~:$HOME:g`
- if test -s "$rfpath"/fonts.dir; then
diff --git a/x11/kdebase3/files/plist.base b/x11/kdebase3/files/plist.base
index 6eb17215bba7..7866bcb8d6af 100644
--- a/x11/kdebase3/files/plist.base
+++ b/x11/kdebase3/files/plist.base
@@ -2212,15 +2212,18 @@ share/icons/crystalsvg/128x128/apps/xclock.png
share/icons/crystalsvg/128x128/apps/xfmail.png
share/icons/crystalsvg/128x128/apps/xmag.png
share/icons/crystalsvg/16x16/actions/newfont.png
+share/icons/crystalsvg/16x16/apps/abiword.png
share/icons/crystalsvg/16x16/apps/access.png
share/icons/crystalsvg/16x16/apps/acroread.png
share/icons/crystalsvg/16x16/apps/agent.png
share/icons/crystalsvg/16x16/apps/alevt.png
share/icons/crystalsvg/16x16/apps/applixware.png
share/icons/crystalsvg/16x16/apps/arts.png
+share/icons/crystalsvg/16x16/apps/assistant.png
share/icons/crystalsvg/16x16/apps/background.png
share/icons/crystalsvg/16x16/apps/bell.png
share/icons/crystalsvg/16x16/apps/blender.png
+share/icons/crystalsvg/16x16/apps/bluefish.png
share/icons/crystalsvg/16x16/apps/cache.png
share/icons/crystalsvg/16x16/apps/clanbomber.png
share/icons/crystalsvg/16x16/apps/clock.png
@@ -2228,16 +2231,25 @@ share/icons/crystalsvg/16x16/apps/colors.png
share/icons/crystalsvg/16x16/apps/cookie.png
share/icons/crystalsvg/16x16/apps/date.png
share/icons/crystalsvg/16x16/apps/designer.png
+share/icons/crystalsvg/16x16/apps/dia.png
share/icons/crystalsvg/16x16/apps/dlgedit.png
+share/icons/crystalsvg/16x16/apps/eclipse.png
share/icons/crystalsvg/16x16/apps/emacs.png
share/icons/crystalsvg/16x16/apps/email.png
share/icons/crystalsvg/16x16/apps/energy.png
share/icons/crystalsvg/16x16/apps/energy_star.png
share/icons/crystalsvg/16x16/apps/enhanced_browsing.png
+share/icons/crystalsvg/16x16/apps/evolution.png
share/icons/crystalsvg/16x16/apps/filetypes.png
+share/icons/crystalsvg/16x16/apps/firefox.png
share/icons/crystalsvg/16x16/apps/fonts.png
+share/icons/crystalsvg/16x16/apps/gabber.png
+share/icons/crystalsvg/16x16/apps/gaim.png
share/icons/crystalsvg/16x16/apps/gimp.png
share/icons/crystalsvg/16x16/apps/gnome_apps.png
+share/icons/crystalsvg/16x16/apps/gnomemeeting.png
+share/icons/crystalsvg/16x16/apps/gnucash.png
+share/icons/crystalsvg/16x16/apps/gnumeric.png
share/icons/crystalsvg/16x16/apps/go.png
share/icons/crystalsvg/16x16/apps/gv.png
share/icons/crystalsvg/16x16/apps/gvim.png
@@ -2292,6 +2304,7 @@ share/icons/crystalsvg/16x16/apps/kwin.png
share/icons/crystalsvg/16x16/apps/kwrite.png
share/icons/crystalsvg/16x16/apps/kxkb.png
share/icons/crystalsvg/16x16/apps/licq.png
+share/icons/crystalsvg/16x16/apps/linguist.png
share/icons/crystalsvg/16x16/apps/linuxconf.png
share/icons/crystalsvg/16x16/apps/locale.png
share/icons/crystalsvg/16x16/apps/looknfeel.png
@@ -2325,6 +2338,7 @@ share/icons/crystalsvg/16x16/apps/package_system.png
share/icons/crystalsvg/16x16/apps/package_toys.png
share/icons/crystalsvg/16x16/apps/package_utilities.png
share/icons/crystalsvg/16x16/apps/package_wordprocessing.png
+share/icons/crystalsvg/16x16/apps/pan.png
share/icons/crystalsvg/16x16/apps/panel.png
share/icons/crystalsvg/16x16/apps/panel_settings.png
share/icons/crystalsvg/16x16/apps/password.png
@@ -2332,6 +2346,7 @@ share/icons/crystalsvg/16x16/apps/penguin.png
share/icons/crystalsvg/16x16/apps/personal.png
share/icons/crystalsvg/16x16/apps/phppg.png
share/icons/crystalsvg/16x16/apps/plan.png
+share/icons/crystalsvg/16x16/apps/planner.png
share/icons/crystalsvg/16x16/apps/printmgr.png
share/icons/crystalsvg/16x16/apps/proxy.png
share/icons/crystalsvg/16x16/apps/pybliographic.png
@@ -2339,15 +2354,19 @@ share/icons/crystalsvg/16x16/apps/randr.png
share/icons/crystalsvg/16x16/apps/realplayer.png
share/icons/crystalsvg/16x16/apps/remote.png
share/icons/crystalsvg/16x16/apps/samba.png
+share/icons/crystalsvg/16x16/apps/scribus.png
+share/icons/crystalsvg/16x16/apps/sodipodi.png
share/icons/crystalsvg/16x16/apps/soffice.png
share/icons/crystalsvg/16x16/apps/style.png
share/icons/crystalsvg/16x16/apps/stylesheet.png
share/icons/crystalsvg/16x16/apps/terminal.png
+share/icons/crystalsvg/16x16/apps/thunderbird.png
share/icons/crystalsvg/16x16/apps/tux.png
share/icons/crystalsvg/16x16/apps/usb.png
share/icons/crystalsvg/16x16/apps/vnc.png
share/icons/crystalsvg/16x16/apps/wabi.png
share/icons/crystalsvg/16x16/apps/window_list.png
+share/icons/crystalsvg/16x16/apps/wine.png
share/icons/crystalsvg/16x16/apps/winprops.png
share/icons/crystalsvg/16x16/apps/wp.png
share/icons/crystalsvg/16x16/apps/xcalc.png
@@ -2376,15 +2395,18 @@ share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/22x22/apps/randr.png
share/icons/crystalsvg/32x32/actions/newfont.png
+share/icons/crystalsvg/32x32/apps/abiword.png
share/icons/crystalsvg/32x32/apps/access.png
share/icons/crystalsvg/32x32/apps/acroread.png
share/icons/crystalsvg/32x32/apps/agent.png
share/icons/crystalsvg/32x32/apps/alevt.png
share/icons/crystalsvg/32x32/apps/applixware.png
share/icons/crystalsvg/32x32/apps/arts.png
+share/icons/crystalsvg/32x32/apps/assistant.png
share/icons/crystalsvg/32x32/apps/background.png
share/icons/crystalsvg/32x32/apps/bell.png
share/icons/crystalsvg/32x32/apps/blender.png
+share/icons/crystalsvg/32x32/apps/bluefish.png
share/icons/crystalsvg/32x32/apps/cache.png
share/icons/crystalsvg/32x32/apps/clanbomber.png
share/icons/crystalsvg/32x32/apps/clock.png
@@ -2392,18 +2414,27 @@ share/icons/crystalsvg/32x32/apps/colors.png
share/icons/crystalsvg/32x32/apps/cookie.png
share/icons/crystalsvg/32x32/apps/date.png
share/icons/crystalsvg/32x32/apps/designer.png
+share/icons/crystalsvg/32x32/apps/dia.png
share/icons/crystalsvg/32x32/apps/dlgedit.png
+share/icons/crystalsvg/32x32/apps/eclipse.png
share/icons/crystalsvg/32x32/apps/emacs.png
share/icons/crystalsvg/32x32/apps/email.png
share/icons/crystalsvg/32x32/apps/energy.png
share/icons/crystalsvg/32x32/apps/energy_star.png
share/icons/crystalsvg/32x32/apps/enhanced_browsing.png
share/icons/crystalsvg/32x32/apps/error.png
+share/icons/crystalsvg/32x32/apps/evolution.png
share/icons/crystalsvg/32x32/apps/filetypes.png
+share/icons/crystalsvg/32x32/apps/firefox.png
share/icons/crystalsvg/32x32/apps/fonts.png
+share/icons/crystalsvg/32x32/apps/gabber.png
+share/icons/crystalsvg/32x32/apps/gaim.png
share/icons/crystalsvg/32x32/apps/galeon.png
share/icons/crystalsvg/32x32/apps/gimp.png
share/icons/crystalsvg/32x32/apps/gnome_apps.png
+share/icons/crystalsvg/32x32/apps/gnomemeeting.png
+share/icons/crystalsvg/32x32/apps/gnucash.png
+share/icons/crystalsvg/32x32/apps/gnumeric.png
share/icons/crystalsvg/32x32/apps/go.png
share/icons/crystalsvg/32x32/apps/gv.png
share/icons/crystalsvg/32x32/apps/gvim.png
@@ -2459,6 +2490,7 @@ share/icons/crystalsvg/32x32/apps/kwin.png
share/icons/crystalsvg/32x32/apps/kwrite.png
share/icons/crystalsvg/32x32/apps/kxkb.png
share/icons/crystalsvg/32x32/apps/licq.png
+share/icons/crystalsvg/32x32/apps/linguist.png
share/icons/crystalsvg/32x32/apps/linuxconf.png
share/icons/crystalsvg/32x32/apps/locale.png
share/icons/crystalsvg/32x32/apps/looknfeel.png
@@ -2490,11 +2522,13 @@ share/icons/crystalsvg/32x32/apps/package_system.png
share/icons/crystalsvg/32x32/apps/package_toys.png
share/icons/crystalsvg/32x32/apps/package_utilities.png
share/icons/crystalsvg/32x32/apps/package_wordprocessing.png
+share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/password.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
share/icons/crystalsvg/32x32/apps/plan.png
+share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/printmgr.png
share/icons/crystalsvg/32x32/apps/proxy.png
share/icons/crystalsvg/32x32/apps/pybliographic.png
@@ -2502,21 +2536,26 @@ share/icons/crystalsvg/32x32/apps/pysol.png
share/icons/crystalsvg/32x32/apps/randr.png
share/icons/crystalsvg/32x32/apps/realplayer.png
share/icons/crystalsvg/32x32/apps/samba.png
+share/icons/crystalsvg/32x32/apps/scribus.png
+share/icons/crystalsvg/32x32/apps/sodipodi.png
share/icons/crystalsvg/32x32/apps/soffice.png
share/icons/crystalsvg/32x32/apps/style.png
share/icons/crystalsvg/32x32/apps/stylesheet.png
share/icons/crystalsvg/32x32/apps/terminal.png
+share/icons/crystalsvg/32x32/apps/thunderbird.png
share/icons/crystalsvg/32x32/apps/tux.png
share/icons/crystalsvg/32x32/apps/usb.png
share/icons/crystalsvg/32x32/apps/vnc.png
share/icons/crystalsvg/32x32/apps/wabi.png
share/icons/crystalsvg/32x32/apps/window_list.png
+share/icons/crystalsvg/32x32/apps/wine.png
share/icons/crystalsvg/32x32/apps/winprops.png
share/icons/crystalsvg/32x32/apps/wp.png
share/icons/crystalsvg/32x32/apps/x.png
share/icons/crystalsvg/32x32/apps/xapp.png
share/icons/crystalsvg/32x32/apps/xawtv.png
share/icons/crystalsvg/32x32/apps/xcalc.png
+share/icons/crystalsvg/32x32/apps/xchat.png
share/icons/crystalsvg/32x32/apps/xclipboard.png
share/icons/crystalsvg/32x32/apps/xclock.png
share/icons/crystalsvg/32x32/apps/xconsole.png
@@ -2533,6 +2572,7 @@ share/icons/crystalsvg/32x32/apps/xpaint.png
share/icons/crystalsvg/32x32/apps/xv.png
share/icons/crystalsvg/32x32/devices/print_printer.png
share/icons/crystalsvg/32x32/filesystems/folder_print2.png
+share/icons/crystalsvg/48x48/apps/abiword.png
share/icons/crystalsvg/48x48/apps/access.png
share/icons/crystalsvg/48x48/apps/acroread.png
share/icons/crystalsvg/48x48/apps/agent.png
@@ -2541,6 +2581,7 @@ share/icons/crystalsvg/48x48/apps/arts.png
share/icons/crystalsvg/48x48/apps/background.png
share/icons/crystalsvg/48x48/apps/bell.png
share/icons/crystalsvg/48x48/apps/blender.png
+share/icons/crystalsvg/48x48/apps/bluefish.png
share/icons/crystalsvg/48x48/apps/cache.png
share/icons/crystalsvg/48x48/apps/clanbomber.png
share/icons/crystalsvg/48x48/apps/clock.png
@@ -2548,16 +2589,25 @@ share/icons/crystalsvg/48x48/apps/colors.png
share/icons/crystalsvg/48x48/apps/cookie.png
share/icons/crystalsvg/48x48/apps/date.png
share/icons/crystalsvg/48x48/apps/designer.png
+share/icons/crystalsvg/48x48/apps/dia.png
+share/icons/crystalsvg/48x48/apps/eclipse.png
share/icons/crystalsvg/48x48/apps/emacs.png
share/icons/crystalsvg/48x48/apps/email.png
share/icons/crystalsvg/48x48/apps/energy.png
share/icons/crystalsvg/48x48/apps/energy_star.png
share/icons/crystalsvg/48x48/apps/enhanced_browsing.png
+share/icons/crystalsvg/48x48/apps/evolution.png
share/icons/crystalsvg/48x48/apps/filetypes.png
+share/icons/crystalsvg/48x48/apps/firefox.png
share/icons/crystalsvg/48x48/apps/fonts.png
+share/icons/crystalsvg/48x48/apps/gabber.png
+share/icons/crystalsvg/48x48/apps/gaim.png
share/icons/crystalsvg/48x48/apps/galeon.png
share/icons/crystalsvg/48x48/apps/gimp.png
share/icons/crystalsvg/48x48/apps/gnome_apps.png
+share/icons/crystalsvg/48x48/apps/gnomemeeting.png
+share/icons/crystalsvg/48x48/apps/gnucash.png
+share/icons/crystalsvg/48x48/apps/gnumeric.png
share/icons/crystalsvg/48x48/apps/go.png
share/icons/crystalsvg/48x48/apps/gvim.png
share/icons/crystalsvg/48x48/apps/help_index.png
@@ -2638,16 +2688,20 @@ share/icons/crystalsvg/48x48/apps/package_system.png
share/icons/crystalsvg/48x48/apps/package_toys.png
share/icons/crystalsvg/48x48/apps/package_utilities.png
share/icons/crystalsvg/48x48/apps/package_wordprocessing.png
+share/icons/crystalsvg/48x48/apps/pan.png
share/icons/crystalsvg/48x48/apps/password.png
share/icons/crystalsvg/48x48/apps/penguin.png
share/icons/crystalsvg/48x48/apps/personal.png
share/icons/crystalsvg/48x48/apps/phppg.png
+share/icons/crystalsvg/48x48/apps/planner.png
share/icons/crystalsvg/48x48/apps/printmgr.png
share/icons/crystalsvg/48x48/apps/proxy.png
share/icons/crystalsvg/48x48/apps/pysol.png
share/icons/crystalsvg/48x48/apps/randr.png
share/icons/crystalsvg/48x48/apps/remote.png
share/icons/crystalsvg/48x48/apps/samba.png
+share/icons/crystalsvg/48x48/apps/scribus.png
+share/icons/crystalsvg/48x48/apps/sodipodi.png
share/icons/crystalsvg/48x48/apps/soffice.png
share/icons/crystalsvg/48x48/apps/staroffice.png
share/icons/crystalsvg/48x48/apps/style.png
@@ -2657,9 +2711,11 @@ share/icons/crystalsvg/48x48/apps/tux.png
share/icons/crystalsvg/48x48/apps/usb.png
share/icons/crystalsvg/48x48/apps/vnc.png
share/icons/crystalsvg/48x48/apps/window_list.png
+share/icons/crystalsvg/48x48/apps/wine.png
share/icons/crystalsvg/48x48/apps/winprops.png
share/icons/crystalsvg/48x48/apps/wmaker_apps.png
share/icons/crystalsvg/48x48/apps/wp.png
+share/icons/crystalsvg/48x48/apps/xchat.png
share/icons/crystalsvg/48x48/apps/xclock.png
share/icons/crystalsvg/48x48/apps/xedit.png
share/icons/crystalsvg/48x48/apps/xemacs.png
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 41c7153a8621..67c989a40513 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index d19b2bea5dec..25dba8c07361 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85
-SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476
+MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117
+SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422
diff --git a/x11/kdebase4-runtime/files/patch-startkde b/x11/kdebase4-runtime/files/patch-startkde
deleted file mode 100644
index 07c59a384354..000000000000
--- a/x11/kdebase4-runtime/files/patch-startkde
+++ /dev/null
@@ -1,12 +0,0 @@
---- patch-startkde begins here ---
---- startkde.orig Sun Oct 26 11:45:35 2003
-+++ startkde Thu Apr 8 12:20:47 2004
-@@ -59,7 +59,7 @@
- do_usr_odir=1
- if test -r "$kde_fontpaths" ; then
- savifs=$IFS
-- IFS=$'\n'
-+ IFS=${IFS#??}
- for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do
- rfpath=`echo $fpath | sed s:\~:$HOME:g`
- if test -s "$rfpath"/fonts.dir; then
diff --git a/x11/kdebase4-runtime/files/plist.base b/x11/kdebase4-runtime/files/plist.base
index 6eb17215bba7..7866bcb8d6af 100644
--- a/x11/kdebase4-runtime/files/plist.base
+++ b/x11/kdebase4-runtime/files/plist.base
@@ -2212,15 +2212,18 @@ share/icons/crystalsvg/128x128/apps/xclock.png
share/icons/crystalsvg/128x128/apps/xfmail.png
share/icons/crystalsvg/128x128/apps/xmag.png
share/icons/crystalsvg/16x16/actions/newfont.png
+share/icons/crystalsvg/16x16/apps/abiword.png
share/icons/crystalsvg/16x16/apps/access.png
share/icons/crystalsvg/16x16/apps/acroread.png
share/icons/crystalsvg/16x16/apps/agent.png
share/icons/crystalsvg/16x16/apps/alevt.png
share/icons/crystalsvg/16x16/apps/applixware.png
share/icons/crystalsvg/16x16/apps/arts.png
+share/icons/crystalsvg/16x16/apps/assistant.png
share/icons/crystalsvg/16x16/apps/background.png
share/icons/crystalsvg/16x16/apps/bell.png
share/icons/crystalsvg/16x16/apps/blender.png
+share/icons/crystalsvg/16x16/apps/bluefish.png
share/icons/crystalsvg/16x16/apps/cache.png
share/icons/crystalsvg/16x16/apps/clanbomber.png
share/icons/crystalsvg/16x16/apps/clock.png
@@ -2228,16 +2231,25 @@ share/icons/crystalsvg/16x16/apps/colors.png
share/icons/crystalsvg/16x16/apps/cookie.png
share/icons/crystalsvg/16x16/apps/date.png
share/icons/crystalsvg/16x16/apps/designer.png
+share/icons/crystalsvg/16x16/apps/dia.png
share/icons/crystalsvg/16x16/apps/dlgedit.png
+share/icons/crystalsvg/16x16/apps/eclipse.png
share/icons/crystalsvg/16x16/apps/emacs.png
share/icons/crystalsvg/16x16/apps/email.png
share/icons/crystalsvg/16x16/apps/energy.png
share/icons/crystalsvg/16x16/apps/energy_star.png
share/icons/crystalsvg/16x16/apps/enhanced_browsing.png
+share/icons/crystalsvg/16x16/apps/evolution.png
share/icons/crystalsvg/16x16/apps/filetypes.png
+share/icons/crystalsvg/16x16/apps/firefox.png
share/icons/crystalsvg/16x16/apps/fonts.png
+share/icons/crystalsvg/16x16/apps/gabber.png
+share/icons/crystalsvg/16x16/apps/gaim.png
share/icons/crystalsvg/16x16/apps/gimp.png
share/icons/crystalsvg/16x16/apps/gnome_apps.png
+share/icons/crystalsvg/16x16/apps/gnomemeeting.png
+share/icons/crystalsvg/16x16/apps/gnucash.png
+share/icons/crystalsvg/16x16/apps/gnumeric.png
share/icons/crystalsvg/16x16/apps/go.png
share/icons/crystalsvg/16x16/apps/gv.png
share/icons/crystalsvg/16x16/apps/gvim.png
@@ -2292,6 +2304,7 @@ share/icons/crystalsvg/16x16/apps/kwin.png
share/icons/crystalsvg/16x16/apps/kwrite.png
share/icons/crystalsvg/16x16/apps/kxkb.png
share/icons/crystalsvg/16x16/apps/licq.png
+share/icons/crystalsvg/16x16/apps/linguist.png
share/icons/crystalsvg/16x16/apps/linuxconf.png
share/icons/crystalsvg/16x16/apps/locale.png
share/icons/crystalsvg/16x16/apps/looknfeel.png
@@ -2325,6 +2338,7 @@ share/icons/crystalsvg/16x16/apps/package_system.png
share/icons/crystalsvg/16x16/apps/package_toys.png
share/icons/crystalsvg/16x16/apps/package_utilities.png
share/icons/crystalsvg/16x16/apps/package_wordprocessing.png
+share/icons/crystalsvg/16x16/apps/pan.png
share/icons/crystalsvg/16x16/apps/panel.png
share/icons/crystalsvg/16x16/apps/panel_settings.png
share/icons/crystalsvg/16x16/apps/password.png
@@ -2332,6 +2346,7 @@ share/icons/crystalsvg/16x16/apps/penguin.png
share/icons/crystalsvg/16x16/apps/personal.png
share/icons/crystalsvg/16x16/apps/phppg.png
share/icons/crystalsvg/16x16/apps/plan.png
+share/icons/crystalsvg/16x16/apps/planner.png
share/icons/crystalsvg/16x16/apps/printmgr.png
share/icons/crystalsvg/16x16/apps/proxy.png
share/icons/crystalsvg/16x16/apps/pybliographic.png
@@ -2339,15 +2354,19 @@ share/icons/crystalsvg/16x16/apps/randr.png
share/icons/crystalsvg/16x16/apps/realplayer.png
share/icons/crystalsvg/16x16/apps/remote.png
share/icons/crystalsvg/16x16/apps/samba.png
+share/icons/crystalsvg/16x16/apps/scribus.png
+share/icons/crystalsvg/16x16/apps/sodipodi.png
share/icons/crystalsvg/16x16/apps/soffice.png
share/icons/crystalsvg/16x16/apps/style.png
share/icons/crystalsvg/16x16/apps/stylesheet.png
share/icons/crystalsvg/16x16/apps/terminal.png
+share/icons/crystalsvg/16x16/apps/thunderbird.png
share/icons/crystalsvg/16x16/apps/tux.png
share/icons/crystalsvg/16x16/apps/usb.png
share/icons/crystalsvg/16x16/apps/vnc.png
share/icons/crystalsvg/16x16/apps/wabi.png
share/icons/crystalsvg/16x16/apps/window_list.png
+share/icons/crystalsvg/16x16/apps/wine.png
share/icons/crystalsvg/16x16/apps/winprops.png
share/icons/crystalsvg/16x16/apps/wp.png
share/icons/crystalsvg/16x16/apps/xcalc.png
@@ -2376,15 +2395,18 @@ share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/22x22/apps/randr.png
share/icons/crystalsvg/32x32/actions/newfont.png
+share/icons/crystalsvg/32x32/apps/abiword.png
share/icons/crystalsvg/32x32/apps/access.png
share/icons/crystalsvg/32x32/apps/acroread.png
share/icons/crystalsvg/32x32/apps/agent.png
share/icons/crystalsvg/32x32/apps/alevt.png
share/icons/crystalsvg/32x32/apps/applixware.png
share/icons/crystalsvg/32x32/apps/arts.png
+share/icons/crystalsvg/32x32/apps/assistant.png
share/icons/crystalsvg/32x32/apps/background.png
share/icons/crystalsvg/32x32/apps/bell.png
share/icons/crystalsvg/32x32/apps/blender.png
+share/icons/crystalsvg/32x32/apps/bluefish.png
share/icons/crystalsvg/32x32/apps/cache.png
share/icons/crystalsvg/32x32/apps/clanbomber.png
share/icons/crystalsvg/32x32/apps/clock.png
@@ -2392,18 +2414,27 @@ share/icons/crystalsvg/32x32/apps/colors.png
share/icons/crystalsvg/32x32/apps/cookie.png
share/icons/crystalsvg/32x32/apps/date.png
share/icons/crystalsvg/32x32/apps/designer.png
+share/icons/crystalsvg/32x32/apps/dia.png
share/icons/crystalsvg/32x32/apps/dlgedit.png
+share/icons/crystalsvg/32x32/apps/eclipse.png
share/icons/crystalsvg/32x32/apps/emacs.png
share/icons/crystalsvg/32x32/apps/email.png
share/icons/crystalsvg/32x32/apps/energy.png
share/icons/crystalsvg/32x32/apps/energy_star.png
share/icons/crystalsvg/32x32/apps/enhanced_browsing.png
share/icons/crystalsvg/32x32/apps/error.png
+share/icons/crystalsvg/32x32/apps/evolution.png
share/icons/crystalsvg/32x32/apps/filetypes.png
+share/icons/crystalsvg/32x32/apps/firefox.png
share/icons/crystalsvg/32x32/apps/fonts.png
+share/icons/crystalsvg/32x32/apps/gabber.png
+share/icons/crystalsvg/32x32/apps/gaim.png
share/icons/crystalsvg/32x32/apps/galeon.png
share/icons/crystalsvg/32x32/apps/gimp.png
share/icons/crystalsvg/32x32/apps/gnome_apps.png
+share/icons/crystalsvg/32x32/apps/gnomemeeting.png
+share/icons/crystalsvg/32x32/apps/gnucash.png
+share/icons/crystalsvg/32x32/apps/gnumeric.png
share/icons/crystalsvg/32x32/apps/go.png
share/icons/crystalsvg/32x32/apps/gv.png
share/icons/crystalsvg/32x32/apps/gvim.png
@@ -2459,6 +2490,7 @@ share/icons/crystalsvg/32x32/apps/kwin.png
share/icons/crystalsvg/32x32/apps/kwrite.png
share/icons/crystalsvg/32x32/apps/kxkb.png
share/icons/crystalsvg/32x32/apps/licq.png
+share/icons/crystalsvg/32x32/apps/linguist.png
share/icons/crystalsvg/32x32/apps/linuxconf.png
share/icons/crystalsvg/32x32/apps/locale.png
share/icons/crystalsvg/32x32/apps/looknfeel.png
@@ -2490,11 +2522,13 @@ share/icons/crystalsvg/32x32/apps/package_system.png
share/icons/crystalsvg/32x32/apps/package_toys.png
share/icons/crystalsvg/32x32/apps/package_utilities.png
share/icons/crystalsvg/32x32/apps/package_wordprocessing.png
+share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/password.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
share/icons/crystalsvg/32x32/apps/plan.png
+share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/printmgr.png
share/icons/crystalsvg/32x32/apps/proxy.png
share/icons/crystalsvg/32x32/apps/pybliographic.png
@@ -2502,21 +2536,26 @@ share/icons/crystalsvg/32x32/apps/pysol.png
share/icons/crystalsvg/32x32/apps/randr.png
share/icons/crystalsvg/32x32/apps/realplayer.png
share/icons/crystalsvg/32x32/apps/samba.png
+share/icons/crystalsvg/32x32/apps/scribus.png
+share/icons/crystalsvg/32x32/apps/sodipodi.png
share/icons/crystalsvg/32x32/apps/soffice.png
share/icons/crystalsvg/32x32/apps/style.png
share/icons/crystalsvg/32x32/apps/stylesheet.png
share/icons/crystalsvg/32x32/apps/terminal.png
+share/icons/crystalsvg/32x32/apps/thunderbird.png
share/icons/crystalsvg/32x32/apps/tux.png
share/icons/crystalsvg/32x32/apps/usb.png
share/icons/crystalsvg/32x32/apps/vnc.png
share/icons/crystalsvg/32x32/apps/wabi.png
share/icons/crystalsvg/32x32/apps/window_list.png
+share/icons/crystalsvg/32x32/apps/wine.png
share/icons/crystalsvg/32x32/apps/winprops.png
share/icons/crystalsvg/32x32/apps/wp.png
share/icons/crystalsvg/32x32/apps/x.png
share/icons/crystalsvg/32x32/apps/xapp.png
share/icons/crystalsvg/32x32/apps/xawtv.png
share/icons/crystalsvg/32x32/apps/xcalc.png
+share/icons/crystalsvg/32x32/apps/xchat.png
share/icons/crystalsvg/32x32/apps/xclipboard.png
share/icons/crystalsvg/32x32/apps/xclock.png
share/icons/crystalsvg/32x32/apps/xconsole.png
@@ -2533,6 +2572,7 @@ share/icons/crystalsvg/32x32/apps/xpaint.png
share/icons/crystalsvg/32x32/apps/xv.png
share/icons/crystalsvg/32x32/devices/print_printer.png
share/icons/crystalsvg/32x32/filesystems/folder_print2.png
+share/icons/crystalsvg/48x48/apps/abiword.png
share/icons/crystalsvg/48x48/apps/access.png
share/icons/crystalsvg/48x48/apps/acroread.png
share/icons/crystalsvg/48x48/apps/agent.png
@@ -2541,6 +2581,7 @@ share/icons/crystalsvg/48x48/apps/arts.png
share/icons/crystalsvg/48x48/apps/background.png
share/icons/crystalsvg/48x48/apps/bell.png
share/icons/crystalsvg/48x48/apps/blender.png
+share/icons/crystalsvg/48x48/apps/bluefish.png
share/icons/crystalsvg/48x48/apps/cache.png
share/icons/crystalsvg/48x48/apps/clanbomber.png
share/icons/crystalsvg/48x48/apps/clock.png
@@ -2548,16 +2589,25 @@ share/icons/crystalsvg/48x48/apps/colors.png
share/icons/crystalsvg/48x48/apps/cookie.png
share/icons/crystalsvg/48x48/apps/date.png
share/icons/crystalsvg/48x48/apps/designer.png
+share/icons/crystalsvg/48x48/apps/dia.png
+share/icons/crystalsvg/48x48/apps/eclipse.png
share/icons/crystalsvg/48x48/apps/emacs.png
share/icons/crystalsvg/48x48/apps/email.png
share/icons/crystalsvg/48x48/apps/energy.png
share/icons/crystalsvg/48x48/apps/energy_star.png
share/icons/crystalsvg/48x48/apps/enhanced_browsing.png
+share/icons/crystalsvg/48x48/apps/evolution.png
share/icons/crystalsvg/48x48/apps/filetypes.png
+share/icons/crystalsvg/48x48/apps/firefox.png
share/icons/crystalsvg/48x48/apps/fonts.png
+share/icons/crystalsvg/48x48/apps/gabber.png
+share/icons/crystalsvg/48x48/apps/gaim.png
share/icons/crystalsvg/48x48/apps/galeon.png
share/icons/crystalsvg/48x48/apps/gimp.png
share/icons/crystalsvg/48x48/apps/gnome_apps.png
+share/icons/crystalsvg/48x48/apps/gnomemeeting.png
+share/icons/crystalsvg/48x48/apps/gnucash.png
+share/icons/crystalsvg/48x48/apps/gnumeric.png
share/icons/crystalsvg/48x48/apps/go.png
share/icons/crystalsvg/48x48/apps/gvim.png
share/icons/crystalsvg/48x48/apps/help_index.png
@@ -2638,16 +2688,20 @@ share/icons/crystalsvg/48x48/apps/package_system.png
share/icons/crystalsvg/48x48/apps/package_toys.png
share/icons/crystalsvg/48x48/apps/package_utilities.png
share/icons/crystalsvg/48x48/apps/package_wordprocessing.png
+share/icons/crystalsvg/48x48/apps/pan.png
share/icons/crystalsvg/48x48/apps/password.png
share/icons/crystalsvg/48x48/apps/penguin.png
share/icons/crystalsvg/48x48/apps/personal.png
share/icons/crystalsvg/48x48/apps/phppg.png
+share/icons/crystalsvg/48x48/apps/planner.png
share/icons/crystalsvg/48x48/apps/printmgr.png
share/icons/crystalsvg/48x48/apps/proxy.png
share/icons/crystalsvg/48x48/apps/pysol.png
share/icons/crystalsvg/48x48/apps/randr.png
share/icons/crystalsvg/48x48/apps/remote.png
share/icons/crystalsvg/48x48/apps/samba.png
+share/icons/crystalsvg/48x48/apps/scribus.png
+share/icons/crystalsvg/48x48/apps/sodipodi.png
share/icons/crystalsvg/48x48/apps/soffice.png
share/icons/crystalsvg/48x48/apps/staroffice.png
share/icons/crystalsvg/48x48/apps/style.png
@@ -2657,9 +2711,11 @@ share/icons/crystalsvg/48x48/apps/tux.png
share/icons/crystalsvg/48x48/apps/usb.png
share/icons/crystalsvg/48x48/apps/vnc.png
share/icons/crystalsvg/48x48/apps/window_list.png
+share/icons/crystalsvg/48x48/apps/wine.png
share/icons/crystalsvg/48x48/apps/winprops.png
share/icons/crystalsvg/48x48/apps/wmaker_apps.png
share/icons/crystalsvg/48x48/apps/wp.png
+share/icons/crystalsvg/48x48/apps/xchat.png
share/icons/crystalsvg/48x48/apps/xclock.png
share/icons/crystalsvg/48x48/apps/xedit.png
share/icons/crystalsvg/48x48/apps/xemacs.png
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 41c7153a8621..67c989a40513 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index d19b2bea5dec..25dba8c07361 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85
-SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476
+MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117
+SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422
diff --git a/x11/kdebase4-workspace/files/patch-startkde b/x11/kdebase4-workspace/files/patch-startkde
deleted file mode 100644
index 07c59a384354..000000000000
--- a/x11/kdebase4-workspace/files/patch-startkde
+++ /dev/null
@@ -1,12 +0,0 @@
---- patch-startkde begins here ---
---- startkde.orig Sun Oct 26 11:45:35 2003
-+++ startkde Thu Apr 8 12:20:47 2004
-@@ -59,7 +59,7 @@
- do_usr_odir=1
- if test -r "$kde_fontpaths" ; then
- savifs=$IFS
-- IFS=$'\n'
-+ IFS=${IFS#??}
- for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do
- rfpath=`echo $fpath | sed s:\~:$HOME:g`
- if test -s "$rfpath"/fonts.dir; then
diff --git a/x11/kdebase4-workspace/files/plist.base b/x11/kdebase4-workspace/files/plist.base
index 6eb17215bba7..7866bcb8d6af 100644
--- a/x11/kdebase4-workspace/files/plist.base
+++ b/x11/kdebase4-workspace/files/plist.base
@@ -2212,15 +2212,18 @@ share/icons/crystalsvg/128x128/apps/xclock.png
share/icons/crystalsvg/128x128/apps/xfmail.png
share/icons/crystalsvg/128x128/apps/xmag.png
share/icons/crystalsvg/16x16/actions/newfont.png
+share/icons/crystalsvg/16x16/apps/abiword.png
share/icons/crystalsvg/16x16/apps/access.png
share/icons/crystalsvg/16x16/apps/acroread.png
share/icons/crystalsvg/16x16/apps/agent.png
share/icons/crystalsvg/16x16/apps/alevt.png
share/icons/crystalsvg/16x16/apps/applixware.png
share/icons/crystalsvg/16x16/apps/arts.png
+share/icons/crystalsvg/16x16/apps/assistant.png
share/icons/crystalsvg/16x16/apps/background.png
share/icons/crystalsvg/16x16/apps/bell.png
share/icons/crystalsvg/16x16/apps/blender.png
+share/icons/crystalsvg/16x16/apps/bluefish.png
share/icons/crystalsvg/16x16/apps/cache.png
share/icons/crystalsvg/16x16/apps/clanbomber.png
share/icons/crystalsvg/16x16/apps/clock.png
@@ -2228,16 +2231,25 @@ share/icons/crystalsvg/16x16/apps/colors.png
share/icons/crystalsvg/16x16/apps/cookie.png
share/icons/crystalsvg/16x16/apps/date.png
share/icons/crystalsvg/16x16/apps/designer.png
+share/icons/crystalsvg/16x16/apps/dia.png
share/icons/crystalsvg/16x16/apps/dlgedit.png
+share/icons/crystalsvg/16x16/apps/eclipse.png
share/icons/crystalsvg/16x16/apps/emacs.png
share/icons/crystalsvg/16x16/apps/email.png
share/icons/crystalsvg/16x16/apps/energy.png
share/icons/crystalsvg/16x16/apps/energy_star.png
share/icons/crystalsvg/16x16/apps/enhanced_browsing.png
+share/icons/crystalsvg/16x16/apps/evolution.png
share/icons/crystalsvg/16x16/apps/filetypes.png
+share/icons/crystalsvg/16x16/apps/firefox.png
share/icons/crystalsvg/16x16/apps/fonts.png
+share/icons/crystalsvg/16x16/apps/gabber.png
+share/icons/crystalsvg/16x16/apps/gaim.png
share/icons/crystalsvg/16x16/apps/gimp.png
share/icons/crystalsvg/16x16/apps/gnome_apps.png
+share/icons/crystalsvg/16x16/apps/gnomemeeting.png
+share/icons/crystalsvg/16x16/apps/gnucash.png
+share/icons/crystalsvg/16x16/apps/gnumeric.png
share/icons/crystalsvg/16x16/apps/go.png
share/icons/crystalsvg/16x16/apps/gv.png
share/icons/crystalsvg/16x16/apps/gvim.png
@@ -2292,6 +2304,7 @@ share/icons/crystalsvg/16x16/apps/kwin.png
share/icons/crystalsvg/16x16/apps/kwrite.png
share/icons/crystalsvg/16x16/apps/kxkb.png
share/icons/crystalsvg/16x16/apps/licq.png
+share/icons/crystalsvg/16x16/apps/linguist.png
share/icons/crystalsvg/16x16/apps/linuxconf.png
share/icons/crystalsvg/16x16/apps/locale.png
share/icons/crystalsvg/16x16/apps/looknfeel.png
@@ -2325,6 +2338,7 @@ share/icons/crystalsvg/16x16/apps/package_system.png
share/icons/crystalsvg/16x16/apps/package_toys.png
share/icons/crystalsvg/16x16/apps/package_utilities.png
share/icons/crystalsvg/16x16/apps/package_wordprocessing.png
+share/icons/crystalsvg/16x16/apps/pan.png
share/icons/crystalsvg/16x16/apps/panel.png
share/icons/crystalsvg/16x16/apps/panel_settings.png
share/icons/crystalsvg/16x16/apps/password.png
@@ -2332,6 +2346,7 @@ share/icons/crystalsvg/16x16/apps/penguin.png
share/icons/crystalsvg/16x16/apps/personal.png
share/icons/crystalsvg/16x16/apps/phppg.png
share/icons/crystalsvg/16x16/apps/plan.png
+share/icons/crystalsvg/16x16/apps/planner.png
share/icons/crystalsvg/16x16/apps/printmgr.png
share/icons/crystalsvg/16x16/apps/proxy.png
share/icons/crystalsvg/16x16/apps/pybliographic.png
@@ -2339,15 +2354,19 @@ share/icons/crystalsvg/16x16/apps/randr.png
share/icons/crystalsvg/16x16/apps/realplayer.png
share/icons/crystalsvg/16x16/apps/remote.png
share/icons/crystalsvg/16x16/apps/samba.png
+share/icons/crystalsvg/16x16/apps/scribus.png
+share/icons/crystalsvg/16x16/apps/sodipodi.png
share/icons/crystalsvg/16x16/apps/soffice.png
share/icons/crystalsvg/16x16/apps/style.png
share/icons/crystalsvg/16x16/apps/stylesheet.png
share/icons/crystalsvg/16x16/apps/terminal.png
+share/icons/crystalsvg/16x16/apps/thunderbird.png
share/icons/crystalsvg/16x16/apps/tux.png
share/icons/crystalsvg/16x16/apps/usb.png
share/icons/crystalsvg/16x16/apps/vnc.png
share/icons/crystalsvg/16x16/apps/wabi.png
share/icons/crystalsvg/16x16/apps/window_list.png
+share/icons/crystalsvg/16x16/apps/wine.png
share/icons/crystalsvg/16x16/apps/winprops.png
share/icons/crystalsvg/16x16/apps/wp.png
share/icons/crystalsvg/16x16/apps/xcalc.png
@@ -2376,15 +2395,18 @@ share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/22x22/apps/randr.png
share/icons/crystalsvg/32x32/actions/newfont.png
+share/icons/crystalsvg/32x32/apps/abiword.png
share/icons/crystalsvg/32x32/apps/access.png
share/icons/crystalsvg/32x32/apps/acroread.png
share/icons/crystalsvg/32x32/apps/agent.png
share/icons/crystalsvg/32x32/apps/alevt.png
share/icons/crystalsvg/32x32/apps/applixware.png
share/icons/crystalsvg/32x32/apps/arts.png
+share/icons/crystalsvg/32x32/apps/assistant.png
share/icons/crystalsvg/32x32/apps/background.png
share/icons/crystalsvg/32x32/apps/bell.png
share/icons/crystalsvg/32x32/apps/blender.png
+share/icons/crystalsvg/32x32/apps/bluefish.png
share/icons/crystalsvg/32x32/apps/cache.png
share/icons/crystalsvg/32x32/apps/clanbomber.png
share/icons/crystalsvg/32x32/apps/clock.png
@@ -2392,18 +2414,27 @@ share/icons/crystalsvg/32x32/apps/colors.png
share/icons/crystalsvg/32x32/apps/cookie.png
share/icons/crystalsvg/32x32/apps/date.png
share/icons/crystalsvg/32x32/apps/designer.png
+share/icons/crystalsvg/32x32/apps/dia.png
share/icons/crystalsvg/32x32/apps/dlgedit.png
+share/icons/crystalsvg/32x32/apps/eclipse.png
share/icons/crystalsvg/32x32/apps/emacs.png
share/icons/crystalsvg/32x32/apps/email.png
share/icons/crystalsvg/32x32/apps/energy.png
share/icons/crystalsvg/32x32/apps/energy_star.png
share/icons/crystalsvg/32x32/apps/enhanced_browsing.png
share/icons/crystalsvg/32x32/apps/error.png
+share/icons/crystalsvg/32x32/apps/evolution.png
share/icons/crystalsvg/32x32/apps/filetypes.png
+share/icons/crystalsvg/32x32/apps/firefox.png
share/icons/crystalsvg/32x32/apps/fonts.png
+share/icons/crystalsvg/32x32/apps/gabber.png
+share/icons/crystalsvg/32x32/apps/gaim.png
share/icons/crystalsvg/32x32/apps/galeon.png
share/icons/crystalsvg/32x32/apps/gimp.png
share/icons/crystalsvg/32x32/apps/gnome_apps.png
+share/icons/crystalsvg/32x32/apps/gnomemeeting.png
+share/icons/crystalsvg/32x32/apps/gnucash.png
+share/icons/crystalsvg/32x32/apps/gnumeric.png
share/icons/crystalsvg/32x32/apps/go.png
share/icons/crystalsvg/32x32/apps/gv.png
share/icons/crystalsvg/32x32/apps/gvim.png
@@ -2459,6 +2490,7 @@ share/icons/crystalsvg/32x32/apps/kwin.png
share/icons/crystalsvg/32x32/apps/kwrite.png
share/icons/crystalsvg/32x32/apps/kxkb.png
share/icons/crystalsvg/32x32/apps/licq.png
+share/icons/crystalsvg/32x32/apps/linguist.png
share/icons/crystalsvg/32x32/apps/linuxconf.png
share/icons/crystalsvg/32x32/apps/locale.png
share/icons/crystalsvg/32x32/apps/looknfeel.png
@@ -2490,11 +2522,13 @@ share/icons/crystalsvg/32x32/apps/package_system.png
share/icons/crystalsvg/32x32/apps/package_toys.png
share/icons/crystalsvg/32x32/apps/package_utilities.png
share/icons/crystalsvg/32x32/apps/package_wordprocessing.png
+share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/password.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
share/icons/crystalsvg/32x32/apps/plan.png
+share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/printmgr.png
share/icons/crystalsvg/32x32/apps/proxy.png
share/icons/crystalsvg/32x32/apps/pybliographic.png
@@ -2502,21 +2536,26 @@ share/icons/crystalsvg/32x32/apps/pysol.png
share/icons/crystalsvg/32x32/apps/randr.png
share/icons/crystalsvg/32x32/apps/realplayer.png
share/icons/crystalsvg/32x32/apps/samba.png
+share/icons/crystalsvg/32x32/apps/scribus.png
+share/icons/crystalsvg/32x32/apps/sodipodi.png
share/icons/crystalsvg/32x32/apps/soffice.png
share/icons/crystalsvg/32x32/apps/style.png
share/icons/crystalsvg/32x32/apps/stylesheet.png
share/icons/crystalsvg/32x32/apps/terminal.png
+share/icons/crystalsvg/32x32/apps/thunderbird.png
share/icons/crystalsvg/32x32/apps/tux.png
share/icons/crystalsvg/32x32/apps/usb.png
share/icons/crystalsvg/32x32/apps/vnc.png
share/icons/crystalsvg/32x32/apps/wabi.png
share/icons/crystalsvg/32x32/apps/window_list.png
+share/icons/crystalsvg/32x32/apps/wine.png
share/icons/crystalsvg/32x32/apps/winprops.png
share/icons/crystalsvg/32x32/apps/wp.png
share/icons/crystalsvg/32x32/apps/x.png
share/icons/crystalsvg/32x32/apps/xapp.png
share/icons/crystalsvg/32x32/apps/xawtv.png
share/icons/crystalsvg/32x32/apps/xcalc.png
+share/icons/crystalsvg/32x32/apps/xchat.png
share/icons/crystalsvg/32x32/apps/xclipboard.png
share/icons/crystalsvg/32x32/apps/xclock.png
share/icons/crystalsvg/32x32/apps/xconsole.png
@@ -2533,6 +2572,7 @@ share/icons/crystalsvg/32x32/apps/xpaint.png
share/icons/crystalsvg/32x32/apps/xv.png
share/icons/crystalsvg/32x32/devices/print_printer.png
share/icons/crystalsvg/32x32/filesystems/folder_print2.png
+share/icons/crystalsvg/48x48/apps/abiword.png
share/icons/crystalsvg/48x48/apps/access.png
share/icons/crystalsvg/48x48/apps/acroread.png
share/icons/crystalsvg/48x48/apps/agent.png
@@ -2541,6 +2581,7 @@ share/icons/crystalsvg/48x48/apps/arts.png
share/icons/crystalsvg/48x48/apps/background.png
share/icons/crystalsvg/48x48/apps/bell.png
share/icons/crystalsvg/48x48/apps/blender.png
+share/icons/crystalsvg/48x48/apps/bluefish.png
share/icons/crystalsvg/48x48/apps/cache.png
share/icons/crystalsvg/48x48/apps/clanbomber.png
share/icons/crystalsvg/48x48/apps/clock.png
@@ -2548,16 +2589,25 @@ share/icons/crystalsvg/48x48/apps/colors.png
share/icons/crystalsvg/48x48/apps/cookie.png
share/icons/crystalsvg/48x48/apps/date.png
share/icons/crystalsvg/48x48/apps/designer.png
+share/icons/crystalsvg/48x48/apps/dia.png
+share/icons/crystalsvg/48x48/apps/eclipse.png
share/icons/crystalsvg/48x48/apps/emacs.png
share/icons/crystalsvg/48x48/apps/email.png
share/icons/crystalsvg/48x48/apps/energy.png
share/icons/crystalsvg/48x48/apps/energy_star.png
share/icons/crystalsvg/48x48/apps/enhanced_browsing.png
+share/icons/crystalsvg/48x48/apps/evolution.png
share/icons/crystalsvg/48x48/apps/filetypes.png
+share/icons/crystalsvg/48x48/apps/firefox.png
share/icons/crystalsvg/48x48/apps/fonts.png
+share/icons/crystalsvg/48x48/apps/gabber.png
+share/icons/crystalsvg/48x48/apps/gaim.png
share/icons/crystalsvg/48x48/apps/galeon.png
share/icons/crystalsvg/48x48/apps/gimp.png
share/icons/crystalsvg/48x48/apps/gnome_apps.png
+share/icons/crystalsvg/48x48/apps/gnomemeeting.png
+share/icons/crystalsvg/48x48/apps/gnucash.png
+share/icons/crystalsvg/48x48/apps/gnumeric.png
share/icons/crystalsvg/48x48/apps/go.png
share/icons/crystalsvg/48x48/apps/gvim.png
share/icons/crystalsvg/48x48/apps/help_index.png
@@ -2638,16 +2688,20 @@ share/icons/crystalsvg/48x48/apps/package_system.png
share/icons/crystalsvg/48x48/apps/package_toys.png
share/icons/crystalsvg/48x48/apps/package_utilities.png
share/icons/crystalsvg/48x48/apps/package_wordprocessing.png
+share/icons/crystalsvg/48x48/apps/pan.png
share/icons/crystalsvg/48x48/apps/password.png
share/icons/crystalsvg/48x48/apps/penguin.png
share/icons/crystalsvg/48x48/apps/personal.png
share/icons/crystalsvg/48x48/apps/phppg.png
+share/icons/crystalsvg/48x48/apps/planner.png
share/icons/crystalsvg/48x48/apps/printmgr.png
share/icons/crystalsvg/48x48/apps/proxy.png
share/icons/crystalsvg/48x48/apps/pysol.png
share/icons/crystalsvg/48x48/apps/randr.png
share/icons/crystalsvg/48x48/apps/remote.png
share/icons/crystalsvg/48x48/apps/samba.png
+share/icons/crystalsvg/48x48/apps/scribus.png
+share/icons/crystalsvg/48x48/apps/sodipodi.png
share/icons/crystalsvg/48x48/apps/soffice.png
share/icons/crystalsvg/48x48/apps/staroffice.png
share/icons/crystalsvg/48x48/apps/style.png
@@ -2657,9 +2711,11 @@ share/icons/crystalsvg/48x48/apps/tux.png
share/icons/crystalsvg/48x48/apps/usb.png
share/icons/crystalsvg/48x48/apps/vnc.png
share/icons/crystalsvg/48x48/apps/window_list.png
+share/icons/crystalsvg/48x48/apps/wine.png
share/icons/crystalsvg/48x48/apps/winprops.png
share/icons/crystalsvg/48x48/apps/wmaker_apps.png
share/icons/crystalsvg/48x48/apps/wp.png
+share/icons/crystalsvg/48x48/apps/xchat.png
share/icons/crystalsvg/48x48/apps/xclock.png
share/icons/crystalsvg/48x48/apps/xedit.png
share/icons/crystalsvg/48x48/apps/xemacs.png
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 41c7153a8621..67c989a40513 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index d19b2bea5dec..25dba8c07361 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85
-SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476
+MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117
+SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422
diff --git a/x11/kdebase4/files/patch-startkde b/x11/kdebase4/files/patch-startkde
deleted file mode 100644
index 07c59a384354..000000000000
--- a/x11/kdebase4/files/patch-startkde
+++ /dev/null
@@ -1,12 +0,0 @@
---- patch-startkde begins here ---
---- startkde.orig Sun Oct 26 11:45:35 2003
-+++ startkde Thu Apr 8 12:20:47 2004
-@@ -59,7 +59,7 @@
- do_usr_odir=1
- if test -r "$kde_fontpaths" ; then
- savifs=$IFS
-- IFS=$'\n'
-+ IFS=${IFS#??}
- for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do
- rfpath=`echo $fpath | sed s:\~:$HOME:g`
- if test -s "$rfpath"/fonts.dir; then
diff --git a/x11/kdebase4/files/plist.base b/x11/kdebase4/files/plist.base
index 6eb17215bba7..7866bcb8d6af 100644
--- a/x11/kdebase4/files/plist.base
+++ b/x11/kdebase4/files/plist.base
@@ -2212,15 +2212,18 @@ share/icons/crystalsvg/128x128/apps/xclock.png
share/icons/crystalsvg/128x128/apps/xfmail.png
share/icons/crystalsvg/128x128/apps/xmag.png
share/icons/crystalsvg/16x16/actions/newfont.png
+share/icons/crystalsvg/16x16/apps/abiword.png
share/icons/crystalsvg/16x16/apps/access.png
share/icons/crystalsvg/16x16/apps/acroread.png
share/icons/crystalsvg/16x16/apps/agent.png
share/icons/crystalsvg/16x16/apps/alevt.png
share/icons/crystalsvg/16x16/apps/applixware.png
share/icons/crystalsvg/16x16/apps/arts.png
+share/icons/crystalsvg/16x16/apps/assistant.png
share/icons/crystalsvg/16x16/apps/background.png
share/icons/crystalsvg/16x16/apps/bell.png
share/icons/crystalsvg/16x16/apps/blender.png
+share/icons/crystalsvg/16x16/apps/bluefish.png
share/icons/crystalsvg/16x16/apps/cache.png
share/icons/crystalsvg/16x16/apps/clanbomber.png
share/icons/crystalsvg/16x16/apps/clock.png
@@ -2228,16 +2231,25 @@ share/icons/crystalsvg/16x16/apps/colors.png
share/icons/crystalsvg/16x16/apps/cookie.png
share/icons/crystalsvg/16x16/apps/date.png
share/icons/crystalsvg/16x16/apps/designer.png
+share/icons/crystalsvg/16x16/apps/dia.png
share/icons/crystalsvg/16x16/apps/dlgedit.png
+share/icons/crystalsvg/16x16/apps/eclipse.png
share/icons/crystalsvg/16x16/apps/emacs.png
share/icons/crystalsvg/16x16/apps/email.png
share/icons/crystalsvg/16x16/apps/energy.png
share/icons/crystalsvg/16x16/apps/energy_star.png
share/icons/crystalsvg/16x16/apps/enhanced_browsing.png
+share/icons/crystalsvg/16x16/apps/evolution.png
share/icons/crystalsvg/16x16/apps/filetypes.png
+share/icons/crystalsvg/16x16/apps/firefox.png
share/icons/crystalsvg/16x16/apps/fonts.png
+share/icons/crystalsvg/16x16/apps/gabber.png
+share/icons/crystalsvg/16x16/apps/gaim.png
share/icons/crystalsvg/16x16/apps/gimp.png
share/icons/crystalsvg/16x16/apps/gnome_apps.png
+share/icons/crystalsvg/16x16/apps/gnomemeeting.png
+share/icons/crystalsvg/16x16/apps/gnucash.png
+share/icons/crystalsvg/16x16/apps/gnumeric.png
share/icons/crystalsvg/16x16/apps/go.png
share/icons/crystalsvg/16x16/apps/gv.png
share/icons/crystalsvg/16x16/apps/gvim.png
@@ -2292,6 +2304,7 @@ share/icons/crystalsvg/16x16/apps/kwin.png
share/icons/crystalsvg/16x16/apps/kwrite.png
share/icons/crystalsvg/16x16/apps/kxkb.png
share/icons/crystalsvg/16x16/apps/licq.png
+share/icons/crystalsvg/16x16/apps/linguist.png
share/icons/crystalsvg/16x16/apps/linuxconf.png
share/icons/crystalsvg/16x16/apps/locale.png
share/icons/crystalsvg/16x16/apps/looknfeel.png
@@ -2325,6 +2338,7 @@ share/icons/crystalsvg/16x16/apps/package_system.png
share/icons/crystalsvg/16x16/apps/package_toys.png
share/icons/crystalsvg/16x16/apps/package_utilities.png
share/icons/crystalsvg/16x16/apps/package_wordprocessing.png
+share/icons/crystalsvg/16x16/apps/pan.png
share/icons/crystalsvg/16x16/apps/panel.png
share/icons/crystalsvg/16x16/apps/panel_settings.png
share/icons/crystalsvg/16x16/apps/password.png
@@ -2332,6 +2346,7 @@ share/icons/crystalsvg/16x16/apps/penguin.png
share/icons/crystalsvg/16x16/apps/personal.png
share/icons/crystalsvg/16x16/apps/phppg.png
share/icons/crystalsvg/16x16/apps/plan.png
+share/icons/crystalsvg/16x16/apps/planner.png
share/icons/crystalsvg/16x16/apps/printmgr.png
share/icons/crystalsvg/16x16/apps/proxy.png
share/icons/crystalsvg/16x16/apps/pybliographic.png
@@ -2339,15 +2354,19 @@ share/icons/crystalsvg/16x16/apps/randr.png
share/icons/crystalsvg/16x16/apps/realplayer.png
share/icons/crystalsvg/16x16/apps/remote.png
share/icons/crystalsvg/16x16/apps/samba.png
+share/icons/crystalsvg/16x16/apps/scribus.png
+share/icons/crystalsvg/16x16/apps/sodipodi.png
share/icons/crystalsvg/16x16/apps/soffice.png
share/icons/crystalsvg/16x16/apps/style.png
share/icons/crystalsvg/16x16/apps/stylesheet.png
share/icons/crystalsvg/16x16/apps/terminal.png
+share/icons/crystalsvg/16x16/apps/thunderbird.png
share/icons/crystalsvg/16x16/apps/tux.png
share/icons/crystalsvg/16x16/apps/usb.png
share/icons/crystalsvg/16x16/apps/vnc.png
share/icons/crystalsvg/16x16/apps/wabi.png
share/icons/crystalsvg/16x16/apps/window_list.png
+share/icons/crystalsvg/16x16/apps/wine.png
share/icons/crystalsvg/16x16/apps/winprops.png
share/icons/crystalsvg/16x16/apps/wp.png
share/icons/crystalsvg/16x16/apps/xcalc.png
@@ -2376,15 +2395,18 @@ share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/22x22/apps/randr.png
share/icons/crystalsvg/32x32/actions/newfont.png
+share/icons/crystalsvg/32x32/apps/abiword.png
share/icons/crystalsvg/32x32/apps/access.png
share/icons/crystalsvg/32x32/apps/acroread.png
share/icons/crystalsvg/32x32/apps/agent.png
share/icons/crystalsvg/32x32/apps/alevt.png
share/icons/crystalsvg/32x32/apps/applixware.png
share/icons/crystalsvg/32x32/apps/arts.png
+share/icons/crystalsvg/32x32/apps/assistant.png
share/icons/crystalsvg/32x32/apps/background.png
share/icons/crystalsvg/32x32/apps/bell.png
share/icons/crystalsvg/32x32/apps/blender.png
+share/icons/crystalsvg/32x32/apps/bluefish.png
share/icons/crystalsvg/32x32/apps/cache.png
share/icons/crystalsvg/32x32/apps/clanbomber.png
share/icons/crystalsvg/32x32/apps/clock.png
@@ -2392,18 +2414,27 @@ share/icons/crystalsvg/32x32/apps/colors.png
share/icons/crystalsvg/32x32/apps/cookie.png
share/icons/crystalsvg/32x32/apps/date.png
share/icons/crystalsvg/32x32/apps/designer.png
+share/icons/crystalsvg/32x32/apps/dia.png
share/icons/crystalsvg/32x32/apps/dlgedit.png
+share/icons/crystalsvg/32x32/apps/eclipse.png
share/icons/crystalsvg/32x32/apps/emacs.png
share/icons/crystalsvg/32x32/apps/email.png
share/icons/crystalsvg/32x32/apps/energy.png
share/icons/crystalsvg/32x32/apps/energy_star.png
share/icons/crystalsvg/32x32/apps/enhanced_browsing.png
share/icons/crystalsvg/32x32/apps/error.png
+share/icons/crystalsvg/32x32/apps/evolution.png
share/icons/crystalsvg/32x32/apps/filetypes.png
+share/icons/crystalsvg/32x32/apps/firefox.png
share/icons/crystalsvg/32x32/apps/fonts.png
+share/icons/crystalsvg/32x32/apps/gabber.png
+share/icons/crystalsvg/32x32/apps/gaim.png
share/icons/crystalsvg/32x32/apps/galeon.png
share/icons/crystalsvg/32x32/apps/gimp.png
share/icons/crystalsvg/32x32/apps/gnome_apps.png
+share/icons/crystalsvg/32x32/apps/gnomemeeting.png
+share/icons/crystalsvg/32x32/apps/gnucash.png
+share/icons/crystalsvg/32x32/apps/gnumeric.png
share/icons/crystalsvg/32x32/apps/go.png
share/icons/crystalsvg/32x32/apps/gv.png
share/icons/crystalsvg/32x32/apps/gvim.png
@@ -2459,6 +2490,7 @@ share/icons/crystalsvg/32x32/apps/kwin.png
share/icons/crystalsvg/32x32/apps/kwrite.png
share/icons/crystalsvg/32x32/apps/kxkb.png
share/icons/crystalsvg/32x32/apps/licq.png
+share/icons/crystalsvg/32x32/apps/linguist.png
share/icons/crystalsvg/32x32/apps/linuxconf.png
share/icons/crystalsvg/32x32/apps/locale.png
share/icons/crystalsvg/32x32/apps/looknfeel.png
@@ -2490,11 +2522,13 @@ share/icons/crystalsvg/32x32/apps/package_system.png
share/icons/crystalsvg/32x32/apps/package_toys.png
share/icons/crystalsvg/32x32/apps/package_utilities.png
share/icons/crystalsvg/32x32/apps/package_wordprocessing.png
+share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/password.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
share/icons/crystalsvg/32x32/apps/plan.png
+share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/printmgr.png
share/icons/crystalsvg/32x32/apps/proxy.png
share/icons/crystalsvg/32x32/apps/pybliographic.png
@@ -2502,21 +2536,26 @@ share/icons/crystalsvg/32x32/apps/pysol.png
share/icons/crystalsvg/32x32/apps/randr.png
share/icons/crystalsvg/32x32/apps/realplayer.png
share/icons/crystalsvg/32x32/apps/samba.png
+share/icons/crystalsvg/32x32/apps/scribus.png
+share/icons/crystalsvg/32x32/apps/sodipodi.png
share/icons/crystalsvg/32x32/apps/soffice.png
share/icons/crystalsvg/32x32/apps/style.png
share/icons/crystalsvg/32x32/apps/stylesheet.png
share/icons/crystalsvg/32x32/apps/terminal.png
+share/icons/crystalsvg/32x32/apps/thunderbird.png
share/icons/crystalsvg/32x32/apps/tux.png
share/icons/crystalsvg/32x32/apps/usb.png
share/icons/crystalsvg/32x32/apps/vnc.png
share/icons/crystalsvg/32x32/apps/wabi.png
share/icons/crystalsvg/32x32/apps/window_list.png
+share/icons/crystalsvg/32x32/apps/wine.png
share/icons/crystalsvg/32x32/apps/winprops.png
share/icons/crystalsvg/32x32/apps/wp.png
share/icons/crystalsvg/32x32/apps/x.png
share/icons/crystalsvg/32x32/apps/xapp.png
share/icons/crystalsvg/32x32/apps/xawtv.png
share/icons/crystalsvg/32x32/apps/xcalc.png
+share/icons/crystalsvg/32x32/apps/xchat.png
share/icons/crystalsvg/32x32/apps/xclipboard.png
share/icons/crystalsvg/32x32/apps/xclock.png
share/icons/crystalsvg/32x32/apps/xconsole.png
@@ -2533,6 +2572,7 @@ share/icons/crystalsvg/32x32/apps/xpaint.png
share/icons/crystalsvg/32x32/apps/xv.png
share/icons/crystalsvg/32x32/devices/print_printer.png
share/icons/crystalsvg/32x32/filesystems/folder_print2.png
+share/icons/crystalsvg/48x48/apps/abiword.png
share/icons/crystalsvg/48x48/apps/access.png
share/icons/crystalsvg/48x48/apps/acroread.png
share/icons/crystalsvg/48x48/apps/agent.png
@@ -2541,6 +2581,7 @@ share/icons/crystalsvg/48x48/apps/arts.png
share/icons/crystalsvg/48x48/apps/background.png
share/icons/crystalsvg/48x48/apps/bell.png
share/icons/crystalsvg/48x48/apps/blender.png
+share/icons/crystalsvg/48x48/apps/bluefish.png
share/icons/crystalsvg/48x48/apps/cache.png
share/icons/crystalsvg/48x48/apps/clanbomber.png
share/icons/crystalsvg/48x48/apps/clock.png
@@ -2548,16 +2589,25 @@ share/icons/crystalsvg/48x48/apps/colors.png
share/icons/crystalsvg/48x48/apps/cookie.png
share/icons/crystalsvg/48x48/apps/date.png
share/icons/crystalsvg/48x48/apps/designer.png
+share/icons/crystalsvg/48x48/apps/dia.png
+share/icons/crystalsvg/48x48/apps/eclipse.png
share/icons/crystalsvg/48x48/apps/emacs.png
share/icons/crystalsvg/48x48/apps/email.png
share/icons/crystalsvg/48x48/apps/energy.png
share/icons/crystalsvg/48x48/apps/energy_star.png
share/icons/crystalsvg/48x48/apps/enhanced_browsing.png
+share/icons/crystalsvg/48x48/apps/evolution.png
share/icons/crystalsvg/48x48/apps/filetypes.png
+share/icons/crystalsvg/48x48/apps/firefox.png
share/icons/crystalsvg/48x48/apps/fonts.png
+share/icons/crystalsvg/48x48/apps/gabber.png
+share/icons/crystalsvg/48x48/apps/gaim.png
share/icons/crystalsvg/48x48/apps/galeon.png
share/icons/crystalsvg/48x48/apps/gimp.png
share/icons/crystalsvg/48x48/apps/gnome_apps.png
+share/icons/crystalsvg/48x48/apps/gnomemeeting.png
+share/icons/crystalsvg/48x48/apps/gnucash.png
+share/icons/crystalsvg/48x48/apps/gnumeric.png
share/icons/crystalsvg/48x48/apps/go.png
share/icons/crystalsvg/48x48/apps/gvim.png
share/icons/crystalsvg/48x48/apps/help_index.png
@@ -2638,16 +2688,20 @@ share/icons/crystalsvg/48x48/apps/package_system.png
share/icons/crystalsvg/48x48/apps/package_toys.png
share/icons/crystalsvg/48x48/apps/package_utilities.png
share/icons/crystalsvg/48x48/apps/package_wordprocessing.png
+share/icons/crystalsvg/48x48/apps/pan.png
share/icons/crystalsvg/48x48/apps/password.png
share/icons/crystalsvg/48x48/apps/penguin.png
share/icons/crystalsvg/48x48/apps/personal.png
share/icons/crystalsvg/48x48/apps/phppg.png
+share/icons/crystalsvg/48x48/apps/planner.png
share/icons/crystalsvg/48x48/apps/printmgr.png
share/icons/crystalsvg/48x48/apps/proxy.png
share/icons/crystalsvg/48x48/apps/pysol.png
share/icons/crystalsvg/48x48/apps/randr.png
share/icons/crystalsvg/48x48/apps/remote.png
share/icons/crystalsvg/48x48/apps/samba.png
+share/icons/crystalsvg/48x48/apps/scribus.png
+share/icons/crystalsvg/48x48/apps/sodipodi.png
share/icons/crystalsvg/48x48/apps/soffice.png
share/icons/crystalsvg/48x48/apps/staroffice.png
share/icons/crystalsvg/48x48/apps/style.png
@@ -2657,9 +2711,11 @@ share/icons/crystalsvg/48x48/apps/tux.png
share/icons/crystalsvg/48x48/apps/usb.png
share/icons/crystalsvg/48x48/apps/vnc.png
share/icons/crystalsvg/48x48/apps/window_list.png
+share/icons/crystalsvg/48x48/apps/wine.png
share/icons/crystalsvg/48x48/apps/winprops.png
share/icons/crystalsvg/48x48/apps/wmaker_apps.png
share/icons/crystalsvg/48x48/apps/wp.png
+share/icons/crystalsvg/48x48/apps/xchat.png
share/icons/crystalsvg/48x48/apps/xclock.png
share/icons/crystalsvg/48x48/apps/xedit.png
share/icons/crystalsvg/48x48/apps/xemacs.png
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 2dcf689624fa..930e4fa11fe5 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -17,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Base set of libraries needed by KDE programs
-CONFLICTS= kdebase-3.1.*
+CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.*
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index cc002b79e577..536c08c26477 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdelibs-3.2.2.tar.bz2) = 76c656fb4ec7f1ca073f52fad2b8898b
-SIZE (KDE/kdelibs-3.2.2.tar.bz2) = 12716460
+MD5 (KDE/kdelibs-3.2.3.tar.bz2) = d9d1c4bd2016a96f156b491ca908dc16
+SIZE (KDE/kdelibs-3.2.3.tar.bz2) = 12737024
diff --git a/x11/kdelibs3/files/patch-kdecore_kapplication.cpp b/x11/kdelibs3/files/patch-kdecore_kapplication.cpp
deleted file mode 100644
index df2cc728b0f1..000000000000
--- a/x11/kdelibs3/files/patch-kdecore_kapplication.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdecore/kapplication.cpp 8 Apr 2004 09:56:28 -0000 1.637.2.8
-+++ kdecore/kapplication.cpp 14 May 2004 12:24:53 -0000
-@@ -2172,7 +2172,7 @@ void KApplication::invokeMailer(const QS
-
- if (command.isEmpty() || command == QString::fromLatin1("kmail")
- || command.endsWith("/kmail"))
-- command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A %t");
-+ command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
-
- // TODO: Take care of the preferred terminal app (instead of hardcoding
- // Konsole), this will probably require a rewrite of the configurable
diff --git a/x11/kdelibs3/files/patch-kdesu-su.cpp b/x11/kdelibs3/files/patch-kdesu-su.cpp
deleted file mode 100644
index 237eac59590b..000000000000
--- a/x11/kdelibs3/files/patch-kdesu-su.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdesu/su.cpp 2004/03/26 23:26:45 1.32.2.2
-+++ kdesu/su.cpp 2004/04/13 13:32:27 1.32.2.3
-@@ -78,9 +78,9 @@ int SuProcess::exec(const char *password
- args += "root";
- else
- args += m_User;
-- args += "-";
- args += "-c";
- args += QCString(__KDE_BINDIR) + "/kdesu_stub";
-+ args += "-";
-
- QCString command = __PATH_SU;
- if (::access(__PATH_SU, X_OK) != 0)
diff --git a/x11/kdelibs3/files/patch-khtml-rendering-render_block.cpp b/x11/kdelibs3/files/patch-khtml-rendering-render_block.cpp
deleted file mode 100644
index c8569bd92bfc..000000000000
--- a/x11/kdelibs3/files/patch-khtml-rendering-render_block.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- khtml/rendering/render_block.cpp 2004/03/01 04:46:27 1.20.2.6
-+++ khtml/rendering/render_block.cpp 2004/04/26 21:05:27 1.20.2.7
-@@ -422,14 +422,16 @@ void RenderBlock::layout()
-
- void RenderBlock::layoutBlock(bool relayoutChildren)
- {
-+ if (isInline() && !isReplacedBlock()) {
-+ setLayouted();
-+ return;
-+ }
-+
- // kdDebug( 6040 ) << renderName() << " " << this << "::layoutBlock() start" << endl;
- // QTime t;
- // t.start();
- KHTMLAssert( !layouted() );
- KHTMLAssert( minMaxKnown() );
--
-- if (isInline()) // Inline <form>s inside various table elements can cause us to
-- return; // come in here. Just bail. -dwh
-
- int oldWidth = m_width;
-
diff --git a/x11/kdelibs3/files/patch-khtml_khtml_part.cpp b/x11/kdelibs3/files/patch-khtml_khtml_part.cpp
deleted file mode 100644
index 451cdd2b152a..000000000000
--- a/x11/kdelibs3/files/patch-khtml_khtml_part.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
---- khtml/khtml_part.cpp 2004/04/03 05:28:15 1.959.2.14
-+++ khtml/khtml_part.cpp 2004/05/10 16:40:50 1.959.2.18
-@@ -203,7 +203,7 @@ void KHTMLPart::init( KHTMLView *view, G
- d->m_paViewFrame = new KAction( i18n( "View Frame Source" ), 0, this, SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
- d->m_paViewInfo = new KAction( i18n( "View Document Information" ), CTRL+Key_I, this, SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
- d->m_paSaveBackground = new KAction( i18n( "Save &Background Image As..." ), 0, this, SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
-- d->m_paSaveDocument = new KAction( i18n( "&Save As..." ), CTRL+Key_S, this, SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
-+ d->m_paSaveDocument = KStdAction::saveAs( this, SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
- if ( parentPart() )
- d->m_paSaveDocument->setShortcut( KShortcut() ); // avoid clashes
- d->m_paSaveFrame = new KAction( i18n( "Save &Frame As..." ), 0, this, SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
-@@ -332,7 +332,7 @@ void KHTMLPart::init( KHTMLView *view, G
- d->m_paFindNext->setShortcut( KShortcut() ); // avoid clashes
- }
-
-- d->m_paPrintFrame = new KAction( i18n( "Print Frame" ), "frameprint", 0, this, SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
-+ d->m_paPrintFrame = new KAction( i18n( "Print Frame..." ), "frameprint", 0, this, SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
- d->m_paPrintFrame->setWhatsThis( i18n( "Print Frame<p>"
- "Some pages have several frames. To print only a single frame, click "
- "on it and then use this function." ) );
-@@ -2665,7 +2665,7 @@ void KHTMLPart::findTextNext()
- d->m_find->setPattern( d->m_findDialog->pattern() );
- d->m_find->resetCounts();
- }
-- long options = d->m_findDialog->options();
-+ options = d->m_findDialog->options();
- if ( d->m_lastFindState.options != options )
- {
- d->m_find->setOptions( options );
-@@ -2712,7 +2712,7 @@ void KHTMLPart::findTextNext()
- {
- // Grab text from render object
- QString s;
-- bool renderAreaText = (QCString(obj->parent()->renderName())== "RenderTextArea");
-+ bool renderAreaText = obj->parent() && (QCString(obj->parent()->renderName())== "RenderTextArea");
- bool renderLineText = (QCString(obj->renderName())== "RenderLineEdit");
- if ( renderAreaText )
- {
-@@ -3288,7 +3288,7 @@ void KHTMLPart::urlSelected( const QStri
-
- kdDebug( 6000 ) << "urlSelected: complete URL:" << cURL.url() << " target = " << target << endl;
-
-- if ( button == LeftButton && (state & ControlButton) )
-+ if ( state & ControlButton )
- {
- args.setNewTab(true);
- emit d->m_extension->createNewWindow( cURL, args );
diff --git a/x11/kdelibs3/files/patch-kio_misc_ktelnetservice.cpp b/x11/kdelibs3/files/patch-kio_misc_ktelnetservice.cpp
deleted file mode 100644
index d1ea72237aaa..000000000000
--- a/x11/kdelibs3/files/patch-kio_misc_ktelnetservice.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- kio/misc/ktelnetservice.cpp 18 Feb 2004 11:42:12 -0000 1.7.2.1
-+++ kio/misc/ktelnetservice.cpp 13 May 2004 15:12:14 -0000
-@@ -77,10 +77,19 @@ int main(int argc, char **argv)
- cmd << url.user();
- }
-
-+ QString host;
- if (!url.host().isEmpty())
-- cmd << url.host(); // telnet://host
-+ host = url.host(); // telnet://host
- else if (!url.path().isEmpty())
-- cmd << url.path(); // telnet:host
-+ host = url.path(); // telnet:host
-+
-+ if (host.isEmpty() || host.startsWith("-"))
-+ {
-+ kdError() << "Invalid hostname " << host << endl;
-+ return 2;
-+ }
-+
-+ cmd << host;
-
- if (url.port()){
- if ( url.protocol() == "ssh" )
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 2dcf689624fa..930e4fa11fe5 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -17,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Base set of libraries needed by KDE programs
-CONFLICTS= kdebase-3.1.*
+CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.*
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index cc002b79e577..536c08c26477 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdelibs-3.2.2.tar.bz2) = 76c656fb4ec7f1ca073f52fad2b8898b
-SIZE (KDE/kdelibs-3.2.2.tar.bz2) = 12716460
+MD5 (KDE/kdelibs-3.2.3.tar.bz2) = d9d1c4bd2016a96f156b491ca908dc16
+SIZE (KDE/kdelibs-3.2.3.tar.bz2) = 12737024
diff --git a/x11/kdelibs4/files/patch-kdecore_kapplication.cpp b/x11/kdelibs4/files/patch-kdecore_kapplication.cpp
deleted file mode 100644
index df2cc728b0f1..000000000000
--- a/x11/kdelibs4/files/patch-kdecore_kapplication.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdecore/kapplication.cpp 8 Apr 2004 09:56:28 -0000 1.637.2.8
-+++ kdecore/kapplication.cpp 14 May 2004 12:24:53 -0000
-@@ -2172,7 +2172,7 @@ void KApplication::invokeMailer(const QS
-
- if (command.isEmpty() || command == QString::fromLatin1("kmail")
- || command.endsWith("/kmail"))
-- command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A %t");
-+ command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
-
- // TODO: Take care of the preferred terminal app (instead of hardcoding
- // Konsole), this will probably require a rewrite of the configurable
diff --git a/x11/kdelibs4/files/patch-kdesu-su.cpp b/x11/kdelibs4/files/patch-kdesu-su.cpp
deleted file mode 100644
index 237eac59590b..000000000000
--- a/x11/kdelibs4/files/patch-kdesu-su.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdesu/su.cpp 2004/03/26 23:26:45 1.32.2.2
-+++ kdesu/su.cpp 2004/04/13 13:32:27 1.32.2.3
-@@ -78,9 +78,9 @@ int SuProcess::exec(const char *password
- args += "root";
- else
- args += m_User;
-- args += "-";
- args += "-c";
- args += QCString(__KDE_BINDIR) + "/kdesu_stub";
-+ args += "-";
-
- QCString command = __PATH_SU;
- if (::access(__PATH_SU, X_OK) != 0)
diff --git a/x11/kdelibs4/files/patch-khtml-rendering-render_block.cpp b/x11/kdelibs4/files/patch-khtml-rendering-render_block.cpp
deleted file mode 100644
index c8569bd92bfc..000000000000
--- a/x11/kdelibs4/files/patch-khtml-rendering-render_block.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- khtml/rendering/render_block.cpp 2004/03/01 04:46:27 1.20.2.6
-+++ khtml/rendering/render_block.cpp 2004/04/26 21:05:27 1.20.2.7
-@@ -422,14 +422,16 @@ void RenderBlock::layout()
-
- void RenderBlock::layoutBlock(bool relayoutChildren)
- {
-+ if (isInline() && !isReplacedBlock()) {
-+ setLayouted();
-+ return;
-+ }
-+
- // kdDebug( 6040 ) << renderName() << " " << this << "::layoutBlock() start" << endl;
- // QTime t;
- // t.start();
- KHTMLAssert( !layouted() );
- KHTMLAssert( minMaxKnown() );
--
-- if (isInline()) // Inline <form>s inside various table elements can cause us to
-- return; // come in here. Just bail. -dwh
-
- int oldWidth = m_width;
-
diff --git a/x11/kdelibs4/files/patch-khtml_khtml_part.cpp b/x11/kdelibs4/files/patch-khtml_khtml_part.cpp
deleted file mode 100644
index 451cdd2b152a..000000000000
--- a/x11/kdelibs4/files/patch-khtml_khtml_part.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
---- khtml/khtml_part.cpp 2004/04/03 05:28:15 1.959.2.14
-+++ khtml/khtml_part.cpp 2004/05/10 16:40:50 1.959.2.18
-@@ -203,7 +203,7 @@ void KHTMLPart::init( KHTMLView *view, G
- d->m_paViewFrame = new KAction( i18n( "View Frame Source" ), 0, this, SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
- d->m_paViewInfo = new KAction( i18n( "View Document Information" ), CTRL+Key_I, this, SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
- d->m_paSaveBackground = new KAction( i18n( "Save &Background Image As..." ), 0, this, SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
-- d->m_paSaveDocument = new KAction( i18n( "&Save As..." ), CTRL+Key_S, this, SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
-+ d->m_paSaveDocument = KStdAction::saveAs( this, SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
- if ( parentPart() )
- d->m_paSaveDocument->setShortcut( KShortcut() ); // avoid clashes
- d->m_paSaveFrame = new KAction( i18n( "Save &Frame As..." ), 0, this, SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
-@@ -332,7 +332,7 @@ void KHTMLPart::init( KHTMLView *view, G
- d->m_paFindNext->setShortcut( KShortcut() ); // avoid clashes
- }
-
-- d->m_paPrintFrame = new KAction( i18n( "Print Frame" ), "frameprint", 0, this, SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
-+ d->m_paPrintFrame = new KAction( i18n( "Print Frame..." ), "frameprint", 0, this, SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
- d->m_paPrintFrame->setWhatsThis( i18n( "Print Frame<p>"
- "Some pages have several frames. To print only a single frame, click "
- "on it and then use this function." ) );
-@@ -2665,7 +2665,7 @@ void KHTMLPart::findTextNext()
- d->m_find->setPattern( d->m_findDialog->pattern() );
- d->m_find->resetCounts();
- }
-- long options = d->m_findDialog->options();
-+ options = d->m_findDialog->options();
- if ( d->m_lastFindState.options != options )
- {
- d->m_find->setOptions( options );
-@@ -2712,7 +2712,7 @@ void KHTMLPart::findTextNext()
- {
- // Grab text from render object
- QString s;
-- bool renderAreaText = (QCString(obj->parent()->renderName())== "RenderTextArea");
-+ bool renderAreaText = obj->parent() && (QCString(obj->parent()->renderName())== "RenderTextArea");
- bool renderLineText = (QCString(obj->renderName())== "RenderLineEdit");
- if ( renderAreaText )
- {
-@@ -3288,7 +3288,7 @@ void KHTMLPart::urlSelected( const QStri
-
- kdDebug( 6000 ) << "urlSelected: complete URL:" << cURL.url() << " target = " << target << endl;
-
-- if ( button == LeftButton && (state & ControlButton) )
-+ if ( state & ControlButton )
- {
- args.setNewTab(true);
- emit d->m_extension->createNewWindow( cURL, args );
diff --git a/x11/kdelibs4/files/patch-kio_misc_ktelnetservice.cpp b/x11/kdelibs4/files/patch-kio_misc_ktelnetservice.cpp
deleted file mode 100644
index d1ea72237aaa..000000000000
--- a/x11/kdelibs4/files/patch-kio_misc_ktelnetservice.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- kio/misc/ktelnetservice.cpp 18 Feb 2004 11:42:12 -0000 1.7.2.1
-+++ kio/misc/ktelnetservice.cpp 13 May 2004 15:12:14 -0000
-@@ -77,10 +77,19 @@ int main(int argc, char **argv)
- cmd << url.user();
- }
-
-+ QString host;
- if (!url.host().isEmpty())
-- cmd << url.host(); // telnet://host
-+ host = url.host(); // telnet://host
- else if (!url.path().isEmpty())
-- cmd << url.path(); // telnet:host
-+ host = url.path(); // telnet:host
-+
-+ if (host.isEmpty() || host.startsWith("-"))
-+ {
-+ kdError() << "Invalid hostname " << host << endl;
-+ return 2;
-+ }
-+
-+ cmd << host;
-
- if (url.port()){
- if ( url.protocol() == "ssh" )