Update KDE to 4.2.1.

multimedia/phonon port has been split into phonon itself, phonon-xine
and phono-gstreamer backends. After updating phonon port you have
to install at least one backend. phonon-xine backend is recommended
for KDE.

4 files changed, 12 insertions, 76 deletions

diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index 90611d6a60a4..6bf34c520e14 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdeedu
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,11 +14,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Collection of entertaining, educational programs for KDE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/eigen/util.h:${PORTSDIR}/math/eigen \
-		${LOCALBASE}/lib/ocaml/facile/facile.a:${PORTSDIR}/math/facile \
+BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/facile/facile.a:${PORTSDIR}/math/facile \
 		gmm++>=3.0.4:${PORTSDIR}/math/gmm++
-LIB_DEPENDS=	usb-0.1:${PORTSDIR}/devel/libusb \
-		boost_python:${PORTSDIR}/devel/boost-python \
+LIB_DEPENDS=	boost_python:${PORTSDIR}/devel/boost-python \
 		nova:${PORTSDIR}/astro/libnova \
 		openbabel.3:${PORTSDIR}/science/openbabel \
 		cfitsio.0:${PORTSDIR}/astro/cfitsio \
diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo
index e207b4669b1b..316eb45570d2 100644
--- a/misc/kdeedu4/distinfo
+++ b/misc/kdeedu4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeedu-4.2.0.tar.bz2) = aaddbdab29e1d284ad8ee67a78b4c597
-SHA256 (KDE/kdeedu-4.2.0.tar.bz2) = 6b1584a39c2a8823deeccd893e0bbc87fa3faa4019f3f9c886face247fa3435a
-SIZE (KDE/kdeedu-4.2.0.tar.bz2) = 59252322
+MD5 (KDE/kdeedu-4.2.1.tar.bz2) = bc8fb562cf0564ce50486b83f7c94d01
+SHA256 (KDE/kdeedu-4.2.1.tar.bz2) = 768e05f1bc99b307e348fb97ad77a2d266fefb47dfc5fa2e28badbfebaae22a6
+SIZE (KDE/kdeedu-4.2.1.tar.bz2) = 59459156
diff --git a/misc/kdeedu4/files/patch-cmake__modules__FindopenBabel2.cmake b/misc/kdeedu4/files/patch-cmake__modules__FindopenBabel2.cmake
deleted file mode 100644
index 546ac033793f..000000000000
--- a/misc/kdeedu4/files/patch-cmake__modules__FindopenBabel2.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -u ../cmake/modules/FindOpenBabel2.cmake ../cmake/modules/FindOpenBabel2.cmake
---- ../cmake/modules/FindOpenBabel2.cmake	2009/01/25 12:06:30	916420
-+++ ../cmake/modules/FindOpenBabel2.cmake	2009/01/26 22:11:35	917115
-@@ -4,6 +4,7 @@
- #  OPENBABEL2_FOUND - system has OpenBabel2
- #  OPENBABEL2_INCLUDE_DIR - the OpenBabel2 include directory
- #  OPENBABEL2_LIBRARIES - Link these to use OpenBabel2
-+# Copyright (C) 2006, 2009 Pino Toscano, <pino@kde.org>
- # Copyright (c) 2006, 2007 Carsten Niehaus, <cniehaus@gmx.de>
- # Copyright (C) 2008 Marcus D. Hanwell <marcus@cryos.org>
- # Redistribution and use is allowed according to the terms of the BSD license.
-@@ -18,13 +19,11 @@
- 
-     # Use the newer PkgConfig stuff
-     find_package(PkgConfig REQUIRED)
--    pkg_check_modules(OPENBABEL2 openbabel-2.0>=2.2.0)
-+    pkg_check_modules(PC_OPENBABEL2 openbabel-2.0>=2.2.0)
- 
--    # Maintain backwards compatibility with previous version of module
--    if(OPENBABEL2_FOUND STREQUAL "1")
-+    if(PC_OPENBABEL2_FOUND)
-       set(OPENBABEL2_VERSION_MET TRUE)
--      set(OPENBABEL2_INCLUDE_DIR ${OPENBABEL2_INCLUDE_DIRS})
--    endif(OPENBABEL2_FOUND STREQUAL "1")
-+    endif(PC_OPENBABEL2_FOUND)
- 
-   else(NOT WIN32)
-     set(OPENBABEL2_VERSION_MET TRUE)
-@@ -32,28 +31,19 @@
- 
-   if(OPENBABEL2_VERSION_MET)
- 
--   # find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
--   #   PATHS
--   #   ${_obIncDir}
--   #   ${GNUWIN32_DIR}/include
--   #   $ENV{OPENBABEL2_INCLUDE_DIR}
--   # )
--
--    if(WIN32)
--      if(NOT OPENBABEL2_INCLUDE_DIR)
--        find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
--          PATHS
--          ${_obIncDir}
--          ${GNUWIN32_DIR}/include
--          $ENV{OPENBABEL2_INCLUDE_DIR}
--          PATH_SUFFIXES openbabel-2.0
--        )
--      endif(NOT OPENBABEL2_INCLUDE_DIR)
--    endif(WIN32)
-+    find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
-+      PATHS
-+      ${PC_OPENBABEL2_INCLUDEDIR}
-+      ${PC_OPENBABEL2_INCLUDE_DIRS}
-+      ${GNUWIN32_DIR}/include
-+      $ENV{OPENBABEL2_INCLUDE_DIR}
-+      PATH_SUFFIXES openbabel-2.0
-+    )
- 
--    find_library(OPENBABEL2_LIBRARIES NAMES openbabel
-+    find_library(OPENBABEL2_LIBRARIES NAMES openbabel openbabel-2
-       PATHS
--      ${_obLinkDir}
-+      ${PC_OPENBABEL2_LIBDIR}
-+      ${PC_OPENBABEL2_LIBRARY_DIRS}
-       ${GNUWIN32_DIR}/lib
-       $ENV{OPENBABEL2_LIBRARIES}
-     )
diff --git a/misc/kdeedu4/pkg-plist b/misc/kdeedu4/pkg-plist
index 69c7f79fa70d..4b64eeaddaa1 100644
--- a/misc/kdeedu4/pkg-plist
+++ b/misc/kdeedu4/pkg-plist
@@ -285,9 +285,12 @@ share/apps/kalzium/data/iconsets/school/38.svg
 share/apps/kalzium/data/iconsets/school/39.svg
 share/apps/kalzium/data/iconsets/school/4.svg
 share/apps/kalzium/data/iconsets/school/40.svg
+share/apps/kalzium/data/iconsets/school/41.svg
 share/apps/kalzium/data/iconsets/school/42.svg
 share/apps/kalzium/data/iconsets/school/43.svg
 share/apps/kalzium/data/iconsets/school/44.svg
+share/apps/kalzium/data/iconsets/school/45.svg
+share/apps/kalzium/data/iconsets/school/46.svg
 share/apps/kalzium/data/iconsets/school/47.svg
 share/apps/kalzium/data/iconsets/school/48.svg
 share/apps/kalzium/data/iconsets/school/49.svg
@@ -301,6 +304,7 @@ share/apps/kalzium/data/iconsets/school/55.svg
 share/apps/kalzium/data/iconsets/school/56.svg
 share/apps/kalzium/data/iconsets/school/57.svg
 share/apps/kalzium/data/iconsets/school/58.svg
+share/apps/kalzium/data/iconsets/school/59.svg
 share/apps/kalzium/data/iconsets/school/6.svg
 share/apps/kalzium/data/iconsets/school/60.svg
 share/apps/kalzium/data/iconsets/school/61.svg
@@ -309,7 +313,10 @@ share/apps/kalzium/data/iconsets/school/7.svg
 share/apps/kalzium/data/iconsets/school/72.svg
 share/apps/kalzium/data/iconsets/school/73.svg
 share/apps/kalzium/data/iconsets/school/74.svg
+share/apps/kalzium/data/iconsets/school/75.svg
 share/apps/kalzium/data/iconsets/school/76.svg
+share/apps/kalzium/data/iconsets/school/77.svg
+share/apps/kalzium/data/iconsets/school/78.svg
 share/apps/kalzium/data/iconsets/school/79.svg
 share/apps/kalzium/data/iconsets/school/8.svg
 share/apps/kalzium/data/iconsets/school/80.svg