math/wxmaxima: update to 21.05.2

ChangeLog: https://github.com/wxMaxima-developers/wxmaxima/releases

PR:	257215
Reported by:	bsd@philippost.de

6 files changed, 110 insertions, 58 deletions

diff --git a/math/wxmaxima/Makefile b/math/wxmaxima/Makefile
index 426bfa123a40..331bc24231f8 100644
--- a/math/wxmaxima/Makefile
+++ b/math/wxmaxima/Makefile
@@ -1,9 +1,8 @@
 # Created by: Nicola Vitale <nivit@email.it>
 
 PORTNAME=	wxmaxima
-PORTVERSION=	20.04.0
+PORTVERSION=	21.05.2
 DISTVERSIONPREFIX=	Version-
-PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	ports@FreeBSD.org
@@ -14,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	maxima:math/maxima
 
-USES=		cmake compiler:c++11-lang desktop-file-utils shared-mime-info
+USES=		cmake compiler:c++14-lang desktop-file-utils shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	wxMaxima-Developers
 
@@ -23,18 +22,11 @@ WX_COMPS=	wx
 WX_CONF_ARGS=	absolute
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
-PORTDATA=	COPYING README README.md
 
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=	NLS DOCS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 NLS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-CMakeLists.txt
 
-.include <bsd.port.options.mk>
-
-.if ${ARCH} != powerpc
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_Version.h.cin
-.endif
-
 .include <bsd.port.mk>
diff --git a/math/wxmaxima/distinfo b/math/wxmaxima/distinfo
index 5184c89f56c5..712c12cbbdcd 100644
--- a/math/wxmaxima/distinfo
+++ b/math/wxmaxima/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587205454
-SHA256 (wxMaxima-Developers-wxmaxima-Version-20.04.0_GH0.tar.gz) = ce65b461bd0dde1dbc8d61d3d4104f95c1122e3a77620239d469ff317ba1e5a7
-SIZE (wxMaxima-Developers-wxmaxima-Version-20.04.0_GH0.tar.gz) = 15313618
+TIMESTAMP = 1626386872
+SHA256 (wxMaxima-Developers-wxmaxima-Version-21.05.2_GH0.tar.gz) = 4d2d486a24090ace2f64ceccb026210e2e6299a32cb348d43134ef80440bcf01
+SIZE (wxMaxima-Developers-wxmaxima-Version-21.05.2_GH0.tar.gz) = 17782421
diff --git a/math/wxmaxima/files/extra-patch-CMakeLists.txt b/math/wxmaxima/files/extra-patch-CMakeLists.txt
index ca4ec2e42aa1..f1b034c002bc 100644
--- a/math/wxmaxima/files/extra-patch-CMakeLists.txt
+++ b/math/wxmaxima/files/extra-patch-CMakeLists.txt
@@ -1,10 +1,10 @@
---- CMakeLists.txt.orig	2019-05-07 12:21:45 UTC
+--- CMakeLists.txt.orig	2021-07-15 22:20:34 UTC
 +++ CMakeLists.txt
-@@ -62,7 +62,6 @@ if(Git_FOUND)
- endif()
- 
- 
--add_subdirectory(locales)
+@@ -192,7 +192,6 @@ set(CPACK_PACKAGE_CHECKSUM "SHA512")
  add_subdirectory(Doxygen)
  add_subdirectory(data)
  add_subdirectory(info)
