CVS commit: pkgsrc/textproc/py-enchant

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Apr 15 05:27:47 UTC 2024

Modified Files:
        pkgsrc/textproc/py-enchant: Makefile distinfo
Added Files:
        pkgsrc/textproc/py-enchant/patches: patch-enchant___enchant.py

Log Message:
py-enchant: always use libenchant2 from pkgsrc; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/py-enchant/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/py-enchant/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/py-enchant/patches/patch-enchant___enchant.py

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

Modified files:

Index: pkgsrc/textproc/py-enchant/Makefile
diff -u pkgsrc/textproc/py-enchant/Makefile:1.19 pkgsrc/textproc/py-enchant/Makefile:1.20
--- pkgsrc/textproc/py-enchant/Makefile:1.19    Mon Jan 22 13:28:38 2024
+++ pkgsrc/textproc/py-enchant/Makefile Mon Apr 15 05:27:46 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2024/01/22 13:28:38 adam Exp $
+# $NetBSD: Makefile,v 1.20 2024/04/15 05:27:46 adam Exp $
 
 DISTNAME=      pyenchant-3.2.2
+PKGREVISION=   1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pyenchant/}
@@ -22,7 +23,12 @@ PYTHON_VERSIONS_INCOMPATIBLE=        27
 
 SOEXT.dylib=   dylib
 SOEXT=         ${SOEXT.${SHLIB_TYPE}:Uso}
-MAKE_ENV+=     PYENCHANT_LIBRARY_PATH=${PREFIX}/lib/libenchant-2.${SOEXT}
+
+SUBST_CLASSES+=                libpath
+SUBST_STAGE.libpath=   pre-configure
+SUBST_MESSAGE.libpath= Fixing libenchant2 path.
+SUBST_FILES.libpath=   enchant/_enchant.py
+SUBST_SED.libpath=     -e 's,@PYENCHANT_LIBRARY_PATH@,${PREFIX}/lib/libenchant-2.${SOEXT},g'
 
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-enchant/distinfo
diff -u pkgsrc/textproc/py-enchant/distinfo:1.12 pkgsrc/textproc/py-enchant/distinfo:1.13
--- pkgsrc/textproc/py-enchant/distinfo:1.12    Mon Jan 22 13:28:38 2024
+++ pkgsrc/textproc/py-enchant/distinfo Mon Apr 15 05:27:46 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.12 2024/01/22 13:28:38 adam Exp $
+$NetBSD: distinfo,v 1.13 2024/04/15 05:27:46 adam Exp $
 
 BLAKE2s (pyenchant-3.2.2.tar.gz) = 9887a5ec697e378bab78692726c6a58b1d4f76faf585eef820ecfbf1b667f9ce
 SHA512 (pyenchant-3.2.2.tar.gz) = 65dd6abf51f7dd45d9879c63d9a1d34a4682ef37da961d0eb41849c6bbb707d94d079f5581b5f695a01fd9a9b68e9456d487b4423ed8382882f22eeeb6b080f8
 Size (pyenchant-3.2.2.tar.gz) = 49580 bytes
+SHA1 (patch-enchant___enchant.py) = c68f90c02bfb66a10183816fbbb310936eef6d5b

Added files:

Index: pkgsrc/textproc/py-enchant/patches/patch-enchant___enchant.py
diff -u /dev/null pkgsrc/textproc/py-enchant/patches/patch-enchant___enchant.py:1.1
--- /dev/null   Mon Apr 15 05:27:47 2024
+++ pkgsrc/textproc/py-enchant/patches/patch-enchant___enchant.py       Mon Apr 15 05:27:47 2024
@@ -0,0 +1,32 @@
+$NetBSD: patch-enchant___enchant.py,v 1.1 2024/04/15 05:27:47 adam Exp $
+
+Always return a path to libenchant2 from pkgsrc.
+
+--- enchant/_enchant.py.orig   2024-04-15 05:19:38.294407367 +0000
++++ enchant/_enchant.py
+@@ -124,24 +124,7 @@ def find_message(*args):
+ 
+ 
+ def find_c_enchant_lib():
+-    verbose = os.environ.get("PYENCHANT_VERBOSE_FIND")
+-    if verbose:
+-        global VERBOSE_FIND
+-        VERBOSE_FIND = True
+-    prefix = os.environ.get("PYENCHANT_ENCHANT_PREFIX")
+-    if prefix:
+-        return from_prefix(prefix)
+-
+-    library_path = os.environ.get("PYENCHANT_LIBRARY_PATH")
+-    if library_path:
+-        return from_env_var(library_path)
+-
+-    from_package = from_package_resources()
+-    if from_package:
+-        return from_package
+-
+-    # Last chance
+-    return from_system()
++    return "@PYENCHANT_LIBRARY_PATH@"
+ 
+ 
+ enchant_lib_path = find_c_enchant_lib()