Update py-pyphen to 0.9.3

Changes:
* Use package_data instead of data_files (fix #10)

5 files changed, 78 insertions, 123 deletions

diff --git a/textproc/py-pyphen/Makefile b/textproc/py-pyphen/Makefile
index 665931668b9..59d3d635be4 100644
--- a/textproc/py-pyphen/Makefile
+++ b/textproc/py-pyphen/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2015/10/20 17:18:57 kleink Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/11 16:21:33 kleink Exp $
 
-DISTNAME=	Pyphen-0.9.2
+DISTNAME=	Pyphen-0.9.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=P/Pyphen/}
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v2 OR gnu-lgpl-v2.1 OR mpl-1.1
 
 USE_LANGUAGES=	# empty
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+REPLACE_PYTHON=+setup.py
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-pyphen/PLIST b/textproc/py-pyphen/PLIST
index 218a0671923..e16f97e2d32 100644
--- a/textproc/py-pyphen/PLIST
+++ b/textproc/py-pyphen/PLIST
@@ -1,75 +1,75 @@
-@comment $NetBSD: PLIST,v 1.2 2015/10/20 17:18:57 kleink Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/01/11 16:21:33 kleink Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/pyphen.py
-${PYSITELIB}/pyphen.pyc
-${PYSITELIB}/pyphen.pyo
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_af.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_af_ZA.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_bg.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_bg_BG.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_ca.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_cs.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_cs_CZ.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_da.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_da_DK.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_de.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_de_AT.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_de_CH.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_de_DE.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_el.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_el_GR.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_en.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_en_GB.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_en_Latn_GB.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_en_Latn_US.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_en_US.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_es.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_et.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_et_EE.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_fr.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_gl.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_hr.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_hr_HR.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_hu.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_hu_HU.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_is.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_it.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_it_IT.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_lt.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_lt_LT.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_lv.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_lv_LV.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_nb.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_nb_NO.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_nl.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_nl_NL.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_nn.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_nn_NO.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_pl.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_pl_PL.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_pt.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_pt_BR.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_pt_Latn_BR.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_pt_Latn_PT.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_pt_PT.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_ro.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_ro_RO.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_ru.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_ru_RU.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_sk.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_sk_SK.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_sl.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_sl_SI.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_sr.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_sr_Latn.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_sv.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_te.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_te_IN.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_uk.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_uk_UA.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_zu.dic
-share/pyphen${PYVERSSUFFIX}/dictionaries/hyph_zu_ZA.dic
+${PYSITELIB}/pyphen/__init__.py
+${PYSITELIB}/pyphen/__init__.pyc
+${PYSITELIB}/pyphen/__init__.pyo
+${PYSITELIB}/pyphen/dictionaries/hyph_af.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_af_ZA.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_bg.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_bg_BG.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_ca.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_cs.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_cs_CZ.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_da.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_da_DK.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_de.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_de_AT.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_de_CH.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_de_DE.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_el.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_el_GR.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_en.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_en_GB.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_en_Latn_GB.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_en_Latn_US.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_en_US.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_es.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_et.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_et_EE.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_fr.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_gl.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_hr.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_hr_HR.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_hu.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_hu_HU.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_is.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_it.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_it_IT.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_lt.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_lt_LT.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_lv.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_lv_LV.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_nb.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_nb_NO.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_nl.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_nl_NL.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_nn.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_nn_NO.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_pl.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_pl_PL.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_pt.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_pt_BR.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_pt_Latn_BR.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_pt_Latn_PT.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_pt_PT.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_ro.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_ro_RO.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_ru.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_ru_RU.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_sk.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_sk_SK.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_sl.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_sl_SI.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_sr.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_sr_Latn.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_sv.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_te.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_te_IN.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_uk.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_uk_UA.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_zu.dic
+${PYSITELIB}/pyphen/dictionaries/hyph_zu_ZA.dic
diff --git a/textproc/py-pyphen/distinfo b/textproc/py-pyphen/distinfo
index 5dcf85c5c5f..e507403a30d 100644
--- a/textproc/py-pyphen/distinfo
+++ b/textproc/py-pyphen/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/10/20 17:18:57 kleink Exp $
+$NetBSD: distinfo,v 1.3 2016/01/11 16:21:33 kleink Exp $
 