+-add_subdirectory(locales)
+ add_subdirectory(art)
+ add_subdirectory(src)
+ add_subdirectory(examples)
diff --git a/math/wxmaxima/files/extra-patch-src_Version.h.cin b/math/wxmaxima/files/extra-patch-src_Version.h.cin
deleted file mode 100644
index b9034dd53787..000000000000
--- a/math/wxmaxima/files/extra-patch-src_Version.h.cin
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Version.h.cin.orig	2020-04-18 07:14:02 UTC
-+++ src/Version.h.cin
-@@ -2,7 +2,7 @@
- #ifndef GITVERSION
- #define GITVERSION "@VERSION@"
- #endif
--#if 0@OpenMP_CXX_SPEC_DATE@ > 0201510
-+#if @OpenMP_CXX_SPEC_DATE@ > 201510
- #define HAVE_OPENMP_TASKS 1
- #define OPENMP_SPEC_DATE "@OpenMP_CXX_SPEC_DATE@"
- #define HAVE_OMP_HEADER @HAVE_OMP_HEADER@
diff --git a/math/wxmaxima/files/patch-src_ww898_cp__utfw.hpp b/math/wxmaxima/files/patch-src_ww898_cp__utfw.hpp
new file mode 100644
index 000000000000..f4621d954dd8
--- /dev/null
+++ b/math/wxmaxima/files/patch-src_ww898_cp__utfw.hpp
@@ -0,0 +1,11 @@
+--- src/ww898/cp_utfw.hpp.orig	2021-05-16 15:23:46 UTC
++++ src/ww898/cp_utfw.hpp
+@@ -33,7 +33,7 @@ namespace utf {
+ using utfw = utf16;
+ }}
+ 
+-#elif defined(__linux__) || defined(__APPLE__) || defined (__NetBSD__)
++#elif defined(__linux__) || defined(__APPLE__) || defined (__NetBSD__) || defined (__FreeBSD__)
+ 
+ #include <ww898/cp_utf32.hpp>
+ 
diff --git a/math/wxmaxima/pkg-plist b/math/wxmaxima/pkg-plist
index 75533e693bd4..a5715b232a2b 100644
--- a/math/wxmaxima/pkg-plist
+++ b/math/wxmaxima/pkg-plist
@@ -1,21 +1,35 @@
 bin/wxmaxima
 %%DESKTOPDIR%%/io.github.wxmaxima_developers.wxMaxima.desktop
-%%DOCSDIR%%/Autocomplete1.jpg
-%%DOCSDIR%%/Autocomplete2.jpg
-%%DOCSDIR%%/BatchImage.png
-%%DOCSDIR%%/MatrixTableExample.png
-%%DOCSDIR%%/SecondTableExample.png
-%%DOCSDIR%%/ezUnits.png
-%%DOCSDIR%%/maxima_screenshot.png
-%%DOCSDIR%%/sbclMemory.png
-%%DOCSDIR%%/wxMaximaLogo.png
-%%DOCSDIR%%/wxMaxima_configuration_001.png
-%%DOCSDIR%%/wxMaxima_configuration_002.png
-%%DOCSDIR%%/wxmaxima.html
 share/bash-completion/completions/wxmaxima
-share/man/de/man1/wxmaxima.1.gz
-share/man/man1/wxmaxima.1.gz
-share/metainfo/io.github.wxmaxima_developers.wxMaxima.appdata.xml
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BatchImage.png
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/GPL.txt
+%%PORTDOCS%%%%DOCSDIR%%/InputCell.png
+%%PORTDOCS%%%%DOCSDIR%%/MatrixTableExample.png
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/SecondTableExample.png
+%%PORTDOCS%%%%DOCSDIR%%/SidePanes.png
+%%PORTDOCS%%%%DOCSDIR%%/cell-example.png
+%%PORTDOCS%%%%DOCSDIR%%/ezUnits.png
+%%PORTDOCS%%%%DOCSDIR%%/header.html
+%%PORTDOCS%%%%DOCSDIR%%/maxima_screenshot.png
+%%PORTDOCS%%%%DOCSDIR%%/sbclMemory.png
+%%PORTDOCS%%%%DOCSDIR%%/wxMaximaLogo.png
+%%PORTDOCS%%%%DOCSDIR%%/wxMaximaWindow.png
+%%PORTDOCS%%%%DOCSDIR%%/wxMaxima_configuration_001.png
+%%PORTDOCS%%%%DOCSDIR%%/wxmaxima.css
+%%PORTDOCS%%%%DOCSDIR%%/wxmaxima.de.html
+%%PORTDOCS%%%%DOCSDIR%%/wxmaxima.es.html
+%%PORTDOCS%%%%DOCSDIR%%/wxmaxima.html
+%%PORTDOCS%%%%DOCSDIR%%/wxmaxima.it.html
+%%PORTDOCS%%%%DOCSDIR%%/wxmaxima.svg
+%%PORTDOCS%%%%DOCSDIR%%/wxmaxima.tr.html
+%%PORTDOCS%%%%DOCSDIR%%/wxmaxima.uk.html
+%%PORTDOCS%%%%DOCSDIR%%/wxmaxima.zh_CN.html
 %%NLS%%share/locale/ca/LC_MESSAGES/wxMaxima.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/wxMaxima.mo
 %%NLS%%share/locale/da/LC_MESSAGES/wxMaxima.mo
