aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2018-06-20 17:05:41 +0000
committerMathieu Arnold <mat@FreeBSD.org>2018-06-20 17:05:41 +0000
commit4376dbbb58dab5a7bf7a8240ca39b562de78343b (patch)
tree8997a738fc5162cf5f1383dd3c61c0423454979b /textproc
parent6cb7ca00bb0a9a3aa67008824300ee8d16203a1b (diff)
downloadports-4376dbbb58dab5a7bf7a8240ca39b562de78343b.tar.gz
ports-4376dbbb58dab5a7bf7a8240ca39b562de78343b.zip
Use PY_FLAVOR for dependencies.
FLAVOR is the current port's flavor, it should not be used outside of this scope. Sponsored by: Absolight
Notes
Notes: svn path=/head/; revision=472884
Diffstat (limited to 'textproc')
-rw-r--r--textproc/archmage/Makefile2
-rw-r--r--textproc/plover/Makefile6
-rw-r--r--textproc/pootle/Makefile28
-rw-r--r--textproc/py-CommonMark/Makefile2
-rw-r--r--textproc/py-agate-dbf/Makefile4
-rw-r--r--textproc/py-agate-excel/Makefile6
-rw-r--r--textproc/py-agate/Makefile14
-rw-r--r--textproc/py-autopep8/Makefile2
-rw-r--r--textproc/py-awesome-slugify/Makefile6
-rw-r--r--textproc/py-bibtexparser/Makefile4
-rw-r--r--textproc/py-chardet/Makefile6
-rw-r--r--textproc/py-citeproc-py-styles/Makefile6
-rw-r--r--textproc/py-citeproc-py/Makefile4
-rw-r--r--textproc/py-cloud_sptheme/Makefile4
-rw-r--r--textproc/py-creole/Makefile2
-rw-r--r--textproc/py-csvkit/Makefile10
-rw-r--r--textproc/py-docutils/Makefile2
-rw-r--r--textproc/py-duecredit/Makefile6
-rw-r--r--textproc/py-elasticsearch-async/Makefile12
-rw-r--r--textproc/py-elasticsearch-dsl/Makefile6
-rw-r--r--textproc/py-elasticsearch/Makefile2
-rw-r--r--textproc/py-elasticsearch5/Makefile2
-rw-r--r--textproc/py-genshi/Makefile2
-rw-r--r--textproc/py-gensim/Makefile6
-rw-r--r--textproc/py-humanfriendly/Makefile2
-rw-r--r--textproc/py-m2r/Makefile10
-rw-r--r--textproc/py-mako/Makefile12
-rw-r--r--textproc/py-markdown/Makefile10
-rw-r--r--textproc/py-mistune/Makefile2
-rw-r--r--textproc/py-mkdocs-nature/Makefile2
-rw-r--r--textproc/py-mkdocs/Makefile14
-rw-r--r--textproc/py-nltk/Makefile6
-rw-r--r--textproc/py-numpydoc/Makefile6
-rw-r--r--textproc/py-openpyxl/Makefile4
-rw-r--r--textproc/py-orange3-text/Makefile30
-rw-r--r--textproc/py-paragrep/Makefile2
-rw-r--r--textproc/py-parsel/Makefile10
-rw-r--r--textproc/py-parsimonious/Makefile2
-rw-r--r--textproc/py-parso/Makefile4
-rw-r--r--textproc/py-pdfminer3k/Makefile2
-rw-r--r--textproc/py-pyes/Makefile4
-rw-r--r--textproc/py-pyhamcrest/Makefile2
-rw-r--r--textproc/py-pyhwp/Makefile10
-rw-r--r--textproc/py-pyscss/Makefile4
-rw-r--r--textproc/py-pysrt/Makefile2
-rw-r--r--textproc/py-python-augeas/Makefile2
-rw-r--r--textproc/py-python-docx/Makefile2
-rw-r--r--textproc/py-python-slugify/Makefile2
-rw-r--r--textproc/py-qrcode/Makefile4
-rw-r--r--textproc/py-rdflib/Makefile8
-rw-r--r--textproc/py-rnc2rng/Makefile2
-rw-r--r--textproc/py-rstyoutube/Makefile2
-rw-r--r--textproc/py-scour/Makefile2
-rw-r--r--textproc/py-snowballstemmer/Makefile2
-rw-r--r--textproc/py-sphinx-hieroglyph/Makefile2
-rw-r--r--textproc/py-sphinx-intl/Makefile6
-rw-r--r--textproc/py-sphinx/Makefile38
-rw-r--r--textproc/py-sphinx_numfig/Makefile2
-rw-r--r--textproc/py-sphinx_wikipedia/Makefile2
-rw-r--r--textproc/py-sphinxcontrib-adadomain/Makefile2
-rw-r--r--textproc/py-sphinxcontrib-bitbucket/Makefile2
-rw-r--r--textproc/py-sphinxcontrib-fulltoc/Makefile4
-rw-r--r--textproc/py-sphinxcontrib-httpdomain/Makefile2
-rw-r--r--textproc/py-sphinxcontrib-programoutput/Makefile2
-rw-r--r--textproc/py-texttable/Makefile8
-rw-r--r--textproc/py-toronado/Makefile6
-rw-r--r--textproc/py-transifex-client/Makefile4
-rw-r--r--textproc/py-wicked/Makefile8
-rw-r--r--textproc/py-wstools/Makefile4
-rw-r--r--textproc/py-wtforms/Makefile8
-rw-r--r--textproc/py-xlutils/Makefile4
-rw-r--r--textproc/py-zope.app.i18n/Makefile18
-rw-r--r--textproc/py-zope.app.locales/Makefile10
-rw-r--r--textproc/py-zope.tal/Makefile4
-rw-r--r--textproc/translate-toolkit/Makefile14
-rw-r--r--textproc/xml2rfc/Makefile6
-rw-r--r--textproc/xsv/Makefile2
77 files changed, 234 insertions, 234 deletions
diff --git a/textproc/archmage/Makefile b/textproc/archmage/Makefile
index 4bd22391a1e0..615eeadfb037 100644
--- a/textproc/archmage/Makefile
+++ b/textproc/archmage/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/chm/chm.py:textproc/pychm \
- ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR}
+ ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${PY_FLAVOR}
NO_BUILD= yes
USES= cpe python:2.7 tar:bzip2
diff --git a/textproc/plover/Makefile b/textproc/plover/Makefile
index d2364b1754df..415298c1d37c 100644
--- a/textproc/plover/Makefile
+++ b/textproc/plover/Makefile
@@ -12,9 +12,9 @@ COMMENT= Open source solution for stenography
LICENSE= GPLv2
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/textproc/pootle/Makefile b/textproc/pootle/Makefile
index c9a934616432..6b5a2f886524 100644
--- a/textproc/pootle/Makefile
+++ b/textproc/pootle/Makefile
@@ -17,16 +17,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= Conflicting Django 1.8 / 1.11 dependencies, ancient version
RUN_DEPENDS= translate-toolkit>=1.11.0:textproc/translate-toolkit \
- ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cssmin>=0.1.4:www/py-cssmin@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.4:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django-taggit>0.10:www/py-django-taggit@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django-assets>=0.8:www/py-django-assets@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django-voting>=0.1:www/py-django-voting@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssmin>=0.1.4:www/py-cssmin@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.4:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-taggit>0.10:www/py-django-taggit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-assets>=0.8:www/py-django-assets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-voting>=0.1:www/py-django-voting@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch@${PY_FLAVOR}
# actually diff-match-patch is a dependency of translate-toolkit,
# but only this port uses it.
@@ -51,14 +51,14 @@ OPTIONS_DEFAULT=MEMCACHED MYSQL
MEMCACHED_DESC= Use memcached to improve performance
-LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap2>0:devel/py-ldap2@${FLAVOR}
+LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap2>0:devel/py-ldap2@${PY_FLAVOR}
MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
-MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached@${FLAVOR}
+MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached@${PY_FLAVOR}
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_FLAVOR}
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
SUBVERSION_RUN_DEPENDS= svn:devel/subversion
diff --git a/textproc/py-CommonMark/Makefile b/textproc/py-CommonMark/Makefile
index 0a669726e5f9..5abb95c026d2 100644
--- a/textproc/py-CommonMark/Makefile
+++ b/textproc/py-CommonMark/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python parser for the CommonMark Markdown spec
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-agate-dbf/Makefile b/textproc/py-agate-dbf/Makefile
index d8042836d24a..eed691224216 100644
--- a/textproc/py-agate-dbf/Makefile
+++ b/textproc/py-agate-dbf/Makefile
@@ -11,8 +11,8 @@ COMMENT= Support reading dbf files for agate
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dbfread>=2.0.5:textproc/py-dbfread@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dbfread>=2.0.5:textproc/py-dbfread@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-agate-excel/Makefile b/textproc/py-agate-excel/Makefile
index 204b15599450..04f5dbc3205a 100644
--- a/textproc/py-agate-excel/Makefile
+++ b/textproc/py-agate-excel/Makefile
@@ -11,9 +11,9 @@ COMMENT= Support reading Excel files for agate
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.4:textproc/py-xlrd@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.3.0:textproc/py-openpyxl@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.4:textproc/py-xlrd@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.3.0:textproc/py-openpyxl@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-agate/Makefile b/textproc/py-agate/Makefile
index 0b9bbf57d40d..1842fa070350 100644
--- a/textproc/py-agate/Makefile
+++ b/textproc/py-agate/Makefile
@@ -11,13 +11,13 @@ COMMENT= Data analysis library optimized for humans
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytimeparse>=1.1.5:devel/py-pytimeparse@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Babel>=2.0:devel/py-babel@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.1:devel/py-parsedatetime@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}python-slugify>=1.2.1:textproc/py-python-slugify@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}leather>=0.3.2:graphics/py-leather@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytimeparse>=1.1.5:devel/py-pytimeparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.0:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.1:devel/py-parsedatetime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-slugify>=1.2.1:textproc/py-python-slugify@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}leather>=0.3.2:graphics/py-leather@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-autopep8/Makefile b/textproc/py-autopep8/Makefile
index 06d4483e9b72..2fed3887d0fa 100644
--- a/textproc/py-autopep8/Makefile
+++ b/textproc/py-autopep8/Makefile
@@ -12,7 +12,7 @@ COMMENT= Automatically formats Python code to conform to the PEP 8 style guide
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-awesome-slugify/Makefile b/textproc/py-awesome-slugify/Makefile
index ee860ba6ccfa..30dad7e5b472 100644
--- a/textproc/py-awesome-slugify/Makefile
+++ b/textproc/py-awesome-slugify/Makefile
@@ -11,9 +11,9 @@ COMMENT= Flexible slugify function
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.14:converters/py-unidecode@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.14:converters/py-unidecode@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-bibtexparser/Makefile b/textproc/py-bibtexparser/Makefile
index 1c1c0f926db3..d2ef79653be3 100644
--- a/textproc/py-bibtexparser/Makefile
+++ b/textproc/py-bibtexparser/Makefile
@@ -12,8 +12,8 @@ COMMENT= Bibtex parser
LICENSE= BSD3CLAUSE LGPL3
LICENSE_COMB= dual
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-chardet/Makefile b/textproc/py-chardet/Makefile
index 7d81ef84a311..cdae73de1bb7 100644
--- a/textproc/py-chardet/Makefile
+++ b/textproc/py-chardet/Makefile
@@ -13,9 +13,9 @@ COMMENT= Universal encoding detector for Python 2 and 3
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/textproc/py-citeproc-py-styles/Makefile b/textproc/py-citeproc-py-styles/Makefile
index b12efbbcbc17..c8fea09931ce 100644
--- a/textproc/py-citeproc-py-styles/Makefile
+++ b/textproc/py-citeproc-py-styles/Makefile
@@ -12,9 +12,9 @@ COMMENT= Static resources package for citeproc-py
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.6.2:devel/py-pytest-runner@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.6.2:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-citeproc-py/Makefile b/textproc/py-citeproc-py/Makefile
index 935ad61481e3..a5794b74ef72 100644
--- a/textproc/py-citeproc-py/Makefile
+++ b/textproc/py-citeproc-py/Makefile
@@ -12,8 +12,8 @@ COMMENT= Citation Style Language (CSL) processor for Python
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rnc2rng>=2.2:textproc/py-rnc2rng@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rnc2rng>=2.2:textproc/py-rnc2rng@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/textproc/py-cloud_sptheme/Makefile b/textproc/py-cloud_sptheme/Makefile
index 7ebb1ca2e9c6..b9321bd6f5f1 100644
--- a/textproc/py-cloud_sptheme/Makefile
+++ b/textproc/py-cloud_sptheme/Makefile
@@ -14,8 +14,8 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
# sphinx.util.fileutil was added in sphinx 1.5
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.5:textproc/py-sphinx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.5:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index 5c3d2bcb7a0a..7eaaa9e51bca 100644
--- a/textproc/py-creole/Makefile
+++ b/textproc/py-creole/Makefile
@@ -13,7 +13,7 @@ COMMENT= Markup converter in pure Python
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:textproc/py-docutils@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:textproc/py-docutils@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-csvkit/Makefile b/textproc/py-csvkit/Makefile
index b5b1bf90f062..8cfa078fe96c 100644
--- a/textproc/py-csvkit/Makefile
+++ b/textproc/py-csvkit/Makefile
@@ -11,11 +11,11 @@ COMMENT= Command line tools for working with CSV
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.4:textproc/py-agate@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}agate-excel>=0.2.0:textproc/py-agate-excel@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}agate-dbf>=0.2.0:textproc/py-agate-dbf@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}agate-sql>=0.5.0:databases/py-agate-sql@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.4:textproc/py-agate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}agate-excel>=0.2.0:textproc/py-agate-excel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}agate-dbf>=0.2.0:textproc/py-agate-dbf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}agate-sql>=0.5.0:databases/py-agate-sql@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 11c0da648343..44326fa13a07 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -22,7 +22,7 @@ USES= python
OPTIONS_DEFINE= PYGMENTS
PYGMENTS_DESC= Syntax highlighting
-PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR}
+PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR}
SCRIPTS= rst2html rst2latex rst2man rst2odt rst2odt_prepstyles \
rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html
diff --git a/textproc/py-duecredit/Makefile b/textproc/py-duecredit/Makefile
index 3014cbc38e10..5fe60a79292b 100644
--- a/textproc/py-duecredit/Makefile
+++ b/textproc/py-duecredit/Makefile
@@ -12,9 +12,9 @@ COMMENT= Embed scientific publication or other references in the original code
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}citeproc-py>=0.4:textproc/py-citeproc-py@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}citeproc-py>=0.4:textproc/py-citeproc-py@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/textproc/py-elasticsearch-async/Makefile b/textproc/py-elasticsearch-async/Makefile
index 6cd177f5f9c2..7bea8c6a197b 100644
--- a/textproc/py-elasticsearch-async/Makefile
+++ b/textproc/py-elasticsearch-async/Makefile
@@ -13,12 +13,12 @@ COMMENT= Python Elasticsearch Async Client
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}async_timeout>=0:devel/py-async_timeout@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}elasticsearch>=6.0.0:textproc/py-elasticsearch@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}async_timeout>=0:devel/py-async_timeout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}elasticsearch>=6.0.0:textproc/py-elasticsearch@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-elasticsearch-dsl/Makefile b/textproc/py-elasticsearch-dsl/Makefile
index f18c588ef05c..94d5a6d73fcd 100644
--- a/textproc/py-elasticsearch-dsl/Makefile
+++ b/textproc/py-elasticsearch-dsl/Makefile
@@ -13,10 +13,10 @@ COMMENT= High level Python client for Elasticsearch
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}elasticsearch>=6.1.0:textproc/py-elasticsearch@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}elasticsearch>=6.1.0:textproc/py-elasticsearch@${PY_FLAVOR} \
${PY_IPADDRESS} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-elasticsearch/Makefile b/textproc/py-elasticsearch/Makefile
index b0ca3e8b973a..7ed352c7c03d 100644
--- a/textproc/py-elasticsearch/Makefile
+++ b/textproc/py-elasticsearch/Makefile
@@ -12,7 +12,7 @@ COMMENT= Official Python low-level client for Elasticsearch
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/textproc/py-elasticsearch5/Makefile b/textproc/py-elasticsearch5/Makefile
index 9aeba334509c..895e8f6c6120 100644
--- a/textproc/py-elasticsearch5/Makefile
+++ b/textproc/py-elasticsearch5/Makefile
@@ -13,7 +13,7 @@ COMMENT= Official Python low-level client for Elasticsearch
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:net/py-urllib3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:net/py-urllib3@${PY_FLAVOR}
CONFLICTS= ${PYTHON_PKGNAMEPREFIX}elasticsearch-[0-9]*
diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index 4fbd537b37cb..adcf78ce8d0e 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -20,6 +20,6 @@ BABEL_DESC= I18n support through the Babel plugin
USES= python
USE_PYTHON= distutils autoplist
-BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${FLAVOR}
+BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/textproc/py-gensim/Makefile b/textproc/py-gensim/Makefile
index b5d1c56f80c2..17c4cbf86c88 100644
--- a/textproc/py-gensim/Makefile
+++ b/textproc/py-gensim/Makefile
@@ -14,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.18.1:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}smart_open>=1.2.1:net/py-smart_open@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.18.1:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}smart_open>=1.2.1:net/py-smart_open@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-humanfriendly/Makefile b/textproc/py-humanfriendly/Makefile
index e4fa2c13b0b4..80a8278854b5 100644
--- a/textproc/py-humanfriendly/Makefile
+++ b/textproc/py-humanfriendly/Makefile
@@ -19,7 +19,7 @@ USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/textproc/py-m2r/Makefile b/textproc/py-m2r/Makefile
index eb5e86d98fc5..612a324be96d 100644
--- a/textproc/py-m2r/Makefile
+++ b/textproc/py-m2r/Makefile
@@ -13,10 +13,10 @@ COMMENT= Convert markdown formatted file with reST markup to reST format
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
# Actually 2.7,3.4+
USES= python
@@ -27,7 +27,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
.endif
do-test:
diff --git a/textproc/py-mako/Makefile b/textproc/py-mako/Makefile
index 40c9e7316913..7df11c7f4150 100644
--- a/textproc/py-mako/Makefile
+++ b/textproc/py-mako/Makefile
@@ -14,12 +14,12 @@ COMMENT= Super-fast templating language in Python
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index bfb2e653c88e..1024c110b0eb 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -14,11 +14,11 @@ COMMENT= Python implementation of Markdown
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytidylib>0:textproc/py-pytidylib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytidylib>0:textproc/py-pytidylib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/textproc/py-mistune/Makefile b/textproc/py-mistune/Makefile
index 1bd5df3cf040..d92f7ddae3e1 100644
--- a/textproc/py-mistune/Makefile
+++ b/textproc/py-mistune/Makefile
@@ -14,7 +14,7 @@ COMMENT= Fastest markdown parser in pure Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-mkdocs-nature/Makefile b/textproc/py-mkdocs-nature/Makefile
index 5f5385efd3a3..c38aa1198097 100644
--- a/textproc/py-mkdocs-nature/Makefile
+++ b/textproc/py-mkdocs-nature/Makefile
@@ -11,7 +11,7 @@ COMMENT= MkDocs theme, a clone of the "greenish" Sphinx theme of the same name
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mkdocs>0:textproc/py-mkdocs@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mkdocs>0:textproc/py-mkdocs@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-mkdocs/Makefile b/textproc/py-mkdocs/Makefile
index 927b6f83b5c3..d4c7c6f43cab 100644
--- a/textproc/py-mkdocs/Makefile
+++ b/textproc/py-mkdocs/Makefile
@@ -12,13 +12,13 @@ COMMENT= Project documentation with Markdown
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}livereload>=2.5.1:www/py-livereload@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tornado>=5.0:www/py-tornado@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}livereload>=2.5.1:www/py-livereload@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=5.0:www/py-tornado@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/textproc/py-nltk/Makefile b/textproc/py-nltk/Makefile
index c0eadb667c6e..a41c2b3dba54 100644
--- a/textproc/py-nltk/Makefile
+++ b/textproc/py-nltk/Makefile
@@ -13,9 +13,9 @@ COMMENT= Natural language toolkit written in python
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-numpydoc/Makefile b/textproc/py-numpydoc/Makefile
index 7bf67f3f5c65..f7e7bc50bfc4 100644
--- a/textproc/py-numpydoc/Makefile
+++ b/textproc/py-numpydoc/Makefile
@@ -13,9 +13,9 @@ COMMENT= Sphinx extension to support docstrings in Numpy format
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-openpyxl/Makefile b/textproc/py-openpyxl/Makefile
index 9bb57a18334c..6e734fc2d7f8 100644
--- a/textproc/py-openpyxl/Makefile
+++ b/textproc/py-openpyxl/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python library to read/write Excel 2007 xlsx/xlsm files
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENCE.rst
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jdcal>=0:devel/py-jdcal@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:textproc/py-et_xmlfile@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jdcal>=0:devel/py-jdcal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:textproc/py-et_xmlfile@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/textproc/py-orange3-text/Makefile b/textproc/py-orange3-text/Makefile
index 0345a815bc58..955af9bb0da4 100644
--- a/textproc/py-orange3-text/Makefile
+++ b/textproc/py-orange3-text/Makefile
@@ -12,21 +12,21 @@ LICENSE= AGPLv3
RUN_DEPENDS= orange3>0:misc/orange3 \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}biopython>0:biology/py-biopython@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}docx2txt>=0.6:textproc/py-docx2txt@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gensim>=0.12.3:textproc/py-gensim@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}nltk>=3.0.5:textproc/py-nltk@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}odfpy>=1.3.5:devel/py-odfpy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pdfminer3k>0:textproc/py-pdfminer3k@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}simhash>0:math/py-simhash@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tweepy>0:net/py-tweepy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}validate_email>0:mail/py-validate_email@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wikipedia>0:www/py-wikipedia@${FLAVOR}
-py34_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typing>0:devel/py-typing@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}biopython>0:biology/py-biopython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docx2txt>=0.6:textproc/py-docx2txt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gensim>=0.12.3:textproc/py-gensim@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nltk>=3.0.5:textproc/py-nltk@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}odfpy>=1.3.5:devel/py-odfpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pdfminer3k>0:textproc/py-pdfminer3k@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simhash>0:math/py-simhash@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tweepy>0:net/py-tweepy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}validate_email>0:mail/py-validate_email@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wikipedia>0:www/py-wikipedia@${PY_FLAVOR}
+py34_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typing>0:devel/py-typing@${PY_FLAVOR}
USES= python:3.4+
USE_GITHUB= yes
diff --git a/textproc/py-paragrep/Makefile b/textproc/py-paragrep/Makefile
index dca937aa4f63..310c50d8b76c 100644
--- a/textproc/py-paragrep/Makefile
+++ b/textproc/py-paragrep/Makefile
@@ -12,7 +12,7 @@ COMMENT= Paragraph Grep Utility
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:devel/py-grizzled@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:devel/py-grizzled@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/textproc/py-parsel/Makefile b/textproc/py-parsel/Makefile
index bcc5dff25ed5..d9a910ce3217 100644
--- a/textproc/py-parsel/Makefile
+++ b/textproc/py-parsel/Makefile
@@ -11,11 +11,11 @@ COMMENT= Library to extract data from HTML and XML using XPath and CSS selectors
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}w3lib>=1.8.0:www/py-w3lib@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}w3lib>=1.8.0:www/py-w3lib@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-parsimonious/Makefile b/textproc/py-parsimonious/Makefile
index 257a106539c9..502599285063 100644
--- a/textproc/py-parsimonious/Makefile
+++ b/textproc/py-parsimonious/Makefile
@@ -12,7 +12,7 @@ COMMENT= PEGs based parser in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-parso/Makefile b/textproc/py-parso/Makefile
index 88906aafc372..56e77a2002a4 100644
--- a/textproc/py-parso/Makefile
+++ b/textproc/py-parso/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python Parser
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.7:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cache>=0:devel/py-pytest-cache@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.7:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cache>=0:devel/py-pytest-cache@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-pdfminer3k/Makefile b/textproc/py-pdfminer3k/Makefile
index 67b923f5dee1..00a3a3d20576 100644
--- a/textproc/py-pdfminer3k/Makefile
+++ b/textproc/py-pdfminer3k/Makefile
@@ -10,7 +10,7 @@ COMMENT= PDF parser and analyzer
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${PY_FLAVOR}
USES= python:3.4+
USE_GITHUB= yes
diff --git a/textproc/py-pyes/Makefile b/textproc/py-pyes/Makefile
index 3209f6a8766e..845128cde580 100644
--- a/textproc/py-pyes/Makefile
+++ b/textproc/py-pyes/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= dvl@FreeBSD.org
COMMENT= Python connector for ElasticSearch - the pythonic way to use ElasticSearch
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-pyhamcrest/Makefile b/textproc/py-pyhamcrest/Makefile
index b07c3d6bd4e8..a3e91d727a3a 100644
--- a/textproc/py-pyhamcrest/Makefile
+++ b/textproc/py-pyhamcrest/Makefile
@@ -13,7 +13,7 @@ COMMENT= Hamcrest matchers for Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
USES= python:2.7-3.4
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-pyhwp/Makefile b/textproc/py-pyhwp/Makefile
index d0d45325db13..bcb7ac99d760 100644
--- a/textproc/py-pyhwp/Makefile
+++ b/textproc/py-pyhwp/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= zi@FreeBSD.org
COMMENT= HWP Document Format v5 parser & processor
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}olefile>=0.40:devel/py-olefile@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}hypua2jamo>0:textproc/py-hypua2jamo@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}olefile>=0.40:devel/py-olefile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hypua2jamo>0:textproc/py-hypua2jamo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${PY_FLAVOR}
BUILD_DEPENDS:= ${RUN_DEPENDS}
USES= python:2.7 zip
diff --git a/textproc/py-pyscss/Makefile b/textproc/py-pyscss/Makefile
index 89036ae284d8..bdc6d863dec0 100644
--- a/textproc/py-pyscss/Makefile
+++ b/textproc/py-pyscss/Makefile
@@ -13,10 +13,10 @@ COMMENT= Compiler for SCSS flavor of the Sass language
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
${PY_ENUM34} ${PY_PATHLIB}
LIB_DEPENDS= libpcre.so:devel/pcre
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= Kronuz
diff --git a/textproc/py-pysrt/Makefile b/textproc/py-pysrt/Makefile
index 4482ae1e15dc..144003ac30dd 100644
--- a/textproc/py-pysrt/Makefile
+++ b/textproc/py-pysrt/Makefile
@@ -12,7 +12,7 @@ COMMENT= SubRip (.srt) subtitle parser and writer
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-python-augeas/Makefile b/textproc/py-python-augeas/Makefile
index 88efdfe74bca..828bb607ffc1 100644
--- a/textproc/py-python-augeas/Makefile
+++ b/textproc/py-python-augeas/Makefile
@@ -12,7 +12,7 @@ COMMENT= Pure python bindings for Augeas
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR}
LIB_DEPENDS= libaugeas.so:textproc/augeas
USES= python
diff --git a/textproc/py-python-docx/Makefile b/textproc/py-python-docx/Makefile
index 62e13767e6cd..ce097d2bac0d 100644
--- a/textproc/py-python-docx/Makefile
+++ b/textproc/py-python-docx/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python library for creating and updating Microsoft Word files
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml@${PY_FLAVOR}
# Python3 ready
USES= python
diff --git a/textproc/py-python-slugify/Makefile b/textproc/py-python-slugify/Makefile
index 7a9f86015641..cf0b66732b9d 100644
--- a/textproc/py-python-slugify/Makefile
+++ b/textproc/py-python-slugify/Makefile
@@ -11,7 +11,7 @@ COMMENT= Slugify application that handles unicode
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.16:converters/py-unidecode@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.16:converters/py-unidecode@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile
index 4da8e2e087f1..539bc9b5e83b 100644
--- a/textproc/py-qrcode/Makefile
+++ b/textproc/py-qrcode/Makefile
@@ -13,8 +13,8 @@ COMMENT= QR Code image generator
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index edd9ed08bfb0..0f2a470341fc 100644
--- a/textproc/py-rdflib/Makefile
+++ b/textproc/py-rdflib/Makefile
@@ -12,10 +12,10 @@ COMMENT= Python library for RDF manipulation
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isodate>=0:devel/py-isodate@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:textproc/py-sparqlwrapper@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isodate>=0:devel/py-isodate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:textproc/py-sparqlwrapper@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-rnc2rng/Makefile b/textproc/py-rnc2rng/Makefile
index 5b074c9b94cf..604d7b93d313 100644
--- a/textproc/py-rnc2rng/Makefile
+++ b/textproc/py-rnc2rng/Makefile
@@ -11,7 +11,7 @@ COMMENT= RELAX NG Compact to regular syntax conversion library
LICENSE= PD
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rply>0:devel/py-rply@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rply>0:devel/py-rply@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/textproc/py-rstyoutube/Makefile b/textproc/py-rstyoutube/Makefile
index 5e718eaa75e5..239b4b0273c8 100644
--- a/textproc/py-rstyoutube/Makefile
+++ b/textproc/py-rstyoutube/Makefile
@@ -13,7 +13,7 @@ COMMENT= Embed YouTube videos in reStructuredText documents
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-scour/Makefile b/textproc/py-scour/Makefile
index 0ceba1b9cc25..fc6e1a659534 100644
--- a/textproc/py-scour/Makefile
+++ b/textproc/py-scour/Makefile
@@ -12,7 +12,7 @@ COMMENT= SVG scrubber
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-snowballstemmer/Makefile b/textproc/py-snowballstemmer/Makefile
index ce9c8c8b0fb9..e5aa55ba2a40 100644
--- a/textproc/py-snowballstemmer/Makefile
+++ b/textproc/py-snowballstemmer/Makefile
@@ -19,6 +19,6 @@ OPTIONS_DEFINE= PYSTEMMER
OPTIONS_DEFAULT=PYSTEMMER
PYSTEMMER_DESC= Use PyStemmer to accelerate
-PYSTEMMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py-pystemmer@${FLAVOR}
+PYSTEMMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py-pystemmer@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/textproc/py-sphinx-hieroglyph/Makefile b/textproc/py-sphinx-hieroglyph/Makefile
index db470971d03b..b4d659f30d99 100644
--- a/textproc/py-sphinx-hieroglyph/Makefile
+++ b/textproc/py-sphinx-hieroglyph/Makefile
@@ -13,7 +13,7 @@ COMMENT= Sphinx extension which builds HTML presentations
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4:textproc/py-sphinx@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= nyergler
diff --git a/textproc/py-sphinx-intl/Makefile b/textproc/py-sphinx-intl/Makefile
index 705d62efc1b4..b654ab2d49c9 100644
--- a/textproc/py-sphinx-intl/Makefile
+++ b/textproc/py-sphinx-intl/Makefile
@@ -14,9 +14,9 @@ COMMENT= Sphinx-intl translation features
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index dda3159305a1..3627de47d3c3 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -17,25 +17,25 @@ COMMENT= Python documentation generator
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-websupport>=1.0.1:textproc/py-sphinxcontrib-websupport@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py-sphinx_rtd_theme@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py-alabaster@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.18.1:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-websupport>=1.0.1:textproc/py-sphinxcontrib-websupport@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py-alabaster@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.18.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize@${PY_FLAVOR} \
${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils concurrent
@@ -44,7 +44,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/textproc/py-sphinx_numfig/Makefile b/textproc/py-sphinx_numfig/Makefile
index 912e3ab50644..1b18ce1ae465 100644
--- a/textproc/py-sphinx_numfig/Makefile
+++ b/textproc/py-sphinx_numfig/Makefile
@@ -12,7 +12,7 @@ COMMENT= Autonumbering figures in Sphinx
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${PY_FLAVOR}
USES= python:2.7 tar:tgz
USE_PYTHON= flavors
diff --git a/textproc/py-sphinx_wikipedia/Makefile b/textproc/py-sphinx_wikipedia/Makefile
index 55be1d63eb5f..4eabf9b1e748 100644
--- a/textproc/py-sphinx_wikipedia/Makefile
+++ b/textproc/py-sphinx_wikipedia/Makefile
@@ -11,7 +11,7 @@ COMMENT= Sphinx extension which adds role to create links to Wikipedia articles
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= flavors
diff --git a/textproc/py-sphinxcontrib-adadomain/Makefile b/textproc/py-sphinxcontrib-adadomain/Makefile
index 27cfd831cd90..e781e8210aa6 100644
--- a/textproc/py-sphinxcontrib-adadomain/Makefile
+++ b/textproc/py-sphinxcontrib-adadomain/Makefile
@@ -14,7 +14,7 @@ COMMENT= Sphinx Adadomain Extension
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-bitbucket/Makefile b/textproc/py-sphinxcontrib-bitbucket/Makefile
index e6824d348fe1..0773c7387441 100644
--- a/textproc/py-sphinxcontrib-bitbucket/Makefile
+++ b/textproc/py-sphinxcontrib-bitbucket/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Sphinx/BitBucket integration
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-fulltoc/Makefile b/textproc/py-sphinxcontrib-fulltoc/Makefile
index 8207ebb43226..ef5b390f7b2a 100644
--- a/textproc/py-sphinxcontrib-fulltoc/Makefile
+++ b/textproc/py-sphinxcontrib-fulltoc/Makefile
@@ -12,8 +12,8 @@ COMMENT= Sphinx Fulltoc Extension
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-httpdomain/Makefile b/textproc/py-sphinxcontrib-httpdomain/Makefile
index 3627a8f0fae7..9770075a1090 100644
--- a/textproc/py-sphinxcontrib-httpdomain/Makefile
+++ b/textproc/py-sphinxcontrib-httpdomain/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wg@FreeBSD.org
COMMENT= Sphinx domain for HTTP APIs
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-programoutput/Makefile b/textproc/py-sphinxcontrib-programoutput/Makefile
index 5658ecf18b3a..701159c44877 100644
--- a/textproc/py-sphinxcontrib-programoutput/Makefile
+++ b/textproc/py-sphinxcontrib-programoutput/Makefile
@@ -13,7 +13,7 @@ COMMENT= Sphinx extension to include program output
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.5:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.5:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-texttable/Makefile b/textproc/py-texttable/Makefile
index d2d10fe1e698..e756a89cb77a 100644
--- a/textproc/py-texttable/Makefile
+++ b/textproc/py-texttable/Makefile
@@ -13,11 +13,11 @@ COMMENT= Module for creating simple ASCII tables
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cjkwrap>=0:textproc/py-cjkwrap@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cjkwrap>=0:textproc/py-cjkwrap@${PY_FLAVOR}
-CJKWRAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cjkwrap>=0:textproc/py-cjkwrap@${FLAVOR}
+CJKWRAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cjkwrap>=0:textproc/py-cjkwrap@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-toronado/Makefile b/textproc/py-toronado/Makefile
index d643b00c1f62..cabbd5c877bf 100644
--- a/textproc/py-toronado/Makefile
+++ b/textproc/py-toronado/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tj@FreeBSD.org
COMMENT= Fast lxml-based CSS stylesheet inliner
-RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR}
+RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-transifex-client/Makefile b/textproc/py-transifex-client/Makefile
index 1116c21d3edd..57cafb1c8f6a 100644
--- a/textproc/py-transifex-client/Makefile
+++ b/textproc/py-transifex-client/Makefile
@@ -13,8 +13,8 @@ COMMENT= Command line interface for Transifex
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-wicked/Makefile b/textproc/py-wicked/Makefile
index 1763456f1632..331b6cc63429 100644
--- a/textproc/py-wicked/Makefile
+++ b/textproc/py-wicked/Makefile
@@ -12,10 +12,10 @@ COMMENT= Compact syntax for doing wiki-like content linking and creation
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-wstools/Makefile b/textproc/py-wstools/Makefile
index 6c9267e03868..dcf02b64d4b6 100644
--- a/textproc/py-wstools/Makefile
+++ b/textproc/py-wstools/Makefile
@@ -12,8 +12,8 @@ COMMENT= WSDL parsing services for Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/textproc/py-wtforms/Makefile b/textproc/py-wtforms/Makefile
index e418cd6aa691..c70cbf3c52dc 100644
--- a/textproc/py-wtforms/Makefile
+++ b/textproc/py-wtforms/Makefile
@@ -15,11 +15,11 @@ COMMENT= Flexible forms validation and rendering library for python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/textproc/py-xlutils/Makefile b/textproc/py-xlutils/Makefile
index 4ab780ec0f2c..0d97e41b1ead 100644
--- a/textproc/py-xlutils/Makefile
+++ b/textproc/py-xlutils/Makefile
@@ -13,8 +13,8 @@ COMMENT= Utilities for working with Excel files that require both xlrd and xlwt
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:textproc/py-xlrd@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:textproc/py-xlrd@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/textproc/py-zope.app.i18n/Makefile b/textproc/py-zope.app.i18n/Makefile
index 6d3c0d9c288a..f22f89dd86f8 100644
--- a/textproc/py-zope.app.i18n/Makefile
+++ b/textproc/py-zope.app.i18n/Makefile
@@ -13,15 +13,15 @@ COMMENT= Persistent translation domains and message catalogs
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:devel/py-zope.publisher@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6:devel/py-zope.component@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-zope.app.locales/Makefile b/textproc/py-zope.app.locales/Makefile
index ae7b8288a52e..105d91a5753c 100644
--- a/textproc/py-zope.app.locales/Makefile
+++ b/textproc/py-zope.app.locales/Makefile
@@ -13,11 +13,11 @@ COMMENT= Zope locale extraction and management utilities
LICENSE= ZPL21
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${PY_FLAVOR}
NO_ARCH= yes
USES= python:-2.7
diff --git a/textproc/py-zope.tal/Makefile b/textproc/py-zope.tal/Makefile
index a9fd882abbe0..e6a39aaafd4c 100644
--- a/textproc/py-zope.tal/Makefile
+++ b/textproc/py-zope.tal/Makefile
@@ -13,8 +13,8 @@ COMMENT= Zope Template Application Language (TAL)
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile
index 29761d284a62..78fa5ac7cac4 100644
--- a/textproc/translate-toolkit/Makefile
+++ b/textproc/translate-toolkit/Makefile
@@ -11,16 +11,16 @@ COMMENT= Converts between many translation formats
LICENSE= GPLv2
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${PY_FLAVOR} \
msghack:devel/gettext-msghack \
- ${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
iso-codes>=1.3:misc/iso-codes \
bash:shells/bash \
- ${PYTHON_PKGNAMEPREFIX}utidylib>=0:www/py-utidylib@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}utidylib>=0:www/py-utidylib@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
# Can use psyco (on i386)
diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index cb5b6e8f881f..12c2cbf9d80a 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -11,9 +11,9 @@ COMMENT= Tool to create RFCs and related documents from XML, as per RFC2629
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist concurrent optsuffix
diff --git a/textproc/xsv/Makefile b/textproc/xsv/Makefile
index 61908468f8b1..a9445cb86a10 100644
--- a/textproc/xsv/Makefile
+++ b/textproc/xsv/Makefile
@@ -13,7 +13,7 @@ COMMENT= XML Schema Validator
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist