CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Thu, 20 Jul 2023 09:46:34 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jul 20 09:46:34 UTC 2023

Modified Files:
        pkgsrc/devel/googletest: Makefile buildlink3.mk
        pkgsrc/devel/kdevelop4: Makefile
        pkgsrc/devel/pangomm: Makefile
        pkgsrc/devel/pangomm2.48: Makefile
        pkgsrc/devel/wabt: Makefile
        pkgsrc/devel/woboq_codebrowser: Makefile
        pkgsrc/games/supertux: Makefile
        pkgsrc/graphics/gimp: Makefile
        pkgsrc/graphics/oxygen-icons: Makefile
        pkgsrc/print/web2c: Makefile
        pkgsrc/textproc/uriparser: options.mk
        pkgsrc/textproc/yaml-cpp: Makefile buildlink3.mk

Log Message:
*: Convert some remaining usage of GCC_REQD.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/googletest/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/googletest/buildlink3.mk
cvs rdiff -u -r1.111 -r1.112 pkgsrc/devel/kdevelop4/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/devel/pangomm/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/pangomm2.48/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/wabt/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/woboq_codebrowser/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/games/supertux/Makefile
cvs rdiff -u -r1.379 -r1.380 pkgsrc/graphics/gimp/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/graphics/oxygen-icons/Makefile
cvs rdiff -u -r1.112 -r1.113 pkgsrc/print/web2c/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/uriparser/options.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/yaml-cpp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/yaml-cpp/buildlink3.mk

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

Modified files:

Index: pkgsrc/devel/googletest/Makefile
diff -u pkgsrc/devel/googletest/Makefile:1.24 pkgsrc/devel/googletest/Makefile:1.25
--- pkgsrc/devel/googletest/Makefile:1.24       Tue Jul 18 14:11:15 2023
+++ pkgsrc/devel/googletest/Makefile    Thu Jul 20 09:46:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/07/18 14:11:15 nia Exp $
+# $NetBSD: Makefile,v 1.25 2023/07/20 09:46:33 nia Exp $
 
 DISTNAME=      googletest-1.13.0
 CATEGORIES=    devel
@@ -10,12 +10,9 @@ HOMEPAGE=    https://github.com/google/goog
 COMMENT=       Google's C++ testing framework
 LICENSE=       modified-bsd
 
-# XXX check this and update it to use USE_CXX_FEATURES
-# gcc7 is very high for a c++11 or c++14 baseline
-USE_LANGUAGES= c c++14
+USE_LANGUAGES= c c++
 
-# cc1plus: error: unrecognized command line option "-std=c++11"
-GCC_REQD+=     7
+USE_CXX_FEATURES+=     c++14
 
 CFLAGS+=       -fPIE
 CXXFLAGS+=     -fPIE

Index: pkgsrc/devel/googletest/buildlink3.mk
diff -u pkgsrc/devel/googletest/buildlink3.mk:1.3 pkgsrc/devel/googletest/buildlink3.mk:1.4
--- pkgsrc/devel/googletest/buildlink3.mk:1.3   Sun Oct 25 12:59:26 2020
+++ pkgsrc/devel/googletest/buildlink3.mk       Thu Jul 20 09:46:33 2023
@@ -1,15 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/10/25 12:59:26 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/07/20 09:46:33 nia Exp $
 
 BUILDLINK_TREE+=       googletest
 
 .if !defined(GOOGLETEST_BUILDLINK3_MK)
 GOOGLETEST_BUILDLINK3_MK:=
 
+USE_CXX_FEATURES+=             c++14
+
 BUILDLINK_API_DEPENDS.googletest+=     googletest>=1.4.0
 BUILDLINK_DEPMETHOD.googletest?=       build
 BUILDLINK_PKGSRCDIR.googletest?=       ../../devel/googletest
 
-GCC_REQD+=     4.8
 .endif # GOOGLETEST_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -googletest

Index: pkgsrc/devel/kdevelop4/Makefile
diff -u pkgsrc/devel/kdevelop4/Makefile:1.111 pkgsrc/devel/kdevelop4/Makefile:1.112
--- pkgsrc/devel/kdevelop4/Makefile:1.111       Tue Jun  6 12:40:38 2023
+++ pkgsrc/devel/kdevelop4/Makefile     Thu Jul 20 09:46:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2023/06/06 12:40:38 riastradh Exp $
+# $NetBSD: Makefile,v 1.112 2023/07/20 09:46:33 nia Exp $
 #
 
 DISTNAME=      kdevelop-4.7.0
