Update to KDE SC 4.10.2

bugfixes, other quality improvements, new and improved KDE Applications

14 files changed, 124 insertions, 55 deletions

diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index ece0edb7e03..1ca0516ca1f 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:19:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:56 markd Exp $
 
 DISTNAME=	analitza-${_KDE_VERSION}
-PKGREVISION=	7
 CATEGORIES=	math
 COMMENT=	KDE library for mathematical features
 
diff --git a/math/analitza/PLIST b/math/analitza/PLIST
index c614b43d00d..86d234edfa4 100644
--- a/math/analitza/PLIST
+++ b/math/analitza/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 07:30:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:56 markd Exp $
 bin/calgebra
 include/analitza/abstractlexer.h
 include/analitza/analitzaexport.h
@@ -6,6 +6,7 @@ include/analitza/analitzautils.h
 include/analitza/analyzer.h
 include/analitza/builtinmethods.h
 include/analitza/expression.h
+include/analitza/expressionstream.h
 include/analitza/expressiontype.h
 include/analitza/importqobjectmetatype.h
 include/analitza/object.h
@@ -14,23 +15,36 @@ include/analitza/operator.h
 include/analitza/value.h
 include/analitza/variable.h
 include/analitza/variables.h
+include/analitza/vector.h
 include/analitzagui/algebrahighlighter.h
 include/analitzagui/analitzaguiexport.h
 include/analitzagui/expressionedit.h
-include/analitzagui/function.h
-include/analitzagui/functionfactory.h
-include/analitzagui/functionsmodel.h
-include/analitzagui/functionspainter.h
-include/analitzagui/functionsview.h
-include/analitzagui/graph2d.h
 include/analitzagui/operatorsmodel.h
+include/analitzagui/plotsview2d.h
+include/analitzagui/plotsview3d.h
 include/analitzagui/variablesmodel.h
+include/analitzaplot/analitzaplotexport.h
+include/analitzaplot/functiongraph.h
+include/analitzaplot/planecurve.h
+include/analitzaplot/plotitem.h
+include/analitzaplot/plotsdictionarymodel.h
+include/analitzaplot/plotsfactory.h
+include/analitzaplot/plotsmodel.h
+include/analitzaplot/plotter2d.h
+include/analitzaplot/plotter3d.h
+include/analitzaplot/plottingenums.h
+include/analitzaplot/spacecurve.h
+include/analitzaplot/surface.h
 lib/cmake/analitza/AnalitzaConfig.cmake
-lib/cmake/analitza/AnalitzaTargets-relwithdebinfo.cmake
+lib/cmake/analitza/AnalitzaTargets-${TARGET}.cmake
 lib/cmake/analitza/AnalitzaTargets.cmake
 lib/libanalitza.so
 lib/libanalitza.so.4
-lib/libanalitza.so.4.8.0
+lib/libanalitza.so.${PKGVERSION}
 lib/libanalitzagui.so
 lib/libanalitzagui.so.4
-lib/libanalitzagui.so.4.8.0
+lib/libanalitzagui.so.${PKGVERSION}
+lib/libanalitzaplot.so
+lib/libanalitzaplot.so.4
+lib/libanalitzaplot.so.${PKGVERSION}
+share/kde/apps/libanalitza/plots/basic_curves.plots
diff --git a/math/analitza/distinfo b/math/analitza/distinfo
index c3e45aa89c3..1fc6eb1ee3d 100644
--- a/math/analitza/distinfo
+++ b/math/analitza/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:31 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:56 markd Exp $
 
-SHA1 (analitza-4.8.4.tar.xz) = d3b831730408078c31b686bc49c1d465de5e80da
-RMD160 (analitza-4.8.4.tar.xz) = 269f2e1e947d5d62adcef70dff807ff72b8d6b3f
-Size (analitza-4.8.4.tar.xz) = 146556 bytes
+SHA1 (analitza-4.10.2.tar.xz) = e4acd6859140c3860eead695c2f20195b8df0a4a
+RMD160 (analitza-4.10.2.tar.xz) = fa3145c00385bee8ea2e72e4c2b866d38161b69a
+Size (analitza-4.10.2.tar.xz) = 178632 bytes
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index d0004d31625..4345788ec8f 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:03 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:57 markd Exp $
 
 DISTNAME=	cantor-${_KDE_VERSION}
