cantor: update to 19.08.3 qt5/kf5 version

3 files changed, 214 insertions, 119 deletions

diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index efa3a9f0971..8a74b1950b0 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -1,25 +1,39 @@
-# $NetBSD: Makefile,v 1.52 2019/11/02 14:41:09 maya Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/20 22:30:05 markd Exp $
 
-DISTNAME=	cantor-${_KDE_VERSION}
-PKGREVISION=	24
+DISTNAME=	cantor-${KAPPSVER}
 CATEGORIES=	math
+
+HOMEPAGE=	https://kde.org/applications/education/cantor/
 COMMENT=	KDE frontend to mathematical software
+LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2
+
+.include "../../meta-pkgs/kde/applications.mk"
 
-.include "../../meta-pkgs/kde4/Makefile.kde4"
+BUILD_DEPENDS+=	kdoctools>=${KF5VER}:../../devel/kdoctools
 
-CMAKE_ARGS+=	-DWITH_R=OFF
-CMAKE_ARGS+=	-DWITH_LuaJIT=OFF
+USE_TOOLS+=	msgmerge pkg-config
 
-PYTHON_VERSIONS_ACCEPTED=	27
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_R=TRUE
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_LuaJIT=TRUE
 
-.include "../../meta-pkgs/kde4/kde4.mk"
+#  only try to build python3 support
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=TRUE
+SUBST_CLASSES+=		py3
+SUBST_STAGE.py3=	pre-configure
+SUBST_FILES.py3=	cmake/FindPythonLibs3.cmake
+SUBST_SED.py3=		-e 's:python3):python-${PYVERSSUFFIX}):'
 
+REPLACE_SH+=	src/backends/sage/cantor-execsage
+
+.include "../../devel/kpty/buildlink3.mk"
+.include "../../devel/ktexteditor/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../math/analitza/buildlink3.mk"
 .include "../../math/qalculate/buildlink3.mk"
+.include "../../net/knewstuff/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/cantor/PLIST b/math/cantor/PLIST
index 0de139cdea2..38422d6313c 100644
--- a/math/cantor/PLIST
+++ b/math/cantor/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2014/11/13 19:24:23 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/11/20 22:30:06 markd Exp $
 bin/cantor
+bin/cantor_python3server
+bin/cantor_scripteditor
 include/cantor/animationresult.h
 include/cantor/backend.h
 include/cantor/cantor_export.h
 include/cantor/cantor_macros.h
+include/cantor/cantorlibs_version.h
 include/cantor/completionobject.h
 include/cantor/defaulthighlighter.h
 include/cantor/defaultvariablemodel.h
@@ -17,44 +20,130 @@ include/cantor/result.h
 include/cantor/session.h
 include/cantor/syntaxhelpobject.h
 include/cantor/textresult.h
-lib/kde4/cantor_advancedplotassistant.so
-lib/kde4/cantor_creatematrixassistant.so
-lib/kde4/cantor_differentiateassistant.so
-lib/kde4/cantor_eigenvaluesassistant.so
-lib/kde4/cantor_eigenvectorsassistant.so
-lib/kde4/cantor_helppanelplugin.so
-lib/kde4/cantor_importpackageassistant.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_octavebackend.so
-lib/kde4/cantor_plot2dassistant.so
-lib/kde4/cantor_plot3dassistant.so
-lib/kde4/cantor_python2backend.so
-lib/kde4/cantor_qalculatebackend.so
-lib/kde4/cantor_qalculateplotassistant.so
-lib/kde4/cantor_runscriptassistant.so
-lib/kde4/cantor_sagebackend.so
-lib/kde4/cantor_scilabbackend.so
-lib/kde4/cantor_solveassistant.so
-lib/kde4/cantor_variablemanagerplugin.so
-lib/kde4/libcantorpart.so
+include/cantor/worksheetaccess.h
+lib/cmake/Cantor/CantorConfig.cmake
+lib/cmake/Cantor/CantorConfigVersion.cmake
+lib/cmake/Cantor/CantorTargets-noconfig.cmake
+lib/cmake/Cantor/CantorTargets.cmake
 lib/libcantor_config.so
+lib/libcantor_pythonbackend.so
 lib/libcantorlibs.so
