6 files changed, 300 insertions, 13 deletions

diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index bfa1a90e23df..8dc4cc483da5 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdeedu
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -24,7 +23,9 @@ LIB_DEPENDS=	boost_python:${PORTSDIR}/devel/boost-python-libs \
 		openbabel.3:${PORTSDIR}/science/openbabel \
 		cfitsio.0:${PORTSDIR}/astro/cfitsio \
 		qalculate.5:${PORTSDIR}/math/libqalculate \
-		gsl.15:${PORTSDIR}/math/gsl
+		gsl.15:${PORTSDIR}/math/gsl \
+		spectre.1:${PORTSDIR}/print/libspectre
+#		gps.19:${PORTSDIR}/astro/gpsd
 RUN_DEPENDS=	xplanet:${PORTSDIR}/astro/xplanet
 
 LATEST_LINK=	${PORTNAME}4
@@ -49,6 +50,12 @@ MAN6=		khangman.6
 #fix checking boost_python
 CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" \
 		-DBOOST_PYTHON_INCLUDES="${LOCALBASE}/include;${PYTHON_INCLUDEDIR}" \
-		-DBOOST_PYTHON_LIBS="-L${LOCALBASE}/lib -lboost_python -l${PYTHON_VERSION}"
+		-DBOOST_PYTHON_LIBS="-L${LOCALBASE}/lib -lboost_python -l${PYTHON_VERSION}" \
+		-DWITH_R:BOOL=OFF
+
+#Disable gpsd support, new version is required
+post-patch:
+	${REINPLACE_CMD} -e "/find_package/d" \
+		${WRKSRC}/marble/src/plugins/positionprovider/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo
index cd3ea4b1d639..6b7a908e05f9 100644
--- a/misc/kdeedu4/distinfo
+++ b/misc/kdeedu4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeedu-4.3.5.tar.bz2) = 5755742477a9db101c03269393ee36ad
-SHA256 (KDE/kdeedu-4.3.5.tar.bz2) = 4495d2bb56d498c6e1f4a3394a5dd2f9c156d1b48a0ad04051aad03f95e6801c
-SIZE (KDE/kdeedu-4.3.5.tar.bz2) = 57964399
+MD5 (KDE/kdeedu-4.4.3.tar.bz2) = 6afd15d2d4c912cb5e2ca94c8a2bf5f4
+SHA256 (KDE/kdeedu-4.4.3.tar.bz2) = 9d7881bf4e2aa8816a7e82838f286c18910f9e5d8a19a16c7d8c15df8e0c0b9e
+SIZE (KDE/kdeedu-4.4.3.tar.bz2) = 59800678
diff --git a/misc/kdeedu4/files/patch-marble__Findlibgps.cmake b/misc/kdeedu4/files/patch-marble__Findlibgps.cmake
new file mode 100644
index 000000000000..e66bc87e03f0
--- /dev/null
+++ b/misc/kdeedu4/files/patch-marble__Findlibgps.cmake
@@ -0,0 +1,27 @@
+--- ./marble/Findlibgps.cmake.orig	2009-05-06 14:13:59.000000000 +0400
++++ ./marble/Findlibgps.cmake	2010-03-14 00:08:03.860024388 +0300
+@@ -1,10 +1,16 @@
+-# - Find Gpsd libs - gps daemon library
+-#
+-# This module finds if Gpsd is installed.
+-#
+-# Copyright (c) 2006, Andrew Manson, <g.real.ate@gmail.com>
+-#
++# LIBGPS_FOUND - system has the LIBGPS library
++# LIBGPS_INCLUDE_DIR - the LIBGPS include directory
++# LIBGPS_LIBRARIES - The libraries needed to use LIBGPS
+ 
+-include(FindPkgConfig)
++if(LIBGPS_INCLUDE_DIR AND LIBGPS_LIBRARIES)
++  set(LIBGPS_FOUND TRUE)
++else(LIBGPS_INCLUDE_DIR AND LIBGPS_LIBRARIES)
+ 
+-pkg_check_modules(libgps libgps>=2.35)
++  find_path(LIBGPS_INCLUDE_DIR NAMES gps.h)
++  find_library(LIBGPS_LIBRARIES NAMES gps)
++
++  include(FindPackageHandleStandardArgs)
++  find_package_handle_standard_args(libgps DEFAULT_MSG LIBGPS_INCLUDE_DIR LIBGPS_LIBRARIES)
++
++  mark_as_advanced(LIBGPS_INCLUDE_DIR LIBGPS_LIBRARIES)
++endif(LIBGPS_INCLUDE_DIR AND LIBGPS_LIBRARIES)
diff --git a/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__CMakeLists.txt b/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__CMakeLists.txt
new file mode 100644
index 000000000000..bc65f5fa9a5f
--- /dev/null
+++ b/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__CMakeLists.txt
@@ -0,0 +1,21 @@
+--- ./marble/src/plugins/positionprovider/CMakeLists.txt.orig	2009-07-18 01:45:18.000000000 +0400
++++ ./marble/src/plugins/positionprovider/CMakeLists.txt	2010-03-14 00:11:25.344715149 +0300
+@@ -1,15 +1,15 @@
+ find_package(libgps)
+ 
+-if(libgps_FOUND)
++if(LIBGPS_FOUND)
+ 
+      message( STATUS "Building with gpsd position provider")
+      add_subdirectory( gpsd )
+ 
+-else(libgps_FOUND)
++else(LIBGPS_FOUND)
+ 
+      message( STATUS "Not building with gpsd position provider")
+ 
+-endif(libgps_FOUND)
++endif(LIBGPS_FOUND)
+ 
+ # experimental implementation
+ # add_subdirectory( geoclue )
diff --git a/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__gpsd__CMakeLists.txt b/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__gpsd__CMakeLists.txt
new file mode 100644
index 000000000000..dfce3fe9e317
--- /dev/null
+++ b/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__gpsd__CMakeLists.txt
@@ -0,0 +1,19 @@
+--- ./marble/src/plugins/positionprovider/gpsd/CMakeLists.txt.orig	2009-05-27 23:53:49.000000000 +0400
++++ ./marble/src/plugins/positionprovider/gpsd/CMakeLists.txt	2010-03-14 00:08:03.862036116 +0300
+@@ -4,7 +4,7 @@
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/positionprovider/gpsd
+  ${CMAKE_BINARY_DIR}/src/plugins/positionprovider/gpsd
+  ${QT_INCLUDE_DIR}
+- ${libgps_INCLUDE_DIRS}
++ ${LIBGPS_INCLUDE_DIR}
+ )
+ 
+ include(${QT_USE_FILE})
+@@ -15,6 +15,6 @@
+  GpsdThread.cpp
+ )
+ 
+-set( GpsdPositionProviderPlugin_LIBS ${libgps_LIBRARIES} )
++set( GpsdPositionProviderPlugin_LIBS ${LIBGPS_LIBRARIES} )
+ 
+ marble_add_plugin( GpsdPositionProviderPlugin ${gpsd_SRCS} )
diff --git a/misc/kdeedu4/pkg-plist b/misc/kdeedu4/pkg-plist
index 7592762bce30..61c513311396 100644
--- a/misc/kdeedu4/pkg-plist
+++ b/misc/kdeedu4/pkg-plist
@@ -1,5 +1,6 @@
 bin/blinken
 bin/calgebra
