diff --git a/math/antic/Makefile b/math/antic/Makefile
index e7b8bfd43334..804d234832a7 100644
--- a/math/antic/Makefile
+++ b/math/antic/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	antic
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Algebraic Number Theory In C
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/gpl-2.0.txt
 
 LIB_DEPENDS=	libflint.so:math/flint2 \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 
 USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wbhart
 
 PLIST_FILES=	include/antic/nf.h \
 		include/antic/nf_elem.h \
 		include/antic/qfb.h \
 		lib/libantic.so \
 		lib/libantic.so.0 \
 		lib/libantic.so.0.2.4
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libantic.so
 
 .include <bsd.port.mk>
diff --git a/math/arb/Makefile b/math/arb/Makefile
index 7ff8aa85f1e8..69f4badf26fa 100644
--- a/math/arb/Makefile
+++ b/math/arb/Makefile
@@ -1,27 +1,31 @@
 PORTNAME=	arb
 DISTVERSION=	2.19.0
+PORTREVISION=	1
 CATEGORIES=	math
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
+PATCHFILES=	b6c8032e2da1b19eb7c5a5f5c2f3372643e3d170.patch:-p1 # compatibility fix for latest flint
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C library for arbitrary-precision interval arithmetic
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libflint.so:math/flint2 \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 
 USES=		cmake
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fredrik-johansson
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/arb/distinfo b/math/arb/distinfo
index f8d43359c573..dc7bb6009664 100644
--- a/math/arb/distinfo
+++ b/math/arb/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1607282389
+TIMESTAMP = 1627190196
 SHA256 (fredrik-johansson-arb-2.19.0_GH0.tar.gz) = 0aec6b492b6e9a543bdb3287a91f976951e2ba74fd4de942e692e21f7edbcf13
 SIZE (fredrik-johansson-arb-2.19.0_GH0.tar.gz) = 1606463
+SHA256 (b6c8032e2da1b19eb7c5a5f5c2f3372643e3d170.patch) = 031b5e734ac7d23d769a5d6448c8eb76210a808087acd823fbde726e55fcc464
+SIZE (b6c8032e2da1b19eb7c5a5f5c2f3372643e3d170.patch) = 1336
diff --git a/math/e-antic/Makefile b/math/e-antic/Makefile
index a98845f32d36..5e4ec19b2620 100644
--- a/math/e-antic/Makefile
+++ b/math/e-antic/Makefile
@@ -1,66 +1,67 @@
 # Created by: thierry@pompo.net
 
 PORTNAME=	e-antic
 DISTVERSION=	1.0.0-rc.13
