aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/kde3/Makefile.kde1
-rw-r--r--x11/kde4-baseapps/distinfo4
-rw-r--r--x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kde4-baseapps/files/patch-konsole-konsole-konsole.cpp30
-rw-r--r--x11/kde4-baseapps/files/patch-kxkb_rules.cpp28
-rw-r--r--x11/kde4-baseapps/files/patch-post-3.3.2-kdebase-htmlframes239
-rw-r--r--x11/kde4-baseapps/pkg-plist72
-rw-r--r--x11/kde4-runtime/distinfo4
-rw-r--r--x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp30
-rw-r--r--x11/kde4-runtime/files/patch-kxkb_rules.cpp28
-rw-r--r--x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes239
-rw-r--r--x11/kde4-runtime/pkg-plist72
-rw-r--r--x11/kde4-workspace/distinfo4
-rw-r--r--x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kde4-workspace/files/patch-konsole-konsole-konsole.cpp30
-rw-r--r--x11/kde4-workspace/files/patch-kxkb_rules.cpp28
-rw-r--r--x11/kde4-workspace/files/patch-post-3.3.2-kdebase-htmlframes239
-rw-r--r--x11/kde4-workspace/pkg-plist72
-rw-r--r--x11/kde4/Makefile.kde1
-rw-r--r--x11/kdebase3/distinfo4
-rw-r--r--x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kdebase3/files/patch-konsole-konsole-konsole.cpp30
-rw-r--r--x11/kdebase3/files/patch-kxkb_rules.cpp28
-rw-r--r--x11/kdebase3/files/patch-post-3.3.2-kdebase-htmlframes239
-rw-r--r--x11/kdebase3/pkg-plist72
-rw-r--r--x11/kdebase4-runtime/distinfo4
-rw-r--r--x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kdebase4-runtime/files/patch-konsole-konsole-konsole.cpp30
-rw-r--r--x11/kdebase4-runtime/files/patch-kxkb_rules.cpp28
-rw-r--r--x11/kdebase4-runtime/files/patch-post-3.3.2-kdebase-htmlframes239
-rw-r--r--x11/kdebase4-runtime/pkg-plist72
-rw-r--r--x11/kdebase4-workspace/distinfo4
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kdebase4-workspace/files/patch-konsole-konsole-konsole.cpp30
-rw-r--r--x11/kdebase4-workspace/files/patch-kxkb_rules.cpp28
-rw-r--r--x11/kdebase4-workspace/files/patch-post-3.3.2-kdebase-htmlframes239
-rw-r--r--x11/kdebase4-workspace/pkg-plist72
-rw-r--r--x11/kdebase4/distinfo4
-rw-r--r--x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kdebase4/files/patch-konsole-konsole-konsole.cpp30
-rw-r--r--x11/kdebase4/files/patch-kxkb_rules.cpp28
-rw-r--r--x11/kdebase4/files/patch-post-3.3.2-kdebase-htmlframes239
-rw-r--r--x11/kdebase4/pkg-plist72
-rw-r--r--x11/kdelibs3/Makefile5
-rw-r--r--x11/kdelibs3/distinfo4
-rw-r--r--x11/kdelibs3/files/patch-post-3.3.2-kdelibs-htmlframes226
-rw-r--r--x11/kdelibs3/files/patch-post-3.3.2-kdelibs-kio.diff21
-rw-r--r--x11/kdelibs3/pkg-plist115
-rw-r--r--x11/kdelibs4/Makefile5
-rw-r--r--x11/kdelibs4/distinfo4
-rw-r--r--x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes226
-rw-r--r--x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff21
-rw-r--r--x11/kdelibs4/pkg-plist115
-rw-r--r--x11/xscreensaver-kde/distinfo4
-rw-r--r--x11/xscreensaver-kde/pkg-plist3
56 files changed, 678 insertions, 982 deletions
diff --git a/x11/kde3/Makefile.kde b/x11/kde3/Makefile.kde
index 4c2546f2a48c..3fc622219a8a 100644
--- a/x11/kde3/Makefile.kde
+++ b/x11/kde3/Makefile.kde
@@ -96,7 +96,6 @@ _NO_KDE_FIXPTHREAD= yes
.if !defined(_NO_KDE_FIXPTHREAD)
USE_REINPLACE= yes
CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}"
-EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-configure
pre-configure: kde-fix-configure kde-fix-ltmain.sh
kde-fix-configure:
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index cfe6154d4b3c..a1ad17ecaaad 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.1.tar.bz2) = dd0d9707296f2be143c28a8be21b6e24
-SIZE (KDE/kdebase-3.3.1.tar.bz2) = 19906317
+MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
+SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
diff --git a/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c
index c845a8cbf236..4a3ac236fe1d 100644
--- a/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
-+++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Nov 28 18:26:14 2004
++++ kdm/kfrontend/genkdmconf.c Thu Dec 2 00:41:46 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,12 +20,14 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -668,7 +668,7 @@
+@@ -667,7 +667,9 @@
+ " */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\n"
- " set -a\n"
--" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n"
+-" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n"
++" set -a\n"
+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; printenv | egrep -v \"^(TERM|SHLVL)=\"'`\n"
- " set +a\n"
++" set +a\n"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
+ " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kde4-baseapps/files/patch-konsole-konsole-konsole.cpp b/x11/kde4-baseapps/files/patch-konsole-konsole-konsole.cpp
new file mode 100644
index 000000000000..553c411983a7
--- /dev/null
+++ b/x11/kde4-baseapps/files/patch-konsole-konsole-konsole.cpp
@@ -0,0 +1,30 @@
+--- konsole/konsole/konsole.cpp 16 Nov 2004 16:46:00 -0000 1.472.2.6
++++ konsole/konsole/konsole.cpp 1 Dec 2004 17:05:30 -0000 1.472.2.7
+@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
+ createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
+ setSchema(s->schemaNo());
+ tabwidget->setCurrentPage(tabwidget->count()-1);
+- disableMasterModeConnections(); // no duplicate connections, remove old
+- enableMasterModeConnections();
+- }
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ disableMasterModeConnections(); // no duplicate connections, remove old
++ enableMasterModeConnections();
++ if(m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ }
+ }
+
+ QString Konsole::currentSession()
+@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
+ rootxpms.remove(s->widget());
+ }
+ delete s->widget();
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ if (m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
+ }
+ session2action.remove(s);
+ action2session.remove(ra);
diff --git a/x11/kde4-baseapps/files/patch-kxkb_rules.cpp b/x11/kde4-baseapps/files/patch-kxkb_rules.cpp
deleted file mode 100644
index 00122a2b9898..000000000000
--- a/x11/kde4-baseapps/files/patch-kxkb_rules.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- kxkb/rules.cpp 2004/06/28 14:19:03 1.38
-+++ kxkb/rules.cpp 2004/10/10 22:59:59 1.38.2.1
-@@ -1,3 +1,4 @@
-+#include <qwindowdefs.h>
- #include <qfile.h>
- #include <qtextstream.h>
- #include <qregexp.h>
-@@ -42,11 +43,19 @@ KeyRules::KeyRules():
- }
-
- QString rulesFile;
-- for(int ii=0; ii<2; ii++)
-+ Display *dpy = qt_xdisplay();
-+ XkbRF_VarDefsRec vd;
-+ char *tmp= NULL;
-+ if (XkbRF_GetNamesProp(dpy,&tmp,&vd) && tmp)
-+ rulesFile = X11_DIR + QString("xkb/rules/%1").arg(tmp);
-+ else {
-+ // old way
-+ for(int ii=0; ii<2; ii++)
- if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) {
- rulesFile = X11_DIR + rulesFileList[ii];
- break;
- }
-+ }
-
- if( rulesFile.isEmpty() ) {
- kdDebug() << "Cannot find rules file in " << X11_DIR << endl;
diff --git a/x11/kde4-baseapps/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kde4-baseapps/files/patch-post-3.3.2-kdebase-htmlframes2
new file mode 100644
index 000000000000..f31b6341cf9c
--- /dev/null
+++ b/x11/kde4-baseapps/files/patch-post-3.3.2-kdebase-htmlframes2
@@ -0,0 +1,39 @@
+Index: konq_mainwindow.cc
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
+retrieving revision 1.1342.2.14
+diff -u -p -r1.1342.2.14 konq_mainwindow.cc
+--- konqueror/konq_mainwindow.cc 24 Nov 2004 18:29:51 -0000 1.1342.2.14
++++ konqueror/konq_mainwindow.cc 12 Dec 2004 15:54:46 -0000
+@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
+ QString viewName = view->viewName();
+ kdDebug() << " - viewName=" << viewName << " "
+ << "frame names:" << view->frameNames().join( "," ) << endl;
++
++ // First look for a hostextension containing this frame name
++ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
++ if ( ext )
++ {
++ ext = ext->findFrameParent(callingPart, name);
++ kdDebug() << "BrowserHostExtension found part " << ext << endl;
++ if (!ext)
++ continue; // Don't use this window
++ }
++
+ if ( !viewName.isEmpty() && viewName == name )
+ {
+ kdDebug() << "found existing view by name: " << view << endl;
+@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
+ return view;
+ }
+
+- // First look for a hostextension containing this frame name
+- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
+- if ( ext )
+- {
+- ext = ext->findFrameParent(callingPart, name);
+- }
+-
+ // KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
+
+ if ( ext )
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index 0c34371113ce..61e591e3cd68 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -1423,6 +1423,7 @@ share/apps/konqsidebartng/entries/remote.desktop
share/apps/konqsidebartng/entries/root.desktop
share/apps/konqsidebartng/entries/services.desktop
share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
+share/apps/konqsidebartng/kicker_entries/devices.desktop
share/apps/konqsidebartng/kicker_entries/history.desktop
share/apps/konqsidebartng/kicker_entries/home.desktop
share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -3787,8 +3788,6 @@ share/wallpapers/only_k.jpg
share/wallpapers/seaofconero.jpg
share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@@ -3806,16 +3805,7 @@ share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@dirrm share/wallpapers
@dirrm share/templates/.source/emptydir
-@dirrm share/templates/.source
-@dirrm share/templates
-@dirrm share/sounds
-@dirrm share/services/useragentstrings
-@dirrm share/services/searchproviders
@dirrm share/mimelnk/print
@dirrm share/mimelnk/kdedevice
@dirrm share/mimelnk/fonts
@@ -4046,20 +4036,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/locale/l10n/ad
@dirrm share/locale/l10n/C
@dirrm share/locale/l10n
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
@dirrm share/icons/crystalsvg/scalable/apps/gnome
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/fonts/override
-@dirrm share/fonts
@dirrm share/doc/kdm
@dirrm share/doc/HTML/en/kxkb
@dirrm share/doc/HTML/en/kwrite
@@ -4156,15 +4133,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/doc/HTML/en/kcontrol/bell
@dirrm share/doc/HTML/en/kcontrol/background
@dirrm share/doc/HTML/en/kcontrol/arts
-@dirrm share/doc/HTML/en/kcontrol
@dirrm share/doc/HTML/en/kate
@dirrm share/desktop-directories
-@dirrm share/config.kcfg
@dirrm share/apps/naughtyapplet/pics
@dirrm share/apps/naughtyapplet
@dirrm share/apps/kwrite
-@dirrm share/apps/kwin/pics
-@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/pics
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@@ -4179,7 +4152,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/ksmserver
@dirrm share/apps/kpersonalizer/pics
@dirrm share/apps/kpersonalizer
-@dirrm share/apps/konsole/profiles
@dirrm share/apps/konsole/icons/crystalsvg/32x32/actions
@dirrm share/apps/konsole/icons/crystalsvg/32x32
@dirrm share/apps/konsole/icons/crystalsvg/22x22/actions
@@ -4188,10 +4160,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konsole/icons/crystalsvg/16x16
@dirrm share/apps/konsole/icons/crystalsvg
@dirrm share/apps/konsole/icons
-@dirrm share/apps/konsole
@dirrm share/apps/konqueror/tiles
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror/profiles
@dirrm share/apps/konqueror/pics
@dirrm share/apps/konqueror/icons/crystalsvg/16x16/actions
@dirrm share/apps/konqueror/icons/crystalsvg/16x16
@@ -4200,18 +4169,8 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konqueror/dirtree/remote
@dirrm share/apps/konqueror/dirtree
@dirrm share/apps/konqueror/about
-@dirrm share/apps/konqueror
@dirrm share/apps/konqsidebartng/websidebar
-@dirrm share/apps/konqsidebartng/virtual_folders/services
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/web
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
-@dirrm share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/konqsidebartng/virtual_folders
@dirrm share/apps/konqsidebartng/kicker_entries
-@dirrm share/apps/konqsidebartng/entries
-@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/konqsidebartng/add
-@dirrm share/apps/konqsidebartng
@dirrm share/apps/konqlistview/kpartplugins
@dirrm share/apps/konqlistview
@dirrm share/apps/konqiconview/kpartplugins
@@ -4230,11 +4189,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kio_info
@dirrm share/apps/kio_finger
@dirrm share/apps/kinfocenter
-@dirrm share/apps/kicker/wallpapers
-@dirrm share/apps/kicker/tiles
-@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/menuext/find
-@dirrm share/apps/kicker/menuext
@dirrm share/apps/kicker/icons/locolor/16x16/actions
@dirrm share/apps/kicker/icons/locolor/16x16
@dirrm share/apps/kicker/icons/locolor
@@ -4242,16 +4197,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kicker/icons/crystalsvg/16x16
@dirrm share/apps/kicker/icons/crystalsvg
@dirrm share/apps/kicker/icons
-@dirrm share/apps/kicker/extensions
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
@dirrm share/apps/khotkeys
@dirrm share/apps/khelpcenter/plugins/Tutorials
@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
@dirrm share/apps/khelpcenter/plugins/Manpages
@dirrm share/apps/khelpcenter/plugins/Applications
-@dirrm share/apps/khelpcenter/plugins
-@dirrm share/apps/khelpcenter
@dirrm share/apps/kfontview
@dirrm share/apps/kfindpart/icons/locolor/22x22/actions
@dirrm share/apps/kfindpart/icons/locolor/22x22
@@ -4268,11 +4218,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
-@dirrm share/apps/kdesktop/programs
-@dirrm share/apps/kdesktop/pics
-@dirrm share/apps/kdesktop/patterns
-@dirrm share/apps/kdesktop/DesktopLinks
-@dirrm share/apps/kdesktop
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16/actions
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16
@dirrm share/apps/kdeprintfax/icons/crystalsvg
@@ -4300,7 +4245,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kcminput
@dirrm share/apps/kcmcss
@dirrm share/apps/kbookmark
-@dirrm share/apps/kate/scripts
@dirrm share/apps/kate/plugins/katedefaultproject
@dirrm share/apps/kate/plugins
@dirrm share/apps/kate/icons/locolor/22x22/actions
@@ -4314,7 +4258,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kate/icons/crystalsvg/16x16
@dirrm share/apps/kate/icons/crystalsvg
@dirrm share/apps/kate/icons
-@dirrm share/apps/kate
@dirrm share/apps/kappfinder/apps/Utilities/XUtilities
@dirrm share/apps/kappfinder/apps/Utilities
@dirrm share/apps/kappfinder/apps/Toys
@@ -4342,19 +4285,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
@dirrm share/apps/clockapplet
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/Toys
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk/Settingsmenu
-@dirrm share/applnk/Settings/WebBrowsing
-@dirrm share/applnk/Settings/LookNFeel/Themes
-@dirrm share/applnk/Settings/LookNFeel
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Internet
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
@dirrm lib/kconf_update_bin
@dirrm include/kwin
@dirrm include/ksplash
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index cfe6154d4b3c..a1ad17ecaaad 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.1.tar.bz2) = dd0d9707296f2be143c28a8be21b6e24
-SIZE (KDE/kdebase-3.3.1.tar.bz2) = 19906317
+MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
+SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
diff --git a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
index c845a8cbf236..4a3ac236fe1d 100644
--- a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
-+++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Nov 28 18:26:14 2004
++++ kdm/kfrontend/genkdmconf.c Thu Dec 2 00:41:46 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,12 +20,14 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -668,7 +668,7 @@
+@@ -667,7 +667,9 @@
+ " */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\n"
- " set -a\n"
--" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n"
+-" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n"
++" set -a\n"
+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; printenv | egrep -v \"^(TERM|SHLVL)=\"'`\n"
- " set +a\n"
++" set +a\n"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
+ " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp b/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp
new file mode 100644
index 000000000000..553c411983a7
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp
@@ -0,0 +1,30 @@
+--- konsole/konsole/konsole.cpp 16 Nov 2004 16:46:00 -0000 1.472.2.6
++++ konsole/konsole/konsole.cpp 1 Dec 2004 17:05:30 -0000 1.472.2.7
+@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
+ createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
+ setSchema(s->schemaNo());
+ tabwidget->setCurrentPage(tabwidget->count()-1);
+- disableMasterModeConnections(); // no duplicate connections, remove old
+- enableMasterModeConnections();
+- }
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ disableMasterModeConnections(); // no duplicate connections, remove old
++ enableMasterModeConnections();
++ if(m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ }
+ }
+
+ QString Konsole::currentSession()
+@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
+ rootxpms.remove(s->widget());
+ }
+ delete s->widget();
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ if (m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
+ }
+ session2action.remove(s);
+ action2session.remove(ra);
diff --git a/x11/kde4-runtime/files/patch-kxkb_rules.cpp b/x11/kde4-runtime/files/patch-kxkb_rules.cpp
deleted file mode 100644
index 00122a2b9898..000000000000
--- a/x11/kde4-runtime/files/patch-kxkb_rules.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- kxkb/rules.cpp 2004/06/28 14:19:03 1.38
-+++ kxkb/rules.cpp 2004/10/10 22:59:59 1.38.2.1
-@@ -1,3 +1,4 @@
-+#include <qwindowdefs.h>
- #include <qfile.h>
- #include <qtextstream.h>
- #include <qregexp.h>
-@@ -42,11 +43,19 @@ KeyRules::KeyRules():
- }
-
- QString rulesFile;
-- for(int ii=0; ii<2; ii++)
-+ Display *dpy = qt_xdisplay();
-+ XkbRF_VarDefsRec vd;
-+ char *tmp= NULL;
-+ if (XkbRF_GetNamesProp(dpy,&tmp,&vd) && tmp)
-+ rulesFile = X11_DIR + QString("xkb/rules/%1").arg(tmp);
-+ else {
-+ // old way
-+ for(int ii=0; ii<2; ii++)
- if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) {
- rulesFile = X11_DIR + rulesFileList[ii];
- break;
- }
-+ }
-
- if( rulesFile.isEmpty() ) {
- kdDebug() << "Cannot find rules file in " << X11_DIR << endl;
diff --git a/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2
new file mode 100644
index 000000000000..f31b6341cf9c
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2
@@ -0,0 +1,39 @@
+Index: konq_mainwindow.cc
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
+retrieving revision 1.1342.2.14
+diff -u -p -r1.1342.2.14 konq_mainwindow.cc
+--- konqueror/konq_mainwindow.cc 24 Nov 2004 18:29:51 -0000 1.1342.2.14
++++ konqueror/konq_mainwindow.cc 12 Dec 2004 15:54:46 -0000
+@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
+ QString viewName = view->viewName();
+ kdDebug() << " - viewName=" << viewName << " "
+ << "frame names:" << view->frameNames().join( "," ) << endl;
++
++ // First look for a hostextension containing this frame name
++ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
++ if ( ext )
++ {
++ ext = ext->findFrameParent(callingPart, name);
++ kdDebug() << "BrowserHostExtension found part " << ext << endl;
++ if (!ext)
++ continue; // Don't use this window
++ }
++
+ if ( !viewName.isEmpty() && viewName == name )
+ {
+ kdDebug() << "found existing view by name: " << view << endl;
+@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
+ return view;
+ }
+
+- // First look for a hostextension containing this frame name
+- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
+- if ( ext )
+- {
+- ext = ext->findFrameParent(callingPart, name);
+- }
+-
+ // KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
+
+ if ( ext )
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index 0c34371113ce..61e591e3cd68 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -1423,6 +1423,7 @@ share/apps/konqsidebartng/entries/remote.desktop
share/apps/konqsidebartng/entries/root.desktop
share/apps/konqsidebartng/entries/services.desktop
share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
+share/apps/konqsidebartng/kicker_entries/devices.desktop
share/apps/konqsidebartng/kicker_entries/history.desktop
share/apps/konqsidebartng/kicker_entries/home.desktop
share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -3787,8 +3788,6 @@ share/wallpapers/only_k.jpg
share/wallpapers/seaofconero.jpg
share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@@ -3806,16 +3805,7 @@ share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@dirrm share/wallpapers
@dirrm share/templates/.source/emptydir
-@dirrm share/templates/.source
-@dirrm share/templates
-@dirrm share/sounds
-@dirrm share/services/useragentstrings
-@dirrm share/services/searchproviders
@dirrm share/mimelnk/print
@dirrm share/mimelnk/kdedevice
@dirrm share/mimelnk/fonts
@@ -4046,20 +4036,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/locale/l10n/ad
@dirrm share/locale/l10n/C
@dirrm share/locale/l10n
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
@dirrm share/icons/crystalsvg/scalable/apps/gnome
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/fonts/override
-@dirrm share/fonts
@dirrm share/doc/kdm
@dirrm share/doc/HTML/en/kxkb
@dirrm share/doc/HTML/en/kwrite
@@ -4156,15 +4133,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/doc/HTML/en/kcontrol/bell
@dirrm share/doc/HTML/en/kcontrol/background
@dirrm share/doc/HTML/en/kcontrol/arts
-@dirrm share/doc/HTML/en/kcontrol
@dirrm share/doc/HTML/en/kate
@dirrm share/desktop-directories
-@dirrm share/config.kcfg
@dirrm share/apps/naughtyapplet/pics
@dirrm share/apps/naughtyapplet
@dirrm share/apps/kwrite
-@dirrm share/apps/kwin/pics
-@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/pics
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@@ -4179,7 +4152,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/ksmserver
@dirrm share/apps/kpersonalizer/pics
@dirrm share/apps/kpersonalizer
-@dirrm share/apps/konsole/profiles
@dirrm share/apps/konsole/icons/crystalsvg/32x32/actions
@dirrm share/apps/konsole/icons/crystalsvg/32x32
@dirrm share/apps/konsole/icons/crystalsvg/22x22/actions
@@ -4188,10 +4160,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konsole/icons/crystalsvg/16x16
@dirrm share/apps/konsole/icons/crystalsvg
@dirrm share/apps/konsole/icons
-@dirrm share/apps/konsole
@dirrm share/apps/konqueror/tiles
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror/profiles
@dirrm share/apps/konqueror/pics
@dirrm share/apps/konqueror/icons/crystalsvg/16x16/actions
@dirrm share/apps/konqueror/icons/crystalsvg/16x16
@@ -4200,18 +4169,8 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konqueror/dirtree/remote
@dirrm share/apps/konqueror/dirtree
@dirrm share/apps/konqueror/about
-@dirrm share/apps/konqueror
@dirrm share/apps/konqsidebartng/websidebar
-@dirrm share/apps/konqsidebartng/virtual_folders/services
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/web
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
-@dirrm share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/konqsidebartng/virtual_folders
@dirrm share/apps/konqsidebartng/kicker_entries
-@dirrm share/apps/konqsidebartng/entries
-@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/konqsidebartng/add
-@dirrm share/apps/konqsidebartng
@dirrm share/apps/konqlistview/kpartplugins
@dirrm share/apps/konqlistview
@dirrm share/apps/konqiconview/kpartplugins
@@ -4230,11 +4189,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kio_info
@dirrm share/apps/kio_finger
@dirrm share/apps/kinfocenter
-@dirrm share/apps/kicker/wallpapers
-@dirrm share/apps/kicker/tiles
-@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/menuext/find
-@dirrm share/apps/kicker/menuext
@dirrm share/apps/kicker/icons/locolor/16x16/actions
@dirrm share/apps/kicker/icons/locolor/16x16
@dirrm share/apps/kicker/icons/locolor
@@ -4242,16 +4197,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kicker/icons/crystalsvg/16x16
@dirrm share/apps/kicker/icons/crystalsvg
@dirrm share/apps/kicker/icons
-@dirrm share/apps/kicker/extensions
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
@dirrm share/apps/khotkeys
@dirrm share/apps/khelpcenter/plugins/Tutorials
@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
@dirrm share/apps/khelpcenter/plugins/Manpages
@dirrm share/apps/khelpcenter/plugins/Applications
-@dirrm share/apps/khelpcenter/plugins
-@dirrm share/apps/khelpcenter
@dirrm share/apps/kfontview
@dirrm share/apps/kfindpart/icons/locolor/22x22/actions
@dirrm share/apps/kfindpart/icons/locolor/22x22
@@ -4268,11 +4218,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
-@dirrm share/apps/kdesktop/programs
-@dirrm share/apps/kdesktop/pics
-@dirrm share/apps/kdesktop/patterns
-@dirrm share/apps/kdesktop/DesktopLinks
-@dirrm share/apps/kdesktop
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16/actions
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16
@dirrm share/apps/kdeprintfax/icons/crystalsvg
@@ -4300,7 +4245,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kcminput
@dirrm share/apps/kcmcss
@dirrm share/apps/kbookmark
-@dirrm share/apps/kate/scripts
@dirrm share/apps/kate/plugins/katedefaultproject
@dirrm share/apps/kate/plugins
@dirrm share/apps/kate/icons/locolor/22x22/actions
@@ -4314,7 +4258,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kate/icons/crystalsvg/16x16
@dirrm share/apps/kate/icons/crystalsvg
@dirrm share/apps/kate/icons
-@dirrm share/apps/kate
@dirrm share/apps/kappfinder/apps/Utilities/XUtilities
@dirrm share/apps/kappfinder/apps/Utilities
@dirrm share/apps/kappfinder/apps/Toys
@@ -4342,19 +4285,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
@dirrm share/apps/clockapplet
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/Toys
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk/Settingsmenu
-@dirrm share/applnk/Settings/WebBrowsing
-@dirrm share/applnk/Settings/LookNFeel/Themes
-@dirrm share/applnk/Settings/LookNFeel
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Internet
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
@dirrm lib/kconf_update_bin
@dirrm include/kwin
@dirrm include/ksplash
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index cfe6154d4b3c..a1ad17ecaaad 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.1.tar.bz2) = dd0d9707296f2be143c28a8be21b6e24
-SIZE (KDE/kdebase-3.3.1.tar.bz2) = 19906317
+MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
+SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
index c845a8cbf236..4a3ac236fe1d 100644
--- a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
-+++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Nov 28 18:26:14 2004
++++ kdm/kfrontend/genkdmconf.c Thu Dec 2 00:41:46 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,12 +20,14 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -668,7 +668,7 @@
+@@ -667,7 +667,9 @@
+ " */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\n"
- " set -a\n"
--" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n"
+-" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n"
++" set -a\n"
+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; printenv | egrep -v \"^(TERM|SHLVL)=\"'`\n"
- " set +a\n"
++" set +a\n"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
+ " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kde4-workspace/files/patch-konsole-konsole-konsole.cpp b/x11/kde4-workspace/files/patch-konsole-konsole-konsole.cpp
new file mode 100644
index 000000000000..553c411983a7
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-konsole-konsole-konsole.cpp
@@ -0,0 +1,30 @@
+--- konsole/konsole/konsole.cpp 16 Nov 2004 16:46:00 -0000 1.472.2.6
++++ konsole/konsole/konsole.cpp 1 Dec 2004 17:05:30 -0000 1.472.2.7
+@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
+ createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
+ setSchema(s->schemaNo());
+ tabwidget->setCurrentPage(tabwidget->count()-1);
+- disableMasterModeConnections(); // no duplicate connections, remove old
+- enableMasterModeConnections();
+- }
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ disableMasterModeConnections(); // no duplicate connections, remove old
++ enableMasterModeConnections();
++ if(m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ }
+ }
+
+ QString Konsole::currentSession()
+@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
+ rootxpms.remove(s->widget());
+ }
+ delete s->widget();
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ if (m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
+ }
+ session2action.remove(s);
+ action2session.remove(ra);
diff --git a/x11/kde4-workspace/files/patch-kxkb_rules.cpp b/x11/kde4-workspace/files/patch-kxkb_rules.cpp
deleted file mode 100644
index 00122a2b9898..000000000000
--- a/x11/kde4-workspace/files/patch-kxkb_rules.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- kxkb/rules.cpp 2004/06/28 14:19:03 1.38
-+++ kxkb/rules.cpp 2004/10/10 22:59:59 1.38.2.1
-@@ -1,3 +1,4 @@
-+#include <qwindowdefs.h>
- #include <qfile.h>
- #include <qtextstream.h>
- #include <qregexp.h>
-@@ -42,11 +43,19 @@ KeyRules::KeyRules():
- }
-
- QString rulesFile;
-- for(int ii=0; ii<2; ii++)
-+ Display *dpy = qt_xdisplay();
-+ XkbRF_VarDefsRec vd;
-+ char *tmp= NULL;
-+ if (XkbRF_GetNamesProp(dpy,&tmp,&vd) && tmp)
-+ rulesFile = X11_DIR + QString("xkb/rules/%1").arg(tmp);
-+ else {
-+ // old way
-+ for(int ii=0; ii<2; ii++)
- if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) {
- rulesFile = X11_DIR + rulesFileList[ii];
- break;
- }
-+ }
-
- if( rulesFile.isEmpty() ) {
- kdDebug() << "Cannot find rules file in " << X11_DIR << endl;
diff --git a/x11/kde4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kde4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2
new file mode 100644
index 000000000000..f31b6341cf9c
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2
@@ -0,0 +1,39 @@
+Index: konq_mainwindow.cc
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
+retrieving revision 1.1342.2.14
+diff -u -p -r1.1342.2.14 konq_mainwindow.cc
+--- konqueror/konq_mainwindow.cc 24 Nov 2004 18:29:51 -0000 1.1342.2.14
++++ konqueror/konq_mainwindow.cc 12 Dec 2004 15:54:46 -0000
+@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
+ QString viewName = view->viewName();
+ kdDebug() << " - viewName=" << viewName << " "
+ << "frame names:" << view->frameNames().join( "," ) << endl;
++
++ // First look for a hostextension containing this frame name
++ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
++ if ( ext )
++ {
++ ext = ext->findFrameParent(callingPart, name);
++ kdDebug() << "BrowserHostExtension found part " << ext << endl;
++ if (!ext)
++ continue; // Don't use this window
++ }
++
+ if ( !viewName.isEmpty() && viewName == name )
+ {
+ kdDebug() << "found existing view by name: " << view << endl;
+@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
+ return view;
+ }
+
+- // First look for a hostextension containing this frame name
+- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
+- if ( ext )
+- {
+- ext = ext->findFrameParent(callingPart, name);
+- }
+-
+ // KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
+
+ if ( ext )
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 0c34371113ce..61e591e3cd68 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -1423,6 +1423,7 @@ share/apps/konqsidebartng/entries/remote.desktop
share/apps/konqsidebartng/entries/root.desktop
share/apps/konqsidebartng/entries/services.desktop
share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
+share/apps/konqsidebartng/kicker_entries/devices.desktop
share/apps/konqsidebartng/kicker_entries/history.desktop
share/apps/konqsidebartng/kicker_entries/home.desktop
share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -3787,8 +3788,6 @@ share/wallpapers/only_k.jpg
share/wallpapers/seaofconero.jpg
share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@@ -3806,16 +3805,7 @@ share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@dirrm share/wallpapers
@dirrm share/templates/.source/emptydir
-@dirrm share/templates/.source
-@dirrm share/templates
-@dirrm share/sounds
-@dirrm share/services/useragentstrings
-@dirrm share/services/searchproviders
@dirrm share/mimelnk/print
@dirrm share/mimelnk/kdedevice
@dirrm share/mimelnk/fonts
@@ -4046,20 +4036,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/locale/l10n/ad
@dirrm share/locale/l10n/C
@dirrm share/locale/l10n
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
@dirrm share/icons/crystalsvg/scalable/apps/gnome
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/fonts/override
-@dirrm share/fonts
@dirrm share/doc/kdm
@dirrm share/doc/HTML/en/kxkb
@dirrm share/doc/HTML/en/kwrite
@@ -4156,15 +4133,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/doc/HTML/en/kcontrol/bell
@dirrm share/doc/HTML/en/kcontrol/background
@dirrm share/doc/HTML/en/kcontrol/arts
-@dirrm share/doc/HTML/en/kcontrol
@dirrm share/doc/HTML/en/kate
@dirrm share/desktop-directories
-@dirrm share/config.kcfg
@dirrm share/apps/naughtyapplet/pics
@dirrm share/apps/naughtyapplet
@dirrm share/apps/kwrite
-@dirrm share/apps/kwin/pics
-@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/pics
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@@ -4179,7 +4152,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/ksmserver
@dirrm share/apps/kpersonalizer/pics
@dirrm share/apps/kpersonalizer
-@dirrm share/apps/konsole/profiles
@dirrm share/apps/konsole/icons/crystalsvg/32x32/actions
@dirrm share/apps/konsole/icons/crystalsvg/32x32
@dirrm share/apps/konsole/icons/crystalsvg/22x22/actions
@@ -4188,10 +4160,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konsole/icons/crystalsvg/16x16
@dirrm share/apps/konsole/icons/crystalsvg
@dirrm share/apps/konsole/icons
-@dirrm share/apps/konsole
@dirrm share/apps/konqueror/tiles
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror/profiles
@dirrm share/apps/konqueror/pics
@dirrm share/apps/konqueror/icons/crystalsvg/16x16/actions
@dirrm share/apps/konqueror/icons/crystalsvg/16x16
@@ -4200,18 +4169,8 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konqueror/dirtree/remote
@dirrm share/apps/konqueror/dirtree
@dirrm share/apps/konqueror/about
-@dirrm share/apps/konqueror
@dirrm share/apps/konqsidebartng/websidebar
-@dirrm share/apps/konqsidebartng/virtual_folders/services
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/web
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
-@dirrm share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/konqsidebartng/virtual_folders
@dirrm share/apps/konqsidebartng/kicker_entries
-@dirrm share/apps/konqsidebartng/entries
-@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/konqsidebartng/add
-@dirrm share/apps/konqsidebartng
@dirrm share/apps/konqlistview/kpartplugins
@dirrm share/apps/konqlistview
@dirrm share/apps/konqiconview/kpartplugins
@@ -4230,11 +4189,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kio_info
@dirrm share/apps/kio_finger
@dirrm share/apps/kinfocenter
-@dirrm share/apps/kicker/wallpapers
-@dirrm share/apps/kicker/tiles
-@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/menuext/find
-@dirrm share/apps/kicker/menuext
@dirrm share/apps/kicker/icons/locolor/16x16/actions
@dirrm share/apps/kicker/icons/locolor/16x16
@dirrm share/apps/kicker/icons/locolor
@@ -4242,16 +4197,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kicker/icons/crystalsvg/16x16
@dirrm share/apps/kicker/icons/crystalsvg
@dirrm share/apps/kicker/icons
-@dirrm share/apps/kicker/extensions
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
@dirrm share/apps/khotkeys
@dirrm share/apps/khelpcenter/plugins/Tutorials
@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
@dirrm share/apps/khelpcenter/plugins/Manpages
@dirrm share/apps/khelpcenter/plugins/Applications
-@dirrm share/apps/khelpcenter/plugins
-@dirrm share/apps/khelpcenter
@dirrm share/apps/kfontview
@dirrm share/apps/kfindpart/icons/locolor/22x22/actions
@dirrm share/apps/kfindpart/icons/locolor/22x22
@@ -4268,11 +4218,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
-@dirrm share/apps/kdesktop/programs
-@dirrm share/apps/kdesktop/pics
-@dirrm share/apps/kdesktop/patterns
-@dirrm share/apps/kdesktop/DesktopLinks
-@dirrm share/apps/kdesktop
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16/actions
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16
@dirrm share/apps/kdeprintfax/icons/crystalsvg
@@ -4300,7 +4245,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kcminput
@dirrm share/apps/kcmcss
@dirrm share/apps/kbookmark
-@dirrm share/apps/kate/scripts
@dirrm share/apps/kate/plugins/katedefaultproject
@dirrm share/apps/kate/plugins
@dirrm share/apps/kate/icons/locolor/22x22/actions
@@ -4314,7 +4258,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kate/icons/crystalsvg/16x16
@dirrm share/apps/kate/icons/crystalsvg
@dirrm share/apps/kate/icons
-@dirrm share/apps/kate
@dirrm share/apps/kappfinder/apps/Utilities/XUtilities
@dirrm share/apps/kappfinder/apps/Utilities
@dirrm share/apps/kappfinder/apps/Toys
@@ -4342,19 +4285,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
@dirrm share/apps/clockapplet
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/Toys
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk/Settingsmenu
-@dirrm share/applnk/Settings/WebBrowsing
-@dirrm share/applnk/Settings/LookNFeel/Themes
-@dirrm share/applnk/Settings/LookNFeel
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Internet
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
@dirrm lib/kconf_update_bin
@dirrm include/kwin
@dirrm include/ksplash
diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde
index 4c2546f2a48c..3fc622219a8a 100644
--- a/x11/kde4/Makefile.kde
+++ b/x11/kde4/Makefile.kde
@@ -96,7 +96,6 @@ _NO_KDE_FIXPTHREAD= yes
.if !defined(_NO_KDE_FIXPTHREAD)
USE_REINPLACE= yes
CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}"
-EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-configure
pre-configure: kde-fix-configure kde-fix-ltmain.sh
kde-fix-configure:
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index cfe6154d4b3c..a1ad17ecaaad 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.1.tar.bz2) = dd0d9707296f2be143c28a8be21b6e24
-SIZE (KDE/kdebase-3.3.1.tar.bz2) = 19906317
+MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
+SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
diff --git a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c
index c845a8cbf236..4a3ac236fe1d 100644
--- a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
-+++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Nov 28 18:26:14 2004
++++ kdm/kfrontend/genkdmconf.c Thu Dec 2 00:41:46 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,12 +20,14 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -668,7 +668,7 @@
+@@ -667,7 +667,9 @@
+ " */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\n"
- " set -a\n"
--" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n"
+-" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n"
++" set -a\n"
+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; printenv | egrep -v \"^(TERM|SHLVL)=\"'`\n"
- " set +a\n"
++" set +a\n"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
+ " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kdebase3/files/patch-konsole-konsole-konsole.cpp b/x11/kdebase3/files/patch-konsole-konsole-konsole.cpp
new file mode 100644
index 000000000000..553c411983a7
--- /dev/null
+++ b/x11/kdebase3/files/patch-konsole-konsole-konsole.cpp
@@ -0,0 +1,30 @@
+--- konsole/konsole/konsole.cpp 16 Nov 2004 16:46:00 -0000 1.472.2.6
++++ konsole/konsole/konsole.cpp 1 Dec 2004 17:05:30 -0000 1.472.2.7
+@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
+ createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
+ setSchema(s->schemaNo());
+ tabwidget->setCurrentPage(tabwidget->count()-1);
+- disableMasterModeConnections(); // no duplicate connections, remove old
+- enableMasterModeConnections();
+- }
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ disableMasterModeConnections(); // no duplicate connections, remove old
++ enableMasterModeConnections();
++ if(m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ }
+ }
+
+ QString Konsole::currentSession()
+@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
+ rootxpms.remove(s->widget());
+ }
+ delete s->widget();
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ if (m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
+ }
+ session2action.remove(s);
+ action2session.remove(ra);
diff --git a/x11/kdebase3/files/patch-kxkb_rules.cpp b/x11/kdebase3/files/patch-kxkb_rules.cpp
deleted file mode 100644
index 00122a2b9898..000000000000
--- a/x11/kdebase3/files/patch-kxkb_rules.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- kxkb/rules.cpp 2004/06/28 14:19:03 1.38
-+++ kxkb/rules.cpp 2004/10/10 22:59:59 1.38.2.1
-@@ -1,3 +1,4 @@
-+#include <qwindowdefs.h>
- #include <qfile.h>
- #include <qtextstream.h>
- #include <qregexp.h>
-@@ -42,11 +43,19 @@ KeyRules::KeyRules():
- }
-
- QString rulesFile;
-- for(int ii=0; ii<2; ii++)
-+ Display *dpy = qt_xdisplay();
-+ XkbRF_VarDefsRec vd;
-+ char *tmp= NULL;
-+ if (XkbRF_GetNamesProp(dpy,&tmp,&vd) && tmp)
-+ rulesFile = X11_DIR + QString("xkb/rules/%1").arg(tmp);
-+ else {
-+ // old way
-+ for(int ii=0; ii<2; ii++)
- if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) {
- rulesFile = X11_DIR + rulesFileList[ii];
- break;
- }
-+ }
-
- if( rulesFile.isEmpty() ) {
- kdDebug() << "Cannot find rules file in " << X11_DIR << endl;
diff --git a/x11/kdebase3/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kdebase3/files/patch-post-3.3.2-kdebase-htmlframes2
new file mode 100644
index 000000000000..f31b6341cf9c
--- /dev/null
+++ b/x11/kdebase3/files/patch-post-3.3.2-kdebase-htmlframes2
@@ -0,0 +1,39 @@
+Index: konq_mainwindow.cc
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
+retrieving revision 1.1342.2.14
+diff -u -p -r1.1342.2.14 konq_mainwindow.cc
+--- konqueror/konq_mainwindow.cc 24 Nov 2004 18:29:51 -0000 1.1342.2.14
++++ konqueror/konq_mainwindow.cc 12 Dec 2004 15:54:46 -0000
+@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
+ QString viewName = view->viewName();
+ kdDebug() << " - viewName=" << viewName << " "
+ << "frame names:" << view->frameNames().join( "," ) << endl;
++
++ // First look for a hostextension containing this frame name
++ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
++ if ( ext )
++ {
++ ext = ext->findFrameParent(callingPart, name);
++ kdDebug() << "BrowserHostExtension found part " << ext << endl;
++ if (!ext)
++ continue; // Don't use this window
++ }
++
+ if ( !viewName.isEmpty() && viewName == name )
+ {
+ kdDebug() << "found existing view by name: " << view << endl;
+@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
+ return view;
+ }
+
+- // First look for a hostextension containing this frame name
+- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
+- if ( ext )
+- {
+- ext = ext->findFrameParent(callingPart, name);
+- }
+-
+ // KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
+
+ if ( ext )
diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist
index 0c34371113ce..61e591e3cd68 100644
--- a/x11/kdebase3/pkg-plist
+++ b/x11/kdebase3/pkg-plist
@@ -1423,6 +1423,7 @@ share/apps/konqsidebartng/entries/remote.desktop
share/apps/konqsidebartng/entries/root.desktop
share/apps/konqsidebartng/entries/services.desktop
share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
+share/apps/konqsidebartng/kicker_entries/devices.desktop
share/apps/konqsidebartng/kicker_entries/history.desktop
share/apps/konqsidebartng/kicker_entries/home.desktop
share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -3787,8 +3788,6 @@ share/wallpapers/only_k.jpg
share/wallpapers/seaofconero.jpg
share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@@ -3806,16 +3805,7 @@ share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@dirrm share/wallpapers
@dirrm share/templates/.source/emptydir
-@dirrm share/templates/.source
-@dirrm share/templates
-@dirrm share/sounds
-@dirrm share/services/useragentstrings
-@dirrm share/services/searchproviders
@dirrm share/mimelnk/print
@dirrm share/mimelnk/kdedevice
@dirrm share/mimelnk/fonts
@@ -4046,20 +4036,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/locale/l10n/ad
@dirrm share/locale/l10n/C
@dirrm share/locale/l10n
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
@dirrm share/icons/crystalsvg/scalable/apps/gnome
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/fonts/override
-@dirrm share/fonts
@dirrm share/doc/kdm
@dirrm share/doc/HTML/en/kxkb
@dirrm share/doc/HTML/en/kwrite
@@ -4156,15 +4133,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/doc/HTML/en/kcontrol/bell
@dirrm share/doc/HTML/en/kcontrol/background
@dirrm share/doc/HTML/en/kcontrol/arts
-@dirrm share/doc/HTML/en/kcontrol
@dirrm share/doc/HTML/en/kate
@dirrm share/desktop-directories
-@dirrm share/config.kcfg
@dirrm share/apps/naughtyapplet/pics
@dirrm share/apps/naughtyapplet
@dirrm share/apps/kwrite
-@dirrm share/apps/kwin/pics
-@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/pics
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@@ -4179,7 +4152,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/ksmserver
@dirrm share/apps/kpersonalizer/pics
@dirrm share/apps/kpersonalizer
-@dirrm share/apps/konsole/profiles
@dirrm share/apps/konsole/icons/crystalsvg/32x32/actions
@dirrm share/apps/konsole/icons/crystalsvg/32x32
@dirrm share/apps/konsole/icons/crystalsvg/22x22/actions
@@ -4188,10 +4160,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konsole/icons/crystalsvg/16x16
@dirrm share/apps/konsole/icons/crystalsvg
@dirrm share/apps/konsole/icons
-@dirrm share/apps/konsole
@dirrm share/apps/konqueror/tiles
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror/profiles
@dirrm share/apps/konqueror/pics
@dirrm share/apps/konqueror/icons/crystalsvg/16x16/actions
@dirrm share/apps/konqueror/icons/crystalsvg/16x16
@@ -4200,18 +4169,8 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konqueror/dirtree/remote
@dirrm share/apps/konqueror/dirtree
@dirrm share/apps/konqueror/about
-@dirrm share/apps/konqueror
@dirrm share/apps/konqsidebartng/websidebar
-@dirrm share/apps/konqsidebartng/virtual_folders/services
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/web
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
-@dirrm share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/konqsidebartng/virtual_folders
@dirrm share/apps/konqsidebartng/kicker_entries
-@dirrm share/apps/konqsidebartng/entries
-@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/konqsidebartng/add
-@dirrm share/apps/konqsidebartng
@dirrm share/apps/konqlistview/kpartplugins
@dirrm share/apps/konqlistview
@dirrm share/apps/konqiconview/kpartplugins
@@ -4230,11 +4189,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kio_info
@dirrm share/apps/kio_finger
@dirrm share/apps/kinfocenter
-@dirrm share/apps/kicker/wallpapers
-@dirrm share/apps/kicker/tiles
-@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/menuext/find
-@dirrm share/apps/kicker/menuext
@dirrm share/apps/kicker/icons/locolor/16x16/actions
@dirrm share/apps/kicker/icons/locolor/16x16
@dirrm share/apps/kicker/icons/locolor
@@ -4242,16 +4197,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kicker/icons/crystalsvg/16x16
@dirrm share/apps/kicker/icons/crystalsvg
@dirrm share/apps/kicker/icons
-@dirrm share/apps/kicker/extensions
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
@dirrm share/apps/khotkeys
@dirrm share/apps/khelpcenter/plugins/Tutorials
@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
@dirrm share/apps/khelpcenter/plugins/Manpages
@dirrm share/apps/khelpcenter/plugins/Applications
-@dirrm share/apps/khelpcenter/plugins
-@dirrm share/apps/khelpcenter
@dirrm share/apps/kfontview
@dirrm share/apps/kfindpart/icons/locolor/22x22/actions
@dirrm share/apps/kfindpart/icons/locolor/22x22
@@ -4268,11 +4218,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
-@dirrm share/apps/kdesktop/programs
-@dirrm share/apps/kdesktop/pics
-@dirrm share/apps/kdesktop/patterns
-@dirrm share/apps/kdesktop/DesktopLinks
-@dirrm share/apps/kdesktop
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16/actions
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16
@dirrm share/apps/kdeprintfax/icons/crystalsvg
@@ -4300,7 +4245,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kcminput
@dirrm share/apps/kcmcss
@dirrm share/apps/kbookmark
-@dirrm share/apps/kate/scripts
@dirrm share/apps/kate/plugins/katedefaultproject
@dirrm share/apps/kate/plugins
@dirrm share/apps/kate/icons/locolor/22x22/actions
@@ -4314,7 +4258,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kate/icons/crystalsvg/16x16
@dirrm share/apps/kate/icons/crystalsvg
@dirrm share/apps/kate/icons
-@dirrm share/apps/kate
@dirrm share/apps/kappfinder/apps/Utilities/XUtilities
@dirrm share/apps/kappfinder/apps/Utilities
@dirrm share/apps/kappfinder/apps/Toys
@@ -4342,19 +4285,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
@dirrm share/apps/clockapplet
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/Toys
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk/Settingsmenu
-@dirrm share/applnk/Settings/WebBrowsing
-@dirrm share/applnk/Settings/LookNFeel/Themes
-@dirrm share/applnk/Settings/LookNFeel
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Internet
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
@dirrm lib/kconf_update_bin
@dirrm include/kwin
@dirrm include/ksplash
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index cfe6154d4b3c..a1ad17ecaaad 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.1.tar.bz2) = dd0d9707296f2be143c28a8be21b6e24
-SIZE (KDE/kdebase-3.3.1.tar.bz2) = 19906317
+MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
+SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
diff --git a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
index c845a8cbf236..4a3ac236fe1d 100644
--- a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
-+++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Nov 28 18:26:14 2004
++++ kdm/kfrontend/genkdmconf.c Thu Dec 2 00:41:46 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,12 +20,14 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -668,7 +668,7 @@
+@@ -667,7 +667,9 @@
+ " */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\n"
- " set -a\n"
--" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n"
+-" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n"
++" set -a\n"
+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; printenv | egrep -v \"^(TERM|SHLVL)=\"'`\n"
- " set +a\n"
++" set +a\n"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
+ " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kdebase4-runtime/files/patch-konsole-konsole-konsole.cpp b/x11/kdebase4-runtime/files/patch-konsole-konsole-konsole.cpp
new file mode 100644
index 000000000000..553c411983a7
--- /dev/null
+++ b/x11/kdebase4-runtime/files/patch-konsole-konsole-konsole.cpp
@@ -0,0 +1,30 @@
+--- konsole/konsole/konsole.cpp 16 Nov 2004 16:46:00 -0000 1.472.2.6
++++ konsole/konsole/konsole.cpp 1 Dec 2004 17:05:30 -0000 1.472.2.7
+@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
+ createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
+ setSchema(s->schemaNo());
+ tabwidget->setCurrentPage(tabwidget->count()-1);
+- disableMasterModeConnections(); // no duplicate connections, remove old
+- enableMasterModeConnections();
+- }
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ disableMasterModeConnections(); // no duplicate connections, remove old
++ enableMasterModeConnections();
++ if(m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ }
+ }
+
+ QString Konsole::currentSession()
+@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
+ rootxpms.remove(s->widget());
+ }
+ delete s->widget();
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ if (m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
+ }
+ session2action.remove(s);
+ action2session.remove(ra);
diff --git a/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp b/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp
deleted file mode 100644
index 00122a2b9898..000000000000
--- a/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- kxkb/rules.cpp 2004/06/28 14:19:03 1.38
-+++ kxkb/rules.cpp 2004/10/10 22:59:59 1.38.2.1
-@@ -1,3 +1,4 @@
-+#include <qwindowdefs.h>
- #include <qfile.h>
- #include <qtextstream.h>
- #include <qregexp.h>
-@@ -42,11 +43,19 @@ KeyRules::KeyRules():
- }
-
- QString rulesFile;
-- for(int ii=0; ii<2; ii++)
-+ Display *dpy = qt_xdisplay();
-+ XkbRF_VarDefsRec vd;
-+ char *tmp= NULL;
-+ if (XkbRF_GetNamesProp(dpy,&tmp,&vd) && tmp)
-+ rulesFile = X11_DIR + QString("xkb/rules/%1").arg(tmp);
-+ else {
-+ // old way
-+ for(int ii=0; ii<2; ii++)
- if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) {
- rulesFile = X11_DIR + rulesFileList[ii];
- break;
- }
-+ }
-
- if( rulesFile.isEmpty() ) {
- kdDebug() << "Cannot find rules file in " << X11_DIR << endl;
diff --git a/x11/kdebase4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kdebase4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2
new file mode 100644
index 000000000000..f31b6341cf9c
--- /dev/null
+++ b/x11/kdebase4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2
@@ -0,0 +1,39 @@
+Index: konq_mainwindow.cc
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
+retrieving revision 1.1342.2.14
+diff -u -p -r1.1342.2.14 konq_mainwindow.cc
+--- konqueror/konq_mainwindow.cc 24 Nov 2004 18:29:51 -0000 1.1342.2.14
++++ konqueror/konq_mainwindow.cc 12 Dec 2004 15:54:46 -0000
+@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
+ QString viewName = view->viewName();
+ kdDebug() << " - viewName=" << viewName << " "
+ << "frame names:" << view->frameNames().join( "," ) << endl;
++
++ // First look for a hostextension containing this frame name
++ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
++ if ( ext )
++ {
++ ext = ext->findFrameParent(callingPart, name);
++ kdDebug() << "BrowserHostExtension found part " << ext << endl;
++ if (!ext)
++ continue; // Don't use this window
++ }
++
+ if ( !viewName.isEmpty() && viewName == name )
+ {
+ kdDebug() << "found existing view by name: " << view << endl;
+@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
+ return view;
+ }
+
+- // First look for a hostextension containing this frame name
+- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
+- if ( ext )
+- {
+- ext = ext->findFrameParent(callingPart, name);
+- }
+-
+ // KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
+
+ if ( ext )
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index 0c34371113ce..61e591e3cd68 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -1423,6 +1423,7 @@ share/apps/konqsidebartng/entries/remote.desktop
share/apps/konqsidebartng/entries/root.desktop
share/apps/konqsidebartng/entries/services.desktop
share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
+share/apps/konqsidebartng/kicker_entries/devices.desktop
share/apps/konqsidebartng/kicker_entries/history.desktop
share/apps/konqsidebartng/kicker_entries/home.desktop
share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -3787,8 +3788,6 @@ share/wallpapers/only_k.jpg
share/wallpapers/seaofconero.jpg
share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@@ -3806,16 +3805,7 @@ share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@dirrm share/wallpapers
@dirrm share/templates/.source/emptydir
-@dirrm share/templates/.source
-@dirrm share/templates
-@dirrm share/sounds
-@dirrm share/services/useragentstrings
-@dirrm share/services/searchproviders
@dirrm share/mimelnk/print
@dirrm share/mimelnk/kdedevice
@dirrm share/mimelnk/fonts
@@ -4046,20 +4036,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/locale/l10n/ad
@dirrm share/locale/l10n/C
@dirrm share/locale/l10n
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
@dirrm share/icons/crystalsvg/scalable/apps/gnome
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/fonts/override
-@dirrm share/fonts
@dirrm share/doc/kdm
@dirrm share/doc/HTML/en/kxkb
@dirrm share/doc/HTML/en/kwrite
@@ -4156,15 +4133,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/doc/HTML/en/kcontrol/bell
@dirrm share/doc/HTML/en/kcontrol/background
@dirrm share/doc/HTML/en/kcontrol/arts
-@dirrm share/doc/HTML/en/kcontrol
@dirrm share/doc/HTML/en/kate
@dirrm share/desktop-directories
-@dirrm share/config.kcfg
@dirrm share/apps/naughtyapplet/pics
@dirrm share/apps/naughtyapplet
@dirrm share/apps/kwrite
-@dirrm share/apps/kwin/pics
-@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/pics
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@@ -4179,7 +4152,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/ksmserver
@dirrm share/apps/kpersonalizer/pics
@dirrm share/apps/kpersonalizer
-@dirrm share/apps/konsole/profiles
@dirrm share/apps/konsole/icons/crystalsvg/32x32/actions
@dirrm share/apps/konsole/icons/crystalsvg/32x32
@dirrm share/apps/konsole/icons/crystalsvg/22x22/actions
@@ -4188,10 +4160,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konsole/icons/crystalsvg/16x16
@dirrm share/apps/konsole/icons/crystalsvg
@dirrm share/apps/konsole/icons
-@dirrm share/apps/konsole
@dirrm share/apps/konqueror/tiles
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror/profiles
@dirrm share/apps/konqueror/pics
@dirrm share/apps/konqueror/icons/crystalsvg/16x16/actions
@dirrm share/apps/konqueror/icons/crystalsvg/16x16
@@ -4200,18 +4169,8 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konqueror/dirtree/remote
@dirrm share/apps/konqueror/dirtree
@dirrm share/apps/konqueror/about
-@dirrm share/apps/konqueror
@dirrm share/apps/konqsidebartng/websidebar
-@dirrm share/apps/konqsidebartng/virtual_folders/services
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/web
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
-@dirrm share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/konqsidebartng/virtual_folders
@dirrm share/apps/konqsidebartng/kicker_entries
-@dirrm share/apps/konqsidebartng/entries
-@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/konqsidebartng/add
-@dirrm share/apps/konqsidebartng
@dirrm share/apps/konqlistview/kpartplugins
@dirrm share/apps/konqlistview
@dirrm share/apps/konqiconview/kpartplugins
@@ -4230,11 +4189,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kio_info
@dirrm share/apps/kio_finger
@dirrm share/apps/kinfocenter
-@dirrm share/apps/kicker/wallpapers
-@dirrm share/apps/kicker/tiles
-@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/menuext/find
-@dirrm share/apps/kicker/menuext
@dirrm share/apps/kicker/icons/locolor/16x16/actions
@dirrm share/apps/kicker/icons/locolor/16x16
@dirrm share/apps/kicker/icons/locolor
@@ -4242,16 +4197,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kicker/icons/crystalsvg/16x16
@dirrm share/apps/kicker/icons/crystalsvg
@dirrm share/apps/kicker/icons
-@dirrm share/apps/kicker/extensions
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
@dirrm share/apps/khotkeys
@dirrm share/apps/khelpcenter/plugins/Tutorials
@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
@dirrm share/apps/khelpcenter/plugins/Manpages
@dirrm share/apps/khelpcenter/plugins/Applications
-@dirrm share/apps/khelpcenter/plugins
-@dirrm share/apps/khelpcenter
@dirrm share/apps/kfontview
@dirrm share/apps/kfindpart/icons/locolor/22x22/actions
@dirrm share/apps/kfindpart/icons/locolor/22x22
@@ -4268,11 +4218,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
-@dirrm share/apps/kdesktop/programs
-@dirrm share/apps/kdesktop/pics
-@dirrm share/apps/kdesktop/patterns
-@dirrm share/apps/kdesktop/DesktopLinks
-@dirrm share/apps/kdesktop
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16/actions
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16
@dirrm share/apps/kdeprintfax/icons/crystalsvg
@@ -4300,7 +4245,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kcminput
@dirrm share/apps/kcmcss
@dirrm share/apps/kbookmark
-@dirrm share/apps/kate/scripts
@dirrm share/apps/kate/plugins/katedefaultproject
@dirrm share/apps/kate/plugins
@dirrm share/apps/kate/icons/locolor/22x22/actions
@@ -4314,7 +4258,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kate/icons/crystalsvg/16x16
@dirrm share/apps/kate/icons/crystalsvg
@dirrm share/apps/kate/icons
-@dirrm share/apps/kate
@dirrm share/apps/kappfinder/apps/Utilities/XUtilities
@dirrm share/apps/kappfinder/apps/Utilities
@dirrm share/apps/kappfinder/apps/Toys
@@ -4342,19 +4285,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
@dirrm share/apps/clockapplet
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/Toys
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk/Settingsmenu
-@dirrm share/applnk/Settings/WebBrowsing
-@dirrm share/applnk/Settings/LookNFeel/Themes
-@dirrm share/applnk/Settings/LookNFeel
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Internet
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
@dirrm lib/kconf_update_bin
@dirrm include/kwin
@dirrm include/ksplash
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index cfe6154d4b3c..a1ad17ecaaad 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.1.tar.bz2) = dd0d9707296f2be143c28a8be21b6e24
-SIZE (KDE/kdebase-3.3.1.tar.bz2) = 19906317
+MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
+SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
index c845a8cbf236..4a3ac236fe1d 100644
--- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
-+++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Nov 28 18:26:14 2004
++++ kdm/kfrontend/genkdmconf.c Thu Dec 2 00:41:46 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,12 +20,14 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -668,7 +668,7 @@
+@@ -667,7 +667,9 @@
+ " */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\n"
- " set -a\n"
--" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n"
+-" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n"
++" set -a\n"
+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; printenv | egrep -v \"^(TERM|SHLVL)=\"'`\n"
- " set +a\n"
++" set +a\n"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
+ " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kdebase4-workspace/files/patch-konsole-konsole-konsole.cpp b/x11/kdebase4-workspace/files/patch-konsole-konsole-konsole.cpp
new file mode 100644
index 000000000000..553c411983a7
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-konsole-konsole-konsole.cpp
@@ -0,0 +1,30 @@
+--- konsole/konsole/konsole.cpp 16 Nov 2004 16:46:00 -0000 1.472.2.6
++++ konsole/konsole/konsole.cpp 1 Dec 2004 17:05:30 -0000 1.472.2.7
+@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
+ createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
+ setSchema(s->schemaNo());
+ tabwidget->setCurrentPage(tabwidget->count()-1);
+- disableMasterModeConnections(); // no duplicate connections, remove old
+- enableMasterModeConnections();
+- }
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ disableMasterModeConnections(); // no duplicate connections, remove old
++ enableMasterModeConnections();
++ if(m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ }
+ }
+
+ QString Konsole::currentSession()
+@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
+ rootxpms.remove(s->widget());
+ }
+ delete s->widget();
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ if (m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
+ }
+ session2action.remove(s);
+ action2session.remove(ra);
diff --git a/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp b/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp
deleted file mode 100644
index 00122a2b9898..000000000000
--- a/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- kxkb/rules.cpp 2004/06/28 14:19:03 1.38
-+++ kxkb/rules.cpp 2004/10/10 22:59:59 1.38.2.1
-@@ -1,3 +1,4 @@
-+#include <qwindowdefs.h>
- #include <qfile.h>
- #include <qtextstream.h>
- #include <qregexp.h>
-@@ -42,11 +43,19 @@ KeyRules::KeyRules():
- }
-
- QString rulesFile;
-- for(int ii=0; ii<2; ii++)
-+ Display *dpy = qt_xdisplay();
-+ XkbRF_VarDefsRec vd;
-+ char *tmp= NULL;
-+ if (XkbRF_GetNamesProp(dpy,&tmp,&vd) && tmp)
-+ rulesFile = X11_DIR + QString("xkb/rules/%1").arg(tmp);
-+ else {
-+ // old way
-+ for(int ii=0; ii<2; ii++)
- if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) {
- rulesFile = X11_DIR + rulesFileList[ii];
- break;
- }
-+ }
-
- if( rulesFile.isEmpty() ) {
- kdDebug() << "Cannot find rules file in " << X11_DIR << endl;
diff --git a/x11/kdebase4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kdebase4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2
new file mode 100644
index 000000000000..f31b6341cf9c
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2
@@ -0,0 +1,39 @@
+Index: konq_mainwindow.cc
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
+retrieving revision 1.1342.2.14
+diff -u -p -r1.1342.2.14 konq_mainwindow.cc
+--- konqueror/konq_mainwindow.cc 24 Nov 2004 18:29:51 -0000 1.1342.2.14
++++ konqueror/konq_mainwindow.cc 12 Dec 2004 15:54:46 -0000
+@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
+ QString viewName = view->viewName();
+ kdDebug() << " - viewName=" << viewName << " "
+ << "frame names:" << view->frameNames().join( "," ) << endl;
++
++ // First look for a hostextension containing this frame name
++ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
++ if ( ext )
++ {
++ ext = ext->findFrameParent(callingPart, name);
++ kdDebug() << "BrowserHostExtension found part " << ext << endl;
++ if (!ext)
++ continue; // Don't use this window
++ }
++
+ if ( !viewName.isEmpty() && viewName == name )
+ {
+ kdDebug() << "found existing view by name: " << view << endl;
+@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
+ return view;
+ }
+
+- // First look for a hostextension containing this frame name
+- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
+- if ( ext )
+- {
+- ext = ext->findFrameParent(callingPart, name);
+- }
+-
+ // KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
+
+ if ( ext )
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 0c34371113ce..61e591e3cd68 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -1423,6 +1423,7 @@ share/apps/konqsidebartng/entries/remote.desktop
share/apps/konqsidebartng/entries/root.desktop
share/apps/konqsidebartng/entries/services.desktop
share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
+share/apps/konqsidebartng/kicker_entries/devices.desktop
share/apps/konqsidebartng/kicker_entries/history.desktop
share/apps/konqsidebartng/kicker_entries/home.desktop
share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -3787,8 +3788,6 @@ share/wallpapers/only_k.jpg
share/wallpapers/seaofconero.jpg
share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@@ -3806,16 +3805,7 @@ share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@dirrm share/wallpapers
@dirrm share/templates/.source/emptydir
-@dirrm share/templates/.source
-@dirrm share/templates
-@dirrm share/sounds
-@dirrm share/services/useragentstrings
-@dirrm share/services/searchproviders
@dirrm share/mimelnk/print
@dirrm share/mimelnk/kdedevice
@dirrm share/mimelnk/fonts
@@ -4046,20 +4036,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/locale/l10n/ad
@dirrm share/locale/l10n/C
@dirrm share/locale/l10n
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
@dirrm share/icons/crystalsvg/scalable/apps/gnome
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/fonts/override
-@dirrm share/fonts
@dirrm share/doc/kdm
@dirrm share/doc/HTML/en/kxkb
@dirrm share/doc/HTML/en/kwrite
@@ -4156,15 +4133,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/doc/HTML/en/kcontrol/bell
@dirrm share/doc/HTML/en/kcontrol/background
@dirrm share/doc/HTML/en/kcontrol/arts
-@dirrm share/doc/HTML/en/kcontrol
@dirrm share/doc/HTML/en/kate
@dirrm share/desktop-directories
-@dirrm share/config.kcfg
@dirrm share/apps/naughtyapplet/pics
@dirrm share/apps/naughtyapplet
@dirrm share/apps/kwrite
-@dirrm share/apps/kwin/pics
-@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/pics
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@@ -4179,7 +4152,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/ksmserver
@dirrm share/apps/kpersonalizer/pics
@dirrm share/apps/kpersonalizer
-@dirrm share/apps/konsole/profiles
@dirrm share/apps/konsole/icons/crystalsvg/32x32/actions
@dirrm share/apps/konsole/icons/crystalsvg/32x32
@dirrm share/apps/konsole/icons/crystalsvg/22x22/actions
@@ -4188,10 +4160,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konsole/icons/crystalsvg/16x16
@dirrm share/apps/konsole/icons/crystalsvg
@dirrm share/apps/konsole/icons
-@dirrm share/apps/konsole
@dirrm share/apps/konqueror/tiles
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror/profiles
@dirrm share/apps/konqueror/pics
@dirrm share/apps/konqueror/icons/crystalsvg/16x16/actions
@dirrm share/apps/konqueror/icons/crystalsvg/16x16
@@ -4200,18 +4169,8 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konqueror/dirtree/remote
@dirrm share/apps/konqueror/dirtree
@dirrm share/apps/konqueror/about
-@dirrm share/apps/konqueror
@dirrm share/apps/konqsidebartng/websidebar
-@dirrm share/apps/konqsidebartng/virtual_folders/services
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/web
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
-@dirrm share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/konqsidebartng/virtual_folders
@dirrm share/apps/konqsidebartng/kicker_entries
-@dirrm share/apps/konqsidebartng/entries
-@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/konqsidebartng/add
-@dirrm share/apps/konqsidebartng
@dirrm share/apps/konqlistview/kpartplugins
@dirrm share/apps/konqlistview
@dirrm share/apps/konqiconview/kpartplugins
@@ -4230,11 +4189,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kio_info
@dirrm share/apps/kio_finger
@dirrm share/apps/kinfocenter
-@dirrm share/apps/kicker/wallpapers
-@dirrm share/apps/kicker/tiles
-@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/menuext/find
-@dirrm share/apps/kicker/menuext
@dirrm share/apps/kicker/icons/locolor/16x16/actions
@dirrm share/apps/kicker/icons/locolor/16x16
@dirrm share/apps/kicker/icons/locolor
@@ -4242,16 +4197,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kicker/icons/crystalsvg/16x16
@dirrm share/apps/kicker/icons/crystalsvg
@dirrm share/apps/kicker/icons
-@dirrm share/apps/kicker/extensions
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
@dirrm share/apps/khotkeys
@dirrm share/apps/khelpcenter/plugins/Tutorials
@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
@dirrm share/apps/khelpcenter/plugins/Manpages
@dirrm share/apps/khelpcenter/plugins/Applications
-@dirrm share/apps/khelpcenter/plugins
-@dirrm share/apps/khelpcenter
@dirrm share/apps/kfontview
@dirrm share/apps/kfindpart/icons/locolor/22x22/actions
@dirrm share/apps/kfindpart/icons/locolor/22x22
@@ -4268,11 +4218,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
-@dirrm share/apps/kdesktop/programs
-@dirrm share/apps/kdesktop/pics
-@dirrm share/apps/kdesktop/patterns
-@dirrm share/apps/kdesktop/DesktopLinks
-@dirrm share/apps/kdesktop
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16/actions
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16
@dirrm share/apps/kdeprintfax/icons/crystalsvg
@@ -4300,7 +4245,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kcminput
@dirrm share/apps/kcmcss
@dirrm share/apps/kbookmark
-@dirrm share/apps/kate/scripts
@dirrm share/apps/kate/plugins/katedefaultproject
@dirrm share/apps/kate/plugins
@dirrm share/apps/kate/icons/locolor/22x22/actions
@@ -4314,7 +4258,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kate/icons/crystalsvg/16x16
@dirrm share/apps/kate/icons/crystalsvg
@dirrm share/apps/kate/icons
-@dirrm share/apps/kate
@dirrm share/apps/kappfinder/apps/Utilities/XUtilities
@dirrm share/apps/kappfinder/apps/Utilities
@dirrm share/apps/kappfinder/apps/Toys
@@ -4342,19 +4285,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
@dirrm share/apps/clockapplet
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/Toys
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk/Settingsmenu
-@dirrm share/applnk/Settings/WebBrowsing
-@dirrm share/applnk/Settings/LookNFeel/Themes
-@dirrm share/applnk/Settings/LookNFeel
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Internet
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
@dirrm lib/kconf_update_bin
@dirrm include/kwin
@dirrm include/ksplash
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index cfe6154d4b3c..a1ad17ecaaad 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.1.tar.bz2) = dd0d9707296f2be143c28a8be21b6e24
-SIZE (KDE/kdebase-3.3.1.tar.bz2) = 19906317
+MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
+SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
diff --git a/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c
index c845a8cbf236..4a3ac236fe1d 100644
--- a/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
-+++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Nov 28 18:26:14 2004
++++ kdm/kfrontend/genkdmconf.c Thu Dec 2 00:41:46 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,12 +20,14 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -668,7 +668,7 @@
+@@ -667,7 +667,9 @@
+ " */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\n"
- " set -a\n"
--" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n"
+-" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n"
++" set -a\n"
+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; printenv | egrep -v \"^(TERM|SHLVL)=\"'`\n"
- " set +a\n"
++" set +a\n"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
+ " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kdebase4/files/patch-konsole-konsole-konsole.cpp b/x11/kdebase4/files/patch-konsole-konsole-konsole.cpp
new file mode 100644
index 000000000000..553c411983a7
--- /dev/null
+++ b/x11/kdebase4/files/patch-konsole-konsole-konsole.cpp
@@ -0,0 +1,30 @@
+--- konsole/konsole/konsole.cpp 16 Nov 2004 16:46:00 -0000 1.472.2.6
++++ konsole/konsole/konsole.cpp 1 Dec 2004 17:05:30 -0000 1.472.2.7
+@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
+ createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
+ setSchema(s->schemaNo());
+ tabwidget->setCurrentPage(tabwidget->count()-1);
+- disableMasterModeConnections(); // no duplicate connections, remove old
+- enableMasterModeConnections();
+- }
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ disableMasterModeConnections(); // no duplicate connections, remove old
++ enableMasterModeConnections();
++ if(m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ }
+ }
+
+ QString Konsole::currentSession()
+@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
+ rootxpms.remove(s->widget());
+ }
+ delete s->widget();
+- if( tabwidget )
+- m_removeSessionButton->setEnabled(tabwidget->count()>1);
++ if (m_removeSessionButton)
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
+ }
+ session2action.remove(s);
+ action2session.remove(ra);
diff --git a/x11/kdebase4/files/patch-kxkb_rules.cpp b/x11/kdebase4/files/patch-kxkb_rules.cpp
deleted file mode 100644
index 00122a2b9898..000000000000
--- a/x11/kdebase4/files/patch-kxkb_rules.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- kxkb/rules.cpp 2004/06/28 14:19:03 1.38
-+++ kxkb/rules.cpp 2004/10/10 22:59:59 1.38.2.1
-@@ -1,3 +1,4 @@
-+#include <qwindowdefs.h>
- #include <qfile.h>
- #include <qtextstream.h>
- #include <qregexp.h>
-@@ -42,11 +43,19 @@ KeyRules::KeyRules():
- }
-
- QString rulesFile;
-- for(int ii=0; ii<2; ii++)
-+ Display *dpy = qt_xdisplay();
-+ XkbRF_VarDefsRec vd;
-+ char *tmp= NULL;
-+ if (XkbRF_GetNamesProp(dpy,&tmp,&vd) && tmp)
-+ rulesFile = X11_DIR + QString("xkb/rules/%1").arg(tmp);
-+ else {
-+ // old way
-+ for(int ii=0; ii<2; ii++)
- if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) {
- rulesFile = X11_DIR + rulesFileList[ii];
- break;
- }
-+ }
-
- if( rulesFile.isEmpty() ) {
- kdDebug() << "Cannot find rules file in " << X11_DIR << endl;
diff --git a/x11/kdebase4/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kdebase4/files/patch-post-3.3.2-kdebase-htmlframes2
new file mode 100644
index 000000000000..f31b6341cf9c
--- /dev/null
+++ b/x11/kdebase4/files/patch-post-3.3.2-kdebase-htmlframes2
@@ -0,0 +1,39 @@
+Index: konq_mainwindow.cc
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
+retrieving revision 1.1342.2.14
+diff -u -p -r1.1342.2.14 konq_mainwindow.cc
+--- konqueror/konq_mainwindow.cc 24 Nov 2004 18:29:51 -0000 1.1342.2.14
++++ konqueror/konq_mainwindow.cc 12 Dec 2004 15:54:46 -0000
+@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
+ QString viewName = view->viewName();
+ kdDebug() << " - viewName=" << viewName << " "
+ << "frame names:" << view->frameNames().join( "," ) << endl;
++
++ // First look for a hostextension containing this frame name
++ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
++ if ( ext )
++ {
++ ext = ext->findFrameParent(callingPart, name);
++ kdDebug() << "BrowserHostExtension found part " << ext << endl;
++ if (!ext)
++ continue; // Don't use this window
++ }
++
+ if ( !viewName.isEmpty() && viewName == name )
+ {
+ kdDebug() << "found existing view by name: " << view << endl;
+@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
+ return view;
+ }
+
+- // First look for a hostextension containing this frame name
+- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
+- if ( ext )
+- {
+- ext = ext->findFrameParent(callingPart, name);
+- }
+-
+ // KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
+
+ if ( ext )
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index 0c34371113ce..61e591e3cd68 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -1423,6 +1423,7 @@ share/apps/konqsidebartng/entries/remote.desktop
share/apps/konqsidebartng/entries/root.desktop
share/apps/konqsidebartng/entries/services.desktop
share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
+share/apps/konqsidebartng/kicker_entries/devices.desktop
share/apps/konqsidebartng/kicker_entries/history.desktop
share/apps/konqsidebartng/kicker_entries/home.desktop
share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -3787,8 +3788,6 @@ share/wallpapers/only_k.jpg
share/wallpapers/seaofconero.jpg
share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@@ -3806,16 +3805,7 @@ share/wallpapers/triplegears.jpg
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@dirrm share/wallpapers
@dirrm share/templates/.source/emptydir
-@dirrm share/templates/.source
-@dirrm share/templates
-@dirrm share/sounds
-@dirrm share/services/useragentstrings
-@dirrm share/services/searchproviders
@dirrm share/mimelnk/print
@dirrm share/mimelnk/kdedevice
@dirrm share/mimelnk/fonts
@@ -4046,20 +4036,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/locale/l10n/ad
@dirrm share/locale/l10n/C
@dirrm share/locale/l10n
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
@dirrm share/icons/crystalsvg/scalable/apps/gnome
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/fonts/override
-@dirrm share/fonts
@dirrm share/doc/kdm
@dirrm share/doc/HTML/en/kxkb
@dirrm share/doc/HTML/en/kwrite
@@ -4156,15 +4133,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/doc/HTML/en/kcontrol/bell
@dirrm share/doc/HTML/en/kcontrol/background
@dirrm share/doc/HTML/en/kcontrol/arts
-@dirrm share/doc/HTML/en/kcontrol
@dirrm share/doc/HTML/en/kate
@dirrm share/desktop-directories
-@dirrm share/config.kcfg
@dirrm share/apps/naughtyapplet/pics
@dirrm share/apps/naughtyapplet
@dirrm share/apps/kwrite
-@dirrm share/apps/kwin/pics
-@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/pics
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@@ -4179,7 +4152,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/ksmserver
@dirrm share/apps/kpersonalizer/pics
@dirrm share/apps/kpersonalizer
-@dirrm share/apps/konsole/profiles
@dirrm share/apps/konsole/icons/crystalsvg/32x32/actions
@dirrm share/apps/konsole/icons/crystalsvg/32x32
@dirrm share/apps/konsole/icons/crystalsvg/22x22/actions
@@ -4188,10 +4160,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konsole/icons/crystalsvg/16x16
@dirrm share/apps/konsole/icons/crystalsvg
@dirrm share/apps/konsole/icons
-@dirrm share/apps/konsole
@dirrm share/apps/konqueror/tiles
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror/profiles
@dirrm share/apps/konqueror/pics
@dirrm share/apps/konqueror/icons/crystalsvg/16x16/actions
@dirrm share/apps/konqueror/icons/crystalsvg/16x16
@@ -4200,18 +4169,8 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/konqueror/dirtree/remote
@dirrm share/apps/konqueror/dirtree
@dirrm share/apps/konqueror/about
-@dirrm share/apps/konqueror
@dirrm share/apps/konqsidebartng/websidebar
-@dirrm share/apps/konqsidebartng/virtual_folders/services
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/web
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
-@dirrm share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/konqsidebartng/virtual_folders
@dirrm share/apps/konqsidebartng/kicker_entries
-@dirrm share/apps/konqsidebartng/entries
-@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/konqsidebartng/add
-@dirrm share/apps/konqsidebartng
@dirrm share/apps/konqlistview/kpartplugins
@dirrm share/apps/konqlistview
@dirrm share/apps/konqiconview/kpartplugins
@@ -4230,11 +4189,7 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kio_info
@dirrm share/apps/kio_finger
@dirrm share/apps/kinfocenter
-@dirrm share/apps/kicker/wallpapers
-@dirrm share/apps/kicker/tiles
-@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/menuext/find
-@dirrm share/apps/kicker/menuext
@dirrm share/apps/kicker/icons/locolor/16x16/actions
@dirrm share/apps/kicker/icons/locolor/16x16
@dirrm share/apps/kicker/icons/locolor
@@ -4242,16 +4197,11 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kicker/icons/crystalsvg/16x16
@dirrm share/apps/kicker/icons/crystalsvg
@dirrm share/apps/kicker/icons
-@dirrm share/apps/kicker/extensions
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
@dirrm share/apps/khotkeys
@dirrm share/apps/khelpcenter/plugins/Tutorials
@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
@dirrm share/apps/khelpcenter/plugins/Manpages
@dirrm share/apps/khelpcenter/plugins/Applications
-@dirrm share/apps/khelpcenter/plugins
-@dirrm share/apps/khelpcenter
@dirrm share/apps/kfontview
@dirrm share/apps/kfindpart/icons/locolor/22x22/actions
@dirrm share/apps/kfindpart/icons/locolor/22x22
@@ -4268,11 +4218,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
-@dirrm share/apps/kdesktop/programs
-@dirrm share/apps/kdesktop/pics
-@dirrm share/apps/kdesktop/patterns
-@dirrm share/apps/kdesktop/DesktopLinks
-@dirrm share/apps/kdesktop
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16/actions
@dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16
@dirrm share/apps/kdeprintfax/icons/crystalsvg
@@ -4300,7 +4245,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kcminput
@dirrm share/apps/kcmcss
@dirrm share/apps/kbookmark
-@dirrm share/apps/kate/scripts
@dirrm share/apps/kate/plugins/katedefaultproject
@dirrm share/apps/kate/plugins
@dirrm share/apps/kate/icons/locolor/22x22/actions
@@ -4314,7 +4258,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/kate/icons/crystalsvg/16x16
@dirrm share/apps/kate/icons/crystalsvg
@dirrm share/apps/kate/icons
-@dirrm share/apps/kate
@dirrm share/apps/kappfinder/apps/Utilities/XUtilities
@dirrm share/apps/kappfinder/apps/Utilities
@dirrm share/apps/kappfinder/apps/Toys
@@ -4342,19 +4285,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
@dirrm share/apps/clockapplet
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/Toys
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk/Settingsmenu
-@dirrm share/applnk/Settings/WebBrowsing
-@dirrm share/applnk/Settings/LookNFeel/Themes
-@dirrm share/applnk/Settings/LookNFeel
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Internet
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
@dirrm lib/kconf_update_bin
@dirrm include/kwin
@dirrm include/ksplash
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index cb961a1bc689..0b3c020709d8 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -16,8 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Base set of libraries needed by KDE programs
-CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* kdepim-3.2.*
-
+DEPENDS= ${PORTSDIR}/misc/kdehier
BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
@@ -34,6 +33,8 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \
${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
+CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* kdepim-3.2.*
+
USE_GETTEXT= yes
USE_QT_VER= 3
PREFIX= ${KDE_PREFIX}
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index c9ecbadac7db..d33e461816d8 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdelibs-3.3.1.tar.bz2) = 8636c93405b20eceadb12af5c5483508
-SIZE (KDE/kdelibs-3.3.1.tar.bz2) = 15573765
+MD5 (KDE/kdelibs-3.3.2.tar.bz2) = 0473fb4c6c2cd2bc0f267cfa201f3fd8
+SIZE (KDE/kdelibs-3.3.2.tar.bz2) = 15623180
diff --git a/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-htmlframes2 b/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-htmlframes2
new file mode 100644
index 000000000000..0ff5af8fe26b
--- /dev/null
+++ b/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-htmlframes2
@@ -0,0 +1,26 @@
+Index: khtml_part.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
+retrieving revision 1.1015.2.12
+diff -u -p -r1.1015.2.12 khtml_part.cpp
+--- khtml/khtml_part.cpp 17 Nov 2004 13:46:56 -0000 1.1015.2.12
++++ khtml/khtml_part.cpp 12 Dec 2004 15:55:30 -0000
+@@ -4758,7 +4758,7 @@ KHTMLPart *
+ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
+ {
+ #ifdef DEBUG_FINDFRAME
+- kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
++ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
+ #endif
+ // Check access
+ KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
+@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read
+ if (!checkFrameAccess(callingHtmlPart))
+ return 0;
+
++ if (!childFrame && !parentPart() && (name() == f))
++ return this;
++
+ FrameIt it = d->m_frames.find( f );
+ const FrameIt end = d->m_frames.end();
+ if ( it != end )
diff --git a/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-kio.diff b/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-kio.diff
new file mode 100644
index 000000000000..674ba009495b
--- /dev/null
+++ b/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-kio.diff
@@ -0,0 +1,21 @@
+--- kio/kio/job.cpp 9 Nov 2004 00:50:35 -0000 1.397.2.5
++++ kio/kio/job.cpp 8 Dec 2004 01:08:15 -0000 1.397.2.8
+@@ -3119,14 +3119,14 @@ void CopyJob::copyNextFile()
+ if ( f.open( IO_ReadWrite ) )
+ {
+ f.close();
+ KSimpleConfig config( path );
+ config.setDesktopGroup();
+- config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() );
+- KURL urlName = (*it).uSource;
+- urlName.setPass( "" );
+- config.writeEntry( QString::fromLatin1("Name"), urlName.url() );
++ KURL url = (*it).uSource;
++ url.setPass( "" );
++ config.writePathEntry( QString::fromLatin1("URL"), url.url() );
++ config.writeEntry( QString::fromLatin1("Name"), url.url() );
+ config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") );
+ QString protocol = (*it).uSource.protocol();
+ if ( protocol == QString::fromLatin1("ftp") )
+ config.writeEntry( QString::fromLatin1("Icon"), QString::fromLatin1("ftp") );
+ else if ( protocol == QString::fromLatin1("http") )
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 8dd742a2082c..ee959342fd7b 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -383,6 +383,7 @@ include/kio/tcpslavebase.h
include/kio/thumbcreator.h
include/kio/uiserver.h
include/kio/uiserver_stub.h
+include/kiobuffer.h
include/kipc.h
include/kjanuswidget.h
include/kjs/completion.h
@@ -681,6 +682,7 @@ include/kuser.h
include/kuserprofile.h
include/kvmallocator.h
include/kwallet.h
+include/kwallettypes.h
include/kwin.h
include/kwindowinfo.h
include/kwindowlistmenu.h
@@ -1001,7 +1003,7 @@ share/apps/dcopidlng/kdocLib.pm
share/apps/dcopidlng/kdocParseDoc.pm
share/apps/dcopidlng/kdocUtil.pm
share/apps/kabc/countrytransl.map
-share/apps/kabc/formats/binary.desktop
+share/apps/kabc/formats/binary.desktop/binary.desktop
share/apps/katepart/katepartreadonlyui.rc
share/apps/katepart/katepartui.rc
share/apps/katepart/syntax/ada.xml
@@ -1372,6 +1374,7 @@ share/apps/ksgmltools2/customization/cs/entities/underArtisticLicense.docbook
share/apps/ksgmltools2/customization/cs/entities/underBSDLicense.docbook
share/apps/ksgmltools2/customization/cs/entities/underFDL.docbook
share/apps/ksgmltools2/customization/cs/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
share/apps/ksgmltools2/customization/cs/entities/underX11License.docbook
share/apps/ksgmltools2/customization/cs/entities/update-doc.docbook
share/apps/ksgmltools2/customization/cs/lang.entities
@@ -4294,6 +4297,7 @@ share/locale/all_languages
share/mimelnk/all/all.desktop
share/mimelnk/all/allfiles.desktop
share/mimelnk/application/illustrator.desktop
+share/mimelnk/application/java.desktop
share/mimelnk/application/mathml+xml.desktop
share/mimelnk/application/msexcel.desktop
share/mimelnk/application/mspowerpoint.desktop
@@ -4444,6 +4448,7 @@ share/mimelnk/application/x-zerosize.desktop
share/mimelnk/application/x-zip.desktop
share/mimelnk/application/x-zoo.desktop
share/mimelnk/application/xhtml+xml.desktop
+share/mimelnk/application/xml.desktop
share/mimelnk/audio/aac.desktop
share/mimelnk/audio/ac3.desktop
share/mimelnk/audio/basic.desktop
@@ -4659,14 +4664,6 @@ share/servicetypes/kurifilterplugin.desktop
share/servicetypes/renamedlgplugin.desktop
share/servicetypes/scriptinterface.desktop
@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
@@ -4725,105 +4722,12 @@ share/servicetypes/scriptinterface.desktop
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
-@dirrm share/servicetypes
@dirrm share/services/kresources/kabc
@dirrm share/services/kresources
@dirrm share/services/kded
-@dirrm share/services
-@dirrm share/mimelnk/video
-@dirrm share/mimelnk/text
-@dirrm share/mimelnk/multipart
-@dirrm share/mimelnk/model
-@dirrm share/mimelnk/message
-@dirrm share/mimelnk/inode
-@dirrm share/mimelnk/image
-@dirrm share/mimelnk/audio
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk/all
-@dirrm share/mimelnk
-@dirrm share/icons/hicolor
@dirrm share/icons/crystalsvg/scalable/mimetypes
-@dirrm share/icons/crystalsvg/scalable/filesystems
-@dirrm share/icons/crystalsvg/scalable/devices
-@dirrm share/icons/crystalsvg/scalable/actions
-@dirrm share/icons/crystalsvg/scalable
-@dirrm share/icons/crystalsvg/64x64/mimetypes
-@dirrm share/icons/crystalsvg/64x64/filesystems
-@dirrm share/icons/crystalsvg/64x64/devices
-@dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/64x64/actions
-@dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/mimetypes
-@dirrm share/icons/crystalsvg/48x48/filesystems
-@dirrm share/icons/crystalsvg/48x48/devices
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48/actions
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/mimetypes
-@dirrm share/icons/crystalsvg/32x32/filesystems
-@dirrm share/icons/crystalsvg/32x32/devices
-@dirrm share/icons/crystalsvg/32x32/apps
@dirrm share/icons/crystalsvg/32x32/actions/kde
-@dirrm share/icons/crystalsvg/32x32/actions
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/mimetypes
-@dirrm share/icons/crystalsvg/22x22/filesystems
-@dirrm share/icons/crystalsvg/22x22/devices
@dirrm share/icons/crystalsvg/22x22/actions/kde
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/mimetypes
-@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/mimetypes
-@dirrm share/icons/crystalsvg/128x128/filesystems
-@dirrm share/icons/crystalsvg/128x128/devices
-@dirrm share/icons/crystalsvg/128x128/apps
-@dirrm share/icons/crystalsvg/128x128/actions
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid/html
@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
@dirrm share/doc/HTML/en/kdelibs-apidocs/kwallet/html
@@ -4864,8 +4768,6 @@ share/servicetypes/scriptinterface.desktop
@dirrm share/doc/HTML/en/kdelibs-apidocs/arts
@dirrm share/doc/HTML/en/kdelibs-apidocs
@dirrm share/doc/HTML/en/common
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
@dirrm share/config/ui
@dirrm share/config/colors
@dirrm share/config
@@ -5032,17 +4934,12 @@ share/servicetypes/scriptinterface.desktop
@dirrm share/apps/kcertpart
@dirrm share/apps/katepart/syntax
@dirrm share/apps/katepart
-@dirrm share/apps/kabc/formats
-@dirrm share/apps/kabc
@dirrm share/apps/dcopidlng
@dirrm share/apps/LICENSES
-@dirrm share/apps
@dirrm share/applications/kde
-@dirrm share/applications
@dirrm lib/kde3/plugins/styles
@dirrm lib/kde3/plugins/designer
@dirrm lib/kde3/plugins
-@dirrm lib/kde3
@dirrm include/libkmid
@dirrm include/ktexteditor
@dirrm include/kspell2
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index cb961a1bc689..0b3c020709d8 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -16,8 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Base set of libraries needed by KDE programs
-CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* kdepim-3.2.*
-
+DEPENDS= ${PORTSDIR}/misc/kdehier
BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
@@ -34,6 +33,8 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \
${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
+CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* kdepim-3.2.*
+
USE_GETTEXT= yes
USE_QT_VER= 3
PREFIX= ${KDE_PREFIX}
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index c9ecbadac7db..d33e461816d8 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdelibs-3.3.1.tar.bz2) = 8636c93405b20eceadb12af5c5483508
-SIZE (KDE/kdelibs-3.3.1.tar.bz2) = 15573765
+MD5 (KDE/kdelibs-3.3.2.tar.bz2) = 0473fb4c6c2cd2bc0f267cfa201f3fd8
+SIZE (KDE/kdelibs-3.3.2.tar.bz2) = 15623180
diff --git a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2 b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2
new file mode 100644
index 000000000000..0ff5af8fe26b
--- /dev/null
+++ b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2
@@ -0,0 +1,26 @@
+Index: khtml_part.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
+retrieving revision 1.1015.2.12
+diff -u -p -r1.1015.2.12 khtml_part.cpp
+--- khtml/khtml_part.cpp 17 Nov 2004 13:46:56 -0000 1.1015.2.12
++++ khtml/khtml_part.cpp 12 Dec 2004 15:55:30 -0000
+@@ -4758,7 +4758,7 @@ KHTMLPart *
+ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
+ {
+ #ifdef DEBUG_FINDFRAME
+- kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
++ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
+ #endif
+ // Check access
+ KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
+@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read
+ if (!checkFrameAccess(callingHtmlPart))
+ return 0;
+
++ if (!childFrame && !parentPart() && (name() == f))
++ return this;
++
+ FrameIt it = d->m_frames.find( f );
+ const FrameIt end = d->m_frames.end();
+ if ( it != end )
diff --git a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff
new file mode 100644
index 000000000000..674ba009495b
--- /dev/null
+++ b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff
@@ -0,0 +1,21 @@
+--- kio/kio/job.cpp 9 Nov 2004 00:50:35 -0000 1.397.2.5
++++ kio/kio/job.cpp 8 Dec 2004 01:08:15 -0000 1.397.2.8
+@@ -3119,14 +3119,14 @@ void CopyJob::copyNextFile()
+ if ( f.open( IO_ReadWrite ) )
+ {
+ f.close();
+ KSimpleConfig config( path );
+ config.setDesktopGroup();
+- config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() );
+- KURL urlName = (*it).uSource;
+- urlName.setPass( "" );
+- config.writeEntry( QString::fromLatin1("Name"), urlName.url() );
++ KURL url = (*it).uSource;
++ url.setPass( "" );
++ config.writePathEntry( QString::fromLatin1("URL"), url.url() );
++ config.writeEntry( QString::fromLatin1("Name"), url.url() );
+ config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") );
+ QString protocol = (*it).uSource.protocol();
+ if ( protocol == QString::fromLatin1("ftp") )
+ config.writeEntry( QString::fromLatin1("Icon"), QString::fromLatin1("ftp") );
+ else if ( protocol == QString::fromLatin1("http") )
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 8dd742a2082c..ee959342fd7b 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -383,6 +383,7 @@ include/kio/tcpslavebase.h
include/kio/thumbcreator.h
include/kio/uiserver.h
include/kio/uiserver_stub.h
+include/kiobuffer.h
include/kipc.h
include/kjanuswidget.h
include/kjs/completion.h
@@ -681,6 +682,7 @@ include/kuser.h
include/kuserprofile.h
include/kvmallocator.h
include/kwallet.h
+include/kwallettypes.h
include/kwin.h
include/kwindowinfo.h
include/kwindowlistmenu.h
@@ -1001,7 +1003,7 @@ share/apps/dcopidlng/kdocLib.pm
share/apps/dcopidlng/kdocParseDoc.pm
share/apps/dcopidlng/kdocUtil.pm
share/apps/kabc/countrytransl.map
-share/apps/kabc/formats/binary.desktop
+share/apps/kabc/formats/binary.desktop/binary.desktop
share/apps/katepart/katepartreadonlyui.rc
share/apps/katepart/katepartui.rc
share/apps/katepart/syntax/ada.xml
@@ -1372,6 +1374,7 @@ share/apps/ksgmltools2/customization/cs/entities/underArtisticLicense.docbook
share/apps/ksgmltools2/customization/cs/entities/underBSDLicense.docbook
share/apps/ksgmltools2/customization/cs/entities/underFDL.docbook
share/apps/ksgmltools2/customization/cs/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
share/apps/ksgmltools2/customization/cs/entities/underX11License.docbook
share/apps/ksgmltools2/customization/cs/entities/update-doc.docbook
share/apps/ksgmltools2/customization/cs/lang.entities
@@ -4294,6 +4297,7 @@ share/locale/all_languages
share/mimelnk/all/all.desktop
share/mimelnk/all/allfiles.desktop
share/mimelnk/application/illustrator.desktop
+share/mimelnk/application/java.desktop
share/mimelnk/application/mathml+xml.desktop
share/mimelnk/application/msexcel.desktop
share/mimelnk/application/mspowerpoint.desktop
@@ -4444,6 +4448,7 @@ share/mimelnk/application/x-zerosize.desktop
share/mimelnk/application/x-zip.desktop
share/mimelnk/application/x-zoo.desktop
share/mimelnk/application/xhtml+xml.desktop
+share/mimelnk/application/xml.desktop
share/mimelnk/audio/aac.desktop
share/mimelnk/audio/ac3.desktop
share/mimelnk/audio/basic.desktop
@@ -4659,14 +4664,6 @@ share/servicetypes/kurifilterplugin.desktop
share/servicetypes/renamedlgplugin.desktop
share/servicetypes/scriptinterface.desktop
@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
@@ -4725,105 +4722,12 @@ share/servicetypes/scriptinterface.desktop
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
-@dirrm share/servicetypes
@dirrm share/services/kresources/kabc
@dirrm share/services/kresources
@dirrm share/services/kded
-@dirrm share/services
-@dirrm share/mimelnk/video
-@dirrm share/mimelnk/text
-@dirrm share/mimelnk/multipart
-@dirrm share/mimelnk/model
-@dirrm share/mimelnk/message
-@dirrm share/mimelnk/inode
-@dirrm share/mimelnk/image
-@dirrm share/mimelnk/audio
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk/all
-@dirrm share/mimelnk
-@dirrm share/icons/hicolor
@dirrm share/icons/crystalsvg/scalable/mimetypes
-@dirrm share/icons/crystalsvg/scalable/filesystems
-@dirrm share/icons/crystalsvg/scalable/devices
-@dirrm share/icons/crystalsvg/scalable/actions
-@dirrm share/icons/crystalsvg/scalable
-@dirrm share/icons/crystalsvg/64x64/mimetypes
-@dirrm share/icons/crystalsvg/64x64/filesystems
-@dirrm share/icons/crystalsvg/64x64/devices
-@dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/64x64/actions
-@dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/mimetypes
-@dirrm share/icons/crystalsvg/48x48/filesystems
-@dirrm share/icons/crystalsvg/48x48/devices
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48/actions
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/mimetypes
-@dirrm share/icons/crystalsvg/32x32/filesystems
-@dirrm share/icons/crystalsvg/32x32/devices
-@dirrm share/icons/crystalsvg/32x32/apps
@dirrm share/icons/crystalsvg/32x32/actions/kde
-@dirrm share/icons/crystalsvg/32x32/actions
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/mimetypes
-@dirrm share/icons/crystalsvg/22x22/filesystems
-@dirrm share/icons/crystalsvg/22x22/devices
@dirrm share/icons/crystalsvg/22x22/actions/kde
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/mimetypes
-@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/mimetypes
-@dirrm share/icons/crystalsvg/128x128/filesystems
-@dirrm share/icons/crystalsvg/128x128/devices
-@dirrm share/icons/crystalsvg/128x128/apps
-@dirrm share/icons/crystalsvg/128x128/actions
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid/html
@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
@dirrm share/doc/HTML/en/kdelibs-apidocs/kwallet/html
@@ -4864,8 +4768,6 @@ share/servicetypes/scriptinterface.desktop
@dirrm share/doc/HTML/en/kdelibs-apidocs/arts
@dirrm share/doc/HTML/en/kdelibs-apidocs
@dirrm share/doc/HTML/en/common
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
@dirrm share/config/ui
@dirrm share/config/colors
@dirrm share/config
@@ -5032,17 +4934,12 @@ share/servicetypes/scriptinterface.desktop
@dirrm share/apps/kcertpart
@dirrm share/apps/katepart/syntax
@dirrm share/apps/katepart
-@dirrm share/apps/kabc/formats
-@dirrm share/apps/kabc
@dirrm share/apps/dcopidlng
@dirrm share/apps/LICENSES
-@dirrm share/apps
@dirrm share/applications/kde
-@dirrm share/applications
@dirrm lib/kde3/plugins/styles
@dirrm lib/kde3/plugins/designer
@dirrm lib/kde3/plugins
-@dirrm lib/kde3
@dirrm include/libkmid
@dirrm include/ktexteditor
@dirrm include/kspell2
diff --git a/x11/xscreensaver-kde/distinfo b/x11/xscreensaver-kde/distinfo
index f5f864c880dd..1ebe2fe83305 100644
--- a/x11/xscreensaver-kde/distinfo
+++ b/x11/xscreensaver-kde/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeartwork-3.3.1.tar.bz2) = b983255aabdc6aadb2b9f66145d5ecfb
-SIZE (KDE/kdeartwork-3.3.1.tar.bz2) = 17954826
+MD5 (KDE/kdeartwork-3.3.2.tar.bz2) = 9a712da253bacb87e0d4fd28cec183a1
+SIZE (KDE/kdeartwork-3.3.2.tar.bz2) = 17980598
diff --git a/x11/xscreensaver-kde/pkg-plist b/x11/xscreensaver-kde/pkg-plist
index 5856077b58d9..47fa9ed250da 100644
--- a/x11/xscreensaver-kde/pkg-plist
+++ b/x11/xscreensaver-kde/pkg-plist
@@ -184,6 +184,3 @@ share/applnk/System/ScreenSavers/xspirograph.desktop
share/applnk/System/ScreenSavers/xsublim.desktop
share/applnk/System/ScreenSavers/xteevee.desktop
share/applnk/System/ScreenSavers/zoom.desktop
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk