math/flint2: Update g20170804 -> g20180323

Port changes:
* Change to the repo that is current
* Change to cmake
* Update/add patches required to build on FreeBSD

4 files changed, 28 insertions, 30 deletions

diff --git a/math/flint2/Makefile b/math/flint2/Makefile
index bf29f24baefe..b0a4ab94303b 100644
--- a/math/flint2/Makefile
+++ b/math/flint2/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	flint2
-DISTVERSION=	g20170804
+DISTVERSION=	g20180323
 CATEGORIES=	math
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	d900af4ca348b054c0e6b2a6645a54744ec9e74b.patch:-p1 # fix 32-bit failure: https://github.com/fredrik-johansson/flint2/pull/22
+PATCHFILES=	95c58b723a9463c27d35e182dfcba6d347eca624.patch:-p1 # cmake fixes: https://github.com/wbhart/flint2/pull/459
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast library for number theory
@@ -16,15 +16,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 
-USES=		gmake
+USES=		cmake:outsource
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 USE_GITHUB=	yes
-GH_ACCOUNT=	fredrik-johansson
-GH_TAGNAME=	5f2a264
+GH_ACCOUNT=	wbhart
+GH_TAGNAME=	83008bd
 USE_LDCONFIG=	yes
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libflint.so.*
+CMAKE_ON=	BUILD_SHARED_LIBS
 
 .include <bsd.port.mk>
diff --git a/math/flint2/distinfo b/math/flint2/distinfo
index 440233aa6c80..5b1d17bf9643 100644
--- a/math/flint2/distinfo
+++ b/math/flint2/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1522371962
-SHA256 (fredrik-johansson-flint2-g20170804-5f2a264_GH0.tar.gz) = f3400a0342d95f1f705d41a535e9298c7501991383dfeef7bf82edb7ef76bf62
-SIZE (fredrik-johansson-flint2-g20170804-5f2a264_GH0.tar.gz) = 4023335
-SHA256 (d900af4ca348b054c0e6b2a6645a54744ec9e74b.patch) = 2f3f44d274c51ca4e8ca73e4d9ec696d33649934067d5f6f36532985f3138f2a
-SIZE (d900af4ca348b054c0e6b2a6645a54744ec9e74b.patch) = 1190
+TIMESTAMP = 1522384688
+SHA256 (wbhart-flint2-g20180323-83008bd_GH0.tar.gz) = 34cdd1c4dd1f9fac8b4d00a33014932786bc263dced2b55a87112fe90a4fa9dc
+SIZE (wbhart-flint2-g20180323-83008bd_GH0.tar.gz) = 3889958
+SHA256 (95c58b723a9463c27d35e182dfcba6d347eca624.patch) = 00d157939827c3b2582be9388db5b4d25f92afa3808cc4cecd0ed15d5d728c92
+SIZE (95c58b723a9463c27d35e182dfcba6d347eca624.patch) = 1142
diff --git a/math/flint2/files/patch-qadic_ctx__init__conway.c b/math/flint2/files/patch-qadic_ctx__init__conway.c
new file mode 100644
index 000000000000..7b1326a1cbb6
--- /dev/null
+++ b/math/flint2/files/patch-qadic_ctx__init__conway.c
@@ -0,0 +1,13 @@
+Workaround for https://github.com/wbhart/flint2/issues/460
+
+--- qadic/ctx_init_conway.c.orig	2018-03-30 04:28:36 UTC
++++ qadic/ctx_init_conway.c
+@@ -19,7 +19,7 @@
+ 
+ int flint_conway_polynomials [] = {
+ #if !defined( _MSC_VER)
+-#include "../build/CPimport.h"
++#include "../../.build/CPimport.h"
+ #else
+ #include "CPimport.h"
+ #endif
diff --git a/math/flint2/pkg-plist b/math/flint2/pkg-plist
index 83a30c80cd48..95b553b6c119 100644
--- a/math/flint2/pkg-plist
+++ b/math/flint2/pkg-plist
@@ -11,26 +11,10 @@ include/flint/fft.h
 include/flint/fft_tuning.h
 include/flint/flint.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
+include/flint/fmpq_mpoly.h
 include/flint/fmpq_poly.h
 include/flint/fmpq_polyxx.h
 include/flint/fmpq_vec.h
@@ -78,6 +62,7 @@ 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/gettimeofday.h
 include/flint/gmpcompat.h
 include/flint/hashmap.h
 include/flint/long_extras.h
@@ -87,8 +72,10 @@ 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/nmod_mat.h
 include/flint/nmod_matxx.h
+include/flint/nmod_mpoly.h
 include/flint/nmod_poly.h
 include/flint/nmod_poly_factor.h
 include/flint/nmod_poly_mat.h
@@ -111,4 +98,3 @@ include/flint/qsieve.h
 include/flint/templates.h
 include/flint/ulong_extras.h
 lib/libflint.so
-lib/libflint.so.13.5.2