summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
Diffstat (limited to 'math')
-rw-r--r--math/Makefile1
-rw-r--r--math/algae/Makefile7
-rw-r--r--math/asymptote/Makefile2
-rw-r--r--math/blacs/Makefile4
-rw-r--r--math/blacs/files/Bmake.inc-mpich.diff2
-rw-r--r--math/blacs/files/patch-SRC_MPI_Bdef.h20
-rw-r--r--math/blacs/files/patch-SRC_MPI_blacs__get__.c11
-rw-r--r--math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c15
-rw-r--r--math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c11
-rw-r--r--math/cadabra2/Makefile2
-rw-r--r--math/elan/Makefile2
-rw-r--r--math/fend/Makefile1
-rw-r--r--math/hexowl/Makefile2
-rw-r--r--math/kalc/Makefile2
-rw-r--r--math/kalker/Makefile2
-rw-r--r--math/libmissing/Makefile85
-rw-r--r--math/libmissing/distinfo2
-rw-r--r--math/libmissing/pkg-descr7
-rw-r--r--math/libsemigroups/Makefile5
-rw-r--r--math/libsemigroups/distinfo6
-rw-r--r--math/libsemigroups/pkg-plist8
-rw-r--r--math/mathicsscript/Makefile15
-rw-r--r--math/mathicsscript/distinfo6
-rw-r--r--math/mathicsscript/files/patch-pyproject.toml11
-rw-r--r--math/mathicsscript/pkg-plist64
-rw-r--r--math/nlopt/Makefile8
-rw-r--r--math/nlopt/files/patch-CMakeLists.txt11
-rw-r--r--math/nlopt/files/patch-CMakePresets.json11
-rw-r--r--math/nlopt/pkg-plist.full48
-rw-r--r--math/octave-forge-image/Makefile2
-rw-r--r--math/octave-forge-image/distinfo6
-rw-r--r--math/openturns/Makefile2
-rw-r--r--math/py-animatplot-ng/Makefile2
-rw-r--r--math/py-animatplot/Makefile2
-rw-r--r--math/py-arviz/Makefile1
-rw-r--r--math/py-arybo/Makefile2
-rw-r--r--math/py-baycomp/Makefile2
-rw-r--r--math/py-benford_py/Makefile2
-rw-r--r--math/py-chaospy/Makefile2
-rw-r--r--math/py-clarabel/Makefile2
-rw-r--r--math/py-cmyt/Makefile1
-rw-r--r--math/py-colormath/Makefile2
-rw-r--r--math/py-dgl/Makefile2
-rw-r--r--math/py-fvcore/Makefile2
-rw-r--r--math/py-hypernetx/Makefile1
-rw-r--r--math/py-keras/Makefile2
-rw-r--r--math/py-mathics-scanner/Makefile16
-rw-r--r--math/py-mathics-scanner/distinfo6
-rw-r--r--math/py-mathics-scanner/files/patch-pyproject.toml11
-rw-r--r--math/py-mathics-scanner/pkg-plist69
-rw-r--r--math/py-mathics/Makefile19
-rw-r--r--math/py-mathics/distinfo6
-rw-r--r--math/py-mathics/files/patch-pyproject.toml11
-rw-r--r--math/py-mathics/pkg-plist1422
-rw-r--r--math/py-matplotlib-scalebar/Makefile2
-rw-r--r--math/py-matplotlib/Makefile2
-rw-r--r--math/py-minorminer/Makefile2
-rw-r--r--math/py-narwhals/Makefile2
-rw-r--r--math/py-narwhals/distinfo6
-rw-r--r--math/py-networkx/Makefile2
-rw-r--r--math/py-pcodec/Makefile2
-rw-r--r--math/py-plastex/Makefile2
-rw-r--r--math/py-pymc3/Makefile2
-rw-r--r--math/py-pyneqsys/Makefile2
-rw-r--r--math/py-pyodesys/Makefile2
-rw-r--r--math/py-python-louvain/Makefile2
-rw-r--r--math/py-python-picard/Makefile2
-rw-r--r--math/py-pytorchvideo/Makefile2
-rw-r--r--math/py-qats/Makefile1
-rw-r--r--math/py-rustworkx/Makefile1
-rw-r--r--math/py-seaborn/Makefile1
-rw-r--r--math/py-splot/Makefile1
-rw-r--r--math/py-spopt/Makefile2
-rw-r--r--math/py-squarify/Makefile2
-rw-r--r--math/py-ssm/Makefile2
-rw-r--r--math/py-timple/Makefile2
-rw-r--r--math/py-yt/Makefile2
-rw-r--r--math/qalculate-gtk/Makefile1
-rw-r--r--math/savage/Makefile2
-rw-r--r--math/scalapack/Makefile3
-rw-r--r--math/scalapack/files/patch-BLACS_SRC_Bdef.h18
-rw-r--r--math/scalapack/files/patch-BLACS_SRC_blacs__init__.c15
-rw-r--r--math/scalapack/files/patch-CMakeLists.txt10
-rw-r--r--math/scalapack/files/patch-gridmap120
-rw-r--r--math/verdict/Makefile3
-rw-r--r--math/verdict/distinfo6
-rw-r--r--math/verdict/pkg-plist2
87 files changed, 1246 insertions, 946 deletions
diff --git a/math/Makefile b/math/Makefile
index 51402df09f03..838c2ecf9d6a 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -461,7 +461,6 @@
SUBDIR += libformfactor
SUBDIR += libhomfly
SUBDIR += libmesh
- SUBDIR += libmissing
SUBDIR += libnormaliz
SUBDIR += libocas
SUBDIR += liborigin
diff --git a/math/algae/Makefile b/math/algae/Makefile
index 385a737f6ad6..3042e6816d32 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -15,13 +15,12 @@ BROKEN_aarch64= does not build: checking for proper floating point exception ha
BROKEN_armv6= does not build: checking for proper floating point exception handling... no
BROKEN_armv7= does not build: checking for proper floating point exception handling... no
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-USES= fortran
+USES= fortran:gfortran
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-dlmalloc --without-fftw --without-blas \
--without-lapack --without-bcslib --without-npsol
-FFLAGS+= -std=legacy
+FFLAGS= -std=legacy
PLIST_SUB= ALGAE_VERSION=${PORTVERSION}
INFO= ${PORTNAME}
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index a5f7dd68ac02..d137ba740d29 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -1,6 +1,6 @@
PORTNAME= asymptote
PORTVERSION= 2.92
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index 8e696c89704d..f550f55ff9a4 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -1,6 +1,6 @@
PORTNAME= blacs
PORTVERSION= 1.7
-PORTREVISION= 40
+PORTREVISION= 41
CATEGORIES= math
MASTER_SITES= NETLIB/blacs
DISTNAME= BLACS
@@ -36,7 +36,7 @@ MPICH_EXTRA_PATCHES= ${FILESDIR}/Bmake.inc-mpich.diff
.include <bsd.port.pre.mk>
F77EXTRAFLAGS= #-w -fno-globals -fugly-complex
-.if ${GCC_DEFAULT} >= 10
+.if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10
# workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1)
F77EXTRAFLAGS+= -fallow-argument-mismatch
.endif
diff --git a/math/blacs/files/Bmake.inc-mpich.diff b/math/blacs/files/Bmake.inc-mpich.diff
index 5224616e5cc8..3e30b122de6f 100644
--- a/math/blacs/files/Bmake.inc-mpich.diff
+++ b/math/blacs/files/Bmake.inc-mpich.diff
@@ -35,7 +35,7 @@
MPILIBdir = $(MPIdir)/lib/
MPIINCdir = $(MPIdir)/include
- MPILIB = $(MPILIBdir)/libmpich.a
-+ MPILIB = -lmpi -lmpifort -pthread
++ MPILIB = -lmpi -lmpifort -pthread -L$(MPILIBdir)
# -------------------------------------
# All libraries required by the tester.
diff --git a/math/blacs/files/patch-SRC_MPI_Bdef.h b/math/blacs/files/patch-SRC_MPI_Bdef.h
index 75a6acbe5696..adcdd43918c2 100644
--- a/math/blacs/files/patch-SRC_MPI_Bdef.h
+++ b/math/blacs/files/patch-SRC_MPI_Bdef.h
@@ -1,6 +1,22 @@
---- SRC/MPI/Bdef.h.orig 2020-04-21 20:22:36 UTC
+--- SRC/MPI/Bdef.h.orig 1998-03-13 20:14:33 UTC
+++ SRC/MPI/Bdef.h
-@@ -1605,9 +1605,9 @@ int BI_ContxtNum();
+@@ -322,6 +322,15 @@ int BI_ContxtNum(BLACSCONTEXT *ctxt);
+ void BI_BlacsWarn(int ConTxt, int line, char *file, char *form, ...);
+ void BI_BlacsErr(int ConTxt, int line, char *file, char *form, ...);
+ int BI_ContxtNum(BLACSCONTEXT *ctxt);
++void BI_TransDist(BLACSCONTEXT *ctxt, char scope, int m, int n, int *rA,
++ int *cA, int ldrc, BI_DistType *dist, int rdest, int cdest);
++void BI_dmvcopy(int m, int n, double *A, int lda, double *buff);
++void BI_dvmcopy(int m, int n, double *A, int lda, double *buff);
++void BI_imvcopy(int m, int n, int *A, int lda, int *buff);
++void BI_ivmcopy(int m, int n, int *A, int lda, int *buff);
++void BI_smvcopy(int m, int n, float *A, int lda, float *buff);
++void BI_svmcopy(int m, int n, float *A, int lda, float *buff);
++void Cblacs_pinfo(int *mypnum, int *nprocs);
+ #else
+ void BI_BlacsWarn();
+ void BI_BlacsErr();
+@@ -1605,9 +1614,9 @@ int BI_ContxtNum();
#else
#define BI_MPI_Type_struct(count_, lens_, disps_, types_, newtype_, ierr_) \
{ \
diff --git a/math/blacs/files/patch-SRC_MPI_blacs__get__.c b/math/blacs/files/patch-SRC_MPI_blacs__get__.c
new file mode 100644
index 000000000000..02f1b33c989e
--- /dev/null
+++ b/math/blacs/files/patch-SRC_MPI_blacs__get__.c
@@ -0,0 +1,11 @@
+--- SRC/MPI/blacs_get_.c.orig 2006-01-18 21:36:03 UTC
++++ SRC/MPI/blacs_get_.c
+@@ -12,6 +12,8 @@ F_VOID_FUNC blacs_get_(int *ConTxt, int *what, int *va
+ #else
+ int comm;
+ #endif
++ void BI_MPI_C_to_f77_trans_comm(MPI_Comm, int *);
++ void BI_MPI_F77_to_c_trans_comm(int F77comm, MPI_Comm *Ccomm);
+ BLACSCONTEXT *ctxt;
+
+ switch( Mpval(what) )
diff --git a/math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c b/math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c
new file mode 100644
index 000000000000..6c102072a27b
--- /dev/null
+++ b/math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c
@@ -0,0 +1,15 @@
+--- SRC/MPI/blacs_gridinit_.c.orig 2006-01-18 21:36:03 UTC
++++ SRC/MPI/blacs_gridinit_.c
+@@ -6,7 +6,12 @@ F_VOID_FUNC blacs_gridinit_(int *ConTxt, F_CHAR order,
+ F_VOID_FUNC blacs_gridinit_(int *ConTxt, F_CHAR order, int *nprow, int *npcol)
+ #endif
+ {
++#if (INTFACE == C_CALL)
+ void Cblacs_gridmap(int *, int *, int, int, int);
++#else
++ F_VOID_FUNC blacs_gridmap_(int *ConTxt, int *usermap, int *ldup, int *nprow0,
++ int *npcol0);
++#endif
+ int *tmpgrid, *iptr;
+ int i, j;
+
diff --git a/math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c b/math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c
new file mode 100644
index 000000000000..5d6f5111549a
--- /dev/null
+++ b/math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c
@@ -0,0 +1,11 @@
+--- SRC/MPI/blacs_pinfo_.c.orig 1998-03-13 20:16:27 UTC
++++ SRC/MPI/blacs_pinfo_.c
+@@ -1,5 +1,8 @@
+ #include "Bdef.h"
+
++void bi_f77_init_(void);
++void bi_f77_get_constants_(int*, int*, int*);
++
+ #if (INTFACE == C_CALL)
+ void Cblacs_pinfo(int *mypnum, int *nprocs)
+ #else
diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile
index 6d80737dae40..144d880da1c4 100644
--- a/math/cadabra2/Makefile
+++ b/math/cadabra2/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cadabra2
DISTVERSION= 2.5.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org
diff --git a/math/elan/Makefile b/math/elan/Makefile
index 16ecfff47107..fde287790f79 100644
--- a/math/elan/Makefile
+++ b/math/elan/Makefile
@@ -1,7 +1,7 @@
PORTNAME= elan
DISTVERSIONPREFIX= v
DISTVERSION= 4.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org
diff --git a/math/fend/Makefile b/math/fend/Makefile
index 27504d4954be..f381bc0a6dbd 100644
--- a/math/fend/Makefile
+++ b/math/fend/Makefile
@@ -1,6 +1,7 @@
PORTNAME= fend
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.7
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org
diff --git a/math/hexowl/Makefile b/math/hexowl/Makefile
index b094e7374d64..af93ef195e30 100644
--- a/math/hexowl/Makefile
+++ b/math/hexowl/Makefile
@@ -1,7 +1,7 @@
PORTNAME= hexowl
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= olgeni@FreeBSD.org
diff --git a/math/kalc/Makefile b/math/kalc/Makefile
index aa559ab8f74e..283f792991c3 100644
--- a/math/kalc/Makefile
+++ b/math/kalc/Makefile
@@ -1,7 +1,7 @@
PORTNAME= kalc
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
PKGNAMESUFFIX= -calculator
diff --git a/math/kalker/Makefile b/math/kalker/Makefile
index dadb36dd1168..46c3130be522 100644
--- a/math/kalker/Makefile
+++ b/math/kalker/Makefile
@@ -1,7 +1,7 @@
PORTNAME= kalker
DISTVERSIONPREFIX= v
DISTVERSION= 2.2.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= math
MAINTAINER= ashish@FreeBSD.org
diff --git a/math/libmissing/Makefile b/math/libmissing/Makefile
deleted file mode 100644
index cd0f0cc430f2..000000000000
--- a/math/libmissing/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-PORTNAME= libmissing
-DISTVERSION= 20130815
-PORTREVISION= 5
-CATEGORIES= math
-MASTER_SITES= LOCAL/bf
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Standard math functions missing from the FreeBSD libm
-
-LICENSE= BSD2CLAUSE
-
-DEPRECATED= Old. FreeBSD's libm improved since 2012 when this was imported
-EXPIRATION_DATE= 2025-09-01
-
-LIB_DEPENDS= libmpc.so:math/mpc
-
-USE_LDCONFIG= yes
-USES= tar:xz uidfix
-
-MAKE_ENV= LDADD=-lmpc LIB=missing SHLIB_MAJOR="${SHLIB_MAJOR}" \
- SRCCONF=/dev/null SRCS="${SRCS}"
-
-OPTIONS_DEFINE= PROFILE EXAMPLES
-
-PLIST_FILES= include/missing_complex.h \
- include/missing_math.h \
- lib/libmissing.a lib/libmissing.so \
- lib/libmissing.so.${SHLIB_MAJOR}
-
-SHLIB_MAJOR= 2
-SRCS= libmissing.c
-
-CFLAGS+= -fno-builtin -fno-math-errno -I. -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -Wl,-z,interpose
-PORTEXAMPLES= ${SRCS}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPROFILE}
-.if !exists(/usr/lib/libc_p.a)
-IGNORE= you have chosen WITH_PROFILE, but have not installed the\
-base system profiling libraries
-.endif
-PLIST_FILES+= lib/libmissing_p.a
-.else
-MAKE_ENV+= WITHOUT_PROFILE=yes
-.endif
-
-post-patch:
- @${PRINTF} "LIBDIR=\t${PREFIX}/lib\n.include <bsd.lib.mk>\n" > \
- ${WRKSRC}/Makefile
-.for t in d q s
- @cd ${WRKSRC}/c/common; ${CP} initseed.c maxtest.c ${WRKSRC}/c/${t}p/
-.endfor
- @${REINPLACE_CMD} -E \
- '/(XCFLAGS|XDEFINES|XINCLUDES|XLDFLAGS|XLIBS|XMFLAGS|XOPT)[[:blank:]]+=/d' \
- ${WRKSRC}/c/Makefile
- @${REINPLACE_CMD} -e \
- '/#include <math.h>/{x;s|^.*$$|#include "missing_math.h"|;H;x;}' \
- ${WRKSRC}/c/common/elefunt.h
- @${REINPLACE_CMD} -e '\|COMMONOBJS[[:blank:]]*=|s|../common/||g' \
- ${WRKSRC}/c/dp/Makefile \
- ${WRKSRC}/c/qp/Makefile \
- ${WRKSRC}/c/sp/Makefile
-
-do-test:
- @cd ${WRKSRC}/c; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
- XCFLAGS="${CFLAGS} -frounding-math" XINCLUDES="-I${WRKSRC}" \
- XLDFLAGS="${LDFLAGS}" XLIBS="-L${WRKSRC} -lmissing" \
- LD_LIBRARY_PATH="/lib:/usr/lib:${LOCALBASE}/lib:${WRKSRC}" \
- ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} all3
-.for t in d q s
- @${PRINTF} "\n\n\n\t\t%s\n\n\n" "REPORT OF ${t:tu}. PRECISION TEST RESULTS:"
- @${CAT} ${WRKSRC}/c/${t}p/tall${t}p.lst-xxx
-.endfor
-
-post-install:
- @cd ${WRKSRC}; ${INSTALL_DATA} missing_complex.h missing_math.h \
- ${STAGEDIR}${PREFIX}/include
-
-post-install-EXAMPLES-on:
- @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.mk>
diff --git a/math/libmissing/distinfo b/math/libmissing/distinfo
deleted file mode 100644
index fdd4102ee8c7..000000000000
--- a/math/libmissing/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libmissing-20130815.tar.xz) = 44872006f607c34e0a85dd18a3c890d2f380fbcd87b885fdb5a17b46e1a3f422
-SIZE (libmissing-20130815.tar.xz) = 130232
diff --git a/math/libmissing/pkg-descr b/math/libmissing/pkg-descr
deleted file mode 100644
index b4f3fd16579e..000000000000
--- a/math/libmissing/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This is a collection of stopgap replacements for standard math
-functions missing from libm in various supported versions of
-FreeBSD. The functions are slower than the existing libm
-functions, but are more accurate than many naive replacements.
-Exceptions are largely ignored. N. Beebe's extended C version
-of the ELEFUNT package is used to provide regression tests for
-some of the real-valued functions.
diff --git a/math/libsemigroups/Makefile b/math/libsemigroups/Makefile
index dd84cc5348c2..9300f0d48ca3 100644
--- a/math/libsemigroups/Makefile
+++ b/math/libsemigroups/Makefile
@@ -1,6 +1,5 @@
PORTNAME= libsemigroups
-PORTVERSION= 3.0.3
-PORTREVISION= 1
+PORTVERSION= 3.1.3
DISTVERSIONPREFIX= v
CATEGORIES= math
@@ -15,7 +14,7 @@ LIB_DEPENDS= libfmt.so:devel/libfmt
USE_GITHUB= yes
-USES= autoreconf compiler:c++11-lang eigen:3,build \
+USES= autoreconf compiler:c++17-lang eigen:3,build \
libtool pathfix pkgconfig
GNU_CONFIGURE= yes
diff --git a/math/libsemigroups/distinfo b/math/libsemigroups/distinfo
index baea601b6412..eb0d7fb689fd 100644
--- a/math/libsemigroups/distinfo
+++ b/math/libsemigroups/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744375738
-SHA256 (libsemigroups-libsemigroups-v3.0.3_GH0.tar.gz) = 5dd477b6cb86fa6b881708666c232f5d01f9d60ebf0a3e70c81b860e2f2236cf
-SIZE (libsemigroups-libsemigroups-v3.0.3_GH0.tar.gz) = 6091089
+TIMESTAMP = 1756982852
+SHA256 (libsemigroups-libsemigroups-v3.1.3_GH0.tar.gz) = a751b879a97b259821e0d19f39d3d394efc8ecd12647cdcb267d39b6d6a8a31d
+SIZE (libsemigroups-libsemigroups-v3.1.3_GH0.tar.gz) = 6155171
diff --git a/math/libsemigroups/pkg-plist b/math/libsemigroups/pkg-plist
index fcb02d634ca2..00dfb889c2c6 100644
--- a/math/libsemigroups/pkg-plist
+++ b/math/libsemigroups/pkg-plist
@@ -21,6 +21,8 @@ include/libsemigroups/cong.hpp
include/libsemigroups/constants.hpp
include/libsemigroups/debug.hpp
include/libsemigroups/deprecated.hpp
+include/libsemigroups/detail/aho-corasick-impl.hpp
+include/libsemigroups/detail/aho-corasick-impl.tpp
include/libsemigroups/detail/bruidhinn-traits.hpp
include/libsemigroups/detail/citow.hpp
include/libsemigroups/detail/cong-common-class.hpp
@@ -33,6 +35,7 @@ include/libsemigroups/detail/felsch-tree.hpp
include/libsemigroups/detail/fmt.hpp
include/libsemigroups/detail/formatters.hpp
include/libsemigroups/detail/function-ref.hpp
+include/libsemigroups/detail/guard.hpp
include/libsemigroups/detail/int-range.hpp
include/libsemigroups/detail/iterator.hpp
include/libsemigroups/detail/kambites-nf.hpp
@@ -42,7 +45,7 @@ include/libsemigroups/detail/ke.hpp
include/libsemigroups/detail/knuth-bendix-impl.hpp
include/libsemigroups/detail/knuth-bendix-impl.tpp
include/libsemigroups/detail/knuth-bendix-nf.hpp
-include/libsemigroups/detail/multi-string-view.hpp
+include/libsemigroups/detail/multi-view.hpp
include/libsemigroups/detail/node-managed-graph.hpp
include/libsemigroups/detail/node-managed-graph.tpp
include/libsemigroups/detail/node-manager.hpp
@@ -50,6 +53,7 @@ include/libsemigroups/detail/node-manager.tpp
include/libsemigroups/detail/path-iterators.hpp
include/libsemigroups/detail/path-iterators.tpp
include/libsemigroups/detail/pool.hpp
+include/libsemigroups/detail/print.hpp
include/libsemigroups/detail/race.hpp
include/libsemigroups/detail/report.hpp
include/libsemigroups/detail/report.tpp
@@ -67,6 +71,7 @@ include/libsemigroups/detail/word-iterators.hpp
include/libsemigroups/dot.hpp
include/libsemigroups/exception.hpp
include/libsemigroups/forest.hpp
+include/libsemigroups/forest.tpp
include/libsemigroups/freeband.hpp
include/libsemigroups/froidure-pin-base.hpp
include/libsemigroups/froidure-pin.hpp
@@ -110,6 +115,7 @@ include/libsemigroups/hpcombi/simde/x86/svml.h
include/libsemigroups/hpcombi/simde/x86/xop.h
include/libsemigroups/hpcombi/vect16.hpp
include/libsemigroups/hpcombi/vect_generic.hpp
+include/libsemigroups/is_specialization_of.hpp
include/libsemigroups/kambites-class.hpp
include/libsemigroups/kambites-class.tpp
include/libsemigroups/kambites-helpers.hpp
diff --git a/math/mathicsscript/Makefile b/math/mathicsscript/Makefile
index dcdde074235f..7d4a11be8769 100644
--- a/math/mathicsscript/Makefile
+++ b/math/mathicsscript/Makefile
@@ -1,6 +1,5 @@
PORTNAME= mathicsscript
-PORTVERSION= 8.0.0
-PORTREVISION= 2
+PORTVERSION= 9.0.0
CATEGORIES= math python
MASTER_SITES= PYPI
@@ -8,23 +7,27 @@ MAINTAINER= thierry@FreeBSD.org
COMMENT= Terminal CLI to Mathics
WWW= https://mathics.org/
-LICENSE= GPLv3
+LICENSE= GPLv3+
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Mathics3>0:math/py-mathics \
+BUILD_DEPENDS= ${PY_SETUPTOOLS} \
+ ${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}pyaml>0:textproc/py-pyaml@${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 \
+RUN_DEPENDS= asy:math/asymptote \
+ ${PYTHON_PKGNAMEPREFIX}Mathics3>0:math/py-mathics \
${PYTHON_PKGNAMEPREFIX}mathics_pygments>0:textproc/py-mathics-pygments \
${PYTHON_PKGNAMEPREFIX}qt6>0:devel/py-qt6@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cson>0:devel/py-cson@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyaml>0:textproc/py-pyaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Mathics_Scanner>0:math/py-mathics-scanner \
${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} \
@@ -39,7 +42,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
#GH_ACCOUNT= Mathics3
USES= python readline shebangfix
-USE_PYTHON= distutils noflavors
+USE_PYTHON= noflavors pep517
SHEBANG_GLOB= *.py
MAKE_ENV+= PYTHON=${PYTHON_CMD}
diff --git a/math/mathicsscript/distinfo b/math/mathicsscript/distinfo
index 8fedfe84f32f..916ef74cc577 100644
--- a/math/mathicsscript/distinfo
+++ b/math/mathicsscript/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738056778
-SHA256 (mathicsscript-8.0.0.tar.gz) = 84a9dc55580d07a9616d7549745583086a5de75ee25cb5f68ae5aab44e1a518b
-SIZE (mathicsscript-8.0.0.tar.gz) = 66662
+TIMESTAMP = 1756917847
+SHA256 (mathicsscript-9.0.0.tar.gz) = 3115fb57a1311e1fe392428355b740b9b6ec46489339baaeea904554ebda555d
+SIZE (mathicsscript-9.0.0.tar.gz) = 73147
diff --git a/math/mathicsscript/files/patch-pyproject.toml b/math/mathicsscript/files/patch-pyproject.toml
new file mode 100644
index 000000000000..de9923401be0
--- /dev/null
+++ b/math/mathicsscript/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig 2025-08-29 10:04:46 UTC
++++ pyproject.toml
+@@ -24,7 +24,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/mathicsscript/pkg-plist b/math/mathicsscript/pkg-plist
index 413fe581bf20..643ac4dca3ef 100644
--- a/math/mathicsscript/pkg-plist
+++ b/math/mathicsscript/pkg-plist
@@ -1,35 +1,42 @@
bin/fake_psviewer.py
bin/mathicsscript
+%%PYTHON_SITELIBDIR%%/mathicsscript-9.0.0.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/mathicsscript-9.0.0.dist-info/RECORD
+%%PYTHON_SITELIBDIR%%/mathicsscript-9.0.0.dist-info/WHEEL
+%%PYTHON_SITELIBDIR%%/mathicsscript-9.0.0.dist-info/entry_points.txt
+%%PYTHON_SITELIBDIR%%/mathicsscript-9.0.0.dist-info/top_level.txt
%%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-try.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/format-try.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__/settings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/settings.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/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/__main__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/__main__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/asymptote%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/asymptote%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/bindkeys%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/bindkeys%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/completion%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/completion%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/fake_psviewer%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/fake_psviewer%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/format-next%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/format-next%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/format-try%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/format-try%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/format%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/format%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/interrupt%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/interrupt%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/settings%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/settings%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell_gnu%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell_gnu%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell_prompt%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/termshell_prompt%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/version%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathicsscript/__pycache__/version%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathicsscript/asymptote.py
%%PYTHON_SITELIBDIR%%/mathicsscript/autoload/settings.m
%%PYTHON_SITELIBDIR%%/mathicsscript/bindkeys.py
@@ -42,6 +49,7 @@ bin/mathicsscript
%%PYTHON_SITELIBDIR%%/mathicsscript/format-next.py
%%PYTHON_SITELIBDIR%%/mathicsscript/format-try.py
%%PYTHON_SITELIBDIR%%/mathicsscript/format.py
+%%PYTHON_SITELIBDIR%%/mathicsscript/interrupt.py
%%PYTHON_SITELIBDIR%%/mathicsscript/settings.py
%%PYTHON_SITELIBDIR%%/mathicsscript/termshell.py
%%PYTHON_SITELIBDIR%%/mathicsscript/termshell_gnu.py
diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile
index 283559daa8db..dd4dc557a783 100644
--- a/math/nlopt/Makefile
+++ b/math/nlopt/Makefile
@@ -1,6 +1,7 @@
PORTNAME= nlopt
DISTVERSIONPREFIX= v
DISTVERSION= 2.10.0
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= rhurlin@FreeBSD.org
@@ -20,6 +21,7 @@ FLAVOR?= ${FLAVORS:[1]}
full_BUILD_DEPENDS= ${PYNUMPY} \
swig:devel/swig
+full_LIB_DEPENDS= liboctave.so:math/octave
full_RUN_DEPENDS= ${PYNUMPY}
full_CONFLICTS_INSTALL= ${PORTNAME}-minimal
minimal_PKGNAMESUFFIX= -minimal
@@ -34,16 +36,18 @@ USE_LDCONFIG= yes
CMAKE_TESTING_ON= NLOPT_TESTS
.if ${FLAVOR} == full
-USES+= guile:3.0,alias localbase pkgconfig python
+USES+= guile:3.0,alias localbase octave:env pkgconfig python
# Because guile-config-3.0 crashes, nlopt avoids this by using
# files/patch-cmake_FindGuile.cmake and setting GUILE_EXECUTABLE
# and GUILE_CONFIG_EXECUTABLE
MAKE_ENV+= GUILE_EXECUTABLE=${PREFIX}/bin/guile-3.0 \
GUILE_CONFIG_EXECUTABLE=${PREFIX}/bin/guile-config-3.0
CMAKE_OFF= NLOPT_JAVA
+GNU_HOST= ${ARCH}-portbld-freebsd${OSREL}
PLIST= ${PKGDIR}/pkg-plist.${FLAVOR}
+PLIST_SUB= GNU_HOST=${GNU_HOST} OCTAVE_VERSION=${OCTAVE_VERSION}
.elif ${FLAVOR} == minimal
-CMAKE_OFF= NLOPT_GUILE NLOPT_JAVA NLOPT_PYTHON NLOPT_SWIG
+CMAKE_OFF= NLOPT_GUILE NLOPT_JAVA NLOPT_OCTAVE NLOPT_PYTHON NLOPT_SWIG
.endif
.include <bsd.port.mk>
diff --git a/math/nlopt/files/patch-CMakeLists.txt b/math/nlopt/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..4cc24139004e
--- /dev/null
+++ b/math/nlopt/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2025-02-04 18:29:30 UTC
++++ CMakeLists.txt
+@@ -147,7 +147,7 @@ if (NLOPT_CXX OR NLOPT_PYTHON OR NLOPT_GUILE OR NLOPT_
+ if (NLOPT_CXX OR NLOPT_PYTHON OR NLOPT_GUILE OR NLOPT_OCTAVE OR NLOPT_JAVA)
+ check_cxx_symbol_exists (__cplusplus ciso646 SYSTEM_HAS_CXX)
+ if (SYSTEM_HAS_CXX)
+- set (CMAKE_CXX_STANDARD 11) # set the standard to C++11 but do not require it
++ set (CMAKE_CXX_STANDARD 17) # set the standard to C++17 but do not require it
+
+ if (NLOPT_CXX)
+ set (CMAKE_CXX_STANDARD_REQUIRED ON) # if we build C++ API, we do need C++11
diff --git a/math/nlopt/files/patch-CMakePresets.json b/math/nlopt/files/patch-CMakePresets.json
new file mode 100644
index 000000000000..e557968bc963
--- /dev/null
+++ b/math/nlopt/files/patch-CMakePresets.json
@@ -0,0 +1,11 @@
+--- CMakePresets.json.orig 2025-02-04 18:29:30 UTC
++++ CMakePresets.json
+@@ -8,7 +8,7 @@
+ "cacheVariables": {
+ "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+ "CMAKE_C_FLAGS": "-Wall -Wextra -Wpedantic -Wshadow",
+- "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -Wshadow -D_GLIBCXX_ASSERTIONS -fno-inline",
++ "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -Wshadow -D_GLIBCXX_ASSERTIONS -fno-inline -std=c++17",
+ "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
+ "SWIG_COMPILE_FLAGS": "-O1 -Wno-unused-parameter -Wno-shadow"
+ }
diff --git a/math/nlopt/pkg-plist.full b/math/nlopt/pkg-plist.full
index 3a3a6db63e96..971a564dd944 100644
--- a/math/nlopt/pkg-plist.full
+++ b/math/nlopt/pkg-plist.full
@@ -1,4 +1,3 @@
-%%GUILE_SITE%%/nlopt.scm
include/nlopt.h
include/nlopt.hpp
lib/cmake/nlopt/NLoptConfig.cmake
@@ -9,10 +8,57 @@ lib/guile/%%GUILE_VER%%/extensions/nlopt_guile.so
lib/libnlopt.so
lib/libnlopt.so.1
lib/libnlopt.so.1.0.0
+lib/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/nlopt_optimize.oct
%%PYTHON_SITELIBDIR%%/_nlopt.so
%%PYTHON_SITELIBDIR%%/nlopt-2.10.0.dist-info/METADATA
%%PYTHON_SITELIBDIR%%/nlopt.py
libdata/pkgconfig/nlopt.pc
+%%GUILE_SITE%%/nlopt.scm
share/man/man3/nlopt.3.gz
share/man/man3/nlopt_minimize.3.gz
share/man/man3/nlopt_minimize_constrained.3.gz
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_AUGLAG.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_AUGLAG_EQ.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GD_MLSL.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GD_MLSL_LDS.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GD_STOGO.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GD_STOGO_RAND.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_AGS.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_CRS2_LM.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT_L.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT_L_NOSCAL.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT_L_RAND.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT_L_RAND_NOSCAL.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT_NOSCAL.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_ESCH.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_ISRES.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_MLSL.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_MLSL_LDS.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_ORIG_DIRECT.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_ORIG_DIRECT_L.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_G_MLSL.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_G_MLSL_LDS.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_AUGLAG.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_AUGLAG_EQ.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_CCSAQ.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_LBFGS.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_MMA.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_SLSQP.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_TNEWTON.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_TNEWTON_PRECOND.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_TNEWTON_PRECOND_RESTART.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_TNEWTON_RESTART.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_VAR1.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_VAR2.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_AUGLAG.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_AUGLAG_EQ.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_BOBYQA.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_COBYLA.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_NELDERMEAD.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_NEWUOA.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_NEWUOA_BOUND.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_PRAXIS.m
+share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_SBPLX.m
+share/octave/%%OCTAVE_VERSION%%/site/m/nlopt_minimize.m
+share/octave/%%OCTAVE_VERSION%%/site/m/nlopt_minimize_constrained.m
diff --git a/math/octave-forge-image/Makefile b/math/octave-forge-image/Makefile
index f9abe718eec9..d8000dbcbe8c 100644
--- a/math/octave-forge-image/Makefile
+++ b/math/octave-forge-image/Makefile
@@ -1,5 +1,5 @@
PORTNAME= octave-forge-image
-PORTVERSION= 2.18.0
+PORTVERSION= 2.18.1
CATEGORIES= math
MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
diff --git a/math/octave-forge-image/distinfo b/math/octave-forge-image/distinfo
index 5188034df013..c816ce3b8a9a 100644
--- a/math/octave-forge-image/distinfo
+++ b/math/octave-forge-image/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755636185
-SHA256 (octave-forge/image-2.18.0.tar.gz) = d87af2b098a03b3fe78d05fe623cff49765f87251c0090769e214bbbc6569a00
-SIZE (octave-forge/image-2.18.0.tar.gz) = 477488
+TIMESTAMP = 1757075144
+SHA256 (octave-forge/image-2.18.1.tar.gz) = d4eed0579782c2efaa0818de2f20f13b276eb3d4b4b3d63347c7317d84e29531
+SIZE (octave-forge/image-2.18.1.tar.gz) = 477118
diff --git a/math/openturns/Makefile b/math/openturns/Makefile
index dca10464a177..1dfded3a266b 100644
--- a/math/openturns/Makefile
+++ b/math/openturns/Makefile
@@ -1,7 +1,7 @@
PORTNAME= openturns
DISTVERSIONPREFIX= v
DISTVERSION= 1.24
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org
diff --git a/math/py-animatplot-ng/Makefile b/math/py-animatplot-ng/Makefile
index 43b4dd82328d..e6b1e08d93a3 100644
--- a/math/py-animatplot-ng/Makefile
+++ b/math/py-animatplot-ng/Makefile
@@ -1,6 +1,6 @@
PORTNAME= animatplot-ng
DISTVERSION= 0.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-animatplot/Makefile b/math/py-animatplot/Makefile
index a246f6b4128b..e283380e035c 100644
--- a/math/py-animatplot/Makefile
+++ b/math/py-animatplot/Makefile
@@ -1,6 +1,6 @@
PORTNAME= animatplot
DISTVERSION= 0.4.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-arviz/Makefile b/math/py-arviz/Makefile
index 15fd25dbf01b..d262be7a0339 100644
--- a/math/py-arviz/Makefile
+++ b/math/py-arviz/Makefile
@@ -1,6 +1,7 @@
PORTNAME= arviz
DISTVERSIONPREFIX= v
DISTVERSION= 0.22.0
+PORTREVISION= 1
CATEGORIES= math python
#MASTER_SITES= PYPI # missing test files
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-arybo/Makefile b/math/py-arybo/Makefile
index 758639d91364..57890d1450fa 100644
--- a/math/py-arybo/Makefile
+++ b/math/py-arybo/Makefile
@@ -1,6 +1,6 @@
PORTNAME= arybo
DISTVERSION= 1.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-baycomp/Makefile b/math/py-baycomp/Makefile
index 2b198a836028..dc1a5d82358b 100644
--- a/math/py-baycomp/Makefile
+++ b/math/py-baycomp/Makefile
@@ -1,6 +1,6 @@
PORTNAME= baycomp
DISTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python # statistics
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-benford_py/Makefile b/math/py-benford_py/Makefile
index 35fbd8c85cb6..bdb2a3652030 100644
--- a/math/py-benford_py/Makefile
+++ b/math/py-benford_py/Makefile
@@ -1,7 +1,7 @@
PORTNAME= benford_py
DISTVERSIONPREFIX= v
DISTVERSION= 0.5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math python
#MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-chaospy/Makefile b/math/py-chaospy/Makefile
index 2d99d5297d2b..b8cf63ae4b4d 100644
--- a/math/py-chaospy/Makefile
+++ b/math/py-chaospy/Makefile
@@ -1,7 +1,7 @@
PORTNAME= chaospy
DISTVERSIONPREFIX= v
DISTVERSION= 4.3.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math python
#MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-clarabel/Makefile b/math/py-clarabel/Makefile
index 7d8e9f5e14d7..421b79298308 100644
--- a/math/py-clarabel/Makefile
+++ b/math/py-clarabel/Makefile
@@ -1,7 +1,7 @@
PORTNAME= clarabel
DISTVERSIONPREFIX= v
DISTVERSION= 0.9.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= math python
#MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-cmyt/Makefile b/math/py-cmyt/Makefile
index 3024184f481f..1b07269ed079 100644
--- a/math/py-cmyt/Makefile
+++ b/math/py-cmyt/Makefile
@@ -1,6 +1,7 @@
PORTNAME= cmyt
DISTVERSIONPREFIX= v
DISTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= math python
#MASTER_SITES= PYPI # no tests
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-colormath/Makefile b/math/py-colormath/Makefile
index 21480db4aef3..c93a29ff0668 100644
--- a/math/py-colormath/Makefile
+++ b/math/py-colormath/Makefile
@@ -1,6 +1,6 @@
PORTNAME= colormath
PORTVERSION= 3.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-dgl/Makefile b/math/py-dgl/Makefile
index 0b39e1c13120..aab285be4877 100644
--- a/math/py-dgl/Makefile
+++ b/math/py-dgl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= dgl
DISTVERSION= 1.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python # machine-learning
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-fvcore/Makefile b/math/py-fvcore/Makefile
index 810cd2d54480..f10511a06e85 100644
--- a/math/py-fvcore/Makefile
+++ b/math/py-fvcore/Makefile
@@ -1,6 +1,6 @@
PORTNAME= fvcore
PORTVERSION= 0.1.5.post20220512
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-hypernetx/Makefile b/math/py-hypernetx/Makefile
index e1d0579ba550..04d46ac73ea6 100644
--- a/math/py-hypernetx/Makefile
+++ b/math/py-hypernetx/Makefile
@@ -1,5 +1,6 @@
PORTNAME= hypernetx
DISTVERSION= 2.4.0
+PORTREVISION= 1
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-keras/Makefile b/math/py-keras/Makefile
index 55791760d60f..b6dc701fdfc6 100644
--- a/math/py-keras/Makefile
+++ b/math/py-keras/Makefile
@@ -1,6 +1,6 @@
PORTNAME= keras
DISTVERSION= 2.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math # machine-learning
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-mathics-scanner/Makefile b/math/py-mathics-scanner/Makefile
index 96baae1f5df0..723040838bac 100644
--- a/math/py-mathics-scanner/Makefile
+++ b/math/py-mathics-scanner/Makefile
@@ -1,25 +1,27 @@
-PORTNAME= mathics_scanner
-PORTVERSION= 1.4.1
-PORTREVISION= 3
+PORTNAME= Mathics_Scanner
+PORTVERSION= 2.0.0
+PORTREVISION= 1
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} \
${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}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}
@@ -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
diff --git a/math/py-mathics/Makefile b/math/py-mathics/Makefile
index 56ec33321e68..23f3f934b998 100644
--- a/math/py-mathics/Makefile
+++ b/math/py-mathics/Makefile
@@ -1,20 +1,22 @@
PORTNAME= Mathics3
-PORTVERSION= 8.0.1
-PORTREVISION= 1
+PORTVERSION= 9.0.0
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= ${PORTNAME:tl}-${PORTVERSION}
MAINTAINER= thierry@FreeBSD.org
COMMENT= General-purpose computer algebra system (CAS)
WWW= https://mathics.org/
-LICENSE= GPLv3
+LICENSE= GPLv3+
-BUILD_DEPENDS= ${PYNUMPY} \
- ${PY_PILLOW} \
+BUILD_DEPENDS= ${PYNUMPY} \
+ ${PY_PILLOW} \
+ ${PY_SETUPTOOLS} \
${PYTHON_PKGNAMEPREFIX}pint>0:devel/py-pint@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
@@ -22,11 +24,10 @@ BUILD_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}llvmlite>0:devel/py-llvmlite@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}palettable>0:misc/py-palettable@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wordcloud>0:textproc/py-wordcloud@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mathics_scanner>0:math/py-mathics-scanner
+ ${PYTHON_PKGNAMEPREFIX}Mathics_Scanner>0:math/py-mathics-scanner
RUN_DEPENDS= ${PYNUMPY} \
${PY_PILLOW} \
bash:shells/bash \
@@ -62,7 +63,7 @@ RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}recordclass>0:devel/py-recordclass@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mathics_scanner>0:math/py-mathics-scanner
+ ${PYTHON_PKGNAMEPREFIX}Mathics_Scanner>0:math/py-mathics-scanner
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
@@ -71,7 +72,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
#GH_ACCOUNT= ${PORTNAME:tl}
USES= python shebangfix
-USE_PYTHON= cython cython_run distutils noflavors
+USE_PYTHON= cython cython_run noflavors pep517
MAKE_ENV+= USE_CYTHON=yes
SHEBANG_GLOB= *.py
diff --git a/math/py-mathics/distinfo b/math/py-mathics/distinfo
index d7019cbec945..b75ff98b9f2c 100644
--- a/math/py-mathics/distinfo
+++ b/math/py-mathics/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742494123
-SHA256 (Mathics3-8.0.1.tar.gz) = 4ce42e4bbb0aec61ab03ccd537f478dc2eabb953ab69073c07515a6e610c22fb
-SIZE (Mathics3-8.0.1.tar.gz) = 19546895
+TIMESTAMP = 1756844251
+SHA256 (mathics3-9.0.0.tar.gz) = 8b49c156b012dd8ac9ebb08963208a7de3651cd1eb048ec60a4e1f9be586e703
+SIZE (mathics3-9.0.0.tar.gz) = 3840672
diff --git a/math/py-mathics/files/patch-pyproject.toml b/math/py-mathics/files/patch-pyproject.toml
new file mode 100644
index 000000000000..5c03fd41c50b
--- /dev/null
+++ b/math/py-mathics/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig 2025-08-28 23:47:16 UTC
++++ pyproject.toml
+@@ -34,7 +34,7 @@ dependencies = [
+ # change a little
+ "sympy>=1.13,<1.14",
+ ]
+-license = "GPL-3.0-or-later"
++license = {text = "GPL-3.0-or-later"}
+ name = "Mathics3"
+ requires-python = ">=3.10" # bisect.insort_left with key parameter starts in 3.10
+ readme = "README.rst"
diff --git a/math/py-mathics/pkg-plist b/math/py-mathics/pkg-plist
index 11d50ca22d82..6ebd02490602 100644
--- a/math/py-mathics/pkg-plist
+++ b/math/py-mathics/pkg-plist
@@ -1,28 +1,34 @@
bin/mathics
+%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%.dist-info/AUTHORS.txt
+%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%.dist-info/RECORD
+%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%.dist-info/WHEEL
+%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%.dist-info/entry_points.txt
+%%PYTHON_SITELIBDIR%%/Mathics3-%%VER%%.dist-info/top_level.txt
%%PYTHON_SITELIBDIR%%/mathics/Packages/BoolEval/BoolEval.m
%%PYTHON_SITELIBDIR%%/mathics/Packages/BoolEval/Kernel/init.m
%%PYTHON_SITELIBDIR%%/mathics/Packages/BoolEval/PacletInfo.m
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/DTDs/__pycache__/validate.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/DTDs/__pycache__/validate.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/DTDs/__pycache__/validate%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/DTDs/__pycache__/validate%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/DTDs/validate.py
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/Pains/test_data/__pycache__/run_tests.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/Pains/test_data/__pycache__/run_tests.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/Pains/test_data/__pycache__/run_tests%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/Pains/test_data/__pycache__/run_tests%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/Pains/test_data/run_tests.py
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/SmartsLib/tests/__pycache__/bench2.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/SmartsLib/tests/__pycache__/bench2.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/SmartsLib/tests/__pycache__/bench2%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/SmartsLib/tests/__pycache__/bench2%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/Packages/Chemistry/Resources/RDKitData/Data/SmartsLib/tests/bench2.py
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/__pycache__/setup%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/__pycache__/setup%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/setup.py
%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/test_combinatorica_v091.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/test_combinatorica_v091.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/test_combinatorica_v201.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/test_combinatorica_v201.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/helper%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/helper%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/test_combinatorica_v091%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/test_combinatorica_v091%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/test_combinatorica_v201%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/__pycache__/test_combinatorica_v201%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/helper.py
%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/test_combinatorica_v091.py
%%PYTHON_SITELIBDIR%%/mathics/Packages/Combinatorica-repo/test/test_combinatorica_v201.py
@@ -36,8 +42,7 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/Packages/DiscreteMath/Kernel/init.m
%%PYTHON_SITELIBDIR%%/mathics/Packages/DiscreteMath/RSolve.m
%%PYTHON_SITELIBDIR%%/mathics/Packages/Kernel/init.m
-%%PYTHON_SITELIBDIR%%/mathics/Packages/MUnit/Kernel/init.m
-%%PYTHON_SITELIBDIR%%/mathics/Packages/MUnit/MUnit.m
+%%PYTHON_SITELIBDIR%%/mathics/Packages/MUnit-save/PacletInfo.m
%%PYTHON_SITELIBDIR%%/mathics/Packages/MUnit/MUnitLoader.m
%%PYTHON_SITELIBDIR%%/mathics/Packages/MUnit/PacletInfo.m
%%PYTHON_SITELIBDIR%%/mathics/Packages/Miscellaneous/Calendar-orig.m
@@ -58,34 +63,41 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/Packages/Utilities/CleanSlate.m
%%PYTHON_SITELIBDIR%%/mathics/Packages/VectorAnalysis/Kernel/init.m
%%PYTHON_SITELIBDIR%%/mathics/Packages/VectorAnalysis/VectorAnalysis.m
+%%PYTHON_SITELIBDIR%%/mathics/Packages/xAct/ExpressionManipulation.m
+%%PYTHON_SITELIBDIR%%/mathics/Packages/xAct/ShowTime1.m
%%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
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/benchmark.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/benchmark.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/docpipeline.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/docpipeline.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/profile_mathics.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/profile_mathics.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/session.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/session.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/system_info.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/system_info.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/timing.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/timing.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__main__.py
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/__main__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/__main__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/benchmark%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/benchmark%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/docpipeline%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/docpipeline%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/interrupt%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/interrupt%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/interupt%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/interupt%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/profile_mathics%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/profile_mathics%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/session%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/session%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/settings%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/settings%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/system_info%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/system_info%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/timing%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/timing%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/version%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/__pycache__/version%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/algorithm/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/clusters.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/clusters.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/introselect.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/introselect.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/clusters%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/clusters%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/introselect%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/algorithm/__pycache__/introselect%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/algorithm/clusters.py
%%PYTHON_SITELIBDIR%%/mathics/algorithm/introselect.py
%%PYTHON_SITELIBDIR%%/mathics/autoload-cli/settings.m
@@ -110,142 +122,142 @@ bin/mathics
%%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
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/_quantities-try.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/_quantities-try.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/arithmetic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/arithmetic.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/attributes.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/attributes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/codetables.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/codetables.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/compilation.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/compilation.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/compress.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/compress.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/datentime.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/datentime.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/evaluation.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/evaluation.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/graphics.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/graphics.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/inout.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/inout.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/kernel_sessions.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/kernel_sessions.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/layout.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/layout.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/mainloop.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/mainloop.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/makeboxes.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/makeboxes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/manipulate.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/manipulate.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/messages.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/messages.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/numeric.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/numeric.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/optimization.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/optimization.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/options.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/options.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/physchemdata.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/physchemdata.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/procedural.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/procedural.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/quantities.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/quantities.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/recurrence.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/recurrence.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/scoping.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/scoping.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/sparse.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/sparse.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/system.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/system.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/tensors.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/tensors.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/trace.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/trace.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/_quantities-try%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/_quantities-try%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/arithmetic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/arithmetic%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/attributes%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/attributes%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/codetables%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/codetables%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/compilation%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/compilation%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/compress%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/compress%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/datentime%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/datentime%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/evaluation%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/evaluation%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/graphics%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/graphics%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/inout%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/inout%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/kernel_sessions%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/kernel_sessions%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/layout%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/layout%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/mainloop%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/mainloop%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/makeboxes%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/makeboxes%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/manipulate%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/manipulate%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/messages%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/messages%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/numeric%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/numeric%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/optimization%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/optimization%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/options%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/options%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/physchemdata%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/physchemdata%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/procedural%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/procedural%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/quantities%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/quantities%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/recurrence%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/recurrence%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/scoping%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/scoping%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/sparse%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/sparse%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/system%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/system%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/tensors%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/tensors%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/trace%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/__pycache__/trace%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/_quantities-try.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/basic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/basic.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/sums.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/sums.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/basic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/basic%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/sums%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/__pycache__/sums%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/basic.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/arithfns/sums.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/arithmetic%%PYTHON_TAG%%.so
%%PYTHON_SITELIBDIR%%/mathics/builtin/arithmetic.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/assign_binaryop.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/assign_binaryop.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/assignment.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/assignment.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/clear.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/clear.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/upvalues.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/upvalues.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/assign_binaryop%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/assign_binaryop%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/assignment%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/assignment%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/clear%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/clear%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/types%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/types%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/upvalues%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/__pycache__/upvalues%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/assign_binaryop.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/assignment.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/clear.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/types.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/assignments/upvalues.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/atomic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/atomic.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/numbers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/numbers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/strings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/strings.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/symbols.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/symbols.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/atomic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/atomic%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/numbers%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/numbers%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/strings%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/strings%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/symbols%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/__pycache__/symbols%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/atomic.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/numbers.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/strings.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/atomic/symbols.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/attributes.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/bytearray.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/bytearray.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/io.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/io.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/system.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/system.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/bytearray%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/bytearray%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/io%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/io%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/system%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/system%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/types%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/__pycache__/types%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/bytearray.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/io.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/system.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/binary/types.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/compilation.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/compilation.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/expression.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/expression.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/graphics.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/graphics.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/graphics3d.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/graphics3d.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/layout.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/layout.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/uniform_polyhedra.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/uniform_polyhedra.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/compilation%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/compilation%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/expression%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/expression%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/graphics%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/graphics%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/graphics3d%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/graphics3d%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/image%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/image%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/layout%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/layout%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/uniform_polyhedra%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/box/__pycache__/uniform_polyhedra%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/box/compilation.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/box/expression.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/box/graphics.py
@@ -255,16 +267,16 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/builtin/box/uniform_polyhedra.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/codetables.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_directives.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_directives.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_internals.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_internals.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_operations.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_operations.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/named_colors.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/named_colors.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_directives%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_directives%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_internals%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_internals%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_operations%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/color_operations%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/named_colors%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/__pycache__/named_colors%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/color_directives.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/color_internals.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/colors/color_operations.py
@@ -273,47 +285,47 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/builtin/compress.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/datentime.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/directory_names.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/directory_names.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/directory_operations.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/directory_operations.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/system_directories.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/system_directories.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/user_directories.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/user_directories.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/directory_names%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/directory_names%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/directory_operations%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/directory_operations%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/system_directories%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/system_directories%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/user_directories%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/__pycache__/user_directories%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/directory_names.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/directory_operations.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/system_directories.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/directories/user_directories.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/clusters.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/clusters.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/numeric.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/numeric.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/stringdata.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/stringdata.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/clusters%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/clusters%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/numeric%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/numeric%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/stringdata%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/__pycache__/stringdata%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/clusters.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/numeric.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/distance/stringdata.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/drawing_options.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/drawing_options.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/graphics3d.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/graphics3d.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/graphics_internals.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/graphics_internals.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/plot.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/plot.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/splines.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/splines.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/uniform_polyhedra.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/uniform_polyhedra.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/drawing_options%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/drawing_options%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/graphics3d%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/graphics3d%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/graphics_internals%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/graphics_internals%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/plot%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/plot%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/splines%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/splines%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/uniform_polyhedra%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/__pycache__/uniform_polyhedra%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/drawing_options.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/graphics3d.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/graphics_internals.py
@@ -322,76 +334,76 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/builtin/drawing/uniform_polyhedra.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/evaluation.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/general.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/general.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/head_related.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/head_related.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/size_and_sig.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/size_and_sig.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/general%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/general%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/head_related%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/head_related%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/size_and_sig%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/__pycache__/size_and_sig%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/general.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/head_related.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/exp_structure/size_and_sig.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/file_properties.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/file_properties.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/file_utilities.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/file_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/path_operations.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/path_operations.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/file_properties%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/file_properties%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/file_utilities%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/file_utilities%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/path_operations%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/__pycache__/path_operations%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/file_properties.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/file_utilities.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/file_operations/path_operations.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/htmlformat.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/htmlformat.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/xmlformat.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/xmlformat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/htmlformat%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/htmlformat%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/xmlformat%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/__pycache__/xmlformat%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/htmlformat.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/fileformats/xmlformat.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/files.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/files.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/filesystem.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/filesystem.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/importexport.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/importexport.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/files%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/files%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/filesystem%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/filesystem%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/importexport%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/__pycache__/importexport%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/files.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/filesystem.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/files_io/importexport.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/other.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/other.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/output.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/output.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/variables.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/variables.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/base%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/base%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/other%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/other%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/output%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/output%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/variables%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/__pycache__/variables%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/base.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/other.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/output.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/forms/variables.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/apply_fns_to_lists.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/apply_fns_to_lists.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/composition.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/composition.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/functional_iteration.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/functional_iteration.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/application%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/application%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/apply_fns_to_lists%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/apply_fns_to_lists%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/composition%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/composition%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/functional_iteration%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/__pycache__/functional_iteration%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/application.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/apply_fns_to_lists.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/functional/composition.py
@@ -399,32 +411,32 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/builtin/graphics%%PYTHON_TAG%%.so
%%PYTHON_SITELIBDIR%%/mathics/builtin/graphics.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/basic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/basic.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/colors.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/colors.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/composition.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/composition.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/geometric.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/geometric.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/morph.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/morph.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/pixel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/pixel.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/properties.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/properties.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/structure.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/structure.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/test.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/test.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/base%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/base%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/basic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/basic%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/colors%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/colors%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/composition%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/composition%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/filters%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/filters%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/geometric%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/geometric%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/misc%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/misc%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/morph%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/morph%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/pixel%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/pixel%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/properties%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/properties%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/structure%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/structure%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/test%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/image/__pycache__/test%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/image/base.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/image/basic.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/image/colors.py
@@ -439,16 +451,16 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/builtin/image/test.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/inout.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/combinatorial.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/combinatorial.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/divlike.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/divlike.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/recurrence.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/recurrence.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/combinatorial%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/combinatorial%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/divlike%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/divlike%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/misc%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/misc%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/recurrence%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/__pycache__/recurrence%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/combinatorial.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/divlike.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/intfns/misc.py
@@ -456,20 +468,20 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/builtin/kernel_sessions.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/layout.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/associations.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/associations.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/constructing.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/constructing.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/eol.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/eol.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/math.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/math.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/predicates.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/predicates.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/rearrange.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/rearrange.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/associations%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/associations%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/constructing%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/constructing%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/eol%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/eol%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/math%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/math%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/predicates%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/predicates%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/rearrange%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/list/__pycache__/rearrange%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/list/associations.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/list/constructing.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/list/eol.py
@@ -480,55 +492,55 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/builtin/makeboxes.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/manipulate.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/constrmatrix.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/constrmatrix.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/partmatrix.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/partmatrix.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/constrmatrix%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/constrmatrix%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/partmatrix%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/__pycache__/partmatrix%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/constrmatrix.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/matrices/partmatrix.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/messages.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/infix.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/infix.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/infix_extra.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/infix_extra.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/postfix.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/postfix.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/prefix.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/prefix.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/infix%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/infix%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/infix_extra%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/infix_extra%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/postfix%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/postfix%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/prefix%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/__pycache__/prefix%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/infix.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/infix_extra.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/postfix.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/no_meaning/prefix.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/algebra.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/algebra.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/calculus.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/calculus.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/constants.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/constants.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/diffeqns.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/diffeqns.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/exp.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/exp.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/hyperbolic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/hyperbolic.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/integer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/integer.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/linalg.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/linalg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/numbertheory.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/numbertheory.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/randomnumbers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/randomnumbers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/trig.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/trig.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/algebra%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/algebra%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/calculus%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/calculus%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/constants%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/constants%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/diffeqns%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/diffeqns%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/exp%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/exp%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/hyperbolic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/hyperbolic%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/integer%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/integer%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/linalg%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/linalg%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/numbertheory%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/numbertheory%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/randomnumbers%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/randomnumbers%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/trig%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/__pycache__/trig%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/algebra.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/calculus.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/constants.py
@@ -542,26 +554,26 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/builtin/numbers/trig.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/numeric.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/numpy_utils/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numpy_utils/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numpy_utils/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numpy_utils/__pycache__/with_numpy.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/numpy_utils/__pycache__/with_numpy.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numpy_utils/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numpy_utils/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numpy_utils/__pycache__/with_numpy%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/numpy_utils/__pycache__/with_numpy%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/numpy_utils/with_numpy.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/optimization.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/options.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/basic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/basic.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/composite.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/composite.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/defaults.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/defaults.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/restrictions.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/restrictions.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/rules.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/rules.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/basic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/basic%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/composite%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/composite%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/defaults%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/defaults%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/restrictions%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/restrictions%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/rules%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/__pycache__/rules%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/basic%%PYTHON_TAG%%.so
%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/basic.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/patterns/composite%%PYTHON_TAG%%.so
@@ -575,70 +587,73 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/builtin/physchemdata.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/procedural.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/pymimesniffer/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/pymimesniffer/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/pymimesniffer/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/pymimesniffer/__pycache__/magic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/pymimesniffer/__pycache__/magic.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/pymimesniffer/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/pymimesniffer/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/pymimesniffer/__pycache__/magic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/pymimesniffer/__pycache__/magic%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/pymimesniffer/magic.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/pymimesniffer/mimetypes.xml
%%PYTHON_SITELIBDIR%%/mathics/builtin/quantities.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/quantum_mechanics/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/quantum_mechanics/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/quantum_mechanics/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/quantum_mechanics/__pycache__/angular.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/quantum_mechanics/__pycache__/angular.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/quantum_mechanics/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/quantum_mechanics/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/quantum_mechanics/__pycache__/angular%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/quantum_mechanics/__pycache__/angular%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/quantum_mechanics/angular.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/recurrence.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/integrators.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/integrators.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/optimizers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/optimizers.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/integrators%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/integrators%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/optimizers%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/__pycache__/optimizers%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/integrators.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/scipy_utils/optimizers.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/scoping.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/sparse.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/bessel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/bessel.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/elliptic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/elliptic.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/erf.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/erf.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/expintegral.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/expintegral.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/gamma.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/gamma.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/orthogonal.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/orthogonal.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/zeta.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/zeta.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/bessel%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/bessel%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/elliptic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/elliptic%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/erf%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/erf%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/expintegral%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/expintegral%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/gamma%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/gamma%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/hypergeom%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/hypergeom%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/orthogonal%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/orthogonal%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/zeta%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/__pycache__/zeta%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/bessel.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/elliptic.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/erf.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/expintegral.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/gamma.py
+%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/hypergeom.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/orthogonal.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/specialfns/zeta.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/dependency.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/dependency.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/general.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/general.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/location.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/location.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/orderstats.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/orderstats.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/shape.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/shape.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/base%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/base%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/dependency%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/dependency%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/general%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/general%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/location%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/location%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/orderstats%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/orderstats%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/shape%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/__pycache__/shape%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/base.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/dependency.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/general.py
@@ -646,46 +661,46 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/orderstats.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/statistics/shape.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/characters.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/characters.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/charcodes.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/charcodes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/operations.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/operations.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/patterns.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/patterns.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/regexp.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/regexp.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/characters%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/characters%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/charcodes%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/charcodes%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/operations%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/operations%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/patterns%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/patterns%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/regexp%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/string/__pycache__/regexp%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/string/characters.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/string/charcodes.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/string/operations.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/string/patterns.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/string/regexp.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/symbolic_history/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/symbolic_history/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/symbolic_history/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/symbolic_history/__pycache__/stack.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/symbolic_history/__pycache__/stack.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/symbolic_history/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/symbolic_history/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/symbolic_history/__pycache__/stack%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/symbolic_history/__pycache__/stack%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/symbolic_history/stack.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/system.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/tensors.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/equality_inequality.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/equality_inequality.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/expression_tests.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/expression_tests.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/list_oriented.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/list_oriented.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/logic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/logic.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/numerical_properties.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/numerical_properties.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/string_tests.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/string_tests.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/equality_inequality%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/equality_inequality%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/expression_tests%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/expression_tests%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/list_oriented%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/list_oriented%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/logic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/logic%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/numerical_properties%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/numerical_properties%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/string_tests%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/__pycache__/string_tests%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/equality_inequality.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/expression_tests.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/list_oriented.py
@@ -694,32 +709,32 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/builtin/testing_expressions/string_tests.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/trace.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/constructing.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/constructing.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/math_ops.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/math_ops.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/vector_space_operations.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/vector_space_operations.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/constructing%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/constructing%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/math_ops%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/math_ops%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/vector_space_operations%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/__pycache__/vector_space_operations%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/constructing.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/math_ops.py
%%PYTHON_SITELIBDIR%%/mathics/builtin/vectors/vector_space_operations.py
%%PYTHON_SITELIBDIR%%/mathics/compile/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/compile.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/compile.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/ir-next.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/ir-next.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/ir.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/ir.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/base%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/base%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/compile%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/compile%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/ir-next%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/ir-next%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/ir%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/ir%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/types%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/types%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/utils%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/compile/__pycache__/utils%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/compile/base.py
%%PYTHON_SITELIBDIR%%/mathics/compile/compile.py
%%PYTHON_SITELIBDIR%%/mathics/compile/ir-next.py
@@ -727,77 +742,84 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/compile/types.py
%%PYTHON_SITELIBDIR%%/mathics/compile/utils.py
%%PYTHON_SITELIBDIR%%/mathics/core/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/assignment.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/assignment.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/atoms.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/atoms.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/attributes.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/attributes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/builtin.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/builtin.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/definitions.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/definitions.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/element.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/element.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/evaluation.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/evaluation.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/expression.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/expression.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/expression_predefined.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/expression_predefined.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/formatter.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/formatter.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/interrupt.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/interrupt.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/list.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/list.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/load_builtin.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/load_builtin.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/number.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/number.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/pattern.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/pattern.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/rules.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/rules.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/streams.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/streams.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/structure.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/structure.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/subexpression.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/subexpression.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/symbols.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/symbols.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/systemsymbols.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/systemsymbols.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/assignment%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/assignment%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/atoms-try%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/atoms-try%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/atoms%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/atoms%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/attributes%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/attributes%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/builtin%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/builtin%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/definitions%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/definitions%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/element%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/element%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/evaluation%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/evaluation%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/exceptions%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/exceptions%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/expression-try%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/expression-try%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/expression%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/expression%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/expression_predefined%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/expression_predefined%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/formatter%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/formatter%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/interrupt%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/interrupt%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/keycomparable%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/keycomparable%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/list%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/list%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/load_builtin%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/load_builtin%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/number%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/number%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/pattern%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/pattern%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/rules%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/rules%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/streams%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/streams%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/structure%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/structure%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/subexpression%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/subexpression%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/symbols%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/symbols%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/systemsymbols%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/systemsymbols%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/util%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/__pycache__/util%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/core/assignment.py
+%%PYTHON_SITELIBDIR%%/mathics/core/atoms-try.py
%%PYTHON_SITELIBDIR%%/mathics/core/atoms.py
%%PYTHON_SITELIBDIR%%/mathics/core/attributes.py
%%PYTHON_SITELIBDIR%%/mathics/core/builtin.py
%%PYTHON_SITELIBDIR%%/mathics/core/convert/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/expression.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/expression.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/function.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/function.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/matrix.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/matrix.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/mpmath.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/mpmath.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/op.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/op.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/python.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/python.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/regex.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/regex.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/sympy.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/sympy.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/expression%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/expression%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/function%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/function%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/matrix%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/matrix%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/mpmath%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/mpmath%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/op%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/op%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/python%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/python%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/regex%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/regex%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/sympy%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/convert/__pycache__/sympy%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/core/convert/expression.py
%%PYTHON_SITELIBDIR%%/mathics/core/convert/function.py
%%PYTHON_SITELIBDIR%%/mathics/core/convert/matrix.py
@@ -810,33 +832,41 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/core/element.py
%%PYTHON_SITELIBDIR%%/mathics/core/evaluation.py
%%PYTHON_SITELIBDIR%%/mathics/core/exceptions.py
+%%PYTHON_SITELIBDIR%%/mathics/core/expression-try.py
%%PYTHON_SITELIBDIR%%/mathics/core/expression%%PYTHON_TAG%%.so
%%PYTHON_SITELIBDIR%%/mathics/core/expression.py
%%PYTHON_SITELIBDIR%%/mathics/core/expression_predefined.py
%%PYTHON_SITELIBDIR%%/mathics/core/formatter.py
%%PYTHON_SITELIBDIR%%/mathics/core/interrupt.py
+%%PYTHON_SITELIBDIR%%/mathics/core/keycomparable.py
%%PYTHON_SITELIBDIR%%/mathics/core/list.py
%%PYTHON_SITELIBDIR%%/mathics/core/load_builtin.py
%%PYTHON_SITELIBDIR%%/mathics/core/number%%PYTHON_TAG%%.so
%%PYTHON_SITELIBDIR%%/mathics/core/number.py
%%PYTHON_SITELIBDIR%%/mathics/core/parser/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/ast.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/ast.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/convert.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/convert.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/feed.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/feed.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/operators.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/operators.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/ast-with-node%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/ast-with-node%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/ast%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/ast%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/convert%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/convert%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/feed%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/feed%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/location%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/location%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/operators%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/operators%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/parser%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/parser%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/util%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/__pycache__/util%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/ast-with-node.py
%%PYTHON_SITELIBDIR%%/mathics/core/parser/ast.py
%%PYTHON_SITELIBDIR%%/mathics/core/parser/convert.py
%%PYTHON_SITELIBDIR%%/mathics/core/parser/feed.py
+%%PYTHON_SITELIBDIR%%/mathics/core/parser/location.py
%%PYTHON_SITELIBDIR%%/mathics/core/parser/operators.py
%%PYTHON_SITELIBDIR%%/mathics/core/parser/parser.py
%%PYTHON_SITELIBDIR%%/mathics/core/parser/util.py
@@ -879,167 +909,174 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/data/op-tables.json
%%PYTHON_SITELIBDIR%%/mathics/data/operator-tables.json
%%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
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/common_doc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/common_doc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/doc_entries.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/doc_entries.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/gather.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/gather.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/latex_doc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/latex_doc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/online.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/online.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/structure.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/structure.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/common_doc%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/common_doc%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/doc_entries%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/doc_entries%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/gather%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/gather%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/latex_doc%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/latex_doc%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/online%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/online%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/structure%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/structure%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/utils%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/__pycache__/utils%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/doc/common_doc.py
%%PYTHON_SITELIBDIR%%/mathics/doc/doc_entries.py
%%PYTHON_SITELIBDIR%%/mathics/doc/documentation/1-Manual.mdoc
%%PYTHON_SITELIBDIR%%/mathics/doc/documentation/A-License.mdoc
%%PYTHON_SITELIBDIR%%/mathics/doc/gather.py
-%%PYTHON_SITELIBDIR%%/mathics/doc/latex/__pycache__/doc2latex.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/doc/latex/__pycache__/doc2latex.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/latex/__pycache__/doc2latex%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/doc/latex/__pycache__/doc2latex%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/doc/latex/doc2latex.py
-%%PYTHON_SITELIBDIR%%/mathics/doc/latex/mathics.pdf
%%PYTHON_SITELIBDIR%%/mathics/doc/latex_doc.py
%%PYTHON_SITELIBDIR%%/mathics/doc/online.py
%%PYTHON_SITELIBDIR%%/mathics/doc/structure.py
%%PYTHON_SITELIBDIR%%/mathics/doc/utils.py
%%PYTHON_SITELIBDIR%%/mathics/docpipeline.py
%%PYTHON_SITELIBDIR%%/mathics/eval/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/arithmetic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/arithmetic.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/datetime.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/datetime.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/directories.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/directories.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/hyperbolic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/hyperbolic.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/inference.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/inference.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/lists.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/lists.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/math_ops.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/math_ops.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/nevaluator.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/nevaluator.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/numeric.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/numeric.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/numerify.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/numerify.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/parts.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/parts.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/patterns.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/patterns.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/pymathics.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/pymathics.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/quantities.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/quantities.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/rules.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/rules.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/scoping.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/scoping.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/strings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/strings.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/sympy.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/sympy.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/tensors.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/tensors.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/test.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/test.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/testing_expressions.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/testing_expressions.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/tracing.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/tracing.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/arithmetic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/arithmetic%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/datetime%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/datetime%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/directories%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/directories%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/hyperbolic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/hyperbolic%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/image%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/image%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/inference%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/inference%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/lists%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/lists%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/math_ops%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/math_ops%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/nevaluator%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/nevaluator%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/numeric%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/numeric%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/numerify%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/numerify%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/parts%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/parts%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/patterns%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/patterns%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/pymathics%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/pymathics%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/quantities%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/quantities%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/rules%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/rules%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/scoping%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/scoping%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/stackframe%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/stackframe%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/strings%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/strings%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/sympy%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/sympy%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/tensors%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/tensors%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/test%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/test%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/testing_expressions%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/testing_expressions%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/tracing%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/__pycache__/tracing%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/arithfns/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/arithfns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/arithfns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/arithfns/__pycache__/basic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/arithfns/__pycache__/basic.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/arithfns/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/arithfns/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/arithfns/__pycache__/basic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/arithfns/__pycache__/basic%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/arithfns/basic.py
%%PYTHON_SITELIBDIR%%/mathics/eval/arithmetic.py
%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/assign_binaryop.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/assign_binaryop.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/assignment.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/assignment.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/assign_binaryop%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/assign_binaryop%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/assignment%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/__pycache__/assignment%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/assign_binaryop.py
%%PYTHON_SITELIBDIR%%/mathics/eval/assignments/assignment.py
+%%PYTHON_SITELIBDIR%%/mathics/eval/binary/__init__.py
+%%PYTHON_SITELIBDIR%%/mathics/eval/binary/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/binary/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/binary/__pycache__/io%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/binary/__pycache__/io%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/binary/io.py
%%PYTHON_SITELIBDIR%%/mathics/eval/datetime.py
%%PYTHON_SITELIBDIR%%/mathics/eval/directories.py
%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/clusters.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/clusters.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/numeric.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/numeric.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/clusters%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/clusters%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/numeric%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/distance/__pycache__/numeric%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/distance/clusters.py
%%PYTHON_SITELIBDIR%%/mathics/eval/distance/numeric.py
%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/charts.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/charts.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/colors.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/colors.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/plot.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/plot.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/plot3d.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/plot3d.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/charts%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/charts%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/colors%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/colors%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/plot%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/plot%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/plot3d%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/__pycache__/plot3d%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/charts.py
%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/colors.py
%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/plot.py
%%PYTHON_SITELIBDIR%%/mathics/eval/drawing/plot3d.py
%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/files.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/files.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/read.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/read.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/files%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/files%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/read%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/__pycache__/read%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/files.py
%%PYTHON_SITELIBDIR%%/mathics/eval/files_io/read.py
%%PYTHON_SITELIBDIR%%/mathics/eval/functional/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/functional/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/functional/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/functional/__pycache__/apply_fns_to_lists.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/functional/__pycache__/apply_fns_to_lists.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/functional/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/functional/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/functional/__pycache__/apply_fns_to_lists%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/functional/__pycache__/apply_fns_to_lists%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/functional/apply_fns_to_lists.py
%%PYTHON_SITELIBDIR%%/mathics/eval/hyperbolic.py
%%PYTHON_SITELIBDIR%%/mathics/eval/image.py
%%PYTHON_SITELIBDIR%%/mathics/eval/inference.py
%%PYTHON_SITELIBDIR%%/mathics/eval/list/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/list/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/list/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/list/__pycache__/eol.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/list/__pycache__/eol.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/list/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/list/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/list/__pycache__/eol%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/list/__pycache__/eol%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/list/eol.py
%%PYTHON_SITELIBDIR%%/mathics/eval/lists.py
%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/formatvalues.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/formatvalues.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/makeboxes.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/makeboxes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/numberform.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/numberform.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/operators.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/operators.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/outputforms.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/outputforms.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/precedence.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/precedence.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/formatvalues%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/formatvalues%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/makeboxes%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/makeboxes%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/numberform%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/numberform%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/operators%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/operators%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/outputforms%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/outputforms%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/precedence%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/__pycache__/precedence%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/formatvalues.py
%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/makeboxes.py
%%PYTHON_SITELIBDIR%%/mathics/eval/makeboxes/numberform.py
@@ -1050,25 +1087,25 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/eval/nevaluator%%PYTHON_TAG%%.so
%%PYTHON_SITELIBDIR%%/mathics/eval/nevaluator.py
%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/__pycache__/numbers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/__pycache__/numbers.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/__pycache__/numbers%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/__pycache__/numbers%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/algebra/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/algebra/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/algebra/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/algebra/__pycache__/simplify.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/algebra/__pycache__/simplify.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/algebra/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/algebra/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/algebra/__pycache__/simplify%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/algebra/__pycache__/simplify%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/algebra/simplify.py
%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/integrators.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/integrators.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/optimizers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/optimizers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/series.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/series.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/integrators%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/integrators%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/optimizers%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/optimizers%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/series%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/__pycache__/series%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/integrators.py
%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/optimizers.py
%%PYTHON_SITELIBDIR%%/mathics/eval/numbers/calculus/series.py
@@ -1081,12 +1118,16 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/eval/quantities.py
%%PYTHON_SITELIBDIR%%/mathics/eval/rules.py
%%PYTHON_SITELIBDIR%%/mathics/eval/scoping.py
+%%PYTHON_SITELIBDIR%%/mathics/eval/specialfns/__pycache__/hypergeom%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/specialfns/__pycache__/hypergeom%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/specialfns/hypergeom.py
+%%PYTHON_SITELIBDIR%%/mathics/eval/stackframe.py
%%PYTHON_SITELIBDIR%%/mathics/eval/strings.py
%%PYTHON_SITELIBDIR%%/mathics/eval/symbolic_history/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/eval/symbolic_history/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/symbolic_history/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/symbolic_history/__pycache__/stack.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/eval/symbolic_history/__pycache__/stack.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/symbolic_history/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/symbolic_history/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/symbolic_history/__pycache__/stack%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/eval/symbolic_history/__pycache__/stack%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/eval/symbolic_history/stack.py
%%PYTHON_SITELIBDIR%%/mathics/eval/sympy.py
%%PYTHON_SITELIBDIR%%/mathics/eval/tensors.py
@@ -1095,24 +1136,24 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/eval/testing_expressions.py
%%PYTHON_SITELIBDIR%%/mathics/eval/tracing.py
%%PYTHON_SITELIBDIR%%/mathics/format/__init__.py
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy_fns.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy_fns.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy_polyhedra.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy_polyhedra.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/json.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/json.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/latex.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/latex.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/mathml.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/mathml.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/svg.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/svg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/text.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/text.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy_fns%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy_fns%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy_polyhedra%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/asy_polyhedra%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/json%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/json%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/latex%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/latex%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/mathml%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/mathml%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/svg%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/svg%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/text%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics/format/__pycache__/text%%PYTHON_TAG%%.pyc
%%PYTHON_SITELIBDIR%%/mathics/format/asy.py
%%PYTHON_SITELIBDIR%%/mathics/format/asy_fns.py
%%PYTHON_SITELIBDIR%%/mathics/format/asy_polyhedra.py
@@ -1121,7 +1162,8 @@ bin/mathics
%%PYTHON_SITELIBDIR%%/mathics/format/mathml.py
%%PYTHON_SITELIBDIR%%/mathics/format/svg.py
%%PYTHON_SITELIBDIR%%/mathics/format/text.py
-%%PYTHON_SITELIBDIR%%/mathics/main.py
+%%PYTHON_SITELIBDIR%%/mathics/interrupt.py
+%%PYTHON_SITELIBDIR%%/mathics/interupt.py
%%PYTHON_SITELIBDIR%%/mathics/profile_mathics.py
%%PYTHON_SITELIBDIR%%/mathics/session.py
%%PYTHON_SITELIBDIR%%/mathics/settings.py
diff --git a/math/py-matplotlib-scalebar/Makefile b/math/py-matplotlib-scalebar/Makefile
index c121b0bd9201..fb44fdb9a68a 100644
--- a/math/py-matplotlib-scalebar/Makefile
+++ b/math/py-matplotlib-scalebar/Makefile
@@ -1,6 +1,6 @@
PORTNAME= matplotlib-scalebar
PORTVERSION= 0.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index bd10c3cdb71e..310dd7de8b83 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -1,6 +1,6 @@
PORTNAME= matplotlib
DISTVERSION= 3.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-minorminer/Makefile b/math/py-minorminer/Makefile
index f235bbb3244c..5e5f453de108 100644
--- a/math/py-minorminer/Makefile
+++ b/math/py-minorminer/Makefile
@@ -1,6 +1,6 @@
PORTNAME= minorminer
DISTVERSION= 0.2.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-narwhals/Makefile b/math/py-narwhals/Makefile
index 996dc336c9ae..ab28d85e5398 100644
--- a/math/py-narwhals/Makefile
+++ b/math/py-narwhals/Makefile
@@ -1,5 +1,5 @@
PORTNAME= narwhals
-PORTVERSION= 1.48.1
+PORTVERSION= 2.1.1
CATEGORIES= math python
MASTER_SITES= PYPI \
https://github.com/narwhals-dev/narwhals/releases/download/v${PORTVERSION}/
diff --git a/math/py-narwhals/distinfo b/math/py-narwhals/distinfo
index 61bcf19af018..8faf1ed4c142 100644
--- a/math/py-narwhals/distinfo
+++ b/math/py-narwhals/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1753796090
-SHA256 (narwhals-1.48.1.tar.gz) = b375cfdfc20b84b5ac0926f34c5c1373eb23ebea48d47bf75e282161cda63e34
-SIZE (narwhals-1.48.1.tar.gz) = 515882
+TIMESTAMP = 1755062570
+SHA256 (narwhals-2.1.1.tar.gz) = 308ec9d0e40616b66b61cd76ede4083a4232ae04942a3acef7e514d49641cb77
+SIZE (narwhals-2.1.1.tar.gz) = 529925
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 687730db26cb..5f76f6f76119 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,6 +1,6 @@
PORTNAME= networkx
DISTVERSION= 3.5
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= math python
MASTER_SITES= PYPI
diff --git a/math/py-pcodec/Makefile b/math/py-pcodec/Makefile
index 5711ecccf91d..2460ea891064 100644
--- a/math/py-pcodec/Makefile
+++ b/math/py-pcodec/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pcodec
PORTVERSION= 0.3.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-plastex/Makefile b/math/py-plastex/Makefile
index f1dc6f8791ff..34def3594480 100644
--- a/math/py-plastex/Makefile
+++ b/math/py-plastex/Makefile
@@ -1,6 +1,6 @@
PORTNAME= plastex
PORTVERSION= 3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-pymc3/Makefile b/math/py-pymc3/Makefile
index e5e86c9cb07e..c5fa30b38bd3 100644
--- a/math/py-pymc3/Makefile
+++ b/math/py-pymc3/Makefile
@@ -1,7 +1,7 @@
PORTNAME= pymc3
DISTVERSIONPREFIX= v
DISTVERSION= 3.11.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-pyneqsys/Makefile b/math/py-pyneqsys/Makefile
index 868756b17426..53ff335620eb 100644
--- a/math/py-pyneqsys/Makefile
+++ b/math/py-pyneqsys/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pyneqsys
DISTVERSION= 0.5.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-pyodesys/Makefile b/math/py-pyodesys/Makefile
index 9b8085d56810..1a125b010f41 100644
--- a/math/py-pyodesys/Makefile
+++ b/math/py-pyodesys/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pyodesys
DISTVERSION= 0.14.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-python-louvain/Makefile b/math/py-python-louvain/Makefile
index 4cc7cea98587..329542f16076 100644
--- a/math/py-python-louvain/Makefile
+++ b/math/py-python-louvain/Makefile
@@ -1,6 +1,6 @@
PORTNAME= python-louvain
DISTVERSION= 0.16
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-python-picard/Makefile b/math/py-python-picard/Makefile
index 8134431b535a..138eacc5c4c1 100644
--- a/math/py-python-picard/Makefile
+++ b/math/py-python-picard/Makefile
@@ -1,6 +1,6 @@
PORTNAME= python-picard
DISTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-pytorchvideo/Makefile b/math/py-pytorchvideo/Makefile
index 5cbbacd503a8..6add9da8a2b0 100644
--- a/math/py-pytorchvideo/Makefile
+++ b/math/py-pytorchvideo/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pytorchvideo
PORTVERSION= 0.1.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-qats/Makefile b/math/py-qats/Makefile
index dab2034110a7..94df3359ca5b 100644
--- a/math/py-qats/Makefile
+++ b/math/py-qats/Makefile
@@ -1,6 +1,7 @@
PORTNAME= qats
DISTVERSIONPREFIX= v
DISTVERSION= 5.2.1
+PORTREVISION= 1
CATEGORIES= math
#MASTER_SITES= PYPI # no tests
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-rustworkx/Makefile b/math/py-rustworkx/Makefile
index c1595e8b000d..b30f0fa69a0a 100644
--- a/math/py-rustworkx/Makefile
+++ b/math/py-rustworkx/Makefile
@@ -1,5 +1,6 @@
PORTNAME= rustworkx
DISTVERSION= 0.17.1
+PORTREVISION= 1
CATEGORIES= math python
#MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-seaborn/Makefile b/math/py-seaborn/Makefile
index 783a99300bb1..ad845bb42249 100644
--- a/math/py-seaborn/Makefile
+++ b/math/py-seaborn/Makefile
@@ -1,5 +1,6 @@
PORTNAME= seaborn
DISTVERSION= 0.13.0
+PORTREVISION= 1
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-splot/Makefile b/math/py-splot/Makefile
index e82daf705373..9593eaa40c02 100644
--- a/math/py-splot/Makefile
+++ b/math/py-splot/Makefile
@@ -1,5 +1,6 @@
PORTNAME= splot
PORTVERSION= 1.1.7
+PORTREVISION= 1
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-spopt/Makefile b/math/py-spopt/Makefile
index 7038ea27b7a5..4085acbb15cb 100644
--- a/math/py-spopt/Makefile
+++ b/math/py-spopt/Makefile
@@ -1,6 +1,6 @@
PORTNAME= spopt
PORTVERSION= 0.5.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-squarify/Makefile b/math/py-squarify/Makefile
index 99731674df12..8d8ec0eeb349 100644
--- a/math/py-squarify/Makefile
+++ b/math/py-squarify/Makefile
@@ -1,6 +1,6 @@
PORTNAME= squarify
DISTVERSION= 0.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-ssm/Makefile b/math/py-ssm/Makefile
index 145cd7407b04..89f6dc59573b 100644
--- a/math/py-ssm/Makefile
+++ b/math/py-ssm/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ssm
DISTVERSION= 0.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-timple/Makefile b/math/py-timple/Makefile
index 11b5af5c56b4..9b1cf9ba763a 100644
--- a/math/py-timple/Makefile
+++ b/math/py-timple/Makefile
@@ -1,6 +1,6 @@
PORTNAME= timple
PORTVERSION= 0.1.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-yt/Makefile b/math/py-yt/Makefile
index bcd16ad88170..d10bab4dd9ea 100644
--- a/math/py-yt/Makefile
+++ b/math/py-yt/Makefile
@@ -1,6 +1,6 @@
PORTNAME= yt
DISTVERSION= 4.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math astro python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile
index 3f481deb632e..ab20fb2d0e04 100644
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -1,5 +1,6 @@
PORTNAME= qalculate-gtk
PORTVERSION= 5.7.0
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/
diff --git a/math/savage/Makefile b/math/savage/Makefile
index 1bcf918ef259..5701c13df0a7 100644
--- a/math/savage/Makefile
+++ b/math/savage/Makefile
@@ -1,7 +1,7 @@
PORTNAME= savage
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.0
-PORTREVISION= 31
+PORTREVISION= 32
CATEGORIES= math
MAINTAINER= ashish@FreeBSD.org
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index 0a5668a213eb..c9020ac6731d 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -1,5 +1,6 @@
PORTNAME= scalapack
PORTVERSION= 2.2.2
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= math
@@ -60,7 +61,7 @@ FFLAGS+= ${FPIC}
LDFLAGS+= ${MPI_LIBS}
SVERSION= ${PORTVERSION:R:R}
-.if ${GCC_DEFAULT} >= 10
+.if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10
# workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1)
FFLAGS+= -fallow-argument-mismatch
.endif
diff --git a/math/scalapack/files/patch-BLACS_SRC_Bdef.h b/math/scalapack/files/patch-BLACS_SRC_Bdef.h
new file mode 100644
index 000000000000..7845091f1e18
--- /dev/null
+++ b/math/scalapack/files/patch-BLACS_SRC_Bdef.h
@@ -0,0 +1,18 @@
+--- BLACS/SRC/Bdef.h.orig 2024-08-06 11:44:11 UTC
++++ BLACS/SRC/Bdef.h
+@@ -129,6 +129,15 @@ Int BI_ContxtNum(BLACSCONTEXT *ctxt);
+ void BI_BlacsWarn(Int ConTxt, Int line, char *file, char *form, ...);
+ void BI_BlacsErr(Int ConTxt, Int line, char *file, char *form, ...);
+ Int BI_ContxtNum(BLACSCONTEXT *ctxt);
++void BI_TransDist(BLACSCONTEXT *ctxt, char scope, Int m, Int n, Int *rA,
++ Int *cA, Int ldrc, BI_DistType *dist, Int rdest, Int cdest);
++void BI_dmvcopy(Int m, Int n, double *A, Int lda, double *buff);
++void BI_dvmcopy(Int m, Int n, double *A, Int lda, double *buff);
++void BI_imvcopy(Int m, Int n, Int *A, Int lda, Int *buff);
++void BI_ivmcopy(Int m, Int n, Int *A, Int lda, Int *buff);
++void BI_smvcopy(Int m, Int n, float *A, Int lda, float *buff);
++void BI_svmcopy(Int m, Int n, float *A, Int lda, float *buff);
++void Cblacs_pinfo(Int *mypnum, Int *nprocs);
+
+ /*
+ * If we've got an ANSI standard C compiler, we can use void pointers...
diff --git a/math/scalapack/files/patch-BLACS_SRC_blacs__init__.c b/math/scalapack/files/patch-BLACS_SRC_blacs__init__.c
new file mode 100644
index 000000000000..642edde152d9
--- /dev/null
+++ b/math/scalapack/files/patch-BLACS_SRC_blacs__init__.c
@@ -0,0 +1,15 @@
+--- BLACS/SRC/blacs_init_.c.orig 2024-08-06 11:44:11 UTC
++++ BLACS/SRC/blacs_init_.c
+@@ -6,7 +6,12 @@ F_VOID_FUNC blacs_gridinit_(Int *ConTxt, F_CHAR order,
+ F_VOID_FUNC blacs_gridinit_(Int *ConTxt, F_CHAR order, Int *nprow, Int *npcol)
+ #endif
+ {
++#if (INTFACE == C_CALL)
+ void Cblacs_gridmap(Int *, Int *, Int, Int, Int);
++#else
++ F_VOID_FUNC blacs_gridmap_(Int *ConTxt, Int *usermap, Int *ldup, Int *nprow0,
++ Int *npcol0);
++#endif
+ Int *tmpgrid, *iptr;
+ Int i, j;
+
diff --git a/math/scalapack/files/patch-CMakeLists.txt b/math/scalapack/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..133cf6b18859
--- /dev/null
+++ b/math/scalapack/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig 2025-09-05 14:39:41 UTC
++++ CMakeLists.txt
+@@ -239,6 +239,7 @@ if (NOT MSVC)
+ append_subdir_files(src-C "SRC")
+
+ if (NOT MSVC)
++ set_source_files_properties(TOOLS/SL_gridreshape.c PROPERTIES COMPILE_OPTIONS "-Wno-error=implicit-function-declaration")
+ add_library(scalapack ${blacs} ${tools} ${tools-C} ${extra_lapack} ${pblas} ${pblas-F} ${ptzblas} ${ptools} ${pbblas} ${redist} ${src} ${src-C})
+ set_target_properties(scalapack PROPERTIES
+ VERSION ${SCALAPACK_VERSION}
diff --git a/math/scalapack/files/patch-gridmap b/math/scalapack/files/patch-gridmap
new file mode 100644
index 000000000000..f442271f2045
--- /dev/null
+++ b/math/scalapack/files/patch-gridmap
@@ -0,0 +1,120 @@
+--- REDIST/SRC/pcgemr.c.orig 2024-08-06 11:44:11 UTC
++++ REDIST/SRC/pcgemr.c
+@@ -194,6 +194,7 @@ extern void Cblacs_gridinit();
+ extern void Cblacs_pinfo();
+ extern void Cblacs_gridinfo();
+ extern void Cblacs_gridinit();
++extern void Cblacs_gridmap();
+ extern void Cblacs_exit();
+ extern void Cblacs_gridexit();
+ extern void Cblacs_setup();
+--- REDIST/SRC/pctrmr.c.orig 2024-08-06 11:44:11 UTC
++++ REDIST/SRC/pctrmr.c
+@@ -209,6 +209,7 @@ extern void Cblacs_gridinit();
+ extern void Cblacs_pinfo();
+ extern void Cblacs_gridinfo();
+ extern void Cblacs_gridinit();
++extern void Cblacs_gridmap();
+ extern void Cblacs_exit();
+ extern void Cblacs_gridexit();
+ extern void Cblacs_setup();
+--- REDIST/SRC/pdgemr.c.orig 2024-08-06 11:44:11 UTC
++++ REDIST/SRC/pdgemr.c
+@@ -191,6 +191,7 @@ extern void Cblacs_gridinit();
+ extern void Cblacs_pinfo();
+ extern void Cblacs_gridinfo();
+ extern void Cblacs_gridinit();
++extern void Cblacs_gridmap();
+ extern void Cblacs_exit();
+ extern void Cblacs_gridexit();
+ extern void Cblacs_setup();
+--- REDIST/SRC/pdtrmr.c.orig 2024-08-06 11:44:11 UTC
++++ REDIST/SRC/pdtrmr.c
+@@ -206,6 +206,7 @@ extern void Cblacs_gridinit();
+ extern void Cblacs_pinfo();
+ extern void Cblacs_gridinfo();
+ extern void Cblacs_gridinit();
++extern void Cblacs_gridmap();
+ extern void Cblacs_exit();
+ extern void Cblacs_gridexit();
+ extern void Cblacs_setup();
+--- REDIST/SRC/pigemr.c.orig 2024-08-06 11:44:11 UTC
++++ REDIST/SRC/pigemr.c
+@@ -191,6 +191,7 @@ extern void Cblacs_gridinit();
+ extern void Cblacs_pinfo();
+ extern void Cblacs_gridinfo();
+ extern void Cblacs_gridinit();
++extern void Cblacs_gridmap();
+ extern void Cblacs_exit();
+ extern void Cblacs_gridexit();
+ extern void Cblacs_setup();
+--- REDIST/SRC/pitrmr.c.orig 2024-08-06 11:44:11 UTC
++++ REDIST/SRC/pitrmr.c
+@@ -206,6 +206,7 @@ extern void Cblacs_gridinit();
+ extern void Cblacs_pinfo();
+ extern void Cblacs_gridinfo();
+ extern void Cblacs_gridinit();
++extern void Cblacs_gridmap();
+ extern void Cblacs_exit();
+ extern void Cblacs_gridexit();
+ extern void Cblacs_setup();
+--- REDIST/SRC/psgemr.c.orig 2024-08-06 11:44:11 UTC
++++ REDIST/SRC/psgemr.c
+@@ -191,6 +191,7 @@ extern void Cblacs_gridinit();
+ extern void Cblacs_pinfo();
+ extern void Cblacs_gridinfo();
+ extern void Cblacs_gridinit();
++extern void Cblacs_gridmap();
+ extern void Cblacs_exit();
+ extern void Cblacs_gridexit();
+ extern void Cblacs_setup();
+--- REDIST/SRC/pstrmr.c.orig 2024-08-06 11:44:11 UTC
++++ REDIST/SRC/pstrmr.c
+@@ -206,6 +206,7 @@ extern void Cblacs_gridinit();
+ extern void Cblacs_pinfo();
+ extern void Cblacs_gridinfo();
+ extern void Cblacs_gridinit();
++extern void Cblacs_gridmap();
+ extern void Cblacs_exit();
+ extern void Cblacs_gridexit();
+ extern void Cblacs_setup();
+--- REDIST/SRC/pzgemr.c.orig 2024-08-06 11:44:11 UTC
++++ REDIST/SRC/pzgemr.c
+@@ -194,6 +194,7 @@ extern void Cblacs_gridinit();
+ extern void Cblacs_pinfo();
+ extern void Cblacs_gridinfo();
+ extern void Cblacs_gridinit();
++extern void Cblacs_gridmap();
+ extern void Cblacs_exit();
+ extern void Cblacs_gridexit();
+ extern void Cblacs_setup();
+--- REDIST/SRC/pztrmr.c.orig 2024-08-06 11:44:11 UTC
++++ REDIST/SRC/pztrmr.c
+@@ -209,6 +209,7 @@ extern void Cblacs_gridinit();
+ extern void Cblacs_pinfo();
+ extern void Cblacs_gridinfo();
+ extern void Cblacs_gridinit();
++extern void Cblacs_gridmap();
+ extern void Cblacs_exit();
+ extern void Cblacs_gridexit();
+ extern void Cblacs_setup();
+--- SRC/pcrot.c.orig 2024-08-06 11:44:11 UTC
++++ SRC/pcrot.c
+@@ -190,6 +190,7 @@ void pcrot_( Int *n, complex X[], Int *ix, Int *jx, In
+ F_INTG_FCT pbctrnv_();
+ F_INTG_FCT crot_();
+ F_INTG_FCT ilcm_();
++ Int numroc_( Int*, Int*, Int*, Int*, Int* );
+ /* ..
+ * .. Executable Statements ..
+ *
+--- SRC/pzrot.c.orig 2024-08-06 11:44:11 UTC
++++ SRC/pzrot.c
+@@ -190,6 +190,7 @@ void pzrot_( Int *n, complex16 X[], Int *ix, Int *jx,
+ F_INTG_FCT pbztrnv_();
+ F_INTG_FCT zrot_();
+ F_INTG_FCT ilcm_();
++ Int numroc_( Int*, Int*, Int*, Int*, Int* );
+ /* ..
+ * .. Executable Statements ..
+ *
diff --git a/math/verdict/Makefile b/math/verdict/Makefile
index e00a2e529d00..b01fbbabd1b1 100644
--- a/math/verdict/Makefile
+++ b/math/verdict/Makefile
@@ -1,6 +1,5 @@
PORTNAME= verdict
-PORTVERSION= 1.4.2
-PORTREVISION= 2
+PORTVERSION= 1.4.4
CATEGORIES= math
MAINTAINER= thierry@FreeBSD.org
diff --git a/math/verdict/distinfo b/math/verdict/distinfo
index fa73f58cfb62..1c05aa083aeb 100644
--- a/math/verdict/distinfo
+++ b/math/verdict/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1689872034
-SHA256 (sandialabs-verdict-1.4.2_GH0.tar.gz) = 225c8c5318f4b02e7215cefa61b5dc3f99e05147ad3fefe6ee5a3ee5b828964b
-SIZE (sandialabs-verdict-1.4.2_GH0.tar.gz) = 2195976
+TIMESTAMP = 1756995704
+SHA256 (sandialabs-verdict-1.4.4_GH0.tar.gz) = d12d1cd41c6568997df348a72cc2973a662fae1b3634a068ea2201b5f7383186
+SIZE (sandialabs-verdict-1.4.4_GH0.tar.gz) = 2199396
diff --git a/math/verdict/pkg-plist b/math/verdict/pkg-plist
index 8d1977a532ae..1733fc58a5bf 100644
--- a/math/verdict/pkg-plist
+++ b/math/verdict/pkg-plist
@@ -6,6 +6,6 @@ lib/cmake/verdict/VerdictTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/verdict/VerdictTargets.cmake
lib/libverdict.so
lib/libverdict.so.1.4
-lib/libverdict.so.1.4.2
+lib/libverdict.so.1.4.4
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/SAND2007-2853p.pdf