Convert Python ports to FLAVORS.

Ports using USE_PYTHON=distutils are now flavored. They will automatically get flavors (py27, py34, py35, py36) depending on what versions they support. There is also a USE_PYTHON=flavors for ports that do not use distutils but need FLAVORS to be set. A USE_PYTHON=noflavors can be set if using distutils but flavors are not wanted. A new USE_PYTHON=optsuffix that will add PYTHON_PKGNAMESUFFIX has been added to cope with Python ports that did not have the Python PKGNAMEPREFIX but are flavored. USES=python now also exports a PY_FLAVOR variable that contains the current python flavor. It can be used in dependency lines when the port itself is not python flavored. For example, deskutils/calibre. By default, all the flavors are generated. To only generate flavors for the versions in PYTHON2_DEFAULT and PYTHON3_DEFAULT, define BUILD_DEFAULT_PYTHON_FLAVORS in your make.conf. In all the ports with Python dependencies, the *_DEPENDS entries MUST end with the flavor so that the framework knows which to build/use. This is done by appending '@${PY_FLAVOR}' after the origin (or @${FLAVOR} if in a Python module with Python flavors, as the content will be the same). For example: RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} PR: 223071 Reviewed by: portmgr, python Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D12464
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 /net
parent: 02f9c9be1699251467efc027f210049dfe14f9c5 (diff)
download: freebsd-ports-551be3c7231225ed9c26479af2b8914fb2ef0ea8.zip
114 files changed, 404 insertions, 469 deletions
diff --git a/net/Makefile b/net/Makefile
index e2e3c367b962..926eb4125f30 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1089,9 +1089,6 @@
     SUBDIR += py-xmlrpc
     SUBDIR += py-zope.proxy
     SUBDIR += py-zsi
-    SUBDIR += py3-netifaces
-    SUBDIR += py3-pysocks
-    SUBDIR += py3-urllib3
     SUBDIR += pygopherd
     SUBDIR += pynids
     SUBDIR += pyrad
diff --git a/net/ceph-devel/Makefile b/net/ceph-devel/Makefile
index b6a32c5580c0..35036a3ecef0 100644
--- a/net/ceph-devel/Makefile
+++ b/net/ceph-devel/Makefile
@@ -20,7 +20,6 @@ IGNORE_FreeBSD_10=	Doesnt build for FreeBSD 10.x
 BUILD_DEPENDS=	\
 	yasm:devel/yasm \
 	pkgconf:devel/pkgconf \
-	cython>=0.25.2:lang/cython \
 	sphinx-build:textproc/py-sphinx \
 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \
 	gperf:devel/gperf
@@ -50,6 +49,7 @@ RUN_DEPENDS=	\
 CONFLICTS_INSTALL=	ceph
 
 USES=	gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix
+USE_PYTHON=	cython
 USE_GITHUB=	yes
 GH_ACCOUNT=	wjwithagen:DEFAULT
 GH_TUPLE+=	ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
diff --git a/net/ceph/Makefile b/net/ceph/Makefile
index 339282fcf4be..e7c5ef5be0da 100644
--- a/net/ceph/Makefile
+++ b/net/ceph/Makefile
@@ -19,8 +19,7 @@ IGNORE_FreeBSD_10=	Doesnt build for FreeBSD 10.x
 BUILD_DEPENDS=	\
 	yasm:devel/yasm \
 	pkgconf:devel/pkgconf \
-	cython>=0.25.2:lang/cython \
-	sphinx-build:textproc/py-sphinx \
+	sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
 	gperf:devel/gperf \
 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 LIB_DEPENDS=	\
@@ -43,12 +42,13 @@ RUN_DEPENDS=	\
 	xml:textproc/xmlstarlet \
 	jq:textproc/jq \
 	flock:sysutils/flock \
-	virtualenv:devel/py-virtualenv \
-	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable
+	virtualenv:devel/py-virtualenv@${PY_FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR}
 
 CONFLICTS_INSTALL=	ceph-devel
 
 USES=	gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix
+USE_PYTHON=	cython
 USE_GITHUB=	yes
 GH_ACCOUNT=	ceph:DEFAULT
 GH_TUPLE+=	ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
diff --git a/net/cloud-init-azure/Makefile b/net/cloud-init-azure/Makefile
index 2a16db74708e..2866450d5905 100644
--- a/net/cloud-init-azure/Makefile
+++ b/net/cloud-init-azure/Makefile
@@ -16,18 +16,18 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	dmidecode>0:sysutils/dmidecode \
 		e2fsprogs>0:sysutils/e2fsprogs \
 		python>0:lang/python \
-		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah \
-		${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable \
-		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch \
-		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer
+		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${FLAVOR}
 
 ETCDIR=		${PREFIX}/etc/cloud
 
diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index e63a72ae9840..39746f431651 100644
--- a/net/cloud-init/Makefile
+++ b/net/cloud-init/Makefile
@@ -15,17 +15,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	dmidecode>0:sysutils/dmidecode \
 		sudo>0:security/sudo \
 		gpart>0:sysutils/gpart \
-		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable \
-		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}oauth>0:net/py-oauth \
-		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch \
-		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer
+		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oauth>0:net/py-oauth@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${FLAVOR}
 
 ETCDIR=		${PREFIX}/etc/cloud
 
diff --git a/net/dpdk/Makefile b/net/dpdk/Makefile
index 71f79518e989..510bbe51e194 100644
--- a/net/dpdk/Makefile
+++ b/net/dpdk/Makefile
@@ -29,7 +29,7 @@ TOOLS_DESC=	Install tool scripts
 
 DEBUG_MAKE_ENV=	EXTRA_CFLAGS='-O0 -g'
 TOOLS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyelftools>=0:devel/py-pyelftools
-TOOLS_USES=	python
+TOOLS_USES=	python:2.7
 
 # build up the list of files in the compiled directory that should be executable
 EXEC_FILES=	app/cmdline_test \