-PKGREVISION=	7
 CATEGORIES=	math
 COMMENT=	KDE frontend to mathematical software
 
diff --git a/math/cantor/PLIST b/math/cantor/PLIST
index 146d502511b..935356f87b7 100644
--- a/math/cantor/PLIST
+++ b/math/cantor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 07:30:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:57 markd Exp $
 bin/cantor
 include/cantor/animationresult.h
 include/cantor/backend.h
@@ -39,7 +39,7 @@ lib/kde4/cantor_variablemanagerplugin.so
 lib/kde4/libcantorpart.so
 lib/libcantor_config.so
 lib/libcantorlibs.so
-lib/libcantorlibs.so.0.0.3
+lib/libcantorlibs.so.0.0.4
 lib/libcantorlibs.so.1
 share/applications/kde4/cantor.desktop
 share/doc/kde/HTML/en/cantor/common
@@ -70,11 +70,13 @@ share/kde/apps/cantor/cantor_runscript_assistant.rc
 share/kde/apps/cantor/cantor_scripteditor.rc
 share/kde/apps/cantor/cantor_shell.rc
 share/kde/apps/cantor/cantor_solve_assistant.rc
+share/kde/apps/cantor/maximabackend/cantor-initmaxima.lisp
 share/kde/apps/cantor/maximabackend/keywords.xml
 share/kde/apps/cantor/octavebackend/cantor_eigenvectors.m
 share/kde/apps/cantor/octavebackend/cantor_plot2d.m
 share/kde/apps/cantor/octavebackend/cantor_plot3d.m
 share/kde/apps/cantor/octavebackend/cantor_print.m
+share/kde/apps/cantor/sagebackend/keywords.xml
 share/kde/apps/cantor/scilabbackend/keywords.xml
 share/kde/apps/cantor/xslt/latex.xsl
 share/kde/config.kcfg/cantor.kcfg
diff --git a/math/cantor/distinfo b/math/cantor/distinfo
index ed87c8dd629..6da04ac9f9d 100644
--- a/math/cantor/distinfo
+++ b/math/cantor/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:57 markd Exp $
 
-SHA1 (cantor-4.8.4.tar.xz) = 8e284e632144a92f503092738d19843272d0412e
-RMD160 (cantor-4.8.4.tar.xz) = 3408b33bfd3e3216f9953e3c835f4428c55f65ad
-Size (cantor-4.8.4.tar.xz) = 272996 bytes
+SHA1 (cantor-4.10.2.tar.xz) = 7611cb379889f87908931ba25a2de9072de75e22
+RMD160 (cantor-4.10.2.tar.xz) = c0e01c04a8f4ac266f1d3968d02f344e6c87e05f
+Size (cantor-4.10.2.tar.xz) = 318600 bytes
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index 6b0d99539ea..e42ca6f4578 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:58 markd Exp $
 
 DISTNAME=	kalgebra-${_KDE_VERSION}
-PKGREVISION=	7
 CATEGORIES=	math
 COMMENT=	KDE graph calculator
 
diff --git a/math/kalgebra/PLIST b/math/kalgebra/PLIST
index a53e45a118e..3a6d0047dca 100644
--- a/math/kalgebra/PLIST
+++ b/math/kalgebra/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 07:30:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:58 markd Exp $
 bin/kalgebra
 bin/kalgebramobile
+lib/kde4/imports/org/kde/analitza/Graph2D.qml
+lib/kde4/imports/org/kde/analitza/libanalitzadeclarativeplugin.so
+lib/kde4/imports/org/kde/analitza/qmldir
 lib/kde4/plasma_applet_kalgebra.so
 share/applications/kde4/kalgebra.desktop
 share/applications/kde4/kalgebramobile.desktop
@@ -19,23 +22,30 @@ share/icons/hicolor/32x32/apps/kalgebra.png
 share/icons/hicolor/48x48/apps/kalgebra.png
 share/icons/hicolor/64x64/apps/kalgebra.png
 share/icons/hicolor/scalable/apps/kalgebra.svgz
