CVS commit: pkgsrc/mail

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 18 18:27:35 UTC 2023

Modified Files:
        pkgsrc/mail/evolution-data-server: Makefile
        pkgsrc/mail/rspamd: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 pkgsrc/mail/evolution-data-server/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/mail/rspamd/Makefile

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

Modified files:

Index: pkgsrc/mail/evolution-data-server/Makefile
diff -u pkgsrc/mail/evolution-data-server/Makefile:1.218 pkgsrc/mail/evolution-data-server/Makefile:1.219
--- pkgsrc/mail/evolution-data-server/Makefile:1.218    Wed Apr 19 08:08:29 2023
+++ pkgsrc/mail/evolution-data-server/Makefile  Tue Jul 18 18:27:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.218 2023/04/19 08:08:29 adam Exp $
+# $NetBSD: Makefile,v 1.219 2023/07/18 18:27:34 nia Exp $
 
 DISTNAME=      evolution-data-server-3.42.2
 PKGREVISION=   9
@@ -15,10 +15,9 @@ USE_CMAKE=   yes
 USE_TOOLS+=    pkg-config perl:run
 USE_TOOLS+=    intltool msgfmt msgmerge xgettext
 USE_TOOLS+=    gdbus-codegen
-USE_LANGUAGES= c c++14
+USE_LANGUAGES= c c++
 
-# C++14
-GCC_REQD+=     5
+USE_CXX_FEATURES+=     c++14
 
 CMAKE_ARGS+=   -DWITH_LIBDB=OFF
 CMAKE_ARGS+=   -DENABLE_GOA=OFF

Index: pkgsrc/mail/rspamd/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.89 pkgsrc/mail/rspamd/Makefile:1.90
--- pkgsrc/mail/rspamd/Makefile:1.89    Sat Apr 29 14:23:35 2023
+++ pkgsrc/mail/rspamd/Makefile Tue Jul 18 18:27:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2023/04/29 14:23:35 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2023/07/18 18:27:34 nia Exp $
 
 DISTNAME=      rspamd-3.5
 CATEGORIES=    mail
@@ -12,19 +12,13 @@ LICENSE=    2-clause-bsd
 DEPENDS+=      ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg
 DEPENDS+=      ragel-[0-9]*:../../devel/ragel
 
-# std::string ends_with()
-GCC_REQD+=     9
-
 USE_TOOLS+=    perl pkg-config
 USE_LANGUAGES= c99 c++
 BUILD_DEFS+=   VARBASE
 
-.include "../../mk/bsd.prefs.mk"
+USE_CXX_FEATURES+=     c++20
 
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915
-USE_PKGSRC_GCC=                yes
-USE_PKGSRC_GCC_RUNTIME=        yes
-.endif
+.include "../../mk/bsd.prefs.mk"
 
 CPPFLAGS.SunOS+=                       -D__EXTENSIONS__