@@ -23,8 +23,7 @@ USE_TOOLS+=   gmake
 
 CMAKE_ARGS+=   -DWITH_KDE4Workspace:BOOL=OFF
 
-#   -std=c++11 is set
-GCC_REQD+=     4.7
+USE_CXX_FEATURES+=     c++11
 
 BUILDLINK_DEPMETHOD.qt4-tools= full
 .include "../../meta-pkgs/kde4/kde4.mk"

Index: pkgsrc/devel/pangomm/Makefile
diff -u pkgsrc/devel/pangomm/Makefile:1.70 pkgsrc/devel/pangomm/Makefile:1.71
--- pkgsrc/devel/pangomm/Makefile:1.70  Sun Jan 29 21:14:32 2023
+++ pkgsrc/devel/pangomm/Makefile       Thu Jul 20 09:46:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2023/01/29 21:14:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.71 2023/07/20 09:46:33 nia Exp $
 
 DISTNAME=      pangomm-2.46.3
 PKGREVISION=   1
@@ -13,12 +13,13 @@ LICENSE=    gnu-lgpl-v2.1
 
 CONFLICTS+=    gtkmm<=2.13.5
 
-GCC_REQD+=             4.9
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gm4 perl:run pkg-config
 PKGCONFIG_OVERRIDE+=   pango/pangomm.pc.in
 
+USE_CXX_FEATURES+=     c++11
+
 .include "../../devel/glibmm/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 BUILDLINK_API_DEPENDS.mm-common+=      mm-common>=0.9.10

Index: pkgsrc/devel/pangomm2.48/Makefile
diff -u pkgsrc/devel/pangomm2.48/Makefile:1.6 pkgsrc/devel/pangomm2.48/Makefile:1.7
--- pkgsrc/devel/pangomm2.48/Makefile:1.6       Sun Jan 29 21:14:33 2023
+++ pkgsrc/devel/pangomm2.48/Makefile   Thu Jul 20 09:46:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/01/29 21:14:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2023/07/20 09:46:33 nia Exp $
 
 DISTNAME=      pangomm-2.48.2
 PKGNAME=       ${DISTNAME:S/pangomm/pangomm2.48/}
@@ -12,13 +12,14 @@ HOMEPAGE=   https://www.gtkmm.org/
 COMMENT=       C++ bindings for pango (2.48 API)
 LICENSE=       gnu-lgpl-v2.1
 
-GCC_REQD+=             4.9
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gm4 perl:run pkg-config
 # TODO: update
 PKGCONFIG_OVERRIDE+=   pango/pangomm.pc.in
 
+USE_CXX_FEATURES+=     c++11
+
 .include "../../devel/glibmm2.68/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 BUILDLINK_API_DEPENDS.mm-common+=      mm-common>=0.9.10

Index: pkgsrc/devel/wabt/Makefile
diff -u pkgsrc/devel/wabt/Makefile:1.19 pkgsrc/devel/wabt/Makefile:1.20
--- pkgsrc/devel/wabt/Makefile:1.19     Sun Jul  9 15:28:30 2023
+++ pkgsrc/devel/wabt/Makefile  Thu Jul 20 09:46:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2023/07/09 15:28:30 nia Exp $
+# $NetBSD: Makefile,v 1.20 2023/07/20 09:46:33 nia Exp $
 
 DISTNAME=      wabt-1.0.33
 CATEGORIES=    devel
@@ -15,8 +15,7 @@ CMAKE_ARG_PATH=       ${WRKSRC}
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-# C++17
-GCC_REQD+=     7
+USE_CXX_FEATURES+=     c++17
 
 CMAKE_ARGS+=   -DBUILD_TESTS=OFF -DBUILD_LIBWASM=OFF
 

Index: pkgsrc/devel/woboq_codebrowser/Makefile
diff -u pkgsrc/devel/woboq_codebrowser/Makefile:1.18 pkgsrc/devel/woboq_codebrowser/Makefile:1.19
--- pkgsrc/devel/woboq_codebrowser/Makefile:1.18        Sun May 21 22:40:33 2023
+++ pkgsrc/devel/woboq_codebrowser/Makefile     Thu Jul 20 09:46:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/05/21 22:40:33 nikita Exp $
+# $NetBSD: Makefile,v 1.19 2023/07/20 09:46:33 nia Exp $
 
 DISTNAME=      codebrowser-2.1.20230517
 PKGNAME=       woboq_${DISTNAME}
