4 files changed, 55 insertions, 33 deletions

diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index 6c4b41989bda..cc5250a9981c 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -3,51 +3,44 @@
 PORTNAME=	cantor
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	math kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 frontend to mathematical software
 
-LIB_DEPENDS=	spectre.1:${PORTSDIR}/print/libspectre \
-		qalculate.5:${PORTSDIR}/math/libqalculate \
-		analitza.5:${PORTSDIR}/math/analitza
-
-CONFLICTS=	kdeedu-4.[0-6].*
+LIB_DEPENDS=	libspectre.so:${PORTSDIR}/print/libspectre \
+		libqalculate.so:${PORTSDIR}/math/libqalculate \
+		libanalitza.so:${PORTSDIR}/math/analitza
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USES=		cmake:outsource pkgconfig
 USE_QT4=	corelib qtestlib_build xml xmlpatterns \
 		moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
+USE_PYTHON=	2
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	MAXIMA OCTAVE R
-MAXIMA_DESC=	Maxima backend
-OCTAVE_DESC=	Octave backend
-R_DESC=		R backend
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	MAXIMA OCTAVE R SAGE SCILAB
+OPTIONS_SUB=	yes # R
 
-.if ${PORT_OPTIONS:MMAXIMA}
-RUN_DEPENDS+=	maxima:${PORTSDIR}/math/maxima
-.endif
+MAXIMA_DESC=	Install Maxima
+MAXIMA_RUN_DEPENDS=	maxima:${PORTSDIR}/math/maxima
 
-.if ${PORT_OPTIONS:MOCTAVE}
-RUN_DEPENDS+=	octave:${PORTSDIR}/math/octave
-.endif
+OCTAVE_DESC=	Install Octave
+OCTAVE_RUN_DEPENDS=	octave:${PORTSDIR}/math/octave
 
-.if ${PORT_OPTIONS:MR}
-BUILD_DEPENDS+=	R:${PORTSDIR}/math/R
-RUN_DEPENDS+=	R:${PORTSDIR}/math/R
+R_DESC=		Build R backend and install R
+R_BUILD_DEPENDS=	R:${PORTSDIR}/math/R
+R_RUN_DEPENDS=		R:${PORTSDIR}/math/R
 # Required to set CFLAGS for -lgfortran.
-USES+=		fortran
-PLIST_SUB+=	R=""
-.else
-CMAKE_ARGS+=	-DWITH_R:BOOL=FALSE
-PLIST_SUB+=	R="@comment "
-.endif
+R_USE=		FORTRAN=yes
+R_CMAKE_OFF=	-DWITH_R:BOOL=FALSE
+
+SAGE_DESC=	Install Sage
+SAGE_RUN_DEPENDS=	sage:${PORTSDIR}/math/sage
+
+SCILAB_DESC=	Install Scilab
+SCILAB_RUN_DEPENDS=	scilab:${PORTSDIR}/math/scilab
 
 .include <bsd.port.mk>
