From 967720eca528c62c0cfb3effed16a46e1d230657 Mon Sep 17 00:00:00 2001
From: markd <markd>
Date: Sun, 11 Oct 2009 08:13:38 +0000
Subject: Update KDE4 to 4.3.2

KDE 4.3.2 brings a nice number of bugfixes, some critical, some just
fixing small annoyances:
* Many crashers have been fixed in KDE's core libraries, bringing more
  stability to all applications
* KWin's window compositing effects have been further stabilized by fixing
  a number of bugs in effect plugins such as the famous coverswitch window
  switcher
* The biggest number of bugs for this release has been fixed in KMail,
  KDE's email client, making it more reliable and usable by correcting a
  number of display issues
* Saving files over themselves works again in Okular, KDE's document viewer
---
 misc/kdeaccessibility4/Makefile |  4 +---
 misc/kdeaccessibility4/distinfo |  8 ++++----
 misc/kdeadmin4/Makefile         |  4 +---
 misc/kdeadmin4/distinfo         |  8 ++++----
 misc/kdeartwork4/Makefile       |  4 +---
 misc/kdeartwork4/distinfo       |  8 ++++----
 misc/kdeedu4/Makefile           |  4 +---
 misc/kdeedu4/PLIST              |  5 +++--
 misc/kdeedu4/distinfo           |  8 ++++----
 misc/kdepim-runtime4/Makefile   |  4 +---
 misc/kdepim-runtime4/distinfo   |  8 ++++----
 misc/kdepim4/Makefile           |  4 +---
 misc/kdepim4/PLIST              | 26 +-------------------------
 misc/kdepim4/distinfo           | 12 ++++--------
 misc/kdepim4/patches/patch-ae   | 15 ---------------
 misc/kdepim4/patches/patch-af   | 15 ---------------
 misc/kdepim4/patches/patch-ag   | 32 --------------------------------
 misc/kdepim4/patches/patch-ah   | 30 ------------------------------
 misc/kdepimlibs4/Makefile       |  4 +---
 misc/kdepimlibs4/distinfo       |  8 ++++----
 misc/kdeplasma-addons4/Makefile |  4 +---
 misc/kdeplasma-addons4/PLIST    |  6 +++---
 misc/kdeplasma-addons4/distinfo |  8 ++++----
 misc/kdeutils4/Makefile         |  4 +---
 misc/kdeutils4/PLIST            |  4 ++--
 misc/kdeutils4/distinfo         |  9 ++++-----
 misc/kdeutils4/patches/patch-aa | 15 ---------------
 27 files changed, 54 insertions(+), 207 deletions(-)
 delete mode 100644 misc/kdepim4/patches/patch-ae
 delete mode 100644 misc/kdepim4/patches/patch-af
 delete mode 100644 misc/kdepim4/patches/patch-ag
 delete mode 100644 misc/kdepim4/patches/patch-ah
 delete mode 100644 misc/kdeutils4/patches/patch-aa

(limited to 'misc')

diff --git a/misc/kdeaccessibility4/Makefile b/misc/kdeaccessibility4/Makefile
index 7e70a44a354..6670e78f710 100644
--- a/misc/kdeaccessibility4/Makefile
+++ b/misc/kdeaccessibility4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:41:53 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $
 
 DISTNAME=	kdeaccessibility-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -8,8 +8,6 @@ COMMENT=	Accessibility support for the KDE integrated X11 desktop
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 CMAKE_ARGS+=	-DKDE4_KTTSD_ALSA:BOOL=OFF
 
 .include "../../meta-pkgs/kde4/kde4.mk"
diff --git a/misc/kdeaccessibility4/distinfo b/misc/kdeaccessibility4/distinfo
index e0c93cadca2..d7b070ff6d2 100644
--- a/misc/kdeaccessibility4/distinfo
+++ b/misc/kdeaccessibility4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:41:53 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $
 