@@ -13,12 +13,13 @@ LICENSE=    cc-by-nc-sa-v3.0-license
 
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++17
-GCC_REQD+=     7
 CMAKE_ARGS+=   -DLLVM_CONFIG_EXECUTABLE=${LLVM_CONFIG_PATH:Q}
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
 # CMAKE_ARGS+= -DCLANG_BUILTIN_HEADERS_DIR=${BUILDLINK_PREFIX.clang}/lib/clang/16/include
 WRKSRC=                ${WRKDIR}/codebrowser-${GITHUB_TAG}
 
+USE_CXX_FEATURES+=     c++17
+
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--as-needed
 
 .include "../../lang/clang/buildlink3.mk"

Index: pkgsrc/games/supertux/Makefile
diff -u pkgsrc/games/supertux/Makefile:1.42 pkgsrc/games/supertux/Makefile:1.43
--- pkgsrc/games/supertux/Makefile:1.42 Tue Jul 18 14:50:45 2023
+++ pkgsrc/games/supertux/Makefile      Thu Jul 20 09:46:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2023/07/18 14:50:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2023/07/20 09:46:34 nia Exp $
 
 PKGNAME=               supertux-0.6.3
 DISTNAME=              SuperTux-v${PKGVERSION_NOREV}-Source
@@ -17,8 +17,7 @@ CMAKE_ARGS+=          -DBUILD_SHARED_LIBS=off
 USE_TOOLS+=            pkg-config
 USE_LANGUAGES=         c c++14
 
-# C++14
-GCC_REQD+=             5
+USE_CXX_FEATURES+=     c++14
 
 # We already patch 'configure'...
 CHECK_PORTABILITY_SKIP+=       external/SDL_ttf/configure.in

Index: pkgsrc/graphics/gimp/Makefile
diff -u pkgsrc/graphics/gimp/Makefile:1.379 pkgsrc/graphics/gimp/Makefile:1.380
--- pkgsrc/graphics/gimp/Makefile:1.379 Fri Jul 14 14:10:08 2023
+++ pkgsrc/graphics/gimp/Makefile       Thu Jul 20 09:46:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.379 2023/07/14 14:10:08 adam Exp $
+# $NetBSD: Makefile,v 1.380 2023/07/20 09:46:34 nia Exp $
 
 DISTNAME=      gimp-2.10.34
 CATEGORIES=    graphics
@@ -38,8 +38,7 @@ PKG_SYSCONFSUBDIR=    gimp/2.0
 PKGCONFIG_OVERRIDE=    gimp.pc.in
 UNLIMIT_RESOURCES+=    datasize
 