diff --git a/math/cantor/distinfo b/math/cantor/distinfo
index c708c883d4f6..ea630a89f55a 100644
--- a/math/cantor/distinfo
+++ b/math/cantor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/cantor-4.10.5.tar.xz) = a63b2923c5b811473978e6d8c111d1fc150cb054a15d8a4c99f3f4d31ba10a1c
-SIZE (KDE/4.10.5/cantor-4.10.5.tar.xz) = 319440
+SHA256 (KDE/4.12.2/cantor-4.12.2.tar.xz) = 1ac7c16797b2265c48e36cc3eb52d8d5d92b8a865254d581d135d66cfac1c2f9
+SIZE (KDE/4.12.2/cantor-4.12.2.tar.xz) = 330476
diff --git a/math/cantor/files/patch-src__backends__python2__python2extensions.cpp b/math/cantor/files/patch-src__backends__python2__python2extensions.cpp
new file mode 100644
index 000000000000..9ca9683b7ff7
--- /dev/null
+++ b/math/cantor/files/patch-src__backends__python2__python2extensions.cpp
@@ -0,0 +1,22 @@
+--- ./src/backends/python2/python2extensions.cpp.orig	2013-12-22 06:37:50.000000000 +0000
++++ ./src/backends/python2/python2extensions.cpp	2014-01-29 22:46:16.542974457 +0000
+@@ -52,7 +52,7 @@
+ QString Python2VariableManagementExtension::clearVariables()
+ {
+     QString delVariablesPythonSession = "for keyPythonBackend in dir():\n"                                 \
+-                                        "    if (not 'PythonBackend' in keyPythonBackend)\ "               \
++                                        "    if (not 'PythonBackend' in keyPythonBackend)\\ "               \
+                                         "and (not '__' in keyPythonBackend):\n"                            \
+                                         "        del(globals()[keyPythonBackend])\n"                       \
+                                         "del(keyPythonBackend)\n";
+@@ -64,8 +64,8 @@
+     QString classSavePythonSession = "import shelve\n"                                                               \
+                                      "shelvePythonBackend = shelve.open('%1', 'n')\n"                                \
+                                      "for keyPythonBackend in dir():\n"                                              \
+-                                     "    if (not 'PythonBackend' in keyPythonBackend)\ "                            \
+-                                     "and (not '__' in keyPythonBackend)\ "                                          \
++                                     "    if (not 'PythonBackend' in keyPythonBackend)\\ "                            \
++                                     "and (not '__' in keyPythonBackend)\\ "                                          \
+                                      "and (not '<module ' in unicode(globals()[keyPythonBackend])):\n"               \
+                                      "        shelvePythonBackend[keyPythonBackend] = globals()[keyPythonBackend]\n" \
+                                      "shelvePythonBackend.close()\n"                                                 \
diff --git a/math/cantor/pkg-plist b/math/cantor/pkg-plist
index e1f809120c9d..459a340d1875 100644
--- a/math/cantor/pkg-plist
+++ b/math/cantor/pkg-plist
@@ -23,6 +23,7 @@ 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
@@ -31,6 +32,7 @@ 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
 %%R%%lib/kde4/cantor_rbackend.so
@@ -50,6 +52,7 @@ 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_import_package_assistant.rc
 share/apps/cantor/cantor_integrate_assistant.rc
 share/apps/cantor/cantor_invert_matrix_assistant.rc
 share/apps/cantor/cantor_part.rc
@@ -66,13 +69,14 @@ share/apps/cantor/octavebackend/cantor_eigenvectors.m
 share/apps/cantor/octavebackend/cantor_plot2d.m
 share/apps/cantor/octavebackend/cantor_plot3d.m
 share/apps/cantor/octavebackend/cantor_print.m
+share/apps/cantor/python2backend/keywords.xml
 share/apps/cantor/sagebackend/keywords.xml
-share/apps/cantor/scilabbackend/keywords.xml
 share/apps/cantor/xslt/latex.xsl
 share/config.kcfg/cantor.kcfg
 share/config.kcfg/cantor_libs.kcfg
 share/config.kcfg/maximabackend.kcfg
 share/config.kcfg/octavebackend.kcfg
+share/config.kcfg/python2backend.kcfg
 share/config.kcfg/qalculatebackend.kcfg
 %%R%%share/config.kcfg/rserver.kcfg
 share/config.kcfg/sagebackend.kcfg
@@ -92,6 +96,7 @@ share/icons/hicolor/32x32/apps/cantor.png
 share/icons/hicolor/48x48/apps/cantor.png
 share/icons/hicolor/48x48/apps/maximabackend.png
 share/icons/hicolor/48x48/apps/octavebackend.png
+share/icons/hicolor/48x48/apps/pythonbackend.png
 share/icons/hicolor/48x48/apps/qalculatebackend.png
 share/icons/hicolor/48x48/apps/rbackend.png
 share/icons/hicolor/48x48/apps/sagebackend.png
@@ -103,6 +108,7 @@ 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
@@ -111,6 +117,7 @@ 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
 %%R%%share/kde4/services/cantor/rbackend.desktop
@@ -125,8 +132,8 @@ share/kde4/servicetypes/cantor_panelplugin.desktop
 @dirrm share/kde4/services/cantor
 @dirrm share/doc/HTML/en/cantor
 @dirrm share/apps/cantor/xslt
-@dirrm share/apps/cantor/scilabbackend
 @dirrm share/apps/cantor/sagebackend
+@dirrm share/apps/cantor/python2backend
 @dirrm share/apps/cantor/octavebackend
 @dirrm share/apps/cantor/maximabackend
 @dirrm share/apps/cantor