git: e579bbf5f47a - main - math/py-mathics-scanner: upgrade to 2.0.0

From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Thu, 04 Sep 2025 09:21:33 UTC
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e579bbf5f47af658dc589c2e5c986a2794703baf

commit e579bbf5f47af658dc589c2e5c986a2794703baf
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2025-09-04 09:10:25 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2025-09-04 09:17:39 +0000

    math/py-mathics-scanner: upgrade to 2.0.0
    
    Release notes at https://github.com/Mathics3/mathics-scanner/releases/tag/2.0.0
---
 math/py-mathics-scanner/Makefile                   | 14 +++--
 math/py-mathics-scanner/distinfo                   |  6 +-
 math/py-mathics-scanner/files/patch-pyproject.toml | 11 ++++
 math/py-mathics-scanner/pkg-plist                  | 69 ++++++++++++----------
 4 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/math/py-mathics-scanner/Makefile b/math/py-mathics-scanner/Makefile
index 96baae1f5df0..c85d4f718fdb 100644
--- a/math/py-mathics-scanner/Makefile
+++ b/math/py-mathics-scanner/Makefile
@@ -1,18 +1,20 @@
-PORTNAME=	mathics_scanner
-PORTVERSION=	1.4.1
-PORTREVISION=	3
+PORTNAME=	Mathics_Scanner
+PORTVERSION=	2.0.0
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Tokeniser, char tables, & conversion routines for the Wolfram Language
 WWW=		https://mathics.org/
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR}	\
+BUILD_DEPENDS=	${PY_SETUPTOOLS}	\
+		${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR}	\
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR}	\
@@ -28,7 +30,7 @@ TEST_DEPENDS=	gmake:devel/gmake	\
 #GH_ACCOUNT=	Mathics3
 
 USES=		python shebangfix
-USE_PYTHON=	distutils noflavors
+USE_PYTHON=	noflavors pep517
 
 NO_ARCH=	yes
 MAKE_ENV+=	PYTHON=${PYTHON_CMD}
diff --git a/math/py-mathics-scanner/distinfo b/math/py-mathics-scanner/distinfo
index 5f36f7c37f0a..fc629e485112 100644
--- a/math/py-mathics-scanner/distinfo
+++ b/math/py-mathics-scanner/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737918622
-SHA256 (mathics_scanner-1.4.1.tar.gz) = a98a5ee11815bf94edf8a6f665e788915c09b9cd4fd96ed4fc26583973dc6fb1
-SIZE (mathics_scanner-1.4.1.tar.gz) = 182389
+TIMESTAMP = 1756828917
+SHA256 (mathics_scanner-2.0.0.tar.gz) = 0424ae0918313640af52a7bbadc91824ca1869eb1ad0e0dd87c784c141326d9a
+SIZE (mathics_scanner-2.0.0.tar.gz) = 199851
diff --git a/math/py-mathics-scanner/files/patch-pyproject.toml b/math/py-mathics-scanner/files/patch-pyproject.toml
new file mode 100644
index 000000000000..3e1cec9381ea
--- /dev/null
+++ b/math/py-mathics-scanner/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig	2025-08-28 15:59:20 UTC
++++ pyproject.toml
+@@ -17,7 +17,7 @@ readme = "README.rst"
+ ]
+ requires-python = ">=3.10"
+ readme = "README.rst"
+-license = "GPL-3.0-or-later"
++license = {text = "GPL-3.0-or-later"}
+ keywords = ["Mathematica", "Wolfram", "Interpreter", "Shell", "Math", "CAS"]
+ maintainers = [
+     {name = "Mathics3 Group"},
diff --git a/math/py-mathics-scanner/pkg-plist b/math/py-mathics-scanner/pkg-plist
index 8a8b8ad363c4..fa400f8a40e3 100644
--- a/math/py-mathics-scanner/pkg-plist
+++ b/math/py-mathics-scanner/pkg-plist
@@ -1,32 +1,35 @@
 bin/mathics3-generate-json-table
 bin/mathics3-generate-operator-json-table
 bin/mathics3-tokens
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/entry_points.txt
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/not-zip-safe
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/requires.txt
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%.dist-info/AUTHORS.txt
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%.dist-info/RECORD
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%.dist-info/WHEEL
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%.dist-info/entry_points.txt
+%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%.dist-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/characters.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/characters.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/feed.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/feed.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/load.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/load.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/mathics3_tokens.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/mathics3_tokens.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/prescanner.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/prescanner.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/tokeniser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/tokeniser.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/characters%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/characters%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/errors%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/errors%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/escape_sequences%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/escape_sequences%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/feed%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/feed%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/load%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/load%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/location%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/location%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/mathics3_tokens%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/mathics3_tokens%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/tokeniser-too-much%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/tokeniser-too-much%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/tokeniser%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/tokeniser%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/version%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/version%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/characters.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/data/character-tables.json
 %%PYTHON_SITELIBDIR%%/mathics_scanner/data/element.csv
@@ -34,18 +37,20 @@ bin/mathics3-tokens
 %%PYTHON_SITELIBDIR%%/mathics_scanner/data/operators.json
 %%PYTHON_SITELIBDIR%%/mathics_scanner/data/operators.yml
 %%PYTHON_SITELIBDIR%%/mathics_scanner/errors.py
+%%PYTHON_SITELIBDIR%%/mathics_scanner/escape_sequences.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/feed.py
-%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_operator_tables.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_operator_tables.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_tables.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_tables.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/rl_inputrc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/rl_inputrc.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_operator_tables%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_operator_tables%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_tables%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_tables%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/rl_inputrc%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/rl_inputrc%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/build_operator_tables.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/build_tables.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/rl_inputrc.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/load.py
+%%PYTHON_SITELIBDIR%%/mathics_scanner/location.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/mathics3_tokens.py
-%%PYTHON_SITELIBDIR%%/mathics_scanner/prescanner.py
+%%PYTHON_SITELIBDIR%%/mathics_scanner/tokeniser-too-much.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/tokeniser.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/version.py