-# GCC 4.x C++14 support is not new enough.
-GCC_REQD+=     5
+USE_CXX_FEATURES+=     c++14
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/graphics/oxygen-icons/Makefile
diff -u pkgsrc/graphics/oxygen-icons/Makefile:1.45 pkgsrc/graphics/oxygen-icons/Makefile:1.46
--- pkgsrc/graphics/oxygen-icons/Makefile:1.45  Mon Jul 10 07:59:49 2023
+++ pkgsrc/graphics/oxygen-icons/Makefile       Thu Jul 20 09:46:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2023/07/10 07:59:49 nia Exp $
+# $NetBSD: Makefile,v 1.46 2023/07/20 09:46:34 nia Exp $
 
 DISTNAME=      oxygen-icons5-5.98.0
 PKGNAME=       ${DISTNAME:S/5//}
@@ -13,10 +13,11 @@ LICENSE=    gnu-lgpl-v3
 
 TOOL_DEPENDS+=         extra-cmake-modules>=5.98.0:../../devel/extra-cmake-modules
 
+USE_LANGUAGES= c c++
+
 # Why a collection of images requires a C++17 compiler is anyone's guess,
 # but this is a hard requirement from the KDE cmake infrastructure.
-USE_LANGUAGES= c c++
-GCC_REQD+=     7
+USE_CXX_FEATURES+=     c++17
 
 CMAKE_ARGS+=   -DKF_IGNORE_PLATFORM_CHECK=true
 

Index: pkgsrc/print/web2c/Makefile
diff -u pkgsrc/print/web2c/Makefile:1.112 pkgsrc/print/web2c/Makefile:1.113
--- pkgsrc/print/web2c/Makefile:1.112   Mon Apr 10 23:51:59 2023
+++ pkgsrc/print/web2c/Makefile Thu Jul 20 09:46:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2023/04/10 23:51:59 markd Exp $
+# $NetBSD: Makefile,v 1.113 2023/07/20 09:46:34 nia Exp $
 
 .include "../../print/texlive/Makefile.common"
 
@@ -19,8 +19,7 @@ USE_TOOLS+=           gmake lex yacc
 GNU_CONFIGURE_STRICT=  no # texk/web2c/web2c doesn't know the options
 PKGCONFIG_OVERRIDE=    synctexdir/synctex.pc.in
 
-# C++14
-GCC_REQD+=             5
+USE_CXX_FEATURES+=     c++14
 
 INFO_FILES=            yes
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/texk/web2c

Index: pkgsrc/textproc/uriparser/options.mk
diff -u pkgsrc/textproc/uriparser/options.mk:1.1 pkgsrc/textproc/uriparser/options.mk:1.2
--- pkgsrc/textproc/uriparser/options.mk:1.1    Tue Jul 11 05:55:10 2023
+++ pkgsrc/textproc/uriparser/options.mk        Thu Jul 20 09:46:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/07/11 05:55:10 nia Exp $
+# $NetBSD: options.mk,v 1.2 2023/07/20 09:46:34 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.uriparser
 
@@ -17,7 +17,6 @@ PKG_SUPPORTED_OPTIONS=        tests
 TEST_TARGET=   test
 CMAKE_ARGS+=   -DURIPARSER_BUILD_TESTS=ON
 USE_LANGUAGES= c c++14
-GCC_REQD+=     5
 .  include "../../devel/googletest/buildlink3.mk"
 .else
 CMAKE_ARGS+=   -DURIPARSER_BUILD_TESTS=OFF

Index: pkgsrc/textproc/yaml-cpp/Makefile
diff -u pkgsrc/textproc/yaml-cpp/Makefile:1.10 pkgsrc/textproc/yaml-cpp/Makefile:1.11
--- pkgsrc/textproc/yaml-cpp/Makefile:1.10      Tue Jul 18 18:34:53 2023
+++ pkgsrc/textproc/yaml-cpp/Makefile   Thu Jul 20 09:46:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/07/18 18:34:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2023/07/20 09:46:34 nia Exp $
 
 DISTNAME=      yaml-cpp-0.7.0
 PKGREVISION=   1
@@ -13,14 +13,13 @@ COMMENT=    YAML parser and emitter for C++
 LICENSE=       mit
 
 USE_CMAKE=     yes
-USE_LANGUAGES= c c++11
-
-# C++11
-GCC_REQD+=     4.7
+USE_LANGUAGES= c c++
 
 CMAKE_ARGS+=   -DYAML_BUILD_SHARED_LIBS=ON
 CMAKE_ARGS+=   -DYAML_CPP_BUILD_TESTS=OFF # issue 539
 
+USE_CXX_FEATURES+=     c++11
+
 PKGCONFIG_OVERRIDE+=   yaml-cpp.pc.cmake
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/yaml-cpp/buildlink3.mk
diff -u pkgsrc/textproc/yaml-cpp/buildlink3.mk:1.3 pkgsrc/textproc/yaml-cpp/buildlink3.mk:1.4
--- pkgsrc/textproc/yaml-cpp/buildlink3.mk:1.3  Tue Jan 30 07:22:17 2018
+++ pkgsrc/textproc/yaml-cpp/buildlink3.mk      Thu Jul 20 09:46:34 2023
@@ -1,10 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/01/30 07:22:17 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/07/20 09:46:34 nia Exp $
 
 BUILDLINK_TREE+=       yaml-cpp
 
 .if !defined(YAML_CPP_BUILDLINK3_MK)
 YAML_CPP_BUILDLINK3_MK:=
 
+USE_CXX_FEATURES+=                     c++11
+
 BUILDLINK_API_DEPENDS.yaml-cpp+=       yaml-cpp>=0.5.0
 BUILDLINK_PKGSRCDIR.yaml-cpp?=         ../../textproc/yaml-cpp

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/glibmm2.68
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel/glibmm2.68
Indexes:

Home | Main Index | Thread Index | Old Index