+bin/cantor
 bin/geodatatest
 bin/kalgebra
 bin/kalzium
@@ -20,6 +21,7 @@ bin/kwordquiz
 bin/marble
 bin/parley
 bin/pykig.py
+bin/rocs
 bin/step
 bin/tilecreator
 include/libkdeedu/chemicaldataobject.h
@@ -65,10 +67,13 @@ include/marble/AbstractDataPluginItem.h
 include/marble/AbstractDataPluginModel.h
 include/marble/AbstractFloatItem.h
 include/marble/AbstractLayerInterface.h
+include/marble/AbstractMarbleGraphicsLayout.h
 include/marble/AbstractProjection.h
+include/marble/AbstractWorkerThread.h
 include/marble/ClipPainter.h
 include/marble/EquirectProjection.h
-include/marble/ExtDateTime.h
+include/marble/FrameGraphicsItem.h
+include/marble/GeoDataAbstractView.h
 include/marble/GeoDataAccuracy.h
 include/marble/GeoDataColorStyle.h
 include/marble/GeoDataContainer.h
@@ -92,6 +97,10 @@ include/marble/GeoDataLineString_p.h
 include/marble/GeoDataLineStyle.h
 include/marble/GeoDataLinearRing.h
 include/marble/GeoDataLinearRing_p.h
+include/marble/GeoDataLod.h
+include/marble/GeoDataLod_p.h
+include/marble/GeoDataLookAt.h
+include/marble/GeoDataLookAt_p.h
 include/marble/GeoDataMultiGeometry.h
 include/marble/GeoDataMultiGeometry_p.h
 include/marble/GeoDataObject.h
@@ -102,12 +111,15 @@ include/marble/GeoDataPoint_p.h
 include/marble/GeoDataPolyStyle.h
 include/marble/GeoDataPolygon.h
 include/marble/GeoDataPolygon_p.h
+include/marble/GeoDataRegion.h
+include/marble/GeoDataRegion_p.h
 include/marble/GeoDataStyle.h
 include/marble/GeoDataStyleMap.h
 include/marble/GeoDataStyleSelector.h
 include/marble/GeoDocument.h
 include/marble/GeoGraphicsItem.h
 include/marble/GeoPainter.h
+include/marble/LabelGraphicsItem.h
 include/marble/LatLonEdit.h
 include/marble/MapThemeManager.h
 include/marble/MapThemeSortFilterProxyModel.h
@@ -115,6 +127,7 @@ include/marble/MarbleAboutDialog.h
 include/marble/MarbleControlBox.h
 include/marble/MarbleDataFacade.h
 include/marble/MarbleDirs.h
+include/marble/MarbleGraphicsGridLayout.h
 include/marble/MarbleGraphicsItem.h
 include/marble/MarbleMap.h
 include/marble/MarbleModel.h
@@ -123,7 +136,9 @@ include/marble/MarbleWidget.h
 include/marble/MarbleWidgetInputHandler.h
 include/marble/MercatorProjection.h
 include/marble/Planet.h
+include/marble/PluginAboutDialog.h
 include/marble/PluginInterface.h
+include/marble/QtMarbleConfigDialog.h
 include/marble/Quaternion.h
 include/marble/RenderPlugin.h
 include/marble/RenderPluginInterface.h
@@ -133,6 +148,7 @@ include/marble/SphericalProjection.h
 include/marble/SunLocator.h
 include/marble/TileCreator.h
 include/marble/TileCreatorDialog.h
+include/marble/TinyWebBrowser.h
 include/marble/ViewParams.h
 include/marble/ViewportParams.h
 include/marble/geodata_export.h
@@ -167,9 +183,27 @@ lib/avogadro-kalzium/tools/libdrawtool.so
 lib/avogadro-kalzium/tools/libmanipulatetool.so
 lib/avogadro-kalzium/tools/libnavigatetool.so
 lib/avogadro-kalzium/tools/libselectrotatetool.so
+lib/kde4/cantor_creatematrixassistant.so
+lib/kde4/cantor_differentiateassistant.so
+lib/kde4/cantor_eigenvaluesassistant.so
+lib/kde4/cantor_eigenvectorsassistant.so
+lib/kde4/cantor_integrateassistant.so
+lib/kde4/cantor_invertmatrixassistant.so
+lib/kde4/cantor_kalgebrabackend.so
+lib/kde4/cantor_maximabackend.so
+lib/kde4/cantor_nullbackend.so
+lib/kde4/cantor_plot2dassistant.so
+lib/kde4/cantor_plot3dassistant.so
+lib/kde4/cantor_runscriptassistant.so
+lib/kde4/cantor_sagebackend.so
+lib/kde4/cantor_solveassistant.so
+lib/kde4/concentrationCalculator.so
+lib/kde4/gasCalculator.so
 lib/kde4/kigpart.so
+lib/kde4/libcantorpart.so
 lib/kde4/libkmplotpart.so
 lib/kde4/libmarble_part.so
+lib/kde4/nuclearCalculator.so
 lib/kde4/plasma_applet_didyouknow.so
 lib/kde4/plasma_applet_kalgebra.so
 lib/kde4/plasma_applet_parley.so
@@ -180,6 +214,8 @@ lib/kde4/plugins/designer/kalziumuiwidgets.so
 lib/kde4/plugins/marble/CompassFloatItem.so
 lib/kde4/plugins/marble/CrosshairsPlugin.so
 lib/kde4/plugins/marble/GeoRendererPlugin.so
+@comment requires new astro/gpsd
+@comment lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
 lib/kde4/plugins/marble/GraticulePlugin.so
 lib/kde4/plugins/marble/MapScaleFloatItem.so
 lib/kde4/plugins/marble/NavigationFloatItem.so
@@ -187,6 +223,7 @@ lib/kde4/plugins/marble/OverviewMap.so
 lib/kde4/plugins/marble/Photo.so
 lib/kde4/plugins/marble/QNamNetworkPlugin.so
 lib/kde4/plugins/marble/StarsPlugin.so
+lib/kde4/plugins/marble/Weather.so
 lib/kde4/plugins/marble/Wikipedia.so
 lib/libSatLib.so
 lib/libSatLib.so.5
@@ -194,9 +231,16 @@ lib/libSatLib.so.5.0.1
 lib/libanalitza.so
 lib/libanalitza.so.5
 lib/libanalitza.so.5.0.1
+lib/libanalitzagui.so
+lib/libanalitzagui.so.5
+lib/libanalitzagui.so.5.0.1
 lib/libavogadro-kalzium.so
 lib/libavogadro-kalzium.so.0
 lib/libavogadro-kalzium.so.0.9.3
+lib/libcantor_config.so
+lib/libcantorlibs.so
+lib/libcantorlibs.so.0.0.1
+lib/libcantorlibs.so.1
 lib/libcompoundviewer.so
 lib/libcompoundviewer.so.5
 lib/libcompoundviewer.so.5.0.1
@@ -217,6 +261,7 @@ lib/libscience.so
 lib/libscience.so.5
 lib/libscience.so.5.0.1
 share/applications/kde4/blinken.desktop
+share/applications/kde4/cantor.desktop
 share/applications/kde4/kalgebra.desktop
 share/applications/kde4/kalzium.desktop
 share/applications/kde4/kanagram.desktop
@@ -233,6 +278,7 @@ share/applications/kde4/kturtle.desktop
 share/applications/kde4/kwordquiz.desktop
 share/applications/kde4/marble.desktop
 share/applications/kde4/parley.desktop
+share/applications/kde4/rocs.desktop
 share/applications/kde4/step.desktop
 share/apps/blinken/README.packagers
 share/apps/blinken/fonts/steve.ttf
@@ -242,6 +288,18 @@ share/apps/blinken/sounds/2.wav
 share/apps/blinken/sounds/3.wav
 share/apps/blinken/sounds/4.wav
 share/apps/blinken/sounds/lose.wav
+share/apps/cantor/cantor_create_matrix_assistant.rc
+share/apps/cantor/cantor_differentiate_assistant.rc
+share/apps/cantor/cantor_eigenvalues_assistant.rc
+share/apps/cantor/cantor_eigenvectors_assistant.rc
+share/apps/cantor/cantor_integrate_assistant.rc
+share/apps/cantor/cantor_invert_matrix_assistant.rc
+share/apps/cantor/cantor_plot2d_assistant.rc
+share/apps/cantor/cantor_plot3d_assistant.rc
+share/apps/cantor/cantor_runscript_assistant.rc
+share/apps/cantor/cantor_shell.rc
+share/apps/cantor/cantor_solve_assistant.rc
+share/apps/cantorpart/cantor_part.rc
 share/apps/cmake/modules/FindKDEEdu.cmake
 share/apps/cmake/modules/FindMarble.cmake
 share/apps/cmake/modules/FindMarbleWidget.cmake
@@ -1473,6 +1531,10 @@ share/apps/kig/icons/hicolor/22x22/actions/arc_center.png
 share/apps/kig/icons/hicolor/22x22/actions/areaCircle.png
 share/apps/kig/icons/hicolor/22x22/actions/attacher.png
 share/apps/kig/icons/hicolor/22x22/actions/baseCircle.png
+share/apps/kig/icons/hicolor/22x22/actions/bezier3.png
+share/apps/kig/icons/hicolor/22x22/actions/bezier4.png
+share/apps/kig/icons/hicolor/22x22/actions/bezierN.png
+share/apps/kig/icons/hicolor/22x22/actions/beziercurves.png
 share/apps/kig/icons/hicolor/22x22/actions/bisection.png
 share/apps/kig/icons/hicolor/22x22/actions/centerofcurvature.png
 share/apps/kig/icons/hicolor/22x22/actions/centralsymmetry.png
@@ -1487,6 +1549,7 @@ share/apps/kig/icons/hicolor/22x22/actions/conicasymptotes.png
 share/apps/kig/icons/hicolor/22x22/actions/conicb5p.png
 share/apps/kig/icons/hicolor/22x22/actions/coniclineintersection.png
 share/apps/kig/icons/hicolor/22x22/actions/conicsradicalline.png
+share/apps/kig/icons/hicolor/22x22/actions/controlpolygon.png
 share/apps/kig/icons/hicolor/22x22/actions/convexhull.png
 share/apps/kig/icons/hicolor/22x22/actions/curvelineintersection.png
 share/apps/kig/icons/hicolor/22x22/actions/directrix.png
@@ -1510,6 +1573,7 @@ share/apps/kig/icons/hicolor/22x22/actions/line.png
 share/apps/kig/icons/hicolor/22x22/actions/linebyvector.png
 share/apps/kig/icons/hicolor/22x22/actions/locus.png
 share/apps/kig/icons/hicolor/22x22/actions/mirrorpoint.png
+share/apps/kig/icons/hicolor/22x22/actions/openpolygon.png
 share/apps/kig/icons/hicolor/22x22/actions/paint.png
 share/apps/kig/icons/hicolor/22x22/actions/parabolabtp.png
 share/apps/kig/icons/hicolor/22x22/actions/parallel.png
@@ -1522,6 +1586,9 @@ share/apps/kig/icons/hicolor/22x22/actions/polygonvertices.png
 share/apps/kig/icons/hicolor/22x22/actions/python.png
 share/apps/kig/icons/hicolor/22x22/actions/radicalline.png
 share/apps/kig/icons/hicolor/22x22/actions/ray.png
+share/apps/kig/icons/hicolor/22x22/actions/rbezier3.png
+share/apps/kig/icons/hicolor/22x22/actions/rbezier4.png
+share/apps/kig/icons/hicolor/22x22/actions/rbezierN.png
 share/apps/kig/icons/hicolor/22x22/actions/rotation.png
 share/apps/kig/icons/hicolor/22x22/actions/scale.png
 share/apps/kig/icons/hicolor/22x22/actions/segment.png
@@ -1555,6 +1622,10 @@ share/apps/kig/icons/hicolor/32x32/actions/arc_center.png
 share/apps/kig/icons/hicolor/32x32/actions/areaCircle.png
 share/apps/kig/icons/hicolor/32x32/actions/attacher.png
 share/apps/kig/icons/hicolor/32x32/actions/baseCircle.png
+share/apps/kig/icons/hicolor/32x32/actions/bezier3.png
+share/apps/kig/icons/hicolor/32x32/actions/bezier4.png
+share/apps/kig/icons/hicolor/32x32/actions/bezierN.png
+share/apps/kig/icons/hicolor/32x32/actions/beziercurves.png
 share/apps/kig/icons/hicolor/32x32/actions/bisection.png
 share/apps/kig/icons/hicolor/32x32/actions/centerofcurvature.png
 share/apps/kig/icons/hicolor/32x32/actions/centralsymmetry.png
@@ -1569,6 +1640,7 @@ share/apps/kig/icons/hicolor/32x32/actions/conicasymptotes.png
 share/apps/kig/icons/hicolor/32x32/actions/conicb5p.png
 share/apps/kig/icons/hicolor/32x32/actions/coniclineintersection.png
 share/apps/kig/icons/hicolor/32x32/actions/conicsradicalline.png
+share/apps/kig/icons/hicolor/32x32/actions/controlpolygon.png
 share/apps/kig/icons/hicolor/32x32/actions/convexhull.png
 share/apps/kig/icons/hicolor/32x32/actions/curvelineintersection.png
 share/apps/kig/icons/hicolor/32x32/actions/directrix.png
@@ -1592,6 +1664,7 @@ share/apps/kig/icons/hicolor/32x32/actions/line.png
 share/apps/kig/icons/hicolor/32x32/actions/linebyvector.png
 share/apps/kig/icons/hicolor/32x32/actions/locus.png
 share/apps/kig/icons/hicolor/32x32/actions/mirrorpoint.png
+share/apps/kig/icons/hicolor/32x32/actions/openpolygon.png
 share/apps/kig/icons/hicolor/32x32/actions/paint.png
 share/apps/kig/icons/hicolor/32x32/actions/parabolabtp.png
 share/apps/kig/icons/hicolor/32x32/actions/parallel.png
@@ -1604,6 +1677,9 @@ share/apps/kig/icons/hicolor/32x32/actions/polygonvertices.png
 share/apps/kig/icons/hicolor/32x32/actions/python.png
 share/apps/kig/icons/hicolor/32x32/actions/radicalline.png
 share/apps/kig/icons/hicolor/32x32/actions/ray.png
+share/apps/kig/icons/hicolor/32x32/actions/rbezier3.png
+share/apps/kig/icons/hicolor/32x32/actions/rbezier4.png
+share/apps/kig/icons/hicolor/32x32/actions/rbezierN.png
 share/apps/kig/icons/hicolor/32x32/actions/rotation.png
 share/apps/kig/icons/hicolor/32x32/actions/scale.png
 share/apps/kig/icons/hicolor/32x32/actions/segment.png
@@ -1636,6 +1712,10 @@ share/apps/kig/icons/hicolor/scalable/actions/arc_center.svgz
 share/apps/kig/icons/hicolor/scalable/actions/areaCircle.svgz
 share/apps/kig/icons/hicolor/scalable/actions/attacher.svgz
 share/apps/kig/icons/hicolor/scalable/actions/baseCircle.svgz
+share/apps/kig/icons/hicolor/scalable/actions/bezier3.svgz
+share/apps/kig/icons/hicolor/scalable/actions/bezier4.svgz
+share/apps/kig/icons/hicolor/scalable/actions/bezierN.svgz
+share/apps/kig/icons/hicolor/scalable/actions/beziercurves.svgz
 share/apps/kig/icons/hicolor/scalable/actions/bisection.svgz
 share/apps/kig/icons/hicolor/scalable/actions/centerofcurvature.svgz
 share/apps/kig/icons/hicolor/scalable/actions/centralsymmetry.svgz
@@ -1650,6 +1730,7 @@ share/apps/kig/icons/hicolor/scalable/actions/conicasymptotes.svgz
 share/apps/kig/icons/hicolor/scalable/actions/conicb5p.svgz
 share/apps/kig/icons/hicolor/scalable/actions/coniclineintersection.svgz
 share/apps/kig/icons/hicolor/scalable/actions/conicsradicalline.svgz
+share/apps/kig/icons/hicolor/scalable/actions/controlpolygon.svgz
 share/apps/kig/icons/hicolor/scalable/actions/convexhull.svgz
 share/apps/kig/icons/hicolor/scalable/actions/curvelineintersection.svgz
 share/apps/kig/icons/hicolor/scalable/actions/directrix.svgz
@@ -1673,6 +1754,7 @@ share/apps/kig/icons/hicolor/scalable/actions/line.svgz
 share/apps/kig/icons/hicolor/scalable/actions/linebyvector.svgz
 share/apps/kig/icons/hicolor/scalable/actions/locus.svgz
 share/apps/kig/icons/hicolor/scalable/actions/mirrorpoint.svgz
+share/apps/kig/icons/hicolor/scalable/actions/openpolygon.svgz
 share/apps/kig/icons/hicolor/scalable/actions/paint.svgz
 share/apps/kig/icons/hicolor/scalable/actions/parabolabtp.svgz
 share/apps/kig/icons/hicolor/scalable/actions/parallel.svgz
@@ -1685,6 +1767,9 @@ share/apps/kig/icons/hicolor/scalable/actions/polygonvertices.svgz
 share/apps/kig/icons/hicolor/scalable/actions/python.svgz
 share/apps/kig/icons/hicolor/scalable/actions/radicalline.svgz
 share/apps/kig/icons/hicolor/scalable/actions/ray.svgz
+share/apps/kig/icons/hicolor/scalable/actions/rbezier3.svgz
+share/apps/kig/icons/hicolor/scalable/actions/rbezier4.svgz
+share/apps/kig/icons/hicolor/scalable/actions/rbezierN.svgz
 share/apps/kig/icons/hicolor/scalable/actions/rotation.svgz
 share/apps/kig/icons/hicolor/scalable/actions/scale.svgz
 share/apps/kig/icons/hicolor/scalable/actions/segment.svgz
@@ -2223,7 +2308,9 @@ share/apps/ktouch/cs.qwertz.keyboard.xml
 share/apps/ktouch/czech.ktouch.xml
 share/apps/ktouch/danish.ktouch.xml
 share/apps/ktouch/danish2.ktouch.xml
+share/apps/ktouch/de.dvorak.type2.keyboard.xml
 share/apps/ktouch/de.keyboard.xml
+share/apps/ktouch/de.neo2.all.keyboard.xml
 share/apps/ktouch/de_ch.keyboard.xml
 share/apps/ktouch/dk.keyboard.xml
 share/apps/ktouch/down.wav
@@ -2248,8 +2335,9 @@ share/apps/ktouch/fr.keyboard.xml
 share/apps/ktouch/fr_ch.keyboard.xml
 share/apps/ktouch/french.ktouch.xml
 share/apps/ktouch/french2.ktouch.xml
+share/apps/ktouch/german.dvorak.type2.ktouch.xml
 share/apps/ktouch/german.ktouch.xml
-share/apps/ktouch/german.neo.ktouch.xml
+share/apps/ktouch/german.neo2.ktouch.xml
 share/apps/ktouch/german.number.ktouch.xml
 share/apps/ktouch/german2.ktouch.xml
 share/apps/ktouch/german3.ktouch.xml
@@ -2469,13 +2557,13 @@ share/apps/kwordquiz/kwordquizui.rc
 share/apps/libkdeedu/data/elements.xml
 share/apps/libkdeedu/data/isotopes.xml
 share/apps/libkdeedu/data/spectra.xml
+share/apps/libkdeedu/data/symbols.csv
+share/apps/libkdeedu/data/symbols2.csv
 share/apps/marble/data/LICENSE.txt
 share/apps/marble/data/bitmaps/airport.png
+share/apps/marble/data/bitmaps/annotation.png
 share/apps/marble/data/bitmaps/border_1.png
 share/apps/marble/data/bitmaps/border_2.png
-share/apps/marble/data/bitmaps/checkbox_checked.png
-share/apps/marble/data/bitmaps/checkbox_disabled.png
-share/apps/marble/data/bitmaps/checkbox_empty.png
 share/apps/marble/data/bitmaps/city_1_orange.png
 share/apps/marble/data/bitmaps/city_1_red.png
 share/apps/marble/data/bitmaps/city_1_white.png
@@ -2504,6 +2592,7 @@ share/apps/marble/data/bitmaps/cursor_tl.xpm
 share/apps/marble/data/bitmaps/cursor_tr.xpm
 share/apps/marble/data/bitmaps/default_location.png
 share/apps/marble/data/bitmaps/earth_apollo.jpg
+share/apps/marble/data/bitmaps/hand.png
 share/apps/marble/data/bitmaps/lake.png
 share/apps/marble/data/bitmaps/manned_landing.png
 share/apps/marble/data/bitmaps/mountain_1.png
@@ -2771,6 +2860,7 @@ share/apps/marble/data/flags/flag_zw.svg
 share/apps/marble/data/landcolors.leg
 share/apps/marble/data/legend.css
 share/apps/marble/data/legend.html
+share/apps/marble/data/licenses/lgpl2.txt
 share/apps/marble/data/maps/earth/bluemarble/bluemarble-preview.png
 share/apps/marble/data/maps/earth/bluemarble/bluemarble.dgml
 share/apps/marble/data/maps/earth/bluemarble/bluemarble.jpg
