Upgrade to 1.1.1 - Christmas 2020 - what a year!

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

3 files changed, 26 insertions, 14 deletions

diff --git a/math/py-mathics/Makefile b/math/py-mathics/Makefile
index 2a8275d0ca1b..bf9dc491a034 100644
--- a/math/py-mathics/Makefile
+++ b/math/py-mathics/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Mathics
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -15,6 +15,7 @@ BUILD_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}	\
+		bash:shells/bash	\
 		${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} \
@@ -32,14 +33,18 @@ RUN_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}palettable>0:misc/py-palettable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tifffile>0:graphics/py-tifffile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipykernel5>0:devel/py-ipykernel5@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${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}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+TEST_DEPENDS=	gmake:devel/gmake	\
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR}
 
 USE_GITHUB=	yes
@@ -48,13 +53,15 @@ GH_ACCOUNT=	${PORTNAME:tl}
 USES=		python:3.6+ shebangfix
 USE_PYTHON=	distutils
 SHEBANG_GLOB=	*.py
+SHEBANG_FILES=	script/dmathicsscript script/dmathicsserver
 
 MAKE_ENV+=	PYTHON=${PYTHON_CMD}
+PLIST_SUB+=	VER=${PORTVERSION}
 TEST_TARGET=	djangotest check
 TEST_ENV=	${MAKE_ENV}
 
 do-test: install
 	(cd ${TEST_WRKSRC} &&	\
-	${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_TARGET})
+	${SETENV} ${TEST_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_TARGET})
 
 .include <bsd.port.mk>
diff --git a/math/py-mathics/distinfo b/math/py-mathics/distinfo
index 5126f2e953c2..11f528980316 100644
--- a/math/py-mathics/distinfo
+++ b/math/py-mathics/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606674400
-SHA256 (mathics-Mathics-1.1.0_GH0.tar.gz) = 9613dc571fec28bdcaa3d009dbeda68304da4372a397d02537c8a67ac7a04f91
-SIZE (mathics-Mathics-1.1.0_GH0.tar.gz) = 4924853
+TIMESTAMP = 1608909174
+SHA256 (mathics-Mathics-1.1.1_GH0.tar.gz) = a64a080710e70d8828190507c2c548c7085294a433d00081783f32357dcea637
+SIZE (mathics-Mathics-1.1.1_GH0.tar.gz) = 5035583
diff --git a/math/py-mathics/pkg-plist b/math/py-mathics/pkg-plist
index 9418fc19b290..efc5f587ca3f 100644
--- a/math/py-mathics/pkg-plist
+++ b/math/py-mathics/pkg-plist
@@ -1,13 +1,14 @@
+bin/dmathicsscript
+bin/dmathicsserver
 bin/mathics
-bin/mathicsscript
 bin/mathicsserver
-%%PYTHON_SITELIBDIR%%/Mathics3-1.1.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/Mathics3-1.1.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/Mathics3-1.1.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/Mathics3-1.1.0-py%%PYTHON_VER%%.egg-info/entry_points.txt
-%%PYTHON_SITELIBDIR%%/Mathics3-1.1.0-py%%PYTHON_VER%%.egg-info/not-zip-safe
-%%PYTHON_SITELIBDIR%%/Mathics3-1.1.0-py%%PYTHON_VER%%.egg-info/requires.txt
-%%PYTHON_SITELIBDIR%%/Mathics3-1.1.0-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%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
@@ -339,6 +340,10 @@ bin/mathicsserver
 %%PYTHON_SITELIBDIR%%/mathics/doc/utils.py
 %%PYTHON_SITELIBDIR%%/mathics/main.py
 %%PYTHON_SITELIBDIR%%/mathics/manage.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/VectorAnalysis/Kernel/init.m
 %%PYTHON_SITELIBDIR%%/mathics/packages/VectorAnalysis/VectorAnalysis.m
 %%PYTHON_SITELIBDIR%%/mathics/profile_mathics.py