-SHA1 (kdeaccessibility-4.3.1.tar.bz2) = bc9c56beb161ddf6c1474d356360ec75db0733bc
-RMD160 (kdeaccessibility-4.3.1.tar.bz2) = db7f9d2c175dbe1f04e7b1b02596849cb10d9544
-Size (kdeaccessibility-4.3.1.tar.bz2) = 6590404 bytes
+SHA1 (kdeaccessibility-4.3.2.tar.bz2) = f6aa2d3cfa74cb2808e02bd67aec8d58cd61ef30
+RMD160 (kdeaccessibility-4.3.2.tar.bz2) = 7983703eaf5d2bf602a94e5ba72e8659007d1767
+Size (kdeaccessibility-4.3.2.tar.bz2) = 6586792 bytes
diff --git a/misc/kdeadmin4/Makefile b/misc/kdeadmin4/Makefile
index 3e11beee99e..9e4bc22d415 100644
--- a/misc/kdeadmin4/Makefile
+++ b/misc/kdeadmin4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:44:34 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $
 
 DISTNAME=	kdeadmin-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -8,8 +8,6 @@ COMMENT=	System administration tools for the KDE integrated X11 desktop
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 .include "../../meta-pkgs/kde4/kde4.mk"
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/misc/kdeadmin4/distinfo b/misc/kdeadmin4/distinfo
index dc25f765041..67b14569f22 100644
--- a/misc/kdeadmin4/distinfo
+++ b/misc/kdeadmin4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:44:34 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $
 
-SHA1 (kdeadmin-4.3.1.tar.bz2) = 032933e521004046a46a7a3c01b5a03b2d6e75d4
-RMD160 (kdeadmin-4.3.1.tar.bz2) = e6cd337079df64b4a182e15232486d329d0b0064
-Size (kdeadmin-4.3.1.tar.bz2) = 1876808 bytes
+SHA1 (kdeadmin-4.3.2.tar.bz2) = fc8978e921f1849b45b269d688b6baf2978555ab
+RMD160 (kdeadmin-4.3.2.tar.bz2) = adb13372ad3799a7a1e49406fb016be799a5fce2
+Size (kdeadmin-4.3.2.tar.bz2) = 1877384 bytes
diff --git a/misc/kdeartwork4/Makefile b/misc/kdeartwork4/Makefile
index 1d9e835e3b5..0a8e3acc8d2 100644
--- a/misc/kdeartwork4/Makefile
+++ b/misc/kdeartwork4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:47:41 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $
 
 DISTNAME=	kdeartwork-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -11,8 +11,6 @@ CMAKE_ARGS+=	-DXSCREENSAVER_DIR:PATH=${BUILDLINK_PREFIX.xscreensaver}/libexec/xs
 
 #BUILD_MAKE_FLAGS+= VERBOSE=1
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 BUILDLINK_API_DEPENDS.xscreensaver+=  xscreensaver>=5.00
 
 .include "../../meta-pkgs/kde4/kde4.mk"
diff --git a/misc/kdeartwork4/distinfo b/misc/kdeartwork4/distinfo
index 6de50a415b6..f5dcdd8319c 100644
--- a/misc/kdeartwork4/distinfo
+++ b/misc/kdeartwork4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:47:41 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $
 
-SHA1 (kdeartwork-4.3.1.tar.bz2) = 9db5c69723bdc9f203e4f854d505c0f87a6dda0d
-RMD160 (kdeartwork-4.3.1.tar.bz2) = 5b4f3b9c40beb12c4cc7c9830f00ed58f24fbd37
-Size (kdeartwork-4.3.1.tar.bz2) = 65324088 bytes
+SHA1 (kdeartwork-4.3.2.tar.bz2) = c199fae3f37b1a86e46ca2ee7a176d34bf034c5d
+RMD160 (kdeartwork-4.3.2.tar.bz2) = 6545205f7bcc84d99a19dbf3dcfd13ba9e7e6cb9
+Size (kdeartwork-4.3.2.tar.bz2) = 65394292 bytes
 SHA1 (patch-aa) = 9007028225dded2490e3181f853c17985bae9509
 SHA1 (patch-ab) = 39d0bbd61000a1bb7f4513c41fb7c8f53e688097
diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index b472a567199..b9c179fb4b0 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:51:26 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $
 
 DISTNAME=	kdeedu-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -8,8 +8,6 @@ COMMENT=	Edu{tainment,cation} tools for the KDE integrated X11 desktop
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-PKG_DESTDIR_SUPPORT=    user-destdir
-
 CMAKE_ARGS+=	-DBUILD_kmplot:BOOL=OFF
 CMAKE_ARGS+=	-DWITH_SBIG:BOOL=OFF
 # CMAKE_ARGS+=	-DWITH_PyKDE4:BOOL=OFF   # "sip: MarblePlacemarkModel is undefined"
diff --git a/misc/kdeedu4/PLIST b/misc/kdeedu4/PLIST
index 54a37601c8e..89fa334e026 100644
--- a/misc/kdeedu4/PLIST
+++ b/misc/kdeedu4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 20:51:26 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:38 markd Exp $
 bin/blinken
 bin/calgebra
 bin/geodatatest
@@ -2627,8 +2627,9 @@ share/kde/apps/ktouch/german.number.ktouch.xml
 share/kde/apps/ktouch/german2.ktouch.xml
 share/kde/apps/ktouch/german3.ktouch.xml
 share/kde/apps/ktouch/he.keyboard.xml
+share/kde/apps/ktouch/hu.keyboard.xml
 share/kde/apps/ktouch/hungarian.ktouch.xml
-share/kde/apps/ktouch/hungarian_expert.ktouch.xml
+share/kde/apps/ktouch/hungarian.expert.ktouch.xml
 share/kde/apps/ktouch/it.keyboard.xml
 share/kde/apps/ktouch/italian.ktouch.xml
 share/kde/apps/ktouch/ktouchui.rc
diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo
index 17a411ed831..f85529ecbec 100644
--- a/misc/kdeedu4/distinfo
+++ b/misc/kdeedu4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:51:24 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $
 
-SHA1 (kdeedu-4.3.1.tar.bz2) = 6326cff7779dfadc1b18a3a6bbe7b0750fb7ceaf
-RMD160 (kdeedu-4.3.1.tar.bz2) = dcb90ec4d3794131ea3387518fdbcb88e67c1118
-Size (kdeedu-4.3.1.tar.bz2) = 57866780 bytes
+SHA1 (kdeedu-4.3.2.tar.bz2) = df274f08242b1dedbfecc5a1d2ce452dcfbb5735
+RMD160 (kdeedu-4.3.2.tar.bz2) = 1c835d8510ab9063b340e2f92d4fa756b02d4255
+Size (kdeedu-4.3.2.tar.bz2) = 57944404 bytes
 SHA1 (patch-aa) = 5e2f12e2c70e438524ace2d238c9119dd36695ed
 SHA1 (patch-ab) = 2ff0e901376e5a01abc26799049eb738b3eb2fd8
 SHA1 (patch-ae) = 412adfe31664db087e66ce73428ee775dff858d3
diff --git a/misc/kdepim-runtime4/Makefile b/misc/kdepim-runtime4/Makefile
index 33d5de57786..f474b0b3624 100644
--- a/misc/kdepim-runtime4/Makefile
+++ b/misc/kdepim-runtime4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:54:04 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $
 
 DISTNAME=	kdepim-runtime-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -6,8 +6,6 @@ COMMENT=	Runtime requirements for the KDE PIM tools
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
 .include "../../meta-pkgs/kde4/kde4.mk"
diff --git a/misc/kdepim-runtime4/distinfo b/misc/kdepim-runtime4/distinfo
index a43e05ea765..0c07108cdd5 100644
--- a/misc/kdepim-runtime4/distinfo
+++ b/misc/kdepim-runtime4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:54:04 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $
 
