diff --git a/devel/py-cysignals/Makefile b/devel/py-cysignals/Makefile
index 0fccd630af54..8fd667d2505c 100644
--- a/devel/py-cysignals/Makefile
+++ b/devel/py-cysignals/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	cysignals
 PORTVERSION=	1.11.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Interrupt and signal handling for Cython
 WWW=		https://pypi.org/project/cysignals/
 
 LICENSE=	LGPL3
 
 LIB_DEPENDS=	libpari.so:math/pari
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	sagemath
 
 USES=		autoreconf:build compiler:c++11-lang gettext localbase python:3.6+
 USE_PYTHON=	cython distutils
 
 TEST_TARGET=	check
 
 .if !defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 OPTIONS_DEFINE=		DOCS
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.6,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_USES=		gmake
 PORTDOCS=		*
 
 pre-configure:
 	${REINPLACE_CMD} -e '/^PYTHON/s|python3|${PYTHON_CMD}|'	\
 		${WRKSRC}/Makefile
 
 do-build-DOCS-on:
 	(cd ${WRKSRC}/docs && ${GMAKE} html)
 
 post-build-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/build/html/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index a10a44b4ec8c..f7e80543699f 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,212 +1,212 @@
 PORTNAME=	clisp
 PORTVERSION=	2.49.93+
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang lisp
 
 MAINTAINER=	kiri@TrueFC.org
 COMMENT=	Common Lisp implementation
 WWW=		https://www.gnu.org/software/clisp/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GNU-GPL
 
 BROKEN_sparc64=	Does not compile
 
 LIB_DEPENDS=	libffcall.so:devel/libffcall \
 		libreadline.so:devel/readline \
 		libsigsegv.so:devel/libsigsegv
 
 USES=		compiler gettext ghostscript gnome iconv localbase:ldflags
 USE_GCC=	yes
 USE_GITLAB=	yes
 
 GL_ACCOUNT=	gnu-clisp
 GL_PROJECT=	clisp
 GL_COMMIT=	df3b9f6fdcff22832898e89a989eb499c0f842ed
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	FORCE_UNSAFE_CONFIGURE=1
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --mandir="${MANPREFIX}/man" \
 		--elispdir="${DATADIR}/emacs" --vimdir="${DATADIR}/vim" \
 		--docdir="${DOCSDIR}" --with-libiconv=${ICONV_PREFIX}
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
 # Complaints if the environment changes between build stages.
 LDFLAGS+=	${LDFLAGS_${CHOSEN_COMPILER_TYPE}}
 LDFLAGS_gcc=	-lthr
 MAKE_ENV=	${CONFIGURE_ENV}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	ASDF BDB CLX_MIT CLX_NEW DBUS FASTCGI GDBM GLIBC GTK2 \
 		JITC MATLAB NETICA ORACLE PARI PCRE PGSQL QUEENS RAWSOCK \
 		SVM THREADS ZLIB
 ASDF_DESC=	Another System Definition Facility
 BDB_DESC=	Interface to Berkeley DB from Sleepycat Software
 CLX_MIT_DESC=	Classical X11 Interface
 CLX_NEW_DESC=	Faster X11 Interface (replaces clx/mit-clx)
 DBUS_DESC=	Interface to the D-Bus message bus system
 FASTCGI_DESC=	FastCGI interface for web development
 GDBM_DESC=	Interface to GNU DBM
 GLIBC_DESC=	Interface to most of the GNU libc library
 GTK2_DESC=	Interface to the GTK library using glade
 JITC_DESC=	Use a given Just-In-Time Compiler
 SVM_DESC=	Support Vector Machine predictive analytics
 MATLAB_DESC=	Matrix calculations using Matlab
 NETICA_DESC=	Bayesian belief networks and influence diagrams
 ORACLE_DESC=	Oracle RDMBS interface
 PARI_DESC=	PARI Computer Algebra System
 PCRE_DESC=	Perl-compatible regular expressions
 PGSQL_DESC=	PostGreSQL RDMBS interface
 QUEENS_DESC=	The Queens Function (a toy example)
 RAWSOCK_DESC=	Low level socket interface
 THREADS_DESC=	Multithreaded Support (Experimental)
 ZLIB_DESC=	Compress vectors
 
 OPTIONS_RADIO=	CLX
 OPTIONS_RADIO_CLX=	CLX_MIT CLX_NEW
 CLX_DESC=	X11 Module Selection
 
 OPTIONS_DEFAULT=BDB RAWSOCK ZLIB
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
 # Segmentation fault in amd64 when using 'mmap(2)', errno = EINVAL.
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=--disable-mmap
 .endif
 
 MODULES=	ASDF BDB CLX_MIT CLX_NEW DBUS FASTCGI GDBM GLIBC GTK2 \
 		JITC MATLAB NETICA ORACLE PARI PCRE PGSQL QUEENS RAWSOCK \
 		SVM ZLIB
 
 .for mod in ${MODULES}
 .   if ${PORT_OPTIONS:M${mod}}
 PLIST_SUB+=	${mod}=""
 .   else
 PLIST_SUB+=	${mod}="@comment "
 .   endif
 .endfor
 
 .if ${PORT_OPTIONS:MASDF}
 CONFIGURE_ARGS+=--with-module=asdf
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
 USES+=		bdb
 CONFIGURE_ARGS+=--with-module=berkeley-db
 CPPFLAGS+=	-I${LOCALBASE}/include/db${BDB_VER}
 LDFLAGS+=	-L${LOCALBASE}/lib/db${BDB_VER}
 .endif
 
 .if ${PORT_OPTIONS:MCLX_MIT} || ${PORT_OPTIONS:MCLX_NEW}
 USES+=		xorg
 USE_XORG=	x11
 .endif
 .if ${PORT_OPTIONS:MCLX_MIT}
 CONFIGURE_ARGS+=--with-module=clx/mit-clx
 .endif
 .if ${PORT_OPTIONS:MCLX_NEW}
 CONFIGURE_ARGS+=--with-module=clx/new-clx
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 CONFIGURE_ARGS+=--with-module=dbus
 .endif
 
 .if ${PORT_OPTIONS:MFASTCGI}
 LIB_DEPENDS+=	libfcgi.so:www/fcgi
 CONFIGURE_ARGS+=--with-module=fastcgi
 .endif
 
 .if ${PORT_OPTIONS:MGDBM}
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 CONFIGURE_ARGS+=--with-module=gdbm
 .endif
 
 .if ${PORT_OPTIONS:MGLIBC}
 USE_LINUX=	base
 CONFIGURE_ARGS+=--with-module=bindings/glibc
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
 USES+=		gnome
 USE_GNOME=	gtk20 libglade2
 CONFIGURE_ARGS+=--with-module=gtk2
 .endif
 
 .if ${PORT_OPTIONS:MJITC}
 BUILD_DEPENDS+=	${LOCALBASE}/include/lightning.h:devel/lightning
 LIB_DEPENDS+=	liblightning.so:devel/lightning
 CONFIGURE_ARGS+=--with-jitc=lightning
 .endif
 
 .if ${PORT_OPTIONS:MMATLAB}
 CONFIGURE_ARGS+=--with-module=matlab
 .endif
 
 .if ${PORT_OPTIONS:MNETICA}
 CONFIGURE_ARGS+=--with-module=netica
 .endif
 
 .if ${PORT_OPTIONS:MORACLE}
 CONFIGURE_ARGS+=--with-module=oracle
 .endif
 
 .if ${PORT_OPTIONS:MPARI}
 LIB_DEPENDS+=	libpari.so:math/pari
 CONFIGURE_ARGS+=--with-module=pari
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS+=	libpcre.so:devel/pcre
 CONFIGURE_ARGS+=--with-module=pcre
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
 CONFIGURE_ARGS+=--with-module=postgresql
 .endif
 
 .if ${PORT_OPTIONS:MQUEENS}
 CONFIGURE_ARGS+=--with-module=queens
 .endif
 
 .if ${PORT_OPTIONS:MRAWSOCK}
 CONFIGURE_ARGS+=--with-module=rawsock
 .endif
 
 .if ${PORT_OPTIONS:MSVM}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/svm-predict:science/libsvm
 CONFIGURE_ARGS+=--with-module=libsvm
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--with-threads=POSIX_THREADS \
 		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
 PKGNAMESUFFIX=	-threaded
 .endif
 
 .if ${PORT_OPTIONS:MZLIB}
 CONFIGURE_ARGS+=--with-module=zlib
 .endif
 
 post-patch:
 .if ${PORT_OPTIONS:MORACLE}
 	@${REINPLACE_CMD} -e 's|-ldl||; s|-lpthread|-lcompat ${PTHREAD_LIBS}|' \
 		${WRKSRC}/modules/oracle/link.sh.in
 .endif
 
 pre-install:
 .if ${PORT_OPTIONS:MCLX_MIT}
 	${CP} ${WRKSRC}/modules/clx/mit-clx/README.CLISP \
 		${WRKSRC}/src/clx/mit-clx/README.CLISP
 .endif
 
 post-install:
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/math/cm/Makefile b/math/cm/Makefile
index 78cf9dda9190..d237f9b94c1b 100644
--- a/math/cm/Makefile
+++ b/math/cm/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	cm
 DISTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.multiprecision.org/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for ring class fields of imaginary quadratic number fields
 WWW=		https://www.multiprecision.org/cm/home.html
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libmpfrcx.so:math/mpfrcx \
 		libpari.so:math/pari
 
 USES=		gmake libtool localbase
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 INFO=		cm
 
 .include <bsd.port.mk>
