CVS commit: pkgsrc/math/cantor

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Dec 21 13:32:44 UTC 2025

Modified Files:
        pkgsrc/math/cantor: Makefile PLIST distinfo
Removed Files:
        pkgsrc/math/cantor/patches:
            patch-thirdparty_discount-2.2.6-patched_cmake_CMakeLists.txt

Log Message:
cantor: update to 25.08.3

Qt6/KF6 version - Two years of development.


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 pkgsrc/math/cantor/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/math/cantor/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/math/cantor/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/math/cantor/patches/patch-thirdparty_discount-2.2.6-patched_cmake_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/cantor/Makefile
diff -u pkgsrc/math/cantor/Makefile:1.142 pkgsrc/math/cantor/Makefile:1.143
--- pkgsrc/math/cantor/Makefile:1.142   Thu Oct 23 20:38:14 2025
+++ pkgsrc/math/cantor/Makefile Sun Dec 21 13:32:43 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.142 2025/10/23 20:38:14 wiz Exp $
+# $NetBSD: Makefile,v 1.143 2025/12/21 13:32:43 markd Exp $
 
 DISTNAME=      cantor-${KAPPSVER}
-PKGREVISION=   19
 CATEGORIES=    math
 
 HOMEPAGE=      https://kde.org/applications/education/cantor/
@@ -10,14 +9,13 @@ LICENSE=     gnu-gpl-v2 AND gnu-fdl-v1.2
 
 .include "../../meta-pkgs/kde/applications.mk"
 
-TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kf6-kdoctools>=5.19.0:../../devel/kf6-kdoctools
 
 USE_TOOLS+=    msgmerge pkg-config
 
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_R=TRUE
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LuaJIT=TRUE
 CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 CMAKE_CONFIGURE_ARGS+= -Wno-dev
 
 REPLACE_SH+=   src/backends/sage/cantor-execsage
@@ -29,19 +27,19 @@ SUBST_FILES.fix-moc=        _KDE_build/src/*/*/
 SUBST_NOOP_OK.fix-moc= yes
 SUBST_SED.fix-moc=     -e 's;"${PREFIX}/include",;;g'
 
-.include "../../devel/kpty/buildlink3.mk"
-.include "../../devel/ktexteditor/buildlink3.mk"
+.include "../../devel/kf6-kpty/buildlink3.mk"
+.include "../../devel/kf6-ktexteditor/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../math/analitza/buildlink3.mk"
 .include "../../math/qalculate/buildlink3.mk"
-.include "../../net/knewstuff/buildlink3.mk"
+.include "../../net/kf6-knewstuff/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
-.include "../../print/poppler-qt5/buildlink3.mk"
+.include "../../print/poppler-qt6/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 # Requires bundled copy with custom mkd_latextext()
 #.include "../../textproc/discount/buildlink3.mk"
-.include "../../x11/qt5-qtwebengine/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../wip/qt6-qtwebengine/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/cantor/PLIST
diff -u pkgsrc/math/cantor/PLIST:1.11 pkgsrc/math/cantor/PLIST:1.12
--- pkgsrc/math/cantor/PLIST:1.11       Tue Feb  6 11:17:32 2024
+++ pkgsrc/math/cantor/PLIST    Sun Dec 21 13:32:43 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2024/02/06 11:17:32 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2025/12/21 13:32:43 markd Exp $
 bin/cantor
 bin/cantor_pythonserver
 bin/cantor_scripteditor
@@ -37,32 +37,32 @@ lib/libcantor_config.so
 lib/libcantorlibs.so
 lib/libcantorlibs.so.${PKGVERSION}
 lib/libcantorlibs.so.28
