diff --git a/math/givaro/Makefile b/math/givaro/Makefile index ba924c8758a8..7c8d4cb3d095 100644 --- a/math/givaro/Makefile +++ b/math/givaro/Makefile @@ -1,42 +1,47 @@ PORTNAME= givaro -PORTVERSION= 4.2.0 -DISTVERSIONPREFIX=v +PORTVERSION= 4.2.1 +DISTVERSIONPREFIX= v CATEGORIES= math +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= ed91ee0dc2d41f3ceb72abc375ad5c0fec62ed56.patch:-p1 # Add libc++ support for macOS and Linux + MAINTAINER= pi@FreeBSD.org COMMENT= C++ library for computer algebra WWW= https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro LICENSE= CeCILL-Bv1-en.txt LICENSE_NAME= Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre] B license, version 1 LICENSE_FILE= ${WRKSRC}/Licence_CeCILL-B_V1-en.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libgmp.so:math/gmp -USES= autoreconf compiler:c++11-lang gmake libtool localbase pathfix pkgconfig +USES= autoreconf compiler:c++11-lang gmake libtool localbase \ + pathfix pkgconfig USE_CXXSTD= c++11 USE_GITHUB= yes GH_ACCOUNT= linbox-team USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gmp="${LOCALBASE}" INSTALL_TARGET= install-strip TEST_TARGET= check OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= doxygen:devel/doxygen \ dot:graphics/graphviz DOCS_USE= TEX=base:build,dvipsk:build,latex:build,pdftex:build -DOCS_CONFIGURE_ON= --enable-doc --with-docdir=${DOCSDIR} +DOCS_CONFIGURE_ON= --enable-doc \ + --with-docdir=${DOCSDIR} post-install-DOCS-on: ${RMDIR} ${STAGEDIR}${DOCSDIR}/givaro-dev-html ${FIND} ${WRKSRC}/docs/givaro-html -not -type d \ | ${SED} -ne 's,^${WRKSRC}/docs/givaro-html,${DOCSDIR}/givaro-html,p' >> ${TMPPLIST} .include diff --git a/math/givaro/distinfo b/math/givaro/distinfo index 6a5502692cc6..20a6c5ce89d4 100644 --- a/math/givaro/distinfo +++ b/math/givaro/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1690897251 -SHA256 (linbox-team-givaro-v4.2.0_GH0.tar.gz) = dca23a928e4704f045848fce884fe49ce09a8de7ebf750b87c807ca4e0facedd -SIZE (linbox-team-givaro-v4.2.0_GH0.tar.gz) = 637479 +TIMESTAMP = 1771446897 +SHA256 (linbox-team-givaro-v4.2.1_GH0.tar.gz) = 6aae4b74c2772b6f4aa4e55d1d90f79214635aa664e3b121dde2e0b5192f310b +SIZE (linbox-team-givaro-v4.2.1_GH0.tar.gz) = 643640 +SHA256 (ed91ee0dc2d41f3ceb72abc375ad5c0fec62ed56.patch) = 9bbe7074e3452c197801ac92c14be1050db72c587deeaa51873fb8c9fb71a992 +SIZE (ed91ee0dc2d41f3ceb72abc375ad5c0fec62ed56.patch) = 7113 diff --git a/math/givaro/files/patch-src_kernel_integer_random-integer.h b/math/givaro/files/patch-src_kernel_integer_random-integer.h deleted file mode 100644 index f8c7c62f7c21..000000000000 --- a/math/givaro/files/patch-src_kernel_integer_random-integer.h +++ /dev/null @@ -1,23 +0,0 @@ ---- src/kernel/integer/random-integer.h.orig 2021-12-14 10:00:03 UTC -+++ src/kernel/integer/random-integer.h -@@ -11,10 +11,12 @@ - - #include "gmp++/gmp++.h" - -+#if __cpp_lib_bool_constant < 201505L - namespace std { - template - using bool_constant = integral_constant; - } -+#endif - - namespace Givaro - { -@@ -91,7 +93,6 @@ namespace Givaro - if (this != &R) { - _bits = R._bits; - _integer = R._integer; -- const_cast(_ring)=R._ring; - } - return *this; - } diff --git a/math/givaro/files/patch-src_kernel_recint_rfiddling.h b/math/givaro/files/patch-src_kernel_recint_rfiddling.h deleted file mode 100644 index 5591e9e210bf..000000000000 --- a/math/givaro/files/patch-src_kernel_recint_rfiddling.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/kernel/recint/rfiddling.h.orig 2021-12-14 10:00:03 UTC -+++ src/kernel/recint/rfiddling.h -@@ -167,7 +167,7 @@ namespace RecInt - template - inline rint rint::maxFFLAS() { - rint max; -- set_highest_bit(max.Low.Value); -+ set_highest_bit(max.Value.Low); - return max; - } - diff --git a/math/givaro/pkg-plist b/math/givaro/pkg-plist index 9439e4d032ea..7488604d26c9 100644 --- a/math/givaro/pkg-plist +++ b/math/givaro/pkg-plist @@ -1,231 +1,232 @@ %%PORTDOCS%%%%DOCSDIR%%/givaro.html bin/givaro-config include/givaro-config.h include/givaro/StaticElement.h include/givaro/chineseremainder.h include/givaro/extension.h include/givaro/gf2.h include/givaro/gf2.inl include/givaro/gfq.h include/givaro/gfq.inl include/givaro/gfqext.h include/givaro/gfqkronecker.h include/givaro/givarithmetics.h include/givaro/givaromm.h include/givaro/givarray0.h include/givaro/givarray0.inl include/givaro/givarrayallocator.h include/givaro/givarrayfixed.h include/givaro/givbasictype.h include/givaro/givbits.h include/givaro/givbits.inl include/givaro/givcaster.h include/givaro/givcategory.h include/givaro/givconfig.h include/givaro/givdegree.h include/givaro/givelem.h include/givaro/giverror.h include/givaro/givfixedtrunc.h include/givaro/givfractiondomain.h include/givaro/givgenarith.h include/givaro/givhashtable.h include/givaro/givhashtable.inl include/givaro/givhighorder.h include/givaro/givindeter.h include/givaro/givinit.h include/givaro/givinteger.h include/givaro/givinterp.h include/givaro/givinterpgeom-multip.h include/givaro/givinterpgeom.h include/givaro/givintfactor.h include/givaro/givintfactor.inl include/givaro/givintnumtheo.h include/givaro/givintnumtheo.inl include/givaro/givintprime.h include/givaro/givintprime.inl include/givaro/givintrns.h include/givaro/givintrns_convert.inl include/givaro/givintrns_cstor.inl include/givaro/givintrsa.h include/givaro/givintrsa.inl include/givaro/givintsqrootmod.h include/givaro/givintsqrootmod.inl include/givaro/giviterator.h include/givaro/givlist0.h include/givaro/givlist0.inl include/givaro/givmatdense.h include/givaro/givmatdenseops.inl include/givaro/givmatrix.h include/givaro/givmatsparse.h include/givaro/givmatsparseops.inl include/givaro/givmatstorage.h include/givaro/givmatstoragedense.h include/givaro/givmatstoragesparse.h include/givaro/givmemorer.h include/givaro/givmodule.h include/givaro/givomptimer.h include/givaro/givops.h include/givaro/givperf.h include/givaro/givpointer.h include/givaro/givpoly1.h include/givaro/givpoly1addsub.inl include/givaro/givpoly1axpy.inl include/givaro/givpoly1crt.h include/givaro/givpoly1crtconvert.inl include/givaro/givpoly1crtcstor.inl include/givaro/givpoly1cstor.inl include/givaro/givpoly1cyclo.inl include/givaro/givpoly1dense.h include/givaro/givpoly1denseops.inl include/givaro/givpoly1factor.h include/givaro/givpoly1factor.inl include/givaro/givpoly1gcd.inl include/givaro/givpoly1io.inl include/givaro/givpoly1kara.inl +include/givaro/givpoly1midmul.inl include/givaro/givpoly1misc.inl include/givaro/givpoly1muldiv.inl include/givaro/givpoly1padic.h include/givaro/givpoly1proot.inl include/givaro/givpoly1ratrecon.inl include/givaro/givpoly1sqrfree.inl include/givaro/givpower.h include/givaro/givprimes16.h include/givaro/givprint.h include/givaro/givquotientdomain.h include/givaro/givranditer.h include/givaro/givrandom.h include/givaro/givrational.h include/givaro/givrational.inl include/givaro/givref_count.h include/givaro/givrns.h include/givaro/givrnsconvert.inl include/givaro/givrnscstor.inl include/givaro/givrnsfixed.h include/givaro/givrnsfixed.inl include/givaro/givspyinteger.h include/givaro/givstack.h include/givaro/givstack.inl include/givaro/givstorage.h include/givaro/givstoragedense.h include/givaro/givstoragesparse.h include/givaro/givtablelimits.h include/givaro/givtimer.h include/givaro/givtruncdomain.h include/givaro/givtruncdomain.inl include/givaro/givtypestring.h include/givaro/givvectdenseops.inl include/givaro/givvectdensespe.inl include/givaro/givvector.h include/givaro/givvectordense.h include/givaro/givvectordense.inl include/givaro/givvectorsparse.h include/givaro/givvectorsparse.inl include/givaro/givvectsparseops.inl include/givaro/modular-floating.h include/givaro/modular-floating.inl include/givaro/modular-implem.h include/givaro/modular-integral.h include/givaro/modular-integral.inl include/givaro/modular-balanced-double.h include/givaro/modular-balanced-double.inl include/givaro/modular-balanced-float.h include/givaro/modular-balanced-float.inl include/givaro/modular-balanced-int32.h include/givaro/modular-balanced-int32.inl include/givaro/modular-balanced-int64.h include/givaro/modular-balanced-int64.inl include/givaro/modular-balanced.h include/givaro/modular-extended.h include/givaro/modular-extended.inl include/givaro/modular-general.h include/givaro/modular-general.inl include/givaro/modular-integer.h include/givaro/modular-integer.inl include/givaro/modular-inttype.h include/givaro/modular-inttype.inl include/givaro/modular-log16.h include/givaro/modular-log16.inl include/givaro/modular-mulprecomp.inl include/givaro/modular-ruint.h include/givaro/modular-ruint.inl include/givaro/modular.h include/givaro/montgomery-int32.h include/givaro/montgomery-int32.inl include/givaro/montgomery-ruint.h include/givaro/montgomery-ruint.inl include/givaro/montgomery.h include/givaro/qfield.h include/givaro/random-integer.h include/givaro/ring-interface.h include/givaro/udl.h include/givaro/unparametric-operations.h include/givaro/zring.h include/gmp++/gmp++.h include/gmp++/gmp++_int.h include/gmp++/gmp++_int_rand.inl include/recint/radd.h include/recint/rcmp.h include/recint/rconvert.h include/recint/rdisplay.h include/recint/rdiv.h include/recint/recdefine.h include/recint/recint.h include/recint/reclonglong.h include/recint/rfiddling.h include/recint/rint.h include/recint/rmadd.h include/recint/rmbaddmul.h include/recint/rmbexp.h include/recint/rmbinv.h include/recint/rmbmodule.h include/recint/rmbmul.h include/recint/rmbreduc.h include/recint/rmbrmint.h include/recint/rmcmp.h include/recint/rmconvert.h include/recint/rmdefine.h include/recint/rmdisplay.h include/recint/rmdiv.h include/recint/rmextra.h include/recint/rmgaddmul.h include/recint/rmgexp.h include/recint/rmginv.h include/recint/rmgmodule.h include/recint/rmgmul.h include/recint/rmgreduc.h include/recint/rmgrmint.h include/recint/rmint.h include/recint/rmintmg.h include/recint/rmmanip.h include/recint/rmmul.h include/recint/rmneg.h include/recint/rmrandom.h include/recint/rmsub.h include/recint/rmul.h include/recint/rrandom.h include/recint/rrint.h include/recint/rsub.h include/recint/ruadd.h include/recint/ruaddmul.h include/recint/rucmp.h include/recint/ruconvert.h include/recint/rudisplay.h include/recint/rudiv.h include/recint/ruexp.h include/recint/rufiddling.h include/recint/rugcd.h include/recint/ruint.h include/recint/ruinvmod.h include/recint/rumanip.h include/recint/rumul.h include/recint/rurandom.h include/recint/ruruint.h include/recint/rushift.h include/recint/rusub.h include/recint/rutools.h lib/libgivaro.a lib/libgivaro.so lib/libgivaro.so.9 -lib/libgivaro.so.9.2.0 +lib/libgivaro.so.9.2.1 libdata/pkgconfig/givaro.pc %%DATADIR%%/givaro-makefile