-lib/libcantorlibs.so.0.0.4
-lib/libcantorlibs.so.1
-share/appdata/cantor.appdata.xml
-share/applications/kde4/cantor.desktop
-share/doc/kde/HTML/en/cantor/common
-share/doc/kde/HTML/en/cantor/index.cache.bz2
-share/doc/kde/HTML/en/cantor/index.docbook
-share/doc/kde/HTML/en/cantor/latex_formula.png
-share/doc/kde/HTML/en/cantor/screenshot.png
+lib/libcantorlibs.so.${PKGVERSION}
+lib/libcantorlibs.so.23
+qt5/plugins/cantor/assistants/cantor_advancedplotassistant.so
+qt5/plugins/cantor/assistants/cantor_creatematrixassistant.so
+qt5/plugins/cantor/assistants/cantor_differentiateassistant.so
+qt5/plugins/cantor/assistants/cantor_eigenvaluesassistant.so
+qt5/plugins/cantor/assistants/cantor_eigenvectorsassistant.so
+qt5/plugins/cantor/assistants/cantor_importpackageassistant.so
+qt5/plugins/cantor/assistants/cantor_integrateassistant.so
+qt5/plugins/cantor/assistants/cantor_invertmatrixassistant.so
+qt5/plugins/cantor/assistants/cantor_plot2dassistant.so
+qt5/plugins/cantor/assistants/cantor_plot3dassistant.so
+qt5/plugins/cantor/assistants/cantor_qalculateplotassistant.so
+qt5/plugins/cantor/assistants/cantor_runscriptassistant.so
+qt5/plugins/cantor/assistants/cantor_solveassistant.so
+qt5/plugins/cantor/backends/cantor_kalgebrabackend.so
+qt5/plugins/cantor/backends/cantor_maximabackend.so
+qt5/plugins/cantor/backends/cantor_nullbackend.so
+qt5/plugins/cantor/backends/cantor_octavebackend.so
+qt5/plugins/cantor/backends/cantor_python3backend.so
+qt5/plugins/cantor/backends/cantor_qalculatebackend.so
+qt5/plugins/cantor/backends/cantor_sagebackend.so
+qt5/plugins/cantor/backends/cantor_scilabbackend.so
+qt5/plugins/cantor/panels/cantor_helppanelplugin.so
+qt5/plugins/cantor/panels/cantor_variablemanagerplugin.so
+qt5/plugins/libcantorpart.so
+share/applications/org.kde.cantor.desktop
+share/cantor/maximabackend/cantor-initmaxima.lisp
+share/cantor/octavebackend/cantor_eigenvectors.m
+share/cantor/octavebackend/cantor_plot2d.m
+share/cantor/octavebackend/cantor_plot3d.m
+share/cantor/octavebackend/cantor_print.m
+share/cantor/sagebackend/cantor-execsage
+share/cantor/xslt/latex.xsl
+share/config.kcfg/cantor.kcfg
+share/config.kcfg/cantor_libs.kcfg
+share/config.kcfg/kalgebrabackend.kcfg
+share/config.kcfg/maximabackend.kcfg
+share/config.kcfg/octavebackend.kcfg
+share/config.kcfg/python3backend.kcfg
+share/config.kcfg/qalculatebackend.kcfg
+share/config.kcfg/sagebackend.kcfg
+share/config.kcfg/scilabbackend.kcfg
+share/doc/HTML/ca/cantor/create-dlg.png
+share/doc/HTML/ca/cantor/differentiate-dlg.png
+share/doc/HTML/ca/cantor/import-dlg.png
+share/doc/HTML/ca/cantor/index.cache.bz2
+share/doc/HTML/ca/cantor/index.docbook
+share/doc/HTML/ca/cantor/integrate-dlg.png
+share/doc/HTML/ca/cantor/latex_formula.png
+share/doc/HTML/ca/cantor/matrix-dlg.png
+share/doc/HTML/ca/cantor/plot-dlg1.png
+share/doc/HTML/ca/cantor/plot-dlg2.png
+share/doc/HTML/ca/cantor/plot2d-dlg.png
+share/doc/HTML/ca/cantor/plot3d-dlg.png
+share/doc/HTML/ca/cantor/screenshot.png
+share/doc/HTML/ca/cantor/solve-equations-dlg.png
+share/doc/HTML/de/cantor/index.cache.bz2
+share/doc/HTML/de/cantor/index.docbook
+share/doc/HTML/en/cantor/create-dlg.png
+share/doc/HTML/en/cantor/differentiate-dlg.png
+share/doc/HTML/en/cantor/import-dlg.png
+share/doc/HTML/en/cantor/index.cache.bz2
+share/doc/HTML/en/cantor/index.docbook
+share/doc/HTML/en/cantor/integrate-dlg.png
+share/doc/HTML/en/cantor/latex_formula.png
+share/doc/HTML/en/cantor/matrix-dlg.png
+share/doc/HTML/en/cantor/plot-dlg1.png
+share/doc/HTML/en/cantor/plot-dlg2.png
+share/doc/HTML/en/cantor/plot2d-dlg.png
+share/doc/HTML/en/cantor/plot3d-dlg.png
+share/doc/HTML/en/cantor/screenshot.png
+share/doc/HTML/en/cantor/solve-equations-dlg.png
+share/doc/HTML/es/cantor/index.cache.bz2
+share/doc/HTML/es/cantor/index.docbook
+share/doc/HTML/es/cantor/screenshot.png
+share/doc/HTML/et/cantor/index.cache.bz2
+share/doc/HTML/et/cantor/index.docbook
+share/doc/HTML/fr/cantor/index.cache.bz2
+share/doc/HTML/fr/cantor/index.docbook
+share/doc/HTML/fr/cantor/screenshot.png
+share/doc/HTML/gl/cantor/index.cache.bz2
+share/doc/HTML/gl/cantor/index.docbook
+share/doc/HTML/it/cantor/index.cache.bz2
+share/doc/HTML/it/cantor/index.docbook
+share/doc/HTML/nl/cantor/index.cache.bz2
+share/doc/HTML/nl/cantor/index.docbook
+share/doc/HTML/pt/cantor/index.cache.bz2
+share/doc/HTML/pt/cantor/index.docbook
+share/doc/HTML/pt_BR/cantor/index.cache.bz2
+share/doc/HTML/pt_BR/cantor/index.docbook
+share/doc/HTML/pt_BR/cantor/screenshot.png
+share/doc/HTML/ru/cantor/index.cache.bz2
+share/doc/HTML/ru/cantor/index.docbook
+share/doc/HTML/sv/cantor/index.cache.bz2
+share/doc/HTML/sv/cantor/index.docbook
+share/doc/HTML/uk/cantor/create-dlg.png
+share/doc/HTML/uk/cantor/differentiate-dlg.png
+share/doc/HTML/uk/cantor/import-dlg.png
+share/doc/HTML/uk/cantor/index.cache.bz2
+share/doc/HTML/uk/cantor/index.docbook
+share/doc/HTML/uk/cantor/integrate-dlg.png
+share/doc/HTML/uk/cantor/matrix-dlg.png
+share/doc/HTML/uk/cantor/plot-dlg1.png
+share/doc/HTML/uk/cantor/plot-dlg2.png
+share/doc/HTML/uk/cantor/plot2d-dlg.png
+share/doc/HTML/uk/cantor/plot3d-dlg.png
+share/doc/HTML/uk/cantor/screenshot.png
+share/doc/HTML/uk/cantor/solve-equations-dlg.png
+share/icons/hicolor/128x128/apps/cantor.png
 share/icons/hicolor/16x16/apps/cantor.png