diff --git a/net/dshell/Makefile b/net/dshell/Makefile
index e849754265f2..51ba8184e80e 100644
--- a/net/dshell/Makefile
+++ b/net/dshell/Makefile
@@ -13,11 +13,11 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	bash:shells/bash \
-		${PYTHON_PKGNAMEPREFIX}pygeoip>0:net/py-pygeoip \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}dpkt>0:net/py-dpkt \
-		${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy \
-		${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap
+		${PYTHON_PKGNAMEPREFIX}pygeoip>0:net/py-pygeoip@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dpkt>0:net/py-dpkt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index d2a1752d2846..e87220c20f40 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -98,7 +98,7 @@ PGSQL_CONFIGURE_WITH=		rlm_sql_postgresql
 PYTHON_CONFIGURE_WITH=		rlm_python
 PYTHON_CONFIGURE_ON=		--with-rlm-python-lib-dir=${PYTHON_LIBDIR} \
 				--with-rlm-python-include-dir=${PYTHON_INCLUDEDIR}
-PYTHON_USES=			python gettext-runtime
+PYTHON_USES=			python:2.7 gettext-runtime
 PYTHON_VARS=			SHEBANG_FILES+=src/modules/rlm_python/*.py
 REDIS_CONFIGURE_WITH=		rlm_redis rlm_rediswho
 REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index c8d0ab1fab8e..e3a396be242c 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Command line tools for the Google Data APIs
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/License
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata \
-		${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client \
-		${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${FLAVOR}
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile
index c1e7490012ff..3697b0c80942 100644
--- a/net/gupnp-igd/Makefile
+++ b/net/gupnp-igd/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG=	yes
 USES=		gmake gnome libtool pathfix pkgconfig tar:xz
 
 PYTHON_CONFIGURE_ENABLE=python
-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject>=2.12.0:devel/py-gobject
+PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject>=2.12.0:devel/py-gobject@${PY_FLAVOR}
 PYTHON_USES=		python:2
 
 post-patch:
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 2107811bf5ff..b5f4168597c0 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -17,10 +17,10 @@ LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libpeas-1.0.so:devel/libpeas \
 		libjson-glib-1.0.so:devel/json-glib
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
-		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
+		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext gmake gnome libtool localbase \
-		pathfix pkgconfig python:3 sqlite tar:bzip2
+		pathfix pkgconfig python:3.4+ sqlite tar:bzip2
 USE_GNOME=	cairo dconf:run gtk30 intltool introspection \
 		libxslt libxml2
 GNU_CONFIGURE=	yes
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index c8d147111d5e..ecd1553b9649 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -66,7 +66,7 @@ DBUS_USES=	python:2
 DBUS_USE=	GNOME=glib20
 DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 			libdbus-1.so:devel/dbus
-DBUS_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
+DBUS_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR}
 MYSQL_USE=	MYSQL=yes
 MYSQL_CONFIGURE_OFF=--with-mysql-config=/nonexistent
 ACL_LIB_DEPENDS=	libsunacl.so:sysutils/libsunacl
diff --git a/net/neubot/Makefile b/net/neubot/Makefile
index 266a2dae9bad..62628bf9790b 100644
--- a/net/neubot/Makefile
+++ b/net/neubot/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Measures neutrality of your network connection in the background
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		python:2
 NO_BUILD=	yes
diff --git a/net/nsscache/Makefile b/net/nsscache/Makefile
index 6f2c04784d8c..f57ec43fbce2 100644
--- a/net/nsscache/Makefile
+++ b/net/nsscache/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Python utility to create a local cache of directory services
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl \
-		${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${FLAVOR}
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/net/pdb/Makefile b/net/pdb/Makefile
index 743fbc34807f..5557bcd3a0ba 100644
--- a/net/pdb/Makefile
+++ b/net/pdb/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	gnn@FreeBSD.org
 COMMENT=	Packet Debugger
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pcs/__init__.py:net/py-pcs
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pcs/__init__.py:net/py-pcs@${FLAVOR}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils pythonprefix
 
 .include <bsd.port.mk>
diff --git a/net/py-GeoIP2/Makefile b/net/py-GeoIP2/Makefile
index fe1307dd4cbf..65729bb531c1 100644
--- a/net/py-GeoIP2/Makefile
+++ b/net/py-GeoIP2/Makefile
@@ -13,8 +13,8 @@ COMMENT=	MaxMind GeoIP2 Python API
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}maxminddb>=1.1.0:net/py-maxminddb \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}maxminddb>=1.1.0:net/py-maxminddb@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests@${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
diff --git a/net/py-amqp/Makefile b/net/py-amqp/Makefile
index 687d4dc16bb1..61faeab808f8 100644
--- a/net/py-amqp/Makefile
+++ b/net/py-amqp/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Low-level AMQP client for Python (fork of amqplib)
 
 LICENSE=	LGPL21
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 7faf7584b97d..18d9d62e9cf3 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -10,11 +10,11 @@ PKGNAMESUFFIX=	# empty
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python interface to the Avahi mDNS system
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm \
-		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} \
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${FLAVOR}
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm \
-		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} \
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${FLAVOR}
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-python
@@ -26,6 +26,7 @@ AVAHI_SLAVE=	python
 
 USE_GNOME=	pygtk2
 USES=		python:2
+USE_PYTHON=	flavors
 MANPAGES=	avahi-bookmarks.1 avahi-discover.1
 
 post-patch:
diff --git a/net/py-beanstalkc/Makefile b/net/py-beanstalkc/Makefile
index 9830731d9a98..6b55874ee991 100644
--- a/net/py-beanstalkc/Makefile
+++ b/net/py-beanstalkc/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Simple beanstalkd client library for Python
 
 LICENSE=	APACHE20
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=		YAML
 OPTIONS_DEFAULT=	YAML
 YAML_DESC=		Support parsing YAML responses
 
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
 
 regression-test: build
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/net/py-cjdns/Makefile b/net/py-cjdns/Makefile
index 7bd51313aea0..4b0569126c01 100644
--- a/net/py-cjdns/Makefile
+++ b/net/py-cjdns/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library to interact with the cjdns admin interface
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-cloudflare-scrape/Makefile b/net/py-cloudflare-scrape/Makefile
index 17310458e134..01058805dbb5 100644
--- a/net/py-cloudflare-scrape/Makefile
+++ b/net/py-cloudflare-scrape/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Python module to bypass Cloudflare's anti-bot page
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PyExecJS>=0:devel/py-PyExecJS
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PyExecJS>=0:devel/py-PyExecJS@${FLAVOR}
 
 USES=		python
 USE_PYTHON=     distutils autoplist
diff --git a/net/py-coherence/Makefile b/net/py-coherence/Makefile
index 8f8327f6b618..acb877dc68c4 100644
--- a/net/py-coherence/Makefile
+++ b/net/py-coherence/Makefile
@@ -12,16 +12,16 @@ COMMENT=	DLNA/UPnP media server and framework for the digital living
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configobj>=4.3:devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}twisted>8.2:devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Louie>0:devel/py-louie
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configobj>=4.3:devel/py-configobj@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>8.2:devel/py-twisted@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Louie>0:devel/py-louie@${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coherence-project
 GH_TAGNAME=	4d5ee5f
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/net/py-ec2-cli-tools/Makefile b/net/py-ec2-cli-tools/Makefile
index cc781a685d25..ab82b2d9a88e 100644
--- a/net/py-ec2-cli-tools/Makefile
+++ b/net/py-ec2-cli-tools/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Helpful CLI utilities for querying and connecting to EC2 instances
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>=1.0:devel/py-boto \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>=1.0:devel/py-boto@${FLAVOR} \
 		bash:shells/bash
 
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-eventlet/Makefile b/net/py-eventlet/Makefile
index 809a679d5df8..5231c3944a9c 100644
--- a/net/py-eventlet/Makefile
+++ b/net/py-eventlet/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Concurrent networking library for Python
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.3:devel/py-greenlet \
-		${PYTHON_PKGNAMEPREFIX}enum-compat>=0.0.2:devel/py-enum-compat \
-		${PYTHON_PKGNAMEPREFIX}enum34>=1.1.6:devel/py-enum34
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.3:devel/py-greenlet@${FLAVOR} \
+		${PY_ENUM_COMPAT} \
+		${PY_ENUM34}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-gspread/Makefile b/net/py-gspread/Makefile
index d79491c72f75..1dd8a114c204 100644
--- a/net/py-gspread/Makefile
+++ b/net/py-gspread/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Google Spreadsheets Python API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.2.1:www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.2.1:www/py-requests@${FLAVOR}
 
 USES=	python:2
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-gspreadsheet/Makefile b/net/py-gspreadsheet/Makefile
index bcee24b71e91..b1f55a61bd0c 100644
--- a/net/py-gspreadsheet/Makefile
+++ b/net/py-gspreadsheet/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Wrapper around Google Spreadsheets to look like csv.DictReader
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
 
 USES=	python:2
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-httpstat/Makefile b/net/py-httpstat/Makefile
index d4470f79ad75..df7d4c4109cf 100644
--- a/net/py-httpstat/Makefile
+++ b/net/py-httpstat/Makefile
@@ -18,7 +18,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	reorx
 
 NO_ARCH=	yes
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile
index b6358c392d13..32bf37bf9774 100644
--- a/net/py-impacket/Makefile
+++ b/net/py-impacket/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Collection of Python classes providing access to network packets
 LICENSE=	APACHE11
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}pcapy>=0:net/py-pcapy \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pcapy>=0:net/py-pcapy@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR}
 
 USES=		dos2unix python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile
index 15e14dfc48e6..cb0c3120c1b3 100644
--- a/net/py-kombu/Makefile
+++ b/net/py-kombu/Makefile
@@ -13,8 +13,8 @@ COMMENT=	AMQP messaging framework for Python
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amqp>=1.4.7:net/py-amqp \
-		${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amqp>=1.4.7:net/py-amqp@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson@${FLAVOR}
 
 OPTIONS_DEFINE=	BEANSTALK BOTO MONGODB REDIS SQLALCHEMY ZMQ
 
@@ -25,12 +25,12 @@ REDIS_DESC=	Include Redis transport support
 SQLALCHEMY_DESC=Include SQLAlchemy transport support
 ZMQ_DESC=	Include ZMQ transport support
 
-BEANSTALK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beanstalkc>0:net/py-beanstalkc
-BOTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:devel/py-boto
+BEANSTALK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beanstalkc>0:net/py-beanstalkc@${FLAVOR}
+BOTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:devel/py-boto@${FLAVOR}
 MONGODB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo
-REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis
-SQLALCHEMY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10
-ZMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq
+REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${FLAVOR}
+SQLALCHEMY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR}
+ZMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile
index f7bb126396ee..08b3e5c493e0 100644
--- a/net/py-ldap/Makefile
+++ b/net/py-ldap/Makefile
@@ -13,8 +13,8 @@ COMMENT=	LDAP module for python, for OpenLDAP2
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules@${FLAVOR}
 
 CONFLICTS_INSTALL=	py27-pyldap
 USES=		python:-2.7
diff --git a/net/py-ldap3/Makefile b/net/py-ldap3/Makefile
index 91688eb17ce8..0c777de10527 100644
--- a/net/py-ldap3/Makefile
+++ b/net/py-ldap3/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Strictly RFC 4511 conforming LDAP V3 pure Python client
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python:2.7+
diff --git a/net/py-ldaptor/Makefile b/net/py-ldaptor/Makefile
index 250777d66f5a..1233c24bcc7c 100644
--- a/net/py-ldaptor/Makefile
+++ b/net/py-ldaptor/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Pure-python LDAP module for Twisted
 LICENSE=	MIT LGPL21+
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
 
 GITVERSION=	aad8ded658b36337a08aeb7402b6b67eb8771bea
 
diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index 9477a96d7a5c..a2827ae15c4d 100644
--- a/net/py-libcloud/Makefile
+++ b/net/py-libcloud/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Standard client library for many popular cloud providers
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR}
 
 NO_ARCH=	yes
 
diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile
index 42f17c9359ad..736869671d92 100644
--- a/net/py-libdnet/Makefile
+++ b/net/py-libdnet/Makefile
@@ -17,7 +17,8 @@ PLIST_FILES=	%%PYTHON_SITELIBDIR%%/dnet.so \
 
 LIBDNET_SLAVE=	yes
 
-USES=		python
+USES=		python:2.7
+USE_PYTHON=	flavors
 CONFIGURE_ARGS=	--with-python=${PYTHON_CMD}
 
 .if defined(MAINTAINER_MODE)
diff --git a/net/py-magic-wormhole/Makefile b/net/py-magic-wormhole/Makefile
index 3e345cbaf2a7..8f2fb0321963 100644
--- a/net/py-magic-wormhole/Makefile
+++ b/net/py-magic-wormhole/Makefile
@@ -9,17 +9,17 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Get things from one computer to another, safely
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}autobahn>=0.14.1:www/py-autobahn \
-		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}hkdf>0:security/py-hkdf \
-		${PYTHON_PKGNAMEPREFIX}humanize>=0:devel/py-humanize \
-		${PYTHON_PKGNAMEPREFIX}idna>=0.6:dns/py-idna \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \
-		${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity \
-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}spake2>=0.7:security/py-spake2 \
-		${PYTHON_PKGNAMEPREFIX}tqdm>=4.13.0:misc/py-tqdm \
-		${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.3:security/py-txtorcon
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}autobahn>=0.14.1:www/py-autobahn@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}hkdf>0:security/py-hkdf@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}humanize>=0:devel/py-humanize@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}idna>=0.6:dns/py-idna@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}spake2>=0.7:security/py-spake2@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tqdm>=4.13.0:misc/py-tqdm@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.3:security/py-txtorcon@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-matrix-synapse-ldap3/Makefile b/net/py-matrix-synapse-ldap3/Makefile
index cb4aac141a2a..cae193c6b900 100644
--- a/net/py-matrix-synapse-ldap3/Makefile
+++ b/net/py-matrix-synapse-ldap3/Makefile
@@ -13,7 +13,7 @@ COMMENT=	LDAP3 auth provider for Matrix Synapse
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap3>=0.9.5:net/py-ldap3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap3>=0.9.5:net/py-ldap3@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-maxminddb/Makefile b/net/py-maxminddb/Makefile
index a1d7409cca26..ebfc02117856 100644
--- a/net/py-maxminddb/Makefile
+++ b/net/py-maxminddb/Makefile
@@ -25,7 +25,7 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr@${FLAVOR}
 .endif
 
 post-install:
diff --git a/net/py-miniupnpc/Makefile b/net/py-miniupnpc/Makefile
index fb6cf0b4a4ad..20b014740792 100644
--- a/net/py-miniupnpc/Makefile
+++ b/net/py-miniupnpc/Makefile
@@ -12,13 +12,15 @@ MASTERDIR=	${.CURDIR}/../miniupnpc
 USES=		python
 USE_PYTHON=	autoplist distutils
 
-WRKDIR=		${WRKDIRPREFIX}${MASTERDIR}/${_WRKDIR}
 PLIST=		${.CURDIR}/pkg-plist
 
 post-patch:
 	${REINPLACE_CMD} 's/\(version\)="[^"]*"/\1="${PORTVERSION}"/' \
 		${WRKSRC}/setup.py
 
+pre-build:
+	${CP} $$(make FLAVOR= -C ${MASTERDIR} -V WRKSRC)/libminiupnpc.a ${WRKSRC}
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc.so
 
diff --git a/net/py-msrplib/Makefile b/net/py-msrplib/Makefile
index 3ee06fb1e776..059caa70bc6b 100644
--- a/net/py-msrplib/Makefile
+++ b/net/py-msrplib/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Python MSRP client library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}application>=1.1.0:devel/py-application \
-		${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.15:net/py-eventlet \
-		${PYTHON_PKGNAMEPREFIX}gnutls>=1.1.6:security/py-gnutls \
-		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}application>=1.1.0:devel/py-application@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.15:net/py-eventlet@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gnutls>=1.1.6:security/py-gnutls@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/net/py-ndg_httpsclient/Makefile b/net/py-ndg_httpsclient/Makefile
index a84c6d49ff76..a2bb37344bb1 100644
--- a/net/py-ndg_httpsclient/Makefile
+++ b/net/py-ndg_httpsclient/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Enhance HTTPS support for httplib and urllib2
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/ndg/httpsclient/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.4:devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.4:devel/py-pyasn1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR}
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile
index 45a78cec5e85..273a132c1818 100644
--- a/net/py-netaddr/Makefile
+++ b/net/py-netaddr/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Manipulation of IPv4, IPv6, CIDR, EUI and MAC network addresses
 LICENSE=	BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/net/py-netif/Makefile b/net/py-netif/Makefile
index 0f8f8a376445..39a419b59b21 100644
--- a/net/py-netif/Makefile
+++ b/net/py-netif/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Python network configuration library for FreeBSD
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	cython>0:lang/cython
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsd>0:devel/py-bsd
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsd>0:devel/py-bsd@${FLAVOR}
 
 USE_GITHUB=     yes
 GH_ACCOUNT=	freenas
@@ -21,12 +20,12 @@ GH_PROJECT=	py-netif
 GH_TAGNAME=	a102b4f
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist distutils cython
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/py-netifaces/Makefile b/net/py-netifaces/Makefile
index bd6f08fd18ca..67ee95185331 100644
--- a/net/py-netifaces/Makefile
+++ b/net/py-netifaces/Makefile
@@ -1,18 +1,21 @@
-# Created by: Stanislav Svirid <count@211.ru>
+# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	netifaces
-PORTVERSION=	0.10.5
+PORTVERSION=	0.10.6
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	count@211.ru
-COMMENT=	Getting network addresses from Python
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Getting network addresses from Python 3
 
 LICENSE=	MIT
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/netifaces.so
+
 .include <bsd.port.mk>
diff --git a/net/py-netifaces/distinfo b/net/py-netifaces/distinfo
index 0e2115a2cc12..5ecdf46f2a00 100644
--- a/net/py-netifaces/distinfo
+++ b/net/py-netifaces/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478617707
-SHA256 (netifaces-0.10.5.tar.gz) = 59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b
-SIZE (netifaces-0.10.5.tar.gz) = 24879
+TIMESTAMP = 1505758293
+SHA256 (netifaces-0.10.6.tar.gz) = 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0
+SIZE (netifaces-0.10.6.tar.gz) = 25166
diff --git a/net/py-netlib/Makefile b/net/py-netlib/Makefile
index 1b1d545cd707..e487391202f2 100644
--- a/net/py-netlib/Makefile
+++ b/net/py-netlib/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Collection of network utilities
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net/py-netstring/Makefile b/net/py-netstring/Makefile
index 7faf018321c2..f6044bdede76 100644
--- a/net/py-netstring/Makefile
+++ b/net/py-netstring/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module implementing the netstring protocol
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net/py-nnpy/Makefile b/net/py-nnpy/Makefile
index 9882647cdc89..47c4567e8b3b 100644
--- a/net/py-nnpy/Makefile
+++ b/net/py-nnpy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	cffi-based Python bindings for nanomsg
 LICENSE=	MIT
 
 LIB_DEPENDS=	libnanomsg.so:net/nanomsg
-BUILD_DEPENDS=	${PYTHONPREFIX_SITELIBDIR}/_cffi_backend.so:devel/py-cffi
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/net/py-oauth2/Makefile b/net/py-oauth2/Makefile
index 4a1f12499569..4534b4e5f7ed 100644
--- a/net/py-oauth2/Makefile
+++ b/net/py-oauth2/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Python library for OAuth version 1.0
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${FLAVOR}
 TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
 
 OPTIONS_DEFINE=		TESTS
 TESTS_DESC=		Install test suite requirements
diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile
index 7a8d4d95d412..bc13417571b0 100644
--- a/net/py-pcap/Makefile
+++ b/net/py-pcap/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python interface to LBL Packet Capture library (libpcap)
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	LIBPCAP
diff --git a/net/py-pcs/Makefile b/net/py-pcs/Makefile
index 5d434a3bf754..c5a8e2b1d66d 100644
--- a/net/py-pcs/Makefile
+++ b/net/py-pcs/Makefile
@@ -14,13 +14,11 @@ COMMENT=	Protocol Construction Set
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-BUILD_DEPENDS=	cython>=0.11.2:lang/cython
-
 PORTDOCS=	pcs.pdf
 PORTEXAMPLES=	*
 
 USES=		python:2.7
-USE_PYTHON=	distutils pythonprefix
+USE_PYTHON=	distutils pythonprefix cython
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/net/py-port-for/Makefile b/net/py-port-for/Makefile
index 5d4be49b8e96..8637878624b8 100644
--- a/net/py-port-for/Makefile
+++ b/net/py-port-for/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Utility that helps with local TCP ports managment
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>=0.8:devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>=0.8:devel/py-mock@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
diff --git a/net/py-pyldap/Makefile b/net/py-pyldap/Makefile
index ec6304eda494..45adba608a58 100644
--- a/net/py-pyldap/Makefile
+++ b/net/py-pyldap/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Fork of python-ldap with Python 3 support
 
 LICENSE=	PSFL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:devel/py-pyasn1-modules
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:devel/py-pyasn1-modules@${FLAVOR}
 
 CONFLICTS_INSTALL=	py27-ldap
 USES=		python
diff --git a/net/py-pynsq/Makefile b/net/py-pynsq/Makefile
index 66c1328b3d41..0dedcf5c17b3 100644
--- a/net/py-pynsq/Makefile
+++ b/net/py-pynsq/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Official Python client library for NSQ
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}python-snappy>0:archivers/py-python-snappy \
-		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-snappy>0:archivers/py-python-snappy@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${FLAVOR}
 
 USES=		python:-2.7
 USE_GITHUB=	yes
diff --git a/net/py-pypcap/Makefile b/net/py-pypcap/Makefile
index b77de7b9f53e..239af98aa39b 100644
--- a/net/py-pypcap/Makefile
+++ b/net/py-pypcap/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Simplified object-oriented Python extension module for libpcap
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pyrexc:devel/pyrex
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dugsong
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 post-patch:
diff --git a/net/py-pyshark/Makefile b/net/py-pyshark/Makefile
index 5e53a690c613..80cced1def2a 100644
--- a/net/py-pyshark/Makefile
+++ b/net/py-pyshark/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Pyhon packet parsing using wireshark dissectors
 LICENSE=	MIT
 
 RUN_DEPENDS=	tshark>0:net/tshark \
-		${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius \
-		${PYTHON_PKGNAMEPREFIX}logbook>0:devel/py-logbook \
-		${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
+		${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}logbook>0:devel/py-logbook@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-pysmb/Makefile b/net/py-pysmb/Makefile
index 408c647f5053..a170aed04bd0 100644
--- a/net/py-pysmb/Makefile
+++ b/net/py-pysmb/Makefile
@@ -14,7 +14,7 @@ COMMENT=	SMB/CIFS library written in Python
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${FLAVOR}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net/py-pysocks/Makefile b/net/py-pysocks/Makefile
index 6b63e7490f1e..d74dafc7b2b4 100644
--- a/net/py-pysocks/Makefile
+++ b/net/py-pysocks/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python SOCKS module
 
 LICENSE=	BSD3CLAUSE
 
-USES?=		python
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 
diff --git a/net/py-python-barbicanclient/Makefile b/net/py-python-barbicanclient/Makefile
index 10bccb7deed1..e6f217c90eb6 100644
--- a/net/py-python-barbicanclient/Makefile
+++ b/net/py-python-barbicanclient/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Client Library for OpenStack Barbican Key Management API
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff@${FLAVOR}
 
 NO_ARCH=	yes
 
diff --git a/net/py-python-ceilometerclient/Makefile b/net/py-python-ceilometerclient/Makefile
index 68b1ff45440a..416c77358ffb 100644
--- a/net/py-python-ceilometerclient/Makefile
+++ b/net/py-python-ceilometerclient/Makefile
@@ -13,17 +13,17 @@ COMMENT=	OpenStack Telemetry API Client Library
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}stevedore>=1.10.0:devel/py-stevedore \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.5.0:devel/py-oslo.utils \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1 \
-		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}stevedore>=1.10.0:devel/py-stevedore@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.5.0:devel/py-oslo.utils@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR}
 
 NO_ARCH=	yes
 
diff --git a/net/py-python-cinderclient/Makefile b/net/py-python-cinderclient/Makefile
index 1d42185d629e..6e7f7b44d475 100644
--- a/net/py-python-cinderclient/Makefile
+++ b/net/py-python-cinderclient/Makefile
@@ -10,15 +10,15 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	alexander.nusov@nfvexpress.com
 COMMENT=	Client for the OpenStack Cinder API
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
-		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR}
 
 USES=		python shebangfix
 SHEBANG_FILES=	cinderclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-python-designateclient/Makefile b/net/py-python-designateclient/Makefile
index b16aee5177b2..045c7aeeaba7 100644
--- a/net/py-python-designateclient/Makefile
+++ b/net/py-python-designateclient/Makefile
@@ -12,17 +12,17 @@ COMMENT=	OpenStack DNS-as-a-Service - Client
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
-		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib \
-		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1 \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \
-		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \
-		${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${FLAVOR}
 
 NO_ARCH=	yes
 
diff --git a/net/py-python-glanceclient/Makefile b/net/py-python-glanceclient/Makefile
index 721bbd366eb2..2f8b85e85327 100644
--- a/net/py-python-glanceclient/Makefile
+++ b/net/py-python-glanceclient/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	alexander.nusov@nfvexpress.com
 COMMENT=	Client for the OpenStack Glance API
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
-		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}warlock>=0:devel/py-warlock \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}warlock>=0:devel/py-warlock@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR}
 
 USES=		python shebangfix
 SHEBANG_FILES=	glanceclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-python-heatclient/Makefile b/net/py-python-heatclient/Makefile
index cbea42dbbbfb..7126b10e325e 100644
--- a/net/py-python-heatclient/Makefile
+++ b/net/py-python-heatclient/Makefile
@@ -13,25 +13,25 @@ COMMENT=	OpenStack Orchestration API Client Library
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib \
-		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \
-		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
-		${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
-		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR}
 
 NO_ARCH=	yes
 
-USES=		python shebangfix
+USES=		python:2.7 shebangfix
 USE_PYTHON=	autoplist distutils
 SHEBANG_FILES=	heatclient/tests/functional/hooks/post_test_hook.sh
 
diff --git a/net/py-python-keystoneclient/Makefile b/net/py-python-keystoneclient/Makefile
index 33dcec7aff5f..79dc899773a7 100644
--- a/net/py-python-keystoneclient/Makefile
+++ b/net/py-python-keystoneclient/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Client for the OpenStack Keystone API
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \
-		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \
-		${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
-		${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR}
 
 USES=		python shebangfix
 SHEBANG_FILES=	keystoneclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-python-neutronclient/Makefile b/net/py-python-neutronclient/Makefile
index c5a8a98901c1..c9c8def0f85e 100644
--- a/net/py-python-neutronclient/Makefile
+++ b/net/py-python-neutronclient/Makefile
@@ -10,20 +10,20 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	alexander.nusov@nfvexpress.com
 COMMENT=	Client for the OpenStack Neutron API
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \
-		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \
-		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.0.2:devel/py-osc-lib \
-		${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff \
-		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
-		${PYTHON_PKGNAMEPREFIX}os-client-config>=0:devel/py-os-client-config \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.0.2:devel/py-osc-lib@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}os-client-config>=0:devel/py-os-client-config@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR}
 
 USES=		python shebangfix
 SHEBANG_FILES=	neutronclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-python-novaclient/Makefile b/net/py-python-novaclient/Makefile
index f4fee5de9ac4..78bb90e3a7b2 100644
--- a/net/py-python-novaclient/Makefile
+++ b/net/py-python-novaclient/Makefile
@@ -10,17 +10,17 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Client for the OpenStack Nova API
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \
-		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
-		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR}
 
 USES=		python shebangfix
 SHEBANG_FILES=	novaclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-python-openstackclient/Makefile b/net/py-python-openstackclient/Makefile
index adacbc0670b6..94d9f65b3003 100644
--- a/net/py-python-openstackclient/Makefile
+++ b/net/py-python-openstackclient/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Client for the OpenStack
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff \
-		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \
-		${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.9.10:devel/py-openstacksdk \
-		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
-		${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.5.0:net/py-python-glanceclient \
-		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \
-		${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient \
-		${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient \
-		${PYTHON_PKGNAMEPREFIX}python-neutronclient>=0:net/py-python-neutronclient
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.9.10:devel/py-openstacksdk@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.5.0:net/py-python-glanceclient@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-neutronclient>=0:net/py-python-neutronclient@${FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	distutils autoplist noegginfo
diff --git a/net/py-python-twitter/Makefile b/net/py-python-twitter/Makefile
index 891f69fab5d6..cf124dce12fe 100644
--- a/net/py-python-twitter/Makefile
+++ b/net/py-python-twitter/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python wrapper around the Twitter API
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/net/py-pyvmomi/Makefile b/net/py-pyvmomi/Makefile
index f9dc9b89552c..aed8ac8cffe4 100644
--- a/net/py-pyvmomi/Makefile
+++ b/net/py-pyvmomi/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Python SDK for the VMware vSphere API of ESX, ESXi, and vCenter
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist distutils concurrent optsuffix
 
 post-patch:
 	${REINPLACE_CMD} -E "/data_files/s|\[\(''|\[\('${DOCSDIR}'|"  ${WRKSRC}/setup.py
diff --git a/net/py-pyzmq/Makefile b/net/py-pyzmq/Makefile
index f56ecdee30db..98cb12d18de5 100644
--- a/net/py-pyzmq/Makefile
+++ b/net/py-pyzmq/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python bindings for ZeroMQ
 LICENSE=	LGPL3
 
 LIB_DEPENDS=	libzmq.so:net/libzmq4
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
@@ -22,7 +22,7 @@ PYDISTUTILS_CONFIGUREARGS=	--zmq=${LOCALBASE}
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} == 3.3
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}asyncio>0:devel/py-asyncio
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}asyncio>0:devel/py-asyncio@${FLAVOR}
 .endif
 
 do-test:
diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile
index e5668ee45fc3..60e0c14ade5e 100644
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:4
 USE_PYQT=	sip_build core_run
+USE_PYTHON=	flavors
 USE_QT4=	moc_build corelib network qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
diff --git a/net/py-qt5-network/Makefile b/net/py-qt5-network/Makefile
index 15098a27c737..81efa320da8c 100644
--- a/net/py-qt5-network/Makefile
+++ b/net/py-qt5-network/Makefile
@@ -11,6 +11,7 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:5
 USE_PYQT=	sip_build core_run
+USE_PYTHON=	flavors
 USE_QT5=	core network qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
diff --git a/net/py-rabbitpy/Makefile b/net/py-rabbitpy/Makefile
index ed3879bc63ce..0c23bf83d403 100644
--- a/net/py-rabbitpy/Makefile
+++ b/net/py-rabbitpy/Makefile
@@ -11,8 +11,8 @@ COMMENT=	RabbitMQ client library for Python
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/net/py-rainbowstream/Makefile b/net/py-rainbowstream/Makefile
index 751ed88b5ed6..ad8717db5f64 100644
--- a/net/py-rainbowstream/Makefile
+++ b/net/py-rainbowstream/Makefile
@@ -14,16 +14,16 @@ COMMENT=	Smart and nice Twitter client on terminal
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.5.3:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}pyfiglet>0:misc/py-pyfiglet \
-		${PYTHON_PKGNAMEPREFIX}twitter-tools>0:net/py-twitter-tools \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.5.3:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyfiglet>0:misc/py-pyfiglet@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twitter-tools>0:net/py-twitter-tools@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${FLAVOR}
 
 # Actually 2.7,3.2-
-USES=		python:2.7-
+USES=		python:2.7
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/net/py-ripe.atlas.cousteau/Makefile b/net/py-ripe.atlas.cousteau/Makefile
index ab36f2ad6c7e..81801cba1c7b 100644
--- a/net/py-ripe.atlas.cousteau/Makefile
+++ b/net/py-ripe.atlas.cousteau/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Python wrapper around the RIPE Atlas API
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}socketio-client>=0.6.5:net/py-socketio-client \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}websocket-client<0.39:www/py-websocket-client
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}socketio-client>=0.6.5:net/py-socketio-client@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}websocket-client<0.39:www/py-websocket-client@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/net/py-ripe.atlas.sagan/Makefile b/net/py-ripe.atlas.sagan/Makefile
index 74adfb4e72c7..d167e335dce6 100644
--- a/net/py-ripe.atlas.sagan/Makefile
+++ b/net/py-ripe.atlas.sagan/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Parsing library for RIPE Atlas measurement results
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-ripe.atlas.tools/Makefile b/net/py-ripe.atlas.tools/Makefile
index 04c3e819370c..929c7512a929 100644
--- a/net/py-ripe.atlas.tools/Makefile
+++ b/net/py-ripe.atlas.tools/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Official command-line client for RIPE Atlas
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}ripe.atlas.cousteau>=1.0.4:net/py-ripe.atlas.cousteau \
-		${PYTHON_PKGNAMEPREFIX}ripe.atlas.sagan>=1.1.4:net/py-ripe.atlas.sagan \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ripe.atlas.cousteau>=1.0.4:net/py-ripe.atlas.cousteau@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ripe.atlas.sagan>=1.1.4:net/py-ripe.atlas.sagan@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile
index abb31192a780..3bd95ad5f031 100644
--- a/net/py-s3cmd/Makefile
+++ b/net/py-s3cmd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Unix-like tools to manipulate stored files from the command line
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR}
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-s3transfer/Makefile b/net/py-s3transfer/Makefile
index 8433d838e98a..512d03cfc081 100644
--- a/net/py-s3transfer/Makefile
+++ b/net/py-s3transfer/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Amazon S3 Transfer Manager for Python
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.3.0:devel/py-botocore
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.3:devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.3.0:devel/py-botocore@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.3:devel/py-nose@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${FLAVOR}
 
 #Actually -2.7,3.3-3.5
 USES=		python
@@ -25,7 +25,7 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>=2.2.0:devel/py-futures
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>=2.2.0:devel/py-futures@${FLAVOR}
 .endif
 
 # setup.py test runs integration tests which fail
diff --git a/net/py-shodan/Makefile b/net/py-shodan/Makefile
index 4d61e0cda532..0242c675bd2b 100644
--- a/net/py-shodan/Makefile
+++ b/net/py-shodan/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Python library and command-line utility for Shodan
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter \
-		${PYTHON_PKGNAMEPREFIX}click-plugins>=1.0.3:devel/py-click-plugins \
-		${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click-plugins>=1.0.3:devel/py-click-plugins@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index 3d47f0c8de1a..c9bb3b285c5f 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -13,8 +13,8 @@ COMMENT=	SOAP Services for Python
 # Actual LICENSE is in GH Repo but not in pypi release
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml \
-		${PYTHON_PKGNAMEPREFIX}wstools>0:textproc/py-wstools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wstools>0:textproc/py-wstools@${FLAVOR}
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-socketio-client/Makefile b/net/py-socketio-client/Makefile
index 0b2a656af498..a5716ba298fa 100644
--- a/net/py-socketio-client/Makefile
+++ b/net/py-socketio-client/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Socket.io client library for Python
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-sshuttle/Makefile b/net/py-sshuttle/Makefile
index 9bbb6567d7fc..9e6b2a682cab 100644
--- a/net/py-sshuttle/Makefile
+++ b/net/py-sshuttle/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Full-featured VPN over an SSH tunnel
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/net/py-stomp.py/Makefile b/net/py-stomp.py/Makefile
index dec674756cc2..541279b73c3f 100644
--- a/net/py-stomp.py/Makefile
+++ b/net/py-stomp.py/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python STOMP client, supporting >=1.0 and <=1.2 of the protocol
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest@${FLAVOR}
 
 OPTIONS_DEFINE=	DOXYGEN
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
diff --git a/net/py-terminado/Makefile b/net/py-terminado/Makefile
index 2743aeee34f3..c56eba3d4007 100644
--- a/net/py-terminado/Makefile
+++ b/net/py-terminado/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Terminals served to term.js using Tornado websockets
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess \
-		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net/py-tofu/Makefile b/net/py-tofu/Makefile
index f5bc67caab48..309742fe8765 100644
--- a/net/py-tofu/Makefile
+++ b/net/py-tofu/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Practical high-level network game engine
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/net/py-tweepy/Makefile b/net/py-tweepy/Makefile
index 0f1e23c6b8e5..a3fbd422fd58 100644
--- a/net/py-tweepy/Makefile
+++ b/net/py-tweepy/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Twitter API library for Python
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4.1:www/py-requests-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}vcrpy>=1.1.2:devel/py-vcrpy
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4.1:www/py-requests-oauthlib@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/py-six@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vcrpy>=1.1.2:devel/py-vcrpy@${FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
@@ -31,7 +31,7 @@ TEST_ENV=	USE_REPLAY=1
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${FLAVOR}
 .endif
 
 do-test:
diff --git a/net/py-twitter-tools/Makefile b/net/py-twitter-tools/Makefile
index 4e382b8c45d3..b048408eddc6 100644
--- a/net/py-twitter-tools/Makefile
+++ b/net/py-twitter-tools/Makefile
@@ -11,12 +11,12 @@ PKGNAMESUFFIX=	-tools
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Python API and command-line toolset for Twitter
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils concurrent autoplist
 USE_GITHUB=	yes
 
diff --git a/net/py-txamqp/Makefile b/net/py-txamqp/Makefile
index bee276366c5d..9b53610145e7 100644
--- a/net/py-txamqp/Makefile
+++ b/net/py-txamqp/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	python-${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Twisted Python library for the AMQP messaging protocol
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}thrift>=0:devel/py-thrift \
-		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}thrift>=0:devel/py-thrift@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python:2
diff --git a/net/py-upnp-inspector/Makefile b/net/py-upnp-inspector/Makefile
index 982a5b455ff9..834d8198b909 100644
--- a/net/py-upnp-inspector/Makefile
+++ b/net/py-upnp-inspector/Makefile
@@ -13,9 +13,9 @@ COMMENT=	UPnP Device and Service analyzer
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Coherence>=0.6.4:net/py-coherence
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Coherence>=0.6.4:net/py-coherence@${FLAVOR}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index 8c02e4dc8bb8..7da693e1fb6e 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -13,16 +13,16 @@ COMMENT=	HTTP library with thread-safe connection pooling, file post, and more
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography \
-		${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna \
-		${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py-pysocks
-TEST_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest
-#TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado
-
-USES?=		python
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py-pysocks@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR}
+#TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${FLAVOR}
+
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
@@ -30,13 +30,11 @@ SUB_FILES=	pkg-message
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddress>=0:net/py-ipaddress
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddress>=0:net/py-ipaddress@${FLAVOR}
 .endif
 
-.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi
-.elif ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py3-certifi
+.if ${PYTHON_REL} < 3400
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/py-wmi-query/Makefile b/net/py-wmi-query/Makefile
index 77c8340c78f7..44064c472d6b 100644
--- a/net/py-wmi-query/Makefile
+++ b/net/py-wmi-query/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python scripts to get wmi data classes in a dict
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/net/py-wolframalpha/Makefile b/net/py-wolframalpha/Makefile
index 41906cbbe42a..0f57db921b22 100644
--- a/net/py-wolframalpha/Makefile
+++ b/net/py-wolframalpha/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Python Client for Wolfram Alpha
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \
-		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
 
 USES=	python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/net/py-xmlrpc/Makefile b/net/py-xmlrpc/Makefile
index 8d8f0cc06db3..57696324d148 100644
--- a/net/py-xmlrpc/Makefile
+++ b/net/py-xmlrpc/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Fast implementation of the xmlrpc spec for Python
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/net/py-zope.proxy/Makefile b/net/py-zope.proxy/Makefile
index 5506393e8a59..fe7ed222bc56 100644
--- a/net/py-zope.proxy/Makefile
+++ b/net/py-zope.proxy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Generic Transparent Proxies
 
 LICENSE=	ZPL21
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface@${FLAVOR}
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/net/py3-netifaces/Makefile b/net/py3-netifaces/Makefile
deleted file mode 100644
index 50093557436a..000000000000
--- a/net/py3-netifaces/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	netifaces
-PORTVERSION=	0.10.6
-CATEGORIES=	net python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Getting network addresses from Python 3
-
-LICENSE=	MIT
-
-USES=		python:3.3+
-USE_PYTHON=	autoplist distutils
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/netifaces.so
-
-.include <bsd.port.mk>
diff --git a/net/py3-netifaces/distinfo b/net/py3-netifaces/distinfo
deleted file mode 100644
index 5ecdf46f2a00..000000000000
--- a/net/py3-netifaces/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1505758293
-SHA256 (netifaces-0.10.6.tar.gz) = 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0
-SIZE (netifaces-0.10.6.tar.gz) = 25166
diff --git a/net/py3-netifaces/pkg-descr b/net/py3-netifaces/pkg-descr
deleted file mode 100644
index 198cf3a29379..000000000000
--- a/net/py3-netifaces/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Getting network addresses from Python
-
-It's been irritating me for ages that it isn't possible to
-straightforwardly get the network address(es) of the machine
-you're running on from a Python program.
-
-WWW: https://pypi.python.org/pypi/netifaces
diff --git a/net/py3-pysocks/Makefile b/net/py3-pysocks/Makefile
deleted file mode 100644
index 2e5124b014b9..000000000000
--- a/net/py3-pysocks/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Neil Booth
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-pysocks
-
-PORTSCOUT=	ignore:1
-
-USES=		python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/py3-urllib3/Makefile b/net/py3-urllib3/Makefile
deleted file mode 100644
index a3b41bff8df2..000000000000
--- a/net/py3-urllib3/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-urllib3
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py3-cryptography \
-		${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py3-idna \
-		${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py3-openssl \
-		${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py3-pysocks
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py3-mock \
-		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py3-nose \
-		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py3-pytest
-
-PORTSCOUT=	ignore:1
-
-USES=		python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index f2d0b83ffda2..81318a99e5c4 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Multiprotocol Information Server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils
 
 USE_GITHUB=	yes
diff --git a/net/pynids/Makefile b/net/pynids/Makefile
index c5686bea1272..98bf2a1f5ba6 100644
--- a/net/pynids/Makefile
+++ b/net/pynids/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python interface to libnids
 
 LIB_DEPENDS=	libnet.so:net/libnet
 
-USES=		pkgconfig python
+USES=		pkgconfig python:2.7
 USE_GNOME=	glib20
 USE_PYTHON=	distutils autoplist pythonprefix
 
diff --git a/net/pythondirector/Makefile b/net/pythondirector/Makefile
index 8e5f605eb499..6e5c64151519 100644
--- a/net/pythondirector/Makefile
+++ b/net/pythondirector/Makefile
@@ -13,13 +13,13 @@ COMMENT=	TCP load balancer written in Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
 
 OPTIONS_DEFINE=	DOCS
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
-USES=		python
+USES=		python:2.7
 
 PORTDOCS=	*
 
diff --git a/net/reposado/Makefile b/net/reposado/Makefile
index 487cee63faf7..7b5c4bdda6db 100644
--- a/net/reposado/Makefile
+++ b/net/reposado/Makefile
@@ -16,7 +16,7 @@ GH_TAGNAME=	de2fdb6
 
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils
 
 SUB_FILES=	pkg-message
diff --git a/net/s3ql/Makefile b/net/s3ql/Makefile
index 5cdb406c6460..467e42cc7906 100644
--- a/net/s3ql/Makefile
+++ b/net/s3ql/Makefile
@@ -11,18 +11,18 @@ COMMENT=	File system that stores all its data in the cloud
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apsw>=3.7:databases/py3-apsw \
-		${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py3-defusedxml \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py3-requests \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py3-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}llfuse>=0:devel/py3-llfuse \
-		${PYTHON_PKGNAMEPREFIX}dugong>=0:net/py-dugong \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apsw>=3.7:databases/py-apsw@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}llfuse>=0:devel/py-llfuse@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dugong>=0:net/py-dugong@${FLAVOR} \
 		psmisc>=0:sysutils/psmisc \
 		ca_root_nss>=0:security/ca_root_nss
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		localbase python:3.3+ sqlite tar:bz2
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist distutils optsuffix
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/s3ql/deltadump.so
diff --git a/net/samba44/Makefile b/net/samba44/Makefile
index 906566f5406c..70438c60e8d6 100644
--- a/net/samba44/Makefile
+++ b/net/samba44/Makefile
@@ -88,12 +88,12 @@ RUN_DEPENDS+=		libarchive>=3.1.2:archivers/libarchive
 BUILD_DEPENDS+=		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
 PLIST_SUB+=		PIDL=""
 # External Python modules
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
+RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
 PLIST_SUB+=		PY_DNSPYTHON="@comment "
 #
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
+RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
 PLIST_SUB+=		PY_ISO8601="@comment "
 # talloc
 BUILD_DEPENDS+=		talloc>=2.1.6:devel/talloc
diff --git a/net/samba45/Makefile b/net/samba45/Makefile
index c7dce1d3838d..5dbd244ed5be 100644
--- a/net/samba45/Makefile
+++ b/net/samba45/Makefile
@@ -123,12 +123,12 @@ RUN_DEPENDS+=			libarchive>=3.1.2:archivers/libarchive
 BUILD_DEPENDS+=			p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
 PLIST_SUB+=			PIDL=""
 # External Python modules
-BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
-RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
+BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
+RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
 PLIST_SUB+=			PY_DNSPYTHON="@comment "
 #
-BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
-RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
+BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
+RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
 PLIST_SUB+=			PY_ISO8601="@comment "
 # talloc
 BUILD_DEPENDS+=			talloc>=2.1.8:devel/talloc
diff --git a/net/samba46/Makefile b/net/samba46/Makefile
index dde952c1affd..804a4495b8c1 100644
--- a/net/samba46/Makefile
+++ b/net/samba46/Makefile
@@ -122,12 +122,12 @@ RUN_DEPENDS+=			libarchive>=3.1.2:archivers/libarchive
 # Needed for IDL compiler
 BUILD_DEPENDS+=			p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
 # External Python modules
-BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
-RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
+BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
+RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
 PLIST_SUB+=			PY_DNSPYTHON="@comment "
 #
-BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
-RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
+BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
+RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
 PLIST_SUB+=			PY_ISO8601="@comment "
 # talloc
 BUILD_DEPENDS+=			talloc>=2.1.9:devel/talloc
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index 66f8c064c184..1ba000b9d2a4 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Powerful interactive packet manipulation program in python
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dnet.so:net/py-libdnet \
-		${PYTHON_SITELIBDIR}/pcap.py:net/py-pcap
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dnet.so:net/py-libdnet@${FLAVOR} \
+		${PYTHON_SITELIBDIR}/pcap.py:net/py-pcap@${FLAVOR}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
@@ -30,9 +30,9 @@ NMAP_DESC=	nmap OS signatures database
 MANUF_DESC=	wireshark's MANUF MAC database
 SOX_DESC=	Support for VoIP
 
-PYX_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyx/__init__.py:graphics/py-PyX12
-PYCRYPTO_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto
-PYGNUPLOT_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:math/py-gnuplot
+PYX_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyx/__init__.py:graphics/py-PyX12@${FLAVOR}
+PYCRYPTO_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto@${FLAVOR}
+PYGNUPLOT_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:math/py-gnuplot@${FLAVOR}
 GRAPH_RUN_DEPENDS=	${LOCALBASE}/bin/MagickCore-config:graphics/ImageMagick \
 			${LOCALBASE}/bin/dot:graphics/graphviz
 P0F_BASE_RUN_DEPENDS=	${LOCALBASE}/etc/p0f.fp:net-mgmt/p0f
diff --git a/net/sippy_b2bua/Makefile b/net/sippy_b2bua/Makefile
index c4f4cbb45a08..f65853e1f73e 100644
--- a/net/sippy_b2bua/Makefile
+++ b/net/sippy_b2bua/Makefile
@@ -11,11 +11,11 @@ DISTNAME=	sippy-${PORTVERSION}
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	SIP Back-to-back user agent (B2BUA) server with Radius support
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
 
 NO_ARCH=	yes
 USE_PYTHON=	distutils
-USES=		python
+USES=		python:2.7
 PYDISTUTILS_PKGNAME=	sippy
 DOCSDIR=	${PREFIX}/share/doc/${PYDISTUTILS_PKGNAME}
 
diff --git a/net/splatd/Makefile b/net/splatd/Makefile
index 0ebfc3327dfd..0e5d4ff521c6 100644
--- a/net/splatd/Makefile
+++ b/net/splatd/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Splat is the Scalable Periodic LDAP Attribute Transmogrifier
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/zconfig:devel/py-zconfig \
-		${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap
-RUN_DEPENDS=	${LOCALBASE}/bin/zconfig:devel/py-zconfig \
-		${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap \
-		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+BUILD_DEPENDS=	${LOCALBASE}/bin/zconfig:devel/py-zconfig@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR}
+RUN_DEPENDS=	${LOCALBASE}/bin/zconfig:devel/py-zconfig@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	splat
 USE_RC_SUBR=	splatd
diff --git a/net/tcpwatch/Makefile b/net/tcpwatch/Makefile
index c79117e42b7a..e40a475d9115 100644
--- a/net/tcpwatch/Makefile
+++ b/net/tcpwatch/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	http://hathawaymix.org/Software/TCPWatch/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TCP monitoring and logging tool with support for HTTP 1.1
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 .include <bsd.port.mk>
diff --git a/net/tiny-network-utilities/Makefile b/net/tiny-network-utilities/Makefile
index 282d11151313..4e09d7496ae7 100644
--- a/net/tiny-network-utilities/Makefile
+++ b/net/tiny-network-utilities/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Minimalistic DHCP, UDP proxy, etc server implementations
 
 LICENSE=	BSD4CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \
-		${PYTHON_PKGNAMEPREFIX}hexdump>0:textproc/py-hexdump
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}hexdump>0:textproc/py-hexdump@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yurivict
@@ -25,13 +25,6 @@ FILES_EXEC=	tiny-dhcp-server tiny-udp-proxy tiny-udp-anti-nat
 FILES_LIB=	net_checksums tiny_utils
 PLIST_FILES=	${FILES_EXEC:%=bin/%} ${FILES_LIB:%=${PYTHON_SITELIBDIR}/%.py}
 
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \
-    ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE=	you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
 do-install:
 .for file_exec in ${FILES_EXEC}
 	${INSTALL_SCRIPT} ${WRKSRC}/${file_exec}.py \
@@ -43,4 +36,4 @@ do-install:
 		${STAGEDIR}${PYTHON_SITELIBDIR}/${file_lib}.py
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/turses/Makefile b/net/turses/Makefile
index 23c4e1fc635c..de3e9a88beb5 100644
--- a/net/turses/Makefile
+++ b/net/turses/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Python Twitter client for the console
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>=1.3.0:devel/py-urwid \
-		${PYTHON_PKGNAMEPREFIX}tweepy>=3.1.0:net/py-tweepy \
-		${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>=1.3.0:devel/py-urwid@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tweepy>=3.1.0:net/py-tweepy@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
@@ -26,7 +26,7 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${FLAVOR}
 .endif
 
 do-test:
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 /net
parent	02f9c9be1699251467efc027f210049dfe14f9c5 (diff)
download	freebsd-ports-551be3c7231225ed9c26479af2b8914fb2ef0ea8.zip