6 files changed, 36 insertions, 54 deletions

diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile
index 4a1e2cc685ea..838715319036 100644
--- a/math/cadabra2/Makefile
+++ b/math/cadabra2/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cadabra2
-DISTVERSION=	2.3.0
-PORTREVISION=	1
+DISTVERSION=	2.3.2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -27,7 +26,6 @@ GH_ACCOUNT=	kpeeters
 DOS2UNIX_FILES=	cmake/version.cmake
 USE_GNOME=	glib20 glibmm libsigc++20
 USE_TEX=	base texmf texhash
-USE_LDCONFIG=	yes
 OPTIONS_SUB=	yes
 
 CMAKE_ON=	ENABLE_SYSTEM_JSONCPP USE_PYTHON_3 # OFF doesn't work, still links to python3: https://github.com/kpeeters/cadabra2/issues/76
diff --git a/math/cadabra2/distinfo b/math/cadabra2/distinfo
index c4594ab8a6bf..78aa00068305 100644
--- a/math/cadabra2/distinfo
+++ b/math/cadabra2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592193826
-SHA256 (kpeeters-cadabra2-2.3.0_GH0.tar.gz) = 1ba2dd2c91e6678a49a136c181da4ec424f1cec9a7172cf95fd1b0c04c253217
-SIZE (kpeeters-cadabra2-2.3.0_GH0.tar.gz) = 24169861
+TIMESTAMP = 1604614352
+SHA256 (kpeeters-cadabra2-2.3.2_GH0.tar.gz) = a17424f41703e4b5c72d44f2c3057f7ea10375ff4b41bbb1675d665a86a489ca
+SIZE (kpeeters-cadabra2-2.3.2_GH0.tar.gz) = 24376316
diff --git a/math/cadabra2/files/patch-client__server_CMakeLists.txt b/math/cadabra2/files/patch-client__server_CMakeLists.txt
deleted file mode 100644
index 531fec1308bb..000000000000
--- a/math/cadabra2/files/patch-client__server_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- client_server/CMakeLists.txt.orig	2019-12-25 01:29:04 UTC
-+++ client_server/CMakeLists.txt
-@@ -272,6 +272,6 @@ if(NOT MSVC)
- 	 FILES
- 	 ../man/man1/cadabra-server.1
- 	 DESTINATION
--	 share/man/man1
-+	 man/man1
- 	 )
- endif()
diff --git a/math/cadabra2/files/patch-core_CMakeLists.txt b/math/cadabra2/files/patch-core_CMakeLists.txt
deleted file mode 100644
index e8ca60fc9d56..000000000000
--- a/math/cadabra2/files/patch-core_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- core/CMakeLists.txt.orig	2019-12-25 01:29:51 UTC
-+++ core/CMakeLists.txt
-@@ -441,6 +441,6 @@ if(NOT MSVC)
- 	 ../man/man1/cadabra2html.1
- 	 ../man/man1/cadabra2python.1	 
- 	 DESTINATION
--	 share/man/man1
-+	 man/man1
- 	 )
- endif()
diff --git a/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt b/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
index 752c364015bd..e2745305ba54 100644
--- a/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
+++ b/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
@@ -13,11 +13,3 @@
  
  	# Install shared libraries on Windows. 
  	# https://stackoverflow.com/questions/32662215/how-do-you-install-gtk-3-0-on-windows
-@@ -196,6 +196,6 @@ if(NOT MSVC)
- 	 FILES
- 	 ../../man/man1/cadabra2-gtk.1
- 	 DESTINATION
--	 share/man/man1
-+	 man/man1
- 	 )
- endif()
diff --git a/math/cadabra2/pkg-plist b/math/cadabra2/pkg-plist
index 932140d4653a..2d6aaa53cff6 100644
--- a/math/cadabra2/pkg-plist
+++ b/math/cadabra2/pkg-plist
@@ -1,17 +1,31 @@
 bin/cadabra-server
 bin/cadabra2
 bin/cadabra2-cli
-bin/cadabra2latex
 %%GUI%%bin/cadabra2-gtk
 bin/cadabra2cadabra
 bin/cadabra2html
+bin/cadabra2latex
 bin/cadabra2python