+share/icons/hicolor/22x22/apps/cantor.png
 share/icons/hicolor/32x32/apps/cantor.png
 share/icons/hicolor/48x48/apps/cantor.png
+share/icons/hicolor/48x48/apps/juliabackend.png
+share/icons/hicolor/48x48/apps/kalgebrabackend.png
 share/icons/hicolor/48x48/apps/luabackend.png
 share/icons/hicolor/48x48/apps/maximabackend.png
 share/icons/hicolor/48x48/apps/octavebackend.png
@@ -63,73 +152,65 @@ share/icons/hicolor/48x48/apps/qalculatebackend.png
 share/icons/hicolor/48x48/apps/rbackend.png
 share/icons/hicolor/48x48/apps/sagebackend.png
 share/icons/hicolor/48x48/apps/scilabbackend.png
-share/kde/apps/cantor/cantor_advancedplot_assistant.rc
-share/kde/apps/cantor/cantor_create_matrix_assistant.rc
-share/kde/apps/cantor/cantor_differentiate_assistant.rc
-share/kde/apps/cantor/cantor_eigenvalues_assistant.rc
-share/kde/apps/cantor/cantor_eigenvectors_assistant.rc
-share/kde/apps/cantor/cantor_import_package_assistant.rc
-share/kde/apps/cantor/cantor_integrate_assistant.rc
-share/kde/apps/cantor/cantor_invert_matrix_assistant.rc
-share/kde/apps/cantor/cantor_part.rc
-share/kde/apps/cantor/cantor_plot2d_assistant.rc
-share/kde/apps/cantor/cantor_plot3d_assistant.rc
-share/kde/apps/cantor/cantor_qalculateplotassistant.rc
-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/python2backend/keywords.xml
-share/kde/apps/cantor/sagebackend/keywords.xml
-share/kde/apps/cantor/xslt/latex.xsl
-share/kde/config.kcfg/cantor.kcfg
-share/kde/config.kcfg/cantor_libs.kcfg
-share/kde/config.kcfg/kalgebrabackend.kcfg
-share/kde/config.kcfg/maximabackend.kcfg
-share/kde/config.kcfg/octavebackend.kcfg
-share/kde/config.kcfg/python2backend.kcfg
-share/kde/config.kcfg/qalculatebackend.kcfg
-share/kde/config.kcfg/sagebackend.kcfg
-share/kde/config.kcfg/scilabbackend.kcfg
-share/kde/config/cantor.knsrc
-share/kde/config/cantor_kalgebra.knsrc
-share/kde/config/cantor_lua.knsrc
-share/kde/config/cantor_maxima.knsrc
-share/kde/config/cantor_octave.knsrc
-share/kde/config/cantor_python2.knsrc
-share/kde/config/cantor_qalculate.knsrc
-share/kde/config/cantor_sage.knsrc
-share/kde/config/cantor_scilab.knsrc
-share/kde4/services/cantor/advancedplotassistant.desktop
-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/helppanelplugin.desktop
-share/kde4/services/cantor/importpackageassistant.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/octavebackend.desktop
-share/kde4/services/cantor/plot2dassistant.desktop
-share/kde4/services/cantor/plot3dassistant.desktop
-share/kde4/services/cantor/python2backend.desktop
-share/kde4/services/cantor/qalculatebackend.desktop
-share/kde4/services/cantor/qalculateplotassistant.desktop
-share/kde4/services/cantor/runscriptassistant.desktop
-share/kde4/services/cantor/sagebackend.desktop
-share/kde4/services/cantor/scilabbackend.desktop
-share/kde4/services/cantor/solveassistant.desktop
-share/kde4/services/cantor/variablemanagerplugin.desktop
-share/kde4/servicetypes/cantor_assistant.desktop
-share/kde4/servicetypes/cantor_backend.desktop
-share/kde4/servicetypes/cantor_panelplugin.desktop
+share/icons/hicolor/64x64/apps/cantor.png
+share/kxmlgui5/cantor/cantor_advancedplot_assistant.rc
+share/kxmlgui5/cantor/cantor_create_matrix_assistant.rc
+share/kxmlgui5/cantor/cantor_differentiate_assistant.rc
+share/kxmlgui5/cantor/cantor_eigenvalues_assistant.rc
+share/kxmlgui5/cantor/cantor_eigenvectors_assistant.rc
+share/kxmlgui5/cantor/cantor_import_package_assistant.rc
+share/kxmlgui5/cantor/cantor_integrate_assistant.rc
+share/kxmlgui5/cantor/cantor_invert_matrix_assistant.rc
+share/kxmlgui5/cantor/cantor_part.rc
+share/kxmlgui5/cantor/cantor_plot2d_assistant.rc
+share/kxmlgui5/cantor/cantor_plot3d_assistant.rc
+share/kxmlgui5/cantor/cantor_qalculateplotassistant.rc
+share/kxmlgui5/cantor/cantor_runscript_assistant.rc
+share/kxmlgui5/cantor/cantor_scripteditor.rc
+share/kxmlgui5/cantor/cantor_shell.rc
+share/kxmlgui5/cantor/cantor_solve_assistant.rc
+share/locale/bs/LC_MESSAGES/cantor.mo
+share/locale/ca/LC_MESSAGES/cantor.mo
+share/locale/ca@valencia/LC_MESSAGES/cantor.mo
+share/locale/cs/LC_MESSAGES/cantor.mo
+share/locale/da/LC_MESSAGES/cantor.mo
+share/locale/de/LC_MESSAGES/cantor.mo
+share/locale/el/LC_MESSAGES/cantor.mo
+share/locale/en_GB/LC_MESSAGES/cantor.mo
+share/locale/eo/LC_MESSAGES/cantor.mo
+share/locale/es/LC_MESSAGES/cantor.mo
+share/locale/et/LC_MESSAGES/cantor.mo
+share/locale/eu/LC_MESSAGES/cantor.mo
+share/locale/fi/LC_MESSAGES/cantor.mo
+share/locale/fr/LC_MESSAGES/cantor.mo
+share/locale/ga/LC_MESSAGES/cantor.mo
+share/locale/gl/LC_MESSAGES/cantor.mo
+share/locale/hr/LC_MESSAGES/cantor.mo
+share/locale/hu/LC_MESSAGES/cantor.mo
+share/locale/it/LC_MESSAGES/cantor.mo
+share/locale/ja/LC_MESSAGES/cantor.mo
+share/locale/kk/LC_MESSAGES/cantor.mo
+share/locale/ko/LC_MESSAGES/cantor.mo
+share/locale/lt/LC_MESSAGES/cantor.mo
+share/locale/lv/LC_MESSAGES/cantor.mo
+share/locale/ml/LC_MESSAGES/cantor.mo
+share/locale/mr/LC_MESSAGES/cantor.mo
+share/locale/nb/LC_MESSAGES/cantor.mo
+share/locale/nds/LC_MESSAGES/cantor.mo
+share/locale/nl/LC_MESSAGES/cantor.mo
+share/locale/nn/LC_MESSAGES/cantor.mo
+share/locale/pa/LC_MESSAGES/cantor.mo
+share/locale/pl/LC_MESSAGES/cantor.mo
+share/locale/pt/LC_MESSAGES/cantor.mo
+share/locale/pt_BR/LC_MESSAGES/cantor.mo
+share/locale/ro/LC_MESSAGES/cantor.mo
+share/locale/ru/LC_MESSAGES/cantor.mo
+share/locale/sk/LC_MESSAGES/cantor.mo
+share/locale/sl/LC_MESSAGES/cantor.mo
+share/locale/sv/LC_MESSAGES/cantor.mo
+share/locale/tr/LC_MESSAGES/cantor.mo
+share/locale/ug/LC_MESSAGES/cantor.mo
+share/locale/uk/LC_MESSAGES/cantor.mo
+share/locale/zh_CN/LC_MESSAGES/cantor.mo
+share/locale/zh_TW/LC_MESSAGES/cantor.mo
+share/metainfo/org.kde.cantor.appdata.xml
diff --git a/math/cantor/distinfo b/math/cantor/distinfo
index 7aed44a750a..c58f80d5769 100644
--- a/math/cantor/distinfo
+++ b/math/cantor/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 23:33:31 agc Exp $
+$NetBSD: distinfo,v 1.10 2019/11/20 22:30:06 markd Exp $
 
-SHA1 (cantor-4.14.3.tar.xz) = e4df7b28c77a094930d695bd5bf15333f2f202f4
-RMD160 (cantor-4.14.3.tar.xz) = eb7e59e11c2d7582110f392f29d62391940d5c2d
-SHA512 (cantor-4.14.3.tar.xz) = 5da20030a74ef4f3b9d59f37d07b4a893b1f9cfea43728b4aa7c0aefe219d0de554201bbbf57ab9cd3e10a97ba381171cd2a907843246c42616da2a5d6b6afa9
-Size (cantor-4.14.3.tar.xz) = 342140 bytes
+SHA1 (cantor-19.08.3.tar.xz) = 863e38a97587cc1f61f6952b69c4a1a4648ff9c9
+RMD160 (cantor-19.08.3.tar.xz) = 98e0c6bc845ac73607781a720a86ff0567c9a9d5
+SHA512 (cantor-19.08.3.tar.xz) = 1dc545c2c122d0303d418c757d7f4079250354e4326f2ec0d4796de343d00beb580ab47945ecc6ea491f4cd893bbfe6fced7eeb0ab8e3122000b4c75912ca807
+Size (cantor-19.08.3.tar.xz) = 2538816 bytes