-SHA1 (kdepim-runtime-4.3.1.tar.bz2) = c39b0fc1d3721fb8c6074ba6a174ad8716c6c604
-RMD160 (kdepim-runtime-4.3.1.tar.bz2) = d44d8cf1e5dbcc0b60edb4b4f3fae5e5e7f97c16
-Size (kdepim-runtime-4.3.1.tar.bz2) = 744306 bytes
+SHA1 (kdepim-runtime-4.3.2.tar.bz2) = 2061f4b2845728a97aef6b64f679cbb8f3a50d91
+RMD160 (kdepim-runtime-4.3.2.tar.bz2) = 59aa306ba32e5be426e91c3eb21c31e183b3250d
+Size (kdepim-runtime-4.3.2.tar.bz2) = 745106 bytes
diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile
index 14ac396a78f..0967d1be7e3 100644
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 21:24:27 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -8,8 +8,6 @@ COMMENT=	Personal Information Management tools for the KDE desktop
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 CMAKE_ARGS+=-DMAL_BASE:STRING=${BUILDLINK_PREFIX.libmal}
 
 CHECK_PORTABILITY_SKIP+=ktimetracker/test/booktime-baddate.sh \
diff --git a/misc/kdepim4/PLIST b/misc/kdepim4/PLIST
index f78d0c574a5..af583afbe2b 100644
--- a/misc/kdepim4/PLIST
+++ b/misc/kdepim4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:39 markd Exp $
 bin/akregator
 bin/akregatorstorageexporter
 bin/egroupwarewizard
@@ -730,59 +730,35 @@ share/icons/oxygen/128x128/apps/kalarm.png
 share/icons/oxygen/128x128/apps/kleopatra.png
 share/icons/oxygen/16x16/actions/edit-delete-page.png
 share/icons/oxygen/16x16/actions/ldap_lookup.png
-share/icons/oxygen/16x16/actions/mail-forwarded-replied.png
-share/icons/oxygen/16x16/actions/mail-forwarded.png
-share/icons/oxygen/16x16/actions/mail-reply-custom.png
-share/icons/oxygen/16x16/actions/mail-signed-fully.png
-share/icons/oxygen/16x16/actions/mail-signed-part.png
-share/icons/oxygen/16x16/actions/mail-signed.png
 share/icons/oxygen/16x16/actions/smallclock.png
 share/icons/oxygen/16x16/actions/upindicator.png
 share/icons/oxygen/16x16/apps/kalarm.png
 share/icons/oxygen/16x16/apps/kleopatra.png
 share/icons/oxygen/16x16/apps/kmailcvt.png
 share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/16x16/status/mail-sent.png
-share/icons/oxygen/16x16/status/mail-tagged.png
-share/icons/oxygen/16x16/status/mail-task.png
 share/icons/oxygen/22x22/actions/button_fewer.png
 share/icons/oxygen/22x22/actions/button_more.png
 share/icons/oxygen/22x22/actions/checkmark.png
 share/icons/oxygen/22x22/actions/edit-delete-page.png
-share/icons/oxygen/22x22/actions/mail-reply-custom.png
 share/icons/oxygen/22x22/apps/kalarm.png
 share/icons/oxygen/22x22/apps/kleopatra.png
 share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/22x22/status/mail-tagged.png
-share/icons/oxygen/22x22/status/mail-task.png
 share/icons/oxygen/32x32/actions/edit-delete-page.png
-share/icons/oxygen/32x32/actions/mail-reply-custom.png
 share/icons/oxygen/32x32/apps/kalarm.png
 share/icons/oxygen/32x32/apps/kleopatra.png
 share/icons/oxygen/32x32/apps/kmailcvt.png
 share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/32x32/status/mail-tagged.png
 share/icons/oxygen/48x48/actions/edit-delete-page.png
