6 files changed, 27 insertions, 27 deletions

diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index dc57e187be90..4d2f8252ffa1 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -44,11 +44,11 @@ OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_ARTSWRAPPER)
+.if !defined(WITHOUT_ARTSWRAPPER)
 RUN_DEPENDS+=	artswrapper:${PORTSDIR}/audio/artswrapper
 .endif
 
-.if defined(WITH_MOTIF)
+.if !defined(WITHOUT_MOTIF)
 USE_MOTIF=	yes
 PLIST_APPEND+=	plist.motif
 .elseif defined(WITHOUT_MOTIF)
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 666a941bc727..d19b2bea5dec 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.2.1.tar.bz2) = 3a3d89b0b49dbb1eaa9e71c83019bbef
-SIZE (KDE/kdebase-3.2.1.tar.bz2) = 17131336
+MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85
+SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476
diff --git a/x11/kde4-workspace/files/patch-kcontrol-arts.cpp b/x11/kde4-workspace/files/patch-kcontrol-arts.cpp
deleted file mode 100644
index df11b254f150..000000000000
--- a/x11/kde4-workspace/files/patch-kcontrol-arts.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- kcontrol/arts/arts.cpp.orig	Fri Mar  5 12:15:10 2004
-+++ kcontrol/arts/arts.cpp	Fri Mar  5 12:08:16 2004
-@@ -541,13 +541,13 @@
- 
- 	connect(checkProcess, SIGNAL(processExited(KProcess*)),
- 	        this, SLOT(slotArtsdExited(KProcess*)));
--	checkProcess->start(KProcess::Block);
--
--	if (latestProcessStatus == 0)
-+	if (checkProcess->start(KProcess::Block) == false)
-+		realtimePossible =  false;
-+	else if (latestProcessStatus == 0)
- 		realtimePossible =  true;
- 	else
- 		realtimePossible =  false;
--	
-+
- 	checked = true;
- 	
- 	}
diff --git a/x11/kde4-workspace/files/patch-startkde b/x11/kde4-workspace/files/patch-startkde
new file mode 100644
index 000000000000..07c59a384354
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-startkde
@@ -0,0 +1,12 @@
+--- 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 a2ca93fb2e3c..6eb17215bba7 100644
--- a/x11/kde4-workspace/files/plist.base
+++ b/x11/kde4-workspace/files/plist.base
@@ -56,6 +56,7 @@ bin/kpersonalizer
 bin/kpm
 bin/kprinter
 bin/krandom.kss
+bin/krandrinithack
 bin/krandrtray
 bin/krdb
 bin/kreadconfig
@@ -398,6 +399,8 @@ lib/kde3/konsole.la
 lib/kde3/konsole.so
 lib/kde3/kprinter.la
 lib/kde3/kprinter.so
+lib/kde3/krandrinithack.la
+lib/kde3/krandrinithack.so
 lib/kde3/ksmserver.la
 lib/kde3/ksmserver.so
 lib/kde3/ksplashdefault.la
@@ -486,8 +489,6 @@ lib/kde3/taskbar_panelextension.la
 lib/kde3/taskbar_panelextension.so
 lib/kde3/textthumbnail.la
 lib/kde3/textthumbnail.so
-lib/krandrinithack.la
-lib/krandrinithack.so
 lib/libkateinterfaces.la
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.0
@@ -535,6 +536,8 @@ lib/libkdeinit_konsole.la
 lib/libkdeinit_konsole.so
 lib/libkdeinit_kprinter.la
 lib/libkdeinit_kprinter.so
+lib/libkdeinit_krandrinithack.la
+lib/libkdeinit_krandrinithack.so
 lib/libkdeinit_ksmserver.la
 lib/libkdeinit_ksmserver.so
 lib/libkdeinit_kwin.la
@@ -1424,7 +1427,6 @@ share/apps/konqueror/pics/indicator_noconnect.png
 share/apps/konqueror/pics/indicator_viewactive.png
 share/apps/konqueror/pics/thumbnailfont_7x4.png
 share/apps/konqueror/profiles/filemanagement
-share/apps/konqueror/profiles/filepreview
 share/apps/konqueror/profiles/midnightcommander
 share/apps/konqueror/profiles/webbrowsing
 share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop
@@ -2209,6 +2211,7 @@ share/icons/crystalsvg/128x128/apps/wp.png
 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/access.png
 share/icons/crystalsvg/16x16/apps/acroread.png
 share/icons/crystalsvg/16x16/apps/agent.png
@@ -2365,12 +2368,14 @@ share/icons/crystalsvg/16x16/apps/xpaint.png
 share/icons/crystalsvg/16x16/apps/xv.png
 share/icons/crystalsvg/16x16/devices/print_printer.png
 share/icons/crystalsvg/16x16/filesystems/folder_print2.png
+share/icons/crystalsvg/22x22/actions/newfont.png
 share/icons/crystalsvg/22x22/apps/klipper.png
 share/icons/crystalsvg/22x22/apps/konqueror.png
 share/icons/crystalsvg/22x22/apps/ksplash.png
 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/access.png
 share/icons/crystalsvg/32x32/apps/acroread.png
 share/icons/crystalsvg/32x32/apps/agent.png
diff --git a/x11/kde4-workspace/files/plist.base.rm b/x11/kde4-workspace/files/plist.base.rm
index cea00d682fcd..ee3dc0fad360 100644
--- a/x11/kde4-workspace/files/plist.base.rm
+++ b/x11/kde4-workspace/files/plist.base.rm
@@ -268,12 +268,15 @@
 @dirrm share/icons/crystalsvg/32x32/filesystems
 @dirrm share/icons/crystalsvg/32x32/devices
 @dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/32x32/actions
 @dirrm share/icons/crystalsvg/32x32
 @dirrm share/icons/crystalsvg/22x22/apps
+@dirrm share/icons/crystalsvg/22x22/actions
 @dirrm share/icons/crystalsvg/22x22
 @dirrm share/icons/crystalsvg/16x16/filesystems
 @dirrm share/icons/crystalsvg/16x16/devices
 @dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16/actions
 @dirrm share/icons/crystalsvg/16x16
 @dirrm share/icons/crystalsvg/128x128/apps
 @dirrm share/icons/crystalsvg/128x128