CVS commit: pkgsrc/misc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 18 18:31:20 UTC 2023

Modified Files:
        pkgsrc/misc/libcec: Makefile
        pkgsrc/misc/libreoffice: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/libcec/Makefile
cvs rdiff -u -r1.310 -r1.311 pkgsrc/misc/libreoffice/Makefile

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

Modified files:

Index: pkgsrc/misc/libcec/Makefile
diff -u pkgsrc/misc/libcec/Makefile:1.6 pkgsrc/misc/libcec/Makefile:1.7
--- pkgsrc/misc/libcec/Makefile:1.6     Thu Jun 30 11:18:38 2022
+++ pkgsrc/misc/libcec/Makefile Tue Jul 18 18:31:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/06/30 11:18:38 nia Exp $
+# $NetBSD: Makefile,v 1.7 2023/07/18 18:31:20 nia Exp $
 
 DISTNAME=      libcec-4.0.4
 PKGREVISION=   2
@@ -14,10 +14,9 @@ LICENSE=     gnu-gpl-v2
 
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++
 
-# C++11
-GCC_REQD+=     4.8
+USE_CXX_FEATURES+=     c++11
 
 CMAKE_ARGS+=   -DSKIP_PYTHON_WRAPPER=ON
 

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.310 pkgsrc/misc/libreoffice/Makefile:1.311
--- pkgsrc/misc/libreoffice/Makefile:1.310      Mon Jul 17 14:30:50 2023
+++ pkgsrc/misc/libreoffice/Makefile    Tue Jul 18 18:31:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.310 2023/07/17 14:30:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.311 2023/07/18 18:31:20 nia Exp $
 
 VERREL=                7.5.4
 VERRC=         2
@@ -15,9 +15,9 @@ LICENSE=      gnu-lgpl-v3
 
 UNLIMIT_RESOURCES+=    cputime
 
-USE_LANGUAGES= c gnu++17
+USE_LANGUAGES= c c++
 
-# Do not use alloca(3) in libc at least on NetBSD.
+# Needed to get a proper (builtin) definition of alloca(3) on NetBSD.
 BUILDLINK_TRANSFORM+=  opt:-std=c++17:-std=gnu++17
 BUILDLINK_TRANSFORM+=  opt:-std=c++1z:-std=gnu++1z
 BUILDLINK_TRANSFORM+=  opt:-std=c++2a:-std=gnu++2a
@@ -43,7 +43,7 @@ SUBST_MESSAGE.font-path=      Use pkgsrc font
 SUBST_FILES.font-path+=                external/pdfium/pkgsrc.patch.1
 SUBST_VARS.font-path+=         X11BASE
 
-GCC_REQD+=     7
+USE_CXX_FEATURES+=     c++17
 
 BUILD_TARGET=  build