author: Mathieu Arnold <mat@FreeBSD.org> 2017-11-30 15:50:30 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2017-11-30 15:50:30 +0000
commit: 551be3c7231225ed9c26479af2b8914fb2ef0ea8 (patch)
tree: d296c82a71504382f4faefa0bf8d7be384ea1105 /textproc
parent: 02f9c9be1699251467efc027f210049dfe14f9c5 (diff)
download: ports-551be3c7231225ed9c26479af2b8914fb2ef0ea8.tar.gz
ports-551be3c7231225ed9c26479af2b8914fb2ef0ea8.zip
130 files changed, 272 insertions, 494 deletions
diff --git a/textproc/Makefile b/textproc/Makefile
index bce80d63cde1..ac8152bfccae 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1266,6 +1266,7 @@
     SUBDIR += py-agate-dbf
     SUBDIR += py-agate-excel
     SUBDIR += py-alabaster
+    SUBDIR += py-asciinema
     SUBDIR += py-asv
     SUBDIR += py-autopep8
     SUBDIR += py-awesome-slugify
@@ -1314,6 +1315,7 @@
     SUBDIR += py-nltk
     SUBDIR += py-numpydoc
     SUBDIR += py-openpyxl
+    SUBDIR += py-pager
     SUBDIR += py-pandocfilters
     SUBDIR += py-paragrep
     SUBDIR += py-parsel
@@ -1397,25 +1399,6 @@
     SUBDIR += py-zope.tal
     SUBDIR += py-zpt
     SUBDIR += py2html
-    SUBDIR += py3-MarkupSafe
-    SUBDIR += py3-alabaster
-    SUBDIR += py3-asciinema
-    SUBDIR += py3-chardet
-    SUBDIR += py3-docutils
-    SUBDIR += py3-feedparser
-    SUBDIR += py3-humanfriendly
-    SUBDIR += py3-hunspell
-    SUBDIR += py3-libxml2
-    SUBDIR += py3-numpydoc
-    SUBDIR += py3-pager
-    SUBDIR += py3-pyPEG2
-    SUBDIR += py3-pygments
-    SUBDIR += py3-pystemmer
-    SUBDIR += py3-qrcode
-    SUBDIR += py3-snowballstemmer
-    SUBDIR += py3-sphinx
-    SUBDIR += py3-sphinx_rtd_theme
-    SUBDIR += py3-texttable
     SUBDIR += pychm
     SUBDIR += qprint
     SUBDIR += qrcodegen
diff --git a/textproc/archmage/Makefile b/textproc/archmage/Makefile
index 6f7e95fbbfba..8924701af090 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
+		${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR}
 
 NO_BUILD=	yes
 USES=		cpe python:2 tar:bzip2
diff --git a/textproc/cdiff/Makefile b/textproc/cdiff/Makefile
index fb96da17679e..0f9483a2f49c 100644
--- a/textproc/cdiff/Makefile
+++ b/textproc/cdiff/Makefile
@@ -18,7 +18,7 @@ USE_GITHUB=
 GH_ACCOUNT=	ymattw
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist concurrent optsuffix
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/textproc/cmark/Makefile b/textproc/cmark/Makefile
index 32e2c72ee548..b60c3211e279 100644
--- a/textproc/cmark/Makefile
+++ b/textproc/cmark/Makefile
@@ -11,7 +11,7 @@ COMMENT=	CommonMark parsing and rendering library and program in C
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake:outsource python:3,test
+USES=		cmake:outsource python:3.4+,test
 USE_GITHUB=	yes
 GH_ACCOUNT=	commonmark
 USE_LDCONFIG=	yes
diff --git a/textproc/coccigrep/Makefile b/textproc/coccigrep/Makefile
index 86e1e441f2a3..b2bfa038ea43 100644
--- a/textproc/coccigrep/Makefile
+++ b/textproc/coccigrep/Makefile
@@ -17,7 +17,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	regit
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 PLIST_FILES=	man/man1/coccigrep.1.gz \
 		${DATADIR_REL}/cocci-grep.el \