-share/icons/oxygen/48x48/actions/mail-reply-custom.png
 share/icons/oxygen/48x48/apps/kalarm.png
 share/icons/oxygen/48x48/apps/kleopatra.png
 share/icons/oxygen/48x48/apps/kmailcvt.png
 share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/48x48/status/mail-tagged.png
 share/icons/oxygen/64x64/apps/kalarm.png
 share/icons/oxygen/64x64/apps/kleopatra.png
 share/icons/oxygen/scalable/actions/edit-delete-page.svgz
-share/icons/oxygen/scalable/actions/mail-forwarded-replied.svgz
-share/icons/oxygen/scalable/actions/mail-forwarded.svgz
-share/icons/oxygen/scalable/actions/mail-reply-custom.svgz
-share/icons/oxygen/scalable/actions/mail-signed-fully.svgz
-share/icons/oxygen/scalable/actions/mail-signed-part.svgz
-share/icons/oxygen/scalable/actions/mail-signed.svgz
 share/icons/oxygen/scalable/apps/kalarm.svgz
 share/icons/oxygen/scalable/apps/kleopatra.svgz
 share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
-share/icons/oxygen/scalable/status/mail-tagged.svgz
-share/icons/oxygen/scalable/status/mail-task.svgz
 share/kde/apps/akregator/about/akregator.css
 share/kde/apps/akregator/about/main.html
 share/kde/apps/akregator/about/top-left-akregator.png
diff --git a/misc/kdepim4/distinfo b/misc/kdepim4/distinfo
index e5430248d04..d8beaa828f0 100644
--- a/misc/kdepim4/distinfo
+++ b/misc/kdepim4/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 21:24:27 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $
 
-SHA1 (kdepim-4.3.1.tar.bz2) = 6fd0309dbd911e2667ec1c08d1f10f2626a54534
-RMD160 (kdepim-4.3.1.tar.bz2) = fb1cac7ddb1e656c537f8db8abf2b4340db10171
-Size (kdepim-4.3.1.tar.bz2) = 11323109 bytes
+SHA1 (kdepim-4.3.2.tar.bz2) = 0de9c7f1c4544f7520128016a6e06f10e6ed1173
+RMD160 (kdepim-4.3.2.tar.bz2) = b22f2888582f2623c07cf96110e0d340938c109f
+Size (kdepim-4.3.2.tar.bz2) = 11250502 bytes
 SHA1 (patch-ab) = 234c88df2dcb633f8c58039b34694a606dc48494
 SHA1 (patch-ac) = fa109df4489b5bad67b19272d1d3fee4fd934c18
 SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f