-share/kde/apps/kalgebra/plugins/Console.qml
-share/kde/apps/kalgebra/plugins/Graph2D.qml
-share/kde/apps/kalgebra/plugins/Plot2D.qml
-share/kde/apps/kalgebra/plugins/Tables.qml
-share/kde/apps/kalgebra/plugins/kalgebraconsole.desktop
-share/kde/apps/kalgebra/plugins/kalgebraplot2d.desktop
-share/kde/apps/kalgebra/plugins/kalgebratables.desktop
-share/kde/apps/kalgebra/plugins/widgets/Button.qml
-share/kde/apps/kalgebra/plugins/widgets/CalcButton.qml
-share/kde/apps/kalgebra/plugins/widgets/ExpressionInput.qml
-share/kde/apps/kalgebra/plugins/widgets/KAlgebraMobile.qml
-share/kde/apps/kalgebra/plugins/widgets/KAlgebraPage.qml
-share/kde/apps/kalgebra/plugins/widgets/Keyboard.qml
-share/kde/apps/kalgebra/plugins/widgets/Label.qml
-share/kde/apps/kalgebra/plugins/widgets/RealInput.qml
-share/kde/apps/kalgebra/plugins/widgets/SimpleListView.qml
-share/kde/apps/kalgebra/plugins/widgets/ToolTip.qml
+share/kde/apps/kalgebramobile/plugins/About.qml
+share/kde/apps/kalgebramobile/plugins/Console.qml
+share/kde/apps/kalgebramobile/plugins/Plot2D.qml
+share/kde/apps/kalgebramobile/plugins/Tables.qml
+share/kde/apps/kalgebramobile/plugins/VariablesView.qml
+share/kde/apps/kalgebramobile/plugins/kalgebraabout.desktop
+share/kde/apps/kalgebramobile/plugins/kalgebraconsole.desktop
+share/kde/apps/kalgebramobile/plugins/kalgebraplot2d.desktop
+share/kde/apps/kalgebramobile/plugins/kalgebratables.desktop
+share/kde/apps/kalgebramobile/plugins/kalgebravariables.desktop
+share/kde/apps/kalgebramobile/plugins/widgets/Button.qml
+share/kde/apps/kalgebramobile/plugins/widgets/CalcButton.qml
+share/kde/apps/kalgebramobile/plugins/widgets/ExpressionInput.qml
+share/kde/apps/kalgebramobile/plugins/widgets/KAlgebraMobile.qml
+share/kde/apps/kalgebramobile/plugins/widgets/KAlgebraPage.qml
+share/kde/apps/kalgebramobile/plugins/widgets/Keyboard.qml
+share/kde/apps/kalgebramobile/plugins/widgets/Label.qml
+share/kde/apps/kalgebramobile/plugins/widgets/RealInput.qml
+share/kde/apps/kalgebramobile/plugins/widgets/SimpleListView.qml
+share/kde/apps/kalgebramobile/plugins/widgets/ToolTip.qml
+share/kde/apps/kalgebramobile/plugins/widgets/qmldir
 share/kde/apps/katepart/syntax/kalgebra.xml
+share/kde/apps/plasma/plasmoids/org.kde.graphsplasmoid/contents/ui/config.ui
+share/kde/apps/plasma/plasmoids/org.kde.graphsplasmoid/contents/ui/main.qml
+share/kde/apps/plasma/plasmoids/org.kde.graphsplasmoid/metadata.desktop
+share/kde4/services/graphsplasmoid.desktop
 share/kde4/services/kalgebraplasmoid.desktop
-share/kde4/servicetypes/kalgebrascript.desktop
diff --git a/math/kalgebra/distinfo b/math/kalgebra/distinfo
index 0b83dbb9417..3cdacabf996 100644
--- a/math/kalgebra/distinfo
+++ b/math/kalgebra/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:31 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:58 markd Exp $
 
-SHA1 (kalgebra-4.8.4.tar.xz) = be0bcd290c61713a0365e9eab2ddc8d58f447f34
-RMD160 (kalgebra-4.8.4.tar.xz) = 189031f8f7306e30c2e53e5d13b165a1017131ef
-Size (kalgebra-4.8.4.tar.xz) = 424864 bytes
+SHA1 (kalgebra-4.10.2.tar.xz) = f029006b89aa75e6584836a90832f5130fff49b5
+RMD160 (kalgebra-4.10.2.tar.xz) = 91da1a350016e56a485a404715c4f0957b8a973f
+Size (kalgebra-4.10.2.tar.xz) = 446028 bytes
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index dc70bf0923d..696df979a78 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:24 markd Exp $
 
 DISTNAME=	kcalc-${_KDE_VERSION}
