diff --git a/math/py-mathics-scanner/Makefile b/math/py-mathics-scanner/Makefile index 05068004895d..afad2ffdcb81 100644 --- a/math/py-mathics-scanner/Makefile +++ b/math/py-mathics-scanner/Makefile @@ -1,40 +1,42 @@ -PORTNAME= Mathics_Scanner -PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTNAME= mathics_scanner +PORTVERSION= 1.4.1 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= thierry@FreeBSD.org COMMENT= Tokeniser, char tables, & conversion routines for the Wolfram Language WWW= https://mathics.org/ LICENSE= GPLv3 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${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} \ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}types-ujson>0:devel/py-types-ujson@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}types-PyYAML>0:devel/py-types-PyYAML@${PY_FLAVOR} TEST_DEPENDS= gmake:devel/gmake \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} #USE_GITHUB= yes #GH_ACCOUNT= Mathics3 USES= python shebangfix USE_PYTHON= distutils noflavors NO_ARCH= yes MAKE_ENV+= PYTHON=${PYTHON_CMD} PLIST_SUB+= VER=${PORTVERSION} TEST_TARGET= check TEST_ENV= ${MAKE_ENV} do-test: install (cd ${TEST_WRKSRC} && \ ${SETENV} ${TEST_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_TARGET}) .include diff --git a/math/py-mathics-scanner/distinfo b/math/py-mathics-scanner/distinfo index dd1e8b722fd5..5f36f7c37f0a 100644 --- a/math/py-mathics-scanner/distinfo +++ b/math/py-mathics-scanner/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678886730 -SHA256 (Mathics_Scanner-1.3.0.tar.gz) = 39751a2d28d40c88538cc03aa72a113dcae59fc49e8e7727f30219a6cc9ef997 -SIZE (Mathics_Scanner-1.3.0.tar.gz) = 125861 +TIMESTAMP = 1737918622 +SHA256 (mathics_scanner-1.4.1.tar.gz) = a98a5ee11815bf94edf8a6f665e788915c09b9cd4fd96ed4fc26583973dc6fb1 +SIZE (mathics_scanner-1.4.1.tar.gz) = 182389 diff --git a/math/py-mathics-scanner/files/patch-Makefile b/math/py-mathics-scanner/files/patch-Makefile index 6241c44f354e..00d7154242d3 100644 --- a/math/py-mathics-scanner/files/patch-Makefile +++ b/math/py-mathics-scanner/files/patch-Makefile @@ -1,10 +1,14 @@ ---- Makefile.orig 2021-02-06 10:47:39 UTC +--- Makefile.orig 2025-01-26 16:27:42 UTC +++ Makefile -@@ -20,7 +20,6 @@ RM ?= rm +@@ -23,11 +23,9 @@ mathics_scanner/data/character-tables.json: mathics_sc all: develop - mathics_scanner/data/characters.json: mathics_scanner/data/named-characters.yml + mathics_scanner/data/character-tables.json: mathics_scanner/data/named-characters.yml - $(PIP) install -r requirements-dev.txt $(PYTHON) mathics_scanner/generate/build_tables.py + mathics_scanner/data/operators.json: mathics_scanner/data/operators.yml +- $(PIP) install -r requirements-dev.txt + $(PYTHON) mathics_scanner/generate/build_operator_tables.py + #: build everything needed to install diff --git a/math/py-mathics-scanner/pkg-plist b/math/py-mathics-scanner/pkg-plist index 74c338400240..8a8b8ad363c4 100644 --- a/math/py-mathics-scanner/pkg-plist +++ b/math/py-mathics-scanner/pkg-plist @@ -1,34 +1,51 @@ -bin/mathics-generate-json-table +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/__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/characters.py -%%PYTHON_SITELIBDIR%%/mathics_scanner/data/characters.json +%%PYTHON_SITELIBDIR%%/mathics_scanner/data/character-tables.json %%PYTHON_SITELIBDIR%%/mathics_scanner/data/element.csv %%PYTHON_SITELIBDIR%%/mathics_scanner/data/named-characters.yml +%%PYTHON_SITELIBDIR%%/mathics_scanner/data/operators.json +%%PYTHON_SITELIBDIR%%/mathics_scanner/data/operators.yml %%PYTHON_SITELIBDIR%%/mathics_scanner/errors.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/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/mathics3_tokens.py %%PYTHON_SITELIBDIR%%/mathics_scanner/prescanner.py %%PYTHON_SITELIBDIR%%/mathics_scanner/tokeniser.py %%PYTHON_SITELIBDIR%%/mathics_scanner/version.py