@@ -38,6 +52,9 @@ share/metainfo/io.github.wxmaxima_developers.wxMaxima.appdata.xml
 %%NLS%%share/locale/uk/LC_MESSAGES/wxMaxima.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wxMaxima.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/wxMaxima.mo
+share/man/de/man1/wxmaxima.1.gz
+share/man/man1/wxmaxima.1.gz
+share/metainfo/io.github.wxmaxima_developers.wxMaxima.appdata.xml
 share/mime/packages/x-wxmathml.xml
 share/mime/packages/x-wxmaxima-batch.xml
 share/pixmaps/io.github.wxmaxima_developers.wxMaxima.png
@@ -46,53 +63,96 @@ share/pixmaps/text-x-wxmathml.svg
 share/pixmaps/text-x-wxmaxima-batch.svg
 share/pixmaps/wxmaxima-16.xpm
 share/pixmaps/wxmaxima-32.xpm
+share/wxMaxima/10MinuteTutorial.wxm
 share/wxMaxima/a.png
+share/wxMaxima/absCells.wxm
 share/wxMaxima/all-celltypes.wxmx
+share/wxMaxima/atCells.wxm
 share/wxMaxima/autosave.cfg
 share/wxMaxima/b.png
+share/wxMaxima/boxes.wxm
 share/wxMaxima/c.png
+share/wxMaxima/commentBegin.wxm
 share/wxMaxima/complete_config_file.cfg
 share/wxMaxima/config_from_19.11.cfg
-share/wxMaxima/d.png
-share/wxMaxima/foreign-characters.wxm
-share/wxMaxima/io.github.wxmaxima_developers.wxMaxima.png
-share/wxMaxima/io.github.wxmaxima_developers.wxMaxima.svg
-share/wxMaxima/noautosave.cfg
-share/wxMaxima/other-features.wxm
-share/wxMaxima/testbench_all_celltypes.wxm
-share/wxMaxima/absCells.wxm
-share/wxMaxima/atCells.wxm
-share/wxMaxima/boxes.wxm
-share/wxMaxima/commentBegin.wxm
 share/wxMaxima/conjugateCells.wxm
+share/wxMaxima/d.png
 share/wxMaxima/diffCells.wxm
 share/wxMaxima/empty_file.wxm
 share/wxMaxima/exptCells.wxm