-PKGREVISION=	7
 CATEGORIES=	math
 COMMENT=	KDE scientific calculator
 
@@ -10,6 +9,7 @@ COMMENT=	KDE scientific calculator
 .include "../../meta-pkgs/kde4/kde4.mk"
 
 .include "../../devel/gmp/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index 850e0828aff..a8661629e84 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:31 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:24 markd Exp $
 
-SHA1 (kcalc-4.8.4.tar.xz) = f1cb6cda210c67fd19eca387df2d2224393d45ef
-RMD160 (kcalc-4.8.4.tar.xz) = b291c9a62b9cd129a936301ec0875581ee8d56f6
-Size (kcalc-4.8.4.tar.xz) = 89360 bytes
+SHA1 (kcalc-4.10.2.tar.xz) = 45f2a3eb557891e3c47a00dafb9ad3bd64bde4d8
+RMD160 (kcalc-4.10.2.tar.xz) = 863148b798a1ab09eb137545fd7ce8ce395ee3c8
+Size (kcalc-4.10.2.tar.xz) = 93980 bytes
+SHA1 (patch-CMakeLists.txt) = 3267b41b6a6a25a18b3dc450747beedb2976b45e
+SHA1 (patch-knumber_knumber_float.cpp) = 413c778069c0d38272e67b00eaca1a76a933e5cb
+SHA1 (patch-knumber_tests_CMakeLists.txt) = 7d159f617903b778e65615cb73a81f40f1d262df
diff --git a/math/kcalc/patches/patch-CMakeLists.txt b/math/kcalc/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..9a98ee0945b
--- /dev/null
+++ b/math/kcalc/patches/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2013/04/03 10:52:24 markd Exp $
+
+use mpfr (alternate code doesnt build on BSD)
+
+--- CMakeLists.txt.orig	2013-04-01 23:12:26.000000000 +0000
++++ CMakeLists.txt
+@@ -36,6 +36,9 @@ if(NOT GMP_FOUND)
+     endif()
+ endif(NOT GMP_FOUND)
+ 
++find_package (MPFR REQUIRED)
++add_definitions (-DKNUMBER_USE_MPFR)
++
+ include(CheckTypeSize)
+ include(CheckFunctionExists)
+ include(CheckIncludeFiles)
diff --git a/math/kcalc/patches/patch-knumber_knumber_float.cpp b/math/kcalc/patches/patch-knumber_knumber_float.cpp
new file mode 100644
index 00000000000..2005cec6fb1
--- /dev/null
+++ b/math/kcalc/patches/patch-knumber_knumber_float.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-knumber_knumber_float.cpp,v 1.1 2013/04/03 10:52:24 markd Exp $
+
+use namespace std for isinf() and isnan()
+
+--- knumber/knumber_float.cpp.orig	2013-03-01 07:05:02.000000000 +0000
++++ knumber/knumber_float.cpp
+@@ -25,6 +25,8 @@ along with this program.  If not, see <h
+ #include <QDebug>
+ #include <cmath>
+ 
++using namespace std;
++
+ // NOTE: these assume IEEE floats..
+ #ifndef HAVE_FUNC_ISINF
+ #define isinf(x) ((x) != 0.0 && (x) + (x) == (x))
diff --git a/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt b/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt
new file mode 100644
index 00000000000..1875ebacb93
--- /dev/null
+++ b/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD: patch-knumber_tests_CMakeLists.txt,v 1.1 2013/04/03 10:52:24 markd Exp $
+
+use mpfr (alternate code doesnt build on BSD)
+
+--- knumber/tests/CMakeLists.txt.orig	2013-03-01 07:05:02.000000000 +0000
++++ knumber/tests/CMakeLists.txt
+@@ -5,4 +5,4 @@ set(knumbertest_SRCS knumbertest.cpp ${l
+ 
+ kde4_add_unit_test(knumbertest TESTNAME KNumber ${knumbertest_SRCS})
+ 
+-target_link_libraries(knumbertest ${KDE4_KDECORE_LIBS} ${GMP_LIBRARIES})
++target_link_libraries(knumbertest ${KDE4_KDECORE_LIBS} ${GMP_LIBRARIES} ${MPFR_LIBRARIES})