CVS commit: pkgsrc/math

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 18 18:30:01 UTC 2023

Modified Files:
        pkgsrc/math/imath: Makefile
        pkgsrc/math/openfst: Makefile
        pkgsrc/math/volk: Makefile

Log Message:
math: Adapt packages to USE_(CC|CXX)_FEATURES where possible


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/imath/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/openfst/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/math/volk/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/imath/Makefile
diff -u pkgsrc/math/imath/Makefile:1.9 pkgsrc/math/imath/Makefile:1.10
--- pkgsrc/math/imath/Makefile:1.9      Tue Jun  6 08:01:09 2023
+++ pkgsrc/math/imath/Makefile  Tue Jul 18 18:30:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/06/06 08:01:09 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2023/07/18 18:30:01 nia Exp $
 
 DISTNAME=      imath-3.1.9
 CATEGORIES=    math
@@ -14,8 +14,7 @@ LICENSE=      modified-bsd
 USE_LANGUAGES= c c++14
 PTHREAD_OPTS=  require
 
-# C++14
-GCC_REQD+=     6
+USE_CXX_FEATURES+=     c++14
 
 PKGCONFIG_OVERRIDE=    config/Imath.pc.in
 

Index: pkgsrc/math/openfst/Makefile
diff -u pkgsrc/math/openfst/Makefile:1.7 pkgsrc/math/openfst/Makefile:1.8
--- pkgsrc/math/openfst/Makefile:1.7    Tue Oct 11 16:35:49 2022
+++ pkgsrc/math/openfst/Makefile        Tue Jul 18 18:30:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/10/11 16:35:49 nros Exp $
+# $NetBSD: Makefile,v 1.8 2023/07/18 18:30:01 nia Exp $
 
 DISTNAME=      openfst-1.8.2
 CATEGORIES=    math
@@ -9,10 +9,11 @@ HOMEPAGE=     http://www.openfst.org/
 COMMENT=       Library for manipulating transducers
 LICENSE=       apache-2.0
 
-USE_LANGUAGES= c c++17
+USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 GNU_CONFIGURE= yes
-GCC_REQD+=     8 # needs <charconv> for from_chars
+
+USE_CXX_FEATURES+=     c++17 charconv
 
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:M*}

Index: pkgsrc/math/volk/Makefile
diff -u pkgsrc/math/volk/Makefile:1.15 pkgsrc/math/volk/Makefile:1.16
--- pkgsrc/math/volk/Makefile:1.15      Tue Jun  6 12:41:53 2023
+++ pkgsrc/math/volk/Makefile   Tue Jul 18 18:30:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/06/06 12:41:53 riastradh Exp $
+# $NetBSD: Makefile,v 1.16 2023/07/18 18:30:01 nia Exp $
 
 DISTNAME=      volk-2.5.2
 CATEGORIES=    math ham
@@ -13,12 +13,13 @@ LICENSE=    gnu-gpl-v3
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
 
-GCC_REQD+=     8       # std::filesystem
 USE_CMAKE=     yes
-USE_LANGUAGES= c c++17
+USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 TEST_TARGET=   test
 
+USE_CXX_FEATURES+=     c++17 filesystem
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-mako
 
 # XXX this doesn't work because VolkPython.cmake doesn't conform