diff --git a/math/mathicsscript/Makefile b/math/mathicsscript/Makefile
index 8f1a88f5d8b8..db4a97ef224e 100644
--- a/math/mathicsscript/Makefile
+++ b/math/mathicsscript/Makefile
@@ -1,49 +1,49 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 
 PORTNAME=	mathicsscript
-PORTVERSION=	3.1.0
+PORTVERSION=	4.0.0
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Terminal CLI to Mathics
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Mathics3>0:math/py-mathics \
 		${PYTHON_PKGNAMEPREFIX}mathics_pygments>0:textproc/py-mathics-pygments \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>0:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}term-background>0:deskutils/py-term-background@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Mathics3>0:math/py-mathics \
 		${PYTHON_PKGNAMEPREFIX}mathics_pygments>0:textproc/py-mathics-pygments \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>2.5:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>0:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}term-background>0:deskutils/py-term-background@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	Mathics3
 
 USES=		python:3.6+ readline shebangfix
 USE_PYTHON=	distutils noflavors
 SHEBANG_GLOB=	*.py
 
 MAKE_ENV+=	PYTHON=${PYTHON_CMD}
 NO_ARCH=	yes
 
 post-stage:
 	${RM} -r ${STAGEDIR}/${PYTHON_SITELIBDIR}/test
 
 do-test: install
 	(cd ${TEST_WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/math/mathicsscript/distinfo b/math/mathicsscript/distinfo
index 23f071ac4479..b38434cd6cee 100644
--- a/math/mathicsscript/distinfo
+++ b/math/mathicsscript/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622995738
-SHA256 (mathicsscript-3.1.0.tar.gz) = 81641debb6dd0cf0307072e482c225d82b85b57c22ccdb062687633967d3e529
-SIZE (mathicsscript-3.1.0.tar.gz) = 49244
+TIMESTAMP = 1645364987
+SHA256 (mathicsscript-4.0.0.tar.gz) = 2fbe40e969917fd8c54ffbcad4b88ac21f0513906800265945a9108bfbdd0cec
+SIZE (mathicsscript-4.0.0.tar.gz) = 56905
diff --git a/math/mathicsscript/files/patch-setup.py b/math/mathicsscript/files/patch-setup.py
index 5eabeb92bdb3..e161ff81af87 100644
--- a/math/mathicsscript/files/patch-setup.py
+++ b/math/mathicsscript/files/patch-setup.py
@@ -1,13 +1,17 @@
---- setup.py.orig	2021-06-06 16:11:07 UTC
+--- setup.py.orig	2021-07-05 14:18:53 UTC
 +++ setup.py
-@@ -47,10 +47,6 @@ exec(read("mathicsscript/version.py"))
+@@ -47,14 +47,6 @@ exec(read("mathicsscript/version.py"))
  is_PyPy = platform.python_implementation() == "PyPy"
  
- dev_requires = []
--for line in open("requirements-dev.txt").read().split("\n"):
--    if line and not line.startswith("#"):
--        requires = re.sub(r"([^#]+)(\s*#.*$)?", r"\1", line)
--        dev_requires.append(requires)
- 
+ EXTRAS_REQUIRE = {}
+-for kind in ("dev", "full"):
+-    extras_require = []
+-    requirements_file = f"requirements-{kind}.txt"
+-    for line in open(requirements_file).read().split("\n"):
+-        if line and not line.startswith("#"):
+-            requires = re.sub(r"([^#]+)(\s*#.*$)?", r"\1", line)
+-            extras_require.append(requires)
+-    EXTRAS_REQUIRE[kind] = extras_require
  
  setup(
+     maintainer="Mathics Group",
diff --git a/math/mathicsscript/pkg-plist b/math/mathicsscript/pkg-plist
index b6d443c65476..d7e77744b3e3 100644
--- a/math/mathicsscript/pkg-plist
+++ b/math/mathicsscript/pkg-plist
@@ -1,31 +1,44 @@
+bin/fake_psviewer.py
 bin/mathicsscript
 %%PYTHON_SITELIBDIR%%/mathicsscript/__init__.py
 %%PYTHON_SITELIBDIR%%/mathicsscript/__main__.py
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/__main__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/__main__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/asymptote.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/asymptote.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/bindkeys.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/bindkeys.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/fake_psviewer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/fake_psviewer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/format-next.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/format-next.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/format.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/format.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell_gnu.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell_gnu.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell_prompt.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell_prompt.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/asymptote.py
+%%PYTHON_SITELIBDIR%%/mathicsscript/autoload/settings.m
 %%PYTHON_SITELIBDIR%%/mathicsscript/bindkeys.py
 %%PYTHON_SITELIBDIR%%/mathicsscript/completion.py
+%%PYTHON_SITELIBDIR%%/mathicsscript/config.asy
 %%PYTHON_SITELIBDIR%%/mathicsscript/data/inputrc-no-unicode
 %%PYTHON_SITELIBDIR%%/mathicsscript/data/inputrc-unicode
 %%PYTHON_SITELIBDIR%%/mathicsscript/data/mma-tables.json
+%%PYTHON_SITELIBDIR%%/mathicsscript/fake_psviewer.py
+%%PYTHON_SITELIBDIR%%/mathicsscript/format-next.py
 %%PYTHON_SITELIBDIR%%/mathicsscript/format.py
 %%PYTHON_SITELIBDIR%%/mathicsscript/termshell.py
 %%PYTHON_SITELIBDIR%%/mathicsscript/termshell_gnu.py
 %%PYTHON_SITELIBDIR%%/mathicsscript/termshell_prompt.py
+%%PYTHON_SITELIBDIR%%/mathicsscript/user-settings.m
 %%PYTHON_SITELIBDIR%%/mathicsscript/version.py