11 files changed, 22 insertions, 14 deletions

diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index c54c6de2918f..a5c5ce5a8d18 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeutils-3.2.1.tar.bz2) = 152030a2912609997d73d7af0bb96d52
-SIZE (KDE/kdeutils-3.2.1.tar.bz2) = 2577558
+MD5 (KDE/kdeutils-3.2.2.tar.bz2) = 94eee311b04f91aa083d1f8a8620faca
+SIZE (KDE/kdeutils-3.2.2.tar.bz2) = 2549521
diff --git a/deskutils/kcharselect/files/patch-ark-tar.cpp b/deskutils/kcharselect/files/patch-ark-tar.cpp
new file mode 100644
index 000000000000..0c88c38fcd9e
--- /dev/null
+++ b/deskutils/kcharselect/files/patch-ark-tar.cpp
@@ -0,0 +1,11 @@
+--- ark/tar.cpp.orig	Thu Apr 15 21:48:14 2004
++++ ark/tar.cpp	Thu Apr 15 21:49:21 2004
+@@ -81,7 +81,7 @@
+ 
+     m_fileMimeType = _openAsMimeType;
+     if ( m_fileMimeType.isNull() )
+-        m_fileMimeType = KMimeType::findByFileContent( _filename )->name();
++        m_fileMimeType = KMimeType::findByPath( _filename )->name();
+ 
+     kdDebug(1601) << "TarArch::TarArch:  mimetype is " << m_fileMimeType << endl;
+ 
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index ec4efc1eb2eb..bd4b4717c39f 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index 37c9dede25a2..e203ea112b27 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdepim-3.2.1.tar.bz2) = 362bec23869328a85845e0501020c938
-SIZE (KDE/kdepim-3.2.1.tar.bz2) = 7754558
+MD5 (KDE/kdepim-3.2.2.tar.bz2) = 10249b56cbc4c67dc4093b9f968604b9
+SIZE (KDE/kdepim-3.2.2.tar.bz2) = 7721918
diff --git a/deskutils/kdepim3/files/plist.base b/deskutils/kdepim3/files/plist.base
index 8aac1ef9f35f..8791a68e0435 100644
--- a/deskutils/kdepim3/files/plist.base
+++ b/deskutils/kdepim3/files/plist.base
@@ -666,10 +666,10 @@ share/autostart/kalarm.tray.desktop
 share/autostart/kalarmd.autostart.desktop
 share/autostart/korgac.desktop
 share/config.kcfg/kandy.kcfg
+share/config.kcfg/knotes.kcfg
 share/config.kcfg/kontact.kcfg
 share/config.kcfg/korganizer.kcfg
 share/config/khotnewstuffrc
-share/config/knotesrc
 share/doc/HTML/en/kaddressbook/common
 share/doc/HTML/en/kaddressbook/conf.png
 share/doc/HTML/en/kaddressbook/contactdlg.png
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index ec4efc1eb2eb..bd4b4717c39f 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 37c9dede25a2..e203ea112b27 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdepim-3.2.1.tar.bz2) = 362bec23869328a85845e0501020c938
-SIZE (KDE/kdepim-3.2.1.tar.bz2) = 7754558
+MD5 (KDE/kdepim-3.2.2.tar.bz2) = 10249b56cbc4c67dc4093b9f968604b9
+SIZE (KDE/kdepim-3.2.2.tar.bz2) = 7721918
diff --git a/deskutils/kdepim4/files/plist.base b/deskutils/kdepim4/files/plist.base
index 8aac1ef9f35f..8791a68e0435 100644
--- a/deskutils/kdepim4/files/plist.base
+++ b/deskutils/kdepim4/files/plist.base
@@ -666,10 +666,10 @@ share/autostart/kalarm.tray.desktop
 share/autostart/kalarmd.autostart.desktop
 share/autostart/korgac.desktop
 share/config.kcfg/kandy.kcfg
+share/config.kcfg/knotes.kcfg
 share/config.kcfg/kontact.kcfg
 share/config.kcfg/korganizer.kcfg
 share/config/khotnewstuffrc
-share/config/knotesrc
 share/doc/HTML/en/kaddressbook/common
 share/doc/HTML/en/kaddressbook/conf.png
 share/doc/HTML/en/kaddressbook/contactdlg.png
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index ec4efc1eb2eb..bd4b4717c39f 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index 37c9dede25a2..e203ea112b27 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdepim-3.2.1.tar.bz2) = 362bec23869328a85845e0501020c938
-SIZE (KDE/kdepim-3.2.1.tar.bz2) = 7754558
+MD5 (KDE/kdepim-3.2.2.tar.bz2) = 10249b56cbc4c67dc4093b9f968604b9
+SIZE (KDE/kdepim-3.2.2.tar.bz2) = 7721918
diff --git a/deskutils/kdepim44/files/plist.base b/deskutils/kdepim44/files/plist.base
index 8aac1ef9f35f..8791a68e0435 100644
--- a/deskutils/kdepim44/files/plist.base
+++ b/deskutils/kdepim44/files/plist.base
@@ -666,10 +666,10 @@ share/autostart/kalarm.tray.desktop
 share/autostart/kalarmd.autostart.desktop
 share/autostart/korgac.desktop
 share/config.kcfg/kandy.kcfg
+share/config.kcfg/knotes.kcfg
 share/config.kcfg/kontact.kcfg
 share/config.kcfg/korganizer.kcfg
 share/config/khotnewstuffrc
-share/config/knotesrc
 share/doc/HTML/en/kaddressbook/common
 share/doc/HTML/en/kaddressbook/conf.png
 share/doc/HTML/en/kaddressbook/contactdlg.png