diff --git a/math/cmh/Makefile b/math/cmh/Makefile
index 17da103f8c7e..a6b648513ea5 100644
--- a/math/cmh/Makefile
+++ b/math/cmh/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	cmh
 DISTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.multiprecision.org/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Compute Igusa class polynomials
 WWW=		https://www.multiprecision.org/cmh/home.html
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfplll.so:math/fplll \
 		libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libmpfrcx.so:math/mpfrcx \
 		libpari.so:math/pari
 RUN_DEPENDS=	bash:shells/bash
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake libtool localbase shebangfix
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	scripts/cmh-classpol.sh.in
 SHEBANG_GLOB=	*.sh
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check # tests fail, see https://gitlab.inria.fr/cmh/cmh/-/issues/1
 
 .include <bsd.port.mk>
diff --git a/math/eclib/Makefile b/math/eclib/Makefile
index 29773e7ab477..c8cecee3812f 100644
--- a/math/eclib/Makefile
+++ b/math/eclib/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	eclib
 PORTVERSION=	20220621
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	C++ library for arithmetic on elliptic curves
 WWW=		https://homepages.warwick.ac.uk/staff/J.E.Cremona/mwrank/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libntl.so:math/ntl		\
 		libpari.so:math/pari		\
 		libflint.so:math/flint2		\
 		libboost_thread.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	JohnCremona
 
 USES=		autoreconf compiler:c++11-lang libtool localbase
 
 OPTIONS_DEFINE=	DOCS
 
 LIBS+=		"-lm"
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-flint=${LOCALBASE} --with-boost=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index c38026301124..5fabd7622c34 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -1,153 +1,154 @@
 PORTNAME=	giacxcas
 DISTVERSION=	1.9.0-21
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \
 		http://cocoa.dima.unige.it/cocoalib/tgz/:cocoa \
 		http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/
 DISTFILES=	giac_${DISTVERSION}${EXTRACT_SUFX}:giac \
 		CoCoALib-${COCOA_LIB_VERSION}.tgz:cocoa \
 		fltk-giac.tar.gz
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Computer algebra system
 WWW=		https://www-fourier.ujf-grenoble.fr/~parisse/giac.html
 
 LICENSE=	GPLv3 DOC
 LICENSE_COMB=	multi
 LICENSE_NAME_DOC=	French documentation
 LICENSE_TEXT_DOC=	French documentation is for non-commercial use only
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_PERMS_DOC=	dist-mirror pkg-mirror auto-accept
 LICENSE_DISTFILES_DOC=	giac_${DISTVERSION}${EXTRACT_SUFX}
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libao.so:audio/libao \
 		libcurl.so:ftp/curl \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libgsl.so:math/gsl \
 		libglpk.so:math/glpk \
 		libgmp.so:math/gmp \
 		libecm.so:math/gmp-ecm \
 		libmpfr.so:math/mpfr \
 		libmpfi.so:math/mpfi \
 		libpari.so:math/pari \
 		libpng.so:graphics/png \
 		libnauty.so:math/nauty \
 		libcliquer.so:math/cliquer \
 		libsamplerate.so:audio/libsamplerate
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		blaslapack compiler:c++14-lang desktop-file-utils fortran \
 		gettext gl gmake gnome jpeg libtool localbase ncurses perl5 \
 		python readline shebangfix xorg
 GNU_CONFIGURE=	yes
 USE_GL=		gl
 USE_XORG=	x11 xcursor xext xft xi xinerama
 USE_TEX=	latex:build dvipsk:build
 USE_PERL5=	run
 USE_LDCONFIG=	yes
 # Warning:  don't remove the USE_GCC without a runtime test *after* make install
 #USE_GCC=	yes
 CONFIGURE_ENV=	ac_cv_lib_X11_main=yes \
 		ac_cv_lib_cocoa_main=yes \
 		ac_cv_lib_fltk_gl_main=yes \
 		ac_cv_lib_fltk_main=yes \
 		ac_cv_lib_fltk_images_main=yes \
 		ac_cv_lib_jpeg_main=yes
 SHEBANG_FILES=	src/pgiac micropython-1.12/docs/conf.py
 
 INSTALL_TARGET=	install-strip
 
 COCOA_LIB_VERSION=	0.99700
 
 CPPFLAGS+=	-I${COCOALIB-GIAC}/include \
 		-I${FLTKDEV-GIAC} \
 		-Wno-narrowing
 LDFLAGS+=	-L${COCOALIB-GIAC}/lib \
 		-L${FLTKDEV-GIAC}/lib
 
 WRKSRC=		${WRKDIR}/giac-${DISTVERSION:C/-[0-9]*//}
 FLTKDEV-GIAC=	${WRKDIR}/fltk-1.3.0
 COCOALIB-GIAC=	${WRKDIR}/CoCoALib-${COCOA_LIB_VERSION}
 TEST_TARGET=	check
 
 DATADIR=	${PREFIX}/share/giac
 DOCSDIR=	${PREFIX}/share/doc/giac
 EXAMPLESDIR=	${PREFIX}/share/examples/giac
 
 INFO=		giac_es giac_us
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 #NB: built of giacxcas with USE_GCC and nlt is successfull if the ntl port is also
 #    installed  with USE_GCC
 CONFIGURE_ARGS+=	--disable-ntl
 CONFIGURE_ARGS+=	--disable-micropy # it causes SEGV in xcas in the nlr_push call from execute_from_lexer@main.c
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 post-extract:
 	@${FIND} ${WRKSRC}/examples/Exemples -name "._*" -delete
 
 post-patch:
 	@${GREP} -Rl --null /bin/bash ${COCOALIB-GIAC} | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's|/bin/bash|/usr/bin/env bash|'
 	@${REINPLACE_CMD} -e '/^SUBDIR/s|examples||' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' \
 		${WRKSRC}/xcas.applications
 	@${REINPLACE_CMD} -e 's|cp -f \*|$$(INSTALL_DATA) WARNINGS [a-z]*|' \
 		${WRKSRC}/doc/el/*/Makefile.in
 	@${REINPLACE_CMD} -e '/browser=/s|"mozilla"|"xdg-open"|' \
 		${WRKSRC}/src/global.cc
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} \
 		${REINPLACE_CMD} -e 's|$$(prefix)/share/giac/doc|$$(docdir)|'
 	@${FIND} ${COCOALIB-GIAC} -name "Makefile" | ${XARGS} \
 		${REINPLACE_CMD} -e \
 		's|\($$(MAKE) \)-s |\1|; s|\([[:blank:]]\)@|\1|'
 	@${REINPLACE_CMD} -e '/.SILENT:/s|^|#|' \
 		${FLTKDEV-GIAC}/makeinclude.in
 	${SED} -i ".orig" -Ee 's|char \*last = style \+ strlen\(style\) - 2|char *last = pretty|' \
 		-Ee 's|\*style = 0|last = style + strnlen(style, ENDOFBUFFER) - 2; *style = 0|' \
 		${FLTKDEV-GIAC}/src/fl_set_fonts_xft.cxx
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/lib  /usr/lib64  /usr/lib32  /usr/local  /opt/local/lib  /sw/lib  /usr/sfw/lib|${LOCALBASE}/lib|' \
 		-e '/libgmp.a/s|find|#find|' \
 		-e 's|-name  libgmp.so|-type f -name "libgmp.so.*"|' \
 		${COCOALIB-GIAC}/configuration/gmp-find.sh
 	${REINPLACE_CMD} -e 's|^protected:|public:|' ${FLTKDEV-GIAC}/FL/Fl_Widget.H
 .for f in icas.cc path.h
 	${REINPLACE_CMD} -e 's|/usr/local/share/giac/doc|${DOCSDIR}|' \
 		${WRKSRC}/src/${f}
 .endfor
 	${FIND} ${WRKSRC}/doc -type f | ${XARGS} ${GREP} -l 'share/giac/doc' | \
 		${XARGS} ${REINPLACE_CMD} -e 's|/usr/local/share/giac/doc|${DOCSDIR}|'
 	${FIND} ${WRKSRC}/micropython-1.12 -type f | ${XARGS}	\
 		${GREP} -l "/usr/bin/env python3" | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|'
 	${FIND} ${WRKSRC}/micropython-1.12 -type f | ${XARGS}	\
 		${GREP} -l "python3 \|'python3'\|= python3\|^python3" | ${XARGS}	\
 		${REINPLACE_CMD} -e "s|python3 |${PYTHON_CMD} |;s|'python3'|'${PYTHON_CMD}'|"	\
 			-e "s|= python3|= ${PYTHON_CMD}|;s|^python3|${PYTHON_CMD}|"
 	@(cd ${COCOALIB-GIAC} && ${SETENV} ${CONFIGURE_ENV} ./configure \
 		--with-cxx="${CXX}")
 	@(cd ${FLTKDEV-GIAC} && ${SETENV} ${CONFIGURE_ENV} ./configure \
 		--prefix=${FLTKDEV-GIAC} \
 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}")
 
 post-configure:	# malloc.h on 13-CURRENT is missing mallinfo and compilation fails after it is discovered
 	@${FIND} ${WRKSRC} -name config.h | ${XARGS} ${REINPLACE_CMD} -e 's|#define HAVE_MALLOC_H 1|/* #undef HAVE_MALLOC_H */|'
 
 pre-build:
 	@cd ${COCOALIB-GIAC} && ${DO_MAKE_BUILD} \
 		CXXFLAGS_SPECIFIC="${CXXFLAGS}" library
 	@cd ${FLTKDEV-GIAC}/src && ${DO_MAKE_BUILD}
 
 post-install-EXAMPLES-on:
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "Exemples [a-z]*" \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/giacxcas/files/patch-src_pari.cc b/math/giacxcas/files/patch-src_pari.cc
new file mode 100644
index 000000000000..bd3f15a4384c
--- /dev/null
+++ b/math/giacxcas/files/patch-src_pari.cc
@@ -0,0 +1,14 @@
+- workaroud of the removal of the ANYARG macro in pari-2.15.0
+
+--- src/pari.cc.orig	2022-03-16 11:38:05 UTC
++++ src/pari.cc
+@@ -44,6 +44,9 @@ using namespace std;
+ #include <pthread.h>
+ #endif
+ 
++// workaround for the removal of the ANYARG macro in pari-2.15.0
++#define ANYARG ...
++
+ static long int abs(long int & l){
+   if (l<0)
+     return -l;
diff --git a/math/gp2c/Makefile b/math/gp2c/Makefile
index c3430a0e2305..9b116a1e624f 100644
--- a/math/gp2c/Makefile
+++ b/math/gp2c/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	gp2c
 DISTVERSION=	0.0.12
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/GP2C/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Package for translating GP routines into C
 WWW=		https://pari.math.u-bordeaux.fr/pub/pari/manuals/gp2c/gp2c.html
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpari.so:math/pari
 
 USES=		perl5
 
 OPTIONS_DEFINE=	DOCS
 
 GNU_CONFIGURE=	yes
 
 TEST_TARGET=	check
 
 .include <bsd.port.mk>
diff --git a/math/lcalc/Makefile b/math/lcalc/Makefile
index 9d031dfeba0a..86f857d6a9ee 100644
--- a/math/lcalc/Makefile
+++ b/math/lcalc/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	lcalc
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/misc/sage/spkg/upstream/lcalc/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	L-function c++ class library and the CLI program lcalc
 WWW=		https://gitlab.com/sagemath/lcalc
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	gengetopt:devel/gengetopt
 LIB_DEPENDS=	libgmp.so:math/gmp	\
 		libmpfr.so:math/mpfr	\
 		libpari.so:math/pari
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	agrawroh
 #GH_PROJECT=	l-calc
 #GH_TAGNAME=	4c57471
 
 USES=		compiler:c++11-lang gmake libtool localbase tar:xz
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pari
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 pre-configure:
 .for dir in . data
 	${REINPLACE_CMD} -e 's|@docdir@/examples|${EXAMPLESDIR}|'	\
 		${WRKSRC}/doc/examples/${dir}/Makefile.in
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/pari/Makefile b/math/pari/Makefile
index 9856269a6e25..f1db8f3499f4 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,82 +1,81 @@
 PORTNAME=	pari
-DISTVERSION=	2.13.4
-PORTEPOCH=	2
+DISTVERSION=	2.15.0
 CATEGORIES=	math
 MASTER_SITES=	https://pari.math.u-bordeaux.fr/pub/pari/unix/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Mathematics library and advanced calculator package
 WWW=		https://pari.math.u-bordeaux.fr/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_mips64=		fails to link: mpker.c:(.text+0x33bc): relocation truncated to fit: R_MIPS_TLS_GD against 'PARI_SIGINT_block'
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
-USES=		perl5 readline
+USES=		bison perl5 readline
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man/man1 \
 		--prefix=${PREFIX} \
 		--with-readline
 ALL_TARGET=	gp
 
 OPTIONS_DEFINE=		DOCS EXAMPLES OPTIMIZED_CFLAGS X11
 OPTIONS_RADIO=		THREADS
 OPTIONS_RADIO_THREADS=	PTHREADS MPI
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS X11 PTHREADS
 THREADS_DESC=		Thread engine (single-threaded when none is selected)
 PTHREADS_DESC=		Enable pthread thread engine
 MPI_DESC=		Enable MPI thread engine
 MPI_BUILD_ENV=		CC=mpicc
 .ifndef WITH_DEBUG
 OPTIMIZED_CFLAGS_CFLAGS=	-O3 -fno-strict-aliasing -fomit-frame-pointer
 .endif
 X11_CONFIGURE_ON=	--graphic=X11
 X11_CONFIGURE_OFF=	--graphic=none
 X11_USES=		xorg
 X11_USE=		xorg=x11
 MPI_RUN_DEPENDS=	${LOCALBASE}/bin/mpirun:net/mpich
 MPI_BUILD_DEPENDS=	${LOCALBASE}/bin/mpicc:net/mpich
 MPI_LIB_DEPENDS=	libgmp.so:math/gmp
 PTHREADS_LIB_DEPENDS=	libgmp.so:math/gmp
 PTHREADS_CONFIGURE_ON=	--mt=pthread --with-gmp=${LOCALBASE}
 MPI_CONFIGURE_ON=	--mt=mpi --with-gmp=${LOCALBASE}
 MPI_CONFIGURE_ENV=	CC=${LOCALBASE}/bin/mpicc
 OPTIONS_SUB=	yes
 
 PLIST_SUB=	GP_VERSION=${PORTVERSION:R} PORTVERSION=${PORTVERSION}
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 .include <bsd.port.pre.mk>
 
 .if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
 CFLAGS+=	-mminimal-toc
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E '/libpari_base\=/s/-tls|-gmp//' \
 		${WRKSRC}/Configure
 	@${REINPLACE_CMD} -e '/^CFLAGS=/s/\$$cflags//' \
 		${WRKSRC}/config/get_cc
 	@${REINPLACE_CMD} -e 's|-lX11|-L${LOCALBASE}/lib -lX11|' \
 		${WRKSRC}/config/get_X11
 	@${REINPLACE_CMD} -e 's|-lreadline|-L${LOCALBASE}/lib -lreadline|' \
 		${WRKSRC}/config/get_readline
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpari.so.${PORTVERSION}
 
 do-test-PTHREADS-on:
 	@cd ${WRKSRC} && ${MAKE_CMD} test-parallel
 
 do-test-MPI-on:
 	@cd ${WRKSRC} && ${MAKE_CMD} test-parallel RUNTEST="mpirun -np 3"
 
 .include <bsd.port.post.mk>
diff --git a/math/pari/distinfo b/math/pari/distinfo
index e375bafd8d6d..921541997f6d 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649311614
-SHA256 (pari-2.13.4.tar.gz) = bcde9eceae1592814381c1697cdb7063567b6504201b1be47bb58920f3bce185
-SIZE (pari-2.13.4.tar.gz) = 4772735
+TIMESTAMP = 1664259213
+SHA256 (pari-2.15.0.tar.gz) = e474851e0d16d4e4f9a0d9612c746a2ae7c9a1ec185d04c440b1c74a85755685
+SIZE (pari-2.15.0.tar.gz) = 5172089
diff --git a/math/pari/pkg-plist b/math/pari/pkg-plist
index 2f067c37052c..dbbe1d277af5 100644
--- a/math/pari/pkg-plist
+++ b/math/pari/pkg-plist
@@ -1,30 +1,31 @@
 bin/gp
 bin/gp-%%GP_VERSION%%
 bin/gphelp
 bin/tex2mail
-include/pari/mpinl.h
 include/pari/genpari.h
+include/pari/mpinl.h
 include/pari/pari.h
 include/pari/paricast.h
 include/pari/paricfg.h
 include/pari/paricom.h
+include/pari/paridbglvl.h
 include/pari/paridecl.h
 include/pari/parierr.h
 include/pari/parigen.h
 include/pari/pariinl.h
 include/pari/parimt.h
 include/pari/parinf.h
 include/pari/pariold.h
 include/pari/paripriv.h
 include/pari/paristio.h
 include/pari/parisys.h
 include/pari/paritune.h
-lib/libpari.so.%%PORTVERSION%%
-lib/libpari.so.7
 lib/libpari.so
+lib/libpari.so.%%PORTVERSION%%
+lib/libpari.so.8
 lib/pari/pari.cfg
 man/man1/gp-%%GP_VERSION%%.1.gz
 man/man1/gp.1.gz
 man/man1/gphelp.1.gz
 man/man1/pari.1.gz
 man/man1/tex2mail.1.gz
diff --git a/math/pari_elldata/Makefile b/math/pari_elldata/Makefile
index 4fcda5ca710d..1c9ca3323dba 100644
--- a/math/pari_elldata/Makefile
+++ b/math/pari_elldata/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	elldata
 DISTVERSION=	2021-03-21
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://pari.math.u-bordeaux.fr/pub/pari/packages/
 PKGNAMEPREFIX=	pari-
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Elliptic Curve Data for PARI/GP
 WWW=		https://pari.math.u-bordeaux.fr/packages.html
 
 LICENSE=	ART20
 
 LIB_DEPENDS=	libpari.so:math/pari
 
 USES=		tar:tgz
 
 WRKSRC=		${WRKDIR}/data/${PORTNAME}
 INSTDIR=	${STAGEDIR}${PREFIX}/share/pari/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${INSTDIR}
 	${INSTALL_DATA} ${WRKSRC}/ell* ${INSTDIR}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/math/pari_galdata/Makefile b/math/pari_galdata/Makefile
index 3523dd92ac60..703bb60b566e 100644
--- a/math/pari_galdata/Makefile
+++ b/math/pari_galdata/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	galdata
 DISTVERSION=	2008-04-11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://pari.math.u-bordeaux.fr/pub/pari/packages/
 PKGNAMEPREFIX=	pari-
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Data needed by PARI/GP for polgalois
 WWW=		https://pari.math.u-bordeaux.fr/packages.html
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpari.so:math/pari
 
 USES=		tar:tgz
 
 WRKSRC=		${WRKDIR}/data/${PORTNAME}
 INSTDIR=	${STAGEDIR}${PREFIX}/share/pari/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-install:
 	${MKDIR} ${INSTDIR}
 	${INSTALL_DATA} ${WRKSRC}/* ${INSTDIR}/
 
 .include <bsd.port.mk>
diff --git a/math/pari_galpol/Makefile b/math/pari_galpol/Makefile
index 5133fff77da4..eebb3317d4aa 100644
--- a/math/pari_galpol/Makefile
+++ b/math/pari_galpol/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	galpol
 DISTVERSION=	2018-06-25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://pari.math.u-bordeaux.fr/pub/pari/packages/
 PKGNAMEPREFIX=	pari-
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Database of Galois polynomials for PARI/GP
 WWW=		https://pari.math.u-bordeaux.fr/packages.html
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpari.so:math/pari
 
 USES=		tar:tgz
 
 WRKSRC=		${WRKDIR}/data/${PORTNAME}
 INSTDIR=	${STAGEDIR}${PREFIX}/share/pari/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${INSTDIR}
 	(cd ${WRKSRC} && ${FIND} . | \
 		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR})
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MV} ${INSTDIR}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/math/pari_nflistdata/Makefile b/math/pari_nflistdata/Makefile
index f6a4a9b1e60c..589c65e5cd29 100644
--- a/math/pari_nflistdata/Makefile
+++ b/math/pari_nflistdata/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	nflistdata
 DISTVERSION=	2022-03-26
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://pari.math.u-bordeaux.fr/pub/pari/packages/
 PKGNAMEPREFIX=	pari-
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	List fields of small discriminant for nflist() in PARI/GP
 WWW=		https://pari.math.u-bordeaux.fr/packages.html
 
 LICENSE=	ART20
 
 RUN_DEPENDS=	pari>0:math/pari
 
 USES=		tar:tgz
 
 WRKSRC=		${WRKDIR}/data/${PORTNAME}
 INSTDIR=	${STAGEDIR}${PREFIX}/share/pari/${PORTNAME}
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${INSTDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTDIR}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/math/pari_nftables/Makefile b/math/pari_nftables/Makefile
index 03432a874756..1e3589dd7bb9 100644
--- a/math/pari_nftables/Makefile
+++ b/math/pari_nftables/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	nftables
 DISTVERSION=	2008-09-29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://pari.math.u-bordeaux.fr/pub/pari/packages/
 PKGNAMEPREFIX=	pari-
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Repackaging of the historical megrez number field tables for PARI/GP
 WWW=		https://pari.math.u-bordeaux.fr/packages.html
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpari.so:math/pari
 
 USES=		tar:tgz
 
 INSTDIR=	${STAGEDIR}${PREFIX}/share/pari/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${INSTDIR}
 	${INSTALL_DATA} ${WRKSRC}/T* ${INSTDIR}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/math/pari_seadata/Makefile b/math/pari_seadata/Makefile
index e21bc535695d..afeca0f4eaa0 100644
--- a/math/pari_seadata/Makefile
+++ b/math/pari_seadata/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	seadata
 DISTVERSION=	2009-06-18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://pari.math.u-bordeaux.fr/pub/pari/packages/
 PKGNAMEPREFIX=	pari-
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Modular polynomials for PARI/GP
 WWW=		https://pari.math.u-bordeaux.fr/packages.html
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpari.so:math/pari
 
 USES=		tar:tgz
 
 WRKSRC=		${WRKDIR}/data/${PORTNAME}
 INSTDIR=	${STAGEDIR}${PREFIX}/share/pari/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${INSTDIR}
 	${INSTALL_DATA} ${WRKSRC}/sea* ${INSTDIR}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/math/paritwine/Makefile b/math/paritwine/Makefile
index 2810d9501efb..aa595e5f34a9 100644
--- a/math/paritwine/Makefile
+++ b/math/paritwine/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	paritwine
 DISTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.multiprecision.org/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Glue library between PARI/GP and other mathematics libraries
 WWW=		https://www.multiprecision.org/paritwine/home.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libarb.so:math/arb \
 		libcmh.so:math/cmh \
 		libflint.so:math/flint2 \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libgmp.so:math/gmp \
 		libpari.so:math/pari
 
 USES=		gmake libtool localbase
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 INFO=		paritwine
 
 TEST_TARGET=	check
 
 .include <bsd.port.mk>
diff --git a/math/py-cypari2/Makefile b/math/py-cypari2/Makefile
index f6884fb1876a..0f57514bba21 100644
--- a/math/py-cypari2/Makefile
+++ b/math/py-cypari2/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	cypari2
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Python interface to the number theory library PARI/GP
 WWW=		https://github.com/sagemath/cypari2
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 LIB_DEPENDS=	libgmp.so:math/gmp	\
 		libpari.so:math/pari
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 TEST_DEPENDS=	py.test:devel/py-pytest@${PY_FLAVOR}
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	sagemath
 
 USES=		compiler:c11 python:3.6+
 USE_PYTHON=	cython distutils
 
 .if !defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 OPTIONS_DEFINE=		DOCS
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_USES=		gmake
 PORTDOCS=		*
 
 PLIST_SUB+=	VER=${DISTVERSION}
 
 pre-configure-DOCS-on:
 	${REINPLACE_CMD} -e 's|python -m|${PYTHON_CMD} -m|'	\
 		${WRKSRC}/docs/Makefile
 
 do-build-DOCS-on:
 	(cd ${WRKSRC}/docs && ${GMAKE} html)
 
 post-build-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/build/html/* ${STAGEDIR}${DOCSDIR}
 
 do-test: install
 	(cd ${WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/math/py-fpylll/Makefile b/math/py-fpylll/Makefile
index 09773e77ec67..1d86640b7856 100644
--- a/math/py-fpylll/Makefile
+++ b/math/py-fpylll/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	fpylll
 PORTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Python interface for fplll
 WWW=		https://github.com/fplll/fpylll
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		cython:lang/cython	\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 LIB_DEPENDS=	libfplll.so:math/fplll	\
 		libgmp.so:math/gmp	\
 		libmpfr.so:math/mpfr	\
 		libpari.so:math/pari	\
 		libqd.so:math/qd
 RUN_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 TEST_DEPENDS=	py.test:devel/py-pytest@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fplll
 
 USES=		compiler:c++11-lang python:3.6+
 USE_PYTHON=	distutils
 .if !defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 OPTIONS_DEFINE=		DOCS
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.6,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_USES=		gmake
 PORTDOCS=		*
 
 PLIST_SUB=	VER=${PORTVERSION:R}
 
 do-build-DOCS-on:
 	(cd ${WRKSRC}/docs && ${GMAKE} html)
 
 post-build-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html/* ${STAGEDIR}${DOCSDIR}
 
 do-test: install
 	(cd ${WRKSRC} && PY_IGNORE_IMPORTMISMATCH=1 py.test)
 
 .include <bsd.port.mk>
diff --git a/math/py-pplpy/Makefile b/math/py-pplpy/Makefile
index b19cfbc1914a..8287cbde58a1 100644
--- a/math/py-pplpy/Makefile
+++ b/math/py-pplpy/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	pplpy
 PORTVERSION=	0.8.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Python wrapper to the C++ Parma Polyhedra Library (PPL)
 WWW=		https://www.labri.fr/perso/vdelecro/pplpy/latest/
 
 LICENSE=	GPLv3
 
 BROKEN_aarch64=	runaway build, 7200 seconds with no output
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 LIB_DEPENDS=	libgmp.so:math/gmp	\
 		libmpfr.so:math/mpfr	\
 		libmpc.so:math/mpc	\
 		libpari.so:math/pari	\
 		libppl.so:devel/ppl
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 TEST_DEPENDS=	py.test:devel/py-pytest@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang localbase python:3.6+
 USE_PYTHON=	cython distutils
 
 .if !defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 OPTIONS_DEFINE=		DOCS
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_USES=		gmake
 PORTDOCS=		*
 
 do-build-DOCS-on:
 	(cd ${WRKSRC}/docs && ${GMAKE} html)
 
 post-build-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/build/html/* ${STAGEDIR}${DOCSDIR}
 
 do-test: install
 	(cd ${WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/math/py-primecountpy/Makefile b/math/py-primecountpy/Makefile
index 6f5aafa205c7..fa00552bae77 100644
--- a/math/py-primecountpy/Makefile
+++ b/math/py-primecountpy/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	primecountpy
 PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Primecount Cython interface
 WWW=		https://pypi.org/project/primecountpy/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYDEPS}
 LIB_DEPENDS=	libpari.so:math/pari			\
 		libprimecount.so:math/primecount	\
 		libprimesieve.so:math/primesieve
 RUN_DEPENDS=	${PYDEPS}
 
 USES=		localbase python:3.7+
 USE_PYTHON=	cython distutils
 .if !defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 PYDEPS=	${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/math/sage/Makefile b/math/sage/Makefile
index c53a1572606e..1367bb3eb1e6 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -1,577 +1,577 @@
 PORTNAME=	sage
 PORTVERSION=	9.2
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	https://mirrors.xmission.com/sage/src/		\
 		http://mirrors.xmission.com/sage/src/		\
 		https://www-ftp.lip6.fr/pub/math/sagemath/src/	\
 		https://mirrors.mit.edu/sage/src/		\
 		https://files.sagemath.org/src/			\
 		ftp://www-ftp.lip6.fr/pub/math/sagemath/src/
 #MASTER_SITES=	ftp://www-ftp.lip6.fr/pub/math/sagemath/devel/
 PKGNAMESUFFIX=	-math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Open source Mathematics software
 WWW=		https://www.sagemath.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BROKEN=		hoping to fix it with Python-3.9
 
 BUILD_DEPENDS=	bash:shells/bash		\
 		dash:shells/dash		\
 		cmake:devel/cmake-core		\
 		dreadnaut:math/nauty		\
 		${PYTHON_PKGNAMEPREFIX}alabaster>0:textproc/py-alabaster@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}backcall>0:devel/py-backcall@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}brial>0:math/py-brial@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cvxopt>0:math/py-cvxopt@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cypari2>0:math/py-cypari2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}fpylll>0:math/py-fpylll@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipykernel5>0:devel/py-ipykernel5@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}itsdangerous>0:security/py-itsdangerous@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0i:devel/py-Jinja2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jupyter-core>0:devel/py-jupyter-core@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>0:devel/py-jupyter-client@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}kiwisolver>0:math/py-kiwisolver@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}markupsafe>0:textproc/py-markupsafe@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nbconvert>0:devel/py-nbconvert@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}notebook>0:www/py-notebook@${PY_FLAVOR}\
 		${PYNUMPY}			\
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pandocfilters>0:textproc/py-pandocfilters@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\
 		${PY_PILLOW}			\
 		${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>0:devel/py-prompt-toolkit@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pycparser>0:devel/py-pycparser@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyrsistent>0:devel/py-pyrsistent@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}rpy2>0:math/py-rpy2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}scandir>0:sysutils/py-scandir@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}simplegeneric>0:devel/py-simplegeneric@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>0:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-websupport>0:textproc/py-sphinxcontrib-websupport@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}terminado>0:net/py-terminado@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}testpath>0:devel/py-testpath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}widgetsnbextension>0:devel/py-widgetsnbextension@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}zipp>0:devel/py-zipp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}\
 		fflas-ffpack-config:math/fflas-ffpack	\
 		fricas>0:math/fricas		\
 		gfan:math/gfan			\
 		git:devel/git			\
 		gp2c:math/gp2c			\
 		jmol:science/jmol		\
 		libatomic_ops>0:devel/libatomic_ops	\
 		MathJax>0:www/mathjax		\
 		maxima>0:math/maxima		\
 		p5-XML-Writer>0:textproc/p5-XML-Writer	\
 		p5-XML-LibXML>0:textproc/p5-XML-LibXML	\
 		p5-XML-LibXSLT>0:textproc/p5-XML-LibXSLT\
 		p5-File-Slurp>0:devel/p5-File-Slurp	\
 		p5-JSON>0:converters/p5-JSON	\
 		p5-SVG>0:textproc/p5-SVG	\
 		p5-MongoDB>0:databases/p5-MongoDB	\
 		p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu\
 		palp>0:math/palp		\
 		pandoc:textproc/hs-pandoc	\
 		pari-elldata>0:math/pari_elldata\
 		pari-galdata>0:math/pari_galdata\
 		pari-galpol>0:math/pari_galpol	\
 		pari-nftables>0:math/pari_nftables	\
 		pari-seadata>0:math/pari_seadata\
 		QuadraticSieve:math/flintqs	\
 		gpatch:devel/patch		\
 		rubiks>0:math/rubiks		\
 		sympow:math/sympow		\
 		tachyon:graphics/tachyon	\
 		three.js>0:www/threejs		\
 		yasm:devel/yasm			\
 		gtar:archivers/gtar		\
 		ffmpeg:multimedia/ffmpeg	\
 		${LOCALBASE}/lib/libBLT.a:x11-toolkits/blt
 LIB_DEPENDS=	libarb.so:math/arb		\
 		libboost_thread.so:devel/boost-libs	\
 		libbraiding.so:math/libbraiding	\
 		libbrial.so:math/brial		\
 		libCbc.so:math/cbc		\
 		libcdd.so:math/cddlib		\
 		libcliquer.so:math/cliquer	\
 		libcurl.so:ftp/curl		\
 		libeantic.so:math/e-antic	\
 		libec.so:math/eclib		\
 		libecl.so:lang/ecl		\
 		libecm.so:math/gmp-ecm		\
 		libflint.so:math/flint2		\
 		libfplll.so:math/fplll		\
 		libfreetype.so:print/freetype2	\
 		libgc.so:devel/boehm-gc		\
 		libgc-threaded.so:devel/boehm-gc-threaded\
 		libgf2x.so:math/gf2x		\
 		libgivaro.so:math/givaro	\
 		libglpk.so:math/glpk		\
 		libgap.so:math/gap		\
 		libgmp.so:math/gmp		\
 		libgsl.so:math/gsl		\
 		libhomfly.so:math/libhomfly	\
 		libiml.so:math/iml		\
 		libisl.so:devel/isl		\
 		libLfunction.so:math/lcalc	\
 		libffi.so:devel/libffi		\
 		libgd.so:graphics/gd		\
 		libgiac.so:math/giacxcas	\
 		liblinbox.so:math/linbox	\
 		liblrcalc.so:math/lrcalc	\
 		liblrs.so:math/lrslib	\
 		libm4ri.so:math/m4ri		\
 		libm4rie.so:math/m4rie		\
 		libmpc.so:math/mpc		\
 		libmpfi.so:math/mpfi		\
 		libmpfr.so:math/mpfr		\
 		libmpir.so:math/mpir		\
 		libntl.so:math/ntl		\
 		libpari.so:math/pari		\
 		libpcre.so:devel/pcre		\
 		libplanarity.so:math/planarity	\
 		libpng.so:graphics/png		\
 		libppl.so:devel/ppl		\
 		libpynac.so:math/pynac		\
 		libR.so:math/R			\
 		librw.so:math/rankwidth		\
 		libSingular.so:math/singular	\
 		libumfpack.so:math/suitesparse-umfpack	\
 		libsemigroups.so:math/libsemigroups	\
 		libsymmetrica.so:math/symmetrica\
 		libzmq.so:net/libzmq4		\
 		libzn_poly-0.9.so:math/zn_poly	\
 		libqd.so:math/qd		\
 		libisl.so:devel/isl		\
 		libblas.so:math/blas		\
 		libicuuc.so:devel/icu		\
 		libtiff.so:graphics/tiff	\
 		liblapack.so:math/lapack	\
 		libedit.so:devel/libedit	\
 		libwebp.so:graphics/webp	\
 		libpcre2-8.so:devel/pcre2	\
 		libgdbm.so:databases/gdbm	\
 		liblcms2.so:graphics/lcms2	\
 		libopenjp2.so:graphics/openjpeg
 RUN_DEPENDS=	bash:shells/bash		\
 		dreadnaut:math/nauty		\
 		${PYTHON_PKGNAMEPREFIX}alabaster>0:textproc/py-alabaster@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}backcall>0:devel/py-backcall@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}brial>0:math/py-brial@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cvxopt>0:math/py-cvxopt@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cypari2>0:math/py-cypari2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}fpylll>0:math/py-fpylll@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipykernel5>0:devel/py-ipykernel5@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}itsdangerous>0:security/py-itsdangerous@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jupyter-core>0:devel/py-jupyter-core@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>0:devel/py-jupyter-client@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}kiwisolver>0:math/py-kiwisolver@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}markupsafe>0:textproc/py-markupsafe@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}mistune0>0:textproc/py-mistune0@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nbconvert>0:devel/py-nbconvert@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}notebook>0:www/py-notebook@${PY_FLAVOR}\
 		${PYNUMPY}			\
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pandocfilters>0:textproc/py-pandocfilters@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\
 		${PY_PILLOW}			\
 		${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>0:devel/py-prompt-toolkit@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pycparser>0:devel/py-pycparser@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyrsistent>0:devel/py-pyrsistent@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}rpy2>0:math/py-rpy2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}scandir>0:sysutils/py-scandir@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}simplegeneric>0:devel/py-simplegeneric@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>0:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-websupport>0:textproc/py-sphinxcontrib-websupport@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}terminado>0:net/py-terminado@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}testpath>0:devel/py-testpath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}widgetsnbextension>0:devel/py-widgetsnbextension@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}zipp>0:devel/py-zipp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}\
 		fflas-ffpack-config:math/fflas-ffpack	\
 		fricas>0:math/fricas		\
 		gfan:math/gfan			\
 		git:devel/git			\
 		gp2c:math/gp2c			\
 		jmol:science/jmol		\
 		MathJax>0:www/mathjax		\
 		maxima>0:math/maxima		\
 		p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu\
 		palp>0:math/palp		\
 		pandoc:textproc/hs-pandoc	\
 		pari-elldata>0:math/pari_elldata\
 		pari-galdata>0:math/pari_galdata\
 		pari-galpol>0:math/pari_galpol	\
 		pari-nftables>0:math/pari_nftables	\
 		pari-seadata>0:math/pari_seadata\
 		QuadraticSieve:math/flintqs	\
 		rubiks>0:math/rubiks		\
 		sympow:math/sympow		\
 		tachyon:graphics/tachyon	\
 		three.js>0:www/threejs		\
 		yasm:devel/yasm			\
 		pixz:archivers/pixz
 
 USES=		autoreconf blaslapack:openblas compiler:c++11-lib fortran \
 		gettext gmake gnome iconv jpeg libtool localbase magick:6,build \
 		ncurses ninja:build perl5 pkgconfig python:3.7+ readline shebangfix \
 		sqlite tk xorg
 USE_TEX=	latex:build pdftex:build tex:build
 USE_XORG=	x11 xext xscrnsaver
 USE_GNOME=	cairo glib20 pango
 USE_PYTHON=	cython
 USE_JAVA=	yes # for science/jmol
 
 CONFLICTS=	${PYTHON_PKGNAMEPREFIX}wheel-0.*
 
 SHEBANG_FILES=	.
 SHEBANG_LANG+=	dash
 dash_OLD_CMD=	/bin/dash
 dash_CMD=	${LOCALBASE}/bin/dash
 
 DISABLE_BINUTILS=	yes
 
 LIBS=		-lomp -pthread
 .if !defined{WITH_DEBUG}
 LDFLAGS+=	-s
 .endif
 BLDDIR=		${WRKDIR}/build
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SAGE_PORT=yes CC=${CC} GCC=${CC} CXX=${CXX} AS=${AS} LD=${LD}	\
 		SAGE_LOCAL=${PREFIX} SAGE_DESTDIR=${BLDDIR}/	\
 		DESTDIR=${BLDDIR}/${PREFIX} PATCH=${LOCALBASE}/bin/gpatch
 CONFIGURE_ARGS=	--with-system-gcc=force		\
 		--with-system-python3=yes	\
 		--with-python=${PYTHON_CMD}	\
 		--enable-build-as-root		\
 		--disable-download-from-upstream-url	\
 		--localstatedir=/var
 MAKE_ENV=	MAKE=${GMAKE} DESTDIR=${BLDDIR}
 ALL_TARGET=	build
 REINPLACE_ARGS=	-i ''
 BINARY_ALIAS=	patch=${LOCALBASE}/bin/gpatch
 OPTIONS_SUB=	yes
 PLIST_SUB=	VER=${DISTVERSION}
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 WSDIR=		${BLDDIR}${PREFIX}
 SPKG_INST=	configure.ac configure build/sage_bootstrap/uninstall.py	\
 		build/make/install src/bin/sage-env
 PY2FIX=		bin lib/${PYTHON_VERSION}
 DOC2FIX=	.pickle .doctree
 SE2FIX=		^ECLDIR= ^SINGULAR MAXIMA_PREFIX
 SHR2FIX=	GAP_ROOT_DIR PPLPY_DOCS SINGULARPATH
 STG2FIX=	bin/sage-env-config	\
 		share/jupyter/kernels/sagemath/kernel.json
 BADLN=		kernels/sagemath/doc nbextensions/jsmol	\
 		nbextensions/mathjax nbextensions/threejs
 # External dependencies not yet handled by SageMath
 # Note: do not use wheel from ports
 PY_LIBS=	alabaster attrs babel backcall bleach certifi cffi cvxopt cycler	\
 		cypari cysignals cython dateutil decorator defusedxml docutils	\
 		entrypoints fpylll gmpy2 html5lib imagesize importlib_metadata ipykernel ipython	\
 		ipython_genutils ipywidgets itsdangerous jedi jinja2 jsonschema jupyter_client	\
 		jupyter_core kiwisolver markupsafe matplotlib mistune mpmath	\
 		nbconvert nbformat networkx nose notebook numpy packaging pandocfilters	\
 		parso pathpy pexpect pickleshare pillow pkgconfig pplpy		\
 		prometheus_client prompt_toolkit psutil ptyprocess pybind11 pycparser pyparsing	\
 		pygments pyrsistent pytz pyzmq requests rpy2 scandir scipy send2trash simplegeneric	\
 		six snowballstemmer sphinx sphinxcontrib_applehelp sphinxcontrib_devhelp sphinxcontrib_htmlhelp sphinxcontrib_jsmath sphinxcontrib_qthelp sphinxcontrib_serializinghtml sphinxcontrib_websupport sympy terminado testpath tornado traitlets	\
 		tzlocal vcversioner wcwidth webencodings widgetsnbextension zipp zope_interface
 JS_LIBS=	jmol mathjax threejs
 SPKGCM4=	e_antic ecl gap libhomfly linbox maxima pynac rubiks singular
 
 post-patch:
 	${CP} ${FILESDIR}/psutil__arch__bsd__freebsd_socks.c.patch	\
 		${WRKSRC}/build/pkgs/psutil/patches/
 .for sp in ${SPKGCM4}
 	${CP} ${FILESDIR}/${sp}_spkg-configure.m4		\
 		${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4
 .endfor
 .for sp in ${PY_LIBS}
 	${CP} ${FILESDIR}/py_libs_spkg-configure.m4		\
 		${WRKSRC}/build/pkgs/${sp:C/pari2/pari/}/spkg-configure.m4
 .endfor
 #.for sp in ${PY_FILES}
 #	${SED} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|' ${FILESDIR}/${sp}_spkg-configure.m4.in \
 #		> ${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4
 #.endfor
 .for sp in ${JS_LIBS}
 	${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${FILESDIR}/${sp}_spkg-configure.m4.in \
 		> ${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4
 .endfor
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|SAGE_LOCAL="$$prefix"|SAGE_LOCAL="${WSDIR}"|'	\
 		-e 's|lib/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/configure.ac
 	${REINPLACE_CMD} -e 's|SAGE_LOCAL="@prefix@"|SAGE_LOCAL="${WSDIR}"|'	\
 		${WRKSRC}/src/bin/sage-env-config.in
 	${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|;s|%%LDFLAGS%%|${LDFLAGS}|'	\
 		${WRKSRC}/build/pkgs/tachyon/patches/Make-arch.patch
 	${REINPLACE_CMD} -e '/SUITESPARSE_INC_DIR/s|$${SAGE_LOCAL}/include|${LOCALBASE}/include/suitesparse|'\
 		${WRKSRC}/build/pkgs/cvxopt/spkg-install.in
 	${REINPLACE_CMD} -e 's|exec python3|exec ${PYTHON_CMD}|'		\
 		-e 's|exec "$$SAGE_LOCAL"/bin/python3|exec ${PYTHON_CMD}|'	\
 		${WRKSRC}/src/bin/sage
 .for f in ${PY_LIBS}
 	${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|;s|py_libs|${f}|'	\
 		${WRKSRC}/build/pkgs/${f}/spkg-configure.m4
 .endfor
 	${REINPLACE_CMD} -e 's|import attrs|import attr|'	\
 		${WRKSRC}/build/pkgs/attrs/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import cypari|import cypari2|'	\
 		${WRKSRC}/build/pkgs/cypari/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import ipython|import IPython|'	\
 		${WRKSRC}/build/pkgs/ipython/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import pathpy|import path|'	\
 		${WRKSRC}/build/pkgs/pathpy/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import pillow|import PIL|'	\
 		${WRKSRC}/build/pkgs/pillow/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import pplpy|import ppl|'	\
 		${WRKSRC}/build/pkgs/pplpy/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import pyzmq|import zmq|'	\
 		${WRKSRC}/build/pkgs/pyzmq/spkg-configure.m4
 .for f in applehelp devhelp htmlhelp jsmath qthelp serializinghtml websupport
 	${REINPLACE_CMD} -e 's|import sphinxcontrib_|import sphinxcontrib.|'	\
 		${WRKSRC}/build/pkgs/sphinxcontrib_${f}/spkg-configure.m4
 .endfor
 	${REINPLACE_CMD} -e 's|import zope_interface|import zope.interface|'	\
 		${WRKSRC}/build/pkgs/zope_interface/spkg-configure.m4
 	${REINPLACE_CMD} -e '/GAP_ROOT=/s|$$SAGE_LOCAL|${LOCALBASE}|'	\
 		${WRKSRC}/build/pkgs/gap_packages/spkg-install.in
 	${REINPLACE_CMD} -e "/os.path.join/s|SAGE_LOCAL|'${LOCALBASE}'|"\
 		${WRKSRC}/src/sage/libs/gap/util.pyx
 	${REINPLACE_CMD} -e "/os.path.join(SAGE_LOCAL/s|SAGE_LOCAL|'${LOCALBASE}'|"	\
 		${WRKSRC}/src/sage/env.py
 	${REINPLACE_CMD} -e "/^library_dirs/s|SAGE_LOCAL|'${LOCALBASE}'|"	\
 		${WRKSRC}/src/setup.py
 .for f in ${SHR2FIX}
 	${REINPLACE_CMD} -e "/${f}/s|SAGE_SHARE|'${LOCALBASE}/share/'|"	\
 		${WRKSRC}/src/sage/env.py
 .endfor
 	${REINPLACE_CMD} -e "/JMOL_DIR/s|SAGE_SHARE|'${JAVASHAREDIR}'|"	\
 			-e "/JMOL_DIR/s|jmol|classes|"			\
 		${WRKSRC}/src/sage/env.py
 	${REINPLACE_CMD} -e "/JSMOL_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|"	\
 			-e "/JSMOL_DIR/s|jsmol|JSmol|"				\
 		${WRKSRC}/src/sage/env.py
 	${REINPLACE_CMD} -e "/MATHJAX_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|"	\
 			-e "/MATHJAX_DIR/s|mathjax|MathJax|"			\
 		${WRKSRC}/src/sage/env.py
 	${REINPLACE_CMD} -e "/THREEJS_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|"	\
 		${WRKSRC}/src/sage/env.py
 .for f in ${SE2FIX}
 	${REINPLACE_CMD} -e '/${f}/s|$$SAGE_LOCAL|${LOCALBASE}|'	\
 		${WRKSRC}/src/bin/sage-env
 .endfor
 	${REINPLACE_CMD} -e '/LDFLAGS=/s|-rpath,$$SAGE_LOCAL|-rpath,${LOCALBASE}|'	\
 		${WRKSRC}/src/bin/sage-env
 .for f in ${SPKG_INST}
 	${REINPLACE_CMD} -e 's|/var/lib/sage|/share/libdata/${PORTNAME}|'	\
 		${WRKSRC}/${f}
 .endfor
 	# Bug with py-docutils > 0.16
 	${RM} -r ${WRKSRC}/src/doc/hu
 	(cd ${WRKSRC} && ./bootstrap)
 	${MKDIR} ${BLDDIR}${PREFIX}/lib/pkgconfig	# Removed thereafter
 
 post-build:
 .if ${PORT_OPTIONS:MDOCS}
 	(cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_CMD} doc)
 .endif
 .for d in ${PY2FIX}
 	${FIND} ${WSDIR}/${d} -type f -exec ${GREP} -I -l "${WSDIR}/bin/python" {} \;	|\
 	${XARGS} ${SED} -i "" -e 's|${WSDIR}/bin/pytho.*|${PYTHON_CMD}|'
 .endfor
 .for d in ${PY2FIX}
 	${FIND} ${WSDIR}/${d} -type f -exec ${GREP} -I -l "/usr/bin/env python" {} \;	|\
 	${XARGS} ${SED} -i "" -e 's|/usr/bin/env pytho.*|${PYTHON_CMD}|'
 .endfor
 	${FIND} ${BLDDIR}/${PYTHON_LIBDIR} -type d -name __pycache__ |	\
 		${XARGS} ${RM} -r
 .for f in ${DOC2FIX}
 	${FIND} ${BLDDIR}${DOCSDIR} -type f -name "*${f}" | ${XARGS}	\
 	${SED} -i "" -e 's|${BLDDIR}||g'
 .endfor
 .for f in ${STG2FIX}
 	${SED} -i "" -e 's|${BLDDIR}||g' ${BLDDIR}${PREFIX}/${f}
 .endfor
 	${RM} ${BLDDIR}${PYTHON_CMD} ${BADLN:C|^|${BLDDIR}${PREFIX}/share/jupyter/|}
 	${RM} -r ${BLDDIR}${PREFIX}/var
 	${RM} ${BLDDIR}${PREFIX}/lib64 ${BLDDIR}${PREFIX}/lib/pkgconfig/blas.pc	\
 		${BLDDIR}${PREFIX}/lib/pkgconfig/cblas.pc	\
 		${BLDDIR}${PREFIX}/lib/pkgconfig/gsl.pc	\
 		${BLDDIR}${PREFIX}/lib/pkgconfig/lapack.pc
 	# Cannot use a package system for pip and setuptools
 	${RM} ${BLDDIR}${PREFIX}/bin/easy_install* ${BLDDIR}${PREFIX}/bin/pip*
 	${RM} -r ${BLDDIR}${PYTHON_SITELIBDIR}/pip-* ${BLDDIR}${PYTHON_SITELIBDIR}/pip/
 	${RM} -r ${BLDDIR}${PYTHON_SITELIBDIR}/setuptools*		\
 		${BLDDIR}${PYTHON_SITELIBDIR}/easy_install.py		\
 		${BLDDIR}${PYTHON_SITELIBDIR}/pkg_resources		\
 		${BLDDIR}${PYTHON_SITELIBDIR}/__pycache__/easy_install*
 	# Remove CONFLICTS with lang/python3
 	${RM} ${BLDDIR}${PREFIX}/bin/python ${BLDDIR}${PREFIX}/bin/python3
 	${REINPLACE_CMD} -e '/exec/s|python3|${PYTHON_VERSION}|' ${BLDDIR}${PREFIX}/bin/sage
 	# ${TRUE} because compilation of some .py fails: compileall.py -q to see errors
 	(cd ${WSDIR} && (${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py	\
 	 -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} ||	\
 	 ${TRUE}))
 	${FIND} ${BLDDIR}${PREFIX} -name "*.bak" -delete
 # See https://lists.freebsd.org/pipermail/freebsd-python/2020-June/020710.html
 .if exists(${PYTHON_SITELIBDIR}/path.py-7.1.dist-info/WHEEL)
 PLIST_SUB+=	EGG="@comment " WHEEL=""
 .else
 PLIST_SUB+=	EGG="" WHEEL="@comment "
 .endif
 
 do-install:
 	cd "${BLDDIR}" && ${FIND} . | ${CPIO} -pduml ${STAGEDIR}
 	# Remove bad links
 	${LN} -sf ${DOCSDIR}	\
 		${STAGEDIR}${PREFIX}/share/jupyter/kernels/sagemath/doc
 	${LN} -sf ${LOCALBASE}/www/JSmol	\
 		${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/jsmol
 	${LN} -sf ${LOCALBASE}/www/MathJax	\
 		${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/mathjax
 	${LN} -sf ${LOCALBASE}/www/threejs	\
 		${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/threejs
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib64 ${STAGEDIR}${PREFIX}/libdata/pkgconfig/blas.pc	\
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/distutils-precedence.pth	\
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/cblas.pc	\
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/gsl.pc	\
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/lapack.pc
 	${RM} -r ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_distutils_hack
 
 .include <bsd.port.post.mk>
diff --git a/math/sympow/Makefile b/math/sympow/Makefile
index 99c2ec085eed..aeb4a9bc87cb 100644
--- a/math/sympow/Makefile
+++ b/math/sympow/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	sympow
 PORTVERSION=	2.023.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Mathematical program for SYMmetric POWer elliptic curve L-functions
 WWW=		https://gitlab.com/rezozer/forks/sympow
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	help2man:misc/help2man	\
 		bash:shells/bash
 LIB_DEPENDS=	libpari.so:math/pari
 
 USES=		compiler:c++11-lang gmake shebangfix
 SHEBANG_FILES=	${CONFIGURE_SCRIPT}
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	rezozer/forks
 GL_COMMIT=	7fd4d97cabc07951200b98ee841afc4151c2c287
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|-O3 ||' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-build:
 	${MKDIR} ${WRKDIR}/home ${WRKDIR}/var/cache/sympow/datafiles
 	for file in `${LS} ${WRKSRC}/datafiles/*.txt`; do	\
 		${SETENV} HOME=${WRKDIR}/home SYMPOW_PKGCACHEDIR="${WRKDIR}/var/cache/sympow"	\
 		${WRKSRC}/sympow -txt2bin "`${GREP} -c AT $${file}`" <$${file} $${file%txt}bin; \
 	done
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/datafiles/*.bin ${STAGEDIR}${DATADIR}/datafiles
 
 .include <bsd.port.mk>