git: 9f5fa23ba46b - main - math/cado-nfs: update 2.3.0-20240318 → 2.3.0-20240408

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9f5fa23ba46b0565aa741f76329e7a75cc4784ac

commit 9f5fa23ba46b0565aa741f76329e7a75cc4784ac
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-04-09 06:22:51 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-04-09 07:40:59 +0000

    math/cado-nfs: update 2.3.0-20240318 → 2.3.0-20240408
---
 math/cado-nfs/Makefile                     | 10 ++++-----
 math/cado-nfs/distinfo                     |  6 ++---
 math/cado-nfs/files/fake-c++               |  2 --
 math/cado-nfs/files/patch-config_fmt.cmake | 35 ------------------------------
 4 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/math/cado-nfs/Makefile b/math/cado-nfs/Makefile
index 6f0fb0500462..34094d61e26a 100644
--- a/math/cado-nfs/Makefile
+++ b/math/cado-nfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cado-nfs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.0-20240318
+DISTVERSION=	2.3.0-20240408
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -13,6 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		bash:shells/bash
 LIB_DEPENDS=	libecm.so:math/gmp-ecm \
+		libfmt.so:devel/libfmt \
 		libgf2x.so:math/gf2x \
 		libgmp.so:math/gmp \
 		libhwloc.so:devel/hwloc2
@@ -22,18 +23,15 @@ USES=		cmake:noninja compiler:c++11-lang gmake perl5 python shebangfix # noninja
 
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.inria.fr
-GL_TAGNAME=	a24829267c8e81f58d8c643c7c5be5e454ef106e
+GL_TAGNAME=	58d113d3608e41378753cd949b077f7c80449279
 
 SHEBANG_GLOB=	*.py
 
-MAKE_ENV+=	WRKSRC=${WRKSRC} # for files/fake-c++: workaround for external libfmt getting into the build
-
 CXXFLAGS_i386=	-msse2 # workaround for error: always_inline function '_mm_setzero_si128' requires target feature 'sse2', but would be inlined into function 'gf2x_mul4' that is compiled without support for 'sse2'
 
 TEST_TARGET=	check # 'test' does the same but is less verbose
 
-BINARY_ALIAS=	python3=${PYTHON_CMD} \
-		c++=${FILESDIR}/fake-c++ # workaround for external libfmt getting into the build
+BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 .include <bsd.port.options.mk>
 
diff --git a/math/cado-nfs/distinfo b/math/cado-nfs/distinfo
index 20ab254f5e74..841e745ad3bc 100644
--- a/math/cado-nfs/distinfo
+++ b/math/cado-nfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712522573
-SHA256 (cado-nfs-cado-nfs-a24829267c8e81f58d8c643c7c5be5e454ef106e_GL0.tar.gz) = 0af1c4ad0fd20caba7667cb9df3bcb999b7ea0bf7bb89bf3fd3c4b708d940cdb
-SIZE (cado-nfs-cado-nfs-a24829267c8e81f58d8c643c7c5be5e454ef106e_GL0.tar.gz) = 4190790
+TIMESTAMP = 1712604812
+SHA256 (cado-nfs-cado-nfs-58d113d3608e41378753cd949b077f7c80449279_GL0.tar.gz) = 060ec6ea3278a236c1ef635dee022aa84ac3463d19116f609ad0734dd5cbf6e2
+SIZE (cado-nfs-cado-nfs-58d113d3608e41378753cd949b077f7c80449279_GL0.tar.gz) = 4190908
diff --git a/math/cado-nfs/files/fake-c++ b/math/cado-nfs/files/fake-c++
deleted file mode 100755
index 752550aedf5a..000000000000
--- a/math/cado-nfs/files/fake-c++
+++ /dev/null
@@ -1,2 +0,0 @@
-# workaround for external libfmt getting into the buid
-/usr/bin/c++ -I $WRKSRC/utils/embedded "$@"
diff --git a/math/cado-nfs/files/patch-config_fmt.cmake b/math/cado-nfs/files/patch-config_fmt.cmake
deleted file mode 100644
index 6686bf33f7c7..000000000000
--- a/math/cado-nfs/files/patch-config_fmt.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
---- config/fmt.cmake.orig	2024-04-07 21:30:28 UTC
-+++ config/fmt.cmake
-@@ -23,7 +23,7 @@ endif()
- endif()
- 
- # Try in three passes, otherwise cmake gets in the way...
--find_path   (FMT_INCDIR fmt/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers"
-+find_path   (FMT_INCDIR fmt-invalid/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers"
-         NO_DEFAULT_PATH
-         NO_SYSTEM_ENVIRONMENT_PATH
-         NO_CMAKE_PATH
-@@ -32,19 +32,19 @@ if(NOT FMT_INCDIR)
-         NO_CMAKE_FIND_ROOT_PATH
-         )
- if(NOT FMT_INCDIR)
--find_path   (FMT_INCDIR fmt/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers"
-+find_path   (FMT_INCDIR fmt-invalid/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers"
-         NO_DEFAULT_PATH
-         )
- endif()
- if(NOT FMT_INCDIR)
--find_path   (FMT_INCDIR fmt/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers")
-+find_path   (FMT_INCDIR fmt-invalid/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers")
- endif()
- 
--find_library(FMT_LIB    fmt   HINTS ${FMT_LIBDIR_HINTS} DOC "fmt library"
-+find_library(FMT_LIB    fmt-invalid   HINTS ${FMT_LIBDIR_HINTS} DOC "fmt library"
-     NO_DEFAULT_PATH
-     )
- if(NOT FMT_LIB)
--find_library(FMT_LIB    fmt   HINTS ${FMT_LIBDIR_HINTS} DOC "fmt library")
-+find_library(FMT_LIB    fmt-invalid   HINTS ${FMT_LIBDIR_HINTS} DOC "fmt library")
- endif()
- 
-