CVS commit: pkgsrc/databases

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 18 14:03:59 UTC 2023

Modified Files:
        pkgsrc/databases/mongodb: Makefile
        pkgsrc/databases/mongodb3: Makefile
        pkgsrc/databases/mysql57-client: Makefile.common
        pkgsrc/databases/mysql80-server: Makefile
        pkgsrc/databases/sqlitebrowser: Makefile

Log Message:
databases: Convert packages to using USE_(CC|CXX)_FEATURES


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/databases/mongodb/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/mongodb3/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/mysql57-client/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/mysql80-server/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/databases/sqlitebrowser/Makefile

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

Modified files:

Index: pkgsrc/databases/mongodb/Makefile
diff -u pkgsrc/databases/mongodb/Makefile:1.78 pkgsrc/databases/mongodb/Makefile:1.79
--- pkgsrc/databases/mongodb/Makefile:1.78      Tue Jun  6 12:40:27 2023
+++ pkgsrc/databases/mongodb/Makefile   Tue Jul 18 14:03:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2023/06/06 12:40:27 riastradh Exp $
+# $NetBSD: Makefile,v 1.79 2023/07/18 14:03:58 nia Exp $
 
 DISTNAME=      mongodb-src-r4.2.15
 PKGNAME=       ${DISTNAME:S/src-r//}
@@ -23,9 +23,6 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-yaml-[0-9]
 
 # https://github.com/mongodb/mongo/blob/master/docs/building.md
 USE_LANGUAGES= c99 c++17
-# Note that USE_LANGUAGES should contain c11, per SConstruct, but
-# pkgsrc does not yet support that.
-GCC_REQD+=     8
 
 USE_TOOLS+=    pkg-config
 
@@ -47,6 +44,8 @@ SCONS_ARGS+=  --use-system-yaml
 SCONS_ARGS+=   --use-system-zlib
 SCONS_ARGS+=   --use-system-zstd
 
+USE_CXX_FEATURES+=     c++17
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/databases/mongodb3/Makefile
diff -u pkgsrc/databases/mongodb3/Makefile:1.26 pkgsrc/databases/mongodb3/Makefile:1.27
--- pkgsrc/databases/mongodb3/Makefile:1.26     Sun Apr 23 14:26:15 2023
+++ pkgsrc/databases/mongodb3/Makefile  Tue Jul 18 14:03:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2023/04/23 14:26:15 adam Exp $
+# $NetBSD: Makefile,v 1.27 2023/07/18 14:03:58 nia Exp $
 
 # This package is intentionally old to avoid:
 #   Server Side Public License
@@ -22,7 +22,8 @@ EXTRACT_USING=        bsdtar
 
 NO_CONFIGURE=  yes
 USE_LANGUAGES= c c++
-GCC_REQD+=     5.3.0
+
+USE_CXX_FEATURES+=     c++14
 
 SCONS_ARGS=    ${_MAKE_JOBS}
 SCONS_ARGS+=   --dbg=off # on: argument parsing problem

Index: pkgsrc/databases/mysql57-client/Makefile.common
diff -u pkgsrc/databases/mysql57-client/Makefile.common:1.42 pkgsrc/databases/mysql57-client/Makefile.common:1.43
--- pkgsrc/databases/mysql57-client/Makefile.common:1.42        Sun Jul  9 10:17:15 2023
+++ pkgsrc/databases/mysql57-client/Makefile.common     Tue Jul 18 14:03:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2023/07/09 10:17:15 nia Exp $
+# $NetBSD: Makefile.common,v 1.43 2023/07/18 14:03:59 nia Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
@@ -15,8 +15,7 @@ LICENSE=      gnu-gpl-v2
 DISTINFO_FILE?=        ${.CURDIR}/../../databases/mysql57-client/distinfo
 PATCHDIR?=     ${.CURDIR}/../../databases/mysql57-client/patches
 
-# C++14
-GCC_REQD+=     5
+USE_CXX_FEATURES+=     c++14
 
 USE_CMAKE=             yes
 USE_LANGUAGES=         c99 gnu++14

Index: pkgsrc/databases/mysql80-server/Makefile
diff -u pkgsrc/databases/mysql80-server/Makefile:1.13 pkgsrc/databases/mysql80-server/Makefile:1.14
--- pkgsrc/databases/mysql80-server/Makefile:1.13       Tue May 23 21:01:12 2023
+++ pkgsrc/databases/mysql80-server/Makefile    Tue Jul 18 14:03:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/05/23 21:01:12 adam Exp $
+# $NetBSD: Makefile,v 1.14 2023/07/18 14:03:59 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 COMMENT=       MySQL 8, a free SQL database (server)
@@ -12,7 +12,7 @@ CMAKE_ARGS+=          -DWITH_PROTOBUF="system"
 
 PLIST_VARS+=           auth_socket
 
-GCC_REQD+=             8 # needs <charconv> include
+USE_CXX_FEATURES+=     charconv
 
 .if ${OPSYS} == "Linux"
 PLIST.auth_socket=     yes

Index: pkgsrc/databases/sqlitebrowser/Makefile
diff -u pkgsrc/databases/sqlitebrowser/Makefile:1.61 pkgsrc/databases/sqlitebrowser/Makefile:1.62
--- pkgsrc/databases/sqlitebrowser/Makefile:1.61        Mon May 22 21:00:19 2023
+++ pkgsrc/databases/sqlitebrowser/Makefile     Tue Jul 18 14:03:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2023/05/22 21:00:19 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2023/07/18 14:03:59 nia Exp $
 
 DISTNAME=      sqlitebrowser-3.12.2
 PKGREVISION=   13
@@ -11,11 +11,10 @@ COMMENT=    Qt5 lightweight GUI editor/view
 HOMEPAGE=      https://sqlitebrowser.org/
 LICENSE=       mpl-2.0 OR gnu-gpl-v3
 
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++
 USE_CMAKE=     yes
 
-# C++11
-GCC_REQD+=     4.9
+USE_CXX_FEATURES+=     c++11
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"