9 files changed, 50 insertions, 46 deletions

diff --git a/math/arb/Makefile b/math/arb/Makefile
index 6f88ab62c146..0f94ebea1ba3 100644
--- a/math/arb/Makefile
+++ b/math/arb/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	arb
 DISTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/math/eclib/Makefile b/math/eclib/Makefile
index 0aa931ad8b02..1ad879ea5aab 100644
--- a/math/eclib/Makefile
+++ b/math/eclib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	eclib
 PORTVERSION=	20190909
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
diff --git a/math/flint2/Makefile b/math/flint2/Makefile
index afafd63e5c19..f22ab7f9aa7f 100644
--- a/math/flint2/Makefile
+++ b/math/flint2/Makefile
@@ -1,14 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	flint2
-DISTVERSION=	g20190210
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.6.0
 CATEGORIES=	math
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
-PATCHFILES=	a143883797f27f853332adbee09b76f48b5fbfaf.patch:-p1 \
-		1266c04004a846221491cb005fc8ba45cd3c75f4.patch:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast library for number theory
 
@@ -18,21 +14,22 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 
-USES=		compiler:c++11-lang gmake
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-static
+USES=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	wbhart
-GH_TAGNAME=	2baa9bc
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	NTL
-OPTIONS_DEFAULT=NTL
+OPTIONS_DEFINE=		NTL
+OPTIONS_DEFAULT=	NTL
 
-NTL_DESC=		Victor Shoup's Number Theory Library (used by SageMath)
+NTL_DESC=		Victor Shoup's Number Theory Library
+NTL_CMAKE_BOOL=		WITH_NTL
 NTL_LIB_DEPENDS=	libntl.so:math/ntl
-NTL_CONFIGURE_WITH=	ntl
 
-TEST_TARGET=	check
+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 7106772bb696..c808f5fd279f 100644
--- a/math/flint2/distinfo
+++ b/math/flint2/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1580761062
-SHA256 (wbhart-flint2-g20190210-2baa9bc_GH0.tar.gz) = e3c085121f481992af84330ae76b47015bd22bffb078432a197e325855d667d5
-SIZE (wbhart-flint2-g20190210-2baa9bc_GH0.tar.gz) = 4130197
-SHA256 (a143883797f27f853332adbee09b76f48b5fbfaf.patch) = 16e16aa60a825008371f4a723d6ad6861999fc1ce9877d372464944a77337441
-SIZE (a143883797f27f853332adbee09b76f48b5fbfaf.patch) = 1205
-SHA256 (1266c04004a846221491cb005fc8ba45cd3c75f4.patch) = c4c7903c98323437a3226af05e9a14398b8944ab8c8c00e6a4dfd1b29e56c651
-SIZE (1266c04004a846221491cb005fc8ba45cd3c75f4.patch) = 1577
+TIMESTAMP = 1591807625
+SHA256 (wbhart-flint2-v2.6.0_GH0.tar.gz) = 87a7de27c31897364a70b74724086dac8ec520416b0212ac4a8204ae648f7395
+SIZE (wbhart-flint2-v2.6.0_GH0.tar.gz) = 4517991
diff --git a/math/flint2/pkg-plist b/math/flint2/pkg-plist
index 9ab35bfc6c96..bf5c00f0598f 100644
--- a/math/flint2/pkg-plist
+++ b/math/flint2/pkg-plist
@@ -2,32 +2,21 @@ include/flint/NTL-interface.h
 include/flint/aprcl.h
 include/flint/arith.h
 include/flint/arithxx.h
-include/flint/config.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/flintxx/default_rules.h
-include/flint/flintxx/evaluation_tools.h
-include/flint/flintxx/expression.h
-include/flint/flintxx/expression_traits.h
-include/flint/flintxx/flint_classes.h
-include/flint/flintxx/flint_exception.h
-include/flint/flintxx/forwarding.h
-include/flint/flintxx/frandxx.h
-include/flint/flintxx/ltuple.h
-include/flint/flintxx/matrix.h
-include/flint/flintxx/mp.h
-include/flint/flintxx/rules.h
-include/flint/flintxx/stdmath.h
-include/flint/flintxx/traits.h
-include/flint/flintxx/traits_fwd.h
-include/flint/flintxx/tuple.h
-include/flint/flintxx/vector.h
 include/flint/fmpq.h
 include/flint/fmpq_mat.h
 include/flint/fmpq_matxx.h
@@ -43,6 +32,9 @@ 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_poly.h
 include/flint/fmpz_mod_poly_factor.h
 include/flint/fmpz_mod_poly_factorxx.h
@@ -59,10 +51,14 @@ 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_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_poly.h
@@ -76,14 +72,20 @@ 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_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
@@ -112,9 +114,16 @@ 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.13
-lib/libflint.so.13.5.2
+lib/libflint.so.14
+lib/libflint.so.14.0.0
diff --git a/math/libnormaliz/Makefile b/math/libnormaliz/Makefile
index b2dc672ae7fc..8f7d8aa03f0f 100644
--- a/math/libnormaliz/Makefile
+++ b/math/libnormaliz/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=		libnormaliz
 DISTVERSIONPREFIX=	v
 DISTVERSION=		3.8.5
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		math
 
 MAINTAINER=	salvadore@FreeBSD.org
diff --git a/math/linbox/Makefile b/math/linbox/Makefile
index 254e8612a7aa..217e378f17eb 100644
--- a/math/linbox/Makefile
+++ b/math/linbox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	linbox
 PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
diff --git a/math/mppp/Makefile b/math/mppp/Makefile
index 65723835458b..3e73348ccdba 100644
--- a/math/mppp/Makefile
+++ b/math/mppp/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	mppp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/math/pynac/Makefile b/math/pynac/Makefile
index a9a254100cef..1f363fe0bd55 100644
--- a/math/pynac/Makefile
+++ b/math/pynac/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pynac
 PORTVERSION=	0.7.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTNAME}/