CVS commit: pkgsrc/textproc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Tue, 18 Jul 2023 18:47:54 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 18 18:47:54 UTC 2023

Modified Files:
        pkgsrc/textproc/ansifilter: Makefile
        pkgsrc/textproc/enchant2: Makefile buildlink3.mk
        pkgsrc/textproc/libodfgen: Makefile
        pkgsrc/textproc/lua-rapidjson: Makefile
        pkgsrc/textproc/php-intl: Makefile
        pkgsrc/textproc/py-Levenshtein: Makefile
        pkgsrc/textproc/sentencepiece: Makefile.common
        pkgsrc/textproc/uchardet: Makefile
        pkgsrc/textproc/uncrustify: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/ansifilter/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/enchant2/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/enchant2/buildlink3.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/textproc/libodfgen/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/lua-rapidjson/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/textproc/php-intl/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/py-Levenshtein/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/sentencepiece/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/uchardet/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/uncrustify/Makefile

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

Modified files:

Index: pkgsrc/textproc/ansifilter/Makefile
diff -u pkgsrc/textproc/ansifilter/Makefile:1.3 pkgsrc/textproc/ansifilter/Makefile:1.4
--- pkgsrc/textproc/ansifilter/Makefile:1.3     Tue Jul 13 08:23:41 2021
+++ pkgsrc/textproc/ansifilter/Makefile Tue Jul 18 18:47:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/07/13 08:23:41 nia Exp $
+# $NetBSD: Makefile,v 1.4 2023/07/18 18:47:52 nia Exp $
 
 DISTNAME=      ansifilter-2.18
 CATEGORIES=    textproc
@@ -12,7 +12,7 @@ LICENSE=      gnu-gpl-v3
 
 USE_LANGUAGES= c c++
 
-GCC_REQD+=     4.7 # C++11
+USE_CXX_FEATURES+=     c++11
 
 MAKE_FILE=     makefile
 MAKE_FLAGS+=   PREFIX=${PREFIX:Q}

Index: pkgsrc/textproc/enchant2/Makefile
diff -u pkgsrc/textproc/enchant2/Makefile:1.27 pkgsrc/textproc/enchant2/Makefile:1.28
--- pkgsrc/textproc/enchant2/Makefile:1.27      Thu Jul 13 13:49:17 2023
+++ pkgsrc/textproc/enchant2/Makefile   Tue Jul 18 18:47:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2023/07/13 13:49:17 nia Exp $
+# $NetBSD: Makefile,v 1.28 2023/07/18 18:47:53 nia Exp $
 
 DISTNAME=              enchant-2.5.0
 PKGNAME=               ${DISTNAME:S/enchant/enchant2/}
@@ -14,6 +14,7 @@ LICENSE=              gnu-lgpl-v2.1
 
 USE_TOOLS+=            autoconf groff pkg-config
 USE_LANGUAGES=         c c++11
+USE_CXX_FEATURES+=     c++11
 USE_PKGLOCALEDIR=      yes
 USE_LIBTOOL=           yes
 PKGCONFIG_OVERRIDE+=   enchant.pc.in

Index: pkgsrc/textproc/enchant2/buildlink3.mk
diff -u pkgsrc/textproc/enchant2/buildlink3.mk:1.7 pkgsrc/textproc/enchant2/buildlink3.mk:1.8
--- pkgsrc/textproc/enchant2/buildlink3.mk:1.7  Wed Dec  8 16:02:41 2021
+++ pkgsrc/textproc/enchant2/buildlink3.mk      Tue Jul 18 18:47:53 2023
@@ -1,16 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.7 2021/12/08 16:02:41 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2023/07/18 18:47:53 nia Exp $
 
 BUILDLINK_TREE+=       enchant2
 
 .if !defined(ENCHANT2_BUILDLINK3_MK)
 ENCHANT2_BUILDLINK3_MK:=
 
+USE_CXX_FEATURES+=                     c++11
+
 BUILDLINK_API_DEPENDS.enchant2+=       enchant2>=2
 BUILDLINK_ABI_DEPENDS.enchant2+=       enchant2>=2.3.2
 BUILDLINK_PKGSRCDIR.enchant2?=         ../../textproc/enchant2
 
-GCC_REQD+=     4.8
-
 # Lots of older software looks for enchant.pc instead of enchant-2.pc.
 ${BUILDLINK_DIR}/lib/pkgconfig/enchant.pc:
        ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig

Index: pkgsrc/textproc/libodfgen/Makefile
diff -u pkgsrc/textproc/libodfgen/Makefile:1.35 pkgsrc/textproc/libodfgen/Makefile:1.36
--- pkgsrc/textproc/libodfgen/Makefile:1.35     Sun Apr 23 14:26:10 2023
+++ pkgsrc/textproc/libodfgen/Makefile  Tue Jul 18 18:47:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2023/04/23 14:26:10 adam Exp $
+# $NetBSD: Makefile,v 1.36 2023/07/18 18:47:53 nia Exp $
 
 DISTNAME=      libodfgen-0.1.7
 PKGREVISION=   7
@@ -14,10 +14,9 @@ LICENSE=     mpl-2.0 OR gnu-lgpl-v2
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++
 
-# C++11
-GCC_REQD+=     4.7
+USE_CXX_FEATURES+=     c++11
 
 CONFIGURE_ARGS+=       --disable-werror
 CONFIGURE_ARGS+=       --without-docs

