CVS commit: pkgsrc/textproc/enchant2

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Jun 22 12:39:59 UTC 2024

Modified Files:
        pkgsrc/textproc/enchant2: Makefile options.mk

Log Message:
textproc/enchant2: Stop force-disabling apple spell

Before the freeze, I disabled all spellcheckers not covered by options
to avoid packaging failures and behavior changes from finding packages
that are installed and not declared dependencies.  It turns out one of
those not-declared dependencies was apple spell on mac, and the
package's PLIST.Darwin expects it always.

As a minimal fix in freeze, comment out the disabling of apple spell.
This will leave Darwin that is not macOS broken, but probably Darwin
without macOS is solidly at zero users.

As part of looking at the other supported spellcheckers for similar
issues, fold the comments in options about checkers supported in
enchant2 but not handled in options.mk to the main Makefile block that
disables them, removing comments about checkers no longer present in
the upstream sources.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/textproc/enchant2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/enchant2/options.mk

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.45 pkgsrc/textproc/enchant2/Makefile:1.46
--- pkgsrc/textproc/enchant2/Makefile:1.45      Mon Jun 17 12:23:58 2024
+++ pkgsrc/textproc/enchant2/Makefile   Sat Jun 22 12:39:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2024/06/17 12:23:58 gdt Exp $
+# $NetBSD: Makefile,v 1.46 2024/06/22 12:39:59 gdt Exp $
 
 DISTNAME=              enchant-2.8.1
 PKGNAME=               ${DISTNAME:S/enchant/enchant2/}
@@ -26,9 +26,13 @@ CFLAGS.SunOS+=               -D__EXTENSIONS__
 # Force disable all spell checkers that are not handled in options.mk,
 # to avoid them being unintentionally found if installed.
 CONFIGURE_ARGS+=       --without-nuspell
-CONFIGURE_ARGS+=       --without-hspell
-CONFIGURE_ARGS+=       --without-voikko
-CONFIGURE_ARGS+=       --without-applespell
+CONFIGURE_ARGS+=       --without-hspell        # Hebrew
+CONFIGURE_ARGS+=       --without-voikko        # Finnish
+
+# \todo The package previously relied on finding applespell on mac,
+# without forcing it on, and without explaining this.  Change to
+# enable on mac (but not on darwin without mac!).
+#CONFIGURE_ARGS+=      --without-applespell
 
 # needed for testing
 CONFIGURE_ARGS+=       --enable-relocatable

Index: pkgsrc/textproc/enchant2/options.mk
diff -u pkgsrc/textproc/enchant2/options.mk:1.2 pkgsrc/textproc/enchant2/options.mk:1.3
--- pkgsrc/textproc/enchant2/options.mk:1.2     Tue Apr 30 06:30:24 2024
+++ pkgsrc/textproc/enchant2/options.mk Sat Jun 22 12:39:59 2024
@@ -1,11 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2024/04/30 06:30:24 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2024/06/22 12:39:59 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.enchant2
 PKG_SUPPORTED_OPTIONS= aspell enchant-zemberek hunspell
-# Code also supports the following:
-# hspell - Hebrew spelling
-# uspell - Yiddish spelling
-# voikko - Finnish spelling
 PKG_SUGGESTED_OPTIONS= hunspell
 
 .include "../../mk/bsd.options.mk"