Update KDE SC to 4.8.2

bugfixes.

4 files changed, 9 insertions, 33 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 2171cc09f28..ebea45f0087 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2012/04/02 10:09:06 dholland Exp $
+# $NetBSD: Makefile,v 1.41 2012/04/15 05:54:53 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index 9cbc8bcbd33..b5b62928401 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/03/31 21:46:55 hans Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/04/15 05:54:53 markd Exp $
 bin/checkXML
 bin/kbuildsycoca4
 bin/kconfig_compiler
@@ -221,6 +221,7 @@ include/KDE/KArchiveDirectory
 include/KDE/KArchiveEntry
 include/KDE/KArchiveFile
 include/KDE/KArrowButton
+include/KDE/KAscii
 include/KDE/KAssistantDialog
 include/KDE/KAuth/Action
 include/KDE/KAuth/ActionReply
@@ -2091,12 +2092,14 @@ lib/libthreadweaver.so
 lib/libthreadweaver.so.4
 lib/libthreadweaver.so.4.8.0
 man/man1/checkXML.1
+man/man1/kconfig_compiler.1
 man/man1/kde4-config.1
 man/man1/kdecmake.1
 man/man1/kjs.1
 man/man1/kjscmd.1
 man/man1/kross.1
 man/man1/makekdewidgets.1
+man/man1/preparetips.1
 man/man7/kdeoptions.7
 man/man7/qtoptions.7
 man/man8/kbuildsycoca4.8
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index f715555e25b..29f8b91266b 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2012/03/31 21:46:55 hans Exp $
+$NetBSD: distinfo,v 1.27 2012/04/15 05:54:53 markd Exp $
 
-SHA1 (kdelibs-4.8.0.tar.bz2) = 5e4744405734e6c3ce572ef7d16054390692b38a
-RMD160 (kdelibs-4.8.0.tar.bz2) = b5fd03eec81a390ea74d4713d6459b685352d362
-Size (kdelibs-4.8.0.tar.bz2) = 13044553 bytes
+SHA1 (kdelibs-4.8.2.tar.xz) = f844ae0877880563361144d9577706064c3483e7
+RMD160 (kdelibs-4.8.2.tar.xz) = 9c52ef42274f4ed5fd82a749ed7cf78f482c9c67
+Size (kdelibs-4.8.2.tar.xz) = 11966308 bytes
 SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
 SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
 SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505
@@ -14,7 +14,6 @@ SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
 SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
 SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
 SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
-SHA1 (patch-cmake_modules_FindXine.cmake) = 292d8e4b44367b66e3a737d2be045c2ff075e8cb
 SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
diff --git a/x11/kdelibs4/patches/patch-cmake_modules_FindXine.cmake b/x11/kdelibs4/patches/patch-cmake_modules_FindXine.cmake
deleted file mode 100644
index 026e0b3c058..00000000000
--- a/x11/kdelibs4/patches/patch-cmake_modules_FindXine.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-cmake_modules_FindXine.cmake,v 1.1 2012/03/22 22:08:30 markd Exp $
-
-Starting with the recently released version 1.2.0, xine has its version
-number macros in xine/version.h instead of xine.h itself.
-
-Account for this case by checking if xine/version.h exists and falling
-back to xine.h if it doesn't when reading the version numbers.
-
---- cmake/modules/FindXine.cmake.orig	2012-01-18 18:06:22.000000000 +0000
-+++ cmake/modules/FindXine.cmake
-@@ -47,7 +47,13 @@ FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES
- 
- # Get the version number from xine.h and store it in the cache:
- IF(XINE_INCLUDE_DIR  AND NOT  XINE_VERSION)
--  FILE(READ ${XINE_INCLUDE_DIR}/xine.h XINE_VERSION_CONTENT)
-+  IF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) # xine 1.2.0+
-+    SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine/version.h)
-+  ELSE(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h)
-+    SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine.h)
-+  ENDIF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h)
-+
-+  FILE(READ ${XINE_VERSION_FILE} XINE_VERSION_CONTENT)
-   STRING(REGEX MATCH "#define *XINE_MAJOR_VERSION *([0-9]+)"  _dummy "${XINE_VERSION_CONTENT}")
-   SET(XINE_VERSION_MAJOR "${CMAKE_MATCH_1}")
-