+PORTREVISION=	1
 #MASTER_SITES=	https://www.labri.fr/perso/vdelecro/e-antic/
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Real Embedded Algebraic Number Theory In C
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
 LIB_DEPENDS=	libarb.so:math/arb		\
 		libgmp.so:math/gmp		\
 		libmpfr.so:math/mpfr		\
 		libantic.so:math/antic		\
 		libflint.so:math/flint2		\
 		libbenchmark.so:devel/benchmark	\
 		libboost_thread.so:devel/boost-libs
 
 USES=		autoreconf compiler:c++11-lang gmake libtool localbase	\
 		python:3.7+
 
 USE_GITHUB=	yes
 ANTIC_TAG=	f4e8a60
 CATCH_TAG=	ff349a5
 CEREAL_TAG=	51cbda5
 FLINT_TAG=	ae7ec89
 UF_TAG=		0000f42
 GH_ACCOUNT=	flatsurf catchorg:c1 USCiLab:c2 wbhart:f flatsurf:u
 GH_PROJECT=	${PORTNAME} antic:a Catch2:c1 cereal:c2 flint2:f	\
 		unique-factory:u
 GH_TAGNAME=	${ANTIC_TAG}:a ${CATCH_TAG}:c1 ${CEREAL_TAG}:c2 ${FLINT_TAG}:f	\
 		${UF_TAG}:u
 
 CONFIGURE_ARGS=	--without-pytest # pytest requires cppyy
 
 LIBS+=		"-lm"
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 
 PLIST_SUB=	VER=1.0.0rc13
 
 post-extract:
 	${CP} -R ${WRKDIR}/antic-${ANTIC_TAG}/* ${WRKSRC}/libeantic/upstream/antic/
 	${CP} -R ${WRKDIR}/Catch2-${CATCH_TAG}/*	\
 		${WRKSRC}/libeantic/test/external/catch2/
 	${CP} -R ${WRKDIR}/cereal-${CEREAL_TAG}/*	\
 		${WRKSRC}/libeantic/test/external/cereal/
 	${CP} -R ${WRKDIR}/flint2-${FLINT_TAG}/* ${WRKSRC}/libeantic/upstream/antic/
 	${CP} -R ${WRKDIR}/unique-factory-${UF_TAG}/*	\
 		${WRKSRC}/libeantic/srcxx/external/unique-factory
 
 post-install:
 	${REINPLACE_CMD} -e 's|${STAGEDIR}||'	\
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyeantic/install_files.txt
 	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyeantic/install_files.txt.bak
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d \
 		${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d \
 		${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/math/eclib/Makefile b/math/eclib/Makefile
index eddc2eec332c..03fd960e52c0 100644
--- a/math/eclib/Makefile
+++ b/math/eclib/Makefile
@@ -1,29 +1,30 @@
 # Created by: thierry@pompo.net
 
 PORTNAME=	eclib
 PORTVERSION=	20210318
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	C++ library for arithmetic on elliptic curves
 
 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}
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/math/flint2/Makefile b/math/flint2/Makefile
index 6b5405964a6d..5dace0698555 100644
--- a/math/flint2/Makefile
+++ b/math/flint2/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	flint2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.7.1	# See note #1
+DISTVERSION=	2.8.0	# See note #1
 CATEGORIES=	math
 # Note #1: FLINT is known to change its API. When upgrading please check that
 #	it does not break its consumers (e.g. math/e-antic)
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast library for number theory
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libopenblas.so:math/openblas
 
 USES=		cmake compiler:c++11-lang python:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	wbhart
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		NTL
 OPTIONS_DEFAULT=	NTL
 
 NTL_DESC=		Victor Shoup's Number Theory Library
 NTL_CMAKE_BOOL=		WITH_NTL
 NTL_LIB_DEPENDS=	libntl.so:math/ntl
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/flint2/distinfo b/math/flint2/distinfo
index 959e3b1eadc1..212e66638f1f 100644
--- a/math/flint2/distinfo
+++ b/math/flint2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611079274
-SHA256 (wbhart-flint2-v2.7.1_GH0.tar.gz) = bcadc2252e61092a9b3a3198b337e20abeac56078eaa19793ab99ff7a987efb7
-SIZE (wbhart-flint2-v2.7.1_GH0.tar.gz) = 4945343
+TIMESTAMP = 1627149449
+SHA256 (wbhart-flint2-v2.8.0_GH0.tar.gz) = 32b9bed06a43c69cc97a2afcb043b6efb6d03b5b4845482d1d65a25b1b6b91bd
+SIZE (wbhart-flint2-v2.8.0_GH0.tar.gz) = 5210170
diff --git a/math/flint2/pkg-plist b/math/flint2/pkg-plist
index e303f56231a8..6eb70a24db6d 100644
--- a/math/flint2/pkg-plist
+++ b/math/flint2/pkg-plist
@@ -1,136 +1,142 @@
 include/flint/NTL-interface.h
 include/flint/aprcl.h
 include/flint/arith.h
 include/flint/arithxx.h
 include/flint/d_mat.h
 include/flint/d_vec.h
 include/flint/default_rules.h
 include/flint/double_extras.h
 include/flint/evaluation_tools.h
 include/flint/exception.h
 include/flint/expression.h
 include/flint/expression_traits.h
 include/flint/fft.h
 include/flint/fft_tuning.h
 include/flint/flint-config.h
 include/flint/flint.h
 include/flint/flint_classes.h
 include/flint/flint_exception.h
 include/flint/flintxx.h
 include/flint/fmpq.h
 include/flint/fmpq_mat.h
 include/flint/fmpq_matxx.h
 include/flint/fmpq_mpoly.h
 include/flint/fmpq_mpoly_factor.h
 include/flint/fmpq_poly.h
 include/flint/fmpq_polyxx.h
 include/flint/fmpq_vec.h
 include/flint/fmpqxx.h
 include/flint/fmpz-conversions.h
 include/flint/fmpz.h
 include/flint/fmpz_factor.h
 include/flint/fmpz_factorxx.h
 include/flint/fmpz_lll.h
 include/flint/fmpz_mat.h
 include/flint/fmpz_matxx.h
 include/flint/fmpz_mod.h
 include/flint/fmpz_mod_mat.h
 include/flint/fmpz_mod_mpoly.h
+include/flint/fmpz_mod_mpoly_factor.h
 include/flint/fmpz_mod_poly.h
 include/flint/fmpz_mod_poly_factor.h
 include/flint/fmpz_mod_poly_factorxx.h
 include/flint/fmpz_mod_polyxx.h
+include/flint/fmpz_mod_vec.h
 include/flint/fmpz_mpoly.h
 include/flint/fmpz_mpoly_factor.h
 include/flint/fmpz_poly.h
 include/flint/fmpz_poly_factor.h
 include/flint/fmpz_poly_factorxx.h
 include/flint/fmpz_poly_mat.h
 include/flint/fmpz_poly_matxx.h
 include/flint/fmpz_poly_q.h
 include/flint/fmpz_poly_qxx.h
 include/flint/fmpz_polyxx.h
 include/flint/fmpz_vec.h
 include/flint/fmpz_vecxx.h
 include/flint/fmpzxx.h
 include/flint/forwarding.h
 include/flint/fq.h
+include/flint/fq_default.h
+include/flint/fq_default_mat.h
+include/flint/fq_default_poly.h
+include/flint/fq_default_poly_factor.h
 include/flint/fq_embed.h
 include/flint/fq_embed_templates.h
 include/flint/fq_mat.h
 include/flint/fq_mat_templates.h
 include/flint/fq_nmod.h
 include/flint/fq_nmod_embed.h
 include/flint/fq_nmod_mat.h
 include/flint/fq_nmod_mpoly.h
 include/flint/fq_nmod_mpoly_factor.h
 include/flint/fq_nmod_poly.h
 include/flint/fq_nmod_poly_factor.h
 include/flint/fq_nmod_vec.h
 include/flint/fq_poly.h
 include/flint/fq_poly_factor.h
 include/flint/fq_poly_factor_templates.h
 include/flint/fq_poly_templates.h
 include/flint/fq_templates.h
 include/flint/fq_vec.h
 include/flint/fq_vec_templates.h
 include/flint/fq_zech.h
 include/flint/fq_zech_embed.h
 include/flint/fq_zech_mat.h
 include/flint/fq_zech_mpoly.h
 include/flint/fq_zech_mpoly_factor.h
 include/flint/fq_zech_poly.h
 include/flint/fq_zech_poly_factor.h
 include/flint/fq_zech_vec.h
 include/flint/frandxx.h
 include/flint/gettimeofday.h
 include/flint/gmpcompat.h
 include/flint/hashmap.h
 include/flint/long_extras.h
 include/flint/longlong.h
 include/flint/ltuple.h
 include/flint/matrix.h
 include/flint/mp.h
 include/flint/mpf_mat.h
 include/flint/mpf_vec.h
 include/flint/mpfr_mat.h
 include/flint/mpfr_vec.h
 include/flint/mpn_extras.h
 include/flint/mpoly.h
 include/flint/n_poly.h
 include/flint/nmod_mat.h
 include/flint/nmod_matxx.h
 include/flint/nmod_mpoly.h
 include/flint/nmod_mpoly_factor.h
 include/flint/nmod_poly.h
 include/flint/nmod_poly_factor.h
 include/flint/nmod_poly_mat.h
 include/flint/nmod_poly_matxx.h
 include/flint/nmod_polyxx.h
 include/flint/nmod_vec.h
 include/flint/nmod_vecxx.h
 include/flint/padic.h
 include/flint/padic_mat.h
 include/flint/padic_matxx.h
 include/flint/padic_poly.h
 include/flint/padic_polyxx.h
 include/flint/padicxx.h
 include/flint/perm.h
 include/flint/permxx.h
 include/flint/profiler.h
 include/flint/qadic.h
 include/flint/qadicxx.h
 include/flint/qsieve.h
 include/flint/rules.h
 include/flint/stdmath.h
 include/flint/templates.h
 include/flint/thread_pool.h
 include/flint/thread_support.h
 include/flint/traits.h
 include/flint/traits_fwd.h
 include/flint/tuple.h
 include/flint/ulong_extras.h
 include/flint/vector.h
 lib/libflint.so
-lib/libflint.so.15
-lib/libflint.so.15.0.1
+lib/libflint.so.16
+lib/libflint.so.16.1.0
diff --git a/math/libnormaliz/Makefile b/math/libnormaliz/Makefile
index a9bb891690f3..4d08d47dc47c 100644
--- a/math/libnormaliz/Makefile
+++ b/math/libnormaliz/Makefile
@@ -1,88 +1,89 @@
 # PORTNAME block
 PORTNAME=	libnormaliz
 DISTVERSION=	3.8.10
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/Normaliz/Normaliz/releases/download/v${PORTVERSION}/
 DISTNAME=	normaliz-${PORTVERSION}
 
 # MAINTAINER block
 MAINTAINER=	moritz@schmi.tt
 COMMENT=	Compute Hilbert bases and enumerative data of rational polyhedra
 
 # LICENSE block
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # Dependencies block
 BUILD_DEPENDS=	${LOCALBASE}/include/gmpxx.h:math/gmp
 
 # USES block
 USES=		autoreconf compiler:c++11-lang gmake libtool
 
 # bsd.ports.mk block
 GNU_CONFIGURE=	yes
 MAKEFILE=	Makefile.classic
 
 CXXFLAGS+=	-I ${LOCALBASE}/include -I ${WRKSRC}/source
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_WRKSRC=	${WRKSRC}/source/libnormaliz
 INSTALL_WRKSRC=	${WRKSRC}/source/libnormaliz
 
 # Options block
 OPTIONS_DEFINE=		COCOA DOCS FLINT OPENMP
 
 COCOA_DESC=		Link with libcocoa.a (might cause circular dependency)
 FLINT_DESC=		Link with libflint.so
 
 COCOA_BUILD_DEPENDS=	${LOCALBASE}/lib/libcocoa.a:math/cocoalib
 COCOA_CONFIGURE_WITH=	cocoalib
 
 FLINT_LIB_DEPENDS=	libflint.so:math/flint2
 FLINT_CONFIGURE_WITH=	flint
 FLINT_LDFLAGS=		-lpthread
 
 OPENMP_CONFIGURE_ENABLE=	openmp
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/libnormaliz
 	${INSTALL_DATA}	${INSTALL_WRKSRC}/libnormaliz.a ${STAGEDIR}${PREFIX}/lib
 	cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} \
 		HilbertSeries.h \
 		automorph.h \
 		collection.h \
 		cone.h \
 		cone_dual_mode.h \
 		cone_property.h \
 		descent.h \
 		dynamic_bitset.h \
 		face_lattice.h \
 		full_cone.h \
 		general.h \
 		input.h \
 		input_type.h \
 		integer.h \
 		libnormaliz.h \
 		list_and_map_operations.h \
 		matrix.h \
 		my_omp.h \
 		nmz_config.h \
 		nmz_integrate.h \
 		nmz_nauty.h \
 		normaliz_exception.h \
 		offload_handler.h \
 		options.h \
 		output.h \
 		project_and_lift.h \
 		reduction.h \
 		simplex.h \
 		sublattice_representation.h \
 		vector_operations.h \
 		version.h \
 		${STAGEDIR}${PREFIX}/include/libnormaliz
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/Normaliz.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/linbox/Makefile b/math/linbox/Makefile
index afa2a8705870..2a27a4e585c5 100644
--- a/math/linbox/Makefile
+++ b/math/linbox/Makefile
@@ -1,75 +1,75 @@
 # Created by: thierry@pompo.net
 
 PORTNAME=	linbox
 PORTVERSION=	1.6.3
-PORTREVISION=	6
+PORTREVISION=	7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	C++ library for exact, high-performance linear algebra
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	fflas-ffpack-config:math/fflas-ffpack
 LIB_DEPENDS=	libgmp.so:math/gmp		\
 		libgivaro.so:math/givaro
 RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linbox-team
 
 USES=		autoreconf blaslapack:openblas compiler:c++11-lang gmake libtool localbase pkgconfig shebangfix
 
 SHEBANG_FILES=	benchmarks/perfpublisher.sh examples/test.sh	\
 		linbox-auto-install.sh linbox-config.in tests/jenkins-maker.sh	\
 		tests/perfpublisher.sh tests/test_leak.sh
 
 OPTIONS_DEFINE=		DOXYGEN
 OPTIONS_RADIO=		SIZE
 OPTIONS_RADIO_SIZE=	FULL MIN
 OPTIONS_DEFAULT=	FULL
 OPTIONS_SUB=		yes
 
 MIN_DESC=		Lightweight package, with less dependencies
 MIN_CONFIGURE_ON=	--without-saclib
 
 FULL_DESC=		Complete package with all its dependencies
 FULL_BUILD_DEPENDS=	gnuplot:math/gnuplot
 FULL_LIB_DEPENDS=	libflint.so:math/flint2		\
 			libfplll.so:math/fplll		\
 			libiml.so:math/iml		\
 			libm4ri.so:math/m4ri		\
 			libm4rie.so:math/m4rie		\
 			libmpfr.so:math/mpfr		\
 			libntl.so:math/ntl		\
 			libtinyxml2.so:textproc/tinyxml2
 FULL_RUN_DEPENDS=	gnuplot:math/gnuplot
 FULL_USES=		ghostscript
 FULL_CONFIGURE_WITH=	flint fplll ghostscript gnuplot iml m4ri m4rie mpfr ntl
 
 DOXYGEN_VARS=		BINARY_ALIAS=sed=${LOCALBASE}/bin/gsed
 DOXYGEN_CONFIGURE_ENABLE=doc
 DOXYGEN_CONFIGURE_WITH=	docdir=${DOCSDIR}
 DOXYGEN_BUILD_DEPENDS=	gsed:textproc/gsed	\
 			dot:graphics/graphviz	\
 			doxygen:devel/doxygen
 
 GNU_CONFIGURE=	yes
 # ATM expat and drivers are broken
 CONFIGURE_ARGS=	--without-expat
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 .if defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=--disable-sse --disable-sse2 --disable-sse3 --disable-ssse3	\
 		--disable-sse41 --disable-sse42 --disable-fma --disable-fma4	\
 		--disable-avx --disable-avx2
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|@LINBOXSAGE_LIBS@||' ${WRKSRC}/linbox.pc.in
 
 .include <bsd.port.mk>
diff --git a/math/mppp/Makefile b/math/mppp/Makefile
index 383b216b69dd..6f0a2c3ab644 100644
--- a/math/mppp/Makefile
+++ b/math/mppp/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	mppp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multiprecision for modern C++
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libarb.so:math/arb \
 		libflint.so:math/flint2 \
 		libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr
 
 USES=		cmake compiler:c++14-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bluescarni
 
 CMAKE_ON=	MPPP_WITH_ARB MPPP_WITH_MPC MPPP_WITH_MPFR MPPP_ENABLE_IPO
 CMAKE_OFF=	MPPP_WITH_QUADMATH # no quad-precision fp type on FreeBSD, requested __float128 reinstantiation, bug#238129
 TEST_ARGS=	-DMPPP_BUILD_TESTS=ON -DMPPP_WITH_QUADMATH=OFF
 BENCHMARK_ARGS=	-DMPPP_BUILD_BENCHMARKS=ON -DMPPP_BENCHMARK_FLINT=ON -DMPPP_BENCHMARK_BOOST=ON
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${TEST_ARGS} ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 benchmarks: build # additionally depends on boost-libs
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${BENCHMARK_ARGS} ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} benchmark
 
 .include <bsd.port.mk>
diff --git a/math/pynac/Makefile b/math/pynac/Makefile
index 775e1c4b5428..260d9c2beaa8 100644
--- a/math/pynac/Makefile
+++ b/math/pynac/Makefile
@@ -1,42 +1,42 @@
 # Created by: thierry@pompo.net
 
 PORTNAME=	pynac
 PORTVERSION=	0.7.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/archive/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Symbolic computation with Python objects, Sage Math support library
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgmp.so:math/gmp		\
 		libntl.so:math/ntl		\
 		libmpfr.so:math/mpfr		\
 		libflint.so:math/flint2		\
 		libSingular.so:math/singular
 
 USES=		autoreconf compiler:c++11-lang libtool localbase pkgconfig	\
 		python:3.6+
 
 OPTIONS_DEFINE=		GIAC
 OPTIONS_DEFAULT=
 GIAC_DESC=		Use giac for polynomial manipulations
 GIAC_LIB_DEPENDS=	libgiac.so:math/giacxcas
 GIAC_CONFIGURE_ON=	--with-giac
 GIAC_CONFIGURE_OFF=	--without-giac
 GIAC_LIBS=		"-lm"
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGIAC}
 BROKEN_FreeBSD_11=	libgiac is broken (undefined reference to `__divmodti4@GCC_7.0.0')
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/sage/Makefile b/math/sage/Makefile
index 25242e2d74d7..4ae24ad66355 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -1,577 +1,577 @@
 # Created by: Stephen Montgomery-Smith <stephen@FreeBSD.org>
 
 PORTNAME=	sage
 PORTVERSION=	9.2
-PORTREVISION=	16
+PORTREVISION=	17
 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
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	bash:shells/bash		\
 		dash:shells/dash		\
 		cmake:devel/cmake		\
 		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-devel>0:math/py-gmpy2-devel@${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		\
 		convert:graphics/ImageMagick6	\
 		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-devel>0:math/py-gmpy2-devel@${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}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}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 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/singular/Makefile b/math/singular/Makefile
index ebea8a6d22b4..3fc41171d68f 100644
--- a/math/singular/Makefile
+++ b/math/singular/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	singular
 DISTVERSIONPREFIX=	Release-
 DISTVERSION=	4-2-0
+PORTREVISION=	1
 CATEGORIES=	math
 #MASTER_SITES=	ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/${PORTVERSION:C/\./-/g}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Computer algebra system for polynomial computations
 
 LICENSE=	GPLv3RLE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake libtool ncurses perl5 pkgconfig readline shebangfix
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	Singular
 GH_PROJECT=	Singular
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-gmp=${LOCALBASE} --disable-dependency-tracking --without-python
 MAKE_JOBS_UNSAFE=	yes
 SHEBANG_FILES=	Singular/surfex \
 		libpolys/libpolys-config.in \
 		libsingular-config.in
 
 OPTIONS_DEFINE=		FLINT NTL
 OPTIONS_DEFAULT=	FLINT NTL
 OPTIONS_SUB=		yes
 
 FLINT_DESC=		Use FLINT library
 FLINT_CONFIGURE_ON=	--with-flint=${LOCALBASE}
 FLINT_CONFIGURE_OFF=	--with-flint=no
 FLINT_LIB_DEPENDS=	libflint.so:math/flint2
 
 NTL_DESC=		Use NTL library
 NTL_USES=		compiler:c11
 NTL_CONFIGURE_ON=	--with-ntl=${LOCALBASE}
 NTL_CONFIGURE_OFF=	--with-ntl=no
 NTL_LIB_DEPENDS=	libntl.so:math/ntl	\
 			libcddgmp.so:math/cddlib
 
 # not a shebang but "/bin/bash" is hardcoded in some files
 post-patch:
 	  @${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|g" \
 		 ${WRKSRC}/emacs/.emacs-general
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/math/symengine/Makefile b/math/symengine/Makefile
index 88e05111c2be..fa6ef53f143b 100644
--- a/math/symengine/Makefile
+++ b/math/symengine/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	symengine
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast symbolic manipulation library, written in C++
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	WITH_SYMENGINE_THREAD_SAFE BUILD_SHARED_LIBS BUILD_FOR_DISTRIBUTION
 CMAKE_OFF=	BUILD_BENCHMARKS WITH_COTIRE
 
 OPTIONS_DEFINE=			ARB ECM LLVM MPC TCMALLOC ASSERT
 OPTIONS_SINGLE=			INTCLASS
 OPTIONS_SINGLE_INTCLASS=	GMP GMPXX BOOSTMP FLINT PIRANHA
 OPTIONS_DEFAULT=		ARB ECM LLVM MPC TCMALLOC FLINT # FLINT choice is based on best performance
 
 INTCLASS_DESC=		Integer class, use integers from:
 
 ARB_DESC=		Build with Arb (interval arithmetic library)
 ARB_CMAKE_BOOL=		WITH_ARB
 ARB_LIB_DEPENDS=	libarb.so:math/arb \
 			libflint.so:math/flint2 \
 			libmpfr.so:math/mpfr
 
 ECM_DESC=		Build with ECM support (Elliptic Curve Method)
 ECM_CMAKE_BOOL=		WITH_ECM
 ECM_LIB_DEPENDS=	libecm.so:math/gmp-ecm
 
 LLVM_DESC=		Build with LLVM
 LLVM_CMAKE_BOOL=	WITH_LLVM
 LLVM_CMAKE_ON=		-DLLVM_INCLUDE_DIRS:STRING=${LOCALBASE}/llvm${LLVM_VERSION}/include
 LLVM_BUILD_DEPENDS=	llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
 
 MPC_DESC=		Build with MPC
 MPC_CMAKE_BOOL=		WITH_MPC
 MPC_LIB_DEPENDS=	libmpc.so:math/mpc
 
 TCMALLOC_DESC=		Use tcmalloc from google-perftools (improves performance)
 TCMALLOC_CMAKE_BOOL=	WITH_TCMALLOC
 TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 
 ASSERT_CMAKE_BOOL=	WITH_SYMENGINE_ASSERT
 
 GMP_DESC=		gmp (supports arbitrary fp precision)
 GMP_CMAKE_ON=		-DINTEGER_CLASS:STRING=gmp
 GMP_LIB_DEPENDS=	libgmp.so:math/gmp \
 			libmpfr.so:math/mpfr
 
 GMPXX_DESC=		gmpxx
 GMPXX_CMAKE_ON=		-DINTEGER_CLASS:STRING=gmpxx
 GMPXX_LIB_DEPENDS=	libgmp.so:math/gmp
 
 BOOSTMP_DESC=		boostmp (no arbitrary fp precision)
 BOOSTMP_CMAKE_ON=	-DINTEGER_CLASS:STRING=boostmp
 BOOSTMP_BUILD_DEPENDS=	${LOCALBASE}/include/boost/multiprecision/cpp_int.hpp:devel/boost-libs
 
 FLINT_DESC=		flint (supports arbitrary fp precision, best performance)
 FLINT_CMAKE_ON=		-DINTEGER_CLASS:STRING=flint
 FLINT_LIB_DEPENDS=	libflint.so:math/flint2 \
 			libgmp.so:math/gmp \
 			libmpfr.so:math/mpfr
 
 PIRANHA_DESC=		piranha
 PIRANHA_CMAKE_ON=	-DINTEGER_CLASS:STRING=piranha
 PIRANHA_BUILD_DEPENDS=	piranha>0:math/piranha
 
 LLVM_VERSION=	${LLVM_DEFAULT}
 
 do-test: # one test fails: https://github.com/symengine/symengine/issues/1697
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>