4 files changed, 6 insertions, 59 deletions
diff --git a/math/cado-nfs/Makefile b/math/cado-nfs/Makefile
index f9cfc93e5460..f65308b72c4e 100644
--- a/math/cado-nfs/Makefile
+++ b/math/cado-nfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cado-nfs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.0.20210915
+DISTVERSION=	2.3.0.20220612
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -24,7 +24,7 @@ USES=		cmake:noninja compiler:c++11-lang perl5 python shebangfix # noninja becau
 
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.inria.fr
-GL_COMMIT=	f4284e2391121b2bfb97bc4880b6273c7250dc2f
+GL_COMMIT=	9044db91bbb2cc853f27b166862077c8ce8e8686
 
 SHEBANG_GLOB=	*.py
 
diff --git a/math/cado-nfs/distinfo b/math/cado-nfs/distinfo
index a14862fd2622..dcfb9407aa68 100644
--- a/math/cado-nfs/distinfo
+++ b/math/cado-nfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631773002
-SHA256 (cado-nfs-cado-nfs-f4284e2391121b2bfb97bc4880b6273c7250dc2f_GL0.tar.gz) = 0f6c8303cadc637647606eb3530f822b5c46e2120dddf942bb55714134c9efd5
-SIZE (cado-nfs-cado-nfs-f4284e2391121b2bfb97bc4880b6273c7250dc2f_GL0.tar.gz) = 4661250
+TIMESTAMP = 1656914582
+SHA256 (cado-nfs-cado-nfs-9044db91bbb2cc853f27b166862077c8ce8e8686_GL0.tar.gz) = 48d754683ce35c9791809eca6c197d7312a4fad1e7ce1fddb22502631a95f2e3
+SIZE (cado-nfs-cado-nfs-9044db91bbb2cc853f27b166862077c8ce8e8686_GL0.tar.gz) = 4741170
diff --git a/math/cado-nfs/files/patch-utils_cado-endian.h b/math/cado-nfs/files/patch-utils_cado-endian.h
deleted file mode 100644
index b29617f00ec2..000000000000
--- a/math/cado-nfs/files/patch-utils_cado-endian.h
+++ /dev/null
@@ -1,53 +0,0 @@
---- utils/cado-endian.h.orig	2021-09-16 01:25:08 UTC
-+++ utils/cado-endian.h
-@@ -27,20 +27,16 @@
- 
- // pragma no prototypes
- 
--#ifdef HAVE_GLIBC
--// GNU libc offers the helpful header <endian.h> which defines
--// __BYTE_ORDER
--# include <endian.h>
--# if (__BYTE_ORDER == __LITTLE_ENDIAN)
-+# if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- #  define CADO_LITTLE_ENDIAN
--# elif (__BYTE_ORDER == __BIG_ENDIAN)
-+# elif (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
- #  define CADO_BIG_ENDIAN
--# elif (__BYTE_ORDER == __PDP_ENDIAN)
-+# elif (__BYTE_ORDER__ == __PDP_ENDIAN)
- #  define CADO_PDP_ENDIAN
- # else
- #  error Unknown machine endianness detected.
- # endif
--# define CADO_BYTE_ORDER __BYTE_ORDER
-+# define CADO_BYTE_ORDER __BYTE_ORDER__
- /* There is no serious reason to think that _BIG_ENDIAN or _LITTLE_ENDIAN
-  * being defined actually means that the machine is big (resp, little)
-  * endian. Systems may like to unconditionally define these as constants
-@@ -54,25 +50,4 @@
- # define CADO_LITTLE_ENDIAN
- # define CADO_BYTE_ORDER 1234
-  */
--#elif defined(__sparc) || defined(__sparc__) \
--   || defined(_POWER) || defined(__powerpc__) \
--   || defined(__ppc__) || defined(__hpux) \
--   || defined(_MIPSEB) || defined(_POWER) \
--   || defined(__AARCH64EB__) \
--   || defined(__s390__)
--# define CADO_BIG_ENDIAN
--# define CADO_BYTE_ORDER 4321
--#elif defined(__i386__) || defined(__alpha__) \
--   || defined(__ia64) || defined(__ia64__) \
--   || defined(_M_IX86) || defined(_M_IA64) \
--   || defined(_M_ALPHA) || defined(__amd64) \
--   || defined(__amd64__) || defined(_M_AMD64) \
--   || defined(__x86_64) || defined(__x86_64__) \
--   || defined(__AARCH64EL__) \
--   || defined(_M_X64)
--# define CADO_LITTLE_ENDIAN
--# define CADO_BYTE_ORDER 1234
--#else
--# error The file cado-endian.h needs to be set up for your CPU type.
--#endif
- #endif
diff --git a/math/cado-nfs/pkg-plist b/math/cado-nfs/pkg-plist
index f0dfa47d72c3..a1a36740ee5b 100644
--- a/math/cado-nfs/pkg-plist
+++ b/math/cado-nfs/pkg-plist
@@ -48,7 +48,7 @@ lib/cado-nfs-3.0.0/sieve/las
 lib/cado-nfs-3.0.0/sieve/las_descent
 lib/cado-nfs-3.0.0/sieve/makefb
 lib/cado-nfs-3.0.0/sqrt/sqrt
-lib/cado-nfs-3.0.0/utils/badideals
+lib/cado-nfs-3.0.0/utils/numbertheory_tool
 %%DATADIR%%-3.0.0/dlp/Joux-Lercier/params.p100
 %%DATADIR%%-3.0.0/dlp/Joux-Lercier/params.p30
 %%DATADIR%%-3.0.0/dlp/Joux-Lercier/params.p35