@@ -3035,15 +3125,44 @@ share/apps/marble/data/svg/application-x-marble-gray.png
 share/apps/marble/data/svg/application-x-marble.png
 share/apps/marble/data/svg/application-x-marble.svg
 share/apps/marble/data/svg/compass.svg
+share/apps/marble/data/svg/configure.svgz
 share/apps/marble/data/svg/coordinate.svg
+share/apps/marble/data/svg/help-about.svgz
 share/apps/marble/data/svg/lunarmap.svg
 share/apps/marble/data/svg/marble-logo-72dpi.png
 share/apps/marble/data/svg/marble-logo-inverted-72dpi.png
 share/apps/marble/data/svg/marble-logo.png
 share/apps/marble/data/svg/marble-logo.svg
 share/apps/marble/data/svg/wikipedia.svg
+share/apps/marble/data/svg/wikipedia_shadow.svg
 share/apps/marble/data/svg/worldmap.svg
 share/apps/marble/data/tempcolors.leg
+share/apps/marble/data/weather/bbc-stations.xml
+share/apps/marble/data/weather/weather-clear-night.png
+share/apps/marble/data/weather/weather-clear.png
+share/apps/marble/data/weather/weather-clouds-night.png
+share/apps/marble/data/weather/weather-clouds.png
+share/apps/marble/data/weather/weather-few-clouds-night.png
+share/apps/marble/data/weather/weather-few-clouds.png
+share/apps/marble/data/weather/weather-hail.png
+share/apps/marble/data/weather/weather-many-clouds.png
+share/apps/marble/data/weather/weather-mist.png
+share/apps/marble/data/weather/weather-none-available.png
+share/apps/marble/data/weather/weather-showers-day.png
+share/apps/marble/data/weather/weather-showers-night.png
+share/apps/marble/data/weather/weather-showers-scattered-day.png
+share/apps/marble/data/weather/weather-showers-scattered-night.png
+share/apps/marble/data/weather/weather-showers-scattered.png
+share/apps/marble/data/weather/weather-showers.png
+share/apps/marble/data/weather/weather-snow-rain.png
+share/apps/marble/data/weather/weather-snow-scattered-day.png
+share/apps/marble/data/weather/weather-snow-scattered-night.png
+share/apps/marble/data/weather/weather-snow-scattered.png
+share/apps/marble/data/weather/weather-snow.png
+share/apps/marble/data/weather/weather-storm-day.png
+share/apps/marble/data/weather/weather-storm-night.png
+share/apps/marble/data/weather/weather-storm.png
+share/apps/marble/data/weather/wind-arrows.svgz
 share/apps/marble/marble.knsrc
 share/apps/marble/marbleui.rc
 share/apps/marble_part/marble_part.rc
@@ -3118,7 +3237,6 @@ share/apps/parley/icons/oxygen/scalable/actions/practice-setup.svgz
 share/apps/parley/icons/oxygen/scalable/actions/practice-start.svgz
 share/apps/parley/icons/oxygen/scalable/actions/remove-duplicates.svgz
 share/apps/parley/icons/oxygen/scalable/actions/set-language.svgz
-share/apps/parley/parleypracticeui.rc
 share/apps/parley/parleyui.rc
 share/apps/parley/plugins/example.desktop
 share/apps/parley/plugins/example.py
@@ -3149,8 +3267,10 @@ share/apps/parley/plugins/wiktionary_sound.py
 share/apps/parley/tips
 share/apps/parley/xslt/flashcards.xsl
 share/apps/parley/xslt/table.xsl
+share/apps/rocs/rocsui.rc
 share/apps/step/examples/brownian.step
 share/apps/step/examples/doublependulum.step
+share/apps/step/examples/eightpendula.step
 share/apps/step/examples/first.step
 share/apps/step/examples/fourpendula.step
 share/apps/step/examples/gas.step
@@ -3184,6 +3304,8 @@ share/apps/step/tutorials/tutorial3.step
 share/apps/step/tutorials/tutorial4.step
 share/apps/step/tutorials/tutorial5.step
 share/config.kcfg/blinken.kcfg
+share/config.kcfg/cantor.kcfg
+share/config.kcfg/cantor_libs.kcfg
 share/config.kcfg/documentsettings.kcfg
 share/config.kcfg/kalzium.kcfg
 share/config.kcfg/kanagram.kcfg
@@ -3198,8 +3320,15 @@ share/config.kcfg/ktouch.kcfg
 share/config.kcfg/kwordquiz.kcfg
 share/config.kcfg/languagesettings.kcfg
 share/config.kcfg/marble.kcfg
+share/config.kcfg/maximabackend.kcfg
 share/config.kcfg/parley.kcfg
+share/config.kcfg/rocs.kcfg
+share/config.kcfg/sagebackend.kcfg
 share/config.kcfg/step.kcfg
+share/config/cantor.knsrc
+share/config/cantor_kalgebra.knsrc
+share/config/cantor_maxima.knsrc
+share/config/cantor_sage.knsrc
 share/config/kalzium.knsrc
 share/config/kanagram.knsrc
 share/config/khangman.knsrc
@@ -3222,6 +3351,11 @@ share/doc/HTML/en/blinken/blinken_quitbutton.png
 share/doc/HTML/en/blinken/common
 share/doc/HTML/en/blinken/index.cache.bz2
 share/doc/HTML/en/blinken/index.docbook
+share/doc/HTML/en/cantor/common
+share/doc/HTML/en/cantor/index.cache.bz2
+share/doc/HTML/en/cantor/index.docbook
+share/doc/HTML/en/cantor/latex_formula.png
+share/doc/HTML/en/cantor/screenshot.png
 share/doc/HTML/en/kalgebra/common
 share/doc/HTML/en/kalgebra/index.cache.bz2
 share/doc/HTML/en/kalgebra/index.docbook
