5 files changed, 37 insertions, 52 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 0f5311360e84..98ba5d9f658a 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index fb6fef9b3dd1..cc002b79e577 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdelibs-3.2.1.tar.bz2) = 50ae60072c1fc4ae4e41694bc2325dcb
-SIZE (KDE/kdelibs-3.2.1.tar.bz2) = 12597050
+MD5 (KDE/kdelibs-3.2.2.tar.bz2) = 76c656fb4ec7f1ca073f52fad2b8898b
+SIZE (KDE/kdelibs-3.2.2.tar.bz2) = 12716460
diff --git a/x11/kdelibs4/files/patch-kdecore-kcharsets.cpp b/x11/kdelibs4/files/patch-kdecore-kcharsets.cpp
deleted file mode 100644
index 231f234b211f..000000000000
--- a/x11/kdelibs4/files/patch-kdecore-kcharsets.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
---- kdecore/kcharsets.cpp	2003/09/06 19:06:29	1.144
-+++ kdecore/kcharsets.cpp	2004/03/12 09:18:03	1.144.2.1
-@@ -1,6 +1,6 @@
- /* This file is part of the KDE libraries
-     Copyright (C) 1999 Lars Knoll (knoll@kde.org)
--    $Id: kcharsets.cpp,v 1.144 2003/09/06 19:06:29 binner Exp $
-+    $Id: kcharsets.cpp,v 1.144.2.1 2004/03/12 09:18:03 kalass Exp $
- 
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Library General Public
-@@ -497,19 +497,19 @@ QString KCharsets::languageForEncoding( 
- 
- QString KCharsets::encodingForName( const QString &descriptiveName )
- {
--    const int left = descriptiveName.find( '(' );
-+    const int left = descriptiveName.findRev( '(' );
-     
-     if (left<0) // No parenthesis, so assume it is a normal encoding name
--	return descriptiveName;
-+	return descriptiveName.stripWhiteSpace();
-     
--    QString name(descriptiveName.mid(left+2));
-+    QString name(descriptiveName.mid(left+1));
-     
--    const int right = name.find( ')' );
-+    const int right = name.findRev( ')' );
-     
-     if (right<0) 
-         return name;
--	
--    return name.left(right-1);
-+
-+    return name.left(right).stripWhiteSpace();
- }
- 
- QStringList KCharsets::descriptiveEncodingNames()
\ No newline at end of file
diff --git a/x11/kdelibs4/files/patch-khtml-khtml_part.cpp b/x11/kdelibs4/files/patch-khtml-khtml_part.cpp
deleted file mode 100644
index be59d645ab9a..000000000000
--- a/x11/kdelibs4/files/patch-khtml-khtml_part.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- khtml/khtml_part.cpp.orig	Mon Mar  1 09:25:09 2004
-+++ khtml/khtml_part.cpp	Sat Mar 13 20:48:58 2004
-@@ -5395,7 +5395,7 @@
-       pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
-     }
- 
--    KURLDrag* urlDrag = new KURLDrag( u, 0 );
-+    KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );
-     if ( !d->m_referrer.isEmpty() )
-       urlDrag->metaData()["referrer"] = d->m_referrer;
- 
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index c307ba148107..2e9c0f13fe3c 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -1189,6 +1189,7 @@ share/apps/khtml/khtml_popupmenu.rc
 share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png
 share/apps/kjava/kjava.jar
 share/apps/kjava/kjava.policy
+share/apps/kjava/pluginsinfo
 share/apps/knotify/eventsrc
 share/apps/ksgmltools2/customization/README
 share/apps/ksgmltools2/customization/af/catalog
@@ -2501,7 +2502,9 @@ share/icons/crystalsvg/128x128/filesystems/folder.png
 share/icons/crystalsvg/128x128/filesystems/folder_crystal.png
 share/icons/crystalsvg/128x128/filesystems/folder_favorite.png
 share/icons/crystalsvg/128x128/filesystems/folder_green.png
+share/icons/crystalsvg/128x128/filesystems/folder_green_open.png
 share/icons/crystalsvg/128x128/filesystems/folder_grey.png
+share/icons/crystalsvg/128x128/filesystems/folder_grey_open.png
 share/icons/crystalsvg/128x128/filesystems/folder_home.png
 share/icons/crystalsvg/128x128/filesystems/folder_home2.png
 share/icons/crystalsvg/128x128/filesystems/folder_html.png
@@ -2510,6 +2513,8 @@ share/icons/crystalsvg/128x128/filesystems/folder_important.png
 share/icons/crystalsvg/128x128/filesystems/folder_locked.png
 share/icons/crystalsvg/128x128/filesystems/folder_man.png
 share/icons/crystalsvg/128x128/filesystems/folder_open.png
+share/icons/crystalsvg/128x128/filesystems/folder_orange.png
+share/icons/crystalsvg/128x128/filesystems/folder_orange_open.png
 share/icons/crystalsvg/128x128/filesystems/folder_print.png
 share/icons/crystalsvg/128x128/filesystems/folder_red.png
 share/icons/crystalsvg/128x128/filesystems/folder_red_open.png
@@ -2518,7 +2523,9 @@ share/icons/crystalsvg/128x128/filesystems/folder_tar.png
 share/icons/crystalsvg/128x128/filesystems/folder_txt.png
 share/icons/crystalsvg/128x128/filesystems/folder_video.png
 share/icons/crystalsvg/128x128/filesystems/folder_violet.png
+share/icons/crystalsvg/128x128/filesystems/folder_violet_open.png
 share/icons/crystalsvg/128x128/filesystems/folder_yellow.png
+share/icons/crystalsvg/128x128/filesystems/folder_yellow_open.png
 share/icons/crystalsvg/128x128/filesystems/lockoverlay.png
 share/icons/crystalsvg/128x128/filesystems/network.png
 share/icons/crystalsvg/128x128/filesystems/network_local.png
@@ -2840,11 +2847,14 @@ share/icons/crystalsvg/16x16/devices/zip_unmount.png
 share/icons/crystalsvg/16x16/filesystems/chardevice.png
 share/icons/crystalsvg/16x16/filesystems/desktop.png
 share/icons/crystalsvg/16x16/filesystems/exec.png
+share/icons/crystalsvg/16x16/filesystems/file_broken.png
 share/icons/crystalsvg/16x16/filesystems/folder.png
 share/icons/crystalsvg/16x16/filesystems/folder_crystal.png
 share/icons/crystalsvg/16x16/filesystems/folder_favorite.png
 share/icons/crystalsvg/16x16/filesystems/folder_green.png
+share/icons/crystalsvg/16x16/filesystems/folder_green_open.png
 share/icons/crystalsvg/16x16/filesystems/folder_grey.png
+share/icons/crystalsvg/16x16/filesystems/folder_grey_open.png
 share/icons/crystalsvg/16x16/filesystems/folder_home.png
 share/icons/crystalsvg/16x16/filesystems/folder_home2.png
 share/icons/crystalsvg/16x16/filesystems/folder_html.png
@@ -2854,6 +2864,8 @@ share/icons/crystalsvg/16x16/filesystems/folder_inbox.png
 share/icons/crystalsvg/16x16/filesystems/folder_locked.png
 share/icons/crystalsvg/16x16/filesystems/folder_man.png
 share/icons/crystalsvg/16x16/filesystems/folder_open.png
+share/icons/crystalsvg/16x16/filesystems/folder_orange.png
+share/icons/crystalsvg/16x16/filesystems/folder_orange_open.png
 share/icons/crystalsvg/16x16/filesystems/folder_outbox.png
 share/icons/crystalsvg/16x16/filesystems/folder_print.png
 share/icons/crystalsvg/16x16/filesystems/folder_red.png
@@ -2864,7 +2876,9 @@ share/icons/crystalsvg/16x16/filesystems/folder_tar.png
 share/icons/crystalsvg/16x16/filesystems/folder_txt.png
 share/icons/crystalsvg/16x16/filesystems/folder_video.png
 share/icons/crystalsvg/16x16/filesystems/folder_violet.png
+share/icons/crystalsvg/16x16/filesystems/folder_violet_open.png
 share/icons/crystalsvg/16x16/filesystems/folder_yellow.png
+share/icons/crystalsvg/16x16/filesystems/folder_yellow_open.png
 share/icons/crystalsvg/16x16/filesystems/link.png
 share/icons/crystalsvg/16x16/filesystems/lockoverlay.png
 share/icons/crystalsvg/16x16/filesystems/network.png
@@ -3481,11 +3495,14 @@ share/icons/crystalsvg/32x32/devices/zip_unmount.png
 share/icons/crystalsvg/32x32/filesystems/chardevice.png
 share/icons/crystalsvg/32x32/filesystems/desktop.png
 share/icons/crystalsvg/32x32/filesystems/exec.png
+share/icons/crystalsvg/32x32/filesystems/file_broken.png
 share/icons/crystalsvg/32x32/filesystems/folder.png
 share/icons/crystalsvg/32x32/filesystems/folder_crystal.png
 share/icons/crystalsvg/32x32/filesystems/folder_favorite.png
 share/icons/crystalsvg/32x32/filesystems/folder_green.png
+share/icons/crystalsvg/32x32/filesystems/folder_green_open.png
 share/icons/crystalsvg/32x32/filesystems/folder_grey.png
+share/icons/crystalsvg/32x32/filesystems/folder_grey_open.png
 share/icons/crystalsvg/32x32/filesystems/folder_home.png
 share/icons/crystalsvg/32x32/filesystems/folder_home2.png
 share/icons/crystalsvg/32x32/filesystems/folder_html.png
@@ -3494,6 +3511,8 @@ share/icons/crystalsvg/32x32/filesystems/folder_important.png
 share/icons/crystalsvg/32x32/filesystems/folder_locked.png
 share/icons/crystalsvg/32x32/filesystems/folder_man.png
 share/icons/crystalsvg/32x32/filesystems/folder_open.png
+share/icons/crystalsvg/32x32/filesystems/folder_orange.png
+share/icons/crystalsvg/32x32/filesystems/folder_orange_open.png
 share/icons/crystalsvg/32x32/filesystems/folder_print.png
 share/icons/crystalsvg/32x32/filesystems/folder_red.png
 share/icons/crystalsvg/32x32/filesystems/folder_red_open.png
@@ -3502,7 +3521,9 @@ share/icons/crystalsvg/32x32/filesystems/folder_tar.png
 share/icons/crystalsvg/32x32/filesystems/folder_txt.png
 share/icons/crystalsvg/32x32/filesystems/folder_video.png
 share/icons/crystalsvg/32x32/filesystems/folder_violet.png
+share/icons/crystalsvg/32x32/filesystems/folder_violet_open.png
 share/icons/crystalsvg/32x32/filesystems/folder_yellow.png
+share/icons/crystalsvg/32x32/filesystems/folder_yellow_open.png
 share/icons/crystalsvg/32x32/filesystems/link.png
 share/icons/crystalsvg/32x32/filesystems/lockoverlay.png
 share/icons/crystalsvg/32x32/filesystems/network.png
@@ -3644,11 +3665,14 @@ share/icons/crystalsvg/48x48/devices/zip_unmount.png
 share/icons/crystalsvg/48x48/filesystems/chardevice.png
 share/icons/crystalsvg/48x48/filesystems/desktop.png
 share/icons/crystalsvg/48x48/filesystems/exec.png
+share/icons/crystalsvg/48x48/filesystems/file_broken.png
 share/icons/crystalsvg/48x48/filesystems/folder.png
 share/icons/crystalsvg/48x48/filesystems/folder_crystal.png
 share/icons/crystalsvg/48x48/filesystems/folder_favorite.png
 share/icons/crystalsvg/48x48/filesystems/folder_green.png
+share/icons/crystalsvg/48x48/filesystems/folder_green_open.png
 share/icons/crystalsvg/48x48/filesystems/folder_grey.png
+share/icons/crystalsvg/48x48/filesystems/folder_grey_open.png
 share/icons/crystalsvg/48x48/filesystems/folder_home.png
 share/icons/crystalsvg/48x48/filesystems/folder_home2.png
 share/icons/crystalsvg/48x48/filesystems/folder_html.png
@@ -3658,6 +3682,8 @@ share/icons/crystalsvg/48x48/filesystems/folder_inbox.png
 share/icons/crystalsvg/48x48/filesystems/folder_locked.png
 share/icons/crystalsvg/48x48/filesystems/folder_man.png
 share/icons/crystalsvg/48x48/filesystems/folder_open.png
+share/icons/crystalsvg/48x48/filesystems/folder_orange.png
+share/icons/crystalsvg/48x48/filesystems/folder_orange_open.png
 share/icons/crystalsvg/48x48/filesystems/folder_outbox.png
 share/icons/crystalsvg/48x48/filesystems/folder_print.png
 share/icons/crystalsvg/48x48/filesystems/folder_red.png
@@ -3667,7 +3693,9 @@ share/icons/crystalsvg/48x48/filesystems/folder_tar.png
 share/icons/crystalsvg/48x48/filesystems/folder_txt.png
 share/icons/crystalsvg/48x48/filesystems/folder_video.png
 share/icons/crystalsvg/48x48/filesystems/folder_violet.png
+share/icons/crystalsvg/48x48/filesystems/folder_violet_open.png
 share/icons/crystalsvg/48x48/filesystems/folder_yellow.png
+share/icons/crystalsvg/48x48/filesystems/folder_yellow_open.png
 share/icons/crystalsvg/48x48/filesystems/link.png
 share/icons/crystalsvg/48x48/filesystems/lockoverlay.png
 share/icons/crystalsvg/48x48/filesystems/network.png
@@ -3801,11 +3829,14 @@ share/icons/crystalsvg/64x64/devices/zip_unmount.png
 share/icons/crystalsvg/64x64/filesystems/chardevice.png
 share/icons/crystalsvg/64x64/filesystems/desktop.png
 share/icons/crystalsvg/64x64/filesystems/exec.png
+share/icons/crystalsvg/64x64/filesystems/file_broken.png
 share/icons/crystalsvg/64x64/filesystems/folder.png
 share/icons/crystalsvg/64x64/filesystems/folder_crystal.png
 share/icons/crystalsvg/64x64/filesystems/folder_favorite.png
 share/icons/crystalsvg/64x64/filesystems/folder_green.png
+share/icons/crystalsvg/64x64/filesystems/folder_green_open.png
 share/icons/crystalsvg/64x64/filesystems/folder_grey.png
+share/icons/crystalsvg/64x64/filesystems/folder_grey_open.png
 share/icons/crystalsvg/64x64/filesystems/folder_home.png
 share/icons/crystalsvg/64x64/filesystems/folder_home2.png
 share/icons/crystalsvg/64x64/filesystems/folder_html.png
@@ -3814,6 +3845,8 @@ share/icons/crystalsvg/64x64/filesystems/folder_important.png
 share/icons/crystalsvg/64x64/filesystems/folder_locked.png
 share/icons/crystalsvg/64x64/filesystems/folder_man.png
 share/icons/crystalsvg/64x64/filesystems/folder_open.png
+share/icons/crystalsvg/64x64/filesystems/folder_orange.png
+share/icons/crystalsvg/64x64/filesystems/folder_orange_open.png
 share/icons/crystalsvg/64x64/filesystems/folder_print.png
 share/icons/crystalsvg/64x64/filesystems/folder_red.png
 share/icons/crystalsvg/64x64/filesystems/folder_red_open.png
@@ -3822,7 +3855,9 @@ share/icons/crystalsvg/64x64/filesystems/folder_tar.png
 share/icons/crystalsvg/64x64/filesystems/folder_txt.png
 share/icons/crystalsvg/64x64/filesystems/folder_video.png
 share/icons/crystalsvg/64x64/filesystems/folder_violet.png
+share/icons/crystalsvg/64x64/filesystems/folder_violet_open.png
 share/icons/crystalsvg/64x64/filesystems/folder_yellow.png
+share/icons/crystalsvg/64x64/filesystems/folder_yellow_open.png
 share/icons/crystalsvg/64x64/filesystems/lockoverlay.png
 share/icons/crystalsvg/64x64/filesystems/network.png
 share/icons/crystalsvg/64x64/filesystems/network_local.png
@@ -4140,11 +4175,9 @@ share/mimelnk/application/x-kontour.desktop
 share/mimelnk/application/x-kpovmodeler.desktop
 share/mimelnk/application/x-kpresenter.desktop
 share/mimelnk/application/x-krita.desktop
-share/mimelnk/application/x-kspread-crypt.desktop
 share/mimelnk/application/x-kspread.desktop
 share/mimelnk/application/x-kudesigner.desktop
 share/mimelnk/application/x-kugar.desktop
-share/mimelnk/application/x-kword-crypt.desktop
 share/mimelnk/application/x-kword.desktop
 share/mimelnk/application/x-lha.desktop
 share/mimelnk/application/x-linguist.desktop