-SHA1 (patch-ae) = 473c76678f4d0329fb6e9bcc1bad44eb0c7192ac
-SHA1 (patch-af) = 5d6f44cfcadb47fd71f024d0bb2c78d9d4dcb7a7
-SHA1 (patch-ag) = 03a751708b841d4f1bc22d33ccdc6efbcb4d6536
-SHA1 (patch-ah) = 04b0b44700daf3179d38f40227b1f734712ed107
diff --git a/misc/kdepim4/patches/patch-ae b/misc/kdepim4/patches/patch-ae
deleted file mode 100644
index 410961e5cba..00000000000
--- a/misc/kdepim4/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
-KDE svn 1019115
-
---- libkdepim/addresseelineedit.cpp.orig	2009-08-27 20:18:28.000000000 +1200
-+++ libkdepim/addresseelineedit.cpp
-@@ -800,7 +800,7 @@ void AddresseeLineEdit::startLoadingLDAP
- 
- void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
- {
--  if ( s_LDAPLineEdit != this ) {
-+  if ( adrs.isEmpty() || s_LDAPLineEdit != this ) {
-     return;
-   }
- 
diff --git a/misc/kdepim4/patches/patch-af b/misc/kdepim4/patches/patch-af
deleted file mode 100644
index ced979fadc0..00000000000
--- a/misc/kdepim4/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
-KDE svn 1022963
-
---- kmail/cachedimapjob.cpp.orig	2009-05-28 07:54:17.000000000 +1200
-+++ kmail/cachedimapjob.cpp
-@@ -510,7 +510,7 @@ void CachedImapJob::slotPutMessageResult
-         bool b = kmkernel->iCalIface().isResourceQuiet();
-         kmkernel->iCalIface().setResourceQuiet( true );
- 
--        mFolder->take( i );
-+        mFolder->takeTemporarily( i );
-         mFolder->addMsgKeepUID( mMsg );
-         mMsg->setTransferInProgress( false );
- 
diff --git a/misc/kdepim4/patches/patch-ag b/misc/kdepim4/patches/patch-ag
deleted file mode 100644
index ea61a75d000..00000000000
--- a/misc/kdepim4/patches/patch-ag
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
-KDE svn 1022963
-
---- kmail/kmfoldercachedimap.h.orig	2009-05-28 07:54:17.000000000 +1200
-+++ kmail/kmfoldercachedimap.h
-@@ -228,10 +228,23 @@ class KMFolderCachedImap : public KMFold
-     /** Reimplemented from KMFolder. Moving is not supported, so aParent must be 0. */
-     virtual int rename( const QString &aName, KMFolderDir *aParent = 0 );
- 
--    /** Reimplemented from KMFolderMaildir */
--    virtual KMMessage *take( int idx );
-     bool canDeleteMessages() const;
- 
-+    /**
-+     * Reimplemented from KMFolderMaildir
-+     * This deletes the message permanently, also from the server. For this,
-+     * rememberDeletion() is called, so that the message can be deleted from
-+     * the server on the next sync.
-+     */
-+    virtual KMMessage* take( int idx );
-+
-+    /**
-+     * Like take(), only that the deletion is not remembered, i.e. the
-+     * message will not be deleted from the server. Calling this can cause
-+     * inconsistencies, so make sure you re-add the message later!
-+     */
-+    void takeTemporarily( int idx );
-+
-     /** Reimplemented from KMFolderMaildir */
-     virtual int addMsg( KMMessage *msg, int *index_return = 0 );
- 
diff --git a/misc/kdepim4/patches/patch-ah b/misc/kdepim4/patches/patch-ah
deleted file mode 100644
index 725df138b4c..00000000000
--- a/misc/kdepim4/patches/patch-ah
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
-KDE svn 1022963 and 1022964
-
---- kmail/kmfoldercachedimap.cpp.orig	2009-05-28 07:54:17.000000000 +1200
-+++ kmail/kmfoldercachedimap.cpp
-@@ -527,6 +527,11 @@ KMMessage *KMFolderCachedImap::take( int
-   return KMFolderMaildir::take( idx );
- }
- 
-+void KMFolderCachedImap::takeTemporarily( int idx )
-+{
-+  KMFolderMaildir::take( idx );
-+}
-+
- int KMFolderCachedImap::addMsgInternal( KMMessage *msg, bool newMail, int *index_return )
- {
-   // Possible optimization: Only dirty if not filtered below
-@@ -1673,6 +1678,11 @@ bool KMFolderCachedImap::deleteMessages(
-     job->start();
-     return true;
-   } else {
-+
-+    // Nothing to delete on the server, make sure the map is clear again.
-+    // Normally this wouldn't be necessary, but there can be stale maps because of
-+    // https://issues.kolab.org/issue3833.
-+    mDeletedUIDsSinceLastSync.clear();
-     return false;
-   }
- }
diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index 94ce1164e13..aa294bc26e8 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 21:27:09 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $
 
 DISTNAME=	kdepimlibs-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -6,8 +6,6 @@ COMMENT=	Support libraries for PIM for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDEPimLibsDependencies.cmake
 
 REPLACE_PERL+= mailtransport/kconf_update/migrate-transports.pl
diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo
index 91206731022..2a0a9b71dc4 100644
--- a/misc/kdepimlibs4/distinfo
+++ b/misc/kdepimlibs4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 21:27:09 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $
 
-SHA1 (kdepimlibs-4.3.1.tar.bz2) = f4b04b21a6aa3accc530bc6c32cf0d820c611265
-RMD160 (kdepimlibs-4.3.1.tar.bz2) = f515ab60014d6e5621ac4e50b332ac9c8407bf7d
-Size (kdepimlibs-4.3.1.tar.bz2) = 1779777 bytes
+SHA1 (kdepimlibs-4.3.2.tar.bz2) = 1d48b9619e04da121e6233bfb081377afa7c327a
+RMD160 (kdepimlibs-4.3.2.tar.bz2) = 56e1bfd6f5c55091f0915c6aa7d30b88ffdac32f
+Size (kdepimlibs-4.3.2.tar.bz2) = 1780884 bytes
diff --git a/misc/kdeplasma-addons4/Makefile b/misc/kdeplasma-addons4/Makefile
index 4eb79c31ddc..d1b94eb4ea2 100644
--- a/misc/kdeplasma-addons4/Makefile
+++ b/misc/kdeplasma-addons4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 21:30:03 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $
 
 DISTNAME=	kdeplasma-addons-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -8,8 +8,6 @@ COMMENT=	Plasmoids
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 .include "../../meta-pkgs/kde4/kde4.mk"
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/misc/kdeplasma-addons4/PLIST b/misc/kdeplasma-addons4/PLIST
index 883aee2063b..af34e7c10b4 100644
--- a/misc/kdeplasma-addons4/PLIST
+++ b/misc/kdeplasma-addons4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 21:30:03 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:39 markd Exp $
 bin/lancelot
 include/conversion/converter.h
 include/conversion/plasmaconversion_export.h
@@ -137,9 +137,9 @@ share/icons/hicolor/64x64/apps/bball.png
 share/icons/hicolor/64x64/apps/lancelot-part.png
 share/icons/hicolor/64x64/apps/lancelot.png
 share/icons/hicolor/64x64/apps/previewer.png
+share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
 share/icons/hicolor/scalable/apps/bball.svgz
 share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
-share/icons/oxygen/scalable/apps/accessories-dictionary.svgz
 share/kde/apps/bball/bball.svgz
 share/kde/apps/bball/bounce.ogg
 share/kde/apps/bball/football.svgz
@@ -212,7 +212,6 @@ share/kde/apps/desktoptheme/default/widgets/eyes.svg
 share/kde/apps/desktoptheme/default/widgets/luna.svgz
 share/kde/apps/desktoptheme/default/widgets/microblog.svgz
 share/kde/apps/desktoptheme/default/widgets/notes.svgz
-share/kde/apps/desktoptheme/default/widgets/picture-frame-default.svgz
 share/kde/apps/desktoptheme/default/widgets/previewer-16.svgz
 share/kde/apps/desktoptheme/default/widgets/previewer-22.svgz
 share/kde/apps/desktoptheme/default/widgets/timer.svgz
@@ -274,6 +273,7 @@ share/kde/apps/desktoptheme/slim-glow/lancelot/system-buttons-extender.svgz
 share/kde/apps/desktoptheme/slim-glow/lancelot/system-buttons.svgz
 share/kde/apps/desktoptheme/slim-glow/lancelot/theme.config
 share/kde/apps/lancelot/lancelot.notifyrc
+share/kde/apps/plasma-applet-frame/picture-frame-default.jpg
 share/kde/apps/plasma-applet-opendesktop/user.css
 share/kde/apps/plasma/services/rtmauth.operations
 share/kde/apps/plasma/services/rtmtask.operations
diff --git a/misc/kdeplasma-addons4/distinfo b/misc/kdeplasma-addons4/distinfo
index 151d557b419..0a776a5d73f 100644
--- a/misc/kdeplasma-addons4/distinfo
+++ b/misc/kdeplasma-addons4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 21:30:03 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $
 
-SHA1 (kdeplasma-addons-4.3.1.tar.bz2) = 83421181dd3a80c4ac0ff5bab111b7f71f6a1192
-RMD160 (kdeplasma-addons-4.3.1.tar.bz2) = 6197ec2ef392fa2b836b04708dedcbbb49eaee22
-Size (kdeplasma-addons-4.3.1.tar.bz2) = 1448440 bytes
+SHA1 (kdeplasma-addons-4.3.2.tar.bz2) = ecbb3ebe64eccf41a567bdf98e741b14a05536f4
+RMD160 (kdeplasma-addons-4.3.2.tar.bz2) = 03492475a4964e28d2dd91970ada31db3045ea1a
+Size (kdeplasma-addons-4.3.2.tar.bz2) = 1453471 bytes
 SHA1 (patch-aa) = ea5181ba97e93c89ee331fec3737a639196733a0
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index d50ac221bb5..5f5c07cb802 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 21:33:16 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -12,8 +12,6 @@ CMAKE_ARGS+=	-DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 BUILDLINK_DEPMETHOD.qt4-tools=	full
 .include "../../meta-pkgs/kde4/kde4.mk"
 
diff --git a/misc/kdeutils4/PLIST b/misc/kdeutils4/PLIST
index 07f10950d2c..ae99c8e840d 100644
--- a/misc/kdeutils4/PLIST
+++ b/misc/kdeutils4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 21:33:16 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:39 markd Exp $
 bin/ark
 bin/irkick
 bin/kcalc
@@ -26,7 +26,7 @@ lib/kde4/kerfuffle_libgz.so
 lib/kde4/libarkpart.so
 lib/kde4/libextracthere.so
 lib/kde4/libkbytearrayedit.so
-lib/kde4/liboktetapart.so
+lib/kde4/oktetapart.so
 lib/kde4/plasma_package_superkaramba.so
 lib/kde4/plasma_scriptengine_superkaramba.so
 lib/libkdeinit4_irkick.so
diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo
index 774f11fd0ea..a9316c11bdc 100644
--- a/misc/kdeutils4/distinfo
+++ b/misc/kdeutils4/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 21:33:16 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $
 
-SHA1 (kdeutils-4.3.1.tar.bz2) = 9743636306cfb137241b6c87f5944e6bf91870fe
-RMD160 (kdeutils-4.3.1.tar.bz2) = 72dcc9d0a5592b371873398604e1bf59acb9eb4e
-Size (kdeutils-4.3.1.tar.bz2) = 2524224 bytes
-SHA1 (patch-aa) = 275e579aa5b99b7e2e4e0af719d6fd629f6bfd8b
+SHA1 (kdeutils-4.3.2.tar.bz2) = 16a4193d847e67abce215056c6eab2cbb348a1c8
+RMD160 (kdeutils-4.3.2.tar.bz2) = c0ae9f74cad3e9167dcf976c955e514ba6c3888e
+Size (kdeutils-4.3.2.tar.bz2) = 2524369 bytes
diff --git a/misc/kdeutils4/patches/patch-aa b/misc/kdeutils4/patches/patch-aa
deleted file mode 100644
index 22a76ac6120..00000000000
--- a/misc/kdeutils4/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/10/02 21:33:16 markd Exp $
-
-removing kscd profile as it is delivered by kscd.
-fixed in kde svn.
-
---- kdelirc/profiles/CMakeLists.txt.orig	2009-08-27 20:17:24.000000000 +1200
-+++ kdelirc/profiles/CMakeLists.txt
-@@ -11,7 +11,6 @@ install( FILES 
-     konqueror.profile.xml 
-     suspend.profile.xml
-     shutdown.profile.xml
--    kscd.profile.xml
-     DESTINATION ${DATA_INSTALL_DIR}/profiles)
- 
- 
-- 
cgit v1.2.3