Thu Jul 13 13:55:10 2023 UTC ()
*: 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@.


(nia)
diff -r1.59 -r1.60 pkgsrc/geography/gama/Makefile
diff -r1.4 -r1.5 pkgsrc/textproc/sentencepiece/Makefile.common
cvs diff -r1.59 -r1.60 pkgsrc/geography/gama/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/gama/Makefile 2023/07/10 07:13:53 1.59
+++ pkgsrc/geography/gama/Makefile 2023/07/13 13:55:10 1.60
@@ -1,31 +1,28 @@ @@ -1,31 +1,28 @@
1# $NetBSD: Makefile,v 1.59 2023/07/10 07:13:53 nia Exp $ 1# $NetBSD: Makefile,v 1.60 2023/07/13 13:55:10 nia Exp $
2# 2#
3 3
4DISTNAME= gama-2.24 4DISTNAME= gama-2.24
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= geography 6CATEGORIES= geography
7MASTER_SITES= ${MASTER_SITE_GNU:=gama/} 7MASTER_SITES= ${MASTER_SITE_GNU:=gama/}
8 8
9MAINTAINER= gdt@NetBSD.org 9MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= https://www.gnu.org/s/gama/ 10HOMEPAGE= https://www.gnu.org/s/gama/
11COMMENT= Geodetic network adjustment (surveying) 11COMMENT= Geodetic network adjustment (surveying)
12LICENSE= gnu-gpl-v2 # or later 12LICENSE= gnu-gpl-v2 # or later
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++11
15# Not documented, but apparent. 15# Not documented, but apparent.
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17 17
18# C++14 
19GCC_REQD+= 5 
20 
21GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
22CONFIGURE_ARGS+= --infodir=${PREFIX}/info 19CONFIGURE_ARGS+= --infodir=${PREFIX}/info
23 20
24INFO_FILES= yes 21INFO_FILES= yes
25 22
26TEST_TARGET= check 23TEST_TARGET= check
27 24
28.include "../../databases/sqlite3/buildlink3.mk" 25.include "../../databases/sqlite3/buildlink3.mk"
29.include "../../textproc/expat/buildlink3.mk" 26.include "../../textproc/expat/buildlink3.mk"
30.include "../../textproc/yaml-cpp/buildlink3.mk" 27.include "../../textproc/yaml-cpp/buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/textproc/sentencepiece/Makefile.common (expand / switch to unified diff)

--- pkgsrc/textproc/sentencepiece/Makefile.common 2023/07/13 13:49:17 1.4
+++ pkgsrc/textproc/sentencepiece/Makefile.common 2023/07/13 13:55:10 1.5
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile.common,v 1.4 2023/07/13 13:49:17 nia Exp $ 1# $NetBSD: Makefile.common,v 1.5 2023/07/13 13:55:10 nia Exp $
2# 2#
3# used by textproc/sentencepiece/Makefile 3# used by textproc/sentencepiece/Makefile
4# used by textproc/py-sentencepiece/Makefile 4# used by textproc/py-sentencepiece/Makefile
5 5
6DISTNAME= sentencepiece-0.1.97 6DISTNAME= sentencepiece-0.1.97
7CATEGORIES= textproc 7CATEGORIES= textproc
8MASTER_SITES= ${MASTER_SITE_GITHUB:=google/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=google/}
9GITHUB_TAG= v${PKGVERSION_NOREV} 9GITHUB_TAG= v${PKGVERSION_NOREV}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://github.com/google/sentencepiece/ 12HOMEPAGE= https://github.com/google/sentencepiece/
13COMMENT= Unsupervised text tokenizer for Neural Network-based text generation 13COMMENT= Unsupervised text tokenizer for Neural Network-based text generation
14LICENSE= apache-2.0 14LICENSE= apache-2.0
15 15
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++17
17 17
18.include "../../mk/atomic64.mk" 18.include "../../mk/atomic64.mk"