+share/wxMaxima/fonts/CMakeLists.txt
+share/wxMaxima/fonts/COPYING-Libertinus.txt
+share/wxMaxima/fonts/COPYING-LinLibertine.txt
+share/wxMaxima/fonts/COPYING-jsMath.txt
+share/wxMaxima/fonts/LibertinusKeyboard-Regular.otf
+share/wxMaxima/fonts/LibertinusMath-Regular.otf
+share/wxMaxima/fonts/LibertinusMono-Regular.otf
+share/wxMaxima/fonts/LibertinusSans-Bold.otf
+share/wxMaxima/fonts/LibertinusSans-Italic.otf
+share/wxMaxima/fonts/LibertinusSans-Regular.otf
+share/wxMaxima/fonts/LibertinusSerif-Bold.otf
+share/wxMaxima/fonts/LibertinusSerif-BoldItalic.otf
+share/wxMaxima/fonts/LibertinusSerif-Italic.otf
+share/wxMaxima/fonts/LibertinusSerif-Regular.otf
+share/wxMaxima/fonts/LibertinusSerif-Semibold.otf
+share/wxMaxima/fonts/LibertinusSerif-SemiboldItalic.otf
+share/wxMaxima/fonts/LibertinusSerifDisplay-Regular.otf
+share/wxMaxima/fonts/LibertinusSerifInitials-Regular.otf
+share/wxMaxima/fonts/LinLibertine_DRah.ttf
+share/wxMaxima/fonts/LinLibertine_I.ttf
+share/wxMaxima/fonts/LinLibertine_Mah.ttf
+share/wxMaxima/fonts/LinLibertine_RBIah.ttf
+share/wxMaxima/fonts/LinLibertine_RBah.ttf
+share/wxMaxima/fonts/LinLibertine_RIah.ttf
+share/wxMaxima/fonts/LinLibertine_RZIah.ttf
+share/wxMaxima/fonts/LinLibertine_RZah.ttf
+share/wxMaxima/fonts/LinLibertine_Rah.ttf
+share/wxMaxima/fonts/jsMath-cmex10.ttf
+share/wxMaxima/fonts/jsMath-cmmi10.ttf
+share/wxMaxima/fonts/jsMath-cmr10.ttf
+share/wxMaxima/fonts/jsMath-cmsy10.ttf
+share/wxMaxima/fonts/jsMath-cmti10.ttf
+share/wxMaxima/foreign-characters.wxm
 share/wxMaxima/formerCrashes.wxm
 share/wxMaxima/fracCells.wxm
 share/wxMaxima/functionCells.wxm
 share/wxMaxima/imageCells.wxm
 share/wxMaxima/intCells.wxm
+share/wxMaxima/io.github.wxmaxima_developers.wxMaxima.png
+share/wxMaxima/io.github.wxmaxima_developers.wxMaxima.svg
+share/wxMaxima/ipc_copypaste1.wxm
+share/wxMaxima/ipc_copypaste2.wxm
+share/wxMaxima/ipc_copypaste_all-celltypes.wxm
 share/wxMaxima/limitCells.wxm
 share/wxMaxima/lisp.wxm
+share/wxMaxima/listCells.wxm
 share/wxMaxima/matrixCells.wxm
 share/wxMaxima/multiplication.wxm
+share/wxMaxima/noautosave.cfg
 share/wxMaxima/nonsenseConstructs.wxm
+share/wxMaxima/other-features.wxm
 share/wxMaxima/parenthesisCells.wxm
+share/wxMaxima/performance.wxm
 share/wxMaxima/presubsupcells.wxm
 share/wxMaxima/printf_continuationLines.wxm
 share/wxMaxima/printf_equations.wxm
 share/wxMaxima/printf_simple.wxm
 share/wxMaxima/rememberingAnswers.wxm
+share/wxMaxima/setCells.wxm
 share/wxMaxima/simpleInput.wxm
 share/wxMaxima/slideshowCells.wxm
 share/wxMaxima/sqrtCells.wxm
 share/wxMaxima/subCells.wxm
 share/wxMaxima/subsupCells.wxm
 share/wxMaxima/sumCells.wxm
+share/wxMaxima/testbench_all_celltypes.wxm
+share/wxMaxima/testbench_simple.mac
+share/wxMaxima/testbench_simple2.mac
+share/wxMaxima/testbench_simple2.mac.wxmx
+share/wxMaxima/textcells.wxm
 share/wxMaxima/threadtest.wxm
+share/wxMaxima/threadtest2.wxm
 share/wxMaxima/unicode.wxm
 share/wxMaxima/unicode_specialchars.wxm
 share/wxMaxima/weirdLabels.wxm
 share/wxMaxima/xmlQuote.wxm
-share/wxMaxima/textcells.wxm