math/py-mathics: upgrade to 2.1.0

- Switch to CHEESESHOP, to keep all modules coherent

- Release notes at <https://github.com/mathics/Mathics/releases/tag/2.1.0>.

3 files changed, 74 insertions, 27 deletions

diff --git a/math/py-mathics/Makefile b/math/py-mathics/Makefile
index e2625524665c..1a073a45840b 100644
--- a/math/py-mathics/Makefile
+++ b/math/py-mathics/Makefile
@@ -1,8 +1,9 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 
-PORTNAME=	Mathics
-PORTVERSION=	2.0.0
+PORTNAME=	Mathics3
+PORTVERSION=	2.1.0
 CATEGORIES=	math python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -12,7 +13,16 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pint>0:devel/py-pint@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}llvmlite>0:devel/py-llvmlite@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}palettable>0:misc/py-palettable@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}word_cloud>0:textproc/py-wordcloud@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Mathics_Scanner>0:math/py-mathics-scanner
 RUN_DEPENDS=	${PYNUMPY}	\
 		bash:shells/bash	\
 		${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py@${PY_FLAVOR} \
@@ -42,25 +52,23 @@ RUN_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}pycountry>0:textproc/py-pycountry@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}word_cloud>0:textproc/py-wordcloud@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mathics-scanner>0:math/py-mathics-scanner@${PY_FLAVOR}
-TEST_DEPENDS=	gmake:devel/gmake	\
-		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Mathics_Scanner>0:math/py-mathics-scanner
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}guppy3>0:devel/py-guppy3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR}
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	${PORTNAME:tl}
+#USE_GITHUB=	yes
+#GH_ACCOUNT=	${PORTNAME:tl}
 
 USES=		python:3.6+ shebangfix
-USE_PYTHON=	distutils
+USE_PYTHON=	distutils noflavors
 SHEBANG_GLOB=	*.py
 
-MAKE_ENV+=	PYTHON=${PYTHON_CMD}
-PLIST_SUB+=	VER=${PORTVERSION}
-TEST_TARGET=	check
-TEST_ENV=	${MAKE_ENV}
+.if !defined(WITH_DEBUG)
+LDFLAGS+=	-s
+.endif
 
 do-test: install
-	(cd ${TEST_WRKSRC} &&	\
-	${SETENV} ${TEST_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_TARGET})
+	(cd ${TEST_WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/math/py-mathics/distinfo b/math/py-mathics/distinfo
index 8c138732a074..2f235408a7d2 100644
--- a/math/py-mathics/distinfo
+++ b/math/py-mathics/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613326837
-SHA256 (mathics-Mathics-2.0.0_GH0.tar.gz) = c22214ccbb55164e656d8a3be17ac9424cca21553f6470a793df719534528ce0
-SIZE (mathics-Mathics-2.0.0_GH0.tar.gz) = 1905790
+TIMESTAMP = 1617903498
+SHA256 (Mathics3-2.1.0.tar.gz) = 76bf8487012b4916f333ae25fd2be9bd0d16566d99e67e815a4995e083046b90
+SIZE (Mathics3-2.1.0.tar.gz) = 15936681
diff --git a/math/py-mathics/pkg-plist b/math/py-mathics/pkg-plist
index e28e2735c19f..fc1e8924b1b8 100644
--- a/math/py-mathics/pkg-plist
+++ b/math/py-mathics/pkg-plist
@@ -1,11 +1,4 @@
 bin/mathics
-%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%-py%%PYTHON_VER%%.egg-info/entry_points.txt
-%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%-py%%PYTHON_VER%%.egg-info/not-zip-safe
-%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%-py%%PYTHON_VER%%.egg-info/requires.txt
-%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/mathics/__init__.py
 %%PYTHON_SITELIBDIR%%/mathics/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -44,6 +37,7 @@ bin/mathics
 %%PYTHON_SITELIBDIR%%/mathics/autoload/formats/Text/Export.m
 %%PYTHON_SITELIBDIR%%/mathics/autoload/formats/Text/Import.m
 %%PYTHON_SITELIBDIR%%/mathics/autoload/formats/XML/Import.m
+%%PYTHON_SITELIBDIR%%/mathics/autoload/settings.m
 %%PYTHON_SITELIBDIR%%/mathics/benchmark.py
 %%PYTHON_SITELIBDIR%%/mathics/builtin/__init__.py
 %%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -301,8 +295,6 @@ bin/mathics
 %%PYTHON_SITELIBDIR%%/mathics/data/ExampleData/moon.tif
 %%PYTHON_SITELIBDIR%%/mathics/data/ExampleData/numberdata.csv
 %%PYTHON_SITELIBDIR%%/mathics/data/ExampleData/sunflowers.jpg
-%%PYTHON_SITELIBDIR%%/mathics/data/characters-data.yml
-%%PYTHON_SITELIBDIR%%/mathics/data/element.csv
 %%PYTHON_SITELIBDIR%%/mathics/doc/__init__.py
 %%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -313,14 +305,61 @@ bin/mathics
 %%PYTHON_SITELIBDIR%%/mathics/doc/doc.py
 %%PYTHON_SITELIBDIR%%/mathics/doc/documentation/1-Manual.mdoc
 %%PYTHON_SITELIBDIR%%/mathics/doc/documentation/A-License.mdoc
+%%PYTHON_SITELIBDIR%%/mathics/doc/tex/data
 %%PYTHON_SITELIBDIR%%/mathics/doc/utils.py
+%%PYTHON_SITELIBDIR%%/mathics/doc/xml/data
 %%PYTHON_SITELIBDIR%%/mathics/main.py
 %%PYTHON_SITELIBDIR%%/mathics/packages/DiscreteMath/CombinatoricaV0.6.m
 %%PYTHON_SITELIBDIR%%/mathics/packages/DiscreteMath/CombinatoricaV0.9.m
 %%PYTHON_SITELIBDIR%%/mathics/packages/DiscreteMath/Kernel/init.m
 %%PYTHON_SITELIBDIR%%/mathics/packages/DiscreteMath/RSolve.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/Rubi-save/IntegrationUtilityFunctions.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/Rubi-save/Kernel/init.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/Rubi-save/PacletInfo.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/Rubi-save/Rubi.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/Rubi-save/RubiPackageTools.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/Rubi-save/ShowStepFormatting.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/Rubi-save/ShowStepRoutines.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/SymbolicLogic/test_driver.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/TeXUtilities/PacletInfo.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/TeXUtilities/TeXUtilities.m
 %%PYTHON_SITELIBDIR%%/mathics/packages/VectorAnalysis/Kernel/init.m
 %%PYTHON_SITELIBDIR%%/mathics/packages/VectorAnalysis/VectorAnalysis.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/GosperSum.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/Kernel/init.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/abs_value.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/analysis.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/bound.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/complexes.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/congruence.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/context.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/definition.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/equation_rules.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/expression_rules.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/factorize.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/imply.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/induction.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/inequality_rules.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/integer.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/knowledge.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/lemmas.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/limit.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/max_min.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/operator.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/print.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/product.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/quantify.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/reals.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/simplify.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/solve.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/substitution.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/summation.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/terms.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/transcendental.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/trigonometric.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/unify.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/usebound.m
+%%PYTHON_SITELIBDIR%%/mathics/packages/analytica/user_rules.m
 %%PYTHON_SITELIBDIR%%/mathics/profile_mathics.py
 %%PYTHON_SITELIBDIR%%/mathics/session.py
 %%PYTHON_SITELIBDIR%%/mathics/settings.py