CVS commit: pkgsrc/textproc/py-enchant

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jul 13 15:51:52 UTC 2019

Modified Files:
        pkgsrc/textproc/py-enchant: Makefile distinfo
        pkgsrc/textproc/py-enchant/patches: patch-ab

Log Message:
py-enchant: update to 1.6.11nb1.

Switch from enchant to enchant2.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/py-enchant/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/py-enchant/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-enchant/patches/patch-ab

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.15 pkgsrc/textproc/py-enchant/Makefile:1.16
--- pkgsrc/textproc/py-enchant/Makefile:1.15    Sat Oct  7 07:05:49 2017
+++ pkgsrc/textproc/py-enchant/Makefile Sat Jul 13 15:51:52 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2017/10/07 07:05:49 adam Exp $
+# $NetBSD: Makefile,v 1.16 2019/07/13 15:51:52 wiz Exp $
 
 DISTNAME=      pyenchant-1.6.11
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
+PKGREVISION=   1
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pyenchant/}
 
@@ -12,7 +13,7 @@ LICENSE=      gnu-lgpl-v2.1
 
 .include "../../lang/python/pyversion.mk"
 
-DEPENDS+=      enchant-[0-9]*:../../textproc/enchant
+DEPENDS+=      enchant2-[0-9]*:../../textproc/enchant2
 
 USE_LANGUAGES= # empty
 
@@ -20,7 +21,7 @@ USE_LANGUAGES=        # empty
 
 DLEXT.dylib=           dylib
 DLEXT=                 ${DLEXT.${SHLIB_TYPE}:Uso}
-PYENCHANT_LIBRARY_PATH=        ${PREFIX}/lib/libenchant.${DLEXT}
+PYENCHANT_LIBRARY_PATH=        ${PREFIX}/lib/libenchant-2.${DLEXT}
 
 # fix the path of libenchant with patch-ab.
 SUBST_CLASSES+=                dlpath

Index: pkgsrc/textproc/py-enchant/distinfo
diff -u pkgsrc/textproc/py-enchant/distinfo:1.7 pkgsrc/textproc/py-enchant/distinfo:1.8
--- pkgsrc/textproc/py-enchant/distinfo:1.7     Sat Oct  7 07:05:49 2017
+++ pkgsrc/textproc/py-enchant/distinfo Sat Jul 13 15:51:52 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2017/10/07 07:05:49 adam Exp $
+$NetBSD: distinfo,v 1.8 2019/07/13 15:51:52 wiz Exp $
 
 SHA1 (pyenchant-1.6.11.tar.gz) = 0119a4ceaa849bc45efbca8d4f5afed537eefc8b
 RMD160 (pyenchant-1.6.11.tar.gz) = dd8b3e3259837a55b93dc58798404bed1d4b406c
 SHA512 (pyenchant-1.6.11.tar.gz) = fadc7382592c426af9b886e1d23e444b1067353aae35805ddba1d43ad62c23d569211f36fda421bd39039134e20310d0e2eafea05564cdb8e747581ca55fb79c
 Size (pyenchant-1.6.11.tar.gz) = 64137 bytes
-SHA1 (patch-ab) = cc3cc686c76ecc45ae624d319f8207adad5a2207
+SHA1 (patch-ab) = 71d50996ed3cb92d9edb44a01b26e166d9807bb0

Index: pkgsrc/textproc/py-enchant/patches/patch-ab
diff -u pkgsrc/textproc/py-enchant/patches/patch-ab:1.3 pkgsrc/textproc/py-enchant/patches/patch-ab:1.4
--- pkgsrc/textproc/py-enchant/patches/patch-ab:1.3     Tue Jul 22 10:22:39 2014
+++ pkgsrc/textproc/py-enchant/patches/patch-ab Sat Jul 13 15:51:52 2019
@@ -1,14 +1,23 @@
-$NetBSD: patch-ab,v 1.3 2014/07/22 10:22:39 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2019/07/13 15:51:52 wiz Exp $
 
 fix path of libenchant.
 
---- enchant/_enchant.py.orig   2014-06-16 12:01:43.000000000 +0000
+--- enchant/_enchant.py.orig   2017-07-18 04:39:34.000000000 +0000
 +++ enchant/_enchant.py
 @@ -64,6 +64,7 @@ e = None
  def _e_path_possibilities():
      """Generator yielding possible locations of the enchant library."""
      # Allow it to be overridden using an environment variable.
-+    yield "@PYENCHANT_LIBRARY_PATH@" 
++    yield "@PYENCHANT_LIBRARY_PATH@"
      yield os.environ.get("PYENCHANT_LIBRARY_PATH")
      # For linuxish systems, allow default soname lookup a chance to succeed.
      if sys.platform not in ("win32", "darwin"):
+@@ -309,7 +310,7 @@ dict_is_removed1.restype = c_int
+ def dict_is_removed(dict,word):
+     return dict_is_removed1(dict,word,len(word))
+ 
+-dict_is_in_session1 = e.enchant_dict_is_in_session
++dict_is_in_session1 = e.enchant_dict_is_added
+ dict_is_in_session1.argtypes = [t_dict,c_char_p,c_size_t]
+ dict_is_in_session1.restype = c_int
+ def dict_is_in_session(dict,word):