Index: pkgsrc/textproc/lua-rapidjson/Makefile
diff -u pkgsrc/textproc/lua-rapidjson/Makefile:1.3 pkgsrc/textproc/lua-rapidjson/Makefile:1.4
--- pkgsrc/textproc/lua-rapidjson/Makefile:1.3  Sat Feb 19 20:55:31 2022
+++ pkgsrc/textproc/lua-rapidjson/Makefile      Tue Jul 18 18:47:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/02/19 20:55:31 nia Exp $
+# $NetBSD: Makefile,v 1.4 2023/07/18 18:47:53 nia Exp $
 
 DISTNAME=      lua-rapidjson-0.7.1
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME:S/^lua-//1}
@@ -21,8 +21,7 @@ TEST_DEPENDS+=        ${LUA_PKGPREFIX}-utf8-[0-
 
 CMAKE_ARGS+=   -DLUA_RAPIDJSON_VERSION=${PKGVERSION}
 
-# C++11
-GCC_REQD+=     4.7
+USE_CXX_FEATURES+=     c++11
 
 INSTALLATION_DIRS+=    ${LUA_CDIR}
 

Index: pkgsrc/textproc/php-intl/Makefile
diff -u pkgsrc/textproc/php-intl/Makefile:1.49 pkgsrc/textproc/php-intl/Makefile:1.50
--- pkgsrc/textproc/php-intl/Makefile:1.49      Wed Apr 19 08:11:38 2023
+++ pkgsrc/textproc/php-intl/Makefile   Tue Jul 18 18:47:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2023/04/19 08:11:38 adam Exp $
+# $NetBSD: Makefile,v 1.50 2023/07/18 18:47:53 nia Exp $
 
 MODNAME=               intl
 CATEGORIES+=           textproc
@@ -6,12 +6,12 @@ COMMENT=              PHP extension for i18n
 PKGREVISION=           10
 LICENSE=               php
 
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
 USE_PHP_EXT_PATCHES=   yes
 CONFIGURE_ARGS+=       --enable-${MODNAME}=shared,${BUILDLINK_DIR}
 CPPFLAGS+=             -DU_USING_ICU_NAMESPACE=1
 
-GCC_REQD+=             4.7 # minimum for -std=c++11
+USE_CXX_FEATURES+=     c++11
 
 USE_PHP_EXT_PATCHES=   yes
 

Index: pkgsrc/textproc/py-Levenshtein/Makefile
diff -u pkgsrc/textproc/py-Levenshtein/Makefile:1.10 pkgsrc/textproc/py-Levenshtein/Makefile:1.11
--- pkgsrc/textproc/py-Levenshtein/Makefile:1.10        Sat Jul  1 08:37:44 2023
+++ pkgsrc/textproc/py-Levenshtein/Makefile     Tue Jul 18 18:47:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/07/01 08:37:44 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2023/07/18 18:47:53 nia Exp $
 
 DISTNAME=      Levenshtein-0.21.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -19,7 +19,7 @@ DEPENDS+=     ${PYPKGPREFIX}-rapidfuzz>=2.3.
 
 USE_LANGUAGES= c c++
 
-GCC_REQD+=     7 # C++17
+USE_CXX_FEATURES+=     c++17
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 37 38
 

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

Index: pkgsrc/textproc/uchardet/Makefile
diff -u pkgsrc/textproc/uchardet/Makefile:1.2 pkgsrc/textproc/uchardet/Makefile:1.3
--- pkgsrc/textproc/uchardet/Makefile:1.2       Mon Apr 25 23:16:50 2022
+++ pkgsrc/textproc/uchardet/Makefile   Tue Jul 18 18:47:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/04/25 23:16:50 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2023/07/18 18:47:53 nia Exp $
 
 DISTNAME=      uchardet-0.0.7
 CATEGORIES=    textproc
@@ -15,8 +15,7 @@ USE_LANGUAGES=        c c++
 
 TEST_TARGET=   test
 
-# C++11
-GCC_REQD+=     4.7
+USE_CXX_FEATURES+=     c++11
 
 PKGCONFIG_OVERRIDE+=   uchardet.pc.in
 

Index: pkgsrc/textproc/uncrustify/Makefile
diff -u pkgsrc/textproc/uncrustify/Makefile:1.15 pkgsrc/textproc/uncrustify/Makefile:1.16
--- pkgsrc/textproc/uncrustify/Makefile:1.15    Tue Jul 11 05:58:40 2023
+++ pkgsrc/textproc/uncrustify/Makefile Tue Jul 18 18:47:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/07/11 05:58:40 nia Exp $
+# $NetBSD: Makefile,v 1.16 2023/07/18 18:47:53 nia Exp $
 
 DISTNAME=      uncrustify-0.76.0
 CATEGORIES=    textproc
@@ -13,8 +13,7 @@ LICENSE=      gnu-gpl-v2
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-# gcc 4.9 added support for std::regex_replace.
-GCC_REQD+=     4.9
+USE_CXX_FEATURES+=     regex
 
 OBJDIR=                        ${WRKSRC}/build
 CONFIGURE_DIRS=                ${OBJDIR}

Prev by Date: CVS commit: pkgsrc/security/libtomcrypt
Next by Date: CVS commit: pkgsrc/time/taskwarrior
Previous by Thread: CVS commit: pkgsrc/security/libtomcrypt
Next by Thread: CVS commit: pkgsrc/time/taskwarrior
Indexes:

Home | Main Index | Thread Index | Old Index