CVS commit: pkgsrc/textproc/enchant2

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Jun 17 12:16:51 UTC 2024

Modified Files:
        pkgsrc/textproc/enchant2: Makefile

Log Message:
textproc/enchant2: Clean up USE_LANGUAGES

There was FORCE_CXX_STD=c++11, blamed on hunspell, but enchant2 now
outright requires c++11 itself, probes for options, and sets --std.
The only thing wrong is not noting that requirement in README.
Therefore, simply USE_CXX_FEATURES as c++11 and drop FORCE_CXX_STD.

Move USE_LANGUAGES to its own block before tools, following
convention; sorting USE_CXX_FEATURES and USE_LANGUAGES backwards makes
it hard to follow.

This shouldn't change the binary package, unless perhaps a compiler is
defaulting to a newer std and produces different binary in c++11 vs
c++newer mode, in which case ride yesterday's update.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/textproc/enchant2/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/enchant2/Makefile
diff -u pkgsrc/textproc/enchant2/Makefile:1.43 pkgsrc/textproc/enchant2/Makefile:1.44
--- pkgsrc/textproc/enchant2/Makefile:1.43      Mon Jun 17 09:18:25 2024
+++ pkgsrc/textproc/enchant2/Makefile   Mon Jun 17 12:16:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2024/06/17 09:18:25 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2024/06/17 12:16:51 gdt Exp $
 
 DISTNAME=              enchant-2.8.1
 PKGNAME=               ${DISTNAME:S/enchant/enchant2/}
@@ -12,18 +12,17 @@ HOMEPAGE=           https://abiword.github.io/enc
 COMMENT=               Generic spell checking library
 LICENSE=               gnu-lgpl-v2.1
 
-USE_TOOLS+=            autoconf gmake groff pkg-config
 USE_LANGUAGES=         c c++
+# Upstream doesn't document, but configure.ac requires C++11.
+USE_CXX_FEATURES+=     c++11
+
+USE_TOOLS+=            autoconf gmake groff pkg-config
 USE_PKGLOCALEDIR=      yes
 USE_LIBTOOL=           yes
 PKGCONFIG_OVERRIDE+=   enchant.pc.in
 GNU_CONFIGURE=         yes
 CFLAGS.SunOS+=         -D__EXTENSIONS__
 
-# Mostly needed due to hunspell headers making c++98 default unacceptable.
-FORCE_CXX_STD=         c++11
-USE_CXX_FEATURES+=     c++11
-
 # unsupported in pkgsrc - other dictionaries can be used instead
 # avoid PLIST problems
 CONFIGURE_ARGS+=       --without-hspell