@@ -3503,7 +3637,6 @@ share/doc/HTML/en/ktouch/statistics_dialog.png
 share/doc/HTML/en/ktouch/statistics_dialog_chart.png
 share/doc/HTML/en/ktouch/training_options.png
 share/doc/HTML/en/kturtle/common
-share/doc/HTML/en/kturtle/forward.png
 share/doc/HTML/en/kturtle/getting-started.docbook
 share/doc/HTML/en/kturtle/glossary.docbook
 share/doc/HTML/en/kturtle/index.cache.bz2
@@ -3599,6 +3732,9 @@ share/doc/HTML/en/parley/stat1-dlg.png
 share/doc/HTML/en/parley/stat2-dlg.png
 share/doc/HTML/en/parley/syn-query-dlg.png
 share/doc/HTML/en/parley/verb-query-dlg.png
+share/doc/HTML/en/rocs/common
+share/doc/HTML/en/rocs/index.cache.bz2
+share/doc/HTML/en/rocs/index.docbook
 share/doc/HTML/en/step/circular-motor.png
 share/doc/HTML/en/step/common
 share/doc/HTML/en/step/disk-properties.png
@@ -3631,7 +3767,18 @@ share/icons/hicolor/128x128/apps/marble.png
 share/icons/hicolor/128x128/apps/parley.png
 share/icons/hicolor/128x128/apps/step.png
 share/icons/hicolor/128x128/mimetypes/application-x-kig.png
+share/icons/hicolor/16x16/actions/rocsaddedge.png
+share/icons/hicolor/16x16/actions/rocsaddnode.png
+share/icons/hicolor/16x16/actions/rocsallignbottom.png
+share/icons/hicolor/16x16/actions/rocsallignhmiddle.png
+share/icons/hicolor/16x16/actions/rocsallignleft.png
+share/icons/hicolor/16x16/actions/rocsallignright.png
+share/icons/hicolor/16x16/actions/rocsalligntop.png
+share/icons/hicolor/16x16/actions/rocsallignvmiddle.png
+share/icons/hicolor/16x16/actions/rocsdelete.png
+share/icons/hicolor/16x16/actions/rocsselect.png
 share/icons/hicolor/16x16/apps/blinken.png
+share/icons/hicolor/16x16/apps/cantor.png
 share/icons/hicolor/16x16/apps/kalgebra.png
 share/icons/hicolor/16x16/apps/kalzium.png
 share/icons/hicolor/16x16/apps/kanagram.png
@@ -3650,6 +3797,12 @@ share/icons/hicolor/16x16/apps/marble.png
 share/icons/hicolor/16x16/apps/parley.png
 share/icons/hicolor/16x16/apps/step.png
 share/icons/hicolor/16x16/mimetypes/application-x-kig.png
+share/icons/hicolor/22x22/actions/rocsallignbottom.png
+share/icons/hicolor/22x22/actions/rocsallignhmiddle.png
+share/icons/hicolor/22x22/actions/rocsallignleft.png
+share/icons/hicolor/22x22/actions/rocsallignright.png
+share/icons/hicolor/22x22/actions/rocsalligntop.png
+share/icons/hicolor/22x22/actions/rocsallignvmiddle.png
 share/icons/hicolor/22x22/apps/blinken.png
 share/icons/hicolor/22x22/apps/kalzium.png
 share/icons/hicolor/22x22/apps/kanagram.png
@@ -3666,7 +3819,18 @@ share/icons/hicolor/22x22/apps/kwordquiz.png
 share/icons/hicolor/22x22/apps/marble.png
 share/icons/hicolor/22x22/apps/step.png
 share/icons/hicolor/22x22/mimetypes/application-x-kig.png
+share/icons/hicolor/32x32/actions/rocsaddedge.png
+share/icons/hicolor/32x32/actions/rocsaddnode.png
+share/icons/hicolor/32x32/actions/rocsallignbottom.png
+share/icons/hicolor/32x32/actions/rocsallignhmiddle.png
+share/icons/hicolor/32x32/actions/rocsallignleft.png
+share/icons/hicolor/32x32/actions/rocsallignright.png
+share/icons/hicolor/32x32/actions/rocsalligntop.png
+share/icons/hicolor/32x32/actions/rocsallignvmiddle.png
+share/icons/hicolor/32x32/actions/rocsdelete.png
+share/icons/hicolor/32x32/actions/rocsselect.png
 share/icons/hicolor/32x32/apps/blinken.png
+share/icons/hicolor/32x32/apps/cantor.png
 share/icons/hicolor/32x32/apps/kalgebra.png
 share/icons/hicolor/32x32/apps/kalzium.png
 share/icons/hicolor/32x32/apps/kanagram.png
@@ -3685,7 +3849,15 @@ share/icons/hicolor/32x32/apps/marble.png
 share/icons/hicolor/32x32/apps/parley.png
 share/icons/hicolor/32x32/apps/step.png
 share/icons/hicolor/32x32/mimetypes/application-x-kig.png
+share/icons/hicolor/48x48/actions/rocsaddnode.png
+share/icons/hicolor/48x48/actions/rocsallignbottom.png
+share/icons/hicolor/48x48/actions/rocsallignhmiddle.png
+share/icons/hicolor/48x48/actions/rocsallignleft.png
+share/icons/hicolor/48x48/actions/rocsallignright.png
+share/icons/hicolor/48x48/actions/rocsalligntop.png
+share/icons/hicolor/48x48/actions/rocsallignvmiddle.png
 share/icons/hicolor/48x48/apps/blinken.png
+share/icons/hicolor/48x48/apps/cantor.png
 share/icons/hicolor/48x48/apps/kalgebra.png
 share/icons/hicolor/48x48/apps/kalzium.png
 share/icons/hicolor/48x48/apps/kanagram.png
