diff --git a/math/eclib/Makefile b/math/eclib/Makefile index 16f0468f88d6..49b68cab2375 100644 --- a/math/eclib/Makefile +++ b/math/eclib/Makefile @@ -1,33 +1,32 @@ PORTNAME= eclib -PORTVERSION= 20230424 -PORTREVISION= 6 +PORTVERSION= 20241112 DISTVERSIONPREFIX= v 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/ +WWW= https://johncremona.github.io/mwrank/index.html 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 +USES= autoreconf compiler:c++14-lang libtool localbase OPTIONS_DEFINE= DOCS -CXXFLAGS+= -std=c++11 LIBS+= "-lm" GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +USE_CXXSTD= c++14 CONFIGURE_ARGS= --with-flint=${LOCALBASE} --with-boost=${LOCALBASE} INSTALL_TARGET= install-strip USE_LDCONFIG= yes .include diff --git a/math/eclib/distinfo b/math/eclib/distinfo index 158e7a1a7159..b66503207051 100644 --- a/math/eclib/distinfo +++ b/math/eclib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684597242 -SHA256 (JohnCremona-eclib-v20230424_GH0.tar.gz) = 67d59d4086c9c46b7ca6c5a34e0879aed00836f812a1cba29756d618af08e32f -SIZE (JohnCremona-eclib-v20230424_GH0.tar.gz) = 1039476 +TIMESTAMP = 1737217199 +SHA256 (JohnCremona-eclib-v20241112_GH0.tar.gz) = 0c5cd1310210bb740ba774ba5b504b882ffa6fb0bcfd7e41da99d9ea296673ae +SIZE (JohnCremona-eclib-v20241112_GH0.tar.gz) = 1047295 diff --git a/math/eclib/files/patch-libsrc_mwprocs.cc b/math/eclib/files/patch-libsrc_mwprocs.cc new file mode 100644 index 000000000000..13ad5db7c812 --- /dev/null +++ b/math/eclib/files/patch-libsrc_mwprocs.cc @@ -0,0 +1,34 @@ +--- libsrc/mwprocs.cc.orig 2024-11-12 14:33:12 UTC ++++ libsrc/mwprocs.cc +@@ -94,25 +94,23 @@ vector> get_minor(const vector> get_minor(const vector>& m, long m_size, long i0, long j0) + { +- vector> minor(MAXRANK, vector(MAXRANK)); ++ vector> the_minor(MAXRANK, vector(MAXRANK)); + for (long i=0; i=i0) ii++; ++ long ii = (i>=i0? i+1 : i); + for (long j=0; j=j0? j+1 : j); + if(j>=j0) jj++; +- minor[i][j] = m[ii][jj]; ++ the_minor[i][j] = m[ii][jj]; + } + } +- return minor; ++ return the_minor; + } + + bigfloat det_minor(const vector>& m, long m_size, long i0, long j0) + { +- const vector>& minor = get_minor(m,m_size,i0,j0); +- return det(minor, m_size-1); ++ return det(get_minor(m,m_size,i0,j0), m_size-1); + } + + bigfloat det(const vector>& m, long m_size) diff --git a/math/eclib/files/patch-tests_Makefile.am b/math/eclib/files/patch-tests_Makefile.am index 88a7b785b717..c9ee847c8acc 100644 --- a/math/eclib/files/patch-tests_Makefile.am +++ b/math/eclib/files/patch-tests_Makefile.am @@ -1,15 +1,15 @@ ---- tests/Makefile.am.orig 2021-03-08 17:51:22 UTC +--- tests/Makefile.am.orig 2024-11-12 14:33:12 UTC +++ tests/Makefile.am -@@ -129,9 +129,9 @@ tnfd_SOURCES=tnfd.cc +@@ -145,9 +145,9 @@ tnfd_SOURCES=tnfd.cc # This is the name of a directory which will be used for newform # input/output in the "make check" tests and removed afterwards. -export NF_DIR:=nftmp -export SNF_DIR:=snftmp -export TCURVE_DIR:=tcurves +export NF_DIR=nftmp +export SNF_DIR=snftmp +export TCURVE_DIR=tcurves check_g0n: g0n_tests @echo Running g0n checks... diff --git a/math/eclib/pkg-plist b/math/eclib/pkg-plist index d08c073a13e2..a1f10f0e5532 100644 --- a/math/eclib/pkg-plist +++ b/math/eclib/pkg-plist @@ -1,131 +1,129 @@ bin/aplist bin/checkap bin/cubics bin/ecnf bin/h1bsd bin/h1bsdcurisog bin/h1clist bin/h1curve bin/h1first bin/indep_test bin/list_cubics bin/moreap bin/mwrank bin/nfcount bin/nfhpcurve bin/nfhpmcurve bin/pcurve bin/point_search bin/qexp bin/quartic_points bin/reduce_cubics bin/reduce_quartics bin/solve_conic bin/solve_legendre include/eclib/GetOpt.h include/eclib/arith.h include/eclib/bigcomplex.h include/eclib/bigrat.h include/eclib/bitspace.h include/eclib/compproc.h include/eclib/conic.h include/eclib/cperiods.h include/eclib/cubic.h include/eclib/curve.h include/eclib/curvemod.h include/eclib/curvesort.h include/eclib/cusp.h include/eclib/desc2.h include/eclib/descent.h include/eclib/divpol.h include/eclib/egr.h include/eclib/elog.h include/eclib/ffmod.h include/eclib/fixc6.h +include/eclib/flinterface.h include/eclib/getcurve.h include/eclib/gf.h include/eclib/hilbert.h include/eclib/homspace.h include/eclib/htconst.h include/eclib/illl.h include/eclib/interface.h include/eclib/isogs.h include/eclib/kbessel.h include/eclib/lambda.h include/eclib/legendre.h include/eclib/logger.h include/eclib/marith.h include/eclib/mat.h include/eclib/matrix.h include/eclib/mequiv.h include/eclib/method.h include/eclib/mglobsol.h include/eclib/minim.h include/eclib/mlocsol.h -include/eclib/mmatrix.h include/eclib/moddata.h include/eclib/mquartic.h include/eclib/mrank1.h include/eclib/mrank2.h include/eclib/msoluble.h -include/eclib/msubspace.h -include/eclib/mvector.h include/eclib/mwprocs.h include/eclib/newforms.h include/eclib/nfd.h include/eclib/oldforms.h include/eclib/options.h include/eclib/p2points.h include/eclib/parifact.h include/eclib/pcprocs.h include/eclib/periods.h include/eclib/points.h include/eclib/pointsmod.h include/eclib/polys.h include/eclib/qc.h include/eclib/quadratic.h include/eclib/rat.h include/eclib/reader.h include/eclib/realroots.h include/eclib/reduce.h include/eclib/saturate.h include/eclib/sieve_search.h include/eclib/sifter.h include/eclib/smat.h include/eclib/smat_elim.h include/eclib/smatrix.h include/eclib/smatrix_elim.h include/eclib/splitbase.h include/eclib/sqfdiv.h include/eclib/sub.h include/eclib/subspace.h include/eclib/svec.h include/eclib/svector.h include/eclib/symb.h include/eclib/templates.h include/eclib/threadpool.h include/eclib/timer.h include/eclib/tlss.h include/eclib/transform.h include/eclib/twoadic.h include/eclib/types.h include/eclib/unimod.h include/eclib/vec.h include/eclib/vector.h include/eclib/version.h include/eclib/xmod.h include/eclib/xsplit.h include/eclib/xsplit_data.h lib/libec.a lib/libec.so -lib/libec.so.10 -lib/libec.so.10.2.0 +lib/libec.so.14 +lib/libec.so.14.0.0 libdata/pkgconfig/eclib.pc %%PORTDOCS%%%%DOCSDIR%%/g0n.txt %%PORTDOCS%%%%DOCSDIR%%/howto.txt %%PORTDOCS%%%%DOCSDIR%%/mwrank/mwrank.changes %%PORTDOCS%%%%DOCSDIR%%/mwrank/mwrank.info %%PORTDOCS%%%%DOCSDIR%%/mwrank/mwrank.options %%PORTDOCS%%%%DOCSDIR%%/mwrank/mwrank.readme %%PORTDOCS%%%%DOCSDIR%%/progs.txt share/man/man1/mwrank.1.gz