-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_octavebackend.so
-qt5/plugins/cantor/backends/cantor_pythonbackend.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_documentationpanelplugin.so
-qt5/plugins/cantor/panels/cantor_filebrowserpanelplugin.so
-qt5/plugins/cantor/panels/cantor_helppanelplugin.so
-qt5/plugins/cantor/panels/cantor_tocpanelplugin.so
-qt5/plugins/cantor/panels/cantor_variablemanagerplugin.so
-qt5/plugins/kf5/parts/cantorpart.so
+qt6/plugins/cantor_plugins/assistants/cantor_advancedplotassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_creatematrixassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_differentiateassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_eigenvaluesassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_eigenvectorsassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_importpackageassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_integrateassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_invertmatrixassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_plot2dassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_plot3dassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_qalculateplotassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_runscriptassistant.so
+qt6/plugins/cantor_plugins/assistants/cantor_solveassistant.so
+qt6/plugins/cantor_plugins/backends/cantor_kalgebrabackend.so
+qt6/plugins/cantor_plugins/backends/cantor_maximabackend.so
+qt6/plugins/cantor_plugins/backends/cantor_octavebackend.so
+qt6/plugins/cantor_plugins/backends/cantor_pythonbackend.so
+qt6/plugins/cantor_plugins/backends/cantor_qalculatebackend.so
+qt6/plugins/cantor_plugins/backends/cantor_sagebackend.so
+qt6/plugins/cantor_plugins/backends/cantor_scilabbackend.so
+qt6/plugins/cantor_plugins/panels/cantor_documentationpanelplugin.so
+qt6/plugins/cantor_plugins/panels/cantor_filebrowserpanelplugin.so
+qt6/plugins/cantor_plugins/panels/cantor_helppanelplugin.so
+qt6/plugins/cantor_plugins/panels/cantor_tocpanelplugin.so
+qt6/plugins/cantor_plugins/panels/cantor_variablemanagerplugin.so
+qt6/plugins/kf6/parts/cantorpart.so
 share/applications/org.kde.cantor.desktop
 share/cantor/latex/preview.sty
 share/cantor/maximabackend/cantor-initmaxima.lisp
@@ -171,22 +171,6 @@ share/knsrcfiles/cantor_python.knsrc
 share/knsrcfiles/cantor_qalculate.knsrc
 share/knsrcfiles/cantor_sage.knsrc
 share/knsrcfiles/cantor_scilab.knsrc
-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/ar/LC_MESSAGES/cantor.mo
 share/locale/bg/LC_MESSAGES/cantor.mo
 share/locale/bs/LC_MESSAGES/cantor.mo
@@ -205,6 +189,8 @@ 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/he/LC_MESSAGES/cantor.mo
+share/locale/hi/LC_MESSAGES/cantor.mo
 share/locale/hr/LC_MESSAGES/cantor.mo
 share/locale/hu/LC_MESSAGES/cantor.mo
 share/locale/ia/LC_MESSAGES/cantor.mo
@@ -227,6 +213,7 @@ 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/sa/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

Index: pkgsrc/math/cantor/distinfo
diff -u pkgsrc/math/cantor/distinfo:1.19 pkgsrc/math/cantor/distinfo:1.20
--- pkgsrc/math/cantor/distinfo:1.19    Sun Aug 17 23:14:06 2025
+++ pkgsrc/math/cantor/distinfo Sun Dec 21 13:32:43 2025
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.19 2025/08/17 23:14:06 wiz Exp $
+$NetBSD: distinfo,v 1.20 2025/12/21 13:32:43 markd Exp $
 
-BLAKE2s (cantor-23.08.4.tar.xz) = c7dc30616c61aa6407ab266e7db826f451beacdeedb4bfdaa8c888f2e5d987f1
-SHA512 (cantor-23.08.4.tar.xz) = fa829a9260164d596fa9383a109a37da1f669d0ffb43292fb32ba36a12144f7e532f78fff65cf50b7805b9325163733d3df195404ee0f2618a06d9874a1641d6
-Size (cantor-23.08.4.tar.xz) = 9285972 bytes
+BLAKE2s (cantor-25.08.3.tar.xz) = 281c0de1e6eb02343fc9e2e6e39e52f3005dd86851483ffaaedb7b475f57395c
+SHA512 (cantor-25.08.3.tar.xz) = 28e1db6e048714a1eabd50f2ff0d21eba808e9833e5a962d9b92be77a64097be0472df2767dc89a40afd7b1e616be06c63ad33b5068c9e041ac7fc6f6933ea5a
+Size (cantor-25.08.3.tar.xz) = 10918180 bytes
 SHA1 (patch-src_lib_jupyterutils.cpp) = d5af7e37e59bc7475112e22d5b37cc31a134fcbb
-SHA1 (patch-thirdparty_discount-2.2.6-patched_cmake_CMakeLists.txt) = 892695a7421024580d595b99f7b81c7f08830466