-SHA1 (Pyphen-0.9.2.tar.gz) = 919a40c50def59ef41463097f68289d1d2efe905
-RMD160 (Pyphen-0.9.2.tar.gz) = 31410712470d03203993f24a4678932a1d5e7d17
-SHA512 (Pyphen-0.9.2.tar.gz) = d0a5f0b49d991016c163e5fb340f33d0c0df92b1623ff8c3eebdc46c12efb8f50c01b0999a9b469878a167ac6a59ccb5d4c21482e244c247f2761388fb697f5f
-Size (Pyphen-0.9.2.tar.gz) = 1045675 bytes
-SHA1 (patch-pyphen.py) = 1479b6a786651f21c88473596c34bfa7aec9d7bf
-SHA1 (patch-setup.py) = 7834ffe12a25c91bd31a4a3fd15ea2051b8434cb
+SHA1 (Pyphen-0.9.3.tar.gz) = e20fd0d3738c1e1468255552c3ef2acd9ca54526
+RMD160 (Pyphen-0.9.3.tar.gz) = 2ff7406a31377fc8af86688d823d7b7baf87a2be
+SHA512 (Pyphen-0.9.3.tar.gz) = 9d43a5f4b39e16f3be3fac76f6e50903e33aabe4a75d420767800dfc9e5f04c460faa16933a1168bfb0034e2999e7057eeee2ccea66b139aa4002142bc7168d4
+Size (Pyphen-0.9.3.tar.gz) = 1046054 bytes
diff --git a/textproc/py-pyphen/patches/patch-pyphen.py b/textproc/py-pyphen/patches/patch-pyphen.py
deleted file mode 100644
index 0022f7df572..00000000000
--- a/textproc/py-pyphen/patches/patch-pyphen.py
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-pyphen.py,v 1.2 2015/10/20 17:18:57 kleink Exp $
-
-Adjust dictionaries path to allow multiple Python version installs.
-
---- pyphen.py.orig	2015-09-28 11:41:52.000000000 +0200
-+++ pyphen.py	2015-10-20 18:26:32.000000000 +0200
-@@ -50,13 +50,13 @@ try:
-     import pkg_resources
-     dictionaries_roots = (os.path.join(
-         pkg_resources.resource_filename('pyphen', ''),
--        'share', 'pyphen', 'dictionaries'),)
-+        'share', 'pyphen%s' % sys.version[0:3], 'dictionaries'),)
- except ImportError:
-     dictionaries_roots = ()
-
- finally:
-     dictionaries_roots += (
--        os.path.join(sys.prefix, 'share', 'pyphen', 'dictionaries'),
-+        os.path.join(sys.prefix, 'share', 'pyphen%s' % sys.version[0:3], 'dictionaries'),
-         os.path.join(os.path.dirname(__file__), 'dictionaries'))
- 
- 
diff --git a/textproc/py-pyphen/patches/patch-setup.py b/textproc/py-pyphen/patches/patch-setup.py
deleted file mode 100644
index 930fa411bd5..00000000000
--- a/textproc/py-pyphen/patches/patch-setup.py
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2015/07/13 16:13:55 kleink Exp $
-
-Adjust dictionaries path to allow multiple Python version installs.
-
---- setup.py.orig	2013-12-27 17:53:41.000000000 +0100
-+++ setup.py	2015-07-13 17:48:37.000000000 +0200
-@@ -1,4 +1,5 @@
- import os.path
-+import sys
- from setuptools import setup
- 
- classifiers = [
-@@ -28,7 +29,7 @@
-     py_modules=['pyphen'],
-     provides=['pyphen'],
-     data_files=[(
--        os.path.join('share', 'pyphen', 'dictionaries'), (
-+        os.path.join('share', 'pyphen%s' % sys.version[0:3], 'dictionaries'), (
-             os.path.join(_dict_folder, filename)
-             for filename in os.listdir(_dict_folder)
-             if filename.endswith('.dic')))],