@@ -3701,9 +3873,22 @@ share/icons/hicolor/48x48/apps/ktouch.png
 share/icons/hicolor/48x48/apps/kturtle.png
 share/icons/hicolor/48x48/apps/kwordquiz.png
 share/icons/hicolor/48x48/apps/marble.png
+share/icons/hicolor/48x48/apps/maximabackend.png
 share/icons/hicolor/48x48/apps/parley.png
+share/icons/hicolor/48x48/apps/rbackend.png
+share/icons/hicolor/48x48/apps/sagebackend.png
 share/icons/hicolor/48x48/apps/step.png
 share/icons/hicolor/48x48/mimetypes/application-x-kig.png
+share/icons/hicolor/64x64/actions/rocsaddedge.png
+share/icons/hicolor/64x64/actions/rocsaddnode.png
+share/icons/hicolor/64x64/actions/rocsallignbottom.png
+share/icons/hicolor/64x64/actions/rocsallignhmiddle.png
+share/icons/hicolor/64x64/actions/rocsallignleft.png
+share/icons/hicolor/64x64/actions/rocsallignright.png
+share/icons/hicolor/64x64/actions/rocsalligntop.png
+share/icons/hicolor/64x64/actions/rocsallignvmiddle.png
+share/icons/hicolor/64x64/actions/rocsdelete.png
+share/icons/hicolor/64x64/actions/rocsselect.png
 share/icons/hicolor/64x64/apps/blinken.png
 share/icons/hicolor/64x64/apps/kalgebra.png
 share/icons/hicolor/64x64/apps/kalzium.png
@@ -3763,16 +3948,38 @@ share/icons/oxygen/22x22/actions/step_object_Spring.png
 share/icons/oxygen/22x22/actions/step_object_Stick.png
 share/icons/oxygen/22x22/actions/step_object_Tracer.png
 share/icons/oxygen/22x22/actions/step_object_WeightForce.png
+share/kde4/services/cantor/cantor_part.desktop
+share/kde4/services/cantor/creatematrixassistant.desktop
+share/kde4/services/cantor/differentiateassistant.desktop
+share/kde4/services/cantor/eigenvaluesassistant.desktop
+share/kde4/services/cantor/eigenvectorsassistant.desktop
+share/kde4/services/cantor/integrateassistant.desktop
+share/kde4/services/cantor/invertmatrixassistant.desktop
+share/kde4/services/cantor/kalgebrabackend.desktop
+share/kde4/services/cantor/maximabackend.desktop
+share/kde4/services/cantor/nullbackend.desktop
+share/kde4/services/cantor/plot2dassistant.desktop
+share/kde4/services/cantor/plot3dassistant.desktop
+share/kde4/services/cantor/runscriptassistant.desktop
+share/kde4/services/cantor/sagebackend.desktop
+share/kde4/services/cantor/solveassistant.desktop
+share/kde4/services/concentrationCalculator.desktop
+share/kde4/services/gasCalculator.desktop
 share/kde4/services/kalgebraplasmoid.desktop
 share/kde4/services/kig_part.desktop
 share/kde4/services/kmplot_part.desktop
 share/kde4/services/marble_part.desktop
+share/kde4/services/nuclearCalculator.desktop
 share/kde4/services/plasma-applet-kworldclock.desktop
 share/kde4/services/plasma-dataengine-kalzium.desktop
 share/kde4/services/plasma-dataengine-parley.desktop
 share/kde4/services/plasma_didyouknow.desktop
 share/kde4/services/plasma_parley.desktop
+share/kde4/servicetypes/cantor_assistant.desktop
+share/kde4/servicetypes/cantor_backend.desktop
+@dirrm share/kde4/services/cantor
 @dirrm share/doc/HTML/en/step
+@dirrm share/doc/HTML/en/rocs
 @dirrm share/doc/HTML/en/parley
 @dirrm share/doc/HTML/en/marble
 @dirrm share/doc/HTML/en/kwordquiz
@@ -3789,11 +3996,13 @@ share/kde4/services/plasma_parley.desktop
 @dirrm share/doc/HTML/en/kanagram
 @dirrm share/doc/HTML/en/kalzium
 @dirrm share/doc/HTML/en/kalgebra
+@dirrm share/doc/HTML/en/cantor
 @dirrm share/doc/HTML/en/blinken
 @dirrm share/apps/step/tutorials
 @dirrm share/apps/step/objinfo
 @dirrm share/apps/step/examples
 @dirrm share/apps/step
+@dirrm share/apps/rocs
 @dirrm share/apps/parley/xslt
 @dirrm share/apps/parley/plugins/mwclient/simplejson
 @dirrm share/apps/parley/plugins/mwclient
@@ -3812,6 +4021,7 @@ share/kde4/services/plasma_parley.desktop
 @dirrm share/apps/parley/icons
 @dirrm share/apps/parley
 @dirrm share/apps/marble_part
+@dirrm share/apps/marble/data/weather
 @dirrm share/apps/marble/data/svg
 @dirrm share/apps/marble/data/stars
 @dirrm share/apps/marble/data/placemarks
@@ -3855,6 +4065,7 @@ share/kde4/services/plasma_parley.desktop
 @dirrm share/apps/marble/data/maps/earth/bluemarble
 @dirrm share/apps/marble/data/maps/earth
 @dirrm share/apps/marble/data/maps
+@dirrm share/apps/marble/data/licenses
 @dirrm share/apps/marble/data/flags
 @dirrm share/apps/marble/data/bitmaps
 @dirrm share/apps/marble/data
@@ -4024,6 +4235,8 @@ share/kde4/services/plasma_parley.desktop
 @dirrm share/apps/kalzium
 @dirrmtry share/apps/cmake/modules
 @dirrmtry share/apps/cmake
+@dirrm share/apps/cantorpart
+@dirrm share/apps/cantor
 @dirrm share/apps/blinken/sounds
 @dirrm share/apps/blinken/images
 @dirrm share/apps/blinken/fonts