-man/man1/cadabra-server.1.gz
-man/man1/cadabra2-gtk.1.gz
-man/man1/cadabra2.1.gz
-man/man1/cadabra2cadabra.1.gz
-man/man1/cadabra2html.1.gz
-man/man1/cadabra2python.1.gz
+%%PYTHON_SITELIBDIR%%/cadabra2.so
+%%PYTHON_SITELIBDIR%%/cadabra2_defaults.py
+%%PYTHON_SITELIBDIR%%/cadabra2_jupyter/__init__.py
+%%PYTHON_SITELIBDIR%%/cadabra2_jupyter/__main__.py
+%%PYTHON_SITELIBDIR%%/cadabra2_jupyter/completer.py
+%%PYTHON_SITELIBDIR%%/cadabra2_jupyter/context.py
+%%PYTHON_SITELIBDIR%%/cadabra2_jupyter/kernel.py
+%%PYTHON_SITELIBDIR%%/cadabra2_jupyter/server.py
+%%PYTHON_SITELIBDIR%%/cdb/core/component.cnb
+%%PYTHON_SITELIBDIR%%/cdb/core/manip.cnb
+%%PYTHON_SITELIBDIR%%/cdb/core/solve.cnb
+%%PYTHON_SITELIBDIR%%/cdb/gauge_theory/__init__.py
+%%PYTHON_SITELIBDIR%%/cdb/gauge_theory/instantons.py
+%%PYTHON_SITELIBDIR%%/cdb/relativity/abstract.cnb
+%%PYTHON_SITELIBDIR%%/cdb/relativity/schwarzschild.cnb
+%%PYTHON_SITELIBDIR%%/cdb/sympy/solvers.cnb
+%%PYTHON_SITELIBDIR%%/cdb/utils/develop.cnb
+%%PYTHON_SITELIBDIR%%/cdb/utils/node.cnb
+%%PYTHON_SITELIBDIR%%/cdb_appdirs.py
+%%PYTHON_SITELIBDIR%%/notebook/static/components/codemirror/mode/cadabra/cadabra.js
 %%GUI%%share/applications/cadabra2-gtk.desktop
 %%GUI%%%%DATADIR%%/images/cadabra2-gtk.png
 %%GUI%%%%DATADIR%%/latex/preamble.tex
@@ -109,20 +123,18 @@ man/man1/cadabra2python.1.gz
 %%GUI%%%%DATADIR%%/manual/properties/WeightInherit.cnb
 %%GUI%%%%DATADIR%%/notebook.html
 %%GUI%%%%DATADIR%%/notebook.tex
-%%DATADIR%%/python/cadabra2.so
-%%DATADIR%%/python/cadabra2_defaults.py
-%%DATADIR%%/python/cdb/core/component.cnb
-%%DATADIR%%/python/cdb/core/manip.cnb
-%%DATADIR%%/python/cdb/core/solve.cnb
-%%DATADIR%%/python/cdb/gauge_theory/__init__.py
-%%DATADIR%%/python/cdb/gauge_theory/instantons.py
-%%DATADIR%%/python/cdb/relativity/abstract.cnb
-%%DATADIR%%/python/cdb/relativity/schwarzschild.cnb
-%%DATADIR%%/python/cdb/sympy/solvers.cnb
-%%DATADIR%%/python/cdb/utils/develop.cnb
-%%DATADIR%%/python/cdb/utils/node.cnb
-%%DATADIR%%/python/cdb_appdirs.py
 %%GUI%%share/icons/hicolor/128x128/apps/cadabra2-gtk.png
 %%GUI%%share/icons/hicolor/256x256/apps/cadabra2-gtk.png
 %%GUI%%share/icons/hicolor/64x64/apps/cadabra2-gtk.png
 %%GUI%%share/icons/hicolor/scalable/apps/cadabra2-gtk.svg
+share/jupyter/kernels/cadabra2/kernel.json
+share/jupyter/kernels/cadabra2/logo-32x32.png
+share/jupyter/kernels/cadabra2/logo-64x64.png
+share/man/man1/cadabra-server.1.gz
+share/man/man1/cadabra2-cli.1.gz
+%%GUI%%share/man/man1/cadabra2-gtk.1.gz
+share/man/man1/cadabra2.1.gz
+share/man/man1/cadabra2cadabra.1.gz
+share/man/man1/cadabra2html.1.gz
+share/man/man1/cadabra2latex.1.gz
+share/man/man1/cadabra2python.1.gz