4 files changed, 58 insertions, 15 deletions

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