CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jul 13 13:55:10 UTC 2023

Modified Files:
        pkgsrc/geography/gama: Makefile
        pkgsrc/textproc/sentencepiece: Makefile.common

Log Message:
*: Revert two recent commits that dropped a cwrappers-enforced C++ standard
by packages that already use -std=c++XX until the discussion about C++
standard versions is resolved.

Requested by pkgsrc-pmc@.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/geography/gama/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/sentencepiece/Makefile.common

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

Modified files:

Index: pkgsrc/geography/gama/Makefile
diff -u pkgsrc/geography/gama/Makefile:1.59 pkgsrc/geography/gama/Makefile:1.60
--- pkgsrc/geography/gama/Makefile:1.59 Mon Jul 10 07:13:53 2023
+++ pkgsrc/geography/gama/Makefile      Thu Jul 13 13:55:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2023/07/10 07:13:53 nia Exp $
+# $NetBSD: Makefile,v 1.60 2023/07/13 13:55:10 nia Exp $
 #
 
 DISTNAME=      gama-2.24
@@ -11,13 +11,10 @@ HOMEPAGE=   https://www.gnu.org/s/gama/
 COMMENT=       Geodetic network adjustment (surveying)
 LICENSE=       gnu-gpl-v2 # or later
 
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++11
 # Not documented, but apparent.
 USE_TOOLS+=    gmake
 
-# C++14
-GCC_REQD+=     5
-
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --infodir=${PREFIX}/info
 

Index: pkgsrc/textproc/sentencepiece/Makefile.common
diff -u pkgsrc/textproc/sentencepiece/Makefile.common:1.4 pkgsrc/textproc/sentencepiece/Makefile.common:1.5
--- pkgsrc/textproc/sentencepiece/Makefile.common:1.4   Thu Jul 13 13:49:17 2023
+++ pkgsrc/textproc/sentencepiece/Makefile.common       Thu Jul 13 13:55:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2023/07/13 13:49:17 nia Exp $
+# $NetBSD: Makefile.common,v 1.5 2023/07/13 13:55:10 nia Exp $
 #
 # used by textproc/sentencepiece/Makefile
 # used by textproc/py-sentencepiece/Makefile
@@ -13,6 +13,6 @@ HOMEPAGE=     https://github.com/google/sent
 COMMENT=       Unsupervised text tokenizer for Neural Network-based text generation
 LICENSE=       apache-2.0
 
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++17
 
 .include "../../mk/atomic64.mk"