diff --git a/textproc/codespell/Makefile b/textproc/codespell/Makefile
index dae471052df6..080a3e11d02f 100644
--- a/textproc/codespell/Makefile
+++ b/textproc/codespell/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Source code spelling checker
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python:3
+USES=		python:3.4+
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lucasdemarchi
diff --git a/textproc/ibus-el/Makefile b/textproc/ibus-el/Makefile
index d3f92e0c08fc..3aa2deb95966 100644
--- a/textproc/ibus-el/Makefile
+++ b/textproc/ibus-el/Makefile
@@ -14,7 +14,7 @@ COMMENT=	IBus client for GNU Emacs
 RUN_DEPENDS=	ibus-daemon:textproc/ibus \
 		${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib
 
-USES=		python:run
+USES=		python:2.7,run
 USE_EMACS=	yes
 
 LICENSE=	GPLv3
diff --git a/textproc/ibus-typing-booster/Makefile b/textproc/ibus-typing-booster/Makefile
index 5ce7628808f9..7becae4fff5f 100644
--- a/textproc/ibus-typing-booster/Makefile
+++ b/textproc/ibus-typing-booster/Makefile
@@ -11,18 +11,18 @@ COMMENT=	Faster typing by context sensitive completion
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py3-xdg		\
-		${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py3-gobject3	\
-		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/${PYTHON_PKGNAMEPREFIX}sqlite3
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py-xdg@${PY_FLAVOR}		\
+		${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py-gobject3@${PY_FLAVOR}	\
+		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
 LIB_DEPENDS=	libibus-1.0.so:textproc/ibus	\
 		libm17n.so:devel/m17n-lib
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py3-xdg		\
-		${PYTHON_SITELIBDIR}/dbus/bus.py:devel/py3-dbus		\
-		${PYTHON_SITELIBDIR}/hunspell.so:textproc/py3-hunspell	\
-		${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py3-gobject3	\
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py-xdg@${PY_FLAVOR}		\
+		${PYTHON_SITELIBDIR}/dbus/bus.py:devel/py-dbus@${PY_FLAVOR}		\
+		${PYTHON_SITELIBDIR}/hunspell.so:textproc/py-hunspell@${PY_FLAVOR}	\
+		${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py-gobject3@${PY_FLAVOR}	\
 		${LOCALBASE}/share/unicode/ucd/Index.txt:textproc/UCD	\
 		${LOCALBASE}/share/unicode/cldr/readme.html:textproc/CLDR\
-		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/${PYTHON_PKGNAMEPREFIX}sqlite3
+		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
 TEST_DEPENDS=	${LOCALBASE}/share/hunspell/de_DE.dic:german/hunspell	\
 		${LOCALBASE}/share/hunspell/ko_KR.aff:korean/hunspell	\
 		${LOCALBASE}/share/hunspell/en_US.aff:textproc/en-hunspell
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 1be4b246a5bf..4c30fd5c0102 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Intelligent Input Bus for Linux / Unix OS
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \
 		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus \
-		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify@${PY_FLAVOR} \
 		${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes \
 		setxkbmap:x11/setxkbmap
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
diff --git a/textproc/icdiff/Makefile b/textproc/icdiff/Makefile
index 23e88b69cab5..e7cfbc14e8ec 100644
--- a/textproc/icdiff/Makefile
+++ b/textproc/icdiff/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Improved colored diff
 LICENSE=	PSFL
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist concurrent optsuffix
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/loook/Makefile b/textproc/loook/Makefile
index 2bc50e5ad094..b89d6347f68b 100644
--- a/textproc/loook/Makefile
+++ b/textproc/loook/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple Python tool that search in LibreOffice/OpenOffice files
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 
 WRKSRC=		${WRKDIR}
 
diff --git a/textproc/plover/Makefile b/textproc/plover/Makefile
index 7a1aa8435516..d2364b1754df 100644
--- a/textproc/plover/Makefile
+++ b/textproc/plover/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Open source solution for stenography
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib \
-		${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile
+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}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils
 USE_WX=		3.0+
 WX_COMPS=	wx
diff --git a/textproc/pootle/Makefile b/textproc/pootle/Makefile
index 3107994f870c..4bac5a0af244 100644
--- a/textproc/pootle/Makefile
+++ b/textproc/pootle/Makefile
@@ -15,21 +15,21 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	translate-toolkit>=1.11.0:textproc/translate-toolkit \
-		${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south\
-		${PYTHON_PKGNAMEPREFIX}cssmin>=0.1.4:www/py-cssmin \
-		${PYTHON_PKGNAMEPREFIX}lxml>=2.1.4:devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}django-taggit>0.10:www/py-django-taggit \
-		${PYTHON_PKGNAMEPREFIX}django-assets>=0.8:www/py-django-assets \
-		${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south \
-		${PYTHON_PKGNAMEPREFIX}django-voting>=0.1:www/py-django-voting \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch
+		${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}
 # actually diff-match-patch is a dependency of translate-toolkit,
 # but only this port uses it.
 
 NO_ARCH=	yes
-USES=		gettext python tar:bzip2 shebangfix
+USES=		gettext python:2.7 tar:bzip2 shebangfix
 USE_PYTHON=	autoplist distutils
 SHEBANG_FILES=	pootle/assets/admin/js/compress.py
 
@@ -49,14 +49,14 @@ OPTIONS_DEFAULT=MEMCACHED MYSQL
 
 MEMCACHED_DESC=	Use memcached to improve performance
 
-LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap2>0:devel/py-ldap2
+LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap2>0:devel/py-ldap2@${FLAVOR}
 
 MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
-MEMCACHED_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached
+MEMCACHED_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached@${FLAVOR}
 
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR}
 
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 
 SUBVERSION_RUN_DEPENDS=	svn:devel/subversion
 
diff --git a/textproc/py-agate-dbf/Makefile b/textproc/py-agate-dbf/Makefile
index 8d652d73f78d..d8042836d24a 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 \
-		${PYTHON_PKGNAMEPREFIX}dbfread>=2.0.5:textproc/py-dbfread
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dbfread>=2.0.5:textproc/py-dbfread@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-agate-excel/Makefile b/textproc/py-agate-excel/Makefile
index 059fb9cb76c9..b75a0a5a23d2 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 \
-		${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.4:textproc/py-xlrd \
-		${PYTHON_PKGNAMEPREFIX}openpyxl>=2.3.0:textproc/py-openpyxl 
+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} 
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-agate/Makefile b/textproc/py-agate/Makefile
index 86070eeb5687..4fd410e6e5ca 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 \
-		${PYTHON_PKGNAMEPREFIX}pytimeparse>=1.1.5:devel/py-pytimeparse \
-		${PYTHON_PKGNAMEPREFIX}Babel>=2.0:devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.1:devel/py-parsedatetime \
-		${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate \
-		${PYTHON_PKGNAMEPREFIX}python-slugify>=1.2.1:textproc/py-python-slugify \
-		${PYTHON_PKGNAMEPREFIX}leather>=0.3.2:graphics/py-leather
+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}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-alabaster/Makefile b/textproc/py-alabaster/Makefile
index 709a45d21454..418d725536cb 100644
--- a/textproc/py-alabaster/Makefile
+++ b/textproc/py-alabaster/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Modified Kr Sphinx theme
 LICENSE=	MIT
 
 NO_ARCH=	yes
-USES?=		python
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py3-asciinema/Makefile b/textproc/py-asciinema/Makefile
index dd3dd3c8e16e..527bbcee344e 100644
--- a/textproc/py3-asciinema/Makefile
+++ b/textproc/py-asciinema/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tool for recording and sharing terminal sessions
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py3-requests \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${FLAVOR} \
 		ca_root_nss>=0:security/ca_root_nss
 
 USES=		python:3.3+
diff --git a/textproc/py3-asciinema/distinfo b/textproc/py-asciinema/distinfo
index 6567268d269c..6567268d269c 100644
--- a/textproc/py3-asciinema/distinfo
+++ b/textproc/py-asciinema/distinfo
diff --git a/textproc/py3-asciinema/pkg-descr b/textproc/py-asciinema/pkg-descr
index aba5693b6a1f..aba5693b6a1f 100644
--- a/textproc/py3-asciinema/pkg-descr
+++ b/textproc/py-asciinema/pkg-descr
diff --git a/textproc/py-autopep8/Makefile b/textproc/py-autopep8/Makefile
index 67c74ba62b1c..fef0e7b9e50b 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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/textproc/py-awesome-slugify/Makefile b/textproc/py-awesome-slugify/Makefile
index e6e00fc0a3db..ee860ba6ccfa 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 \
-		${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.14:converters/py-unidecode
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
+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}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-chardet/Makefile b/textproc/py-chardet/Makefile
index 30b3eebe3832..7d81ef84a311 100644
--- a/textproc/py-chardet/Makefile
+++ b/textproc/py-chardet/Makefile
@@ -13,12 +13,12 @@ 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
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis
+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}
 
 NO_ARCH=	yes
-USES?=		python
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 do-test:
diff --git a/textproc/py-cloud_sptheme/Makefile b/textproc/py-cloud_sptheme/Makefile
index dc1ee66c4135..a1b2b8616619 100644
--- a/textproc/py-cloud_sptheme/Makefile
+++ b/textproc/py-cloud_sptheme/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Sphinx theme
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index bb73283269ed..5c3d2bcb7a0a 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
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/docutils/__init__.py:textproc/py-docutils@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-csvkit/Makefile b/textproc/py-csvkit/Makefile
index bb29cbad3ab3..67539871458d 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 \
-		${PYTHON_PKGNAMEPREFIX}agate-excel>=0.2.0:textproc/py-agate-excel \
-		${PYTHON_PKGNAMEPREFIX}agate-dbf>=0.2.0:textproc/py-agate-dbf \
-		${PYTHON_PKGNAMEPREFIX}agate-sql>=0.5.0:databases/py-agate-sql \
-		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six
+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}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 634d5c29eb2e..db87dfb3f95c 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Python Documentation Utilities
 LICENSE=	BSD2CLAUSE GPLv3+ PD PSFL
 LICENSE_COMB=	multi
 
-PORTSCOUT?=	limit:^[0-9\.]*$$
+PORTSCOUT=	limit:^[0-9\.]*$$
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
-USES?=		python
+USES=		python
 
 OPTIONS_DEFINE=	PYGMENTS
 PYGMENTS_DESC=	Syntax highlighting
-PYGMENTS_RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments
+PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR}
 
 SCRIPTS=	rst2html rst2latex rst2man rst2odt rst2odt_prepstyles \
 		rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html
diff --git a/textproc/py-elasticsearch-curator-py/Makefile b/textproc/py-elasticsearch-curator-py/Makefile
index 4701f909c5cb..fcf4134054d5 100644
--- a/textproc/py-elasticsearch-curator-py/Makefile
+++ b/textproc/py-elasticsearch-curator-py/Makefile
@@ -13,9 +13,9 @@ COMMENT=		Python index manager for Elasticsearch
 
 LICENSE=		APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.3:net/py-urllib3 \
-		${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.8.0:textproc/py-elasticsearch-py \
-		${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.3:net/py-urllib3@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.8.0:textproc/py-elasticsearch-py@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click@${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
diff --git a/textproc/py-elasticsearch-dsl-py/Makefile b/textproc/py-elasticsearch-dsl-py/Makefile
index 5c453b352162..ac4d5b012deb 100644
--- a/textproc/py-elasticsearch-dsl-py/Makefile
+++ b/textproc/py-elasticsearch-dsl-py/Makefile
@@ -11,7 +11,7 @@ COMMENT=	High level Python client for Elasticsearch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py@${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
diff --git a/textproc/py-elasticsearch-py/Makefile b/textproc/py-elasticsearch-py/Makefile
index d538cb76e730..096ef3ca8975 100644
--- a/textproc/py-elasticsearch-py/Makefile
+++ b/textproc/py-elasticsearch-py/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Official Python low-level client for Elasticsearch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:net/py-urllib3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:net/py-urllib3@${FLAVOR}
 
 NO_ARCH=	yes
 USE_GITHUB=	yes
diff --git a/textproc/py-elasticsearch2-dsl-py/Makefile b/textproc/py-elasticsearch2-dsl-py/Makefile
index 97605fffdd8d..47c357cbed9d 100644
--- a/textproc/py-elasticsearch2-dsl-py/Makefile
+++ b/textproc/py-elasticsearch2-dsl-py/Makefile
@@ -11,7 +11,7 @@ COMMENT=	High level Python client for Elasticsearch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py@${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
diff --git a/textproc/py-elib.intl/Makefile b/textproc/py-elib.intl/Makefile
index 1bfefb6252aa..2c4ff953ca16 100644
--- a/textproc/py-elib.intl/Makefile
+++ b/textproc/py-elib.intl/Makefile
@@ -18,7 +18,7 @@ USE_GITHUB=	yes
 PORTSCOUT=	ignore:1
 
 NO_ARCH=	yes
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index 12872a5d76e2..abe535241055 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFAULT=WX
 WX_DESC=	Provide a wxSpellCheckerDialog
 OPTIONS_SUB=	yes
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils
 
 WX_USE=		WX=3.0+
diff --git a/textproc/py-errorhandler/Makefile b/textproc/py-errorhandler/Makefile
index 28576375b5d2..7322f32b300c 100644
--- a/textproc/py-errorhandler/Makefile
+++ b/textproc/py-errorhandler/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	dikshie@sfc.wide.ad.jp
 COMMENT=	Logging framework handler that tracks when messages above a certain level have been logged
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py-feedparser/Makefile b/textproc/py-feedparser/Makefile
index cea169f16e81..377b82b7fa96 100644
--- a/textproc/py-feedparser/Makefile
+++ b/textproc/py-feedparser/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Universal feed parser written in Python
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES?=		python tar:bzip2
+USES=		python tar:bzip2
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index 5e889dd8ebdd..722021a12200 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -23,7 +23,7 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBABEL}
-RUN_DEPENDS+=	${PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel
+RUN_DEPENDS+=	${PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${FLAVOR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/py-humanfriendly/Makefile b/textproc/py-humanfriendly/Makefile
index 341dd9ef47a9..32817aaf23b0 100644
--- a/textproc/py-humanfriendly/Makefile
+++ b/textproc/py-humanfriendly/Makefile
@@ -13,13 +13,13 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 NO_ARCH=	yes
-USES?=		python
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic@${FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/py-hunspell/Makefile b/textproc/py-hunspell/Makefile
index 0bd14252ac17..b3276e36d64b 100644
--- a/textproc/py-hunspell/Makefile
+++ b/textproc/py-hunspell/Makefile
@@ -15,7 +15,7 @@ LICENSE=	LGPL3
 
 LIB_DEPENDS=	libhunspell-${HSPLVER}.so:textproc/hunspell
 
-USES?=		python
+USES=		python
 USES+=		localbase
 USE_PYTHON=	distutils
 
diff --git a/textproc/py-hyperestraier-python/Makefile b/textproc/py-hyperestraier-python/Makefile
index 61528f0f3cdb..f273e1d2fe76 100644
--- a/textproc/py-hyperestraier-python/Makefile
+++ b/textproc/py-hyperestraier-python/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	jun-g@daemonfreaks.com
 COMMENT=	Pure Python HyperEstraier library
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils
 
 PORTEXAMPLES=	example.py asyn_example.py
diff --git a/textproc/py-hypua2jamo/Makefile b/textproc/py-hypua2jamo/Makefile
index a8a2e91292ad..250241035aaa 100644
--- a/textproc/py-hypua2jamo/Makefile
+++ b/textproc/py-hypua2jamo/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Convert Hanyang-PUA code to unicode Hangul Jamo
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py-libtre/Makefile b/textproc/py-libtre/Makefile
index 7b4c286a2229..3e87abd20dd3 100644
--- a/textproc/py-libtre/Makefile
+++ b/textproc/py-libtre/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libtre.so:textproc/libtre
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
-USES=		python tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	distutils autoplist
 
 BUILD_WRKSRC=	${WRKSRC}/python
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index 1320484796c2..0e9cb5f4086b 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -14,8 +14,8 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
-USE_GNOME+=	libxml2
-USES+=		python:2 gettext-runtime
+USE_GNOME=	libxml2
+USES=		python gettext-runtime
 USE_PYTHON=	autoplist distutils
 
 CPPFLAGS+=	`${PYTHON_CMD}-config --cflags`
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index ddd49f20175c..fb37d71ee9ba 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -7,6 +7,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python interface for XSLT C library for GNOME
 
+py34_BROKEN=	does not package
+py35_BROKEN=	does not package
+py36_BROKEN=	does not package
+
 MASTERDIR=	${.CURDIR}/../libxslt
 BUILD_WRKSRC=	${WRKSRC}/python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
@@ -15,6 +19,7 @@ PLIST=		${.CURDIR}/pkg-plist
 
 USE_GNOME=	libxslt
 USES+=		python
+USE_PYTHON=	flavors
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--with-python=${PYTHON_CMD}
 
diff --git a/textproc/py-ltxml/Makefile b/textproc/py-ltxml/Makefile
index 3dde7a13f4c6..5091b73c1858 100644
--- a/textproc/py-ltxml/Makefile
+++ b/textproc/py-ltxml/Makefile
@@ -17,7 +17,7 @@ LICENSE=	GPLv2 # only `GPL' is mentioned, assuming v2
 BUILD_DEPENDS=	${LOCALBASE}/include/ltxml12/lt-safe.h:textproc/ltxml
 RUN_DEPENDS=	${LOCALBASE}/include/ltxml12/lt-safe.h:textproc/ltxml
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 USE_LDCONFIG=	yes
 
diff --git a/textproc/py-m2r/Makefile b/textproc/py-m2r/Makefile
index f8c74daef78a..96b29d5657fa 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
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune \
-		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${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
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
 .endif
 
 do-test:
diff --git a/textproc/py-mako/Makefile b/textproc/py-mako/Makefile
index 86d4fd95d4e9..0e26fdeeb233 100644
--- a/textproc/py-mako/Makefile
+++ b/textproc/py-mako/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Super-fast templating language in Python
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker \
-		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe \
-		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker \
-		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe \
-		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel
+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}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index d6ddb7a4eeb8..e3dc8aed4600 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 \
-		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}pytidylib>0:textproc/py-pytidylib \
-		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
+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}
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
diff --git a/textproc/py-mistune/Makefile b/textproc/py-mistune/Makefile
index 2ca58918f4d9..c0f1b8da17f2 100644
--- a/textproc/py-mistune/Makefile
+++ b/textproc/py-mistune/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fastest markdown parser in pure Python
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-nltk/Makefile b/textproc/py-nltk/Makefile
index b304faa79cb1..c0eadb667c6e 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 \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
+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}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-numpydoc/Makefile b/textproc/py-numpydoc/Makefile
index 0fa5aed761f1..32f1a89349da 100644
--- a/textproc/py-numpydoc/Makefile
+++ b/textproc/py-numpydoc/Makefile
@@ -13,11 +13,11 @@ 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 \
-		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx
-TEST_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
+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}
 
-USES?=		python
+USES=		python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
diff --git a/textproc/py-openpyxl/Makefile b/textproc/py-openpyxl/Makefile
index de23cd9d94fa..b9d4548fcc05 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 \
-		${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:textproc/py-et_xmlfile
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jdcal>=0:devel/py-jdcal@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:textproc/py-et_xmlfile@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/textproc/py3-pager/Makefile b/textproc/py-pager/Makefile
index ff794b9fe525..ff794b9fe525 100644
--- a/textproc/py3-pager/Makefile
+++ b/textproc/py-pager/Makefile
diff --git a/textproc/py3-pager/distinfo b/textproc/py-pager/distinfo
index 786d500a307c..786d500a307c 100644
--- a/textproc/py3-pager/distinfo
+++ b/textproc/py-pager/distinfo
diff --git a/textproc/py3-pager/pkg-descr b/textproc/py-pager/pkg-descr
index e2a19326bca1..e2a19326bca1 100644
--- a/textproc/py3-pager/pkg-descr
+++ b/textproc/py-pager/pkg-descr
diff --git a/textproc/py-paragrep/Makefile b/textproc/py-paragrep/Makefile
index 8f3519446506..dca937aa4f63 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
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:devel/py-grizzled@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/textproc/py-parsel/Makefile b/textproc/py-parsel/Makefile
index cac6e2369128..bcc5dff25ed5 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
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}w3lib>=1.8.0:www/py-w3lib
+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}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-parsimonious/Makefile b/textproc/py-parsimonious/Makefile
index 54e7f5658401..d768089ec48d 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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/textproc/py-pyPEG2/Makefile b/textproc/py-pyPEG2/Makefile
index d319c08cca07..a698c2e033a5 100644
--- a/textproc/py-pyPEG2/Makefile
+++ b/textproc/py-pyPEG2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Parsing Expression Grammar (PEG) parser for Python
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES?=		python
+USES=		python
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/textproc/py-pyelasticsearch/Makefile b/textproc/py-pyelasticsearch/Makefile
index ca74cc8fea49..70e9899631f9 100644
--- a/textproc/py-pyelasticsearch/Makefile
+++ b/textproc/py-pyelasticsearch/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Flexible, high-scale API to elasticsearch
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi \
-		${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}urllib3>=1.8:net/py-urllib3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urllib3>=1.8:net/py-urllib3@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-pyes/Makefile b/textproc/py-pyes/Makefile
index f28d716c4abf..09b8b74375ba 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 \
-		${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${FLAVOR}
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index 7530d1ddbb06..886172945091 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Syntax highlighter written in Python
 
 LICENSE=	BSD2CLAUSE
 
-USES?=		python
+USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 NO_ARCH=	yes
 
diff --git a/textproc/py-pyhwp/Makefile b/textproc/py-pyhwp/Makefile
index 40ec70ab471e..8fa2d6c206ad 100644
--- a/textproc/py-pyhwp/Makefile
+++ b/textproc/py-pyhwp/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	HWP Document Format v5 parser & processor
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel \
-		${PYTHON_PKGNAMEPREFIX}olefile>=0.40:devel/py-olefile \
-		${PYTHON_PKGNAMEPREFIX}hypua2jamo>0:textproc/py-hypua2jamo \
-		${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt
+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}
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-USES=		python zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py-pyscss/Makefile b/textproc/py-pyscss/Makefile
index e12ce5748057..3358fa226c2d 100644
--- a/textproc/py-pyscss/Makefile
+++ b/textproc/py-pyscss/Makefile
@@ -12,11 +12,10 @@ COMMENT=	Compiler for SCSS flavor of the Sass language
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 \
-		${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+		${PY_ENUM34} ${PY_PATHLIB}
 LIB_DEPENDS=	libpcre.so:devel/pcre
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Kronuz
diff --git a/textproc/py-pysrt/Makefile b/textproc/py-pysrt/Makefile
index 38aa56123c26..4482ae1e15dc 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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-pystemmer/Makefile b/textproc/py-pystemmer/Makefile
index 64055062e71c..16699b88378d 100644
--- a/textproc/py-pystemmer/Makefile
+++ b/textproc/py-pystemmer/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Snowball Stemming Algorithms for Information Retrieval
 LICENSE=	MIT BSD3CLAUSE
 LICENSE_COMB=	dual
 
-USES?=		python
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 post-install:
diff --git a/textproc/py-python-augeas/Makefile b/textproc/py-python-augeas/Makefile
index f374cfe73e87..f8b0bc095644 100644
--- a/textproc/py-python-augeas/Makefile
+++ b/textproc/py-python-augeas/Makefile
@@ -12,7 +12,11 @@ COMMENT=	Pure python bindings for Augeas
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi
+py34_BROKEN=	does not package
+py35_BROKEN=	does not package
+py36_BROKEN=	does not package
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR}
 LIB_DEPENDS=	libaugeas.so:textproc/augeas
 
 USES=		python
diff --git a/textproc/py-python-docx/Makefile b/textproc/py-python-docx/Makefile
index f6772fba8953..62e13767e6cd 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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml@${FLAVOR}
 
 # Python3 ready
 USES=		python
diff --git a/textproc/py-python-slugify/Makefile b/textproc/py-python-slugify/Makefile
index cd6a68eaa4cc..d6584dc0509e 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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.16:converters/py-unidecode@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile
index e2b3c9d3ba99..c735a9bde156 100644
--- a/textproc/py-qrcode/Makefile
+++ b/textproc/py-qrcode/Makefile
@@ -13,18 +13,10 @@ COMMENT=	QR Code image generator
 
 LICENSE=	BSD3CLAUSE
 
-USES?=		python
-USE_PYTHON=	autoplist distutils
-
-.include <bsd.port.pre.mk>
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${FLAVOR}
 
-.if ${PYTHON_REL} > 3000
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py3-six \
-		${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py3-pillow
-.else
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow
-.endif
-
-.include <bsd.port.post.mk>
+USES=		python
+USE_PYTHON=	autoplist distutils
 
+.include <bsd.port.mk>
diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile
index ed8fa0367fca..a9bb98c4be82 100644
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:4
 USE_PYQT=	sip_build core_run
+USE_PYTHON=	flavors
 USE_QT4=	corelib xml moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile
index ef68ab5e43f5..d50d72c96c27 100644
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@@ -12,6 +12,7 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:4
 USE_PYQT=	sip_build core_run network_run
+USE_PYTHON=	flavors
 USE_QT4=	corelib network xmlpatterns moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
diff --git a/textproc/py-qt5-xml/Makefile b/textproc/py-qt5-xml/Makefile
index 1ec5ca6887e1..3f2c43d7a339 100644
--- a/textproc/py-qt5-xml/Makefile
+++ b/textproc/py-qt5-xml/Makefile
@@ -11,6 +11,7 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:5
 USE_PYQT=	sip_build core_run
+USE_PYTHON=	flavors
 USE_QT5=	core xml buildtools_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
diff --git a/textproc/py-qt5-xmlpatterns/Makefile b/textproc/py-qt5-xmlpatterns/Makefile
index 2f183406642c..7d24aa98fc04 100644
--- a/textproc/py-qt5-xmlpatterns/Makefile
+++ b/textproc/py-qt5-xmlpatterns/Makefile
@@ -11,6 +11,7 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:5
 USE_PYQT=	sip_build core_run network_run
+USE_PYTHON=	flavors
 USE_QT5=	core network xmlpatterns qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index d68d02897f4f..edd9ed08bfb0 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 \
-	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing \
-	${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:textproc/py-sparqlwrapper \
-	${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
+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}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-rst2html5/Makefile b/textproc/py-rst2html5/Makefile
index 84c68cf2d1c3..ebf44634c814 100644
--- a/textproc/py-rst2html5/Makefile
+++ b/textproc/py-rst2html5/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Produces HTML5 documents from reStructuredText sources
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi \
-	${PYTHON_PKGNAMEPREFIX}pygments>=2.1:textproc/py-pygments \
-	${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}pygments>=2.1:textproc/py-pygments@${FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${FLAVOR}
 
-USES=	python
+USES=	python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/textproc/py-rstyoutube/Makefile b/textproc/py-rstyoutube/Makefile
index 2a1c11345d37..6ee2a23612eb 100644
--- a/textproc/py-rstyoutube/Makefile
+++ b/textproc/py-rstyoutube/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Embed YouTube videos in reStructuredText documents
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR}
 
 USES=	python:2
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-rxp/Makefile b/textproc/py-rxp/Makefile
index 426a6c4608a9..eb5acdc9a8a6 100644
--- a/textproc/py-rxp/Makefile
+++ b/textproc/py-rxp/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Fast validating XML parser for Python
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 NO_WRKSUBDIR=	yes
-USES=		python tar:tgz
+USES=		python:2.7 tar:tgz
 USE_PYTHON=	distutils autoplist
 
 DOCSDIR=	${PREFIX}/share/doc/py-rxp
diff --git a/textproc/py-scour/Makefile b/textproc/py-scour/Makefile
index ceac29530a52..0ceba1b9cc25 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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-snowballstemmer/Makefile b/textproc/py-snowballstemmer/Makefile
index ea2b460d65c6..ce9c8c8b0fb9 100644
--- a/textproc/py-snowballstemmer/Makefile
+++ b/textproc/py-snowballstemmer/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Snowball stemming library collection for Python
 
 LICENSE=	BSD2CLAUSE
 
-USES?=		python
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	PYSTEMMER
 OPTIONS_DEFAULT=PYSTEMMER
 PYSTEMMER_DESC=	Use PyStemmer to accelerate
 
-PYSTEMMER_RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py-pystemmer
+PYSTEMMER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py-pystemmer@${FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/textproc/py-sphinx-hieroglyph/Makefile b/textproc/py-sphinx-hieroglyph/Makefile
index 198e0132afdd..db470971d03b 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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.4:textproc/py-sphinx@${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nyergler
diff --git a/textproc/py-sphinx-intl/Makefile b/textproc/py-sphinx-intl/Makefile
index 1dde6d4f6c77..727ac4ade6fe 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=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx \
-		${PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib \
-		${PKGNAMEPREFIX}six>=1.8.0:devel/py-six
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} \
+		${PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib@${FLAVOR} \
+		${PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index 06ce3b7e56ee..ecce8981393d 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -17,23 +17,22 @@ COMMENT=	Python documentation generator
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
-RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel\
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py-sphinx_rtd_theme \
-		${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py-alabaster \
-		${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize \
+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}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}imagesize>=0.7.1:graphics/py-imagesize@${FLAVOR} \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
-USES?=		python
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist distutils concurrent
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-sphinx_numfig/Makefile b/textproc/py-sphinx_numfig/Makefile
index c27e9e13ef21..89f477724d3e 100644
--- a/textproc/py-sphinx_numfig/Makefile
+++ b/textproc/py-sphinx_numfig/Makefile
@@ -12,9 +12,10 @@ COMMENT=	Autonumbering figures in Sphinx
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${FLAVOR}
 
-USES=		python tar:tgz
+USES=		python:2.7 tar:tgz
+USE_PYTHON=	flavors
 NO_BUILD=	yes
 SPHINXDIR=	${PYTHON_LIBDIR}/site-packages/sphinx
 PLIST_FILES=	${SPHINXDIR}/ext/numfig.py ${SPHINXDIR}/ext/numfig.pyc
diff --git a/textproc/py-sphinx_rtd_theme/Makefile b/textproc/py-sphinx_rtd_theme/Makefile
index 2a7984d61864..4efb27860863 100644
--- a/textproc/py-sphinx_rtd_theme/Makefile
+++ b/textproc/py-sphinx_rtd_theme/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NO_ARCH=	yes
-USES?=		python
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py-sphinx_wikipedia/Makefile b/textproc/py-sphinx_wikipedia/Makefile
index 4186f6c15869..67334bb16c91 100644
--- a/textproc/py-sphinx_wikipedia/Makefile
+++ b/textproc/py-sphinx_wikipedia/Makefile
@@ -11,9 +11,10 @@ COMMENT=	Sphinx extension which adds role to create links to Wikipedia articles
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${FLAVOR}
 
 USES=		python
+USE_PYTHON=	flavors
 NO_BUILD=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	quiver
diff --git a/textproc/py-sphinxcontrib-adadomain/Makefile b/textproc/py-sphinxcontrib-adadomain/Makefile
index 1c56ac9d91a6..65763b8d12d5 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=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-sphinxcontrib-bitbucket/Makefile b/textproc/py-sphinxcontrib-bitbucket/Makefile
index c5a1a8b3befd..b577a5bdc6fb 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=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-sphinxcontrib-fulltoc/Makefile b/textproc/py-sphinxcontrib-fulltoc/Makefile
index 2a0a14def53a..f7d7e17a2cf9 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=	${PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr
-RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
+BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-sphinxcontrib-httpdomain/Makefile b/textproc/py-sphinxcontrib-httpdomain/Makefile
index 4f12e11b019a..96d00d55db75 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=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-sphinxcontrib-programoutput/Makefile b/textproc/py-sphinxcontrib-programoutput/Makefile
index 3e65c474ca22..5658ecf18b3a 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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.5:textproc/py-sphinx@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-syck/Makefile b/textproc/py-syck/Makefile
index 569c549c6604..7321f3c80272 100644
--- a/textproc/py-syck/Makefile
+++ b/textproc/py-syck/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python binding for Syck, a YAML parser and emitter
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libsyck.a:textproc/syck
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 post-patch:
diff --git a/textproc/py-texttable/Makefile b/textproc/py-texttable/Makefile
index 2763905460e5..cd1776ce6000 100644
--- a/textproc/py-texttable/Makefile
+++ b/textproc/py-texttable/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Module for creating simple ASCII tables
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR}
 
-USES?=	python
+USES=	python
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 
diff --git a/textproc/py-toronado/Makefile b/textproc/py-toronado/Makefile
index 562a6cb6fb8f..d643b00c1f62 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 \
-		${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml
+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}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-trans/Makefile b/textproc/py-trans/Makefile
index cb6e18bf5fdd..5add1c400872 100644
--- a/textproc/py-trans/Makefile
+++ b/textproc/py-trans/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Module for performing transliteration
 
 LICENSE=	BSD
 
-USES=		python tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/textproc/py-transifex-client/Makefile b/textproc/py-transifex-client/Makefile
index a7d23e86c2df..1116c21d3edd 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
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/textproc/py-wicked/Makefile b/textproc/py-wicked/Makefile
index afddd45c4109..1763456f1632 100644
--- a/textproc/py-wicked/Makefile
+++ b/textproc/py-wicked/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Compact syntax for doing wiki-like content linking and creation
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
+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}
 
-USES=		python zip
+USES=		python:2.7 zip
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/textproc/py-wstools/Makefile b/textproc/py-wstools/Makefile
index 143685eecdc8..1a4c12726a84 100644
--- a/textproc/py-wstools/Makefile
+++ b/textproc/py-wstools/Makefile
@@ -12,11 +12,11 @@ COMMENT=	WSDL parsing services for Python
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
 
 NO_ARCH=	yes
-USES=		python:2.7+
+USES=		python
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/textproc/py-wtforms/Makefile b/textproc/py-wtforms/Makefile
index a8657489d735..33939ab170eb 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
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \
+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} \
 		${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8 \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR}
 
 OPTIONS_DEFINE=		DOCS
 
diff --git a/textproc/py-xlutils/Makefile b/textproc/py-xlutils/Makefile
index 4fbb190fc92d..88af92337ccc 100644
--- a/textproc/py-xlutils/Makefile
+++ b/textproc/py-xlutils/Makefile
@@ -12,8 +12,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 \
-				${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt
+BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:textproc/py-xlrd@${FLAVOR} \
+				${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt@${FLAVOR}
 RUN_DEPENDS:=   ${BUILD_DEPENDS}
 
 USES=		python:2
diff --git a/textproc/py-xlwriter/Makefile b/textproc/py-xlwriter/Makefile
index ce94ca3fa56f..ef0f71606cec 100644
--- a/textproc/py-xlwriter/Makefile
+++ b/textproc/py-xlwriter/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	pyXLWriter-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python library for generating Excel-compatible spreadsheets
 
-USES=		python zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 
 PORTEXAMPLES=	*
diff --git a/textproc/py-xlwt/Makefile b/textproc/py-xlwt/Makefile
index b503317b0340..6fd65151ca27 100644
--- a/textproc/py-xlwt/Makefile
+++ b/textproc/py-xlwt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Writing data and formatting information from Excel files
 
 LICENSE=	BSD4CLAUSE
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.mk>
diff --git a/textproc/py-zope.app.i18n/Makefile b/textproc/py-zope.app.i18n/Makefile
index 76c488ddcca0..6d3c0d9c288a 100644
--- a/textproc/py-zope.app.i18n/Makefile
+++ b/textproc/py-zope.app.i18n/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Persistent translation domains and message catalogs
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.6:devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
+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}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py-zope.app.locales/Makefile b/textproc/py-zope.app.locales/Makefile
index 90261359f09c..ae7b8288a52e 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 \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal
+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}
 
 NO_ARCH=	yes
 USES=		python:-2.7
diff --git a/textproc/py-zope.tal/Makefile b/textproc/py-zope.tal/Makefile
index 492609142e41..a9fd882abbe0 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 \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py3-MarkupSafe/Makefile b/textproc/py3-MarkupSafe/Makefile
deleted file mode 100644
index 61183b0ef34b..000000000000
--- a/textproc/py3-MarkupSafe/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	MarkupSafe
-PORTVERSION=	1.0
-CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Implements XML/HTML/XHTML Markup safe string for Python
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-USES=		python:3.3+
-USE_PYTHON=	autoplist concurrent distutils
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/markupsafe/_speedups.so
-
-.include <bsd.port.mk>
diff --git a/textproc/py3-MarkupSafe/distinfo b/textproc/py3-MarkupSafe/distinfo
deleted file mode 100644
index b7777bd27bac..000000000000
--- a/textproc/py3-MarkupSafe/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1489176826
-SHA256 (MarkupSafe-1.0.tar.gz) = a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665
-SIZE (MarkupSafe-1.0.tar.gz) = 14356
diff --git a/textproc/py3-MarkupSafe/pkg-descr b/textproc/py3-MarkupSafe/pkg-descr
deleted file mode 100644
index 06d057ad5a10..000000000000
--- a/textproc/py3-MarkupSafe/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-py-MarkupSafe is a python module that implements a XML/HTML/XHTML Markup
-safe string.
-
-WWW: https://pypi.python.org/pypi/MarkupSafe/
diff --git a/textproc/py3-alabaster/Makefile b/textproc/py3-alabaster/Makefile
deleted file mode 100644
index c3d732c90db7..000000000000
--- a/textproc/py3-alabaster/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-alabaster
-
-USES=	python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-chardet/Makefile b/textproc/py3-chardet/Makefile
deleted file mode 100644
index 8b86131ed22c..000000000000
--- a/textproc/py3-chardet/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-chardet
-
-BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py3-pytest-runner
-
-USES=		python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-docutils/Makefile b/textproc/py3-docutils/Makefile
deleted file mode 100644
index 4186de03148f..000000000000
--- a/textproc/py3-docutils/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-docutils
-
-PORTSCOUT=	ignore:1
-
-USES=		python:3.3+
-
-PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py3-pygments
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-feedparser/Makefile b/textproc/py3-feedparser/Makefile
deleted file mode 100644
index 1b9a58700812..000000000000
--- a/textproc/py3-feedparser/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-feedparser
-
-USES=	python:3.3+ tar:bzip2
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-humanfriendly/Makefile b/textproc/py3-humanfriendly/Makefile
deleted file mode 100644
index 876a03f09373..000000000000
--- a/textproc/py3-humanfriendly/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-humanfriendly
-
-PORTSCOUT=	ignore:1
-
-USES=		python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-hunspell/Makefile b/textproc/py3-hunspell/Makefile
deleted file mode 100644
index 52708394692f..000000000000
--- a/textproc/py3-hunspell/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-hunspell
-
-USES=		python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-libxml2/Makefile b/textproc/py3-libxml2/Makefile
deleted file mode 100644
index 9926e1371f12..000000000000
--- a/textproc/py3-libxml2/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION=	0
-CATEGORIES=	textproc gnome python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Python interface for XML parser library for GNOME
-
-MASTERDIR=	${.CURDIR}/../libxml2
-BUILD_WRKSRC=	${WRKSRC}/python
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-
-USE_GNOME+=	libxml2
-USES=		python:3 gettext-runtime
-USE_PYTHON=	autoplist distutils
-
-CPPFLAGS+=	`${PYTHON_CMD}-config --cflags`
-LDFLAGS+=	-L${LOCALBASE}/lib `${PYTHON_CMD}-config --libs`
-CONFIGURE_ARGS=	--with-iconv=${ICONV_PREFIX} \
-		--with-html-dir=${PREFIX}/share/doc \
-		--with-html-subdir=${PORTNAME} \
-		--with-python=${PYTHON_CMD}
-
-DOCSDIR=	${PREFIX}/share/doc/py-libxml2
-EXAMPLESDIR=	${PREFIX}/share/examples/py-libxml2
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-libxml2/pkg-descr b/textproc/py3-libxml2/pkg-descr
deleted file mode 100644
index afb7cf4dd299..000000000000
--- a/textproc/py3-libxml2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Python interface for XML parser library for GNOME
-
-WWW: http://xmlsoft.org/
diff --git a/textproc/py3-numpydoc/Makefile b/textproc/py3-numpydoc/Makefile
deleted file mode 100644
index 236670fbc8d6..000000000000
--- a/textproc/py3-numpydoc/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-numpydoc
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py3-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py3-sphinx
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py3-nose
-
-USES=	python:3.4+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-pyPEG2/Makefile b/textproc/py3-pyPEG2/Makefile
deleted file mode 100644
index 2ea7945297e1..000000000000
--- a/textproc/py3-pyPEG2/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-pyPEG2
-
-USES=		python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-pygments/Makefile b/textproc/py3-pygments/Makefile
deleted file mode 100644
index 9487486f7ac4..000000000000
--- a/textproc/py3-pygments/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-pygments
-
-USES=	python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-pystemmer/Makefile b/textproc/py3-pystemmer/Makefile
deleted file mode 100644
index 3a4222df32e1..000000000000
--- a/textproc/py3-pystemmer/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-pystemmer
-
-USES=	python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-qrcode/Makefile b/textproc/py3-qrcode/Makefile
deleted file mode 100644
index 204d2aa49106..000000000000
--- a/textproc/py3-qrcode/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
- 
-MASTERDIR=	${.CURDIR}/../py-qrcode
- 
-USES=		python:3
- 
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-snowballstemmer/Makefile b/textproc/py3-snowballstemmer/Makefile
deleted file mode 100644
index 663fe0722683..000000000000
--- a/textproc/py3-snowballstemmer/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-snowballstemmer
-
-USES=	python:3.3+
-
-PYSTEMMER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py3-pystemmer
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-sphinx/Makefile b/textproc/py3-sphinx/Makefile
deleted file mode 100644
index 533e86f7b8f8..000000000000
--- a/textproc/py3-sphinx/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-sphinx
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py3-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py3-docutils \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py3-six
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py3-babel\
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py3-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py3-docutils \
-		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py3-pygments \
-		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py3-babel \
-		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py3-sphinx_rtd_theme \
-		${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py3-alabaster \
-		${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py3-snowballstemmer \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py3-six \
-		${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py3-imagesize \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-
-USES=	python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-sphinx_rtd_theme/Makefile b/textproc/py3-sphinx_rtd_theme/Makefile
deleted file mode 100644
index 3181aff62a9e..000000000000
--- a/textproc/py3-sphinx_rtd_theme/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-sphinx_rtd_theme
-
-USES=	python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-texttable/Makefile b/textproc/py3-texttable/Makefile
deleted file mode 100644
index f67602a5ab13..000000000000
--- a/textproc/py3-texttable/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-texttable
-
-USES=	python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index 28d4ca1732dd..b7b8b59a4a4b 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -14,14 +14,14 @@ LICENSE=	GPLv3+
 LIB_DEPENDS=	libminizip.so:archivers/minizip \
 		libpcre.so:devel/pcre \
 		libhunspell-1.6.so:textproc/hunspell
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py3-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Sigil-Ebook
 GH_PROJECT=	Sigil
 
 USES=		cmake:outsource compiler:c++11-lib desktop-file-utils \
-		pkgconfig python:3 shebangfix
+		pkgconfig python:3.4+ shebangfix
 SHEBANG_FILES=	src/Resource_Files/plugin_launchers/python/*.py \
 		src/Resource_Files/python3lib/*.py
 USE_QT5=	concurrent core gui network printsupport svg webkit \
diff --git a/textproc/silvercity/Makefile b/textproc/silvercity/Makefile
index 1419bad5f3ef..7eee02cd061d 100644
--- a/textproc/silvercity/Makefile
+++ b/textproc/silvercity/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	SilverCity-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lexing package for over 20 programming and markup languages
 
-USES=		dos2unix python
+USES=		dos2unix python:2.7
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	SilverCity
 
diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile
index 0350a3b7dfd1..29761d284a62 100644
--- a/textproc/translate-toolkit/Makefile
+++ b/textproc/translate-toolkit/Makefile
@@ -11,21 +11,21 @@ COMMENT=	Converts between many translation formats
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject \
+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} \
 		msghack:devel/gettext-msghack \
-		${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse \
-		${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
 		iso-codes>=1.3:misc/iso-codes \
 		bash:shells/bash \
-		${PYTHON_PKGNAMEPREFIX}utidylib>=0:www/py-utidylib
+		${PYTHON_PKGNAMEPREFIX}utidylib>=0:www/py-utidylib@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 # Can use psyco (on i386)
 
 NO_ARCH=	yes
-USES=		gettext python:2.7+
+USES=		gettext python:2.7
 USE_PYTHON=	autoplist distutils
 
 # list of manual pages to generate
diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index 8c52b89a45e2..de0867e66361 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -11,10 +11,10 @@ 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 \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${FLAVOR}
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 .include <bsd.port.mk>
diff --git a/textproc/xsv/Makefile b/textproc/xsv/Makefile
index 1dcea42ead18..61908468f8b1 100644
--- a/textproc/xsv/Makefile
+++ b/textproc/xsv/Makefile
@@ -13,9 +13,9 @@ COMMENT=	XML Schema Validator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml@${FLAVOR}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/textproc/yould/Makefile b/textproc/yould/Makefile
index ed9d51ad05eb..7d4441a68ef4 100644
--- a/textproc/yould/Makefile
+++ b/textproc/yould/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pronounceable word generator
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
author	Mathieu Arnold <mat@FreeBSD.org>	2017-11-30 15:50:30 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2017-11-30 15:50:30 +0000
commit	551be3c7231225ed9c26479af2b8914fb2ef0ea8 (patch)
tree	d296c82a71504382f4faefa0bf8d7be384ea1105 /textproc
parent	02f9c9be1699251467efc027f210049dfe14f9c5 (diff)
download	ports-551be3c7231225ed9c26479af2b8914fb2ef0ea8.tar.gz ports-551be3c7231225ed9c26479af2b8914fb2ef0ea8.zip